Permalink
Browse files

[nomaster] Revert "cosmetic renamings in runtime reflection"

This reverts commit 0429f0f.

This is necessary to maintain binary compatibility with 2.10.0.
  • Loading branch information...
1 parent 9194b37 commit ddfe3a06b0fec24948ddb06fe23b3aa78d78bbe1 @adriaanm adriaanm committed Feb 9, 2013
@@ -28,30 +28,30 @@ filter {
},
# scala.reflect.runtime
- {
- matchName="scala.reflect.runtime.JavaUniverse.createClassModule"
- problemName=MissingMethodProblem
- },
- {
- matchName="scala.reflect.runtime.JavaUniverse.initClassModule"
- problemName=MissingMethodProblem
- },
- {
- matchName="scala.reflect.runtime.SymbolLoaders.createClassModule"
- problemName=MissingMethodProblem
- },
- {
- matchName="scala.reflect.runtime.SymbolLoaders.initClassModule"
- problemName=MissingMethodProblem
- },
- {
- matchName="scala.reflect.runtime.SymbolLoaders.initClassAndModule"
- problemName=MissingMethodProblem
- },
- {
- matchName="scala.reflect.runtime.SymbolLoaders.initAndEnterClassAndModule"
- problemName=MissingMethodProblem
- },
+ # {
+ # matchName="scala.reflect.runtime.JavaUniverse.createClassModule"
+ # problemName=MissingMethodProblem
+ # },
+ # {
+ # matchName="scala.reflect.runtime.JavaUniverse.initClassModule"
+ # problemName=MissingMethodProblem
+ # },
+ # {
+ # matchName="scala.reflect.runtime.SymbolLoaders.createClassModule"
+ # problemName=MissingMethodProblem
+ # },
+ # {
+ # matchName="scala.reflect.runtime.SymbolLoaders.initClassModule"
+ # problemName=MissingMethodProblem
+ # },
+ # {
+ # matchName="scala.reflect.runtime.SymbolLoaders.initClassAndModule"
+ # problemName=MissingMethodProblem
+ # },
+ # {
+ # matchName="scala.reflect.runtime.SymbolLoaders.initAndEnterClassAndModule"
+ # problemName=MissingMethodProblem
+ # },
{
matchName="scala.reflect.runtime.JavaMirrors#JavaMirror.scala$reflect$runtime$JavaMirrors$JavaMirror$$jclassAsScala"
problemName=MissingMethodProblem
@@ -69,34 +69,34 @@ filter {
matchName="scala.reflect.runtime.JavaMirrors#JavaMirror.scala$reflect$runtime$JavaMirrors$JavaMirror$$jclassAsScala1"
problemName=MissingMethodProblem
},
- {
- matchName="scala.reflect.runtime.SymbolLoaders.initClassAndModule"
- problemName=MissingMethodProblem
- },
- {
- matchName="scala.reflect.runtime.SymbolLoaders.initAndEnterClassAndModule"
- problemName=MissingMethodProblem
- },
- {
- matchName="scala.reflect.runtime.SymbolLoaders.createClassModule"
- problemName=MissingMethodProblem
- },
- {
- matchName="scala.reflect.runtime.SymbolLoaders.initClassModule"
- problemName=MissingMethodProblem
- },
+ # {
+ # matchName="scala.reflect.runtime.SymbolLoaders.initClassAndModule"
+ # problemName=MissingMethodProblem
+ # },
+ # {
+ # matchName="scala.reflect.runtime.SymbolLoaders.initAndEnterClassAndModule"
+ # problemName=MissingMethodProblem
+ # },
+ # {
+ # matchName="scala.reflect.runtime.SymbolLoaders.createClassModule"
+ # problemName=MissingMethodProblem
+ # },
+ # {
+ # matchName="scala.reflect.runtime.SymbolLoaders.initClassModule"
+ # problemName=MissingMethodProblem
+ # },
{
matchName="scala.reflect.runtime.JavaUniverse"
problemName=MissingTypesProblem
},
- {
- matchName="scala.reflect.runtime.JavaUniverse.initClassAndModule"
- problemName=MissingMethodProblem
- },
- {
- matchName="scala.reflect.runtime.JavaUniverse.initAndEnterClassAndModule"
- problemName=MissingMethodProblem
- },
+ # {
+ # matchName="scala.reflect.runtime.JavaUniverse.initClassAndModule"
+ # problemName=MissingMethodProblem
+ # },
+ # {
+ # matchName="scala.reflect.runtime.JavaUniverse.initAndEnterClassAndModule"
+ # problemName=MissingMethodProblem
+ # },
# scala.reflect.internal
{
@@ -574,7 +574,7 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni
case None =>
// class does not have a Scala signature; it's a Java class
info("translating reflection info for Java " + jclazz) //debug
- initClassAndModule(clazz, module, new FromJavaClassCompleter(clazz, module, jclazz))
+ initClassModule(clazz, module, new FromJavaClassCompleter(clazz, module, jclazz))
}
}
} catch {
@@ -1053,7 +1053,7 @@ private[reflect] trait JavaMirrors extends internal.SymbolTable with api.JavaUni
val owner = sOwner(jclazz)
val name = scalaSimpleName(jclazz)
val completer = (clazz: Symbol, module: Symbol) => new FromJavaClassCompleter(clazz, module, jclazz)
- initAndEnterClassAndModule(owner, name, completer)._1
+ createClassModule(owner, name, completer) match { case (clazz, module) => clazz }
}
/**
@@ -57,7 +57,7 @@ private[reflect] trait SymbolLoaders { self: SymbolTable =>
* @param name The simple name of the newly created class
* @param completer The completer to be used to set the info of the class and the module
*/
- protected def initAndEnterClassAndModule(owner: Symbol, name: TypeName, completer: (Symbol, Symbol) => LazyType) = {
+ protected def createClassModule(owner: Symbol, name: TypeName, completer: (Symbol, Symbol) => LazyType) = {
assert(!(name.toString endsWith "[]"), name)
val clazz = owner.newClass(name)
val module = owner.newModule(name.toTermName)
@@ -67,15 +67,15 @@ private[reflect] trait SymbolLoaders { self: SymbolTable =>
owner.info.decls enter clazz
owner.info.decls enter module
}
- initClassAndModule(clazz, module, completer(clazz, module))
+ initClassModule(clazz, module, completer(clazz, module))
(clazz, module)
}
protected def setAllInfos(clazz: Symbol, module: Symbol, info: Type) = {
List(clazz, module, module.moduleClass) foreach (_ setInfo info)
}
- protected def initClassAndModule(clazz: Symbol, module: Symbol, completer: LazyType) =
+ protected def initClassModule(clazz: Symbol, module: Symbol, completer: LazyType) =
setAllInfos(clazz, module, completer)
/** The type completer for packages.
@@ -118,7 +118,7 @@ private[reflect] trait SymbolLoaders { self: SymbolTable =>
val loadingMirror = currentMirror.mirrorDefining(cls)
val (clazz, module) =
if (loadingMirror eq currentMirror) {
- initAndEnterClassAndModule(pkgClass, name.toTypeName, new TopClassCompleter(_, _))
+ createClassModule(pkgClass, name.toTypeName, new TopClassCompleter(_, _))
} else {
val origOwner = loadingMirror.packageNameToScala(pkgClass.fullName)
val clazz = origOwner.info decl name.toTypeName

0 comments on commit ddfe3a0

Please sign in to comment.