From f7a315adf63fdac2a7f95f87b88e03d4139af863 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Wed, 18 Sep 2013 07:48:57 -0700 Subject: SI-7854, SI-6768 better parsing/positioning in parser The parser hole I found while working on the generated positions serves as the umbrella for a host of improvements. Upgraded positions assigned during some specific challenging situations mostly involving the creation of synthetic trees, e.g. for comprehensions and closures. While doing so improved some error messages. Eliminated some of the most glaring duplication in the parser. It's written like there is some payoff associated with being spectacularly imperative. Not so far. --- test/files/neg/t7473.check | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'test/files/neg/t7473.check') diff --git a/test/files/neg/t7473.check b/test/files/neg/t7473.check index 488baef94e..c686466a44 100644 --- a/test/files/neg/t7473.check +++ b/test/files/neg/t7473.check @@ -1,13 +1,7 @@ -t7473.scala:5: error: '<-' expected but '=' found. +t7473.scala:5: error: for comprehension must start with generator: '<-' expected but '=' found. for (x = Option(i); if x == j) yield 42 //t7473.scala:4: error: '<-' expected but '=' found. ^ -t7473.scala:5: error: illegal start of simple expression - for (x = Option(i); if x == j) yield 42 //t7473.scala:4: error: '<-' expected but '=' found. - ^ -t7473.scala:8: error: '<-' expected but '=' found. +t7473.scala:8: error: for comprehension must start with generator: '<-' expected but '=' found. (for (x = Option(i); if x == j) yield 42) toList ^ -t7473.scala:8: error: illegal start of simple expression - (for (x = Option(i); if x == j) yield 42) toList - ^ -four errors found +two errors found -- cgit v1.2.3