diff options
author | Martin Odersky <odersky@gmail.com> | 2016-11-09 18:55:28 +0100 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2016-12-01 13:55:12 +0100 |
commit | 34690395dd86c9e31eb38f73df35a5ebaf3b2c80 (patch) | |
tree | 6eeee5cf20dde2ff1bfd9e988db94838d2894b6f /compiler/src | |
parent | f1151d658ade02d6e838ab11d9d9700a89762558 (diff) | |
download | dotty-34690395dd86c9e31eb38f73df35a5ebaf3b2c80.tar.gz dotty-34690395dd86c9e31eb38f73df35a5ebaf3b2c80.tar.bz2 dotty-34690395dd86c9e31eb38f73df35a5ebaf3b2c80.zip |
Clean up imports
Honor the new scheme where any explicit import of a
root import will disable the root import.
Diffstat (limited to 'compiler/src')
5 files changed, 7 insertions, 9 deletions
diff --git a/compiler/src/dotty/tools/dotc/ast/Trees.scala b/compiler/src/dotty/tools/dotc/ast/Trees.scala index 2801bcae2..c4b2b2122 100644 --- a/compiler/src/dotty/tools/dotc/ast/Trees.scala +++ b/compiler/src/dotty/tools/dotc/ast/Trees.scala @@ -32,7 +32,7 @@ object Trees { /** Property key for trees with documentation strings attached */ val DocComment = new Property.Key[Comment] - @sharable private var nextId = 0 // for debugging + @sharable private var nextId = 0 // for debugging type LazyTree = AnyRef /* really: Tree | Lazy[Tree] */ type LazyTreeList = AnyRef /* really: List[Tree] | Lazy[List[Tree]] */ diff --git a/compiler/src/dotty/tools/dotc/repl/CompilingInterpreter.scala b/compiler/src/dotty/tools/dotc/repl/CompilingInterpreter.scala index f269fef64..d849ea370 100644 --- a/compiler/src/dotty/tools/dotc/repl/CompilingInterpreter.scala +++ b/compiler/src/dotty/tools/dotc/repl/CompilingInterpreter.scala @@ -6,7 +6,7 @@ import java.io.{ File, PrintWriter, PrintStream, StringWriter, Writer, OutputStream, ByteArrayOutputStream => ByteOutputStream } -import java.lang.{Class, ClassLoader} +import java.lang.{Class, ClassLoader, Thread, System, StringBuffer} import java.net.{URL, URLClassLoader} import scala.collection.immutable.ListSet diff --git a/compiler/src/dotty/tools/dotc/repl/InterpreterLoop.scala b/compiler/src/dotty/tools/dotc/repl/InterpreterLoop.scala index b3ac41c55..cfe8d892d 100644 --- a/compiler/src/dotty/tools/dotc/repl/InterpreterLoop.scala +++ b/compiler/src/dotty/tools/dotc/repl/InterpreterLoop.scala @@ -4,7 +4,7 @@ package repl import java.io.{BufferedReader, File, FileReader, PrintWriter} import java.io.IOException -import java.lang.{ClassLoader, System} +import java.lang.{ClassLoader, System, Thread} import scala.concurrent.{Future, Await} import scala.concurrent.duration.Duration import reporting.Reporter diff --git a/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala b/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala index 714255962..331fce46a 100644 --- a/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala +++ b/compiler/src/dotty/tools/dotc/transform/CollectEntryPoints.scala @@ -9,7 +9,6 @@ import dotty.tools.dotc.core.Symbols.NoSymbol import scala.annotation.tailrec import dotty.tools.dotc.core._ import Symbols._ -import scala.Some import dotty.tools.dotc.transform.TreeTransforms.{NXTransformations, TransformerInfo, TreeTransform, TreeTransformer} import dotty.tools.dotc.ast.tpd import dotty.tools.dotc.core.Contexts.Context diff --git a/compiler/src/dotty/tools/dotc/util/Chars.scala b/compiler/src/dotty/tools/dotc/util/Chars.scala index bae3b4732..6f95b87c4 100644 --- a/compiler/src/dotty/tools/dotc/util/Chars.scala +++ b/compiler/src/dotty/tools/dotc/util/Chars.scala @@ -6,7 +6,6 @@ package dotty.tools.dotc package util import scala.annotation.switch -import java.lang.{ Character => JCharacter } import java.lang.{Character => JCharacter} import java.lang.Character.LETTER_NUMBER import java.lang.Character.LOWERCASE_LETTER @@ -66,16 +65,16 @@ object Chars { /** Can character start an alphanumeric Scala identifier? */ def isIdentifierStart(c: Char): Boolean = - (c == '_') || (c == '$') || Character.isUnicodeIdentifierStart(c) + (c == '_') || (c == '$') || JCharacter.isUnicodeIdentifierStart(c) /** Can character form part of an alphanumeric Scala identifier? */ def isIdentifierPart(c: Char) = - (c == '$') || Character.isUnicodeIdentifierPart(c) + (c == '$') || JCharacter.isUnicodeIdentifierPart(c) /** Is character a math or other symbol in Unicode? */ def isSpecial(c: Char) = { - val chtp = Character.getType(c) - chtp == Character.MATH_SYMBOL.toInt || chtp == Character.OTHER_SYMBOL.toInt + val chtp = JCharacter.getType(c) + chtp == JCharacter.MATH_SYMBOL.toInt || chtp == JCharacter.OTHER_SYMBOL.toInt } private final val otherLetters = Set[Char]('\u0024', '\u005F') // '$' and '_' |