Merge pull request #2062 from dotty-staging/fix/scala-reflect-dep

Remove most uses of scala-reflect jar

Author: smarter

compiler/src/dotty/tools/FatalError.scala

@@ -0,0 +1,3 @@
+package dotty.tools
+
+case class FatalError(msg: String) extends Exception(msg)

compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala

@@ -15,7 +15,6 @@ import java.io.{File => JFile}
 import scala.collection.generic.Clearable
 import scala.collection.mutable
 import scala.reflect.ClassTag
-import scala.reflect.internal.util.WeakHashSet
 import scala.reflect.io.{Directory, PlainDirectory, AbstractFile}
 import scala.tools.asm.{ClassVisitor, FieldVisitor, MethodVisitor}
 import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}

compiler/src/dotty/tools/backend/jvm/LabelDefs.scala

@@ -16,7 +16,6 @@ import scala.collection.generic.Clearable
 import scala.collection.mutable
 import scala.collection.mutable.{ListBuffer, ArrayBuffer}
 import scala.reflect.ClassTag
-import scala.reflect.internal.util.WeakHashSet
 import scala.reflect.io.{Directory, PlainDirectory, AbstractFile}
 import scala.tools.asm.{ClassVisitor, FieldVisitor, MethodVisitor}
 import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}

compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

@@ -31,11 +31,16 @@ trait TreeInfo[T >: Untyped <: Type] { self: Trees.Instance[T] =>
    *   Does tree contain an initialization part when seen as a member of a class or trait?
    */
   def defKind(tree: Tree): FlagSet = unsplice(tree) match {
-    case EmptyTree | _: Import => NoInitsInterface
-    case tree: TypeDef => if (tree.isClassDef) NoInits else NoInitsInterface
-    case tree: DefDef => if (tree.unforcedRhs == EmptyTree) NoInitsInterface else NoInits
-    case tree: ValDef => if (tree.unforcedRhs == EmptyTree) NoInitsInterface else EmptyFlags
-    case _ => EmptyFlags
+    case EmptyTree | _: Import =>
+      NoInitsInterface
+    case tree: TypeDef =>
+      if (tree.isClassDef) NoInits else NoInitsInterface
+    case tree: DefDef =>
+      if (tree.unforcedRhs == EmptyTree && tree.vparamss.forall(_.forall(_.unforcedRhs == EmptyTree))) NoInitsInterface else NoInits
+    case tree: ValDef =>
+      if (tree.unforcedRhs == EmptyTree) NoInitsInterface else EmptyFlags
+    case _ =>
+      EmptyFlags
   }
 
   def isOpAssign(tree: Tree) = unsplice(tree) match {

compiler/src/dotty/tools/dotc/config/Settings.scala

@@ -3,7 +3,6 @@ package config
 
 import collection.mutable.{ ArrayBuffer }
 import scala.util.{ Try, Success, Failure }
-import scala.reflect.internal.util.StringOps
 import reflect.ClassTag
 import core.Contexts._
 // import annotation.unchecked

compiler/src/dotty/tools/dotc/core/Decorators.scala

@@ -15,12 +15,22 @@ import printing.Formatting._
 object Decorators {
 
   /** Turns Strings into PreNames, adding toType/TermName methods */
-  implicit class StringDecorator(val s: String) extends AnyVal with PreName {
+  implicit class PreNamedString(val s: String) extends AnyVal with PreName {
     def toTypeName: TypeName = typeName(s)
     def toTermName: TermName = termName(s)
     def toText(printer: Printer): Text = Str(s)
   }
 
+  implicit class StringDecorator(val s: String) extends AnyVal {
+    def splitWhere(f: Char => Boolean, doDropIndex: Boolean): Option[(String, String)] = {
+      def splitAt(idx: Int, doDropIndex: Boolean): Option[(String, String)] =
+        if (idx == -1) None
+        else Some((s.take(idx), s.drop(if (doDropIndex) idx + 1 else idx)))
+
+      splitAt(s.indexWhere(f), doDropIndex)
+    }
+  }
+
   /** Implements a findSymbol method on iterators of Symbols that
    *  works like find but avoids Option, replacing None with NoSymbol.
    */

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -10,7 +10,6 @@ import scala.collection.{ mutable, immutable }
 import PartialFunction._
 import collection.mutable
 import util.common.alwaysZero
-import scala.reflect.api.{ Universe => ApiUniverse }
 
 object Definitions {
 

compiler/src/dotty/tools/dotc/core/NameOps.scala

@@ -5,7 +5,7 @@ import java.security.MessageDigest
 import scala.annotation.switch
 import scala.io.Codec
 import Names._, StdNames._, Contexts._, Symbols._, Flags._
-import Decorators.StringDecorator
+import Decorators.PreNamedString
 import util.{Chars, NameTransformer}
 import Chars.isOperatorPart
 import Definitions._

compiler/src/dotty/tools/dotc/core/StdNames.scala

@@ -7,7 +7,7 @@ import scala.annotation.switch
 import Names._
 import Symbols._
 import Contexts._
-import Decorators.StringDecorator
+import Decorators.PreNamedString
 import util.NameTransformer
 import scala.collection.breakOut
 

compiler/src/dotty/tools/dotc/core/SymbolLoaders.scala

@@ -12,7 +12,7 @@ import scala.compat.Platform.currentTime
 import dotty.tools.io.{ ClassPath, AbstractFile }
 import Contexts._, Symbols._, Flags._, SymDenotations._, Types._, Scopes._, util.Positions._, Names._
 import StdNames._, NameOps._
-import Decorators.{StringDecorator, StringInterpolators}
+import Decorators.{PreNamedString, StringInterpolators}
 import classfile.ClassfileParser
 import scala.util.control.NonFatal