summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2013-10-18 09:15:43 -0700
committerSom Snytt <som.snytt@gmail.com>2013-11-08 11:09:20 -0800
commite1fdf86438a6771ff3735a977ca85ba16a99484c (patch)
tree7e54c69cee84e8bfe427fd8d7de36ce074c4005c /test
parentef273e4790528f267655fff147c712941cc7ce1a (diff)
downloadscala-e1fdf86438a6771ff3735a977ca85ba16a99484c.tar.gz
scala-e1fdf86438a6771ff3735a977ca85ba16a99484c.tar.bz2
scala-e1fdf86438a6771ff3735a977ca85ba16a99484c.zip
Parser stack reduction peekingAhead
Restores a form of the previous peekAhead bookkeeping. Instead of tracking the current token and offset outside of xxxAhead, peekingAhead uses `in.prev` and will push back if the operation results in an empty tree.
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/t421.check2
-rw-r--r--test/files/neg/t5702-neg-bad-brace.check11
2 files changed, 8 insertions, 5 deletions
diff --git a/test/files/neg/t421.check b/test/files/neg/t421.check
index d16e541868..dc5fa425ac 100644
--- a/test/files/neg/t421.check
+++ b/test/files/neg/t421.check
@@ -1,4 +1,4 @@
t421.scala:5: error: star patterns must correspond with varargs parameters
case Bar("foo",_*) => sys.error("huh?");
- ^
+ ^
one error found
diff --git a/test/files/neg/t5702-neg-bad-brace.check b/test/files/neg/t5702-neg-bad-brace.check
index a4a00814d3..503f7d95ed 100644
--- a/test/files/neg/t5702-neg-bad-brace.check
+++ b/test/files/neg/t5702-neg-bad-brace.check
@@ -1,7 +1,10 @@
t5702-neg-bad-brace.scala:14: error: Unmatched closing brace '}' ignored here
case List(1, _*} =>
^
-t5702-neg-bad-brace.scala:17: error: eof expected but '}' found.
-}
-^
-two errors found
+t5702-neg-bad-brace.scala:14: error: illegal start of simple pattern
+ case List(1, _*} =>
+ ^
+t5702-neg-bad-brace.scala:15: error: ')' expected but '}' found.
+ }
+ ^
+three errors found