Skip to content

Commit b3bf1e6

Browse files
committed
Print shallow extractor for SymRef definitions
This allows to copy pase the printed extractor
1 parent a15cfad commit b3bf1e6

File tree

5 files changed

+93
-93
lines changed

5 files changed

+93
-93
lines changed

library/src/scala/tasty/util/ShowExtractors.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,11 @@ class ShowExtractors[T <: Tasty with Singleton](tasty0: T) extends Show[T](tasty
145145
this += "ConstantType(" += value += ")"
146146
case Type.SymRef(sym, qual) =>
147147
def visitName(sym: Definition): Buffer = sym match {
148-
case ValDef(name, _, _) => this += name
149-
case DefDef(name, _, _, _, _) => this += name
150-
case TypeDef(name, _) => this += name
151-
case ClassDef(name, _, _, _, _) => this += name
152-
case PackageDef(name, _) => this += name
148+
case ValDef(name, _, _) => this += "ValDef(" += name += ", _, _)"
149+
case DefDef(name, _, _, _, _) => this += "DefDef(" += name += ", _, _, _, _)"
150+
case TypeDef(name, _) => this += "TypeDef(" += name += ", _)"
151+
case ClassDef(name, _, _, _, _) => this += "ClassDef(" += name += ", _, _, _, _)"
152+
case PackageDef(name, _) => this += "PackageDef(" += name += ", _)"
153153
case _ => this += "#"
154154
}
155155
this += "SymRef("

tests/run/tasty-extractors-1.check

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ Literal(String(abc))
1717
ConstantType(String(abc))
1818

1919
Apply(Ident(println), List(Literal(String(abc))))
20-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
20+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
2121

2222
Typed(Literal(Int(8)), TypeIdent(Int))
23-
SymRef(Int, SymRef(scala, ThisType(SymRef(<root>, NoPrefix))))
23+
SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(<root>, _), NoPrefix))))
2424

2525
Typed(Literal(Byte(8)), TypeIdent(Byte))
26-
SymRef(Byte, SymRef(scala, ThisType(SymRef(<root>, NoPrefix))))
26+
SymRef(ClassDef(Byte, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(<root>, _), NoPrefix))))
2727

2828
Typed(Literal(Short(8)), TypeIdent(Short))
29-
SymRef(Short, SymRef(scala, ThisType(SymRef(<root>, NoPrefix))))
29+
SymRef(ClassDef(Short, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(<root>, _), NoPrefix))))
3030

3131
Literal(Char(a))
3232
ConstantType(Char(a))
@@ -35,86 +35,86 @@ Block(List(Literal(Int(1)), Literal(Int(2))), Literal(Int(3)))
3535
ConstantType(Int(3))
3636

3737
If(Typed(Literal(Boolean(true)), TypeIdent(Boolean)), Literal(Int(1)), Literal(Int(2)))
38-
SymRef(Int, ThisType(SymRef(scala, NoPrefix)))
38+
SymRef(ClassDef(Int, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
3939

4040
Match(Literal(String(a)), List(CaseDef(Value(Literal(String(a))), None, Block(Nil, Literal(Unit())))))
41-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
41+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
4242

4343
Match(Literal(String(b)), List(CaseDef(Bind(n, Value(Ident(_))), None, Block(Nil, Literal(Unit())))))
44-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
44+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
4545

4646
Match(Literal(String(c)), List(CaseDef(Bind(n, TypeTest(TypeIdent(String))), None, Block(Nil, Literal(Unit())))))
47-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
47+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
4848

4949
Match(Literal(String(e)), List(CaseDef(Value(Ident(_)), None, Block(Nil, Literal(Unit())))))
50-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
50+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
5151

5252
Match(Literal(String(f)), List(CaseDef(TypeTest(TypeIdent(String)), None, Block(Nil, Literal(Unit())))))
53-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
53+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
5454

5555
Match(Typed(Literal(String(g)), TypeIdent(Any)), List(CaseDef(Alternative(List(TypeTest(TypeIdent(String)), TypeTest(TypeIdent(Int)))), None, Block(Nil, Literal(Unit())))))
56-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
56+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
5757

5858
Match(Literal(String(h)), List(CaseDef(Value(Ident(_)), Some(Literal(Boolean(false))), Block(Nil, Literal(Unit())))))
59-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
59+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
6060

6161
Block(List(ValDef(a, Synthetic(), Some(Literal(String(o))))), Match(Literal(String(i)), List(CaseDef(Bind(a, Value(Ident(_))), None, Block(Nil, Literal(Unit()))))))
62-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
62+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
6363

6464
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())))))
65-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
65+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
6666

