Merge pull request #5797 from dotty-staging/create-interpreter

nicolasstucki · web-flow · commit ad94ab5b8289 · 2019-01-29T14:04:54.000+01:00
Add regression test for tasty reflect case study
diff --git a/compiler/src/dotty/tools/dotc/tastyreflect/FlagsOpsImpl.scala b/compiler/src/dotty/tools/dotc/tastyreflect/FlagsOpsImpl.scala
@@ -40,7 +40,7 @@ trait FlagsOpsImpl extends scala.tasty.reflect.FlagsOps with CoreImpl {
     def Contravariant: Flags = core.Flags.Contravariant
     def Scala2X: Flags = core.Flags.Scala2x
     def DefaultParameterized: Flags = core.Flags.DefaultParameterized
-    def Stable: Flags = core.Flags.StableRealizable
+    def StableRealizable: Flags = core.Flags.StableRealizable
     def Param: Flags = core.Flags.Param
     def ParamAccessor: Flags = core.Flags.ParamAccessor
   }
diff --git a/compiler/src/dotty/tools/dotc/tastyreflect/SymbolOpsImpl.scala b/compiler/src/dotty/tools/dotc/tastyreflect/SymbolOpsImpl.scala
@@ -76,6 +76,10 @@ trait SymbolOpsImpl extends scala.tasty.reflect.SymbolOps with CoreImpl {
       }
     }
 
