1 files changed, 154 insertions, 2 deletions
diff --git a/src/library/scala/reflect/api/StandardNames.scala b/src/library/scala/reflect/api/StandardNames.scala
index 81517d2a6b..bfc165f613 100644
--- a/src/library/scala/reflect/api/StandardNames.scala
+++ b/src/library/scala/reflect/api/StandardNames.scala
@@ -8,14 +8,166 @@ package api
 
 trait StandardNames { self: Universe =>
 
+  abstract class AbsNames {
+    type NameType <: Name
+
+    val EMPTY: NameType
+    val ANON_FUN_NAME: NameType
+    val ANON_CLASS_NAME: NameType
+    val EMPTY_PACKAGE_NAME: NameType
+    val IMPORT: NameType
+    val MODULE_VAR_SUFFIX: NameType
+    val ROOT: NameType
+    val PACKAGE: NameType
+    val SPECIALIZED_SUFFIX: NameType
+
+    val ERROR: NameType
+    val NO_NAME: NameType
+    val WILDCARD: NameType
+
+    def flattenedName(segments: Name*): NameType
+  }
+
   val nme: AbsTermNames
 
-  abstract class AbsTermNames {
+  abstract class AbsTermNames extends AbsNames {
+    val EXPAND_SEPARATOR_STRING: String
+
+    val ANYNAME: TermName
     val CONSTRUCTOR: TermName
+    val FAKE_LOCAL_THIS: TermName
+    val INITIALIZER: TermName
+    val LAZY_LOCAL: TermName
+    val LOCAL_SUFFIX_STRING: String
+    val MIRROR_PREFIX: TermName
+    val MIRROR_SHORT: TermName
+    val MIRROR_FREE_PREFIX: TermName
+    val MIRROR_FREE_THIS_SUFFIX: TermName
+    val MIRROR_FREE_VALUE_SUFFIX: TermName
+    val MIXIN_CONSTRUCTOR: TermName
+    val MODULE_INSTANCE_FIELD: TermName
+    val OUTER: TermName
+    val OUTER_LOCAL: TermName
+    val OUTER_SYNTH: TermName
+    val SELECTOR_DUMMY: TermName
+    val SELF: TermName
+    val SPECIALIZED_INSTANCE: TermName
+    val STAR: TermName
+    val THIS: TermName
+
+    val BITMAP_NORMAL: TermName
+    val BITMAP_TRANSIENT: TermName
+    val BITMAP_PRIVATE: TermName
+    val BITMAP_CHECKINIT: TermName
+    val BITMAP_CHECKINIT_TRANSIENT: TermName
+
+    val INTERPRETER_IMPORT_WRAPPER: String
+    val INTERPRETER_LINE_PREFIX: String
+    val INTERPRETER_VAR_PREFIX: String
+    val INTERPRETER_WRAPPER_SUFFIX: String
+
+    val ROOTPKG: TermName
+
+    val ADD: TermName
+    val AND: TermName
+    val ASR: TermName
+    val DIV: TermName
+    val EQ: TermName
+    val EQL: TermName
+    val GE: TermName
+    val GT: TermName
+    val HASHHASH: TermName
+    val LE: TermName
+    val LSL: TermName
+    val LSR: TermName
+    val LT: TermName
+    val MINUS: TermName
+    val MOD: TermName
+    val MUL: TermName
+    val NE: TermName
+    val OR: TermName
+    val PLUS : TermName
+    val SUB: TermName
+    val XOR: TermName
+    val ZAND: TermName
+    val ZOR: TermName
+
+    // [Eugene] this doesn't compile. why?!
+//    val UNARY_~: TermName
+//    val UNARY_+: TermName
+//    val UNARY_-: TermName
+//    val UNARY_!: TermName
+    val UNARY_TILDE: TermName
+    val UNARY_PLUS: TermName
+    val UNARY_MINUS: TermName
+    val UNARY_NOT: TermName
+
+    // [Eugene] this doesn't compile. why?!
+//    val ???: TermName
+    val QQQ: TermName
+
+    val MODULE_SUFFIX_NAME: TermName
+    val NAME_JOIN_NAME: TermName
+    val IMPL_CLASS_SUFFIX: String
+    val LOCALDUMMY_PREFIX: String
+    val PROTECTED_PREFIX: String
+    val PROTECTED_SET_PREFIX: String
+    val SINGLETON_SUFFIX: String
+    val SUPER_PREFIX_STRING: String
+    val TRAIT_SETTER_SEPARATOR_STRING: String
+    val SETTER_SUFFIX: TermName
+
+    def isConstructorName(name: Name): Boolean
+    def isExceptionResultName(name: Name): Boolean
+    def isImplClassName(name: Name): Boolean
+    def isLocalDummyName(name: Name): Boolean
+    def isLocalName(name: Name): Boolean
+    def isLoopHeaderLabel(name: Name): Boolean
+    def isProtectedAccessorName(name: Name): Boolean
+    def isSuperAccessorName(name: Name): Boolean
+    def isReplWrapperName(name: Name): Boolean
+    def isSetterName(name: Name): Boolean
+    def isTraitSetterName(name: Name): Boolean
+    def isSingletonName(name: Name): Boolean
+    def isModuleName(name: Name): Boolean
+    def isOpAssignmentName(name: Name): Boolean
+
+    def segments(name: String, assumeTerm: Boolean): List[Name]
+    def originalName(name: Name): Name
+    def stripModuleSuffix(name: Name): Name
+    def unspecializedName(name: Name): Name
+    def splitSpecializedName(name: Name): (Name, String, String)
+    def dropLocalSuffix(name: Name): Name
+
+    def expandedName(name: TermName, base: Symbol, separator: String = EXPAND_SEPARATOR_STRING): TermName
+    def expandedSetterName(name: TermName, base: Symbol): TermName
+    def protName(name: Name): TermName
+    def protSetterName(name: Name): TermName
+    def getterName(name: TermName): TermName
+    def getterToLocal(name: TermName): TermName
+    def getterToSetter(name: TermName): TermName
+    def localToGetter(name: TermName): TermName
+    def setterToGetter(name: TermName): TermName
+    def defaultGetterName(name: Name, pos: Int): TermName
+    def defaultGetterToMethod(name: Name): TermName
+
+    def dropSingletonName(name: Name): TypeName
+    def singletonName(name: Name): TypeName
+    def implClassName(name: Name): TypeName
+    def interfaceName(implname: Name): TypeName
+    def localDummyName(clazz: Symbol): TermName
+    def superName(name: Name): TermName
   }
 
   val tpnme: AbsTypeNames
 
-  abstract class AbsTypeNames {
+  abstract class AbsTypeNames extends AbsNames {
+    val REFINE_CLASS_NAME: TypeName
+    val BYNAME_PARAM_CLASS_NAME: TypeName
+    val EQUALS_PATTERN_NAME: TypeName
+    val JAVA_REPEATED_PARAM_CLASS_NAME: TypeName
+    val LOCAL_CHILD: TypeName
+    val REPEATED_PARAM_CLASS_NAME: TypeName
+    val WILDCARD_STAR: TypeName
   }
 }