diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2014-03-02 17:03:12 -0800 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2014-03-02 17:03:12 -0800 |
commit | df5d69a59ff5af28a66cec7ca0e88ec0b67f4ab4 (patch) | |
tree | 9012c5665e957178e9b8fe671b53b137546a37f2 | |
parent | eecab99c85e98034f01faabda16ff588138cc78c (diff) | |
download | txr-df5d69a59ff5af28a66cec7ca0e88ec0b67f4ab4.tar.gz txr-df5d69a59ff5af28a66cec7ca0e88ec0b67f4ab4.tar.bz2 txr-df5d69a59ff5af28a66cec7ca0e88ec0b67f4ab4.zip |
* parser.y (unquotes_occur): Fix use of unquote_s rather than sys_unquote_s
which breaks backquote, caught by tests/010/reghash.txr.
I thought fixed this already! But I must have made the change to y.tab.c
rather than parser.y.
* Makefile (lex.yy.c, y.tab.c): Make these files readonly to prevent
unintended edits.
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | parser.y | 2 |
3 files changed, 13 insertions, 2 deletions
@@ -1,5 +1,15 @@ 2014-03-02 Kaz Kylheku <kaz@kylheku.com> + * parser.y (unquotes_occur): Fix use of unquote_s rather than sys_unquote_s + which breaks backquote, caught by tests/010/reghash.txr. + I thought fixed this already! But I must have made the change to y.tab.c + rather than parser.y. + + * Makefile (lex.yy.c, y.tab.c): Make these files readonly to prevent + unintended edits. + +2014-03-02 Kaz Kylheku <kaz@kylheku.com> + * genvim.txr: Skip lines that contain system_package. * txr.vim: Regenerated. @@ -62,9 +62,10 @@ VPATH := $(top_srcdir) lex.yy.c: parser.l $(LEX) $(LEX_DBG_FLAGS) $< + chmod a-w $@ y.tab.c y.tab.h: parser.y - if $(YACC) -v -d $< ; then true ; else rm $@ ; false ; fi + if $(YACC) -v -d $< ; then chmod a-w $@ ; true ; else rm $@ ; false ; fi # Suppress useless sccs id array and unused label warning in byacc otuput. # Bison-generated parser also tests for this lint define. @@ -1114,7 +1114,7 @@ static val unquotes_occur(val quoted_form, int level) return nil; } else { val sym = car(quoted_form); - if (sym == unquote_s || sym == sys_splice_s) + if (sym == sys_unquote_s || sym == sys_splice_s) return (level == 0) ? t : unquotes_occur(cdr(quoted_form), level - 1); if (sym == sys_qquote_s) return unquotes_occur(cdr(quoted_form), level + 1); |