finish move independent classes

bishabosha · bishabosha · commit baac64b99d57 · 2019-11-25T20:49:00.000+01:00
diff --git a/compiler/src/dotty/tools/backend/jvm/GenBCode.scala b/compiler/src/dotty/tools/backend/jvm/GenBCode.scala
@@ -20,13 +20,13 @@ import Decorators._
 
 import java.io.DataOutputStream
 
+import dotty.tools.tasty.{ TastyBuffer, TastyHeaderUnpickler }
 
 import scala.tools.asm
 import scala.tools.asm.Handle
 import scala.tools.asm.tree._
 import tpd._
 import StdNames._
-import dotty.tools.dotc.core.tasty.{TastyBuffer, TastyHeaderUnpickler}
 import dotty.tools.io._
 
 class GenBCode extends Phase {
diff --git a/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala b/compiler/src/dotty/tools/dotc/core/classfile/ClassfileParser.scala
@@ -3,10 +3,11 @@ package dotc
 package core
 package classfile
 
+import dotty.tools.tasty.{ TastyReader, TastyHeaderUnpickler }
+
 import Contexts._, Symbols._, Types._, Names._, StdNames._, NameOps._, Scopes._, Decorators._
 import SymDenotations._, unpickleScala2.Scala2Unpickler._, Constants._, Annotations._, util.Spans._
 import NameKinds.DefaultGetterName
-import dotty.tools.dotc.core.tasty.{TastyHeaderUnpickler, TastyReader}
 import ast.tpd._
 import java.io.{ ByteArrayInputStream, ByteArrayOutputStream, DataInputStream, IOException }
 
@@ -1183,4 +1184,3 @@ class ClassfileParser(
       throw new RuntimeException("bad constant pool tag " + in.buf(start) + " at byte " + start)
   }
 }
-
diff --git a/compiler/src/dotty/tools/dotc/core/quoted/PickledQuotes.scala b/compiler/src/dotty/tools/dotc/core/quoted/PickledQuotes.scala
@@ -12,11 +12,13 @@ import dotty.tools.dotc.core.Mode
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Types._
 import dotty.tools.dotc.core.tasty.TreePickler.Hole
-import dotty.tools.dotc.core.tasty.{PositionPickler, TastyPickler, TastyPrinter, TastyString}
+import dotty.tools.dotc.core.tasty.{ PositionPickler, TastyPickler, TastyPrinter }
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
 import dotty.tools.dotc.quoted.QuoteContext
 import dotty.tools.dotc.tastyreflect.ReflectionImpl
 
+import dotty.tools.tasty.TastyString
+
 import scala.internal.quoted._
 import scala.reflect.ClassTag
 
diff --git a/compiler/src/dotty/tools/dotc/core/quoted/QuoteUnpickler.scala b/compiler/src/dotty/tools/dotc/core/quoted/QuoteUnpickler.scala
@@ -4,6 +4,8 @@ import dotty.tools.dotc.core.tasty._
 import dotty.tools.dotc.core.tasty.TastyUnpickler.NameTable
 import dotty.tools.dotc.core.tasty.TreeUnpickler.UnpickleMode
 
+import dotty.tools.tasty.TastyReader
+
 object QuoteUnpickler {
   class QuotedTreeSectionUnpickler(posUnpickler: Option[PositionUnpickler], splices: Seq[Any])
     extends DottyUnpickler.TreeSectionUnpickler(posUnpickler, None) {
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/CommentPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/CommentPickler.scala
@@ -1,9 +1,11 @@
 package dotty.tools.dotc.core.tasty
 
 import dotty.tools.dotc.ast.tpd
-import dotty.tools.dotc.core.Comments.{Comment, CommentsContext, ContextDocstrings}
+import dotty.tools.dotc.core.Comments.{ Comment, CommentsContext, ContextDocstrings }
 import dotty.tools.dotc.core.Contexts.Context
-import dotty.tools.dotc.core.tasty.TastyBuffer.{Addr, NoAddr}
+
+import dotty.tools.tasty.TastyBuffer
+import TastyBuffer.{Addr, NoAddr}
 
 import java.nio.charset.Charset
 
@@ -40,4 +42,3 @@ class CommentPickler(pickler: TastyPickler, addrOfTree: tpd.Tree => Addr)(implic
       }
   }
 }
-
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/CommentUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/CommentUnpickler.scala
@@ -1,9 +1,11 @@
 package dotty.tools.dotc.core.tasty
 
 import dotty.tools.dotc.core.Comments.Comment
