Skip to content

Quote pattern cleanups #8727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 15, 2020
Merged

Quote pattern cleanups #8727

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c8e593e
Fix quote pattern assign matching
nicolasstucki Apr 15, 2020
5be95e1
Simplify quoted reference match
nicolasstucki Apr 15, 2020
39529db
Remove unnecessary symbol check
nicolasstucki Apr 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions library/src/scala/internal/quoted/Matcher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import scala.quoted._
* '{ while e0 do e1 } =?= '{ while p0 do p1 } ===> '{e0} =?= '{p0} &&& '{e1} =?= '{p1}
*
* /* Match assign */
* '{ e0 = e1 } =?= '{ p0 = p1 } && '{e0} =?= '{p0} ===> '{e1} =?= '{p1}
* '{ e0 = e1 } =?= '{ p0 = p1 } ==> '{e0} =?= '{p0} &&& '{e1} =?= '{p1}
*
* /* Match new */
* '{ new T } =?= '{ new T } ===> matched
Expand Down Expand Up @@ -316,22 +316,15 @@ private[quoted] object Matcher {
qual1 =?= qual2

/* Match reference */
// TODO could be subsumed by the next case
case (Ident(_), Ident(_)) if scrutinee.symbol == pattern.symbol || summon[Env].get(scrutinee.symbol).contains(pattern.symbol) =>
matched

/* Match reference */
case (_: Ref, _: Ref) if scrutinee.symbol == pattern.symbol =>
case (_: Ref, _: Ref) if scrutinee.symbol == pattern.symbol || summon[Env].get(scrutinee.symbol).contains(pattern.symbol) =>
matched

/* Match application */
// TODO may not need to check the symbol (done in fn1 =?= fn2)
case (Apply(fn1, args1), Apply(fn2, args2)) if fn1.symbol == fn2.symbol || summon[Env].get(fn1.symbol).contains(fn2.symbol) =>
case (Apply(fn1, args1), Apply(fn2, args2)) =>
fn1 =?= fn2 &&& args1 =?= args2

/* Match type application */
// TODO may not need to check the symbol (done in fn1 =?= fn2)
case (TypeApply(fn1, args1), TypeApply(fn2, args2)) if fn1.symbol == fn2.symbol || summon[Env].get(fn1.symbol).contains(fn2.symbol) =>
case (TypeApply(fn1, args1), TypeApply(fn2, args2)) =>
fn1 =?= fn2 &&& args1 =?= args2

case (Block(stats1, expr1), Block(binding :: stats2, expr2)) if isTypeBinding(binding) =>
Expand Down Expand Up @@ -365,11 +358,7 @@ private[quoted] object Matcher {

/* Match assign */
case (Assign(lhs1, rhs1), Assign(lhs2, rhs2)) =>
val lhsMatch =
if ((lhs1 =?= lhs2).isMatch) matched
else notMatched
// TODO lhs1 =?= lhs2 &&& rhs1 =?= rhs2
lhsMatch &&& rhs1 =?= rhs2
lhs1 =?= lhs2 &&& rhs1 =?= rhs2

/* Match new */
case (New(tpt1), New(tpt2)) if tpt1.tpe.typeSymbol == tpt2.tpe.typeSymbol =>
Expand Down