diff --git a/compiler/src/dotty/tools/dotc/tastyreflect/FromSymbol.scala b/compiler/src/dotty/tools/dotc/tastyreflect/FromSymbol.scala index 2a7e3ca2af4c..c2a91a914e5c 100644 --- a/compiler/src/dotty/tools/dotc/tastyreflect/FromSymbol.scala +++ b/compiler/src/dotty/tools/dotc/tastyreflect/FromSymbol.scala @@ -10,6 +10,7 @@ import dotty.tools.dotc.core.Types._ object FromSymbol { def definitionFromSym(sym: Symbol)(implicit ctx: Context): tpd.Tree = { + assert(sym.exists) if (sym.is(Package)) packageDefFromSym(sym) else if (sym.isClass) classDef(sym.asClass) else if (sym.isType) typeDefFromSym(sym.asType) @@ -19,21 +20,32 @@ object FromSymbol { def packageDefFromSym(sym: Symbol)(implicit ctx: Context): PackageDefinition = PackageDefinitionImpl(sym) - def classDef(cls: ClassSymbol)(implicit ctx: Context): tpd.TypeDef = { - val constrSym = cls.unforcedDecls.find(_.isPrimaryConstructor).orElse( - // Dummy constructor for classes such as `` - ctx.newSymbol(cls, nme.CONSTRUCTOR, EmptyFlags, NoType) - ) - val constr = tpd.DefDef(constrSym.asTerm) - val parents = cls.classParents.map(tpd.TypeTree(_)) - val body = cls.unforcedDecls.filter(!_.isPrimaryConstructor).map(s => definitionFromSym(s)) - tpd.ClassDefWithParents(cls, constr, parents, body) + def classDef(cls: ClassSymbol)(implicit ctx: Context): tpd.TypeDef = cls.defTree match { + case tree: tpd.TypeDef => tree + case tpd.EmptyTree => + val constrSym = cls.unforcedDecls.find(_.isPrimaryConstructor).orElse( + // Dummy constructor for classes such as `` + ctx.newSymbol(cls, nme.CONSTRUCTOR, EmptyFlags, NoType) + ) + val constr = tpd.DefDef(constrSym.asTerm) + val parents = cls.classParents.map(tpd.TypeTree(_)) + val body = cls.unforcedDecls.filter(!_.isPrimaryConstructor).map(s => definitionFromSym(s)) + tpd.ClassDefWithParents(cls, constr, parents, body) } - def typeDefFromSym(sym: TypeSymbol)(implicit ctx: Context): tpd.TypeDef = tpd.TypeDef(sym) + def typeDefFromSym(sym: TypeSymbol)(implicit ctx: Context): tpd.TypeDef = sym.defTree match { + case tree: tpd.TypeDef => tree + case tpd.EmptyTree => tpd.TypeDef(sym) + } - def defDefFromSym(sym: TermSymbol)(implicit ctx: Context): tpd.DefDef = tpd.DefDef(sym) + def defDefFromSym(sym: TermSymbol)(implicit ctx: Context): tpd.DefDef = sym.defTree match { + case tree: tpd.DefDef => tree + case tpd.EmptyTree => tpd.DefDef(sym) + } - def valDefFromSym(sym: TermSymbol)(implicit ctx: Context): tpd.ValDef = tpd.ValDef(sym) + def valDefFromSym(sym: TermSymbol)(implicit ctx: Context): tpd.ValDef = sym.defTree match { + case tree: tpd.ValDef => tree + case tpd.EmptyTree => tpd.ValDef(sym) + } } diff --git a/compiler/src/dotty/tools/dotc/tastyreflect/TreeOpsImpl.scala b/compiler/src/dotty/tools/dotc/tastyreflect/TreeOpsImpl.scala index bc9d57d50544..c8970474be27 100644 --- a/compiler/src/dotty/tools/dotc/tastyreflect/TreeOpsImpl.scala +++ b/compiler/src/dotty/tools/dotc/tastyreflect/TreeOpsImpl.scala @@ -316,7 +316,7 @@ trait TreeOpsImpl extends scala.tasty.reflect.TreeOps with TastyCoreImpl with He } object Inlined extends InlinedExtractor { - def unapply(x: Term)(implicit ctx: Context): Option[(Option[Term], List[Statement], Term)] = x match { + def unapply(x: Term)(implicit ctx: Context): Option[(Option[Parent], List[Statement], Term)] = x match { case x: tpd.Inlined => Some((optional(x.call), x.bindings, x.expansion)) case _ => None diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala index e76934395b15..86791f38224f 100644 --- a/compiler/test/dotty/tools/dotc/CompilationTests.scala +++ b/compiler/test/dotty/tools/dotc/CompilationTests.scala @@ -169,6 +169,7 @@ class CompilationTests extends ParallelTesting { @Test def runAll: Unit = { implicit val testGroup: TestGroup = TestGroup("runAll") + compileFilesInDir("tests/run-custom-args/Yretain-trees", defaultOptions and "-Yretain-trees") + compileFilesInDir("tests/run", defaultOptions) }.checkRuns() diff --git a/library/src/scala/tasty/reflect/TreeOps.scala b/library/src/scala/tasty/reflect/TreeOps.scala index f956e97f6369..8abf360be50d 100644 --- a/library/src/scala/tasty/reflect/TreeOps.scala +++ b/library/src/scala/tasty/reflect/TreeOps.scala @@ -286,7 +286,7 @@ trait TreeOps extends TastyCore { val Inlined: InlinedExtractor abstract class InlinedExtractor { - def unapply(tree: Tree)(implicit ctx: Context): Option[(Option[Term], List[Definition], Term)] + def unapply(tree: Tree)(implicit ctx: Context): Option[(Option[Parent], List[Definition], Term)] } val SelectOuter: SelectOuterExtractor diff --git a/library/src/scala/tasty/util/ShowExtractors.scala b/library/src/scala/tasty/util/ShowExtractors.scala index ccdbd4fc5b16..2eb56e4427b4 100644 --- a/library/src/scala/tasty/util/ShowExtractors.scala +++ b/library/src/scala/tasty/util/ShowExtractors.scala @@ -69,7 +69,9 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty case Term.Repeated(elems) => this += "Term.Repeated(" ++= elems += ")" case Term.Inlined(call, bindings, expansion) => - this += "Term.Inlined(" += call += ", " ++= bindings += ", " += expansion += ")" + this += "Term.Inlined(" + visitOption(call, visitParent) + this += ", " ++= bindings += ", " += expansion += ")" case ValDef(name, tpt, rhs) => this += "ValDef(\"" += name += "\", " += tpt += ", " += rhs += ")" case DefDef(name, typeParams, paramss, returnTpt, rhs) => @@ -78,10 +80,7 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty this += "TypeDef(\"" += name += "\", " += rhs += ")" case ClassDef(name, constr, parents, self, body) => this += "ClassDef(\"" += name += "\", " += constr += ", " - visitList[Parent](parents, { - case IsTerm(parent) => this += parent - case IsTypeTree(parent) => this += parent - }) + visitList[Parent](parents, visitParent) this += ", " += self += ", " ++= body += ")" case PackageDef(name, owner) => this += "PackageDef(\"" += name += "\", " += owner += ")" @@ -142,6 +141,11 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty this += "Pattern.TypeTest(" += tpt += ")" } + def visitParent(x: Parent): Buffer = x match { + case IsTerm(parent) => this += parent + case IsTypeTree(parent) => this += parent + } + def visitConstant(x: Constant): Buffer = x match { case Constant.Unit() => this += "Constant.Unit()" case Constant.Null() => this += "Constant.Null()" diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-2.check b/tests/run-custom-args/Yretain-trees/tasty-definitions-2.check new file mode 100644 index 000000000000..8f6dddd4da1e --- /dev/null +++ b/tests/run-custom-args/Yretain-trees/tasty-definitions-2.check @@ -0,0 +1,2 @@ +DefDef("foo", Nil, Nil, TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(1)), "+", Some(Signature(List(scala.Int), scala.Int))), List(Term.Literal(Constant.Int(2)))))) +ValDef("bar", TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(2)), "+", Some(Signature(List(scala.Int), scala.Int))), List(Term.Literal(Constant.Int(3)))))) diff --git a/tests/run/tasty-definitions-2/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala similarity index 100% rename from tests/run/tasty-definitions-2/Macro_1.scala rename to tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala diff --git a/tests/run/tasty-definitions-2/Test_2.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-2/Test_2.scala similarity index 100% rename from tests/run/tasty-definitions-2/Test_2.scala rename to tests/run-custom-args/Yretain-trees/tasty-definitions-2/Test_2.scala diff --git a/tests/run-custom-args/Yretain-trees/tasty-definitions-3.check b/tests/run-custom-args/Yretain-trees/tasty-definitions-3.check new file mode 100644 index 000000000000..8f6dddd4da1e --- /dev/null +++ b/tests/run-custom-args/Yretain-trees/tasty-definitions-3.check @@ -0,0 +1,2 @@ +DefDef("foo", Nil, Nil, TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(1)), "+", Some(Signature(List(scala.Int), scala.Int))), List(Term.Literal(Constant.Int(2)))))) +ValDef("bar", TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(2)), "+", Some(Signature(List(scala.Int), scala.Int))), List(Term.Literal(Constant.Int(3)))))) diff --git a/tests/run/tasty-definitions-3/Macro_1.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala similarity index 100% rename from tests/run/tasty-definitions-3/Macro_1.scala rename to tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala diff --git a/tests/run/tasty-definitions-3/Test_2.scala b/tests/run-custom-args/Yretain-trees/tasty-definitions-3/Test_2.scala similarity index 100% rename from tests/run/tasty-definitions-3/Test_2.scala rename to tests/run-custom-args/Yretain-trees/tasty-definitions-3/Test_2.scala diff --git a/tests/run-custom-args/Yretain-trees/tasty-extractors-owners.check b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners.check new file mode 100644 index 000000000000..9d583ddae984 --- /dev/null +++ b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners.check @@ -0,0 +1,27 @@ +foo +DefDef("main", Nil, List(List(ValDef("args", TypeTree.Applied(TypeTree.TypeIdent("Array"), List(TypeTree.TypeIdent("String"))), None))), TypeTree.TypeIdent("Unit"), Some(Term.Block(Nil, Term.Inlined(Some(TypeTree.TypeIdent("Macros$")), Nil, Term.Select(Term.Apply(Term.Apply(Term.TypeApply(Term.Ident("impl"), List(TypeTree.Synthetic())), List(Term.Apply(Term.TypeApply(Term.Ident("apply"), List(TypeTree.Synthetic())), List(Term.Inlined(None, Nil, Term.Block(List(DefDef("foo", Nil, Nil, TypeTree.Synthetic(), Some(Term.Block(List(DefDef("bar", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(1)))), ValDef("bar2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(2))))), Term.Typed(Term.Ident("bar"), TypeTree.Synthetic())))), ValDef("foo2", TypeTree.Synthetic(), Some(Term.Block(List(DefDef("baz", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(3)))), ValDef("baz2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(4))))), Term.Typed(Term.Ident("baz"), TypeTree.Synthetic())))), ClassDef("A", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("B", TypeTree.TypeIdent("Int")), DefDef("b", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(5)))), ValDef("b2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(6))))))), Term.Literal(Constant.Unit()))))))), List(Term.Ident("macroContext"))), "unary_~", Some(Signature(Nil, java.lang.Object))))))) + +bar +DefDef("foo", Nil, Nil, TypeTree.Synthetic(), Some(Term.Block(List(DefDef("bar", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(1)))), ValDef("bar2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(2))))), Term.Typed(Term.Ident("bar"), TypeTree.Synthetic())))) + +bar2 +DefDef("foo", Nil, Nil, TypeTree.Synthetic(), Some(Term.Block(List(DefDef("bar", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(1)))), ValDef("bar2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(2))))), Term.Typed(Term.Ident("bar"), TypeTree.Synthetic())))) + +foo2 +DefDef("main", Nil, List(List(ValDef("args", TypeTree.Applied(TypeTree.TypeIdent("Array"), List(TypeTree.TypeIdent("String"))), None))), TypeTree.TypeIdent("Unit"), Some(Term.Block(Nil, Term.Inlined(Some(TypeTree.TypeIdent("Macros$")), Nil, Term.Select(Term.Apply(Term.Apply(Term.TypeApply(Term.Ident("impl"), List(TypeTree.Synthetic())), List(Term.Apply(Term.TypeApply(Term.Ident("apply"), List(TypeTree.Synthetic())), List(Term.Inlined(None, Nil, Term.Block(List(DefDef("foo", Nil, Nil, TypeTree.Synthetic(), Some(Term.Block(List(DefDef("bar", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(1)))), ValDef("bar2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(2))))), Term.Typed(Term.Ident("bar"), TypeTree.Synthetic())))), ValDef("foo2", TypeTree.Synthetic(), Some(Term.Block(List(DefDef("baz", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(3)))), ValDef("baz2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(4))))), Term.Typed(Term.Ident("baz"), TypeTree.Synthetic())))), ClassDef("A", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("B", TypeTree.TypeIdent("Int")), DefDef("b", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(5)))), ValDef("b2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(6))))))), Term.Literal(Constant.Unit()))))))), List(Term.Ident("macroContext"))), "unary_~", Some(Signature(Nil, java.lang.Object))))))) + +baz +ValDef("foo2", TypeTree.Synthetic(), Some(Term.Block(List(DefDef("baz", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(3)))), ValDef("baz2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(4))))), Term.Typed(Term.Ident("baz"), TypeTree.Synthetic())))) + +baz2 +ValDef("foo2", TypeTree.Synthetic(), Some(Term.Block(List(DefDef("baz", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(3)))), ValDef("baz2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(4))))), Term.Typed(Term.Ident("baz"), TypeTree.Synthetic())))) + + +ClassDef("A", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("B", TypeTree.TypeIdent("Int")), DefDef("b", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(5)))), ValDef("b2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(6)))))) + +b +ClassDef("A", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("B", TypeTree.TypeIdent("Int")), DefDef("b", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(5)))), ValDef("b2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(6)))))) + +b2 +ClassDef("A", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("B", TypeTree.TypeIdent("Int")), DefDef("b", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(5)))), ValDef("b2", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(6)))))) + diff --git a/tests/run/tasty-extractors-owners/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala similarity index 100% rename from tests/run/tasty-extractors-owners/quoted_1.scala rename to tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_1.scala diff --git a/tests/run/tasty-extractors-owners/quoted_2.scala b/tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_2.scala similarity index 100% rename from tests/run/tasty-extractors-owners/quoted_2.scala rename to tests/run-custom-args/Yretain-trees/tasty-extractors-owners/quoted_2.scala diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-1.check b/tests/run-custom-args/Yretain-trees/tasty-load-tree-1.check new file mode 100644 index 000000000000..8f6dddd4da1e --- /dev/null +++ b/tests/run-custom-args/Yretain-trees/tasty-load-tree-1.check @@ -0,0 +1,2 @@ +DefDef("foo", Nil, Nil, TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(1)), "+", Some(Signature(List(scala.Int), scala.Int))), List(Term.Literal(Constant.Int(2)))))) +ValDef("bar", TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(2)), "+", Some(Signature(List(scala.Int), scala.Int))), List(Term.Literal(Constant.Int(3)))))) diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala new file mode 100644 index 000000000000..6e0b8d551d87 --- /dev/null +++ b/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_1.scala @@ -0,0 +1,26 @@ +import scala.quoted._ + +import scala.tasty._ + +object Foo { + + inline def inspectBody(i: => Int): String = + ~inspectBodyImpl('(i)) + + def inspectBodyImpl(x: Expr[Int])(implicit tasty: Tasty): Expr[String] = { + import tasty._ + + def definitionString(tree: Tree): Expr[String] = tree.symbol.tree match { + case Some(definition) => definition.show.toExpr + case None => '("NO DEFINTION") + } + + x.toTasty match { + case Term.Inlined(None, Nil, arg) => definitionString(arg) + case arg => definitionString(arg) // TODO should all by name parameters be in an inline node + } + } + + def foo: Int = 1 + 2 + val bar: Int = 2 + 3 +} diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_2.scala b/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_2.scala new file mode 100644 index 000000000000..2aa76a7f2822 --- /dev/null +++ b/tests/run-custom-args/Yretain-trees/tasty-load-tree-1/quoted_2.scala @@ -0,0 +1,7 @@ + +object Test { + def main(args: Array[String]): Unit = { + println(Foo.inspectBody(Foo.foo)) + println(Foo.inspectBody(Foo.bar)) + } +} diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-2.check b/tests/run-custom-args/Yretain-trees/tasty-load-tree-2.check new file mode 100644 index 000000000000..8f6dddd4da1e --- /dev/null +++ b/tests/run-custom-args/Yretain-trees/tasty-load-tree-2.check @@ -0,0 +1,2 @@ +DefDef("foo", Nil, Nil, TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(1)), "+", Some(Signature(List(scala.Int), scala.Int))), List(Term.Literal(Constant.Int(2)))))) +ValDef("bar", TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(2)), "+", Some(Signature(List(scala.Int), scala.Int))), List(Term.Literal(Constant.Int(3)))))) diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala b/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala new file mode 100644 index 000000000000..7008417dac7a --- /dev/null +++ b/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_1.scala @@ -0,0 +1,23 @@ +import scala.quoted._ + +import scala.tasty._ + +object Foo { + + inline def inspectBody(i: => Int): String = + ~inspectBodyImpl('(i)) + + def inspectBodyImpl(x: Expr[Int])(implicit tasty: Tasty): Expr[String] = { + import tasty._ + + def definitionString(tree: Tree): Expr[String] = tree.symbol.tree match { + case Some(definition) => definition.show.toExpr + case None => '("NO DEFINTION") + } + + x.toTasty match { + case Term.Inlined(None, Nil, arg) => definitionString(arg) + case arg => definitionString(arg) // TODO should all by name parameters be in an inline node + } + } +} diff --git a/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_2.scala b/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_2.scala new file mode 100644 index 000000000000..2cffe72c5a74 --- /dev/null +++ b/tests/run-custom-args/Yretain-trees/tasty-load-tree-2/quoted_2.scala @@ -0,0 +1,10 @@ + +object Test { + def main(args: Array[String]): Unit = { + println(Foo.inspectBody(foo)) + println(Foo.inspectBody(bar)) + } + + def foo: Int = 1 + 2 + val bar: Int = 2 + 3 +} diff --git a/tests/run/tasty-definitions-2.check b/tests/run/tasty-definitions-2.check deleted file mode 100644 index e92423eea1ca..000000000000 --- a/tests/run/tasty-definitions-2.check +++ /dev/null @@ -1,2 +0,0 @@ -DefDef("foo", Nil, Nil, TypeTree.Synthetic(), None) -ValDef("bar", TypeTree.Synthetic(), None) diff --git a/tests/run/tasty-definitions-3.check b/tests/run/tasty-definitions-3.check deleted file mode 100644 index e92423eea1ca..000000000000 --- a/tests/run/tasty-definitions-3.check +++ /dev/null @@ -1,2 +0,0 @@ -DefDef("foo", Nil, Nil, TypeTree.Synthetic(), None) -ValDef("bar", TypeTree.Synthetic(), None) diff --git a/tests/run/tasty-extractors-owners.check b/tests/run/tasty-extractors-owners.check deleted file mode 100644 index 84e8f1b6be6d..000000000000 --- a/tests/run/tasty-extractors-owners.check +++ /dev/null @@ -1,27 +0,0 @@ -foo -DefDef("main", Nil, List(List(ValDef("args", TypeTree.Synthetic(), None))), TypeTree.Synthetic(), None) - -bar -DefDef("foo", Nil, Nil, TypeTree.Synthetic(), None) - -bar2 -DefDef("foo", Nil, Nil, TypeTree.Synthetic(), None) - -foo2 -DefDef("main", Nil, List(List(ValDef("args", TypeTree.Synthetic(), None))), TypeTree.Synthetic(), None) - -baz -ValDef("foo2", TypeTree.Synthetic(), None) - -baz2 -ValDef("foo2", TypeTree.Synthetic(), None) - - -ClassDef("A", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(TypeTree.Synthetic()), None, List(TypeDef("B", SyntheticBounds()), DefDef("b", Nil, Nil, TypeTree.Synthetic(), None), ValDef("b2", TypeTree.Synthetic(), None))) - -b -ClassDef("A", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(TypeTree.Synthetic()), None, List(TypeDef("B", SyntheticBounds()), DefDef("b", Nil, Nil, TypeTree.Synthetic(), None), ValDef("b2", TypeTree.Synthetic(), None))) - -b2 -ClassDef("A", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(TypeTree.Synthetic()), None, List(TypeDef("B", SyntheticBounds()), DefDef("b", Nil, Nil, TypeTree.Synthetic(), None), ValDef("b2", TypeTree.Synthetic(), None))) -