diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-03-20 16:09:04 +0100 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-04-27 15:33:20 +0200 |
| commit | a8edefcef8905ed3487c7293056f6d0946e79dd7 (patch) | |
| tree | 2bcf87b30a70492f4586d2e1dbb98a11bc626223 /test/files/neg | |
| parent | 403ba8938f115215700e677523d91710c20b6be4 (diff) | |
| download | scala-a8edefcef8905ed3487c7293056f6d0946e79dd7.tar.gz scala-a8edefcef8905ed3487c7293056f6d0946e79dd7.tar.bz2 scala-a8edefcef8905ed3487c7293056f6d0946e79dd7.zip | |
SI-7271 fixes positions of string interpolation parts
Positions of static parts are now set explicitly during parsing rather
than filled in wholesale during subsequent atPos after parsing.
I also had to change the offsets that scanner uses for initial static
parts of string interpolations so that they no longer point to the
opening double quote, but rather to the actual beginning of the part.
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/t5510.check | 6 | ||||
| -rw-r--r-- | test/files/neg/t5856.check | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/files/neg/t5510.check b/test/files/neg/t5510.check index 04220e79bb..322a2f5e25 100644 --- a/test/files/neg/t5510.check +++ b/test/files/neg/t5510.check @@ -1,15 +1,15 @@ t5510.scala:2: error: unclosed string literal val s1 = s"xxx - ^ + ^ t5510.scala:3: error: unclosed string literal val s2 = s"xxx $x ^ t5510.scala:4: error: unclosed string literal val s3 = s"xxx $$ - ^ + ^ t5510.scala:5: error: unclosed string literal val s4 = ""s" - ^ + ^ t5510.scala:6: error: unclosed multi-line string literal val s5 = ""s""" $s1 $s2 s" ^ diff --git a/test/files/neg/t5856.check b/test/files/neg/t5856.check index ac49d4b9ac..08a61bdc07 100644 --- a/test/files/neg/t5856.check +++ b/test/files/neg/t5856.check @@ -1,6 +1,6 @@ t5856.scala:10: error: invalid string interpolation: `$$', `$'ident or `$'BlockExpr expected val s9 = s"$" - ^ + ^ t5856.scala:10: error: unclosed string literal val s9 = s"$" ^ |