From b3bf1e6c8c1698507a6a1192df6004ec33274bce Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 25 May 2018 14:27:22 +0200 Subject: [PATCH 1/3] Print shallow extractor for SymRef definitions This allows to copy pase the printed extractor --- .../src/scala/tasty/util/ShowExtractors.scala | 10 +-- tests/run/tasty-extractors-1.check | 62 +++++++++--------- tests/run/tasty-extractors-2.check | 64 +++++++++---------- tests/run/tasty-extractors-3.check | 42 ++++++------ tests/run/tasty-extractors-types.check | 8 +-- 5 files changed, 93 insertions(+), 93 deletions(-) diff --git a/library/src/scala/tasty/util/ShowExtractors.scala b/library/src/scala/tasty/util/ShowExtractors.scala index 078915c407bd..86f62b215fbd 100644 --- a/library/src/scala/tasty/util/ShowExtractors.scala +++ b/library/src/scala/tasty/util/ShowExtractors.scala @@ -145,11 +145,11 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty this += "ConstantType(" += value += ")" case Type.SymRef(sym, qual) => def visitName(sym: Definition): Buffer = sym match { - case ValDef(name, _, _) => this += name - case DefDef(name, _, _, _, _) => this += name - case TypeDef(name, _) => this += name - case ClassDef(name, _, _, _, _) => this += name - case PackageDef(name, _) => this += name + case ValDef(name, _, _) => this += "ValDef(" += name += ", _, _)" + case DefDef(name, _, _, _, _) => this += "DefDef(" += name += ", _, _, _, _)" + case TypeDef(name, _) => this += "TypeDef(" += name += ", _)" + case ClassDef(name, _, _, _, _) => this += "ClassDef(" += name += ", _, _, _, _)" + case PackageDef(name, _) => this += "PackageDef(" += name += ", _)" case _ => this += "#" } this += "SymRef(" diff --git a/tests/run/tasty-extractors-1.check b/tests/run/tasty-extractors-1.check index 1b8005b7c0a4..2e32e69c7b8a 100644 --- a/tests/run/tasty-extractors-1.check +++ b/tests/run/tasty-extractors-1.check @@ -17,16 +17,16 @@ Literal(String(abc)) ConstantType(String(abc)) Apply(Ident(println), List(Literal(String(abc)))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Typed(Literal(Int(8)), TypeIdent(Int)) -SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))) +SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) Typed(Literal(Byte(8)), TypeIdent(Byte)) -SymRef(Byte, SymRef(scala, ThisType(SymRef(, NoPrefix)))) +SymRef(ClassDef(Byte, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) Typed(Literal(Short(8)), TypeIdent(Short)) -SymRef(Short, SymRef(scala, ThisType(SymRef(, NoPrefix)))) +SymRef(ClassDef(Short, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) Literal(Char(a)) ConstantType(Char(a)) @@ -35,86 +35,86 @@ Block(List(Literal(Int(1)), Literal(Int(2))), Literal(Int(3))) ConstantType(Int(3)) If(Typed(Literal(Boolean(true)), TypeIdent(Boolean)), Literal(Int(1)), Literal(Int(2))) -SymRef(Int, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Int, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Match(Literal(String(a)), List(CaseDef(Value(Literal(String(a))), None, Block(Nil, Literal(Unit()))))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Match(Literal(String(b)), List(CaseDef(Bind(n, Value(Ident(_))), None, Block(Nil, Literal(Unit()))))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Match(Literal(String(c)), List(CaseDef(Bind(n, TypeTest(TypeIdent(String))), None, Block(Nil, Literal(Unit()))))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Match(Literal(String(e)), List(CaseDef(Value(Ident(_)), None, Block(Nil, Literal(Unit()))))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Match(Literal(String(f)), List(CaseDef(TypeTest(TypeIdent(String)), None, Block(Nil, Literal(Unit()))))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Match(Typed(Literal(String(g)), TypeIdent(Any)), List(CaseDef(Alternative(List(TypeTest(TypeIdent(String)), TypeTest(TypeIdent(Int)))), None, Block(Nil, Literal(Unit()))))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Match(Literal(String(h)), List(CaseDef(Value(Ident(_)), Some(Literal(Boolean(false))), Block(Nil, Literal(Unit()))))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ValDef(a, Synthetic(), Some(Literal(String(o))))), Match(Literal(String(i)), List(CaseDef(Bind(a, Value(Ident(_))), None, Block(Nil, Literal(Unit())))))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Match(Ident(Nil), List(CaseDef(Unapply(TypeApply(Select(Ident(List), unapplySeq, Some(Signature(List(scala.collection.Seq), scala.Some))), List(Synthetic())), Nil, List(Bind(a, Value(Ident(_))), Bind(b, Value(Ident(_))), Bind(c, Value(Ident(_))))), None, Block(Nil, Literal(Unit()))))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Try(Literal(Int(1)), List(CaseDef(Value(Ident(_)), None, Block(Nil, Literal(Unit())))), None) -OrType(SymRef(Int, ThisType(SymRef(scala, NoPrefix))), SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))) +OrType(SymRef(ClassDef(Int, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))), SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) Try(Literal(Int(2)), Nil, Some(Literal(Unit()))) ConstantType(Int(2)) Try(Literal(Int(3)), List(CaseDef(Value(Ident(_)), None, Block(Nil, Literal(Unit())))), Some(Literal(Unit()))) -OrType(SymRef(Int, ThisType(SymRef(scala, NoPrefix))), SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))) +OrType(SymRef(ClassDef(Int, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))), SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) Apply(Select(Literal(String(a)), ==, Some(Signature(List(java.lang.Object), scala.Boolean))), List(Literal(String(b)))) -SymRef(Boolean, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Boolean, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Apply(Select(New(TypeIdent(Object)), , Some(Signature(Nil, java.lang.Object))), Nil) -SymRef(Object, ThisType(SymRef(lang, NoPrefix))) +SymRef(ClassDef(Object, _, _, _, _), ThisType(SymRef(PackageDef(lang, _), NoPrefix))) Apply(Select(Ident(Int), box, Some(Signature(List(scala.Int), java.lang.Integer))), List(NamedArg(x, Literal(Int(9))))) -SymRef(Integer, ThisType(SymRef(lang, NoPrefix))) +SymRef(ClassDef(Integer, _, _, _, _), ThisType(SymRef(PackageDef(lang, _), NoPrefix))) Apply(TypeApply(Select(Ident(Ordering), apply, Some(Signature(List(scala.math.Ordering), scala.math.Ordering))), List(TypeIdent(Int))), List(Ident(Int))) -AppliedType(SymRef(Ordering, ThisType(SymRef(math, NoPrefix))), List(SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))))) +AppliedType(SymRef(ClassDef(Ordering, _, _, _, _), ThisType(SymRef(PackageDef(math, _), NoPrefix))), List(SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))))) Block(List(ValDef(a, TypeIdent(Int), Some(Literal(Int(3))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ValDef(b, TypeIdent(Int), Some(Literal(Int(3))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(DefDef(f1, Nil, Nil, TypeIdent(Int), Some(Literal(Int(3))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(DefDef(f2, Nil, Nil, TypeIdent(Int), Some(Return(Literal(Int(4)))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(DefDef(f3, Nil, List(List(ValDef(i, TypeIdent(Int), None))), TypeIdent(Int), Some(Ident(i)))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(DefDef(f4, Nil, List(List(ValDef(i, TypeIdent(Int), None)), List(ValDef(j, TypeIdent(Int), None))), TypeIdent(Int), Some(Apply(Select(Ident(i), +, Some(Signature(List(scala.Int), scala.Int))), List(Ident(j)))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(DefDef(f5, Nil, List(List(ValDef(i, TypeIdent(Int), None))), TypeIdent(Int), Some(Ident(i))), DefDef(f5$default$1, Nil, Nil, Synthetic(), Some(Literal(Int(9))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(DefDef(f6, List(TypeDef(T, TypeBoundsTree(Synthetic(), Synthetic()))), List(List(ValDef(x, TypeIdent(T), None))), TypeIdent(T), Some(Ident(x)))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(DefDef(f7, List(TypeDef(T, TypeBoundsTree(Synthetic(), Synthetic()))), List(List(ValDef(x, TypeIdent(T), None))), Singleton(Ident(x)), Some(Ident(x)))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(DefDef(f8, Nil, List(List(ValDef(i, Annotated(Applied(Synthetic(), List(TypeIdent(Int))), Apply(Select(New(Synthetic()), , Some(Signature(Nil, scala.annotation.internal.Repeated))), Nil)), None))), TypeIdent(Int), Some(Literal(Int(9))))), Apply(Ident(f8), List(Typed(Repeated(List(Literal(Int(1)), Literal(Int(2)), Literal(Int(3)))), Synthetic())))) -SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))) +SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) Block(List(DefDef(f9, Nil, List(List(ValDef(i, ByName(TypeIdent(Int)), None))), TypeIdent(Int), Some(Ident(i)))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) diff --git a/tests/run/tasty-extractors-2.check b/tests/run/tasty-extractors-2.check index ef60d7330f8f..58dba2d8208a 100644 --- a/tests/run/tasty-extractors-2.check +++ b/tests/run/tasty-extractors-2.check @@ -1,26 +1,26 @@ Block(List(ValDef(x, Synthetic(), Some(Literal(Int(1))))), Assign(Ident(x), Literal(Int(2)))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(DefDef($anonfun, Nil, List(List(ValDef(x, TypeIdent(Int), None))), Synthetic(), Some(Ident(x)))), Lambda(Ident($anonfun), None)) -AppliedType(SymRef(Function1, ThisType(SymRef(scala, NoPrefix))), List(SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))), SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))))) +AppliedType(SymRef(ClassDef(Function1, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))), List(SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))), SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))))) Ident(???) -SymRef(???, SymRef(Predef, ThisType(SymRef(scala, NoPrefix)))) +SymRef(DefDef(???, _, _, _, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) Typed(Literal(Int(1)), Singleton(Literal(Int(1)))) ConstantType(Int(1)) Typed(Literal(Int(1)), TypeIdent(Int)) -SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))) +SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) Typed(Ident(Nil), Applied(TypeIdent(List), List(TypeIdent(Int)))) -AppliedType(SymRef(List, ThisType(SymRef(immutable, NoPrefix))), List(SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))))) +AppliedType(SymRef(ClassDef(List, _, _, _, _), ThisType(SymRef(PackageDef(immutable, _), NoPrefix))), List(SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))))) Typed(Apply(Select(New(TypeIdent(Baz)), , Some(Signature(Nil, Baz))), Nil), And(TypeIdent(Foo), TypeIdent(Bar))) -AndType(SymRef(Foo, ThisType(SymRef(, NoPrefix))), SymRef(Bar, ThisType(SymRef(, NoPrefix)))) +AndType(SymRef(ClassDef(Foo, _, _, _, _), ThisType(SymRef(PackageDef(, _), NoPrefix))), SymRef(ClassDef(Bar, _, _, _, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) Typed(Literal(Int(1)), Or(TypeIdent(Int), TypeIdent(String))) -OrType(SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))), SymRef(String, SymRef(Predef, ThisType(SymRef(scala, NoPrefix))))) +OrType(SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))), SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))))) Block(List(Import(Select(Ident(scala), collection, None), List(SimpleSelector(Id(mutable))))), Literal(Int(1))) ConstantType(Int(1)) @@ -35,77 +35,77 @@ Block(List(Import(Select(Ident(scala), collection, None), List(OmitSelector(Id(m ConstantType(Int(4)) Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, Nil)), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ValDef(Foo, TypeIdent(Foo$), Some(Apply(Select(New(TypeIdent(Foo$)), , Some(Signature(Nil, Test$._$Foo$))), Nil))), ClassDef(Foo$, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef(_, Singleton(Ident(Foo)), None)), Nil)), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(TypeDef(Foo, TypeBoundsTree(Synthetic(), Synthetic()))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(TypeDef(Foo, TypeIdent(Int))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(TypeDef(Foo, TypeBoundsTree(TypeIdent(Null), TypeIdent(Object)))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), Some(Literal(Int(0)))), DefDef(a_=, Nil, List(List(ValDef(x$1, Synthetic(), None))), Synthetic(), Some(Literal(Unit())))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef(a, Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef(a, Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef(a, Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo1, DefDef(, Nil, List(List(ValDef(a, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), None)))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo2, DefDef(, Nil, List(List(ValDef(b, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(b, Synthetic(), None)))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo3, DefDef(, Nil, List(List(ValDef(a, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), None))), ValDef(Foo3, TypeIdent(Foo3$), Some(Apply(Select(New(TypeIdent(Foo3$)), , Some(Signature(Nil, Test$._$Foo3$))), Nil))), ClassDef(Foo3$, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef(_, Singleton(Ident(Foo3)), None)), List(DefDef($lessinit$greater$default$1, Nil, Nil, Synthetic(), Some(Literal(Int(5))))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo4, DefDef(, Nil, List(List(ValDef(a, TypeIdent(Int), None)), List(ValDef(b, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), None), ValDef(b, Synthetic(), None)))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo5, DefDef(, Nil, List(List(ValDef(a, TypeIdent(Int), None)), List(ValDef(b, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), None), ValDef(b, Synthetic(), None))), ValDef(Foo5, TypeIdent(Foo5$), Some(Apply(Select(New(TypeIdent(Foo5$)), , Some(Signature(Nil, Test$._$Foo5$))), Nil))), ClassDef(Foo5$, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef(_, Singleton(Ident(Foo5)), None)), List(DefDef($lessinit$greater$default$2, Nil, List(List(ValDef(a, TypeIdent(Int), None))), Synthetic(), Some(Ident(a)))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo6, DefDef(, Nil, List(List(ValDef(a, TypeIdent(Int), None)), List(ValDef(b, Singleton(Ident(a)), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), None), ValDef(b, Synthetic(), None)))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo8, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(Apply(Ident(println), List(Literal(Int(0))))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo10, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), Some(Literal(Int(9))))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo11, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), Some(Literal(Int(10)))), DefDef(a_=, Nil, List(List(ValDef(x$1, Synthetic(), None))), Synthetic(), Some(Literal(Unit())))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo12, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), Some(Literal(Int(11))))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, Nil), ClassDef(Bar, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, Test$._$Foo))), Nil)), None, Nil)), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo2, DefDef(, Nil, List(Nil), Synthetic(), None), List(Synthetic()), None, Nil), ClassDef(Bar, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil), TypeIdent(Foo2)), None, Nil)), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo, DefDef(, Nil, List(List(ValDef(i, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(i, Synthetic(), None))), ClassDef(Bar, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(TypeIdent(Foo)), , Some(Signature(List(scala.Int), Test$._$Foo))), List(Literal(Int(1))))), None, Nil)), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef(X, TypeIdent(Int)))), DefDef(f, Nil, List(List(ValDef(a, TypeIdent(Foo), None))), TypeSelect(Ident(a), X), Some(Ident(???)))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef(X, TypeBoundsTree(Synthetic(), Synthetic())))), DefDef(f, Nil, List(List(ValDef(a, Refined(TypeIdent(Foo), List(TypeDef(X, TypeIdent(Int)))), None))), TypeSelect(Ident(a), X), Some(Ident(???)))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) Block(List(ValDef(lambda, Applied(Synthetic(), List(TypeIdent(Int), TypeIdent(Int))), Some(Block(List(DefDef($anonfun, Nil, List(List(ValDef(x, Synthetic(), None))), Synthetic(), Some(Ident(x)))), Lambda(Ident($anonfun), None))))), Literal(Unit())) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) diff --git a/tests/run/tasty-extractors-3.check b/tests/run/tasty-extractors-3.check index 5b8f72f7c560..57a06f56e45a 100644 --- a/tests/run/tasty-extractors-3.check +++ b/tests/run/tasty-extractors-3.check @@ -1,42 +1,42 @@ -SymRef(Int, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Int, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) -SymRef(x, NoPrefix) +SymRef(ValDef(x, _, _), NoPrefix) -TypeBounds(SymRef(#, ThisType(SymRef(scala, NoPrefix))), SymRef(#, ThisType(SymRef(scala, NoPrefix)))) +TypeBounds(SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))), SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) -SymRef(#, ThisType(SymRef(scala, NoPrefix))) +SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))) -SymRef(#, ThisType(SymRef(scala, NoPrefix))) +SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))) -SymRef(T, NoPrefix) +SymRef(TypeDef(T, _), NoPrefix) -TypeBounds(SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))), SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix))))) +TypeBounds(SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))), SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix))))) -SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))) +SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) -SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))) +SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) -SymRef(T, NoPrefix) +SymRef(TypeDef(T, _), NoPrefix) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) -SymRef(Object, ThisType(SymRef(lang, NoPrefix))) +SymRef(ClassDef(Object, _, _, _, _), ThisType(SymRef(PackageDef(lang, _), NoPrefix))) -TypeBounds(SymRef(#, ThisType(SymRef(scala, NoPrefix))), SymRef(#, ThisType(SymRef(scala, NoPrefix)))) +TypeBounds(SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))), SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) -SymRef(#, ThisType(SymRef(scala, NoPrefix))) +SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))) -SymRef(#, ThisType(SymRef(scala, NoPrefix))) +SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))) -Refinement(SymRef(Foo, NoPrefix), X, TypeBounds(SymRef(String, SymRef(Predef, ThisType(SymRef(scala, NoPrefix)))), SymRef(String, SymRef(Predef, ThisType(SymRef(scala, NoPrefix)))))) +Refinement(SymRef(ClassDef(Foo, _, _, _, _), NoPrefix), X, TypeBounds(SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))), SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))))) -SymRef(Unit, ThisType(SymRef(scala, NoPrefix))) +SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) -SymRef(Foo, NoPrefix) +SymRef(ClassDef(Foo, _, _, _, _), NoPrefix) -SymRef(String, SymRef(Predef, ThisType(SymRef(scala, NoPrefix)))) +SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) -SymRef($anon, NoPrefix) +SymRef(ClassDef($anon, _, _, _, _), NoPrefix) -Refinement(SymRef(Foo, NoPrefix), X, TypeBounds(SymRef(String, SymRef(Predef, ThisType(SymRef(scala, NoPrefix)))), SymRef(String, SymRef(Predef, ThisType(SymRef(scala, NoPrefix)))))) +Refinement(SymRef(ClassDef(Foo, _, _, _, _), NoPrefix), X, TypeBounds(SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))), SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))))) diff --git a/tests/run/tasty-extractors-types.check b/tests/run/tasty-extractors-types.check index 0cb6690578ab..9ac7ce7637fc 100644 --- a/tests/run/tasty-extractors-types.check +++ b/tests/run/tasty-extractors-types.check @@ -1,12 +1,12 @@ TypeIdent(Int) -SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))) +SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) Applied(TypeIdent(List), List(TypeIdent(String))) -AppliedType(SymRef(List, ThisType(SymRef(immutable, NoPrefix))), List(SymRef(String, SymRef(Predef, ThisType(SymRef(scala, NoPrefix)))))) +AppliedType(SymRef(ClassDef(List, _, _, _, _), ThisType(SymRef(PackageDef(immutable, _), NoPrefix))), List(SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))))) Applied(TypeIdent(Map), List(TypeIdent(String), TypeIdent(Int))) -AppliedType(SymRef(Map, ThisType(SymRef(immutable, NoPrefix))), List(SymRef(String, SymRef(Predef, ThisType(SymRef(scala, NoPrefix)))), SymRef(Int, SymRef(scala, ThisType(SymRef(, NoPrefix)))))) +AppliedType(SymRef(ClassDef(Map, _, _, _, _), ThisType(SymRef(PackageDef(immutable, _), NoPrefix))), List(SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))), SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))))) Applied(TypeIdent(Map), List(TypeIdent(String), TypeIdent(I))) -AppliedType(SymRef(Map, ThisType(SymRef(immutable, NoPrefix))), List(SymRef(String, SymRef(Predef, ThisType(SymRef(scala, NoPrefix)))), SymRef(I, NoPrefix))) +AppliedType(SymRef(ClassDef(Map, _, _, _, _), ThisType(SymRef(PackageDef(immutable, _), NoPrefix))), List(SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))), SymRef(TypeDef(I, _), NoPrefix))) From c4e3e9208a14aedc63afc10b029afb7e2c3dd391 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 25 May 2018 14:36:29 +0200 Subject: [PATCH 2/3] Add quotes to strings in tasty extractors To make pattern matches mach the exact names or strings --- .../src/scala/tasty/util/ShowExtractors.scala | 40 +++--- tests/run/tasty-extractors-1.check | 128 ++++++++--------- tests/run/tasty-extractors-2.check | 136 +++++++++--------- tests/run/tasty-extractors-3.check | 42 +++--- tests/run/tasty-extractors-owners.check | 18 +-- tests/run/tasty-extractors-types.check | 16 +-- tests/run/tasty-macro-assert.check | 8 +- 7 files changed, 194 insertions(+), 194 deletions(-) diff --git a/library/src/scala/tasty/util/ShowExtractors.scala b/library/src/scala/tasty/util/ShowExtractors.scala index 86f62b215fbd..342dd9b09c0b 100644 --- a/library/src/scala/tasty/util/ShowExtractors.scala +++ b/library/src/scala/tasty/util/ShowExtractors.scala @@ -25,9 +25,9 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty def visitTree(x: Tree): Buffer = x match { case Term.Ident(name) => - this += "Ident(" += name += ")" + this += "Ident(\"" += name += "\")" case Term.Select(qualifier, name, signature) => - this += "Select(" += qualifier += ", " += name += ", " += signature += ")" + this += "Select(" += qualifier += ", \"" += name += "\", " += signature += ")" case Term.This(qual) => this += "This(" += qual += ")" case Term.Super(qual, mix) => @@ -43,7 +43,7 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty case Term.Typed(expr, tpt) => this += "Typed(" += expr += ", " += tpt += ")" case Term.NamedArg(name, arg) => - this += "NamedArg(" += name += ", " += arg += ")" + this += "NamedArg(\"" += name += "\", " += arg += ")" case Term.Assign(lhs, rhs) => this += "Assign(" += lhs += ", " += rhs += ")" case Term.Block(stats, expr) => @@ -63,20 +63,20 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty case Term.Inlined(call, bindings, expansion) => this += "Inlined(" += call += ", " ++= bindings += ", " += expansion += ")" case ValDef(name, tpt, rhs) => - this += "ValDef(" += name += ", " += tpt += ", " += rhs += ")" + this += "ValDef(\"" += name += "\", " += tpt += ", " += rhs += ")" case DefDef(name, typeParams, paramss, returnTpt, rhs) => - this += "DefDef(" += name += ", " ++= typeParams += ", " +++= paramss += ", " += returnTpt += ", " += rhs += ")" + this += "DefDef(\"" += name += "\", " ++= typeParams += ", " +++= paramss += ", " += returnTpt += ", " += rhs += ")" case TypeDef(name, rhs) => - this += "TypeDef(" += name += ", " += rhs += ")" + this += "TypeDef(\"" += name += "\", " += rhs += ")" case ClassDef(name, constr, parents, self, body) => - this += "ClassDef(" += name += ", " += constr += ", " + this += "ClassDef(\"" += name += "\", " += constr += ", " visitList[Parent](parents, { case parent @ Term() => this += parent case parent @ TypeTree() => this += parent }) this += ", " += self += ", " ++= body += ")" case PackageDef(name, members) => - this += "PackageDef(" += name += ", " ++= members += ")" + this += "PackageDef(\"" += name += "\", " ++= members += ")" case Import(expr, selectors) => this += "Import(" += expr += ", " ++= selectors += ")" case PackageClause(pid, stats) => @@ -87,9 +87,9 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty case TypeTree.Synthetic() => this += "Synthetic()" case TypeTree.TypeIdent(name) => - this += "TypeIdent(" += name += ")" + this += "TypeIdent(\"" += name += "\")" case TypeTree.TypeSelect(qualifier, name) => - this += "TypeSelect(" += qualifier += ", " += name += ")" + this += "TypeSelect(" += qualifier += ", \"" += name += "\")" case TypeTree.Singleton(ref) => this += "Singleton(" += ref += ")" case TypeTree.And(left, right) => @@ -117,7 +117,7 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty case Pattern.Value(v) => this += "Value(" += v += ")" case Pattern.Bind(name, body) => - this += "Bind(" += name += ", " += body += ")" + this += "Bind(\"" += name += "\", " += body += ")" case Pattern.Unapply(fun, implicits, patterns) => this += "Unapply(" += fun += ", " ++= implicits += ", " ++= patterns += ")" case Pattern.Alternative(patterns) => @@ -137,7 +137,7 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty case Constant.Long(value) => this += "Long(" += value += ")" case Constant.Float(value) => this += "Float(" += value += ")" case Constant.Double(value) => this += "Double(" += value += ")" - case Constant.String(value) => this += "String(" += value += ")" + case Constant.String(value) => this += "String(\"" += value += "\")" } def visitType(x: TypeOrBounds): Buffer = x match { @@ -145,20 +145,20 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty this += "ConstantType(" += value += ")" case Type.SymRef(sym, qual) => def visitName(sym: Definition): Buffer = sym match { - case ValDef(name, _, _) => this += "ValDef(" += name += ", _, _)" - case DefDef(name, _, _, _, _) => this += "DefDef(" += name += ", _, _, _, _)" - case TypeDef(name, _) => this += "TypeDef(" += name += ", _)" - case ClassDef(name, _, _, _, _) => this += "ClassDef(" += name += ", _, _, _, _)" - case PackageDef(name, _) => this += "PackageDef(" += name += ", _)" + case ValDef(name, _, _) => this += "ValDef(\"" += name += "\", _, _)" + case DefDef(name, _, _, _, _) => this += "DefDef(\"" += name += "\", _, _, _, _)" + case TypeDef(name, _) => this += "TypeDef(\"" += name += "\", _)" + case ClassDef(name, _, _, _, _) => this += "ClassDef(\"" += name += "\", _, _, _, _)" + case PackageDef(name, _) => this += "PackageDef(\"" += name += "\", _)" case _ => this += "#" } this += "SymRef(" visitName(sym) this += ", " += qual += ")" case Type.TermRef(name, qual) => - this += "TermRef(" += name += ", " += qual += ")" + this += "TermRef(\"" += name += "\", " += qual += ")" case Type.TypeRef(name, qual) => - this += "TypeRef(" += name += ", " += qual += ")" + this += "TypeRef(\"" += name += "\", " += qual += ")" case Type.Refinement(parent, name, info) => this += "Refinement(" += parent += ", " += name += ", " += info += ")" case Type.AppliedType(tycon, args) => @@ -198,7 +198,7 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty def visitId(x: Id): Buffer = { val Id(name) = x - this += "Id(" += name += ")" + this += "Id(\"" += name += "\")" } def visitSignature(sig: Signature): Buffer = { diff --git a/tests/run/tasty-extractors-1.check b/tests/run/tasty-extractors-1.check index 2e32e69c7b8a..7afc6b990d5c 100644 --- a/tests/run/tasty-extractors-1.check +++ b/tests/run/tasty-extractors-1.check @@ -13,20 +13,20 @@ ConstantType(Float(2.1)) Literal(Double(2.2)) ConstantType(Double(2.2)) -Literal(String(abc)) -ConstantType(String(abc)) +Literal(String("abc")) +ConstantType(String("abc")) -Apply(Ident(println), List(Literal(String(abc)))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Apply(Ident("println"), List(Literal(String("abc")))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Typed(Literal(Int(8)), TypeIdent(Int)) -SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) +Typed(Literal(Int(8)), TypeIdent("Int")) +SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) -Typed(Literal(Byte(8)), TypeIdent(Byte)) -SymRef(ClassDef(Byte, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) +Typed(Literal(Byte(8)), TypeIdent("Byte")) +SymRef(ClassDef("Byte", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) -Typed(Literal(Short(8)), TypeIdent(Short)) -SymRef(ClassDef(Short, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) +Typed(Literal(Short(8)), TypeIdent("Short")) +SymRef(ClassDef("Short", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) Literal(Char(a)) ConstantType(Char(a)) @@ -34,87 +34,87 @@ ConstantType(Char(a)) Block(List(Literal(Int(1)), Literal(Int(2))), Literal(Int(3))) ConstantType(Int(3)) -If(Typed(Literal(Boolean(true)), TypeIdent(Boolean)), Literal(Int(1)), Literal(Int(2))) -SymRef(ClassDef(Int, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +If(Typed(Literal(Boolean(true)), TypeIdent("Boolean")), Literal(Int(1)), Literal(Int(2))) +SymRef(ClassDef("Int", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Match(Literal(String(a)), List(CaseDef(Value(Literal(String(a))), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Match(Literal(String("a")), List(CaseDef(Value(Literal(String("a"))), None, Block(Nil, Literal(Unit()))))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Match(Literal(String(b)), List(CaseDef(Bind(n, Value(Ident(_))), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Match(Literal(String("b")), List(CaseDef(Bind("n", Value(Ident("_"))), None, Block(Nil, Literal(Unit()))))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Match(Literal(String(c)), List(CaseDef(Bind(n, TypeTest(TypeIdent(String))), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Match(Literal(String("c")), List(CaseDef(Bind("n", TypeTest(TypeIdent("String"))), None, Block(Nil, Literal(Unit()))))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Match(Literal(String(e)), List(CaseDef(Value(Ident(_)), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Match(Literal(String("e")), List(CaseDef(Value(Ident("_")), None, Block(Nil, Literal(Unit()))))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Match(Literal(String(f)), List(CaseDef(TypeTest(TypeIdent(String)), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Match(Literal(String("f")), List(CaseDef(TypeTest(TypeIdent("String")), None, Block(Nil, Literal(Unit()))))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Match(Typed(Literal(String(g)), TypeIdent(Any)), List(CaseDef(Alternative(List(TypeTest(TypeIdent(String)), TypeTest(TypeIdent(Int)))), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Match(Typed(Literal(String("g")), TypeIdent("Any")), List(CaseDef(Alternative(List(TypeTest(TypeIdent("String")), TypeTest(TypeIdent("Int")))), None, Block(Nil, Literal(Unit()))))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Match(Literal(String(h)), List(CaseDef(Value(Ident(_)), Some(Literal(Boolean(false))), Block(Nil, Literal(Unit()))))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Match(Literal(String("h")), List(CaseDef(Value(Ident("_")), Some(Literal(Boolean(false))), Block(Nil, Literal(Unit()))))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ValDef(a, Synthetic(), Some(Literal(String(o))))), Match(Literal(String(i)), List(CaseDef(Bind(a, Value(Ident(_))), None, Block(Nil, Literal(Unit())))))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ValDef("a", Synthetic(), Some(Literal(String("o"))))), Match(Literal(String("i")), List(CaseDef(Bind("a", Value(Ident("_"))), None, Block(Nil, Literal(Unit())))))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Match(Ident(Nil), List(CaseDef(Unapply(TypeApply(Select(Ident(List), unapplySeq, Some(Signature(List(scala.collection.Seq), scala.Some))), List(Synthetic())), Nil, List(Bind(a, Value(Ident(_))), Bind(b, Value(Ident(_))), Bind(c, Value(Ident(_))))), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Match(Ident("Nil"), List(CaseDef(Unapply(TypeApply(Select(Ident("List"), "unapplySeq", Some(Signature(List(scala.collection.Seq), scala.Some))), List(Synthetic())), Nil, List(Bind("a", Value(Ident("_"))), Bind("b", Value(Ident("_"))), Bind("c", Value(Ident("_"))))), None, Block(Nil, Literal(Unit()))))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Try(Literal(Int(1)), List(CaseDef(Value(Ident(_)), None, Block(Nil, Literal(Unit())))), None) -OrType(SymRef(ClassDef(Int, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))), SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) +Try(Literal(Int(1)), List(CaseDef(Value(Ident("_")), None, Block(Nil, Literal(Unit())))), None) +OrType(SymRef(ClassDef("Int", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))), SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) Try(Literal(Int(2)), Nil, Some(Literal(Unit()))) ConstantType(Int(2)) -Try(Literal(Int(3)), List(CaseDef(Value(Ident(_)), None, Block(Nil, Literal(Unit())))), Some(Literal(Unit()))) -OrType(SymRef(ClassDef(Int, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))), SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) +Try(Literal(Int(3)), List(CaseDef(Value(Ident("_")), None, Block(Nil, Literal(Unit())))), Some(Literal(Unit()))) +OrType(SymRef(ClassDef("Int", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))), SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) -Apply(Select(Literal(String(a)), ==, Some(Signature(List(java.lang.Object), scala.Boolean))), List(Literal(String(b)))) -SymRef(ClassDef(Boolean, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Apply(Select(Literal(String("a")), "==", Some(Signature(List(java.lang.Object), scala.Boolean))), List(Literal(String("b")))) +SymRef(ClassDef("Boolean", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Apply(Select(New(TypeIdent(Object)), , Some(Signature(Nil, java.lang.Object))), Nil) -SymRef(ClassDef(Object, _, _, _, _), ThisType(SymRef(PackageDef(lang, _), NoPrefix))) +Apply(Select(New(TypeIdent("Object")), "", Some(Signature(Nil, java.lang.Object))), Nil) +SymRef(ClassDef("Object", _, _, _, _), ThisType(SymRef(PackageDef("lang", _), NoPrefix))) -Apply(Select(Ident(Int), box, Some(Signature(List(scala.Int), java.lang.Integer))), List(NamedArg(x, Literal(Int(9))))) -SymRef(ClassDef(Integer, _, _, _, _), ThisType(SymRef(PackageDef(lang, _), NoPrefix))) +Apply(Select(Ident("Int"), "box", Some(Signature(List(scala.Int), java.lang.Integer))), List(NamedArg("x", Literal(Int(9))))) +SymRef(ClassDef("Integer", _, _, _, _), ThisType(SymRef(PackageDef("lang", _), NoPrefix))) -Apply(TypeApply(Select(Ident(Ordering), apply, Some(Signature(List(scala.math.Ordering), scala.math.Ordering))), List(TypeIdent(Int))), List(Ident(Int))) -AppliedType(SymRef(ClassDef(Ordering, _, _, _, _), ThisType(SymRef(PackageDef(math, _), NoPrefix))), List(SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))))) +Apply(TypeApply(Select(Ident("Ordering"), "apply", Some(Signature(List(scala.math.Ordering), scala.math.Ordering))), List(TypeIdent("Int"))), List(Ident("Int"))) +AppliedType(SymRef(ClassDef("Ordering", _, _, _, _), ThisType(SymRef(PackageDef("math", _), NoPrefix))), List(SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))))) -Block(List(ValDef(a, TypeIdent(Int), Some(Literal(Int(3))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ValDef("a", TypeIdent("Int"), Some(Literal(Int(3))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ValDef(b, TypeIdent(Int), Some(Literal(Int(3))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ValDef("b", TypeIdent("Int"), Some(Literal(Int(3))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(DefDef(f1, Nil, Nil, TypeIdent(Int), Some(Literal(Int(3))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(DefDef("f1", Nil, Nil, TypeIdent("Int"), Some(Literal(Int(3))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(DefDef(f2, Nil, Nil, TypeIdent(Int), Some(Return(Literal(Int(4)))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(DefDef("f2", Nil, Nil, TypeIdent("Int"), Some(Return(Literal(Int(4)))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(DefDef(f3, Nil, List(List(ValDef(i, TypeIdent(Int), None))), TypeIdent(Int), Some(Ident(i)))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(DefDef("f3", Nil, List(List(ValDef("i", TypeIdent("Int"), None))), TypeIdent("Int"), Some(Ident("i")))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(DefDef(f4, Nil, List(List(ValDef(i, TypeIdent(Int), None)), List(ValDef(j, TypeIdent(Int), None))), TypeIdent(Int), Some(Apply(Select(Ident(i), +, Some(Signature(List(scala.Int), scala.Int))), List(Ident(j)))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(DefDef("f4", Nil, List(List(ValDef("i", TypeIdent("Int"), None)), List(ValDef("j", TypeIdent("Int"), None))), TypeIdent("Int"), Some(Apply(Select(Ident("i"), "+", Some(Signature(List(scala.Int), scala.Int))), List(Ident("j")))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(DefDef(f5, Nil, List(List(ValDef(i, TypeIdent(Int), None))), TypeIdent(Int), Some(Ident(i))), DefDef(f5$default$1, Nil, Nil, Synthetic(), Some(Literal(Int(9))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(DefDef("f5", Nil, List(List(ValDef("i", TypeIdent("Int"), None))), TypeIdent("Int"), Some(Ident("i"))), DefDef("f5$default$1", Nil, Nil, Synthetic(), Some(Literal(Int(9))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(DefDef(f6, List(TypeDef(T, TypeBoundsTree(Synthetic(), Synthetic()))), List(List(ValDef(x, TypeIdent(T), None))), TypeIdent(T), Some(Ident(x)))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(DefDef("f6", List(TypeDef("T", TypeBoundsTree(Synthetic(), Synthetic()))), List(List(ValDef("x", TypeIdent("T"), None))), TypeIdent("T"), Some(Ident("x")))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(DefDef(f7, List(TypeDef(T, TypeBoundsTree(Synthetic(), Synthetic()))), List(List(ValDef(x, TypeIdent(T), None))), Singleton(Ident(x)), Some(Ident(x)))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(DefDef("f7", List(TypeDef("T", TypeBoundsTree(Synthetic(), Synthetic()))), List(List(ValDef("x", TypeIdent("T"), None))), Singleton(Ident("x")), Some(Ident("x")))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(DefDef(f8, Nil, List(List(ValDef(i, Annotated(Applied(Synthetic(), List(TypeIdent(Int))), Apply(Select(New(Synthetic()), , Some(Signature(Nil, scala.annotation.internal.Repeated))), Nil)), None))), TypeIdent(Int), Some(Literal(Int(9))))), Apply(Ident(f8), List(Typed(Repeated(List(Literal(Int(1)), Literal(Int(2)), Literal(Int(3)))), Synthetic())))) -SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) +Block(List(DefDef("f8", Nil, List(List(ValDef("i", Annotated(Applied(Synthetic(), List(TypeIdent("Int"))), Apply(Select(New(Synthetic()), "", Some(Signature(Nil, scala.annotation.internal.Repeated))), Nil)), None))), TypeIdent("Int"), Some(Literal(Int(9))))), Apply(Ident("f8"), List(Typed(Repeated(List(Literal(Int(1)), Literal(Int(2)), Literal(Int(3)))), Synthetic())))) +SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) -Block(List(DefDef(f9, Nil, List(List(ValDef(i, ByName(TypeIdent(Int)), None))), TypeIdent(Int), Some(Ident(i)))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(DefDef("f9", Nil, List(List(ValDef("i", ByName(TypeIdent("Int")), None))), TypeIdent("Int"), Some(Ident("i")))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) diff --git a/tests/run/tasty-extractors-2.check b/tests/run/tasty-extractors-2.check index 58dba2d8208a..2bc68536397f 100644 --- a/tests/run/tasty-extractors-2.check +++ b/tests/run/tasty-extractors-2.check @@ -1,111 +1,111 @@ -Block(List(ValDef(x, Synthetic(), Some(Literal(Int(1))))), Assign(Ident(x), Literal(Int(2)))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ValDef("x", Synthetic(), Some(Literal(Int(1))))), Assign(Ident("x"), Literal(Int(2)))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(DefDef($anonfun, Nil, List(List(ValDef(x, TypeIdent(Int), None))), Synthetic(), Some(Ident(x)))), Lambda(Ident($anonfun), None)) -AppliedType(SymRef(ClassDef(Function1, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))), List(SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))), SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))))) +Block(List(DefDef("$anonfun", Nil, List(List(ValDef("x", TypeIdent("Int"), None))), Synthetic(), Some(Ident("x")))), Lambda(Ident("$anonfun"), None)) +AppliedType(SymRef(ClassDef("Function1", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))), List(SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))), SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))))) -Ident(???) -SymRef(DefDef(???, _, _, _, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) +Ident("???") +SymRef(DefDef("???", _, _, _, _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) Typed(Literal(Int(1)), Singleton(Literal(Int(1)))) ConstantType(Int(1)) -Typed(Literal(Int(1)), TypeIdent(Int)) -SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) +Typed(Literal(Int(1)), TypeIdent("Int")) +SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) -Typed(Ident(Nil), Applied(TypeIdent(List), List(TypeIdent(Int)))) -AppliedType(SymRef(ClassDef(List, _, _, _, _), ThisType(SymRef(PackageDef(immutable, _), NoPrefix))), List(SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))))) +Typed(Ident("Nil"), Applied(TypeIdent("List"), List(TypeIdent("Int")))) +AppliedType(SymRef(ClassDef("List", _, _, _, _), ThisType(SymRef(PackageDef("immutable", _), NoPrefix))), List(SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))))) -Typed(Apply(Select(New(TypeIdent(Baz)), , Some(Signature(Nil, Baz))), Nil), And(TypeIdent(Foo), TypeIdent(Bar))) -AndType(SymRef(ClassDef(Foo, _, _, _, _), ThisType(SymRef(PackageDef(, _), NoPrefix))), SymRef(ClassDef(Bar, _, _, _, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) +Typed(Apply(Select(New(TypeIdent("Baz")), "", Some(Signature(Nil, Baz))), Nil), And(TypeIdent("Foo"), TypeIdent("Bar"))) +AndType(SymRef(ClassDef("Foo", _, _, _, _), ThisType(SymRef(PackageDef("", _), NoPrefix))), SymRef(ClassDef("Bar", _, _, _, _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) -Typed(Literal(Int(1)), Or(TypeIdent(Int), TypeIdent(String))) -OrType(SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))), SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))))) +Typed(Literal(Int(1)), Or(TypeIdent("Int"), TypeIdent("String"))) +OrType(SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))), SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))))) -Block(List(Import(Select(Ident(scala), collection, None), List(SimpleSelector(Id(mutable))))), Literal(Int(1))) +Block(List(Import(Select(Ident("scala"), "collection", None), List(SimpleSelector(Id("mutable"))))), Literal(Int(1))) ConstantType(Int(1)) -Block(List(Import(Select(Ident(scala), collection, None), List(SimpleSelector(Id(mutable)), SimpleSelector(Id(immutable))))), Literal(Int(2))) +Block(List(Import(Select(Ident("scala"), "collection", None), List(SimpleSelector(Id("mutable")), SimpleSelector(Id("immutable"))))), Literal(Int(2))) ConstantType(Int(2)) -Block(List(Import(Select(Ident(scala), collection, None), List(RenameSelector(Id(mutable), Id(mut))))), Literal(Int(3))) +Block(List(Import(Select(Ident("scala"), "collection", None), List(RenameSelector(Id("mutable"), Id("mut"))))), Literal(Int(3))) ConstantType(Int(3)) -Block(List(Import(Select(Ident(scala), collection, None), List(OmitSelector(Id(mutable))))), Literal(Int(4))) +Block(List(Import(Select(Ident("scala"), "collection", None), List(OmitSelector(Id("mutable"))))), Literal(Int(4))) ConstantType(Int(4)) -Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, Nil)), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, Nil)), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ValDef(Foo, TypeIdent(Foo$), Some(Apply(Select(New(TypeIdent(Foo$)), , Some(Signature(Nil, Test$._$Foo$))), Nil))), ClassDef(Foo$, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef(_, Singleton(Ident(Foo)), None)), Nil)), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ValDef("Foo", TypeIdent("Foo$"), Some(Apply(Select(New(TypeIdent("Foo$")), "", Some(Signature(Nil, Test$._$Foo$))), Nil))), ClassDef("Foo$", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef("_", Singleton(Ident("Foo")), None)), Nil)), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(TypeDef(Foo, TypeBoundsTree(Synthetic(), Synthetic()))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(TypeDef("Foo", TypeBoundsTree(Synthetic(), Synthetic()))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(TypeDef(Foo, TypeIdent(Int))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(TypeDef("Foo", TypeIdent("Int"))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(TypeDef(Foo, TypeBoundsTree(TypeIdent(Null), TypeIdent(Object)))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(TypeDef("Foo", TypeBoundsTree(TypeIdent("Null"), TypeIdent("Object")))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), Some(Literal(Int(0)))), DefDef(a_=, Nil, List(List(ValDef(x$1, Synthetic(), None))), Synthetic(), Some(Literal(Unit())))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), Some(Literal(Int(0)))), DefDef("a_=", Nil, List(List(ValDef("x$1", Synthetic(), None))), Synthetic(), Some(Literal(Unit())))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef(a, Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef("a", Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef(a, Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef("a", Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef(a, Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef("a", Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo1, DefDef(, Nil, List(List(ValDef(a, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), None)))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo1", DefDef("", Nil, List(List(ValDef("a", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), None)))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo2, DefDef(, Nil, List(List(ValDef(b, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(b, Synthetic(), None)))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo2", DefDef("", Nil, List(List(ValDef("b", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("b", Synthetic(), None)))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo3, DefDef(, Nil, List(List(ValDef(a, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), None))), ValDef(Foo3, TypeIdent(Foo3$), Some(Apply(Select(New(TypeIdent(Foo3$)), , Some(Signature(Nil, Test$._$Foo3$))), Nil))), ClassDef(Foo3$, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef(_, Singleton(Ident(Foo3)), None)), List(DefDef($lessinit$greater$default$1, Nil, Nil, Synthetic(), Some(Literal(Int(5))))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo3", DefDef("", Nil, List(List(ValDef("a", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), None))), ValDef("Foo3", TypeIdent("Foo3$"), Some(Apply(Select(New(TypeIdent("Foo3$")), "", Some(Signature(Nil, Test$._$Foo3$))), Nil))), ClassDef("Foo3$", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef("_", Singleton(Ident("Foo3")), None)), List(DefDef("$lessinit$greater$default$1", Nil, Nil, Synthetic(), Some(Literal(Int(5))))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo4, DefDef(, Nil, List(List(ValDef(a, TypeIdent(Int), None)), List(ValDef(b, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), None), ValDef(b, Synthetic(), None)))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo4", DefDef("", Nil, List(List(ValDef("a", TypeIdent("Int"), None)), List(ValDef("b", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), None), ValDef("b", Synthetic(), None)))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo5, DefDef(, Nil, List(List(ValDef(a, TypeIdent(Int), None)), List(ValDef(b, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), None), ValDef(b, Synthetic(), None))), ValDef(Foo5, TypeIdent(Foo5$), Some(Apply(Select(New(TypeIdent(Foo5$)), , Some(Signature(Nil, Test$._$Foo5$))), Nil))), ClassDef(Foo5$, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef(_, Singleton(Ident(Foo5)), None)), List(DefDef($lessinit$greater$default$2, Nil, List(List(ValDef(a, TypeIdent(Int), None))), Synthetic(), Some(Ident(a)))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo5", DefDef("", Nil, List(List(ValDef("a", TypeIdent("Int"), None)), List(ValDef("b", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), None), ValDef("b", Synthetic(), None))), ValDef("Foo5", TypeIdent("Foo5$"), Some(Apply(Select(New(TypeIdent("Foo5$")), "", Some(Signature(Nil, Test$._$Foo5$))), Nil))), ClassDef("Foo5$", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef("_", Singleton(Ident("Foo5")), None)), List(DefDef("$lessinit$greater$default$2", Nil, List(List(ValDef("a", TypeIdent("Int"), None))), Synthetic(), Some(Ident("a")))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo6, DefDef(, Nil, List(List(ValDef(a, TypeIdent(Int), None)), List(ValDef(b, Singleton(Ident(a)), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), None), ValDef(b, Synthetic(), None)))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo6", DefDef("", Nil, List(List(ValDef("a", TypeIdent("Int"), None)), List(ValDef("b", Singleton(Ident("a")), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), None), ValDef("b", Synthetic(), None)))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo8, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(Apply(Ident(println), List(Literal(Int(0))))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo8", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(Apply(Ident("println"), List(Literal(Int(0))))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo10, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), Some(Literal(Int(9))))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo10", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), Some(Literal(Int(9))))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo11, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), Some(Literal(Int(10)))), DefDef(a_=, Nil, List(List(ValDef(x$1, Synthetic(), None))), Synthetic(), Some(Literal(Unit())))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo11", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), Some(Literal(Int(10)))), DefDef("a_=", Nil, List(List(ValDef("x$1", Synthetic(), None))), Synthetic(), Some(Literal(Unit())))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo12, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(a, Synthetic(), Some(Literal(Int(11))))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo12", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), Some(Literal(Int(11))))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, Nil), ClassDef(Bar, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, Test$._$Foo))), Nil)), None, Nil)), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, Nil), ClassDef("Bar", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, Test$._$Foo))), Nil)), None, Nil)), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo2, DefDef(, Nil, List(Nil), Synthetic(), None), List(Synthetic()), None, Nil), ClassDef(Bar, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil), TypeIdent(Foo2)), None, Nil)), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo2", DefDef("", Nil, List(Nil), Synthetic(), None), List(Synthetic()), None, Nil), ClassDef("Bar", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil), TypeIdent("Foo2")), None, Nil)), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo, DefDef(, Nil, List(List(ValDef(i, TypeIdent(Int), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef(i, Synthetic(), None))), ClassDef(Bar, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(TypeIdent(Foo)), , Some(Signature(List(scala.Int), Test$._$Foo))), List(Literal(Int(1))))), None, Nil)), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo", DefDef("", Nil, List(List(ValDef("i", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("i", Synthetic(), None))), ClassDef("Bar", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(TypeIdent("Foo")), "", Some(Signature(List(scala.Int), Test$._$Foo))), List(Literal(Int(1))))), None, Nil)), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef(X, TypeIdent(Int)))), DefDef(f, Nil, List(List(ValDef(a, TypeIdent(Foo), None))), TypeSelect(Ident(a), X), Some(Ident(???)))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("X", TypeIdent("Int")))), DefDef("f", Nil, List(List(ValDef("a", TypeIdent("Foo"), None))), TypeSelect(Ident("a"), "X"), Some(Ident("???")))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ClassDef(Foo, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef(X, TypeBoundsTree(Synthetic(), Synthetic())))), DefDef(f, Nil, List(List(ValDef(a, Refined(TypeIdent(Foo), List(TypeDef(X, TypeIdent(Int)))), None))), TypeSelect(Ident(a), X), Some(Ident(???)))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("X", TypeBoundsTree(Synthetic(), Synthetic())))), DefDef("f", Nil, List(List(ValDef("a", Refined(TypeIdent("Foo"), List(TypeDef("X", TypeIdent("Int")))), None))), TypeSelect(Ident("a"), "X"), Some(Ident("???")))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Block(List(ValDef(lambda, Applied(Synthetic(), List(TypeIdent(Int), TypeIdent(Int))), Some(Block(List(DefDef($anonfun, Nil, List(List(ValDef(x, Synthetic(), None))), Synthetic(), Some(Ident(x)))), Lambda(Ident($anonfun), None))))), Literal(Unit())) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +Block(List(ValDef("lambda", Applied(Synthetic(), List(TypeIdent("Int"), TypeIdent("Int"))), Some(Block(List(DefDef("$anonfun", Nil, List(List(ValDef("x", Synthetic(), None))), Synthetic(), Some(Ident("x")))), Lambda(Ident("$anonfun"), None))))), Literal(Unit())) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) diff --git a/tests/run/tasty-extractors-3.check b/tests/run/tasty-extractors-3.check index 57a06f56e45a..507d87fe9a04 100644 --- a/tests/run/tasty-extractors-3.check +++ b/tests/run/tasty-extractors-3.check @@ -1,42 +1,42 @@ -SymRef(ClassDef(Int, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +SymRef(ClassDef("Int", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -SymRef(ValDef(x, _, _), NoPrefix) +SymRef(ValDef("x", _, _), NoPrefix) -TypeBounds(SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))), SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) +TypeBounds(SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))), SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) -SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -SymRef(TypeDef(T, _), NoPrefix) +SymRef(TypeDef("T", _), NoPrefix) -TypeBounds(SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))), SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix))))) +TypeBounds(SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))), SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix))))) -SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) +SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) -SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) +SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) -SymRef(TypeDef(T, _), NoPrefix) +SymRef(TypeDef("T", _), NoPrefix) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -SymRef(ClassDef(Object, _, _, _, _), ThisType(SymRef(PackageDef(lang, _), NoPrefix))) +SymRef(ClassDef("Object", _, _, _, _), ThisType(SymRef(PackageDef("lang", _), NoPrefix))) -TypeBounds(SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))), SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) +TypeBounds(SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))), SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) -SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -SymRef(#, ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -Refinement(SymRef(ClassDef(Foo, _, _, _, _), NoPrefix), X, TypeBounds(SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))), SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))))) +Refinement(SymRef(ClassDef("Foo", _, _, _, _), NoPrefix), X, TypeBounds(SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))), SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))))) -SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))) +SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) -SymRef(ClassDef(Foo, _, _, _, _), NoPrefix) +SymRef(ClassDef("Foo", _, _, _, _), NoPrefix) -SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))) +SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) -SymRef(ClassDef($anon, _, _, _, _), NoPrefix) +SymRef(ClassDef("$anon", _, _, _, _), NoPrefix) -Refinement(SymRef(ClassDef(Foo, _, _, _, _), NoPrefix), X, TypeBounds(SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))), SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))))) +Refinement(SymRef(ClassDef("Foo", _, _, _, _), NoPrefix), X, TypeBounds(SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))), SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))))) diff --git a/tests/run/tasty-extractors-owners.check b/tests/run/tasty-extractors-owners.check index 7712d05c567d..ec7f4f6b6a0a 100644 --- a/tests/run/tasty-extractors-owners.check +++ b/tests/run/tasty-extractors-owners.check @@ -1,27 +1,27 @@ foo -DefDef(main, Nil, List(List(ValDef(args, Synthetic(), None))), Synthetic(), None) +DefDef("main", Nil, List(List(ValDef("args", Synthetic(), None))), Synthetic(), None) bar -DefDef(foo, Nil, Nil, Synthetic(), None) +DefDef("foo", Nil, Nil, Synthetic(), None) bar2 -DefDef(foo, Nil, Nil, Synthetic(), None) +DefDef("foo", Nil, Nil, Synthetic(), None) foo2 -DefDef(main, Nil, List(List(ValDef(args, Synthetic(), None))), Synthetic(), None) +DefDef("main", Nil, List(List(ValDef("args", Synthetic(), None))), Synthetic(), None) baz -ValDef(foo2, Synthetic(), None) +ValDef("foo2", Synthetic(), None) baz2 -ValDef(foo2, Synthetic(), None) +ValDef("foo2", Synthetic(), None) -ClassDef(A, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef(B, Synthetic()), DefDef(b, Nil, Nil, Synthetic(), None), ValDef(b2, Synthetic(), None))) +ClassDef("A", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("B", Synthetic()), DefDef("b", Nil, Nil, Synthetic(), None), ValDef("b2", Synthetic(), None))) b -ClassDef(A, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef(B, Synthetic()), DefDef(b, Nil, Nil, Synthetic(), None), ValDef(b2, Synthetic(), None))) +ClassDef("A", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("B", Synthetic()), DefDef("b", Nil, Nil, Synthetic(), None), ValDef("b2", Synthetic(), None))) b2 -ClassDef(A, DefDef(, Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), , Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef(B, Synthetic()), DefDef(b, Nil, Nil, Synthetic(), None), ValDef(b2, Synthetic(), None))) +ClassDef("A", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("B", Synthetic()), DefDef("b", Nil, Nil, Synthetic(), None), ValDef("b2", Synthetic(), None))) diff --git a/tests/run/tasty-extractors-types.check b/tests/run/tasty-extractors-types.check index 9ac7ce7637fc..283018e6e716 100644 --- a/tests/run/tasty-extractors-types.check +++ b/tests/run/tasty-extractors-types.check @@ -1,12 +1,12 @@ -TypeIdent(Int) -SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))) +TypeIdent("Int") +SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) -Applied(TypeIdent(List), List(TypeIdent(String))) -AppliedType(SymRef(ClassDef(List, _, _, _, _), ThisType(SymRef(PackageDef(immutable, _), NoPrefix))), List(SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))))) +Applied(TypeIdent("List"), List(TypeIdent("String"))) +AppliedType(SymRef(ClassDef("List", _, _, _, _), ThisType(SymRef(PackageDef("immutable", _), NoPrefix))), List(SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))))) -Applied(TypeIdent(Map), List(TypeIdent(String), TypeIdent(Int))) -AppliedType(SymRef(ClassDef(Map, _, _, _, _), ThisType(SymRef(PackageDef(immutable, _), NoPrefix))), List(SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))), SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(, _), NoPrefix)))))) +Applied(TypeIdent("Map"), List(TypeIdent("String"), TypeIdent("Int"))) +AppliedType(SymRef(ClassDef("Map", _, _, _, _), ThisType(SymRef(PackageDef("immutable", _), NoPrefix))), List(SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))), SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))))) -Applied(TypeIdent(Map), List(TypeIdent(String), TypeIdent(I))) -AppliedType(SymRef(ClassDef(Map, _, _, _, _), ThisType(SymRef(PackageDef(immutable, _), NoPrefix))), List(SymRef(TypeDef(String, _), SymRef(ValDef(Predef, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))), SymRef(TypeDef(I, _), NoPrefix))) +Applied(TypeIdent("Map"), List(TypeIdent("String"), TypeIdent("I"))) +AppliedType(SymRef(ClassDef("Map", _, _, _, _), ThisType(SymRef(PackageDef("immutable", _), NoPrefix))), List(SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))), SymRef(TypeDef("I", _), NoPrefix))) diff --git a/tests/run/tasty-macro-assert.check b/tests/run/tasty-macro-assert.check index d8efe99f6d02..9cb0fa36e224 100644 --- a/tests/run/tasty-macro-assert.check +++ b/tests/run/tasty-macro-assert.check @@ -1,7 +1,7 @@ Condition was false Error left did not equal right: - left = Literal(String(acb)) - right = Literal(String(cde)) + left = Literal(String("acb")) + right = Literal(String("cde")) Error left was equal to right: - left = Literal(String(acb)) - right = Literal(String(acb)) + left = Literal(String("acb")) + right = Literal(String("acb")) From b25311bea931203745883c136325c676d3e6230e Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 25 May 2018 14:43:27 +0200 Subject: [PATCH 3/3] Add prefixes to printed extractors --- .../src/scala/tasty/util/ShowExtractors.scala | 132 +++++++-------- tests/run/tasty-extractors-1.check | 160 +++++++++--------- tests/run/tasty-extractors-2.check | 148 ++++++++-------- tests/run/tasty-extractors-3.check | 42 ++--- tests/run/tasty-extractors-owners.check | 18 +- tests/run/tasty-extractors-types.check | 16 +- tests/run/tasty-macro-assert.check | 8 +- 7 files changed, 262 insertions(+), 262 deletions(-) diff --git a/library/src/scala/tasty/util/ShowExtractors.scala b/library/src/scala/tasty/util/ShowExtractors.scala index 342dd9b09c0b..ea46507351f8 100644 --- a/library/src/scala/tasty/util/ShowExtractors.scala +++ b/library/src/scala/tasty/util/ShowExtractors.scala @@ -25,43 +25,43 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty def visitTree(x: Tree): Buffer = x match { case Term.Ident(name) => - this += "Ident(\"" += name += "\")" + this += "Term.Ident(\"" += name += "\")" case Term.Select(qualifier, name, signature) => - this += "Select(" += qualifier += ", \"" += name += "\", " += signature += ")" + this += "Term.Select(" += qualifier += ", \"" += name += "\", " += signature += ")" case Term.This(qual) => - this += "This(" += qual += ")" + this += "Term.This(" += qual += ")" case Term.Super(qual, mix) => - this += "TypeApply(" += qual += ", " += mix += ")" + this += "Term.TypeApply(" += qual += ", " += mix += ")" case Term.Apply(fun, args) => - this += "Apply(" += fun += ", " ++= args += ")" + this += "Term.Apply(" += fun += ", " ++= args += ")" case Term.TypeApply(fun, args) => - this += "TypeApply(" += fun += ", " ++= args += ")" + this += "Term.TypeApply(" += fun += ", " ++= args += ")" case Term.Literal(const) => - this += "Literal(" += const += ")" + this += "Term.Literal(" += const += ")" case Term.New(tpt) => - this += "New(" += tpt += ")" + this += "Term.New(" += tpt += ")" case Term.Typed(expr, tpt) => - this += "Typed(" += expr += ", " += tpt += ")" + this += "Term.Typed(" += expr += ", " += tpt += ")" case Term.NamedArg(name, arg) => - this += "NamedArg(\"" += name += "\", " += arg += ")" + this += "Term.NamedArg(\"" += name += "\", " += arg += ")" case Term.Assign(lhs, rhs) => - this += "Assign(" += lhs += ", " += rhs += ")" + this += "Term.Assign(" += lhs += ", " += rhs += ")" case Term.Block(stats, expr) => - this += "Block(" ++= stats += ", " += expr += ")" + this += "Term.Block(" ++= stats += ", " += expr += ")" case Term.If(cond, thenp, elsep) => - this += "If(" += cond += ", " += thenp += ", " += elsep += ")" + this += "Term.If(" += cond += ", " += thenp += ", " += elsep += ")" case Term.Lambda(meth, tpt) => - this += "Lambda(" += meth += ", " += tpt += ")" + this += "Term.Lambda(" += meth += ", " += tpt += ")" case Term.Match(selector, cases) => - this += "Match(" += selector += ", " ++= cases += ")" + this += "Term.Match(" += selector += ", " ++= cases += ")" case Term.Return(expr) => - this += "Return(" += expr += ")" + this += "Term.Return(" += expr += ")" case Term.Try(block, handlers, finalizer) => - this += "Try(" += block += ", " ++= handlers += ", " += finalizer += ")" + this += "Term.Try(" += block += ", " ++= handlers += ", " += finalizer += ")" case Term.Repeated(elems) => - this += "Repeated(" ++= elems += ")" + this += "Term.Repeated(" ++= elems += ")" case Term.Inlined(call, bindings, expansion) => - this += "Inlined(" += call += ", " ++= bindings += ", " += expansion += ")" + this += "Term.Inlined(" += call += ", " ++= bindings += ", " += expansion += ")" case ValDef(name, tpt, rhs) => this += "ValDef(\"" += name += "\", " += tpt += ", " += rhs += ")" case DefDef(name, typeParams, paramss, returnTpt, rhs) => @@ -85,25 +85,25 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty def visitTypeTree(x: TypeOrBoundsTree): Buffer = x match { case TypeTree.Synthetic() => - this += "Synthetic()" + this += "TypeTree.Synthetic()" case TypeTree.TypeIdent(name) => - this += "TypeIdent(\"" += name += "\")" + this += "TypeTree.TypeIdent(\"" += name += "\")" case TypeTree.TypeSelect(qualifier, name) => - this += "TypeSelect(" += qualifier += ", \"" += name += "\")" + this += "TypeTree.TypeSelect(" += qualifier += ", \"" += name += "\")" case TypeTree.Singleton(ref) => - this += "Singleton(" += ref += ")" + this += "TypeTree.Singleton(" += ref += ")" case TypeTree.And(left, right) => - this += "And(" += left += ", " += right += ")" + this += "TypeTree.And(" += left += ", " += right += ")" case TypeTree.Or(left, right) => - this += "Or(" += left += ", " += right += ")" + this += "TypeTree.Or(" += left += ", " += right += ")" case TypeTree.Refined(tpt, refinements) => - this += "Refined(" += tpt += ", " ++= refinements += ")" + this += "TypeTree.Refined(" += tpt += ", " ++= refinements += ")" case TypeTree.Applied(tpt, args) => - this += "Applied(" += tpt += ", " ++= args += ")" + this += "TypeTree.Applied(" += tpt += ", " ++= args += ")" case TypeTree.ByName(result) => - this += "ByName(" += result += ")" + this += "TypeTree.ByName(" += result += ")" case TypeTree.Annotated(arg, annot) => - this += "Annotated(" += arg += ", " += annot += ")" + this += "TypeTree.Annotated(" += arg += ", " += annot += ")" case TypeBoundsTree(lo, hi) => this += "TypeBoundsTree(" += lo += ", " += hi += ")" } @@ -115,34 +115,34 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty def visitPattern(x: Pattern): Buffer = x match { case Pattern.Value(v) => - this += "Value(" += v += ")" + this += "Pattern.Value(" += v += ")" case Pattern.Bind(name, body) => - this += "Bind(\"" += name += "\", " += body += ")" + this += "Pattern.Bind(\"" += name += "\", " += body += ")" case Pattern.Unapply(fun, implicits, patterns) => - this += "Unapply(" += fun += ", " ++= implicits += ", " ++= patterns += ")" + this += "Pattern.Unapply(" += fun += ", " ++= implicits += ", " ++= patterns += ")" case Pattern.Alternative(patterns) => - this += "Alternative(" ++= patterns += ")" + this += "Pattern.Alternative(" ++= patterns += ")" case Pattern.TypeTest(tpt) => - this += "TypeTest(" += tpt += ")" + this += "Pattern.TypeTest(" += tpt += ")" } def visitConstant(x: Constant): Buffer = x match { - case Constant.Unit() => this += "Unit()" - case Constant.Null() => this += "Null()" - case Constant.Boolean(value) => this += "Boolean(" += value += ")" - case Constant.Byte(value) => this += "Byte(" += value += ")" - case Constant.Short(value) => this += "Short(" += value += ")" - case Constant.Char(value) => this += "Char(" += value += ")" - case Constant.Int(value) => this += "Int(" += value.toString += ")" - case Constant.Long(value) => this += "Long(" += value += ")" - case Constant.Float(value) => this += "Float(" += value += ")" - case Constant.Double(value) => this += "Double(" += value += ")" - case Constant.String(value) => this += "String(\"" += value += "\")" + case Constant.Unit() => this += "Constant.Unit()" + case Constant.Null() => this += "Constant.Null()" + case Constant.Boolean(value) => this += "Constant.Boolean(" += value += ")" + case Constant.Byte(value) => this += "Constant.Byte(" += value += ")" + case Constant.Short(value) => this += "Constant.Short(" += value += ")" + case Constant.Char(value) => this += "Constant.Char(" += value += ")" + case Constant.Int(value) => this += "Constant.Int(" += value.toString += ")" + case Constant.Long(value) => this += "Constant.Long(" += value += ")" + case Constant.Float(value) => this += "Constant.Float(" += value += ")" + case Constant.Double(value) => this += "Constant.Double(" += value += ")" + case Constant.String(value) => this += "Constant.String(\"" += value += "\")" } def visitType(x: TypeOrBounds): Buffer = x match { case Type.ConstantType(value) => - this += "ConstantType(" += value += ")" + this += "Type.ConstantType(" += value += ")" case Type.SymRef(sym, qual) => def visitName(sym: Definition): Buffer = sym match { case ValDef(name, _, _) => this += "ValDef(\"" += name += "\", _, _)" @@ -152,48 +152,48 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty case PackageDef(name, _) => this += "PackageDef(\"" += name += "\", _)" case _ => this += "#" } - this += "SymRef(" + this += "Type.SymRef(" visitName(sym) this += ", " += qual += ")" case Type.TermRef(name, qual) => - this += "TermRef(\"" += name += "\", " += qual += ")" + this += "Type.TermRef(\"" += name += "\", " += qual += ")" case Type.TypeRef(name, qual) => - this += "TypeRef(\"" += name += "\", " += qual += ")" + this += "Type.TypeRef(\"" += name += "\", " += qual += ")" case Type.Refinement(parent, name, info) => - this += "Refinement(" += parent += ", " += name += ", " += info += ")" + this += "Type.Refinement(" += parent += ", " += name += ", " += info += ")" case Type.AppliedType(tycon, args) => - this += "AppliedType(" += tycon += ", " ++= args += ")" + this += "Type.AppliedType(" += tycon += ", " ++= args += ")" case Type.AnnotatedType(underlying, annot) => - this += "AnnotatedType(" += underlying += ", " += annot += ")" + this += "Type.AnnotatedType(" += underlying += ", " += annot += ")" case Type.AndType(left, right) => - this += "AndType(" += left += ", " += right += ")" + this += "Type.AndType(" += left += ", " += right += ")" case Type.OrType(left, right) => - this += "OrType(" += left += ", " += right += ")" + this += "Type.OrType(" += left += ", " += right += ")" case Type.ByNameType(underlying) => - this += "ByNameType(" += underlying += ")" + this += "Type.ByNameType(" += underlying += ")" case Type.ParamRef(binder, idx) => - this += "ParamRef(" += binder+= ", " += idx += ")" + this += "Type.ParamRef(" += binder+= ", " += idx += ")" case Type.ThisType(tp) => - this += "ThisType(" += tp += ")" + this += "Type.ThisType(" += tp += ")" case Type.RecursiveThis(binder) => - this += "RecursiveThis(" += binder += ")" + this += "Type.RecursiveThis(" += binder += ")" case Type.MethodType(argNames, argTypes, resType) => - this += "MethodType(" ++= argNames += ", " ++= argTypes += ", " += resType += ")" + this += "Type.MethodType(" ++= argNames += ", " ++= argTypes += ", " += resType += ")" case Type.PolyType(argNames, argBounds, resType) => - this += "PolyType(" ++= argNames += ", " ++= argBounds += ", " += resType += ")" + this += "Type.PolyType(" ++= argNames += ", " ++= argBounds += ", " += resType += ")" case Type.TypeLambda(argNames, argBounds, resType) => - this += "TypeLambda(" ++= argNames += ", " ++= argBounds += ", " += resType += ")" + this += "Type.TypeLambda(" ++= argNames += ", " ++= argBounds += ", " += resType += ")" case TypeBounds(lo, hi) => this += "TypeBounds(" += lo += ", " += hi += ")" case NoPrefix() => - this += "NoPrefix" + this += "NoPrefix()" } def visitModifier(x: Modifier): Buffer = x match { - case Modifier.Flags(flags) => this += "Flags(" += flags.toString += ")" - case Modifier.QualifiedPrivate(tp) => this += "QualifiedPrivate(" += tp += ")" - case Modifier.QualifiedProtected(tp) => this += "QualifiedProtected(" += tp += ")" - case Modifier.Annotation(tree) => this += "Annotation(" += tree += ")" + case Modifier.Flags(flags) => this += "Modifier.Flags(" += flags.toString += ")" + case Modifier.QualifiedPrivate(tp) => this += "Modifier.QualifiedPrivate(" += tp += ")" + case Modifier.QualifiedProtected(tp) => this += "Modifier.QualifiedProtected(" += tp += ")" + case Modifier.Annotation(tree) => this += "Modifier.Annotation(" += tree += ")" } def visitId(x: Id): Buffer = { diff --git a/tests/run/tasty-extractors-1.check b/tests/run/tasty-extractors-1.check index 7afc6b990d5c..000e7a57862d 100644 --- a/tests/run/tasty-extractors-1.check +++ b/tests/run/tasty-extractors-1.check @@ -1,120 +1,120 @@ -Literal(Boolean(true)) -ConstantType(Boolean(true)) +Term.Literal(Constant.Boolean(true)) +Type.ConstantType(Constant.Boolean(true)) -Literal(Int(1)) -ConstantType(Int(1)) +Term.Literal(Constant.Int(1)) +Type.ConstantType(Constant.Int(1)) -Literal(Long(2)) -ConstantType(Long(2)) +Term.Literal(Constant.Long(2)) +Type.ConstantType(Constant.Long(2)) -Literal(Float(2.1)) -ConstantType(Float(2.1)) +Term.Literal(Constant.Float(2.1)) +Type.ConstantType(Constant.Float(2.1)) -Literal(Double(2.2)) -ConstantType(Double(2.2)) +Term.Literal(Constant.Double(2.2)) +Type.ConstantType(Constant.Double(2.2)) -Literal(String("abc")) -ConstantType(String("abc")) +Term.Literal(Constant.String("abc")) +Type.ConstantType(Constant.String("abc")) -Apply(Ident("println"), List(Literal(String("abc")))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Apply(Term.Ident("println"), List(Term.Literal(Constant.String("abc")))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Typed(Literal(Int(8)), TypeIdent("Int")) -SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) +Term.Typed(Term.Literal(Constant.Int(8)), TypeTree.TypeIdent("Int")) +Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))) -Typed(Literal(Byte(8)), TypeIdent("Byte")) -SymRef(ClassDef("Byte", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) +Term.Typed(Term.Literal(Constant.Byte(8)), TypeTree.TypeIdent("Byte")) +Type.SymRef(ClassDef("Byte", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))) -Typed(Literal(Short(8)), TypeIdent("Short")) -SymRef(ClassDef("Short", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) +Term.Typed(Term.Literal(Constant.Short(8)), TypeTree.TypeIdent("Short")) +Type.SymRef(ClassDef("Short", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))) -Literal(Char(a)) -ConstantType(Char(a)) +Term.Literal(Constant.Char(a)) +Type.ConstantType(Constant.Char(a)) -Block(List(Literal(Int(1)), Literal(Int(2))), Literal(Int(3))) -ConstantType(Int(3)) +Term.Block(List(Term.Literal(Constant.Int(1)), Term.Literal(Constant.Int(2))), Term.Literal(Constant.Int(3))) +Type.ConstantType(Constant.Int(3)) -If(Typed(Literal(Boolean(true)), TypeIdent("Boolean")), Literal(Int(1)), Literal(Int(2))) -SymRef(ClassDef("Int", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.If(Term.Typed(Term.Literal(Constant.Boolean(true)), TypeTree.TypeIdent("Boolean")), Term.Literal(Constant.Int(1)), Term.Literal(Constant.Int(2))) +Type.SymRef(ClassDef("Int", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Match(Literal(String("a")), List(CaseDef(Value(Literal(String("a"))), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Match(Term.Literal(Constant.String("a")), List(CaseDef(Pattern.Value(Term.Literal(Constant.String("a"))), None, Term.Block(Nil, Term.Literal(Constant.Unit()))))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Match(Literal(String("b")), List(CaseDef(Bind("n", Value(Ident("_"))), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Match(Term.Literal(Constant.String("b")), List(CaseDef(Pattern.Bind("n", Pattern.Value(Term.Ident("_"))), None, Term.Block(Nil, Term.Literal(Constant.Unit()))))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Match(Literal(String("c")), List(CaseDef(Bind("n", TypeTest(TypeIdent("String"))), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Match(Term.Literal(Constant.String("c")), List(CaseDef(Pattern.Bind("n", Pattern.TypeTest(TypeTree.TypeIdent("String"))), None, Term.Block(Nil, Term.Literal(Constant.Unit()))))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Match(Literal(String("e")), List(CaseDef(Value(Ident("_")), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Match(Term.Literal(Constant.String("e")), List(CaseDef(Pattern.Value(Term.Ident("_")), None, Term.Block(Nil, Term.Literal(Constant.Unit()))))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Match(Literal(String("f")), List(CaseDef(TypeTest(TypeIdent("String")), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Match(Term.Literal(Constant.String("f")), List(CaseDef(Pattern.TypeTest(TypeTree.TypeIdent("String")), None, Term.Block(Nil, Term.Literal(Constant.Unit()))))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Match(Typed(Literal(String("g")), TypeIdent("Any")), List(CaseDef(Alternative(List(TypeTest(TypeIdent("String")), TypeTest(TypeIdent("Int")))), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Match(Term.Typed(Term.Literal(Constant.String("g")), TypeTree.TypeIdent("Any")), List(CaseDef(Pattern.Alternative(List(Pattern.TypeTest(TypeTree.TypeIdent("String")), Pattern.TypeTest(TypeTree.TypeIdent("Int")))), None, Term.Block(Nil, Term.Literal(Constant.Unit()))))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Match(Literal(String("h")), List(CaseDef(Value(Ident("_")), Some(Literal(Boolean(false))), Block(Nil, Literal(Unit()))))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Match(Term.Literal(Constant.String("h")), List(CaseDef(Pattern.Value(Term.Ident("_")), Some(Term.Literal(Constant.Boolean(false))), Term.Block(Nil, Term.Literal(Constant.Unit()))))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ValDef("a", Synthetic(), Some(Literal(String("o"))))), Match(Literal(String("i")), List(CaseDef(Bind("a", Value(Ident("_"))), None, Block(Nil, Literal(Unit())))))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ValDef("a", TypeTree.Synthetic(), Some(Term.Literal(Constant.String("o"))))), Term.Match(Term.Literal(Constant.String("i")), List(CaseDef(Pattern.Bind("a", Pattern.Value(Term.Ident("_"))), None, Term.Block(Nil, Term.Literal(Constant.Unit())))))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Match(Ident("Nil"), List(CaseDef(Unapply(TypeApply(Select(Ident("List"), "unapplySeq", Some(Signature(List(scala.collection.Seq), scala.Some))), List(Synthetic())), Nil, List(Bind("a", Value(Ident("_"))), Bind("b", Value(Ident("_"))), Bind("c", Value(Ident("_"))))), None, Block(Nil, Literal(Unit()))))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Match(Term.Ident("Nil"), List(CaseDef(Pattern.Unapply(Term.TypeApply(Term.Select(Term.Ident("List"), "unapplySeq", Some(Signature(List(scala.collection.Seq), scala.Some))), List(TypeTree.Synthetic())), Nil, List(Pattern.Bind("a", Pattern.Value(Term.Ident("_"))), Pattern.Bind("b", Pattern.Value(Term.Ident("_"))), Pattern.Bind("c", Pattern.Value(Term.Ident("_"))))), None, Term.Block(Nil, Term.Literal(Constant.Unit()))))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Try(Literal(Int(1)), List(CaseDef(Value(Ident("_")), None, Block(Nil, Literal(Unit())))), None) -OrType(SymRef(ClassDef("Int", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))), SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) +Term.Try(Term.Literal(Constant.Int(1)), List(CaseDef(Pattern.Value(Term.Ident("_")), None, Term.Block(Nil, Term.Literal(Constant.Unit())))), None) +Type.OrType(Type.SymRef(ClassDef("Int", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))) -Try(Literal(Int(2)), Nil, Some(Literal(Unit()))) -ConstantType(Int(2)) +Term.Try(Term.Literal(Constant.Int(2)), Nil, Some(Term.Literal(Constant.Unit()))) +Type.ConstantType(Constant.Int(2)) -Try(Literal(Int(3)), List(CaseDef(Value(Ident("_")), None, Block(Nil, Literal(Unit())))), Some(Literal(Unit()))) -OrType(SymRef(ClassDef("Int", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))), SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) +Term.Try(Term.Literal(Constant.Int(3)), List(CaseDef(Pattern.Value(Term.Ident("_")), None, Term.Block(Nil, Term.Literal(Constant.Unit())))), Some(Term.Literal(Constant.Unit()))) +Type.OrType(Type.SymRef(ClassDef("Int", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))) -Apply(Select(Literal(String("a")), "==", Some(Signature(List(java.lang.Object), scala.Boolean))), List(Literal(String("b")))) -SymRef(ClassDef("Boolean", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Apply(Term.Select(Term.Literal(Constant.String("a")), "==", Some(Signature(List(java.lang.Object), scala.Boolean))), List(Term.Literal(Constant.String("b")))) +Type.SymRef(ClassDef("Boolean", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Apply(Select(New(TypeIdent("Object")), "", Some(Signature(Nil, java.lang.Object))), Nil) -SymRef(ClassDef("Object", _, _, _, _), ThisType(SymRef(PackageDef("lang", _), NoPrefix))) +Term.Apply(Term.Select(Term.New(TypeTree.TypeIdent("Object")), "", Some(Signature(Nil, java.lang.Object))), Nil) +Type.SymRef(ClassDef("Object", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("lang", _), NoPrefix()))) -Apply(Select(Ident("Int"), "box", Some(Signature(List(scala.Int), java.lang.Integer))), List(NamedArg("x", Literal(Int(9))))) -SymRef(ClassDef("Integer", _, _, _, _), ThisType(SymRef(PackageDef("lang", _), NoPrefix))) +Term.Apply(Term.Select(Term.Ident("Int"), "box", Some(Signature(List(scala.Int), java.lang.Integer))), List(Term.NamedArg("x", Term.Literal(Constant.Int(9))))) +Type.SymRef(ClassDef("Integer", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("lang", _), NoPrefix()))) -Apply(TypeApply(Select(Ident("Ordering"), "apply", Some(Signature(List(scala.math.Ordering), scala.math.Ordering))), List(TypeIdent("Int"))), List(Ident("Int"))) -AppliedType(SymRef(ClassDef("Ordering", _, _, _, _), ThisType(SymRef(PackageDef("math", _), NoPrefix))), List(SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))))) +Term.Apply(Term.TypeApply(Term.Select(Term.Ident("Ordering"), "apply", Some(Signature(List(scala.math.Ordering), scala.math.Ordering))), List(TypeTree.TypeIdent("Int"))), List(Term.Ident("Int"))) +Type.AppliedType(Type.SymRef(ClassDef("Ordering", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("math", _), NoPrefix()))), List(Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))))) -Block(List(ValDef("a", TypeIdent("Int"), Some(Literal(Int(3))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ValDef("a", TypeTree.TypeIdent("Int"), Some(Term.Literal(Constant.Int(3))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ValDef("b", TypeIdent("Int"), Some(Literal(Int(3))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ValDef("b", TypeTree.TypeIdent("Int"), Some(Term.Literal(Constant.Int(3))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(DefDef("f1", Nil, Nil, TypeIdent("Int"), Some(Literal(Int(3))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(DefDef("f1", Nil, Nil, TypeTree.TypeIdent("Int"), Some(Term.Literal(Constant.Int(3))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(DefDef("f2", Nil, Nil, TypeIdent("Int"), Some(Return(Literal(Int(4)))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(DefDef("f2", Nil, Nil, TypeTree.TypeIdent("Int"), Some(Term.Return(Term.Literal(Constant.Int(4)))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(DefDef("f3", Nil, List(List(ValDef("i", TypeIdent("Int"), None))), TypeIdent("Int"), Some(Ident("i")))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(DefDef("f3", Nil, List(List(ValDef("i", TypeTree.TypeIdent("Int"), None))), TypeTree.TypeIdent("Int"), Some(Term.Ident("i")))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(DefDef("f4", Nil, List(List(ValDef("i", TypeIdent("Int"), None)), List(ValDef("j", TypeIdent("Int"), None))), TypeIdent("Int"), Some(Apply(Select(Ident("i"), "+", Some(Signature(List(scala.Int), scala.Int))), List(Ident("j")))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(DefDef("f4", Nil, List(List(ValDef("i", TypeTree.TypeIdent("Int"), None)), List(ValDef("j", TypeTree.TypeIdent("Int"), None))), TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Ident("i"), "+", Some(Signature(List(scala.Int), scala.Int))), List(Term.Ident("j")))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(DefDef("f5", Nil, List(List(ValDef("i", TypeIdent("Int"), None))), TypeIdent("Int"), Some(Ident("i"))), DefDef("f5$default$1", Nil, Nil, Synthetic(), Some(Literal(Int(9))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(DefDef("f5", Nil, List(List(ValDef("i", TypeTree.TypeIdent("Int"), None))), TypeTree.TypeIdent("Int"), Some(Term.Ident("i"))), DefDef("f5$default$1", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(9))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(DefDef("f6", List(TypeDef("T", TypeBoundsTree(Synthetic(), Synthetic()))), List(List(ValDef("x", TypeIdent("T"), None))), TypeIdent("T"), Some(Ident("x")))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(DefDef("f6", List(TypeDef("T", TypeBoundsTree(TypeTree.Synthetic(), TypeTree.Synthetic()))), List(List(ValDef("x", TypeTree.TypeIdent("T"), None))), TypeTree.TypeIdent("T"), Some(Term.Ident("x")))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(DefDef("f7", List(TypeDef("T", TypeBoundsTree(Synthetic(), Synthetic()))), List(List(ValDef("x", TypeIdent("T"), None))), Singleton(Ident("x")), Some(Ident("x")))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(DefDef("f7", List(TypeDef("T", TypeBoundsTree(TypeTree.Synthetic(), TypeTree.Synthetic()))), List(List(ValDef("x", TypeTree.TypeIdent("T"), None))), TypeTree.Singleton(Term.Ident("x")), Some(Term.Ident("x")))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(DefDef("f8", Nil, List(List(ValDef("i", Annotated(Applied(Synthetic(), List(TypeIdent("Int"))), Apply(Select(New(Synthetic()), "", Some(Signature(Nil, scala.annotation.internal.Repeated))), Nil)), None))), TypeIdent("Int"), Some(Literal(Int(9))))), Apply(Ident("f8"), List(Typed(Repeated(List(Literal(Int(1)), Literal(Int(2)), Literal(Int(3)))), Synthetic())))) -SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) +Term.Block(List(DefDef("f8", Nil, List(List(ValDef("i", TypeTree.Annotated(TypeTree.Applied(TypeTree.Synthetic(), List(TypeTree.TypeIdent("Int"))), Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, scala.annotation.internal.Repeated))), Nil)), None))), TypeTree.TypeIdent("Int"), Some(Term.Literal(Constant.Int(9))))), Term.Apply(Term.Ident("f8"), List(Term.Typed(Term.Repeated(List(Term.Literal(Constant.Int(1)), Term.Literal(Constant.Int(2)), Term.Literal(Constant.Int(3)))), TypeTree.Synthetic())))) +Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))) -Block(List(DefDef("f9", Nil, List(List(ValDef("i", ByName(TypeIdent("Int")), None))), TypeIdent("Int"), Some(Ident("i")))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(DefDef("f9", Nil, List(List(ValDef("i", TypeTree.ByName(TypeTree.TypeIdent("Int")), None))), TypeTree.TypeIdent("Int"), Some(Term.Ident("i")))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) diff --git a/tests/run/tasty-extractors-2.check b/tests/run/tasty-extractors-2.check index 2bc68536397f..3247ffb7a635 100644 --- a/tests/run/tasty-extractors-2.check +++ b/tests/run/tasty-extractors-2.check @@ -1,111 +1,111 @@ -Block(List(ValDef("x", Synthetic(), Some(Literal(Int(1))))), Assign(Ident("x"), Literal(Int(2)))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ValDef("x", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(1))))), Term.Assign(Term.Ident("x"), Term.Literal(Constant.Int(2)))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(DefDef("$anonfun", Nil, List(List(ValDef("x", TypeIdent("Int"), None))), Synthetic(), Some(Ident("x")))), Lambda(Ident("$anonfun"), None)) -AppliedType(SymRef(ClassDef("Function1", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))), List(SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))), SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))))) +Term.Block(List(DefDef("$anonfun", Nil, List(List(ValDef("x", TypeTree.TypeIdent("Int"), None))), TypeTree.Synthetic(), Some(Term.Ident("x")))), Term.Lambda(Term.Ident("$anonfun"), None)) +Type.AppliedType(Type.SymRef(ClassDef("Function1", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), List(Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))), Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))))) -Ident("???") -SymRef(DefDef("???", _, _, _, _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) +Term.Ident("???") +Type.SymRef(DefDef("???", _, _, _, _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))) -Typed(Literal(Int(1)), Singleton(Literal(Int(1)))) -ConstantType(Int(1)) +Term.Typed(Term.Literal(Constant.Int(1)), TypeTree.Singleton(Term.Literal(Constant.Int(1)))) +Type.ConstantType(Constant.Int(1)) -Typed(Literal(Int(1)), TypeIdent("Int")) -SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) +Term.Typed(Term.Literal(Constant.Int(1)), TypeTree.TypeIdent("Int")) +Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))) -Typed(Ident("Nil"), Applied(TypeIdent("List"), List(TypeIdent("Int")))) -AppliedType(SymRef(ClassDef("List", _, _, _, _), ThisType(SymRef(PackageDef("immutable", _), NoPrefix))), List(SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))))) +Term.Typed(Term.Ident("Nil"), TypeTree.Applied(TypeTree.TypeIdent("List"), List(TypeTree.TypeIdent("Int")))) +Type.AppliedType(Type.SymRef(ClassDef("List", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("immutable", _), NoPrefix()))), List(Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))))) -Typed(Apply(Select(New(TypeIdent("Baz")), "", Some(Signature(Nil, Baz))), Nil), And(TypeIdent("Foo"), TypeIdent("Bar"))) -AndType(SymRef(ClassDef("Foo", _, _, _, _), ThisType(SymRef(PackageDef("", _), NoPrefix))), SymRef(ClassDef("Bar", _, _, _, _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) +Term.Typed(Term.Apply(Term.Select(Term.New(TypeTree.TypeIdent("Baz")), "", Some(Signature(Nil, Baz))), Nil), TypeTree.And(TypeTree.TypeIdent("Foo"), TypeTree.TypeIdent("Bar"))) +Type.AndType(Type.SymRef(ClassDef("Foo", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix()))), Type.SymRef(ClassDef("Bar", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))) -Typed(Literal(Int(1)), Or(TypeIdent("Int"), TypeIdent("String"))) -OrType(SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))), SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))))) +Term.Typed(Term.Literal(Constant.Int(1)), TypeTree.Or(TypeTree.TypeIdent("Int"), TypeTree.TypeIdent("String"))) +Type.OrType(Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))), Type.SymRef(TypeDef("String", _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))))) -Block(List(Import(Select(Ident("scala"), "collection", None), List(SimpleSelector(Id("mutable"))))), Literal(Int(1))) -ConstantType(Int(1)) +Term.Block(List(Import(Term.Select(Term.Ident("scala"), "collection", None), List(SimpleSelector(Id("mutable"))))), Term.Literal(Constant.Int(1))) +Type.ConstantType(Constant.Int(1)) -Block(List(Import(Select(Ident("scala"), "collection", None), List(SimpleSelector(Id("mutable")), SimpleSelector(Id("immutable"))))), Literal(Int(2))) -ConstantType(Int(2)) +Term.Block(List(Import(Term.Select(Term.Ident("scala"), "collection", None), List(SimpleSelector(Id("mutable")), SimpleSelector(Id("immutable"))))), Term.Literal(Constant.Int(2))) +Type.ConstantType(Constant.Int(2)) -Block(List(Import(Select(Ident("scala"), "collection", None), List(RenameSelector(Id("mutable"), Id("mut"))))), Literal(Int(3))) -ConstantType(Int(3)) +Term.Block(List(Import(Term.Select(Term.Ident("scala"), "collection", None), List(RenameSelector(Id("mutable"), Id("mut"))))), Term.Literal(Constant.Int(3))) +Type.ConstantType(Constant.Int(3)) -Block(List(Import(Select(Ident("scala"), "collection", None), List(OmitSelector(Id("mutable"))))), Literal(Int(4))) -ConstantType(Int(4)) +Term.Block(List(Import(Term.Select(Term.Ident("scala"), "collection", None), List(OmitSelector(Id("mutable"))))), Term.Literal(Constant.Int(4))) +Type.ConstantType(Constant.Int(4)) -Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, Nil)), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, Nil)), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ValDef("Foo", TypeIdent("Foo$"), Some(Apply(Select(New(TypeIdent("Foo$")), "", Some(Signature(Nil, Test$._$Foo$))), Nil))), ClassDef("Foo$", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef("_", Singleton(Ident("Foo")), None)), Nil)), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ValDef("Foo", TypeTree.TypeIdent("Foo$"), Some(Term.Apply(Term.Select(Term.New(TypeTree.TypeIdent("Foo$")), "", Some(Signature(Nil, Test$._$Foo$))), Nil))), ClassDef("Foo$", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef("_", TypeTree.Singleton(Term.Ident("Foo")), None)), Nil)), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(TypeDef("Foo", TypeBoundsTree(Synthetic(), Synthetic()))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(TypeDef("Foo", TypeBoundsTree(TypeTree.Synthetic(), TypeTree.Synthetic()))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(TypeDef("Foo", TypeIdent("Int"))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(TypeDef("Foo", TypeTree.TypeIdent("Int"))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(TypeDef("Foo", TypeBoundsTree(TypeIdent("Null"), TypeIdent("Object")))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(TypeDef("Foo", TypeBoundsTree(TypeTree.TypeIdent("Null"), TypeTree.TypeIdent("Object")))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), Some(Literal(Int(0)))), DefDef("a_=", Nil, List(List(ValDef("x$1", Synthetic(), None))), Synthetic(), Some(Literal(Unit())))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo", 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(ValDef("a", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(0)))), DefDef("a_=", Nil, List(List(ValDef("x$1", TypeTree.Synthetic(), None))), TypeTree.Synthetic(), Some(Term.Literal(Constant.Unit())))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef("a", Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo", 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(DefDef("a", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(0))))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef("a", Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo", 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(DefDef("a", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(0))))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(DefDef("a", Nil, Nil, Synthetic(), Some(Literal(Int(0))))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo", 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(DefDef("a", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(0))))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo1", DefDef("", Nil, List(List(ValDef("a", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), None)))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo1", DefDef("", Nil, List(List(ValDef("a", TypeTree.TypeIdent("Int"), None))), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", TypeTree.Synthetic(), None)))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo2", DefDef("", Nil, List(List(ValDef("b", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("b", Synthetic(), None)))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo2", DefDef("", Nil, List(List(ValDef("b", TypeTree.TypeIdent("Int"), None))), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("b", TypeTree.Synthetic(), None)))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo3", DefDef("", Nil, List(List(ValDef("a", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), None))), ValDef("Foo3", TypeIdent("Foo3$"), Some(Apply(Select(New(TypeIdent("Foo3$")), "", Some(Signature(Nil, Test$._$Foo3$))), Nil))), ClassDef("Foo3$", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef("_", Singleton(Ident("Foo3")), None)), List(DefDef("$lessinit$greater$default$1", Nil, Nil, Synthetic(), Some(Literal(Int(5))))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo3", DefDef("", Nil, List(List(ValDef("a", TypeTree.TypeIdent("Int"), None))), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", TypeTree.Synthetic(), None))), ValDef("Foo3", TypeTree.TypeIdent("Foo3$"), Some(Term.Apply(Term.Select(Term.New(TypeTree.TypeIdent("Foo3$")), "", Some(Signature(Nil, Test$._$Foo3$))), Nil))), ClassDef("Foo3$", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef("_", TypeTree.Singleton(Term.Ident("Foo3")), None)), List(DefDef("$lessinit$greater$default$1", Nil, Nil, TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(5))))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo4", DefDef("", Nil, List(List(ValDef("a", TypeIdent("Int"), None)), List(ValDef("b", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), None), ValDef("b", Synthetic(), None)))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo4", DefDef("", Nil, List(List(ValDef("a", TypeTree.TypeIdent("Int"), None)), List(ValDef("b", TypeTree.TypeIdent("Int"), None))), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", TypeTree.Synthetic(), None), ValDef("b", TypeTree.Synthetic(), None)))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo5", DefDef("", Nil, List(List(ValDef("a", TypeIdent("Int"), None)), List(ValDef("b", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), None), ValDef("b", Synthetic(), None))), ValDef("Foo5", TypeIdent("Foo5$"), Some(Apply(Select(New(TypeIdent("Foo5$")), "", Some(Signature(Nil, Test$._$Foo5$))), Nil))), ClassDef("Foo5$", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef("_", Singleton(Ident("Foo5")), None)), List(DefDef("$lessinit$greater$default$2", Nil, List(List(ValDef("a", TypeIdent("Int"), None))), Synthetic(), Some(Ident("a")))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo5", DefDef("", Nil, List(List(ValDef("a", TypeTree.TypeIdent("Int"), None)), List(ValDef("b", TypeTree.TypeIdent("Int"), None))), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", TypeTree.Synthetic(), None), ValDef("b", TypeTree.Synthetic(), None))), ValDef("Foo5", TypeTree.TypeIdent("Foo5$"), Some(Term.Apply(Term.Select(Term.New(TypeTree.TypeIdent("Foo5$")), "", Some(Signature(Nil, Test$._$Foo5$))), Nil))), ClassDef("Foo5$", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), Some(ValDef("_", TypeTree.Singleton(Term.Ident("Foo5")), None)), List(DefDef("$lessinit$greater$default$2", Nil, List(List(ValDef("a", TypeTree.TypeIdent("Int"), None))), TypeTree.Synthetic(), Some(Term.Ident("a")))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo6", DefDef("", Nil, List(List(ValDef("a", TypeIdent("Int"), None)), List(ValDef("b", Singleton(Ident("a")), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), None), ValDef("b", Synthetic(), None)))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo6", DefDef("", Nil, List(List(ValDef("a", TypeTree.TypeIdent("Int"), None)), List(ValDef("b", TypeTree.Singleton(Term.Ident("a")), None))), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", TypeTree.Synthetic(), None), ValDef("b", TypeTree.Synthetic(), None)))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo8", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(Apply(Ident("println"), List(Literal(Int(0))))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo8", 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(Term.Apply(Term.Ident("println"), List(Term.Literal(Constant.Int(0))))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo10", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), Some(Literal(Int(9))))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo10", 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(ValDef("a", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(9))))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo11", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), Some(Literal(Int(10)))), DefDef("a_=", Nil, List(List(ValDef("x$1", Synthetic(), None))), Synthetic(), Some(Literal(Unit())))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo11", 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(ValDef("a", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(10)))), DefDef("a_=", Nil, List(List(ValDef("x$1", TypeTree.Synthetic(), None))), TypeTree.Synthetic(), Some(Term.Literal(Constant.Unit())))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo12", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("a", Synthetic(), Some(Literal(Int(11))))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo12", 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(ValDef("a", TypeTree.Synthetic(), Some(Term.Literal(Constant.Int(11))))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, Nil), ClassDef("Bar", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, Test$._$Foo))), Nil)), None, Nil)), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, Nil), ClassDef("Bar", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, Test$._$Foo))), Nil)), None, Nil)), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo2", DefDef("", Nil, List(Nil), Synthetic(), None), List(Synthetic()), None, Nil), ClassDef("Bar", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil), TypeIdent("Foo2")), None, Nil)), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo2", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(TypeTree.Synthetic()), None, Nil), ClassDef("Bar", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil), TypeTree.TypeIdent("Foo2")), None, Nil)), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo", DefDef("", Nil, List(List(ValDef("i", TypeIdent("Int"), None))), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("i", Synthetic(), None))), ClassDef("Bar", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(TypeIdent("Foo")), "", Some(Signature(List(scala.Int), Test$._$Foo))), List(Literal(Int(1))))), None, Nil)), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo", DefDef("", Nil, List(List(ValDef("i", TypeTree.TypeIdent("Int"), None))), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(ValDef("i", TypeTree.Synthetic(), None))), ClassDef("Bar", DefDef("", Nil, List(Nil), TypeTree.Synthetic(), None), List(Term.Apply(Term.Select(Term.New(TypeTree.TypeIdent("Foo")), "", Some(Signature(List(scala.Int), Test$._$Foo))), List(Term.Literal(Constant.Int(1))))), None, Nil)), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("X", TypeIdent("Int")))), DefDef("f", Nil, List(List(ValDef("a", TypeIdent("Foo"), None))), TypeSelect(Ident("a"), "X"), Some(Ident("???")))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo", 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("X", TypeTree.TypeIdent("Int")))), DefDef("f", Nil, List(List(ValDef("a", TypeTree.TypeIdent("Foo"), None))), TypeTree.TypeSelect(Term.Ident("a"), "X"), Some(Term.Ident("???")))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ClassDef("Foo", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("X", TypeBoundsTree(Synthetic(), Synthetic())))), DefDef("f", Nil, List(List(ValDef("a", Refined(TypeIdent("Foo"), List(TypeDef("X", TypeIdent("Int")))), None))), TypeSelect(Ident("a"), "X"), Some(Ident("???")))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ClassDef("Foo", 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("X", TypeBoundsTree(TypeTree.Synthetic(), TypeTree.Synthetic())))), DefDef("f", Nil, List(List(ValDef("a", TypeTree.Refined(TypeTree.TypeIdent("Foo"), List(TypeDef("X", TypeTree.TypeIdent("Int")))), None))), TypeTree.TypeSelect(Term.Ident("a"), "X"), Some(Term.Ident("???")))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Block(List(ValDef("lambda", Applied(Synthetic(), List(TypeIdent("Int"), TypeIdent("Int"))), Some(Block(List(DefDef("$anonfun", Nil, List(List(ValDef("x", Synthetic(), None))), Synthetic(), Some(Ident("x")))), Lambda(Ident("$anonfun"), None))))), Literal(Unit())) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Term.Block(List(ValDef("lambda", TypeTree.Applied(TypeTree.Synthetic(), List(TypeTree.TypeIdent("Int"), TypeTree.TypeIdent("Int"))), Some(Term.Block(List(DefDef("$anonfun", Nil, List(List(ValDef("x", TypeTree.Synthetic(), None))), TypeTree.Synthetic(), Some(Term.Ident("x")))), Term.Lambda(Term.Ident("$anonfun"), None))))), Term.Literal(Constant.Unit())) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) diff --git a/tests/run/tasty-extractors-3.check b/tests/run/tasty-extractors-3.check index 507d87fe9a04..124fc305f91e 100644 --- a/tests/run/tasty-extractors-3.check +++ b/tests/run/tasty-extractors-3.check @@ -1,42 +1,42 @@ -SymRef(ClassDef("Int", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Type.SymRef(ClassDef("Int", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -SymRef(ValDef("x", _, _), NoPrefix) +Type.SymRef(ValDef("x", _, _), NoPrefix()) -TypeBounds(SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))), SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) +TypeBounds(Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))) -SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -SymRef(TypeDef("T", _), NoPrefix) +Type.SymRef(TypeDef("T", _), NoPrefix()) -TypeBounds(SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))), SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix))))) +TypeBounds(Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))), Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix()))))) -SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) +Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))) -SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) +Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))) -SymRef(TypeDef("T", _), NoPrefix) +Type.SymRef(TypeDef("T", _), NoPrefix()) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -SymRef(ClassDef("Object", _, _, _, _), ThisType(SymRef(PackageDef("lang", _), NoPrefix))) +Type.SymRef(ClassDef("Object", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("lang", _), NoPrefix()))) -TypeBounds(SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))), SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) +TypeBounds(Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))), Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))) -SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -SymRef(#, ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Type.SymRef(#, Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -Refinement(SymRef(ClassDef("Foo", _, _, _, _), NoPrefix), X, TypeBounds(SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))), SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))))) +Type.Refinement(Type.SymRef(ClassDef("Foo", _, _, _, _), NoPrefix()), X, TypeBounds(Type.SymRef(TypeDef("String", _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))), Type.SymRef(TypeDef("String", _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))))) -SymRef(ClassDef("Unit", _, _, _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix))) +Type.SymRef(ClassDef("Unit", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix()))) -SymRef(ClassDef("Foo", _, _, _, _), NoPrefix) +Type.SymRef(ClassDef("Foo", _, _, _, _), NoPrefix()) -SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))) +Type.SymRef(TypeDef("String", _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))) -SymRef(ClassDef("$anon", _, _, _, _), NoPrefix) +Type.SymRef(ClassDef("$anon", _, _, _, _), NoPrefix()) -Refinement(SymRef(ClassDef("Foo", _, _, _, _), NoPrefix), X, TypeBounds(SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))), SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))))) +Type.Refinement(Type.SymRef(ClassDef("Foo", _, _, _, _), NoPrefix()), X, TypeBounds(Type.SymRef(TypeDef("String", _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))), Type.SymRef(TypeDef("String", _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))))) diff --git a/tests/run/tasty-extractors-owners.check b/tests/run/tasty-extractors-owners.check index ec7f4f6b6a0a..2bc84f66c081 100644 --- a/tests/run/tasty-extractors-owners.check +++ b/tests/run/tasty-extractors-owners.check @@ -1,27 +1,27 @@ foo -DefDef("main", Nil, List(List(ValDef("args", Synthetic(), None))), Synthetic(), None) +DefDef("main", Nil, List(List(ValDef("args", TypeTree.Synthetic(), None))), TypeTree.Synthetic(), None) bar -DefDef("foo", Nil, Nil, Synthetic(), None) +DefDef("foo", Nil, Nil, TypeTree.Synthetic(), None) bar2 -DefDef("foo", Nil, Nil, Synthetic(), None) +DefDef("foo", Nil, Nil, TypeTree.Synthetic(), None) foo2 -DefDef("main", Nil, List(List(ValDef("args", Synthetic(), None))), Synthetic(), None) +DefDef("main", Nil, List(List(ValDef("args", TypeTree.Synthetic(), None))), TypeTree.Synthetic(), None) baz -ValDef("foo2", Synthetic(), None) +ValDef("foo2", TypeTree.Synthetic(), None) baz2 -ValDef("foo2", Synthetic(), None) +ValDef("foo2", TypeTree.Synthetic(), None) -ClassDef("A", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("B", Synthetic()), DefDef("b", Nil, Nil, Synthetic(), None), ValDef("b2", Synthetic(), None))) +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.Synthetic()), DefDef("b", Nil, Nil, TypeTree.Synthetic(), None), ValDef("b2", TypeTree.Synthetic(), None))) b -ClassDef("A", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("B", Synthetic()), DefDef("b", Nil, Nil, Synthetic(), None), ValDef("b2", Synthetic(), None))) +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.Synthetic()), DefDef("b", Nil, Nil, TypeTree.Synthetic(), None), ValDef("b2", TypeTree.Synthetic(), None))) b2 -ClassDef("A", DefDef("", Nil, List(Nil), Synthetic(), None), List(Apply(Select(New(Synthetic()), "", Some(Signature(Nil, java.lang.Object))), Nil)), None, List(TypeDef("B", Synthetic()), DefDef("b", Nil, Nil, Synthetic(), None), ValDef("b2", Synthetic(), None))) +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.Synthetic()), DefDef("b", Nil, Nil, TypeTree.Synthetic(), None), ValDef("b2", TypeTree.Synthetic(), None))) diff --git a/tests/run/tasty-extractors-types.check b/tests/run/tasty-extractors-types.check index 283018e6e716..6563bf5bfc42 100644 --- a/tests/run/tasty-extractors-types.check +++ b/tests/run/tasty-extractors-types.check @@ -1,12 +1,12 @@ -TypeIdent("Int") -SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))) +TypeTree.TypeIdent("Int") +Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))) -Applied(TypeIdent("List"), List(TypeIdent("String"))) -AppliedType(SymRef(ClassDef("List", _, _, _, _), ThisType(SymRef(PackageDef("immutable", _), NoPrefix))), List(SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))))) +TypeTree.Applied(TypeTree.TypeIdent("List"), List(TypeTree.TypeIdent("String"))) +Type.AppliedType(Type.SymRef(ClassDef("List", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("immutable", _), NoPrefix()))), List(Type.SymRef(TypeDef("String", _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))))) -Applied(TypeIdent("Map"), List(TypeIdent("String"), TypeIdent("Int"))) -AppliedType(SymRef(ClassDef("Map", _, _, _, _), ThisType(SymRef(PackageDef("immutable", _), NoPrefix))), List(SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))), SymRef(ClassDef("Int", _, _, _, _), SymRef(PackageDef("scala", _), ThisType(SymRef(PackageDef("", _), NoPrefix)))))) +TypeTree.Applied(TypeTree.TypeIdent("Map"), List(TypeTree.TypeIdent("String"), TypeTree.TypeIdent("Int"))) +Type.AppliedType(Type.SymRef(ClassDef("Map", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("immutable", _), NoPrefix()))), List(Type.SymRef(TypeDef("String", _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))), Type.SymRef(ClassDef("Int", _, _, _, _), Type.SymRef(PackageDef("scala", _), Type.ThisType(Type.SymRef(PackageDef("", _), NoPrefix())))))) -Applied(TypeIdent("Map"), List(TypeIdent("String"), TypeIdent("I"))) -AppliedType(SymRef(ClassDef("Map", _, _, _, _), ThisType(SymRef(PackageDef("immutable", _), NoPrefix))), List(SymRef(TypeDef("String", _), SymRef(ValDef("Predef", _, _), ThisType(SymRef(PackageDef("scala", _), NoPrefix)))), SymRef(TypeDef("I", _), NoPrefix))) +TypeTree.Applied(TypeTree.TypeIdent("Map"), List(TypeTree.TypeIdent("String"), TypeTree.TypeIdent("I"))) +Type.AppliedType(Type.SymRef(ClassDef("Map", _, _, _, _), Type.ThisType(Type.SymRef(PackageDef("immutable", _), NoPrefix()))), List(Type.SymRef(TypeDef("String", _), Type.SymRef(ValDef("Predef", _, _), Type.ThisType(Type.SymRef(PackageDef("scala", _), NoPrefix())))), Type.SymRef(TypeDef("I", _), NoPrefix()))) diff --git a/tests/run/tasty-macro-assert.check b/tests/run/tasty-macro-assert.check index 9cb0fa36e224..df774273df9d 100644 --- a/tests/run/tasty-macro-assert.check +++ b/tests/run/tasty-macro-assert.check @@ -1,7 +1,7 @@ Condition was false Error left did not equal right: - left = Literal(String("acb")) - right = Literal(String("cde")) + left = Term.Literal(Constant.String("acb")) + right = Term.Literal(Constant.String("cde")) Error left was equal to right: - left = Literal(String("acb")) - right = Literal(String("acb")) + left = Term.Literal(Constant.String("acb")) + right = Term.Literal(Constant.String("acb"))