diff options
| -rw-r--r-- | src/dotty/tools/dotc/ast/TreeTypeMap.scala | 2 | ||||
| -rw-r--r-- | test/dotc/tests.scala | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/dotty/tools/dotc/ast/TreeTypeMap.scala b/src/dotty/tools/dotc/ast/TreeTypeMap.scala index ec66fcdb8..511c5ef4a 100644 --- a/src/dotty/tools/dotc/ast/TreeTypeMap.scala +++ b/src/dotty/tools/dotc/ast/TreeTypeMap.scala @@ -13,8 +13,6 @@ import dotty.tools.dotc.transform.SymUtils._ * @param typeMap A function from Type to Type that gets applied to the * type of every tree node and to all locally defined symbols, * followed by the substitution [substFrom := substTo]. - * @param ownerMap A function that translates owners of top-level local symbols - * defined in the mapped tree. * @param treeMap A transformer that translates all encountered subtrees in * prefix traversal orders * @param oldOwners Previous owners. If a top-level local symbol in the mapped tree diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 512cad90e..61ebae609 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -42,7 +42,7 @@ class tests extends CompilerTest { val toolsDir = dottyDir + "tools/" val dotcDir = toolsDir + "dotc/" val coreDir = dotcDir + "core/" -/* + @Test def pickle_pickleOK = compileDir(testsDir, "pickling", testPickling) @Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling) @Test def pickle_ast = compileDir(dotcDir, "ast", testPickling) @@ -135,9 +135,9 @@ class tests extends CompilerTest { @Test def neg_escapingRefs = compileFile(negDir, "escapingRefs", xerrors = 2) @Test def neg_instantiateAbstract = compileFile(negDir, "instantiateAbstract", xerrors = 8) @Test def neg_selfInheritance = compileFile(negDir, "selfInheritance", xerrors = 5) -*/ + @Test def dotty = compileDir(toolsDir, "", "-deep" :: allowDeepSubtypes ++ twice) // note the -deep argument -/* + @Test def dotc_ast = compileDir(dotcDir, "ast") @Test def dotc_config = compileDir(dotcDir, "config") @Test def dotc_core = compileDir(dotcDir, "core")("-Yno-double-bindings" :: allowDeepSubtypes)// twice omitted to make tests run faster @@ -178,6 +178,6 @@ class tests extends CompilerTest { ), List(/* "-Ylog:frontend", */ "-Xprompt") ++ staleSymbolError ++ twice) val javaDir = "./tests/pos/java-interop/" - @Test def java_all = compileFiles(javaDir, twice)*/ + @Test def java_all = compileFiles(javaDir, twice) //@Test def dotc_compilercommand = compileFile(dotcDir + "config/", "CompilerCommand") } |