diff options
| author | Dominik Gruntz <dominik.gruntz@fhnw.ch> | 2012-07-17 17:27:22 +0200 |
|---|---|---|
| committer | Dominik Gruntz <dominik.gruntz@fhnw.ch> | 2012-07-17 17:27:22 +0200 |
| commit | d06c73c1f381c346b46ca9499fbec8677d3fab5e (patch) | |
| tree | e9fd69226b4b1405b2c4362f972f735f809f0bfa | |
| parent | 9c4b0d0402559921d4f36e9ebdd1af9a818fdde7 (diff) | |
| download | scala-d06c73c1f381c346b46ca9499fbec8677d3fab5e.tar.gz scala-d06c73c1f381c346b46ca9499fbec8677d3fab5e.tar.bz2 scala-d06c73c1f381c346b46ca9499fbec8677d3fab5e.zip | |
changes error message generated by compiler
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Scanners.scala | 2 | ||||
| -rw-r--r-- | test/files/neg/t5856.check | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala index db04aedf29..7ccd6785bb 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala @@ -734,7 +734,7 @@ trait Scanners extends ScannersCommon { next.token = kwArray(idx) } } else { - syntaxError("invalid string interpolation: $$, $ident or $block expected") + syntaxError("invalid string interpolation: `$$', `$'ident or `$'BlockExpr expected") } } else { val isUnclosedLiteral = !isUnicodeEscape && (ch == SU || (!multiLine && (ch == CR || ch == LF))) diff --git a/test/files/neg/t5856.check b/test/files/neg/t5856.check index d42bcdb524..ac49d4b9ac 100644 --- a/test/files/neg/t5856.check +++ b/test/files/neg/t5856.check @@ -1,4 +1,4 @@ -t5856.scala:10: error: invalid string interpolation: $$, $ident or $block expected +t5856.scala:10: error: invalid string interpolation: `$$', `$'ident or `$'BlockExpr expected val s9 = s"$" ^ t5856.scala:10: error: unclosed string literal |