summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2014-01-22 18:53:02 +0300
committerEugene Burmako <xeno.by@gmail.com>2014-01-22 20:20:32 +0300
commit47d1fb1e9975998d5f8dde63c08c0b3ab1cd5ae2 (patch)
treebf707759b878e3b1584c5497d5153c664bce5d07 /test
parenta242101282ba986c4e336b759aaa08a32ca82a7b (diff)
downloadscala-47d1fb1e9975998d5f8dde63c08c0b3ab1cd5ae2.tar.gz
scala-47d1fb1e9975998d5f8dde63c08c0b3ab1cd5ae2.tar.bz2
scala-47d1fb1e9975998d5f8dde63c08c0b3ab1cd5ae2.zip
SI-6879 improves Context.freshName
Instead of per-compilation unit unique counters, the freshName API now uses a per-Global counter. Fresh names now also contain dollars to exclude clashes with supported user-defined names (the ones without dollar signs). This doesn’t fix the bug, because per-Global counters get created anew every time a new Global is instantiated, and that provides some potential for name clashes even for def macros, but at least it completely excludes clashes in typical situations.
Diffstat (limited to 'test')
-rw-r--r--test/files/run/macro-abort-fresh.check6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/files/run/macro-abort-fresh.check b/test/files/run/macro-abort-fresh.check
index 9fddee57d4..5064b96eef 100644
--- a/test/files/run/macro-abort-fresh.check
+++ b/test/files/run/macro-abort-fresh.check
@@ -1,6 +1,6 @@
-fresh$1
-qwe1
-qwe2
+fresh$macro$1
+qwe$macro$2
+qwe$macro$3
reflective compilation has failed:
blargh