diff options
Diffstat (limited to 'sources/scalac/backend')
-rw-r--r-- | sources/scalac/backend/Primitives.java | 2 | ||||
-rw-r--r-- | sources/scalac/backend/jvm/GenJVM.java | 2 | ||||
-rw-r--r-- | sources/scalac/backend/msil/TypeCreator.java | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sources/scalac/backend/Primitives.java b/sources/scalac/backend/Primitives.java index a4c084b118..5189846126 100644 --- a/sources/scalac/backend/Primitives.java +++ b/sources/scalac/backend/Primitives.java @@ -320,7 +320,7 @@ public class Primitives { this.primitives = new HashMap(); this.jreNameWriter = new SymbolNameWriter().setClassSeparator('$'); this.clrNameWriter = new SymbolNameWriter().setNameDecoding(false/*true*/); - this.RUNTIME = definitions.getModule(Names.scala_runtime_RunTime); + this.RUNTIME = definitions.getModule("scala.runtime.RunTime"); this.NEW_ZARRAY = getUniqueTerm(RUNTIME, ZARRAY_N); this.NEW_BARRAY = getUniqueTerm(RUNTIME, BARRAY_N); this.NEW_SARRAY = getUniqueTerm(RUNTIME, SARRAY_N); diff --git a/sources/scalac/backend/jvm/GenJVM.java b/sources/scalac/backend/jvm/GenJVM.java index 72cd128e54..ebaf5e6362 100644 --- a/sources/scalac/backend/jvm/GenJVM.java +++ b/sources/scalac/backend/jvm/GenJVM.java @@ -109,7 +109,7 @@ class GenJVM { initTypeMap(); initArithPrimMap(); - JAVA_RMI_REMOTE_CLASS = defs.getClass(Name.fromString(JAVA_RMI_REMOTE)); + JAVA_RMI_REMOTE_CLASS = defs.getClass(JAVA_RMI_REMOTE); } /// Code generation diff --git a/sources/scalac/backend/msil/TypeCreator.java b/sources/scalac/backend/msil/TypeCreator.java index bad4e01f03..0ffd145dbd 100644 --- a/sources/scalac/backend/msil/TypeCreator.java +++ b/sources/scalac/backend/msil/TypeCreator.java @@ -249,17 +249,17 @@ final class TypeCreator { translateMethod(JSTRING, "replace", jChar2, STRING, "Replace"); translateMethod(JSTRING, "toCharArray", STRING, "ToCharArray"); - translateMethod(defs.getModule(Name.fromString("java.lang.Byte")).moduleClass() + translateMethod(defs.getModule("java.lang.Byte").moduleClass() , "parseByte", jString1, BYTE, "Parse"); - translateMethod(defs.getModule(Name.fromString("java.lang.Short")).moduleClass() + translateMethod(defs.getModule("java.lang.Short").moduleClass() , "parseShort", jString1, SHORT, "Parse"); - translateMethod(defs.getModule(Name.fromString("java.lang.Integer")).moduleClass() + translateMethod(defs.getModule("java.lang.Integer").moduleClass() , "parseInt", jString1, INT, "Parse"); - translateMethod(defs.getModule(Name.fromString("java.lang.Long")).moduleClass() + translateMethod(defs.getModule("java.lang.Long").moduleClass() , "parseLong", jString1, LONG, "Parse"); - translateMethod(defs.getModule(Name.fromString("java.lang.Float")).moduleClass() + translateMethod(defs.getModule("java.lang.Float").moduleClass() , "parseFloat", jString1, FLOAT, "Parse"); - translateMethod(defs.getModule(Name.fromString("java.lang.Double")).moduleClass() + translateMethod(defs.getModule("java.lang.Double").moduleClass() , "parseDouble", jString1, DOUBLE, "Parse"); SYM_SUBSTRING_INT_INT = lookupMethod(JSTRING, "substring", jInt2); |