diff options
author | paltherr <paltherr@epfl.ch> | 2003-10-30 12:49:30 +0000 |
---|---|---|
committer | paltherr <paltherr@epfl.ch> | 2003-10-30 12:49:30 +0000 |
commit | fb814bd99236d100b74978cb357ab42ffb2c79a8 (patch) | |
tree | cf3b66e1cc0913d4779dcecc9dd1828d92f6961c /sources/scalac/backend | |
parent | 4d69afd9eb473beecd39afa4f399a21724667776 (diff) | |
download | scala-fb814bd99236d100b74978cb357ab42ffb2c79a8.tar.gz scala-fb814bd99236d100b74978cb357ab42ffb2c79a8.tar.bz2 scala-fb814bd99236d100b74978cb357ab42ffb2c79a8.zip |
- Normalized member names of class Definition
- Cleaned code of Definition
Diffstat (limited to 'sources/scalac/backend')
-rw-r--r-- | sources/scalac/backend/Primitives.java | 22 | ||||
-rw-r--r-- | sources/scalac/backend/jvm/GenJVM.java | 4 | ||||
-rw-r--r-- | sources/scalac/backend/msil/GenMSIL.java | 8 |
3 files changed, 17 insertions, 17 deletions
diff --git a/sources/scalac/backend/Primitives.java b/sources/scalac/backend/Primitives.java index b12b97eb7d..a48be3a333 100644 --- a/sources/scalac/backend/Primitives.java +++ b/sources/scalac/backend/Primitives.java @@ -319,7 +319,7 @@ public class Primitives { } private Symbol getBoxArray(Symbol[] alts, Type type) { - return getBoxValue(alts, definitions.arrayType(type)); + return getBoxValue(alts, definitions.ARRAY_TYPE(type)); } private Symbol getUniqueTerm(Symbol owner, Name name) { @@ -339,14 +339,14 @@ public class Primitives { Definitions defs = definitions; // scala.Any - addPrimitive(defs.EQ, Primitive.ID); - addPrimitive(defs.IS, Primitive.IS); - addPrimitive(defs.AS, Primitive.AS); - addPrimitive(defs.EQEQ, Primitive.EQ); - addPrimitive(defs.BANGEQ, Primitive.NE); - // !!! addPrimitive(defs.EQUALS, Primitive.EQUALS); - addPrimitive(defs.HASHCODE, Primitive.HASHCODE); - addPrimitive(defs.TOSTRING, Primitive.TOSTRING); + addPrimitive(defs.ANY_EQ, Primitive.ID); + addPrimitive(defs.ANY_IS, Primitive.IS); + addPrimitive(defs.ANY_AS, Primitive.AS); + addPrimitive(defs.ANY_EQEQ, Primitive.EQ); + addPrimitive(defs.ANY_BANGEQ, Primitive.NE); + // !!! addPrimitive(defs.ANY_EQUALS, Primitive.EQUALS); + addPrimitive(defs.ANY_HASHCODE, Primitive.HASHCODE); + addPrimitive(defs.ANY_TOSTRING, Primitive.TOSTRING); // scala.Unit addAll(defs.UNIT_CLASS, Names.EQ, Primitive.EQ, 1); @@ -492,10 +492,10 @@ public class Primitives { addAll(defs.ARRAY_CLASS, Names.update, Primitive.UPDATE, 1); // scala.String - addPrimitive(defs.STRING_PLUS_ANY, Primitive.CONCAT); + addPrimitive(defs.JAVA_STRING_PLUS, Primitive.CONCAT); // java.lang.Throwable - addPrimitive(defs.THROW, Primitive.THROW); + addPrimitive(defs.JAVA_THROWABLE_THROW, Primitive.THROW); // scala.runtime.RunTime addPrimitive(BOX_UVALUE, Primitive.BOX); diff --git a/sources/scalac/backend/jvm/GenJVM.java b/sources/scalac/backend/jvm/GenJVM.java index 1c73938e4c..85b95efb13 100644 --- a/sources/scalac/backend/jvm/GenJVM.java +++ b/sources/scalac/backend/jvm/GenJVM.java @@ -249,10 +249,10 @@ class GenJVM { genLoadQualifier(ctx, fun, true); JType type = typeStoJ(args[0].type); - if (fun.symbol() == defs.IS) { + if (fun.symbol() == defs.ANY_IS) { ctx.code.emitINSTANCEOF((JReferenceType)type); generatedType = JType.BOOLEAN; - } else if (fun.symbol() == defs.AS) { + } else if (fun.symbol() == defs.ANY_AS) { ctx.code.emitCHECKCAST((JReferenceType)type); generatedType = type; } else diff --git a/sources/scalac/backend/msil/GenMSIL.java b/sources/scalac/backend/msil/GenMSIL.java index 82176d9a12..1de7c196f1 100644 --- a/sources/scalac/backend/msil/GenMSIL.java +++ b/sources/scalac/backend/msil/GenMSIL.java @@ -737,10 +737,10 @@ public class GenMSIL { return coerce(gen(qualifier, MSILType.VOID), MSILType.VOID); } - if (sym == defs.EQEQ) { + if (sym == defs.ANY_EQEQ) { return genEq(qualifier, args[0]); } - if (sym == defs.BANGEQ) { + if (sym == defs.ANY_BANGEQ) { return negate(genEq(qualifier, args[0])); } @@ -857,10 +857,10 @@ public class GenMSIL { /** Generate code for scala's '==' */ Item genEq(Tree left, Tree right) { - LocalBuilder tmpLocal = (LocalBuilder)locals.get(defs.EQEQ); + LocalBuilder tmpLocal = (LocalBuilder)locals.get(defs.ANY_EQEQ); if (tmpLocal == null) { tmpLocal = code.DeclareLocal(TypeCreator.SYSTEM_OBJECT); - locals.put(defs.EQEQ, tmpLocal); + locals.put(defs.ANY_EQEQ, tmpLocal); } Label l1 = code.DefineLabel(), l2 = code.DefineLabel(); load(gen(left)); |