diff options
author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-02 04:22:37 -0700 |
---|---|---|
committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-09-02 04:22:37 -0700 |
commit | 2b707ee99bbb44447315874d360c498aac4c3089 (patch) | |
tree | 3337b59be4477e7a9db300d4ec87c4a97b46df60 /src | |
parent | 6e1ff1c92d32b567a41b10c0e4321adf01d3e616 (diff) | |
parent | ce048745e1520c03cd1467933a87f4d5f8b77652 (diff) | |
download | scala-2b707ee99bbb44447315874d360c498aac4c3089.tar.gz scala-2b707ee99bbb44447315874d360c498aac4c3089.tar.bz2 scala-2b707ee99bbb44447315874d360c498aac4c3089.zip |
Merge pull request #1231 from paulp/issue/6273
Fix for SI-6273, repl string interpolation.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Scanners.scala | 8 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/interpreter/ExprTyper.scala | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala index e6bf43fe93..dd0f8fdbe0 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Scanners.scala @@ -754,8 +754,12 @@ trait Scanners extends ScannersCommon { } else { val isUnclosedLiteral = !isUnicodeEscape && (ch == SU || (!multiLine && (ch == CR || ch == LF))) if (isUnclosedLiteral) { - syntaxError(if (!multiLine) "unclosed string literal" else "unclosed multi-line string literal") - } else { + if (multiLine) + incompleteInputError("unclosed multi-line string literal") + else + syntaxError("unclosed string literal") + } + else { putChar(ch) nextRawChar() getStringPart(multiLine) diff --git a/src/compiler/scala/tools/nsc/interpreter/ExprTyper.scala b/src/compiler/scala/tools/nsc/interpreter/ExprTyper.scala index f49e8d6b59..0f5777d260 100644 --- a/src/compiler/scala/tools/nsc/interpreter/ExprTyper.scala +++ b/src/compiler/scala/tools/nsc/interpreter/ExprTyper.scala @@ -37,7 +37,7 @@ trait ExprTyper { } /** Parse a line into a sequence of trees. Returns None if the input is incomplete. */ - def parse(line: String): Option[List[Tree]] = { + def parse(line: String): Option[List[Tree]] = debugging(s"""parse("$line")""") { var isIncomplete = false reporter.withIncompleteHandler((_, _) => isIncomplete = true) { val trees = codeParser.stmts(line) |