Skip to content

Commit 2a6bfeb

Browse files
committed
tasty-macro-assert.isOps: fix hygiene problems
- Ensure we deal with `Assert.Ops` and not any `Ops`, addressing TODO.
1 parent 5909a6b commit 2a6bfeb

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

tests/neg/tasty-macro-assert/quoted_1.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ object Asserts {
2121
val tree = cond.toTasty
2222

2323
def isOps(tpe: TypeOrBounds): Boolean = tpe match {
24-
case Type.SymRef(DefDef("Ops", _, _, _, _), _) => true // TODO check that the parent is Asserts
24+
case Type.SymRef(DefDef("Ops", _, _, _, _),
25+
Type.SymRef(ValDef("Asserts", _, _),
26+
Type.ThisType(Type.SymRef(PackageDef("<empty>", _), NoPrefix())))) =>
27+
true
2528
case _ => false
2629
}
2730

tests/run/tasty-macro-assert/quoted_1.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ object Asserts {
2121
val tree = cond.toTasty
2222

2323
def isOps(tpe: TypeOrBounds): Boolean = tpe match {
24-
case Type.SymRef(DefDef("Ops", _, _, _, _), _) => true // TODO check that the parent is Asserts
24+
case Type.SymRef(DefDef("Ops", _, _, _, _),
25+
Type.SymRef(ValDef("Asserts", _, _),
26+
Type.ThisType(Type.SymRef(PackageDef("<empty>", _), NoPrefix())))) =>
27+
true
2528
case _ => false
2629
}
2730

0 commit comments

Comments
 (0)