Fix tests

odersky · odersky · commit f1ed7c857a12 · 2020-07-17T15:03:37.000+02:00
diff --git a/compiler/src/dotty/tools/dotc/Run.scala b/compiler/src/dotty/tools/dotc/Run.scala
@@ -74,7 +74,7 @@ class Run(comp: Compiler, ictx: Context) extends ImplicitRunInfo with Constraint
       .addMode(Mode.ImplicitsEnabled)
       .setTyperState(ctx.typerState.fresh(ctx.reporter))
     ctx.initialize()(using start) // re-initialize the base context with start
-    atPeriod(start.period) {
+    atPeriod(ctx.period) {
       def addImport(ctx: Context, rootRef: ImportInfo.RootRef) =
         ctx.fresh.setImportInfo(ImportInfo.rootImport(rootRef))
       defn.RootImportFns.foldLeft(start.setRun(this))(addImport)
diff --git a/compiler/src/dotty/tools/repl/ReplCompiler.scala b/compiler/src/dotty/tools/repl/ReplCompiler.scala
@@ -47,11 +47,10 @@ class ReplCompiler extends Compiler {
       def importContext(imp: tpd.Import)(using Context, CState) =
         ctx.importContext(imp, imp.symbol)
 
-      def importPreviousRun(id: Int)(using Context, CState) = {
+      def importPreviousRun(id: Int)(using Context, CState): Context = {
         // we first import the wrapper object id
         val path = nme.EMPTY_PACKAGE ++ "." ++ objectNames(id)
         def importWrapper(c: Context, importGiven: Boolean) = {
-          assertSamePeriod()
           val importInfo = ImportInfo.rootImport(() =>
             requiredModuleRef(path), importGiven)(using c, c.cstate)
           c.fresh.setNewScope.setImportInfo(importInfo)
diff --git a/compiler/test/dotty/tools/CheckTypesTests.scala b/compiler/test/dotty/tools/CheckTypesTests.scala
@@ -5,7 +5,7 @@ import org.junit.Assert.{ assertFalse, assertTrue, fail }
 
 import dotc.ast.Trees._
 import dotc.core.Decorators._
-import dotc.core.Contexts.{Context, ctx}
+import dotc.core.Contexts._
 
 class CheckTypeTest extends DottyTest {
   @Test
@@ -29,6 +29,7 @@ class CheckTypeTest extends DottyTest {
     checkTypes(source, types: _*) {
       case (List(a, b, lu, li, lr, ls, la, lb), context) =>
         given Context = context
+        given CState = context.cstate
 
         assertTrue  ( b <:<  a)
         assertTrue  (li <:< lu)
@@ -61,6 +62,7 @@ class CheckTypeTest extends DottyTest {
     checkTypes(source, List(typesA, typesB)) {
       case (List(sups, subs), context) =>
         given Context = context
+        given CState = context.cstate
 
         sups.lazyZip(subs).foreach { (sup, sub) => assertTrue(sub <:< sup) }
 
diff --git a/compiler/test/dotty/tools/DottyTest.scala b/compiler/test/dotty/tools/DottyTest.scala
@@ -83,6 +83,8 @@ trait DottyTest extends ContextEscapeDetection {
     checkCompile("typer", gatheredSource) {
       (tree, context) =>
         given Context = context
+        given CState = context.cstate
+
         val findValDef: (List[tpd.ValDef], tpd.Tree) => List[tpd.ValDef] =
           (acc , tree) =>  {
             tree match {
diff --git a/compiler/test/dotty/tools/DottyTypeStealer.scala b/compiler/test/dotty/tools/DottyTypeStealer.scala
@@ -3,7 +3,7 @@ package dotty.tools
 import dotc.ast.tpd
 import dotc.core.Names._
 import dotc.ast.tpd._
-import dotc.core.Contexts.Context
+import dotc.core.Contexts._
 import dotc.core.Decorators._
 import dotc.core.Types.Type
 
@@ -17,6 +17,7 @@ object DottyTypeStealer extends DottyTest {
     checkCompile("typer", gatheredSource) {
       (tree, context) =>
         given Context = context
+        given CState = context.cstate
         val findValDef: (List[ValDef], tpd.Tree) => List[ValDef] =
           (acc , tree) =>  tree match {
             case t: ValDef if t.name.startsWith(dummyName) => t :: acc
diff --git a/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala b/compiler/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala
@@ -4,7 +4,7 @@ package backend.jvm
 
 import vulpix.TestConfiguration
 
-import dotc.core.Contexts.{Context, ContextBase, ctx}
+import dotc.core.Contexts._
 import dotc.core.Comments.{ContextDoc, ContextDocstrings}
 import dotc.core.Phases.Phase
 import dotc.Compiler
@@ -59,6 +59,7 @@ trait DottyBytecodeTest {
   /** Checks source code from raw strings */
   def checkBCode(scalaSources: List[String], javaSources: List[String] = Nil)(checkOutput: AbstractFile => Unit): Unit = {
     given Context = initCtx
+    given CState = initCtx.cstate
 
     val compiler = new Compiler
     val run = compiler.newRun
diff --git a/compiler/test/dotty/tools/dotc/ast/DesugarTests.scala b/compiler/test/dotty/tools/dotc/ast/DesugarTests.scala
@@ -11,7 +11,7 @@ import org.junit.Assert._
 class DesugarTests extends DottyTest {
   import tpd._
 
-  private def validSym(sym: Symbol)(using Context): Unit = {
+  private def validSym(sym: Symbol)(using Context, CState): Unit = {
       assert(
         // remaining symbols must be either synthetic:
         sym.is(Synthetic) ||
@@ -24,6 +24,7 @@ class DesugarTests extends DottyTest {
   @Test def caseClassHasCorrectMembers: Unit =
     checkCompile("typer", "case class Foo(x: Int, y: String)") { (tree, context) =>
       given Context = context
+      given CState = context.cstate
       val ccTree = tree.find(tree => tree.symbol.name == typeName("Foo")).get
       val List(_, foo) = defPath(ccTree.symbol, tree).map(_.symbol.info)
 
@@ -39,6 +40,7 @@ class DesugarTests extends DottyTest {
   @Test def caseClassCompanionHasCorrectMembers: Unit =
     checkCompile("typer", "case class Foo(x: Int, y: String)") { (tree, context) =>
       given Context = context
+      given CState = context.cstate
       val ccTree = tree.find(tree => tree.symbol.name == termName("Foo")).get
       val List(_, foo) = defPath(ccTree.symbol, tree).map(_.symbol.info)
 
diff --git a/compiler/test/dotty/tools/dotc/ast/TreeInfoTest.scala b/compiler/test/dotty/tools/dotc/ast/TreeInfoTest.scala
@@ -8,7 +8,7 @@ import core.StdNames.nme
 import core.Types._
 import core.Symbols._
 import org.junit.Assert._
-import core.Contexts.{Context, ctx}
+import core.Contexts._
 
 class TreeInfoTest extends DottyTest {
 
@@ -18,6 +18,7 @@ class TreeInfoTest extends DottyTest {
   def testDefPath: Unit = checkCompile("typer", "class A { def bar = { val x = { val z = 0; 0} }} ") {
     (tree, context) =>
       given Context = context
+      given CState = context.cstate
       val xTree = tree.find(tree => tree.symbol.name == termName("x")).get
       val path = defPath(xTree.symbol, tree)
       assertEquals(List(
diff --git a/compiler/test/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactoryTest.scala b/compiler/test/dotty/tools/dotc/classpath/ZipAndJarFileLookupFactoryTest.scala
@@ -4,7 +4,7 @@ import org.junit.Test
 import java.nio.file._
 import java.nio.file.attribute.FileTime
 
-import dotty.tools.dotc.core.Contexts.{Context, ContextBase, CState, ctx}
+import dotty.tools.dotc.core.Contexts._
 import dotty.tools.io.AbstractFile
 
 
diff --git a/compiler/test/dotty/tools/dotc/parsing/DeSugarTest.scala b/compiler/test/dotty/tools/dotc/parsing/DeSugarTest.scala
@@ -10,7 +10,7 @@ import ast.Trees._
 import ast.desugar
 import ast.desugar._
 import core.Mode
-import Contexts.{Context, CState}
+import Contexts._
 
 import scala.collection.mutable.ListBuffer
 
diff --git a/compiler/test/dotty/tools/dotc/parsing/DocstringTest.scala b/compiler/test/dotty/tools/dotc/parsing/DocstringTest.scala
@@ -3,7 +3,7 @@ package dotc
 package parsing
 
 import ast.Trees._
-import core.Contexts.Context
+import core.Contexts._
 
 trait DocstringTest extends DottyTest {
 
diff --git a/compiler/test/dotty/tools/dotc/parsing/DocstringTests.scala b/compiler/test/dotty/tools/dotc/parsing/DocstringTests.scala
@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package parsing
 
-import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.ast.Trees._
 
 import org.junit.Assert._
diff --git a/compiler/test/dotty/tools/dotc/parsing/parsePackage.scala b/compiler/test/dotty/tools/dotc/parsing/parsePackage.scala
@@ -5,7 +5,7 @@ package parsing
 import dotty.tools.dotc._
 import core._, ast._
 import Trees._
-import Contexts.{Context, CState}
+import Contexts._
 
 object parsePackage extends ParserTest {
 
diff --git a/compiler/test/dotty/tools/dotc/printing/PrinterTests.scala b/compiler/test/dotty/tools/dotc/printing/PrinterTests.scala
@@ -5,7 +5,7 @@ import dotty.tools.dotc.ast.{Trees,tpd}
 import dotty.tools.dotc.core.Names._
 import dotty.tools.dotc.core.Symbols._
 import dotty.tools.dotc.core.Decorators._
-import dotty.tools.dotc.core.Contexts.{Context, ctx}
+import dotty.tools.dotc.core.Contexts._
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
@@ -29,6 +29,7 @@ class PrinterTests extends DottyTest {
 
     checkCompile("typer", source) { (tree, context) =>
       given Context = context
+      given CState = context.cstate
       val bar = tree.find(tree => tree.symbol.name == termName("bar")).get
       assertEquals("package object foo", bar.symbol.owner.show)
     }
@@ -46,6 +47,7 @@ class PrinterTests extends DottyTest {
 
     checkCompile("typer", source) { (tree, context) =>
       given Context = context
+      given CState = context.cstate
       val bar @ Trees.DefDef(_, _, _, _, _) = tree.find(tree => tree.symbol.name == termName("bar2")).get
       assertEquals("Int & (Boolean | String)", bar.tpt.show)
     }
diff --git a/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala b/compiler/test/dotty/tools/dotc/reporting/ErrorMessagesTest.scala
@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package reporting
 
-import core.Contexts.Context
+import core.Contexts._
 import scala.collection.mutable
 import org.junit.Assert._
 
diff --git a/compiler/test/dotty/tools/dotc/reporting/UserDefinedErrorMessages.scala b/compiler/test/dotty/tools/dotc/reporting/UserDefinedErrorMessages.scala
@@ -2,7 +2,7 @@ package dotty.tools
 package dotc
 package reporting
 
-import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.Contexts._
 import org.junit.Assert._
 import org.junit.Test
 
@@ -24,6 +24,7 @@ class UserDefinedErrorMessages extends ErrorMessagesTest {
       """.stripMargin
     }.expect { (itcx, messages) =>
       given Context = itcx
+      given CState = itcx.cstate
 
       assertMessageCount(1, messages)
       val (m: NoExplanation) :: Nil = messages
@@ -48,6 +49,7 @@ class UserDefinedErrorMessages extends ErrorMessagesTest {
       """.stripMargin
     }.expect { (itcx, messages) =>
       given Context = itcx
+      given CState = itcx.cstate
 
       assertMessageCount(1, messages)
       val (m: NoExplanation) :: Nil = messages
@@ -73,6 +75,7 @@ class UserDefinedErrorMessages extends ErrorMessagesTest {
       """.stripMargin
     }.expect { (itcx, messages) =>
       given Context = itcx
+      given CState = itcx.cstate
 
       assertMessageCount(1, messages)
       val (m: NoExplanation) :: Nil = messages
@@ -95,6 +98,7 @@ class UserDefinedErrorMessages extends ErrorMessagesTest {
       """.stripMargin
     }.expect { (itcx, messages) =>
       given Context = itcx
+      given CState = itcx.cstate
 
       assertMessageCount(1, messages)
       val (m: NoExplanation) :: Nil = messages
@@ -117,6 +121,7 @@ class UserDefinedErrorMessages extends ErrorMessagesTest {
       """.stripMargin
     }.expect { (itcx, messages) =>
       given Context = itcx
+      given CState = itcx.cstate
 
       assertMessageCount(1, messages)
       val (m: NoExplanation) :: Nil = messages
diff --git a/compiler/test/dotty/tools/dotc/transform/TreeTransformerTest.scala b/compiler/test/dotty/tools/dotc/transform/TreeTransformerTest.scala
@@ -6,14 +6,15 @@ import org.junit.{Assert, Test}
 import MegaPhase._
 import ast.tpd
 import core.Constants.Constant
-import core.Contexts.{Context, CState}
+import core.Contexts._
 
 class TreeTransformerTest extends DottyTest {
 
   @Test
   def shouldReturnSameTreeIfUnchanged: Unit = checkCompile("typer", "class A{ val d = 1}") {
     (tree, context) =>
       given Context = context
+      given CState = context.cstate
       class EmptyTransform extends MiniPhase {
         override def phaseName: String = "empty"
         init(ctx.base, ctx.period.firstPhaseId, ctx.period.lastPhaseId)
@@ -30,6 +31,7 @@ class TreeTransformerTest extends DottyTest {
   def canReplaceConstant: Unit = checkCompile("typer", "class A{ val d = 1}") {
     (tree, context) =>
       given Context = context
+      given CState = context.cstate
       class ConstantTransform extends MiniPhase {
 
         override def transformLiteral(tree: tpd.Literal)(using Context, CState): tpd.Tree = tpd.Literal(Constant(2))
@@ -48,6 +50,7 @@ class TreeTransformerTest extends DottyTest {
   def canOverwrite: Unit = checkCompile("typer", "class A{ val d = 1}") {
     (tree, context) =>
       given Context = context
+      given CState = context.cstate
       class Transformation extends MiniPhase {
 
         override def transformLiteral(tree: tpd.Literal)(using Context, CState): tpd.Tree = tpd.Literal(Constant(-1))
@@ -74,6 +77,7 @@ class TreeTransformerTest extends DottyTest {
   def transformationOrder: Unit = checkCompile("typer", "class A{ val d = 1}") {
     (tree, context) =>
       given Context = context
+      given CState = context.cstate
       class Transformation1 extends MiniPhase {
         override def phaseName: String = "transformationOrder1"
 
@@ -116,6 +120,7 @@ class TreeTransformerTest extends DottyTest {
   def invocationCount: Unit = checkCompile("typer", "class A{ val d = 1}") {
     (tree, context) =>
       given Context = context
+      given CState = context.cstate
       var transformed1 = 0
       class Transformation1 extends MiniPhase {
         override def phaseName: String = "invocationCount1"
diff --git a/compiler/test/dotty/tools/dotc/typer/DivergenceChecker.scala b/compiler/test/dotty/tools/dotc/typer/DivergenceChecker.scala
@@ -34,6 +34,7 @@ class DivergenceCheckerTests extends DottyTest {
     checkTypes(source, List(types, elements)) {
       case (List(tpes, elements0), context) =>
         given Context = context
+        given CState = context.cstate
 
         val List(a, b, n, o, s, t2, i, l) = elements0.map(_.typeConstructor)
         val expectedCoveringSets = List(
diff --git a/compiler/test/dotty/tools/dotc/typer/SubtypingInvariantTests.scala b/compiler/test/dotty/tools/dotc/typer/SubtypingInvariantTests.scala
@@ -1,7 +1,7 @@
 package dotty.tools.dotc.typer
 
 import dotty.tools.DottyTest
-import dotty.tools.dotc.core.Contexts.Context
+import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.core.Types.TypeBounds
 import dotty.tools.dotc.typer.ProtoTypes.newTypeVar
 import org.junit.Test
@@ -12,6 +12,7 @@ class SubtypingInvariantTests extends DottyTest {
   def typeVarInvariant(): Unit = {
     checkCompile("typer", "class A") { (_, ctx0) =>
       given Context = ctx0
+      given CState = ctx0.cstate
       val a = newTypeVar(TypeBounds.empty)
       val b = newTypeVar(TypeBounds.empty)
       assert(a <:< b)
diff --git a/compiler/test/dotty/tools/repl/ReplCompilerTests.scala b/compiler/test/dotty/tools/repl/ReplCompilerTests.scala
@@ -4,7 +4,7 @@ import java.util.regex.Pattern
 
 import org.junit.Assert.{assertTrue => assert, _}
 import org.junit.{Ignore, Test}
-import dotty.tools.dotc.core.Contexts.{Context, CState, ctx}
+import dotty.tools.dotc.core.Contexts._
 
 class ReplCompilerTests extends ReplTest {
   import ReplCompilerTests._
