diff options
18 files changed, 85 insertions, 140 deletions
diff --git a/sources/scala/tools/scalac/typechecker/Analyzer.scala b/sources/scala/tools/scalac/typechecker/Analyzer.scala index db2bec984f..2672700ba4 100644 --- a/sources/scala/tools/scalac/typechecker/Analyzer.scala +++ b/sources/scala/tools/scalac/typechecker/Analyzer.scala @@ -2394,21 +2394,18 @@ class Analyzer(global: scalac_Global, descr: AnalyzerPhase) extends Transformer( .setType(owntype.instanceType()); } else { pushContext(tree, context.owner, new Scope(context.scope)); + val clazz: Symbol = context.owner.newAnonymousClass(templ.pos); val cd: Tree = make.ClassDef( templ.pos, - 0, - Names.ANON_CLASS_NAME.toTypeName(), + clazz, Tree.AbsTypeDef_EMPTY_ARRAY, NewArray.ValDefArray(Tree.ValDef_EMPTY_ARRAY), Tree.Empty, templ); + defineSym(cd, unit, context); //new TextTreePrinter().print(cd).println().end();//DEBUG - enterSym(cd); val cd1 = transform(cd); - val clazz: Symbol = cd1.symbol(); - if (clazz.kind != CLASS) - errorTree(tree.pos) - else { + { // compute template's type with new refinement scope. val parentTypes = clazz.info().parents(); val refinement: Scope = new Scope(); diff --git a/sources/scala/tools/scalac/typechecker/AnalyzerPhase.scala b/sources/scala/tools/scalac/typechecker/AnalyzerPhase.scala index 257d71c65e..f61bf494bf 100644 --- a/sources/scala/tools/scalac/typechecker/AnalyzerPhase.scala +++ b/sources/scala/tools/scalac/typechecker/AnalyzerPhase.scala @@ -30,12 +30,12 @@ class AnalyzerPhase(global: scalac_Global, descriptor: PhaseDescriptor) extends startContext.enclClass = startContext; if (!global.noimports) { - addImport(startContext, global.definitions.getModule(Names.java_lang)); - addImport(startContext, global.definitions.getModule(Names.scala)); + addImport(startContext, global.definitions.JAVALANG); + addImport(startContext, global.definitions.SCALA); } if (!global.noimports && !global.nopredefs) { - addImport(startContext, global.definitions.getModule(Names.scala_Predef)); + addImport(startContext, global.definitions.PREDEF); } val consoleContext = new Context( diff --git a/sources/scala/tools/scaladoc/HTMLGenerator.java b/sources/scala/tools/scaladoc/HTMLGenerator.java index f08988c1ed..e804f5a24b 100644 --- a/sources/scala/tools/scaladoc/HTMLGenerator.java +++ b/sources/scala/tools/scaladoc/HTMLGenerator.java @@ -299,9 +299,9 @@ public abstract class HTMLGenerator { protected Symbol[] getPackages(ScalaProgramArgumentParser option) { if (option.main != null) { Symbol[] packages = new Symbol[option.args.length + 1]; - packages[0] = global.definitions.getModule(Name.fromString(option.main)); + packages[0] = global.definitions.getModule(option.main); for(int i = 0; i < option.args.length; i++) - packages[i+1] = global.definitions.getModule(Name.fromString(option.args[i])); + packages[i+1] = global.definitions.getModule(option.args[i]); return packages; } else diff --git a/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java b/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java index 0ebf63d307..9df68964e3 100644 --- a/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java +++ b/sources/scala/tools/scaladoc/SymbolTablePrinterFactory.java @@ -91,8 +91,7 @@ class SymbolTablePrinterFactory { if (prefix.symbol().isRoot()) return null; // Next line should be removed in theory. - if (prefix.symbol() == global.definitions.getModule(Names.java_lang)) - return null; + if (prefix.symbol() == global.definitions.JAVALANG) return null; switch(prefix) { case ThisType(Symbol sym): diff --git a/sources/scalac/Global.java b/sources/scalac/Global.java index c7546e4568..a5d26fdf4c 100644 --- a/sources/scalac/Global.java +++ b/sources/scalac/Global.java @@ -351,8 +351,6 @@ public abstract class Global { // !!! <<< Interpreter stuff public static final String CONSOLE_S = "$console$"; private static final Name - CONSOLE_N = Name.fromString(CONSOLE_S), - INTERPRETER_N = Name.fromString("scala.runtime.InterpreterSupport"), SHOW_DEFINITION_N = Name.fromString("showDefinition"), SHOW_VALUE_DEFINITION_N = Name.fromString("showValueDefinition"), SET_EVALUATION_RESULT_N = Name.fromString("setEvaluationResult"); @@ -365,7 +363,7 @@ public abstract class Global { private Symbol INTERPRETER() { if (INTERPRETER == null) - INTERPRETER = definitions.getModule(INTERPRETER_N); + INTERPRETER = definitions.getModule("scala.runtime.InterpreterSupport"); return INTERPRETER; } diff --git a/sources/scalac/ast/TreeGen.java b/sources/scalac/ast/TreeGen.java index 5ffeade7ac..33774c5fe3 100644 --- a/sources/scalac/ast/TreeGen.java +++ b/sources/scalac/ast/TreeGen.java @@ -1200,10 +1200,9 @@ public class TreeGen implements Kinds, Modifiers, TypeTags { } public Tree Console_print(int pos, Tree arg) { - Symbol sym = global.definitions.getModule( Names.scala_Console ); return Apply( Select( pos, - mkGlobalRef( pos, sym), - global.definitions.CONSOLE_PRINT()), + mkGlobalRef(pos, definitions.CONSOLE), + definitions.CONSOLE_PRINT()), new Tree[] { arg }); 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); diff --git a/sources/scalac/symtab/Definitions.java b/sources/scalac/symtab/Definitions.java index 01c6b85b66..68b92e7731 100644 --- a/sources/scalac/symtab/Definitions.java +++ b/sources/scalac/symtab/Definitions.java @@ -26,16 +26,19 @@ public class Definitions { public final ATreeTyper atyper; //######################################################################## - // Public Fields & Methods - Root, java and scala packages + // Public Fields & Methods - Root class and some standard packages - /** The root package */ + /** The root class */ public final Symbol ROOT_CLASS; /** The java package */ - public final Symbol JAVA_CLASS; + public final Symbol JAVA; + + /** The java.lang package */ + public final Symbol JAVALANG; /** The scala package */ - public final Symbol SCALA_CLASS; + public final Symbol SCALA; //######################################################################## // Public Fields & Methods - Top and bottom classes @@ -581,59 +584,61 @@ public class Definitions { // create attributed tree typer atyper = new ATreeTyper(global, this); - // the root package + // the root class ROOT_CLASS = ClassSymbol.newRootClass(new PackageParser(global)); - // the java and scala packages - JAVA_CLASS = getModule(Names.java).moduleClass(); - SCALA_CLASS = getModule(Names.scala).moduleClass(); + // the java, java.lang and scala packages + JAVA = getModule("java"); + JAVALANG = getModule("java.lang"); + SCALA = getModule("scala"); // the top and bottom classes + Symbol SCALA_CLASS = SCALA.moduleClass(); ANY_CLASS = newClass(SCALA_CLASS, Names.Any, 0); - ANYVAL_CLASS = getClass(Names.scala_AnyVal); + ANYVAL_CLASS = getClass("scala.AnyVal"); ANYREF_CLASS = newAlias(SCALA_CLASS, Names.AnyRef, 0); ALLREF_CLASS = newClass(SCALA_CLASS, Names.AllRef, 0); ALL_CLASS = newClass(SCALA_CLASS, Names.All, 0); // the java classes - OBJECT_CLASS = getClass(Names.java_lang_Object); - THROWABLE_CLASS = getClass(Names.java_lang_Throwable); - STRING_CLASS = getClass(Names.java_lang_String); + OBJECT_CLASS = getClass("java.lang.Object"); + THROWABLE_CLASS = getClass("java.lang.Throwable"); + STRING_CLASS = getClass("java.lang.String"); // the scala value classes - UNIT_CLASS = getClass(Names.scala_Unit); - BOOLEAN_CLASS = getClass(Names.scala_Boolean); - BYTE_CLASS = getClass(Names.scala_Byte); - SHORT_CLASS = getClass(Names.scala_Short); - CHAR_CLASS = getClass(Names.scala_Char); - INT_CLASS = getClass(Names.scala_Int); - LONG_CLASS = getClass(Names.scala_Long); - FLOAT_CLASS = getClass(Names.scala_Float); - DOUBLE_CLASS = getClass(Names.scala_Double); + UNIT_CLASS = getClass("scala.Unit"); + BOOLEAN_CLASS = getClass("scala.Boolean"); + BYTE_CLASS = getClass("scala.Byte"); + SHORT_CLASS = getClass("scala.Short"); + CHAR_CLASS = getClass("scala.Char"); + INT_CLASS = getClass("scala.Int"); + LONG_CLASS = getClass("scala.Long"); + FLOAT_CLASS = getClass("scala.Float"); + DOUBLE_CLASS = getClass("scala.Double"); // the scala reference classes - SCALAOBJECT_CLASS = getClass(Names.scala_ScalaObject); - REF_CLASS = getClass(Names.scala_Ref); + SCALAOBJECT_CLASS = getClass("scala.ScalaObject"); + REF_CLASS = getClass("scala.Ref"); for (int i = 1; i < TUPLE_COUNT; i++) { - TUPLE_CLASS[i] = getClass(Names.scala_Tuple(i)); + TUPLE_CLASS[i] = getClass("scala.Tuple" + i); TUPLE_FIELD[i] = new Symbol[i]; } for (int i = 0; i < FUNCTION_COUNT; i++) - FUNCTION_CLASS[i] = getClass(Names.scala_Function(i)); - PARTIALFUNCTION_CLASS = getClass(Names.scala_PartialFunction); - ITERABLE_CLASS = getClass(Names.scala_Iterable); - ITERATOR_CLASS = getClass(Names.scala_Iterator); - SEQ_CLASS = getClass(Names.scala_Seq); - LIST_CLASS = getClass(Names.scala_List); - NIL = getModule(Names.scala_Nil); - CONS_CLASS = getClass(Names.scala_COLONCOLON); - ARRAY_CLASS = getClass(Names.scala_Array); - TYPE_CLASS = getClass(Names.scala_Type); - CONSTRUCTEDTYPE_CLASS = getClass(Names.scala_ConstructedType); - SINGLETYPE_CLASS = getClass(Names.scala_SingleType); - PREDEF = getModule(Names.scala_Predef); - CONSOLE = getModule(Names.scala_Console); - MATCHERROR = getModule(Names.scala_MatchError); + FUNCTION_CLASS[i] = getClass("scala.Function" + i); + PARTIALFUNCTION_CLASS = getClass("scala.PartialFunction"); + ITERABLE_CLASS = getClass("scala.Iterable"); + ITERATOR_CLASS = getClass("scala.Iterator"); + SEQ_CLASS = getClass("scala.Seq"); + LIST_CLASS = getClass("scala.List"); + NIL = getModule("scala.Nil"); + CONS_CLASS = getClass("scala.$colon$colon"); + ARRAY_CLASS = getClass("scala.Array"); + TYPE_CLASS = getClass("scala.Type"); + CONSTRUCTEDTYPE_CLASS = getClass("scala.ConstructedType"); + SINGLETYPE_CLASS = getClass("scala.SingleType"); + PREDEF = getModule("scala.Predef"); + CONSOLE = getModule("scala.Console"); + MATCHERROR = getModule("scala.MatchError"); // initialize generated classes and aliases initClass(ANY_CLASS, Type.EMPTY_ARRAY); @@ -732,16 +737,18 @@ public class Definitions { // Public Methods /** Returns the symbol of the module with the given fullname. */ - public Symbol getModule(Name fullname, boolean fail) { + public Symbol getModule(String fullname, boolean fail) { Scope scope = ROOT_CLASS.members(); int i = 0; int j = fullname.indexOf('.', i); while (j >= 0) { - scope = scope.lookup(fullname.subName(i, j)).members(); + Name name = Name.fromString(fullname.substring(i, j)); + scope = scope.lookup(name).members(); i = j + 1; j = fullname.indexOf('.', i); } - Symbol sym = scope.lookup(fullname.subName(i, fullname.length())); + Name name = Name.fromString(fullname.substring(i, fullname.length())); + Symbol sym = scope.lookup(name); if (!sym.isModule()) { switch (sym.type()) { case OverloadedType(Symbol[] alts, Type[] alttypes): @@ -755,21 +762,23 @@ public class Definitions { } /** Returns the symbol of the module with the given fullname. */ - public Symbol getModule(Name fullname) { + public Symbol getModule(String fullname) { return getModule(fullname, true); } /** Returns the symbol of the class with the given fullname. */ - public Symbol getClass(Name fullname) { + public Symbol getClass(String fullname) { Scope scope = ROOT_CLASS.members(); int i = 0; int j = fullname.indexOf('.', i); while (j >= 0) { - scope = scope.lookup(fullname.subName(i, j)).members(); + Name name = Name.fromString(fullname.substring(i, j)); + scope = scope.lookup(name).members(); i = j + 1; j = fullname.indexOf('.', i); } - Symbol sym = scope.lookup(fullname.subName(i, fullname.length()).toTypeName()); + Name name = Name.fromString(fullname.substring(i, fullname.length())); + Symbol sym = scope.lookup(name.toTypeName()); assert sym.kind != Kinds.NONE : "no class '" + fullname + "'"; return sym; } diff --git a/sources/scalac/symtab/Symbol.java b/sources/scalac/symtab/Symbol.java index fc488aeb63..2f5cad351a 100644 --- a/sources/scalac/symtab/Symbol.java +++ b/sources/scalac/symtab/Symbol.java @@ -950,9 +950,9 @@ public abstract class Symbol implements Modifiers, Kinds { */ public Symbol accessed() { assert (flags & ACCESSOR) != 0; - Name name1 = name; - if (name1.toString().endsWith(Names._EQ.toString())) - name1 = name1.subName(0, name1.length() - Names._EQ.length()); + String name1 = name.toString(); + if (name1.endsWith(Names._EQ.toString())) + name1 = name1.substring(0, name1.length() - Names._EQ.length()); return owner.info().lookup(Name.fromString(name1 + "$")); } diff --git a/sources/scalac/symtab/classfile/AttributeParser.java b/sources/scalac/symtab/classfile/AttributeParser.java index c0b2444737..ccd802dfd6 100644 --- a/sources/scalac/symtab/classfile/AttributeParser.java +++ b/sources/scalac/symtab/classfile/AttributeParser.java @@ -343,7 +343,7 @@ public class AttributeParser implements ClassfileConstants { nextToken(); if (s != Symbol.NONE) return s.type(); - Type clazztype = parser.make.classType(Name.fromString(name)).unalias(); + Type clazztype = parser.make.classType(name).unalias(); if (token.equals("[")) { Vector types = new Vector(); do { diff --git a/sources/scalac/symtab/classfile/CLRClassParser.java b/sources/scalac/symtab/classfile/CLRClassParser.java index 2914cae6bc..ac5c5ea313 100644 --- a/sources/scalac/symtab/classfile/CLRClassParser.java +++ b/sources/scalac/symtab/classfile/CLRClassParser.java @@ -263,7 +263,7 @@ public class CLRClassParser extends SymbolLoader { protected scalac.symtab.Type getClassType(Type type) { assert type != null; scalac.symtab.Type res = - make.classType(Name.fromString(type.FullName.replace('+', '.'))); + make.classType(type.FullName.replace('+', '.')); if (res == scalac.symtab.Type.ErrorType) global.error("unknown class reference " + type.FullName); return res; diff --git a/sources/scalac/symtab/classfile/CLRPackageParser.java b/sources/scalac/symtab/classfile/CLRPackageParser.java index 05a0c4ca4f..f6578a4aff 100644 --- a/sources/scalac/symtab/classfile/CLRPackageParser.java +++ b/sources/scalac/symtab/classfile/CLRPackageParser.java @@ -244,8 +244,8 @@ public class CLRPackageParser extends SymbolLoader { String n1 = ""; for (Symbol q = p; !q.isRoot(); q = q.owner()) { n1 = NameTransformer.decode(q.name) + "." + n1; - if (q == global.definitions.JAVA_CLASS - || q == global.definitions.SCALA_CLASS) + if (q.module() == global.definitions.JAVA + || q.module() == global.definitions.SCALA) return; } for (int i = 0; i < types.length; i++) { diff --git a/sources/scalac/symtab/classfile/JavaTypeCreator.java b/sources/scalac/symtab/classfile/JavaTypeCreator.java index 4e320cb529..64417a7a8b 100644 --- a/sources/scalac/symtab/classfile/JavaTypeCreator.java +++ b/sources/scalac/symtab/classfile/JavaTypeCreator.java @@ -99,7 +99,7 @@ public class JavaTypeCreator implements JavaTypeFactory { return STRING_TYPE; } - public Type classType(Name classname) { + public Type classType(String classname) { return classType(definitions.getClass(classname)); } diff --git a/sources/scalac/symtab/classfile/JavaTypeFactory.java b/sources/scalac/symtab/classfile/JavaTypeFactory.java index 62ead89e1d..af89fce22b 100644 --- a/sources/scalac/symtab/classfile/JavaTypeFactory.java +++ b/sources/scalac/symtab/classfile/JavaTypeFactory.java @@ -26,7 +26,7 @@ public interface JavaTypeFactory { Type voidType(); Type objectType(); Type stringType(); - Type classType(Name classname); + Type classType(String classname); Type classType(Symbol clasz); Type arrayType(Type elemtpe); Type methodType(Type[] argtpes, Type restpe, Type[] thrown); diff --git a/sources/scalac/util/Name.java b/sources/scalac/util/Name.java index 530a939ae1..96d674e5c4 100644 --- a/sources/scalac/util/Name.java +++ b/sources/scalac/util/Name.java @@ -125,12 +125,6 @@ public final class Name { return string.lastIndexOf(c); } -/** returns the subName starting at position start, excluding position end - */ - public Name subName(int start, int end) { - return fromString(string.substring(start, end)); - } - /** returns the concatenation of this name and n */ public Name append(Name n) { diff --git a/sources/scalac/util/Names.java b/sources/scalac/util/Names.java index b033a7d216..4c7098af3e 100644 --- a/sources/scalac/util/Names.java +++ b/sources/scalac/util/Names.java @@ -19,8 +19,6 @@ public class Names { private static final String SUPER_PREFIX = "super$"; private static final String TUPLE_FIELD_PREFIX = "_"; private static final String TYPE_PREFIX = "type$"; - private static final String scala_Tuple_PREFIX = "scala.Tuple"; - private static final String scala_Function_PREFIX = "scala.Function"; public static Name ALIAS(ClassSymbol clasz) { return Name.fromString(ALIAS_PREFIX + clasz.name).toTypeName(); @@ -65,14 +63,6 @@ public class Names { return Name.fromString(TYPE_PREFIX + sym.name); } - public static Name scala_Tuple(int arity) { - return Name.fromString(scala_Tuple_PREFIX + arity); - } - - public static Name scala_Function(int arity) { - return Name.fromString(scala_Function_PREFIX + arity); - } - public static final Name ERROR = Name.ERROR; public static final Name NOSYMBOL = Name.fromString("<none>"); public static final Name EMPTY = Name.fromString(""); @@ -161,10 +151,6 @@ public class Names { public static final Name isDefinedAt = Name.fromString("isDefinedAt"); public static final Name isEmpty = Name.fromString("isEmpty"); public static final Name java = Name.fromString("java"); - public static final Name java_lang = Name.fromString("java.lang"); - public static final Name java_lang_Object = Name.fromString("java.lang.Object"); - public static final Name java_lang_String = Name.fromString("java.lang.String"); - public static final Name java_lang_Throwable = Name.fromString("java.lang.Throwable"); public static final Name lang = Name.fromString("lang"); public static final Name length = Name.fromString("length"); public static final Name match = Name.fromString("match"); @@ -178,43 +164,6 @@ public class Names { public static final Name runtime = Name.fromString("runtime"); public static final Name scala = Name.fromString("scala"); public static final Name xml = Name.fromString("xml"); - public static final Name scala_COLONCOLON = Name.fromString("scala." + COLONCOLON); - public static final Name scala_All = Name.fromString("scala.All"); - public static final Name scala_AllRef = Name.fromString("scala.AllRef"); - public static final Name scala_Any = Name.fromString("scala.Any"); - public static final Name scala_AnyRef = Name.fromString("scala.AnyRef"); - public static final Name scala_AnyVal = Name.fromString("scala.AnyVal"); - public static final Name scala_Array = Name.fromString("scala.Array"); - public static final Name scala_Boolean = Name.fromString("scala.Boolean"); - public static final Name scala_Byte = Name.fromString("scala.Byte"); - public static final Name scala_Case = Name.fromString("scala.Case"); - public static final Name scala_Char = Name.fromString("scala.Char"); - public static final Name scala_Console = Name.fromString("scala.Console"); - public static final Name scala_Double = Name.fromString("scala.Double"); - public static final Name scala_Float = Name.fromString("scala.Float"); - public static final Name scala_Function = Name.fromString(scala_Function_PREFIX); - public static final Name scala_Int = Name.fromString("scala.Int"); - - public static final Name scala_Iterable = Name.fromString("scala.Iterable"); - public static final Name scala_Iterator = Name.fromString("scala.Iterator"); - public static final Name scala_List = Name.fromString("scala.List"); - public static final Name scala_Long = Name.fromString("scala.Long"); - public static final Name scala_MatchError = Name.fromString("scala.MatchError"); - public static final Name scala_Nil = Name.fromString("scala.Nil"); - public static final Name scala_ScalaObject = Name.fromString("scala.ScalaObject"); - public static final Name scala_PartialFunction = Name.fromString("scala.PartialFunction"); - public static final Name scala_Predef = Name.fromString("scala.Predef"); - public static final Name scala_Ref = Name.fromString("scala.Ref"); - public static final Name scala_Seq = Name.fromString("scala.Seq"); - public static final Name scala_Short = Name.fromString("scala.Short"); - public static final Name scala_Symbol = Name.fromString("scala.Symbol"); - public static final Name scala_Tuple = Name.fromString("scala.Tuple"); - public static final Name scala_Type = Name.fromString("scala.Type"); - public static final Name scala_ConstructedType = Name.fromString("scala.ConstructedType"); - public static final Name scala_SingleType = Name.fromString("scala.SingleType"); - public static final Name scala_Unit = Name.fromString("scala.Unit"); - public static final Name scala_runtime = Name.fromString("scala.runtime"); - public static final Name scala_runtime_RunTime = Name.fromString("scala.runtime.RunTime"); public static final Name synchronized_ = Name.fromString("synchronized"); public static final Name eq = Name.fromString("eq"); public static final Name equals = Name.fromString("equals"); |