Skip to content

Commit 5177cb3

Browse files
nicolasstuckinicolasstucki
committed
Deprecate refelct Typed
1 parent 7e23208 commit 5177cb3

File tree

13 files changed

+37
-34
lines changed

13 files changed

+37
-34
lines changed

‎compiler/src/scala/quoted/runtime/impl/printers/Extractors.scala

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@ object Extractors {
8888
this += "Literal(" += const += ")"
8989
case New(tpt) =>
9090
this += "New(" += tpt += ")"
91-
case Typed(expr, tpt) =>
92-
this += "Typed(" += expr += ", " += tpt += ")"
91+
case TypedTree(tree, tpt) =>
92+
this += "TypedTree(" += tree += ", " += tpt += ")"
9393
case NamedArg(name, arg) =>
9494
this += "NamedArg(\"" += name += "\", " += arg += ")"
9595
case Assign(lhs, rhs) =>
@@ -174,8 +174,6 @@ object Extractors {
174174
this += "Unapply(" += fun += ", " ++= implicits += ", " ++= patterns += ")"
175175
case Alternatives(patterns) =>
176176
this += "Alternatives(" ++= patterns += ")"
177-
case TypedTree(tree, tpt) =>
178-
this += "TypedTree(" += tree += ", " += tpt += ")"
179177
}
180178

181179
def visitConstant(x: Constant): this.type = x match {

‎compiler/src/scala/quoted/runtime/impl/printers/SourceCode.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ object SourceCode {
399399
case _ => printQualTree(fn)
400400
}
401401
val args1 = args match {
402-
case init :+ Typed(Repeated(Nil, _), _) => init // drop empty var args at the end
402+
case init :+ TypedTree(Repeated(Nil, _), _) => init // drop empty var args at the end
403403
case _ => args
404404
}
405405

@@ -428,7 +428,7 @@ object SourceCode {
428428
inSquare(this += id)
429429
this
430430

431-
case Typed(term, tpt) =>
431+
case TypedTree(term: Term, tpt) =>
432432
tpt.tpe match {
433433
case Types.Repeated(_) =>
434434
printTree(term)
@@ -623,7 +623,7 @@ object SourceCode {
623623
case Select(qual, _) => rec(qual)
624624
case Apply(fn, _) => rec(fn)
625625
case TypeApply(fn, _) => rec(fn)
626-
case Typed(_, _) => this += doubleLineBreak()
626+
case TypedTree(_, _) => this += doubleLineBreak()
627627
case _ => this += lineBreak()
628628
}
629629
next match {

‎library/src/scala/quoted/ExprMap.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ trait ExprMap:
5656
tree
5757
case New(tpt) =>
5858
New.copy(tree)(transformTypeTree(tpt)(owner))
59-
case Typed(expr, tpt) =>
59+
case TypedTree(expr: Term, tpt) =>
6060
val tp = tpt.tpe match
6161
case AppliedType(TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "<repeated>"), List(tp0: TypeRepr)) =>
6262
TypeRepr.of[Seq].appliedTo(tp0)
6363
case tp => tp
64-
Typed.copy(tree)(transformTerm(expr, tp)(owner), transformTypeTree(tpt)(owner))
64+
TypedTree.copy(tree)(transformTerm(expr, tp)(owner), transformTypeTree(tpt)(owner))
6565
case tree: NamedArg =>
6666
NamedArg.copy(tree)(tree.name, transformTerm(tree.value, tpe)(owner))
6767
case Assign(lhs, rhs) =>

‎library/src/scala/quoted/FromExpr.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ object FromExpr {
8686
def rec(tree: Term): Option[T] = tree match {
8787
case Block(stats, e) => if stats.isEmpty then rec(e) else None
8888
case Inlined(_, bindings, e) => if bindings.isEmpty then rec(e) else None
89-
case Typed(e, _) => rec(e)
89+
case TypedTree(e: Term, _) => rec(e)
9090
case _ =>
9191
tree.tpe.widenTermRefByName match
9292
case ConstantType(c) => Some(c.value.asInstanceOf[T])

‎library/src/scala/quoted/Quotes.scala

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
145145
* | +- Inlined
146146
* | +- SelectOuter
147147
* | +- While
148-
* | +---+- Typed
148+
* | +---+- Typed (deprecated)
149149
* | /
150150
* +- TypedTree +------------------·
151151
* +- WildcardPattern
@@ -1119,19 +1119,23 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
11191119
end SuperMethods
11201120

11211121
/** `TypeTest` that allows testing at runtime in a pattern match if a `Tree` is a `Typed` */
1122+
@deprecated("Use TypedTree", "3.1.0")
11221123
given TypedTypeTest: TypeTest[Tree, Typed]
11231124

11241125
/** Tree representing a type ascription `x: T` in the source code.
11251126
*
11261127
* Also represents a pattern that contains a term `x`.
11271128
* Other `: T` patterns use the more general `TypedTree`.
11281129
*/
1130+
@deprecated("Use TypedTree", "3.1.0")
11291131
type Typed <: Term & TypedTree
11301132

11311133
/** Module object of `type Typed` */
1134+
@deprecated("Use TypedTree", "3.1.0")
11321135
val Typed: TypedModule
11331136

11341137
/** Methods of the module object `val Typed` */
1138+
@deprecated("Use TypedTree", "3.1.0")
11351139
trait TypedModule { this: Typed.type =>
11361140

11371141
/** Create a type ascription `<x: Term>: <tpt: TypeTree>` */
@@ -1140,13 +1144,15 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
11401144
def copy(original: Tree)(expr: Term, tpt: TypeTree): Typed
11411145

11421146
/** Matches `<expr: Term>: <tpt: TypeTree>` */
1143-
def unapply(x: Typed): (Term, TypeTree)
1147+
def unapply(x: Typed): (Tree, TypeTree)
11441148
}
11451149

11461150
/** Makes extension methods on `Typed` available without any imports */
1151+
@deprecated("Use TypedTree", "3.1.0")
11471152
given TypedMethods: TypedMethods
11481153

11491154
/** Extension methods of `Typed` */
1155+
@deprecated("Use TypedTree", "3.1.0")
11501156
trait TypedMethods:
11511157
extension (self: Typed)
11521158
def expr: Term
@@ -4336,7 +4342,7 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
43364342
x
43374343
case New(tpt) =>
43384344
foldTree(x, tpt)(owner)
4339-
case Typed(expr, tpt) =>
4345+
case TypedTree(expr, tpt) =>
43404346
foldTree(foldTree(x, expr)(owner), tpt)(owner)
43414347
case NamedArg(_, arg) =>
43424348
foldTree(x, arg)(owner)
@@ -4400,7 +4406,6 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
44004406
case Bind(_, body) => foldTree(x, body)(owner)
44014407
case Unapply(fun, implicits, patterns) => foldTrees(foldTrees(foldTree(x, fun)(owner), implicits)(owner), patterns)(owner)
44024408
case Alternatives(patterns) => foldTrees(x, patterns)(owner)
4403-
case TypedTree(tree1, tpt) => foldTree(foldTree(x, tree1)(owner), tpt)(owner)
44044409
}
44054410
}
44064411
end TreeAccumulator
@@ -4516,8 +4521,8 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
45164521
tree
45174522
case New(tpt) =>
45184523
New.copy(tree)(transformTypeTree(tpt)(owner))
4519-
case Typed(expr, tpt) =>
4520-
Typed.copy(tree)(transformTerm(expr)(owner), transformTypeTree(tpt)(owner))
4524+
case TypedTree(expr: Term, tpt) =>
4525+
TypedTree.copy(tree)(transformTerm(expr)(owner), transformTypeTree(tpt)(owner))
45214526
case tree: NamedArg =>
45224527
NamedArg.copy(tree)(tree.name, transformTerm(tree.value)(owner))
45234528
case Assign(lhs, rhs) =>

‎library/src/scala/quoted/Varargs.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ object Varargs {
4242
import quotes.reflect._
4343
def rec(tree: Term): Option[Seq[Expr[T]]] = tree match {
4444
case Repeated(elems, _) => Some(elems.map(x => x.asExpr.asInstanceOf[Expr[T]]))
45-
case Typed(e, _) => rec(e)
45+
case TypedTree(e: Term, _) => rec(e)
4646
case Block(Nil, e) => rec(e)
4747
case Inlined(_, Nil, e) => rec(e)
4848
case _ => None

‎tests/neg-macros/i11483/Macro_1.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ object X {
5151
)
5252
case Apply(f,List()) =>
5353
Apply(TypeApply(Select.unique(m,"pure"),List(Inferred(t.tpe.widen))),List(t))
54-
case Typed(x,tp) => Typed(processTree(x,m), Inferred(TypeRepr.of[F].appliedTo(tp.tpe)) )
54+
case Typed(x: Term,tp) => Typed(processTree(x,m), Inferred(TypeRepr.of[F].appliedTo(tp.tpe)) )
5555
case _ => throw new RuntimeException(s"tree not recoginized: $t")
5656
r
5757

‎tests/pos-macros/i10910/Macro_1.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ object X:
4848
case Inlined(x,bindings,body) => transform(body) match
4949
case Left(unchanged) => Left(term)
5050
case Right(changed) => Right(Inlined(x,bindings,changed))
51-
case Typed(arg,tp) => transform(arg)
51+
case TypedTree(arg: Term,tp) => transform(arg)
5252
case Ident(x) => Left(term)
5353
case l@Literal(x) => Left(l)
5454
case other =>

‎tests/pos-macros/i11401/X_1.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ object X:
5353
val nFun = processLambda[T](fun)
5454
Apply(Apply(TypeApply(Select.unique(x,"fold_async"),targs),List(state)),List(nFun))
5555
case Apply(TypeApply(Ident("await"),targs),List(body)) => body
56-
case Typed(x,tp) => Typed(processTree(x), Inferred(TypeRepr.of[Future].appliedTo(tp.tpe)) )
56+
case TypedTree(x: Term,tp) => Typed(processTree(x), Inferred(TypeRepr.of[Future].appliedTo(tp.tpe)) )
5757
case _ => throw new RuntimeException(s"tree not recoginized: $t")
5858
val checker = new TreeMap() {}
5959
checker.transformTerm(r)(Symbol.spliceOwner)

‎tests/run-macros/i5119.check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Select(Typed(Apply(Select(New(TypeIdent("StringContextOps")), "<init>"), List(Apply(Select(Select(Select(Ident("_root_"), "scala"), "StringContext"), "apply"), List(Typed(Repeated(List(Literal(StringConstant("Hello World ")), Literal(StringConstant("!"))), Inferred()), Inferred()))))), TypeIdent("StringContextOps")), "inline$sc")
2-
Typed(Repeated(List(Literal(IntConstant(1))), Inferred()), Inferred())
1+
Select(TypedTree(Apply(Select(New(TypeIdent("StringContextOps")), "<init>"), List(Apply(Select(Select(Select(Ident("_root_"), "scala"), "StringContext"), "apply"), List(TypedTree(Repeated(List(Literal(StringConstant("Hello World ")), Literal(StringConstant("!"))), Inferred()), Inferred()))))), TypeIdent("StringContextOps")), "inline$sc")
2+
TypedTree(Repeated(List(Literal(IntConstant(1))), Inferred()), Inferred())

‎tests/run-macros/quote-matcher-symantics-3/quoted_1.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ object Const {
132132
case NullConstant() | UnitConstant() | ClassOfConstant(_) => None
133133
case _ => Some(c.value.asInstanceOf[T])
134134
case Block(Nil, e) => rec(e)
135-
case Typed(e, _) => rec(e)
135+
case TypedTree(e: Term, _) => rec(e)
136136
case Inlined(_, Nil, e) => rec(e)
137137
case _ => None
138138
}

‎tests/run-macros/tasty-extractors-1.check

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ ConstantType(StringConstant("abc"))
1919
Inlined(None, Nil, Apply(Ident("println"), List(Literal(StringConstant("abc")))))
2020
TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
2121

22-
Inlined(None, Nil, Typed(Literal(IntConstant(8)), TypeIdent("Int")))
22+
Inlined(None, Nil, TypedTree(Literal(IntConstant(8)), TypeIdent("Int")))
2323
TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int")
2424

25-
Inlined(None, Nil, Typed(Literal(ByteConstant(8)), TypeIdent("Byte")))
25+
Inlined(None, Nil, TypedTree(Literal(ByteConstant(8)), TypeIdent("Byte")))
2626
TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Byte")
2727

28-
Inlined(None, Nil, Typed(Literal(ShortConstant(8)), TypeIdent("Short")))
28+
Inlined(None, Nil, TypedTree(Literal(ShortConstant(8)), TypeIdent("Short")))
2929
TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Short")
3030

3131
Inlined(None, Nil, Literal(CharConstant('a')))
@@ -34,7 +34,7 @@ ConstantType(CharConstant('a'))
3434
Inlined(None, Nil, Block(List(Literal(IntConstant(1)), Literal(IntConstant(2))), Literal(IntConstant(3))))
3535
ConstantType(IntConstant(3))
3636

37-
Inlined(None, Nil, If(Typed(Literal(BooleanConstant(true)), TypeIdent("Boolean")), Literal(IntConstant(1)), Literal(IntConstant(2))))
37+
Inlined(None, Nil, If(TypedTree(Literal(BooleanConstant(true)), TypeIdent("Boolean")), Literal(IntConstant(1)), Literal(IntConstant(2))))
3838
OrType(ConstantType(IntConstant(1)), ConstantType(IntConstant(2)))
3939

4040
Inlined(None, Nil, Match(Literal(StringConstant("a")), List(CaseDef(Literal(StringConstant("a")), None, Block(Nil, Literal(UnitConstant()))))))
@@ -52,7 +52,7 @@ TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
5252
Inlined(None, Nil, Match(Literal(StringConstant("f")), List(CaseDef(TypedTree(WildcardPattern(), TypeIdent("String")), None, Block(Nil, Literal(UnitConstant()))))))
5353
TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
5454

55-
Inlined(None, Nil, Match(Typed(Literal(StringConstant("g")), TypeIdent("Any")), List(CaseDef(Alternatives(List(TypedTree(WildcardPattern(), TypeIdent("String")), TypedTree(WildcardPattern(), TypeIdent("Int")))), None, Block(Nil, Literal(UnitConstant()))))))
55+
Inlined(None, Nil, Match(TypedTree(Literal(StringConstant("g")), TypeIdent("Any")), List(CaseDef(Alternatives(List(TypedTree(WildcardPattern(), TypeIdent("String")), TypedTree(WildcardPattern(), TypeIdent("Int")))), None, Block(Nil, Literal(UnitConstant()))))))
5656
TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
5757

5858
Inlined(None, Nil, Match(Literal(StringConstant("h")), List(CaseDef(WildcardPattern(), Some(Literal(BooleanConstant(false))), Block(Nil, Literal(UnitConstant()))))))
@@ -112,7 +112,7 @@ TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
112112
Inlined(None, Nil, Block(List(DefDef("f7", List(TypeParamClause(List(TypeDef("T", TypeBoundsTree(Inferred(), Inferred())))), TermParamClause(List(ValDef("x", TypeIdent("T"), None)))), Singleton(Ident("x")), Some(Ident("x")))), Literal(UnitConstant())))
113113
TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
114114

115-
Inlined(None, Nil, Block(List(DefDef("f8", List(TermParamClause(List(ValDef("i", Annotated(Applied(Inferred(), List(TypeIdent("Int"))), Apply(Select(New(Inferred()), "<init>"), Nil)), None)))), TypeIdent("Int"), Some(Literal(IntConstant(9))))), Apply(Ident("f8"), List(Typed(Repeated(List(Literal(IntConstant(1)), Literal(IntConstant(2)), Literal(IntConstant(3))), Inferred()), Inferred())))))
115+
Inlined(None, Nil, Block(List(DefDef("f8", List(TermParamClause(List(ValDef("i", Annotated(Applied(Inferred(), List(TypeIdent("Int"))), Apply(Select(New(Inferred()), "<init>"), Nil)), None)))), TypeIdent("Int"), Some(Literal(IntConstant(9))))), Apply(Ident("f8"), List(TypedTree(Repeated(List(Literal(IntConstant(1)), Literal(IntConstant(2)), Literal(IntConstant(3))), Inferred()), Inferred())))))
116116
TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int")
117117

118118
Inlined(None, Nil, Block(List(DefDef("f9", List(TermParamClause(List(ValDef("i", ByName(TypeIdent("Int")), None)))), TypeIdent("Int"), Some(Ident("i")))), Literal(UnitConstant())))

‎tests/run-macros/tasty-extractors-2.check

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Unit")
44
Inlined(None, Nil, Block(List(DefDef("$anonfun", List(TermParamClause(List(ValDef("x", TypeIdent("Int"), None)))), Inferred(), Some(Ident("x")))), Closure(Ident("$anonfun"), None)))
55
AppliedType(TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "Function1"), List(TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int"), TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int")))
66

7-
Inlined(None, Nil, Typed(Ident("???"), Inferred()))
7+
Inlined(None, Nil, TypedTree(Ident("???"), Inferred()))
88
AnnotatedType(TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Any"), Apply(Select(New(Inferred()), "<init>"), Nil))
99

1010
Inlined(None, Nil, Literal(IntConstant(1)))
1111
ConstantType(IntConstant(1))
1212

13-
Inlined(None, Nil, Typed(Literal(IntConstant(1)), TypeIdent("Int")))
13+
Inlined(None, Nil, TypedTree(Literal(IntConstant(1)), TypeIdent("Int")))
1414
TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int")
1515

16-
Inlined(None, Nil, Typed(Ident("Nil"), Applied(TypeIdent("List"), List(TypeIdent("Int")))))
16+
Inlined(None, Nil, TypedTree(Ident("Nil"), Applied(TypeIdent("List"), List(TypeIdent("Int")))))
1717
AppliedType(TypeRef(ThisType(TypeRef(NoPrefix(), "immutable")), "List"), List(TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int")))
1818

19-
Inlined(None, Nil, Typed(Apply(Select(New(TypeIdent("Baz")), "<init>"), Nil), Applied(TypeIdent("&"), List(TypeIdent("Foo"), TypeIdent("Bar")))))
19+
Inlined(None, Nil, TypedTree(Apply(Select(New(TypeIdent("Baz")), "<init>"), Nil), Applied(TypeIdent("&"), List(TypeIdent("Foo"), TypeIdent("Bar")))))
2020
AndType(TypeRef(ThisType(TypeRef(NoPrefix(), "<empty>")), "Foo"), TypeRef(ThisType(TypeRef(NoPrefix(), "<empty>")), "Bar"))
2121

22-
Inlined(None, Nil, Typed(Literal(IntConstant(1)), Applied(TypeIdent("|"), List(TypeIdent("Int"), TypeIdent("String")))))
22+
Inlined(None, Nil, TypedTree(Literal(IntConstant(1)), Applied(TypeIdent("|"), List(TypeIdent("Int"), TypeIdent("String")))))
2323
OrType(TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "<root>")), "scala"), "Int"), TypeRef(TermRef(ThisType(TypeRef(NoPrefix(), "scala")), "Predef"), "String"))
2424

2525
Inlined(None, Nil, Block(List(ClassDef("Foo", DefDef("<init>", List(TermParamClause(Nil)), Inferred(), None), List(Apply(Select(New(Inferred()), "<init>"), Nil)), None, Nil)), Literal(UnitConstant())))

0 commit comments

Comments
 (0)