diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2014-07-22 07:47:35 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2014-07-22 07:47:35 -0700 |
commit | 7ca548b7926aaf9fb6937fef2316c7ac3a00b302 (patch) | |
tree | f906dc6cd67ec87fee1407162202b0ea42fd44ea | |
parent | bf36536c9fa398161b24668ad1c29f12f86556e8 (diff) | |
download | txr-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-- | ChangeLog | 5 | ||||
-rw-r--r-- | parser.y | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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 @@ -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 '|' '/' |