diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-16 11:16:36 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-08-16 11:16:36 -0700 |
| commit | 560b3728f364f3523a2bad202d41881f719b9fad (patch) | |
| tree | 1edb8ee3456f7fe897e5cc5004360d5cb9adc982 /src/compiler/scala | |
| parent | 83e95c0fa5168e64299d85b081b21c577ce4e8ef (diff) | |
| parent | 9d5c97cb0155c0a2d375be6904eef8f882970615 (diff) | |
| download | scala-560b3728f364f3523a2bad202d41881f719b9fad.tar.gz scala-560b3728f364f3523a2bad202d41881f719b9fad.tar.bz2 scala-560b3728f364f3523a2bad202d41881f719b9fad.zip | |
Merge pull request #2798 from som-snytt/issue/7544-errmsg
SI-7544 Interpolation message for %% literal
Diffstat (limited to 'src/compiler/scala')
| -rw-r--r-- | src/compiler/scala/tools/reflect/MacroImplementations.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/reflect/MacroImplementations.scala b/src/compiler/scala/tools/reflect/MacroImplementations.scala index 8e1bcb5f87..4e3761454d 100644 --- a/src/compiler/scala/tools/reflect/MacroImplementations.scala +++ b/src/compiler/scala/tools/reflect/MacroImplementations.scala @@ -94,7 +94,8 @@ abstract class MacroImplementations { def errorAtIndex(idx: Int, msg: String) = c.error(new OffsetPosition(strTree.pos.source, strTree.pos.point + idx), msg) def wrongConversionString(idx: Int) = errorAtIndex(idx, "wrong conversion string") def illegalConversionCharacter(idx: Int) = errorAtIndex(idx, "illegal conversion character") - def nonEscapedPercent(idx: Int) = errorAtIndex(idx, "percent signs not directly following splicees must be escaped") + def nonEscapedPercent(idx: Int) = errorAtIndex(idx, + "conversions must follow a splice; use %% for literal %, %n for newline") // STEP 1: handle argument conversion // 1) "...${smth}" => okay, equivalent to "...${smth}%s" |