accommodates pull request feedback

1 files changed, 23 insertions, 23 deletions

diff --git a/src/reflect/scala/reflect/runtime/JavaMirrors.scala b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
index 6abd40abc6..f4b68640ae 100644
--- a/src/reflect/scala/reflect/runtime/JavaMirrors.scala
+++ b/src/reflect/scala/reflect/runtime/JavaMirrors.scala
@@ -120,19 +120,19 @@ trait JavaMirrors extends internal.SymbolTable with api.JavaUniverse { self: Sym
 
 // ----------- Implementations of mirror operations and classes  -------------------
 
-    private def ErrorInnerClass(wannabe: Symbol) = throw new ScalaReflectionException(s"$wannabe is an inner class, use reflectClass on an InstanceMirror to obtain its ClassMirror")
-    private def ErrorInnerModule(wannabe: Symbol) = throw new ScalaReflectionException(s"$wannabe is an inner module, use reflectModule on an InstanceMirror to obtain its ModuleMirror")
-    private def ErrorStaticClass(wannabe: Symbol) = throw new ScalaReflectionException(s"$wannabe is a static class, use reflectClass on a RuntimeMirror to obtain its ClassMirror")
-    private def ErrorStaticModule(wannabe: Symbol) = throw new ScalaReflectionException(s"$wannabe is a static module, use reflectModule on a RuntimeMirror to obtain its ModuleMirror")
-    private def ErrorNotMember(wannabe: Symbol, owner: Symbol) = throw new ScalaReflectionException(s"expected a member of $owner, you provided ${wannabe.kindString} ${wannabe.fullName}")
-    private def ErrorNotField(wannabe: Symbol) = throw new ScalaReflectionException(s"expected a field or an accessor method symbol, you provided $wannabe")
-    private def ErrorNonExistentField(wannabe: Symbol) = throw new ScalaReflectionException(s"""
-      |Scala field ${wannabe.name} isn't represented as a Java field, neither it has a Java accessor method
+    private def ErrorInnerClass(sym: Symbol) = throw new ScalaReflectionException(s"$sym is an inner class, use reflectClass on an InstanceMirror to obtain its ClassMirror")
+    private def ErrorInnerModule(sym: Symbol) = throw new ScalaReflectionException(s"$sym is an inner module, use reflectModule on an InstanceMirror to obtain its ModuleMirror")
+    private def ErrorStaticClass(sym: Symbol) = throw new ScalaReflectionException(s"$sym is a static class, use reflectClass on a RuntimeMirror to obtain its ClassMirror")
+    private def ErrorStaticModule(sym: Symbol) = throw new ScalaReflectionException(s"$sym is a static module, use reflectModule on a RuntimeMirror to obtain its ModuleMirror")
+    private def ErrorNotMember(sym: Symbol, owner: Symbol) = throw new ScalaReflectionException(s"expected a member of $owner, you provided ${sym.kindString} ${sym.fullName}")
+    private def ErrorNotField(sym: Symbol) = throw new ScalaReflectionException(s"expected a field or an accessor method symbol, you provided $sym")
+    private def ErrorNonExistentField(sym: Symbol) = throw new ScalaReflectionException(s"""
+      |Scala field ${sym.name} isn't represented as a Java field, neither it has a Java accessor method
       |note that private parameters of class constructors don't get mapped onto fields and/or accessors,
       |unless they are used outside of their declaring constructors.
     """.trim.stripMargin)
-    private def ErrorSetImmutableField(wannabe: Symbol) = throw new ScalaReflectionException(s"cannot set an immutable field ${wannabe.name}")
-    private def ErrorNotConstructor(wannabe: Symbol, owner: Symbol) = throw new ScalaReflectionException(s"expected a constructor of $owner, you provided $wannabe")
+    private def ErrorSetImmutableField(sym: Symbol) = throw new ScalaReflectionException(s"cannot set an immutable field ${sym.name}")
+    private def ErrorNotConstructor(sym: Symbol, owner: Symbol) = throw new ScalaReflectionException(s"expected a constructor of $owner, you provided $sym")
     private def ErrorFree(member: Symbol, freeType: Symbol) = throw new ScalaReflectionException(s"cannot reflect ${member.kindString} ${member.name}, because it's a member of a weak type ${freeType.name}")
 
     def reflect[T: ClassTag](obj: T): InstanceMirror = new JavaInstanceMirror(obj)
@@ -155,30 +155,30 @@ trait JavaMirrors extends internal.SymbolTable with api.JavaUniverse { self: Sym
 
     def moduleSymbol(rtcls: RuntimeClass): ModuleSymbol = classToScala(rtcls).companionModule.asModule
 
-    private def ensuringNotFree(wannabe: Symbol)(body: => Any) {
-      val freeType = wannabe.ownerChain find (_.isFreeType)
+    private def ensuringNotFree(sym: Symbol)(body: => Any) {
+      val freeType = sym.ownerChain find (_.isFreeType)
       freeType match {
-        case Some(freeType) => ErrorFree(wannabe, freeType)
+        case Some(freeType) => ErrorFree(sym, freeType)
         case _ => body
       }
     }
 
-    private def checkMemberOf(wannabe: Symbol, owner: ClassSymbol) {
-      if (wannabe.owner == AnyClass || wannabe.owner == AnyRefClass || wannabe.owner == ObjectClass) {
+    private def checkMemberOf(sym: Symbol, owner: ClassSymbol) {
+      if (sym.owner == AnyClass || sym.owner == AnyRefClass || sym.owner == ObjectClass) {
         // do nothing
-      } else if (wannabe.owner == AnyValClass) {
-        if (!owner.isPrimitiveValueClass && !owner.isDerivedValueClass) ErrorNotMember(wannabe, owner)
+      } else if (sym.owner == AnyValClass) {
+        if (!owner.isPrimitiveValueClass && !owner.isDerivedValueClass) ErrorNotMember(sym, owner)
       } else {
-        ensuringNotFree(wannabe) {
-          if (!(owner.info.baseClasses contains wannabe.owner)) ErrorNotMember(wannabe, owner)
+        ensuringNotFree(sym) {
+          if (!(owner.info.baseClasses contains sym.owner)) ErrorNotMember(sym, owner)
         }
       }
     }
 
-    private def checkConstructorOf(wannabe: Symbol, owner: ClassSymbol) {
-      if (!wannabe.isClassConstructor) ErrorNotConstructor(wannabe, owner)
-      ensuringNotFree(wannabe) {
-        if (!owner.info.decls.toList.contains(wannabe)) ErrorNotConstructor(wannabe, owner)
+    private def checkConstructorOf(sym: Symbol, owner: ClassSymbol) {
+      if (!sym.isClassConstructor) ErrorNotConstructor(sym, owner)
+      ensuringNotFree(sym) {
+        if (!owner.info.decls.toList.contains(sym)) ErrorNotConstructor(sym, owner)
       }
     }