summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-05-13 14:14:03 +0000
committerPaul Phillips <paulp@improving.org>2009-05-13 14:14:03 +0000
commit62d0a710573fa6bf0d7fcac30c9df1a8b843b3d1 (patch)
treedf65111bf6d09a3f2912e87175f1e5d0cfa40854
parent0df17b5003ef3d2546e2e87b926e287cd9723fff (diff)
downloadscala-62d0a710573fa6bf0d7fcac30c9df1a8b843b3d1.tar.gz
scala-62d0a710573fa6bf0d7fcac30c9df1a8b843b3d1.tar.bz2
scala-62d0a710573fa6bf0d7fcac30c9df1a8b843b3d1.zip
Removed what I believe to be accumulated cruft ...
Removed what I believe to be accumulated cruft from StdNames, names which are of questionable standardness since they're not referenced anywhere within trunk. I am not quite sure how to check whether any other branches are depending on these in some way, so I ask forgiveness if your cool experimental branch can no longer find nme.that1 or some such.
-rw-r--r--src/compiler/scala/tools/nsc/symtab/StdNames.scala45
1 files changed, 1 insertions, 44 deletions
diff --git a/src/compiler/scala/tools/nsc/symtab/StdNames.scala b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
index 0dad1e3923..57bc1060a9 100644
--- a/src/compiler/scala/tools/nsc/symtab/StdNames.scala
+++ b/src/compiler/scala/tools/nsc/symtab/StdNames.scala
@@ -90,7 +90,6 @@ trait StdNames {
val IMPL_CLASS_SUFFIX = newTermName("$class")
val MODULE_SUFFIX = newTermName("$module")
val LOCALDUMMY_PREFIX = newTermName(LOCALDUMMY_PREFIX_STRING)
- val THIS_SUFFIX = newTermName(".this")
val SELECTOR_DUMMY = newTermName("<unapply-selector>")
val MODULE_INSTANCE_FIELD = newTermName("MODULE$")
@@ -178,7 +177,6 @@ trait StdNames {
def bitmapName(n: Int): Name = newTermName("bitmap$" + n)
val ERROR = newTermName("<error>")
- val ERRORtype = newTypeName("<error>")
val LOCALCHILD = newTypeName("<local child>")
val NOSYMBOL = newTermName("<none>")
@@ -186,21 +184,14 @@ trait StdNames {
val ANYNAME = newTermName("<anyname>")
val WILDCARD = newTermName("_")
val WILDCARD_STAR = newTermName("_*")
- val COMPOUND_NAME = newTermName("<ct>")
val ANON_CLASS_NAME = newTermName("$anon")
- val ANON_CLASS_NAME_tn = ANON_CLASS_NAME.toTypeName
val ANON_FUN_NAME = newTermName("$anonfun")
- val ANON_FUN_NAME_tn = ANON_FUN_NAME.toTypeName
val REFINE_CLASS_NAME = newTermName("<refinement>")
- val REFINE_CLASS_NAME_tn = REFINE_CLASS_NAME.toTypeName
val EMPTY_PACKAGE_NAME = newTermName("<empty>")
- val EMPTY_PACKAGE_NAME_tn = EMPTY_PACKAGE_NAME.toTypeName
val IMPORT = newTermName("<import>")
- val ZERO = newTermName("<zero>")
val STAR = newTermName("*")
val ROOT = newTermName("<root>")
- val ROOT_tn = ROOT.toTypeName
val ROOTPKG = newTermName("_root_")
val REPEATED_PARAM_CLASS_NAME = newTermName("<repeated>")
val BYNAME_PARAM_CLASS_NAME = newTermName("<byname>")
@@ -232,24 +223,21 @@ trait StdNames {
val AnyVal = newTermName("AnyVal")
val AnyRef = newTermName("AnyRef")
val Array = newTermName("Array")
+ val Boolean = newTermName("Boolean")
val Byte = newTermName("Byte")
val Catch = newTermName("Catch")
val Char = newTermName("Char")
- val Boolean = newTermName("Boolean")
val Do = newTermName("Do")
val Double = newTermName("Double")
- val Element = newTermName("Element")
val Finally = newTermName("Finally")
val Float = newTermName("Float")
val Function = newTermName("Function")
val Function1 = newTermName("Function1")
val Int = newTermName("Int")
- val Labelled = newTermName("Labelled")
val Long = newTermName("Long")
val Nil = newTermName("Nil")
val Object = newTermName("Object")
val PartialFunction = newTermName("PartialFunction")
- val PolyMethodCache = newTermName("PolyMethodCache")
val Predef = newTermName("Predef")
val Product = newTermName("Product")
def Product_(i:Int) = newTermName("_" + i)
@@ -259,43 +247,30 @@ trait StdNames {
val Short = newTermName("Short")
val Singleton = newTermName("Singleton")
val Some = newTermName("Some")
- val SourceFile = newTermName("SourceFile")
val String = newTermName("String")
val Symbol = newTermName("Symbol")
- val Synthetic = newTermName("Synthetic")
val System = newTermName("System")
- val Text = newTermName("Text")
val Throwable = newTermName("Throwable")
val Try = newTermName("Try")
val Tuple = newTermName("Tuple")
- val Type = newTermName("Type")
val Tuple2 = newTermName("Tuple2")
val Unit = newTermName("Unit")
- val While = newTermName("While")
val apply = newTermName("apply")
- val array = newTermName("array")
val arrayValue = newTermName("arrayValue")
val arraycopy = newTermName("arraycopy")
val assert_ = newTermName("assert")
val assume_ = newTermName("assume")
val asInstanceOf_ = newTermName("asInstanceOf")
val asInstanceOfErased = newTermName("asInstanceOf$erased")
- val bind = newTermName("bind")
- val booleanValue = newTermName("booleanValue")
val box = newTermName("box")
val boxArray = newTermName("boxArray")
val forceBoxedArray = newTermName("forceBoxedArray")
val checkInitialized = newTermName("checkInitialized")
val classOf = newTermName("classOf")
- val coerce = newTermName("coerce")
- val defaultValue = newTermName("defaultValue")
- val detach = newTermName("detach")
val dottype = newTermName(".type")
val drop = newTermName("drop")
- val dummy = newTermName("$dummy")
val elem = newTermName("elem")
- val elements = newTermName("elements")
val eq = newTermName("eq")
val equals_ = newTermName("equals")
val _equals = newTermName("_equals")
@@ -303,7 +278,6 @@ trait StdNames {
val error = newTermName("error")
val ex = newTermName("ex")
val add_ = newTermName("add")
- val fail = newTermName("fail")
val false_ = newTermName("false")
val filter = newTermName("filter")
val finalize_ = newTermName("finalize")
@@ -315,12 +289,10 @@ trait StdNames {
val getCause = newTermName("getCause")
val getClass_ = newTermName("getClass")
val getMethod_ = newTermName("getMethod")
- val hasAsInstance = newTermName("hasAsInstance")
val hashCode_ = newTermName("hashCode")
val hasNext = newTermName("hasNext")
val head = newTermName("head")
val identity = newTermName("identity")
- val intern = newTermName("intern")
val invoke_ = newTermName("invoke")
val isInstanceOf_ = newTermName("isInstanceOf")
val isInstanceOfErased = newTermName("isInstanceOf$erased")
@@ -334,50 +306,36 @@ trait StdNames {
val main = newTermName("main")
val map = newTermName("map")
val Mutable = newTypeName("Mutable")
- val n = newTermName("n")
val ne = newTermName("ne")
- val nobinding = newTermName("nobinding")
val next = newTermName("next")
- val newArray = newTermName("newArray")
val notify_ = newTermName("notify")
val notifyAll_ = newTermName("notifyAll")
val null_ = newTermName("null")
- val predef = newTermName("predef")
val print = newTermName("print")
val productArity = newTermName("productArity")
val productElement = newTermName("productElement")
val productPrefix = newTermName("productPrefix")
val readResolve = newTermName("readResolve")
- val receive = newTermName("receive")
- val report = newTermName("report")
- val runtime = newTermName("runtime")
val sameElements = newTermName("sameElements")
val scala_ = newTermName("scala")
- val scala_tn = scala_.toTypeName
val self = newTermName("self")
val synchronized_ = newTermName("synchronized")
- val tag = newTermName("$tag")
val tail = newTermName("tail")
val toList = newTermName("toList")
val toSeq = newTermName("toSeq")
val toString_ = newTermName("toString")
val clone_ = newTermName("clone")
- val that = newTermName("that")
- val that1 = newTermName("that1")
val this_ = newTermName("this")
val throw_ = newTermName("throw")
val true_ = newTermName("true")
val unapply = newTermName("unapply")
val unapplySeq = newTermName("unapplySeq")
- val unbind = newTermName("unbind")
val unbox = newTermName("unbox")
- val unreferenced = newTermName("unreferenced")
val update = newTermName("update")
val value = newTermName("value")
val view_ = newTermName("view")
val wait_ = newTermName("wait")
val withDims = newTermName("withDims")
- val xml = newTermName("xml")
val zip = newTermName("zip")
val ZAND = encode("&&")
@@ -434,7 +392,6 @@ trait StdNames {
val JacoMetaATTR = newTermName("JacoMeta")
val SignatureATTR = newTermName("Signature")
val ScalaSignatureATTR = newTermName("ScalaSig")
- val JavaInterfaceATTR = newTermName("JacoInterface")
val AnnotationDefaultATTR = newTermName("AnnotationDefault")
val RuntimeAnnotationATTR = newTermName("RuntimeVisibleAnnotations")
val ClassfileAnnotationATTR = newTermName("RuntimeInvisibleAnnotations")