+    def isDefinedInCurrentRun(implicit ctx: Context): Boolean = {
+      symbol.topLevelClass.asClass.isDefinedInCurrentRun
+    }
+
   }
 
   object IsPackageSymbol extends IsPackageSymbolModule {
@@ -171,6 +175,10 @@ trait SymbolOpsImpl extends scala.tasty.reflect.SymbolOps with CoreImpl {
 
   def DefSymbolDeco(symbol: DefSymbol): DefSymbolAPI = new DefSymbolAPI {
     def tree(implicit ctx: Context): DefDef = FromSymbol.defDefFromSym(symbol)
+
+    def signature(implicit ctx: Context): Signature = {
+      symbol.signature
+    }
   }
 
   object IsValSymbol extends IsValSymbolModule {
@@ -181,6 +189,11 @@ trait SymbolOpsImpl extends scala.tasty.reflect.SymbolOps with CoreImpl {
   def ValSymbolDeco(symbol: ValSymbol): ValSymbolAPI = new ValSymbolAPI {
     def tree(implicit ctx: Context): ValDef = FromSymbol.valDefFromSym(symbol)
 
+    def moduleClass(implicit ctx: Context): Option[ClassSymbol] = {
+      val sym = symbol.moduleClass
+      if (sym.exists) Some(sym.asClass) else None
+    }
+
     def companionClass(implicit ctx: Context): Option[ClassSymbol] = {
       val sym = symbol.companionClass
       if (sym.exists) Some(sym.asClass) else None
diff --git a/compiler/src/dotty/tools/dotc/tastyreflect/TypeOrBoundsOpsImpl.scala b/compiler/src/dotty/tools/dotc/tastyreflect/TypeOrBoundsOpsImpl.scala
@@ -19,6 +19,8 @@ trait TypeOrBoundsOpsImpl extends scala.tasty.reflect.TypeOrBoundsOps with CoreI
       */
     def widen(implicit ctx: Context): Type = tpe.widen
 
+    def classSymbol(implicit ctx: Context): Option[ClassSymbol] =
+      if (tpe.classSymbol.exists) Some(tpe.classSymbol.asClass) else None
   }
 
   def ConstantTypeDeco(x: ConstantType): Type.ConstantTypeAPI = new Type.ConstantTypeAPI {
diff --git a/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala b/compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala
@@ -81,6 +81,7 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting {
   @Test def runWithCompiler: Unit = {
     implicit val testGroup: TestGroup = TestGroup("runWithCompiler")
     compileFilesInDir("tests/run-with-compiler", withCompilerOptions) +
+    compileDir("tests/run-with-compiler-custom-args/tasty-interpreter", withCompilerOptions) +
     compileFile("tests/run-with-compiler-custom-args/staged-streams_1.scala", withCompilerOptions without "-Yno-deep-subtypes")
   }.checkRuns()
 
diff --git a/library/src/scala/tasty/reflect/FlagsOps.scala b/library/src/scala/tasty/reflect/FlagsOps.scala
@@ -93,8 +93,8 @@ trait FlagsOps extends Core {
     /** Is this symbol a method with default parameters */
     def DefaultParameterized: Flags
 
-    /** Is this symbol member that is assumed to be stable */
-    def Stable: Flags
+    /** Is this symbol member that is assumed to be stable and realizable */
+    def StableRealizable: Flags
 
     /** Is this symbol a parameter */
     def Param: Flags
diff --git a/library/src/scala/tasty/reflect/Printers.scala b/library/src/scala/tasty/reflect/Printers.scala
@@ -126,7 +126,7 @@ trait Printers
       if (flags.is(Flags.Contravariant)) flagList += "Flags.Contravariant"
       if (flags.is(Flags.Scala2X)) flagList += "Flags.Scala2X"
       if (flags.is(Flags.DefaultParameterized)) flagList += "Flags.DefaultParameterized"
-      if (flags.is(Flags.Stable)) flagList += "Flags.Stable"
+      if (flags.is(Flags.StableRealizable)) flagList += "Flags.StableRealizable"
       if (flags.is(Flags.Param)) flagList += "Flags.Param"
       if (flags.is(Flags.ParamAccessor)) flagList += "Flags.ParamAccessor"
       flagList.result().mkString(" | ")
@@ -501,7 +501,7 @@ trait Printers
       if (flags.is(Flags.Contravariant)) flagList += "contravariant"
       if (flags.is(Flags.Scala2X)) flagList += "scala2x"
       if (flags.is(Flags.DefaultParameterized)) flagList += "defaultParameterized"
-      if (flags.is(Flags.Stable)) flagList += "stable"
+      if (flags.is(Flags.StableRealizable)) flagList += "stableRealizable"
       if (flags.is(Flags.Param)) flagList += "param"
       if (flags.is(Flags.ParamAccessor)) flagList += "paramAccessor"
       flagList.result().mkString("/*", " ", "*/")
diff --git a/library/src/scala/tasty/reflect/SymbolOps.scala b/library/src/scala/tasty/reflect/SymbolOps.scala
@@ -51,6 +51,7 @@ trait SymbolOps extends Core {
     /** Annotations attached to this symbol */
     def annots(implicit ctx: Context): List[Term]
 
+    def isDefinedInCurrentRun(implicit ctx: Context): Boolean
   }
   implicit def SymbolDeco(symbol: Symbol): SymbolAPI
 
@@ -121,7 +122,7 @@ trait SymbolOps extends Core {
   }
 
   trait TypeSymbolAPI {
-    /** TypeDef tree of this defintion. */
+    /** TypeDef tree of this definition. */
     def tree(implicit ctx: Context): TypeDef
   }
   implicit def TypeSymbolDeco(symbol: TypeSymbol): TypeSymbolAPI
@@ -136,6 +137,8 @@ trait SymbolOps extends Core {
   trait DefSymbolAPI {
     /** DefDef tree of this defintion. */
     def tree(implicit ctx: Context): DefDef
+
+    def signature(implicit ctx: Context): Signature
   }
   implicit def DefSymbolDeco(symbol: DefSymbol): DefSymbolAPI
 
@@ -151,8 +154,9 @@ trait SymbolOps extends Core {
     def tree(implicit ctx: Context): ValDef
 
     /** The class symbol of the companion module class */
-    def companionClass(implicit ctx: Context): Option[ClassSymbol]
+    def moduleClass(implicit ctx: Context): Option[ClassSymbol]
 
+    def companionClass(implicit ctx: Context): Option[ClassSymbol]
   }
   implicit def ValSymbolDeco(symbol: ValSymbol): ValSymbolAPI
 
diff --git a/library/src/scala/tasty/reflect/TypeOrBoundsOps.scala b/library/src/scala/tasty/reflect/TypeOrBoundsOps.scala
@@ -44,7 +44,7 @@ trait TypeOrBoundsOps extends Core {
   implicit def TypeLambdaDeco(x: TypeLambda): Type.TypeLambdaAPI
 
   implicit def TypeBoundsDeco(bounds: TypeBounds): TypeBoundsAPI
-  
+
   // ----- Types ----------------------------------------------------
 
   def typeOf[T: scala.quoted.Type]: Type
@@ -53,6 +53,7 @@ trait TypeOrBoundsOps extends Core {
     def =:=(other: Type)(implicit ctx: Context): Boolean
     def <:<(other: Type)(implicit ctx: Context): Boolean
     def widen(implicit ctx: Context): Type
+    def classSymbol(implicit ctx: Context): Option[ClassSymbol]
   }
 
   val IsType: IsTypeModule
diff --git a/tests/run-with-compiler-custom-args/tasty-interpreter/InterpretedMain.scala b/tests/run-with-compiler-custom-args/tasty-interpreter/InterpretedMain.scala
@@ -0,0 +1,73 @@
+object IntepretedMain {
+  def main(args: Array[String]): Unit = {
+    val x1 = 42
+    println(x1)
+    println()
+
+    lazy val x2 = println("Hello")
+    x2
+    x2
+    println()
+
+    def x3 = 42
+    println(x3)
+    println()
+
+    var x4: Int = 42
+    x4 = 43
+    println(x4)
+    println()
+
+    if(x1 == 42)
+      println("if")
+    else
+      println("else")
+    println()
+
+    var x5 = 5
+    while(x5 > 0){
+      println(x5)
+      x5 = x5 - 1
+    }
+    println()
+
+    def meth() = 42
+    println(meth())
+    println()
+
+    def methP(i: Int) = i
+    println(methP(55))
+
+    println(Precompiled)
+    println(Precompiled.staticMeth)
+    println(Precompiled.staticVal)
+    println(Precompiled.staticMeth1())
+    println(Precompiled.staticMeth2(58))
+    println(Precompiled.staticMeth3(new Object))
+    println(Precompiled.staticMeth4(new Bar))
+    println(Precompiled.staticMeth5(new Bar, 61))
+    println(Precompiled.staticMeth4(new InterpretedBar))
+    println(Precompiled.staticMeth5(new InterpretedBar, 62))
+
+    val x6: Any = 64
+    println(x6.isInstanceOf[Int])
+    println(x6.isInstanceOf[Long])
+    println(x6.asInstanceOf[Int])
+
+
+    val bar = new Bar
+    println(bar.meth() + 5)
+    println(bar.methA(66))
+
+    val ibar = new InterpretedBar
+    println(ibar.meth() + 5)
+    println(ibar.methA(67))
+  }
+
+  def foo(x: Int): Unit = println(x)
+}
+
+class InterpretedBar extends IFace {
+  def meth(): Int = 62
+  def methA(x: Int): Int = x + 1
+}
diff --git a/tests/run-with-compiler-custom-args/tasty-interpreter/Precompiled.scala b/tests/run-with-compiler-custom-args/tasty-interpreter/Precompiled.scala
@@ -0,0 +1,24 @@
+
+class Bar extends IFace {
+  def meth(): Int = 60
+  def methA(x: Int): Int = x
+}
+
+trait IFace {
+  def meth(): Int
+  def methA(x: Int): Int
+}
+
+object Precompiled {
+  def staticMeth = 55
+  val staticVal  = 56
+
+  // Todo
+  def staticMeth1() = 57
+  def staticMeth2(arg: Int) = arg
+  def staticMeth3(arg: Object): Int = 59
+  def staticMeth4(arg: IFace): Int = arg.meth()
+  def staticMeth5(arg: IFace, x: Int): Int = arg.methA(x)
+
+  override def toString() = "precompiledModule"
+}
diff --git a/tests/run-with-compiler-custom-args/tasty-interpreter/Test.scala b/tests/run-with-compiler-custom-args/tasty-interpreter/Test.scala
@@ -0,0 +1,113 @@
+import java.io.{ByteArrayOutputStream, File, PrintStream}
+
+import dotty.tools.dotc.core.Contexts
+import dotty.tools.dotc.reporting.Reporter
+import dotty.tools.dotc.reporting.diagnostic.MessageContainer
+import dotty.tools.dotc.util.DiffUtil
+import dotty.tools.io.Path
+
+import scala.io.Source
+import scala.tasty.file._
+import scala.tasty.interpreter.TastyInterpreter
+import scala.tasty.Reflection
+
+object Test {
+  def main(args: Array[String]): Unit = {
+
+    val actualOutput = interpret("")("IntepretedMain", "InterpretedBar")
+    val expectedOutput =
+      """42
+        |
+        |Hello
+        |
+        |42
+        |
+        |43
+        |
+        |if
+        |
+        |5
+        |4
+        |3
+        |2
+        |1
+        |
+        |42
+        |
+        |55
+        |precompiledModule
+        |55
+        |56
+        |57
+        |58
+        |59
+        |60
+        |61
+        |62
+        |63
+        |true
+        |false
+        |64
+        |65
+        |66
+        |67
+        |68
+        |""".stripMargin
+
+    assert(expectedOutput == actualOutput,
+      "\n>>>>>>>>>>>>>>>>>>\n" +
+      DiffUtil.mkColoredCodeDiff(actualOutput, expectedOutput, true) +
+      "<<<<<<<<<<<<<<<<<<"
+    )
+
+    compileAndInterpret("HelloWorld.scala")
+    compileAndInterpret("nullInstanceEval.scala")
+    compileAndInterpret("t3327.scala")
+//    compileAndInterpret("t5614.scala")
+//    compileAndInterpret("t4054.scala")
+//    compileAndInterpret("sort.scala")
+//    compileAndInterpret("t0607.scala")
+//    compileAndInterpret("i4073b.scala")
+//    compileAndInterpret("i4430.scala")
+//    compileAndInterpret("nullAsInstanceOf.scala")
+//    compileAndInterpret("classof.scala")
+//    compileAndInterpret("null-hash.scala")
+//    compileAndInterpret("i3518.scala")
+//    compileAndInterpret("withIndex.scala")
+//    compileAndInterpret("unboxingBug.scala")
+//    compileAndInterpret("traitInit.scala")
+  }
+
+  def compileAndInterpret(testFileName: String) = {
+    val reproter = new Reporter {
+      def doReport(m: MessageContainer)(implicit ctx: Contexts.Context): Unit = println(m)
+    }
+    val out = java.nio.file.Paths.get("out/interpreted")
+    if (!java.nio.file.Files.exists(out))
+      java.nio.file.Files.createDirectory(out)
+    dotty.tools.dotc.Main.process(Array("-classpath", System.getProperty("java.class.path"), "-d", out.toString, "tests/run/" + testFileName), reproter)
+
+    val actualOutput = interpret(out.toString)("Test")
+
+    val checkFile = java.nio.file.Paths.get("tests/run/" + testFileName.stripSuffix(".scala") + ".check")
+    if (java.nio.file.Files.exists(checkFile)) {
+      val expectedOutput = Source.fromFile(checkFile.toFile).getLines().mkString("", "\n", "\n")
+
+      assert(expectedOutput == actualOutput,
+        "\n>>>>>>>>>>>>>>>>>>\n" +
+          DiffUtil.mkColoredCodeDiff(actualOutput, expectedOutput, true) +
+          "<<<<<<<<<<<<<<<<<<"
+      )
+    }
+  }
+
+  def interpret(classpath: String*)(interpretedClasses: String*): String = {
+    val ps = new ByteArrayOutputStream()
+    try scala.Console.withOut(ps) {
+      ConsumeTasty(classpath.mkString(java.io.File.pathSeparatorChar.toString), interpretedClasses.toList, new TastyInterpreter)
+    } catch {
+      case e: Throwable => throw new Exception(ps.toString, e)
+    }
+    ps.toString
+  }
+}
diff --git a/tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala b/tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/TastyInterpreter.scala
@@ -0,0 +1,25 @@
+package scala.tasty.interpreter
+
+import scala.tasty.Reflection
+import scala.tasty.file.TastyConsumer
+
+class TastyInterpreter extends TastyConsumer {
+
+  final def apply(reflect: Reflection)(root: reflect.Tree): Unit = {
+    import reflect._
+    object Traverser extends TreeTraverser {
+
+      override def traverseTree(tree: Tree)(implicit ctx: Context): Unit = tree match {
+        // TODO: check the correct sig and object enclosement for main
+        case DefDef("main", _, _, _, Some(rhs)) =>
+          val interpreter = new jvm.Interpreter(reflect)
+
+          interpreter.eval(rhs)(Map.empty)
+        // TODO: recurse only for PackageDef, ClassDef
+        case tree =>
+          super.traverseTree(tree)
+      }
+    }
+    Traverser.traverseTree(root)(reflect.rootContext)
+  }
+}
diff --git a/tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala b/tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala
diff --git a/tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/jvm/Interpreter.scala b/tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/jvm/Interpreter.scala
diff --git a/tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/jvm/JVMReflection.scala b/tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/jvm/JVMReflection.scala
diff --git a/tests/run-with-compiler-custom-args/tasty-interpreter/notes.md b/tests/run-with-compiler-custom-args/tasty-interpreter/notes.md
diff --git a/tests/run/HelloWorld.check b/tests/run/HelloWorld.check
diff --git a/tests/run/HelloWorld.scala b/tests/run/HelloWorld.scala

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ trait FlagsOpsImpl extends scala.tasty.reflect.FlagsOps with CoreImpl {`
`40`	`40`	`def Contravariant: Flags = core.Flags.Contravariant`
`41`	`41`	`def Scala2X: Flags = core.Flags.Scala2x`
`42`	`42`	`def DefaultParameterized: Flags = core.Flags.DefaultParameterized`
`43`		`- def Stable: Flags = core.Flags.StableRealizable`
	`43`	`+ def StableRealizable: Flags = core.Flags.StableRealizable`
`44`	`44`	`def Param: Flags = core.Flags.Param`
`45`	`45`	`def ParamAccessor: Flags = core.Flags.ParamAccessor`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,8 @@ trait TypeOrBoundsOpsImpl extends scala.tasty.reflect.TypeOrBoundsOps with CoreI`
`19`	`19`	`*/`
`20`	`20`	`def widen(implicit ctx: Context): Type = tpe.widen`
`21`	`21`
	`22`	`+ def classSymbol(implicit ctx: Context): Option[ClassSymbol] =`
	`23`	`+ if (tpe.classSymbol.exists) Some(tpe.classSymbol.asClass) else None`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`def ConstantTypeDeco(x: ConstantType): Type.ConstantTypeAPI = new Type.ConstantTypeAPI {`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ trait SymbolOps extends Core {`
`51`	`51`	`/** Annotations attached to this symbol */`
`52`	`52`	`def annots(implicit ctx: Context): List[Term]`
`53`	`53`
	`54`	`+ def isDefinedInCurrentRun(implicit ctx: Context): Boolean`
`54`	`55`	`}`
`55`	`56`	`implicit def SymbolDeco(symbol: Symbol): SymbolAPI`
`56`	`57`
`@@ -121,7 +122,7 @@ trait SymbolOps extends Core {`
`121`	`122`	`}`
`122`	`123`
`123`	`124`	`trait TypeSymbolAPI {`
`124`		`- /** TypeDef tree of this defintion. */`
	`125`	`+ /** TypeDef tree of this definition. */`
`125`	`126`	`def tree(implicit ctx: Context): TypeDef`
`126`	`127`	`}`
`127`	`128`	`implicit def TypeSymbolDeco(symbol: TypeSymbol): TypeSymbolAPI`
`@@ -136,6 +137,8 @@ trait SymbolOps extends Core {`
`136`	`137`	`trait DefSymbolAPI {`
`137`	`138`	`/** DefDef tree of this defintion. */`
`138`	`139`	`def tree(implicit ctx: Context): DefDef`
	`140`	`+`
	`141`	`+ def signature(implicit ctx: Context): Signature`
`139`	`142`	`}`
`140`	`143`	`implicit def DefSymbolDeco(symbol: DefSymbol): DefSymbolAPI`
`141`	`144`
`@@ -151,8 +154,9 @@ trait SymbolOps extends Core {`
`151`	`154`	`def tree(implicit ctx: Context): ValDef`
`152`	`155`
`153`	`156`	`/** The class symbol of the companion module class */`
`154`		`- def companionClass(implicit ctx: Context): Option[ClassSymbol]`
	`157`	`+ def moduleClass(implicit ctx: Context): Option[ClassSymbol]`
`155`	`158`
	`159`	`+ def companionClass(implicit ctx: Context): Option[ClassSymbol]`
`156`	`160`	`}`
`157`	`161`	`implicit def ValSymbolDeco(symbol: ValSymbol): ValSymbolAPI`
`158`	`162`