-import dotty.tools.dotc.core.tasty.TastyBuffer.Addr
 import dotty.tools.dotc.util.Spans.Span
 
+import dotty.tools.tasty.{ TastyReader, TastyBuffer }
+import TastyBuffer.Addr
+
 import scala.collection.mutable.HashMap
 
 import java.nio.charset.Charset
@@ -29,4 +31,3 @@ class CommentUnpickler(reader: TastyReader) {
   def commentAt(addr: Addr): Option[Comment] =
     comments.get(addr)
 }
-
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/DottyUnpickler.scala
@@ -10,6 +10,8 @@ import classfile.ClassfileParser
 import Names.SimpleName
 import TreeUnpickler.UnpickleMode
 
+import dotty.tools.tasty.TastyReader
+
 object DottyUnpickler {
 
   /** Exception thrown if classfile is corrupted */
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala b/compiler/src/dotty/tools/dotc/core/tasty/NameBuffer.scala
@@ -3,11 +3,13 @@ package dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyBuffer
+import TastyBuffer._
+
 import collection.mutable
-import Names.{Name, chrs, SimpleName, DerivedName, TypeName}
+import Names.{ Name, chrs, SimpleName, DerivedName, TypeName }
 import NameKinds._
 import Decorators._
-import TastyBuffer._
 import scala.io.Codec
 
 class NameBuffer extends TastyBuffer(10000) {
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/PositionPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/PositionPickler.scala
@@ -4,6 +4,8 @@ package core
 package tasty
 
 import dotty.tools.tasty.TastyFormat.SOURCE
+import dotty.tools.tasty.TastyBuffer
+import TastyBuffer._
 
 import ast._
 import ast.Trees._
@@ -12,7 +14,6 @@ import util.{SourceFile, NoSource}
 import core._
 import Contexts._, Symbols._, Annotations._, Decorators._
 import collection.mutable
-import TastyBuffer._
 import util.Spans._
 
 class PositionPickler(pickler: TastyPickler, addrOfTree: untpd.Tree => Addr) {
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/PositionUnpickler.scala
@@ -3,11 +3,12 @@ package dotc
 package core
 package tasty
 
-import dotty.tools.tasty.TastyFormat.SOURCE
+import dotty.tools.tasty.{ TastyFormat, TastyBuffer, TastyReader }
+import TastyFormat.SOURCE
+import TastyBuffer.{ Addr, NameRef }
 
 import util.Spans._
-import collection.{mutable, Map}
-import TastyBuffer.{Addr, NameRef}
+import collection.{ mutable, Map }
 import Names.TermName
 
 /** Unpickler for tree positions */
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyClassName.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyClassName.scala
@@ -2,11 +2,13 @@ package dotty.tools.dotc
 package core
 package tasty
 
+import dotty.tools.tasty.{ TastyBuffer, TastyReader }
+import TastyBuffer.NameRef
+
 import Contexts._, Decorators._
-import Names.{Name, TermName}
+import Names.{ Name, TermName }
 import StdNames.nme
 import TastyUnpickler._
-import TastyBuffer.NameRef
 import util.Spans.offsetToInt
 import printing.Highlighting._
 
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyHTMLPrinter.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyHTMLPrinter.scala
@@ -2,10 +2,11 @@ package dotty.tools.dotc
 package core
 package tasty
 
+import dotty.tools.tasty.TastyBuffer.NameRef
+
 import Contexts._, Decorators._
 import Names.Name
 import TastyUnpickler._
-import TastyBuffer.NameRef
 import util.Spans.offsetToInt
 import printing.Highlighting._
 
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPickler.scala
@@ -3,11 +3,12 @@ package dotc
 package core
 package tasty
 
-import dotty.tools.tasty.TastyFormat._
+import dotty.tools.tasty.{ TastyBuffer, TastyFormat, TastyHash }
+import TastyFormat._
+import TastyBuffer._
 
 import collection.mutable
-import TastyBuffer._
-import core.Symbols.{Symbol, ClassSymbol}
+import core.Symbols.{ Symbol, ClassSymbol }
 import ast.tpd
 import Decorators._
 
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala
@@ -2,10 +2,12 @@ package dotty.tools.dotc
 package core
 package tasty
 
+import dotty.tools.tasty.{ TastyBuffer, TastyReader }
+import TastyBuffer.{ Addr, NameRef }
+
 import Contexts._, Decorators._
 import Names.Name
 import TastyUnpickler._
-import TastyBuffer.{Addr, NameRef}
 import util.Spans.offsetToInt
 import printing.Highlighting._
 
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TastyUnpickler.scala
@@ -2,11 +2,12 @@ package dotty.tools.dotc
 package core
 package tasty
 
-import dotty.tools.tasty.TastyFormat.NameTags._
+import dotty.tools.tasty.{ TastyFormat, TastyBuffer, TastyReader, TastyHeaderUnpickler }
+import TastyFormat.NameTags._
+import TastyBuffer.NameRef
 
 import scala.collection.mutable
-import TastyBuffer.NameRef
-import Names.{TermName, termName, EmptyTermName}
+import Names.{ TermName, termName, EmptyTermName }
 import NameKinds._
 
 object TastyUnpickler {
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeBuffer.scala
@@ -3,8 +3,11 @@ package dotc
 package core
 package tasty
 
-import util.Util.{bestFit, dble}
-import TastyBuffer.{Addr, NoAddr, AddrWidth}
+import dotty.tools.tasty.util.Util.dble
+import dotty.tools.tasty.TastyBuffer
+import TastyBuffer.{ Addr, NoAddr, AddrWidth }
+
+import util.Util.bestFit
 import config.Printers.pickling
 import ast.untpd.Tree
 
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala
@@ -4,14 +4,14 @@ package core
 package tasty
 
 import dotty.tools.tasty.TastyFormat._
+import dotty.tools.tasty.TastyBuffer._
 
 import ast.Trees._
-import ast.{untpd, tpd}
+import ast.{ untpd, tpd }
 import Contexts._, Symbols._, Types._, Names._, Constants._, Decorators._, Annotations._, Flags._
 import typer.Inliner
 import NameKinds._
 import StdNames.nme
-import TastyBuffer._
 import transform.SymUtils._
 import printing.Printer
 import printing.Texts._
diff --git a/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala b/compiler/src/dotty/tools/dotc/core/tasty/TreeUnpickler.scala
@@ -20,13 +20,15 @@ import typer.ConstFold
 import typer.Checking.checkNonCyclic
 import util.Spans._
 import util.SourceFile
-import ast.{TreeTypeMap, Trees, tpd, untpd}
+import ast.{ TreeTypeMap, Trees, tpd, untpd }
 import Trees._
 import Decorators._
 import transform.SymUtils._
+
+import dotty.tools.tasty.{ TastyBuffer, TastyReader }
 import TastyBuffer._
 
-import scala.annotation.{switch, tailrec}
+import scala.annotation.{ switch, tailrec }
 import scala.collection.mutable.ListBuffer
 import scala.collection.mutable
 import config.Printers.pickling
@@ -36,7 +38,7 @@ import dotty.tools.dotc.quoted.QuoteContext
 import dotty.tools.tasty.TastyFormat._
 
 import scala.quoted
-import scala.internal.quoted.{TastyTreeExpr, TreeType}
+import scala.internal.quoted.{ TastyTreeExpr, TreeType }
 import scala.annotation.constructorOnly
 import scala.annotation.internal.sharable
 
diff --git a/compiler/src/dotty/tools/dotc/util/Util.scala b/compiler/src/dotty/tools/dotc/util/Util.scala
@@ -1,5 +1,4 @@
 package dotty.tools.dotc.util
-import reflect.ClassTag
 
 object Util {
 
@@ -23,10 +22,4 @@ object Util {
     else recur(0, length, initMid)
   }
 
-  /** An array twice the size of given array, with existing elements copied over */
-  def dble[T: ClassTag](arr: Array[T]): Array[T] = {
-    val arr1 = new Array[T](arr.length * 2)
-    System.arraycopy(arr, 0, arr1, 0, arr.length)
-    arr1
-  }
 }
diff --git a/compiler/test/dotty/tools/dotc/TastyHashTest.scala b/compiler/test/dotty/tools/dotc/TastyHashTest.scala
@@ -3,7 +3,7 @@ package dotty.tools.dotc
 import org.junit.Test
 import org.junit.Assert.assertEquals
 
-import dotty.tools.dotc.core.tasty.TastyHash.pjwHash64
+import dotty.tools.tasty.TastyHash.pjwHash64
 
 class TastyHashTest {
   @Test def pjwHash64Tests(): Unit = {
diff --git a/language-server/src/dotty/tools/languageserver/decompiler/TastyDecompilerService.scala b/language-server/src/dotty/tools/languageserver/decompiler/TastyDecompilerService.scala
@@ -6,7 +6,8 @@ import java.net.URI
 import java.nio.file._
 import java.util.concurrent.CompletableFuture
 
-import dotc.core.tasty.UnpickleException
+import dotty.tools.tasty.UnpickleException
+
 import dotc.fromtasty.TastyFileUtil
 
 import org.eclipse.lsp4j.jsonrpc.services._
diff --git a/tasty/src/dotty/tools/tasty/TastyBuffer.scala b/tasty/src/dotty/tools/tasty/TastyBuffer.scala
@@ -1,7 +1,4 @@
-package dotty.tools
-package dotc
-package core
-package tasty
+package dotty.tools.tasty
 
 import util.Util.dble
 
diff --git a/tasty/src/dotty/tools/tasty/TastyHash.scala b/tasty/src/dotty/tools/tasty/TastyHash.scala
@@ -1,4 +1,4 @@
-package dotty.tools.dotc.core.tasty
+package dotty.tools.tasty
 
 object TastyHash {
 
@@ -20,4 +20,3 @@ object TastyHash {
     h
   }
 }
-
diff --git a/tasty/src/dotty/tools/tasty/TastyHeaderUnpickler.scala b/tasty/src/dotty/tools/tasty/TastyHeaderUnpickler.scala
@@ -1,10 +1,8 @@
-package dotty.tools.dotc
-package core
-package tasty
+package dotty.tools.tasty
 
 import java.util.UUID
 
-import dotty.tools.tasty.TastyFormat.{MajorVersion, MinorVersion, header}
+import TastyFormat.{ MajorVersion, MinorVersion, header }
 
 class TastyHeaderUnpickler(reader: TastyReader) {
   import reader._
diff --git a/tasty/src/dotty/tools/tasty/TastyReader.scala b/tasty/src/dotty/tools/tasty/TastyReader.scala
@@ -1,11 +1,9 @@
-package dotty.tools
-package dotc
-package core
-package tasty
+package dotty.tools.tasty
 
-import TastyBuffer._
 import collection.mutable
 
+import TastyBuffer._
+
 /** A byte array buffer that can be filled with bytes or natural numbers in TASTY format,
  *  and that supports reading and patching addresses represented as natural numbers.
  *
diff --git a/tasty/src/dotty/tools/tasty/TastyString.scala b/tasty/src/dotty/tools/tasty/TastyString.scala
@@ -1,4 +1,4 @@
-package dotty.tools.dotc.core.tasty
+package dotty.tools.tasty
 
 import java.io._
 import java.util.Base64
@@ -25,4 +25,3 @@ object TastyString {
     Base64.getDecoder().decode(string.result().getBytes(UTF_8))
   }
 }
-
diff --git a/tasty/src/dotty/tools/tasty/UnpickleException.scala b/tasty/src/dotty/tools/tasty/UnpickleException.scala
@@ -1,3 +1,3 @@
-package dotty.tools.dotc.core.tasty
+package dotty.tools.tasty
 
 class UnpickleException(msg: String) extends RuntimeException(msg)
diff --git a/tasty/src/dotty/tools/tasty/util/Util.scala b/tasty/src/dotty/tools/tasty/util/Util.scala
@@ -0,0 +1,14 @@
+package dotty.tools.tasty.util
+
+import reflect.ClassTag
+
+object Util {
+
+  /** An array twice the size of given array, with existing elements copied over */
+  def dble[T: ClassTag](arr: Array[T]): Array[T] = {
+    val arr1 = new Array[T](arr.length * 2)
+    System.arraycopy(arr, 0, arr1, 0, arr.length)
+    arr1
+  }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,11 @@`
`1`	`1`	`package dotty.tools.dotc.core.tasty`
`2`	`2`
`3`	`3`	`import dotty.tools.dotc.ast.tpd`
`4`		`-import dotty.tools.dotc.core.Comments.{Comment, CommentsContext, ContextDocstrings}`
	`4`	`+import dotty.tools.dotc.core.Comments.{ Comment, CommentsContext, ContextDocstrings }`
`5`	`5`	`import dotty.tools.dotc.core.Contexts.Context`
`6`		`-import dotty.tools.dotc.core.tasty.TastyBuffer.{Addr, NoAddr}`
	`6`	`+`
	`7`	`+import dotty.tools.tasty.TastyBuffer`
	`8`	`+import TastyBuffer.{Addr, NoAddr}`
`7`	`9`
`8`	`10`	`import java.nio.charset.Charset`
`9`	`11`
`@@ -40,4 +42,3 @@ class CommentPickler(pickler: TastyPickler, addrOfTree: tpd.Tree => Addr)(implic`
`40`	`42`	`}`
`41`	`43`	`}`
`42`	`44`	`}`
`43`		`-`