-2012-01-15 Jim Meyering <meyering@redhat.com>
+2012-01-15 Akim Demaille <demaille@gostai.com>
+
+ java: fix reduction traces.
+ * data/lalr1.java (yy_reduce_print): Fix state index.
+ Reported by Tim Landscheidt.
+
+2012-01-12 Jim Meyering <meyering@redhat.com>
+
+ build: avoid warning from coverity about lbitset_elt_find
+ * lib/lbitset.c (lbitset_elt_find): Remove unnecessary test of "elt",
+ at a point where we know it is non-NULL, due to prior dereference.
+
+2012-01-13 Jim Meyering <meyering@redhat.com>
maint: get fdl.texi from gnulib
* bootstrap.conf (gnulib_modules): Add fdl.
* doc/fdl.texi: Remove file.
* doc/.gitignore: Add it here.
-2012-01-15 Jim Meyering <meyering@redhat.com>
-
maint: spell "file system" as two separate words
* doc/Doxyfile.in: Spell it "file system", to avoid a
"make syntax-check" failure.
-2012-01-15 Jim Meyering <meyering@redhat.com>
-
maint: avoid "the the"
* djgpp/README.in: s/the the/the/
* src/parse-gram.c (lloc_default): Likewise.
* src/parse-gram.y (lloc_default): Likewise, and remove a
trailing space.
-2012-01-13 Jim Meyering <meyering@redhat.com>
-
- build: avoid warning from coverity about lbitset_elt_find
- * lib/lbitset.c (lbitset_elt_find): Remove unnecessary test of "elt",
- at a point where we know it is non-NULL, due to prior dereference.
-
2012-01-13 Akim Demaille <akim@lrde.epita.fr>
maint: factor copyright year.
* lib/ebitset.c (ebitset_init): Likewise, for "size".
* lib/lbitset.c (lbitset_not): Likewise, for "elt".
+2011-08-21 Joel E. Denny <joeldenny@joeldenny.org>
+
+ lalr1.cc: remove trailing comma from enumerator list.
+ * data/lalr1.cc (yy::parser): Here. This suppresses a -pedantic
+ warning.
+
2011-08-21 Joel E. Denny <joeldenny@joeldenny.org>
tests: add -pedantic for --enable-gcc-warnings.
* tests/existing.at (GNU Cim Grammar)
(GNU pic (Groff 1.18.1) Grammar.): Remove empty %union.
+2011-07-24 Joel E. Denny <joeldenny@joeldenny.org>
+
+ global: remove unnecessary horizontal tabs.
+ This change was made by applying emacs' untabify function to
+ nearly all files in Bison's repository. Required tabs in make
+ files, ChangeLog, regexps, and test code were manually skipped.
+ Other notable exceptions and changes are listed below.
+ * bootstrap: Skip because we sync this with gnulib.
+ * data/m4sugar/foreach.m4
+ * data/m4sugar/m4sugar.m4: Skip because we sync these with
+ Autoconf.
+ * djgpp: Skip because I don't know how to test djgpp properly, and
+ this code appears to be unmaintained anyway.
+ * README-hacking (Hacking): Specify that tabs should be avoided
+ where not required.
+
2011-07-10 Joel E. Denny <joeldenny@joeldenny.org>
build: avoid YACC typo inherited from Autoconf.
* tests/regression.at (Token number in precedence declaration):
Extend.
-2011-05-01 Joel E. Denny <joeldenny@joeldenny.org>
-
- Prepare for 2.5 release.
- * NEWS (2.5_rc1): Rename back to...
- (2.5): ... this, and unset date.
-
-2011-05-01 Joel E. Denny <joeldenny@joeldenny.org>
-
- Version 2.5_rc1.
- * NEWS (2.5): Rename to...
- (2.5_rc1): ... this, and set date.
-
2011-05-01 Joel E. Denny <joeldenny@joeldenny.org>
Pacify -DGNULIB_POSIXCHECK.
* src/files.c (file_name_split)
* src/getargs.c (getargs)
* src/location.c (boundary_set_from_string)
- * src/output.c (token_definitions_output, output_skeleton)
+ * src/output.c (output_skeleton)
* src/parse-gram.y (prologue_declaration)
* src/scan-gram.l (handle_syncline)
* src/symtab.c (symbol_new): Use mbschr and mbsrchr instead of
* NEWS (2.5): Document fix for -Wno-CATEGORY.
-2008-11-21 Di-an Jan <dianj@freeshell.org>
-
- Implement no-XXX arguments for --warnings, --report, --trace.
- * src/getargs.c (flags_argmatch): Handles no-XXX.
- Fix typo in doxygen comment.
-
2011-03-20 Joel E. Denny <joeldenny@joeldenny.org>
doc: fix confusing citation of LAC publication.
lr.keep-unreachable-states, lr.type, and parse.lac into brief
summaries, and cross-reference the appropriate subsections of
Tuning LR. For parse.lac, mention that it's only implemented for
- deterministic parsers in C.
- (Error Reporting): When mentioning %error-verbose, mention LAC,
+ deterministic parsers in C. In parse.error entry, mention LAC,
and add cross-reference to the LAC section.
+ (Error Reporting): When mentioning parse.error, mention LAC, and
+ add cross-reference to the LAC section.
(Tuning LR): New section with an extended version of the
documentation removed from %define Summary. Change all
cross-references in the manual to point here instead of there.
- (Calc++ Parser): When mentioning %error-verbose, mention LAC, and
- add cross-reference to the LAC section.
- (Table of Symbols): In %error-verbose and YYERROR_VERBOSE entries,
- add cross-references to Error Reporting.
+ (Calc++ Parser): When mentioning parse.error, mention LAC, and add
+ cross-reference to the LAC section.
+ (Table of Symbols): In %error-verbose entry, add cross-reference
+ to Error Reporting.
(Glossary): Capitalize entry titles consistently. Add definitions
for "defaulted state" and "unreachable state". Expand IELR
acronym in IELR's entry.
reversed access to location stack.
* THANKS (Bernd Kiefer): Add.
-2010-05-11 Akim Demaille <demaille@gostai.com>
+2011-02-13 Joel E. Denny <joeldenny@joeldenny.org>
- doc: please Emacs.
- * doc/bison.texinfo (Local Variables): Move this after the
- LocalWords, since the latter are looked for in the whole document,
- while the former are looked for only at its end.
- Require american spell checking.
+ doc: fix some minor inconsistencies.
+ * doc/bison.texinfo (%define Summary): Fix mislabeled entry for
+ lex_symbol.
+ (%code Summary): For consistency with the variable list in the
+ %define Summary, enclose the list of %code qualifiers in a table
+ instead of an itemize.
2011-02-06 Joel E. Denny <joeldenny@joeldenny.org>
is requested.
* tests/conflicts.at (%nonassoc and eof): Extend to check the
effect of each of -Dlr.type=canonical-lr and -Dparse.lac=full.
- (%error-verbose and consistent errors): Likewise.
+ (parse.error=verbose and consistent errors): Likewise.
(LAC: %nonassoc requires splitting canonical LR states): New test
group demonstrating how LAC can fix canonical LR.
* tests/input.at (LAC: Errors for %define): New test group.
* bootstrap.conf (bootstrap_sync): Set to true.
* gnulib: Update to latest so bootstrap is in sync now.
-2010-11-07 Joel E. Denny <joeldenny@joeldenny.org>
-
- yysyntax_error: adjust prior fixes for branch-2.5's lalr1.cc.
- On master, there is no yychar in lalr1.cc, but there is on
- branch-2.5, and the prior cherry-pick of "Fix handling of yychar
- manipulation in user semantic actions" wasn't adjusted for that
- difference.
- * data/lalr1.cc (yy::parser::parse): Translate yychar before
- every use of yytoken, and add comments explaining this approach.
- * tests/conflicts.at (%error-verbose and consistent errors):
- Extend to test yychar manipulation with lalr1.cc.
-
2010-11-07 Joel E. Denny <joeldenny@joeldenny.org>
yysyntax_error: fix for consistent error with lookahead.
* data/glr.c (yyreportSyntaxError): As in yacc.c, don't drop the
unexpected token unless there actually is no lookahead.
* data/lalr1.cc (yy::parser::parse): If there's no lookahead,
- set yytoken to yyempty_ before invoking yysyntax_error_.
+ pass yyempty_ not yyla.type to yysyntax_error_.
(yy::parser::yysyntax_error_): Again, don't drop the unexpected
token unless there actually is no lookahead.
* data/lalr1.java (YYParser::parse): If there's no lookahead,
set yytoken to yyempty_ before invoking yysyntax_error.
(YYParser::yysyntax_error): Again, don't drop the unexpected
token unless there actually is no lookahead.
- * tests/conflicts.at (%error-verbose and consistent
+ * tests/conflicts.at (parse.error=verbose and consistent
errors): Extend test group to further reveal how the previous
use of the simple "syntax error" message was too general. Test
yacc.c, glr.c, lalr1.cc, and lalr1.java. No longer an expected
There are no behavioral changes here.
* data/glr.c (yyreportSyntaxError): Reorganize.
* data/lalr1.cc (yy::parser::yysyntax_error_): Reorganize.
- * tests/conflicts.at (%error-verbose and consistent errors):
+ * tests/conflicts.at (parse.error=verbose and consistent errors):
Reorganize.
2010-11-07 Joel E. Denny <joeldenny@joeldenny.org>
* data/lalr1.java (YYParser::yysyntax_error): Reindent.
* data/yacc.c (yysyntax_error): Reindent.
+2010-10-31 Joel E. Denny <joeldenny@joeldenny.org>
+
+ Fix memory leak.
+ * src/output.c (prepare_rules): Free temporary array.
+
2010-10-31 Joel E. Denny <joeldenny@joeldenny.org>
yysyntax_error: improve invocation readability.
out of storage? If not, we can omit malloc-gnu; but for now I left
it in to be safe.
(vc_ignore): Remove.
+ (gnulib_mk_hook): New function.
* README-hacking: Renamed from HACKING, since gnulib bootstrap now
uses that convention.
+2010-09-09 Paul Hilfinger <hilfinger@cs.berkeley.edu>
+
+ * data/glr.c (yySymbol): Define as int to avoid compiler warnings about
+ possible change of value.
+
+2010-09-08 Paul Hilfinger <hilfinger@cs.berkeley.edu>
+
+ * data/glr.c (yy_reduce_print): Change yyrhsVals to yyvsp to remove
+ compiler errors when using %debug.
+ Add declaration of yylow when locations in use to avoid compilation
+ error.
+ (yyglrReduce): Conditionalize message "Parse ... rejected by rule..."
+ on whether we are in split mode, for consistency with behavior of
+ non-GLR parsing.
+
+2010-09-01 Akim Demaille <demaille@gostai.com>
+
+ Address GCC warnings about shadowed local variables (yyflag).
+ * data/glr.c (YYCHK): Rename yyflag as yychk_flag.
+ (yyprocessOneStack): Reduce the scope of yyaction, yyconflicts,
+ yyrule, and yyflag.
+
2010-08-05 Joel E. Denny <joeldenny@joeldenny.org>
Version 2.4.3.
* po/POTFILES.in: Add remaining gnulib files that have
translatable strings.
+2010-07-25 Joel E. Denny <joeldenny@joeldenny.org>
+
+ build: fix our adjustments for gnulib files in lib.
+ * configure.ac: For prepending lib/ to the values of config
+ variables, fix detection of empty values. Also, due to recent
+ gnulib changes, add LIBUNISTRING_UNITYPES_H and
+ LIBUNISTRING_UNIWIDTH_H to the list of those variables.
+
2010-07-25 Joel E. Denny <joeldenny@joeldenny.org>
maint: use announce-gen's new --mail-headers.
(Output files: -dv >&-): Skip test group if running
maintainer-check-valgrind.
+2010-07-23 Paul Hilfinger <hilfingr@EECS.Berkeley.EDU>
+
+ * NEWS: Describe new semantic-predicate feature.
+ * data/c.m4 (b4_predicate_case): New definition.
+ * data/java.m4 (b4_predicate_case): New definition.
+ * data/glr.c (yyimmediate): Add definition.
+ (yydoAction): Remove comment, now obsolete.
+ Do YY_REDUCE_PRINT here.
+ (yyglrReduce): Alter comment to indicate that semantic values
+ need not be deferred.
+ Remove YY_REDUCE_PRINT from here; done in yydoAction.
+ (yyprocessOneStack): Pass immediate flag.
+ Delete stacks rejected by predicates in newly split-off parsers.
+ Change handling of yyerr so that only current stack gets deleted
+ when semantic predicate fails.
+ (yyfillin): Don't crash if a semantic value is unresolved (as may
+ happen in predicate rules).
+ Copy lr state as well in debugging mode.
+ Update comment on setting of yysval to include yyloc as well.
+ (yy_reduce_print): Add yynormal argument. Perform fillin properly.
+ Report unresolved RHS values.
+ (yyimmediate): New table.
+ * src/gram.h (struct rule): Add is_predicate field.
+ * src/output.c (user_actions_output): Use b4_predicate_case for
+ predicates.
+ (prepare_symbols): Output yyimmediate.
+ * src/scan-gram.l: Add %? token, SC_PREDICATE state.
+ * src/scan-code.l (code_props_rule_action_init): Add is_predicate
+ argument.
+ * src/scan-code.h (struct code_props): Add is_predicate field.
+ (code_props_rule_action_init): New interface.
+ * src/parse-gram.y (%?{...}): New token.
+ (rhs): Add %?{...} rule.
+ * src/parse-gram.c: Regenerate.
+ * src/parse-gram.h: Regenerate.
+ * src/reader.c (grammar_current_rule_action_append): Add
+ immediate argument.
+ (grammar_midrule_action): Use new interface for
+ code_props_rule_action_init.
+ (grammar_current_rule_action_append): Ditto.
+ (packgram): Transfer is_predicate value.
+ * src/reader.h (grammar_current_rule_action_append): New interface.
+ * doc/bison.texinfo: Document semantic predicates (%?).
+
+ * data/glr.c (yylhsNonterm, yyisDefaultedState,yyDefaultAction)
+ (yygetLRActions,yynewGLRStackItem,yyaddDeferredAction,yyinitStateSet)
+ (yyinitGLRStack,yyexpandGLRStack,yyupdateSplit,yymarkStackDeleted)
+ (yyundeleteLastStack,yyglrShift,yyglrShiftDefer,yydoAction,yyglrReduce)
+ (yyidenticalOptions,yymergeOptionSets,yyresolveStates,yyresolveAction)
+ (yyresolveLocations,yyresolveValue,yyreducePrint): Update parameter
+ names in comments and mention all parameters.
+ (struct yyGLRState): Fix description of yyposn field.
+ (yyresolveLocations): Correct comment so as not to imply action when
+ yyn1==0.
+
2010-06-17 Paul Eggert <eggert@cs.ucla.edu>
Update from GFDL GFDL 1.2 to 1.3.
* doc/fdl.texi: Update to version 1.3, taken from:
http://www.gnu.org/licenses/fdl.texi
-2010-06-17 Paul Eggert <eggert@cs.ucla.edu>
-
Do not use date ranges in copyright notices.
See http://www.gnu.org/prep/maintain/maintain.html#Copyright-Notices
* data/README, data/bison.m4, data/c++-skel.m4, data/c++.m4:
* data/c-skel.m4, data/c.m4, data/glr.c, data/glr.cc:
* data/java-skel.m4, data/java.m4, data/lalr1.cc:
- * data/lalr1.java, data/location.cc:
- * data/xslt/bison.xsl:
+ * data/lalr1.java, data/local.mk, data/location.cc:
+ * data/stack.hh, data/variant.hh, data/xslt/bison.xsl:
* data/xslt/xml2dot.xsl, data/xslt/xml2text.xsl:
* data/xslt/xml2xhtml.xsl, data/yacc.c, djgpp/Makefile.maint:
* djgpp/README.in, djgpp/config.bat, djgpp/config.sed:
* djgpp/config.site, djgpp/config_h.sed, djgpp/djunpack.bat:
- * djgpp/subpipe.c, djgpp/subpipe.h:
- * djgpp/testsuite.sed, doc/bison.texinfo:
- * doc/refcard.tex, etc/README, etc/bench.pl.in:
+ * djgpp/local.mk, djgpp/subpipe.c, djgpp/subpipe.h:
+ * djgpp/testsuite.sed, doc/bison.texinfo, doc/local.mk:
+ * doc/refcard.tex, etc/README, etc/bench.pl.in, etc/local.mk:
* examples/calc++/Makefile.am, examples/extexi:
- * lib/abitset.c, lib/abitset.h:
+ * examples/local.mk, lib/abitset.c, lib/abitset.h:
* lib/bbitset.h, lib/bitset.c, lib/bitset.h:
* lib/bitset_stats.c, lib/bitset_stats.h, lib/bitsetv-print.c:
* lib/bitsetv-print.h, lib/bitsetv.c, lib/bitsetv.h:
* lib/ebitset.c, lib/ebitset.h, lib/get-errno.c:
* lib/get-errno.h, lib/lbitset.c, lib/lbitset.h:
- * lib/libiberty.h, lib/main.c, lib/timevar.c:
+ * lib/libiberty.h, lib/local.mk, lib/main.c, lib/timevar.c:
* lib/timevar.def, lib/timevar.h, lib/vbitset.c:
* lib/vbitset.h, lib/yyerror.c, m4/bison-i18n.m4:
* m4/c-working.m4, m4/cxx.m4, m4/subpipe.m4, m4/timevar.m4:
* src/derives.c, src/derives.h, src/files.c, src/files.h:
* src/flex-scanner.h, src/getargs.c, src/getargs.h:
* src/gram.c, src/gram.h, src/graphviz.c, src/ielr.c:
- * src/ielr.h, src/lalr.c, src/lalr.h:
+ * src/ielr.h, src/lalr.c, src/lalr.h, src/local.mk:
* src/location.c, src/location.h, src/main.c:
* src/muscle-tab.c, src/muscle-tab.h, src/named-ref.c:
* src/named-ref.h, src/nullable.c, src/nullable.h:
* tests/calc.at, tests/conflicts.at, tests/cxx-type.at:
* tests/existing.at, tests/glr-regression.at:
* tests/headers.at, tests/input.at, tests/java.at:
- * tests/local.at, tests/named-refs.at:
+ * tests/local.at, tests/local.mk, tests/named-refs.at:
* tests/output.at, tests/push.at, tests/reduce.at:
* tests/regression.at, tests/sets.at, tests/skeletons.at:
* tests/synclines.at, tests/testsuite.at, tests/torture.at:
- * data/Makefile.am, data/location.cc, doc/Makefile.am, src/Makefile.am:
- * tests/Makefile.am, lib/Makefile.am, examples/Makefile.am:
- * etc/Makefile.am:
Don't use date ranges in copyright notices.
2010-05-11 Akim Demaille <demaille@gostai.com>
sections.
* NEWS (2.5): Document this.
-2010-05-07 Akim Demaille <demaille@gostai.com>
+2010-05-11 Akim Demaille <demaille@gostai.com>
+
+ doc: please Emacs.
+ * doc/bison.texinfo (Local Variables): Move this after the
+ LocalWords, since the latter are looked for in the whole document,
+ while the former are looked for only at its end.
+ Require american spell checking.
+
+2010-05-10 Akim Demaille <demaille@gostai.com>
+
+ doc: fix lalr1.cc documentation.
+ * doc/bison.texinfo (C++ Scanner Interface): Fix yylex signature.
+ (C++ Bison Interface): Fix lalr1.cc skeleton name.
+ (C++ Parser Interface): Fix semantic_type and location_type names.
+ Document yy::parser::token.
+ Reported by Jerry Quinn.
+
+2010-05-10 Akim Demaille <demaille@gostai.com>
c++: use YYRHSLOC.
* data/lalr1.cc (YYRHSLOC): New.
Check that glr.cc supports user defined location_type.
* NEWS: Document this.
-2010-05-10 Akim Demaille <demaille@gostai.com>
+2010-05-07 Akim Demaille <demaille@gostai.com>
- doc: fix lalr1.cc documentation.
- * doc/bison.texinfo (C++ Scanner Interface): Fix yylex signature.
- (C++ Bison Interface): Fix lalr1.cc skeleton name.
- (C++ Parser Interface): Fix semantic_type and location_type names.
- Document yy::parser::token.
- Reported by Jerry Quinn.
+ doc: fix typo.
+ * tests/synclines.at: here.
+
+2010-05-04 Akim Demaille <demaille@gostai.com>
+
+ tests: enhance AT_SYNCLINES_COMPILE.
+ * tests/synclines.at (AT_SYNCLINES_COMPILE): More distcc patterns.
+ (AT_TEST_SYNCLINE): Remove GCC 4.5 protection which is already
+ taken care of in AT_SYNCLINES_COMPILE.
2010-05-04 Akim Demaille <demaille@gostai.com>
lalr1.cc: don't generate location.hh when location_type is defined
- * data/bison.m4 (b4_percent_define_use): New.
- (b4_percent_define_get): Use it.
- Accept a default value.
+ * data/bison.m4 (b4_percent_define_get): Accept a default value.
* data/c++.m4: Do not provide a default value for the %define
variable location_type, rather, use b4_percent_define_get with a
default argument where its value is needed.
* data/lalr1.cc: Do not load location.cc (which outputs both
location.hh and position.hh) if the user defined location_type.
Do not include location.hh either.
- * data/glr.cc: Likewise.
+
+2010-05-04 Akim Demaille <demaille@gostai.com>
+
+ lalr1.cc: minor refactoring.
+ * data/lalr1.cc: Don't issue empty namespaces.
+
+2010-05-04 Akim Demaille <demaille@gostai.com>
+
+ tests: fix %printer.
+ Currently, there is no check that %printer ... <foo> (nor
+ %destructor) is about an existing <foo> type. This C++ test had
+ it wrong (<::std::string> vs. <std::string>).
+
+ * tests/c++.at (AT_CHECK_VARIANTS): In list.yy, redefine the
+ pretty-printing of lists into something better for parser traces.
+ Update the expected output.
+ Fix correspondance between %type/%token and %printer.
2010-05-04 Akim Demaille <demaille@gostai.com>
* tests/local.at (_AT_BISON_OPTION_PUSHDEFS): Adjust to the
location_type changes.
-2010-05-04 Akim Demaille <demaille@gostai.com>
-
- tests: enhance AT_SYNCLINES_COMPILE.
- * tests/synclines.at (AT_TEST_SYNCLINE): Move GCC 4.5 protection
- into...
- (AT_SYNCLINES_COMPILE): here.
- Add more distcc patterns.
-
2010-05-01 Joel E. Denny <joeldenny@joeldenny.org>
tests: fix maintainer-xml-check.
portability: fix for BSD make.
Reported by Johan van Selst at
<http://lists.gnu.org/archive/html/bug-bison/2010-03/msg00016.html>.
- * tests/Makefile.am ($(TESTSUITE)): Qualify package.m4 in
+ * tests/local.mk ($(TESTSUITE)): Qualify package.m4 in
this dependency list as in package.m4's target rule.
2010-03-23 Joel E. Denny <jdenny@ces.clemson.edu>
<http://lists.gnu.org/archive/html/bug-bison/2010-03/msg00014.html>.
* NEWS (2.4.3): New.
* THANKS (Johan van Selst): Add.
+ * etc/prefix-gnulib-mk (prefix): Adjust regex for makefile
+ targets so that gnulib's new c++defs.h is matched.
* gnulib: Update to latest.
2010-03-20 Joel E. Denny <jdenny@ces.clemson.edu>
* bootstrap.conf (gnulib_modules): Add pipe.
* gnulib: Update to latest to make sure we have all the latest
fixes.
- * lib/Makefile.am (libbison_a_SOURCES): Remove subpipe.h and
+ * lib/local.mk (lib_libbison_a_SOURCES): Remove subpipe.h and
subpipe.c.
* po/POTFILES.in (lib/subpipe.c): Remove.
* src/files.c (compute_output_file_names): Update invocations
* tests/atlocal.in (abs_top_srcdir): Remove shell variable,
which is already defined in atconfig.
+2010-01-22 Joel E. Denny <jdenny@clemson.edu>
+
+ tests: fix missing include caught by g++ 4.4.1.
+ Reported by Tys Lefering.
+ * HACKING (Release checks): Add note about trying a recent GCC.
+ * tests/regression.at (_AT_DATA_DANCER_Y): For C++, include
+ cstdlib for abort.
+ (_AT_DATA_EXPECT2_Y): Likewise.
+
2010-01-21 Joel E. Denny <jdenny@clemson.edu>
* cfg.mk (gnulib_dir): Assume gnulib is a subdirectory.
* HACKING (Release Procedure): Recommend a secure automake.
-2008-12-11 Akim Demaille <demaille@gostai.com>
-
- Propagate i18n changes into glr.c.
- * data/glr.c (yyreportSyntaxError): Use "switch" instead of
- building the error message format dynamically.
- * data/lalr1.java: Formatting changes.
-
-2009-12-22 Joel E. Denny <jdenny@clemson.edu>
-
- Port small part of master's 11707b2b so future ports are easier.
- * data/lalr1.java (YYParser::yysyntax_error): Untabify.
-
-2008-12-11 Akim Demaille <demaille@gostai.com>
-
- Simplify the i18n of the error messages.
- * data/lalr1.cc: Comment changes.
-
-2008-11-11 Akim Demaille <demaille@gostai.com>
-
- Prefer M4 to CPP.
- * data/lalr1.cc: Use b4_error_verbose_if instead of #if
- YYERROR_VERBOSE.
-
-2008-11-11 Akim Demaille <demaille@gostai.com>
-
- Support i18n of the parse error messages.
- * TODO (lalr1.cc/I18n): Remove.
- * data/lalr1.cc (yysyntax_error_): Support the translation of the
- error messages, as done in yacc.c.
- Stay within the yy* pseudo namespace.
-
-2009-12-22 Joel E. Denny <jdenny@clemson.edu>
-
- Port small part of master's 8901f32e so future ports are easier.
- * data/lalr1.cc (yy::parser::yysyntax_error_): Always add second
- argument, but name it in the function definition only when
- verbose error messages are enabled and it'll thus be used.
- (yy::parser::parse): Update use of yysyntax_error_.
-
2009-12-29 Joel E. Denny <jdenny@clemson.edu>
portability: `<' and `>' are not always defined on addresses.
action): New test group checking that translation happens before
lookahead destructor calls at parser return. Previously,
incorrect destructors were called.
- * tests/conflicts.at (%error-verbose and consistent
+ * tests/conflicts.at (parse.error=verbose and consistent
errors): New test group checking that translation happens at
syntax error detection before the associated verbose error
message and the associated lookahead destructor calls. While
documentation.
(LocalWords): Remove YYFAIL.
+2009-12-20 Joel E. Denny <jdenny@clemson.edu>
+
+ tests: cleanup.
+ * tests/c++.at (Syntax error discarding no lookahead): Don't
+ ignore stderr. Instead, eliminate remaining warnings.
+
+2009-12-18 Joel E. Denny <jdenny@clemson.edu>
+
+ lalr1.cc: don't discard non-existent lookahead on syntax error.
+ * data/lalr1.cc (yy::parser::parse): Check yyempty first.
+ * tests/c++.at (Syntax error discarding no lookahead): New test
+ group.
+
2009-12-17 Joel E. Denny <jdenny@clemson.edu>
Code cleanup.
* tests/atlocal.in (LIBS): As for LDADD in src/local.mk, add
lib/libbison.a so gnulib libraries can be linked.
+2009-12-15 Joel E. Denny <jdenny@clemson.edu>
+
+ gnulib: update for fix of fprintf-posix, which we'll use soon.
+ * etc/prefix-gnulib-mk (prefix): Adjust regex for make file
+ targets so that gnulib's new arg-nonnull.h and link-warning.h
+ are matched.
+ * gnulib: Update.
+
2009-12-14 Joel E. Denny <jdenny@clemson.edu>
Enable assertion output and --disable-assert for configure.
* data/bison.m4: Update comments for rename to muscle-tab.h.
-2009-10-08 Joel E. Denny <jdenny@clemson.edu>
-
- Rename muscle_tab.* to muscle-tab.* for consistency with master.
- * src/Makefile.am (bison_SOURCES): Update.
- * src/getargs.c, src/ielr.c, src/lalr.c, src/main.c,
- src/output.c, src/parse-gram.y, src/print.c, src/reader.c,
- src/tables.c: Update include.
- * src/muscle_tab.c, src/muscle_tab.h: Rename to...
- * src/muscle-tab.c, src/muscle-tab.h: ... these and update
- include.
-
2009-10-07 Joel E. Denny <jdenny@clemson.edu>
Minor code cleanup.
- * src/muscle_tab.c (MUSCLE_USER_NAME_CONVERT): Remove macro and
+ * src/muscle-tab.c (MUSCLE_USER_NAME_CONVERT): Remove macro and
replace all uses with UNIQSTR_CONCAT.
* src/uniqstr.c (uniqstr_vsprintf): New function.
* src/uniqstr.h (uniqstr_vsprintf): Add prototype.
(UNIQSTR_CONCAT, UNIQSTR_GEN_FORMAT, UNIQSTR_GEN_FORMAT_): New
macros.
+2009-10-06 Joel E. Denny <jdenny@clemson.edu>
+
+ * TODO (Complaint submessage indentation): New.
+
2009-10-04 Joel E. Denny <jdenny@clemson.edu>
Minor code cleanup.
message buffer, import and clean up memory management code
from...
(yyparse, yypush_parse): ... here.
- * tests/regression.at (%error-verbose overflow): No longer an
- expected failure.
+ * tests/regression.at (parse.error=verbose overflow): No longer
+ an expected failure.
2009-09-23 Joel E. Denny <jdenny@clemson.edu>
yysyntax_error: test memory management more.
* tests/atlocal.in (NO_WERROR_CFLAGS): New cpp macro.
- * tests/regression.at (%error-verbose and YYSTACK_USE_ALLOCA):
- New test group.
- (%error-verbose overflow): New test group that reveals an
+ * tests/regression.at (parse.error=verbose and
+ YYSTACK_USE_ALLOCA): New test group.
+ (parse.error=verbose overflow): New test group that reveals an
obscure bug. Expected fail for now.
-2008-12-11 Akim Demaille <demaille@gostai.com>
-
- Pass the token type to yysyntax_error.
- * data/yacc.c (yysyntax_error): Take the transated token instead
- of the raw number.
- Adjust callers.
-
-2008-12-11 Akim Demaille <demaille@gostai.com>
+2009-10-04 Joel E. Denny <jdenny@clemson.edu>
- Simplify the i18n of the error messages.
- * data/yacc.c (yysyntax_error): Rewrite, using a switch instead
- of building dynamically the format string.
+ benchmarks: use %debug consistently among grammars.
+ * etc/bench.pl.in (generate_grammar_triangular): Do not activate
+ %debug by default. It can affect the timings even if yydebug=0.
+ (generate_grammar_calc): For consistency with other grammars,
+ use YYDEBUG environment variable to set yydebug.
2009-10-03 Joel E. Denny <jdenny@clemson.edu>
* tests/regression.at (parse-gram.y: LALR = IELR): New test
group.
-2009-09-16 Akim Demaille <demaille@gostai.com>
-
- doc: comment changes.
- * doc/bison.texinfo: Comment changes.
-
-2009-09-16 Akim Demaille <demaille@gostai.com>
-
- doc: spell checking.
- * doc/bison.texinfo: here.
-
2009-09-19 Alex Rozenman <rozenman@gmail.com>
Keep sub-messages aligned. Fix strings for translation.
* tests/named-ref.at: Adjust test-cases.
* NEWS (2.5): Add an announcement about named references.
+2009-09-17 Akim Demaille <demaille@gostai.com>
+
+ doc: fixes.
+ * doc/bison.texinfo: here.
+ Reported by Alex Rozenman.
+
+2009-09-16 Akim Demaille <demaille@gostai.com>
+
+ doc: lalr1.cc and variants.
+ * doc/bison.texinfo (Decl Summary): Document the "lex_symbol" and
+ "variant" %define variables.
+ (C++ Semantic Values): Split into...
+ (C++ Unions, C++ Variants): these.
+ The latter is new.
+ (C++ Parser Interface): Fix type names.
+ Document parser::syntax_error.
+ Document the fact that locations are not mandatory.
+ (C++ Scanner Interface): Split into...
+ (Split Symbols, Complete Symbols): these.
+ The later is new.
+ (Calc++ Parsing Driver): Use variants.
+ Add more comments.
+ Adjust style.
+ (Calc++ Parser): Declare all the tokens, no
+ longer accept raw characters.
+ Remove %union.
+ Adjust types and printers.
+ Remove destructors.
+ (Calc++ Scanner): Use make_<SYMBOL> functions.
+ Use strerror in error message.
+
+2009-09-16 Akim Demaille <demaille@gostai.com>
+
+ doc: spell checking.
+ * doc/bison.texinfo: here.
+
+2009-09-16 Akim Demaille <demaille@gostai.com>
+
+ doc: comment changes.
+ * doc/bison.texinfo: Comment changes.
+
+2009-09-16 Akim Demaille <demaille@gostai.com>
+
+ lalr1.cc: factor the yytranslate_ invocation in make_SYMBOLS.
+ * data/c++.m4, data/lalr1.cc (parser::symbol_type): Change the
+ constructor to take a token_type instead of the (internal) symbol
+ number.
+ Call yytranslate_.
+ * data/variant.hh (b4_symbol_constructor_define_): Therefore,
+ don't call yytranslate_ here.
+
+2009-09-16 Akim Demaille <demaille@gostai.com>
+
+ TODO: statistics.
+ * TODO (Figures): New.
+
2009-09-13 Joel E. Denny <jdenny@clemson.edu>
tests: clean up push.at test group titles.
comment, instead of saying "yyparse or yypush_parse", say either
"yyparse" or "yypush_parse" depending on which it actually is.
-2009-09-03 Joel E. Denny <jdenny@clemson.edu>
+2009-09-10 Joel E. Denny <jdenny@clemson.edu>
- Complain about unused %define variables and %code qualifiers.
- * NEWS (2.5): Document.
- * data/bison.m4 (b4_check_user_names): Complain instead of warn.
- * doc/bison.texinfo (Decl Summary): Document complaint, and
- improve %define documentation a little otherwise.
- * tests/input.at (Reject unused %code qualifiers): Update.
- (%define errors): Update.
- (%define, --define, --force-define): Update.
- (%define backward compatibility): Update.
- (Unused %define api.pure): Update.
- * tests/push.at (Push Parsing: Unsupported Skeletons): Update.
+ Fix --enable-gcc-warnings.
+ * src/parse-gram.y (%printer <param>): Handle param_none.
+
+2009-09-09 Akim Demaille <demaille@gostai.com>
+
+ lalr1.cc: syntax_error as exceptions.
+ It is common to use sort of factories in the user actions. These
+ factories may check some "syntactic" constraints that are not
+ enforced by the grammar itself. This is possible using YYERROR
+ within the action itself. Provide the user with a means to throw
+ a syntax_error exception.
+
+ * data/c++.m4 (b4_public_types_declare, b4_public_types_define):
+ Declare and define yy::parser::syntax_error.
+ * data/lalr1.cc: Include stdexcept.
+ (yy::parser::parse): Wrap the user action within a try/catch.
+ * data/glr.cc: Include stdexcept.
+
+2009-09-09 Akim Demaille <demaille@gostai.com>
+
+ lalr1.cc: add missing "inline".
+ * data/c++.m4 (b4_public_types_define): Add missing inline to
+ implementations provided in headers.
+
+2009-09-09 Akim Demaille <demaille@gostai.com>
+
+ %param: documentation.
+ * NEWS (2.6): Document %param, %lex-param, and %parse-param
+ changes.
+ * doc/bison.texinfo: Document that %lex-param and %parse-param
+ are n-ary.
+ Changes some examples to demonstrate it.
+ (Calc++ Parser): Use %param.
+
+2009-09-09 Akim Demaille <demaille@gostai.com>
+
+ Regen.
+
+2009-09-09 Akim Demaille <demaille@gostai.com>
+
+ style changes.
+ * src/parse-gram.y (add_param): Scope changes.
+
+2009-09-09 Akim Demaille <demaille@gostai.com>
+
+ %parse: support several arguments.
+ * src/parse-gram.y (current_param): New.
+ (param_type): Add param_none.
+ (params): New nonterminal.
+ Use it.
+
+2009-09-09 Akim Demaille <demaille@gostai.com>
+
+ Regen.
+
+2009-09-09 Akim Demaille <demaille@gostai.com>
+
+ %param.
+ Provide a means to factor lex-param and parse-param common
+ declarations.
+
+ * src/parse-gram.y (param_type): New.
+ Define a %printer for it.
+ (add_param): Use it.
+ (%parse-param, %lex-param): Merge into...
+ (%parse): this new token.
+ Adjust the grammar to use it.
+ * src/scan-gram.l (RETURN_VALUE): New.
+ (RETURN_PERCENT_FLAG): Use it.
+ (RETURN_PERCENT_PARAM): New.
+ Use it to support %parse-param, %lex-param and %param.
2009-09-03 Joel E. Denny <jdenny@clemson.edu>
rename variable "exact_mode" to "explicit_bracketing".
* tests/named-ref.at: Adjust existing tests and add a new one.
+2009-09-04 Akim Demaille <demaille@gostai.com>
+
+ Adjust synclines in src/parse-gram.[ch].
+ * tests/bison.in: Do some magic (including working around issues
+ with ylwrap) when this wrapper is used to compile
+ src/parse-gram.y.
+
+2009-09-03 Joel E. Denny <jdenny@clemson.edu>
+
+ Complain about unused %define variables and %code qualifiers.
+ * NEWS (2.5): Document.
+ * data/bison.m4 (b4_check_user_names): Complain instead of warn.
+ * doc/bison.texinfo (Decl Summary): Document complaint, and
+ improve %define documentation a little otherwise.
+ * tests/input.at (Reject unused %code qualifiers): Update.
+ (%define errors): Update.
+ (%define, --define, --force-define): Update.
+ (%define backward compatibility): Update.
+ (Unused %define api.pure): Update.
+ * tests/push.at (Push Parsing: Unsupported Skeletons): Update.
+
+2009-09-03 Joel E. Denny <jdenny@clemson.edu>
+
+ Don't suppress warnings about unused parse.error.
+ * data/bison.m4 (b4_error_verbose_flag): Don't examine value of
+ %define variable parse.error unless b4_error_verbose_flag is
+ actually expanded in a skeleton.
+
2009-09-03 Akim Demaille <demaille@gostai.com>
* NEWS (2.4.2): Add "Internationalization" item.
(Table of Symbols): Likewise.
* src/ielr.c (LrType): Update documentation.
* src/parse-gram.y (content.opt): Add production for ID.
- * tests/calc.at: Remove quotes in most tests.
+ * tests/actions.at: Remove quotes in most tests.
+ * tests/calc.at: Likewise.
* tests/existing.at: Likewise.
* tests/input.at: Likewise.
* tests/local.at: Likewise.
2009-08-26 Joel E. Denny <jdenny@clemson.edu>
Actually handle the yytable zero value correctly this time.
- * data/glr.c, data/lalr1.cc, data/lalr1.java, data/yacc.c: Don't
- mention zero values in the YYTABLE comments.
+ * data/bison.m4 (b4_integral_parser_tables_map): Don't mention
+ zero values in the YYTABLE comments.
* data/glr.c (yytable_value_is_error): Don't check for zero
value.
* data/lalr1.cc (yy_table_value_is_error_): Likewise.
2009-08-25 Joel E. Denny <jdenny@clemson.edu>
More fixes related to last two patches.
+ * data/bison.m4 (b4_integral_parser_tables_map): Fix YYTABLE
+ comments: zero indicates syntax error not default action.
* data/c.m4 (b4_table_value_equals): Comment that YYID must be
defined.
- * data/glr.c, data/lalr1.cc, data/lalr1.java, data/yacc.c: Fix
- yytable comments: zero indicates syntax error not default
- action.
* data/glr.c (yyis_pact_ninf): Rename to...
(yypact_value_is_default): ... this.
(yyisDefaultedState): Update for rename.
2009-08-19 Akim Demaille <demaille@gostai.com>
- doc: %initial-action to initialize yylloc.
- Reported by Bill Allombert.
- * doc/bison.texinfo: Set fill-column to 76.
- (Location Type): Document the use of %initial-action to initialize
- yylloc.
+ tests: distcc compliance.
+ * tests/synclines.at (AT_SYNCLINES_COMPILE): Discard distcc's
+ error messages from the output.
-2009-08-18 Joel E. Denny <jdenny@clemson.edu>
+2009-08-19 Akim Demaille <demaille@gostai.com>
+
+ variables: simplify the upgrade of namespace into api.namespace.
+
+ This patch simplifies "variables: rename namespace as
+ api.namespace", commit 67501061076ba46355cfd9f9361c7eed861b389c.
+ Suggested by Joel E. Denny in
+ http://lists.gnu.org/archive/html/bison-patches/2009-07/msg00006.html
+
+ * src/muscle-tab.c (muscle_percent_variable_update): New.
+ (muscle_percent_define_insert): Use it in replacement of the
+ previous tr invocation.
+ Remove variable_tr, no longer needed.
+ * data/bison.m4 (b4_percent_define_copy_, b4_percent_define_copy):
+ Remove.
+ * data/c++.m4: No longer handle namespace -> api.namespace.
+ * tests/input.at (%define backward compatibility): Check that
+ namespace is treated as api.namespace.
+
+2009-08-19 Akim Demaille <demaille@gostai.com>
+
+ doc: %initial-action to initialize yylloc.
+ Reported by Bill Allombert.
+ * doc/bison.texinfo: Set fill-column to 76.
+ (Location Type): Document the use of %initial-action to initialize
+ yylloc.
+
+2009-08-19 Akim Demaille <demaille@gostai.com>
+
+ lalr1.cc: use state_type.
+ * data/lalr1.cc (yysyntax_error_): Use state_type.
+ Move argument names into yy*.
+
+2009-08-19 Akim Demaille <demaille@gostai.com>
+
+ lalr1.cc: get rid of yyparse's yystate.
+ yystate and yystack_[0].state are equal, keep only the latter.
+ The former was also used as a temporary variable to compute the
+ post-reduction state. Move this computation into an auxiliary
+ function.
+
+ * data/glr.c (yyLRgotoState): Fuse variable definition and first
+ assignment.
+ * data/lalr1.cc (yy_lr_goto_state_): New.
+ (yyparse): Use it.
+ Replace remaining uses of yystate by yystate_[0].state.
+ Remove the former.
+
+2009-08-19 Akim Demaille <demaille@gostai.com>
+
+ lalr1.cc: destroy $$ when YYERROR is called.
+ * data/lalr1.cc (yyreduce): Compute the resulting state before
+ running the user action so that yylhs is a valid symbol.
+ (yyerrorlab): Since yylhs is complete (it knows its type), we can
+ simply call yy_destroy_ to destroy $$ on YYERROR invocations.
+ * tests/c++.at (AT_CHECK_VARIANTS): Test YYERROR with variants.
+
+2009-08-18 Joel E. Denny <jdenny@clemson.edu>
maint: update for gnulib's recent update-copyright changes
* gnulib: Update.
* tests/input.at (Numbered tokens): Recombine tests now that the
output should be deterministic across multiple numbers.
+2009-08-12 Akim Demaille <demaille@gostai.com>
+
+ tests: GCC 4.5 compliance.
+ * tests/synclines.at (AT_SYNCLINES_COMPILE): Adjust to GCC 4.5's
+ messages about #error.
+
+2009-08-12 Akim Demaille <demaille@gostai.com>
+
+ build: fix the generation of the documentation.
+ Some of our targets use "bison --help", but they can't depend on
+ "bison" itself (to avoid additional requirements on the user), so
+ they used to call "make src/bison" in the commands. Then
+ concurrent builds may fail: one make might be aiming one of its
+ jobs at compiling src/bison, and another job at generating the man
+ page. If the latter is faster than the former, then we have two
+ makes that concurrently try to compile src/bison.
+
+ This might also be a more convincing explanation for the failure
+ described in the patch "build: fix paths".
+
+ * Makefile.am (SUFFIXES): Initialize.
+ * build-aux/move-if-change: New, symlink to gnulib's.
+ * build-aux/local.mk: Ship it.
+ * doc/common.x: Remove, merged into...
+ * doc/bison.x: here.
+ * doc/local.mk (doc/bison.help): New.
+ ($(CROSS_OPTIONS_TEXI)): Depend on it.
+ Use src/bison.
+ (.x.1): Replace with...
+ (doc/bison.1): this explicit, simpler, target.
+ (common_dep): Remove, inlined where appropriate.
+ (SUFFIXES, PREPATH): Remove, unused.
+
+2009-08-12 Akim Demaille <demaille@gostai.com>
+
+ gnulib: improve prefixing.
+ * configure.ac (gl_PREFIXED_LIBOBJS): Don't rename it, rather,
+ change the value of...
+ (gl_LIBOBJS): this.
+ Adjust more variables.
+ * etc/prefix-gnulib-mk (prefix_assignment): Don't rename
+ gl_LIBOBJS.
+ (prefix): Also transform rules whose targets have slashes.
+ Use $prefix liberally.
+ Map @MKDIR_P@ to $(MKDIR_P).
+ Prefix directories that are mkdir'd.
+
+2009-08-12 Akim Demaille <demaille@gostai.com>
+
+ build: fix paths.
+ When using $(top_builddir) inconsistently, Make (including GNU
+ Make) is sometimes confused. As a result it may want to build
+ lib/libbison.la and $(top_builddir)/lib/libbison.la (the same
+ file, different names) concurrently, which, amusingly enough,
+ might end with:
+
+ ranlib lib/libbison.a
+ ranlib lib/libbison.a
+ make[2]: *** [lib/libbison.a] Segmentation fault
+
+ on OS X.
+
+ * doc/local.mk, src/local.mk: Do not use $(top_builddir) when not
+ needed.
+
2009-08-12 Akim Demaille <demaille@gostai.com>
distcheck: fix.
2009-08-10 Joel E. Denny <jdenny@clemson.edu>
- * tests/Makefile.am (TESTSUITE_AT): Add named-refs.at.
+ * tests/local.mk (TESTSUITE_AT): Add named-refs.at.
2009-08-10 Joel E. Denny <jdenny@clemson.edu>
maint: automate b4_copyright updates.
* Makefile.am (update-b4-copyright): New target rule.
- * build-aux/Makefile.am (EXTRA_DIST): Add update-b4-copyright.
+ * build-aux/local.mk (EXTRA_DIST): Add update-b4-copyright.
* build-aux/update-b4-copyright: New.
* data/yacc.c: Remove stray characters around b4_copyright
invocations.
* src/scan-gram.l (SC_ESCAPED_CHARACTER): Actually use length
variable.
-2009-07-24 Alex Rozenman <rozenman@gmail.com>
-
- Fix some memory leaks.
- * src/named-ref.c: Add a pointer check (named_ref_free).
- * src/scan-code.l: New function (variant_table_free). Called in
- code_scanner_free.
- * src/symlist.c: Call to named_ref_free (symbol_list_free).
-
2009-07-24 Joel E. Denny <jdenny@ces.clemson.edu>
Warn about character literals not of length one.
(SC_ESCAPED_CHARACTER): Warn if length is wrong.
* tests/input.at (Bad character literals): New test group.
+2009-07-24 Alex Rozenman <rozenman@gmail.com>
+
+ Fix some memory leaks.
+ * src/named-ref.c: Add a pointer check (named_ref_free).
+ * src/scan-code.l: New function (variant_table_free). Called in
+ code_scanner_free.
+ * src/symlist.c: Call to named_ref_free (symbol_list_free).
+
2009-07-24 Joel E. Denny <jdenny@ces.clemson.edu>
* src/lalr.c (state_lookahead_tokens_count): Correct comment.
do not distinguish between a missing value and an empty string
value.
-2009-07-21 Joel E. Denny <jdenny@ces.clemson.edu>
-
- * m4/m4.m4: Make it a sym link to submodules/autoconf/m4/m4.m4.
-
2009-07-15 Joel E. Denny <jdenny@ces.clemson.edu>
Revert unnecessary column realignment in --help output.
2009-07-04 Alex Rozenman <rozenman@gmail.com>
- Alphabetical order in src/Makefile.am.
- * src/Makefile.am: Adjust.
+ Alphabetical order in src/local.mk.
+ * src/local.mk: Adjust.
2009-07-04 Alex Rozenman <rozenman@gmail.com>
Not only this is inefficient, this also builds incorrect sources
with several extractions mixed together.
+2009-06-29 Akim Demaille <demaille@gostai.com>
+
+ parse.error: fix.
+ * data/bison.m4: Move code related to specific variables after the
+ definition of the variable-maintaining macros so that we don't
+ "invoke" b4_percent_define_check_values before it is defined.
+
+2009-06-29 Akim Demaille <demaille@gostai.com>
+
+ variables: parse.error
+
+ Implement, document, and test the replacement of %error-verbose
+ by %define parse.error "verbose".
+ * data/bison.m4 (b4_error_verbose_if): Reimplement to track the
+ values of the parse.error variable.
+ Make "simple" its default value.
+ Check the valid values.
+ * src/parse-gram.y: Use %define parse.error.
+ (PERCENT_ERROR_VERBOSE): New token.
+ Support it.
+ * src/scan-gram.l: Support %error-verbose.
+
+ * doc/bison.texinfo (Decl Summary): Replace the documentation of
+ %define error-verbose by that of %define parse.error.
+ * NEWS: Document it.
+
+ * tests/actions.at, tests/calc.at: Use parse.error instead of
+ %error-verbose.
+
2009-06-27 Alex Rozenman <rozenman@gmail.com>
Implement support for named symbol references.
hash: check insertion for memory exhaustion.
* src/uniqstr.c (uniqstr_new): New.
+2009-06-24 Akim Demaille <demaille@gostai.com>
+
+ variables: rename namespace as api.namespace.
+ Discussed in
+ http://lists.gnu.org/archive/html/bison-patches/2009-04/msg00033.html
+
+ * data/bison.m4 (b4_percent_define_copy_, b4_percent_define_copy):
+ New.
+ (b4_percent_define_use): New.
+ Use it where applicable.
+ * data/c++.m4: Replace uses of the variable "namespace" by
+ "api.namespace".
+ Default the latter to the former.
+ * doc/bison.texinfo (Decl Summary): Document "namespace" as
+ obsolete.
+ Document api.namespace.
+ Use @samp to document %define uses, keep @code for identifiers.
+ * NEWS: Likewise.
+ * tests/c++.at, tests/input.at: Test api.namespace instead of
+ namespace. (The tests passed with namespace.)
+
2009-06-11 Akim Demaille <demaille@gostai.com>
style changes.
* src/state.c (state_hash_insert): Check the return value of
hash_insert.
+2009-06-11 Akim Demaille <demaille@gostai.com>
+
+ tests: honor TESTSUITEFLAGS in every check target.
+ * tests/local.mk (RUN_TESTSUITE): New.
+ (check-local, installcheck-local, maintainer-check-g++)
+ (maintainer-check-posix, maintainer-check-valgrind): Use it.
+
2009-06-10 Akim Demaille <demaille@gostai.com>
deterministic test suite.
Use different file names for the three tests to make the
maintenance easier.
+2009-06-10 Akim Demaille <demaille@gostai.com>
+
+ gnulib: update.
+ * gnulib: Update to latest.
+ * lib/.cvsignore, lib/.gitignore, m4/.cvsignore,
+ * m4/.gitignore: Regen.
+ * src/symtab.c (symbol_from_uniqstr, semantic_type_from_uniqstr):
+ Call xalloc_die on hash_insert failures.
+ Requested by the new __warn_unused_result__ attribute of
+ hash_insert.
+
2009-06-10 Akim Demaille <demaille@gostai.com>
deterministic user-token-number redeclaration errors.
2009-05-25 Akim Demaille <demaille@gostai.com>
- gnulib: update.
- * gnulib: Update to latest.
- * lib/.cvsignore, lib/.gitignore, m4/.cvsignore,
- * m4/.gitignore: Regen.
- * src/symtab.c (symbol_from_uniqstr, semantic_type_from_uniqstr):
- Call xalloc_die on hash_insert failures.
- Requested by the new __warn_unused_result__ attribute of
- hash_insert.
+ build: avoid ignored errors.
+ * doc/local.mk ($(CROSS_OPTIONS_TEXI)): Don't generate ignored
+ errors, they pollute the output.
2009-05-22 Joel E. Denny <jdenny@ces.clemson.edu>
* NEWS (2.5): Add a new entry for that change.
* doc/bison.texinfo (Decl Summary): Update %define entry.
(Bison Options): Update -D/--define/-F/--force-define entry.
- * src/muscle_tab.c (muscle_percent_define_insert): Implement.
- * src/muscle_tab.h (muscle_percent_define_insert): Update
+ * src/muscle-tab.c (muscle_percent_define_insert): Implement.
+ * src/muscle-tab.h (muscle_percent_define_insert): Update
comments.
* tests/input.at (`%define errors'): Update.
(`%define, --define, --force-define'): Update.
* src/getargs.c (usage): Document -F/--force-define. Realign
options in output.
(short_options, long_options, getargs): Parse -F/--force-define,
- and update muscle_percent_define_insert invocation.
- * src/muscle_tab.h (muscle_percent_define_how): New enum type.
+ and update muscle_percent_define_insert invocations.
+ * src/muscle-tab.h (muscle_percent_define_how): New enum type.
(muscle_percent_define_insert): Add argument with that type.
- * src/muscle_tab.c (muscle_percent_define_insert): Implement
+ * src/muscle-tab.c (muscle_percent_define_insert): Implement
-F/--force-define behavior and priorities.
+ (muscle_percent_define_ensure): Update
+ muscle_percent_define_insert invocation.
* src/parse-gram.y (prologue_declaration): Update
muscle_percent_define_insert invocations.
* tests/input.at (`%define, --define'): Rename to...
Update some comments to make sense for -D.
* data/bison.m4 (b4_check_user_names): In header comments, say
"user occurrence" instead of "grammar occurrence".
- * src/muscle_tab.h (muscle_percent_define_insert): Likewise.
+ * src/muscle-tab.h (muscle_percent_define_insert): Likewise.
(muscle_percent_code_grow): Likewise just for consistency.
-2009-05-22 Joel E. Denny <jdenny@ces.clemson.edu>
-
- * data/c++.m4: Update copyright year.
-
2009-05-20 Joel E. Denny <jdenny@ces.clemson.edu>
* data/c++.m4 (b4_namespace_close): Simplify slightly.
* src/getargs.c (skeleton_arg): Remove now useless variable.
Should help the compiler see that this printf-like call is sane.
+2009-05-15 Akim Demaille <demaille@gostai.com>
+
+ Rename token.prefix as api.tokens.prefix.
+ Discussed here.
+ http://lists.gnu.org/archive/html/bison-patches/2009-05/msg00024.html.
+
+ * NEWS, data/bison.m4, data/c.m4, data/java.m4, doc/bison.texinfo,
+ * tests/c++.at, tests/calc.at, tests/java.at, tests/local.at
+ (token.prefix): Rename as...
+ (api.tokens.prefix): this.
+
2009-05-11 Akim Demaille <demaille@gostai.com>
doc: use C++ headers.
* doc/bison.texinfo (Calc++ Scanner): Prefer C++ headers to C
headers.
-2009-05-05 Akim Demaille <demaille@gostai.com>
-
- fix hexadecimal token number support.
- * src/scan-gram.l: Catch incorrect ids after hexadecimal numbers.
-
-2009-05-05 Akim Demaille <demaille@gostai.com>
+2009-05-11 Akim Demaille <demaille@gostai.com>
- tests: check token numbers.
- * tests/input.at (Numbered tokens): New.
+ doc: token.prefix
+ * doc/bison.simple (Decl Summary): Document token.prefix.
+ (Calc++ Parser): Various fixes.
+ Formatting changes.
+ Use token.prefix.
+ Introduce a macro TOKEN to shorten the code and make it more
+ readable.
+ (Calc++ Scanner): Adjust.
+ * NEWS (Variable token.prefix): New.
2009-05-04 Akim Demaille <demaille@gostai.com>
* src/scan-gram.l({int}{id}): Report as an invalid identifier.
* tests/input.at: Adjust.
-2009-05-04 Akim Demaille <demaille@gostai.com>
-
- space changes.
- * src/scan-gram.l: Untabify to be robust to zealous editors.
-
2009-05-04 Akim Demaille <demaille@gostai.com>
identifiers: dashes are letters.
* data/c.m4 (b4_identification): Update comment.
* data/yacc.c: Update access.
* doc/bison.texinfo: Update.
- * etc/bench.pl.in (bench_grammar): Update use.
+ * etc/bench.pl.in (bench_push_parser): Update use.
* src/files.c (tr): Move to...
* src/getargs.c, src/getargs.h (tr): ... here because I can't
think of a better place to expose it. My logic is that, for all
Pacify ./configure --enable-gcc-warnings.
* tests/input.at (Symbols): Prototype yyerror and yylex.
-2009-04-21 Akim Demaille <demaille@gostai.com>
-
- tests: check the use of dashes and periods in symbols.
- * tests/input.at (Symbol): New test group.
-
2009-04-29 Joel E. Denny <jdenny@ces.clemson.edu>
Document how `%define "var" "value"' is not M4-friendly.
* src/parse-gram.y (variable): In comments here.
-2009-04-29 Joel E. Denny <jdenny@ces.clemson.edu>
-
- Add copyright updates missed during previous cherry pick.
- * src/output.c: Here.
- * src/parse-gram.y: Here.
- * src/scan-gram.l: Here.
-
-2009-04-20 Akim Demaille <demaille@gostai.com>
-
- variables: accept dashes.
- * src/scan-gram.l ({id}): Also accept dashes after the initial
- letter.
- ({directive}): Use {id}.
- * src/parse-gram.y: Comment and formatting changes.
- * doc/bison.texinfo (Symbols): Adjust the lexical definitions of
- symbols.
- * src/complain.h, src/complain.c (yacc_at): New.
- * src/symtab.c (symbol_new): Use yacc_at to report inappropriate
- symbol names.
- * src/output.c (token_definitions_output): Do not #define token
- names with dashes.
-
2009-04-24 Joel E. Denny <jdenny@ces.clemson.edu>
Clean up recent patches a little.
Suggested by Akim Demaille at
<http://lists.gnu.org/archive/html/bison-patches/2009-04/msg00082.html>.
* data/bison.m4 (_b4_percent_define_check_values): Implement.
- * src/muscle_tab.c (muscle_percent_define_check_values): Implement.
+ * src/muscle-tab.c (muscle_percent_define_check_values): Implement.
* tests/input.at (%define lr.default_reductions invalid values): Merge
into...
(%define enum variables): ... here, and update output.
comments, and renaming %define lr.default_rules to %define
lr.default_reductions.
* NEWS (2.5): Update IELR documentation.
- * data/glr.c, data/lalr1.cc, data/lalr1.java, data/yacc.c:
- Adjust YYDEFACT and yydefact_ documentation.
+ * data/bison.m4 (b4_integral_parser_tables_map): Adjust YYDEFACT
+ documentation.
+ * data/glr.c, data/lalr1.java: Sync copyright dates.
* doc/bison.texinfo (Decl Summary): Adjust lr.default_reductions
and lr.type documentation. Make some other wording
improvements.
* tests/reduce.at (AT_TEST_LR_DEFAULT_RULES): Rename to...
(AT_TEST_LR_DEFAULT_REDUCTIONS): ... this, and update.
+2009-04-21 Akim Demaille <demaille@gostai.com>
+
+ tests: check the use of dashes and periods in symbols.
+ * tests/input.at (Symbol): New test group.
+
2009-04-21 Joel E. Denny <jdenny@ces.clemson.edu>
Document %define lr.type and lr.default_rules.
(`%define lr.default_rules "consistent"'): Likewise.
(`%define lr.default_rules "accepting"'): Likewise.
+2009-04-20 Akim Demaille <demaille@gostai.com>
+
+ Formatting change.
+
+2009-04-20 Akim Demaille <demaille@gostai.com>
+
+ bison: factoring.
+ * src/output.c (token_definitions_output): Use symbol_id_get
+ instead of duplicating its logic.
+ * TODO (YYERRCODE): Extend.
+
+2009-04-20 Akim Demaille <demaille@gostai.com>
+
+ variables: prefer error-verbose to error_verbose.
+ * data/bison.m4 (b4_error_verbose_if): Based on error-verbose
+ instead of error_verbose.
+ * src/scan-gram.l (%error-verbose): Map to the error-verbose
+ variable.
+ * doc/bison.texinfo: Promote %define error-verbose instead of
+ %error-verbose.
+ * tests/actions.at: Prefer %define error-verbose to %error-verbose.
+
+2009-04-15 Akim Demaille <demaille@gostai.com>
+
+ variables: accept dashes.
+ * data/bison.m4 (b4_percent_define_if_define_): Also map dashes to
+ underscores.
+ * src/scan-gram.l ({id}): Also accept dashes after the initial
+ letter.
+ ({directive}): Use {id}.
+ * src/parse-gram.y: Comment and formatting changes.
+ * doc/bison.texinfo (Symbols): Adjust the lexical definitions of
+ symbols.
+ * src/complain.h, src/complain.c (yacc_at): New.
+ * src/symtab.c (symbol_new): Use yacc_at to report inappropriate
+ symbol names.
+ * src/output.c (token_definitions_output): Do not #define token
+ names with dashes.
+
2009-04-20 Akim Demaille <demaille@gostai.com>
Consistently refer to Yacc, not YACC.
Document semicolon warnings.
* NEWS (2.5): Here.
-2008-12-08 Akim Demaille <demaille@gostai.com>
+2009-04-14 Akim Demaille <demaille@gostai.com>
- Fix portability issue in the test suite.
- * tests/local.at (AT_MATCHES_CHECK): New.
- Based on Perl instead of Sed. Sed has too many portability
- pitfalls, not ever Sed is GNU Sed.
- * tests/actions.at (Fix user actions without a trailing semicolon):
- Use it.
+ variables: use `parse.assert' instead of `assert'.
+ * TODO (assert): Remove.
+ * data/bison.m4 (b4_assert_if): Replace with...
+ (b4_parse_assert_if): this.
+ * data/lalr1.cc, data/variant.hh, tests/c++.at: Adjust.
+ * doc/bison.texinfo (Decl Summary): Document parse.assert.
-2008-12-07 Di-an Jan <dianj@freeshell.org>
+2009-04-14 Akim Demaille <demaille@gostai.com>
- Implement the FIXME that ends an user action with a semicolon
- if it seems necessary.
- * src/scan-code.l (flex rules section): Flag cpp directive from
- any `#' to the first unescaped end-of-line. Semicolon is not
- needed after `;', `{', '}', or cpp directives and is needed after
- any other token (whitespaces and comments have no effect).
- * tests/actions.at (Fix user actions without a trailing semicolon):
- New test.
- * tests/input.at (AT_CHECK_UNUSED_VALUES): Add semicolons to
- to make user actions complete statements.
- Adjust column numbers in error messages.
- * tests/regression.at (Fix user actions without a trailing semicolon):
- Remove. Covered by new test.
+ variables: use `parse.trace' instead of `debug'.
+ * src/getargs.c (getargs): Map -t to %define trace.parse.
+ * src/scan-gram.l (%debug): Map to %define trace.parse.
+ * data/bison.m4 (b4_percent_define_if_define): Map `.' in variable
+ names to `_' in macro names.
+ (b4_debug_if): Replace with...
+ (b4_parse_trace_if): this.
+ * data/glr.c, data/glr.cc, data/lalr1.cc, data/lalr1.java,
+ * data/yacc.c: Adjust.
+ * doc/bison.texinfo (Decl Summary): Document %debug as obsoleted.
+ Use @code to label the variable list.
+ Document the variable parse.trace.
+ (Tracing): Promote the parse.trace variable.
+ * TODO: %printer is not documented.
2009-04-14 Akim Demaille <demaille@gostai.com>
2009-04-06 Joel E. Denny <jdenny@ces.clemson.edu>
- * NEWS (2.5): Describe new -D/--define feature.
-
-2008-11-10 Akim Demaille <demaille@gostai.com>
-
- --trace=muscles
- * src/getargs.h, src/getargs.c (trace_muscle): New.
- (trace_types, trace_args): Support it.
- * src/output.c (output_skeleton): Use it.
+ * NEWS (2.5): New section. Describe new -D/--define feature.
-2008-11-10 Akim Demaille <demaille@gostai.com>
+2009-04-06 Akim Demaille <demaille@gostai.com>
- muscles_output.
- * src/output.c (muscles_output): New, extracted from...
- (output_skeleton): here.
- Adjust.
+ Regen.
+ * src/parse-gram.h, src/parse-gram.c: Regen.
-2008-11-21 Akim Demaille <demaille@gostai.com>
+2009-04-06 Akim Demaille <demaille@gostai.com>
- Display the changes in cross-options.texi.
- * build-aux/cross-options.pl ($sep): New, to separate items.
- * doc/Makefile.am ($(srcdir)/cross-options.texi): Use diff to display
- the changes.
+ rename muscle_tab.* as muscle-tab.* for consistency.
+ * src/muscle_tab.h, src/muscle_tab.c: Rename as...
+ * src/muscle-tab.h, src/muscle-tab.c: these.
+ * src/getargs.c, src/local.mk, src/main.c, src/output.c,
+ * src/parse-gram.y, src/reader.c, src/scan-code.l: Adjust.
-2008-11-20 Di-an Jan <dianj@freeshell.org>
+2009-04-06 Akim Demaille <demaille@gostai.com>
- Improves options in the manual.
- * doc/bison.texinfo (-g, -x): Add space before argument.
- (Option Cross Key): Implement FIXME: listing directives also.
- * build-aux/cross-options.pl: Read from <STDIN> rather than <>.
- (Short Option): Special case -d. Put arguments inside @option.
- (Bison Directive): Add column, automatically extracted from
- src/scan-gram.l (actual name passed as the first argument)
- with special case for %define.
- * doc/Makefile.am (doc/cross-options.texi): Pass src/scan-gram.l
- to build-aux/cross-options.pl.
- * src/getargs.c (usage): Document limitations of cross-options.pl.
- * src/scan-gram.l: Likewise.
+ Makefile: introduce $(BISON).
+ * src/local.mk (BISON): New.
+ (YACC): Use it.
-2009-02-25 Akim Demaille <demaille@gostai.com>
+2009-04-06 Akim Demaille <demaille@gostai.com>
- Copyright years.
- * data/glr.c: Add 2007 and 2008 here, consistenly with the comments.
+ parser: handle %locations as %define locations.
+ * src/getargs.h, src/getargs.c (locations_flag): Remove.
+ * src/getargs.c, src/scan-code.l: Use muscle_percent_define_ensure
+ to set "locations" to true.
+ * src/output.c (prepare): Don't output "locations".
+ * src/scan-gram.l (%locations): Handle it as a %<flag>.
+ * src/parse-gram.y: It's no longer a token.
+ Don't handle it.
+ * data/bison.m4 (b4_locations_if): Define it with
+ b4_percent_define_if_define.
+ * data/c.m4, data/glr.cc: Adjust.
-2008-12-08 Akim Demaille <demaille@gostai.com>
+2009-04-06 Akim Demaille <demaille@gostai.com>
- Install autoconf as a submodule to get m4sugar.
- * .gitmodules: Add submodules/autoconf.
- * data/m4sugar/foreach.m4, data/m4sugar/m4sugar.m4: Now links into
- submodules/autoconf.
+ Regen.
+ * src/parse-gram.c: Regen.
-2008-11-17 Joel E. Denny <jdenny@ces.clemson.edu>
+2009-04-06 Akim Demaille <demaille@gostai.com>
- Simplify last patch slightly.
- * src/getargs.c (getargs): Here.
+ muscle: factor the handling of obsolete of obsolete directives.
+ Suggested by Joel E. Denny.
-2008-11-17 Joel E. Denny <jdenny@ces.clemson.edu>
+ * src/muscle_tab.h, src/muscle_tab.c (muscle_percent_define_ensure):
+ New, extracted from...
+ * src/parse-gram.y (prologue_declaration: pure-parser): here.
+ Remove it.
+ (prologue_declaration: "%<flag>"): Use
+ muscle_percent_define_ensure.
+ (%error-verbose, %pure-parser): No longer tokens.
+ * src/scan-gram.l (pure-parser): Return as a %<flag>.
- Fix last warning from --enable-gcc-warnings.
- * src/getargs.c (getargs): Don't assign const address to non-const
- pointer.
+2009-04-06 Joel E. Denny <jdenny@ces.clemson.edu>
-2008-11-17 Di-an Jan <dianj@freeshell.org>
+ Fix options documentation.
+ * build-aux/cross-options.pl: As in --help output, write optional
+ arguments as [=ARG] not =[ARG].
+ * doc/bison.texinfo (Bison Options): Add -W/--warnings argument.
- Handle --enable-gcc-warnings.
- * src/getargs.c (command_line_location): Set parameters to void.
+2009-04-04 Joel E. Denny <jdenny@ces.clemson.edu>
-2008-11-11 Akim Demaille <demaille@gostai.com>
+ Replace BISON_PROG_GNU_M4 with Autoconf's AC_PROG_GNU_M4.
+ If the first m4 in $PATH is wrong, it keeps looking. Moreover, its
+ requirements for a correct m4 are stricter.
+ * m4/m4.m4: Make it a symbolic link to submodules/autoconf/m4/m4.m4.
+ * configure.ac: Update to use AC_PROG_GNU_M4.
+ Reported by Eric Blake.
- AT_FULL_COMPILE.
- * tests/actions.at, tests/regression.at: Use it.
+2009-04-03 Joel E. Denny <jdenny@ces.clemson.edu>
-2008-11-07 Akim Demaille <demaille@gostai.com>
+ Help with updating web manual.
+ * HACKING: Incorporate instructions from gnulib/doc/README.
+ * bootstrap.conf (gnulib_modules): Add gendocs.
- Pass command line location to skeleton_arg and language_argmatch.
- * src/getargs.h, src/getargs.c (skeleton_arg, language_argmatch):
- The location argument is now mandatory.
- Adjust all dependencies.
- (getargs): Use command_line_location.
+2009-04-03 Akim Demaille <demaille@gostai.com>
+
+ Regen.
+ * src/parse-gram.h, src/parse-gram.c: Regen.
+
+2009-04-03 Akim Demaille <demaille@gostai.com>
+
+ Factor %FLAG at scan level.
+ * src/parse-gram.y (PERCENT_DEBUG, PERCENT_ERROR_VERBOSE): Token
+ definitions and associated rules, replaced by....
+ (PERCENT_FLAG): this new token type, and rule.
+ * src/scan-gram.l (RETURN_PERCENT_FLAG): New.
+ Use it for %debug and %error-verbose.
+
+2009-04-03 Akim Demaille <demaille@gostai.com>
+
+ Regen.
+ * src/parse-gram.h, src/parse-gram.c: Regen.
+
+2009-04-03 Akim Demaille <demaille@gostai.com>
+
+ Treat %debug as %define debug.
+ * data/bison.m4 (b4_debug_if): New.
+ * data/glr.c, data/glr.cc, data/lalr1.cc, data/yacc.c,
+ * data/lalr1.java: Use it instead of b4_debug_flag.
+ * src/getargs.h, src/getargs.c (debug_flag): Remove.
+ * src/output.c (prepare): Don't output it.
+ * src/parse-gram.y: Treat %debug as %define debug.
+
+2009-04-03 Akim Demaille <demaille@gostai.com>
+
+ Treat %error-verbose as %define error_verbose.
+ This allows to pass -Derror_verbose on the command line. Better
+ yet, it allows to pass -Derror_verbose=$(ERROR_VERBOSE), with
+ ERROR_VERBOSE being defined as false or true.
+ * data/bison.m4 (b4_percent_define_if_define): Instead of relying
+ on b4_percent_define_ifdef, for does not check the defined value,
+ but only whether the symbol is defined, rely on
+ b4_percent_define_flag_if, so that a value of "false" is processed
+ as a false.
+ If not defined, define the flag to "false".
+ (b4_error_verbose_if): New.
+ * data/glr.c, data/lalr1.cc, data/yacc.c: Use it instead of
+ b4_error_verbose_flag.
+ * src/getargs.h, src/getargs.c (error_verbose_flag): Remove.
+ * src/output.c (prepare): Don't output it.
+ * src/parse-gram.y (%error-verbose): Treat as %define error_verbose.
-2008-11-07 Akim Demaille <demaille@gostai.com>
-
- -D, --define.
- * src/getargs.c (usage): Document -D.
- Fix help string for --locations.
- (command_line_location): New.
- (short_options, long_options, getargs): Support -D, --define.
- (getargs): Move -d support at the right place.
- * doc/bison.texinfo (Bison Options): Update.
- * tests/input.at (%define, --define): New.
-
-2008-11-07 Akim Demaille <demaille@gostai.com>
-
- Initialize the muscle table before parsing the command line.
- * src/getargs.c (quotearg.h, muscle_tab.h): Include.
- (getargs): Define file_name.
- * src/main.c (main): Initialize muscle_tab before calling
- getargs.
- * src/muscle_tab.c (muscle_init): No longer define file_name, as
- its value is not available yet.
-
-2008-11-09 Akim Demaille <demaille@gostai.com>
-
- Require the generation of parse-gram.output.
- * src/Makefile.am (YACC): Pass --report=all.
-
-2009-04-06 Joel E. Denny <jdenny@ces.clemson.edu>
-
- * NEWS (2.5): New stub.
-
-2009-04-06 Joel E. Denny <jdenny@ces.clemson.edu>
-
- Fix options documentation.
- * build-aux/cross-options.pl: As in --help output, write optional
- arguments as [=ARG] not =[ARG].
- * doc/bison.texinfo (Bison Options): Add -W/--warnings argument.
-
-2008-11-07 Akim Demaille <demaille@gostai.com>
-
- Fix --help.
- * src/getargs.c (usage): Fix help string for -W.
-
-2008-11-07 Akim Demaille <demaille@gostai.com>
-
- Handle more general types of option arguments.
- * build-aux/cross-options.pl: The argument ends at the first
- space, not the first non-symbol character.
- Use @var for each word appearing the argument description.
-
-2009-04-04 Joel E. Denny <jdenny@ces.clemson.edu>
-
- Remove spurious initial empty lines.
- * data/location.cc: End the @output lines with an @.
-
-2008-11-04 Akim Demaille <demaille@gostai.com>
-
- Remove spurious initial empty lines.
- * data/glr.c, data/glr.cc, data/lalr1.cc, data/lalr1.java,
- * data/yacc.c: End the @output lines with an @.
-
-2009-04-04 Joel E. Denny <jdenny@ces.clemson.edu>
-
- Replace BISON_PROG_GNU_M4 with Autoconf's AC_PROG_GNU_M4.
- If the first m4 in $PATH is wrong, it keeps looking. Moreover, its
- requirements for a correct m4 are stricter.
- * m4/m4.m4: Replace with Autoconf 2.63's m4/m4.m4.
- * configure.ac: Update to use AC_PROG_GNU_M4.
- Reported by Eric Blake.
-
-2009-04-03 Joel E. Denny <jdenny@ces.clemson.edu>
-
- Help with updating web manual.
- * HACKING: Incorporate instructions from gnulib/doc/README.
- * bootstrap.conf (gnulib_modules): Add gendocs.
-
-2009-04-03 Joel E. Denny <jdenny@ces.clemson.edu>
+2009-04-03 Joel E. Denny <jdenny@ces.clemson.edu>
Fix strange %define locations for default values.
Reported by Akim Demaille at
* tests/skeletons.at (%define Boolean variables: invalid skeleton
defaults): Update output.
-2008-11-07 Akim Demaille <demaille@gostai.com>
-
- Locations without columns for command line arguments.
- * src/location.c (location_print): Don't display negative columns.
- * src/location.h: Document this.
-
-2009-02-03 Joel E. Denny <jdenny@ces.clemson.edu>
+2009-04-03 Joel E. Denny <jdenny@ces.clemson.edu>
- Add reminder about uploading public key to keys.gnupg.net.
- * HACKING (Release Procedure): Here.
+ Pacify ./configure --enable-gcc-warnings.
+ * Makefile.am (AM_CFLAGS): Remove $(WERROR_CFLAGS) because many files
+ in lib won't compile with it.
+ * src/local.mk (src_bison_CFLAGS): Use $(WERROR_CFLAGS) here only.
2009-03-31 Akim Demaille <demaille@gostai.com>
gnulib: update.
* gnulib: Update to latest.
- * lib/Makefile.am (AM_CPPFLAGS): It is now defined by gnulib, so
- use +=.
+ * src/local.mk (AM_CFLAGS): Move to...
+ * Makefile.am: here.
+ * etc/prefix-gnulib-mk (prefix_assignment): Also transform
+ AM_CFLAGS.
+
+2009-03-02 Akim Demaille <demaille@gostai.com>
+
+ Comment changes.
+
+2009-03-02 Akim Demaille <demaille@gostai.com>
+
+ Share b4_yytranslate_define.
+ * data/lalr1.cc (b4_yytranslate_define): Move to...
+ * data/c++.m4: here.
+
+2009-03-02 Akim Demaille <demaille@gostai.com>
+
+ Use locations in the variant example.
+ Yes, this obfuscates the point of this example, variants only.
+ But glr.cc cannot work (yet?) without locations. This change
+ makes it easier to use this example with glr.cc.
+
+ * examples/variant.yy (assert): %define it.
+ (locations): Request them.
+ (yylex): Bind the location to the stage.
+
+2009-03-02 Akim Demaille <demaille@gostai.com>
+
+ Dub make_TOKEN as a public type interface.
+ * data/c++.m4 (b4_symbol_constructor_declare)
+ (b4_symbol_constructor_define): New empty stubs.
+ (b4_public_types_declare, b4_public_types_define): Use them.
+ * data/lalr1.cc (b4_symbol_constructor_declare)
+ (b4_symbol_constructor_declare_)
+ (b4_symbol_constructor_define_, b4_symbol_constructor_define):
+ Move to...
+ * data/variant.hh: here.
+ Remove the "b4_variant_if" parts, as variant.hh is loaded only if
+ needed.
+ * data/lalr1.cc: No longer invoke b4_symbol_constructor_define and
+ b4_symbol_constructor_declare, as it is now done by
+ b4_public_types_define and b4_public_types_declare.
+
+2009-03-02 Akim Demaille <demaille@gostai.com>
+
+ Coding style changes.
+ * data/lalr1.cc (b4_symbol_constructor_declaration_)
+ (b4_symbol_constructor_declarations)
+ (b4_symbol_constructor_definition_)
+ (b4_symbol_constructor_definitions)
+ (b4_yytranslate_definition): Rename as...
+ (b4_symbol_constructor_declare_)
+ (b4_symbol_constructor_declare)
+ (b4_symbol_constructor_define_)
+ (b4_symbol_constructor_define)
+ (b4_yytranslate_define): these.
+ * data/variant.hh (b4_variant_definition): Rename as...
+ (b4_variant_define): this.
+
+2009-03-02 Akim Demaille <demaille@gostai.com>
+
+ Factor b4_assert_if, b4_lex_symbol_if, and b4_variant_if.
+ * data/bison.m4 (b4_percent_define_if_define): New.
+ * data/c++.m4 (b4_variant_if): Move to...
+ * data/bison.m4: Here, using b4_percent_define_if_define.
+ * data/lalr1.cc (b4_assert_if, b4_lex_symbol_if): Move to...
+ * data/bison.m4: Here, using b4_percent_define_if_define.
+
+2009-03-02 Akim Demaille <demaille@gostai.com>
+
+ Dub symbol_type_base as a public type.
+ * data/c++.m4 (b4_public_types_declare): Now define
+ symbol_type_base and symbol_type.
+ (b4_public_types_define): New.
+ In both cases, the definitions are taken verbatim from lalr1.cc.
+ * data/lalr1.cc: Adjust.
+
+2009-03-02 Akim Demaille <demaille@gostai.com>
+
+ b4_public_types_declare.
+ * data/c++.m4 (b4_public_types_declare): New.
+ * data/glr.cc, data/lalr1.cc: Use it.
+
+2009-03-02 Akim Demaille <demaille@gostai.com>
+
+ b4_semantic_type_declare.
+ * data/c++.m4 (b4_semantic_type_declare): New.
+ Factors and generalizes what was in glr.cc and lalr1.cc.
+ * data/variant.hh (b4_semantic_type_declare): Redefine it for
+ variants.
+ * data/lalr1.cc, data/glr.cc: Use it.
+
+2009-02-26 Akim Demaille <demaille@gostai.com>
+
+ Upgrade gnulib.
+ * gnulib: Upgrade from master.
+ * lib/.cvsignore, lib/.gitignore, m4/.cvsignore, m4/.gitignore:
+ Regen.
+
+2009-02-25 Akim Demaille <demaille@gostai.com>
+
+ Remove useless arguments.
+ * data/glr.c (yy_reduce_print): $$ and @$ are not used and not
+ relevant.
+
+2009-02-25 Akim Demaille <demaille@gostai.com>
+
+ Comment changes.
+ * data/lalr1.cc: here.
+
+2009-02-25 Akim Demaille <demaille@gostai.com>
+
+ Fix glr.cc's debug level handling.
+ * data/glr.cc (yydebug_): Remove, as it is actually yydebug from
+ glr.c which is used.
+ (debug_level, set_debug_level): Adjust.
+
+2009-02-25 Akim Demaille <demaille@gostai.com>
+
+ Copyright years.
+ * data/glr.c: Add 2007 and 2008 here, consistenly with the comments.
+
+2009-02-25 Akim Demaille <demaille@gostai.com>
+
+ Style changes.
+ * etc/bench.pl.in (generate_grammar_list): Consitently use
+ location_type, not yy::location.
+
+2009-02-25 Akim Demaille <demaille@gostai.com>
+
+ Comment change.
+ * data/lalr1.cc: here.
+
+2009-02-19 Akim Demaille <demaille@gostai.com>
+
+ Make yyparser::error public.
+ * data/lalr1.cc: here.
+ There is no good reason to keep it private (and it is convenient
+ to use it from the scanner for instance). It is already public in
+ glr.cc.
+
+2009-02-19 Akim Demaille <demaille@gostai.com>
+
+ Comment changes.
+ * data/glr.cc: here.
+
+2009-02-19 Akim Demaille <demaille@gostai.com>
+
+ Remove trailing blanks.
+ The epilogue has its own ending \n, no need to add another.
+
+ * data/glr.c, data/lalr1.java, data/yacc.c: dnl when outputing the
+ epilogue.
+ * data/glr.cc: dnl when extending the epilogue.
+ Remove stray "private:".
+
+2009-02-19 Akim Demaille <demaille@gostai.com>
+
+ Use b4_c_modern.
+ * data/c.m4 (b4_c_function_decl): Here.
+
+2009-02-19 Akim Demaille <demaille@gostai.com>
+
+ Comment changes.
+ * data/lalr1.cc: here.
+
+2009-02-19 Akim Demaille <demaille@gostai.com>
+
+ Extract variant.hh
+ * data/variant.hh: New, extracted from...
+ * data/lalr1.cc: here.
+ Adjust.
+ * data/local.mk: Adjust.
+
+2009-02-19 Akim Demaille <demaille@gostai.com>
+
+ Extract stack.hh from lalr1.cc.
+ * data/stack.hh: New.
+ * data/lalr1.cc: Extract from here.
+ * data/local.mk: Adjust.
+
+2009-02-03 Joel E. Denny <jdenny@ces.clemson.edu>
+
+ Add reminder about uploading public key to keys.gnupg.net.
+ * HACKING (Release Procedure): Here.
+
+2009-01-28 Akim Demaille <demaille@gostai.com>
+
+ * NEWS: Update information about 2.4.1 and 2.4.2.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Reformat NEWS.
+ * NEWS: Use more outline-mode markup.
+ Suggested by Jim Meyering.
2009-01-08 Akim Demaille <demaille@gostai.com>
* tests/java.at: Use $EGREP instead of egrep.
Use AT_CHECK's ignore instead of grep's -q.
-2008-12-11 Joel E. Denny <jdenny@ces.clemson.edu>
+2008-12-11 Akim Demaille <demaille@gostai.com>
- Version 2.4.1.
- * NEWS: Set version and date.
- * lib/Makefile.am: Update copyright year.
- * tests/atlocal.in: Update copyright year.
+ Pass the token type to yysyntax_error.
+ * data/yacc.c (yysyntax_error): Take the transated token instead
+ of the raw number.
+ Adjust callers.
+ * TODO: Update.
-2008-12-11 Joel E. Denny <jdenny@ces.clemson.edu>
+2008-12-11 Akim Demaille <demaille@gostai.com>
- Semicolon feature removal is not about future language support.
- * NEWS: The semicolon feature is no longer active for newer languages,
- so don't claim that it causes trouble for them.
+ Formatting changes.
+ * data/glr.c: Formatting changes.
-2008-12-11 Joel E. Denny <jdenny@ces.clemson.edu>
+2008-12-11 Akim Demaille <demaille@gostai.com>
- * gnulib: Update submodule to HEAD.
+ Propagate i18n changes into glr.c.
+ * TODO: Update.
+ * data/glr.c (yyreportSyntaxError): Use "switch" instead of
+ building the error message format dynamically.
+ * data/lalr1.java: Formatting changes.
+
+2008-12-11 Akim Demaille <demaille@gostai.com>
+
+ Use testsuite -C.
+ * tests/local.mk: Replace "cd && testsuite" by "testsuite -C".
+ Solves problems when top_srcdir is an absolute path.
+ Suggested by Eric Blake.
+ * configure.ac: Require Autoconf 2.62.
+
+2008-12-11 Akim Demaille <demaille@gostai.com>
+
+ Simplify the i18n of the error messages.
+ * data/lalr1.cc: Comment changes.
+ * data/yacc.c (yysyntax_error): Rewrite, using a switch as in
+ lalr1.cc instead of building dynamically the format string.
+
+2008-12-08 Akim Demaille <demaille@gostai.com>
+
+ Fix portability issue in the test suite.
+ * tests/local.at (AT_MATCHES_CHECK): New.
+ Based on Perl instead of Sed. Sed has too many portability
+ pitfalls, not ever Sed is GNU Sed.
+ * tests/actions.at (Fix user actions without a trailing semicolon):
+ Use it.
-2008-12-09 Akim Demaille <demaille@gostai.com>
+2008-12-08 Akim Demaille <demaille@gostai.com>
Update data/README.
* data/README: Document glr.cc, lalr1.java, m4sugar and xslt.
+2008-12-08 Akim Demaille <demaille@gostai.com>
+
+ Install autoconf as a submodule to get m4sugar.
+ * .gitmodules: Add submodules/autoconf.
+ * data/m4sugar/foreach.m4, data/m4sugar/m4sugar.m4: Now links into
+ submodules/autoconf.
+
+2008-12-08 Akim Demaille <demaille@gostai.com>
+
+ Test token.prefix in all the skeletons.
+ * data/java.m4 (b4_token_enum): Use the token.prefix.
+ * tests/local.at (AT_BISON_OPTION_PUSHDEFS): Define AT_TOKEN_PREFIX.
+ * tests/calc.at (_AT_DATA_CALC_Y): Use it.
+ Add checks for yacc.c, glr.c, lalr1.cc and glr.cc.
+ * tests/java.at: Comment changes.
+ (AT_CHECK_JAVA_MINIMAL): Define the END token.
+ (Java parser class and package names): Add token.prefix check.
+
+2008-12-08 Akim Demaille <demaille@gostai.com>
+
+ Fix regeneration of atconfig.
+ * tests/local.mk (tests/atconfig): The rule was incorrect, but
+ remove it: now that there is no tests/Makefile.am, the top-level
+ Makefile properly updates atconfig when needed.
+
+2008-12-07 Di-an Jan <dianj@freeshell.org>
+
+ Implement the FIXME that ends an user action with a semicolon
+ if it seems necessary.
+ * src/scan-code.l (flex rules section): Flag cpp directive from
+ any `#' to the first unescaped end-of-line. Semicolon is not
+ needed after `;', `{', '}', or cpp directives and is needed after
+ any other token (whitespaces and comments have no effect).
+ * tests/actions.at (Fix user actions without a trailing semicolon):
+ New test.
+ * tests/input.at (AT_CHECK_UNUSED_VALUES): Add semicolons to
+ to make user actions complete statements.
+ Adjust column numbers in error messages.
+ * tests/regression.at (Fix user actions without a trailing semicolon):
+ Remove. Covered by new test.
+
+2008-12-07 Akim Demaille <demaille@gostai.com>
+
+ Update gnulib.
+ * gnulib: Update from master.
+
2008-12-05 Eric Blake <ebb9@byu.net>
+ Avoid compiler warning.
+ * src/output.c (muscle_insert_item_number_table): Delete unused
+ function.
+
+2008-12-02 Eric Blake <ebb9@byu.net>
+
Build testsuite with newer autoconf.
* tests/output.at (m4_expand): Don't override in newer autoconf,
where the underlying implementation changed.
(_AT_VERBOSE_GLR_STDERR): Expand to double-quoted strings,
since some of them contain unbalanced ')'.
-2008-11-19 Joel E. Denny <jdenny@ces.clemson.edu>
+2008-12-01 Akim Demaille <demaille@gostai.com>
+
+ Use b4_symbol for printers and destructors everywhere.
+ * data/bison.m4 (b4_symbol_action_location): New.
+ * data/c.m4 (b4_symbol_actions): Remove.
+ Adjust all callers to use by b4_symbol_foreach and the corresponding
+ b4_symbol_printer/destructor macro.
+ * data/glr.cc: Adjust.
+ * data/lalr1.java: Adjust the %destructor sanity check.
+ * src/output.c (symbol_code_props_output): Remove, we no longer
+ need the b4_symbol_printers/destructors tables.
+
+2008-12-01 Akim Demaille <demaille@gostai.com>
+
+ Use b4_symbol_case_.
+ * data/lalr1.cc, data/bison.m4 (b4_symbol_action): Use
+ b4_symbol_case_.
+
+2008-12-01 Akim Demaille <demaille@gostai.com>
+
+ Move b4_symbol based macro to bison.m4.
+ * data/lalr1.cc (b4_symbol_, b4_symbol, b4_symbol_if)
+ (b4_symbol_action, b4_symbol_destructor, b4_symbol_printer)
+ (b4_symbol_case_, b4_symbol_foreach, b4_type_action_)
+ (b4_type_foreach): Move to...
+ * data/bison.m4: Here.
+ * data/lalr1.cc (b4_symbol_action): Specialize for C++: use
+ b4_symbol_value_template instead of b4_symbol_value.
+
+2008-12-01 Akim Demaille <demaille@gostai.com>
+
+ b4_symbol/type_foreach.
+ * data/lalr1.cc (b4_symbol_foreach, b4_type_foreach): New.
+ Use them.
+
+2008-12-01 Akim Demaille <demaille@gostai.com>
+
+ Use the symbol properties to output the printer/destructor for lalr1.cc.
+ Instead of defining complex list of tuples to define various
+ properties of the symbols, we now prefer to define symbols as
+ "structs" in m4: using the symbol key (its number), and the
+ property name, b4_symbol gives it value. Use this to handle
+ destructors and printers.
+
+ * src/output.c (CODE_PROP): New.
+ (prepare_symbol_definitions): Use it to define the printer and
+ destructor related attributes of the symbols.
+ * data/lalr1.cc (b4_symbol_actions): Rename as...
+ (b4_symbol_action): this.
+ Use b4_symbol instead of 6 arguments.
+ (b4_symbol_printer, b4_symbol_destructor): New.
+ Use them instead of b4_symbol_actions.
+
+2008-12-01 Akim Demaille <demaille@gostai.com>
+
+ Avoid capturing variables too easily.
+ * src/muscle_tab.h (MUSCLE_INSERT_BOOL, MUSCLE_OBSTACK_SGROW): Use
+ v__ and p__ instead of v and p.
+
+2008-12-01 Akim Demaille <demaille@gostai.com>
+
+ Remove spurious empty line before syncline.
+ * data/bison.m4 (b4_syncline): Don't output an empty line before
+ the output.
+
+2008-11-26 Akim Demaille <demaille@gostai.com>
+
+ Convert lib/Makefile.am into lib/local.mk.
+ The real problem is rather gnulib.mk, which itself is extracted
+ from a Makefile.am that gnulib expects to the "recursive". The
+ tool prefix-gnulib-mk converts such a gnulib.mk to be
+ non-recursive. Also, some AC_SUBST variables need to be adjusted.
+
+ * etc/prefix-gnulib-mk: New.
+ * bootstrap (slurp): Use it to convert further gnulib.mk.
+ No longer try to avoid re-creation of lib/gnulib.mk as the changes
+ are deeper.
+ * lib/Makefile.am: Rename as...
+ * lib/local.mk: this.
+ Adjust to be prefixed.
+ * Makefile.am, configure.ac: Adjust.
+ * src/local.mk (AM_CPPFLAGS): Extend it, don't define it.
+
+2008-11-26 Akim Demaille <demaille@gostai.com>
+
+ s/_FLAGS/FLAGS/.
+ * tests/local.mk (TESTSUITE_FLAGS, AUTOTEST_FLAGS): Rename as...
+ (TESTSUITEFLAGS, AUTOTESTFLAGS): these to compy with the GCS.
+ Reported by Eric Blake.
+
+2008-11-26 Akim Demaille <demaille@gostai.com>
+
+ Use b4_parser_tables_define in glr.cc.
+ * data/glr.c: Use b4_parser_tables_define instead of defining the
+ (deterministic integral) tables by hand.
+
+2008-11-26 Akim Demaille <demaille@gostai.com>
+
+ Use b4_parser_tables_define in Java.
+ * data/java.m4 (b4_typed_parser_table): Rename as...
+ (b4_typed_parser_table_define): this, for consistency.
+ Accept a comment as $4.
+ Move $2 into yy*_.
+ (b4_integral_parser_table): Rename as...
+ (b4_integral_parser_table_define): this.
+ * data/lalr1.java: Adjust all uses.
+ Use b4_parser_tables_define instead of generation by hand.
+
+2008-11-26 Akim Demaille <demaille@gostai.com>
+
+ Prepare the convergence bw C style and Java table generation.
+ * data/bison.m4 (b4_tables_map, b4_tables_declare)
+ (b4_tables_define): Rename as...
+ (b4_integral_parser_tables_map, b4_parser_tables_declare)
+ (b4_parser_tables_define): these.
+ * data/c.m4 (b4_table_define): Rename as...
+ (b4_integral_parser_table_define): this.
+ * data/lalr1.cc: Adjust.
+ (b4_table_define, b4_table_declare): Rename as...
+ (b4_integral_parser_table_define)
+ (b4_integral_parser_table_declare): these.
+ (yyrline_): Move the comment where it is actually used.
+ * data/yacc.c: Adjust.
+ (yyrline): Use b4_integral_parser_table_define.
+
+2008-11-26 Akim Demaille <demaille@gostai.com>
+
+ Regen.
+ * src/parse-gram.h, src/parse-gram.c: Regen.
+
+2008-11-26 Akim Demaille <demaille@gostai.com>
+
+ Factor the generation of the (integral) tables bw yacc.c and lalr1.cc.
+ * data/lalr1.cc (b4_tables_map): Move to...
+ * data/bison.m4: here.
+ Update the comment for yytable during the flight.
+ (b4_tables_declare, b4_tables_define): New.
+ * data/lalr1.cc: Use them.
+ * data/c.m4 (b4_table_define): New.
+ * data/yacc.c: Use b4_tables_define instead of output the tables
+ by hand.
+ * tests/regression.at (Web2c Actions): Adjust the expected output,
+ the order of the tables changed.
+
+2008-11-26 Akim Demaille <demaille@gostai.com>
+
+ Get rid of (yy)rhs and (yy)prhs.
+ These tables are no longer needed in the parsers, and they don't seem to
+ be useful. They are not documented either.
+
+ * src/output.c (prepare_rules): Get rid of rhs and prhs.
+ Adjust the computation of (yy)r2.
+
+2008-11-26 Akim Demaille <demaille@gostai.com>
+
+ Rule length is unsigned.
+ * src/gram.h, src/gram.c (rule_rhs_length): Return a size_t.
+
+2008-11-26 Akim Demaille <demaille@gostai.com>
+
+ Get rid of lalr1-split.cc.
+ It was no longer maintainer.
+
+ * data/lalr1-split.cc: Remove.
+ * etc/bench.pl.in (bench_fusion_parser): Remove.
+ Adjust.
+
+2008-11-26 Akim Demaille <demaille@gostai.com>
+
+ Use yy* consistently.
+ * data/glr.c: Now that yyrhs no longer exists as a global
+ variable, rename local "rhs" variables into "yyrhs" for
+ consistency.
+
+2008-11-25 Akim Demaille <demaille@gostai.com>
+
+ Get rid of yyrhs and yyprhs in glr.c.
+ * data/glr.c (yyrhs, yyprhs): Remove.
+ Instead, use the state stack and yystos.
+
+2008-11-25 Akim Demaille <demaille@gostai.com>
+
+ Flag glr tests.
+ * tests/local.at (_AT_BISON_OPTION_PUSHDEFS): If glr, declare it
+ as an Autotest keyword.
+
+2008-11-25 Akim Demaille <demaille@gostai.com>
+
+ Prefer TESTSUITE_FLAGS.
+ TESTSUITEFLAGS is barely readable.
+
+ * tests/local.mk (TESTSUITE_FLAGS): Default to $(TESTSUITEFLAGS)
+ for backward compatibility.
+ Use the former instead of the latter.
+
+2008-11-25 Akim Demaille <demaille@gostai.com>
+
+ Get rid of yyrhs and yyprhs in larl1.java.
+ * data/lalr1.java (yyrhs_, yyprhs_): Remove.
+ (yy_reduce_print): Rather, use yystos_ and the state stack.
+
+2008-11-25 Akim Demaille <demaille@gostai.com>
+
+ Formatting changes.
+
+2008-11-25 Akim Demaille <demaille@gostai.com>
+
+ Get rid of yyrhs and yyprhs in yacc.c.
+ They were used to get the symbol types, given a rule number, when
+ displaying the top of the stack before a reduction. But the
+ symbol type is available from the state stack. This has two be
+ benefits: two tables less in the parser (making it smaller), and a
+ more consistent use of the three stacks which will help to fuse
+ them.
+
+ * data/yacc.c (yyprhs, yyrhs): Remove.
+ (YY_REDUCE_PRINT): Pass yyssp to yy_reduce_print.
+ (yy_reduce_print): Take yyssp as argument.
+ Use it, together with yystos, to get the symbol type.
+ * tests/regression.at (Web2c Report): Remove these tables from the
+ expected output.
+
+2008-11-25 Akim Demaille <demaille@gostai.com>
+
+ b4_tables_map.
+ The point is to factor the generation of the tables across skeletons.
+ This is language dependant.
+
+ * data/c.m4 (b4_comment_): New.
+ Should be usable to define how to generate tables independently of
+ the language.
+ (b4_c_comment): New.
+ (b4_comment): Bounce to b4_c_comment.
+ Now support $2 = [PREFIX] for indentation.
+ * data/lalr1.cc (b4_table_declare): Don't output a comment if
+ there is no comment.
+ Indent it properly when there is one.
+ Output the ending semicolon.
+ (b4_table_define): Space changes.
+ Output the ending semicolon.
+ (b4_tables_map): New.
+ Use it twice instead of declaring and defining the (integral)
+ tables by hand.
+
+2008-11-25 Akim Demaille <demaille@gostai.com>
+
+ b4_table_declare.
+ * data/lalr1.cc (b4_table_declare): New.
+ Use it to declare the tables defined with b4_table_define.
+ (b4_table_define): Declare a third arg to match b4_table_declare
+ signature.
+ Move all the comments around invocations of b4_table_define into
+ the invocations itselves.
+ Move things around to have the order for declarations and
+ definitions.
- * NEWS: Clarify a little.
+2008-11-25 Akim Demaille <demaille@gostai.com>
-2008-11-19 Joel E. Denny <jdenny@ces.clemson.edu>
+ Formatting changes.
+ * data/lalr1.java: here.
- * NEWS: Update for recent changes.
+2008-11-25 Akim Demaille <demaille@gostai.com>
+
+ b4_args is more general than only C++.
+ * data/lalr1.cc (b4_args, _b4_args): Move to...
+ * data/bison.m4: here.
+
+2008-11-21 Di-an Jan <dianj@freeshell.org>
+
+ Implement no-XXX arguments for --warnings, --report, --trace.
+ * src/getargs.c (flags_argmatch): Handles no-XXX.
+ Fix typo in doxygen comment.
+
+2008-11-21 Akim Demaille <demaille@gostai.com>
+
+ Display the changes in cross-options.texi.
+ * build-aux/cross-options.pl ($sep): New, to separate items.
+ * doc/local.mk ($(CROSS_OPTIONS_TEXI)): Use diff to display the
+ changes.
+
+2008-11-20 Di-an Jan <dianj@freeshell.org>
+
+ Improves options in the manual.
+ * doc/bison.texinfo (-g, -x): Add space before argument.
+ (Option Cross Key): Implement FIXME: listing directives also.
+ * build-aux/cross-options.pl: Read from <STDIN> rather than <>.
+ (Short Option): Special case -d. Put arguments inside @option.
+ (Bison Directive): Add column, automatically extracted from
+ src/scan-gram.l (actual name passed as the first argument)
+ with special case for %define.
+ * doc/local.mk (doc/cross-options.texi): Pass src/scan-gram.l
+ to build-aux/cross-options.pl.
+ * src/getargs.c (usage): Document limitations of cross-options.pl.
+ * src/scan-gram.l: Likewise.
2008-11-18 Joel E. Denny <jdenny@ces.clemson.edu>
* data/glr.c: Fix overquoting on b4_prefix for yylval and yylloc.
* tests/calc.at (_AT_DATA_CALC_Y): If %defines is specified, generate
lexer in a separate module that includes the defines file.
- (AT_CHECK_CALC): Use AT_FULL_COMPILE and request compilation of lexer
+ (AT_CHECK_CALC): From AT_FULL_COMPILE, request compilation of lexer
source.
* tests/local.at (_AT_BISON_OPTION_PUSHDEFS): Push AT_DEFINES_IF.
Adjust AT_LOC and AT_VAL to use AT_NAME_PREFIX.
(AT_DATA_SOURCE_PROLOGUE): New.
(AT_DATA_GRAMMAR_PROLOGUE): Use AT_DATA_SOURCE_PROLOGUE.
(AT_DATA_SOURCE): New.
- (AT_FULL_COMPILE): New, copied from master branch and extended to
- support an additional source file.
+ (AT_FULL_COMPILE): Extend to support an additional source file.
-2008-11-17 Joel E. Denny <jdenny@ces.clemson.edu>
+2008-11-18 Akim Demaille <demaille@gostai.com>
- Don't let maintainer-*-check targets force a version update.
- * cfg.mk (_is-dist-target): Implement. maintainer-check* was already
- handled.
+ More TODO.
+ * TODO: More short term issues.
-2008-11-17 Di-an Jan <dianj@freeshell.org>
+2008-11-18 Akim Demaille <demaille@gostai.com>
+
+ Regen.
+ * src/parse-gram.h, src/parse-gram.c: Regen.
+
+2008-11-18 Akim Demaille <demaille@gostai.com>
+
+ Use b4_subtract where possible.
+ * data/lalr1.cc (b4_subtract): Move to...
+ * data/bison.m4: here.
+ * data/glr.c (b4_rhs_data): Use it.
+ * data/yacc.c (b4_rhs_value, b4_rhs_location): Use it.
+
+2008-11-18 Akim Demaille <demaille@gostai.com>
+
+ Remove incorrect mode specification.
+ * data/glr.cc: Don't pretend it's C code.
+
+2008-11-17 Joel E. Denny <jdenny@ces.clemson.edu>
+
+ Simplify last patch slightly.
+ * src/getargs.c (getargs): Here.
+
+2008-11-17 Joel E. Denny <jdenny@ces.clemson.edu>
+
+ Fix last warning from --enable-gcc-warnings.
+ * src/getargs.c (getargs): Don't assign const address to non-const
+ pointer.
+
+2008-11-17 Joel E. Denny <jdenny@ces.clemson.edu>
+
+ Don't let maintainer-*-check targets force a version update.
+ * cfg.mk (_is-dist-target): Implement. maintainer-check* was already
+ handled.
+
+2008-11-17 Di-an Jan <dianj@freeshell.org>
* doc/bison.texinfo: Synchronize ``Detail Node Listing''.
Align menus. Adjust word wrapping. Use node names for menu names.
(Copying): Make description a sentence.
(Java Action Features): Remove period to match the rest of menu.
-2008-11-11 Paolo Bonzini <bonzini@gnu.org>
+2008-11-17 Di-an Jan <dianj@freeshell.org>
+
+ Handles several --enable-gcc-warnings.
+ * src/getargs.c (command_line_location): Set parameters to void.
+ * src/output.c (symbol_type_name_cmp): Make static.
+ (symbols_by_type_name): Set parameters to void.
+ (symbol_definitions_output): Remove unused parameter. Rename as...
+ (prepare_symbol_definitions): this.
+ (muscles_output): Move symbol_definitions_output to...
+ (output): here as prepare_symbol_definitions.
+ * tests/c++.at (AT_CHECK_VARIANTS): Remove unused parameters of main.
+ (AT_CHECK_NAMESPACE): Make unused parameter lloc unnamed.
+
+2008-11-17 Di-an Jan <dianj@freeshell.org>
+
+ * tests/c++.at (AT_CHECK_VARIANTS): Fixes tests 198-202.
+ Use AT_DATA_GRAMMAR instead of AT_DATA for compiled tests.
+
+2008-11-16 Akim Demaille <demaille@gostai.com>
+
+ Add missing $(EXEEXT).
+ * doc/local.mk ($(CROSS_OPTIONS_TEXI)): The target is
+ "src/bison$(EXEEXT)".
+ Reported by Di-an Jan.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ * TODO: Update.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Formatting changes.
+ * tests/input.at: here.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Remove duplicate header inclusion.
+ * src/LR0.c: here.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ * src/parse-gram.h, src/parse-gram.c: Regen.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Support parametric types.
+
+ There are two issues to handle: first scanning nested angle
+ bracket pairs to support types such as std::pair< std::string,
+ std::list<std::string> > >.
+
+ Another issue is to address idiosyncracies of C++: do not glue two
+ closing angle brackets together (otherwise it's operator>>), and
+ avoid sticking blindly a TYPE to the opening <, as it can result
+ in '<:' which is a digraph for '['.
+
+ * src/scan-gram.l (brace_level): Rename as...
+ (nesting): this.
+ (SC_TAG): New.
+ Implement support for complex tags.
+ (tag): Accept
+ , but not <.
+ * data/lalr1.cc (b4_symbol_value, b4_symbol_value_template)
+ (b4_symbol_variant): Leave space around types as parameters.
+ * examples/variant.yy: Use nested template types and leading ::.
+ * src/parse-gram.y (TYPE, TYPE_TAG_ANY, TYPE_TAG_NONE, type.opt):
+ Rename as...
+ (TAG, TAG_ANY, TAG_NONE, tag.opt): these.
+ * tests/c++.at: Test parametric types.
+
+2008-11-15 Akim Demaille <akim@betelgeuse.gostai.ensta.fr>
+
+ Test token.prefix.
+ This is not sufficient, but we test at least that the make_SYMBOL
+ interface is not affected by token.prefix. A more general test
+ will be implemented when the support of token.prefix is generalized
+ to more skeletons.
+
+ * tests/c++.at: One more variant test, using token.prefix.
+
+2008-11-15 Akim Demaille <akim@betelgeuse.gostai.ensta.fr>
+
+ Test the make_TOKEN interface.
+ * tests/c++.at (AT_CHECK_VARIANTS): Require and use locations.
+ Factor the common code in yylex.
+ Use it to test "%define lex_symbol".
+
+2008-11-15 Akim Demaille <akim@betelgeuse.gostai.ensta.fr>
+
+ Formatting change.
+
+2008-11-15 Akim Demaille <akim@betelgeuse.gostai.ensta.fr>
+
+ Simplify code for variants bench marks.
+ * etc/bench.pl.in (&generate_grammar_list): Define and use
+ location_type.
+ Factor the common code in yylex.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Better error message.
+ * bootstrap (find_tool): Fix the error message.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Update variant.yy to newest interface.
+ * examples/variant.yy: Define lex_symbol.
+ Adjust.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Don't use locations in variant.yy.
+ * examples/variant.yy: Adjust to not using locations.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Comment changes.
+ * data/local.mk, etc/local.mk, examples/local.mk: Use Automake
+ comments for the license.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Remove tests/Makefile.am.
+ * tests/Makefile.am: Rename as...
+ * tests/local.mk: this.
+ * Makefile.am, configure.ac: Adjust.
+ * Makefile.am (DISTCLEANFILES): Define.
+ (maintainer-check, maintainer-xml-check, maintainer-push-check):
+ Remove, we no longer need to bounce to the real targets.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Comment changes.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ djgpp/local.mk.
+ * Makefile.am (EXTRA_DIST): Move djgpp related part to...
+ * djgpp/local.mk: this new file.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Remove doc/Makefile.am.
+ * doc/Makefile.am: Rename as...
+ * doc/local.mk: this.
+ Adjust paths
+ * Makefile.am, configure.ac: Adjust.
+ * Makefile.am (MOSTLYCLEANFILES): New.
+ * src/local.mk: Adjust.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Move sc_tight_scope into maint.mk.
+ It does not work, and I don't know how it was supposed to work: it
+ seems to be looking for sources in the build tree. I just moved
+ it at a better place, fixing it is still required.
+
+ * src/local.mk (echo): Remove.
+ (sc_tight_scope): Move to...
+ * maint.mk: here.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Regen.
+ * src/parse-gram.h, src/parse-gram.h: Regen.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Remove src/Makefile.am.
+ * src/Makefile.am: Rename as...
+ * src/local.mk: this.
+ Prefix all the paths with src/.
+ (AUTOMAKE_OPTIONS): Build object files in the sub dirs.
+ (AM_CPPFLAGS): Find find in builddir/src.
+ (YACC): Move the flags into...
+ (AM_YFLAGS): here.
+ * maint.mk (sc_tight_scope): Disable.
+ It used to bounce to the version in src/Makefile.am which is now
+ part of this very Makefile.
+ * Makefile.am, configure.ac: Adjust.
+ * src/scan-code-c.c, src/scan-code.l: We can no longer rely on
+ include "..." to find files "here": we are no longer in src/, so
+ qualify the includes with src/.
+ * doc/Makefile.am (PREPATH): No longer include the top_builddir
+ prefix.
+ (.x.1): Adjust to be able to create src/foo from the top level
+ Makefile, instead of going bounce to src/Makefile the creation of
+ foo.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Remove useless variable.
+ * doc/Makefile.am (srcsrcdir): Remove.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Remove data/Makefile.am.
+ * data/Makefile.am: Rename as...
+ * data/local.mk: this.
+ Adjust paths.
+ * Makefile.am, configure.ac: Adjust.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Remove etc/Makefile.am.
+ * etc/Makefile.am: Rename as...
+ * etc/local.mk: this.
+ Adjust.
+ * Makefile.am, configure.ac: Adjust.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Remove examples/local.mk.
+ examples/calc++/Makefile.am might be interesting to keep as is, since
+ it is an example in itself.
+
+ * examples/Makefile.am: Rename as...
+ * examples/local.mk: this.
+ Adjust.
+ * Makefile.am, configure.ac: Adjust.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Remove build-aux/Makefile.am.
+ Recursive Makefiles are really way too slow, let's get rid of some of
+ them.
+
+ * build-aux/Makefile.am: Rename as...
+ * build-aux/local.mk: this.
+ Adjust paths.
+ * Makefile.am, configure.ac: Adjust.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Provide convenience constructors for locations and positions.
+ * data/location.cc (position::position): Accept file, line and
+ column as arguments with default values.
+ Always qualify initial line and column literals as unsigned.
+ (location::location): Provide convenience constructors.
+
+2008-11-15 Akim Demaille <demaille@gostai.com>
+
+ Instead of using make_symbol<TOK_FOO>, generate make_FOO for each
+ token type.
+ Using template buys us nothing, and makes it uselessly complex to
+ construct a symbol. Besides, it could not be generalized to other
+ languages, while make_FOO would work in C/Java etc.
+
+ * data/lalr1.cc (b4_symbol_): New.
+ (b4_symbol): Use it.
+ (b4_symbol_constructor_declaration_)
+ (b4_symbol_constructor_definition_): Instead of generating
+ specializations of an overloaded template function, just generate
+ several functions whose names are forged from the token names
+ without the token.prefix.
+ (b4_symbol_constructor_declarations): Generate them for all the
+ symbols, not just by class of symbol type, now that instead of
+ specializing a function template by the token, we generate a
+ function named after the token.
+ (b4_symbol_constructor_specialization_)
+ (b4_symbol_constructor_specializations): Remove.
+ * etc/bench.pl.in: Adjust to this new API.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ %define token.prefix.
+ Provide a means to add a prefix to the name of the tokens as
+ output in the generated files. Because of name clashes, it is
+ good to have such a prefix such as TOK_ that protects from names
+ such as EOF, FILE etc. But it clutters the grammar itself.
+
+ * data/bison.m4 (token.prefix): Empty by default.
+ * data/c.m4 (b4_token_enum, b4_token_define): Use it.
+ * data/lalr1.cc (b4_symbol): Ditto.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Compute at M4 time some of the subtractions.
+ * data/lalr1.cc (b4_subtract): New.
+ (b4_rhs_data): Use it.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ symbol::token.
+ This allows the user to get the type of a token returned by yylex.
+
+ * data/lalr1.cc (symbol::token): New.
+ (yytoknum_): Define when %define lex_symbol, independently of
+ %debug.
+ (yytoken_number_): Move into...
+ (symbol::token): here, since that's the only use.
+ The other one is YYPRINT which was not officially supported
+ by lalr1.cc, and anyway it did not work since YYPRINT uses this
+ array under a different name (yytoknum).
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ YYERRCODE.
+ * TODO (YYERRCODE): Mention the case of $undef.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ TODO: YYPRINT.
+ * TODO (YYPRINT): New.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Comment changes.
+ * data/lalr1.cc, data/yacc.c: Fix the description of the
+ yytranslate and yytoknum tables.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Define make_symbol in the header.
+ To reach good performances these functions should be inlined (yet
+ this is to measure precisely). To this end they must be available
+ to the caller.
+
+ * data/lalr1.cc (b4_symbol_constructor_definition_): Qualify
+ location_type with the class name.
+ Since will now be output in the header, declare "inline".
+ No longer use b4_symbol_constructor_specializations, but
+ b4_symbol_constructor_definitions in the header.
+ Don't call it in the *.cc file.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Define yytranslate in the header for lex_symbol.
+ * data/lalr1.cc: Move the invocation of b4_yytranslate_definition
+ into the header file when using %define lex_symbol.
+ (yytranslate_): Declare inline.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Define the constructors of symbol_type in
+ b4_symbol_constructor_definitions.
+ The constructors are called by the make_symbol functions, which a
+ forthcoming patch will move elsewhere. Hence the interest of
+ putting them together.
+
+ The stack_symbol_type does not need to be moved, it is used only
+ by the parser.
+
+ * data/lalr1.cc: Move symbol_type and symbol_base_type
+ constructors into...
+ (b4_symbol_constructor_definitions): here.
+ Adjust.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Make it easier to move the definition of yytranslate_.
+ Forthcoming changes will make it possible to use yytranslate_
+ from outside the parser implementation file.
+
+ * data/lalr1.cc (b4_yytranslate_definition): New.
+ Use it.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Remove useless class specification.
+ * data/lalr1.cc (b4_symbol_constructor_specialization_): No need
+ to refer to the class name to use a type defined by the class for
+ arguments of member functions.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Finer input type for yytranslate.
+ This patch is debatable: the tradition expects yylex to return an int
+ which happens to correspond to token_number (which is an enum). This
+ allows for instance to return characters (such as '*' etc.). But this
+ goes against the stronger typing I am trying to have with the new
+ lex interface which return a symbol_type. So in this case, feed
+ yytranslate_ with a token_type.
+
+ * data/lalr1.cc (yytranslate_): When in %define lex-symbol,
+ expect a token_type.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Honor lex-params in %define lex_symbol mode.
+ * data/lalr1.cc: Use b4_lex_param.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Simplify names.
+ * src/output.c (symbol_definitions_output): Rename symbol
+ attributes type_name and has_type_name as type and has_type.
+ * data/lalr1.cc: Adjust uses.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Use b4_type_names for the union type.
+ The union used to compute the size of the variant used to iterate
+ over the type of all the symbols, with a lot of redundancy. Now
+ iterate over the lists of symbols having the same type-name.
+
+ * data/lalr1.cc (b4_char_sizeof_): New.
+ (b4_char_sizeof): Use it.
+ Adjust to be called with a list of numbers instead of a single
+ number.
+ Adjust its caller for new-line issues.
+
+2008-11-13 Akim Demaille <demaille@gostai.com>
+
+ Define the "identifier" of a symbol.
+ Symbols may have several string representations, for instance if
+ they have an alias. What I call its "id" is a string that can be
+ used as an identifier. May not exist.
+
+ Currently the symbols which have the "tag_is_id" flag set are
+ those that don't have an alias. Look harder for the id.
+
+ * src/output.c (is_identifier): Move to...
+ * src/symtab.c (is_identifier): here.
+ * src/symtab.h, src/symtab.c (symbol_id_get): New.
+ * src/output.c (symbol_definitions_output): Use it to define "id"
+ and "has_id".
+ Remove the definition of "tag_is_id".
+ * data/lalr1.cc: Use the "id" and "has_id" whereever "tag" and
+ "tag_is_id" were used to produce code.
+ We still use "tag" for documentation.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Locations are no longer required by lalr1.cc.
+ * data/lalr1.cc (_b4_args, b4_args): New.
+ Adjust all uses of locations to make them optional.
+ * tests/c++.at (AT_CHECK_VARIANTS): No longer use the locations.
+ (AT_CHECK_NAMESPACE): Check the use of locations.
+ * tests/calc.at (_AT_DATA_CALC_Y): Adjust to be usable with or
+ without locations with lalr1.cc.
+ Test these cases.
+ * tests/output.at: Check lalr1.cc with and without location
+ support.
+ * tests/regression.at (_AT_DATA_EXPECT2_Y, _AT_DATA_DANCER_Y):
+ Don't use locations.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ AT_FULL_COMPILE.
+ * tests/local.at (AT_FULL_COMPILE): New.
+ * tests/actions.at, tests/calc.at, tests/regression.at: Use it.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Support parens in calc++.
+ * doc/bison.texinfo (Calc++ Scanner, Calc++ Parser): Support parens.
+ * examples/calc++/test (run): Check the expected output.
+ Adjust callers.
+ Check parens too.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Simplify lalr1.cc since %defines is mandatory.
+ * data/lalr1.cc: Remove useless calls to b4_defines_if.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ TODO: yyfmt.
+ * TODO (yysyntax_error): New item.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Prefer M4 to CPP.
+ * data/lalr1.cc: Use b4_error_verbose_if instead of #if
+ YYERROR_VERBOSE.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Support i18n of the parse error messages.
+ * TODO (lalr1.cc/I18n): Remove.
+ * data/lalr1.cc (yysyntax_error_): Support the translation of the
+ error messages, as done in yacc.c.
+ Stay within the yy* pseudo namespace.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ More TODO.
+ * TODO (single stack, yysyntax_error): New.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Make it possible to return a symbol_type from yylex.
+ * data/lalr1.cc (b4_lex_symbol_if): New.
+ (parse): When lex_symbol is defined, expected yylex to return the
+ complete lookahead.
+ * etc/bench.pl.in (generate_grammar_list): Extend to support this
+ yylex interface.
+ (bench_variant_parser): Exercise it.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Remove useless bench case.
+ * etc/bench.pl.in (bench_variant_parser): VARIANT_DESTROY is
+ no longer used.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Improve display of directives.
+ * etc/bench.pl.in (parse_term): Don't add useless eol.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Use string_cast in the bench.
+ * etc/bench.pl.in (generate_grammar_list): Define and use
+ string_cast.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Replace yychar with a Boolean.
+ * data/lalr1.cc (parse::yychar): Replace by...
+ (parse::yyempty): this.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Factor the tables.
+ * TODO: New item.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Let yytranslate handle the eof case.
+ * data/lalr1.cc (yytranslate_): Handle the EOF case.
+ Adjust callers.
+ No longer expect yychar to be equal to yyeof_, rather, test the
+ lookahead's (translated) kind.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ yychar cannot be empty in yyerrlab.
+ * TODO (yychar == yyempty_): New.
+ * data/lalr1.cc: Remove the handling of this case.
+ This eases forthcoming changes related to yychar and yytranslate.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Bench: syntactic sugar for %define/#define.
+ * etc/bench.pl.in (parse_dirs): Support %d and #d with arguments.
+ (&bench_push_parser, bench_variant_parser): Use this feature.
+ (&eat): New.
+ Use it.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Less memory pressure on the "list" bench.
+ * etc/bench.pl.in (generate_grammar_list): Do not accumulate all
+ the values, to limit memory pressure.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Introduce make_symbol.
+ make_symbol provides a means to construct a full symbol (kind,
+ value, location) in a single shot. It is meant to be a Symbol
+ constructor, parameterized by the symbol kind so that overloading
+ would prevent incorrect kind/value pairs. Unfortunately
+ parameterized constructors do not work well in C++ (unless the
+ parameter also appears as an argument, which is not acceptable),
+ hence the use of a function instead of a constructor.
+
+ * data/lalr1.cc (b4_symbol_constructor_declaration_)
+ (b4_symbol_constructor_declarations)
+ (b4_symbol_constructor_specialization_)
+ (b4_symbol_constructor_specializations)
+ (b4_symbol_constructor_definition_)
+ (b4_symbol_constructor_definitions): New.
+ Use them where appropriate to generate declaration, declaration of
+ the specializations, and implementations of the templated
+ overloaded function "make_symbol".
+ (variant::variant): Always define a default ctor.
+ Also provide a copy ctor.
+ (symbol_base_type, symbol_type): New ctor overloads for value-less
+ symbols.
+ (symbol_type): Now public, so that functions such as yylex can use
+ it.
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Inform m4 whether a tag is a valid id.
+ * src/output.c (is_identifier): New.
+ (symbol_definitions_output): Use it to define tag_is_id.
+ But maybe this should be done at m4 level?
+
+2008-11-11 Akim Demaille <demaille@gostai.com>
+
+ Test 214 was failing: it greps with a pattern containing [ ]*
+ which obviously meant to catch spaces and tabs, but contained only
+ spaces. Tabulations in sources are a nuisance, so to simplify the
+ matter, get rid of all the tabulations in the Java sources. The
+ other skeletons will be treated equally later.
+
+ * data/java.m4, data/lalr1.java: Untabify.
+ * tests/java.at: Simplify AT_CHECK_JAVA_GREP invocations:
+ tabulations are no longer generated.
+
+2008-11-11 Paolo Bonzini <bonzini@gnu.org>
+
+ * bootstrap.conf: Replace m4/warning.m4 with warnings module.
+ * configure.ac: Adjust usage.
+ * lib/Makefile.am: Replace $(WARNING_CFLAGS) with $(WARN_CFLAGS).
+ * src/Makefile.am: Replace $(WARNING_CFLAGS) with $(WARN_CFLAGS).
+ * tests/atlocal.in: Replace $(WARNING_*FLAGS) with $(WARN_*FLAGS).
+
+2008-11-10 Di-an Jan <dianj@freeshell.org>
+
+ Workaround Java's ``code too large'' problem for parser tables
+ in most cases, by using one function per initialization.
+ * data/java.m4 (b4_typed_parser_table, b4_integral_parser_table): New.
+ * data/lalr1.java (yypact_, yydefact_, yypgoto_, yydefgoto_,
+ yytable_, yycheck_, yystos_, yytoken_number_, yyr1_, yyr2_, yyrhs_
+ yyprhs_, yyrline_, yytranslate_table_): Use b4_integral_parser_table.
+ (yytname_): Use b4_typed_parser_table.
+ * doc/bison.texinfo (Java Bison Interface): Add note on Java's
+ ``code too large'' error.
+
+2008-11-10 Di-an Jan <dianj@freeshell.org>
+
+ * NEWS: Document them.
+
+ General Java skeleton improvements.
+ * configure.ac (gt_JAVACOMP): Request target of 1.4, which allows
+ using gcj < 4.3 in the testsuite, according to comments in
+ gnulib/m4/javacomp.m4.
+ * data/java.m4 (stype, parser_class_name, lex_throws, throws,
+ location_type, position_type): Remove extraneous brackets from
+ b4_percent_define_default.
+ (b4_lex_param, b4_parse_param): Remove extraneous brackets from
+ m4_define and m4_define_default.
+ * data/lalr1.java (b4_pre_prologue): Change to b4_user_post_prologue,
+ which marks the end of user code with appropriate syncline, like all
+ the other skeletons.
+ (b4_user_post_prologue): Add. Don't silently drop.
+ (yylex): Remove.
+ (parse): Inline yylex.
+ * doc/bison.texinfo (bisonVersion, bisonSkeleton): Document.
+ (%{...%}): Fix typo of %code imports.
+ * tests/java.at (AT_JAVA_COMPILE): Add "java" keyword.
+
+ Support annotations on parser class with %define annotations.
+ * data/lalr1.java (annotations): Add to parser class modifier.
+ * doc/bison.texinfo (Java Parser Interface): Document
+ %define annotations.
+ (Java Declarations Summary): Document %define annotations.
+ * tests/java.at (Java parser class modifiers): Test annotations.
+
+ Do not generate code for %error-verbose unless requested.
+ * data/lalr1.java (errorVerbose): Rename to yyErrorVerbose.
+ Make private. Make conditional on %error-verbose.
+ (getErrorVerbose, setErrorVerbose): New.
+ (yytnamerr_): Make conditional on %error-verbose.
+ (yysyntax_error): Make some code conditional on %error-verbose.
+ * doc/bison.texinfo (Java Bison Interface): Remove the parts
+ about %error-verbose having no effect.
+ (getErrorVerbose, setErrorVerbose): Document.
+
+ Move constants for token names to Lexer interface.
+ * data/lalr1.java (Lexer): Move EOF, b4_token_enums(b4_tokens) here.
+ * data/java.m4 (b4_token_enum): Indent for move to Lexer interface.
+ (parse): Qualify EOF to Lexer.EOF.
+ * doc/bison.texinfo (Java Parser Interface): Move documentation of
+ EOF and token names to Java Lexer Interface.
+ * tests/java.at (_AT_DATA_JAVA_CALC_Y): Remove Calc qualifier.
+
+ Make yyerror public.
+ * data/lalr1.java (Lexer.yyerror): Use longer parameter name.
+ (yyerror): Change to public. Add Javadoc comments. Use longer
+ parameter names. Make the body rather than the declarator
+ conditional on %locations.
+ * doc/bison.texinfo (yyerror): Document. Don't mark as protected.
+
+ Allow user to add code to the constructor with %code init.
+ * data/java.m4 (b4_init_throws): New, for %define init_throws.
+ * data/lalr1.java (YYParser.YYParser): Add b4_init_throws.
+ Add %code init to the front of the constructor body.
+ * doc/bison.texinfo (YYParser.YYParser): Document %code init
+ and %define init_throws.
+ (Java Declarations Summary): Document %code init and
+ %define init_throws.
+ * tests/java.at (Java %parse-param and %lex-param): Adjust grep.
+ (Java constructor init and init_throws): Add tests.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Update TODO.
+ * TODO (-D): is implemented.
+ (associativity): Same precedence must have the same associativity.
+ For instance, how can a * b / c be parsed if * is %left and / is
+ %right?
+ (YYERRORCODE, YYFAIL, YYBACKUP): New.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Formatting changes.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ More information about the symbols.
+ * src/output.c (type_names_output): Document all the symbols,
+ including those that don't have a type-name.
+ (symbol_definitions_output): Define "is_token" and
+ "has_type_name".
+ * data/lalr1.cc (b4_type_action_): Skip symbols that have an empty
+ type-name, now that they are defined too in b4_type_names.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Regen.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Make parser::yytranslate static.
+ Small speedup (1%) on the list grammar. And makes yytranslate_
+ available in non member functions.
+
+ * data/lalr1.cc (yytranslate_): Does not need to be a instance
+ function.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Avoid trailing spaces.
+ * data/c.m4: b4_comment(TEXT): Don't indent empty lines.
+ * data/lalr1.cc: Don't indent before rule and symbol actions, as
+ they can be empty, and anyway this incorrectly indents the first
+ action.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Comment changes.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Use "enum" for integral constants.
+ This is just nicer to read, I observed no speedup.
+
+ * data/lalr1.cc (yyeof_, yylast_, yynnts_, yyempty_, yyfinal_)
+ (yterror_, yyerrcode_, yyntokens_): Define as members of an enum.
+ (yyuser_token_number_max_, yyundef_token_): Move into...
+ (yytranslate_): here.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Shortcuts in bench directives.
+ * etc/bench.pl.in (parse_dirs): New.
+ Use it.
+ (bench_variant_parser, bench_fusion_parser): Use %s and %d.
+ Create the benches in "benches/".
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Formatting changes.
+ * data/lalr1.cc: here.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Adjust verbose message to using emacs.
+ * etc/bench.pl.in: Inform compilation-mode when we change the
+ directory.
+ (generate_grammar_list): Recognize %define "variant" in addition
+ to %define variant.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Classify symbols by type-name.
+ * src/uniqstr.h (UNIQSTR_CMP): New.
+ * src/output.c (symbol_type_name_cmp, symbols_by_type_name)
+ (type_names_output): New.
+ (muscles_output): Use it.
+ * data/lalr1.cc (b4_symbol_action_): Remove.
+ (b4_symbol_case_, b4_type_action_): New.
+ Adjust uses of b4_symbol_action_ to use b4_type_action_.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Change the handling of the symbols in the skeletons.
+ Before we were using tables which lines were the symbols and which
+ columns were things like number, tag, type-name etc. It is was
+ difficult to extend: each time a column was added, all the numbers had
+ to be updated (you asked for colon $2, not for "tag"). Also, it was
+ hard to filter these tables when only a subset of the symbols (say the
+ tokens, or the nterms, or the tokens that have and external number
+ *and* a type-name) was of interest.
+
+ Now instead of monolithic tables, we define one macro per cell. For
+ instance "b4_symbol(0, tag)" is a macro name which contents is
+ self-decriptive. The macro "b4_symbol" provides easier access to
+ these cells.
+
+ * src/output.c (type_names_output): Remove.
+ (symbol_numbers_output, symbol_definitions_output): New.
+ (muscles_output): Call them.
+ (prepare_symbols): Define b4_symbols_number.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ --trace=muscles
+ * src/getargs.h, src/getargs.c (trace_muscle): New.
+ (trace_types, trace_args): Support it.
+ * src/output.c (output_skeleton): Use it.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ muscles_output.
+ * src/output.c (muscles_output): New, extracted from...
+ (output_skeleton): here.
+ Adjust.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Formatting changes.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
- * bootstrap.conf: Replace m4/warning.m4 with warnings module.
- * configure.ac: Adjust usage.
- * lib/Makefile.am: Replace $(WARNING_CFLAGS) with $(WARN_CFLAGS).
- * src/Makefile.am: Replace $(WARNING_CFLAGS) with $(WARN_CFLAGS).
- * tests/atlocal.in: Replace $(WARNING_*FLAGS) with $(WARN_*FLAGS).
+ Update the variant example.
+ * examples/variant.yy: Formatting changes.
+ One stage build.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Support constructor with an argument.
+ This improves the "list" bench by 2%.
+
+ * data/lalr1.cc (variant::build): Add an overloaded version with
+ an argument.
+ * tests/c++.at (AT_CHECK_VARIANT): Check it.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Test variants.
+ * tests/c++.at (AT_CHECK_VARIANTS): New.
+ Use it with and without %define assert.
+
+2008-11-10 Akim Demaille <demaille@gostai.com>
+
+ Add %precedence support.
+ Unfortunately it is not possible to reuse the %prec directive. This
+ is because to please POSIX, we do not require to end the rules with a
+ semicolon. As a result,
+
+ foo: bar %prec baz
+
+ is ambiguous: either a rule which precedence is that of baz, or a rule,
+ and then a declaration of the precedence of the token baz.
+
+ * doc/bison.texinfo: Document %precedence.
+ (Precedence Only): New.
+ * src/assoc.h, src/assoc.c (precedence_assoc): New.
+ * src/conflicts.c (resolve_sr_conflict): Support it.
+ * src/scan-gram.l, src/parse-gram.y (%precedence): New token.
+ Parse it.
+ * tests/calc.at: Use %precedence for NEG.
+ * tests/conflicts.at (%precedence does not suffice)
+ (%precedence suffices): New tests.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Make benches in a sub dirs.
+ * etc/bench.pl.in ($dir): New.
+ Use it.
+ Check the use of constructors with an argument.
+ (bench_variant_parser): Fix.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ fix eof condition
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Fix --help.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Require the generation of parse-gram.output.
+ * src/Makefile.am (YACC): Pass --report=all.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Formatting changes.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Update TODO.
+ * TODO: Remove obsolete items.
+ Update others.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Enhance bench.pl.
+ * etc/bench.pl.in (parse, parse_expr, parse_term, parse_fact)
+ (@token, $grammar, $bench): New.
+ (generate_grammar_variant): Rename as...
+ (generate_grammar_list): this.
+ (generate_grammar): Adjust.
+ (bench_grammar): Rename as...
+ (bench): this.
+ Use it in the various bench-marking routines.
+ (-b, -g): New options.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Use a static hierarchy for symbols in the C++ parser.
+ * data/lalr1.cc (symbol_base_type, symbol_type)
+ (stack_symbol_type): Make it a static hierarchy.
+ Adjust dependencies.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ bench.pl -d, --directive.
+ * etc/bench.pl.in (@directive): New.
+ (&bench_grammar): Use it.
+ (&bench_list_grammar): New, to provide access to the "variant"
+ grammar.
+ Use it.
+ (getopts): Support -d, --directive.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Use inline for small operations.
+ * data/lalr1.cc (symbol_base_type, symbol_type)
+ (stack_symbol_type): Declare constructor and other operations as
+ inline.
+ (yy_destroy_): Inline.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Introduce a hierarchy for symbols.
+ * data/lalr1.cc (symbol_base_type, symbol_type): New.
+ (data_type): Rename as...
+ (stack_symbol_type): this.
+ Derive from symbol_base_type.
+ (yy_symbol_value_print_): Merge into...
+ (yy_symbol_print_): this.
+ Rename as...
+ (yy_print_): this.
+ (yydestruct_): Rename as...
+ (yy_destroy_): this.
+ (b4_symbols_actions, YY_SYMBOL_PRINT): Adjust.
+ (parser::parse): yyla is now of symbol_type.
+ Use its type member instead of yytoken.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Rename data_type and stack_symbol_type.
+ * data/lalr1.cc (data_type): Rename as...
+ (stack_symbol_type): this.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Handle semantic value and location together.
+ * data/lalr1.cc (b4_symbol_actions): Bounce $$ and @$ to
+ yydata.value and yydata.location.
+ (yy_symbol_value_print_, yy_symbol_print_, yydestruct_)
+ (YY_SYMBOL_PRINT): Now take semantic value and location as a
+ single arg.
+ Adjust all callers.
+ (yydestruct_): New overload for a stack symbol.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Push a complete symbol, not connected parts.
+ * data/lalr1.cc (yypush_): Take a data_type&, not disconnected
+ state, value and location.
+ Adjust callers.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Agregate yylval and yylloc.
+ * data/lalr1.cc (parser::yylval, parser::yylloc): Replace by...
+ (parser::yyla): this.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Rely on the state stack to display reduction traces.
+ To display rhs symbols before a reduction, we used information
+ about the rule reduced, which required the tables yyrhs and
+ yyprhs. Now use rely only on the state stack to get the same
+ information.
+
+ * data/lalr1.cc (b4_rhs_data, b4_rhs_state): New.
+ Use them.
+ (parser::yyrhs_, parser::yyprhs_): Remove.
+ (parser::yy_reduce_print_): Use the state stack.
+
+2008-11-09 Akim Demaille <demaille@gostai.com>
+
+ Fuse yyval and yyloc into yylhs.
+ * data/lalr1.cc (b4_lhs_value, b4_lhs_location): Adjust to using
+ yylhs.
+ (parse): Replace yyval and yyloc with yylhs.value and
+ yylhs.location.
+ After a user action, compute yylhs.state earlier.
+ (yyerrlab1): Do not play tricks with yylhs.location, rather, use a
+ fresh error_token.
+
+2008-11-09 Di-an Jan <dianj@freeshell.org>
+
+ Remove unused variable.
+ * src/output.c (type_names_output): Remove unused variable sep.
+
+2008-11-09 Paolo Bonzini <bonzini@gnu.org>
+
+ Change tests/output.at quoting.
+ * tests/output.at (AT_CHECK_OUTPUT): Use conventional m4 quoting when
+ expanding arguments.
2008-11-07 Joel E. Denny <jdenny@ces.clemson.edu>
(language_prio): Extern it.
* src/parse-gram.y: Use grammar_prio rather than 1.
-2008-11-04 Akim Demaille <demaille@gostai.com>
+2008-11-07 Akim Demaille <demaille@gostai.com>
- * NEWS: Mention the trailing semicolon in action.
+ Moving push traces into yypush_.
+ * data/lalr1.cc (yypush_): Now takes a optional trace message.
+ Adjust all uses.
-2008-11-04 Akim Demaille <demaille@gostai.com>
+2008-11-07 Akim Demaille <demaille@gostai.com>
- Reformat NEWS.
- * NEWS: Use more outline-mode markup.
- Suggested by Jim Meyering.
+ The single-stack C++ parser is now the standard one.
+ * data/lalr1.cc: Rename as...
+ * data/lalr1-split.cc: this.
+ * data/lalr1-fusion.cc: Rename as...
+ * data/lalr1.cc: this.
+ * etc/bench.pl.in: Adjust.
+
+2008-11-07 Akim Demaille <demaille@gostai.com>
+
+ Avoid empty-if warnings.
+ Reported by Quentin Hocquet.
+
+ * data/lalr1-fusion.cc (YY_SYMBOL_PRINT, YY_REDUCE_PRINT)
+ (YY_STACK_PRINT): Provide some contents even when !YYDEBUG.
+
+2008-11-07 Akim Demaille <demaille@gostai.com>
+
+ Pass command line location to skeleton_arg and language_argmatch.
+ * src/getargs.h, src/getargs.c (skeleton_arg, language_argmatch):
+ The location argument is now mandatory.
+ Adjust all dependencies.
+ (getargs): Use command_line_location.
+
+2008-11-07 Akim Demaille <demaille@gostai.com>
+
+ -D, --define.
+ * src/getargs.c (usage): Document -D.
+ Fix help string for --locations.
+ (command_line_location): New.
+ (short_options, long_options, getargs): Support -D, --define.
+ (getargs): Move -d support at the right place.
+ * doc/bison.texinfo (Bison Options): Update.
+ * tests/input.at (%define, --define): New.
+
+2008-11-07 Akim Demaille <demaille@gostai.com>
+
+ Initialize the muscle table before parsing the command line.
+ * src/getargs.c (quotearg.h, muscle_tab.h): Include.
+ (getargs): Define file_name.
+ * src/main.c (main): Initialize muscle_tab before calling
+ getargs.
+ * src/muscle_tab.c (muscle_init): No longer define file_name, as
+ its value is not available yet.
+
+2008-11-07 Akim Demaille <demaille@gostai.com>
+
+ Locations without columns for command line arguments.
+ * src/location.c (location_print): Don't display negative columns.
+ * src/location.h: Document this.
+
+2008-11-07 Akim Demaille <demaille@gostai.com>
+
+ Fix --help.
+ * src/getargs.c (usage): Fix help string for -W.
+
+2008-11-07 Akim Demaille <demaille@gostai.com>
+
+ Handle more general types of option arguments.
+ * build-aux/cross-options.pl: The argument ends at the first
+ space, not the first non-symbol character.
+ Use @var for each word appearing the argument description.
+
+2008-11-07 Akim Demaille <demaille@gostai.com>
+
+ Destroy the variants that remain on the stack in case of error.
+ * data/lalr1-fusion.cc (yydestruct_): Invoke the variant's
+ destructor.
+ Display the value only if yymsg is nonnull.
+ (yyreduce): Invoke yydestruct_ when popping lhs symbols.
+
+2008-11-07 Akim Demaille <demaille@gostai.com>
+
+ Add "%define assert" to variants.
+ This is used to help the user catch cases where some value gets
+ ovewritten by a new one. This should not happen, as this will
+ probably leak.
+
+ Unfortunately this uncovered a bug in the C++ parser itself: the
+ lookahead value was not destroyed between two calls to yylex. For
+ instance if the previous lookahead was a std::string, and then an int,
+ then the value of the std::string was correctly taken (i.e., the
+ lookahead was now an empty string), but std::string structure itself
+ was not reclaimed.
+
+ This is now done in variant::build(other&) (which is used to take the
+ value of the lookahead): other is not only stolen from its value, it
+ is also destroyed. This incurs a new performance penalty of a few
+ percent, and union becomes faster again.
+
+ * data/lalr1-fusion.cc (variant::build(other&)): Destroy other.
+ (b4_variant_if): New.
+ (variant::built): New.
+ Use it whereever the status of the variant changes.
+ * etc/bench.pl.in: Check the penalty of %define assert.
+
+2008-11-07 Akim Demaille <demaille@gostai.com>
+
+ Use "%define variant" in bench.pl.
+ * etc/bench.pl.in: No longer use the pseudo directive %variants,
+ just use %define variants.
+
+2008-11-07 Akim Demaille <demaille@gostai.com>
+
+ Regen.
+ * src/parse-gram.h, src/parse-gram.c: Regen.
2008-11-04 Joel E. Denny <jdenny@ces.clemson.edu>
* tests/regression.at (Fix user actions without a trailing semicolon):
New test case.
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Use b4_copyright_years.
+ * data/yacc.c (b4_copyright_years): New.
+ Fix its value according to the comments in the file.
+ Use it and undefine it.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Formatting changes.
+ * data/lalr1-fusion.cc, src/parse-gram.y: here.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Formatting changes.
+ * data/lalr1-fusion.cc: here.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Use strict on bench.pl.
+ * etc/bench.pl.in (&run, &generate_grammar): New.
+ Rename the grammar generating functions for consistency.
+ Change the interface so that the list of benches to run is passed
+ as (optionless) arguments.
+ (&compile): Use &run.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Remove spurious initial empty lines.
+ * data/glr.c, data/glr.cc, data/lalr1.cc, data/lalr1.java,
+ * data/yacc.c: End the @output lines with an @.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Improve the display of sizes.
+ * etc/bench.p.in: Higher precision.
+ Sort by decreasing size.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Don't memcpy C++ structures.
+ * data/lalr1-fusion.cc (b4_symbol_variant): Adjust additional
+ arguments.
+ (variant::build): New overload for
+ copy-construction-that-destroys.
+ (variant::swap): New.
+ (parser::yypush_): Use it in variant mode.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Better defaults for bench.pl.
+ * etc/bench.pl.in ($verbose, $cflags, $iterations): Change the
+ default values.
+ Adjust &verbose uses.
+ (-q, --quiet): New.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Make variant.yy more complex.
+ std::list cannot be copied via memcpy, they are more demanding than
+ std::string. Use one std::list to strengthen the test.
+
+ * examples/variant.yy: Use lalr1-fusion.cc, not lalr1.cc.
+ Adjust.
+ Create a list of strings, instead of a single large string.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ bench.pl --bench.
+ * etc/bench.pl.in (--bench, $bench): New.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Sort methods.
+ * data/lalr1-fusion.cc (destroy): Use as() in its definition.
+ Define it after as().
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Useless parens.
+ * data/lalr1-fusion.cc (b4_rhs_location): Remove useless parens.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Issue missing synclines after user actions.
+ * data/c.m4 (b4_case): Issue synclines on the output file.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Remove trailing empty line.
+ * data/lalr1-fusion.cc: Don't add an empty line after the user's
+ epilogue.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Fix output of copyright years.
+ * data/bison.m4 (b4_copyright): Fix the indentation of the
+ copyright year paragraph.
+ Use b4_copyright_years when no years are given.
+ * data/lalr1.cc, data/lalr1-fusion.cc, data/location.cc
+ (b4_copyright_years): New.
+ Use it.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Avoid the spurious initial empty line.
+ * data/lalr1-fusion.cc, data/location.cc: Put a trailing "@" at
+ the end of @output request to suppress the empty line that
+ results.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Remove parser::rhs_number_type.
+ * data/lalr1-fusion.cc (rhs_number_type): No longer define it.
+ (yyrhs_): Use b4_table_define.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Fix iteration type.
+ * data/lalr1-fusion.cc: Use an int to iterate up to an int.
+
+2008-11-04 Akim Demaille <demaille@gostai.com>
+
+ Factor the declaration of the integer tables.
+ * data/lalr1-fusion.cc (b4_table_define): New.
+ Use it.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Fix indentation of tables in lalr1.cc
+ * data/lalr1-fusion.cc: Fix the indentation.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Destroy the lhs symbols after reduction.
+ * data/lalr1-fusion.cc (parse): After the user action, when in
+ variant mode, destroy the lhs symbols.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Simplify yysyntax_error_ use.
+ * data/lalr1-fusion.cc (yysyntax_error_): Always pass it the token
+ type, but make it unnamed in the declaration when it is not used.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Let yy::variant::build return an lvalue.
+ * data/lalr1-fusion.cc (variant::build): Return a reference to the
+ object.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Define yy::variant only when needed.
+ * data/lalr1-fusion.cc (yy::variant): Define only if variants are
+ used.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Bench the three-stack lalr1.cc.
+ * etc/bench.pl.in: Bench the three-stack lalr1.cc vs. the
+ one-stack one.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Fail on parse error in calc++.
+ * doc/bison.texinfo (calc++.cc): Propagate failures to the exit
+ status.
+ * examples/calc++/test ($me, $number, $exit, run): New.
+ Use them to propagate errors to the exit status.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Don't specify the skeleton twice in the example.
+ * examples/calc++/Makefile.am: Don't pass -S to Bison, the grammar
+ file does what is needed.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ bench: Improve output.
+ * etc/bench.pl.in (bench_grammar): Tune the printf format.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ bench: check impact of %debug on variants.
+ * etc/bench.pl.in (variant_grammar): Fix the computation of
+ $variant.
+ Generate a grammar file that can work with or without %debug.
+ Do use the @directive.
+ (bench_variant_parser): Check impact of %debug.
+ (@directives): Rename all the occurrences to...
+ (@directive): this, for consistency.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ bench: report the size too.
+ * etc/bench.pl.in ($iterations): Defaults to -3.
+ (&bench_grammar): Require hireswallclock.
+ Compute and display the size of the result.
+ More comments.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ bench: More use of the verbosity level.
+ * etc/bench.pl.in ($verbose, &verbose): New.
+ Use them.
+ More POD documentation.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ bench.pl: a command line interface
+ * etc/bench.pl.in: More doc.
+ Some fixes in the documentation.
+ ($cflags, $iterations, &help, &getopt): New.
+ Use them.
+ (&variant_grammar): Let the number of stages be 10 times what is
+ specified.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Bench the use of Boost.Variants.
+ * etc/bench.pl.in ($cxx, &variant_grammar, &bench_variant_parser):
+ New.
+ (&compile): Be ready to compile C++ parsers.
+ (&bench_push_parser): Move debug information to the outermost
+ level.
+ * THANKS: Add Michiel De Wilde.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ bench.pl: Pass directives as a list instead of as a string.
+ * etc/bench.pl.in (&directives): New.
+ (&triangular_grammar, &calc_grammar): Use it to format the Bison
+ directives.
+ (&triangular_grammar): Do use the directives (were ignored).
+ (&bench_grammar, &bench_push_parser): Adjust to pass lists of
+ directives.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Improve genericity of bench.pl.
+ * etc/bench.pl.in (&bench_grammar): Take the set of benches as
+ argument.
+ (&bench_push_parser): New.
+ Call it.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Add documentation to bench.pl.
+ * etc/bench.pl.in: Comment changes.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Fuse the three stacks into a single one.
+
+ In order to make it easy to perform benchmarks to ensure that
+ there are no performance loss, lalr1.cc is forked into
+ lalr1-fusion.cc. Eventually, lalr1-fusion.cc will replace
+ lalr1.cc.
+
+ Meanwhile, to make sure that lalr1-fusion.cc is correctly
+ exercized by the test suite, the user must install a symbolic link
+ from lalr1.cc to it.
+
+ Instead of having three stacks (state, value, location), use a
+ stack of triples. This considerably simplifies the code (and it
+ will be easier not to require locations as currently does the C++
+ parser), and also gives a 10% speedup according to
+ etc/bench (probably mainly since memory allocation is done once
+ instead of three times).
+
+ Another motivation is to make it easier to destruct properly
+ semantic values: now that they are bound to their state (hence
+ symbol type) it will be easier to call the appropriate destructor.
+
+ These changes should probably benefit the C parser too.
+
+ * data/lalr1.cc: Copy as...
+ * data/lalr1-fusion.cc: this new file.
+ (b4_rhs_value, b4_rhs_location): New definitions overriding those
+ from c++.m4.
+ (state_stack_type, semantic_stack_type, location_stack_type)
+ (yystate_stack_, yysemantic_stack_, yylocation_stack_): Remove.
+ (data_type, stack_type, yystack_): New.
+ (YYLLOC_DEFAULT, yypush_): Adjust.
+ (yyerror_range): Now based on data_type, not location_type.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Push the state, value, and location at the same time.
+ This is needed to prepare a forthcoming patch that fuses the three
+ stacks into one.
+
+ * data/lalr1.cc (parser::yypush_): New.
+ (parser::yynewstate): Change the semantics: instead of arriving to
+ this label when value and location have been pushed, but yystate
+ is to be pushed on the state stack, now the three of them must
+ have been pushed before. yystate still must be the new state.
+ This allows to use yypush_ everywhere instead of individual
+ handling of the stacks.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Prefer references to pointers.
+ * data/lalr1.cc (b4_symbol_actions): New, overrides the default C
+ definition to use references instead of pointers.
+ (yy_symbol_value_print_, yy_symbol_print_, yydestruct_):
+ Take the value and location as references.
+ Adjust callers.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ stack::size instead of stack::height.
+ * data/lalr1.cc (stack::height): Rename as...
+ (stack::size): this.
+ Fix the output type.
+ Comment changes.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Use variants to support objects as semantic values.
+ This patch was inspired by work by Michiel De Wilde. But he used
+ Boost variants which (i) requires Boost on the user side, (ii) is
+ slow, and (iii) has useless overhead (the parser knows the type of
+ the semantic value there is no reason to duplicate this
+ information as Boost.Variants do).
+
+ This implementation reserves a buffer large enough to store the
+ largest objects. yy::variant implements this buffer. It was
+ implemented with Quentin Hocquet.
+
+ * src/output.c (type_names_output): New.
+ (output_skeleton): Invoke it.
+ * data/c++.m4 (b4_variant_if): New.
+ (b4_symbol_value): If needed, provide a definition for variants.
+ * data/lalr1.cc (b4_symbol_value, b4_symbol_action_)
+ (b4_symbol_variant, _b4_char_sizeof_counter, _b4_char_sizeof_dummy)
+ (b4_char_sizeof, yy::variant): New.
+ (parser::parse): If variants are requested, define
+ parser::union_type, parser::variant, change the definition of
+ semantic_type, construct $$ before running the user action instead
+ of performing a default $$ = $1.
+ * examples/variant.yy: New.
+ Based on an example by Michiel De Wilde.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Parameterize the extraction of semantic values.
+ To make future changes easier, no longer rely on ".TYPE" being the
+ way to get a semantic value.
+
+ * data/c.m4 (b4_symbol_value): New.
+ Use it.
+ * data/c++.m4, data/yacc.c: Use it.
+ * data/glr.c: Use b4_symbol_value.
+ (b4_rhs_data): New.
+ Use it.
+
+2008-11-03 Akim Demaille <demaille@gostai.com>
+
+ Prepare easier M4 changes.
+ * data/lalr1.cc: Use escaped [] instead of literals to prepare
+ future changes.
+
2008-11-02 Joel E. Denny <jdenny@ces.clemson.edu>
Initiate further development.
(PERCENT_LEX_PARAM, PERCENT_PARSE_PARAM): Remove the {...} part,
which is now, again, a separate token.
Adjust all dependencies.
- Whereever actions with $ and @ are used, use translate_code.
+ Wherever actions with $ and @ are used, use translate_code.
(action): Remove this nonterminal which is now useless.
* src/reader.c: Include assert.h, scan-gram.h and scan-code.h.
(grammar_current_rule_action_append): Use translate_code.
* Makefile.am: DJGPP specific files added to EXTRA_DIST.
* djgpp/Makefile.maint: Fix PACKAGE variable computation.
- * djgpp/config.bat: Replace every occurence of the file name
+ * djgpp/config.bat: Replace every occurrence of the file name
scan-gram-c.c with c-scan-gram.c. The same for scan-skel-c.c with
c-scan-skel.c to conform with the 8.3 file name restriction on MSDOS.
- * djgpp/config.sed: Replace every occurence of the file name
+ * djgpp/config.sed: Replace every occurrence of the file name
scan-gram-c.c with c-scan-gram.c. The same for scan-skel-c.c with
c-scan-skel.c to conform with the 8.3 file name restriction on MSDOS.
* djgpp/djunpack.bat: DJGPP specific file.
(YYERROR): Goto to yyerrorlab, not yyerrlab1.
(yyerrlab1): Remove, but where it used to be (now the bottom part of
yyerrlab), when hitting EOF, pop the whole stack here instead of
- merely falling thru the default error handling mechanism.
+ merely falling through the default error handling mechanism.
(yyerrorlab): New label, with the old contents of YYERROR,
plus the following change: pop the stack of rhs corresponding
to the production that invoked YYERROR. That is how Yacc
2002-07-30 Akim Demaille <akim@epita.fr>
- `stage' was accidently included in a previous patch.
+ `stage' was accidentally included in a previous patch.
Initiate its autoconfiscation.
* configure.in: Look for malloc.h and sys/times.h.
(insert_accepting_state, augment_automaton): Remove, since now
these states are automatically computed from the initial state.
(generate_states): Adjust.
- * src/print.c: When reporting a rule number to the user, substract
+ * src/print.c: When reporting a rule number to the user, subtract
1, so that the axiom rule is rule 0, and the first user rule is 1.
* src/reduce.c: Likewise.
* src/print_graph.c (print_core): For the time being, just as for
- Bison News
- ----------
+ GNU Bison NEWS
- * Changes in version ?.? (????-??-??):
++* Noteworthy changes in release ?.? (????-??-??) [?]
+
+** Additional yylex/yyparse arguments
+
+ The new directive %param declare additional argument to both yylex
+ and yyparse. The %lex-param, %parse-param, and %param directives
+ support one or more arguments. Instead of
+
+ %lex-param {arg1_type *arg1}
+ %lex-param {arg2_type *arg2}
+ %parse-param {arg1_type *arg1}
+ %parse-param {arg2_type *arg2}
+
+ one may now declare
+
+ %param {arg1_type *arg1} {arg2_type *arg2}
+
+** Java skeleton improvements
+
+ The constants for token names were moved to the Lexer interface.
+ Also, it is possible to add code to the parser's constructors using
+ "%code init" and "%define init_throws".
+
+** C++ skeleton improvements
+
+ The C++ parser features a syntax_error exception, which can be
+ thrown from the scanner or from user rules to raise syntax errors.
+ This facilitates reporting errors caught in sub-functions (e.g.,
+ rejecting too large integral literals from a conversion function
+ used by the scanner, or rejecting invalid combinations from a
+ factory invoked by the user actions).
+
+** Variable api.tokens.prefix
+
+ The variable api.tokens.prefix changes the way tokens are identified in
+ the generated files. This is especially useful to avoid collisions
+ with identifiers in the target language. For instance
+
+ %token FILE for ERROR
+ %define api.tokens.prefix "TOK_"
+ %%
+ start: FILE for ERROR;
+
+ will generate the definition of the symbols TOK_FILE, TOK_for, and
+ TOK_ERROR in the generated sources. In particular, the scanner must
+ use these prefixed token names, although the grammar itself still
+ uses the short names (as in the sample rule given above).
+
+** Variable api.namespace
+
+ The "namespace" variable is renamed "api.namespace". Backward
+ compatibility is ensured, but upgrading is recommended.
+
+** Variable parse.error
+
+ The variable error controls the verbosity of error messages. The
+ use of the %error-verbose directive is deprecated in favor of
+ %define parse.error "verbose".
+
+** Semantic predicates
+
+ The new, experimental, semantic-predicate feature allows actions of
+ the form %?{ BOOLEAN-EXPRESSION }, which cause syntax errors (as for
+ YYERROR) if the expression evaluates to 0, and are evaluated immediately
+ in GLR parsers, rather than being deferred. The result is that they
+ allow the programmer to prune possible parses based on the values of
+ runtime expressions.
+
- * Changes in version 2.5.1 (????-??-??):
+ * Noteworthy changes in release 2.5.1 (2012-06-05) [stable]
** Future changes:
if the symbols have destructors. For instance:
exp: exp "?" exp ":" exp { $1 ? $1 : $3; }
- | exp "+" exp
- ;
+ | exp "+" exp
+ ;
will trigger a warning about $$ and $5 in the first rule, and $3 in
the second ($1 is copied to $$ by the default rule). This example
most likely contains three errors, and could be rewritten as:
exp: exp "?" exp ":" exp
- { $$ = $1 ? $3 : $5; free ($1 ? $5 : $3); free ($1); }
- | exp "+" exp
- { $$ = $1 ? $1 : $3; if ($1) free ($3); }
- ;
+ { $$ = $1 ? $3 : $5; free ($1 ? $5 : $3); free ($1); }
+ | exp "+" exp
+ { $$ = $1 ? $1 : $3; if ($1) free ($3); }
+ ;
However, if the original actions were really intended, memory leaks
and all, the warnings can be suppressed by letting Bison believe the
values are used, e.g.:
exp: exp "?" exp ":" exp { $1 ? $1 : $3; (void) ($$, $5); }
- | exp "+" exp { $$ = $1; (void) $3; }
- ;
+ | exp "+" exp { $$ = $1; (void) $3; }
+ ;
If there are mid-rule actions, the warning is issued if no action
uses it. The following triggers no warning: $1 and $3 are used.
In agreement with POSIX and with other Yaccs, leaving a default
action is valid when $$ is untyped, and $1 typed:
- untyped: ... typed;
+ untyped: ... typed;
but the converse remains an error:
- typed: ... untyped;
+ typed: ... untyped;
** Values of mid-rule actions
The following code:
- foo: { ... } { $$ = $1; } ...
+ foo: { ... } { $$ = $1; } ...
was incorrectly rejected: $1 is defined in the second mid-rule
action, and is equal to the $$ of the first mid-rule action.
(comparable to assert/abort), and all the --trace output which is
meant for the maintainers only.
+** Horizontal tabs
+Do not add horizontal tab characters to any file in Bison's repository
+except where required. For example, do not use tabs to format C code.
+However, make files, ChangeLog, and some regular expressions require
+tabs. Also, test cases might need to contain tabs to check that Bison
+properly processes tabs in its input.
+
* Working from the repository
Also, you may run into similar problems yourself if you modify Bison.
Only building the initial full source tree will be a bit painful.
- Later, after synchronizing from the repository a plain `make' should
- be sufficient.
+ Later, after synchronizing from the repository a plain 'make' should
+ be sufficient. Note, however, that when gnulib is updated, running
+ './bootstrap' again might be needed.
** First checkout
*** Updating Bison
- If you pull a newer version of a branch, say via `git pull', you might
- import requests for updated submodules. A simple `git diff' will
+ If you pull a newer version of a branch, say via "git pull", you might
+ import requests for updated submodules. A simple "git diff" will
reveal if the current version of the submodule (i.e., the actual
contents of the gnulib directory) and the current request from the
subscriber (i.e., the reference of the version of gnulib that the
Bison reporitory requests) differ. To upgrade the submodules (i.e.,
to check out the version that is actually requested by the subscriber,
- run `git submodule update'.
+ run "git submodule update".
$ git pull
$ git submodule update
that 1. Bison compiles cleanly, 2. the parsers it produces compile
cleanly too.
- - Build with -DGNULIB_POSIXCHECK. It suggests gnulib modules that can
- fix portability issues.
+ - Maybe build with -DGNULIB_POSIXCHECK, which suggests gnulib modules
+ that can fix portability issues. See if you really want to pay
+ attention to its warnings; there's no need to obey blindly to it
+ (<http://lists.gnu.org/archive/html/bison-patches/2012-05/msg00057.html>).
- - Check with `make syntax-check' if there are issues diagnosed by
+ - Check with "make syntax-check" if there are issues diagnosed by
gnulib.
- - run `make maintainer-check' which:
- - runs `valgrind -q bison' to run Bison under Valgrind.
+ - run "make maintainer-check" which:
+ - runs "valgrind -q bison" to run Bison under Valgrind.
- runs the parsers under Valgrind.
- runs the test suite with G++ as C compiler...
- - run `make maintainer-push-check', which runs `make maintainer-check'
+ - run "make maintainer-push-check", which runs "make maintainer-check"
while activating the push implementation and its pull interface wrappers
in many test cases that were originally written to exercise only the
pull implementation. This makes certain the push implementation can
perform every task the pull implementation can.
- - run `make maintainer-xml-check', which runs `make maintainer-check'
+ - run "make maintainer-xml-check", which runs "make maintainer-check"
while checking Bison's XML automaton report for every working grammar
passed to Bison in the test suite. The check just diffs the output of
Bison's included XSLT style sheets with the output of --report=all and
--graph.
- - running `make maintainer-release-check' takes care of running
+ - running "make maintainer-release-check" takes care of running
maintainer-check, maintainer-push-check and maintainer-xml-check.
- Change tests/atlocal/CFLAGS to add your preferred options. For
- instance, `-traditional' to check that the parsers are K&R. Note
- that it does not make sense for glr.c, which should be ANSI,
- but currently is actually GNU C, nor for lalr1.cc.
+ instance, "-traditional" to check that the parsers are K&R. Note
+ that it does not make sense for glr.c, which should be ANSI, but
+ currently is actually GNU C, nor for lalr1.cc.
+- Test with a very recent version of GCC for both C and C++. Testing
+ with older versions that are still in use is nice too.
+
* Release Procedure
+ This section needs to be updated to take into account features from
+ gnulib. In particular, be sure to read README-release.
** Update the submodules. See above.
See above.
** Update the foreign files
- Running `./bootstrap' in the top level should update them all for you.
+ Running "./bootstrap" in the top level should update them all for you.
This covers PO files too. Sometimes a PO file contains problems that
causes it to be rejected by recent Gettext releases; please report
these to the Translation Project.
** Check copyright years.
We update years in copyright statements throughout Bison once at the
- start of every year by running `make update-copyright'. However, before
+ start of every year by running "make update-copyright". However, before
a release, it's good to verify that it's actually been run. Besides the
copyright statement for each Bison file, check the copyright statements
that the skeletons insert into generated parsers, and check all
betas).
** Mention the release name in a commit message
- Should have an entry similar to `Version 2.3b.'.
+ Should have an entry similar to "Version 2.3b.".
** Tag the release
Before Bison will build with the right version number, you must tag
the release in git. Do this after all other changes. The command is
similar to:
- git tag -a v2.3b
+ git tag -a v2.3b -m "Bison 2.3b."
- The commit message can be simply:
+ ** Push
+ Once "make distcheck" passes, push your changes and the tag.
+ "git push" without arguments will not push the tag.
- Bison 2.3b
+ ** make alpha, beta, or release
+ See README-release.
- ** Push
- Once `make distcheck' passes, push your changes and the tag.
- `git push' without arguments will not push the tag.
+ ** Upload
+ There are two ways to upload the tarballs to the GNU servers: using
+ gnupload (from gnulib), or by hand. Obviously prefer the former. But
+ in either case, be sure to read the following paragraph.
+
+ *** Setup
+ You need "gnupg".
- ** make alpha
- FIXME: `make alpha' is not maintained and is broken. These
- instructions need to be replaced or removed.
+ Make sure your public key has been uploaded at least to
+ keys.gnupg.net. You can upload it with:
- Running `make alpha' is absolutely perfect for beta releases: it makes
- the tarballs, the xdeltas, and prepares (in /tmp/) a proto
- announcement. It is so neat, that that's what I use anyway for
- genuine releases, but adjusting things by hand (e.g., the urls in the
- announcement file, the ChangeLog which is not needed etc.).
+ gpg --keyserver keys.gnupg.net --send-keys F125BDF3
- If it fails, you're on your own...
+ where F125BDF3 should be replaced with your key ID.
- It requires GNU Make.
+ *** Using gnupload
+ You need "ncftp".
+
+ At the end "make release" (or alpha/beta) will display the prodecure
+ to run. Just copy and paste it in your shell.
+
+ *** By hand
- ** Upload
The generic GNU upload procedure is at:
http://www.gnu.org/prep/maintain/maintain.html#Automated-FTP-Uploads
Follow the instructions there to register your information so you're permitted
- to upload. Make sure your public key has been uploaded at least to
- keys.gnupg.net. You can upload it with:
-
- gpg --keyserver keys.gnupg.net --send-keys F125BDF3
-
- where F125BDF3 should be replaced with your key ID.
+ to upload.
Here's a brief reminder of how to roll the tarballs and upload them:
*** make distcheck
*** gpg -b bison-2.3b.tar.gz
- *** In a file named `bison-2.3b.tar.gz.directive', type:
+ *** In a file named "bison-2.3b.tar.gz.directive", type:
version: 1.1
directory: bison
Complete/fix the announcement file. The generated list of recipients
(info-gnu@gnu.org, bug-bison@gnu.org, help-bison@gnu.org,
bison-patches@gnu.org, and coordinator@translationproject.org) is
- appropriate for a stable release or a ``serious beta''. For any other
- release, drop at least info-gnu@gnu.org. For an example of how to fill
- out the rest of the template, search the mailing list archives for the
- most recent release announcement.
+ appropriate for a stable release or a "serious beta". For any other
+ release, drop at least info-gnu@gnu.org. For an example of how to
+ fill out the rest of the template, search the mailing list archives
+ for the most recent release announcement.
For a stable release, send the same announcement on the comp.compilers
newsgroup by sending email to compilers@iecc.com. Do not make any Cc as
needs to be a separate message.
** Bump the version number
- In configure.ac. Run `make'. So that developers don't accidentally add new
+ In configure.ac. Run "make". So that developers don't accidentally add new
items to the old NEWS entry, create a new empty NEWS entry something like:
Changes in version ?.? (????-??-??):
# gnulib modules used by this package.
gnulib_modules='
announce-gen argmatch assert calloc-posix close closeout config-h c-strcase
- configmake dirname error extensions fdl fopen-safer gendocs getopt-gnu
+ configmake
+ dirname
+ do-release-commit-and-tag
+ error extensions fdl fopen-safer gendocs getopt-gnu
gettext git-version-gen gitlog-to-changelog
gpl-3.0 hash inttypes isnan javacomp-script
javaexec-script ldexpl maintainer-makefile malloc-gnu mbschr mbsrchr
mbswidth obstack perror progname
- quote quotearg realloc-posix
+ quote quotearg
+ readme-release
+ realloc-posix
spawn-pipe stdbool stpcpy strdup-posix strerror strtoul strverscmp
unistd unistd-safer unlocked-io update-copyright unsetenv verify
warnings
bootstrap_post_import_hook()
{
+ # Massage lib/gnulib.mk before using it later in the bootstrapping process.
+ etc/prefix-gnulib-mk --lib-name=$gnulib_name lib/$gnulib_mk
+
# Ensure that ChangeLog exists, for automake.
test -f ChangeLog || touch ChangeLog
}
# Make sure we don't need src/bison, which usually doesn't exist at
# the time of a bootstrap.
touch src/parse-gram.[ch]
+
+ perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
}
# Keep our bootstrap script in sync with gnulib's. If we ever need to
-/Makefile
-/Makefile.in
/announce-gen
/arg-nonnull.h
/c++defs.h
/compile
/config.guess
/config.rpath
+/config.rpath~
/config.sub
/depcomp
/gendocs.sh
/vc-list-files
/warn-on-use.h
/ylwrap
+ /do-release-commit-and-tag
-*- C -*-
-
# Yacc compatible skeleton for Bison
# Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation,
# Inc.
+m4_pushdef([b4_copyright_years],
+ [1984, 1989-1990, 2000-2012])
+
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# Expand IF-TRUE, if %pure-parser and %parse-param, IF-FALSE otherwise.
m4_define([b4_yacc_pure_if],
[b4_pure_if([m4_ifset([b4_parse_param],
- [$1], [$2])],
- [$2])])
+ [$1], [$2])],
+ [$2])])
# b4_yyerror_args
m4_eval([0 <= $1]), [1], [unsigned int],
- [int])])
+ [int])])
## ----------------- ##
# --------------------
# Expansion of $<TYPE>$.
m4_define([b4_lhs_value],
-[(yyval[]m4_ifval([$1], [.$1]))])
+[b4_symbol_value(yyval, [$1])])
# b4_rhs_value(RULE-LENGTH, NUM, [TYPE])
# Expansion of $<TYPE>NUM, where the current rule has RULE-LENGTH
# symbols on RHS.
m4_define([b4_rhs_value],
-[(yyvsp@{($2) - ($1)@}m4_ifval([$3], [.$3]))])
+ [b4_symbol_value([yyvsp@{b4_subtract([$2], [$1])@}], [$3])])
# Expansion of @NUM, where the current rule has RULE-LENGTH symbols
# on RHS.
m4_define([b4_rhs_location],
-[(yylsp@{($2) - ($1)@})])
+ [(yylsp@{b4_subtract([$2], [$1])@})])
## ------------------ ##
`yyvs': related to semantic values.]b4_locations_if([[
`yyls': related to locations.]])[
- Refer to the stacks thru separate pointers, to allow yyoverflow
+ Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */
/* The state stack. */
m4_changecom()
m4_divert_push(0)dnl
@output(b4_parser_file_name@)@
-b4_copyright([Bison implementation for Yacc-like parsers in C],
- [1984, 1989-1990, 2000-2012])[
+b4_copyright([Bison implementation for Yacc-like parsers in C])[
/* C LALR(1) parser skeleton written by Richard Stallman, by
simplifying the original so-called "semantic" parser. */
/* Enabling traces. */
#ifndef YYDEBUG
-# define YYDEBUG ]b4_debug_flag[
+# define YYDEBUG ]b4_parse_trace_if([1], [0])[
#endif
/* Enabling verbose error messages. */
# undef YYERROR_VERBOSE
# define YYERROR_VERBOSE 1
#else
-# define YYERROR_VERBOSE ]b4_error_verbose_flag[
+# define YYERROR_VERBOSE ]b4_error_verbose_if([1], [0])[
#endif
/* Enabling the token table. */
# endif
# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
- && (defined YYFREE || defined free)))
+ && (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef EXIT_SUCCESS
# define EXIT_SUCCESS 0
#if (! defined yyoverflow \
&& (! defined __cplusplus \
- || (]b4_locations_if([[defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
- && ]])[defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+ || (]b4_locations_if([[defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
+ && ]])[defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
- do \
- { \
- YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- } \
+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+ Stack = &yyptr->Stack_alloc; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
while (YYID (0))
#endif
#define YYNNTS ]b4_nterms_number[
/* YYNRULES -- Number of rules. */
#define YYNRULES ]b4_rules_number[
-/* YYNRULES -- Number of states. */
+/* YYNSTATES -- Number of states. */
#define YYNSTATES ]b4_states_number[
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+ by yylex, with out-of-bounds checking. */
#define YYUNDEFTOK ]b4_undef_token_number[
#define YYMAXUTOK ]b4_user_token_number_max[
-#define YYTRANSLATE(YYX) \
+#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+ as returned by yylex, without out-of-bounds checking. */
static const ]b4_int_type_for([b4_translate])[ yytranslate[] =
{
]b4_translate[
};
#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
-static const ]b4_int_type_for([b4_prhs])[ yyprhs[] =
-{
- ]b4_prhs[
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const ]b4_int_type_for([b4_rhs])[ yyrhs[] =
-{
- ]b4_rhs[
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
-static const ]b4_int_type_for([b4_rline])[ yyrline[] =
-{
- ]b4_rline[
-};
+]b4_integral_parser_table_define([rline], [b4_rline],
+ [YYRLINE[YYN] -- Source line where rule number YYN was defined.])[
#endif
#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
#endif
# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
- token YYLEX-NUM. */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+ (internal) symbol number NUM (which must be that of a token). */
static const ]b4_int_type_for([b4_toknum])[ yytoknum[] =
{
]b4_toknum[
};
# endif
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const ]b4_int_type_for([b4_r1])[ yyr1[] =
-{
- ]b4_r1[
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const ]b4_int_type_for([b4_r2])[ yyr2[] =
-{
- ]b4_r2[
-};
-
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
- Performed when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
-static const ]b4_int_type_for([b4_defact])[ yydefact[] =
-{
- ]b4_defact[
-};
-
-/* YYDEFGOTO[NTERM-NUM]. */
-static const ]b4_int_type_for([b4_defgoto])[ yydefgoto[] =
-{
- ]b4_defgoto[
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
- STATE-NUM. */
#define YYPACT_NINF ]b4_pact_ninf[
-static const ]b4_int_type_for([b4_pact])[ yypact[] =
-{
- ]b4_pact[
-};
-
-/* YYPGOTO[NTERM-NUM]. */
-static const ]b4_int_type_for([b4_pgoto])[ yypgoto[] =
-{
- ]b4_pgoto[
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- number is the opposite. If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF ]b4_table_ninf[
-static const ]b4_int_type_for([b4_table])[ yytable[] =
-{
- ]b4_table[
-};
#define yypact_value_is_default(yystate) \
]b4_table_value_equals([[pact]], [[yystate]], [b4_pact_ninf])[
+#define YYTABLE_NINF ]b4_table_ninf[
+
#define yytable_value_is_error(yytable_value) \
]b4_table_value_equals([[table]], [[yytable_value]], [b4_table_ninf])[
-static const ]b4_int_type_for([b4_check])[ yycheck[] =
-{
- ]b4_check[
-};
-
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
-static const ]b4_int_type_for([b4_stos])[ yystos[] =
-{
- ]b4_stos[
-};
+]b4_parser_tables_define[
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
/* Like YYERROR except do call yyerror. This remains here temporarily
in Bison 2.4.2's NEWS entry, where a plan to phase it out is
discussed. */
-#define YYFAIL goto yyerrlab
+#define YYFAIL goto yyerrlab
#if defined YYFAIL
/* This is here to suppress warnings from the GCC cpp's
-Wunused-macros. Normally we don't worry about that warning, but
else \
{ \
yyerror (]b4_yyerror_args[YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
+ YYERROR; \
+ } \
while (YYID (0))
-#define YYTERROR 1
-#define YYERRCODE 256
+#define YYTERROR 1
+#define YYERRCODE 256
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
while (YYID (0))
#endif]b4_locations_if([[
#ifndef YY_LOCATION_PRINT
# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc) \
- fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
+# define YY_LOCATION_PRINT(File, Loc) \
+ fprintf (File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
# else
# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
# endif
# define YYFPRINTF fprintf
# endif
-# define YYDPRINTF(Args) \
-do { \
- if (yydebug) \
- YYFPRINTF Args; \
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
} while (YYID (0))
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-do { \
- if (yydebug) \
- { \
- YYFPRINTF (stderr, "%s ", Title); \
- yy_symbol_print (stderr, \
- Type, Value]b4_locations_if([, Location])[]b4_user_args[); \
- YYFPRINTF (stderr, "\n"); \
- } \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yy_symbol_print (stderr, \
+ Type, Value]b4_locations_if([, Location])[]b4_user_args[); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
} while (YYID (0))
]b4_yy_symbol_print_generate([b4_c_function_def])[
`------------------------------------------------------------------*/
]b4_c_function_def([yy_stack_print], [static void],
- [[yytype_int16 *yybottom], [yybottom]],
- [[yytype_int16 *yytop], [yytop]])[
+ [[yytype_int16 *yybottom], [yybottom]],
+ [[yytype_int16 *yytop], [yytop]])[
{
YYFPRINTF (stderr, "Stack now");
for (; yybottom <= yytop; yybottom++)
YYFPRINTF (stderr, "\n");
}
-# define YY_STACK_PRINT(Bottom, Top) \
-do { \
- if (yydebug) \
- yy_stack_print ((Bottom), (Top)); \
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
} while (YYID (0))
`------------------------------------------------*/
]b4_c_function_def([yy_reduce_print], [static void],
- [[YYSTYPE *yyvsp], [yyvsp]],
+ [[yytype_int16 *yyssp], [yyssp]],
+ [[YYSTYPE *yyvsp], [yyvsp]],
b4_locations_if([[[YYLTYPE *yylsp], [yylsp]],
- ])[[int yyrule], [yyrule]]m4_ifset([b4_parse_param], [,
- b4_parse_param]))[
+ ])[[int yyrule], [yyrule]]m4_ifset([b4_parse_param], [,
+ b4_parse_param]))[
{
+ unsigned long int yylno = yyrline[yyrule];
int yynrhs = yyr2[yyrule];
int yyi;
- unsigned long int yylno = yyrline[yyrule];
YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
- yyrule - 1, yylno);
+ yyrule - 1, yylno);
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
YYFPRINTF (stderr, " $%d = ", yyi + 1);
- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
- &]b4_rhs_value(yynrhs, yyi + 1)[
- ]b4_locations_if([, &]b4_rhs_location(yynrhs, yyi + 1))[]dnl
- b4_user_args[);
+ yy_symbol_print (stderr,
+ yystos[yyssp[yyi + 1 - yynrhs]],
+ &]b4_rhs_value(yynrhs, yyi + 1)[
+ ]b4_locations_if([, &]b4_rhs_location(yynrhs, yyi + 1))[]dnl
+ b4_user_args[);
YYFPRINTF (stderr, "\n");
}
}
-# define YY_REDUCE_PRINT(Rule) \
-do { \
- if (yydebug) \
- yy_reduce_print (yyvsp, ]b4_locations_if([yylsp, ])[Rule]b4_user_args[); \
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
+ yy_reduce_print (yyssp, yyvsp, ]b4_locations_if([yylsp, ])[Rule]b4_user_args[); \
} while (YYID (0))
/* Nonzero means print parse trace. It is left uninitialized so that
/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
# define YYINITDEPTH ]b4_stack_depth_init[
#endif
char const *yyp = yystr;
for (;;)
- switch (*++yyp)
- {
- case '\'':
- case ',':
- goto do_not_strip_quotes;
-
- case '\\':
- if (*++yyp != '\\')
- goto do_not_strip_quotes;
- /* Fall through. */
- default:
- if (yyres)
- yyres[yyn] = *yyp;
- yyn++;
- break;
-
- case '"':
- if (yyres)
- yyres[yyn] = '\0';
- return yyn;
- }
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
+
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
do_not_strip_quotes: ;
}
#ifdef yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
- yytype_int16 *yyss1 = yyss;]b4_locations_if([
- YYLTYPE *yyls1 = yyls;])[
-
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
- yyoverflow (YY_("memory exhausted"),
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),]b4_locations_if([
- &yyls1, yysize * sizeof (*yylsp),])[
- &yystacksize);
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ yytype_int16 *yyss1 = yyss;]b4_locations_if([
+ YYLTYPE *yyls1 = yyls;])[
+
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow (YY_("memory exhausted"),
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),]b4_locations_if([
+ &yyls1, yysize * sizeof (*yylsp),])[
+ &yystacksize);
]b4_locations_if([
- yyls = yyls1;])[
- yyss = yyss1;
- yyvs = yyvs1;
+ yyls = yyls1;])[
+ yyss = yyss1;
+ yyvs = yyvs1;
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
+ yystacksize = YYMAXDEPTH;
{
- yytype_int16 *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
- goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);]b4_locations_if([
- YYSTACK_RELOCATE (yyls_alloc, yyls);])[
+ yytype_int16 *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);]b4_locations_if([
+ YYSTACK_RELOCATE (yyls_alloc, yyls);])[
# undef YYSTACK_RELOCATE
- if (yyss1 != yyssa)
- YYSTACK_FREE (yyss1);
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
}
# endif
#endif /* no yyoverflow */
yylsp = yyls + yysize - 1;])[
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ (unsigned long int) yystacksize));
if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
+ YYABORT;
}
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
if (yyerrstatus == 3)
{
/* If just tried and failed to reuse lookahead token after an
- error, discard it. */
+ error, discard it. */
if (yychar <= YYEOF)
- {
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
- YYABORT;
- }
+ {
+ /* Return failure if at end of input. */
+ if (yychar == YYEOF)
+ YYABORT;
+ }
else
- {
- yydestruct ("Error: discarding",
- yytoken, &yylval]b4_locations_if([, &yylloc])[]b4_user_args[);
- yychar = YYEMPTY;
- }
+ {
+ yydestruct ("Error: discarding",
+ yytoken, &yylval]b4_locations_if([, &yylloc])[]b4_user_args[);
+ yychar = YYEMPTY;
+ }
}
/* Else will try to reuse lookahead token after shifting the error
| yyerrlab1 -- common code for both syntax error and YYERROR. |
`-------------------------------------------------------------*/
yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;)
{
yyn = yypact[yystate];
if (!yypact_value_is_default (yyn))
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
- {
- yyn = yytable[yyn];
- if (0 < yyn)
- break;
- }
- }
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
/* Pop the current state because it cannot handle the error token. */
if (yyssp == yyss)
- YYABORT;
+ YYABORT;
]b4_locations_if([[ yyerror_range[1] = *yylsp;]])[
yydestruct ("Error: popping",
- yystos[yystate], yyvsp]b4_locations_if([, yylsp])[]b4_user_args[);
+ yystos[yystate], yyvsp]b4_locations_if([, yylsp])[]b4_user_args[);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp]b4_locations_if([, yylsp])[]b4_user_args[);
+ yystos[*yyssp], yyvsp]b4_locations_if([, yylsp])[]b4_user_args[);
YYPOPSTACK (1);
}
#ifndef yyoverflow
return YYID (yyresult);
}
-
-]b4_epilogue
+]b4_epilogue[]dnl
b4_defines_if(
[@output(b4_spec_defines_file@)@
-b4_copyright([Bison interface for Yacc-like parsers in C],
- [1984, 1989-1990, 2000-2012])
+b4_copyright([Bison interface for Yacc-like parsers in C])dnl
b4_percent_code_get([[requires]])[]dnl
b4_percent_code_get([[provides]])[]dnl
])dnl b4_defines_if
m4_divert_pop(0)
+m4_popdef([b4_copyright_years])
-/* A Bison parser, made by GNU Bison 2.5.1_rc2. */
+/* A Bison parser, made by GNU Bison 2.5.1_rc2.741-bfd9. */
/* Bison implementation for Yacc-like parsers in C
-
- Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
-
+
+ Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.5.1_rc2"
+#define YYBISON_VERSION "2.5.1_rc2.741-bfd9"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
#define yylloc gram_lloc
/* Copy the first part of user declarations. */
-
-/* Line 268 of yacc.c */
-#line 1 "parse-gram.y"
+/* Line 269 of yacc.c */
+#line 1 "src/parse-gram.y"
/* Bison Grammar Parser -*- C -*-
Copyright (C) 2002-2012 Free Software Foundation, Inc.
static YYLTYPE lloc_default (YYLTYPE const *, int);
#define YY_LOCATION_PRINT(File, Loc) \
- location_print (File, Loc)
+ location_print (File, Loc)
static void version_check (location const *loc, char const *version);
FIXME: depends on the undocumented availability of YYLLOC. */
#undef yyerror
#define yyerror(Msg) \
- gram_error (&yylloc, Msg)
+ gram_error (&yylloc, Msg)
static void gram_error (location const *, char const *);
static char const *char_name (char);
-/** Add a lex-param or a parse-param.
- *
- * \param type \a lex_param or \a parse_param
- * \param decl the formal argument
- * \param loc the location in the source.
- */
-static void add_param (char const *type, char *decl, location loc);
-
-
-static symbol_class current_class = unknown_sym;
-static uniqstr current_type = NULL;
-static symbol *current_lhs_symbol;
-static location current_lhs_location;
-static named_ref *current_lhs_named_ref;
-static int current_prec = 0;
-
-/** Set the new current left-hand side symbol, possibly common
- * to several right-hand side parts of rule.
- */
-static
-void
-current_lhs(symbol *sym, location loc, named_ref *ref)
-{
- current_lhs_symbol = sym;
- current_lhs_location = loc;
- /* In order to simplify memory management, named references for lhs
- are always assigned by deep copy into the current symbol_list
- node. This is because a single named-ref in the grammar may
- result in several uses when the user factors lhs between several
- rules using "|". Therefore free the parser's original copy. */
- free (current_lhs_named_ref);
- current_lhs_named_ref = ref;
-}
-
-
-#define YYTYPE_INT16 int_fast16_t
-#define YYTYPE_INT8 int_fast8_t
-#define YYTYPE_UINT16 uint_fast16_t
-#define YYTYPE_UINT8 uint_fast8_t
-
-
-/* Line 268 of yacc.c */
-#line 174 "parse-gram.c"
+/* Line 269 of yacc.c */
+#line 132 "src/parse-gram.c"
# ifndef YY_NULL
# if defined __cplusplus && 201103L <= __cplusplus
# define YYTOKEN_TABLE 0
#endif
+/* "%code requires" blocks. */
+/* Line 291 of yacc.c */
+#line 221 "src/parse-gram.y"
+
+# ifndef PARAM_TYPE
+# define PARAM_TYPE
+ typedef enum
+ {
+ param_none = 0,
+ param_lex = 1 << 0,
+ param_parse = 1 << 1,
+ param_both = param_lex | param_parse
+ } param_type;
+# endif
+
+
+/* Line 291 of yacc.c */
+#line 177 "src/parse-gram.c"
/* Tokens. */
#ifndef YYTOKENTYPE
PERCENT_LEFT = 265,
PERCENT_RIGHT = 266,
PERCENT_NONASSOC = 267,
- PERCENT_PREC = 268,
- PERCENT_DPREC = 269,
- PERCENT_MERGE = 270,
- PERCENT_CODE = 271,
- PERCENT_DEBUG = 272,
+ PERCENT_PRECEDENCE = 268,
+ PERCENT_PREC = 269,
+ PERCENT_DPREC = 270,
+ PERCENT_MERGE = 271,
+ PERCENT_CODE = 272,
PERCENT_DEFAULT_PREC = 273,
PERCENT_DEFINE = 274,
PERCENT_DEFINES = 275,
PERCENT_ERROR_VERBOSE = 276,
PERCENT_EXPECT = 277,
PERCENT_EXPECT_RR = 278,
- PERCENT_FILE_PREFIX = 279,
- PERCENT_GLR_PARSER = 280,
- PERCENT_INITIAL_ACTION = 281,
- PERCENT_LANGUAGE = 282,
- PERCENT_LEX_PARAM = 283,
- PERCENT_LOCATIONS = 284,
- PERCENT_NAME_PREFIX = 285,
- PERCENT_NO_DEFAULT_PREC = 286,
- PERCENT_NO_LINES = 287,
- PERCENT_NONDETERMINISTIC_PARSER = 288,
- PERCENT_OUTPUT = 289,
- PERCENT_PARSE_PARAM = 290,
- PERCENT_PURE_PARSER = 291,
- PERCENT_REQUIRE = 292,
- PERCENT_SKELETON = 293,
- PERCENT_START = 294,
- PERCENT_TOKEN_TABLE = 295,
- PERCENT_VERBOSE = 296,
- PERCENT_YACC = 297,
- BRACED_CODE = 298,
- BRACKETED_ID = 299,
- CHAR = 300,
- EPILOGUE = 301,
- EQUAL = 302,
- ID = 303,
- ID_COLON = 304,
- PERCENT_PERCENT = 305,
- PIPE = 306,
- PROLOGUE = 307,
- SEMICOLON = 308,
- TYPE = 309,
- TYPE_TAG_ANY = 310,
- TYPE_TAG_NONE = 311,
- PERCENT_UNION = 312
+ PERCENT_FLAG = 279,
+ PERCENT_FILE_PREFIX = 280,
+ PERCENT_GLR_PARSER = 281,
+ PERCENT_INITIAL_ACTION = 282,
+ PERCENT_LANGUAGE = 283,
+ PERCENT_NAME_PREFIX = 284,
+ PERCENT_NO_DEFAULT_PREC = 285,
+ PERCENT_NO_LINES = 286,
+ PERCENT_NONDETERMINISTIC_PARSER = 287,
+ PERCENT_OUTPUT = 288,
+ PERCENT_REQUIRE = 289,
+ PERCENT_SKELETON = 290,
+ PERCENT_START = 291,
+ PERCENT_TOKEN_TABLE = 292,
+ PERCENT_VERBOSE = 293,
+ PERCENT_YACC = 294,
+ BRACED_CODE = 295,
+ BRACED_PREDICATE = 296,
+ BRACKETED_ID = 297,
+ CHAR = 298,
+ EPILOGUE = 299,
+ EQUAL = 300,
+ ID = 301,
+ ID_COLON = 302,
+ PERCENT_PERCENT = 303,
+ PIPE = 304,
+ PROLOGUE = 305,
+ SEMICOLON = 306,
+ TAG = 307,
+ TAG_ANY = 308,
+ TAG_NONE = 309,
+ PERCENT_PARAM = 310,
+ PERCENT_UNION = 311
};
#endif
/* Tokens. */
#define PERCENT_LEFT 265
#define PERCENT_RIGHT 266
#define PERCENT_NONASSOC 267
-#define PERCENT_PREC 268
-#define PERCENT_DPREC 269
-#define PERCENT_MERGE 270
-#define PERCENT_CODE 271
-#define PERCENT_DEBUG 272
+#define PERCENT_PRECEDENCE 268
+#define PERCENT_PREC 269
+#define PERCENT_DPREC 270
+#define PERCENT_MERGE 271
+#define PERCENT_CODE 272
#define PERCENT_DEFAULT_PREC 273
#define PERCENT_DEFINE 274
#define PERCENT_DEFINES 275
#define PERCENT_ERROR_VERBOSE 276
#define PERCENT_EXPECT 277
#define PERCENT_EXPECT_RR 278
-#define PERCENT_FILE_PREFIX 279
-#define PERCENT_GLR_PARSER 280
-#define PERCENT_INITIAL_ACTION 281
-#define PERCENT_LANGUAGE 282
-#define PERCENT_LEX_PARAM 283
-#define PERCENT_LOCATIONS 284
-#define PERCENT_NAME_PREFIX 285
-#define PERCENT_NO_DEFAULT_PREC 286
-#define PERCENT_NO_LINES 287
-#define PERCENT_NONDETERMINISTIC_PARSER 288
-#define PERCENT_OUTPUT 289
-#define PERCENT_PARSE_PARAM 290
-#define PERCENT_PURE_PARSER 291
-#define PERCENT_REQUIRE 292
-#define PERCENT_SKELETON 293
-#define PERCENT_START 294
-#define PERCENT_TOKEN_TABLE 295
-#define PERCENT_VERBOSE 296
-#define PERCENT_YACC 297
-#define BRACED_CODE 298
-#define BRACKETED_ID 299
-#define CHAR 300
-#define EPILOGUE 301
-#define EQUAL 302
-#define ID 303
-#define ID_COLON 304
-#define PERCENT_PERCENT 305
-#define PIPE 306
-#define PROLOGUE 307
-#define SEMICOLON 308
-#define TYPE 309
-#define TYPE_TAG_ANY 310
-#define TYPE_TAG_NONE 311
-#define PERCENT_UNION 312
+#define PERCENT_FLAG 279
+#define PERCENT_FILE_PREFIX 280
+#define PERCENT_GLR_PARSER 281
+#define PERCENT_INITIAL_ACTION 282
+#define PERCENT_LANGUAGE 283
+#define PERCENT_NAME_PREFIX 284
+#define PERCENT_NO_DEFAULT_PREC 285
+#define PERCENT_NO_LINES 286
+#define PERCENT_NONDETERMINISTIC_PARSER 287
+#define PERCENT_OUTPUT 288
+#define PERCENT_REQUIRE 289
+#define PERCENT_SKELETON 290
+#define PERCENT_START 291
+#define PERCENT_TOKEN_TABLE 292
+#define PERCENT_VERBOSE 293
+#define PERCENT_YACC 294
+#define BRACED_CODE 295
+#define BRACED_PREDICATE 296
+#define BRACKETED_ID 297
+#define CHAR 298
+#define EPILOGUE 299
+#define EQUAL 300
+#define ID 301
+#define ID_COLON 302
+#define PERCENT_PERCENT 303
+#define PIPE 304
+#define PROLOGUE 305
+#define SEMICOLON 306
+#define TAG 307
+#define TAG_ANY 308
+#define TAG_NONE 309
+#define PERCENT_PARAM 310
+#define PERCENT_UNION 311
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
{
+/* Line 296 of yacc.c */
+#line 107 "src/parse-gram.y"
-/* Line 295 of yacc.c */
-#line 114 "parse-gram.y"
-
+ assoc assoc;
+ char *code;
+ char const *chars;
+ int integer;
+ named_ref *named_ref;
symbol *symbol;
symbol_list *list;
- int integer;
- char const *chars;
- char *code;
- assoc assoc;
uniqstr uniqstr;
unsigned char character;
- named_ref *named_ref;
+/* Line 296 of yacc.c */
+#line 245 "src/parse-gram.y"
+
+ param_type param;
-/* Line 295 of yacc.c */
-#line 348 "parse-gram.c"
+/* Line 296 of yacc.c */
+#line 325 "src/parse-gram.c"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
/* Copy the second part of user declarations. */
+/* Line 346 of yacc.c */
+#line 349 "src/parse-gram.c"
+/* Unqualified %code blocks. */
+/* Line 347 of yacc.c */
+#line 56 "src/parse-gram.y"
+
+ static int current_prec = 0;
+ static location current_lhs_location;
+ static named_ref *current_lhs_named_ref;
+ static symbol *current_lhs_symbol;
+ static symbol_class current_class = unknown_sym;
+ static uniqstr current_type = NULL;
+
+ /** Set the new current left-hand side symbol, possibly common
+ * to several right-hand side parts of rule.
+ */
+ static
+ void
+ current_lhs(symbol *sym, location loc, named_ref *ref)
+ {
+ current_lhs_symbol = sym;
+ current_lhs_location = loc;
+ /* In order to simplify memory management, named references for lhs
+ are always assigned by deep copy into the current symbol_list
+ node. This is because a single named-ref in the grammar may
+ result in several uses when the user factors lhs between several
+ rules using "|". Therefore free the parser's original copy. */
+ free (current_lhs_named_ref);
+ current_lhs_named_ref = ref;
+ }
+
+ #define YYTYPE_INT16 int_fast16_t
+ #define YYTYPE_INT8 int_fast8_t
+ #define YYTYPE_UINT16 uint_fast16_t
+ #define YYTYPE_UINT8 uint_fast8_t
+
+/* Line 347 of yacc.c */
+#line 234 "src/parse-gram.y"
-/* Line 345 of yacc.c */
-#line 373 "parse-gram.c"
+ /** Add a lex-param and/or a parse-param.
+ *
+ * \param type where to push this formal argument.
+ * \param decl the formal argument. Destroyed.
+ * \param loc the location in the source.
+ */
+ static void add_param (param_type type, char *decl, location loc);
+ static param_type current_param = param_none;
+
+
+/* Line 347 of yacc.c */
+#line 398 "src/parse-gram.c"
#ifdef short
# undef short
# endif
# if (defined __cplusplus && ! defined EXIT_SUCCESS \
&& ! ((defined YYMALLOC || defined malloc) \
- && (defined YYFREE || defined free)))
+ && (defined YYFREE || defined free)))
# include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
# ifndef EXIT_SUCCESS
# define EXIT_SUCCESS 0
#if (! defined yyoverflow \
&& (! defined __cplusplus \
- || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
- && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+ || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
+ && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
/* A type that is properly aligned for any stack member. */
union yyalloc
elements in the stack, and YYPTR gives the new location of the
stack. Advance YYPTR to a properly aligned location for the next
stack. */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
- do \
- { \
- YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
- Stack = &yyptr->Stack_alloc; \
- yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
- yyptr += yynewbytes / sizeof (*yyptr); \
- } \
+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
+ do \
+ { \
+ YYSIZE_T yynewbytes; \
+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+ Stack = &yyptr->Stack_alloc; \
+ yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+ yyptr += yynewbytes / sizeof (*yyptr); \
+ } \
while (YYID (0))
#endif
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 160
+#define YYLAST 163
/* YYNTOKENS -- Number of terminals. */
-#define YYNTOKENS 58
+#define YYNTOKENS 57
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 34
+#define YYNNTS 36
/* YYNRULES -- Number of rules. */
-#define YYNRULES 108
-/* YYNRULES -- Number of states. */
-#define YYNSTATES 148
+#define YYNRULES 110
+/* YYNSTATES -- Number of states. */
+#define YYNSTATES 149
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+ by yylex, with out-of-bounds checking. */
#define YYUNDEFTOK 2
-#define YYMAXUTOK 312
+#define YYMAXUTOK 311
-#define YYTRANSLATE(YYX) \
+#define YYTRANSLATE(YYX) \
((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX. */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+ as returned by yylex, without out-of-bounds checking. */
static const yytype_uint8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
35, 36, 37, 38, 39, 40, 41, 42, 43, 44,
45, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, 56, 57
+ 55, 56
};
#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
- YYRHS. */
-static const yytype_uint16 yyprhs[] =
-{
- 0, 0, 3, 8, 9, 12, 14, 16, 18, 22,
- 24, 27, 29, 32, 35, 38, 42, 44, 47, 50,
- 53, 55, 58, 62, 64, 66, 69, 73, 76, 78,
- 81, 84, 86, 88, 90, 92, 94, 96, 99, 103,
- 107, 109, 111, 114, 118, 119, 121, 125, 126, 130,
- 131, 135, 139, 143, 145, 147, 149, 150, 152, 154,
- 157, 159, 162, 164, 167, 169, 172, 174, 176, 178,
- 180, 182, 184, 187, 190, 194, 196, 199, 201, 204,
- 206, 209, 212, 213, 218, 220, 224, 227, 228, 232,
- 236, 240, 244, 248, 249, 251, 253, 255, 256, 258,
- 260, 262, 264, 266, 268, 270, 272, 274, 275
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const yytype_int8 yyrhs[] =
-{
- 59, 0, -1, 60, 50, 77, 91, -1, -1, 60,
- 61, -1, 62, -1, 52, -1, 17, -1, 19, 84,
- 85, -1, 20, -1, 20, 3, -1, 21, -1, 22,
- 4, -1, 23, 4, -1, 24, 3, -1, 24, 47,
- 3, -1, 25, -1, 26, 43, -1, 27, 3, -1,
- 28, 43, -1, 29, -1, 30, 3, -1, 30, 47,
- 3, -1, 32, -1, 33, -1, 34, 3, -1, 34,
- 47, 3, -1, 35, 43, -1, 36, -1, 37, 3,
- -1, 38, 3, -1, 40, -1, 41, -1, 42, -1,
- 53, -1, 67, -1, 64, -1, 39, 89, -1, 8,
- 43, 73, -1, 9, 43, 73, -1, 18, -1, 31,
- -1, 16, 86, -1, 16, 48, 86, -1, -1, 48,
- -1, 57, 63, 86, -1, -1, 6, 65, 76, -1,
- -1, 5, 66, 76, -1, 7, 54, 72, -1, 68,
- 69, 70, -1, 10, -1, 11, -1, 12, -1, -1,
- 54, -1, 71, -1, 70, 71, -1, 89, -1, 89,
- 4, -1, 89, -1, 72, 89, -1, 74, -1, 73,
- 74, -1, 89, -1, 54, -1, 55, -1, 56, -1,
- 54, -1, 87, -1, 87, 4, -1, 87, 90, -1,
- 87, 4, 90, -1, 75, -1, 76, 75, -1, 78,
- -1, 77, 78, -1, 79, -1, 62, 53, -1, 1,
- 53, -1, -1, 88, 83, 80, 81, -1, 82, -1,
- 81, 51, 82, -1, 81, 53, -1, -1, 82, 89,
- 83, -1, 82, 43, 83, -1, 82, 13, 89, -1,
- 82, 14, 4, -1, 82, 15, 54, -1, -1, 44,
- -1, 48, -1, 3, -1, -1, 48, -1, 3, -1,
- 43, -1, 48, -1, 45, -1, 49, -1, 87, -1,
- 90, -1, 3, -1, -1, 50, 46, -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
+ /* YYRLINEYYN -- Source line where rule number YYN was defined. */
static const yytype_uint16 yyrline[] =
{
- 0, 229, 229, 237, 239, 243, 244, 254, 255, 260,
- 261, 266, 267, 268, 269, 270, 271, 276, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 310,
- 311, 335, 336, 337, 338, 342, 343, 344, 348, 355,
- 362, 366, 370, 377, 392, 393, 397, 409, 409, 414,
- 414, 419, 430, 445, 446, 447, 451, 452, 457, 459,
- 464, 465, 470, 472, 477, 478, 482, 483, 484, 485,
- 490, 495, 500, 506, 512, 523, 524, 533, 534, 540,
- 541, 542, 549, 549, 557, 558, 559, 564, 566, 568,
- 570, 572, 574, 579, 581, 592, 593, 598, 599, 600,
- 609, 629, 631, 640, 645, 646, 651, 658, 660
+ 0, 270, 270, 278, 280, 284, 285, 295, 299, 304,
+ 305, 310, 315, 316, 317, 318, 319, 324, 333, 334,
+ 335, 336, 337, 338, 339, 340, 340, 341, 342, 366,
+ 367, 368, 369, 373, 374, 383, 384, 385, 389, 396,
+ 403, 407, 411, 418, 433, 434, 438, 450, 450, 455,
+ 455, 460, 471, 486, 487, 488, 489, 493, 494, 499,
+ 501, 506, 507, 512, 514, 519, 520, 524, 525, 526,
+ 527, 532, 537, 542, 548, 554, 565, 566, 575, 576,
+ 582, 583, 584, 591, 591, 599, 600, 601, 606, 608,
+ 610, 612, 614, 616, 618, 623, 625, 635, 636, 641,
+ 642, 643, 652, 672, 674, 683, 688, 689, 694, 701,
+ 703
};
#endif
{
"\"end of file\"", "error", "$undefined", "\"string\"", "\"integer\"",
"\"%token\"", "\"%nterm\"", "\"%type\"", "\"%destructor\"",
- "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"", "\"%prec\"",
- "\"%dprec\"", "\"%merge\"", "\"%code\"", "\"%debug\"",
+ "\"%printer\"", "\"%left\"", "\"%right\"", "\"%nonassoc\"",
+ "\"%precedence\"", "\"%prec\"", "\"%dprec\"", "\"%merge\"", "\"%code\"",
"\"%default-prec\"", "\"%define\"", "\"%defines\"", "\"%error-verbose\"",
- "\"%expect\"", "\"%expect-rr\"", "\"%file-prefix\"", "\"%glr-parser\"",
- "\"%initial-action\"", "\"%language\"", "\"%lex-param\"",
- "\"%locations\"", "\"%name-prefix\"", "\"%no-default-prec\"",
- "\"%no-lines\"", "\"%nondeterministic-parser\"", "\"%output\"",
- "\"%parse-param\"", "\"%pure-parser\"", "\"%require\"", "\"%skeleton\"",
- "\"%start\"", "\"%token-table\"", "\"%verbose\"", "\"%yacc\"",
- "\"{...}\"", "\"[identifier]\"", "\"char\"", "\"epilogue\"", "\"=\"",
- "\"identifier\"", "\"identifier:\"", "\"%%\"", "\"|\"", "\"%{...%}\"",
- "\";\"", "\"type\"", "\"<*>\"", "\"<>\"", "\"%union\"", "$accept",
- "input", "prologue_declarations", "prologue_declaration",
- "grammar_declaration", "union_name", "symbol_declaration", "$@1", "$@2",
- "precedence_declaration", "precedence_declarator", "type.opt",
+ "\"%expect\"", "\"%expect-rr\"", "\"%<flag>\"", "\"%file-prefix\"",
+ "\"%glr-parser\"", "\"%initial-action\"", "\"%language\"",
+ "\"%name-prefix\"", "\"%no-default-prec\"", "\"%no-lines\"",
+ "\"%nondeterministic-parser\"", "\"%output\"", "\"%require\"",
+ "\"%skeleton\"", "\"%start\"", "\"%token-table\"", "\"%verbose\"",
+ "\"%yacc\"", "\"{...}\"", "\"%?{...}\"", "\"[identifier]\"", "\"char\"",
+ "\"epilogue\"", "\"=\"", "\"identifier\"", "\"identifier:\"", "\"%%\"",
+ "\"|\"", "\"%{...%}\"", "\";\"", "\"<tag>\"", "\"<*>\"", "\"<>\"",
+ "\"%param\"", "\"%union\"", "$accept", "input", "prologue_declarations",
+ "prologue_declaration", "$@1", "params", "grammar_declaration",
+ "union_name", "symbol_declaration", "$@2", "$@3",
+ "precedence_declaration", "precedence_declarator", "tag.opt",
"symbols.prec", "symbol.prec", "symbols.1", "generic_symlist",
"generic_symlist_item", "symbol_def", "symbol_defs.1", "grammar",
- "rules_or_grammar_declaration", "rules", "$@3", "rhses.1", "rhs",
+ "rules_or_grammar_declaration", "rules", "$@4", "rhses.1", "rhs",
"named_ref.opt", "variable", "content.opt", "braceless", "id",
"id_colon", "symbol", "string_as_id", "epilogue.opt", YY_NULL
};
#endif
# ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
- token YYLEX-NUM. */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+ (internal) symbol number NUM (which must be that of a token). */
static const yytype_uint16 yytoknum[] =
{
0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
295, 296, 297, 298, 299, 300, 301, 302, 303, 304,
- 305, 306, 307, 308, 309, 310, 311, 312
+ 305, 306, 307, 308, 309, 310, 311
};
# endif
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
-static const yytype_uint8 yyr1[] =
-{
- 0, 58, 59, 60, 60, 61, 61, 61, 61, 61,
- 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
- 61, 61, 61, 61, 61, 61, 61, 61, 61, 61,
- 61, 61, 61, 61, 61, 62, 62, 62, 62, 62,
- 62, 62, 62, 62, 63, 63, 62, 65, 64, 66,
- 64, 64, 67, 68, 68, 68, 69, 69, 70, 70,
- 71, 71, 72, 72, 73, 73, 74, 74, 74, 74,
- 75, 75, 75, 75, 75, 76, 76, 77, 77, 78,
- 78, 78, 80, 79, 81, 81, 81, 82, 82, 82,
- 82, 82, 82, 83, 83, 84, 84, 85, 85, 85,
- 86, 87, 87, 88, 89, 89, 90, 91, 91
-};
+#define YYPACT_NINF -50
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(yystate) \
+ ((yystate) == (-50))
+
+#define YYTABLE_NINF -110
+
+#define yytable_value_is_error(yytable_value) \
+ YYID (0)
+
+ /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+ STATE-NUM. */
+static const yytype_int16 yypact[] =
{
- 0, 2, 4, 0, 2, 1, 1, 1, 3, 1,
- 2, 1, 2, 2, 2, 3, 1, 2, 2, 2,
- 1, 2, 3, 1, 1, 2, 3, 2, 1, 2,
- 2, 1, 1, 1, 1, 1, 1, 2, 3, 3,
- 1, 1, 2, 3, 0, 1, 3, 0, 3, 0,
- 3, 3, 3, 1, 1, 1, 0, 1, 1, 2,
- 1, 2, 1, 2, 1, 2, 1, 1, 1, 1,
- 1, 1, 2, 2, 3, 1, 2, 1, 2, 1,
- 2, 2, 0, 4, 1, 3, 2, 0, 3, 3,
- 3, 3, 3, 0, 1, 1, 1, 0, 1, 1,
- 1, 1, 1, 1, 1, 1, 1, 0, 2
+ -50, 4, 107, -50, -50, -50, -20, 3, 11, -50,
+ -50, -50, -50, 14, -50, 12, 68, -50, 72, 73,
+ -50, 0, -50, 45, 86, 2, -50, -50, -50, 17,
+ 95, 96, 32, -50, -50, -50, 16, -50, -50, -50,
+ 54, -50, -50, -50, -50, 49, -2, -2, 32, 27,
+ 27, -50, 63, -50, -50, -50, 37, -50, -50, -50,
+ -50, 101, -50, -50, -50, 103, -50, 104, -50, -50,
+ -50, -50, -50, -50, -50, -50, 57, -50, 58, 1,
+ -50, -50, 79, 70, -50, 63, -50, 32, -50, -50,
+ -2, 64, -2, 32, -50, -50, -50, -50, 27, -50,
+ -50, 27, -50, -50, -50, -50, -50, -50, -50, -50,
+ -50, 78, -50, -50, -50, -50, -50, 83, -50, 32,
+ -50, 143, -50, 145, -50, -50, -50, -50, -50, -50,
+ -50, -50, -50, 43, 50, -50, -50, 32, 146, 97,
+ 79, -50, 79, 50, -50, -50, -50, -50, -50
};
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
- Performed when YYTABLE doesn't specify something else to do. Zero
- means the default is an error. */
+ /* YYDEFACT[S] -- default reduction number in state S. Performed when
+ YYTABLE does not specify something else to do. Zero means the default
+ is an error. */
static const yytype_uint8 yydefact[] =
{
3, 0, 0, 1, 49, 47, 0, 0, 0, 53,
- 54, 55, 0, 7, 40, 0, 9, 11, 0, 0,
- 0, 16, 0, 0, 0, 20, 0, 41, 23, 24,
- 0, 0, 28, 0, 0, 0, 31, 32, 33, 0,
- 6, 34, 44, 4, 5, 36, 35, 56, 0, 0,
- 0, 0, 0, 100, 0, 42, 96, 95, 97, 10,
- 12, 13, 14, 0, 17, 18, 19, 21, 0, 25,
- 0, 27, 29, 30, 106, 102, 101, 104, 37, 105,
- 0, 103, 0, 0, 77, 79, 93, 45, 0, 57,
- 0, 70, 75, 50, 71, 48, 51, 62, 67, 68,
- 69, 38, 64, 66, 39, 43, 99, 98, 8, 15,
- 22, 26, 81, 80, 0, 78, 2, 94, 82, 46,
- 52, 58, 60, 76, 72, 73, 63, 65, 108, 87,
- 59, 61, 74, 83, 84, 87, 86, 0, 0, 0,
- 93, 93, 85, 90, 91, 92, 89, 88
+ 54, 55, 56, 0, 40, 0, 9, 11, 0, 0,
+ 7, 0, 16, 0, 0, 0, 41, 21, 22, 0,
+ 0, 0, 0, 29, 30, 31, 0, 6, 32, 25,
+ 44, 4, 5, 36, 35, 57, 0, 0, 0, 0,
+ 0, 102, 0, 42, 98, 97, 99, 10, 12, 13,
+ 14, 0, 17, 18, 19, 0, 23, 0, 27, 28,
+ 108, 104, 103, 106, 37, 107, 0, 105, 0, 0,
+ 78, 80, 95, 0, 45, 0, 58, 0, 71, 76,
+ 50, 72, 48, 51, 63, 68, 69, 70, 38, 65,
+ 67, 39, 43, 101, 100, 8, 15, 20, 24, 82,
+ 81, 0, 79, 2, 96, 83, 34, 26, 46, 52,
+ 59, 61, 77, 73, 74, 64, 66, 110, 88, 33,
+ 60, 62, 75, 84, 85, 88, 87, 0, 0, 0,
+ 95, 91, 95, 86, 92, 93, 94, 90, 89
};
-/* YYDEFGOTO[NTERM-NUM]. */
-static const yytype_int16 yydefgoto[] =
+ /* YYPGOTO[NTERM-NUM]. */
+static const yytype_int16 yypgoto[] =
{
- -1, 1, 2, 43, 82, 88, 45, 49, 48, 46,
- 47, 90, 120, 121, 96, 101, 102, 92, 93, 83,
- 84, 85, 129, 133, 134, 118, 58, 108, 55, 77,
- 86, 103, 79, 116
+ -50, -50, -50, -50, -50, -50, 149, -50, -50, -50,
+ -50, -50, -50, -50, -50, 33, -50, 106, -42, -4,
+ 112, -50, 74, -50, -50, -50, 19, -45, -50, -50,
+ -16, -8, -50, -32, -49, -50
};
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
- STATE-NUM. */
-#define YYPACT_NINF -91
-static const yytype_int16 yypact[] =
+ /* YYDEFGOTO[NTERM-NUM]. */
+static const yytype_int16 yydefgoto[] =
{
- -91, 3, 103, -91, -91, -91, -36, 2, 10, -91,
- -91, -91, 9, -91, -91, 32, 60, -91, 65, 67,
- 27, -91, 41, 73, 51, -91, 39, -91, -91, -91,
- 40, 52, -91, 93, 95, 33, -91, -91, -91, 15,
- -91, -91, 53, -91, -91, -91, -91, 46, 43, 43,
- 33, 11, 11, -91, 61, -91, -91, -91, 35, -91,
- -91, -91, -91, 100, -91, -91, -91, -91, 102, -91,
- 113, -91, -91, -91, -91, -91, -91, -91, -91, -91,
- 64, -91, 94, 1, -91, -91, 62, -91, 61, -91,
- 33, -91, -91, 43, 86, 43, 33, -91, -91, -91,
- -91, 11, -91, -91, 11, -91, -91, -91, -91, -91,
- -91, -91, -91, -91, 72, -91, -91, -91, -91, -91,
- 33, -91, 142, -91, 145, -91, -91, -91, -91, -91,
- -91, -91, -91, 17, 34, -91, -91, 33, 146, 97,
- 62, 62, 34, -91, -91, -91, -91, -91
+ -1, 1, 2, 41, 83, 117, 78, 85, 43, 47,
+ 46, 44, 45, 87, 119, 120, 93, 98, 99, 89,
+ 90, 79, 80, 81, 128, 133, 134, 115, 56, 105,
+ 53, 73, 82, 100, 75, 113
};
-/* YYPGOTO[NTERM-NUM]. */
-static const yytype_int16 yypgoto[] =
+ /* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
+ positive, shift that token. If negative, reduce the rule which
+ number is the opposite. If YYTABLE_NINF, syntax error. */
+static const yytype_int16 yytable[] =
{
- -91, -91, -91, -91, 147, -91, -91, -91, -91, -91,
- -91, -91, -91, 37, -91, 106, -60, -33, 105, -91,
- 69, -91, -91, -91, 24, -48, -91, -91, -49, -20,
- -91, -35, -90, -91
+ 74, -109, 76, 60, 3, 64, 4, 5, 6, 7,
+ 8, 9, 10, 11, 12, 54, 94, 76, 13, 14,
+ 66, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+ 70, 26, 48, 13, 14, 70, 102, 32, 91, 91,
+ 103, 71, 124, 49, 72, 61, 26, 65, 77, 111,
+ 88, 50, 32, 70, 51, 121, 126, 40, 55, 126,
+ 52, 125, 67, 77, 137, 138, 139, 70, 123, 118,
+ 71, 57, 40, 72, 132, 71, 58, 59, 72, 95,
+ 96, 97, 91, 104, 91, 62, 122, 121, 122, 63,
+ 140, 141, 135, 71, 136, 147, 72, 148, 68, 69,
+ 84, 86, 142, 51, 106, 144, 107, 108, 109, 110,
+ 116, 142, 4, 5, 6, 7, 8, 9, 10, 11,
+ 12, 114, 127, 129, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, 33, 34, 35, 131, 70, 146,
+ 145, 42, 130, 112, 143, 36, 101, 37, 38, 92,
+ 0, 0, 39, 40
};
-/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
- positive, shift that token. If negative, reduce the rule which
- number is the opposite. If YYTABLE_NINF, syntax error. */
-#define YYTABLE_NINF -108
-static const yytype_int16 yytable[] =
+static const yytype_int16 yycheck[] =
{
- 78, -107, 80, 3, 125, 105, 4, 5, 6, 7,
- 8, 9, 10, 11, 74, 97, 80, 12, 50, 14,
- 4, 5, 6, 7, 8, 9, 10, 11, 94, 94,
- 62, 12, 27, 14, 132, 56, 74, 74, 106, 119,
- 35, 127, 67, 69, 127, 51, 27, 137, 138, 139,
- 81, 114, 53, 52, 35, 122, 75, 54, 42, 76,
- 123, 126, 123, 59, 81, 98, 99, 100, 135, 60,
- 136, 61, 42, 94, 63, 94, 65, 140, 75, 75,
- 57, 76, 76, 107, 64, 122, 68, 70, 75, 74,
- 124, 76, 146, 147, 66, 71, 72, 91, 73, 141,
- 89, 87, 143, 109, 53, 110, 117, 141, 4, 5,
- 6, 7, 8, 9, 10, 11, 111, 112, 128, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 32, 0, 1, 3, 0, 3, 5, 6, 7, 8,
+ 9, 10, 11, 12, 13, 3, 48, 1, 17, 18,
+ 3, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ 3, 30, 52, 17, 18, 3, 52, 36, 46, 47,
+ 3, 43, 91, 40, 46, 45, 30, 45, 47, 48,
+ 52, 40, 36, 3, 40, 87, 98, 56, 46, 101,
+ 46, 93, 45, 47, 14, 15, 16, 3, 4, 85,
+ 43, 3, 56, 46, 123, 43, 4, 4, 46, 52,
+ 53, 54, 90, 46, 92, 40, 90, 119, 92, 3,
+ 40, 41, 49, 43, 51, 140, 46, 142, 3, 3,
+ 46, 52, 134, 40, 3, 137, 3, 3, 51, 51,
+ 40, 143, 5, 6, 7, 8, 9, 10, 11, 12,
+ 13, 42, 44, 40, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, 35, 36, 37, 38, 131, 113, 74, 44,
- 144, 145, 115, 39, 95, 40, 41, 130, 104, 142,
- 42
+ 33, 34, 35, 36, 37, 38, 39, 4, 3, 52,
+ 4, 2, 119, 79, 135, 48, 50, 50, 51, 47,
+ -1, -1, 55, 56
};
-#define yypact_value_is_default(yystate) \
- ((yystate) == (-91))
-
-#define yytable_value_is_error(yytable_value) \
- YYID (0)
+ /* STOS_[STATE-NUM] -- The (internal number of the) accessing
+ symbol of state STATE-NUM. */
+static const yytype_uint8 yystos[] =
+{
+ 0, 58, 59, 0, 5, 6, 7, 8, 9, 10,
+ 11, 12, 13, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 34, 35, 36, 37, 38, 39, 48, 50, 51, 55,
+ 56, 60, 63, 65, 68, 69, 67, 66, 52, 40,
+ 40, 40, 46, 87, 3, 46, 85, 3, 4, 4,
+ 3, 45, 40, 3, 3, 45, 3, 45, 3, 3,
+ 3, 43, 46, 88, 90, 91, 1, 47, 63, 78,
+ 79, 80, 89, 61, 46, 64, 52, 70, 52, 76,
+ 77, 88, 77, 73, 90, 52, 53, 54, 74, 75,
+ 90, 74, 87, 3, 46, 86, 3, 3, 3, 51,
+ 51, 48, 79, 92, 42, 84, 40, 62, 87, 71,
+ 72, 90, 76, 4, 91, 90, 75, 44, 81, 40,
+ 72, 4, 91, 82, 83, 49, 51, 14, 15, 16,
+ 40, 41, 90, 83, 90, 4, 52, 84, 84
+};
-static const yytype_uint8 yycheck[] =
+ /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives. */
+static const yytype_uint8 yyr1[] =
{
- 35, 0, 1, 0, 94, 54, 5, 6, 7, 8,
- 9, 10, 11, 12, 3, 50, 1, 16, 54, 18,
- 5, 6, 7, 8, 9, 10, 11, 12, 48, 49,
- 3, 16, 31, 18, 124, 3, 3, 3, 3, 88,
- 39, 101, 3, 3, 104, 43, 31, 13, 14, 15,
- 49, 50, 43, 43, 39, 90, 45, 48, 57, 48,
- 93, 96, 95, 3, 49, 54, 55, 56, 51, 4,
- 53, 4, 57, 93, 47, 95, 3, 43, 45, 45,
- 48, 48, 48, 48, 43, 120, 47, 47, 45, 3,
- 4, 48, 140, 141, 43, 43, 3, 54, 3, 134,
- 54, 48, 137, 3, 43, 3, 44, 142, 5, 6,
- 7, 8, 9, 10, 11, 12, 3, 53, 46, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
- 37, 38, 39, 40, 41, 42, 4, 53, 3, 2,
- 4, 54, 83, 50, 49, 52, 53, 120, 52, 135,
- 57
+ 0, 57, 58, 59, 59, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 60, 60, 60, 60, 60,
+ 60, 60, 60, 60, 60, 61, 60, 60, 60, 60,
+ 60, 60, 60, 62, 62, 63, 63, 63, 63, 63,
+ 63, 63, 63, 63, 64, 64, 63, 66, 65, 67,
+ 65, 65, 68, 69, 69, 69, 69, 70, 70, 71,
+ 71, 72, 72, 73, 73, 74, 74, 75, 75, 75,
+ 75, 76, 76, 76, 76, 76, 77, 77, 78, 78,
+ 79, 79, 79, 81, 80, 82, 82, 82, 83, 83,
+ 83, 83, 83, 83, 83, 84, 84, 85, 85, 86,
+ 86, 86, 87, 88, 88, 89, 90, 90, 91, 92,
+ 92
};
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
- symbol of state STATE-NUM. */
-static const yytype_uint8 yystos[] =
+ /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
+static const yytype_uint8 yyr2[] =
{
- 0, 59, 60, 0, 5, 6, 7, 8, 9, 10,
- 11, 12, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, 35, 36, 37, 38, 39, 40, 41, 42, 50,
- 52, 53, 57, 61, 62, 64, 67, 68, 66, 65,
- 54, 43, 43, 43, 48, 86, 3, 48, 84, 3,
- 4, 4, 3, 47, 43, 3, 43, 3, 47, 3,
- 47, 43, 3, 3, 3, 45, 48, 87, 89, 90,
- 1, 49, 62, 77, 78, 79, 88, 48, 63, 54,
- 69, 54, 75, 76, 87, 76, 72, 89, 54, 55,
- 56, 73, 74, 89, 73, 86, 3, 48, 85, 3,
- 3, 3, 53, 53, 50, 78, 91, 44, 83, 86,
- 70, 71, 89, 75, 4, 90, 89, 74, 46, 80,
- 71, 4, 90, 81, 82, 51, 53, 13, 14, 15,
- 43, 89, 82, 89, 4, 54, 83, 83
+ 0, 2, 4, 0, 2, 1, 1, 1, 3, 1,
+ 2, 1, 2, 2, 2, 3, 1, 2, 2, 2,
+ 3, 1, 1, 2, 3, 0, 3, 2, 2, 1,
+ 1, 1, 1, 2, 1, 1, 1, 2, 3, 3,
+ 1, 1, 2, 3, 0, 1, 3, 0, 3, 0,
+ 3, 3, 3, 1, 1, 1, 1, 0, 1, 1,
+ 2, 1, 2, 1, 2, 1, 2, 1, 1, 1,
+ 1, 1, 1, 2, 2, 3, 1, 2, 1, 2,
+ 1, 2, 2, 0, 4, 1, 3, 2, 0, 3,
+ 3, 2, 3, 3, 3, 0, 1, 1, 1, 0,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
+ 2
};
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
+
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
/* Like YYERROR except do call yyerror. This remains here temporarily
in Bison 2.4.2's NEWS entry, where a plan to phase it out is
discussed. */
-#define YYFAIL goto yyerrlab
+#define YYFAIL goto yyerrlab
#if defined YYFAIL
/* This is here to suppress warnings from the GCC cpp's
-Wunused-macros. Normally we don't worry about that warning, but
else \
{ \
yyerror (YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
+ YYERROR; \
+ } \
while (YYID (0))
-#define YYTERROR 1
-#define YYERRCODE 256
+#define YYTERROR 1
+#define YYERRCODE 256
/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
#define YYRHSLOC(Rhs, K) ((Rhs)[K])
#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N) \
- do \
+# define YYLLOC_DEFAULT(Current, Rhs, N) \
+ do \
if (YYID (N)) \
- { \
- (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
- (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
- (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
- (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
- } \
- else \
- { \
- (Current).first_line = (Current).last_line = \
- YYRHSLOC (Rhs, 0).last_line; \
- (Current).first_column = (Current).last_column = \
- YYRHSLOC (Rhs, 0).last_column; \
- } \
+ { \
+ (Current).first_line = YYRHSLOC (Rhs, 1).first_line; \
+ (Current).first_column = YYRHSLOC (Rhs, 1).first_column; \
+ (Current).last_line = YYRHSLOC (Rhs, N).last_line; \
+ (Current).last_column = YYRHSLOC (Rhs, N).last_column; \
+ } \
+ else \
+ { \
+ (Current).first_line = (Current).last_line = \
+ YYRHSLOC (Rhs, 0).last_line; \
+ (Current).first_column = (Current).last_column = \
+ YYRHSLOC (Rhs, 0).last_column; \
+ } \
while (YYID (0))
#endif
#ifndef YY_LOCATION_PRINT
# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-# define YY_LOCATION_PRINT(File, Loc) \
- fprintf (File, "%d.%d-%d.%d", \
- (Loc).first_line, (Loc).first_column, \
- (Loc).last_line, (Loc).last_column)
+# define YY_LOCATION_PRINT(File, Loc) \
+ fprintf (File, "%d.%d-%d.%d", \
+ (Loc).first_line, (Loc).first_column, \
+ (Loc).last_line, (Loc).last_column)
# else
# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
# endif
# define YYFPRINTF fprintf
# endif
-# define YYDPRINTF(Args) \
-do { \
- if (yydebug) \
- YYFPRINTF Args; \
+# define YYDPRINTF(Args) \
+do { \
+ if (yydebug) \
+ YYFPRINTF Args; \
} while (YYID (0))
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-do { \
- if (yydebug) \
- { \
- YYFPRINTF (stderr, "%s ", Title); \
- yy_symbol_print (stderr, \
- Type, Value, Location); \
- YYFPRINTF (stderr, "\n"); \
- } \
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+do { \
+ if (yydebug) \
+ { \
+ YYFPRINTF (stderr, "%s ", Title); \
+ yy_symbol_print (stderr, \
+ Type, Value, Location); \
+ YYFPRINTF (stderr, "\n"); \
+ } \
} while (YYID (0))
#endif
{
FILE *yyo = yyoutput;
- YYUSE (yyo);
+ YYUSE(yyo);
+ YYUSE (yylocationp);
if (!yyvaluep)
return;
- YYUSE (yylocationp);
# ifdef YYPRINT
if (yytype < YYNTOKENS)
YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
- YYUSE (yyoutput);
# endif
switch (yytype)
{
- case 3: /* "\"string\"" */
-
-/* Line 823 of yacc.c */
-#line 204 "parse-gram.y"
- { fputs (quotearg_style (c_quoting_style, (yyvaluep->chars)), stderr); };
-
-/* Line 823 of yacc.c */
-#line 1069 "parse-gram.c"
- break;
- case 4: /* "\"integer\"" */
-
-/* Line 823 of yacc.c */
-#line 216 "parse-gram.y"
- { fprintf (stderr, "%d", (yyvaluep->integer)); };
-
-/* Line 823 of yacc.c */
-#line 1078 "parse-gram.c"
- break;
- case 43: /* "\"{...}\"" */
-
-/* Line 823 of yacc.c */
-#line 206 "parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->code)); };
-
-/* Line 823 of yacc.c */
-#line 1087 "parse-gram.c"
- break;
- case 44: /* "\"[identifier]\"" */
-
-/* Line 823 of yacc.c */
-#line 211 "parse-gram.y"
- { fprintf (stderr, "[%s]", (yyvaluep->uniqstr)); };
-
-/* Line 823 of yacc.c */
-#line 1096 "parse-gram.c"
- break;
- case 45: /* "\"char\"" */
-
-/* Line 823 of yacc.c */
-#line 198 "parse-gram.y"
- { fputs (char_name ((yyvaluep->character)), stderr); };
-
-/* Line 823 of yacc.c */
-#line 1105 "parse-gram.c"
- break;
- case 46: /* "\"epilogue\"" */
-
-/* Line 823 of yacc.c */
-#line 206 "parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 823 of yacc.c */
-#line 1114 "parse-gram.c"
- break;
- case 48: /* "\"identifier\"" */
-
-/* Line 823 of yacc.c */
-#line 210 "parse-gram.y"
- { fputs ((yyvaluep->uniqstr), stderr); };
-
-/* Line 823 of yacc.c */
-#line 1123 "parse-gram.c"
- break;
- case 49: /* "\"identifier:\"" */
-
-/* Line 823 of yacc.c */
-#line 212 "parse-gram.y"
- { fprintf (stderr, "%s:", (yyvaluep->uniqstr)); };
-
-/* Line 823 of yacc.c */
-#line 1132 "parse-gram.c"
- break;
- case 52: /* "\"%{...%}\"" */
-
-/* Line 823 of yacc.c */
-#line 206 "parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 823 of yacc.c */
-#line 1141 "parse-gram.c"
- break;
- case 54: /* "\"type\"" */
-
-/* Line 823 of yacc.c */
-#line 213 "parse-gram.y"
- { fprintf (stderr, "<%s>", (yyvaluep->uniqstr)); };
-
-/* Line 823 of yacc.c */
-#line 1150 "parse-gram.c"
- break;
- case 71: /* "symbol.prec" */
-
-/* Line 823 of yacc.c */
-#line 219 "parse-gram.y"
- { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 823 of yacc.c */
-#line 1159 "parse-gram.c"
- break;
- case 84: /* "variable" */
-
-/* Line 823 of yacc.c */
-#line 210 "parse-gram.y"
- { fputs ((yyvaluep->uniqstr), stderr); };
-
-/* Line 823 of yacc.c */
-#line 1168 "parse-gram.c"
- break;
- case 85: /* "content.opt" */
-
-/* Line 823 of yacc.c */
-#line 206 "parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 823 of yacc.c */
-#line 1177 "parse-gram.c"
- break;
- case 86: /* "braceless" */
-
-/* Line 823 of yacc.c */
-#line 206 "parse-gram.y"
- { fprintf (stderr, "{\n%s\n}", (yyvaluep->chars)); };
-
-/* Line 823 of yacc.c */
-#line 1186 "parse-gram.c"
- break;
- case 87: /* "id" */
-
-/* Line 823 of yacc.c */
-#line 219 "parse-gram.y"
- { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 823 of yacc.c */
-#line 1195 "parse-gram.c"
- break;
- case 88: /* "id_colon" */
-
-/* Line 823 of yacc.c */
-#line 220 "parse-gram.y"
- { fprintf (stderr, "%s:", (yyvaluep->symbol)->tag); };
-
-/* Line 823 of yacc.c */
-#line 1204 "parse-gram.c"
- break;
- case 89: /* "symbol" */
-
-/* Line 823 of yacc.c */
-#line 219 "parse-gram.y"
- { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 823 of yacc.c */
-#line 1213 "parse-gram.c"
- break;
- case 90: /* "string_as_id" */
-
-/* Line 823 of yacc.c */
-#line 219 "parse-gram.y"
- { fprintf (stderr, "%s", (yyvaluep->symbol)->tag); };
-
-/* Line 823 of yacc.c */
-#line 1222 "parse-gram.c"
- break;
+ case 3: // "string"
+
+/* Line 755 of yacc.c */
+#line 194 "src/parse-gram.y"
+ { fputs (quotearg_style (c_quoting_style, ((*yyvaluep).chars)), stderr); }
+/* Line 755 of yacc.c */
+#line 1049 "src/parse-gram.c"
+ break;
+
+ case 4: // "integer"
+
+/* Line 755 of yacc.c */
+#line 207 "src/parse-gram.y"
+ { fprintf (stderr, "%d", ((*yyvaluep).integer)); }
+/* Line 755 of yacc.c */
+#line 1058 "src/parse-gram.c"
+ break;
+
+ case 24: // "%<flag>"
+
+/* Line 755 of yacc.c */
+#line 203 "src/parse-gram.y"
+ { fprintf (stderr, "%%%s", ((*yyvaluep).uniqstr)); }
+/* Line 755 of yacc.c */
+#line 1067 "src/parse-gram.c"
+ break;
+
+ case 40: // "{...}"
+
+/* Line 755 of yacc.c */
+#line 196 "src/parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).code)); }
+/* Line 755 of yacc.c */
+#line 1076 "src/parse-gram.c"
+ break;
+
+ case 42: // "[identifier]"
+
+/* Line 755 of yacc.c */
+#line 201 "src/parse-gram.y"
+ { fprintf (stderr, "[%s]", ((*yyvaluep).uniqstr)); }
+/* Line 755 of yacc.c */
+#line 1085 "src/parse-gram.c"
+ break;
+
+ case 43: // "char"
+
+/* Line 755 of yacc.c */
+#line 188 "src/parse-gram.y"
+ { fputs (char_name (((*yyvaluep).character)), stderr); }
+/* Line 755 of yacc.c */
+#line 1094 "src/parse-gram.c"
+ break;
+
+ case 44: // "epilogue"
+
+/* Line 755 of yacc.c */
+#line 196 "src/parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 755 of yacc.c */
+#line 1103 "src/parse-gram.c"
+ break;
+
+ case 46: // "identifier"
+
+/* Line 755 of yacc.c */
+#line 200 "src/parse-gram.y"
+ { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 755 of yacc.c */
+#line 1112 "src/parse-gram.c"
+ break;
+
+ case 47: // "identifier:"
+
+/* Line 755 of yacc.c */
+#line 202 "src/parse-gram.y"
+ { fprintf (stderr, "%s:", ((*yyvaluep).uniqstr)); }
+/* Line 755 of yacc.c */
+#line 1121 "src/parse-gram.c"
+ break;
+
+ case 50: // "%{...%}"
+
+/* Line 755 of yacc.c */
+#line 196 "src/parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 755 of yacc.c */
+#line 1130 "src/parse-gram.c"
+ break;
+
+ case 52: // "<tag>"
+
+/* Line 755 of yacc.c */
+#line 204 "src/parse-gram.y"
+ { fprintf (stderr, "<%s>", ((*yyvaluep).uniqstr)); }
+/* Line 755 of yacc.c */
+#line 1139 "src/parse-gram.c"
+ break;
+
+ case 55: // "%param"
+
+/* Line 755 of yacc.c */
+#line 250 "src/parse-gram.y"
+ {
+ switch (((*yyvaluep).param))
+ {
+#define CASE(In, Out) \
+ case param_ ## In: fputs ("%" #Out, stderr); break
+ CASE(lex, lex-param);
+ CASE(parse, parse-param);
+ CASE(both, param);
+#undef CASE
+ case param_none: aver (false); break;
+ }
+}
+/* Line 755 of yacc.c */
+#line 1159 "src/parse-gram.c"
+ break;
+
+ case 72: // symbol.prec
+
+/* Line 755 of yacc.c */
+#line 210 "src/parse-gram.y"
+ { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 755 of yacc.c */
+#line 1168 "src/parse-gram.c"
+ break;
+
+ case 85: // variable
+
+/* Line 755 of yacc.c */
+#line 200 "src/parse-gram.y"
+ { fputs (((*yyvaluep).uniqstr), stderr); }
+/* Line 755 of yacc.c */
+#line 1177 "src/parse-gram.c"
+ break;
+
+ case 86: // content.opt
+
+/* Line 755 of yacc.c */
+#line 196 "src/parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 755 of yacc.c */
+#line 1186 "src/parse-gram.c"
+ break;
+
+ case 87: // braceless
+
+/* Line 755 of yacc.c */
+#line 196 "src/parse-gram.y"
+ { fprintf (stderr, "{\n%s\n}", ((*yyvaluep).chars)); }
+/* Line 755 of yacc.c */
+#line 1195 "src/parse-gram.c"
+ break;
+
+ case 88: // id
+
+/* Line 755 of yacc.c */
+#line 210 "src/parse-gram.y"
+ { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 755 of yacc.c */
+#line 1204 "src/parse-gram.c"
+ break;
+
+ case 89: // id_colon
+
+/* Line 755 of yacc.c */
+#line 211 "src/parse-gram.y"
+ { fprintf (stderr, "%s:", ((*yyvaluep).symbol)->tag); }
+/* Line 755 of yacc.c */
+#line 1213 "src/parse-gram.c"
+ break;
+
+ case 90: // symbol
+
+/* Line 755 of yacc.c */
+#line 210 "src/parse-gram.y"
+ { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 755 of yacc.c */
+#line 1222 "src/parse-gram.c"
+ break;
+
+ case 91: // string_as_id
+
+/* Line 755 of yacc.c */
+#line 210 "src/parse-gram.y"
+ { fprintf (stderr, "%s", ((*yyvaluep).symbol)->tag); }
+/* Line 755 of yacc.c */
+#line 1231 "src/parse-gram.c"
+ break;
+
default:
- break;
+ break;
}
}
YYFPRINTF (stderr, "\n");
}
-# define YY_STACK_PRINT(Bottom, Top) \
-do { \
- if (yydebug) \
- yy_stack_print ((Bottom), (Top)); \
+# define YY_STACK_PRINT(Bottom, Top) \
+do { \
+ if (yydebug) \
+ yy_stack_print ((Bottom), (Top)); \
} while (YYID (0))
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
#else
static void
-yy_reduce_print (yyvsp, yylsp, yyrule)
+yy_reduce_print (yyssp, yyvsp, yylsp, yyrule)
+ yytype_int16 *yyssp;
YYSTYPE *yyvsp;
YYLTYPE *yylsp;
int yyrule;
#endif
{
+ unsigned long int yylno = yyrline[yyrule];
int yynrhs = yyr2[yyrule];
int yyi;
- unsigned long int yylno = yyrline[yyrule];
YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
- yyrule - 1, yylno);
+ yyrule - 1, yylno);
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
YYFPRINTF (stderr, " $%d = ", yyi + 1);
- yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
- &(yyvsp[(yyi + 1) - (yynrhs)])
- , &(yylsp[(yyi + 1) - (yynrhs)]) );
+ yy_symbol_print (stderr,
+ yystos[yyssp[yyi + 1 - yynrhs]],
+ &(yyvsp[(yyi + 1) - (yynrhs)])
+ , &(yylsp[(yyi + 1) - (yynrhs)]) );
YYFPRINTF (stderr, "\n");
}
}
-# define YY_REDUCE_PRINT(Rule) \
-do { \
- if (yydebug) \
- yy_reduce_print (yyvsp, yylsp, Rule); \
+# define YY_REDUCE_PRINT(Rule) \
+do { \
+ if (yydebug) \
+ yy_reduce_print (yyssp, yyvsp, yylsp, Rule); \
} while (YYID (0))
/* Nonzero means print parse trace. It is left uninitialized so that
/* YYINITDEPTH -- initial size of the parser's stacks. */
-#ifndef YYINITDEPTH
+#ifndef YYINITDEPTH
# define YYINITDEPTH 200
#endif
char const *yyp = yystr;
for (;;)
- switch (*++yyp)
- {
- case '\'':
- case ',':
- goto do_not_strip_quotes;
-
- case '\\':
- if (*++yyp != '\\')
- goto do_not_strip_quotes;
- /* Fall through. */
- default:
- if (yyres)
- yyres[yyn] = *yyp;
- yyn++;
- break;
-
- case '"':
- if (yyres)
- yyres[yyn] = '\0';
- return yyn;
- }
+ switch (*++yyp)
+ {
+ case '\'':
+ case ',':
+ goto do_not_strip_quotes;
+
+ case '\\':
+ if (*++yyp != '\\')
+ goto do_not_strip_quotes;
+ /* Fall through. */
+ default:
+ if (yyres)
+ yyres[yyn] = *yyp;
+ yyn++;
+ break;
+
+ case '"':
+ if (yyres)
+ yyres[yyn] = '\0';
+ return yyn;
+ }
do_not_strip_quotes: ;
}
YYLTYPE *yylocationp;
#endif
{
- YYUSE (yyvaluep);
+ YYUSE(yyvaluep);
YYUSE (yylocationp);
-
if (!yymsg)
yymsg = "Deleting";
YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
switch (yytype)
{
-
default:
- break;
+ break;
}
}
/* Prevent warnings from -Wmissing-prototypes. */
#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
int yyparse (void *YYPARSE_PARAM);
#else
int yyparse ();
#endif
#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
+#if (defined __STDC__ || defined __C99__FUNC__ \
+ || defined __cplusplus || defined _MSC_VER)
int yyparse (void);
#else
int yyparse ();
`yyvs': related to semantic values.
`yyls': related to locations.
- Refer to the stacks thru separate pointers, to allow yyoverflow
+ Refer to the stacks through separate pointers, to allow yyoverflow
to reallocate them elsewhere. */
/* The state stack. */
#endif
/* User initialization code. */
-
-/* Line 1594 of yacc.c */
-#line 106 "parse-gram.y"
+/* Line 1528 of yacc.c */
+#line 99 "src/parse-gram.y"
{
/* Bison's grammar can initial empty locations, hence a default
location is needed. */
boundary_set (&yylloc.start, current_file, 1, 1);
boundary_set (&yylloc.end, current_file, 1, 1);
}
-
-/* Line 1594 of yacc.c */
-#line 2023 "parse-gram.c"
+/* Line 1528 of yacc.c */
+#line 2033 "src/parse-gram.c"
yylsp[0] = yylloc;
goto yysetstate;
#ifdef yyoverflow
{
- /* Give user a chance to reallocate the stack. Use copies of
- these so that the &'s don't force the real ones into
- memory. */
- YYSTYPE *yyvs1 = yyvs;
- yytype_int16 *yyss1 = yyss;
- YYLTYPE *yyls1 = yyls;
-
- /* Each stack pointer address is followed by the size of the
- data in use in that stack, in bytes. This used to be a
- conditional around just the two extra args, but that might
- be undefined if yyoverflow is a macro. */
- yyoverflow (YY_("memory exhausted"),
- &yyss1, yysize * sizeof (*yyssp),
- &yyvs1, yysize * sizeof (*yyvsp),
- &yyls1, yysize * sizeof (*yylsp),
- &yystacksize);
-
- yyls = yyls1;
- yyss = yyss1;
- yyvs = yyvs1;
+ /* Give user a chance to reallocate the stack. Use copies of
+ these so that the &'s don't force the real ones into
+ memory. */
+ YYSTYPE *yyvs1 = yyvs;
+ yytype_int16 *yyss1 = yyss;
+ YYLTYPE *yyls1 = yyls;
+
+ /* Each stack pointer address is followed by the size of the
+ data in use in that stack, in bytes. This used to be a
+ conditional around just the two extra args, but that might
+ be undefined if yyoverflow is a macro. */
+ yyoverflow (YY_("memory exhausted"),
+ &yyss1, yysize * sizeof (*yyssp),
+ &yyvs1, yysize * sizeof (*yyvsp),
+ &yyls1, yysize * sizeof (*yylsp),
+ &yystacksize);
+
+ yyls = yyls1;
+ yyss = yyss1;
+ yyvs = yyvs1;
}
#else /* no yyoverflow */
# ifndef YYSTACK_RELOCATE
# else
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
- goto yyexhaustedlab;
+ goto yyexhaustedlab;
yystacksize *= 2;
if (YYMAXDEPTH < yystacksize)
- yystacksize = YYMAXDEPTH;
+ yystacksize = YYMAXDEPTH;
{
- yytype_int16 *yyss1 = yyss;
- union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
- if (! yyptr)
- goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss_alloc, yyss);
- YYSTACK_RELOCATE (yyvs_alloc, yyvs);
- YYSTACK_RELOCATE (yyls_alloc, yyls);
+ yytype_int16 *yyss1 = yyss;
+ union yyalloc *yyptr =
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ if (! yyptr)
+ goto yyexhaustedlab;
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+ YYSTACK_RELOCATE (yyls_alloc, yyls);
# undef YYSTACK_RELOCATE
- if (yyss1 != yyssa)
- YYSTACK_FREE (yyss1);
+ if (yyss1 != yyssa)
+ YYSTACK_FREE (yyss1);
}
# endif
#endif /* no yyoverflow */
yylsp = yyls + yysize - 1;
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ (unsigned long int) yystacksize));
if (yyss + yystacksize - 1 <= yyssp)
- YYABORT;
+ YYABORT;
}
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
switch (yyn)
{
case 6:
-
-/* Line 1810 of yacc.c */
-#line 245 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 286 "src/parse-gram.y"
{
code_props plain_code;
- code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].chars), (yylsp[(1) - (1)]));
+ code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
code_props_translate_code (&plain_code);
gram_scanner_last_string_free ();
muscle_code_grow (union_seen ? "post_prologue" : "pre_prologue",
- plain_code.code, (yylsp[(1) - (1)]));
+ plain_code.code, (yylsp[0]));
code_scanner_last_string_free ();
}
+/* Line 1744 of yacc.c */
+#line 2238 "src/parse-gram.c"
break;
case 7:
-
-/* Line 1810 of yacc.c */
-#line 254 "parse-gram.y"
- { debug_flag = true; }
+/* Line 1744 of yacc.c */
+#line 296 "src/parse-gram.y"
+ {
+ muscle_percent_define_ensure ((yyvsp[0].uniqstr), (yylsp[0]), true);
+ }
+/* Line 1744 of yacc.c */
+#line 2248 "src/parse-gram.c"
break;
case 8:
-
-/* Line 1810 of yacc.c */
-#line 256 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 300 "src/parse-gram.y"
{
- muscle_percent_define_insert ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars),
+ muscle_percent_define_insert ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars),
MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
}
+/* Line 1744 of yacc.c */
+#line 2259 "src/parse-gram.c"
break;
case 9:
-
-/* Line 1810 of yacc.c */
-#line 260 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 304 "src/parse-gram.y"
{ defines_flag = true; }
+/* Line 1744 of yacc.c */
+#line 2267 "src/parse-gram.c"
break;
case 10:
-
-/* Line 1810 of yacc.c */
-#line 262 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 306 "src/parse-gram.y"
{
defines_flag = true;
- spec_defines_file = xstrdup ((yyvsp[(2) - (2)].chars));
+ spec_defines_file = xstrdup ((yyvsp[0].chars));
}
+/* Line 1744 of yacc.c */
+#line 2278 "src/parse-gram.c"
break;
case 11:
-
-/* Line 1810 of yacc.c */
-#line 266 "parse-gram.y"
- { error_verbose = true; }
+/* Line 1744 of yacc.c */
+#line 311 "src/parse-gram.y"
+ {
+ muscle_percent_define_insert ("parse.error", (yylsp[0]), "verbose",
+ MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
+ }
+/* Line 1744 of yacc.c */
+#line 2289 "src/parse-gram.c"
break;
case 12:
-
-/* Line 1810 of yacc.c */
-#line 267 "parse-gram.y"
- { expected_sr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1744 of yacc.c */
+#line 315 "src/parse-gram.y"
+ { expected_sr_conflicts = (yyvsp[0].integer); }
+/* Line 1744 of yacc.c */
+#line 2297 "src/parse-gram.c"
break;
case 13:
-
-/* Line 1810 of yacc.c */
-#line 268 "parse-gram.y"
- { expected_rr_conflicts = (yyvsp[(2) - (2)].integer); }
+/* Line 1744 of yacc.c */
+#line 316 "src/parse-gram.y"
+ { expected_rr_conflicts = (yyvsp[0].integer); }
+/* Line 1744 of yacc.c */
+#line 2305 "src/parse-gram.c"
break;
case 14:
-
-/* Line 1810 of yacc.c */
-#line 269 "parse-gram.y"
- { spec_file_prefix = (yyvsp[(2) - (2)].chars); }
+/* Line 1744 of yacc.c */
+#line 317 "src/parse-gram.y"
+ { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1744 of yacc.c */
+#line 2313 "src/parse-gram.c"
break;
case 15:
-
-/* Line 1810 of yacc.c */
-#line 270 "parse-gram.y"
- { spec_file_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1744 of yacc.c */
+#line 318 "src/parse-gram.y"
+ { spec_file_prefix = (yyvsp[0].chars); }
+/* Line 1744 of yacc.c */
+#line 2321 "src/parse-gram.c"
break;
case 16:
-
-/* Line 1810 of yacc.c */
-#line 272 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 320 "src/parse-gram.y"
{
nondeterministic_parser = true;
glr_parser = true;
}
+/* Line 1744 of yacc.c */
+#line 2332 "src/parse-gram.c"
break;
case 17:
-
-/* Line 1810 of yacc.c */
-#line 277 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 325 "src/parse-gram.y"
{
code_props action;
- code_props_symbol_action_init (&action, (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)]));
+ code_props_symbol_action_init (&action, (yyvsp[0].code), (yylsp[0]));
code_props_translate_code (&action);
gram_scanner_last_string_free ();
- muscle_code_grow ("initial_action", action.code, (yylsp[(2) - (2)]));
+ muscle_code_grow ("initial_action", action.code, (yylsp[0]));
code_scanner_last_string_free ();
}
+/* Line 1744 of yacc.c */
+#line 2347 "src/parse-gram.c"
break;
case 18:
-
-/* Line 1810 of yacc.c */
-#line 285 "parse-gram.y"
- { language_argmatch ((yyvsp[(2) - (2)].chars), grammar_prio, (yylsp[(1) - (2)])); }
+/* Line 1744 of yacc.c */
+#line 333 "src/parse-gram.y"
+ { language_argmatch ((yyvsp[0].chars), grammar_prio, (yylsp[-1])); }
+/* Line 1744 of yacc.c */
+#line 2355 "src/parse-gram.c"
break;
case 19:
-
-/* Line 1810 of yacc.c */
-#line 286 "parse-gram.y"
- { add_param ("lex_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1744 of yacc.c */
+#line 334 "src/parse-gram.y"
+ { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1744 of yacc.c */
+#line 2363 "src/parse-gram.c"
break;
case 20:
-
-/* Line 1810 of yacc.c */
-#line 287 "parse-gram.y"
- { locations_flag = true; }
+/* Line 1744 of yacc.c */
+#line 335 "src/parse-gram.y"
+ { spec_name_prefix = (yyvsp[0].chars); }
+/* Line 1744 of yacc.c */
+#line 2371 "src/parse-gram.c"
break;
case 21:
-
-/* Line 1810 of yacc.c */
-#line 288 "parse-gram.y"
- { spec_name_prefix = (yyvsp[(2) - (2)].chars); }
+/* Line 1744 of yacc.c */
+#line 336 "src/parse-gram.y"
+ { no_lines_flag = true; }
+/* Line 1744 of yacc.c */
+#line 2379 "src/parse-gram.c"
break;
case 22:
-
-/* Line 1810 of yacc.c */
-#line 289 "parse-gram.y"
- { spec_name_prefix = (yyvsp[(3) - (3)].chars); }
+/* Line 1744 of yacc.c */
+#line 337 "src/parse-gram.y"
+ { nondeterministic_parser = true; }
+/* Line 1744 of yacc.c */
+#line 2387 "src/parse-gram.c"
break;
case 23:
-
-/* Line 1810 of yacc.c */
-#line 290 "parse-gram.y"
- { no_lines_flag = true; }
+/* Line 1744 of yacc.c */
+#line 338 "src/parse-gram.y"
+ { spec_outfile = (yyvsp[0].chars); }
+/* Line 1744 of yacc.c */
+#line 2395 "src/parse-gram.c"
break;
case 24:
-
-/* Line 1810 of yacc.c */
-#line 291 "parse-gram.y"
- { nondeterministic_parser = true; }
+/* Line 1744 of yacc.c */
+#line 339 "src/parse-gram.y"
+ { spec_outfile = (yyvsp[0].chars); }
+/* Line 1744 of yacc.c */
+#line 2403 "src/parse-gram.c"
break;
case 25:
-
-/* Line 1810 of yacc.c */
-#line 292 "parse-gram.y"
- { spec_outfile = (yyvsp[(2) - (2)].chars); }
+/* Line 1744 of yacc.c */
+#line 340 "src/parse-gram.y"
+ { current_param = (yyvsp[0].param); }
+/* Line 1744 of yacc.c */
+#line 2411 "src/parse-gram.c"
break;
case 26:
-
-/* Line 1810 of yacc.c */
-#line 293 "parse-gram.y"
- { spec_outfile = (yyvsp[(3) - (3)].chars); }
+/* Line 1744 of yacc.c */
+#line 340 "src/parse-gram.y"
+ { current_param = param_none; }
+/* Line 1744 of yacc.c */
+#line 2419 "src/parse-gram.c"
break;
case 27:
-
-/* Line 1810 of yacc.c */
-#line 294 "parse-gram.y"
- { add_param ("parse_param", (yyvsp[(2) - (2)].code), (yylsp[(2) - (2)])); }
+/* Line 1744 of yacc.c */
+#line 341 "src/parse-gram.y"
+ { version_check (&(yylsp[0]), (yyvsp[0].chars)); }
+/* Line 1744 of yacc.c */
+#line 2427 "src/parse-gram.c"
break;
case 28:
-
-/* Line 1810 of yacc.c */
-#line 296 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 343 "src/parse-gram.y"
{
- /* %pure-parser is deprecated in favor of `%define api.pure', so use
- `%define api.pure' in a backward-compatible manner here. First, don't
- complain if %pure-parser is specified multiple times. */
- if (!muscle_find_const ("percent_define(api.pure)"))
- muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "",
- MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
- /* In all cases, use api.pure now so that the backend doesn't complain if
- the skeleton ignores api.pure, but do warn now if there's a previous
- conflicting definition from an actual %define. */
- if (!muscle_percent_define_flag_if ("api.pure"))
- muscle_percent_define_insert ("api.pure", (yylsp[(1) - (1)]), "",
- MUSCLE_PERCENT_DEFINE_GRAMMAR_FILE);
- }
- break;
-
- case 29:
-
-/* Line 1810 of yacc.c */
-#line 310 "parse-gram.y"
- { version_check (&(yylsp[(2) - (2)]), (yyvsp[(2) - (2)].chars)); }
- break;
-
- case 30:
-
-/* Line 1810 of yacc.c */
-#line 312 "parse-gram.y"
- {
- char const *skeleton_user = (yyvsp[(2) - (2)].chars);
+ char const *skeleton_user = (yyvsp[0].chars);
if (mbschr (skeleton_user, '/'))
{
size_t dir_length = strlen (current_file);
skeleton_user = uniqstr_new (skeleton_build);
free (skeleton_build);
}
- skeleton_arg (skeleton_user, grammar_prio, (yylsp[(1) - (2)]));
+ skeleton_arg (skeleton_user, grammar_prio, (yylsp[-1]));
}
+/* Line 1744 of yacc.c */
+#line 2457 "src/parse-gram.c"
break;
- case 31:
-
-/* Line 1810 of yacc.c */
-#line 335 "parse-gram.y"
+ case 29:
+/* Line 1744 of yacc.c */
+#line 366 "src/parse-gram.y"
{ token_table_flag = true; }
+/* Line 1744 of yacc.c */
+#line 2465 "src/parse-gram.c"
break;
- case 32:
-
-/* Line 1810 of yacc.c */
-#line 336 "parse-gram.y"
+ case 30:
+/* Line 1744 of yacc.c */
+#line 367 "src/parse-gram.y"
{ report_flag |= report_states; }
+/* Line 1744 of yacc.c */
+#line 2473 "src/parse-gram.c"
+ break;
+
+ case 31:
+/* Line 1744 of yacc.c */
+#line 368 "src/parse-gram.y"
+ { yacc_flag = true; }
+/* Line 1744 of yacc.c */
+#line 2481 "src/parse-gram.c"
break;
case 33:
+/* Line 1744 of yacc.c */
+#line 373 "src/parse-gram.y"
+ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2489 "src/parse-gram.c"
+ break;
-/* Line 1810 of yacc.c */
-#line 337 "parse-gram.y"
- { yacc_flag = true; }
+ case 34:
+/* Line 1744 of yacc.c */
+#line 374 "src/parse-gram.y"
+ { add_param (current_param, (yyvsp[0].code), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2497 "src/parse-gram.c"
break;
case 37:
-
-/* Line 1810 of yacc.c */
-#line 345 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 386 "src/parse-gram.y"
{
- grammar_start_symbol_set ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]));
+ grammar_start_symbol_set ((yyvsp[0].symbol), (yylsp[0]));
}
+/* Line 1744 of yacc.c */
+#line 2507 "src/parse-gram.c"
break;
case 38:
-
-/* Line 1810 of yacc.c */
-#line 349 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 390 "src/parse-gram.y"
{
symbol_list *list;
- for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- symbol_list_destructor_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
- symbol_list_free ((yyvsp[(3) - (3)].list));
+ for (list = (yyvsp[0].list); list; list = list->next)
+ symbol_list_destructor_set (list, (yyvsp[-1].code), (yylsp[-1]));
+ symbol_list_free ((yyvsp[0].list));
}
+/* Line 1744 of yacc.c */
+#line 2520 "src/parse-gram.c"
break;
case 39:
-
-/* Line 1810 of yacc.c */
-#line 356 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 397 "src/parse-gram.y"
{
symbol_list *list;
- for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- symbol_list_printer_set (list, (yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]));
- symbol_list_free ((yyvsp[(3) - (3)].list));
+ for (list = (yyvsp[0].list); list; list = list->next)
+ symbol_list_printer_set (list, (yyvsp[-1].code), (yylsp[-1]));
+ symbol_list_free ((yyvsp[0].list));
}
+/* Line 1744 of yacc.c */
+#line 2533 "src/parse-gram.c"
break;
case 40:
-
-/* Line 1810 of yacc.c */
-#line 363 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 404 "src/parse-gram.y"
{
default_prec = true;
}
+/* Line 1744 of yacc.c */
+#line 2543 "src/parse-gram.c"
break;
case 41:
-
-/* Line 1810 of yacc.c */
-#line 367 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 408 "src/parse-gram.y"
{
default_prec = false;
}
+/* Line 1744 of yacc.c */
+#line 2553 "src/parse-gram.c"
break;
case 42:
-
-/* Line 1810 of yacc.c */
-#line 371 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 412 "src/parse-gram.y"
{
/* Do not invoke muscle_percent_code_grow here since it invokes
muscle_user_name_list_grow. */
- muscle_code_grow ("percent_code()", (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+ muscle_code_grow ("percent_code()", (yyvsp[0].chars), (yylsp[0]));
code_scanner_last_string_free ();
}
+/* Line 1744 of yacc.c */
+#line 2566 "src/parse-gram.c"
break;
case 43:
-
-/* Line 1810 of yacc.c */
-#line 378 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 419 "src/parse-gram.y"
{
- muscle_percent_code_grow ((yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+ muscle_percent_code_grow ((yyvsp[-1].uniqstr), (yylsp[-1]), (yyvsp[0].chars), (yylsp[0]));
code_scanner_last_string_free ();
}
+/* Line 1744 of yacc.c */
+#line 2577 "src/parse-gram.c"
break;
case 44:
-
-/* Line 1810 of yacc.c */
-#line 392 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 433 "src/parse-gram.y"
{}
+/* Line 1744 of yacc.c */
+#line 2585 "src/parse-gram.c"
break;
case 45:
-
-/* Line 1810 of yacc.c */
-#line 393 "parse-gram.y"
- { muscle_code_grow ("union_name", (yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1744 of yacc.c */
+#line 434 "src/parse-gram.y"
+ { muscle_code_grow ("union_name", (yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2593 "src/parse-gram.c"
break;
case 46:
-
-/* Line 1810 of yacc.c */
-#line 398 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 439 "src/parse-gram.y"
{
union_seen = true;
- muscle_code_grow ("stype", (yyvsp[(3) - (3)].chars), (yylsp[(3) - (3)]));
+ muscle_code_grow ("stype", (yyvsp[0].chars), (yylsp[0]));
code_scanner_last_string_free ();
}
+/* Line 1744 of yacc.c */
+#line 2605 "src/parse-gram.c"
break;
case 47:
-
-/* Line 1810 of yacc.c */
-#line 409 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 450 "src/parse-gram.y"
{ current_class = nterm_sym; }
+/* Line 1744 of yacc.c */
+#line 2613 "src/parse-gram.c"
break;
case 48:
-
-/* Line 1810 of yacc.c */
-#line 410 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 451 "src/parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
+/* Line 1744 of yacc.c */
+#line 2624 "src/parse-gram.c"
break;
case 49:
-
-/* Line 1810 of yacc.c */
-#line 414 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 455 "src/parse-gram.y"
{ current_class = token_sym; }
+/* Line 1744 of yacc.c */
+#line 2632 "src/parse-gram.c"
break;
case 50:
-
-/* Line 1810 of yacc.c */
-#line 415 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 456 "src/parse-gram.y"
{
current_class = unknown_sym;
current_type = NULL;
}
+/* Line 1744 of yacc.c */
+#line 2643 "src/parse-gram.c"
break;
case 51:
-
-/* Line 1810 of yacc.c */
-#line 420 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 461 "src/parse-gram.y"
{
symbol_list *list;
tag_seen = true;
- for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- symbol_type_set (list->content.sym, (yyvsp[(2) - (3)].uniqstr), (yylsp[(2) - (3)]));
- symbol_list_free ((yyvsp[(3) - (3)].list));
+ for (list = (yyvsp[0].list); list; list = list->next)
+ symbol_type_set (list->content.sym, (yyvsp[-1].uniqstr), (yylsp[-1]));
+ symbol_list_free ((yyvsp[0].list));
}
+/* Line 1744 of yacc.c */
+#line 2657 "src/parse-gram.c"
break;
case 52:
-
-/* Line 1810 of yacc.c */
-#line 431 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 472 "src/parse-gram.y"
{
symbol_list *list;
++current_prec;
- for (list = (yyvsp[(3) - (3)].list); list; list = list->next)
- {
- symbol_type_set (list->content.sym, current_type, (yylsp[(2) - (3)]));
- symbol_precedence_set (list->content.sym, current_prec, (yyvsp[(1) - (3)].assoc), (yylsp[(1) - (3)]));
- }
- symbol_list_free ((yyvsp[(3) - (3)].list));
+ for (list = (yyvsp[0].list); list; list = list->next)
+ {
+ symbol_type_set (list->content.sym, current_type, (yylsp[-1]));
+ symbol_precedence_set (list->content.sym, current_prec, (yyvsp[-2].assoc), (yylsp[-2]));
+ }
+ symbol_list_free ((yyvsp[0].list));
current_type = NULL;
}
+/* Line 1744 of yacc.c */
+#line 2675 "src/parse-gram.c"
break;
case 53:
-
-/* Line 1810 of yacc.c */
-#line 445 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 486 "src/parse-gram.y"
{ (yyval.assoc) = left_assoc; }
+/* Line 1744 of yacc.c */
+#line 2683 "src/parse-gram.c"
break;
case 54:
-
-/* Line 1810 of yacc.c */
-#line 446 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 487 "src/parse-gram.y"
{ (yyval.assoc) = right_assoc; }
+/* Line 1744 of yacc.c */
+#line 2691 "src/parse-gram.c"
break;
case 55:
-
-/* Line 1810 of yacc.c */
-#line 447 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 488 "src/parse-gram.y"
{ (yyval.assoc) = non_assoc; }
+/* Line 1744 of yacc.c */
+#line 2699 "src/parse-gram.c"
break;
case 56:
-
-/* Line 1810 of yacc.c */
-#line 451 "parse-gram.y"
- { current_type = NULL; }
+/* Line 1744 of yacc.c */
+#line 489 "src/parse-gram.y"
+ { (yyval.assoc) = precedence_assoc; }
+/* Line 1744 of yacc.c */
+#line 2707 "src/parse-gram.c"
break;
case 57:
-
-/* Line 1810 of yacc.c */
-#line 452 "parse-gram.y"
- { current_type = (yyvsp[(1) - (1)].uniqstr); tag_seen = true; }
+/* Line 1744 of yacc.c */
+#line 493 "src/parse-gram.y"
+ { current_type = NULL; }
+/* Line 1744 of yacc.c */
+#line 2715 "src/parse-gram.c"
break;
case 58:
-
-/* Line 1810 of yacc.c */
-#line 458 "parse-gram.y"
- { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1744 of yacc.c */
+#line 494 "src/parse-gram.y"
+ { current_type = (yyvsp[0].uniqstr); tag_seen = true; }
+/* Line 1744 of yacc.c */
+#line 2723 "src/parse-gram.c"
break;
case 59:
-
-/* Line 1810 of yacc.c */
-#line 460 "parse-gram.y"
- { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+/* Line 1744 of yacc.c */
+#line 500 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2731 "src/parse-gram.c"
break;
case 60:
-
-/* Line 1810 of yacc.c */
-#line 464 "parse-gram.y"
- { (yyval.symbol) = (yyvsp[(1) - (1)].symbol); }
+/* Line 1744 of yacc.c */
+#line 502 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1744 of yacc.c */
+#line 2739 "src/parse-gram.c"
break;
case 61:
-
-/* Line 1810 of yacc.c */
-#line 465 "parse-gram.y"
- { (yyval.symbol) = (yyvsp[(1) - (2)].symbol); symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)])); }
+/* Line 1744 of yacc.c */
+#line 506 "src/parse-gram.y"
+ { (yyval.symbol) = (yyvsp[0].symbol); }
+/* Line 1744 of yacc.c */
+#line 2747 "src/parse-gram.c"
break;
case 62:
-
-/* Line 1810 of yacc.c */
-#line 471 "parse-gram.y"
- { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1744 of yacc.c */
+#line 507 "src/parse-gram.y"
+ { (yyval.symbol) = (yyvsp[-1].symbol); symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2755 "src/parse-gram.c"
break;
case 63:
-
-/* Line 1810 of yacc.c */
-#line 473 "parse-gram.y"
- { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), symbol_list_sym_new ((yyvsp[(2) - (2)].symbol), (yylsp[(2) - (2)]))); }
+/* Line 1744 of yacc.c */
+#line 513 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2763 "src/parse-gram.c"
break;
case 64:
-
-/* Line 1810 of yacc.c */
-#line 477 "parse-gram.y"
- { (yyval.list) = (yyvsp[(1) - (1)].list); }
+/* Line 1744 of yacc.c */
+#line 515 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0]))); }
+/* Line 1744 of yacc.c */
+#line 2771 "src/parse-gram.c"
break;
case 65:
-
-/* Line 1810 of yacc.c */
-#line 478 "parse-gram.y"
- { (yyval.list) = symbol_list_prepend ((yyvsp[(1) - (2)].list), (yyvsp[(2) - (2)].list)); }
+/* Line 1744 of yacc.c */
+#line 519 "src/parse-gram.y"
+ { (yyval.list) = (yyvsp[0].list); }
+/* Line 1744 of yacc.c */
+#line 2779 "src/parse-gram.c"
break;
case 66:
-
-/* Line 1810 of yacc.c */
-#line 482 "parse-gram.y"
- { (yyval.list) = symbol_list_sym_new ((yyvsp[(1) - (1)].symbol), (yylsp[(1) - (1)])); }
+/* Line 1744 of yacc.c */
+#line 520 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_prepend ((yyvsp[-1].list), (yyvsp[0].list)); }
+/* Line 1744 of yacc.c */
+#line 2787 "src/parse-gram.c"
break;
case 67:
-
-/* Line 1810 of yacc.c */
-#line 483 "parse-gram.y"
- { (yyval.list) = symbol_list_type_new ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1744 of yacc.c */
+#line 524 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_sym_new ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2795 "src/parse-gram.c"
break;
case 68:
-
-/* Line 1810 of yacc.c */
-#line 484 "parse-gram.y"
- { (yyval.list) = symbol_list_default_tagged_new ((yylsp[(1) - (1)])); }
+/* Line 1744 of yacc.c */
+#line 525 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_type_new ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2803 "src/parse-gram.c"
break;
case 69:
-
-/* Line 1810 of yacc.c */
-#line 485 "parse-gram.y"
- { (yyval.list) = symbol_list_default_tagless_new ((yylsp[(1) - (1)])); }
+/* Line 1744 of yacc.c */
+#line 526 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagged_new ((yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2811 "src/parse-gram.c"
break;
case 70:
-
-/* Line 1810 of yacc.c */
-#line 491 "parse-gram.y"
- {
- current_type = (yyvsp[(1) - (1)].uniqstr);
- tag_seen = true;
- }
+/* Line 1744 of yacc.c */
+#line 527 "src/parse-gram.y"
+ { (yyval.list) = symbol_list_default_tagless_new ((yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2819 "src/parse-gram.c"
break;
case 71:
-
-/* Line 1810 of yacc.c */
-#line 496 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 533 "src/parse-gram.y"
{
- symbol_class_set ((yyvsp[(1) - (1)].symbol), current_class, (yylsp[(1) - (1)]), true);
- symbol_type_set ((yyvsp[(1) - (1)].symbol), current_type, (yylsp[(1) - (1)]));
+ current_type = (yyvsp[0].uniqstr);
+ tag_seen = true;
}
+/* Line 1744 of yacc.c */
+#line 2830 "src/parse-gram.c"
break;
case 72:
-
-/* Line 1810 of yacc.c */
-#line 501 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 538 "src/parse-gram.y"
{
- symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
- symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
- symbol_user_token_number_set ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].integer), (yylsp[(2) - (2)]));
- }
+ symbol_class_set ((yyvsp[0].symbol), current_class, (yylsp[0]), true);
+ symbol_type_set ((yyvsp[0].symbol), current_type, (yylsp[0]));
+ }
+/* Line 1744 of yacc.c */
+#line 2841 "src/parse-gram.c"
break;
case 73:
-
-/* Line 1810 of yacc.c */
-#line 507 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 543 "src/parse-gram.y"
{
- symbol_class_set ((yyvsp[(1) - (2)].symbol), current_class, (yylsp[(1) - (2)]), true);
- symbol_type_set ((yyvsp[(1) - (2)].symbol), current_type, (yylsp[(1) - (2)]));
- symbol_make_alias ((yyvsp[(1) - (2)].symbol), (yyvsp[(2) - (2)].symbol), (yyloc));
+ symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
+ symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
+ symbol_user_token_number_set ((yyvsp[-1].symbol), (yyvsp[0].integer), (yylsp[0]));
}
+/* Line 1744 of yacc.c */
+#line 2853 "src/parse-gram.c"
break;
case 74:
-
-/* Line 1810 of yacc.c */
-#line 513 "parse-gram.y"
+/* Line 1744 of yacc.c */
+#line 549 "src/parse-gram.y"
{
- symbol_class_set ((yyvsp[(1) - (3)].symbol), current_class, (yylsp[(1) - (3)]), true);
- symbol_type_set ((yyvsp[(1) - (3)].symbol), current_type, (yylsp[(1) - (3)]));
- symbol_user_token_number_set ((yyvsp[(1) - (3)].symbol), (yyvsp[(2) - (3)].integer), (yylsp[(2) - (3)]));
- symbol_make_alias ((yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol), (yyloc));
+ symbol_class_set ((yyvsp[-1].symbol), current_class, (yylsp[-1]), true);
+ symbol_type_set ((yyvsp[-1].symbol), current_type, (yylsp[-1]));
+ symbol_make_alias ((yyvsp[-1].symbol), (yyvsp[0].symbol), (yyloc));
}
+/* Line 1744 of yacc.c */
+#line 2865 "src/parse-gram.c"
break;
- case 81:
-
-/* Line 1810 of yacc.c */
-#line 543 "parse-gram.y"
+ case 75:
+/* Line 1744 of yacc.c */
+#line 555 "src/parse-gram.y"
{
- yyerrok;
+ symbol_class_set ((yyvsp[-2].symbol), current_class, (yylsp[-2]), true);
+ symbol_type_set ((yyvsp[-2].symbol), current_type, (yylsp[-2]));
+ symbol_user_token_number_set ((yyvsp[-2].symbol), (yyvsp[-1].integer), (yylsp[-1]));
+ symbol_make_alias ((yyvsp[-2].symbol), (yyvsp[0].symbol), (yyloc));
}
+/* Line 1744 of yacc.c */
+#line 2878 "src/parse-gram.c"
break;
case 82:
-
-/* Line 1810 of yacc.c */
-#line 549 "parse-gram.y"
- { current_lhs ((yyvsp[(1) - (2)].symbol), (yylsp[(1) - (2)]), (yyvsp[(2) - (2)].named_ref)); }
+/* Line 1744 of yacc.c */
+#line 585 "src/parse-gram.y"
+ {
+ yyerrok;
+ }
+/* Line 1744 of yacc.c */
+#line 2888 "src/parse-gram.c"
break;
case 83:
+/* Line 1744 of yacc.c */
+#line 591 "src/parse-gram.y"
+ { current_lhs ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1744 of yacc.c */
+#line 2896 "src/parse-gram.c"
+ break;
-/* Line 1810 of yacc.c */
-#line 550 "parse-gram.y"
+ case 84:
+/* Line 1744 of yacc.c */
+#line 592 "src/parse-gram.y"
{
/* Free the current lhs. */
- current_lhs (0, (yylsp[(1) - (4)]), 0);
+ current_lhs (0, (yylsp[-3]), 0);
}
- break;
-
- case 84:
-
-/* Line 1810 of yacc.c */
-#line 557 "parse-gram.y"
- { grammar_current_rule_end ((yylsp[(1) - (1)])); }
+/* Line 1744 of yacc.c */
+#line 2907 "src/parse-gram.c"
break;
case 85:
-
-/* Line 1810 of yacc.c */
-#line 558 "parse-gram.y"
- { grammar_current_rule_end ((yylsp[(3) - (3)])); }
+/* Line 1744 of yacc.c */
+#line 599 "src/parse-gram.y"
+ { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2915 "src/parse-gram.c"
break;
- case 87:
-
-/* Line 1810 of yacc.c */
-#line 564 "parse-gram.y"
- { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
- current_lhs_named_ref); }
+ case 86:
+/* Line 1744 of yacc.c */
+#line 600 "src/parse-gram.y"
+ { grammar_current_rule_end ((yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2923 "src/parse-gram.c"
break;
case 88:
-
-/* Line 1810 of yacc.c */
-#line 567 "parse-gram.y"
- { grammar_current_rule_symbol_append ((yyvsp[(2) - (3)].symbol), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
+/* Line 1744 of yacc.c */
+#line 606 "src/parse-gram.y"
+ { grammar_current_rule_begin (current_lhs_symbol, current_lhs_location,
+ current_lhs_named_ref); }
+/* Line 1744 of yacc.c */
+#line 2932 "src/parse-gram.c"
break;
case 89:
-
-/* Line 1810 of yacc.c */
-#line 569 "parse-gram.y"
- { grammar_current_rule_action_append ((yyvsp[(2) - (3)].code), (yylsp[(2) - (3)]), (yyvsp[(3) - (3)].named_ref)); }
+/* Line 1744 of yacc.c */
+#line 609 "src/parse-gram.y"
+ { grammar_current_rule_symbol_append ((yyvsp[-1].symbol), (yylsp[-1]), (yyvsp[0].named_ref)); }
+/* Line 1744 of yacc.c */
+#line 2940 "src/parse-gram.c"
break;
case 90:
-
-/* Line 1810 of yacc.c */
-#line 571 "parse-gram.y"
- { grammar_current_rule_prec_set ((yyvsp[(3) - (3)].symbol), (yylsp[(3) - (3)])); }
+/* Line 1744 of yacc.c */
+#line 611 "src/parse-gram.y"
+ { grammar_current_rule_action_append ((yyvsp[-1].code), (yylsp[-1]), (yyvsp[0].named_ref), false); }
+/* Line 1744 of yacc.c */
+#line 2948 "src/parse-gram.c"
break;
case 91:
-
-/* Line 1810 of yacc.c */
-#line 573 "parse-gram.y"
- { grammar_current_rule_dprec_set ((yyvsp[(3) - (3)].integer), (yylsp[(3) - (3)])); }
+/* Line 1744 of yacc.c */
+#line 613 "src/parse-gram.y"
+ { grammar_current_rule_action_append ((yyvsp[0].code), (yylsp[0]), NULL, true); }
+/* Line 1744 of yacc.c */
+#line 2956 "src/parse-gram.c"
break;
case 92:
-
-/* Line 1810 of yacc.c */
-#line 575 "parse-gram.y"
- { grammar_current_rule_merge_set ((yyvsp[(3) - (3)].uniqstr), (yylsp[(3) - (3)])); }
+/* Line 1744 of yacc.c */
+#line 615 "src/parse-gram.y"
+ { grammar_current_rule_prec_set ((yyvsp[0].symbol), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2964 "src/parse-gram.c"
break;
case 93:
-
-/* Line 1810 of yacc.c */
-#line 579 "parse-gram.y"
- { (yyval.named_ref) = 0; }
+/* Line 1744 of yacc.c */
+#line 617 "src/parse-gram.y"
+ { grammar_current_rule_dprec_set ((yyvsp[0].integer), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2972 "src/parse-gram.c"
break;
case 94:
-
-/* Line 1810 of yacc.c */
-#line 581 "parse-gram.y"
- { (yyval.named_ref) = named_ref_new((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+/* Line 1744 of yacc.c */
+#line 619 "src/parse-gram.y"
+ { grammar_current_rule_merge_set ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2980 "src/parse-gram.c"
break;
- case 96:
-
-/* Line 1810 of yacc.c */
-#line 593 "parse-gram.y"
- { (yyval.uniqstr) = uniqstr_new ((yyvsp[(1) - (1)].chars)); }
+ case 95:
+/* Line 1744 of yacc.c */
+#line 623 "src/parse-gram.y"
+ { (yyval.named_ref) = 0; }
+/* Line 1744 of yacc.c */
+#line 2988 "src/parse-gram.c"
break;
- case 97:
-
-/* Line 1810 of yacc.c */
-#line 598 "parse-gram.y"
- { (yyval.chars) = ""; }
+ case 96:
+/* Line 1744 of yacc.c */
+#line 625 "src/parse-gram.y"
+ { (yyval.named_ref) = named_ref_new((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 2996 "src/parse-gram.c"
break;
case 98:
+/* Line 1744 of yacc.c */
+#line 636 "src/parse-gram.y"
+ { (yyval.uniqstr) = uniqstr_new ((yyvsp[0].chars)); }
+/* Line 1744 of yacc.c */
+#line 3004 "src/parse-gram.c"
+ break;
-/* Line 1810 of yacc.c */
-#line 599 "parse-gram.y"
- { (yyval.chars) = (yyvsp[(1) - (1)].uniqstr); }
+ case 99:
+/* Line 1744 of yacc.c */
+#line 641 "src/parse-gram.y"
+ { (yyval.chars) = ""; }
+/* Line 1744 of yacc.c */
+#line 3012 "src/parse-gram.c"
break;
case 100:
+/* Line 1744 of yacc.c */
+#line 642 "src/parse-gram.y"
+ { (yyval.chars) = (yyvsp[0].uniqstr); }
+/* Line 1744 of yacc.c */
+#line 3020 "src/parse-gram.c"
+ break;
-/* Line 1810 of yacc.c */
-#line 610 "parse-gram.y"
+ case 102:
+/* Line 1744 of yacc.c */
+#line 653 "src/parse-gram.y"
{
code_props plain_code;
- (yyvsp[(1) - (1)].code)[strlen ((yyvsp[(1) - (1)].code)) - 1] = '\n';
- code_props_plain_init (&plain_code, (yyvsp[(1) - (1)].code)+1, (yylsp[(1) - (1)]));
+ (yyvsp[0].code)[strlen ((yyvsp[0].code)) - 1] = '\n';
+ code_props_plain_init (&plain_code, (yyvsp[0].code)+1, (yylsp[0]));
code_props_translate_code (&plain_code);
gram_scanner_last_string_free ();
(yyval.chars) = plain_code.code;
}
+/* Line 1744 of yacc.c */
+#line 3035 "src/parse-gram.c"
break;
- case 101:
-
-/* Line 1810 of yacc.c */
-#line 630 "parse-gram.y"
- { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+ case 103:
+/* Line 1744 of yacc.c */
+#line 673 "src/parse-gram.y"
+ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 3043 "src/parse-gram.c"
break;
- case 102:
-
-/* Line 1810 of yacc.c */
-#line 632 "parse-gram.y"
+ case 104:
+/* Line 1744 of yacc.c */
+#line 675 "src/parse-gram.y"
{
- (yyval.symbol) = symbol_get (char_name ((yyvsp[(1) - (1)].character)), (yylsp[(1) - (1)]));
- symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
- symbol_user_token_number_set ((yyval.symbol), (yyvsp[(1) - (1)].character), (yylsp[(1) - (1)]));
+ (yyval.symbol) = symbol_get (char_name ((yyvsp[0].character)), (yylsp[0]));
+ symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
+ symbol_user_token_number_set ((yyval.symbol), (yyvsp[0].character), (yylsp[0]));
}
+/* Line 1744 of yacc.c */
+#line 3055 "src/parse-gram.c"
break;
- case 103:
-
-/* Line 1810 of yacc.c */
-#line 640 "parse-gram.y"
- { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[(1) - (1)].uniqstr), (yylsp[(1) - (1)])); }
+ case 105:
+/* Line 1744 of yacc.c */
+#line 683 "src/parse-gram.y"
+ { (yyval.symbol) = symbol_from_uniqstr ((yyvsp[0].uniqstr), (yylsp[0])); }
+/* Line 1744 of yacc.c */
+#line 3063 "src/parse-gram.c"
break;
- case 106:
-
-/* Line 1810 of yacc.c */
-#line 652 "parse-gram.y"
+ case 108:
+/* Line 1744 of yacc.c */
+#line 695 "src/parse-gram.y"
{
- (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[(1) - (1)].chars)), (yylsp[(1) - (1)]));
- symbol_class_set ((yyval.symbol), token_sym, (yylsp[(1) - (1)]), false);
+ (yyval.symbol) = symbol_get (quotearg_style (c_quoting_style, (yyvsp[0].chars)), (yylsp[0]));
+ symbol_class_set ((yyval.symbol), token_sym, (yylsp[0]), false);
}
+/* Line 1744 of yacc.c */
+#line 3074 "src/parse-gram.c"
break;
- case 108:
-
-/* Line 1810 of yacc.c */
-#line 661 "parse-gram.y"
+ case 110:
+/* Line 1744 of yacc.c */
+#line 704 "src/parse-gram.y"
{
code_props plain_code;
- code_props_plain_init (&plain_code, (yyvsp[(2) - (2)].chars), (yylsp[(2) - (2)]));
+ code_props_plain_init (&plain_code, (yyvsp[0].chars), (yylsp[0]));
code_props_translate_code (&plain_code);
gram_scanner_last_string_free ();
- muscle_code_grow ("epilogue", plain_code.code, (yylsp[(2) - (2)]));
+ muscle_code_grow ("epilogue", plain_code.code, (yylsp[0]));
code_scanner_last_string_free ();
}
+/* Line 1744 of yacc.c */
+#line 3089 "src/parse-gram.c"
break;
-
-/* Line 1810 of yacc.c */
-#line 2989 "parse-gram.c"
+/* Line 1744 of yacc.c */
+#line 3094 "src/parse-gram.c"
default: break;
}
if (yychar_backup != yychar)
if (yyerrstatus == 3)
{
/* If just tried and failed to reuse lookahead token after an
- error, discard it. */
+ error, discard it. */
if (yychar <= YYEOF)
- {
- /* Return failure if at end of input. */
- if (yychar == YYEOF)
- YYABORT;
- }
+ {
+ /* Return failure if at end of input. */
+ if (yychar == YYEOF)
+ YYABORT;
+ }
else
- {
- yydestruct ("Error: discarding",
- yytoken, &yylval, &yylloc);
- yychar = YYEMPTY;
- }
+ {
+ yydestruct ("Error: discarding",
+ yytoken, &yylval, &yylloc);
+ yychar = YYEMPTY;
+ }
}
/* Else will try to reuse lookahead token after shifting the error
| yyerrlab1 -- common code for both syntax error and YYERROR. |
`-------------------------------------------------------------*/
yyerrlab1:
- yyerrstatus = 3; /* Each real token shifted decrements this. */
+ yyerrstatus = 3; /* Each real token shifted decrements this. */
for (;;)
{
yyn = yypact[yystate];
if (!yypact_value_is_default (yyn))
- {
- yyn += YYTERROR;
- if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
- {
- yyn = yytable[yyn];
- if (0 < yyn)
- break;
- }
- }
+ {
+ yyn += YYTERROR;
+ if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+ {
+ yyn = yytable[yyn];
+ if (0 < yyn)
+ break;
+ }
+ }
/* Pop the current state because it cannot handle the error token. */
if (yyssp == yyss)
- YYABORT;
+ YYABORT;
yyerror_range[1] = *yylsp;
yydestruct ("Error: popping",
- yystos[yystate], yyvsp, yylsp);
+ yystos[yystate], yyvsp, yylsp);
YYPOPSTACK (1);
yystate = *yyssp;
YY_STACK_PRINT (yyss, yyssp);
while (yyssp != yyss)
{
yydestruct ("Cleanup: popping",
- yystos[*yyssp], yyvsp, yylsp);
+ yystos[*yyssp], yyvsp, yylsp);
YYPOPSTACK (1);
}
#ifndef yyoverflow
return YYID (yyresult);
}
-
-
-/* Line 2071 of yacc.c */
-#line 671 "parse-gram.y"
+/* Line 2004 of yacc.c */
+#line 714 "src/parse-gram.y"
for (i = 1; i <= n; i++)
if (! equal_boundaries (rhs[i].start, rhs[i].end))
{
- loc.start = rhs[i].start;
- break;
+ loc.start = rhs[i].start;
+ break;
}
return loc;
}
-/* Add a lex-param or a parse-param (depending on TYPE) with
- declaration DECL and location LOC. */
-
static void
-add_param (char const *type, char *decl, location loc)
+add_param (param_type type, char *decl, location loc)
{
static char const alphanum[26 + 26 + 1 + 10] =
"abcdefghijklmnopqrstuvwxyz"
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"_"
"0123456789";
+
char const *name_start = NULL;
- char *p;
-
- /* Stop on last actual character. */
- for (p = decl; p[1]; p++)
- if ((p == decl
- || ! memchr (alphanum, p[-1], sizeof alphanum))
- && memchr (alphanum, p[0], sizeof alphanum - 10))
- name_start = p;
-
- /* Strip the surrounding '{' and '}', and any blanks just inside
- the braces. */
- while (*--p == ' ' || *p == '\t')
- continue;
- p[1] = '\0';
- while (*++decl == ' ' || *decl == '\t')
- continue;
+ {
+ char *p;
+ /* Stop on last actual character. */
+ for (p = decl; p[1]; p++)
+ if ((p == decl
+ || ! memchr (alphanum, p[-1], sizeof alphanum))
+ && memchr (alphanum, p[0], sizeof alphanum - 10))
+ name_start = p;
+
+ /* Strip the surrounding '{' and '}', and any blanks just inside
+ the braces. */
+ while (*--p == ' ' || *p == '\t')
+ continue;
+ p[1] = '\0';
+ while (*++decl == ' ' || *decl == '\t')
+ continue;
+ }
if (! name_start)
complain_at (loc, _("missing identifier in parameter declaration"));
else
{
char *name = xmemdup0 (name_start, strspn (name_start, alphanum));
- muscle_pair_list_grow (type, decl, name);
+ if (type & param_lex)
+ muscle_pair_list_grow ("lex_param", decl, name);
+ if (type & param_parse)
+ muscle_pair_list_grow ("parse_param", decl, name);
free (name);
}
return quotearg_style (escape_quoting_style, buf);
}
}
-
]],
[[
start
- : opt_nls program opt_nls
- ;
+ : opt_nls program opt_nls
+ ;
program
- : rule
- | program rule
- | error
- | program error
- | /* empty */
- ;
+ : rule
+ | program rule
+ | error
+ | program error
+ | /* empty */
+ ;
rule
- : LEX_BEGIN {} action
- | LEX_END {} action
- | LEX_BEGIN statement_term
- | LEX_END statement_term
- | pattern action
- | action
- | pattern statement_term
- | function_prologue function_body
- ;
+ : LEX_BEGIN {} action
+ | LEX_END {} action
+ | LEX_BEGIN statement_term
+ | LEX_END statement_term
+ | pattern action
+ | action
+ | pattern statement_term
+ | function_prologue function_body
+ ;
func_name
- : NAME
- | FUNC_CALL
- | lex_builtin
- ;
+ : NAME
+ | FUNC_CALL
+ | lex_builtin
+ ;
lex_builtin
- : LEX_BUILTIN
- | LEX_LENGTH
- ;
+ : LEX_BUILTIN
+ | LEX_LENGTH
+ ;
function_prologue
- : LEX_FUNCTION {} func_name '(' opt_param_list r_paren opt_nls
- ;
+ : LEX_FUNCTION {} func_name '(' opt_param_list r_paren opt_nls
+ ;
function_body
- : l_brace statements r_brace opt_semi opt_nls
- | l_brace r_brace opt_semi opt_nls
- ;
+ : l_brace statements r_brace opt_semi opt_nls
+ | l_brace r_brace opt_semi opt_nls
+ ;
pattern
- : exp
- | exp ',' exp
- ;
+ : exp
+ | exp ',' exp
+ ;
regexp
- /*
- * In this rule, want_regexp tells yylex that the next thing
- * is a regexp so it should read up to the closing slash.
- */
- : '/' {} REGEXP '/'
- ;
+ /*
+ * In this rule, want_regexp tells yylex that the next thing
+ * is a regexp so it should read up to the closing slash.
+ */
+ : '/' {} REGEXP '/'
+ ;
action
- : l_brace statements r_brace opt_semi opt_nls
- | l_brace r_brace opt_semi opt_nls
- ;
+ : l_brace statements r_brace opt_semi opt_nls
+ | l_brace r_brace opt_semi opt_nls
+ ;
statements
- : statement
- | statements statement
- | error
- | statements error
- ;
+ : statement
+ | statements statement
+ | error
+ | statements error
+ ;
statement_term
- : nls
- | semi opt_nls
- ;
+ : nls
+ | semi opt_nls
+ ;
statement
- : semi opt_nls
- | l_brace r_brace
- | l_brace statements r_brace
- | if_statement
- | LEX_WHILE '(' exp r_paren opt_nls statement
- | LEX_DO opt_nls statement LEX_WHILE '(' exp r_paren opt_nls
- | LEX_FOR '(' NAME LEX_IN NAME r_paren opt_nls statement
- | LEX_FOR '(' opt_exp semi opt_nls exp semi opt_nls opt_exp r_paren opt_nls statement
- | LEX_FOR '(' opt_exp semi opt_nls semi opt_nls opt_exp r_paren opt_nls statement
- | LEX_BREAK statement_term
- | LEX_CONTINUE statement_term
- | print '(' expression_list r_paren output_redir statement_term
- | print opt_rexpression_list output_redir statement_term
- | LEX_NEXT statement_term
- | LEX_NEXTFILE statement_term
- | LEX_EXIT opt_exp statement_term
- | LEX_RETURN {} opt_exp statement_term
- | LEX_DELETE NAME '[' expression_list ']' statement_term
- | LEX_DELETE NAME statement_term
- | exp statement_term
- ;
+ : semi opt_nls
+ | l_brace r_brace
+ | l_brace statements r_brace
+ | if_statement
+ | LEX_WHILE '(' exp r_paren opt_nls statement
+ | LEX_DO opt_nls statement LEX_WHILE '(' exp r_paren opt_nls
+ | LEX_FOR '(' NAME LEX_IN NAME r_paren opt_nls statement
+ | LEX_FOR '(' opt_exp semi opt_nls exp semi opt_nls opt_exp r_paren opt_nls statement
+ | LEX_FOR '(' opt_exp semi opt_nls semi opt_nls opt_exp r_paren opt_nls statement
+ | LEX_BREAK statement_term
+ | LEX_CONTINUE statement_term
+ | print '(' expression_list r_paren output_redir statement_term
+ | print opt_rexpression_list output_redir statement_term
+ | LEX_NEXT statement_term
+ | LEX_NEXTFILE statement_term
+ | LEX_EXIT opt_exp statement_term
+ | LEX_RETURN {} opt_exp statement_term
+ | LEX_DELETE NAME '[' expression_list ']' statement_term
+ | LEX_DELETE NAME statement_term
+ | exp statement_term
+ ;
print
- : LEX_PRINT
- | LEX_PRINTF
- ;
+ : LEX_PRINT
+ | LEX_PRINTF
+ ;
if_statement
- : LEX_IF '(' exp r_paren opt_nls statement
- | LEX_IF '(' exp r_paren opt_nls statement
- LEX_ELSE opt_nls statement
- ;
+ : LEX_IF '(' exp r_paren opt_nls statement
+ | LEX_IF '(' exp r_paren opt_nls statement
+ LEX_ELSE opt_nls statement
+ ;
nls
- : NEWLINE
- | nls NEWLINE
- ;
+ : NEWLINE
+ | nls NEWLINE
+ ;
opt_nls
- : /* empty */
- | nls
- ;
+ : /* empty */
+ | nls
+ ;
input_redir
- : /* empty */
- | '<' simp_exp
- ;
+ : /* empty */
+ | '<' simp_exp
+ ;
output_redir
- : /* empty */
- | '>' exp
- | APPEND_OP exp
- | '|' exp
- | TWOWAYIO exp
- ;
+ : /* empty */
+ | '>' exp
+ | APPEND_OP exp
+ | '|' exp
+ | TWOWAYIO exp
+ ;
opt_param_list
- : /* empty */
- | param_list
- ;
+ : /* empty */
+ | param_list
+ ;
param_list
- : NAME
- | param_list comma NAME
- | error
- | param_list error
- | param_list comma error
- ;
+ : NAME
+ | param_list comma NAME
+ | error
+ | param_list error
+ | param_list comma error
+ ;
/* optional expression, as in for loop */
opt_exp
- : /* empty */
- | exp
- ;
+ : /* empty */
+ | exp
+ ;
opt_rexpression_list
- : /* empty */
- | rexpression_list
- ;
+ : /* empty */
+ | rexpression_list
+ ;
rexpression_list
- : rexp
- | rexpression_list comma rexp
- | error
- | rexpression_list error
- | rexpression_list error rexp
- | rexpression_list comma error
- ;
+ : rexp
+ | rexpression_list comma rexp
+ | error
+ | rexpression_list error
+ | rexpression_list error rexp
+ | rexpression_list comma error
+ ;
opt_expression_list
- : /* empty */
- | expression_list
- ;
+ : /* empty */
+ | expression_list
+ ;
expression_list
- : exp
- | expression_list comma exp
- | error
- | expression_list error
- | expression_list error exp
- | expression_list comma error
- ;
+ : exp
+ | expression_list comma exp
+ | error
+ | expression_list error
+ | expression_list error exp
+ | expression_list comma error
+ ;
/* Expressions, not including the comma operator. */
-exp : variable ASSIGNOP {} exp
- | '(' expression_list r_paren LEX_IN NAME
- | exp '|' LEX_GETLINE opt_variable
- | exp TWOWAYIO LEX_GETLINE opt_variable
- | LEX_GETLINE opt_variable input_redir
- | exp LEX_AND exp
- | exp LEX_OR exp
- | exp MATCHOP exp
- | regexp
- | '!' regexp %prec UNARY
- | exp LEX_IN NAME
- | exp RELOP exp
- | exp '<' exp
- | exp '>' exp
- | exp '?' exp ':' exp
- | simp_exp
- | exp simp_exp %prec CONCAT_OP
- ;
+exp : variable ASSIGNOP {} exp
+ | '(' expression_list r_paren LEX_IN NAME
+ | exp '|' LEX_GETLINE opt_variable
+ | exp TWOWAYIO LEX_GETLINE opt_variable
+ | LEX_GETLINE opt_variable input_redir
+ | exp LEX_AND exp
+ | exp LEX_OR exp
+ | exp MATCHOP exp
+ | regexp
+ | '!' regexp %prec UNARY
+ | exp LEX_IN NAME
+ | exp RELOP exp
+ | exp '<' exp
+ | exp '>' exp
+ | exp '?' exp ':' exp
+ | simp_exp
+ | exp simp_exp %prec CONCAT_OP
+ ;
rexp
- : variable ASSIGNOP {} rexp
- | rexp LEX_AND rexp
- | rexp LEX_OR rexp
- | LEX_GETLINE opt_variable input_redir
- | regexp
- | '!' regexp %prec UNARY
- | rexp MATCHOP rexp
- | rexp LEX_IN NAME
- | rexp RELOP rexp
- | rexp '?' rexp ':' rexp
- | simp_exp
- | rexp simp_exp %prec CONCAT_OP
- ;
+ : variable ASSIGNOP {} rexp
+ | rexp LEX_AND rexp
+ | rexp LEX_OR rexp
+ | LEX_GETLINE opt_variable input_redir
+ | regexp
+ | '!' regexp %prec UNARY
+ | rexp MATCHOP rexp
+ | rexp LEX_IN NAME
+ | rexp RELOP rexp
+ | rexp '?' rexp ':' rexp
+ | simp_exp
+ | rexp simp_exp %prec CONCAT_OP
+ ;
simp_exp
- : non_post_simp_exp
- /* Binary operators in order of decreasing precedence. */
- | simp_exp '^' simp_exp
- | simp_exp '*' simp_exp
- | simp_exp '/' simp_exp
- | simp_exp '%' simp_exp
- | simp_exp '+' simp_exp
- | simp_exp '-' simp_exp
- | variable INCREMENT
- | variable DECREMENT
- ;
+ : non_post_simp_exp
+ /* Binary operators in order of decreasing precedence. */
+ | simp_exp '^' simp_exp
+ | simp_exp '*' simp_exp
+ | simp_exp '/' simp_exp
+ | simp_exp '%' simp_exp
+ | simp_exp '+' simp_exp
+ | simp_exp '-' simp_exp
+ | variable INCREMENT
+ | variable DECREMENT
+ ;
non_post_simp_exp
- : '!' simp_exp %prec UNARY
- | '(' exp r_paren
- | LEX_BUILTIN
- '(' opt_expression_list r_paren
- | LEX_LENGTH '(' opt_expression_list r_paren
- | LEX_LENGTH
- | FUNC_CALL '(' opt_expression_list r_paren
- | variable
- | INCREMENT variable
- | DECREMENT variable
- | YNUMBER
- | YSTRING
- | '-' simp_exp %prec UNARY
- | '+' simp_exp %prec UNARY
- ;
+ : '!' simp_exp %prec UNARY
+ | '(' exp r_paren
+ | LEX_BUILTIN
+ '(' opt_expression_list r_paren
+ | LEX_LENGTH '(' opt_expression_list r_paren
+ | LEX_LENGTH
+ | FUNC_CALL '(' opt_expression_list r_paren
+ | variable
+ | INCREMENT variable
+ | DECREMENT variable
+ | YNUMBER
+ | YSTRING
+ | '-' simp_exp %prec UNARY
+ | '+' simp_exp %prec UNARY
+ ;
opt_variable
- : /* empty */
- | variable
- ;
+ : /* empty */
+ | variable
+ ;
variable
- : NAME
- | NAME '[' expression_list ']'
- | '$' non_post_simp_exp
- ;
+ : NAME
+ | NAME '[' expression_list ']'
+ | '$' non_post_simp_exp
+ ;
l_brace
- : '{' opt_nls
- ;
+ : '{' opt_nls
+ ;
r_brace
- : '}' opt_nls
- ;
+ : '}' opt_nls
+ ;
r_paren
- : ')'
- ;
+ : ')'
+ ;
opt_semi
- : /* empty */
- | semi
- ;
+ : /* empty */
+ | semi
+ ;
semi
- : ';'
- ;
+ : ';'
+ ;
-comma : ',' opt_nls
- ;
+comma : ',' opt_nls
+ ;
]],
dnl INPUT
AT_TEST_EXISTING_GRAMMAR([[GNU Cim Grammar]],
[[
%token
- HACTIVATE HAFTER /*HAND*/ HARRAY HAT
- HBEFORE HBEGIN HBOOLEAN
- HCHARACTER HCLASS /*HCOMMENT*/ HCONC
- HDELAY HDO
- HELSE HEND HEQ /*HEQV*/ HEXTERNAL
- HFOR
- HGE HGO HGOTO HGT
- HHIDDEN
- HIF /*HIMP*/ HIN HINNER HINSPECT HINTEGER HIS
- HLABEL HLE HLONG HLT
- HNAME HNE HNEW HNONE /*HNOT*/ HNOTEXT
- /*HOR*/ HOTHERWISE
- HPRIOR HPROCEDURE HPROTECTED
- HQUA
- HREACTIVATE HREAL HREF
- HSHORT HSTEP HSWITCH
- HTEXT HTHEN HTHIS HTO
- HUNTIL
- HVALUE HVAR HVIRTUAL
- HWHEN HWHILE
-
- HASSIGNVALUE HASSIGNREF
- /*HDOT*/ HPAREXPSEPARATOR HLABELSEPARATOR HSTATEMENTSEPARATOR
- HBEGPAR HENDPAR
- HEQR HNER
- HADD HSUB HMUL HDIV HINTDIV HEXP
- HDOTDOTDOT
+ HACTIVATE HAFTER /*HAND*/ HARRAY HAT
+ HBEFORE HBEGIN HBOOLEAN
+ HCHARACTER HCLASS /*HCOMMENT*/ HCONC
+ HDELAY HDO
+ HELSE HEND HEQ /*HEQV*/ HEXTERNAL
+ HFOR
+ HGE HGO HGOTO HGT
+ HHIDDEN
+ HIF /*HIMP*/ HIN HINNER HINSPECT HINTEGER HIS
+ HLABEL HLE HLONG HLT
+ HNAME HNE HNEW HNONE /*HNOT*/ HNOTEXT
+ /*HOR*/ HOTHERWISE
+ HPRIOR HPROCEDURE HPROTECTED
+ HQUA
+ HREACTIVATE HREAL HREF
+ HSHORT HSTEP HSWITCH
+ HTEXT HTHEN HTHIS HTO
+ HUNTIL
+ HVALUE HVAR HVIRTUAL
+ HWHEN HWHILE
+
+ HASSIGNVALUE HASSIGNREF
+ /*HDOT*/ HPAREXPSEPARATOR HLABELSEPARATOR HSTATEMENTSEPARATOR
+ HBEGPAR HENDPAR
+ HEQR HNER
+ HADD HSUB HMUL HDIV HINTDIV HEXP
+ HDOTDOTDOT
%token HIDENTIFIER
%token HBOOLEANKONST HINTEGERKONST HCHARACTERKONST
%left HVALRELOPERATOR HREFRELOPERATOR HOBJRELOPERATOR
-%left HCONC
+%left HCONC
%left HTERMOPERATOR
%left UNEAR
[[
/* GRAMATIKK FOR PROGRAM MODULES */
MAIN_MODULE : {}
- MODULS
- | error HSTATEMENTSEPARATOR MBEE_DECLSTMS
- ;
-EXT_DECLARATION : HEXTERNAL
- MBEE_TYPE
- HPROCEDURE
- {}
- EXT_LIST
- |
- HEXTERNAL
- HIDENTIFIER
- HPROCEDURE
- {}
- HIDENTIFIER {}
- EXTERNAL_KIND_ITEM
- | HEXTERNAL
- HCLASS
- {}
- EXT_LIST
-
- ;
-EXTERNAL_KIND_ITEM: EXT_IDENT
- HOBJRELOPERATOR
- {}
- MBEE_TYPE HPROCEDURE
- HIDENTIFIER
- {}
- HEADING EMPTY_BLOCK
- {}
-/* |
- EXT_IDENT
- {}
- MBEE_REST_EXT_LIST
- ;
-MBEE_REST_EXT_LIST: /* EMPTY
- | HPAREXPSEPARATOR EXT_KIND_LIST
- ;
-EXT_KIND_LIST : EXT_KIND_ITEM
- | EXT_KIND_LIST HPAREXPSEPARATOR EXT_KIND_ITEM
- ;
-EXT_KIND_ITEM : HIDENTIFIER
- EXT_IDENT
- {}*/
- ;
-EMPTY_BLOCK : /*EMPT*/
- | HBEGIN HEND
- ;
-EXT_LIST : EXT_ITEM
- | EXT_LIST HPAREXPSEPARATOR EXT_ITEM
- ;
-EXT_ITEM : HIDENTIFIER
- EXT_IDENT
- ;
-EXT_IDENT : /* EMPTY */
- | HVALRELOPERATOR {}
- HTEXTKONST
- ;
+ MODULS
+ | error HSTATEMENTSEPARATOR MBEE_DECLSTMS
+ ;
+EXT_DECLARATION : HEXTERNAL
+ MBEE_TYPE
+ HPROCEDURE
+ {}
+ EXT_LIST
+ |
+ HEXTERNAL
+ HIDENTIFIER
+ HPROCEDURE
+ {}
+ HIDENTIFIER {}
+ EXTERNAL_KIND_ITEM
+ | HEXTERNAL
+ HCLASS
+ {}
+ EXT_LIST
+
+ ;
+EXTERNAL_KIND_ITEM: EXT_IDENT
+ HOBJRELOPERATOR
+ {}
+ MBEE_TYPE HPROCEDURE
+ HIDENTIFIER
+ {}
+ HEADING EMPTY_BLOCK
+ {}
+/* |
+ EXT_IDENT
+ {}
+ MBEE_REST_EXT_LIST
+ ;
+MBEE_REST_EXT_LIST: /* EMPTY
+ | HPAREXPSEPARATOR EXT_KIND_LIST
+ ;
+EXT_KIND_LIST : EXT_KIND_ITEM
+ | EXT_KIND_LIST HPAREXPSEPARATOR EXT_KIND_ITEM
+ ;
+EXT_KIND_ITEM : HIDENTIFIER
+ EXT_IDENT
+ {}*/
+ ;
+EMPTY_BLOCK : /*EMPT*/
+ | HBEGIN HEND
+ ;
+EXT_LIST : EXT_ITEM
+ | EXT_LIST HPAREXPSEPARATOR EXT_ITEM
+ ;
+EXT_ITEM : HIDENTIFIER
+ EXT_IDENT
+ ;
+EXT_IDENT : /* EMPTY */
+ | HVALRELOPERATOR {}
+ HTEXTKONST
+ ;
/* GRAMATIKK FOR TYPER */
NO_TYPE : /*EMPT*/
- ;
+ ;
MBEE_TYPE : NO_TYPE
- | TYPE
- ;
+ | TYPE
+ ;
TYPE : HREF HBEGPAR
- HIDENTIFIER
- {}
- HENDPAR
- | HTEXT
- | HBOOLEAN
- | HCHARACTER
- | HSHORT HINTEGER
- | HINTEGER
- | HREAL
- | HLONG HREAL
- ;
+ HIDENTIFIER
+ {}
+ HENDPAR
+ | HTEXT
+ | HBOOLEAN
+ | HCHARACTER
+ | HSHORT HINTEGER
+ | HINTEGER
+ | HREAL
+ | HLONG HREAL
+ ;
/* GRAMATIKK FOR DEL AV SETNINGER */
MBEE_ELSE_PART : /*EMPT*/
-/* | HELSE
- HIF
- EXPRESSION
- HTHEN {}
- BLOCK {}
- MBEE_ELSE_PART {}*/
- | HELSE {}
- BLOCK
- ;
+/* | HELSE
+ HIF
+ EXPRESSION
+ HTHEN {}
+ BLOCK {}
+ MBEE_ELSE_PART {}*/
+ | HELSE {}
+ BLOCK
+ ;
FOR_LIST : FOR_LIST_ELEMENT
- | FOR_LIST_ELEMENT
- HPAREXPSEPARATOR
- FOR_LIST
- ;
+ | FOR_LIST_ELEMENT
+ HPAREXPSEPARATOR
+ FOR_LIST
+ ;
FOR_LIST_ELEMENT: EXPRESSION
- MBEE_F_L_EL_R_PT
- ;
+ MBEE_F_L_EL_R_PT
+ ;
MBEE_F_L_EL_R_PT: /*EMPT*/
- | HWHILE
- EXPRESSION
- | HSTEP
- EXPRESSION
- HUNTIL
- EXPRESSION
- ;
+ | HWHILE
+ EXPRESSION
+ | HSTEP
+ EXPRESSION
+ HUNTIL
+ EXPRESSION
+ ;
GOTO : HGO
- HTO
- | HGOTO
- ;
+ HTO
+ | HGOTO
+ ;
CONN_STATE_R_PT : WHEN_CLAUSE_LIST
- | HDO {}
- BLOCK
- ;
+ | HDO {}
+ BLOCK
+ ;
WHEN_CLAUSE_LIST: HWHEN
- HIDENTIFIER
- HDO {}
- BLOCK
- | WHEN_CLAUSE_LIST
- HWHEN
- HIDENTIFIER
- HDO {}
- BLOCK
- ;
+ HIDENTIFIER
+ HDO {}
+ BLOCK
+ | WHEN_CLAUSE_LIST
+ HWHEN
+ HIDENTIFIER
+ HDO {}
+ BLOCK
+ ;
MBEE_OTWI_CLAUS : /*EMPT*/
- | HOTHERWISE {}
-
- BLOCK
- ;
-ACTIVATOR : HACTIVATE
- | HREACTIVATE
- ;
-SCHEDULE : /*EMPT*/
- | ATDELAY EXPRESSION {}
- PRIOR
- | BEFOREAFTER {}
- EXPRESSION
- ;
-ATDELAY : HAT
- | HDELAY
- ;
-BEFOREAFTER : HBEFORE
- | HAFTER
- ;
-PRIOR : /*EMPT*/
- | HPRIOR
- ;
+ | HOTHERWISE {}
+
+ BLOCK
+ ;
+ACTIVATOR : HACTIVATE
+ | HREACTIVATE
+ ;
+SCHEDULE : /*EMPT*/
+ | ATDELAY EXPRESSION {}
+ PRIOR
+ | BEFOREAFTER {}
+ EXPRESSION
+ ;
+ATDELAY : HAT
+ | HDELAY
+ ;
+BEFOREAFTER : HBEFORE
+ | HAFTER
+ ;
+PRIOR : /*EMPT*/
+ | HPRIOR
+ ;
/* GRAMATIKK FOR SETNINGER OG DEKLARASJONER */
MODULSTATEMENT : HWHILE
- EXPRESSION
- HDO {}
- BLOCK
- | HIF
- EXPRESSION
- HTHEN {}
- BLOCK {}
- MBEE_ELSE_PART
- | HFOR
- HIDENTIFIER
- HASSIGN {}
- FOR_LIST
- HDO {}
- BLOCK
- | GOTO
- EXPRESSION
- | HINSPECT
- EXPRESSION {}
- CONN_STATE_R_PT
- {}
- MBEE_OTWI_CLAUS
- | HINNER
- | HIDENTIFIER
- HLABELSEPARATOR
- {}
- DECLSTATEMENT
- | EXPRESSION_SIMP
- HBEGIN
- {}
- IMPORT_SPEC_MODULE
- {}
- MBEE_DECLSTMS
- HEND
- | EXPRESSION_SIMP HBEGIN error HSTATEMENTSEPARATOR
- MBEE_DECLSTMS HEND
- | EXPRESSION_SIMP HBEGIN error HEND
- | EXPRESSION_SIMP
- | ACTIVATOR EXPRESSION SCHEDULE
- | HBEGIN
- {}
- MBEE_DECLSTMS
- HEND
- | MBEE_TYPE HPROCEDURE
- HIDENTIFIER
- {}
- HEADING BLOCK
- | HIDENTIFIER
- HCLASS
- NO_TYPE
- {}
- IMPORT_SPEC_MODULE
- HIDENTIFIER
- {}
- HEADING
- BLOCK
- | HCLASS
- NO_TYPE
- HIDENTIFIER
- {}
- HEADING
- BLOCK
- | EXT_DECLARATION
- | /*EMPT*/
- ;
+ EXPRESSION
+ HDO {}
+ BLOCK
+ | HIF
+ EXPRESSION
+ HTHEN {}
+ BLOCK {}
+ MBEE_ELSE_PART
+ | HFOR
+ HIDENTIFIER
+ HASSIGN {}
+ FOR_LIST
+ HDO {}
+ BLOCK
+ | GOTO
+ EXPRESSION
+ | HINSPECT
+ EXPRESSION {}
+ CONN_STATE_R_PT
+ {}
+ MBEE_OTWI_CLAUS
+ | HINNER
+ | HIDENTIFIER
+ HLABELSEPARATOR
+ {}
+ DECLSTATEMENT
+ | EXPRESSION_SIMP
+ HBEGIN
+ {}
+ IMPORT_SPEC_MODULE
+ {}
+ MBEE_DECLSTMS
+ HEND
+ | EXPRESSION_SIMP HBEGIN error HSTATEMENTSEPARATOR
+ MBEE_DECLSTMS HEND
+ | EXPRESSION_SIMP HBEGIN error HEND
+ | EXPRESSION_SIMP
+ | ACTIVATOR EXPRESSION SCHEDULE
+ | HBEGIN
+ {}
+ MBEE_DECLSTMS
+ HEND
+ | MBEE_TYPE HPROCEDURE
+ HIDENTIFIER
+ {}
+ HEADING BLOCK
+ | HIDENTIFIER
+ HCLASS
+ NO_TYPE
+ {}
+ IMPORT_SPEC_MODULE
+ HIDENTIFIER
+ {}
+ HEADING
+ BLOCK
+ | HCLASS
+ NO_TYPE
+ HIDENTIFIER
+ {}
+ HEADING
+ BLOCK
+ | EXT_DECLARATION
+ | /*EMPT*/
+ ;
IMPORT_SPEC_MODULE:
- ;
-DECLSTATEMENT : MODULSTATEMENT
- | TYPE
- HIDENTIFIER
- MBEE_CONSTANT
- HPAREXPSEPARATOR
- {}
- IDENTIFIER_LISTC
- | TYPE
- HIDENTIFIER
- MBEE_CONSTANT
- | MBEE_TYPE
- HARRAY {}
- ARR_SEGMENT_LIST
- | HSWITCH
- HIDENTIFIER
- HASSIGN {}
- SWITCH_LIST
- ;
+ ;
+DECLSTATEMENT : MODULSTATEMENT
+ | TYPE
+ HIDENTIFIER
+ MBEE_CONSTANT
+ HPAREXPSEPARATOR
+ {}
+ IDENTIFIER_LISTC
+ | TYPE
+ HIDENTIFIER
+ MBEE_CONSTANT
+ | MBEE_TYPE
+ HARRAY {}
+ ARR_SEGMENT_LIST
+ | HSWITCH
+ HIDENTIFIER
+ HASSIGN {}
+ SWITCH_LIST
+ ;
BLOCK : DECLSTATEMENT
- | HBEGIN MBEE_DECLSTMS HEND
- | HBEGIN error HSTATEMENTSEPARATOR MBEE_DECLSTMS HEND
- | HBEGIN error HEND
- ;
+ | HBEGIN MBEE_DECLSTMS HEND
+ | HBEGIN error HSTATEMENTSEPARATOR MBEE_DECLSTMS HEND
+ | HBEGIN error HEND
+ ;
MBEE_DECLSTMS : MBEE_DECLSTMSU
- ;
+ ;
MBEE_DECLSTMSU : DECLSTATEMENT
- | MBEE_DECLSTMSU
- HSTATEMENTSEPARATOR
- DECLSTATEMENT
- ;
-MODULS : MODULSTATEMENT
- | MODULS HSTATEMENTSEPARATOR MODULSTATEMENT
- ;
+ | MBEE_DECLSTMSU
+ HSTATEMENTSEPARATOR
+ DECLSTATEMENT
+ ;
+MODULS : MODULSTATEMENT
+ | MODULS HSTATEMENTSEPARATOR MODULSTATEMENT
+ ;
/* GRAMATIKK FOR DEL AV DEKLARASJONER */
ARR_SEGMENT_LIST: ARR_SEGMENT
- | ARR_SEGMENT_LIST
- HPAREXPSEPARATOR
- ARR_SEGMENT
- ;
-ARR_SEGMENT : ARRAY_SEGMENT
- HBEGPAR
- BAUND_PAIR_LIST HENDPAR
- ;
+ | ARR_SEGMENT_LIST
+ HPAREXPSEPARATOR
+ ARR_SEGMENT
+ ;
+ARR_SEGMENT : ARRAY_SEGMENT
+ HBEGPAR
+ BAUND_PAIR_LIST HENDPAR
+ ;
ARRAY_SEGMENT : ARRAY_SEGMENT_EL {}
- | ARRAY_SEGMENT_EL
- HPAREXPSEPARATOR
- ARRAY_SEGMENT
- ;
+ | ARRAY_SEGMENT_EL
+ HPAREXPSEPARATOR
+ ARRAY_SEGMENT
+ ;
ARRAY_SEGMENT_EL: HIDENTIFIER
- ;
+ ;
BAUND_PAIR_LIST : BAUND_PAIR
- | BAUND_PAIR
- HPAREXPSEPARATOR
- BAUND_PAIR_LIST
- ;
+ | BAUND_PAIR
+ HPAREXPSEPARATOR
+ BAUND_PAIR_LIST
+ ;
BAUND_PAIR : EXPRESSION
- HLABELSEPARATOR
- EXPRESSION
- ;
+ HLABELSEPARATOR
+ EXPRESSION
+ ;
SWITCH_LIST : EXPRESSION
- | EXPRESSION
- HPAREXPSEPARATOR
- SWITCH_LIST
- ;
+ | EXPRESSION
+ HPAREXPSEPARATOR
+ SWITCH_LIST
+ ;
HEADING : MBEE_FMAL_PAR_P HSTATEMENTSEPARATOR {}
- MBEE_MODE_PART {}
- MBEE_SPEC_PART {}
- MBEE_PROT_PART {}
- MBEE_VIRT_PART
- ;
+ MBEE_MODE_PART {}
+ MBEE_SPEC_PART {}
+ MBEE_PROT_PART {}
+ MBEE_VIRT_PART
+ ;
MBEE_FMAL_PAR_P : /*EMPT*/
- | FMAL_PAR_PART
- ;
+ | FMAL_PAR_PART
+ ;
FMAL_PAR_PART : HBEGPAR NO_TYPE
- MBEE_LISTV HENDPAR
- ;
+ MBEE_LISTV HENDPAR
+ ;
MBEE_LISTV : /*EMPT*/
- | LISTV
- ;
+ | LISTV
+ ;
LISTV : HIDENTIFIER
- | FPP_CATEG HDOTDOTDOT
- | HIDENTIFIER {}
- HPAREXPSEPARATOR LISTV
- | FPP_SPEC
- | FPP_SPEC
- HPAREXPSEPARATOR LISTV
- ;
+ | FPP_CATEG HDOTDOTDOT
+ | HIDENTIFIER {}
+ HPAREXPSEPARATOR LISTV
+ | FPP_SPEC
+ | FPP_SPEC
+ HPAREXPSEPARATOR LISTV
+ ;
FPP_HEADING : HBEGPAR NO_TYPE
- FPP_MBEE_LISTV HENDPAR
- ;
+ FPP_MBEE_LISTV HENDPAR
+ ;
FPP_MBEE_LISTV : /*EMPT*/
- | FPP_LISTV
- ;
-FPP_LISTV : FPP_CATEG HDOTDOTDOT
- | FPP_SPEC
- | FPP_SPEC
- HPAREXPSEPARATOR LISTV
- ;
+ | FPP_LISTV
+ ;
+FPP_LISTV : FPP_CATEG HDOTDOTDOT
+ | FPP_SPEC
+ | FPP_SPEC
+ HPAREXPSEPARATOR LISTV
+ ;
FPP_SPEC : FPP_CATEG SPECIFIER HIDENTIFIER
- | FPP_CATEG FPP_PROC_DECL_IN_SPEC
- ;
+ | FPP_CATEG FPP_PROC_DECL_IN_SPEC
+ ;
FPP_CATEG : HNAME HLABELSEPARATOR
- | HVALUE HLABELSEPARATOR
- | HVAR HLABELSEPARATOR
- | /*EMPT*/
- ;
-FPP_PROC_DECL_IN_SPEC: MBEE_TYPE HPROCEDURE
- HIDENTIFIER
- {}
- FPP_HEADING {} { /* Yes, two "final" actions. */ }
- ;
+ | HVALUE HLABELSEPARATOR
+ | HVAR HLABELSEPARATOR
+ | /*EMPT*/
+ ;
+FPP_PROC_DECL_IN_SPEC: MBEE_TYPE HPROCEDURE
+ HIDENTIFIER
+ {}
+ FPP_HEADING {} { /* Yes, two "final" actions. */ }
+ ;
IDENTIFIER_LISTV: HIDENTIFIER
- | HDOTDOTDOT
- | HIDENTIFIER {}
- HPAREXPSEPARATOR IDENTIFIER_LISTV
- ;
+ | HDOTDOTDOT
+ | HIDENTIFIER {}
+ HPAREXPSEPARATOR IDENTIFIER_LISTV
+ ;
MBEE_MODE_PART : /*EMPT*/
- | MODE_PART
- ;
+ | MODE_PART
+ ;
MODE_PART : NAME_PART
- | VALUE_PART
- | VAR_PART
- | NAME_PART VALUE_PART
- | VALUE_PART NAME_PART
- | NAME_PART VAR_PART
- | VAR_PART NAME_PART
- | VALUE_PART VAR_PART
- | VAR_PART VALUE_PART
- | VAR_PART NAME_PART VALUE_PART
- | NAME_PART VAR_PART VALUE_PART
- | NAME_PART VALUE_PART VAR_PART
- | VAR_PART VALUE_PART NAME_PART
- | VALUE_PART VAR_PART NAME_PART
- | VALUE_PART NAME_PART VAR_PART
- ;
+ | VALUE_PART
+ | VAR_PART
+ | NAME_PART VALUE_PART
+ | VALUE_PART NAME_PART
+ | NAME_PART VAR_PART
+ | VAR_PART NAME_PART
+ | VALUE_PART VAR_PART
+ | VAR_PART VALUE_PART
+ | VAR_PART NAME_PART VALUE_PART
+ | NAME_PART VAR_PART VALUE_PART
+ | NAME_PART VALUE_PART VAR_PART
+ | VAR_PART VALUE_PART NAME_PART
+ | VALUE_PART VAR_PART NAME_PART
+ | VALUE_PART NAME_PART VAR_PART
+ ;
NAME_PART : HNAME {}
- IDENTIFIER_LISTV
- HSTATEMENTSEPARATOR
- ;
+ IDENTIFIER_LISTV
+ HSTATEMENTSEPARATOR
+ ;
VAR_PART : HVAR {}
- IDENTIFIER_LISTV
- HSTATEMENTSEPARATOR
- ;
+ IDENTIFIER_LISTV
+ HSTATEMENTSEPARATOR
+ ;
VALUE_PART : HVALUE {}
- IDENTIFIER_LISTV HSTATEMENTSEPARATOR
- ;
+ IDENTIFIER_LISTV HSTATEMENTSEPARATOR
+ ;
MBEE_SPEC_PART : /*EMPT*/
- | SPEC_PART
- ;
+ | SPEC_PART
+ ;
SPEC_PART : ONE_SPEC
- | SPEC_PART ONE_SPEC
- ;
-ONE_SPEC : SPECIFIER IDENTIFIER_LIST HSTATEMENTSEPARATOR
- | NO_TYPE HPROCEDURE HIDENTIFIER HOBJRELOPERATOR
- {}
- PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR
- | FPP_PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR
- | MBEE_TYPE HPROCEDURE HIDENTIFIER HSTATEMENTSEPARATOR
- | MBEE_TYPE HPROCEDURE HIDENTIFIER HPAREXPSEPARATOR
- IDENTIFIER_LIST HSTATEMENTSEPARATOR
- ;
+ | SPEC_PART ONE_SPEC
+ ;
+ONE_SPEC : SPECIFIER IDENTIFIER_LIST HSTATEMENTSEPARATOR
+ | NO_TYPE HPROCEDURE HIDENTIFIER HOBJRELOPERATOR
+ {}
+ PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR
+ | FPP_PROC_DECL_IN_SPEC HSTATEMENTSEPARATOR
+ | MBEE_TYPE HPROCEDURE HIDENTIFIER HSTATEMENTSEPARATOR
+ | MBEE_TYPE HPROCEDURE HIDENTIFIER HPAREXPSEPARATOR
+ IDENTIFIER_LIST HSTATEMENTSEPARATOR
+ ;
SPECIFIER : TYPE
- | MBEE_TYPE
- HARRAY
- | HLABEL
- | HSWITCH
- ;
-PROC_DECL_IN_SPEC: MBEE_TYPE HPROCEDURE
- HIDENTIFIER
- {}
- HEADING
- {}
- MBEE_BEGIN_END
- ;
-MBEE_BEGIN_END : /* EMPTY */
- | HBEGIN HEND
- ;
+ | MBEE_TYPE
+ HARRAY
+ | HLABEL
+ | HSWITCH
+ ;
+PROC_DECL_IN_SPEC: MBEE_TYPE HPROCEDURE
+ HIDENTIFIER
+ {}
+ HEADING
+ {}
+ MBEE_BEGIN_END
+ ;
+MBEE_BEGIN_END : /* EMPTY */
+ | HBEGIN HEND
+ ;
MBEE_PROT_PART : /*EMPT*/
- | PROTECTION_PART
- ;
+ | PROTECTION_PART
+ ;
PROTECTION_PART : PROT_SPECIFIER IDENTIFIER_LIST
- HSTATEMENTSEPARATOR
- | PROTECTION_PART PROT_SPECIFIER
- IDENTIFIER_LIST HSTATEMENTSEPARATOR
- ;
+ HSTATEMENTSEPARATOR
+ | PROTECTION_PART PROT_SPECIFIER
+ IDENTIFIER_LIST HSTATEMENTSEPARATOR
+ ;
PROT_SPECIFIER : HHIDDEN
- | HPROTECTED
- | HHIDDEN
- HPROTECTED
- | HPROTECTED
- HHIDDEN
- ;
+ | HPROTECTED
+ | HHIDDEN
+ HPROTECTED
+ | HPROTECTED
+ HHIDDEN
+ ;
MBEE_VIRT_PART : /*EMPT*/
- | VIRTUAL_PART
- ;
+ | VIRTUAL_PART
+ ;
VIRTUAL_PART : HVIRTUAL
- HLABELSEPARATOR
- MBEE_SPEC_PART
- ;
+ HLABELSEPARATOR
+ MBEE_SPEC_PART
+ ;
IDENTIFIER_LIST : HIDENTIFIER
- | IDENTIFIER_LIST HPAREXPSEPARATOR
- HIDENTIFIER
- ;
+ | IDENTIFIER_LIST HPAREXPSEPARATOR
+ HIDENTIFIER
+ ;
IDENTIFIER_LISTC: HIDENTIFIER
- MBEE_CONSTANT
- | IDENTIFIER_LISTC HPAREXPSEPARATOR
- HIDENTIFIER
- MBEE_CONSTANT
- ;
-MBEE_CONSTANT : /* EMPTY */
- | HVALRELOPERATOR
- {}
- EXPRESSION
- ;
+ MBEE_CONSTANT
+ | IDENTIFIER_LISTC HPAREXPSEPARATOR
+ HIDENTIFIER
+ MBEE_CONSTANT
+ ;
+MBEE_CONSTANT : /* EMPTY */
+ | HVALRELOPERATOR
+ {}
+ EXPRESSION
+ ;
/* GRAMATIKK FOR UTTRYKK */
EXPRESSION : EXPRESSION_SIMP
- | HIF
- EXPRESSION
- HTHEN
- EXPRESSION
- HELSE
- EXPRESSION
- ;
-EXPRESSION_SIMP : EXPRESSION_SIMP
- HASSIGN
- EXPRESSION
- |
-
- EXPRESSION_SIMP
- HCONC
- EXPRESSION_SIMP
- | EXPRESSION_SIMP HOR
- HELSE
- EXPRESSION_SIMP
- %prec HORELSE
- | EXPRESSION_SIMP HAND
- HTHEN
- EXPRESSION_SIMP
- %prec HANDTHEN
- | EXPRESSION_SIMP
- HEQV EXPRESSION_SIMP
- | EXPRESSION_SIMP
- HIMP EXPRESSION_SIMP
- | EXPRESSION_SIMP
- HOR EXPRESSION_SIMP
- | EXPRESSION_SIMP
- HAND EXPRESSION_SIMP
- | HNOT EXPRESSION_SIMP
- | EXPRESSION_SIMP
- HVALRELOPERATOR
- EXPRESSION_SIMP
- | EXPRESSION_SIMP
- HREFRELOPERATOR
- EXPRESSION_SIMP
- | EXPRESSION_SIMP
- HOBJRELOPERATOR
- EXPRESSION_SIMP
- | HTERMOPERATOR
- EXPRESSION_SIMP %prec UNEAR
- | EXPRESSION_SIMP
- HTERMOPERATOR
- EXPRESSION_SIMP
- | EXPRESSION_SIMP
- HFACTOROPERATOR
- EXPRESSION_SIMP
- | EXPRESSION_SIMP
- HPRIMARYOPERATOR
- EXPRESSION_SIMP
- | HBEGPAR
- EXPRESSION HENDPAR
- | HTEXTKONST
- | HCHARACTERKONST
- | HREALKONST
- | HINTEGERKONST
- | HBOOLEANKONST
- | HNONE
- | HIDENTIFIER
- {}
- MBEE_ARG_R_PT
- | HTHIS HIDENTIFIER
- | HNEW
- HIDENTIFIER
- ARG_R_PT
- | EXPRESSION_SIMP
- HDOT
- EXPRESSION_SIMP
- | EXPRESSION_SIMP
- HQUA HIDENTIFIER
- ;
+ | HIF
+ EXPRESSION
+ HTHEN
+ EXPRESSION
+ HELSE
+ EXPRESSION
+ ;
+EXPRESSION_SIMP : EXPRESSION_SIMP
+ HASSIGN
+ EXPRESSION
+ |
+
+ EXPRESSION_SIMP
+ HCONC
+ EXPRESSION_SIMP
+ | EXPRESSION_SIMP HOR
+ HELSE
+ EXPRESSION_SIMP
+ %prec HORELSE
+ | EXPRESSION_SIMP HAND
+ HTHEN
+ EXPRESSION_SIMP
+ %prec HANDTHEN
+ | EXPRESSION_SIMP
+ HEQV EXPRESSION_SIMP
+ | EXPRESSION_SIMP
+ HIMP EXPRESSION_SIMP
+ | EXPRESSION_SIMP
+ HOR EXPRESSION_SIMP
+ | EXPRESSION_SIMP
+ HAND EXPRESSION_SIMP
+ | HNOT EXPRESSION_SIMP
+ | EXPRESSION_SIMP
+ HVALRELOPERATOR
+ EXPRESSION_SIMP
+ | EXPRESSION_SIMP
+ HREFRELOPERATOR
+ EXPRESSION_SIMP
+ | EXPRESSION_SIMP
+ HOBJRELOPERATOR
+ EXPRESSION_SIMP
+ | HTERMOPERATOR
+ EXPRESSION_SIMP %prec UNEAR
+ | EXPRESSION_SIMP
+ HTERMOPERATOR
+ EXPRESSION_SIMP
+ | EXPRESSION_SIMP
+ HFACTOROPERATOR
+ EXPRESSION_SIMP
+ | EXPRESSION_SIMP
+ HPRIMARYOPERATOR
+ EXPRESSION_SIMP
+ | HBEGPAR
+ EXPRESSION HENDPAR
+ | HTEXTKONST
+ | HCHARACTERKONST
+ | HREALKONST
+ | HINTEGERKONST
+ | HBOOLEANKONST
+ | HNONE
+ | HIDENTIFIER
+ {}
+ MBEE_ARG_R_PT
+ | HTHIS HIDENTIFIER
+ | HNEW
+ HIDENTIFIER
+ ARG_R_PT
+ | EXPRESSION_SIMP
+ HDOT
+ EXPRESSION_SIMP
+ | EXPRESSION_SIMP
+ HQUA HIDENTIFIER
+ ;
ARG_R_PT : /*EMPTY*/
- | HBEGPAR
- ARGUMENT_LIST HENDPAR
- ;
+ | HBEGPAR
+ ARGUMENT_LIST HENDPAR
+ ;
MBEE_ARG_R_PT : /*EMPTY*/
- | HBEGPAR
- ARGUMENT_LIST HENDPAR
- ;
+ | HBEGPAR
+ ARGUMENT_LIST HENDPAR
+ ;
ARGUMENT_LIST : EXPRESSION
- | EXPRESSION
- HPAREXPSEPARATOR
- ARGUMENT_LIST
- ;
+ | EXPRESSION
+ HPAREXPSEPARATOR
+ ARGUMENT_LIST
+ ;
]],
dnl INPUT
%token RAND
%token SRAND
%token COPY
- %token THRU
+ %token THROUGH
%token TOP
%token BOTTOM
%token UPPER
]],
[[
top:
- optional_separator
- | element_list
- ;
+ optional_separator
+ | element_list
+ ;
element_list:
- optional_separator middle_element_list optional_separator
- ;
+ optional_separator middle_element_list optional_separator
+ ;
middle_element_list:
- element
- | middle_element_list separator element
- ;
+ element
+ | middle_element_list separator element
+ ;
optional_separator:
- /* empty */
- | separator
- ;
+ /* empty */
+ | separator
+ ;
separator:
- ';'
- | separator ';'
- ;
+ ';'
+ | separator ';'
+ ;
placeless_element:
- VARIABLE '=' any_expr
- | VARIABLE ':' '=' any_expr
- | UP
- | DOWN
- | LEFT
- | RIGHT
- | COMMAND_LINE
- | COMMAND print_args
- | PRINT print_args
- | SH
- {}
- DELIMITED
- | COPY TEXT
- | COPY TEXT THROUGH
- {}
- DELIMITED
- {}
- until
- | COPY THROUGH
- {}
- DELIMITED
- {}
- until
- | FOR VARIABLE '=' expr TO expr optional_by DO
- {}
- DELIMITED
- | simple_if
- | simple_if ELSE
- {}
- DELIMITED
- | reset_variables
- | RESET
- ;
+ VARIABLE '=' any_expr
+ | VARIABLE ':' '=' any_expr
+ | UP
+ | DOWN
+ | LEFT
+ | RIGHT
+ | COMMAND_LINE
+ | COMMAND print_args
+ | PRINT print_args
+ | SH
+ {}
+ DELIMITED
+ | COPY TEXT
- | COPY TEXT THRU
++ | COPY TEXT THROUGH
+ {}
+ DELIMITED
+ {}
+ until
- | COPY THRU
++ | COPY THROUGH
+ {}
+ DELIMITED
+ {}
+ until
+ | FOR VARIABLE '=' expr TO expr optional_by DO
+ {}
+ DELIMITED
+ | simple_if
+ | simple_if ELSE
+ {}
+ DELIMITED
+ | reset_variables
+ | RESET
+ ;
reset_variables:
- RESET VARIABLE
- | reset_variables VARIABLE
- | reset_variables ',' VARIABLE
- ;
+ RESET VARIABLE
+ | reset_variables VARIABLE
+ | reset_variables ',' VARIABLE
+ ;
print_args:
- print_arg
- | print_args print_arg
- ;
+ print_arg
+ | print_args print_arg
+ ;
print_arg:
- expr %prec ','
- | text
- | position %prec ','
- ;
+ expr %prec ','
+ | text
+ | position %prec ','
+ ;
simple_if:
- IF any_expr THEN
- {}
- DELIMITED
- ;
+ IF any_expr THEN
+ {}
+ DELIMITED
+ ;
until:
- /* empty */
- | UNTIL TEXT
- ;
+ /* empty */
+ | UNTIL TEXT
+ ;
any_expr:
- expr
- | text_expr
- ;
+ expr
+ | text_expr
+ ;
text_expr:
- text EQUALEQUAL text
- | text NOTEQUAL text
- | text_expr ANDAND text_expr
- | text_expr ANDAND expr
- | expr ANDAND text_expr
- | text_expr OROR text_expr
- | text_expr OROR expr
- | expr OROR text_expr
- | '!' text_expr
- ;
+ text EQUALEQUAL text
+ | text NOTEQUAL text
+ | text_expr ANDAND text_expr
+ | text_expr ANDAND expr
+ | expr ANDAND text_expr
+ | text_expr OROR text_expr
+ | text_expr OROR expr
+ | expr OROR text_expr
+ | '!' text_expr
+ ;
optional_by:
- /* empty */
- | BY expr
- | BY '*' expr
- ;
+ /* empty */
+ | BY expr
+ | BY '*' expr
+ ;
element:
- object_spec
- | LABEL ':' optional_separator element
- | LABEL ':' optional_separator position_not_place
- | LABEL ':' optional_separator place
- | '{' {} element_list '}'
- {}
- optional_element
- | placeless_element
- ;
+ object_spec
+ | LABEL ':' optional_separator element
+ | LABEL ':' optional_separator position_not_place
+ | LABEL ':' optional_separator place
+ | '{' {} element_list '}'
+ {}
+ optional_element
+ | placeless_element
+ ;
optional_element:
- /* empty */
- | element
- ;
+ /* empty */
+ | element
+ ;
object_spec:
- BOX
- | CIRCLE
- | ELLIPSE
- | ARC
- | LINE
- | ARROW
- | MOVE
- | SPLINE
- | text %prec TEXT
- | PLOT expr
- | PLOT expr text
- | '['
- {}
- element_list ']'
- | object_spec HEIGHT expr
- | object_spec RADIUS expr
- | object_spec WIDTH expr
- | object_spec DIAMETER expr
- | object_spec expr %prec HEIGHT
- | object_spec UP
- | object_spec UP expr
- | object_spec DOWN
- | object_spec DOWN expr
- | object_spec RIGHT
- | object_spec RIGHT expr
- | object_spec LEFT
- | object_spec LEFT expr
- | object_spec FROM position
- | object_spec TO position
- | object_spec AT position
- | object_spec WITH path
- | object_spec WITH position %prec ','
- | object_spec BY expr_pair
- | object_spec THEN
- | object_spec SOLID
- | object_spec DOTTED
- | object_spec DOTTED expr
- | object_spec DASHED
- | object_spec DASHED expr
- | object_spec FILL
- | object_spec FILL expr
- | object_spec SHADED text
- | object_spec COLORED text
- | object_spec OUTLINED text
- | object_spec CHOP
- | object_spec CHOP expr
- | object_spec SAME
- | object_spec INVISIBLE
- | object_spec LEFT_ARROW_HEAD
- | object_spec RIGHT_ARROW_HEAD
- | object_spec DOUBLE_ARROW_HEAD
- | object_spec CW
- | object_spec CCW
- | object_spec text %prec TEXT
- | object_spec LJUST
- | object_spec RJUST
- | object_spec ABOVE
- | object_spec BELOW
- | object_spec THICKNESS expr
- | object_spec ALIGNED
- ;
+ BOX
+ | CIRCLE
+ | ELLIPSE
+ | ARC
+ | LINE
+ | ARROW
+ | MOVE
+ | SPLINE
+ | text %prec TEXT
+ | PLOT expr
+ | PLOT expr text
+ | '['
+ {}
+ element_list ']'
+ | object_spec HEIGHT expr
+ | object_spec RADIUS expr
+ | object_spec WIDTH expr
+ | object_spec DIAMETER expr
+ | object_spec expr %prec HEIGHT
+ | object_spec UP
+ | object_spec UP expr
+ | object_spec DOWN
+ | object_spec DOWN expr
+ | object_spec RIGHT
+ | object_spec RIGHT expr
+ | object_spec LEFT
+ | object_spec LEFT expr
+ | object_spec FROM position
+ | object_spec TO position
+ | object_spec AT position
+ | object_spec WITH path
+ | object_spec WITH position %prec ','
+ | object_spec BY expr_pair
+ | object_spec THEN
+ | object_spec SOLID
+ | object_spec DOTTED
+ | object_spec DOTTED expr
+ | object_spec DASHED
+ | object_spec DASHED expr
+ | object_spec FILL
+ | object_spec FILL expr
+ | object_spec SHADED text
+ | object_spec COLORED text
+ | object_spec OUTLINED text
+ | object_spec CHOP
+ | object_spec CHOP expr
+ | object_spec SAME
+ | object_spec INVISIBLE
+ | object_spec LEFT_ARROW_HEAD
+ | object_spec RIGHT_ARROW_HEAD
+ | object_spec DOUBLE_ARROW_HEAD
+ | object_spec CW
+ | object_spec CCW
+ | object_spec text %prec TEXT
+ | object_spec LJUST
+ | object_spec RJUST
+ | object_spec ABOVE
+ | object_spec BELOW
+ | object_spec THICKNESS expr
+ | object_spec ALIGNED
+ ;
text:
- TEXT
- | SPRINTF '(' TEXT sprintf_args ')'
- ;
+ TEXT
+ | SPRINTF '(' TEXT sprintf_args ')'
+ ;
sprintf_args:
- /* empty */
- | sprintf_args ',' expr
- ;
+ /* empty */
+ | sprintf_args ',' expr
+ ;
position:
- position_not_place
- | place
- ;
+ position_not_place
+ | place
+ ;
position_not_place:
- expr_pair
- | position '+' expr_pair
- | position '-' expr_pair
- | '(' position ',' position ')'
- | expr between position AND position
- | expr '<' position ',' position '>'
- ;
+ expr_pair
+ | position '+' expr_pair
+ | position '-' expr_pair
+ | '(' position ',' position ')'
+ | expr between position AND position
+ | expr '<' position ',' position '>'
+ ;
between:
- BETWEEN
- | OF THE WAY BETWEEN
- ;
+ BETWEEN
+ | OF THE WAY BETWEEN
+ ;
expr_pair:
- expr ',' expr
- | '(' expr_pair ')'
- ;
+ expr ',' expr
+ | '(' expr_pair ')'
+ ;
place:
- /* line at A left == line (at A) left */
- label %prec CHOP
- | label corner
- | corner label
- | corner OF label
- | HERE
- ;
+ /* line at A left == line (at A) left */
+ label %prec CHOP
+ | label corner
+ | corner label
+ | corner OF label
+ | HERE
+ ;
label:
- LABEL
- | nth_primitive
- | label '.' LABEL
- ;
+ LABEL
+ | nth_primitive
+ | label '.' LABEL
+ ;
ordinal:
- ORDINAL
- | '`' any_expr TH
- ;
+ ORDINAL
+ | '`' any_expr TH
+ ;
optional_ordinal_last:
- LAST
- | ordinal LAST
- ;
+ LAST
+ | ordinal LAST
+ ;
nth_primitive:
- ordinal object_type
- | optional_ordinal_last object_type
- ;
+ ordinal object_type
+ | optional_ordinal_last object_type
+ ;
object_type:
- BOX
- | CIRCLE
- | ELLIPSE
- | ARC
- | LINE
- | ARROW
- | SPLINE
- | '[' ']'
- | TEXT
- ;
+ BOX
+ | CIRCLE
+ | ELLIPSE
+ | ARC
+ | LINE
+ | ARROW
+ | SPLINE
+ | '[' ']'
+ | TEXT
+ ;
label_path:
- '.' LABEL
- | label_path '.' LABEL
- ;
+ '.' LABEL
+ | label_path '.' LABEL
+ ;
relative_path:
- corner %prec CHOP
- /* give this a lower precedence than LEFT and RIGHT so that
- [A: box] with .A left == [A: box] with (.A left) */
- | label_path %prec TEXT
- | label_path corner
- ;
+ corner %prec CHOP
+ /* give this a lower precedence than LEFT and RIGHT so that
+ [A: box] with .A left == [A: box] with (.A left) */
+ | label_path %prec TEXT
+ | label_path corner
+ ;
path:
- relative_path
- | '(' relative_path ',' relative_path ')'
- {}
- /* The rest of these rules are a compatibility sop. */
- | ORDINAL LAST object_type relative_path
- | LAST object_type relative_path
- | ORDINAL object_type relative_path
- | LABEL relative_path
- ;
+ relative_path
+ | '(' relative_path ',' relative_path ')'
+ {}
+ /* The rest of these rules are a compatibility sop. */
+ | ORDINAL LAST object_type relative_path
+ | LAST object_type relative_path
+ | ORDINAL object_type relative_path
+ | LABEL relative_path
+ ;
corner:
- DOT_N
- | DOT_E
- | DOT_W
- | DOT_S
- | DOT_NE
- | DOT_SE
- | DOT_NW
- | DOT_SW
- | DOT_C
- | DOT_START
- | DOT_END
- | TOP
- | BOTTOM
- | LEFT
- | RIGHT
- | UPPER LEFT
- | LOWER LEFT
- | UPPER RIGHT
- | LOWER RIGHT
- | LEFT_CORNER
- | RIGHT_CORNER
- | UPPER LEFT_CORNER
- | LOWER LEFT_CORNER
- | UPPER RIGHT_CORNER
- | LOWER RIGHT_CORNER
- | NORTH
- | SOUTH
- | EAST
- | WEST
- | CENTER
- | START
- | END
- ;
+ DOT_N
+ | DOT_E
+ | DOT_W
+ | DOT_S
+ | DOT_NE
+ | DOT_SE
+ | DOT_NW
+ | DOT_SW
+ | DOT_C
+ | DOT_START
+ | DOT_END
+ | TOP
+ | BOTTOM
+ | LEFT
+ | RIGHT
+ | UPPER LEFT
+ | LOWER LEFT
+ | UPPER RIGHT
+ | LOWER RIGHT
+ | LEFT_CORNER
+ | RIGHT_CORNER
+ | UPPER LEFT_CORNER
+ | LOWER LEFT_CORNER
+ | UPPER RIGHT_CORNER
+ | LOWER RIGHT_CORNER
+ | NORTH
+ | SOUTH
+ | EAST
+ | WEST
+ | CENTER
+ | START
+ | END
+ ;
expr:
- VARIABLE
- | NUMBER
- | place DOT_X
- | place DOT_Y
- | place DOT_HT
- | place DOT_WID
- | place DOT_RAD
- | expr '+' expr
- | expr '-' expr
- | expr '*' expr
- | expr '/' expr
- | expr '%' expr
- | expr '^' expr
- | '-' expr %prec '!'
- | '(' any_expr ')'
- | SIN '(' any_expr ')'
- | COS '(' any_expr ')'
- | ATAN2 '(' any_expr ',' any_expr ')'
- | LOG '(' any_expr ')'
- | EXP '(' any_expr ')'
- | SQRT '(' any_expr ')'
- | K_MAX '(' any_expr ',' any_expr ')'
- | K_MIN '(' any_expr ',' any_expr ')'
- | INT '(' any_expr ')'
- | RAND '(' any_expr ')'
- | RAND '(' ')'
- | SRAND '(' any_expr ')'
- | expr '<' expr
- | expr LESSEQUAL expr
- | expr '>' expr
- | expr GREATEREQUAL expr
- | expr EQUALEQUAL expr
- | expr NOTEQUAL expr
- | expr ANDAND expr
- | expr OROR expr
- | '!' expr
- ;
+ VARIABLE
+ | NUMBER
+ | place DOT_X
+ | place DOT_Y
+ | place DOT_HT
+ | place DOT_WID
+ | place DOT_RAD
+ | expr '+' expr
+ | expr '-' expr
+ | expr '*' expr
+ | expr '/' expr
+ | expr '%' expr
+ | expr '^' expr
+ | '-' expr %prec '!'
+ | '(' any_expr ')'
+ | SIN '(' any_expr ')'
+ | COS '(' any_expr ')'
+ | ATAN2 '(' any_expr ',' any_expr ')'
+ | LOG '(' any_expr ')'
+ | EXP '(' any_expr ')'
+ | SQRT '(' any_expr ')'
+ | K_MAX '(' any_expr ',' any_expr ')'
+ | K_MIN '(' any_expr ',' any_expr ')'
+ | INT '(' any_expr ')'
+ | RAND '(' any_expr ')'
+ | RAND '(' ')'
+ | SRAND '(' any_expr ')'
+ | expr '<' expr
+ | expr LESSEQUAL expr
+ | expr '>' expr
+ | expr GREATEREQUAL expr
+ | expr EQUALEQUAL expr
+ | expr NOTEQUAL expr
+ | expr ANDAND expr
+ | expr OROR expr
+ | '!' expr
+ ;
]],
dnl INPUT
# --------------------------------------------------
# This macro works around the impossibility to define macros
# inside macros, because issuing `[$1]' is not possible in M4 :(.
-# This sucks hard, GNU M4 should really provide M5 like $$1.
+# This sucks hard, GNU M4 should really provide M5-like $$1.
m4_define([_AT_BISON_OPTION_PUSHDEFS],
[m4_if([$1$2], $[1]$[2], [],
[m4_fatal([$0: Invalid arguments: $@])])dnl
[m4_bmatch([$3], [%name-prefix ".*"],
[m4_bregexp([$3], [name-prefix "\([^"]*\)"], [\1])],
[yy])])
+m4_pushdef([AT_TOKEN_PREFIX],
+[m4_bmatch([$3], [%define api.tokens.prefix ".*"],
+ [m4_bregexp([$3], [%define api.tokens.prefix "\(.*\)"], [\1])])])
# yyerror receives the location if %location & %pure & (%glr or %parse-param).
m4_pushdef([AT_YYERROR_ARG_LOC_IF],
[AT_GLR_OR_PARAM_IF([AT_PURE_AND_LOC_IF([$1], [$2])],
- [$2])])
+ [$2])])
# yyerror always sees the locations (when activated), except if
# (yacc & pure & !param). FIXME: This is wrong. See the manual.
m4_pushdef([AT_YYERROR_SEES_LOC_IF],
[AT_LOCATION_IF([AT_YACC_IF([AT_PURE_IF([AT_PARAM_IF([$1], [$2])],
- [$1])],
- [$1])],
- [$2])])
+ [$1])],
+ [$1])],
+ [$2])])
# The interface is pure: either because %define api.pure, or because we
# are using the C++ parsers.
m4_pushdef([AT_PURE_LEX_IF],
[AT_PURE_IF([$1],
- [AT_SKEL_CC_IF([$1], [$2])])])
+ [AT_SKEL_CC_IF([$1], [$2])])])
AT_PURE_LEX_IF(
[m4_pushdef([AT_LOC], [(*llocp)])
m4_pushdef([AT_VAL], [(*lvalp)])
m4_pushdef([AT_LEX_FORMALS],
- [YYSTYPE *lvalp[]AT_LOCATION_IF([, YYLTYPE *llocp])])
+ [YYSTYPE *lvalp[]AT_LOCATION_IF([, YYLTYPE *llocp])])
m4_pushdef([AT_LEX_ARGS],
- [lvalp[]AT_LOCATION_IF([, llocp])])
+ [lvalp[]AT_LOCATION_IF([, llocp])])
m4_pushdef([AT_USE_LEX_ARGS],
- [(void) lvalp;AT_LOCATION_IF([(void) llocp])])
+ [(void) lvalp;AT_LOCATION_IF([(void) llocp])])
m4_pushdef([AT_LEX_PRE_FORMALS],
- [AT_LEX_FORMALS, ])
+ [AT_LEX_FORMALS, ])
m4_pushdef([AT_LEX_PRE_ARGS],
- [AT_LEX_ARGS, ])
+ [AT_LEX_ARGS, ])
],
[m4_pushdef([AT_LOC], [[(]AT_NAME_PREFIX[lloc)]])
m4_pushdef([AT_VAL], [[(]AT_NAME_PREFIX[lval)]])
[AT_LOC_PUSHDEF([begin.line], [begin.column], [end.line], [end.column])])],
[AT_LOC_PUSHDEF([first_line], [first_column], [last_line], [last_column])])
+
+AT_GLR_IF([AT_KEYWORDS([glr])])
])# _AT_BISON_OPTION_PUSHDEFS
# assume that we are linking too; this is a hack.
m4_define([AT_COMPILE],
[AT_CHECK([$CC $CFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])-o $1 m4_default([$2], [$1.c])[]m4_bmatch([$1], [[.]], [], [ $LIBS])],
- 0, [ignore], [ignore])])
+ 0, [ignore], [ignore])])
# AT_COMPILE_CXX(OUTPUT, [SOURCES = OUTPUT.cc])
# --------------------------------------------
[AT_KEYWORDS(c++)
AT_CHECK([$BISON_CXX_WORKS], 0, ignore, ignore)
AT_CHECK([$CXX $CXXFLAGS $CPPFLAGS m4_bmatch([$1], [[.]], [], [$LDFLAGS ])-o $1 m4_default([$2], [$1.cc])[]m4_bmatch([$1], [[.]], [], [ $LIBS])],
- 0, [ignore], [ignore])])
+ 0, [ignore], [ignore])])
# AT_JAVA_COMPILE(SOURCES)
# ------------------------
# In some versions of Autoconf, AT_CHECK invokes AS_ESCAPE before
# expanding macros, so it corrupts some special characters in the
# macros. To avoid this, expand now and pass it the result with proper
- # string quotation. Assume args 7 thru 12 expand to properly quoted
+ # string quotation. Assume args 7 through 12 expand to properly quoted
# strings.
m4_if(m4_index(m4_quote($3), [no-xml]), -1,
projects / bison.git / commitdiff
