diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/dotc/comptest.scala | 2 | ||||
-rw-r--r-- | test/dotc/tests.scala | 2 | ||||
-rw-r--r-- | test/dotty/tools/ContextEscapeDetection.java (renamed from test/test/ContextEscapeDetection.java) | 6 | ||||
-rw-r--r-- | test/dotty/tools/ContextEscapeDetector.java (renamed from test/test/ContextEscapeDetector.java) | 3 | ||||
-rw-r--r-- | test/dotty/tools/DottyTest.scala (renamed from test/test/DottyTest.scala) | 26 | ||||
-rw-r--r-- | test/dotty/tools/DottyTypeStealer.scala (renamed from test/test/DottyTypeStealer.scala) | 14 | ||||
-rw-r--r-- | test/dotty/tools/ShowClassTests.scala (renamed from test/test/ShowClassTests.scala) | 16 | ||||
-rw-r--r-- | test/dotty/tools/TypeStealer.scala (renamed from test/test/TypeStealer.scala) | 8 | ||||
-rw-r--r-- | test/dotty/tools/backend/jvm/AsmConverters.scala (renamed from test/test/AsmConverters.scala) | 2 | ||||
-rw-r--r-- | test/dotty/tools/backend/jvm/AsmNode.scala (renamed from test/test/AsmNode.scala) | 2 | ||||
-rw-r--r-- | test/dotty/tools/backend/jvm/DottyBytecodeTest.scala (renamed from test/test/DottyBytecodeTest.scala) | 12 | ||||
-rw-r--r-- | test/dotty/tools/backend/jvm/DottyBytecodeTests.scala (renamed from test/test/DottyBytecodeTests.scala) | 2 | ||||
-rw-r--r-- | test/dotty/tools/backend/jvm/InlineBytecodeTests.scala (renamed from test/test/InlineBytecodeTests.scala) | 2 | ||||
-rw-r--r-- | test/dotty/tools/dotc/CompilerTest.scala (renamed from test/test/CompilerTest.scala) | 14 | ||||
-rw-r--r-- | test/dotty/tools/dotc/EntryPointsTest.scala (renamed from test/test/OtherEntryPointsTest.scala) | 12 | ||||
-rw-r--r-- | test/dotty/tools/dotc/InterfaceEntryPointTest.scala (renamed from test/test/InterfaceEntryPointTest.scala) | 4 | ||||
-rw-r--r-- | test/dotty/tools/dotc/ast/TreeInfoTest.scala | 4 | ||||
-rw-r--r-- | test/dotty/tools/dotc/parsing/DeSugarTest.scala (renamed from test/test/DeSugarTest.scala) | 12 | ||||
-rw-r--r-- | test/dotty/tools/dotc/parsing/DocstringTest.scala (renamed from test/test/DottyDocTest.scala) | 10 | ||||
-rw-r--r-- | test/dotty/tools/dotc/parsing/DocstringTests.scala (renamed from test/test/DottyDocParsingTests.scala) | 6 | ||||
-rw-r--r-- | test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala (renamed from test/test/ModifiersParsingTest.scala) | 18 | ||||
-rw-r--r-- | test/dotty/tools/dotc/parsing/ParserTest.scala (renamed from test/test/ParserTest.scala) | 11 | ||||
-rw-r--r-- | test/dotty/tools/dotc/parsing/ScannerTest.scala (renamed from test/test/ScannerTest.scala) | 7 | ||||
-rw-r--r-- | test/dotty/tools/dotc/parsing/desugarPackage.scala (renamed from test/test/desugarPackage.scala) | 5 | ||||
-rw-r--r-- | test/dotty/tools/dotc/parsing/parseFile.scala (renamed from test/test/parseFile.scala) | 2 | ||||
-rw-r--r-- | test/dotty/tools/dotc/parsing/parsePackage.scala (renamed from test/test/parsePackage.scala) | 4 | ||||
-rw-r--r-- | test/dotty/tools/dotc/parsing/showTree.scala (renamed from test/test/showTree.scala) | 6 | ||||
-rw-r--r-- | test/dotty/tools/dotc/repl/TestREPL.scala (renamed from test/test/TestREPL.scala) | 6 | ||||
-rw-r--r-- | test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala (renamed from test/test/transform/CreateCompanionObjectsTest.scala) | 12 | ||||
-rw-r--r-- | test/dotty/tools/dotc/transform/LazyValsTest.scala (renamed from test/test/transform/LazyValsTest.scala) | 5 | ||||
-rw-r--r-- | test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala (renamed from test/test/transform/PostTyperTransformerTest.scala) | 12 | ||||
-rw-r--r-- | test/dotty/tools/dotc/transform/TreeTransformerTest.scala (renamed from test/test/transform/TreeTransformerTest.scala) | 15 | ||||
-rw-r--r-- | test/dotty/tools/showClass.scala (renamed from test/test/showClass.scala) | 4 | ||||
-rw-r--r-- | test/test/ContravariantTrees.scala | 65 | ||||
-rw-r--r-- | test/test/SamplePhaseTest.scala | 16 | ||||
-rw-r--r-- | test/worksheets/baseTypetest.sc (renamed from test/test/baseTypetest.sc) | 0 | ||||
-rw-r--r-- | test/worksheets/denotTest.sc (renamed from test/test/denotTest.sc) | 0 | ||||
-rw-r--r-- | test/worksheets/flagtest.sc (renamed from test/test/flagtest.sc) | 0 | ||||
-rw-r--r-- | test/worksheets/nesting.sc (renamed from test/test/nesting.sc) | 0 | ||||
-rw-r--r-- | test/worksheets/periodtest.sc (renamed from test/test/periodtest.sc) | 0 | ||||
-rw-r--r-- | test/worksheets/positiontest.sc (renamed from test/test/positiontest.sc) | 0 | ||||
-rw-r--r-- | test/worksheets/sigtest.sc (renamed from test/test/sigtest.sc) | 0 | ||||
-rw-r--r-- | test/worksheets/testnames.sc (renamed from test/test/testnames.sc) | 0 | ||||
-rw-r--r-- | test/x/PatMat.scala | 16 | ||||
-rw-r--r-- | test/x/cakes.scala | 49 | ||||
-rw-r--r-- | test/x/names.scala | 21 | ||||
-rw-r--r-- | test/x/xplore.sc | 70 | ||||
-rw-r--r-- | test/x/xplore2.sc | 104 |
48 files changed, 135 insertions, 472 deletions
diff --git a/test/dotc/comptest.scala b/test/dotc/comptest.scala index 5b6646f39..5ae1823e8 100644 --- a/test/dotc/comptest.scala +++ b/test/dotc/comptest.scala @@ -1,6 +1,6 @@ package dotc -import test._ +import dotty.tools.dotc.CompilerTest object comptest extends CompilerTest { diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index e0bcbea7e..842236b16 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -1,6 +1,6 @@ package dotc -import test._ +import dotty.tools.dotc.CompilerTest import org.junit.{Before, Test} import java.io.{ File => JFile } diff --git a/test/test/ContextEscapeDetection.java b/test/dotty/tools/ContextEscapeDetection.java index 8852c9fe9..6a47de5c6 100644 --- a/test/test/ContextEscapeDetection.java +++ b/test/dotty/tools/ContextEscapeDetection.java @@ -1,4 +1,4 @@ -package test; +package dotty.tools; import dotty.tools.dotc.core.Contexts; import org.junit.*; @@ -7,7 +7,6 @@ import java.lang.ref.WeakReference; import java.util.LinkedList; import java.util.List; - public abstract class ContextEscapeDetection { public static class TestContext{ public TestContext(WeakReference<Contexts.Context> context, String testName) { @@ -34,7 +33,4 @@ public abstract class ContextEscapeDetection { public synchronized void clearContext() { this.clearCtx(); } - - } - diff --git a/test/test/ContextEscapeDetector.java b/test/dotty/tools/ContextEscapeDetector.java index 78d293a5d..e19fc5a64 100644 --- a/test/test/ContextEscapeDetector.java +++ b/test/dotty/tools/ContextEscapeDetector.java @@ -1,9 +1,8 @@ -package test; +package dotty.tools; import org.junit.runner.Result; import org.junit.runner.notification.RunListener; import org.junit.Assert; - import java.lang.ref.WeakReference; public class ContextEscapeDetector extends RunListener { diff --git a/test/test/DottyTest.scala b/test/dotty/tools/DottyTest.scala index 57bd9bbc4..9e7b6fccb 100644 --- a/test/test/DottyTest.scala +++ b/test/dotty/tools/DottyTest.scala @@ -1,22 +1,22 @@ -package test +package dotty +package tools -import dotty.tools.dotc.core._ -import dotty.tools.dotc.core.Contexts._ -import dotty.tools.dotc.core.Symbols._ -import dotty.tools.dotc.core.Flags._ +import dotc.core._ +import dotc.core.Contexts._ +import dotc.core.Symbols._ +import dotc.core.Flags._ import Types._, Symbols._, Decorators._ -import dotty.tools.dotc.printing.Texts._ -import dotty.tools.dotc.reporting.ConsoleReporter -import dotty.tools.dotc.core.Decorators._ -import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.Compiler +import dotc.printing.Texts._ +import dotc.reporting.ConsoleReporter +import dotc.core.Decorators._ +import dotc.ast.tpd +import dotc.Compiler -import dotty.tools.dotc -import dotty.tools.dotc.core.Phases.Phase +import dotc.core.Phases.Phase class DottyTest extends ContextEscapeDetection{ - dotty.tools.dotc.parsing.Scanners // initialize keywords + dotc.parsing.Scanners // initialize keywords implicit var ctx: Contexts.Context = { val base = new ContextBase {} diff --git a/test/test/DottyTypeStealer.scala b/test/dotty/tools/DottyTypeStealer.scala index fed14499a..819f19d25 100644 --- a/test/test/DottyTypeStealer.scala +++ b/test/dotty/tools/DottyTypeStealer.scala @@ -1,11 +1,11 @@ -package test +package dotty.tools -import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.core.Names._ -import dotty.tools.dotc.ast.tpd._ -import dotty.tools.dotc.core.Contexts.Context -import dotty.tools.dotc.core.Decorators._ -import dotty.tools.dotc.core.Types.Type +import dotc.ast.tpd +import dotc.core.Names._ +import dotc.ast.tpd._ +import dotc.core.Contexts.Context +import dotc.core.Decorators._ +import dotc.core.Types.Type object DottyTypeStealer { def stealType(source: String, typeStrings: String*): (Context, List[Type]) = { diff --git a/test/test/ShowClassTests.scala b/test/dotty/tools/ShowClassTests.scala index 81e304296..96ab6080c 100644 --- a/test/test/ShowClassTests.scala +++ b/test/dotty/tools/ShowClassTests.scala @@ -1,13 +1,13 @@ -package test +package dotty.tools -import dotty.tools.dotc.core._ -import dotty.tools.dotc.core.Contexts._ -import dotty.tools.dotc.core.Symbols._ -import dotty.tools.dotc.core.Flags._ -import dotty.tools.dotc.core.Types._ -import dotty.tools.dotc.printing.Texts._ +import dotc.core._ +import dotc.core.Contexts._ +import dotc.core.Symbols._ +import dotc.core.Flags._ +import dotc.core.Types._ +import dotc.printing.Texts._ import NameOps._ -import dotty.tools.dotc.core.Decorators._ +import dotc.core.Decorators._ import org.junit.Test class ShowClassTests extends DottyTest { diff --git a/test/test/TypeStealer.scala b/test/dotty/tools/TypeStealer.scala index ae48d9a5b..ccaf2d41e 100644 --- a/test/test/TypeStealer.scala +++ b/test/dotty/tools/TypeStealer.scala @@ -1,11 +1,8 @@ -package test +package dotty.tools + import scala.tools.nsc.interpreter._ import scala.tools.nsc.Settings -/** - * Dotty requires a mangled bootclasspath to start. It means that `console` mode of sbt doesn't work for us. - * At least I(Dmitry) wasn't able to make sbt fork in console - */ object TypeStealer { def main(args: Array[String]): Unit = { def repl = new ILoop {} @@ -13,7 +10,6 @@ object TypeStealer { val settings = new Settings settings.Yreplsync.value = true - //use when launching normally outside SBT settings.usejavacp.value = true diff --git a/test/test/AsmConverters.scala b/test/dotty/tools/backend/jvm/AsmConverters.scala index 5734e8660..499037c47 100644 --- a/test/test/AsmConverters.scala +++ b/test/dotty/tools/backend/jvm/AsmConverters.scala @@ -1,4 +1,4 @@ -package test +package dotty.tools.backend.jvm import scala.tools.asm import asm._ diff --git a/test/test/AsmNode.scala b/test/dotty/tools/backend/jvm/AsmNode.scala index 80211e2af..ac3f34258 100644 --- a/test/test/AsmNode.scala +++ b/test/dotty/tools/backend/jvm/AsmNode.scala @@ -1,4 +1,4 @@ -package test +package dotty.tools.backend.jvm import java.lang.reflect.Modifier import scala.tools.asm diff --git a/test/test/DottyBytecodeTest.scala b/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala index dbf86bf8e..fc9853691 100644 --- a/test/test/DottyBytecodeTest.scala +++ b/test/dotty/tools/backend/jvm/DottyBytecodeTest.scala @@ -1,9 +1,9 @@ -package test +package dotty.tools +package backend.jvm -import dotty.tools.dotc.core.Contexts.{Context, ContextBase} -import dotty.tools.dotc.core.Phases.Phase -import dotty.tools.backend.jvm.GenBCode -import dotty.tools.dotc.Compiler +import dotc.core.Contexts.{Context, ContextBase} +import dotc.core.Phases.Phase +import dotc.Compiler import scala.reflect.io.{VirtualDirectory => Directory} import scala.tools.asm @@ -17,7 +17,7 @@ import scala.tools.asm.{ClassWriter, ClassReader} import scala.tools.asm.tree._ import java.io.{File => JFile, InputStream} -private[test] class TestGenBCode(val outDir: String) extends GenBCode { +class TestGenBCode(val outDir: String) extends GenBCode { override def phaseName: String = "testGenBCode" val virtualDir = new Directory(outDir, None) override def outputDir(implicit ctx: Context) = virtualDir diff --git a/test/test/DottyBytecodeTests.scala b/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala index 5b5989474..ce71ef3cb 100644 --- a/test/test/DottyBytecodeTests.scala +++ b/test/dotty/tools/backend/jvm/DottyBytecodeTests.scala @@ -1,4 +1,4 @@ -package test +package dotty.tools.backend.jvm import org.junit.Assert._ import org.junit.Test diff --git a/test/test/InlineBytecodeTests.scala b/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala index f7dc35305..033783303 100644 --- a/test/test/InlineBytecodeTests.scala +++ b/test/dotty/tools/backend/jvm/InlineBytecodeTests.scala @@ -1,4 +1,4 @@ -package test +package dotty.tools.backend.jvm import org.junit.Assert._ import org.junit.Test diff --git a/test/test/CompilerTest.scala b/test/dotty/tools/dotc/CompilerTest.scala index 05a7d62b8..e0d225169 100644 --- a/test/test/CompilerTest.scala +++ b/test/dotty/tools/dotc/CompilerTest.scala @@ -1,13 +1,13 @@ -package test +package dotty.tools.dotc -import dotty.tools.dotc.core.Contexts._ +import repl.TestREPL +import core.Contexts._ import dotty.partest.DPConfig -import dotty.tools.dotc.{Main, Bench, Driver} -import dotty.tools.dotc.interfaces.Diagnostic.ERROR -import dotty.tools.dotc.reporting._ +import interfaces.Diagnostic.ERROR +import reporting._ import diagnostic.MessageContainer -import dotty.tools.dotc.util.SourcePosition -import dotty.tools.dotc.config.CompilerCommand +import util.SourcePosition +import config.CompilerCommand import dotty.tools.io.PlainFile import scala.collection.mutable.ListBuffer import scala.reflect.io.{ Path, Directory, File => SFile, AbstractFile } diff --git a/test/test/OtherEntryPointsTest.scala b/test/dotty/tools/dotc/EntryPointsTest.scala index ae46fa36f..4673ffd3c 100644 --- a/test/test/OtherEntryPointsTest.scala +++ b/test/dotty/tools/dotc/EntryPointsTest.scala @@ -1,12 +1,12 @@ -package test +package dotty.tools +package dotc import org.junit.Test import org.junit.Assert._ -import dotty.tools.dotc.Main import dotty.tools.dotc.interfaces.{CompilerCallback, SourceFile} -import dotty.tools.dotc.reporting._ -import dotty.tools.dotc.reporting.diagnostic.MessageContainer -import dotty.tools.dotc.core.Contexts._ +import reporting._ +import reporting.diagnostic.MessageContainer +import core.Contexts._ import java.io.File import scala.collection.mutable.ListBuffer @@ -16,7 +16,7 @@ import scala.collection.mutable.ListBuffer * * @see [[InterfaceEntryPointTest]] */ -class OtherEntryPointsTest { +class EntryPointsTest { private val sources = List("./tests/pos/HelloWorld.scala").map(p => new java.io.File(p).getPath()) private val dottyInterfaces = diff --git a/test/test/InterfaceEntryPointTest.scala b/test/dotty/tools/dotc/InterfaceEntryPointTest.scala index a1a8433d7..6624b45dd 100644 --- a/test/test/InterfaceEntryPointTest.scala +++ b/test/dotty/tools/dotc/InterfaceEntryPointTest.scala @@ -1,8 +1,8 @@ -package test +package dotty.tools.dotc import org.junit.Test import org.junit.Assert._ -import dotty.tools.dotc.interfaces._ +import interfaces._ import scala.collection.mutable.ListBuffer /** Test that demonstrates how to use dotty-interfaces diff --git a/test/dotty/tools/dotc/ast/TreeInfoTest.scala b/test/dotty/tools/dotc/ast/TreeInfoTest.scala index 6e02ee813..a55973c43 100644 --- a/test/dotty/tools/dotc/ast/TreeInfoTest.scala +++ b/test/dotty/tools/dotc/ast/TreeInfoTest.scala @@ -1,8 +1,8 @@ -package dotty.tools.dotc +package dotty.tools +package dotc package ast import org.junit.Test -import test.DottyTest import core.Names._ import core.Types._ import core.Symbols._ diff --git a/test/test/DeSugarTest.scala b/test/dotty/tools/dotc/parsing/DeSugarTest.scala index d7a056e42..1f79c2cf6 100644 --- a/test/test/DeSugarTest.scala +++ b/test/dotty/tools/dotc/parsing/DeSugarTest.scala @@ -1,11 +1,11 @@ -package test +package dotty.tools +package dotc +package parsing -import scala.reflect.io._ -import dotty.tools.dotc.util._ -import dotty.tools.dotc.core._ -import dotty.tools.dotc.parsing._ import Tokens._, Parsers._ -import dotty.tools.dotc._ +import scala.reflect.io._ +import util._ +import core._ import ast.Trees._ import ast.desugar import ast.desugar._ diff --git a/test/test/DottyDocTest.scala b/test/dotty/tools/dotc/parsing/DocstringTest.scala index 34269ec64..30e885f70 100644 --- a/test/test/DottyDocTest.scala +++ b/test/dotty/tools/dotc/parsing/DocstringTest.scala @@ -1,9 +1,11 @@ -package test +package dotty.tools +package dotc +package parsing -import dotty.tools.dotc.ast.Trees._ -import dotty.tools.dotc.core.Contexts.Context +import ast.Trees._ +import core.Contexts.Context -trait DottyDocTest extends DottyTest { +trait DocstringTest extends DottyTest { ctx = ctx.fresh.setSetting(ctx.settings.YkeepComments, true) def checkDocString(actual: Option[String], expected: String): Unit = actual match { diff --git a/test/test/DottyDocParsingTests.scala b/test/dotty/tools/dotc/parsing/DocstringTests.scala index 8522cdae3..930ec117a 100644 --- a/test/test/DottyDocParsingTests.scala +++ b/test/dotty/tools/dotc/parsing/DocstringTests.scala @@ -1,4 +1,6 @@ -package test +package dotty.tools +package dotc +package parsing import dotty.tools.dotc.core.Contexts.Context import dotty.tools.dotc.ast.Trees._ @@ -6,7 +8,7 @@ import dotty.tools.dotc.ast.Trees._ import org.junit.Assert._ import org.junit.Test -class DottyDocParsingTests extends DottyDocTest { +class DocstringTests extends DocstringTest { @Test def noComment = { import dotty.tools.dotc.ast.untpd._ diff --git a/test/test/ModifiersParsingTest.scala b/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala index 82aa33281..e31ef2160 100644 --- a/test/test/ModifiersParsingTest.scala +++ b/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala @@ -1,15 +1,17 @@ -package test +package dotty.tools +package dotc +package parsing import org.junit.Test import org.junit.Assert._ -import dotty.tools.dotc.ast.untpd.modsDeco -import dotty.tools.dotc.ast.untpd._ -import dotty.tools.dotc.ast.{ Trees => d } -import dotty.tools.dotc.parsing.Parsers.Parser -import dotty.tools.dotc.util.SourceFile -import dotty.tools.dotc.core.Contexts.ContextBase -import dotty.tools.dotc.core.Flags +import ast.untpd.modsDeco +import ast.untpd._ +import ast.{ Trees => d } +import Parsers.Parser +import util.SourceFile +import core.Contexts.ContextBase +import core.Flags object ModifiersParsingTest { implicit val ctx = (new ContextBase).initialCtx diff --git a/test/test/ParserTest.scala b/test/dotty/tools/dotc/parsing/ParserTest.scala index f66dbf55d..a89b34512 100644 --- a/test/test/ParserTest.scala +++ b/test/dotty/tools/dotc/parsing/ParserTest.scala @@ -1,12 +1,13 @@ -package test +package dotty.tools +package dotc +package parsing import scala.reflect.io._ -import dotty.tools.dotc.util._ -import dotty.tools.dotc.core._ -import dotty.tools.dotc.parsing._ +import util._ +import core._ import scala.io.Codec import Tokens._, Parsers._ -import dotty.tools.dotc.ast.untpd._ +import ast.untpd._ import org.junit.Test import scala.collection.mutable.ListBuffer diff --git a/test/test/ScannerTest.scala b/test/dotty/tools/dotc/parsing/ScannerTest.scala index 5ff9bba0c..2177b99a4 100644 --- a/test/test/ScannerTest.scala +++ b/test/dotty/tools/dotc/parsing/ScannerTest.scala @@ -1,9 +1,10 @@ -package test +package dotty.tools +package dotc +package parsing import scala.reflect.io._ import scala.io.Codec -import dotty.tools.dotc.util._ -import dotty.tools.dotc.parsing._ +import util._ import Tokens._, Scanners._ import org.junit.Test diff --git a/test/test/desugarPackage.scala b/test/dotty/tools/dotc/parsing/desugarPackage.scala index 7f56e470b..84bf7a2d1 100644 --- a/test/test/desugarPackage.scala +++ b/test/dotty/tools/dotc/parsing/desugarPackage.scala @@ -1,6 +1,7 @@ -package test +package dotty.tools +package dotc +package parsing -import dotty.tools.dotc._ import core._, ast._ import Trees._ diff --git a/test/test/parseFile.scala b/test/dotty/tools/dotc/parsing/parseFile.scala index c82fe22e7..c41a286cb 100644 --- a/test/test/parseFile.scala +++ b/test/dotty/tools/dotc/parsing/parseFile.scala @@ -1,4 +1,4 @@ -package test +package dotty.tools.dotc.parsing object parseFile extends ParserTest { diff --git a/test/test/parsePackage.scala b/test/dotty/tools/dotc/parsing/parsePackage.scala index 6fa5c0f86..df5368ffe 100644 --- a/test/test/parsePackage.scala +++ b/test/dotty/tools/dotc/parsing/parsePackage.scala @@ -1,4 +1,6 @@ -package test +package dotty.tools +package dotc +package parsing import dotty.tools.dotc._ import core._, ast._ diff --git a/test/test/showTree.scala b/test/dotty/tools/dotc/parsing/showTree.scala index 8d5a5ad7c..18b2203d5 100644 --- a/test/test/showTree.scala +++ b/test/dotty/tools/dotc/parsing/showTree.scala @@ -1,5 +1,7 @@ -package test -import dotty.tools.dotc._ +package dotty.tools +package dotc +package parsing + import ast.Trees._ import ast.desugar import ast.desugar._ diff --git a/test/test/TestREPL.scala b/test/dotty/tools/dotc/repl/TestREPL.scala index cccfacc41..7be8dc13e 100644 --- a/test/test/TestREPL.scala +++ b/test/dotty/tools/dotc/repl/TestREPL.scala @@ -1,7 +1,7 @@ -package test +package dotty.tools.dotc +package repl -import dotty.tools.dotc.repl._ -import dotty.tools.dotc.core.Contexts.Context +import core.Contexts.Context import collection.mutable import java.io.StringWriter diff --git a/test/test/transform/CreateCompanionObjectsTest.scala b/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala index 82830781c..18acb2105 100644 --- a/test/test/transform/CreateCompanionObjectsTest.scala +++ b/test/dotty/tools/dotc/transform/CreateCompanionObjectsTest.scala @@ -1,10 +1,10 @@ -package test.transform - +package dotty.tools +package dotc +package transform import org.junit.{Assert, Test} -import test.DottyTest -import dotty.tools.dotc.core._ -import dotty.tools.dotc.ast.{tpd, Trees} +import core._ +import ast.{tpd, Trees} import Contexts._ import Flags._ import Denotations._ @@ -13,7 +13,7 @@ import Symbols._ import Types._ import Decorators._ import Trees._ -import dotty.tools.dotc.transform.TreeTransforms.{TreeTransform, TreeTransformer} +import TreeTransforms.{TreeTransform, TreeTransformer} class CreateCompanionObjectsTest extends DottyTest { diff --git a/test/test/transform/LazyValsTest.scala b/test/dotty/tools/dotc/transform/LazyValsTest.scala index 5b8a659fa..96298c571 100644 --- a/test/test/transform/LazyValsTest.scala +++ b/test/dotty/tools/dotc/transform/LazyValsTest.scala @@ -1,7 +1,8 @@ -package test.transform +package dotty.tools +package dotc +package transform import org.junit.Test -import test.DottyTest import org.junit.Assert class LazyValsTest extends DottyTest { diff --git a/test/test/transform/PostTyperTransformerTest.scala b/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala index 9886c3023..03d6d9b36 100644 --- a/test/test/transform/PostTyperTransformerTest.scala +++ b/test/dotty/tools/dotc/transform/PostTyperTransformerTest.scala @@ -1,10 +1,10 @@ -package test.transform - +package dotty.tools +package dotc +package transform import org.junit.{Assert, Test} -import test.DottyTest -import dotty.tools.dotc.core._ -import dotty.tools.dotc.ast.Trees +import core._ +import ast.Trees import Contexts._ import Flags._ import Denotations._ @@ -13,7 +13,7 @@ import Symbols._ import Types._ import Decorators._ import Trees._ -import dotty.tools.dotc.transform.TreeTransforms.{TreeTransform, TreeTransformer} +import TreeTransforms.{TreeTransform, TreeTransformer} class PostTyperTransformerTest extends DottyTest { /* FIXME: re-enable after adapting to new scheme diff --git a/test/test/transform/TreeTransformerTest.scala b/test/dotty/tools/dotc/transform/TreeTransformerTest.scala index df6175735..d72980d80 100644 --- a/test/test/transform/TreeTransformerTest.scala +++ b/test/dotty/tools/dotc/transform/TreeTransformerTest.scala @@ -1,13 +1,12 @@ -package test.transform - +package dotty.tools +package dotc +package transform import org.junit.{Assert, Test} -import test.DottyTest -import dotty.tools.dotc.transform.TreeTransforms.{TransformerInfo, TreeTransformer, MiniPhaseTransform} -import dotty.tools.dotc.ast.tpd -import dotty.tools.dotc.core.Constants.Constant -import dotty.tools.dotc.core.Contexts.Context - +import TreeTransforms.{TransformerInfo, TreeTransformer, MiniPhaseTransform} +import ast.tpd +import core.Constants.Constant +import core.Contexts.Context class TreeTransformerTest extends DottyTest { diff --git a/test/test/showClass.scala b/test/dotty/tools/showClass.scala index 78751ad6e..012f5f59e 100644 --- a/test/test/showClass.scala +++ b/test/dotty/tools/showClass.scala @@ -1,6 +1,6 @@ -package test +package dotty.tools -import dotty.tools.dotc.core.Decorators._ +import dotc.core.Decorators._ object showClass extends ShowClassTests { diff --git a/test/test/ContravariantTrees.scala b/test/test/ContravariantTrees.scala deleted file mode 100644 index 999224042..000000000 --- a/test/test/ContravariantTrees.scala +++ /dev/null @@ -1,65 +0,0 @@ -package test - -import language.higherKinds -import dotty.tools.dotc.core._ -import Flags._, Names._, StdNames._ -import annotation.unchecked.uncheckedVariance - -object ContravariantTrees { - - type Untyped = Null - - case class Modifiers[-T >: Untyped] ( - flags: FlagSet = EmptyFlags, - privateWithin: TypeName = tpnme.EMPTY, - annotations: List[Tree[T]] = Nil) { - - def is(fs: FlagSet): Boolean = flags is fs - def is(fc: FlagConjunction): Boolean = flags is fc - - def | (fs: FlagSet): Modifiers[T] = withFlags(flags | fs) - def & (fs: FlagSet): Modifiers[T] = withFlags(flags & fs) - def &~(fs: FlagSet): Modifiers[T] = withFlags(flags &~ fs) - - def toTypeFlags: Modifiers[T] = withFlags(flags.toTypeFlags) - def toTermFlags: Modifiers[T] = withFlags(flags.toTermFlags) - - private def withFlags(flags: FlagSet) = - if (this.flags == flags) this - else copy(flags = flags) - - def withPrivateWithin(pw: TypeName) = - if (pw.isEmpty) this - else copy(privateWithin = pw) - - def hasFlags = flags != EmptyFlags - def hasAnnotations = annotations.nonEmpty - def hasPrivateWithin = privateWithin != tpnme.EMPTY - } - - abstract class Tree[-T >: Untyped] { - private[this] var myTpe: T = _ - private def setMyTpe(tpe: T) = myTpe = tpe - - def tpe: T @uncheckedVariance = { - if (myTpe == null) throw new Error() - myTpe - } - } - - trait TermTree[-T >: Untyped] extends Tree[T] { - type ThisTree[T >: Untyped] <: TermTree[T] - } - - case class Select[-T >: Untyped](qualifier: Tree[T], name: Name) - extends TermTree[T] { - type ThisTree[T >: Untyped] = Select[T] - } - - /** mods def name[tparams](vparams_1)...(vparams_n): tpt = rhs */ - case class DefDef[-T >: Untyped](mods: Modifiers[T], name: TermName, tparams: List[Tree[T]], vparamss: List[List[Tree[T]]], tpt: Tree[T], rhs: Tree[T]) - extends Tree[T] { - type ThisTree[T >: Untyped] = DefDef[T] - } - -} diff --git a/test/test/SamplePhaseTest.scala b/test/test/SamplePhaseTest.scala deleted file mode 100644 index 47037f1d8..000000000 --- a/test/test/SamplePhaseTest.scala +++ /dev/null @@ -1,16 +0,0 @@ -package test - -import org.junit.{Assert, Test} - -class SamplePhaseTest extends DottyTest { - - // Disabled, awaiting resolution: @Test - def testTypechekingSimpleClass = checkCompile("frontend", "class A{}") { - (tree, context) => - implicit val ctx = context - Assert.assertTrue("can typecheck simple class", - tree.toString == "PackageDef(Ident(<empty>),List(TypeDef(Modifiers(,,List()),A,Template(DefDef(Modifiers(,,List()),<init>,List(),List(List()),TypeTree[TypeRef(ThisType(module class scala),Unit)],EmptyTree),List(Apply(Select(New(TypeTree[TypeRef(ThisType(module class lang),Object)]),<init>),List())),ValDef(Modifiers(private,,List()),_,EmptyTree,EmptyTree),List()))))" - ) - } - -} diff --git a/test/test/baseTypetest.sc b/test/worksheets/baseTypetest.sc index 001f1e3b3..001f1e3b3 100644 --- a/test/test/baseTypetest.sc +++ b/test/worksheets/baseTypetest.sc diff --git a/test/test/denotTest.sc b/test/worksheets/denotTest.sc index 222a347b6..222a347b6 100644 --- a/test/test/denotTest.sc +++ b/test/worksheets/denotTest.sc diff --git a/test/test/flagtest.sc b/test/worksheets/flagtest.sc index ac3a6ab13..ac3a6ab13 100644 --- a/test/test/flagtest.sc +++ b/test/worksheets/flagtest.sc diff --git a/test/test/nesting.sc b/test/worksheets/nesting.sc index a6fc92432..a6fc92432 100644 --- a/test/test/nesting.sc +++ b/test/worksheets/nesting.sc diff --git a/test/test/periodtest.sc b/test/worksheets/periodtest.sc index 09c02da19..09c02da19 100644 --- a/test/test/periodtest.sc +++ b/test/worksheets/periodtest.sc diff --git a/test/test/positiontest.sc b/test/worksheets/positiontest.sc index 11cc54dbe..11cc54dbe 100644 --- a/test/test/positiontest.sc +++ b/test/worksheets/positiontest.sc diff --git a/test/test/sigtest.sc b/test/worksheets/sigtest.sc index ed3793f1c..ed3793f1c 100644 --- a/test/test/sigtest.sc +++ b/test/worksheets/sigtest.sc diff --git a/test/test/testnames.sc b/test/worksheets/testnames.sc index 282b07d4e..282b07d4e 100644 --- a/test/test/testnames.sc +++ b/test/worksheets/testnames.sc diff --git a/test/x/PatMat.scala b/test/x/PatMat.scala deleted file mode 100644 index 131136a1e..000000000 --- a/test/x/PatMat.scala +++ /dev/null @@ -1,16 +0,0 @@ -package x - -trait PatMat { - - trait A - type TT <: B1 - trait B2 - trait B1 extends B - case class B() - - def foo[T <: Any](x: TT) = x match { - case x: B => println("!!!") - case "hi" => ??? - } - -} diff --git a/test/x/cakes.scala b/test/x/cakes.scala deleted file mode 100644 index ff5e5d64f..000000000 --- a/test/x/cakes.scala +++ /dev/null @@ -1,49 +0,0 @@ -package test - -trait API { - - type Name >: Null <: NameAPI - type Symbol >: Null <: SymbolAPI - type ScopeEntry >: Null <: ScopeEntryAPI - - class NameAPI - class SymbolAPI - class ScopeEntryAPI - -} - -trait Names { self: SymTab => - - class Name extends NameAPI - -} - -trait Symbols { self: SymTab => - - class Symbol extends SymbolAPI - -} - -trait Scopes { self: SymTab => - - class ScopeEntry extends ScopeEntryAPI - class Scope { - def unlink(e: ScopeEntry): Unit = ??? - def unlink(e: Symbol): Unit = ??? - } - -} - -trait SymTab extends API with Names with Scopes { - -} - - -trait SyncOps extends SymTab { - - trait SyncScope extends Scope { - override def unlink(e: ScopeEntry): Unit = ??? - override def unlink(e: Symbol): Unit = ??? - } - -} diff --git a/test/x/names.scala b/test/x/names.scala deleted file mode 100644 index c80c3e51d..000000000 --- a/test/x/names.scala +++ /dev/null @@ -1,21 +0,0 @@ -package test - -object Foo { - def foo = 1 -} - -object Bar { - def foo = 2 -} - -object Test123 { - - import Foo.foo - - object Inner { - - import Bar._ -//!! println(foo) - } - -} diff --git a/test/x/xplore.sc b/test/x/xplore.sc deleted file mode 100644 index 15b431637..000000000 --- a/test/x/xplore.sc +++ /dev/null @@ -1,70 +0,0 @@ -package x -import dotty.tools.dotc._ -import core._ -import Contexts._ -import Symbols._ -import Decorators._ - -object xplore { - println("Welcome to the Scala worksheet") //> Welcome to the Scala worksheet - val c = Main.newCompiler //> c : dotty.tools.dotc.Compiler = dotty.tools.dotc.Compiler@36ff057f - val base = new ContextBase //> base : dotty.tools.dotc.core.Contexts.ContextBase = dotty.tools.dotc.core.C - //| ontexts$ContextBase@2980f96c - implicit val ctx = c.rootContext(base.initialCtx) - //> ctx : dotty.tools.dotc.core.Contexts.Context = dotty.tools.dotc.core.Contex - //| ts$InitialContext@6aadae91 - val strClass = defn.StringClass //> strClass : dotty.tools.dotc.core.Symbols.ClassSymbol = class String#213 - strClass.baseClasses //> res0: List[dotty.tools.dotc.core.Symbols.ClassSymbol] = List(class String#21 - //| 3, class CharSequence#531, class Comparable#102, class Serializable#3816, cl - //| ass Object#129, class Any#2133) - strClass.typeRef <:< defn.AnyType //> res1: Boolean = true - val predef = defn.PredefModule //> predef : dotty.tools.dotc.core.Symbols.TermSymbol = module Predef#1515 - val strd = predef.info.member("String".toTypeName) - //> strd : dotty.tools.dotc.core.Denotations.Denotation = type String - strd.info //> res2: dotty.tools.dotc.core.Types.Type = TypeAlias(TypeRef(ThisType(module c - //| lass lang#57),String)) - val strType = strd.symbol.typeRef //> strType : dotty.tools.dotc.core.Types.TypeRef = TypeRef(ThisType(module cla - //| ss Predef$#1516),String) - strType <:< defn.AnyType //> res3: Boolean = true - val prdef = defn.PredefModule //> prdef : dotty.tools.dotc.core.Symbols.TermSymbol = module Predef#1515 - predef.isCompleted //> res4: Boolean = true - predef.info.parents //> res5: List[dotty.tools.dotc.core.Types.TypeRef] = List(TypeRef(ThisType(modu - //| le class scala#35),LowPriorityImplicits), TypeRef(ThisType(module class scal - //| a#35),DeprecatedPredef)) - predef.info //> res6: dotty.tools.dotc.core.Types.Type = TypeRef(ThisType(module class scala - //| #35),Predef$) - predef.info.typeSymbol //> res7: dotty.tools.dotc.core.Symbols.Symbol = module class Predef$#1516 - val scala = defn.ScalaPackageClass //> scala : dotty.tools.dotc.core.Symbols.ClassSymbol = module class scala#35 - scala.info.decl("Predef$".toTypeName) //> res8: dotty.tools.dotc.core.Denotations.Denotation = module class Predef$ - predef.info.decls //> res9: dotty.tools.dotc.core.Scopes.Scope = Scopes(val <init>#4979, val class - //| Of#4980, type Class#4981, type String#4984, type Function#4985, type Map#498 - //| 8, type Set#4991, val Map#4993, val Map #4994, val Set#4995, val Set #4996, - //| type ClassManifest#4997, type OptManifest#4999, type Manifest#5001, val Clas - //| sManifest#5003, val ClassManifest #5004, val Manifest#5005, val Manifest #50 - //| 06, val NoManifest#5007, val NoManifest #5008, val manifest#5009, val classM - //| anifest#5012, val optManifest#5015, val identity#5018, val implicitly#5021, - //| val locally#5024, val error#5027, val assert#5029, val assert#5031, val assu - //| me#5034, val assume#5036, val require#5039, val require#5041, val $qmark$qma - //| rk$qmark#5044, type Pair#5045, module Pair#5048, type Triple#5060, module Tr - //| iple#5064, class ArrowAssoc#5079, val ArrowAssoc#5094, class Ensuring#5097, - //| val Ensuring#5116, class StringFormat#5119, val StringFormat#5130, class Str - //| ingAdd#5133, val StringAdd#5144, class RichException#5147, val RichException - //| #5156, class SeqCharSequence#5158, val SeqCharSequence#5170, class ArrayChar - //| Sequence#5172, val ArrayCharSequence#5184, val StringCanBuildFrom#5186, val - //| StringCanBuildFrom #5187, val augmentString#5188, val unaugmentString#5190, - //| val print#5192, val println#5194, val println#5195, val printf#5197, val tup - //| le2ToZippedOps#5200, val tuple3ToZippedOps#5204, val genericArrayOps#5209, v - //| al booleanArrayOps#5212, val byteArrayOps#5214, val charArrayOps#5216, val d - //| oubleArrayOps#5218, val floatArrayOps#5220, val intArrayOps#5222, val longAr - //| rayOps#5224, val refArrayOps#5226, val shortArrayOps#5229, val unitArrayOps# - //| 5231, val byte2Byte#5233, val short2Short#5235, val char2Character#5237, val - //| int2Integer#5239, val long2Long#5241, val float2Float#5243, val double2Doub - //| le#5245, val boolean2Boolean#5247, val Byte2byte#5249, val Short2short#5251, - //| val Character2char#5253, val Integer2int#5255, val Long2long#5257, val Floa - //| t2float#5259, val Double2double#5261, val Boolean2boolean#5263, class $less$ - //| colon$less#5265, val singleton_$less$colon$less#5270, val conforms#5271, cla - //| ss $eq$colon$eq#5273, val singleton_$eq$colon$eq#5278, module $eq$colon$eq#5 - //| 279, class DummyImplicit#5285, module DummyImplicit#5287, module RichExcepti - //| on#5291, module StringAdd#5301, module StringFormat#5315, module Ensuring#53 - //| 29, module ArrowAssoc#5357) -}
\ No newline at end of file diff --git a/test/x/xplore2.sc b/test/x/xplore2.sc deleted file mode 100644 index 5a33b2519..000000000 --- a/test/x/xplore2.sc +++ /dev/null @@ -1,104 +0,0 @@ -package x -import dotty.tools.dotc._ -import core._ -import Contexts._ -import Symbols._ -import Decorators._ // should always import to get useful implicit decorators. -import Flags._ -import Types._ -import ast.Trees._ -import ast.tpd -import ast.untpd -import Constants._ - -object xplore2 { - import ast.tpd._ - println("Welcome to the Scala worksheet") //> Welcome to the Scala worksheet - val c = Main.newCompiler //> c : dotty.tools.dotc.Compiler = dotty.tools.dotc.Compiler@d8d9850 - val base = new ContextBase //> base : dotty.tools.dotc.core.Contexts.ContextBase = dotty.tools.dotc.core.C - //| ontexts$ContextBase@31ad98ef - implicit val ctx = c.rootContext(base.initialCtx) - //> ctx : dotty.tools.dotc.core.Contexts.Context = Context( - //| owner = module class <root>, scope = Scopes() - //| owner = module class <root>, scope = Scopes() - //| owner = module class <root>, scope = Scopes() - //| owner = module class <root>, scope = Scopes() - //| owner = module class <root>, scope = Scopes() - //| owner = val <none>, scope = null - - val SerializableClass = ctx.requiredClass("scala.Serializable") - //> SerializableClass : dotty.tools.dotc.core.Symbols.ClassSymbol = class Seria - //| lizable - val SystemModule = ctx.requiredModule("java.lang.System") - //> SystemModule : dotty.tools.dotc.core.Symbols.TermSymbol = module System - - val scope = new Scopes.MutableScope //> scope : dotty.tools.dotc.core.Scopes.MutableScope = Scopes() - val bla = ctx.newClassSymbol( // suggestion: Use newCompleteClassSymbol instead! - owner = defn.EmptyPackageClass, - name = "Bia".toTypeName, - flags = EmptyFlags, - infoFn = cls => ClassInfo( - prefix = defn.EmptyPackageClass.thisType, - cls = cls, - classParents = List(defn.ObjectClass.typeRef, SerializableClass.typeRef), - decls = scope, - selfInfo = NoType)).entered //> bla : dotty.tools.dotc.core.Symbols.ClassSymbol = class Bia - val constr = ctx.newConstructor(bla, EmptyFlags, List("p".toTermName, "r".toTermName), List(defn.AnyRefType, defn.IntType)).entered - //> constr : dotty.tools.dotc.core.Symbols.Symbol{type ThisName = dotty.tools. - //| dotc.core.Names.TermName} = method <init> - val foo = ctx.newSymbol( - owner = bla, - name = "foo".toTermName, - flags = Final, - info = MethodType(List("s".toTermName), List(defn.IntType), defn.UnitType)).entered - //> foo : dotty.tools.dotc.core.Symbols.Symbol{type ThisName = dotty.tools.dot - //| c.core.Names.TermName} = val foo - val rep = ctx.newSymbol(bla, "rep".toTermName, flags = Lazy, info = defn.IntType).entered - //> rep : dotty.tools.dotc.core.Symbols.Symbol{type ThisName = dotty.tools.dot - //| c.core.Names.TermName} = val rep - val tostr = ctx.newSymbol(bla, "toString".toTermName, flags = Override, info = defn.UnitType).entered - //> tostr : dotty.tools.dotc.core.Symbols.Symbol{type ThisName = dotty.tools.d - //| otc.core.Names.TermName} = val toString -// val repTree = ValDef(rep, Literal(Constant(3))) - "==".toTermName.encode //> res0: dotty.tools.dotc.core.Names.Name = $eq$eq - val b = ctx.newSymbol(tostr, "b".toTermName, EmptyFlags, bla.typeRef) - //> b : dotty.tools.dotc.core.Symbols.Symbol{type ThisName = dotty.tools.dotc. - //| core.Names.TermName} = val b - - val bTree = ValDef(b, New(bla.typeRef, List(This(bla), Literal(Constant(3))))) - //> bTree : dotty.tools.dotc.ast.tpd.ValDef = ValDef(Modifiers(,,List()),b,Typ - //| eTree[TypeRef(ThisType(module class <empty>),Bia)],Apply(Select(New(TypeTre - //| e[TypeRef(ThisType(module class <empty>),Bia)]),<init>),List(This(Bia), Lit - //| eral(Constant(3))))) - val system = tpd.Ident(SystemModule.termRef) //> system : dotty.tools.dotc.ast.tpd.Ident = Ident(System) - - val ref @ TermRef(_, _) = system.tpe //> ref : dotty.tools.dotc.core.Types.TermRef = TermRef(ThisType(module class - //| lang),System) - ref.symbol //> res1: dotty.tools.dotc.core.Symbols.Symbol = module System - val idHash = Select(system, "identityHashCode".toTermName) - //> idHash : dotty.tools.dotc.ast.tpd.Select = Select(Ident(System),identityHa - //| shCode) - val idHashApp = Apply(idHash, Ident(b.termRef) :: Nil) - //> idHashApp : dotty.tools.dotc.ast.tpd.Apply = Apply(Select(Ident(System),id - //| entityHashCode),List(Ident(b))) - val eqlref = defn.IntType.member("==".toTermName) - //> eqlref : dotty.tools.dotc.core.Denotations.Denotation = val <none> - - /* - val tostrTree = { - Block( - List( - ValDef(b, New(bla.typeRef, List(This(bla), Literal(Constant(3))))), - If( - Apply( - Select( - Apply( - Select(Ident(SystemModule.termRef), "identityHashCode".toTermName), - Ident(b.termRef) :: Nil), - "==".toTermName.encode), - Literal(Constant(0)) :: Nil), - Apply(Select(Ident(b.termRef), foo.termRef), Literal(Constant(3)) :: Nil), - EmptyTree)), - Literal(Constant(()))) - }*/ -}
\ No newline at end of file |