From 7ca548b7926aaf9fb6937fef2316c7ac3a00b302 Mon Sep 17 00:00:00 2001 From: Kaz Kylheku Date: Tue, 22 Jul 2014 07:47:35 -0700 Subject: * parser.y (METANUM): Forgotten %right declaration for this token has been resulting in a shift-reduce conflict. --- ChangeLog | 5 +++++ parser.y | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5783483f..feadfebe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-07-22 Kaz Kylheku + + * parser.y (METANUM): Forgotten %right declaration for this + token has been resulting in a shift-reduce conflict. + 2014-07-22 Kaz Kylheku * configure: Add a check, in the case that we cannot make an diff --git a/parser.y b/parser.y index 6b4f1c70..3ef6cde8 100644 --- a/parser.y +++ b/parser.y @@ -110,7 +110,7 @@ static val parsed_spec; %right SYMTOK '{' '}' %right ALL SOME NONE MAYBE CASES CHOOSE AND OR END COLLECT UNTIL COLL %right OUTPUT REPEAT REP FIRST LAST EMPTY DEFINE IF ELIF ELSE -%right SPACE TEXT NUMBER +%right SPACE TEXT NUMBER METANUM %nonassoc '[' ']' '(' ')' %left '-' ',' '\'' '^' SPLICE '@' %left '|' '/' -- cgit v1.2.3