Merge pull request #74 from scalacenter/tasty/cleanup

Refactor, enable dotty compiled java enums

Author: bishabosha

README.md

@@ -1,26 +1,3 @@
-# TASTy Reader For Scala 2
-
-This branch is the home for development of the Scala Center project [**TASTy Reader For Scala 2**](https://scala.epfl.ch/projects.html#tastyScala2), which will enable the reference compiler of Scala 2.x to consume dependencies compiled with dotc, the reference compiler of Scala 3. The scope of this project is to enable all Scala 2 compatible features of TASTy files to be read during class file unpickling. There is no goal to backport non-compatible features. Features are tested with `ch.epfl.lamp:dotty-compiler_0.22:0.22.0-RC1`. Check the issues at [scalacenter/scala](https://github.com/scalacenter/scala/issues)
-
-## Testing
-
-The framework for testing TASTy reader is contained in the `tastytest` subproject. A description of its functionality is provided at [tastytest.md](doc/internal/tastytest.md)
-
-The `tasty` project is an example subproject depending on `tastytest`, used to test the functionality of the TASTy reader. Test sources are placed in the `test/tasty` directory of this repository.
-
-`tasty/test` is used to run the full suite of tests, isolated tests can be made by following the example of [TastyTestJUnit](test/tasty/test/scala/tools/tastytest/TastyTestJUnit.scala) and running with `tasty/testOnly <test class>`
-
-Individual tasks exist to help debug issues:
-
-- `tasty/dotc <out directory> <filename>` to compile a Scala 3 source file with the supported version of dotty, where the classpath is set to the out directory.
-- `tasty/dotcd <filename> <arg>*` to decompile a tasty file with the supported version of dotty. Can pass additional flags.
-- `tasty/scalac <out directory> <filename> <arg>*` to compile a Scala 2 file, where the classpath is set to the out directory, along with the dotty library. Can pass additional flags.
-- `tasty/runDotty <classpath> <classname>` to execute a main method with the dotty library added to the given classpath.
-
-## Notes
-
-comments beginning with `// TODO [tasty]:` should be considered carefully as they are special accomodations for the TASTy reader that are particulary expensive, or leak out of the classfile parser or `scala.tools.nsc.tasty` package.
-
 # Welcome!
 
 This is the official repository for the [Scala Programming Language](http://www.scala-lang.org)

doc/internal/tastyreader.md

@@ -0,0 +1,20 @@
+# TASTy Reader For Scala 2
+
+The [**TASTy Reader For Scala 2**](https://scala.epfl.ch/projects.html#tastyScala2), included in the Scala 2.x Compiler will enable dependencies to be used which are compiled with dotc, the reference compiler of Scala 3.
+
+## Testing
+
+The framework for testing TASTy reader is contained in the `tastytest` subproject. A description of its functionality is provided at [tastytest.md](tastytest.md)
+
+The `tasty` project is an example subproject depending on `tastytest`, used to test the functionality of the TASTy reader. Test sources are placed in the `test/tasty` directory of this repository and tested with the sbt task `tasty/test`.
+
+Individual tasks exist to help debug issues:
+
+- `tasty/dotc <out directory> <filename>` to compile a Scala 3 source file with the supported version of dotty, where the classpath is set to the out directory.
+- `tasty/dotcd <filename> <arg>*` to decompile a tasty file with the supported version of dotty. Can pass additional flags.
+- `tasty/scalac <out directory> <filename> <arg>*` to compile a Scala 2 file, where the classpath is set to the out directory, along with the dotty library. Can pass additional flags.
+- `tasty/runDotty <classpath> <classname>` to execute a main method with the dotty library added to the given classpath.
+
+## Notes
+
+comments beginning with `// TODO [tasty]:` should be considered carefully as they are special accomodations for the TASTy reader that are particulary expensive, or leak out of the classfile parser or `scala.tools.nsc.tasty` package.

doc/internal/tastytest.md

@@ -1,6 +1,6 @@
 # TASTy Test
 
-TASTy Test is a testing framework for scala 2 code that depends on code compiled with the `dotc`, the Scala 3 compiler, which outputs TASTy trees. The framework supports `run` and `neg` suites.
+TASTy Test is a testing framework for scala 2 code that depends on code compiled with the `dotc`, the Scala 3 compiler, which outputs TASTy trees. The framework supports `run`, `pos` and `neg` suites, which may be customised with extra flags.
 
 ## `run`
 A `run` suite tests the runtime behaviour of Scala 2 code that may extend or call into code compiled with `dotc`, and is specified as follows:
@@ -24,12 +24,6 @@ A `neg` suite asserts which Scala 2 code is not compatible with code compiled wi
      - If a Scala source fails compilation, check that it is in the set of expected fail cases, and that there is a corresponding check file that matches the compiler output, else collect in the list of failures.
      - If an expected fail case compiles successfully, collect it in the list of failures.
 
-## `neg-false`
-A `neg-false` test runs identically to a `neg` test, but asserts that a test is a false positive.
-
-## `pos-false`
-A `pos-false` test runs identically to a `pos` test, but asserts that a test is a false positive.
-
 ## General Notes
 - In each suite, the dotty library is available to all test sources.
 - In either suite's source directory, failing tests without a known fix should be put in a sibling directory to `src-2`, `src-3`, etc., such as `suspended`, to document that they are incompatible at present.

src/compiler/scala/tools/nsc/tasty/CommentUnpickler.scala

@@ -2,7 +2,6 @@ package scala.tools.nsc.tasty
 
 import TastyUnpickler.SectionUnpickler
 import TastyRefs.NameRef
-import Names.TastyName
 
 import scala.reflect.io.AbstractFile
 import scala.util.control.NonFatal
@@ -12,7 +11,7 @@ object ScalacUnpickler {
   final class TreeSectionUnpickler[Tasty <: TastyUniverse](implicit tasty: Tasty)
   extends SectionUnpickler[TreeUnpickler[Tasty]]("ASTs") { self =>
     def unpickle(reader: TastyReader, nameAtRef: NameRef => TastyName ): TreeUnpickler[Tasty] =
-      new TreeUnpickler(reader, nameAtRef, None, None, Seq.empty)
+      new TreeUnpickler(reader, nameAtRef, Seq.empty)
   }
 
   object Unpickler {
@@ -38,9 +37,7 @@ object ScalacUnpickler {
 
         val treeUnpickler = unpickler.unpickle[TreeUnpickler[tasty.type]](new TreeSectionUnpickler()(tasty)).get
 
-        implicit val ctx: Context = {
-          new InitialContext(classRoot, mirrorThatLoaded(classRoot), AbstractFile.getFile(filename))
-        }
+        implicit val ctx: Context = new InitialContext(classRoot, AbstractFile.getFile(filename))
         treeUnpickler.enter(classRoot, moduleRoot)
       } catch {
         case NonFatal(ex) =>

src/compiler/scala/tools/nsc/tasty/Names.scala

@@ -21,11 +21,11 @@ object TastyFlags {
   final val SuperParamAlias: TastyFlagSet = Open.next
   final val maxFlag: Int                  = SuperParamAlias.shift
 
-  case class TastyFlagSet private[TastyFlags](private val flags: Int) extends AnyVal {
+  case class TastyFlagSet(val toInt: Int) extends AnyVal {
 
     private[TastyFlags] def shift: Int = {
       var acc = 0
-      var curr = flags
+      var curr = toInt
       while (curr != 0) {
         acc += 1
         curr = curr >> 1
@@ -37,16 +37,16 @@ object TastyFlags {
       TastyFlagSet(1 << shift + 1)
     }
 
-    def toSingletonSets: SingletonSets                        = SingletonSets(flags)
-    def |(other: TastyFlagSet): TastyFlagSet                  = TastyFlagSet(flags | other.flags)
-    def &(mask: TastyFlagSet): TastyFlagSet                   = TastyFlagSet(flags & mask.flags)
-    def &~(mask: TastyFlagSet): TastyFlagSet                  = TastyFlagSet(flags & ~mask.flags)
-    def unary_! : Boolean                                     = this.flags == 0
+    def toSingletonSets: SingletonSets                        = SingletonSets(toInt)
+    def |(other: TastyFlagSet): TastyFlagSet                  = TastyFlagSet(toInt | other.toInt)
+    def &(mask: TastyFlagSet): TastyFlagSet                   = TastyFlagSet(toInt & mask.toInt)
+    def &~(mask: TastyFlagSet): TastyFlagSet                  = TastyFlagSet(toInt & ~mask.toInt)
+    def unary_! : Boolean                                     = this.toInt == 0
     def is(mask: TastyFlagSet): Boolean                       = (this & mask) == mask
     def isOneOf(mask: TastyFlagSet): Boolean                  = (this & mask).hasFlags
     def is(mask: TastyFlagSet, butNot: TastyFlagSet): Boolean = if (!butNot) is(mask) else is(mask) && not(butNot)
     def not(mask: TastyFlagSet): Boolean                      = !isOneOf(mask)
-    def hasFlags: Boolean                                     = this.flags != 0
+    def hasFlags: Boolean                                     = this.toInt != 0
 
     def debug: String = {
       if (!this) {
@@ -75,13 +75,13 @@ object TastyFlags {
     }
   }
 
-  case class SingletonSets private[TastyFlags](private val set: Int) extends AnyVal {
+  case class SingletonSets(val toInt: Int) extends AnyVal {
     def map[A](f: TastyFlagSet => A): Iterable[A] = {
       val buf = Iterable.newBuilder[A]
       var i = 0
       while (i <= maxFlag) {
         val flag = 1 << i
-        if ((flag & set) != 0) {
+        if ((flag & toInt) != 0) {
           buf += f(TastyFlagSet(flag))
         }
         i += 1