diff options
| author | Akim Demaille <akim.demaille@gmail.com> | 2020-03-02 06:08:08 +0100 |
|---|---|---|
| committer | Akim Demaille <akim.demaille@gmail.com> | 2020-03-05 07:13:23 +0100 |
| commit | 744171ddbff0e398c81c0ced966c9a483ddf51a9 (patch) | |
| tree | 38e289757e7e4033666696148fff7c73c4ae7650 /examples | |
| parent | 4fd3282dd7823f8c7870622f2f73f6e6af60f6b7 (diff) | |
| download | bison-744171ddbff0e398c81c0ced966c9a483ddf51a9.tar.gz | |
yacc.c: push: initialize the pstate variables in pstate_new
Currently pstate_new does not set up its variables, this task is left
to yypush_parse. This was probably to share more code with usual pull
parsers, where these (local) variables are indeed initialized by
yyparse.
But as a consequence yyexpected_tokens crashes at the very beginning
of the parse, since, for instance, the stacks are not even set up.
See https://lists.gnu.org/r/bison-patches/2020-03/msg00001.html.
The fix could have very simple, but the documentation actually makes
it very clear that we can reuse a pstate for several parses:
After yypush_parse returns a status other than YYPUSH_MORE, the
parser instance yyps may be reused for a new parse.
so we need to restore the parser to its pristine state so that (i) it
is ready to run the next parse, (ii) it properly supports
yyexpected_tokens for the next run.
* data/skeletons/yacc.c (b4_initialize_parser_state_variables): New,
extracted from the top of yyparse/yypush_parse.
(yypstate_clear): New.
(yypstate_new): Use it when push parsers are enabled.
Define after the yyps macros so that we can use the same code as the
regular pull parsers.
(yyparse): Use it when push parsers are _not_ enabled.
* examples/c/bistromathic/bistromathic.test: Check the completion on
the beginning of the line.
Diffstat (limited to 'examples')
| -rwxr-xr-x | examples/c/bistromathic/bistromathic.test | 10 | ||||
| -rw-r--r-- | examples/c/bistromathic/local.mk | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/examples/c/bistromathic/bistromathic.test b/examples/c/bistromathic/bistromathic.test index a877bea3..4f64b1a1 100755 --- a/examples/c/bistromathic/bistromathic.test +++ b/examples/c/bistromathic/bistromathic.test @@ -102,3 +102,13 @@ sed -e 's/\\t/ /g' >input <<EOF EOF run 0 '> (atan ( '' > err: 1.9: syntax error: expected - or ( or double precision number or function or variable before end of file' + +# Check the completion at the very beginning. +sed -e 's/\\t/ /g' >input <<EOF +e\t\t +EOF +run 0 '> e +end of file exit exp '' +> e +0 +> err: ' diff --git a/examples/c/bistromathic/local.mk b/examples/c/bistromathic/local.mk index 920265f6..cab026e2 100644 --- a/examples/c/bistromathic/local.mk +++ b/examples/c/bistromathic/local.mk @@ -23,7 +23,7 @@ check_PROGRAMS += %D%/bistromathic TESTS += %D%/bistromathic.test EXTRA_DIST += %D%/bistromathic.test nodist_%C%_bistromathic_SOURCES = %D%/parse.y %D%/parse.h -%D%/calc.c: $(dependencies) +%D%/parse.c: $(dependencies) # Don't use gnulib's system headers. %C%_bistromathic_CPPFLAGS = -I$(top_srcdir)/%D% -I$(top_builddir)/%D% |