Rewrite test

Test rewritings that were implemented so far.

Author: odersky

test/dotc/tests.scala

@@ -104,6 +104,8 @@ class tests extends CompilerTest {
 
   @Test def pos_scala2_all = compileFiles(posScala2Dir, scala2mode)
 
+  @Test def rewrites = compileFile(posScala2Dir, "rewrites", "-rewrite" :: scala2mode)
+
   @Test def pos_859 = compileFile(posSpecialDir, "i859", scala2mode)(allowDeepSubtypes)
 
   @Test def new_all = compileFiles(newDir, twice)

test/test/CompilerTest.scala

@@ -10,6 +10,7 @@ import scala.reflect.io.{ Path, Directory, File => SFile, AbstractFile }
 import scala.tools.partest.nest.{ FileManager, NestUI }
 import scala.annotation.tailrec
 import java.io.{ RandomAccessFile, File => JFile }
+import dotty.tools.io.PlainFile
 
 import org.junit.Test
 
@@ -89,7 +90,20 @@ abstract class CompilerTest {
     if (!generatePartestFiles || !partestableFile(prefix, fileName, extension, args ++ defaultOptions)) {
       if (runTest)
         log(s"WARNING: run tests can only be run by partest, JUnit just verifies compilation: $prefix$fileName$extension")
-      compileArgs((s"$filePath" :: args).toArray, expErrors)
+      if (args.contains("-rewrite")) {
+        val file = new PlainFile(filePath)
+        val data = file.toByteArray
+        val cs = data.map(_.toChar)
+        println(s"data = ${cs.mkString}")
+        compileArgs((filePath :: args).toArray, expErrors)
+        val plainArgs = args.filter(arg => arg != "-rewrite" && arg != "-language:Scala2")
+        println(s"plainArgs = $plainArgs")
+        compileFile(prefix, fileName, plainArgs, extension, runTest)
+        val out = file.output
+        out.write(data)
+        out.close()
+      }
+      else compileArgs((filePath :: args).toArray, expErrors)
     } else {
       val kind = testKind(prefix, runTest)
       log(s"generating partest files for test file: $prefix$fileName$extension of kind $kind")
@@ -191,6 +205,8 @@ abstract class CompilerTest {
     }
   }
 
+
+
   // ========== HELPERS =============
 
   private def expectedErrors(filePaths: List[String]): List[ErrorsInFile] = if (filePaths.exists(isNegTest(_))) filePaths.map(getErrors(_)) else Nil

tests/pos-scala2/rewrites.scala

@@ -0,0 +1,29 @@
+trait Test {
+
+  def baz() {}
+
+  def bar()
+
+  def foo() {
+    println("hi")
+  }
+
+  lazy val x: Int
+}
+
+object Test {
+
+  lazy val x = 1
+
+  @deprecated lazy val y = 2
+
+  @deprecated private lazy val z = 2
+
+  lazy val (x1, y1) = (1, 2)
+
+  @deprecated private lazy val (x2, y2) = (1, 2)
+
+  val yy = x1 _
+
+}
+