diff options
| author | Denys Shabalin <denys.shabalin@typesafe.com> | 2014-02-19 17:20:35 +0100 |
|---|---|---|
| committer | Denys Shabalin <denys.shabalin@typesafe.com> | 2014-02-20 13:17:12 +0100 |
| commit | d49c09e3f67d780d2757085e02b0a28d333527c4 (patch) | |
| tree | c4263bd1a011e8d2c955efb550d91446b6c7bffc /test/files/neg | |
| parent | 3973f29cec9f06724941b68577908f546341c45e (diff) | |
| download | scala-d49c09e3f67d780d2757085e02b0a28d333527c4.tar.gz scala-d49c09e3f67d780d2757085e02b0a28d333527c4.tar.bz2 scala-d49c09e3f67d780d2757085e02b0a28d333527c4.zip | |
Fix quasiquote terminology to be consistent with Scheme
1. Rename cardinality into rank. Shorter word, easier to
understand, more appropriate in our context.
2. Previously we called any dollar substitution splicing
but this is not consistent with Scheme where splicing
is substitution with non-zero rank.
So now $foo is unquoting and ..$foo and ...$foo is
unquote splicing or just splicing. Correspondingly
splicee becomes unquotee.
3. Rename si7980 test into t7980
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/quasiquotes-syntax-error-position.check | 2 | ||||
| -rw-r--r-- | test/files/neg/t7980.check (renamed from test/files/neg/si7980.check) | 2 | ||||
| -rw-r--r-- | test/files/neg/t7980.scala (renamed from test/files/neg/si7980.scala) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/quasiquotes-syntax-error-position.check b/test/files/neg/quasiquotes-syntax-error-position.check index 14fef16e01..fd55bd25b5 100644 --- a/test/files/neg/quasiquotes-syntax-error-position.check +++ b/test/files/neg/quasiquotes-syntax-error-position.check @@ -7,7 +7,7 @@ quasiquotes-syntax-error-position.scala:6: error: illegal start of simple expres quasiquotes-syntax-error-position.scala:7: error: '}' expected but end of quote found. q"class $t { def foo = $a" ^ -quasiquotes-syntax-error-position.scala:8: error: '.' expected but splicee found. +quasiquotes-syntax-error-position.scala:8: error: '.' expected but unquotee found. q"import $t $t" ^ quasiquotes-syntax-error-position.scala:9: error: '{' expected but end of quote found. diff --git a/test/files/neg/si7980.check b/test/files/neg/t7980.check index b085cabf1d..031c23dbeb 100644 --- a/test/files/neg/si7980.check +++ b/test/files/neg/t7980.check @@ -1,4 +1,4 @@ -si7980.scala:7: error: Can't splice Nothing, bottom type values often indicate programmer mistake +t7980.scala:7: error: Can't unquote Nothing, bottom type values often indicate programmer mistake println(q"class ${Name(X)} { }") ^ one error found diff --git a/test/files/neg/si7980.scala b/test/files/neg/t7980.scala index b21907de54..b21907de54 100644 --- a/test/files/neg/si7980.scala +++ b/test/files/neg/t7980.scala |