diff options
| -rw-r--r-- | sources/scalac/symtab/Definitions.java | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java index 5cdc2d84ba..d57c055760 100644 --- a/sources/scalac/symtab/Definitions.java +++ b/sources/scalac/symtab/Definitions.java @@ -721,14 +721,16 @@ public class Definitions { LIST_CLASS = getClass("scala.List"); ARRAY_CLASS = getClass("scala.Array"); TYPE_CLASS = getClass("scala.Type"); - CLASSTYPE_CLASS = getClass("scala.runtime.types.ClassType"); - JAVACLASSTYPE_CLASS = getClass("scala.runtime.types.JavaClassType"); - SCALACLASSTYPE_CLASS = getClass("scala.runtime.types.ScalaClassType"); - SINGLETYPE_CLASS = getClass("scala.runtime.types.SingleType"); - TYPECONSTRUCTOR_CLASS = getClass("scala.runtime.types.TypeConstructor"); - COMPOUNDTYPE_CLASS = getClass("scala.runtime.types.CompoundType"); - METHODTYPE_CLASS = getClass("scala.runtime.types.MethodType"); - REFINEMENT_CLASS = getClass("scala.runtime.types.Refinement"); + + CLASSTYPE_CLASS = getJVMClass("scala.runtime.types.ClassType"); + JAVACLASSTYPE_CLASS = getJVMClass("scala.runtime.types.JavaClassType"); + SCALACLASSTYPE_CLASS = getJVMClass("scala.runtime.types.ScalaClassType"); + SINGLETYPE_CLASS = getJVMClass("scala.runtime.types.SingleType"); + TYPECONSTRUCTOR_CLASS = getJVMClass("scala.runtime.types.TypeConstructor"); + COMPOUNDTYPE_CLASS = getJVMClass("scala.runtime.types.CompoundType"); + METHODTYPE_CLASS = getJVMClass("scala.runtime.types.MethodType"); + REFINEMENT_CLASS = getJVMClass("scala.runtime.types.Refinement"); + PREDEF = getModule("scala.Predef"); CONSOLE = getModule("scala.Console"); MATCHERROR = getModule("scala.MatchError"); @@ -958,6 +960,11 @@ public class Definitions { return sym; } + private Symbol getJVMClass(String fullname) { + return Global.instance.target == Global.TARGET_MSIL ? null : + getClass(fullname); + } + //######################################################################## // Private Methods |