miscellaneous cleanup

Author: xeno-by

src/compiler/scala/tools/nsc/typechecker/Macros.scala

@@ -1221,7 +1221,10 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces {
             case ex: Throwable =>
               None
           }
-        } getOrElse realex.getMessage
+        } getOrElse {
+          val msg = realex.getMessage
+          if (msg != null) msg else realex.getClass.getName
+        }
         fail(typer, expandee, msg = "exception during macro expansion: " + message)
     }
   }

src/compiler/scala/tools/reflect/ToolBoxFactory.scala

@@ -216,7 +216,7 @@ abstract class ToolBoxFactory[U <: JavaUniverse](val u: U) { factorySelf =>
         (singleton, jmeth)
       }
 
-      def runExpr(expr: Tree, freeTypes: Map[TypeName, Type] = Map[TypeName, Type]()): Any = {
+      def runExpr(expr: Tree): Any = {
         val freeTerms = expr.freeTerms // need to calculate them here, because later on they will be erased
         val thunks = freeTerms map (fte => () => fte.value) // need to be lazy in order not to distort evaluation order
 

src/library/scala/reflect/base/Base.scala

@@ -96,8 +96,8 @@ class Base extends Universe { self =>
   class Type extends TypeBase { def typeSymbol: Symbol = NoSymbol }
   implicit val TypeTagg = ClassTag[Type](classOf[Type])
 
-  val NoType = new Type
-  val NoPrefix = new Type
+  val NoType = new Type { override def toString = "NoType" }
+  val NoPrefix = new Type { override def toString = "NoPrefix" }
 
   class SingletonType extends Type
   implicit val SingletonTypeTag = ClassTag[SingletonType](classOf[SingletonType])