summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--parser.y3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index fe4ad2c8..7fc9e6af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2011-09-27 Kaz Kylheku <kaz@kylheku.com>
+ * parser.y ('{', '}'): Nope, still not right.
+ These must have exactly the same precedence as
+ IDENT for this to work right, of course.
+
+2011-09-27 Kaz Kylheku <kaz@kylheku.com>
+
* parser.y ('{', '}'): Bugfix: precedence of these
terminals was causing @foo@foo to be parsed differently
from @foo@{foo}. We need consecutive variables to be
diff --git a/parser.y b/parser.y
index 74331810..479b9993 100644
--- a/parser.y
+++ b/parser.y
@@ -78,8 +78,7 @@ static val parsed_spec;
%nonassoc ALL SOME NONE MAYBE CASES AND OR END COLLECT UNTIL COLL
%nonassoc OUTPUT REPEAT REP FIRST LAST EMPTY DEFINE
%nonassoc '[' ']' '(' ')'
-%right IDENT TEXT NUMBER
-%nonassoc '{' '}'
+%right IDENT TEXT NUMBER '{' '}'
%left '-'
%left '|' '/'
%left '&'