6767
Try(Literal(Int(1)), List(CaseDef(Value(Ident(_)), None, Block(Nil, Literal(Unit())))), None)
68-
OrType(SymRef(Int, ThisType(SymRef(scala, NoPrefix))), SymRef(Unit, ThisType(SymRef(scala, NoPrefix))))
68+
OrType(SymRef(ClassDef(Int, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))), SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))))
6969

7070
Try(Literal(Int(2)), Nil, Some(Literal(Unit())))
7171
ConstantType(Int(2))
7272

7373
Try(Literal(Int(3)), List(CaseDef(Value(Ident(_)), None, Block(Nil, Literal(Unit())))), Some(Literal(Unit())))
74-
OrType(SymRef(Int, ThisType(SymRef(scala, NoPrefix))), SymRef(Unit, ThisType(SymRef(scala, NoPrefix))))
74+
OrType(SymRef(ClassDef(Int, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))), SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix))))
7575

7676
Apply(Select(Literal(String(a)), ==, Some(Signature(List(java.lang.Object), scala.Boolean))), List(Literal(String(b))))
77-
SymRef(Boolean, ThisType(SymRef(scala, NoPrefix)))
77+
SymRef(ClassDef(Boolean, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
7878

7979
Apply(Select(New(TypeIdent(Object)), <init>, Some(Signature(Nil, java.lang.Object))), Nil)
80-
SymRef(Object, ThisType(SymRef(lang, NoPrefix)))
80+
SymRef(ClassDef(Object, _, _, _, _), ThisType(SymRef(PackageDef(lang, _), NoPrefix)))
8181

8282
Apply(Select(Ident(Int), box, Some(Signature(List(scala.Int), java.lang.Integer))), List(NamedArg(x, Literal(Int(9)))))
83-
SymRef(Integer, ThisType(SymRef(lang, NoPrefix)))
83+
SymRef(ClassDef(Integer, _, _, _, _), ThisType(SymRef(PackageDef(lang, _), NoPrefix)))
8484

8585
Apply(TypeApply(Select(Ident(Ordering), apply, Some(Signature(List(scala.math.Ordering), scala.math.Ordering))), List(TypeIdent(Int))), List(Ident(Int)))
86-
AppliedType(SymRef(Ordering, ThisType(SymRef(math, NoPrefix))), List(SymRef(Int, SymRef(scala, ThisType(SymRef(<root>, NoPrefix))))))
86+
AppliedType(SymRef(ClassDef(Ordering, _, _, _, _), ThisType(SymRef(PackageDef(math, _), NoPrefix))), List(SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(<root>, _), NoPrefix))))))
8787

8888
Block(List(ValDef(a, TypeIdent(Int), Some(Literal(Int(3))))), Literal(Unit()))
89-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
89+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
9090

9191
Block(List(ValDef(b, TypeIdent(Int), Some(Literal(Int(3))))), Literal(Unit()))
92-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
92+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
9393

9494
Block(List(DefDef(f1, Nil, Nil, TypeIdent(Int), Some(Literal(Int(3))))), Literal(Unit()))
95-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
95+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
9696

9797
Block(List(DefDef(f2, Nil, Nil, TypeIdent(Int), Some(Return(Literal(Int(4)))))), Literal(Unit()))
98-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
98+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
9999

100100
Block(List(DefDef(f3, Nil, List(List(ValDef(i, TypeIdent(Int), None))), TypeIdent(Int), Some(Ident(i)))), Literal(Unit()))
101-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
101+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
102102

103103
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()))
104-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
104+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
105105

106106
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()))
107-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
107+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
108108

109109
Block(List(DefDef(f6, List(TypeDef(T, TypeBoundsTree(Synthetic(), Synthetic()))), List(List(ValDef(x, TypeIdent(T), None))), TypeIdent(T), Some(Ident(x)))), Literal(Unit()))
110-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
110+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
111111

112112
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()))
113-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
113+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
114114

115115
Block(List(DefDef(f8, Nil, List(List(ValDef(i, Annotated(Applied(Synthetic(), List(TypeIdent(Int))), Apply(Select(New(Synthetic()), <init>, 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()))))
116-
SymRef(Int, SymRef(scala, ThisType(SymRef(<root>, NoPrefix))))
116+
SymRef(ClassDef(Int, _, _, _, _), SymRef(PackageDef(scala, _), ThisType(SymRef(PackageDef(<root>, _), NoPrefix))))
117117

118118
Block(List(DefDef(f9, Nil, List(List(ValDef(i, ByName(TypeIdent(Int)), None))), TypeIdent(Int), Some(Ident(i)))), Literal(Unit()))
119-
SymRef(Unit, ThisType(SymRef(scala, NoPrefix)))
119+
SymRef(ClassDef(Unit, _, _, _, _), ThisType(SymRef(PackageDef(scala, _), NoPrefix)))
120120

0 commit comments

Comments
 (0)