Skip to content

Commit 90a3d1e

Browse files
committed
Fix assert when xCheckMacro conditions
1 parent 229bd59 commit 90a3d1e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,8 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
266266

267267
object DefDef extends DefDefModule:
268268
def apply(symbol: Symbol, rhsFn: List[List[Tree]] => Option[Term]): DefDef =
269-
assert(xCheckMacro && symbol.isTerm, s"expected a term symbol but received $symbol")
270-
assert(xCheckMacro && symbol.flags.is(Flags.Method), "expected a symbol with `Method` flag set")
269+
assert(!xCheckMacro || symbol.isTerm, s"expected a term symbol but received $symbol")
270+
assert(!xCheckMacro || symbol.flags.is(Flags.Method), "expected a symbol with `Method` flag set")
271271
withDefaultPos(tpd.DefDef(symbol.asTerm, prefss =>
272272
xCheckedMacroOwners(xCheckMacroValidExpr(rhsFn(prefss)), symbol).getOrElse(tpd.EmptyTree)
273273
))
@@ -298,7 +298,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
298298

299299
object ValDef extends ValDefModule:
300300
def apply(symbol: Symbol, rhs: Option[Term]): ValDef =
301-
assert(xCheckMacro && !symbol.flags.is(Flags.Method), "expected a symbol without `Method` flag set")
301+
assert(!xCheckMacro || !symbol.flags.is(Flags.Method), "expected a symbol without `Method` flag set")
302302
tpd.ValDef(symbol.asTerm, xCheckedMacroOwners(xCheckMacroValidExpr(rhs), symbol).getOrElse(tpd.EmptyTree))
303303
def copy(original: Tree)(name: String, tpt: TypeTree, rhs: Option[Term]): ValDef =
304304
tpd.cpy.ValDef(original)(name.toTermName, tpt, xCheckedMacroOwners(xCheckMacroValidExpr(rhs), original.symbol).getOrElse(tpd.EmptyTree))
@@ -1475,7 +1475,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
14751475

14761476
object Bind extends BindModule:
14771477
def apply(sym: Symbol, pattern: Tree): Bind =
1478-
assert(xCheckMacro && sym.flags.is(Flags.Case), "expected a symbol with `Case` flag set")
1478+
assert(!xCheckMacro || sym.flags.is(Flags.Case), "expected a symbol with `Case` flag set")
14791479
tpd.Bind(sym, pattern)
14801480
def copy(original: Tree)(name: String, pattern: Tree): Bind =
14811481
withDefaultPos(tpd.cpy.Bind(original)(name.toTermName, pattern))
@@ -2504,7 +2504,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
25042504
// We introduce this check under this flag to not break published macros that may have accidentally used a wrong flag but happen to work.
25052505
// Once macro implementation had a compiler version or two too find their bugs and patch them we can enforce it on every use site.
25062506
assert(
2507-
xCheckMacro && flags <= valid,
2507+
!xCheckMacro || flags <= valid,
25082508
s"Received invalid flags. Expected flags ${flags.show} to only contain a subset of ${valid.show}."
25092509
)
25102510

0 commit comments

Comments
 (0)