Skip to content

Commit

Permalink
Fix rebase breakage
Browse files Browse the repository at this point in the history
  • Loading branch information
odersky committed Aug 1, 2018
1 parent 6bf58a5 commit 370125e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
outer.checkType(pos).foldOver(acc, tp)
}
else {
if (tp.isTerm) ctx.error(i"splice outside quotes", pos)
if (tp.isTerm) spliceOutsideQuotes(pos)
tp
}
case tp: NamedType =>
Expand Down Expand Up @@ -435,7 +435,7 @@ class ReifyQuotes extends MacroTransformWithImplicits {
if (ctx.reporter.hasErrors) splice else transform(evaluatedSplice)
}
else if (!ctx.owner.is(Transparent)) { // level 0 outside a transparent definition
ctx.error(i"splice outside quotes or transparent method", splice.pos)
spliceOutsideQuotes(splice.pos)
splice
}
else if (Splicer.canBeSpliced(splice.qualifier)) { // level 0 inside a transparent definition
Expand Down

0 comments on commit 370125e

Please sign in to comment.