diff options
author | Paul Phillips <paulp@improving.org> | 2009-11-18 22:06:03 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2009-11-18 22:06:03 +0000 |
commit | ae024cebd4a41339039f3df91c8aa4a02522594f (patch) | |
tree | 07c5e3a27ce4636f76eb73fe43353fc6c6aa0362 /src/msil/ch/epfl | |
parent | 536955e1afd68ac6f99f0347fa14a58ab47cb958 (diff) | |
download | scala-ae024cebd4a41339039f3df91c8aa4a02522594f.tar.gz scala-ae024cebd4a41339039f3df91c8aa4a02522594f.tar.bz2 scala-ae024cebd4a41339039f3df91c8aa4a02522594f.zip |
Finally completed the incredibly tedious task o...
Finally completed the incredibly tedious task of removing the lower case
primitive aliases from Predef. Had to rebuild msil.jar along the way.
Diffstat (limited to 'src/msil/ch/epfl')
11 files changed, 95 insertions, 95 deletions
diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/AssemblyBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/AssemblyBuilder.scala index 9fbfbb533b..834b2b3a74 100644 --- a/src/msil/ch/epfl/lamp/compiler/msil/emit/AssemblyBuilder.scala +++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/AssemblyBuilder.scala @@ -72,7 +72,7 @@ class AssemblyBuilder(name: AssemblyName) } /** Sets a custom attribute. */ - def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte]) { + def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte]) { addCustomAttribute(constr, value) } diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/ConstructorBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/ConstructorBuilder.scala index ad3a82d040..cfb54844c9 100644 --- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ConstructorBuilder.scala +++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ConstructorBuilder.scala @@ -21,7 +21,7 @@ import java.io.IOException * @author Nikolay Mihaylov * @version 1.0 */ -class ConstructorBuilder(declType: Type, attrs: int, paramTypes: Array[Type]) +class ConstructorBuilder(declType: Type, attrs: Int, paramTypes: Array[Type]) extends ConstructorInfo(declType, attrs, paramTypes) with ICustomAttributeSetter with Visitable @@ -31,7 +31,7 @@ class ConstructorBuilder(declType: Type, attrs: int, paramTypes: Array[Type]) // public interface /** Defines a parameter of this constructor. */ - def DefineParameter(pos: int, attr: int, name: String): ParameterBuilder = { + def DefineParameter(pos: Int, attr: Int, name: String): ParameterBuilder = { val param = new ParameterBuilder(name, params(pos).ParameterType, attr, pos) params(pos) = param return param diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/FieldBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/FieldBuilder.scala index 1fc3e068b8..1306148975 100644 --- a/src/msil/ch/epfl/lamp/compiler/msil/emit/FieldBuilder.scala +++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/FieldBuilder.scala @@ -18,7 +18,7 @@ import java.io.IOException * @author Nikolay Mihaylov * @version 1.0 */ -class FieldBuilder(name: String, declType: Type, attrs: int, fieldType: Type) +class FieldBuilder(name: String, declType: Type, attrs: Int, fieldType: Type) extends FieldInfo(name, declType, attrs, fieldType) with ICustomAttributeSetter with Visitable diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/ICustomAttributeSetter.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/ICustomAttributeSetter.scala index c19366cc33..88587a143d 100644 --- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ICustomAttributeSetter.scala +++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ICustomAttributeSetter.scala @@ -15,5 +15,5 @@ import ch.epfl.lamp.compiler.msil.ConstructorInfo * @version 1.0 */ trait ICustomAttributeSetter { - def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte]) + def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte]) } diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/ILPrinterVisitor.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/ILPrinterVisitor.scala index 28d0f7787a..4644cade72 100644 --- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ILPrinterVisitor.scala +++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ILPrinterVisitor.scala @@ -52,7 +52,7 @@ abstract class ILPrinterVisitor extends Visitor { private var newline = true // print types without or with members? - protected var nomembers: boolean = false + protected var nomembers: Boolean = false // external assemblies protected var as: Array[Assembly] = null @@ -90,13 +90,13 @@ abstract class ILPrinterVisitor extends Visitor { // methods to print code protected def print(s: String) { align(); out.print(s)} protected def print(o: Object) { align(); out.print(o) } - protected def print(c: char) { align(); out.print(c) } - protected def print(`val`: int) { align(); out.print(`val`)} - protected def print(`val`: long){ align(); out.print(`val`)} + protected def print(c: Char) { align(); out.print(c) } + protected def print(`val`: Int) { align(); out.print(`val`)} + protected def print(`val`: Long){ align(); out.print(`val`)} protected def println() { out.println(); newline = true; padding = 0 } - protected def println(c: char) { print(c); println() } - protected def println(i: int) { print(i); println() } - protected def println(l: long) { print(l); println() } + protected def println(c: Char) { print(c); println() } + protected def println(i: Int) { print(i); println() } + protected def println(l: Long) { print(l); println() } protected def println(s: String){ print(s); println() } protected def println(o: Object){ print(o); println() } protected def printName(name: String) { @@ -489,7 +489,7 @@ abstract class ILPrinterVisitor extends Visitor { //########################################################################## - def printAssemblySignature(assem: Assembly, extern: boolean) { + def printAssemblySignature(assem: Assembly, extern: Boolean) { print(".assembly ") if (extern) print("extern ") diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/MethodBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/MethodBuilder.scala index e22c1fca13..eb86c96de5 100644 --- a/src/msil/ch/epfl/lamp/compiler/msil/emit/MethodBuilder.scala +++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/MethodBuilder.scala @@ -45,7 +45,7 @@ class MethodBuilder(name: String, declType: Type, attrs: Int, returnType: Type, } /** Sets a custom attribute. */ - def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte]) { + def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte]) { addCustomAttribute(constr, value) } diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/ModuleBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/ModuleBuilder.scala index 037b8660ee..5b42d6df76 100644 --- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ModuleBuilder.scala +++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ModuleBuilder.scala @@ -105,7 +105,7 @@ class ModuleBuilder(name: String, fullname: String, scopeName: String, assembly: } /** Sets a custom attribute. */ - def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte]) { + def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte]) { addCustomAttribute(constr, value) } diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCode.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCode.scala index e7bff447cc..1bd8e48633 100644 --- a/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCode.scala +++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCode.scala @@ -23,23 +23,23 @@ class OpCode extends Visitable { var CEE_string: String = _ /** The type of Microsoft intermediate language (MSIL) instruction. */ - var CEE_code: short = _ + var CEE_code: Short = _ /** How the Microsoft intermediate language (MSIL) instruction pops the stack. */ - var CEE_pop: byte = _ + var CEE_pop: Byte = _ /** How the Microsoft intermediate language (MSIL) instruction pushes operand onto the stack. */ - var CEE_push: byte = _ + var CEE_push: Byte = _ /** Describes the type of flow control. */ - var CEE_flow: byte = _ + var CEE_flow: Byte = _ /** ????? */ - var CEE_inline: byte = _ + var CEE_inline: Byte = _ - var CEE_length: byte = _ + var CEE_length: Byte = _ - var CEE_popush: byte = _ + var CEE_popush: Byte = _ /** * the apply method for a visitor @@ -49,13 +49,13 @@ class OpCode extends Visitable { v.caseOpCode(this) } - protected def length(): byte = { + protected def length(): Byte = { val code = OpCode.length(CEE_code) val inline = OpCode.INLINE_length(CEE_inline) return if(inline < 0) { -1 } else { (code + inline).toByte } } - protected def popush(): byte = { + protected def popush(): Byte = { val pop = OpCode.POP_size(CEE_pop) val push = OpCode.PUSH_size(CEE_push) return if(pop < 0 || push < 0) { OpCode.POPUSH_SPECIAL } else { (push - pop).toByte } @@ -391,27 +391,27 @@ object OpCode { //######################################################################## // Opcode's amount and type of poped data - final val POP_NONE : byte = 0x00 - final val POP_1 : byte = 0x01 - final val POP_1_1 : byte = 0x02 - final val POP_I : byte = 0x03 - final val POP_I_1 : byte = 0x04 - final val POP_I_I : byte = 0x05 - final val POP_I_I8 : byte = 0x06 - final val POP_I_R4 : byte = 0x07 - final val POP_I_R8 : byte = 0x08 - final val POP_I_I_I : byte = 0x09 - final val POP_REF : byte = 0x0A - final val POP_REF_1 : byte = 0x0B - final val POP_REF_I : byte = 0x0C - final val POP_REF_I_I : byte = 0x0D - final val POP_REF_I_I8 : byte = 0x0E - final val POP_REF_I_R4 : byte = 0x0F - final val POP_REF_I_R8 : byte = 0x10 - final val POP_REF_I_REF : byte = 0x11 - final val POP_SPECIAL : byte = 0x12 + final val POP_NONE : Byte = 0x00 + final val POP_1 : Byte = 0x01 + final val POP_1_1 : Byte = 0x02 + final val POP_I : Byte = 0x03 + final val POP_I_1 : Byte = 0x04 + final val POP_I_I : Byte = 0x05 + final val POP_I_I8 : Byte = 0x06 + final val POP_I_R4 : Byte = 0x07 + final val POP_I_R8 : Byte = 0x08 + final val POP_I_I_I : Byte = 0x09 + final val POP_REF : Byte = 0x0A + final val POP_REF_1 : Byte = 0x0B + final val POP_REF_I : Byte = 0x0C + final val POP_REF_I_I : Byte = 0x0D + final val POP_REF_I_I8 : Byte = 0x0E + final val POP_REF_I_R4 : Byte = 0x0F + final val POP_REF_I_R8 : Byte = 0x10 + final val POP_REF_I_REF : Byte = 0x11 + final val POP_SPECIAL : Byte = 0x12 final val POP_count : Int = 0x13 - final val POP_size : Array[byte] = new Array[byte](POP_count) + final val POP_size : Array[Byte] = new Array[Byte](POP_count) POP_size(POP_NONE) = 0 POP_size(POP_1) = 1 @@ -436,17 +436,17 @@ object OpCode { //######################################################################## // Opcode's amount and type of pushed data - final val PUSH_NONE : byte = 0x00 - final val PUSH_1 : byte = 0x01 - final val PUSH_1_1 : byte = 0x02 - final val PUSH_I : byte = 0x03 - final val PUSH_I8 : byte = 0x04 - final val PUSH_R4 : byte = 0x05 - final val PUSH_R8 : byte = 0x06 - final val PUSH_REF : byte = 0x07 - final val PUSH_SPECIAL : byte = 0x08 + final val PUSH_NONE : Byte = 0x00 + final val PUSH_1 : Byte = 0x01 + final val PUSH_1_1 : Byte = 0x02 + final val PUSH_I : Byte = 0x03 + final val PUSH_I8 : Byte = 0x04 + final val PUSH_R4 : Byte = 0x05 + final val PUSH_R8 : Byte = 0x06 + final val PUSH_REF : Byte = 0x07 + final val PUSH_SPECIAL : Byte = 0x08 final val PUSH_count : Int = 0x09 - final val PUSH_size : Array[byte] = new Array[byte](PUSH_count) + final val PUSH_size : Array[Byte] = new Array[Byte](PUSH_count) PUSH_size(PUSH_NONE) = 0 PUSH_size(PUSH_1) = 1 @@ -461,30 +461,30 @@ object OpCode { //######################################################################## // Opcode's amount of moved data - final val POPUSH_SPECIAL : byte = -128 + final val POPUSH_SPECIAL : Byte = -128 //######################################################################## // Opcode's inline argument types - final val INLINE_NONE : byte = 0x00 - final val INLINE_VARIABLE_S : byte = 0x01 - final val INLINE_TARGET_S : byte = 0x02 - final val INLINE_I_S : byte = 0x03 - final val INLINE_VARIABLE : byte = 0x04 - final val INLINE_TARGET : byte = 0x05 - final val INLINE_I : byte = 0x06 - final val INLINE_I8 : byte = 0x07 - final val INLINE_R : byte = 0x08 - final val INLINE_R8 : byte = 0x09 - final val INLINE_STRING : byte = 0x0A - final val INLINE_TYPE : byte = 0x0B - final val INLINE_FIELD : byte = 0x0C - final val INLINE_METHOD : byte = 0x0D - final val INLINE_SIGNATURE : byte = 0x0E - final val INLINE_TOKEN : byte = 0x0F - final val INLINE_SWITCH : byte = 0x10 + final val INLINE_NONE : Byte = 0x00 + final val INLINE_VARIABLE_S : Byte = 0x01 + final val INLINE_TARGET_S : Byte = 0x02 + final val INLINE_I_S : Byte = 0x03 + final val INLINE_VARIABLE : Byte = 0x04 + final val INLINE_TARGET : Byte = 0x05 + final val INLINE_I : Byte = 0x06 + final val INLINE_I8 : Byte = 0x07 + final val INLINE_R : Byte = 0x08 + final val INLINE_R8 : Byte = 0x09 + final val INLINE_STRING : Byte = 0x0A + final val INLINE_TYPE : Byte = 0x0B + final val INLINE_FIELD : Byte = 0x0C + final val INLINE_METHOD : Byte = 0x0D + final val INLINE_SIGNATURE : Byte = 0x0E + final val INLINE_TOKEN : Byte = 0x0F + final val INLINE_SWITCH : Byte = 0x10 final val INLINE_count : Int = 0x11 - final val INLINE_length : Array[byte] = new Array[byte](INLINE_count) + final val INLINE_length : Array[Byte] = new Array[Byte](INLINE_count) INLINE_length(INLINE_NONE) = 0 INLINE_length(INLINE_VARIABLE_S) = 1 @@ -507,21 +507,21 @@ object OpCode { //######################################################################## // Opcode's control flow implications - final val FLOW_META : byte = 0x00 - final val FLOW_NEXT : byte = 0x01 - final val FLOW_BRANCH : byte = 0x02 - final val FLOW_COND_BRANCH : byte = 0x03 - final val FLOW_BREAK : byte = 0x04 - final val FLOW_CALL : byte = 0x05 - final val FLOW_RETURN : byte = 0x06 - final val FLOW_THROW : byte = 0x07 + final val FLOW_META : Byte = 0x00 + final val FLOW_NEXT : Byte = 0x01 + final val FLOW_BRANCH : Byte = 0x02 + final val FLOW_COND_BRANCH : Byte = 0x03 + final val FLOW_BREAK : Byte = 0x04 + final val FLOW_CALL : Byte = 0x05 + final val FLOW_RETURN : Byte = 0x06 + final val FLOW_THROW : Byte = 0x07 final val FLOW_count : Int = 0x08 //######################################################################## // Init methods for Opcode - def opcode(that: OpCode, opcode: int, string: String, code: Int, - pop: byte, push: byte, inline: byte, flow: byte) { + def opcode(that: OpCode, opcode: Int, string: String, code: Int, + pop: Byte, push: Byte, inline: Byte, flow: Byte) { that.CEE_opcode = opcode that.CEE_string = string that.CEE_code = code.toShort @@ -533,7 +533,7 @@ object OpCode { that.CEE_popush = that.popush() } - def length(code: Int): byte = { + def length(code: Int): Byte = { if ((code & 0xFFFFFF00) == 0xFFFFFF00) return 1 if ((code & 0xFFFFFF00) == 0xFFFFFE00) return 2 return 0 @@ -1862,7 +1862,7 @@ object OpCode { /** * Allocates a certain number of bytes from the local dynamic memory pool and pushes the - * address (a transient pointer, type *) of the first allocated byte onto the evaluation stack. + * address (a transient pointer, type *) of the first allocated Byte onto the evaluation stack. */ final val Localloc = new OpCode() opcode(Localloc, CEE_LOCALLOC, "localloc" , 0xFFFFFE0F, POP_I, PUSH_I, INLINE_NONE, FLOW_NEXT) diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCodes.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCodes.scala index 57ef69ba7f..f8e0f140a8 100644 --- a/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCodes.scala +++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/OpCodes.scala @@ -1135,7 +1135,7 @@ object OpCodes { /** * Allocates a certain number of bytes from the local dynamic memory pool and pushes the - * address (a transient pointer, type *) of the first allocated byte onto the evaluation stack. + * address (a transient pointer, type *) of the first allocated Byte onto the evaluation stack. */ final val Localloc = OpCode.Localloc diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/ParameterBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/ParameterBuilder.scala index dabba58f0c..5a68f8f0ae 100644 --- a/src/msil/ch/epfl/lamp/compiler/msil/emit/ParameterBuilder.scala +++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/ParameterBuilder.scala @@ -29,7 +29,7 @@ class ParameterBuilder(name: String, tpe: Type, attr: Int, pos: Int) //########################################################################## /** Sets a custom attribute. */ - def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte]) { + def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte]) { addCustomAttribute(constr, value) } diff --git a/src/msil/ch/epfl/lamp/compiler/msil/emit/TypeBuilder.scala b/src/msil/ch/epfl/lamp/compiler/msil/emit/TypeBuilder.scala index 81bf28bc04..84fd2a4023 100644 --- a/src/msil/ch/epfl/lamp/compiler/msil/emit/TypeBuilder.scala +++ b/src/msil/ch/epfl/lamp/compiler/msil/emit/TypeBuilder.scala @@ -18,7 +18,7 @@ import java.io.IOException * @author Nikolay Mihaylov * @version 1.0 */ -class TypeBuilder (module: Module, attributes: int, fullName: String, baseType: Type, interfaces: Array[Type], declType: Type) +class TypeBuilder (module: Module, attributes: Int, fullName: String, baseType: Type, interfaces: Array[Type], declType: Type) extends Type(module, attributes, fullName, baseType, interfaces, declType, 0) with ICustomAttributeSetter with Visitable @@ -45,7 +45,7 @@ class TypeBuilder (module: Module, attributes: int, fullName: String, baseType: * Adds a new field to the class, with the given name, * attributes and field type. */ - def DefineField(name: String, `type`: Type, attrs: short): FieldBuilder = { + def DefineField(name: String, `type`: Type, attrs: Short): FieldBuilder = { val field: FieldBuilder = new FieldBuilder(name, this, attrs, `type`) fieldBuilders.add(field) return field @@ -55,7 +55,7 @@ class TypeBuilder (module: Module, attributes: int, fullName: String, baseType: * Adds a new method to the class, with the given name and * method signature. */ - def DefineMethod(name: String, attrs: short, returnType: Type, paramTypes: Array[Type]): MethodBuilder = { + def DefineMethod(name: String, attrs: Short, returnType: Type, paramTypes: Array[Type]): MethodBuilder = { val method = new MethodBuilder(name, this, attrs, returnType, paramTypes) val methods = methodBuilders.iterator() while(methods.hasNext()) { @@ -72,7 +72,7 @@ class TypeBuilder (module: Module, attributes: int, fullName: String, baseType: * Adds a new constructor to the class, with the given attributes * and signature. */ - def DefineConstructor(attrs: short, callingConvention: short, paramTypes: Array[Type]): ConstructorBuilder = { + def DefineConstructor(attrs: Short, callingConvention: Short, paramTypes: Array[Type]): ConstructorBuilder = { val constr = new ConstructorBuilder(this, attrs, paramTypes) constructorBuilders.add(constr) return constr @@ -81,7 +81,7 @@ class TypeBuilder (module: Module, attributes: int, fullName: String, baseType: /** * Defines a nested type given its name. */ - def DefineNestedType(name: String, attributes: int, baseType: Type, interfaces: Array[Type]): TypeBuilder = { + def DefineNestedType(name: String, attributes: Int, baseType: Type, interfaces: Array[Type]): TypeBuilder = { val nested = nestedTypeBuilders.iterator() while(nested.hasNext()) { val nt = nested.next().asInstanceOf[TypeBuilder] @@ -152,11 +152,11 @@ class TypeBuilder (module: Module, attributes: int, fullName: String, baseType: } /** Sets a custom attribute. */ - def SetCustomAttribute(constr: ConstructorInfo, value: Array[byte]) { + def SetCustomAttribute(constr: ConstructorInfo, value: Array[Byte]) { addCustomAttribute(constr, value) } - def setPosition(sourceLine: int, sourceFilename: String) { + def setPosition(sourceLine: Int, sourceFilename: String) { this.sourceLine = sourceLine this.sourceFilename = sourceFilename } @@ -213,7 +213,7 @@ object TypeBuilder { return s.toString() } - def methodsEqual(m1: MethodInfo, m2: MethodInfo): boolean = { + def methodsEqual(m1: MethodInfo, m2: MethodInfo): Boolean = { if (!m1.Name.equals(m2.Name)) return false if (m1.ReturnType != m2.ReturnType) |