diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2013-10-19 06:46:27 -0700 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2013-10-19 06:46:27 -0700 |
| commit | 8848f241616627b0c5beca38a5107c4eca3e10fd (patch) | |
| tree | 7f6e5f05e3ab98d86049e493ded1f31be3b4f62d /test/files/neg | |
| parent | fc892176ec4fd877bae4fc31ad7769ec15bbd858 (diff) | |
| parent | d3e04daa658170ffc58f2e1ea3da0f4d55f001a7 (diff) | |
| download | scala-8848f241616627b0c5beca38a5107c4eca3e10fd.tar.gz scala-8848f241616627b0c5beca38a5107c4eca3e10fd.tar.bz2 scala-8848f241616627b0c5beca38a5107c4eca3e10fd.zip | |
Merge pull request #3007 from densh/pull/fresh-name-and-package-support
Add support for packages into quasiquotes and toolbox, improve handling of fresh names, unhardcode quasiquote expansion logic
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/quasiquotes-syntax-error-position.check | 4 | ||||
| -rw-r--r-- | test/files/neg/xmltruncated6.check | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/neg/quasiquotes-syntax-error-position.check b/test/files/neg/quasiquotes-syntax-error-position.check index 3bd813b1bb..25e5b8d75a 100644 --- a/test/files/neg/quasiquotes-syntax-error-position.check +++ b/test/files/neg/quasiquotes-syntax-error-position.check @@ -10,9 +10,9 @@ quasiquotes-syntax-error-position.scala:7: error: '}' expected but end of quote quasiquotes-syntax-error-position.scala:8: error: '.' expected but splicee found. q"import $t $t" ^ -quasiquotes-syntax-error-position.scala:9: error: illegal start of definition +quasiquotes-syntax-error-position.scala:9: error: '{' expected but end of quote found. q"package p" - ^ + ^ quasiquotes-syntax-error-position.scala:10: error: ';' expected but '@' found. q"foo@$a" ^ diff --git a/test/files/neg/xmltruncated6.check b/test/files/neg/xmltruncated6.check index 6123114560..f638f2f090 100644 --- a/test/files/neg/xmltruncated6.check +++ b/test/files/neg/xmltruncated6.check @@ -1,4 +1,4 @@ -xmltruncated6.scala:2: error: ';' expected but eof found. +xmltruncated6.scala:2: error: in XML literal: expected end of Scala block val stuff = <a>{ "no closing brace" ^ one error found |