summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaz Kylheku <kaz@kylheku.com>2014-07-22 07:47:35 -0700
committerKaz Kylheku <kaz@kylheku.com>2014-07-22 07:47:35 -0700
commit7ca548b7926aaf9fb6937fef2316c7ac3a00b302 (patch)
treef906dc6cd67ec87fee1407162202b0ea42fd44ea
parentbf36536c9fa398161b24668ad1c29f12f86556e8 (diff)
downloadtxr-7ca548b7926aaf9fb6937fef2316c7ac3a00b302.tar.gz
txr-7ca548b7926aaf9fb6937fef2316c7ac3a00b302.tar.bz2
txr-7ca548b7926aaf9fb6937fef2316c7ac3a00b302.zip
* parser.y (METANUM): Forgotten %right declaration for this
token has been resulting in a shift-reduce conflict.
-rw-r--r--ChangeLog5
-rw-r--r--parser.y2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5783483f..feadfebe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2014-07-22 Kaz Kylheku <kaz@kylheku.com>
+ * parser.y (METANUM): Forgotten %right declaration for this
+ token has been resulting in a shift-reduce conflict.
+
+2014-07-22 Kaz Kylheku <kaz@kylheku.com>
+
* configure: Add a check, in the case that we cannot make an
executable, whether this is due to being required to use C99.
For instance, the Solaris environment requires compilation
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 '|' '/'