?????????? ????????? - ??????????????? - /home/agenciai/public_html/cd38d8/bison.zip
???????
PK �s�[,D��� � TODOnu �[��� * Soon ** gnulib Bruno notes: > I haven't looked deeply, but it strikes me that gnulib/lib/bitset/array.c > does not make use of the 'ffsl' function, nor or the 'integer_length_l' > function. Maybe because in Bison, all bitsets are so dense that it does > not give a performance advantage? ** Cex *** Improve gnulib Don't do this (counterexample.c): // This is the fastest way to get the tail node from the gl_list API. gl_list_node_t list_get_end (gl_list_t list) { gl_list_node_t sentinel = gl_list_add_last (list, NULL); gl_list_node_t res = gl_list_previous_node (list, sentinel); gl_list_remove_node (list, sentinel); return res; } *** Ambiguous rewriting If the user is stupid enough to have equal rules, then the derivations are harder to read: Reduce/reduce conflict on tokens $end, "+", "⊕": 2 exp: exp "+" exp . 3 exp: exp "+" exp . Example exp "+" exp • First derivation exp ::=[ exp "+" exp • ] Example exp "+" exp • Second derivation exp ::=[ exp "+" exp • ] Do we care about this? In color, we use twice the same color here, but we could try to use the same color for the same rule. *** XML reports Show the counterexamples. This is going to be really hard and/or painful. Unless we play it dumb (little structure). ** Bistromathic - How about not evaluating incomplete lines when the text is not finished (as shells do). ** Questions *** Java - Should i18n be part of the Lexer? Currently it's a static method of Lexer. - is there a migration path that would allow to use TokenKinds in yylex? - define the tokens as an enum too. - promote YYEOF rather than EOF. ** YYerror https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=blob;f=gettext-runtime/intl/plural.y;h=a712255af4f2f739c93336d4ff6556d932a426a5;hb=HEAD should be updated to not use YYERRCODE. Returning an undef token is good enough. ** Java *** calc.at Stop hard-coding "Calc". Adjust local.at (look for FIXME). ** A dev warning for b4_ Maybe we should check for m4_ and b4_ leaking out of the m4 processing, as Autoconf does. It would have caught over-quotation issues. ** doc I feel it's ugly to use the GNU style to declare functions in the doc. It generates tons of white space in the page, and may contribute to bad page breaks. ** consistency token vs terminal. ** api.token.raw The YYUNDEFTOK could be assigned a semantic value so that yyerror could be used to report invalid lexemes. ** push parsers Consider deprecating impure push parsers. They add a lot of complexity, for a bad feature. On the other hand, that would make it much harder to sit push parsers on top of pull parser. Which is currently not relevant, since push parsers are measurably slower. ** %define parse.error formatted How about pushing Bistromathic's yyreport_syntax_error as another standard way to generate the error message, and leave to the user the task of providing the message formats? Currently in bistro, it reads: const char * error_format_string (int argc) { switch (argc) { default: /* Avoid compiler warnings. */ case 0: return _("%@: syntax error"); case 1: return _("%@: syntax error: unexpected %u"); // TRANSLATORS: '%@' is a location in a file, '%u' is an // "unexpected token", and '%0e', '%1e'... are expected tokens // at this point. // // For instance on the expression "1 + * 2", you'd get // // 1.5: syntax error: expected - or ( or number or function or variable before * case 2: return _("%@: syntax error: expected %0e before %u"); case 3: return _("%@: syntax error: expected %0e or %1e before %u"); case 4: return _("%@: syntax error: expected %0e or %1e or %2e before %u"); case 5: return _("%@: syntax error: expected %0e or %1e or %2e or %3e before %u"); case 6: return _("%@: syntax error: expected %0e or %1e or %2e or %3e or %4e before %u"); case 7: return _("%@: syntax error: expected %0e or %1e or %2e or %3e or %4e or %5e before %u"); case 8: return _("%@: syntax error: expected %0e or %1e or %2e or %3e or %4e or %5e or %6e before %u"); } } The message would have to be generated in a string, and pushed to yyerror. Which will be a pain in the neck in yacc.c. If we want to do that, we should think very carefully about the syntax of the format string. ** yyclearin does not invoke the lookahead token's %destructor https://lists.gnu.org/r/bug-bison/2018-02/msg00000.html Rici: > Modifying yyclearin so that it calls yydestruct seems like the simplest > solution to this issue, but it is conceivable that such a change would > break programs which already perform some kind of workaround in order to > destruct the lookahead symbol. So it might be necessary to use some kind of > compatibility %define, or to create a new replacement macro with a > different name such as yydiscardin. > > At a minimum, the fact that yyclearin does not invoke the %destructor > should be highlighted in the documentation, since it is not at all obvious. ** Issues in i18n Les catégories d'avertissements incluent : conflicts-sr conflits S/R (activé par défaut) conflicts-rr conflits R/R (activé par défaut) dangling-alias l'alias chaîne n'est pas attaché à un symbole deprecated construction obsolète empty-rule règle vide sans %empty midrule-values valeurs de règle intermédiaire non définies ou inutilisées precedence priorité et associativité inutiles yacc incompatibilités avec POSIX Yacc other tous les autres avertissements (activé par défaut) all tous les avertissements sauf « dangling-alias » et « yacc » no-CATEGORY désactiver les avertissements dans CATEGORIE none désactiver tous les avertissements error[=CATEGORY] traiter les avertissements comme des erreurs Line -1 and -3 should mention CATEGORIE, not CATEGORY. * Bison 3.8 ** Rewrite glr.cc Get rid of scaffolding in glr.c. ** Unit rules / Injection rules (Akim Demaille) Maybe we could expand unit rules (or "injections", see https://homepages.cwi.nl/~daybuild/daily-books/syntax/2-sdf/sdf.html), i.e., transform exp: arith | bool; arith: exp '+' exp; bool: exp '&' exp; into exp: exp '+' exp | exp '&' exp; when there are no actions. This can significantly speed up some grammars. I can't find the papers. In particular the book 'LR parsing: Theory and Practice' is impossible to find, but according to 'Parsing Techniques: a Practical Guide', it includes information about this issue. Does anybody have it? ** clean up (Akim Demaille) Do not work on these items now, as I (Akim) have branches with a lot of changes in this area (hitting several files), and no desire to have to fix conflicts. Addressing these items will happen after my branches have been merged. *** lalr.c Introduce a goto struct, and use it in place of from_state/to_state. Rename states1 as path, length as pathlen. Introduce inline functions for things such as nullable[*rp - ntokens] where we need to map from symbol number to nterm number. There are probably a significant part of the relations management that should be migrated on top of a bitsetv. *** closure It should probably take a "state*" instead of two arguments. *** traces The "automaton" and "set" categories are not so useful. We should probably introduce lr(0) and lalr, just the way we have ielr categories. The "closure" function is too verbose, it should probably have its own category. "set" can still be used for summarizing the important sets. That would make tests easy to maintain. *** complain.* Rename these guys as "diagnostics.*" (or "diagnose.*"), since that's the name they have in GCC, clang, etc. Likewise for the complain_* series of functions. *** ritem states/nstates, rules/nrules, ..., ritem/nritems Fix the latter. * D programming language There's a number of features that are missing, here sorted in _suggested_ order of implementation. When copying code from other skeletons, keep the comments exactly as they are. Keep the same variable names. If you change the wording in one place, do it in the others too. In other words: make sure to keep the maintenance *simple* by avoiding any gratuitous difference. ** Rename the D example Move the current content of examples/d into examples/d/simple. ** Create a second example Duplicate examples/d/simple into examples/d/calc. ** Add location tracking to d/calc Look at the examples in the other languages to see how to do that. ** yysymbol_name The SymbolKind is an enum. For a given SymbolKind we want to get its string representation. Currently it's a separate table in the parser that does that: /* Symbol kinds. */ public enum SymbolKind { S_YYEMPTY = -2, /* No symbol. */ S_YYEOF = 0, /* "end of file" */ S_YYerror = 1, /* error */ S_YYUNDEF = 2, /* "invalid token" */ S_EQ = 3, /* "=" */ ... S_input = 14, /* input */ S_line = 15, /* line */ S_exp = 16, /* exp */ }; ... /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at \a yyntokens_, nonterminals. */ private static immutable string[] yytname_ = [ "\"end of file\"", "error", "\"invalid token\"", "\"=\"", "\"+\"", "\"-\"", "\"*\"", "\"/\"", "\"(\"", "\")\"", "\"end of line\"", "\"number\"", "UNARY", "$accept", "input", "line", "exp", null ]; ... So to get a symbol kind, one runs `yytname_[yykind]`. Is there a way to attach this conversion to string to SymbolKind? In Java for instance, we have: public enum SymbolKind { S_YYEOF(0), /* "end of file" */ S_YYerror(1), /* error */ S_YYUNDEF(2), /* "invalid token" */ ... S_input(16), /* input */ S_line(17), /* line */ S_exp(18); /* exp */ private final int yycode_; SymbolKind (int n) { this.yycode_ = n; } ... /* YYNAMES_[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at \a YYNTOKENS_, nonterminals. */ private static final String[] yynames_ = yynames_init(); private static final String[] yynames_init() { return new String[] { i18n("end of file"), i18n("error"), i18n("invalid token"), "!", "+", "-", "*", "/", "^", "(", ")", "=", i18n("end of line"), i18n("number"), "NEG", "$accept", "input", "line", "exp", null }; } /* The user-facing name of this symbol. */ public final String getName() { return yynames_[yycode_]; } }; which allows to write more naturally `yykind.getName()` rather than `yytname_[yykind]`. Is there something comparable in (idiomatic) D? ** Change the return value of yylex Historically people were allowed to return any int from the scanner (which is convenient and allows `return '+'` from the scanner). Akim tends to see this as an error, we should restrict the return values to TokenKind (not to be confused with SymbolKind). In the case of D, without the history, we have the choice to support or not `int`. If we want to _keep_ `int`, is there a way, say via introspection, to support both signatures of yylex? If we don't keep `int`, just move to TokenKind. ** Documentation Write documentation about D support in doc/bison.texi. Imitate the Java documentation. You should be more succinct IMHO. ** Complete Symbols The current interface from the scanner to the parser is somewhat clumsy: the token kind is returned by yylex, but the value and location are stored in the scanner. This reflects the fact that the implementation of the parser uses three variables to deal with each parsed symbol: its kind, its value, its location. So today the scanner of examples/d/calc.d (no locations) looks like: if (input.front.isNumber) { import std.conv : parse; semanticVal_.ival = input.parse!int; return TokenKind.NUM; } and the generated parser: /* Read a lookahead token. */ if (yychar == TokenKind.YYEMPTY) { yychar = yylex (); yylval = yylexer.semanticVal; } The parser class should feature a `Symbol` type which binds together kind, value and location, and the scanner should be able to return an instance of that type. Something like if (input.front.isNumber) { import std.conv : parse; return parser.Symbol (TokenKind.NUM, input.parse!int); } ** Token Constructors In the previous example it is possible to mix incorrectly kinds and values, and for instance: return parser.Symbol (TokenKind.NUM, "Hello, World!\n"); attaches a string value to NUM kind (wrong, of course). When api.token.constructor is set, in C++, Bison generated "token constructors": parser.make_NUM. parser.make_PLUS, parser.make_STRING, etc. The previous example becomes return parser.make_NUM ("Hello, World!\n"); which would easily be caught by the type checker. ** Lookahead Correction Add support for LAC to the D skeleton. It should not be too hard: look how this is done in lalr1.cc, and mock it. ** Push Parser Add support for push parser. Do not start a nice skeleton, just enhance the current one to support push parsers. This is going to be a tougher nut to crack. First, you need to understand well how the push parser is expected to work. To this end: - read the doc - look at examples/c/pushcalc - create an example of a Java push parser. - have a look at the generated parser in Java, which has the advantage of being already based on a parser object, instead of just a function. The C case is harder to read, but it may help too. Keep in mind that because there's no object to maintain state, the C push parser uses some struct (yypstate) to preserve this state. We don't need this in D, the parser object will suffice. I think working directly on the skeleton to add push-parser support is not the simplest path. I suggest that you (1) transform a generated parser into a push parser by hand, and then (2) transform lalr1.d to generate such a parser. Use `git commit` frequently to make sure you keep track of your progress. *** (1.a) Prepare pull parser by hand Copy again one of the D examples into say examples/d/pushcalc. Also check-in the generated parser to facilitate experimentation. - find local variables of yyparse should become members of the parser object (so that we preserve state from one call to the next). - do it in your generated D parser. We don't need an equivalent for yypstate, because we already have it: that the parser object itself. - have your *pull*-parser (i.e., the good old yy::parser::parse()) work properly this way. Write and run tests. That's one of the reasons I suggest using examples/d/calc as a starting point: it already has tests, you can/should add more. At this point you have a pull-parser which you prepared to turn into a push-parser. *** (1.b) Turn pull parser into push parser by hand - look again at how push parsers are implemented in Java/C to see what needs to change in yyparse so that the control is inverted: parse() will be *given* the tokens, instead of having to call yylex itself. When I say "look at C", I think your best option are (i) yacc.c (look for b4_push_if) and (ii) examples/c/pushcalc. - rename parse() as push_parse(Symbol yyla) (or push_parse(TokenKind, Value, Location)) that takes the symbol as argument. That's the push parser we are looking for. - define a new parse() function which has the same signature as the usual pull-parser, that repeatedly calls the push_parse function. Something like this: int parse () { int status = 0; do { status = this->push_parse (yylex()); } while (status == YYPUSH_MORE); return status; } - show me that parser, so that we can validate the approach. *** (2) Port that into the skeleton - once we agree on the API of the push parser, implement it into lalr1.d. You will probaby need help on this regard, but imitation, again, should help. - have example/d/pushcalc work properly and pass tests - add tests in the "real" test suite. Do that in tests/calc.at. I can help. - document ** GLR Parser This is very ambitious. That's the final boss. There are currently no "clean" implementation to get inspiration from. glr.c is very clean but: - is low-level C - is a different skeleton from yacc.c glr.cc is (currently) an ugly hack: a C++ shell around glr.c. Valentin Tolmer is currently rewriting glr.cc to be clean C++, but he is not finished. There will be a lot a common code between lalr1.cc and glr.cc, so eventually I would like them to be fused into a single skeleton, supporting both deterministic and generalized parsing. It would be great for D to also support this. The basic ideas of GLR are explained here: https://www.codeproject.com/Articles/5259825/GLR-Parsing-in-Csharp-How-to-Use-The-Most-Powerful * Better error messages The users are not provided with enough tools to forge their error messages. See for instance "Is there an option to change the message produced by YYERROR_VERBOSE?" by Simon Sobisch, on bison-help. See also https://www.cs.tufts.edu/~nr/cs257/archive/clinton-jefferey/lr-error-messages.pdf https://research.swtch.com/yyerror http://gallium.inria.fr/~fpottier/publis/fpottier-reachability-cc2016.pdf * Modernization Fix data/skeletons/yacc.c so that it defines YYPTRDIFF_T properly for modern and older C++ compilers. Currently the code defaults to defining it to 'long' for non-GCC compilers, but it should use the proper C++ magic to define it to the same type as the C ptrdiff_t type. * Completion Several features are not available in all the back-ends. - lac: D, Java (easy) - push parsers: glr.c, glr.cc, lalr1.cc (not very difficult) - token constructors: Java, C, D (a bit difficult) - glr: D, Java (super difficult) * Bugs ** Autotest has quotation issues tests/input.at:1730:AT_SETUP([%define errors]) -> $ ./tests/testsuite -l | grep errors | sed q 38: input.at:1730 errors * Short term ** Get rid of YYPRINT and b4_toknum Besides yytoknum is wrong when api.token.raw is defined. ** Better design for diagnostics The current implementation of diagnostics is ad hoc, it grew organically. It works as a series of calls to several functions, with dependency of the latter calls on the former. For instance: complain (&sym->location, sym->content->status == needed ? complaint : Wother, _("symbol %s is used, but is not defined as a token" " and has no rules; did you mean %s?"), quote_n (0, sym->tag), quote_n (1, best->tag)); if (feature_flag & feature_caret) location_caret_suggestion (sym->location, best->tag, stderr); We should rewrite this in a more FP way: 1. build a rich structure that denotes the (complete) diagnostic. "Complete" in the sense that it also contains the suggestions, the list of possible matches, etc. 2. send this to the pretty-printing routine. The diagnostic structure should be sufficient so that we can generate all the 'format' of diagnostics, including the fixits. If properly done, this diagnostic module can be detached from Bison and be put in gnulib. It could be used, for instance, for errors caught by xgettext. There's certainly already something alike in GCC. At least that's the impression I get from reading the "-fdiagnostics-format=FORMAT" part of this page: https://gcc.gnu.org/onlinedocs/gcc/Diagnostic-Message-Formatting-Options.html ** Graphviz display code thoughts The code for the --graph option is over two files: print_graph, and graphviz. This is because Bison used to also produce VCG graphs, but since this is no longer true, maybe we could consider these files for fusion. An other consideration worth noting is that print_graph.c (correct me if I am wrong) should contain generic functions, whereas graphviz.c and other potential files should contain just the specific code for that output format. It will probably prove difficult to tell if the implementation is actually generic whilst only having support for a single format, but it would be nice to keep stuff a bit tidier: right now, the construction of the bitset used to show reductions is in the graphviz-specific code, and on the opposite side we have some use of \l, which is graphviz-specific, in what should be generic code. Little effort seems to have been given to factoring these files and their print{,-xml} counterpart. We would very much like to re-use the pretty format of states from .output for the graphs, etc. Since graphviz dies on medium-to-big grammars, maybe consider an other tool? ** push-parser Check it too when checking the different kinds of parsers. And be sure to check that the initial-action is performed once per parsing. ** m4 names b4_shared_declarations is no longer what it is. Make it b4_parser_declaration for instance. ** yychar in lalr1.cc There is a large difference bw maint and master on the handling of yychar (which was removed in lalr1.cc). See what needs to be back-ported. /* User semantic actions sometimes alter yychar, and that requires that yytoken be updated with the new translation. We take the approach of translating immediately before every use of yytoken. One alternative is translating here after every semantic action, but that translation would be missed if the semantic action invokes YYABORT, YYACCEPT, or YYERROR immediately after altering yychar. In the case of YYABORT or YYACCEPT, an incorrect destructor might then be invoked immediately. In the case of YYERROR, subsequent parser actions might lead to an incorrect destructor call or verbose syntax error message before the lookahead is translated. */ /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ yytoken = yytranslate_ (yychar); ** Get rid of fake #lines [Bison: ...] Possibly as simple as checking whether the column number is nonnegative. I have seen messages like the following from GCC. <built-in>:0: fatal error: opening dependency file .deps/libltdl/argz.Tpo: No such file or directory ** Discuss about %printer/%destroy in the case of C++. It would be very nice to provide the symbol classes with an operator<< and a destructor. Unfortunately the syntax we have chosen for %destroy and %printer make them hard to reuse. For instance, the user is invited to write something like %printer { debug_stream() << $$; } <my_type>; which is hard to reuse elsewhere since it wants to use "debug_stream()" to find the stream to use. The same applies to %destroy: we told the user she could use the members of the Parser class in the printers/destructors, which is not good for an operator<< since it is no longer bound to a particular parser, it's just a (standalone symbol). * Various ** Rewrite glr.cc in C++ (Valentin Tolmer) As a matter of fact, it would be very interesting to see how much we can share between lalr1.cc and glr.cc. Most of the skeletons should be common. It would be a very nice source of inspiration for the other languages. Valentin Tolmer is working on this. ** yychar == YYEMPTY The code in yyerrlab reads: if (yychar <= YYEOF) { /* Return failure if at end of input. */ if (yychar == YYEOF) YYABORT; } There are only two yychar that can be <= YYEOF: YYEMPTY and YYEOF. But I can't produce the situation where yychar is YYEMPTY here, is it really possible? The test suite does not exercise this case. This shows that it would be interesting to manage to install skeleton coverage analysis to the test suite. * From lalr1.cc to yacc.c ** Single stack Merging the three stacks in lalr1.cc simplified the code, prompted for other improvements and also made it faster (probably because memory management is performed once instead of three times). I suggest that we do the same in yacc.c. (Some time later): it's also very nice to have three stacks: it's more dense as we don't lose bits to padding. For instance the typical stack for states will use 8 bits, while it is likely to consume 32 bits in a struct. We need trustworthy benchmarks for Bison, for all our backends. Akim has a few things scattered around; we need to put them in the repo, and make them more useful. * Report ** Figures Some statistics about the grammar and the parser would be useful, especially when asking the user to send some information about the grammars she is working on. We should probably also include some information about the variables (I'm not sure for instance we even specify what LR variant was used). ** GLR How would Paul like to display the conflicted actions? In particular, what when two reductions are possible on a given lookahead token, but one is part of $default. Should we make the two reductions explicit, or just keep $default? See the following point. ** Disabled Reductions See 'tests/conflicts.at (Defaulted Conflicted Reduction)', and decide what we want to do. ** Documentation Extend with error productions. The hard part will probably be finding the right rule so that a single state does not exhibit too many yet undocumented ''features''. Maybe an empty action ought to be presented too. Shall we try to make a single grammar with all these features, or should we have several very small grammars? * Extensions ** More languages? Well, only if there is really some demand for it. *** PHP https://github.com/scfc/bison-php/blob/master/data/lalr1.php *** Python https://lists.gnu.org/r/bison-patches/2013-09/msg00000.html and following ** Multiple start symbols Would be very useful when parsing closely related languages. The idea is to declare several start symbols, for instance %start stmt expr %% stmt: ... expr: ... and to generate parse(), parse_stmt() and parse_expr(). Technically, the above grammar would be transformed into %start yy_start %token YY_START_STMT YY_START_EXPR %% yy_start: YY_START_STMT stmt | YY_START_EXPR expr so that there are no new conflicts in the grammar (as would undoubtedly happen with yy_start: stmt | expr). Then adjust the skeletons so that this initial token (YY_START_STMT, YY_START_EXPR) be shifted first in the corresponding parse function. ** %include This is a popular demand. We already made many changes in the parser that should make this reasonably easy to implement. Bruce Mardle <marblypup@yahoo.co.uk> https://lists.gnu.org/archive/html/bison-patches/2015-09/msg00000.html However, there are many other things to do before having such a feature, because I don't want a % equivalent to #include (which we all learned to hate). I want something that builds "modules" of grammars, and assembles them together, paying attention to keep separate bits separated, in pseudo name spaces. ** Push parsers There is demand for push parsers in Java and C++. And GLR I guess. ** Generate code instead of tables This is certainly quite a lot of work. See http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.50.4539. ** $-1 We should find a means to provide an access to values deep in the stack. For instance, instead of baz: qux { $$ = $<foo>-1 + $<bar>0 + $1; } we should be able to have: foo($foo) bar($bar) baz($bar): qux($qux) { $baz = $foo + $bar + $qux; } Or something like this. ** %if and the like It should be possible to have %if/%else/%endif. The implementation is not clear: should it be lexical or syntactic. Vadim Maslow thinks it must be in the scanner: we must not parse what is in a switched off part of %if. Akim Demaille thinks it should be in the parser, so as to avoid falling into another CPP mistake. (Later): I'm sure there's actually good case for this. People who need that feature can use m4/cpp on top of Bison. I don't think it is worth the trouble in Bison itself. ** XML Output There are couple of available extensions of Bison targeting some XML output. Some day we should consider including them. One issue is that they seem to be quite orthogonal to the parsing technique, and seem to depend mostly on the possibility to have some code triggered for each reduction. As a matter of fact, such hooks could also be used to generate the yydebug traces. Some generic scheme probably exists in there. XML output for GNU Bison and gcc http://www.cs.may.ie/~jpower/Research/bisonXML/ XML output for GNU Bison http://yaxx.sourceforge.net/ * Coding system independence Paul notes: Currently Bison assumes 8-bit bytes (i.e. that UCHAR_MAX is 255). It also assumes that the 8-bit character encoding is the same for the invocation of 'bison' as it is for the invocation of 'cc', but this is not necessarily true when people run bison on an ASCII host and then use cc on an EBCDIC host. I don't think these topics are worth our time addressing (unless we find a gung-ho volunteer for EBCDIC or PDP-10 ports :-) but they should probably be documented somewhere. More importantly, Bison does not currently allow NUL bytes in tokens, either via escapes (e.g., "x\0y") or via a NUL byte in the source code. This should get fixed. * Broken options? ** %token-table ** Skeleton strategy Must we keep %token-table? * Precedence ** Partial order It is unfortunate that there is a total order for precedence. It makes it impossible to have modular precedence information. We should move to partial orders (sounds like series/parallel orders to me). This is a prerequisite for modules. * Pre and post actions. From: Florian Krohm <florian@edamail.fishkill.ibm.com> Subject: YYACT_EPILOGUE To: bug-bison@gnu.org X-Sent: 1 week, 4 days, 14 hours, 38 minutes, 11 seconds ago The other day I had the need for explicitly building the parse tree. I used %locations for that and defined YYLLOC_DEFAULT to call a function that returns the tree node for the production. Easy. But I also needed to assign the S-attribute to the tree node. That cannot be done in YYLLOC_DEFAULT, because it is invoked before the action is executed. The way I solved this was to define a macro YYACT_EPILOGUE that would be invoked after the action. For reasons of symmetry I also added YYACT_PROLOGUE. Although I had no use for that I can envision how it might come in handy for debugging purposes. All is needed is to add #if YYLSP_NEEDED YYACT_EPILOGUE (yyval, (yyvsp - yylen), yylen, yyloc, (yylsp - yylen)); #else YYACT_EPILOGUE (yyval, (yyvsp - yylen), yylen); #endif at the proper place to bison.simple. Ditto for YYACT_PROLOGUE. I was wondering what you think about adding YYACT_PROLOGUE/EPILOGUE to bison. If you're interested, I'll work on a patch. * Better graphics Equip the parser with a means to create the (visual) parse tree. ----- # LocalWords: Cex gnulib gl Bistromathic TokenKinds yylex enum YYEOF EOF # LocalWords: YYerror gettext af hb YYERRCODE undef calc FIXME dev yyerror # LocalWords: Autoconf YYUNDEFTOK lexemes parsers Bistromathic's yyreport # LocalWords: const argc yacc yyclearin lookahead destructor Rici incluent # LocalWords: yydestruct yydiscardin catégories d'avertissements sr activé # LocalWords: conflits défaut rr l'alias chaîne n'est attaché un symbole # LocalWords: obsolète règle vide midrule valeurs de intermédiaire ou avec # LocalWords: définies inutilisées priorité associativité inutiles POSIX # LocalWords: incompatibilités tous les autres avertissements sauf dans rp # LocalWords: désactiver CATEGORIE traiter comme des erreurs glr Akim bool # LocalWords: Demaille arith lalr goto struct pathlen nullable ntokens lr # LocalWords: nterm bitsetv ielr ritem nstates nrules nritems yysymbol EQ # LocalWords: SymbolKind YYEMPTY YYUNDEF YYTNAME NUM yyntokens yytname sed # LocalWords: nonterminals yykind yycode YYNAMES yynames init getName conv # LocalWords: TokenKind semanticVal ival yychar yylval yylexer Tolmer hoc # LocalWords: Sobisch YYPTRDIFF ptrdiff Autotest YYPRINT toknum yytoknum # LocalWords: sym Wother stderr FP fixits xgettext fdiagnostics Graphviz # LocalWords: graphviz VCG bitset xml bw maint yytoken YYABORT deps # LocalWords: YYACCEPT yytranslate nonnegative destructors yyerrlab repo # LocalWords: backends stmt expr yy Mardle baz qux Vadim Maslow CPP cpp # LocalWords: yydebug gcc UCHAR EBCDIC gung PDP NUL Pre Florian Krohm utf # LocalWords: YYACT YYLLOC YYLSP yyval yyvsp yylen yyloc yylsp endif # LocalWords: ispell american Local Variables: mode: outline coding: utf-8 fill-column: 76 ispell-dictionary: "american" End: Copyright (C) 2001-2004, 2006, 2008-2015, 2018-2020 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the "GNU Free Documentation License" file as part of this distribution. PK �s�[6��S�i �i NEWSnu �[��� GNU Bison NEWS * Noteworthy changes in release 3.7.4 (2020-11-14) [stable] ** Bug fixes *** Bug fixes in yacc.c In Yacc mode, all the tokens are defined twice: once as an enum, and then as a macro. YYEMPTY was missing its macro. *** Bug fixes in lalr1.cc The lalr1.cc skeleton used to emit internal assertions (using YY_ASSERT) even when the `parse.assert` %define variable is not enabled. It no longer does. The private internal macro YY_ASSERT now obeys the `api.prefix` %define variable. When there is a very large number of tokens, some assertions could be long enough to hit arbitrary limits in Visual C++. They have been rewritten to work around this limitation. ** Changes The YYBISON macro in generated "regular C parsers" (from the "yacc.c" skeleton) used to be defined to 1. It is now defined to the version of Bison as an integer (e.g., 30704 for version 3.7.4). * Noteworthy changes in release 3.7.3 (2020-10-13) [stable] ** Bug fixes Fix concurrent build issues. The bison executable is no longer linked uselessly against libreadline. Fix incorrect use of yytname in glr.cc. * Noteworthy changes in release 3.7.2 (2020-09-05) [stable] This release of Bison fixes all known bugs reported for Bison in MITRE's Common Vulnerabilities and Exposures (CVE) system. These vulnerabilities are only about bison-the-program itself, not the generated code. Although these bugs are typically irrelevant to how Bison is used, they are worth fixing if only to give users peace of mind. There is no known vulnerability in the generated parsers. ** Bug fixes Fix concurrent build issues (introduced in Bison 3.5). Push parsers always use YYMALLOC/YYFREE (no direct calls to malloc/free). Fix portability issues of the test suite, and of bison itself. Some unlikely crashes found by fuzzing have been fixed. This is only about bison itself, not the generated parsers. * Noteworthy changes in release 3.7.1 (2020-08-02) [stable] ** Bug fixes Crash when a token alias contains a NUL byte. Portability issues with libtextstyle. Portability issues of Bison itself with MSVC. ** Changes Improvements and fixes in the documentation. More precise location about symbol type redefinitions. * Noteworthy changes in release 3.7 (2020-07-23) [stable] ** Deprecated features The YYPRINT macro, which works only with yacc.c and only for tokens, was obsoleted long ago by %printer, introduced in Bison 1.50 (November 2002). It is deprecated and its support will be removed eventually. In conformance with the recommendations of the Graphviz team, in the next version Bison the option `--graph` will generate a *.gv file by default, instead of *.dot. A transition started in Bison 3.4. ** New features *** Counterexample Generation Contributed by Vincent Imbimbo. When given `-Wcounterexamples`/`-Wcex`, bison will now output counterexamples for conflicts. **** Unifying Counterexamples Unifying counterexamples are strings which can be parsed in two ways due to the conflict. For example on a grammar that contains the usual "dangling else" ambiguity: $ bison else.y else.y: warning: 1 shift/reduce conflict [-Wconflicts-sr] else.y: note: rerun with option '-Wcounterexamples' to generate conflict counterexamples $ bison else.y -Wcex else.y: warning: 1 shift/reduce conflict [-Wconflicts-sr] else.y: warning: shift/reduce conflict on token "else" [-Wcounterexamples] Example: "if" exp "then" "if" exp "then" exp • "else" exp Shift derivation exp ↳ "if" exp "then" exp ↳ "if" exp "then" exp • "else" exp Example: "if" exp "then" "if" exp "then" exp • "else" exp Reduce derivation exp ↳ "if" exp "then" exp "else" exp ↳ "if" exp "then" exp • When text styling is enabled, colors are used in the examples and the derivations to highlight the structure of both analyses. In this case, "if" exp "then" [ "if" exp "then" exp • ] "else" exp vs. "if" exp "then" [ "if" exp "then" exp • "else" exp ] The counterexamples are "focused", in two different ways. First, they do not clutter the output with all the derivations from the start symbol, rather they start on the "conflicted nonterminal". They go straight to the point. Second, they don't "expand" nonterminal symbols uselessly. **** Nonunifying Counterexamples In the case of the dangling else, Bison found an example that can be parsed in two ways (therefore proving that the grammar is ambiguous). When it cannot find such an example, it instead generates two examples that are the same up until the dot: $ bison foo.y foo.y: warning: 1 shift/reduce conflict [-Wconflicts-sr] foo.y: note: rerun with option '-Wcounterexamples' to generate conflict counterexamples foo.y:4.4-7: warning: rule useless in parser due to conflicts [-Wother] 4 | a: expr | ^~~~ $ bison -Wcex foo.y foo.y: warning: 1 shift/reduce conflict [-Wconflicts-sr] foo.y: warning: shift/reduce conflict on token ID [-Wcounterexamples] First example: expr • ID ',' ID $end Shift derivation $accept ↳ s $end ↳ a ID ↳ expr ↳ expr • ID ',' Second example: expr • ID $end Reduce derivation $accept ↳ s $end ↳ a ID ↳ expr • foo.y:4.4-7: warning: rule useless in parser due to conflicts [-Wother] 4 | a: expr | ^~~~ In these cases, the parser usually doesn't have enough lookahead to differentiate the two given examples. **** Reports Counterexamples are also included in the report when given `--report=counterexamples`/`-rcex` (or `--report=all`), with more technical details: State 7 1 exp: "if" exp "then" exp • [$end, "then", "else"] 2 | "if" exp "then" exp • "else" exp "else" shift, and go to state 8 "else" [reduce using rule 1 (exp)] $default reduce using rule 1 (exp) shift/reduce conflict on token "else": 1 exp: "if" exp "then" exp • 2 exp: "if" exp "then" exp • "else" exp Example: "if" exp "then" "if" exp "then" exp • "else" exp Shift derivation exp ↳ "if" exp "then" exp ↳ "if" exp "then" exp • "else" exp Example: "if" exp "then" "if" exp "then" exp • "else" exp Reduce derivation exp ↳ "if" exp "then" exp "else" exp ↳ "if" exp "then" exp • *** File prefix mapping Contributed by Joshua Watt. Bison learned a new argument, `--file-prefix-map OLD=NEW`. Any file path in the output (specifically `#line` directives and `#ifdef` header guards) that begins with the prefix OLD will have it replaced with the prefix NEW, similar to the `-ffile-prefix-map` in GCC. This option can be used to make bison output reproducible. ** Changes *** Diagnostics When text styling is enabled and the terminal supports it, the warnings now include hyperlinks to the documentation. *** Relocatable installation When installed to be relocatable (via `configure --enable-relocatable`), bison will now also look for a relocated m4. *** C++ file names The `filename_type` %define variable was renamed `api.filename.type`. Instead of %define filename_type "symbol" write %define api.filename.type {symbol} (Or let `bison --update` do it for you). It now defaults to `const std::string` instead of `std::string`. *** Deprecated %define variable names The following variables have been renamed for consistency. Backward compatibility is ensured, but upgrading is recommended. filename_type -> api.filename.type package -> api.package *** Push parsers no longer clear their state when parsing is finished Previously push-parsers cleared their state when parsing was finished (on success and on failure). This made it impossible to check if there were parse errors, since `yynerrs` was also reset. This can be especially troublesome when used in autocompletion, since a parser with error recovery would suggest (irrelevant) expected tokens even if there were failure. Now the parser state can be examined when parsing is finished. The parser state is reset when starting a new parse. ** Documentation *** Examples The bistromathic demonstrates %param and how to quote sources in the error messages: > 123 456 1.5-7: syntax error: expected end of file or + or - or * or / or ^ before number 1 | 123 456 | ^~~ ** Bug fixes *** Include the generated header (yacc.c) Historically, when --defines was used, bison generated a header and pasted an exact copy of it into the generated parser implementation file. Since Bison 3.4 it is possible to specify that the header should be `#include`d, and how. For instance %define api.header.include {"parse.h"} or %define api.header.include {<parser/parse.h>} Now api.header.include defaults to `"header-basename"`, as was intended in Bison 3.4, where `header-basename` is the basename of the generated header. This is disabled when the generated header is `y.tab.h`, to comply with Automake's ylwrap. *** String aliases are faithfully propagated Bison used to interpret user strings (i.e., decoding backslash escapes) when reading them, and to escape them (i.e., issue non-printable characters as backslash escapes, taking the locale into account) when outputting them. As a consequence non-ASCII strings (say in UTF-8) ended up "ciphered" as sequences of backslash escapes. This happened not only in the generated sources (where the compiler will reinterpret them), but also in all the generated reports (text, xml, html, dot, etc.). Reports were therefore not readable when string aliases were not pure ASCII. Worse yet: the output depended on the user's locale. Now Bison faithfully treats the string aliases exactly the way the user spelled them. This fixes all the aforementioned problems. However, now, string aliases semantically equivalent but syntactically different (e.g., "A", "\x41", "\101") are considered to be different. *** Crash when generating IELR An old, well hidden, bug in the generation of IELR parsers was fixed. * Noteworthy changes in release 3.6.4 (2020-06-15) [stable] ** Bug fixes In glr.cc some internal macros leaked in the user's code, and could damage access to the token kinds. * Noteworthy changes in release 3.6.3 (2020-06-03) [stable] ** Bug fixes Incorrect comments in the generated parsers. Warnings in push parsers (yacc.c). Incorrect display of gotos in LAC traces (lalr1.cc). * Noteworthy changes in release 3.6.2 (2020-05-17) [stable] ** Bug fixes Some tests were fixed. When token aliases contain comment delimiters: %token FOO "/* foo */" bison used to emit "nested" comments, which is invalid C. * Noteworthy changes in release 3.6.1 (2020-05-10) [stable] ** Bug fixes Restored ANSI-C compliance in yacc.c. GNU readline portability issues. In C++, yy::parser::symbol_name is now a public member, as was intended. ** New features In C++, yy::parser::symbol_type now has a public name() member function. * Noteworthy changes in release 3.6 (2020-05-08) [stable] ** Backward incompatible changes TL;DR: replace "#define YYERROR_VERBOSE 1" by "%define parse.error verbose". The YYERROR_VERBOSE macro is no longer supported; the parsers that still depend on it will now produce Yacc-like error messages (just "syntax error"). It was superseded by the "%error-verbose" directive in Bison 1.875 (2003-01-01). Bison 2.6 (2012-07-19) clearly announced that support for YYERROR_VERBOSE would be removed. Note that since Bison 3.0 (2013-07-25), "%error-verbose" is deprecated in favor of "%define parse.error verbose". ** Deprecated features The YYPRINT macro, which works only with yacc.c and only for tokens, was obsoleted long ago by %printer, introduced in Bison 1.50 (November 2002). It is deprecated and its support will be removed eventually. ** New features *** Improved syntax error messages Two new values for the %define parse.error variable offer more control to the user. Available in all the skeletons (C, C++, Java). **** %define parse.error detailed The behavior of "%define parse.error detailed" is closely resembling that of "%define parse.error verbose" with a few exceptions. First, it is safe to use non-ASCII characters in token aliases (with 'verbose', the result depends on the locale with which bison was run). Second, a yysymbol_name function is exposed to the user, instead of the yytnamerr function and the yytname table. Third, token internationalization is supported (see below). **** %define parse.error custom With this directive, the user forges and emits the syntax error message herself by defining the yyreport_syntax_error function. A new type, yypcontext_t, captures the circumstances of the error, and provides the user with functions to get details, such as yypcontext_expected_tokens to get the list of expected token kinds. A possible implementation of yyreport_syntax_error is: int yyreport_syntax_error (const yypcontext_t *ctx) { int res = 0; YY_LOCATION_PRINT (stderr, *yypcontext_location (ctx)); fprintf (stderr, ": syntax error"); // Report the tokens expected at this point. { enum { TOKENMAX = 10 }; yysymbol_kind_t expected[TOKENMAX]; int n = yypcontext_expected_tokens (ctx, expected, TOKENMAX); if (n < 0) // Forward errors to yyparse. res = n; else for (int i = 0; i < n; ++i) fprintf (stderr, "%s %s", i == 0 ? ": expected" : " or", yysymbol_name (expected[i])); } // Report the unexpected token. { yysymbol_kind_t lookahead = yypcontext_token (ctx); if (lookahead != YYSYMBOL_YYEMPTY) fprintf (stderr, " before %s", yysymbol_name (lookahead)); } fprintf (stderr, "\n"); return res; } **** Token aliases internationalization When the %define variable parse.error is set to `custom` or `detailed`, one may specify which token aliases are to be translated using _(). For instance %token PLUS "+" MINUS "-" <double> NUM _("number") <symrec*> FUN _("function") VAR _("variable") In that case the user must define _() and N_(), and yysymbol_name returns the translated symbol (i.e., it returns '_("variable")' rather that '"variable"'). In Java, the user must provide an i18n() function. *** List of expected tokens (yacc.c) Push parsers may invoke yypstate_expected_tokens at any point during parsing (including even before submitting the first token) to get the list of possible tokens. This feature can be used to propose autocompletion (see below the "bistromathic" example). It makes little sense to use this feature without enabling LAC (lookahead correction). *** Returning the error token When the scanner returns an invalid token or the undefined token (YYUNDEF), the parser generates an error message and enters error recovery. Because of that error message, most scanners that find lexical errors generate an error message, and then ignore the invalid input without entering the error-recovery. The scanners may now return YYerror, the error token, to enter the error-recovery mode without triggering an additional error message. See the bistromathic for an example. *** Deep overhaul of the symbol and token kinds To avoid the confusion with types in programming languages, we now refer to token and symbol "kinds" instead of token and symbol "types". The documentation and error messages have been revised. All the skeletons have been updated to use dedicated enum types rather than integral types. Special symbols are now regular citizens, instead of being declared in ad hoc ways. **** Token kinds The "token kind" is what is returned by the scanner, e.g., PLUS, NUMBER, LPAREN, etc. While backward compatibility is of course ensured, users are nonetheless invited to replace their uses of "enum yytokentype" by "yytoken_kind_t". This type now also includes tokens that were previously hidden: YYEOF (end of input), YYUNDEF (undefined token), and YYerror (error token). They now have string aliases, internationalized when internationalization is enabled. Therefore, by default, error messages now refer to "end of file" (internationalized) rather than the cryptic "$end", or to "invalid token" rather than "$undefined". Therefore in most cases it is now useless to define the end-of-line token as follows: %token T_EOF 0 "end of file" Rather simply use "YYEOF" in your scanner. **** Symbol kinds The "symbol kinds" is what the parser actually uses. (Unless the api.token.raw %define variable is used, the symbol kind of a terminal differs from the corresponding token kind.) They are now exposed as a enum, "yysymbol_kind_t". This allows users to tailor the error messages the way they want, or to process some symbols in a specific way in autocompletion (see the bistromathic example below). *** Modernize display of explanatory statements in diagnostics Since Bison 2.7, output was indented four spaces for explanatory statements. For example: input.y:2.7-13: error: %type redeclaration for exp input.y:1.7-11: previous declaration Since the introduction of caret-diagnostics, it became less clear. This indentation has been removed and submessages are displayed similarly as in GCC: input.y:2.7-13: error: %type redeclaration for exp 2 | %type <float> exp | ^~~~~~~ input.y:1.7-11: note: previous declaration 1 | %type <int> exp | ^~~~~ Contributed by Victor Morales Cayuela. *** C++ The token and symbol kinds are yy::parser::token_kind_type and yy::parser::symbol_kind_type. The symbol_type::kind() member function allows to get the kind of a symbol. This can be used to write unit tests for scanners, e.g., yy::parser::symbol_type t = make_NUMBER ("123"); assert (t.kind () == yy::parser::symbol_kind::S_NUMBER); assert (t.value.as<int> () == 123); ** Documentation *** User Manual In order to avoid ambiguities with "type" as in "typing", we now refer to the "token kind" (e.g., `PLUS`, `NUMBER`, etc.) rather than the "token type". We now also refer to the "symbol type" (e.g., `PLUS`, `expr`, etc.). *** Examples There are now examples/java: a very simple calculator, and a more complete one (push-parser, location tracking, and debug traces). The lexcalc example (a simple example in C based on Flex and Bison) now also demonstrates location tracking. A new C example, bistromathic, is a fully featured interactive calculator using many Bison features: pure interface, push parser, autocompletion based on the current parser state (using yypstate_expected_tokens), location tracking, internationalized custom error messages, lookahead correction, rich debug traces, etc. It shows how to depend on the symbol kinds to tailor autocompletion. For instance it recognizes the symbol kind "VARIABLE" to propose autocompletion on the existing variables, rather than of the word "variable". * Noteworthy changes in release 3.5.4 (2020-04-05) [stable] ** WARNING: Future backward-incompatibilities! TL;DR: replace "#define YYERROR_VERBOSE 1" by "%define parse.error verbose". Bison 3.6 will no longer support the YYERROR_VERBOSE macro; the parsers that still depend on it will produce Yacc-like error messages (just "syntax error"). It was superseded by the "%error-verbose" directive in Bison 1.875 (2003-01-01). Bison 2.6 (2012-07-19) clearly announced that support for YYERROR_VERBOSE would be removed. Note that since Bison 3.0 (2013-07-25), "%error-verbose" is deprecated in favor of "%define parse.error verbose". ** Bug fixes Fix portability issues of the package itself on old compilers. Fix api.token.raw support in Java. * Noteworthy changes in release 3.5.3 (2020-03-08) [stable] ** Bug fixes Error messages could quote lines containing zero-width characters (such as \005) with incorrect styling. Fixes for similar issues with unexpectedly short lines (e.g., the file was changed between parsing and diagnosing). Some unlikely crashes found by fuzzing have been fixed. This is only about bison itself, not the generated parsers. * Noteworthy changes in release 3.5.2 (2020-02-13) [stable] ** Bug fixes Portability issues and minor cosmetic issues. The lalr1.cc skeleton properly rejects unsupported values for parse.lac (as yacc.c does). * Noteworthy changes in release 3.5.1 (2020-01-19) [stable] ** Bug fixes Portability fixes. Fix compiler warnings. * Noteworthy changes in release 3.5 (2019-12-11) [stable] ** Backward incompatible changes Lone carriage-return characters (aka \r or ^M) in the grammar files are no longer treated as end-of-lines. This changes the diagnostics, and in particular their locations. In C++, line numbers and columns are now represented as 'int' not 'unsigned', so that integer overflow on positions is easily checkable via 'gcc -fsanitize=undefined' and the like. This affects the API for positions. The default position and location classes now expose 'counter_type' (int), used to define line and column numbers. ** Deprecated features The YYPRINT macro, which works only with yacc.c and only for tokens, was obsoleted long ago by %printer, introduced in Bison 1.50 (November 2002). It is deprecated and its support will be removed eventually. ** New features *** Lookahead correction in C++ Contributed by Adrian Vogelsgesang. The C++ deterministic skeleton (lalr1.cc) now supports LAC, via the %define variable parse.lac. *** Variable api.token.raw: Optimized token numbers (all skeletons) In the generated parsers, tokens have two numbers: the "external" token number as returned by yylex (which starts at 257), and the "internal" symbol number (which starts at 3). Each time yylex is called, a table lookup maps the external token number to the internal symbol number. When the %define variable api.token.raw is set, tokens are assigned their internal number, which saves one table lookup per token, and also saves the generation of the mapping table. The gain is typically moderate, but in extreme cases (very simple user actions), a 10% improvement can be observed. *** Generated parsers use better types for states Stacks now use the best integral type for state numbers, instead of always using 15 bits. As a result "small" parsers now have a smaller memory footprint (they use 8 bits), and there is support for large automata (16 bits), and extra large (using int, i.e., typically 31 bits). *** Generated parsers prefer signed integer types Bison skeletons now prefer signed to unsigned integer types when either will do, as the signed types are less error-prone and allow for better checking with 'gcc -fsanitize=undefined'. Also, the types chosen are now portable to unusual machines where char, short and int are all the same width. On non-GNU platforms this may entail including <limits.h> and (if available) <stdint.h> to define integer types and constants. *** A skeleton for the D programming language For the last few releases, Bison has shipped a stealth experimental skeleton: lalr1.d. It was first contributed by Oliver Mangold, based on Paolo Bonzini's lalr1.java, and was cleaned and improved thanks to H. S. Teoh. However, because nobody has committed to improving, testing, and documenting this skeleton, it is not clear that it will be supported in the future. The lalr1.d skeleton *is functional*, and works well, as demonstrated in examples/d/calc.d. Please try it, enjoy it, and... commit to support it. *** Debug traces in Java The Java backend no longer emits code and data for parser tracing if the %define variable parse.trace is not defined. ** Diagnostics *** New diagnostic: -Wdangling-alias String literals, which allow for better error messages, are (too) liberally accepted by Bison, which might result in silent errors. For instance %type <exVal> cond "condition" does not define "condition" as a string alias to 'cond' (nonterminal symbols do not have string aliases). It is rather equivalent to %nterm <exVal> cond %token <exVal> "condition" i.e., it gives the type 'exVal' to the "condition" token, which was clearly not the intention. Also, because string aliases need not be defined, typos such as "baz" instead of "bar" will be not reported. The option -Wdangling-alias catches these situations. On %token BAR "bar" %type <ival> foo "foo" %% foo: "baz" {} bison -Wdangling-alias reports warning: string literal not attached to a symbol | %type <ival> foo "foo" | ^~~~~ warning: string literal not attached to a symbol | foo: "baz" {} | ^~~~~ The -Wall option does not (yet?) include -Wdangling-alias. *** Better POSIX Yacc compatibility diagnostics POSIX Yacc restricts %type to nonterminals. This is now diagnosed by -Wyacc. %token TOKEN1 %type <ival> TOKEN1 TOKEN2 't' %token TOKEN2 %% expr: gives with -Wyacc input.y:2.15-20: warning: POSIX yacc reserves %type to nonterminals [-Wyacc] 2 | %type <ival> TOKEN1 TOKEN2 't' | ^~~~~~ input.y:2.29-31: warning: POSIX yacc reserves %type to nonterminals [-Wyacc] 2 | %type <ival> TOKEN1 TOKEN2 't' | ^~~ input.y:2.22-27: warning: POSIX yacc reserves %type to nonterminals [-Wyacc] 2 | %type <ival> TOKEN1 TOKEN2 't' | ^~~~~~ *** Diagnostics with insertion The diagnostics now display the suggestion below the underlined source. Replacement for undeclared symbols are now also suggested. $ cat /tmp/foo.y %% list: lis '.' | $ bison -Wall foo.y foo.y:2.7-9: error: symbol 'lis' is used, but is not defined as a token and has no rules; did you mean 'list'? 2 | list: lis '.' | | ^~~ | list foo.y:2.16: warning: empty rule without %empty [-Wempty-rule] 2 | list: lis '.' | | ^ | %empty foo.y: warning: fix-its can be applied. Rerun with option '--update'. [-Wother] *** Diagnostics about long lines Quoted sources may now be truncated to fit the screen. For instance, on a 30-column wide terminal: $ cat foo.y %token FOO FOO FOO %% exp: FOO $ bison foo.y foo.y:1.34-36: warning: symbol FOO redeclared [-Wother] 1 | … FOO … | ^~~ foo.y:1.8-10: previous declaration 1 | %token FOO … | ^~~ foo.y:1.62-64: warning: symbol FOO redeclared [-Wother] 1 | … FOO | ^~~ foo.y:1.8-10: previous declaration 1 | %token FOO … | ^~~ ** Changes *** Debugging glr.c and glr.cc The glr.c skeleton always had asserts to check its own behavior (not the user's). These assertions are now under the control of the parse.assert %define variable (disabled by default). *** Clean up Several new compiler warnings in the generated output have been avoided. Some unused features are no longer emitted. Cleaner generated code in general. ** Bug Fixes Portability issues in the test suite. In theory, parsers using %nonassoc could crash when reporting verbose error messages. This unlikely bug has been fixed. In Java, %define api.prefix was ignored. It now behaves as expected. * Noteworthy changes in release 3.4.2 (2019-09-12) [stable] ** Bug fixes In some cases, when warnings are disabled, bison could emit tons of white spaces as diagnostics. When running out of memory, bison could crash (found by fuzzing). When defining twice the EOF token, bison would crash. New warnings from recent compilers have been addressed in the generated parsers (yacc.c, glr.c, glr.cc). When lone carriage-return characters appeared in the input file, diagnostics could hang forever. * Noteworthy changes in release 3.4.1 (2019-05-22) [stable] ** Bug fixes Portability fixes. * Noteworthy changes in release 3.4 (2019-05-19) [stable] ** Deprecated features The %pure-parser directive is deprecated in favor of '%define api.pure' since Bison 2.3b (2008-05-27), but no warning was issued; there is one now. Note that since Bison 2.7 you are strongly encouraged to use '%define api.pure full' instead of '%define api.pure'. ** New features *** Colored diagnostics As an experimental feature, diagnostics are now colored, controlled by the new options --color and --style. To use them, install the libtextstyle library before configuring Bison. It is available from https://alpha.gnu.org/gnu/gettext/ for instance https://alpha.gnu.org/gnu/gettext/libtextstyle-0.8.tar.gz The option --color supports the following arguments: - always, yes: Enable colors. - never, no: Disable colors. - auto, tty (default): Enable colors if the output device is a tty. To customize the styles, create a CSS file similar to /* bison-bw.css */ .warning { } .error { font-weight: 800; text-decoration: underline; } .note { } then invoke bison with --style=bison-bw.css, or set the BISON_STYLE environment variable to "bison-bw.css". *** Disabling output When given -fsyntax-only, the diagnostics are reported, but no output is generated. The name of this option is somewhat misleading as bison does more than just checking the syntax: every stage is run (including checking for conflicts for instance), except the generation of the output files. *** Include the generated header (yacc.c) Before, when --defines is used, bison generated a header, and pasted an exact copy of it into the generated parser implementation file. If the header name is not "y.tab.h", it is now #included instead of being duplicated. To use an '#include' even if the header name is "y.tab.h" (which is what happens with --yacc, or when using the Autotools' ylwrap), define api.header.include to the exact argument to pass to #include. For instance: %define api.header.include {"parse.h"} or %define api.header.include {<parser/parse.h>} *** api.location.type is now supported in C (yacc.c, glr.c) The %define variable api.location.type defines the name of the type to use for locations. When defined, Bison no longer defines YYLTYPE. This can be used in programs with several parsers to factor their definition of locations: let one of them generate them, and the others just use them. ** Changes *** Graphviz output In conformance with the recommendations of the Graphviz team, if %require "3.4" (or better) is specified, the option --graph generates a *.gv file by default, instead of *.dot. *** Diagnostics overhaul Column numbers were wrong with multibyte characters, which would also result in skewed diagnostics with carets. Beside, because we were indenting the quoted source with a single space, lines with tab characters were incorrectly underlined. To address these issues, and to be clearer, Bison now issues diagnostics as GCC9 does. For instance it used to display (there's a tab before the opening brace): foo.y:3.37-38: error: $2 of ‘expr’ has no declared type expr: expr '+' "number" { $$ = $1 + $2; } ^~ It now reports foo.y:3.37-38: error: $2 of ‘expr’ has no declared type 3 | expr: expr '+' "number" { $$ = $1 + $2; } | ^~ Other constructs now also have better locations, resulting in more precise diagnostics. *** Fix-it hints for %empty Running Bison with -Wempty-rules and --update will remove incorrect %empty annotations, and add the missing ones. *** Generated reports The format of the reports (parse.output) was improved for readability. *** Better support for --no-line. When --no-line is used, the generated files are now cleaner: no lines are generated instead of empty lines. Together with using api.header.include, that should help people saving the generated files into version control systems get smaller diffs. ** Documentation A new example in C shows an simple infix calculator with a hand-written scanner (examples/c/calc). A new example in C shows a reentrant parser (capable of recursive calls) built with Flex and Bison (examples/c/reccalc). There is a new section about the history of Yaccs and Bison. ** Bug fixes A few obscure bugs were fixed, including the second oldest (known) bug in Bison: it was there when Bison was entered in the RCS version control system, in December 1987. See the NEWS of Bison 3.3 for the previous oldest bug. * Noteworthy changes in release 3.3.2 (2019-02-03) [stable] ** Bug fixes Bison 3.3 failed to generate parsers for grammars with unused nonterminal symbols. * Noteworthy changes in release 3.3.1 (2019-01-27) [stable] ** Changes The option -y/--yacc used to imply -Werror=yacc, which turns uses of Bison extensions into errors. It now makes them simple warnings (-Wyacc). * Noteworthy changes in release 3.3 (2019-01-26) [stable] A new mailing list was created, Bison Announce. It is low traffic, and is only about announcing new releases and important messages (e.g., polls about major decisions to make). https://lists.gnu.org/mailman/listinfo/bison-announce ** Backward incompatible changes Support for DJGPP, which has been unmaintained and untested for years, is removed. ** Deprecated features A new feature, --update (see below) helps adjusting existing grammars to deprecations. *** Deprecated directives The %error-verbose directive is deprecated in favor of '%define parse.error verbose' since Bison 3.0, but no warning was issued. The '%name-prefix "xx"' directive is deprecated in favor of '%define api.prefix {xx}' since Bison 3.0, but no warning was issued. These directives are slightly different, you might need to adjust your code. %name-prefix renames only symbols with external linkage, while api.prefix also renames types and macros, including YYDEBUG, YYTOKENTYPE, yytokentype, YYSTYPE, YYLTYPE, etc. Users of Flex that move from '%name-prefix "xx"' to '%define api.prefix {xx}' will typically have to update YY_DECL from #define YY_DECL int xxlex (YYSTYPE *yylval, YYLTYPE *yylloc) to #define YY_DECL int xxlex (XXSTYPE *yylval, XXLTYPE *yylloc) *** Deprecated %define variable names The following variables, mostly related to parsers in Java, have been renamed for consistency. Backward compatibility is ensured, but upgrading is recommended. abstract -> api.parser.abstract annotations -> api.parser.annotations extends -> api.parser.extends final -> api.parser.final implements -> api.parser.implements parser_class_name -> api.parser.class public -> api.parser.public strictfp -> api.parser.strictfp ** New features *** Generation of fix-its for IDEs/Editors When given the new option -ffixit (aka -fdiagnostics-parseable-fixits), bison now generates machine readable editing instructions to fix some issues. Currently, this is mostly limited to updating deprecated directives and removing duplicates. For instance: $ cat foo.y %error-verbose %define parser_class_name "Parser" %define api.parser.class "Parser" %% exp:; See the "fix-it:" lines below: $ bison -ffixit foo.y foo.y:1.1-14: warning: deprecated directive, use '%define parse.error verbose' [-Wdeprecated] %error-verbose ^~~~~~~~~~~~~~ fix-it:"foo.y":{1:1-1:15}:"%define parse.error verbose" foo.y:2.1-34: warning: deprecated directive, use '%define api.parser.class {Parser}' [-Wdeprecated] %define parser_class_name "Parser" ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fix-it:"foo.y":{2:1-2:35}:"%define api.parser.class {Parser}" foo.y:3.1-33: error: %define variable 'api.parser.class' redefined %define api.parser.class "Parser" ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ foo.y:2.1-34: previous definition %define parser_class_name "Parser" ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ fix-it:"foo.y":{3:1-3:34}:"" foo.y: warning: fix-its can be applied. Rerun with option '--update'. [-Wother] This uses the same output format as GCC and Clang. *** Updating grammar files Fixes can be applied on the fly. The previous example ends with the suggestion to re-run bison with the option -u/--update, which results in a cleaner grammar file. $ bison --update foo.y [...] bison: file 'foo.y' was updated (backup: 'foo.y~') $ cat foo.y %define parse.error verbose %define api.parser.class {Parser} %% exp:; *** Bison is now relocatable If you pass '--enable-relocatable' to 'configure', Bison is relocatable. A relocatable program can be moved or copied to a different location on the file system. It can also be used through mount points for network sharing. It is possible to make symbolic links to the installed and moved programs, and invoke them through the symbolic link. *** %expect and %expect-rr modifiers on individual rules One can now document (and check) which rules participate in shift/reduce and reduce/reduce conflicts. This is particularly important GLR parsers, where conflicts are a normal occurrence. For example, %glr-parser %expect 1 %% ... argument_list: arguments %expect 1 | arguments ',' | %empty ; arguments: expression | argument_list ',' expression ; ... Looking at the output from -v, one can see that the shift/reduce conflict here is due to the fact that the parser does not know whether to reduce arguments to argument_list until it sees the token _after_ the following ','. By marking the rule with %expect 1 (because there is a conflict in one state), we document the source of the 1 overall shift/reduce conflict. In GLR parsers, we can use %expect-rr in a rule for reduce/reduce conflicts. In this case, we mark each of the conflicting rules. For example, %glr-parser %expect-rr 1 %% stmt: target_list '=' expr ';' | expr_list ';' ; target_list: target | target ',' target_list ; target: ID %expect-rr 1 ; expr_list: expr | expr ',' expr_list ; expr: ID %expect-rr 1 | ... ; In a statement such as x, y = 3, 4; the parser must reduce x to a target or an expr, but does not know which until it sees the '='. So we notate the two possible reductions to indicate that each conflicts in one rule. This feature needs user feedback, and might evolve in the future. *** C++: Actual token constructors When variants and token constructors are enabled, in addition to the type-safe named token constructors (make_ID, make_INT, etc.), we now generate genuine constructors for symbol_type. For instance with these declarations %token ':' <std::string> ID <int> INT; you may use these constructors: symbol_type (int token, const std::string&); symbol_type (int token, const int&); symbol_type (int token); Correct matching between token types and value types is checked via 'assert'; for instance, 'symbol_type (ID, 42)' would abort. Named constructors are preferable, as they offer better type safety (for instance 'make_ID (42)' would not even compile), but symbol_type constructors may help when token types are discovered at run-time, e.g., [a-z]+ { if (auto i = lookup_keyword (yytext)) return yy::parser::symbol_type (i); else return yy::parser::make_ID (yytext); } *** C++: Variadic emplace If your application requires C++11 and you don't use symbol constructors, you may now use a variadic emplace for semantic values: %define api.value.type variant %token <std::pair<int, int>> PAIR in your scanner: int yylex (parser::semantic_type *lvalp) { lvalp->emplace <std::pair<int, int>> (1, 2); return parser::token::PAIR; } *** C++: Syntax error exceptions in GLR The glr.cc skeleton now supports syntax_error exceptions thrown from user actions, or from the scanner. *** More POSIX Yacc compatibility warnings More Bison specific directives are now reported with -y or -Wyacc. This change was ready since the release of Bison 3.0 in September 2015. It was delayed because Autoconf used to define YACC as `bison -y`, which resulted in numerous warnings for Bison users that use the GNU Build System. If you still experience that problem, either redefine YACC as `bison -o y.tab.c`, or pass -Wno-yacc to Bison. *** The tables yyrhs and yyphrs are back Because no Bison skeleton uses them, these tables were removed (no longer passed to the skeletons, not even computed) in 2008. However, some users have expressed interest in being able to use them in their own skeletons. ** Bug fixes *** Incorrect number of reduce/reduce conflicts On a grammar such as exp: "num" | "num" | "num" bison used to report a single RR conflict, instead of two. This is now fixed. This was the oldest (known) bug in Bison: it was there when Bison was entered in the RCS version control system, in December 1987. Some grammar files might have to adjust their %expect-rr. *** Parser directives that were not careful enough Passing invalid arguments to %nterm, for instance character literals, used to result in unclear error messages. ** Documentation The examples/ directory (installed in .../share/doc/bison/examples) has been restructured per language for clarity. The examples come with a README and a Makefile. Not only can they be used to toy with Bison, they can also be starting points for your own grammars. There is now a Java example, and a simple example in C based on Flex and Bison (examples/c/lexcalc/). ** Changes *** Parsers in C++ They now use noexcept and constexpr. Please, report missing annotations. *** Symbol Declarations The syntax of the variation directives to declare symbols was overhauled for more consistency, and also better POSIX Yacc compliance (which, for instance, allows "%type" without actually providing a type). The %nterm directive, supported by Bison since its inception, is now documented and officially supported. The syntax is now as follows: %token TAG? ( ID NUMBER? STRING? )+ ( TAG ( ID NUMBER? STRING? )+ )* %left TAG? ( ID NUMBER? )+ ( TAG ( ID NUMBER? )+ )* %type TAG? ( ID | CHAR | STRING )+ ( TAG ( ID | CHAR | STRING )+ )* %nterm TAG? ID+ ( TAG ID+ )* where TAG denotes a type tag such as ‘<ival>’, ID denotes an identifier such as ‘NUM’, NUMBER a decimal or hexadecimal integer such as ‘300’ or ‘0x12d’, CHAR a character literal such as ‘'+'’, and STRING a string literal such as ‘"number"’. The post-fix quantifiers are ‘?’ (zero or one), ‘*’ (zero or more) and ‘+’ (one or more). * Noteworthy changes in release 3.2.4 (2018-12-24) [stable] ** Bug fixes Fix the move constructor of symbol_type. Always provide a copy constructor for symbol_type, even in modern C++. * Noteworthy changes in release 3.2.3 (2018-12-18) [stable] ** Bug fixes Properly support token constructors in C++ with types that include commas (e.g., std::pair<int, int>). A regression introduced in Bison 3.2. * Noteworthy changes in release 3.2.2 (2018-11-21) [stable] ** Bug fixes C++ portability issues. * Noteworthy changes in release 3.2.1 (2018-11-09) [stable] ** Bug fixes Several portability issues have been fixed in the build system, in the test suite, and in the generated parsers in C++. * Noteworthy changes in release 3.2 (2018-10-29) [stable] ** Backward incompatible changes Support for DJGPP, which has been unmaintained and untested for years, is obsolete. Unless there is activity to revive it, it will be removed. ** Changes %printers should use yyo rather than yyoutput to denote the output stream. Variant-based symbols in C++ should use emplace() rather than build(). In C++ parsers, parser::operator() is now a synonym for the parser::parse. ** Documentation A new section, "A Simple C++ Example", is a tutorial for parsers in C++. A comment in the generated code now emphasizes that users should not depend upon non-documented implementation details, such as macros starting with YY_. ** New features *** C++: Support for move semantics (lalr1.cc) The lalr1.cc skeleton now fully supports C++ move semantics, while maintaining compatibility with C++98. You may now store move-only types when using Bison's variants. For instance: %code { #include <memory> #include <vector> } %skeleton "lalr1.cc" %define api.value.type variant %% %token <int> INT "int"; %type <std::unique_ptr<int>> int; %type <std::vector<std::unique_ptr<int>>> list; list: %empty {} | list int { $$ = std::move($1); $$.emplace_back(std::move($2)); } int: "int" { $$ = std::make_unique<int>($1); } *** C++: Implicit move of right-hand side values (lalr1.cc) In modern C++ (C++11 and later), you should always use 'std::move' with the values of the right-hand side symbols ($1, $2, etc.), as they will be popped from the stack anyway. Using 'std::move' is mandatory for move-only types such as unique_ptr, and it provides a significant speedup for large types such as std::string, or std::vector, etc. If '%define api.value.automove' is set, every occurrence '$n' is replaced by 'std::move ($n)'. The second rule in the previous grammar can be simplified to: list: list int { $$ = $1; $$.emplace_back($2); } With automove enabled, the semantic values are no longer lvalues, so do not use the swap idiom: list: list int { std::swap($$, $1); $$.emplace_back($2); } This idiom is anyway obsolete: it is preferable to move than to swap. A warning is issued when automove is enabled, and a value is used several times. input.yy:16.31-32: warning: multiple occurrences of $2 with api.value.automove enabled [-Wother] exp: "twice" exp { $$ = $2 + $2; } ^^ Enabling api.value.automove does not require support for modern C++. The generated code is valid C++98/03, but will use copies instead of moves. The new examples/c++/variant-11.yy shows these features in action. *** C++: The implicit default semantic action is always run When variants are enabled, the default action was not run, so exp: "number" was equivalent to exp: "number" {} It now behaves like in all the other cases, as exp: "number" { $$ = $1; } possibly using std::move if automove is enabled. We do not expect backward compatibility issues. However, beware of forward compatibility issues: if you rely on default actions with variants, be sure to '%require "3.2"' to avoid older versions of Bison to generate incorrect parsers. *** C++: Renaming location.hh When both %defines and %locations are enabled, Bison generates a location.hh file. If you don't use locations outside of the parser, you may avoid its creation with: %define api.location.file none However this file is useful if, for instance, your parser builds an AST decorated with locations: you may use Bison's location independently of Bison's parser. You can now give it another name, for instance: %define api.location.file "my-location.hh" This name can have directory components, and even be absolute. The name under which the location file is included is controlled by api.location.include. This way it is possible to have several parsers share the same location file. For instance, in src/foo/parser.hh, generate the include/ast/loc.hh file: %locations %define api.namespace {foo} %define api.location.file "include/ast/loc.hh" %define api.location.include {<ast/loc.hh>} and use it in src/bar/parser.hh: %locations %define api.namespace {bar} %code requires {#include <ast/loc.hh>} %define api.location.type {bar::location} Absolute file names are supported, so in your Makefile, passing the flag -Dapi.location.file='"$(top_srcdir)/include/ast/location.hh"' to bison is safe. *** C++: stack.hh and position.hh are deprecated When asked to generate a header file (%defines), the lalr1.cc skeleton generates a stack.hh file. This file had no interest for users; it is now made useless: its content is included in the parser definition. It is still generated for backward compatibility. When in addition to %defines, location support is requested (%locations), the file position.hh is also generated. It is now also useless: its content is now included in location.hh. These files are no longer generated when your grammar file requires at least Bison 3.2 (%require "3.2"). ** Bug fixes Portability issues on MinGW and VS2015. Portability issues in the test suite. Portability/warning issues with Flex. * Noteworthy changes in release 3.1 (2018-08-27) [stable] ** Backward incompatible changes Compiling Bison now requires a C99 compiler---as announced during the release of Bison 3.0, five years ago. Generated parsers do not require a C99 compiler. Support for DJGPP, which has been unmaintained and untested for years, is obsolete. Unless there is activity to revive it, the next release of Bison will have it removed. ** New features *** Typed midrule actions Because their type is unknown to Bison, the values of midrule actions are not treated like the others: they don't have %printer and %destructor support. It also prevents C++ (Bison) variants to handle them properly. Typed midrule actions address these issues. Instead of: exp: { $<ival>$ = 1; } { $<ival>$ = 2; } { $$ = $<ival>1 + $<ival>2; } write: exp: <ival>{ $$ = 1; } <ival>{ $$ = 2; } { $$ = $1 + $2; } *** Reports include the type of the symbols The sections about terminal and nonterminal symbols of the '*.output' file now specify their declared type. For instance, for: %token <ival> NUM the report now shows '<ival>': Terminals, with rules where they appear NUM <ival> (258) 5 *** Diagnostics about useless rules In the following grammar, the 'exp' nonterminal is trivially useless. So, of course, its rules are useless too. %% input: '0' | exp exp: exp '+' exp | exp '-' exp | '(' exp ')' Previously all the useless rules were reported, including those whose left-hand side is the 'exp' nonterminal: warning: 1 nonterminal useless in grammar [-Wother] warning: 4 rules useless in grammar [-Wother] 2.14-16: warning: nonterminal useless in grammar: exp [-Wother] input: '0' | exp ^^^ 2.14-16: warning: rule useless in grammar [-Wother] input: '0' | exp ^^^ 3.6-16: warning: rule useless in grammar [-Wother] exp: exp '+' exp | exp '-' exp | '(' exp ')' ^^^^^^^^^^^ 3.20-30: warning: rule useless in grammar [-Wother] exp: exp '+' exp | exp '-' exp | '(' exp ')' ^^^^^^^^^^^ 3.34-44: warning: rule useless in grammar [-Wother] exp: exp '+' exp | exp '-' exp | '(' exp ')' ^^^^^^^^^^^ Now, rules whose left-hand side symbol is useless are no longer reported as useless. The locations of the errors have also been adjusted to point to the first use of the nonterminal as a left-hand side of a rule: warning: 1 nonterminal useless in grammar [-Wother] warning: 4 rules useless in grammar [-Wother] 3.1-3: warning: nonterminal useless in grammar: exp [-Wother] exp: exp '+' exp | exp '-' exp | '(' exp ')' ^^^ 2.14-16: warning: rule useless in grammar [-Wother] input: '0' | exp ^^^ *** C++: Generated parsers can be compiled with -fno-exceptions (lalr1.cc) When compiled with exceptions disabled, the generated parsers no longer uses try/catch clauses. Currently only GCC and Clang are supported. ** Documentation *** A demonstration of variants A new example was added (installed in .../share/doc/bison/examples), 'variant.yy', which shows how to use (Bison) variants in C++. The other examples were made nicer to read. *** Some features are no longer 'experimental' The following features, mature enough, are no longer flagged as experimental in the documentation: push parsers, default %printer and %destructor (typed: <*> and untyped: <>), %define api.value.type union and variant, Java parsers, XML output, LR family (lr, ielr, lalr), and semantic predicates (%?). ** Bug fixes *** GLR: Predicates support broken by #line directives Predicates (%?) in GLR such as widget: %? {new_syntax} 'w' id new_args | %?{!new_syntax} 'w' id old_args were issued with #lines in the middle of C code. *** Printer and destructor with broken #line directives The #line directives were not properly escaped when emitting the code for %printer/%destructor, which resulted in compiler errors if there are backslashes or double-quotes in the grammar file name. *** Portability on ICC The Intel compiler claims compatibility with GCC, yet rejects its _Pragma. Generated parsers now work around this. *** Various There were several small fixes in the test suite and in the build system, many warnings in bison and in the generated parsers were eliminated. The documentation also received its share of minor improvements. Useless code was removed from C++ parsers, and some of the generated constructors are more 'natural'. * Noteworthy changes in release 3.0.5 (2018-05-27) [stable] ** Bug fixes *** C++: Fix support of 'syntax_error' One incorrect 'inline' resulted in linking errors about the constructor of the syntax_error exception. *** C++: Fix warnings GCC 7.3 (with -O1 or -O2 but not -O0 or -O3) issued null-dereference warnings about yyformat being possibly null. It also warned about the deprecated implicit definition of copy constructors when there's a user-defined (copy) assignment operator. *** Location of errors In C++ parsers, out-of-bounds errors can happen when a rule with an empty ride-hand side raises a syntax error. The behavior of the default parser (yacc.c) in such a condition was undefined. Now all the parsers match the behavior of glr.c: @$ is used as the location of the error. This handles gracefully rules with and without rhs. *** Portability fixes in the test suite On some platforms, some Java and/or C++ tests were failing. * Noteworthy changes in release 3.0.4 (2015-01-23) [stable] ** Bug fixes *** C++ with Variants (lalr1.cc) Fix a compiler warning when no %destructor use $$. *** Test suites Several portability issues in tests were fixed. * Noteworthy changes in release 3.0.3 (2015-01-15) [stable] ** Bug fixes *** C++ with Variants (lalr1.cc) Problems with %destructor and '%define parse.assert' have been fixed. *** Named %union support (yacc.c, glr.c) Bison 3.0 introduced a regression on named %union such as %union foo { int ival; }; The possibility to use a name was introduced "for Yacc compatibility". It is however not required by POSIX Yacc, and its usefulness is not clear. *** %define api.value.type union with %defines (yacc.c, glr.c) The C parsers were broken when %defines was used together with "%define api.value.type union". *** Redeclarations are reported in proper order On %token FOO "foo" %printer {} "foo" %printer {} FOO bison used to report: foo.yy:2.10-11: error: %printer redeclaration for FOO %printer {} "foo" ^^ foo.yy:3.10-11: previous declaration %printer {} FOO ^^ Now, the "previous" declaration is always the first one. ** Documentation Bison now installs various files in its docdir (which defaults to '/usr/local/share/doc/bison'), including the three fully blown examples extracted from the documentation: - rpcalc Reverse Polish Calculator, a simple introductory example. - mfcalc Multi-function Calc, a calculator with memory and functions and located error messages. - calc++ a calculator in C++ using variant support and token constructors. * Noteworthy changes in release 3.0.2 (2013-12-05) [stable] ** Bug fixes *** Generated source files when errors are reported When warnings are issued and -Werror is set, bison would still generate the source files (*.c, *.h...). As a consequence, some runs of "make" could fail the first time, but not the second (as the files were generated anyway). This is fixed: bison no longer generates this source files, but, of course, still produces the various reports (*.output, *.xml, etc.). *** %empty is used in reports Empty right-hand sides are denoted by '%empty' in all the reports (text, dot, XML and formats derived from it). *** YYERROR and variants When C++ variant support is enabled, an error triggered via YYERROR, but not caught via error recovery, resulted in a double deletion. * Noteworthy changes in release 3.0.1 (2013-11-12) [stable] ** Bug fixes *** Errors in caret diagnostics On some platforms, some errors could result in endless diagnostics. *** Fixes of the -Werror option Options such as "-Werror -Wno-error=foo" were still turning "foo" diagnostics into errors instead of warnings. This is fixed. Actually, for consistency with GCC, "-Wno-error=foo -Werror" now also leaves "foo" diagnostics as warnings. Similarly, with "-Werror=foo -Wno-error", "foo" diagnostics are now errors. *** GLR Predicates As demonstrated in the documentation, one can now leave spaces between "%?" and its "{". *** Installation The yacc.1 man page is no longer installed if --disable-yacc was specified. *** Fixes in the test suite Bugs and portability issues. * Noteworthy changes in release 3.0 (2013-07-25) [stable] ** WARNING: Future backward-incompatibilities! Like other GNU packages, Bison will start using some of the C99 features for its own code, especially the definition of variables after statements. The generated C parsers still aim at C90. ** Backward incompatible changes *** Obsolete features Support for YYFAIL is removed (deprecated in Bison 2.4.2): use YYERROR. Support for yystype and yyltype is removed (deprecated in Bison 1.875): use YYSTYPE and YYLTYPE. Support for YYLEX_PARAM and YYPARSE_PARAM is removed (deprecated in Bison 1.875): use %lex-param, %parse-param, or %param. Missing semicolons at the end of actions are no longer added (as announced in the release 2.5). *** Use of YACC='bison -y' TL;DR: With Autoconf <= 2.69, pass -Wno-yacc to (AM_)YFLAGS if you use Bison extensions. Traditional Yacc generates 'y.tab.c' whatever the name of the input file. Therefore Makefiles written for Yacc expect 'y.tab.c' (and possibly 'y.tab.h' and 'y.output') to be generated from 'foo.y'. To this end, for ages, AC_PROG_YACC, Autoconf's macro to look for an implementation of Yacc, was using Bison as 'bison -y'. While it does ensure compatible output file names, it also enables warnings for incompatibilities with POSIX Yacc. In other words, 'bison -y' triggers warnings for Bison extensions. Autoconf 2.70+ fixes this incompatibility by using YACC='bison -o y.tab.c' (which also generates 'y.tab.h' and 'y.output' when needed). Alternatively, disable Yacc warnings by passing '-Wno-yacc' to your Yacc flags (YFLAGS, or AM_YFLAGS with Automake). ** Bug fixes *** The epilogue is no longer affected by internal #defines (glr.c) The glr.c skeleton uses defines such as #define yylval (yystackp->yyval) in generated code. These weren't properly undefined before the inclusion of the user epilogue, so functions such as the following were butchered by the preprocessor expansion: int yylex (YYSTYPE *yylval); This is fixed: yylval, yynerrs, yychar, and yylloc are now valid identifiers for user-provided variables. *** stdio.h is no longer needed when locations are enabled (yacc.c) Changes in Bison 2.7 introduced a dependency on FILE and fprintf when locations are enabled. This is fixed. *** Warnings about useless %pure-parser/%define api.pure are restored ** Diagnostics reported by Bison Most of these features were contributed by Théophile Ranquet and Victor Santet. *** Carets Version 2.7 introduced caret errors, for a prettier output. These are now activated by default. The old format can still be used by invoking Bison with -fno-caret (or -fnone). Some error messages that reproduced excerpts of the grammar are now using the caret information only. For instance on: %% exp: 'a' | 'a'; Bison 2.7 reports: in.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] in.y:2.12-14: warning: rule useless in parser due to conflicts: exp: 'a' [-Wother] Now bison reports: in.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] in.y:2.12-14: warning: rule useless in parser due to conflicts [-Wother] exp: 'a' | 'a'; ^^^ and "bison -fno-caret" reports: in.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr] in.y:2.12-14: warning: rule useless in parser due to conflicts [-Wother] *** Enhancements of the -Werror option The -Werror=CATEGORY option is now recognized, and will treat specified warnings as errors. The warnings need not have been explicitly activated using the -W option, this is similar to what GCC 4.7 does. For example, given the following command line, Bison will treat both warnings related to POSIX Yacc incompatibilities and S/R conflicts as errors (and only those): $ bison -Werror=yacc,error=conflicts-sr input.y If no categories are specified, -Werror will make all active warnings into errors. For example, the following line does the same the previous example: $ bison -Werror -Wnone -Wyacc -Wconflicts-sr input.y (By default -Wconflicts-sr,conflicts-rr,deprecated,other is enabled.) Note that the categories in this -Werror option may not be prefixed with "no-". However, -Wno-error[=CATEGORY] is valid. Note that -y enables -Werror=yacc. Therefore it is now possible to require Yacc-like behavior (e.g., always generate y.tab.c), but to report incompatibilities as warnings: "-y -Wno-error=yacc". *** The display of warnings is now richer The option that controls a given warning is now displayed: foo.y:4.6: warning: type clash on default action: <foo> != <bar> [-Wother] In the case of warnings treated as errors, the prefix is changed from "warning: " to "error: ", and the suffix is displayed, in a manner similar to GCC, as [-Werror=CATEGORY]. For instance, where the previous version of Bison would report (and exit with failure): bison: warnings being treated as errors input.y:1.1: warning: stray ',' treated as white space it now reports: input.y:1.1: error: stray ',' treated as white space [-Werror=other] *** Deprecated constructs The new 'deprecated' warning category flags obsolete constructs whose support will be discontinued. It is enabled by default. These warnings used to be reported as 'other' warnings. *** Useless semantic types Bison now warns about useless (uninhabited) semantic types. Since semantic types are not declared to Bison (they are defined in the opaque %union structure), it is %printer/%destructor directives about useless types that trigger the warning: %token <type1> term %type <type2> nterm %printer {} <type1> <type3> %destructor {} <type2> <type4> %% nterm: term { $$ = $1; }; 3.28-34: warning: type <type3> is used, but is not associated to any symbol 4.28-34: warning: type <type4> is used, but is not associated to any symbol *** Undefined but unused symbols Bison used to raise an error for undefined symbols that are not used in the grammar. This is now only a warning. %printer {} symbol1 %destructor {} symbol2 %type <type> symbol3 %% exp: "a"; *** Useless destructors or printers Bison now warns about useless destructors or printers. In the following example, the printer for <type1>, and the destructor for <type2> are useless: all symbols of <type1> (token1) already have a printer, and all symbols of type <type2> (token2) already have a destructor. %token <type1> token1 <type2> token2 <type3> token3 <type4> token4 %printer {} token1 <type1> <type3> %destructor {} token2 <type2> <type4> *** Conflicts The warnings and error messages about shift/reduce and reduce/reduce conflicts have been normalized. For instance on the following foo.y file: %glr-parser %% exp: exp '+' exp | '0' | '0'; compare the previous version of bison: $ bison foo.y foo.y: conflicts: 1 shift/reduce, 2 reduce/reduce $ bison -Werror foo.y bison: warnings being treated as errors foo.y: conflicts: 1 shift/reduce, 2 reduce/reduce with the new behavior: $ bison foo.y foo.y: warning: 1 shift/reduce conflict [-Wconflicts-sr] foo.y: warning: 2 reduce/reduce conflicts [-Wconflicts-rr] $ bison -Werror foo.y foo.y: error: 1 shift/reduce conflict [-Werror=conflicts-sr] foo.y: error: 2 reduce/reduce conflicts [-Werror=conflicts-rr] When %expect or %expect-rr is used, such as with bar.y: %expect 0 %glr-parser %% exp: exp '+' exp | '0' | '0'; Former behavior: $ bison bar.y bar.y: conflicts: 1 shift/reduce, 2 reduce/reduce bar.y: expected 0 shift/reduce conflicts bar.y: expected 0 reduce/reduce conflicts New one: $ bison bar.y bar.y: error: shift/reduce conflicts: 1 found, 0 expected bar.y: error: reduce/reduce conflicts: 2 found, 0 expected ** Incompatibilities with POSIX Yacc The 'yacc' category is no longer part of '-Wall', enable it explicitly with '-Wyacc'. ** Additional yylex/yyparse arguments The new directive %param declares additional arguments 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} ** Types of values for %define variables Bison used to make no difference between '%define foo bar' and '%define foo "bar"'. The former is now called a 'keyword value', and the latter a 'string value'. A third kind was added: 'code values', such as '%define foo {bar}'. Keyword variables are used for fixed value sets, e.g., %define lr.type lalr Code variables are used for value in the target language, e.g., %define api.value.type {struct semantic_type} String variables are used remaining cases, e.g. file names. ** Variable api.token.prefix The variable api.token.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.token.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.value.type This new %define variable supersedes the #define macro YYSTYPE. The use of YYSTYPE is discouraged. In particular, #defining YYSTYPE *and* either using %union or %defining api.value.type results in undefined behavior. Either define api.value.type, or use "%union": %union { int ival; char *sval; } %token <ival> INT "integer" %token <sval> STRING "string" %printer { fprintf (yyo, "%d", $$); } <ival> %destructor { free ($$); } <sval> /* In yylex(). */ yylval.ival = 42; return INT; yylval.sval = "42"; return STRING; The %define variable api.value.type supports both keyword and code values. The keyword value 'union' means that the user provides genuine types, not union member names such as "ival" and "sval" above (WARNING: will fail if -y/--yacc/%yacc is enabled). %define api.value.type union %token <int> INT "integer" %token <char *> STRING "string" %printer { fprintf (yyo, "%d", $$); } <int> %destructor { free ($$); } <char *> /* In yylex(). */ yylval.INT = 42; return INT; yylval.STRING = "42"; return STRING; The keyword value variant is somewhat equivalent, but for C++ special provision is made to allow classes to be used (more about this below). %define api.value.type variant %token <int> INT "integer" %token <std::string> STRING "string" Code values (in braces) denote user defined types. This is where YYSTYPE used to be used. %code requires { struct my_value { enum { is_int, is_string } kind; union { int ival; char *sval; } u; }; } %define api.value.type {struct my_value} %token <u.ival> INT "integer" %token <u.sval> STRING "string" %printer { fprintf (yyo, "%d", $$); } <u.ival> %destructor { free ($$); } <u.sval> /* In yylex(). */ yylval.u.ival = 42; return INT; yylval.u.sval = "42"; return STRING; ** Variable parse.error This variable controls the verbosity of error messages. The use of the %error-verbose directive is deprecated in favor of "%define parse.error verbose". ** Deprecated %define variable names The following variables have been renamed for consistency. Backward compatibility is ensured, but upgrading is recommended. lr.default-reductions -> lr.default-reduction lr.keep-unreachable-states -> lr.keep-unreachable-state namespace -> api.namespace stype -> api.value.type ** Semantic predicates Contributed by Paul Hilfinger. 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 run-time expressions. ** The directive %expect-rr is now an error in non GLR mode It used to be an error only if used in non GLR mode, _and_ if there are reduce/reduce conflicts. ** Tokens are numbered in their order of appearance Contributed by Valentin Tolmer. With '%token A B', A had a number less than the one of B. However, precedence declarations used to generate a reversed order. This is now fixed, and introducing tokens with any of %token, %left, %right, %precedence, or %nonassoc yields the same result. When mixing declarations of tokens with a literal character (e.g., 'a') or with an identifier (e.g., B) in a precedence declaration, Bison numbered the literal characters first. For example %right A B 'c' 'd' would lead to the tokens declared in this order: 'c' 'd' A B. Again, the input order is now preserved. These changes were made so that one can remove useless precedence and associativity declarations (i.e., map %nonassoc, %left or %right to %precedence, or to %token) and get exactly the same output. ** Useless precedence and associativity Contributed by Valentin Tolmer. When developing and maintaining a grammar, useless associativity and precedence directives are common. They can be a nuisance: new ambiguities arising are sometimes masked because their conflicts are resolved due to the extra precedence or associativity information. Furthermore, it can hinder the comprehension of a new grammar: one will wonder about the role of a precedence, where in fact it is useless. The following changes aim at detecting and reporting these extra directives. *** Precedence warning category A new category of warning, -Wprecedence, was introduced. It flags the useless precedence and associativity directives. *** Useless associativity Bison now warns about symbols with a declared associativity that is never used to resolve conflicts. In that case, using %precedence is sufficient; the parsing tables will remain unchanged. Solving these warnings may raise useless precedence warnings, as the symbols no longer have associativity. For example: %left '+' %left '*' %% exp: "number" | exp '+' "number" | exp '*' exp ; will produce a warning: useless associativity for '+', use %precedence [-Wprecedence] %left '+' ^^^ *** Useless precedence Bison now warns about symbols with a declared precedence and no declared associativity (i.e., declared with %precedence), and whose precedence is never used. In that case, the symbol can be safely declared with %token instead, without modifying the parsing tables. For example: %precedence '=' %% exp: "var" '=' "number"; will produce a warning: useless precedence for '=' [-Wprecedence] %precedence '=' ^^^ *** Useless precedence and associativity In case of both useless precedence and associativity, the issue is flagged as follows: %nonassoc '=' %% exp: "var" '=' "number"; The warning is: warning: useless precedence and associativity for '=' [-Wprecedence] %nonassoc '=' ^^^ ** Empty rules With help from Joel E. Denny and Gabriel Rassoul. Empty rules (i.e., with an empty right-hand side) can now be explicitly marked by the new %empty directive. Using %empty on a non-empty rule is an error. The new -Wempty-rule warning reports empty rules without %empty. On the following grammar: %% s: a b c; a: ; b: %empty; c: 'a' %empty; bison reports: 3.4-5: warning: empty rule without %empty [-Wempty-rule] a: {} ^^ 5.8-13: error: %empty on non-empty rule c: 'a' %empty {}; ^^^^^^ ** 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". Contributed by Paolo Bonzini. The Java skeleton now supports push parsing. Contributed by Dennis Heimbigner. ** C++ skeletons improvements *** The parser header is no longer mandatory (lalr1.cc, glr.cc) Using %defines is now optional. Without it, the needed support classes are defined in the generated parser, instead of additional files (such as location.hh, position.hh and stack.hh). *** Locations are no longer mandatory (lalr1.cc, glr.cc) Both lalr1.cc and glr.cc no longer require %location. *** syntax_error exception (lalr1.cc) 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). *** %define api.value.type variant This is based on a submission from Michiel De Wilde. With help from Théophile Ranquet. In this mode, complex C++ objects can be used as semantic values. For instance: %token <::std::string> TEXT; %token <int> NUMBER; %token SEMICOLON ";" %type <::std::string> item; %type <::std::list<std::string>> list; %% result: list { std::cout << $1 << std::endl; } ; list: %empty { /* Generates an empty string list. */ } | list item ";" { std::swap ($$, $1); $$.push_back ($2); } ; item: TEXT { std::swap ($$, $1); } | NUMBER { $$ = string_cast ($1); } ; *** %define api.token.constructor When variants are enabled, Bison can generate functions to build the tokens. This guarantees that the token type (e.g., NUMBER) is consistent with the semantic value (e.g., int): parser::symbol_type yylex () { parser::location_type loc = ...; ... return parser::make_TEXT ("Hello, world!", loc); ... return parser::make_NUMBER (42, loc); ... return parser::make_SEMICOLON (loc); ... } *** C++ locations There are operator- and operator-= for 'location'. Negative line/column increments can no longer underflow the resulting value. * Noteworthy changes in release 2.7.1 (2013-04-15) [stable] ** Bug fixes *** Fix compiler attribute portability (yacc.c) With locations enabled, __attribute__ was used unprotected. *** Fix some compiler warnings (lalr1.cc) * Noteworthy changes in release 2.7 (2012-12-12) [stable] ** Bug fixes Warnings about uninitialized yylloc in yyparse have been fixed. Restored C90 compliance (yet no report was ever made). ** Diagnostics are improved Contributed by Théophile Ranquet. *** Changes in the format of error messages This used to be the format of many error reports: input.y:2.7-12: %type redeclaration for exp input.y:1.7-12: previous declaration It is now: input.y:2.7-12: error: %type redeclaration for exp input.y:1.7-12: previous declaration *** New format for error reports: carets Caret errors have been added to Bison: input.y:2.7-12: error: %type redeclaration for exp %type <sval> exp ^^^^^^ input.y:1.7-12: previous declaration %type <ival> exp ^^^^^^ or input.y:3.20-23: error: ambiguous reference: '$exp' exp: exp '+' exp { $exp = $1 + $3; }; ^^^^ input.y:3.1-3: refers to: $exp at $$ exp: exp '+' exp { $exp = $1 + $3; }; ^^^ input.y:3.6-8: refers to: $exp at $1 exp: exp '+' exp { $exp = $1 + $3; }; ^^^ input.y:3.14-16: refers to: $exp at $3 exp: exp '+' exp { $exp = $1 + $3; }; ^^^ The default behavior for now is still not to display these unless explicitly asked with -fcaret (or -fall). However, in a later release, it will be made the default behavior (but may still be deactivated with -fno-caret). ** New value for %define variable: api.pure full The %define variable api.pure requests a pure (reentrant) parser. However, for historical reasons, using it in a location-tracking Yacc parser resulted in a yyerror function that did not take a location as a parameter. With this new value, the user may request a better pure parser, where yyerror does take a location as a parameter (in location-tracking parsers). The use of "%define api.pure true" is deprecated in favor of this new "%define api.pure full". ** New %define variable: api.location.type (glr.cc, lalr1.cc, lalr1.java) The %define variable api.location.type defines the name of the type to use for locations. When defined, Bison no longer generates the position.hh and location.hh files, nor does the parser will include them: the user is then responsible to define her type. This can be used in programs with several parsers to factor their location and position files: let one of them generate them, and the others just use them. This feature was actually introduced, but not documented, in Bison 2.5, under the name "location_type" (which is maintained for backward compatibility). For consistency, lalr1.java's %define variables location_type and position_type are deprecated in favor of api.location.type and api.position.type. ** Exception safety (lalr1.cc) The parse function now catches exceptions, uses the %destructors to release memory (the lookahead symbol and the symbols pushed on the stack) before re-throwing the exception. This feature is somewhat experimental. User feedback would be appreciated. ** Graph improvements in DOT and XSLT Contributed by Théophile Ranquet. The graphical presentation of the states is more readable: their shape is now rectangular, the state number is clearly displayed, and the items are numbered and left-justified. The reductions are now explicitly represented as transitions to other diamond shaped nodes. These changes are present in both --graph output and xml2dot.xsl XSLT processing, with minor (documented) differences. ** %language is no longer an experimental feature. The introduction of this feature, in 2.4, was four years ago. The --language option and the %language directive are no longer experimental. ** Documentation The sections about shift/reduce and reduce/reduce conflicts resolution have been fixed and extended. Although introduced more than four years ago, XML and Graphviz reports were not properly documented. The translation of midrule actions is now described. * Noteworthy changes in release 2.6.5 (2012-11-07) [stable] We consider compiler warnings about Bison generated parsers to be bugs. Rather than working around them in your own project, please consider reporting them to us. ** Bug fixes Warnings about uninitialized yylval and/or yylloc for push parsers with a pure interface have been fixed for GCC 4.0 up to 4.8, and Clang 2.9 to 3.2. Other issues in the test suite have been addressed. Null characters are correctly displayed in error messages. When possible, yylloc is correctly initialized before calling yylex. It is no longer necessary to initialize it in the %initial-action. * Noteworthy changes in release 2.6.4 (2012-10-23) [stable] Bison 2.6.3's --version was incorrect. This release fixes this issue. * Noteworthy changes in release 2.6.3 (2012-10-22) [stable] ** Bug fixes Bugs and portability issues in the test suite have been fixed. Some errors in translations have been addressed, and --help now directs users to the appropriate place to report them. Stray Info files shipped by accident are removed. Incorrect definitions of YY_, issued by yacc.c when no parser header is generated, are removed. All the generated headers are self-contained. ** Header guards (yacc.c, glr.c, glr.cc) In order to avoid collisions, the header guards are now YY_<PREFIX>_<FILE>_INCLUDED, instead of merely <PREFIX>_<FILE>. For instance the header generated from %define api.prefix "calc" %defines "lib/parse.h" will use YY_CALC_LIB_PARSE_H_INCLUDED as guard. ** Fix compiler warnings in the generated parser (yacc.c, glr.c) The compilation of pure parsers (%define api.pure) can trigger GCC warnings such as: input.c: In function 'yyparse': input.c:1503:12: warning: 'yylval' may be used uninitialized in this function [-Wmaybe-uninitialized] *++yyvsp = yylval; ^ This is now fixed; pragmas to avoid these warnings are no longer needed. Warnings from clang ("equality comparison with extraneous parentheses" and "function declared 'noreturn' should not return") have also been addressed. * Noteworthy changes in release 2.6.2 (2012-08-03) [stable] ** Bug fixes Buffer overruns, complaints from Flex, and portability issues in the test suite have been fixed. ** Spaces in %lex- and %parse-param (lalr1.cc, glr.cc) Trailing end-of-lines in %parse-param or %lex-param would result in invalid C++. This is fixed. ** Spurious spaces and end-of-lines The generated files no longer end (nor start) with empty lines. * Noteworthy changes in release 2.6.1 (2012-07-30) [stable] Bison no longer executes user-specified M4 code when processing a grammar. ** Future Changes In addition to the removal of the features announced in Bison 2.6, the next major release will remove the "Temporary hack for adding a semicolon to the user action", as announced in the release 2.5. Instead of: exp: exp "+" exp { $$ = $1 + $3 }; write: exp: exp "+" exp { $$ = $1 + $3; }; ** Bug fixes *** Type names are now properly escaped. *** glr.cc: set_debug_level and debug_level work as expected. *** Stray @ or $ in actions While Bison used to warn about stray $ or @ in action rules, it did not for other actions such as printers, destructors, or initial actions. It now does. ** Type names in actions For consistency with rule actions, it is now possible to qualify $$ by a type-name in destructors, printers, and initial actions. For instance: %printer { fprintf (yyo, "(%d, %f)", $<ival>$, $<fval>$); } <*> <>; will display two values for each typed and untyped symbol (provided that YYSTYPE has both "ival" and "fval" fields). * Noteworthy changes in release 2.6 (2012-07-19) [stable] ** Future changes The next major release of Bison will drop support for the following deprecated features. Please report disagreements to bug-bison@gnu.org. *** K&R C parsers Support for generating parsers in K&R C will be removed. Parsers generated for C support ISO C90, and are tested with ISO C99 and ISO C11 compilers. *** Features deprecated since Bison 1.875 The definitions of yystype and yyltype will be removed; use YYSTYPE and YYLTYPE. YYPARSE_PARAM and YYLEX_PARAM, deprecated in favor of %parse-param and %lex-param, will no longer be supported. Support for the preprocessor symbol YYERROR_VERBOSE will be removed, use %error-verbose. *** The generated header will be included (yacc.c) Instead of duplicating the content of the generated header (definition of YYSTYPE, yyparse declaration etc.), the generated parser will include it, as is already the case for GLR or C++ parsers. This change is deferred because existing versions of ylwrap (e.g., Automake 1.12.1) do not support it. ** Generated Parser Headers *** Guards (yacc.c, glr.c, glr.cc) The generated headers are now guarded, as is already the case for C++ parsers (lalr1.cc). For instance, with --defines=foo.h: #ifndef YY_FOO_H # define YY_FOO_H ... #endif /* !YY_FOO_H */ *** New declarations (yacc.c, glr.c) The generated header now declares yydebug and yyparse. Both honor --name-prefix=bar_, and yield int bar_parse (void); rather than #define yyparse bar_parse int yyparse (void); in order to facilitate the inclusion of several parser headers inside a single compilation unit. *** Exported symbols in C++ The symbols YYTOKEN_TABLE and YYERROR_VERBOSE, which were defined in the header, are removed, as they prevent the possibility of including several generated headers from a single compilation unit. *** YYLSP_NEEDED For the same reasons, the undocumented and unused macro YYLSP_NEEDED is no longer defined. ** New %define variable: api.prefix Now that the generated headers are more complete and properly protected against multiple inclusions, constant names, such as YYSTYPE are a problem. While yyparse and others are properly renamed by %name-prefix, YYSTYPE, YYDEBUG and others have never been affected by it. Because it would introduce backward compatibility issues in projects not expecting YYSTYPE to be renamed, instead of changing the behavior of %name-prefix, it is deprecated in favor of a new %define variable: api.prefix. The following examples compares both: %name-prefix "bar_" | %define api.prefix "bar_" %token <ival> FOO %token <ival> FOO %union { int ival; } %union { int ival; } %% %% exp: 'a'; exp: 'a'; bison generates: #ifndef BAR_FOO_H #ifndef BAR_FOO_H # define BAR_FOO_H # define BAR_FOO_H /* Enabling traces. */ /* Enabling traces. */ # ifndef YYDEBUG | # ifndef BAR_DEBUG > # if defined YYDEBUG > # if YYDEBUG > # define BAR_DEBUG 1 > # else > # define BAR_DEBUG 0 > # endif > # else # define YYDEBUG 0 | # define BAR_DEBUG 0 > # endif # endif | # endif # if YYDEBUG | # if BAR_DEBUG extern int bar_debug; extern int bar_debug; # endif # endif /* Tokens. */ /* Tokens. */ # ifndef YYTOKENTYPE | # ifndef BAR_TOKENTYPE # define YYTOKENTYPE | # define BAR_TOKENTYPE enum yytokentype { | enum bar_tokentype { FOO = 258 FOO = 258 }; }; # endif # endif #if ! defined YYSTYPE \ | #if ! defined BAR_STYPE \ && ! defined YYSTYPE_IS_DECLARED | && ! defined BAR_STYPE_IS_DECLARED typedef union YYSTYPE | typedef union BAR_STYPE { { int ival; int ival; } YYSTYPE; | } BAR_STYPE; # define YYSTYPE_IS_DECLARED 1 | # define BAR_STYPE_IS_DECLARED 1 #endif #endif extern YYSTYPE bar_lval; | extern BAR_STYPE bar_lval; int bar_parse (void); int bar_parse (void); #endif /* !BAR_FOO_H */ #endif /* !BAR_FOO_H */ * Noteworthy changes in release 2.5.1 (2012-06-05) [stable] ** Future changes: The next major release will drop support for generating parsers in K&R C. ** yacc.c: YYBACKUP works as expected. ** glr.c improvements: *** Location support is eliminated when not requested: GLR parsers used to include location-related code even when locations were not requested, and therefore not even usable. *** __attribute__ is preserved: __attribute__ is no longer disabled when __STRICT_ANSI__ is defined (i.e., when -std is passed to GCC). ** lalr1.java: several fixes: The Java parser no longer throws ArrayIndexOutOfBoundsException if the first token leads to a syntax error. Some minor clean ups. ** Changes for C++: *** C++11 compatibility: C and C++ parsers use "nullptr" instead of "0" when __cplusplus is 201103L or higher. *** Header guards The header files such as "parser.hh", "location.hh", etc. used a constant name for preprocessor guards, for instance: #ifndef BISON_LOCATION_HH # define BISON_LOCATION_HH ... #endif // !BISON_LOCATION_HH The inclusion guard is now computed from "PREFIX/FILE-NAME", where lower case characters are converted to upper case, and series of non-alphanumerical characters are converted to an underscore. With "bison -o lang++/parser.cc", "location.hh" would now include: #ifndef YY_LANG_LOCATION_HH # define YY_LANG_LOCATION_HH ... #endif // !YY_LANG_LOCATION_HH *** C++ locations: The position and location constructors (and their initialize methods) accept new arguments for line and column. Several issues in the documentation were fixed. ** liby is no longer asking for "rpl_fprintf" on some platforms. ** Changes in the manual: *** %printer is documented The "%printer" directive, supported since at least Bison 1.50, is finally documented. The "mfcalc" example is extended to demonstrate it. For consistency with the C skeletons, the C++ parsers now also support "yyoutput" (as an alias to "debug_stream ()"). *** Several improvements have been made: The layout for grammar excerpts was changed to a more compact scheme. Named references are motivated. The description of the automaton description file (*.output) is updated to the current format. Incorrect index entries were fixed. Some other errors were fixed. ** Building bison: *** Conflicting prototypes with recent/modified Flex. Fixed build problems with the current, unreleased, version of Flex, and some modified versions of 2.5.35, which have modified function prototypes. *** Warnings during the build procedure have been eliminated. *** Several portability problems in the test suite have been fixed: This includes warnings with some compilers, unexpected behavior of tools such as diff, warning messages from the test suite itself, etc. *** The install-pdf target works properly: Running "make install-pdf" (or -dvi, -html, -info, and -ps) no longer halts in the middle of its course. * Noteworthy changes in release 2.5 (2011-05-14) ** Grammar symbol names can now contain non-initial dashes: Consistently with directives (such as %error-verbose) and with %define variables (e.g. push-pull), grammar symbol names may contain dashes in any position except the beginning. This is a GNU extension over POSIX Yacc. Thus, use of this extension is reported by -Wyacc and rejected in Yacc mode (--yacc). ** Named references: Historically, Yacc and Bison have supported positional references ($n, $$) to allow access to symbol values from inside of semantic actions code. Starting from this version, Bison can also accept named references. When no ambiguity is possible, original symbol names may be used as named references: if_stmt : "if" cond_expr "then" then_stmt ';' { $if_stmt = mk_if_stmt($cond_expr, $then_stmt); } In the more common case, explicit names may be declared: stmt[res] : "if" expr[cond] "then" stmt[then] "else" stmt[else] ';' { $res = mk_if_stmt($cond, $then, $else); } Location information is also accessible using @name syntax. When accessing symbol names containing dots or dashes, explicit bracketing ($[sym.1]) must be used. These features are experimental in this version. More user feedback will help to stabilize them. Contributed by Alex Rozenman. ** IELR(1) and canonical LR(1): IELR(1) is a minimal LR(1) parser table generation algorithm. That is, given any context-free grammar, IELR(1) generates parser tables with the full language-recognition power of canonical LR(1) but with nearly the same number of parser states as LALR(1). This reduction in parser states is often an order of magnitude. More importantly, because canonical LR(1)'s extra parser states may contain duplicate conflicts in the case of non-LR(1) grammars, the number of conflicts for IELR(1) is often an order of magnitude less as well. This can significantly reduce the complexity of developing of a grammar. Bison can now generate IELR(1) and canonical LR(1) parser tables in place of its traditional LALR(1) parser tables, which remain the default. You can specify the type of parser tables in the grammar file with these directives: %define lr.type lalr %define lr.type ielr %define lr.type canonical-lr The default-reduction optimization in the parser tables can also be adjusted using "%define lr.default-reductions". For details on both of these features, see the new section "Tuning LR" in the Bison manual. These features are experimental. More user feedback will help to stabilize them. ** LAC (Lookahead Correction) for syntax error handling Contributed by Joel E. Denny. Canonical LR, IELR, and LALR can suffer from a couple of problems upon encountering a syntax error. First, the parser might perform additional parser stack reductions before discovering the syntax error. Such reductions can perform user semantic actions that are unexpected because they are based on an invalid token, and they cause error recovery to begin in a different syntactic context than the one in which the invalid token was encountered. Second, when verbose error messages are enabled (with %error-verbose or the obsolete "#define YYERROR_VERBOSE"), the expected token list in the syntax error message can both contain invalid tokens and omit valid tokens. The culprits for the above problems are %nonassoc, default reductions in inconsistent states, and parser state merging. Thus, IELR and LALR suffer the most. Canonical LR can suffer only if %nonassoc is used or if default reductions are enabled for inconsistent states. LAC is a new mechanism within the parsing algorithm that solves these problems for canonical LR, IELR, and LALR without sacrificing %nonassoc, default reductions, or state merging. When LAC is in use, canonical LR and IELR behave almost exactly the same for both syntactically acceptable and syntactically unacceptable input. While LALR still does not support the full language-recognition power of canonical LR and IELR, LAC at least enables LALR's syntax error handling to correctly reflect LALR's language-recognition power. Currently, LAC is only supported for deterministic parsers in C. You can enable LAC with the following directive: %define parse.lac full See the new section "LAC" in the Bison manual for additional details including a few caveats. LAC is an experimental feature. More user feedback will help to stabilize it. ** %define improvements: *** Can now be invoked via the command line: Each of these command-line options -D NAME[=VALUE] --define=NAME[=VALUE] -F NAME[=VALUE] --force-define=NAME[=VALUE] is equivalent to this grammar file declaration %define NAME ["VALUE"] except that the manner in which Bison processes multiple definitions for the same NAME differs. Most importantly, -F and --force-define quietly override %define, but -D and --define do not. For further details, see the section "Bison Options" in the Bison manual. *** Variables renamed: The following %define variables api.push_pull lr.keep_unreachable_states have been renamed to api.push-pull lr.keep-unreachable-states The old names are now deprecated but will be maintained indefinitely for backward compatibility. *** Values no longer need to be quoted in the grammar file: If a %define value is an identifier, it no longer needs to be placed within quotations marks. For example, %define api.push-pull "push" can be rewritten as %define api.push-pull push *** Unrecognized variables are now errors not warnings. *** Multiple invocations for any variable is now an error not a warning. ** Unrecognized %code qualifiers are now errors not warnings. ** Character literals not of length one: Previously, Bison quietly converted all character literals to length one. For example, without warning, Bison interpreted the operators in the following grammar to be the same token: exp: exp '++' | exp '+' exp ; Bison now warns when a character literal is not of length one. In some future release, Bison will start reporting an error instead. ** Destructor calls fixed for lookaheads altered in semantic actions: Previously for deterministic parsers in C, if a user semantic action altered yychar, the parser in some cases used the old yychar value to determine which destructor to call for the lookahead upon a syntax error or upon parser return. This bug has been fixed. ** C++ parsers use YYRHSLOC: Similarly to the C parsers, the C++ parsers now define the YYRHSLOC macro and use it in the default YYLLOC_DEFAULT. You are encouraged to use it. If, for instance, your location structure has "first" and "last" members, instead of # define YYLLOC_DEFAULT(Current, Rhs, N) \ do \ if (N) \ { \ (Current).first = (Rhs)[1].location.first; \ (Current).last = (Rhs)[N].location.last; \ } \ else \ { \ (Current).first = (Current).last = (Rhs)[0].location.last; \ } \ while (false) use: # define YYLLOC_DEFAULT(Current, Rhs, N) \ do \ if (N) \ { \ (Current).first = YYRHSLOC (Rhs, 1).first; \ (Current).last = YYRHSLOC (Rhs, N).last; \ } \ else \ { \ (Current).first = (Current).last = YYRHSLOC (Rhs, 0).last; \ } \ while (false) ** YYLLOC_DEFAULT in C++: The default implementation of YYLLOC_DEFAULT used to be issued in the header file. It is now output in the implementation file, after the user %code sections so that its #ifndef guard does not try to override the user's YYLLOC_DEFAULT if provided. ** YYFAIL now produces warnings and Java parsers no longer implement it: YYFAIL has existed for many years as an undocumented feature of deterministic parsers in C generated by Bison. More recently, it was a documented feature of Bison's experimental Java parsers. As promised in Bison 2.4.2's NEWS entry, any appearance of YYFAIL in a semantic action now produces a deprecation warning, and Java parsers no longer implement YYFAIL at all. For further details, including a discussion of how to suppress C preprocessor warnings about YYFAIL being unused, see the Bison 2.4.2 NEWS entry. ** Temporary hack for adding a semicolon to the user action: Previously, Bison appended a semicolon to every user action for reductions when the output language defaulted to C (specifically, when neither %yacc, %language, %skeleton, or equivalent command-line options were specified). This allowed actions such as exp: exp "+" exp { $$ = $1 + $3 }; instead of exp: exp "+" exp { $$ = $1 + $3; }; As a first step in removing this misfeature, Bison now issues a warning when it appends a semicolon. Moreover, in cases where Bison cannot easily determine whether a semicolon is needed (for example, an action ending with a cpp directive or a braced compound initializer), it no longer appends one. Thus, the C compiler might now complain about a missing semicolon where it did not before. Future releases of Bison will cease to append semicolons entirely. ** Verbose syntax error message fixes: When %error-verbose or the obsolete "#define YYERROR_VERBOSE" is specified, syntax error messages produced by the generated parser include the unexpected token as well as a list of expected tokens. The effect of %nonassoc on these verbose messages has been corrected in two ways, but a more complete fix requires LAC, described above: *** When %nonassoc is used, there can exist parser states that accept no tokens, and so the parser does not always require a lookahead token in order to detect a syntax error. Because no unexpected token or expected tokens can then be reported, the verbose syntax error message described above is suppressed, and the parser instead reports the simpler message, "syntax error". Previously, this suppression was sometimes erroneously triggered by %nonassoc when a lookahead was actually required. Now verbose messages are suppressed only when all previous lookaheads have already been shifted or discarded. *** Previously, the list of expected tokens erroneously included tokens that would actually induce a syntax error because conflicts for them were resolved with %nonassoc in the current parser state. Such tokens are now properly omitted from the list. *** Expected token lists are still often wrong due to state merging (from LALR or IELR) and default reductions, which can both add invalid tokens and subtract valid tokens. Canonical LR almost completely fixes this problem by eliminating state merging and default reductions. However, there is one minor problem left even when using canonical LR and even after the fixes above. That is, if the resolution of a conflict with %nonassoc appears in a later parser state than the one at which some syntax error is discovered, the conflicted token is still erroneously included in the expected token list. Bison's new LAC implementation, described above, eliminates this problem and the need for canonical LR. However, LAC is still experimental and is disabled by default. ** Java skeleton fixes: *** A location handling bug has been fixed. *** The top element of each of the value stack and location stack is now cleared when popped so that it can be garbage collected. *** Parser traces now print the top element of the stack. ** -W/--warnings fixes: *** Bison now properly recognizes the "no-" versions of categories: For example, given the following command line, Bison now enables all warnings except warnings for incompatibilities with POSIX Yacc: bison -Wall,no-yacc gram.y *** Bison now treats S/R and R/R conflicts like other warnings: Previously, conflict reports were independent of Bison's normal warning system. Now, Bison recognizes the warning categories "conflicts-sr" and "conflicts-rr". This change has important consequences for the -W and --warnings command-line options. For example: bison -Wno-conflicts-sr gram.y # S/R conflicts not reported bison -Wno-conflicts-rr gram.y # R/R conflicts not reported bison -Wnone gram.y # no conflicts are reported bison -Werror gram.y # any conflict is an error However, as before, if the %expect or %expect-rr directive is specified, an unexpected number of conflicts is an error, and an expected number of conflicts is not reported, so -W and --warning then have no effect on the conflict report. *** The "none" category no longer disables a preceding "error": For example, for the following command line, Bison now reports errors instead of warnings for incompatibilities with POSIX Yacc: bison -Werror,none,yacc gram.y *** The "none" category now disables all Bison warnings: Previously, the "none" category disabled only Bison warnings for which there existed a specific -W/--warning category. However, given the following command line, Bison is now guaranteed to suppress all warnings: bison -Wnone gram.y ** Precedence directives can now assign token number 0: Since Bison 2.3b, which restored the ability of precedence directives to assign token numbers, doing so for token number 0 has produced an assertion failure. For example: %left END 0 This bug has been fixed. * Noteworthy changes in release 2.4.3 (2010-08-05) ** Bison now obeys -Werror and --warnings=error for warnings about grammar rules that are useless in the parser due to conflicts. ** Problems with spawning M4 on at least FreeBSD 8 and FreeBSD 9 have been fixed. ** Failures in the test suite for GCC 4.5 have been fixed. ** Failures in the test suite for some versions of Sun Studio C++ have been fixed. ** Contrary to Bison 2.4.2's NEWS entry, it has been decided that warnings about undefined %prec identifiers will not be converted to errors in Bison 2.5. They will remain warnings, which should be sufficient for POSIX while avoiding backward compatibility issues. ** Minor documentation fixes. * Noteworthy changes in release 2.4.2 (2010-03-20) ** Some portability problems that resulted in failures and livelocks in the test suite on some versions of at least Solaris, AIX, HP-UX, RHEL4, and Tru64 have been addressed. As a result, fatal Bison errors should no longer cause M4 to report a broken pipe on the affected platforms. ** "%prec IDENTIFIER" requires IDENTIFIER to be defined separately. POSIX specifies that an error be reported for any identifier that does not appear on the LHS of a grammar rule and that is not defined by %token, %left, %right, or %nonassoc. Bison 2.3b and later lost this error report for the case when an identifier appears only after a %prec directive. It is now restored. However, for backward compatibility with recent Bison releases, it is only a warning for now. In Bison 2.5 and later, it will return to being an error. [Between the 2.4.2 and 2.4.3 releases, it was decided that this warning will not be converted to an error in Bison 2.5.] ** Detection of GNU M4 1.4.6 or newer during configure is improved. ** Warnings from gcc's -Wundef option about undefined YYENABLE_NLS, YYLTYPE_IS_TRIVIAL, and __STRICT_ANSI__ in C/C++ parsers are now avoided. ** %code is now a permanent feature. A traditional Yacc prologue directive is written in the form: %{CODE%} To provide a more flexible alternative, Bison 2.3b introduced the %code directive with the following forms for C/C++: %code {CODE} %code requires {CODE} %code provides {CODE} %code top {CODE} These forms are now considered permanent features of Bison. See the %code entries in the section "Bison Declaration Summary" in the Bison manual for a summary of their functionality. See the section "Prologue Alternatives" for a detailed discussion including the advantages of %code over the traditional Yacc prologue directive. Bison's Java feature as a whole including its current usage of %code is still considered experimental. ** YYFAIL is deprecated and will eventually be removed. YYFAIL has existed for many years as an undocumented feature of deterministic parsers in C generated by Bison. Previously, it was documented for Bison's experimental Java parsers. YYFAIL is no longer documented for Java parsers and is formally deprecated in both cases. Users are strongly encouraged to migrate to YYERROR, which is specified by POSIX. Like YYERROR, you can invoke YYFAIL from a semantic action in order to induce a syntax error. The most obvious difference from YYERROR is that YYFAIL will automatically invoke yyerror to report the syntax error so that you don't have to. However, there are several other subtle differences between YYERROR and YYFAIL, and YYFAIL suffers from inherent flaws when %error-verbose or "#define YYERROR_VERBOSE" is used. For a more detailed discussion, see: http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html The upcoming Bison 2.5 will remove YYFAIL from Java parsers, but deterministic parsers in C will continue to implement it. However, because YYFAIL is already flawed, it seems futile to try to make new Bison features compatible with it. Thus, during parser generation, Bison 2.5 will produce a warning whenever it discovers YYFAIL in a rule action. In a later release, YYFAIL will be disabled for %error-verbose and "#define YYERROR_VERBOSE". Eventually, YYFAIL will be removed altogether. There exists at least one case where Bison 2.5's YYFAIL warning will be a false positive. Some projects add phony uses of YYFAIL and other Bison-defined macros for the sole purpose of suppressing C preprocessor warnings (from GCC cpp's -Wunused-macros, for example). To avoid Bison's future warning, such YYFAIL uses can be moved to the epilogue (that is, after the second "%%") in the Bison input file. In this release (2.4.2), Bison already generates its own code to suppress C preprocessor warnings for YYFAIL, so projects can remove their own phony uses of YYFAIL if compatibility with Bison releases prior to 2.4.2 is not necessary. ** Internationalization. Fix a regression introduced in Bison 2.4: Under some circumstances, message translations were not installed although supported by the host system. * Noteworthy changes in release 2.4.1 (2008-12-11) ** In the GLR defines file, unexpanded M4 macros in the yylval and yylloc declarations have been fixed. ** Temporary hack for adding a semicolon to the user action. Bison used to prepend a trailing semicolon at the end of the user action for reductions. This allowed actions such as exp: exp "+" exp { $$ = $1 + $3 }; instead of exp: exp "+" exp { $$ = $1 + $3; }; Some grammars still depend on this "feature". Bison 2.4.1 restores the previous behavior in the case of C output (specifically, when neither %language or %skeleton or equivalent command-line options are used) to leave more time for grammars depending on the old behavior to be adjusted. Future releases of Bison will disable this feature. ** A few minor improvements to the Bison manual. * Noteworthy changes in release 2.4 (2008-11-02) ** %language is an experimental feature. We first introduced this feature in test release 2.3b as a cleaner alternative to %skeleton. Since then, we have discussed the possibility of modifying its effect on Bison's output file names. Thus, in this release, we consider %language to be an experimental feature that will likely evolve in future releases. ** Forward compatibility with GNU M4 has been improved. ** Several bugs in the C++ skeleton and the experimental Java skeleton have been fixed. * Noteworthy changes in release 2.3b (2008-05-27) ** The quotes around NAME that used to be required in the following directive are now deprecated: %define NAME "VALUE" ** The directive "%pure-parser" is now deprecated in favor of: %define api.pure which has the same effect except that Bison is more careful to warn about unreasonable usage in the latter case. ** Push Parsing Bison can now generate an LALR(1) parser in C with a push interface. That is, instead of invoking "yyparse", which pulls tokens from "yylex", you can push one token at a time to the parser using "yypush_parse", which will return to the caller after processing each token. By default, the push interface is disabled. Either of the following directives will enable it: %define api.push_pull "push" // Just push; does not require yylex. %define api.push_pull "both" // Push and pull; requires yylex. See the new section "A Push Parser" in the Bison manual for details. The current push parsing interface is experimental and may evolve. More user feedback will help to stabilize it. ** The -g and --graph options now output graphs in Graphviz DOT format, not VCG format. Like --graph, -g now also takes an optional FILE argument and thus cannot be bundled with other short options. ** Java Bison can now generate an LALR(1) parser in Java. The skeleton is "data/lalr1.java". Consider using the new %language directive instead of %skeleton to select it. See the new section "Java Parsers" in the Bison manual for details. The current Java interface is experimental and may evolve. More user feedback will help to stabilize it. Contributed by Paolo Bonzini. ** %language This new directive specifies the programming language of the generated parser, which can be C (the default), C++, or Java. Besides the skeleton that Bison uses, the directive affects the names of the generated files if the grammar file's name ends in ".y". ** XML Automaton Report Bison can now generate an XML report of the LALR(1) automaton using the new "--xml" option. The current XML schema is experimental and may evolve. More user feedback will help to stabilize it. Contributed by Wojciech Polak. ** The grammar file may now specify the name of the parser header file using %defines. For example: %defines "parser.h" ** When reporting useless rules, useless nonterminals, and unused terminals, Bison now employs the terms "useless in grammar" instead of "useless", "useless in parser" instead of "never reduced", and "unused in grammar" instead of "unused". ** Unreachable State Removal Previously, Bison sometimes generated parser tables containing unreachable states. A state can become unreachable during conflict resolution if Bison disables a shift action leading to it from a predecessor state. Bison now: 1. Removes unreachable states. 2. Does not report any conflicts that appeared in unreachable states. WARNING: As a result, you may need to update %expect and %expect-rr directives in existing grammar files. 3. For any rule used only in such states, Bison now reports the rule as "useless in parser due to conflicts". This feature can be disabled with the following directive: %define lr.keep_unreachable_states See the %define entry in the "Bison Declaration Summary" in the Bison manual for further discussion. ** Lookahead Set Correction in the ".output" Report When instructed to generate a ".output" file including lookahead sets (using "--report=lookahead", for example), Bison now prints each reduction's lookahead set only next to the associated state's one item that (1) is associated with the same rule as the reduction and (2) has its dot at the end of its RHS. Previously, Bison also erroneously printed the lookahead set next to all of the state's other items associated with the same rule. This bug affected only the ".output" file and not the generated parser source code. ** --report-file=FILE is a new option to override the default ".output" file name. ** The "=" that used to be required in the following directives is now deprecated: %file-prefix "parser" %name-prefix "c_" %output "parser.c" ** An Alternative to "%{...%}" -- "%code QUALIFIER {CODE}" Bison 2.3a provided a new set of directives as a more flexible alternative to the traditional Yacc prologue blocks. Those have now been consolidated into a single %code directive with an optional qualifier field, which identifies the purpose of the code and thus the location(s) where Bison should generate it: 1. "%code {CODE}" replaces "%after-header {CODE}" 2. "%code requires {CODE}" replaces "%start-header {CODE}" 3. "%code provides {CODE}" replaces "%end-header {CODE}" 4. "%code top {CODE}" replaces "%before-header {CODE}" See the %code entries in section "Bison Declaration Summary" in the Bison manual for a summary of the new functionality. See the new section "Prologue Alternatives" for a detailed discussion including the advantages of %code over the traditional Yacc prologues. The prologue alternatives are experimental. More user feedback will help to determine whether they should become permanent features. ** Revised warning: unset or unused midrule values Since Bison 2.2, Bison has warned about midrule values that are set but not used within any of the actions of the parent rule. For example, Bison warns about unused $2 in: exp: '1' { $$ = 1; } '+' exp { $$ = $1 + $4; }; Now, Bison also warns about midrule values that are used but not set. For example, Bison warns about unset $$ in the midrule action in: exp: '1' { $1 = 1; } '+' exp { $$ = $2 + $4; }; However, Bison now disables both of these warnings by default since they sometimes prove to be false alarms in existing grammars employing the Yacc constructs $0 or $-N (where N is some positive integer). To enable these warnings, specify the option "--warnings=midrule-values" or "-W", which is a synonym for "--warnings=all". ** Default %destructor or %printer with "<*>" or "<>" Bison now recognizes two separate kinds of default %destructor's and %printer's: 1. Place "<*>" in a %destructor/%printer symbol list to define a default %destructor/%printer for all grammar symbols for which you have formally declared semantic type tags. 2. Place "<>" in a %destructor/%printer symbol list to define a default %destructor/%printer for all grammar symbols without declared semantic type tags. Bison no longer supports the "%symbol-default" notation from Bison 2.3a. "<*>" and "<>" combined achieve the same effect with one exception: Bison no longer applies any %destructor to a midrule value if that midrule value is not actually ever referenced using either $$ or $n in a semantic action. The default %destructor's and %printer's are experimental. More user feedback will help to determine whether they should become permanent features. See the section "Freeing Discarded Symbols" in the Bison manual for further details. ** %left, %right, and %nonassoc can now declare token numbers. This is required by POSIX. However, see the end of section "Operator Precedence" in the Bison manual for a caveat concerning the treatment of literal strings. ** The nonfunctional --no-parser, -n, and %no-parser options have been completely removed from Bison. * Noteworthy changes in release 2.3a (2006-09-13) ** Instead of %union, you can define and use your own union type YYSTYPE if your grammar contains at least one <type> tag. Your YYSTYPE need not be a macro; it can be a typedef. This change is for compatibility with other Yacc implementations, and is required by POSIX. ** Locations columns and lines start at 1. In accordance with the GNU Coding Standards and Emacs. ** You may now declare per-type and default %destructor's and %printer's: For example: %union { char *string; } %token <string> STRING1 %token <string> STRING2 %type <string> string1 %type <string> string2 %union { char character; } %token <character> CHR %type <character> chr %destructor { free ($$); } %symbol-default %destructor { free ($$); printf ("%d", @$.first_line); } STRING1 string1 %destructor { } <character> guarantees that, when the parser discards any user-defined symbol that has a semantic type tag other than "<character>", it passes its semantic value to "free". However, when the parser discards a "STRING1" or a "string1", it also prints its line number to "stdout". It performs only the second "%destructor" in this case, so it invokes "free" only once. [Although we failed to mention this here in the 2.3a release, the default %destructor's and %printer's were experimental, and they were rewritten in future versions.] ** Except for LALR(1) parsers in C with POSIX Yacc emulation enabled (with "-y", "--yacc", or "%yacc"), Bison no longer generates #define statements for associating token numbers with token names. Removing the #define statements helps to sanitize the global namespace during preprocessing, but POSIX Yacc requires them. Bison still generates an enum for token names in all cases. ** Handling of traditional Yacc prologue blocks is now more consistent but potentially incompatible with previous releases of Bison. As before, you declare prologue blocks in your grammar file with the "%{ ... %}" syntax. To generate the pre-prologue, Bison concatenates all prologue blocks that you've declared before the first %union. To generate the post-prologue, Bison concatenates all prologue blocks that you've declared after the first %union. Previous releases of Bison inserted the pre-prologue into both the header file and the code file in all cases except for LALR(1) parsers in C. In the latter case, Bison inserted it only into the code file. For parsers in C++, the point of insertion was before any token definitions (which associate token numbers with names). For parsers in C, the point of insertion was after the token definitions. Now, Bison never inserts the pre-prologue into the header file. In the code file, it always inserts it before the token definitions. ** Bison now provides a more flexible alternative to the traditional Yacc prologue blocks: %before-header, %start-header, %end-header, and %after-header. For example, the following declaration order in the grammar file reflects the order in which Bison will output these code blocks. However, you are free to declare these code blocks in your grammar file in whatever order is most convenient for you: %before-header { /* Bison treats this block like a pre-prologue block: it inserts it into * the code file before the contents of the header file. It does *not* * insert it into the header file. This is a good place to put * #include's that you want at the top of your code file. A common * example is '#include "system.h"'. */ } %start-header { /* Bison inserts this block into both the header file and the code file. * In both files, the point of insertion is before any Bison-generated * token, semantic type, location type, and class definitions. This is a * good place to define %union dependencies, for example. */ } %union { /* Unlike the traditional Yacc prologue blocks, the output order for the * new %*-header blocks is not affected by their declaration position * relative to any %union in the grammar file. */ } %end-header { /* Bison inserts this block into both the header file and the code file. * In both files, the point of insertion is after the Bison-generated * definitions. This is a good place to declare or define public * functions or data structures that depend on the Bison-generated * definitions. */ } %after-header { /* Bison treats this block like a post-prologue block: it inserts it into * the code file after the contents of the header file. It does *not* * insert it into the header file. This is a good place to declare or * define internal functions or data structures that depend on the * Bison-generated definitions. */ } If you have multiple occurrences of any one of the above declarations, Bison will concatenate the contents in declaration order. [Although we failed to mention this here in the 2.3a release, the prologue alternatives were experimental, and they were rewritten in future versions.] ** The option "--report=look-ahead" has been changed to "--report=lookahead". The old spelling still works, but is not documented and may be removed in a future release. * Noteworthy changes in release 2.3 (2006-06-05) ** GLR grammars should now use "YYRECOVERING ()" instead of "YYRECOVERING", for compatibility with LALR(1) grammars. ** It is now documented that any definition of YYSTYPE or YYLTYPE should be to a type name that does not contain parentheses or brackets. * Noteworthy changes in release 2.2 (2006-05-19) ** The distribution terms for all Bison-generated parsers now permit using the parsers in nonfree programs. Previously, this permission was granted only for Bison-generated LALR(1) parsers in C. ** %name-prefix changes the namespace name in C++ outputs. ** The C++ parsers export their token_type. ** Bison now allows multiple %union declarations, and concatenates their contents together. ** New warning: unused values Right-hand side symbols whose values are not used are reported, if the symbols have destructors. For instance: exp: exp "?" exp ":" exp { $1 ? $1 : $3; } | 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); } ; 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; } ; If there are midrule actions, the warning is issued if no action uses it. The following triggers no warning: $1 and $3 are used. exp: exp { push ($1); } '+' exp { push ($3); sum (); }; The warning is intended to help catching lost values and memory leaks. If a value is ignored, its associated memory typically is not reclaimed. ** %destructor vs. YYABORT, YYACCEPT, and YYERROR. Destructors are now called when user code invokes YYABORT, YYACCEPT, and YYERROR, for all objects on the stack, other than objects corresponding to the right-hand side of the current rule. ** %expect, %expect-rr Incorrect numbers of expected conflicts are now actual errors, instead of warnings. ** GLR, YACC parsers. The %parse-params are available in the destructors (and the experimental printers) as per the documentation. ** Bison now warns if it finds a stray "$" or "@" in an action. ** %require "VERSION" This specifies that the grammar file depends on features implemented in Bison version VERSION or higher. ** lalr1.cc: The token and value types are now class members. The tokens were defined as free form enums and cpp macros. YYSTYPE was defined as a free form union. They are now class members: tokens are enumerations of the "yy::parser::token" struct, and the semantic values have the "yy::parser::semantic_type" type. If you do not want or can update to this scheme, the directive '%define "global_tokens_and_yystype" "1"' triggers the global definition of tokens and YYSTYPE. This change is suitable both for previous releases of Bison, and this one. If you wish to update, then make sure older version of Bison will fail using '%require "2.2"'. ** DJGPP support added. * Noteworthy changes in release 2.1 (2005-09-16) ** The C++ lalr1.cc skeleton supports %lex-param. ** Bison-generated parsers now support the translation of diagnostics like "syntax error" into languages other than English. The default language is still English. For details, please see the new Internationalization section of the Bison manual. Software distributors should also see the new PACKAGING file. Thanks to Bruno Haible for this new feature. ** Wording in the Bison-generated parsers has been changed slightly to simplify translation. In particular, the message "memory exhausted" has replaced "parser stack overflow", as the old message was not always accurate for modern Bison-generated parsers. ** Destructors are now called when the parser aborts, for all symbols left behind on the stack. Also, the start symbol is now destroyed after a successful parse. In both cases, the behavior was formerly inconsistent. ** When generating verbose diagnostics, Bison-generated parsers no longer quote the literal strings associated with tokens. For example, for a syntax error associated with '%token NUM "number"' they might print 'syntax error, unexpected number' instead of 'syntax error, unexpected "number"'. * Noteworthy changes in release 2.0 (2004-12-25) ** Possibly-incompatible changes - Bison-generated parsers no longer default to using the alloca function (when available) to extend the parser stack, due to widespread problems in unchecked stack-overflow detection. You can "#define YYSTACK_USE_ALLOCA 1" to require the use of alloca, but please read the manual to determine safe values for YYMAXDEPTH in that case. - Error token location. During error recovery, the location of the syntax error is updated to cover the whole sequence covered by the error token: it includes the shifted symbols thrown away during the first part of the error recovery, and the lookahead rejected during the second part. - Semicolon changes: . Stray semicolons are no longer allowed at the start of a grammar. . Semicolons are now required after in-grammar declarations. - Unescaped newlines are no longer allowed in character constants or string literals. They were never portable, and GCC 3.4.0 has dropped support for them. Better diagnostics are now generated if forget a closing quote. - NUL bytes are no longer allowed in Bison string literals, unfortunately. ** New features - GLR grammars now support locations. - New directive: %initial-action. This directive allows the user to run arbitrary code (including initializing @$) from yyparse before parsing starts. - A new directive "%expect-rr N" specifies the expected number of reduce/reduce conflicts in GLR parsers. - %token numbers can now be hexadecimal integers, e.g., "%token FOO 0x12d". This is a GNU extension. - The option "--report=lookahead" was changed to "--report=look-ahead". [However, this was changed back after 2.3.] - Experimental %destructor support has been added to lalr1.cc. - New configure option --disable-yacc, to disable installation of the yacc command and -ly library introduced in 1.875 for POSIX conformance. ** Bug fixes - For now, %expect-count violations are now just warnings, not errors. This is for compatibility with Bison 1.75 and earlier (when there are reduce/reduce conflicts) and with Bison 1.30 and earlier (when there are too many or too few shift/reduce conflicts). However, in future versions of Bison we plan to improve the %expect machinery so that these violations will become errors again. - Within Bison itself, numbers (e.g., goto numbers) are no longer arbitrarily limited to 16-bit counts. - Semicolons are now allowed before "|" in grammar rules, as POSIX requires. * Noteworthy changes in release 1.875 (2003-01-01) ** The documentation license has been upgraded to version 1.2 of the GNU Free Documentation License. ** syntax error processing - In Yacc-style parsers YYLLOC_DEFAULT is now used to compute error locations too. This fixes bugs in error-location computation. - %destructor It is now possible to reclaim the memory associated to symbols discarded during error recovery. This feature is still experimental. - %error-verbose This new directive is preferred over YYERROR_VERBOSE. - #defining yyerror to steal internal variables is discouraged. It is not guaranteed to work forever. ** POSIX conformance - Semicolons are once again optional at the end of grammar rules. This reverts to the behavior of Bison 1.33 and earlier, and improves compatibility with Yacc. - "parse error" -> "syntax error" Bison now uniformly uses the term "syntax error"; formerly, the code and manual sometimes used the term "parse error" instead. POSIX requires "syntax error" in diagnostics, and it was thought better to be consistent. - The documentation now emphasizes that yylex and yyerror must be declared before use. C99 requires this. - Bison now parses C99 lexical constructs like UCNs and backslash-newline within C escape sequences, as POSIX 1003.1-2001 requires. - File names are properly escaped in C output. E.g., foo\bar.y is output as "foo\\bar.y". - Yacc command and library now available The Bison distribution now installs a "yacc" command, as POSIX requires. Also, Bison now installs a small library liby.a containing implementations of Yacc-compatible yyerror and main functions. This library is normally not useful, but POSIX requires it. - Type clashes now generate warnings, not errors. - If the user does not define YYSTYPE as a macro, Bison now declares it using typedef instead of defining it as a macro. For consistency, YYLTYPE is also declared instead of defined. ** Other compatibility issues - %union directives can now have a tag before the "{", e.g., the directive "%union foo {...}" now generates the C code "typedef union foo { ... } YYSTYPE;"; this is for Yacc compatibility. The default union tag is "YYSTYPE", for compatibility with Solaris 9 Yacc. For consistency, YYLTYPE's struct tag is now "YYLTYPE" not "yyltype". This is for compatibility with both Yacc and Bison 1.35. - ";" is output before the terminating "}" of an action, for compatibility with Bison 1.35. - Bison now uses a Yacc-style format for conflict reports, e.g., "conflicts: 2 shift/reduce, 1 reduce/reduce". - "yystype" and "yyltype" are now obsolescent macros instead of being typedefs or tags; they are no longer documented and are planned to be withdrawn in a future release. ** GLR parser notes - GLR and inline Users of Bison have to decide how they handle the portability of the C keyword "inline". - "parsing stack overflow..." -> "parser stack overflow" GLR parsers now report "parser stack overflow" as per the Bison manual. ** %parse-param and %lex-param The macros YYPARSE_PARAM and YYLEX_PARAM provide a means to pass additional context to yyparse and yylex. They suffer from several shortcomings: - a single argument only can be added, - their types are weak (void *), - this context is not passed to ancillary functions such as yyerror, - only yacc.c parsers support them. The new %parse-param/%lex-param directives provide a more precise control. For instance: %parse-param {int *nastiness} %lex-param {int *nastiness} %parse-param {int *randomness} results in the following signatures: int yylex (int *nastiness); int yyparse (int *nastiness, int *randomness); or, if both %pure-parser and %locations are used: int yylex (YYSTYPE *lvalp, YYLTYPE *llocp, int *nastiness); int yyparse (int *nastiness, int *randomness); ** Bison now warns if it detects conflicting outputs to the same file, e.g., it generates a warning for "bison -d -o foo.h foo.y" since that command outputs both code and header to foo.h. ** #line in output files - --no-line works properly. ** Bison can no longer be built by a K&R C compiler; it requires C89 or later to be built. This change originally took place a few versions ago, but nobody noticed until we recently asked someone to try building Bison with a K&R C compiler. * Noteworthy changes in release 1.75 (2002-10-14) ** Bison should now work on 64-bit hosts. ** Indonesian translation thanks to Tedi Heriyanto. ** GLR parsers Fix spurious parse errors. ** Pure parsers Some people redefine yyerror to steal yyparse' private variables. Reenable this trick until an official feature replaces it. ** Type Clashes In agreement with POSIX and with other Yaccs, leaving a default action is valid when $$ is untyped, and $1 typed: untyped: ... typed; but the converse remains an error: typed: ... untyped; ** Values of midrule actions The following code: foo: { ... } { $$ = $1; } ... was incorrectly rejected: $1 is defined in the second midrule action, and is equal to the $$ of the first midrule action. * Noteworthy changes in release 1.50 (2002-10-04) ** GLR parsing The declaration %glr-parser causes Bison to produce a Generalized LR (GLR) parser, capable of handling almost any context-free grammar, ambiguous or not. The new declarations %dprec and %merge on grammar rules allow parse-time resolution of ambiguities. Contributed by Paul Hilfinger. Unfortunately Bison 1.50 does not work properly on 64-bit hosts like the Alpha, so please stick to 32-bit hosts for now. ** Output Directory When not in Yacc compatibility mode, when the output file was not specified, running "bison foo/bar.y" created "foo/bar.c". It now creates "bar.c". ** Undefined token The undefined token was systematically mapped to 2 which prevented the use of 2 by the user. This is no longer the case. ** Unknown token numbers If yylex returned an out of range value, yyparse could die. This is no longer the case. ** Error token According to POSIX, the error token must be 256. Bison extends this requirement by making it a preference: *if* the user specified that one of her tokens is numbered 256, then error will be mapped onto another number. ** Verbose error messages They no longer report "..., expecting error or..." for states where error recovery is possible. ** End token Defaults to "$end" instead of "$". ** Error recovery now conforms to documentation and to POSIX When a Bison-generated parser encounters a syntax error, it now pops the stack until it finds a state that allows shifting the error token. Formerly, it popped the stack until it found a state that allowed some non-error action other than a default reduction on the error token. The new behavior has long been the documented behavior, and has long been required by POSIX. For more details, please see Paul Eggert, "Reductions during Bison error handling" (2002-05-20) <http://lists.gnu.org/archive/html/bug-bison/2002-05/msg00038.html>. ** Traces Popped tokens and nonterminals are now reported. ** Larger grammars Larger grammars are now supported (larger token numbers, larger grammar size (= sum of the LHS and RHS lengths), larger LALR tables). Formerly, many of these numbers ran afoul of 16-bit limits; now these limits are 32 bits on most hosts. ** Explicit initial rule Bison used to play hacks with the initial rule, which the user does not write. It is now explicit, and visible in the reports and graphs as rule 0. ** Useless rules Before, Bison reported the useless rules, but, although not used, included them in the parsers. They are now actually removed. ** Useless rules, useless nonterminals They are now reported, as a warning, with their locations. ** Rules never reduced Rules that can never be reduced because of conflicts are now reported. ** Incorrect "Token not used" On a grammar such as %token useless useful %% exp: '0' %prec useful; where a token was used to set the precedence of the last rule, bison reported both "useful" and "useless" as useless tokens. ** Revert the C++ namespace changes introduced in 1.31 as they caused too many portability hassles. ** Default locations By an accident of design, the default computation of @$ was performed after another default computation was performed: @$ = @1. The latter is now removed: YYLLOC_DEFAULT is fully responsible of the computation of @$. ** Token end-of-file The token end of file may be specified by the user, in which case, the user symbol is used in the reports, the graphs, and the verbose error messages instead of "$end", which remains being the default. For instance %token MYEOF 0 or %token MYEOF 0 "end of file" ** Semantic parser This old option, which has been broken for ages, is removed. ** New translations Brazilian Portuguese, thanks to Alexandre Folle de Menezes. Croatian, thanks to Denis Lackovic. ** Incorrect token definitions When given %token 'a' "A" bison used to output #define 'a' 65 ** Token definitions as enums Tokens are output both as the traditional #define's, and, provided the compiler supports ANSI C or is a C++ compiler, as enums. This lets debuggers display names instead of integers. ** Reports In addition to --verbose, bison supports --report=THINGS, which produces additional information: - itemset complete the core item sets with their closure - lookahead [changed to "look-ahead" in 1.875e through 2.3, but changed back] explicitly associate lookahead tokens to items - solved describe shift/reduce conflicts solving. Bison used to systematically output this information on top of the report. Solved conflicts are now attached to their states. ** Type clashes Previous versions don't complain when there is a type clash on the default action if the rule has a midrule action, such as in: %type <foo> bar %% bar: '0' {} '0'; This is fixed. ** GNU M4 is now required when using Bison. * Noteworthy changes in release 1.35 (2002-03-25) ** C Skeleton Some projects use Bison's C parser with C++ compilers, and define YYSTYPE as a class. The recent adjustment of C parsers for data alignment and 64 bit architectures made this impossible. Because for the time being no real solution for C++ parser generation exists, kludges were implemented in the parser to maintain this use. In the future, when Bison has C++ parsers, this kludge will be disabled. This kludge also addresses some C++ problems when the stack was extended. * Noteworthy changes in release 1.34 (2002-03-12) ** File name clashes are detected $ bison foo.y -d -o foo.x fatal error: header and parser would both be named "foo.x" ** A missing ";" at the end of a rule triggers a warning In accordance with POSIX, and in agreement with other Yacc implementations, Bison will mandate this semicolon in the near future. This eases the implementation of a Bison parser of Bison grammars by making this grammar LALR(1) instead of LR(2). To facilitate the transition, this release introduces a warning. ** Revert the C++ namespace changes introduced in 1.31, as they caused too many portability hassles. ** DJGPP support added. ** Fix test suite portability problems. * Noteworthy changes in release 1.33 (2002-02-07) ** Fix C++ issues Groff could not be compiled for the definition of size_t was lacking under some conditions. ** Catch invalid @n As is done with $n. * Noteworthy changes in release 1.32 (2002-01-23) ** Fix Yacc output file names ** Portability fixes ** Italian, Dutch translations * Noteworthy changes in release 1.31 (2002-01-14) ** Many Bug Fixes ** GNU Gettext and %expect GNU Gettext asserts 10 s/r conflicts, but there are 7. Now that Bison dies on incorrect %expectations, we fear there will be too many bug reports for Gettext, so _for the time being_, %expect does not trigger an error when the input file is named "plural.y". ** Use of alloca in parsers If YYSTACK_USE_ALLOCA is defined to 0, then the parsers will use malloc exclusively. Since 1.29, but was not NEWS'ed. alloca is used only when compiled with GCC, to avoid portability problems as on AIX. ** yyparse now returns 2 if memory is exhausted; formerly it dumped core. ** When the generated parser lacks debugging code, YYDEBUG is now 0 (as POSIX requires) instead of being undefined. ** User Actions Bison has always permitted actions such as { $$ = $1 }: it adds the ending semicolon. Now if in Yacc compatibility mode, the semicolon is no longer output: one has to write { $$ = $1; }. ** Better C++ compliance The output parsers try to respect C++ namespaces. [This turned out to be a failed experiment, and it was reverted later.] ** Reduced Grammars Fixed bugs when reporting useless nonterminals. ** 64 bit hosts The parsers work properly on 64 bit hosts. ** Error messages Some calls to strerror resulted in scrambled or missing error messages. ** %expect When the number of shift/reduce conflicts is correct, don't issue any warning. ** The verbose report includes the rule line numbers. ** Rule line numbers are fixed in traces. ** Swedish translation ** Parse errors Verbose parse error messages from the parsers are better looking. Before: parse error: unexpected `'/'', expecting `"number"' or `'-'' or `'('' Now: parse error: unexpected '/', expecting "number" or '-' or '(' ** Fixed parser memory leaks. When the generated parser was using malloc to extend its stacks, the previous allocations were not freed. ** Fixed verbose output file. Some newlines were missing. Some conflicts in state descriptions were missing. ** Fixed conflict report. Option -v was needed to get the result. ** %expect Was not used. Mismatches are errors, not warnings. ** Fixed incorrect processing of some invalid input. ** Fixed CPP guards: 9foo.h uses BISON_9FOO_H instead of 9FOO_H. ** Fixed some typos in the documentation. ** %token MY_EOF 0 is supported. Before, MY_EOF was silently renumbered as 257. ** doc/refcard.tex is updated. ** %output, %file-prefix, %name-prefix. New. ** --output New, aliasing "--output-file". * Noteworthy changes in release 1.30 (2001-10-26) ** "--defines" and "--graph" have now an optional argument which is the output file name. "-d" and "-g" do not change; they do not take any argument. ** "%source_extension" and "%header_extension" are removed, failed experiment. ** Portability fixes. * Noteworthy changes in release 1.29 (2001-09-07) ** The output file does not define const, as this caused problems when used with common autoconfiguration schemes. If you still use ancient compilers that lack const, compile with the equivalent of the C compiler option "-Dconst=". Autoconf's AC_C_CONST macro provides one way to do this. ** Added "-g" and "--graph". ** The Bison manual is now distributed under the terms of the GNU FDL. ** The input and the output files has automatically a similar extension. ** Russian translation added. ** NLS support updated; should hopefully be less troublesome. ** Added the old Bison reference card. ** Added "--locations" and "%locations". ** Added "-S" and "--skeleton". ** "%raw", "-r", "--raw" is disabled. ** Special characters are escaped when output. This solves the problems of the #line lines with path names including backslashes. ** New directives. "%yacc", "%fixed_output_files", "%defines", "%no_parser", "%verbose", "%debug", "%source_extension" and "%header_extension". ** @$ Automatic location tracking. * Noteworthy changes in release 1.28 (1999-07-06) ** Should compile better now with K&R compilers. ** Added NLS. ** Fixed a problem with escaping the double quote character. ** There is now a FAQ. * Noteworthy changes in release 1.27 ** The make rule which prevented bison.simple from being created on some systems has been fixed. * Noteworthy changes in release 1.26 ** Bison now uses Automake. ** New mailing lists: <bug-bison@gnu.org> and <help-bison@gnu.org>. ** Token numbers now start at 257 as previously documented, not 258. ** Bison honors the TMPDIR environment variable. ** A couple of buffer overruns have been fixed. ** Problems when closing files should now be reported. ** Generated parsers should now work even on operating systems which do not provide alloca(). * Noteworthy changes in release 1.25 (1995-10-16) ** Errors in the input grammar are not fatal; Bison keeps reading the grammar file, and reports all the errors found in it. ** Tokens can now be specified as multiple-character strings: for example, you could use "<=" for a token which looks like <=, instead of choosing a name like LESSEQ. ** The %token_table declaration says to write a table of tokens (names and numbers) into the parser file. The yylex function can use this table to recognize multiple-character string tokens, or for other purposes. ** The %no_lines declaration says not to generate any #line preprocessor directives in the parser file. ** The %raw declaration says to use internal Bison token numbers, not Yacc-compatible token numbers, when token names are defined as macros. ** The --no-parser option produces the parser tables without including the parser engine; a project can now use its own parser engine. The actions go into a separate file called NAME.act, in the form of a switch statement body. * Noteworthy changes in release 1.23 The user can define YYPARSE_PARAM as the name of an argument to be passed into yyparse. The argument should have type void *. It should actually point to an object. Grammar actions can access the variable by casting it to the proper pointer type. Line numbers in output file corrected. * Noteworthy changes in release 1.22 --help option added. * Noteworthy changes in release 1.20 Output file does not redefine const for C++. ----- LocalWords: yacc YYBACKUP glr GCC lalr ArrayIndexOutOfBoundsException nullptr LocalWords: cplusplus liby rpl fprintf mfcalc Wyacc stmt cond expr mk sym lr LocalWords: IELR ielr Lookahead YYERROR nonassoc LALR's api lookaheads yychar LocalWords: destructor lookahead YYRHSLOC YYLLOC Rhs ifndef YYFAIL cpp sr rr LocalWords: preprocessor initializer Wno Wnone Werror FreeBSD prec livelocks LocalWords: Solaris AIX UX RHEL Tru LHS gcc's Wundef YYENABLE NLS YYLTYPE VCG LocalWords: yyerror cpp's Wunused yylval yylloc prepend yyparse yylex yypush LocalWords: Graphviz xml nonterminals midrule destructor's YYSTYPE typedef ly LocalWords: CHR chr printf stdout namespace preprocessing enum pre include's LocalWords: YYRECOVERING nonfree destructors YYABORT YYACCEPT params enums de LocalWords: struct yystype DJGPP lex param Haible NUM alloca YYSTACK NUL goto LocalWords: YYMAXDEPTH Unescaped UCNs YYLTYPE's yyltype typedefs inline Yaccs LocalWords: Heriyanto Reenable dprec Hilfinger Eggert MYEOF Folle Menezes EOF LocalWords: Lackovic define's itemset Groff Gettext malloc NEWS'ed YYDEBUG YY LocalWords: namespaces strerror const autoconfiguration Dconst Autoconf's FDL LocalWords: Automake TMPDIR LESSEQ ylwrap endif yydebug YYTOKEN YYLSP ival hh LocalWords: extern YYTOKENTYPE TOKENTYPE yytokentype tokentype STYPE lval pdf LocalWords: lang yyoutput dvi html ps POSIX lvalp llocp Wother nterm arg init LocalWords: TOK calc yyo fval Wconflicts parsers yystackp yyval yynerrs LocalWords: Théophile Ranquet Santet fno fnone stype associativity Tolmer LocalWords: Wprecedence Rassoul Wempty Paolo Bonzini parser's Michiel loc LocalWords: redeclaration sval fcaret reentrant XSLT xsl Wmaybe yyvsp Tedi LocalWords: pragmas noreturn untyped Rozenman unexpanded Wojciech Polak LocalWords: Alexandre MERCHANTABILITY yytype emplace ptr automove lvalues LocalWords: nonterminal yy args Pragma dereference yyformat rhs docdir bw LocalWords: Redeclarations rpcalc Autoconf YFLAGS Makefiles PROG DECL num LocalWords: Heimbigner AST src ast Makefile srcdir MinGW xxlex XXSTYPE LocalWords: XXLTYPE strictfp IDEs ffixit fdiagnostics parseable fixits LocalWords: Wdeprecated yytext Variadic variadic yyrhs yyphrs RCS README LocalWords: noexcept constexpr ispell american deprecations backend Teoh LocalWords: YYPRINT Mangold Bonzini's Wdangling exVal baz checkable gcc LocalWords: fsanitize Vogelsgesang lis redeclared stdint automata yytname LocalWords: yysymbol yytnamerr yyreport ctx ARGMAX yysyntax stderr LPAREN LocalWords: symrec yypcontext TOKENMAX yyexpected YYEMPTY yypstate YYEOF LocalWords: autocompletion bistromathic submessages Cayuela lexcalc hoc LocalWords: yytoken YYUNDEF YYerror basename Automake's UTF ifdef ffile LocalWords: gotos readline Imbimbo Wcounterexamples Wcex Nonunifying rcex Local Variables: ispell-dictionary: "american" mode: outline fill-column: 76 End: Copyright (C) 1995-2015, 2018-2020 Free Software Foundation, Inc. This file is part of Bison, the GNU Parser Generator. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the "GNU Free Documentation License" file as part of this distribution. PK �s�[�&Z�� � AUTHORSnu �[��� Authors of GNU Bison. Bison was written primarily by Robert Corbett. Richard Stallman made it Yacc-compatible. Wilfred Hansen of Carnegie Mellon University added multicharacter string literals and other features (Bison 1.25, 1995). Akim Demaille rewrote the parser in Bison, and changed the back end to use M4 (1.50, 2002). Paul Hilfinger added GLR support (Bison 1.50, 2002). Joel E. Denny contributed canonical-LR support, and invented and added IELR and LAC (Lookahead Correction) support (Bison 2.5, 2011). Paolo Bonzini contributed Java support (Bison 2.4, 2008). Alex Rozenman added named reference support (Bison 2.5, 2011). Paul Eggert fixed a million portability issues, arbitrary limitations, and nasty bugs. ----- Copyright (C) 1998-2015, 2018-2020 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. 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/>. PK �s�[|�wfK� K� COPYINGnu �[��� GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The GNU General Public License is a free, copyleft license for software and other kinds of works. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. TERMS AND CONDITIONS 0. Definitions. "This License" refers to version 3 of the GNU General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. A "covered work" means either the unmodified Program or a work based on the Program. To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. 1. Source Code. The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. The Corresponding Source for a work in source code form is that same work. 2. Basic Permissions. All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. 3. Protecting Users' Legal Rights From Anti-Circumvention Law. No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. 4. Conveying Verbatim Copies. You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. 5. Conveying Modified Source Versions. You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: a) The work must carry prominent notices stating that you modified it, and giving a relevant date. b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. 6. Conveying Non-Source Forms. You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. "Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. 7. Additional Terms. "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or d) Limiting the use for publicity purposes of names of licensors or authors of the material; or e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. 8. Termination. You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. 9. Acceptance Not Required for Having Copies. You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. 10. Automatic Licensing of Downstream Recipients. Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. 11. Patents. A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. 12. No Surrender of Others' Freedom. If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. 13. Use with the GNU Affero General Public License. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. 15. Disclaimer of Warranty. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. Limitation of Liability. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 17. Interpretation of Sections 15 and 16. If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> 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/>. Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: <program> Copyright (C) <year> <name of author> This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an "about box". You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <http://www.gnu.org/licenses/>. The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>. PK �s�[�,���- �- THANKSnu �[��� Bison was originally written by Robert Corbett. It would not be what it is today without the invaluable help of these people: Aaro Koskinen aaro.koskinen@iki.fi Аскар Сафин safinaskar@mail.ru Adam Sampson ats@offog.org Adrian Vogelsgesang avogelsgesang@tableau.com Ahcheong Lee dkcjd2000@gmail.com Airy Andre Airy.Andre@edf.fr Akim Demaille akim@gnu.org Albert Chin-A-Young china@thewrittenword.com Alexander Belopolsky alexb@rentec.com Alexandre Duret-Lutz adl@lrde.epita.fr Andre da Costa Barros andre.cbarros@yahoo.com Andreas Damm adamm@onica.com Andreas Schwab schwab@suse.de Andrew Suffield asuffield@users.sourceforge.net Angelo Borsotti angelo.borsotti@gmail.com Anthony Heading ajrh@ajrh.net Antonio Silva Correia amsilvacorreia@hotmail.com Arnold Robbins arnold@skeeve.com Art Haas ahaas@neosoft.com Arthur Schwarz aschwarz1309@att.net Askar Safin safinaskar@mail.ru Balázs Scheidler balazs.scheidler@oneidentity.com Baron Schwartz baron@sequent.org Ben Pfaff blp@cs.stanford.edu Benoit Perrot benoit.perrot@epita.fr Bernd Edlinger bernd.edlinger@hotmail.de Bernd Kiefer kiefer@dfki.de Bert Deknuydt Bert.Deknuydt@esat.kuleuven.ac.be Bill Allombert Bill.Allombert@math.u-bordeaux1.fr Bob Rossi bob@brasko.net Brandon Lucia blucia@gmail.com Brooks Moses bmoses@google.com Bruce Lilly blilly@erols.com Bruno Haible bruno@clisp.org Charles-Henri de Boysson de-boy_c@epita.fr Christian Burger cburger@sunysb.edu Clément Démoulins demoulins@lrde.epita.fr Colin Daley colin.daley@outlook.com Cris Bailiff c.bailiff+bison@awayweb.com Cris van Pelt cris@amf03054.office.wxs.nl Csaba Raduly csaba_22@yahoo.co.uk Dagobert Michelsen dam@baltic-online.de Daniel Frużyński daniel@poradnik-webmastera.com Daniel Galloway dg1751@att.com Daniela Becker daniela@lrde.epita.fr Daniel Hagerty hag@gnu.org David Barto david.barto@sparqlcity.com David J. MacKenzie djm@gnu.org David Kastrup dak@gnu.org David Michael fedora.dm0@gmail.com Dengke Du dengke.du@windriver.com Denis Excoffier gcc@Denis-Excoffier.org Dennis Clarke dclarke@blastwave.org Derek Clegg derek@me.com Derek M. Jones derek@knosof.co.uk Di-an Jan dianj@freeshell.org Dick Streefland dick.streefland@altium.nl Didier Godefroy dg@ulysium.net Don Macpherson donmac703@gmail.com Dwight Guth dwight.guth@runtimeverification.com Efi Fogel efifogel@gmail.com Enrico Scholz enrico.scholz@informatik.tu-chemnitz.de Eric Blake ebb9@byu.net Eric S. Raymond esr@thyrsus.com Étienne Renault renault@lrde.epita.fr Evan Lavelle eml-bison@cyconix.com Evan Nemerson evan@nemerson.com Evgeny Stambulchik fnevgeny@plasma-gate.weizmann.ac.il Fabrice Bauzac noon@cote-dazur.com Ferdinand Thiessen ferdinand@fthiessen.de Florian Krohm florian@edamail.fishkill.ibm.com Frank Heckenbach frank@g-n-u.de Frans Englich frans.englich@telia.com Gabriel Rassoul gabriel.rassoul@epita.fr Gary L Peskin garyp@firstech.com Gavin Smith gavinsmith0123@gmail.com Georg Sauthoff gsauthof@TechFak.Uni-Bielefeld.DE George Neuner gneuner2@comcast.net Gilles Espinasse g.esp@free.fr Goran Uddeborg goeran@uddeborg.se Guido Trentalancia trentalg@aston.ac.uk H. Merijn Brand h.m.brand@hccnet.nl Hans Åberg haberg-1@telia.com Horst Von Brand vonbrand@inf.utfsm.cl Jacob L. Mandelson jlm-bbison@jlm.ofb.net Jan Nieuwenhuizen janneke@gnu.org Jannick thirdedition@gmx.net Jeff Hammond jeff_hammond@acm.org Jerry Quinn jlquinn@optonline.net Jesse Thilo jthilo@gnu.org Jim Kent jkent@arch.sel.sony.com Jim Meyering jim@meyering.net Joel E. Denny joeldenny@joeldenny.org Johan van Selst johans@stack.nl John Horigan john@glyphic.com Jonathan Fabrizio jonathan.fabrizio@lrde.epita.fr Jonathan Nieder jrnieder@gmail.com Josh Soref jsoref@gmail.com Juan Manuel Guerrero juan.guerrero@gmx.de Karl Berry karl@freefriends.org Kees Zeelenberg kzlg@users.sourceforge.net Keith Browne kbrowne@legato.com Ken Moffat zarniwhoop@ntlworld.com Kiyoshi Kanazawa yoi_no_myoujou@yahoo.co.jp Lars Maier lars.maier@tefax.net Lars Wendler polynomial-c@gentoo.org László Várady laszlo.varady93@gmail.com Laurent Mascherpa laurent.mascherpa@epita.fr Lie Yan lie.yan@kaust.edu.sa Maarten De Braekeleer maarten.debraekeleer@gmail.com Magnus Fromreide magfr@lysator.liu.se Marc Autret autret_m@epita.fr Marc Mendiola mmendiol@usc.edu Marc Schönefeld marc.schoenefeld@gmx.org Mark Boyall wolfeinstein@gmail.com Martin Blais blais@furius.ca Martin Jacobs martin.jacobs@arcor.de Martin Mokrejs mmokrejs@natur.cuni.cz Martin Nylin martin.nylin@linuxmail.org Matt Kraai kraai@alumni.cmu.edu Matt Rosing rosing@peakfive.com Maxim Prohorenko Maxim.Prohorenko@gmail.com Michael Catanzaro mcatanzaro@gnome.org Michael Felt mamfelt@gmail.com Michael Hayes m.hayes@elec.canterbury.ac.nz Michael Raskin 7c6f434c@mail.ru Michel d'Hooge michel.dhooge@gmail.com Michiel De Wilde mdewilde.agilent@gmail.com Mickael Labau labau_m@epita.fr Mike Castle dalgoda@ix.netcom.com Mike Frysinger vapier@gentoo.org Mike Sullivan Mike.sullivan@Oracle.COM Nate Guerin nathan.guerin@riseup.net Neil Booth NeilB@earthling.net Nelson H. F. Beebe beebe@math.utah.edu neok m4700 neok.m4700@gmail.com Nick Bowler nbowler@elliptictech.com Nicolas Bedon nicolas.bedon@univ-rouen.fr Nicolas Burrus nicolas.burrus@epita.fr Nicolas Tisserand nicolas.tisserand@epita.fr Nikki Valen nicolettavalencia.nv@gmail.com Noah Friedman friedman@gnu.org Odd Arild Olsen oao@fibula.no Oleg Smolsky oleg.smolsky@pacific-simulators.co.nz Oleksii Taran oleksii.taran@gmail.com Oliver Mangold o.mangold@gmail.com Paolo Bonzini bonzini@gnu.org Paolo Simone Gasparello djgaspa@gmail.com Pascal Bart pascal.bart@epita.fr Patrice Dumas pertusus@free.fr Paul Eggert eggert@cs.ucla.edu Paul Hilfinger Hilfinger@CS.Berkeley.EDU Per Allansson per@appgate.com Peter Eisentraut peter_e@gmx.net Peter Fales psfales@lucent.com Peter Hamorsky hamo@upjs.sk Peter Simons simons@cryp.to Petr Machata pmachata@redhat.com Pho pho@cielonegro.org Piotr Gackiewicz gacek@intertel.com.pl Piotr Marcińczyk piomar123@gmail.com Pramod Kumbhar pramod.s.kumbhar@gmail.com Quentin Hocquet hocquet@gostai.com Quoc Peyrot chojin@lrde.epita.fr R Blake blakers@mac.com Raja R Harinath harinath@cs.umn.edu Ralf Wildenhues Ralf.Wildenhues@gmx.de Ryan dev@splintermail.com Rich Wilson richaw@gmail.com Richard Stallman rms@gnu.org Rici Lake ricilake@gmail.com Rob Conde rob.conde@ai-solutions.com Rob Vermaas rob.vermaas@gmail.com Robert Anisko anisko_r@epita.fr Robert Yang liezhi.yang@windriver.com Roland Levillain roland@lrde.epita.fr Satya Kiran Popuri satyakiran@gmail.com Sebastian Setzer sebastian.setzer.ext@siemens.com Sebastien Fricker sebastien.fricker@gmail.com Sébastien Villemot sebastien@debian.org Sergei Steshenko sergstesh@yahoo.com Shura debil_urod@ngs.ru Simon Sobisch simonsobisch@web.de Stefano Lattarini stefano.lattarini@gmail.com Stephen Cameron stephenmcameron@gmail.com Steve Murphy murf@parsetree.com Suhwan Song prada960808@gmail.com Sum Wu sum@geekhouse.org Théophile Ranquet theophile.ranquet@gmail.com Thiru Ramakrishnan thiru.ramakrishnan@gmail.com Thomas Jahns jahns@dkrz.de Thomas Petazzoni thomas.petazzoni@bootlin.com Tim Josling tej@melbpc.org.au Tim Landscheidt tim@tim-landscheidt.de Tim Van Holder tim.van.holder@pandora.be Tobias Frost tobi@debian.org Todd Freed todd.freed@gmail.com Tom Kramer kramer@nist.gov Tom Lane tgl@sss.pgh.pa.us Tom Tromey tromey@cygnus.com Tomasz Kłoczko kloczko.tomasz@gmail.com Tommy Nordgren tommy.nordgren@chello.se Troy A. Johnson troyj@ecn.purdue.edu Tys Lefering gccbison@gmail.com Uxio Prego uxio@uma.es Valentin Tolmer nitnelave1@gmail.com wcventure wcventure@126.com Victor Khomenko victor.khomenko@newcastle.ac.uk Victor Zverovich victor.zverovich@gmail.com Vin Shelton acs@alumni.princeton.edu W.C.A. Wijngaards wouter@NLnetLabs.nl Wayne Green wayne@infosavvy.com Wei Song wsong83@gmail.com Wojciech Polak polak@gnu.org Wolfgang S. Kechel wolfgang.kechel@prs.de Wolfgang Thaller wolfgang.thaller@gmx.net Wolfram Wagner ww@mpi-sb.mpg.de Wwp subscript@free.fr xolodho xolodho@gmail.com Yuichiro Kaneko spiketeika@gmail.com Yuriy Solodkyy solodon@gmail.com Zack Weinberg zack@codesourcery.com 江 祖铭 jjzuming@outlook.com 長田偉伸 cbh34680@iret.co.jp 马俊 majun123@whu.edu.cn Many people are not named here because we lost track of them. We thank them! Please, help us keeping this list up to date. Local Variables: mode: text coding: utf-8 End: ----- Copyright (C) 2000-2015, 2018-2020 Free Software Foundation, Inc. This file is part of Bison, the GNU Parser Generator. 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/>. PK �s�[�jj j READMEnu �[��� GNU Bison is a general-purpose parser generator that converts an annotated context-free grammar into a deterministic LR or generalized LR (GLR) parser employing LALR(1) parser tables. Bison can also generate IELR(1) or canonical LR(1) parser tables. Once you are proficient with Bison, you can use it to develop a wide range of language parsers, from those used in simple desk calculators to complex programming languages. Bison is upward compatible with Yacc: all properly-written Yacc grammars work with Bison with no change. Anyone familiar with Yacc should be able to use Bison with little trouble. You need to be fluent in C, C++ or Java programming in order to use Bison. Bison and the parsers it generates are portable, they do not require any specific compilers. GNU Bison's home page is https://gnu.org/software/bison/. # Installation ## Build from git The [README-hacking.md file](README-hacking.md) is about building, modifying and checking Bison. See its "Working from the Repository" section to build Bison from the git repo. Roughly, run: $ git submodule update --init $ ./bootstrap then proceed with the usual `configure && make` steps. ## Build from tarball See the [INSTALL file](INSTALL) for generic compilation and installation instructions. Bison requires GNU m4 1.4.6 or later. See https://ftp.gnu.org/gnu/m4/m4-1.4.6.tar.gz. ## Running a non installed bison Once you ran `make`, you might want to toy with this fresh bison before installing it. In that case, do not use `src/bison`: it would use the *installed* files (skeletons, etc.), not the local ones. Use `tests/bison`. ## Colored diagnostics As an experimental feature, diagnostics are now colored, controlled by the `--color` and `--style` options. To use them, install the libtextstyle library, 0.20.5 or newer, before configuring Bison. It is available from https://alpha.gnu.org/gnu/gettext/, for instance https://alpha.gnu.org/gnu/gettext/libtextstyle-0.20.5.tar.gz, or as part of Gettext 0.21 or newer, for instance https://ftp.gnu.org/gnu/gettext/gettext-0.21.tar.gz. The option --color supports the following arguments: - always, yes: Enable colors. - never, no: Disable colors. - auto, tty (default): Enable colors if the output device is a tty. To customize the styles, create a CSS file, say `bison-bw.css`, similar to /* bison-bw.css */ .warning { } .error { font-weight: 800; text-decoration: underline; } .note { } then invoke bison with `--style=bison-bw.css`, or set the `BISON_STYLE` environment variable to `bison-bw.css`. In some diagnostics, bison uses libtextstyle to emit special escapes to generate clickable hyperlinks. The environment variable `NO_TERM_HYPERLINKS` can be used to suppress them. This may be useful for terminal emulators which produce garbage output when they receive the escape sequence for a hyperlink. Currently (as of 2020), this affects some versions of emacs, guake, konsole, lxterminal, rxvt, yakuake. ## Relocatability If you pass `--enable-relocatable` to `configure`, Bison is relocatable. A relocatable program can be moved or copied to a different location on the file system. It can also be used through mount points for network sharing. It is possible to make symlinks to the installed and moved programs, and invoke them through the symlink. See "Enabling Relocatability" in the documentation. ## Internationalization Bison supports two catalogs: one for Bison itself (i.e., for the maintainer-side parser generation), and one for the generated parsers (i.e., for the user-side parser execution). The requirements between both differ: bison needs ngettext, the generated parsers do not. To simplify the build system, neither are installed if ngettext is not supported, even if generated parsers could have been localized. See http://lists.gnu.org/archive/html/bug-bison/2009-08/msg00006.html for more details. # Questions See the section FAQ in the documentation (doc/bison.info) for frequently asked questions. The documentation is also available in PDF and HTML, provided you have a recent version of Texinfo installed: run `make pdf` or `make html`. If you have questions about using Bison and the documentation does not answer them, please send mail to <help-bison@gnu.org>. # Bug reports Please send bug reports to <bug-bison@gnu.org>. Be sure to include the version number from `bison --version`, and a complete, self-contained test case in each bug report. # Copyright statements For any copyright year range specified as YYYY-ZZZZ in this package, note that the range specifies every single year in that closed interval. <!-- LocalWords: parsers ngettext Texinfo pdf html YYYY ZZZZ ispell american md LocalWords: MERCHANTABILITY GLR LALR IELR submodule init README src bw LocalWords: Relocatability symlinks symlink Local Variables: mode: markdown fill-column: 76 ispell-dictionary: "american" End: Copyright (C) 1992, 1998-1999, 2003-2005, 2008-2015, 2018-2020 Free Software Foundation, Inc. This file is part of GNU bison, the GNU Compiler Compiler. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. A copy of the license is included in the "GNU Free Documentation License" file as part of this distribution. --> PK �s�[�� � ChangeLognu �[��� 2020-11-14 Akim Demaille <akim.demaille@gmail.com> version 3.7.4 * NEWS: Record release date. 2020-11-13 Akim Demaille <akim.demaille@gmail.com> c++: shorten the assertions that check whether tokens are correct Before: YY_ASSERT (tok == token::YYEOF || tok == token::YYerror || tok == token::YYUNDEF || tok == 120 || tok == 49 || tok == 50 || tok == 51 || tok == 52 || tok == 53 || tok == 54 || tok == 55 || tok == 56 || tok == 57 || tok == 97 || tok == 98); After: YY_ASSERT (tok == token::YYEOF || (token::YYerror <= tok && tok <= token::YYUNDEF) || tok == 120 || (49 <= tok && tok <= 57) || (97 <= tok && tok <= 98)); Clauses are now also wrapped on several lines. This is nicer to read and diff, but also avoids pushing Visual C++ to its arbitrary limits (640K and lines of 16380 bytes ought to be enough for anybody, otherwise make an C2026 error). The useless parens are there for the dummy warnings about precedence (in the future, will we also have to put parens in `1+2*3`?). * data/skeletons/variant.hh (_b4_filter_tokens, b4_tok_in, b4_tok_in): New. (_b4_token_constructor_define): Use them. 2020-11-13 Akim Demaille <akim.demaille@gmail.com> c++: don't glue functions together * data/skeletons/bison.m4 (b4_type_foreach): Accept a separator. * data/skeletons/c++.m4: Use it. And fix an incorrect comment. 2020-11-13 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: YY_ASSERT should use api.prefix Working on the previous commit I realized that YY_ASSERT was used in the generated headers, so must follow api.prefix to avoid clashes when multiple C++ parser with variants are used. Actually many more macros should obey api.prefix (YY_CPLUSPLUS, YY_COPY, etc.). There was no complaint so far, so it's not urgent enough for 3.7.4, but it should be addressed in 3.8. * data/skeletons/variant.hh (b4_assert): New. Use it. * tests/local.at (AT_YYLEX_RETURN): Fix. * tests/headers.at: Make sure variant-based C++ parsers are checked too. This test did find that YY_ASSERT escaped renaming (before the fix in this commit). 2020-11-13 Akim Demaille <akim.demaille@gmail.com> c++: don't use YY_ASSERT at all if parse.assert is disabled In some extreme situations (about 800 tokens), we generate a single-line assertion long enough for Visual C++ to discard the end of the line, thus falling into parse ends for the missing `);`. On a shorter example: YY_ASSERT (tok == token::TOK_YYEOF || tok == token::TOK_YYerror || tok == token::TOK_YYUNDEF || tok == token::TOK_ASSIGN || tok == token::TOK_MINUS || tok == token::TOK_PLUS || tok == token::TOK_STAR || tok == token::TOK_SLASH || tok == token::TOK_LPAREN || tok == token::TOK_RPAREN); Whether NDEBUG is used or not is irrelevant, the parser dies anyway. Reported by Jot Dot <jotdot@shaw.ca>. https://lists.gnu.org/r/bug-bison/2020-11/msg00002.html We should avoid emitting lines so long. We probably should also use a range-based assertion (with extraneous parens to pacify fascist compilers): YY_ASSERT ((token::TOK_YYEOF <= tok && tok <= token::TOK_YYUNDEF) || (token::TOK_ASSIGN <= tok && ...) But anyway, we should simply not emit this assertion at all when not asked for. * data/skeletons/variant.hh: Do not define, nor use, YY_ASSERT when it is not enabled. 2020-11-13 Akim Demaille <akim.demaille@gmail.com> c++: style: follow the Bison m4 quoting pattern * data/skeletons/variant.hh: here. 2020-11-11 Akim Demaille <akim.demaille@gmail.com> yacc.c: provide the Bison version as an integral macro Suggested by Balazs Scheidler. https://github.com/akimd/bison/issues/55 * src/muscle-tab.c (muscle_init): Move/rename `b4_version` to/as... * src/output.c (prepare): `b4_version_string`. Also define `b4_version`. * data/skeletons/bison.m4, data/skeletons/c.m4, data/skeletons/d.m4, * data/skeletons/java.m4: Adjust. * doc/bison.texi: Document it. 2020-11-11 Akim Demaille <akim.demaille@gmail.com> regen 2020-11-11 Akim Demaille <akim.demaille@gmail.com> style: make conversion of version string to int public * src/parse-gram.y (str_to_version): Rename as/move to... * src/strversion.h, src/strversion.c (strversion_to_int): these new files. 2020-11-11 Akim Demaille <akim.demaille@gmail.com> %require: accept version numbers with three parts ("3.7.4") * src/parse-gram.y (str_to_version): Support three parts. * data/skeletons/location.cc, data/skeletons/stack.hh: Adjust. 2020-11-11 Todd C. Miller <Todd.Miller@sudo.ws> yacc.c: fix #definition of YYEMPTY When generating a C parser, YYEMPTY is present in enum yytokentype but there is no corresponding #define like there is for the other values. There is a special case for YYEMPTY in b4_token_enums but no corresponding case in b4_token_defines. * data/skeletons/c.m4 (b4_token_defines): Do define YYEMPTY. 2020-11-10 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-11-01 Akim Demaille <akim.demaille@gmail.com> doc: fix incorrect section title Reported by Gaurav Singh <gaurav.singh199709@yahoo.com>. https://lists.gnu.org/r/bug-bison/2020-11/msg00000.html * doc/bison.texi (Rpcalc Expr): Rename as... (Rpcalc Exp): this, as the nterm is named 'exp'. 2020-10-28 Nick Gasson <nick@nickg.me.uk> doc: minor grammar fixes in counterexamples section * doc/bison.texi: Minor fixes in counterexamples section. 2020-10-14 Akim Demaille <akim.demaille@gmail.com> doc: fix typo * README: here. 2020-10-13 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-10-13 Akim Demaille <akim.demaille@gmail.com> version 3.7.3 * NEWS: Record release date. 2020-10-13 Akim Demaille <akim.demaille@gmail.com> build: don't link bison against libreadline Reported by Paul Smith <psmith@gnu.org>. https://lists.gnu.org/r/bug-bison/2020-10/msg00001.html * src/local.mk (src_bison_LDADD): here. 2020-10-13 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-09-27 Akim Demaille <akim.demaille@gmail.com> glr.cc: fix: use symbol_name * data/skeletons/glr.cc: here. 2020-09-06 Akim Demaille <akim.demaille@gmail.com> build: fix a concurrent build issue in examples Reported by Thomas Deutschmann <whissi@gentoo.org>. https://lists.gnu.org/r/bug-bison/2020-09/msg00010.html * examples/c/lexcalc/local.mk: scan.o depends on parse.[ch]. 2020-09-05 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-09-05 Akim Demaille <akim.demaille@gmail.com> version 3.7.2 * NEWS: Record release date. 2020-09-05 Akim Demaille <akim.demaille@gmail.com> build: disable syntax-check warning error_message_uppercase etc/bench.pl.in-419-static int yylex (@{[is_pure (@directive) ? "YYSTYPE *yylvalp" : "void"]}); * cfg.mk: here. 2020-09-05 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-09-05 Akim Demaille <akim.demaille@gmail.com> build: fix incorrect dependencies Commit af000bab111768a04021bf5ffa4bbe91d44e231c ("doc: work around Texinfo 6.7 bug"), published in 3.4.91, added a dependency on the "all" target. This is a super bad idea, since "make all" will run this target *before* "all", which builds bison. It turns out that this new dependency actually needed bison to be built. So all the regular process (i) build $(BUILT_SOURCES) and then (ii) build bison, was wrecked since some of the $(BUILT_SOURCES) depended on bison... It was "easy" to see in the logs of "make V=1" because we were building bison files (such as src/files.o) *before* displaying the banner for "all-recursive". With this fix, we finally get again the proper sequence: rm -f examples/c/reccalc/scan.stamp examples/c/reccalc/scan.stamp.tmp /opt/local/libexec/gnubin/mkdir -p examples/c/reccalc touch examples/c/reccalc/scan.stamp.tmp flex -oexamples/c/reccalc/scan.c --header=examples/c/reccalc/scan.h ./examples/c/reccalc/scan.l mv examples/c/reccalc/scan.stamp.tmp examples/c/reccalc/scan.stamp rm -f lib/fcntl.h-t lib/fcntl.h && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ ... } > lib/fcntl.h-t && \ mv lib/fcntl.h-t lib/fcntl.h ... mv -f lib/alloca.h-t lib/alloca.h make all-recursive Reported by Mingli Yu <mingli.yu@windriver.com>. https://github.com/akimd/bison/issues/31 https://lists.gnu.org/r/bison-patches/2020-05/msg00055.html Reported by Claudio Calvelli <bugb@w42.org>. https://lists.gnu.org/r/bug-bison/2020-09/msg00001.html https://bugs.gentoo.org/716516 * doc/local.mk (all): Rename as... (all-local): this. So that we don't compete with BUILT_SOURCES. 2020-09-02 Akim Demaille <akim.demaille@gmail.com> doc: updates * NEWS, TODO: here. 2020-08-30 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-08-30 Akim Demaille <akim.demaille@gmail.com> tests: beware of sed portability issues Reported by David Laxer <davidl@softintel.com>. https://lists.gnu.org/r/bug-bison/2020-08/msg00027.html * tests/output.at: Don't use + with sed. While at it, fix a quotation problem hidden by the use of '#'. 2020-08-30 Akim Demaille <akim.demaille@gmail.com> c: always use YYMALLOC/YYFREE Reported by Kovalex <kovalex.pro@gmail.com>. https://lists.gnu.org/r/bug-bison/2020-08/msg00015.html * data/skeletons/yacc.c: Don't make direct calls to malloc/free. * tests/calc.at: Check it. 2020-08-30 Akim Demaille <akim.demaille@gmail.com> build: beware of POSIX mode Reported by Dennis Clarke. https://lists.gnu.org/r/bug-bison/2020-08/msg00013.html * examples/d/local.mk, examples/java/calc/local.mk, * examples/java/simple/local.mk: Pass bison's options before its argument, in case we're in POSIX mode. 2020-08-30 Akim Demaille <akim.demaille@gmail.com> doc: history of api.prefix Reported by Matthew Fernandez <matthew.fernandez@gmail.com>. https://lists.gnu.org/r/help-bison/2020-08/msg00015.html * doc/bison.texi (api.prefix): We move to {} in 3.0. 2020-08-11 Akim Demaille <akim.demaille@gmail.com> CI: intel moved the script for ICC * .travis.yml: Adjust. 2020-08-08 Akim Demaille <akim.demaille@gmail.com> fix: unterminated \-escape An assertion failed when the last character is a '\' and we're in a character or a string. Reported by Agency for Defense Development. https://lists.gnu.org/r/bug-bison/2020-08/msg00009.html * src/scan-gram.l: Catch unterminated escapes. * tests/input.at (Unexpected end of file): New. 2020-08-07 Akim Demaille <akim.demaille@gmail.com> fix: crash when redefining the EOF token Reported by Agency for Defense Development. https://lists.gnu.org/r/bug-bison/2020-08/msg00008.html On an empty such as %token FOO BAR FOO 0 %% input: %empty we crash because when we find FOO 0, we decrement ntokens (since FOO was discovered to be EOF, which is already known to be a token, so we increment ntokens for it, and need to cancel this). This "works well" when EOF is properly defined in one go, but here it is first defined and later only assign token code 0. In the meanwhile BAR was given the token number that we just decremented. To fix this, assign symbol numbers after parsing, not during parsing, so that we also saw all the explicit token codes. To maintain the current numbers (I'd like to keep no difference in the output, not just equivalence), we need to make sure the symbols are numbered in the same order: that of appearance in the source file. So we need the locations to be correct, which was almost the case, except for nterms that appeared several times as LHS (i.e., several times as "foo: ..."). Fixing the use of location_of_lhs sufficed (it appears it was intended for this use, but its implementation was unfinished: it was always set to "false" only). * src/symtab.c (symbol_location_as_lhs_set): Update location_of_lhs. (symbol_code_set): Remove broken hack that decremented ntokens. (symbol_class_set, dummy_symbol_get): Don't set number, ntokens and nnterms. (symbol_check_defined): Do it. (symbols): Don't count nsyms here. Actually, don't count nsyms at all: let it be done in... * src/reader.c (check_and_convert_grammar): here. Define nsyms from ntokens and nnterms after parsing. * tests/input.at (EOF redeclared): New. * examples/c/bistromathic/bistromathic.test: Adjust the traces: in "%nterm <double> exp %% input: ...", exp used to be numbered before input. 2020-08-07 Akim Demaille <akim.demaille@gmail.com> style: fix missing space before paren * cfg.mk (_space_before_paren_exempt): Be less laxist. * src/output.c, src/reader.c: Fix space before paren issues. Pacify the warnings where applicable. 2020-08-07 Akim Demaille <akim.demaille@gmail.com> style: fix comments and more debug trace * src/location.c, src/symtab.h, src/symtab.c: here. 2020-08-07 Akim Demaille <akim.demaille@gmail.com> style: more uses of const * src/symtab.c: here. 2020-08-07 Akim Demaille <akim.demaille@gmail.com> bench: fix support for pure parser * etc/bench.pl.in (is_pure): New. (generate_grammar_calc): Use code provides where needed. Use is_pure to call yylex properly. Coding style fixes. 2020-08-03 Akim Demaille <akim.demaille@gmail.com> portability: multiple typedefs Older versions of GCC (4.1.2 here) don't like repeated typedefs. CC src/bison-parse-simulation.o src/parse-simulation.c:61: error: redefinition of typedef 'parse_state' src/parse-simulation.h:74: error: previous declaration of 'parse_state' was here make: *** [Makefile:7876: src/bison-parse-simulation.o] Error 1 Reported by Nelson H. F. Beebe. * src/parse-simulation.c (parse_state): Don't typedef, parse-simulation.h did it already. 2020-08-02 Akim Demaille <akim.demaille@gmail.com> style: revert "avoid warnings with GCC 4.6" This reverts commit d0bec3175ff5cf6582ffbf584b73ea6aaea838d0 (which should have read "We have a clash...", not "With have a clash..."). Now that `max()` was renamed `max_int()`, we can use `max` again, as elsewhere in the code. * src/counterexample.c (visited_hasher): Alpha reconversion. 2020-08-02 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-08-02 Akim Demaille <akim.demaille@gmail.com> version 3.7.1 * NEWS: Record release date. 2020-08-02 Akim Demaille <akim.demaille@gmail.com> portability: we use termios.h and sys/ioctl.h Reported by Maarten De Braekeleer. https://lists.gnu.org/r/bison-patches/2020-07/msg00079.html * bootstrap.conf (gnulib_modules): Add termios and sys_ioctl. 2020-08-02 Maarten De Braekeleer <maarten.debraekeleer@gmail.com> portability: rename accept to acceptsymbol because of MSVC MSVC already defines this symbol. * src/symtab.h, src/symtab.c (accept): Rename as... (acceptsymbol): this. Adjust dependencies. 2020-08-02 Akim Demaille <akim.demaille@gmail.com> regen 2020-08-02 Maarten De Braekeleer <maarten.debraekeleer@gmail.com> portability: use CHAR_LITERAL instead of CHAR because MSVC defines CHAR * src/parse-gram.y, src/scan-gram.l: here. 2020-08-02 Maarten De Braekeleer <maarten.debraekeleer@gmail.com> portability: use INT_LITERAL instead of INT because MSVC defines INT It is defined as a typedef, not a macro. https://lists.gnu.org/r/bison-patches/2020-08/msg00001.html * src/parse-gram.y, src/scan-gram.l: here. 2020-08-02 Akim Demaille <akim.demaille@gmail.com> portability: beware of max () with MSVC Reported by Maarten De Braekeleer. https://lists.gnu.org/r/bison-patches/2020-07/msg00080.html We don't want to use gnulib's min and max macros, since we use function calls in min/max arguments. * src/location.c (max_int, min_int): Move to... * src/system.h: here. * src/counterexample.c, src/derivation.c: Use max_int instead of max. 2020-08-02 Akim Demaille <akim.demaille@gmail.com> libtextstyle: be sure to have ostream_printf and hyperlink support Older versions of libtextstyle do not support them, rule them out. Reported by Lars Wendler https://lists.gnu.org/r/bug-bison/2020-07/msg00030.html and by Arnold Robbins https://lists.gnu.org/r/bug-bison/2020-07/msg00041.html and https://lists.gnu.org/mailman/private/gawk-devel/2020-July/003988.html and by Nelson H. F. Beebe https://lists.gnu.org/mailman/private/gawk-devel/2020-July/003993.html With support from Bruno Haible in gnulib https://lists.gnu.org/r/bug-gnulib/2020-08/msg00000.html thread starting at https://lists.gnu.org/r/bug-gnulib/2020-07/msg00148.html * configure.ac: Require libtextstyle 0.20.5. * gnulib: Update. 2020-08-01 Akim Demaille <akim.demaille@gmail.com> CI: comment changes 2020-08-01 Akim Demaille <akim.demaille@gmail.com> regen 2020-08-01 Akim Demaille <akim.demaille@gmail.com> diagnostics: better location for type redeclarations From foo.y:1.7-11: error: %type redeclaration for bar 1 | %type <foo> bar bar | ^~~~~ foo.y:1.7-11: note: previous declaration 1 | %type <foo> bar bar | ^~~~~ to foo.y:1.17-19: error: %type redeclaration for bar 1 | %type <foo> bar bar | ^~~ foo.y:1.13-15: note: previous declaration 1 | %type <foo> bar bar | ^~~ * src/symlist.h, src/symlist.c (symbol_list_type_set): There's no need for the tag's location, use that of the symbol. * src/parse-gram.y: Adjust. * tests/input.at: Adjust. 2020-07-30 Akim Demaille <akim.demaille@gmail.com> todo: updates for D 2020-07-29 Akim Demaille <akim.demaille@gmail.com> cex: style: comment changes * src/parse-simulation.c: here. 2020-07-29 Akim Demaille <akim.demaille@gmail.com> cex: style: prefer "res" for the returned value * src/derivation.c (derivation_new): here. 2020-07-29 Akim Demaille <akim.demaille@gmail.com> cex: style: prefer FOO_print to print_FOO * src/state-item.h, src/state-item.c (print_state_item): Rename as... (state_item_print): this. * src/counterexample.c (print_counterexample): Rename as... (counterexample_print): this. 2020-07-28 Akim Demaille <akim.demaille@gmail.com> scanner: don't crash on strings containing a NUL byte We crash if the input contains a string containing a NUL byte. Reported by Suhwan Song. https://lists.gnu.org/r/bug-bison/2020-07/msg00051.html * src/flex-scanner.h (STRING_FREE): Avoid accidental use of last_string. * src/scan-gram.l: Don't call STRING_FREE without calling STRING_FINISH first. * tests/input.at (Invalid inputs): Check that case. 2020-07-28 Akim Demaille <akim.demaille@gmail.com> doc: refer to cex from sections dealing with conflicts The documentation about -Wcex should be put forward. * doc/bison.texi: Refer to -Wcex from the sections about conflicts. 2020-07-28 Akim Demaille <akim.demaille@gmail.com> doc: factor ifnottex/iftex examples * doc/bison.texi: Factor the common bits out of ifnottex/iftex. 2020-07-28 Akim Demaille <akim.demaille@gmail.com> doc: fix colors The original Texinfo macros introducing colors were made for diagnostics, which are printed in bold. So by copy-paste accident the styles we introduced for counterexamples were also in bold. They should not. * doc/bison.texi: Separate the styling of diagnostics from the styling for counterexamples. Don't use bold in the latter case. 2020-07-28 Akim Demaille <akim.demaille@gmail.com> doc: fixes * doc/bison.texi: Fix spello. Fix missing colors, and factor. 2020-07-23 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-07-23 Akim Demaille <akim.demaille@gmail.com> version 3.7 * NEWS: Record release date. 2020-07-23 Akim Demaille <akim.demaille@gmail.com> style: avoid warnings with GCC 4.6 With have a clash with the "max" function. src/counterexample.c: In function 'visited_hasher': src/counterexample.c:720:48: error: declaration of 'max' shadows a global declaration [-Werror=shadow] src/counterexample.c:116:12: error: shadowed declaration is here [-Werror=shadow] * src/counterexample.c (visited_hasher): Alpha conversion. 2020-07-23 Akim Demaille <akim.demaille@gmail.com> doc: fix definition of -Wall * doc/bison.texi (Diagnostics): here. 2020-07-23 Akim Demaille <akim.demaille@gmail.com> gnulib: update * bootstrap.conf: We need stpncpy. 2020-07-23 Akim Demaille <akim.demaille@gmail.com> tests: fixes Fix 6b78e50cef3c2cd8e6f4e7938be987e8769f8eef, "cex: make "rerun with '-Wcex'" a note instead of a warning" * tests/conflicts.at (-W versus %expect and %expect-rr): Fix expectations. 2020-07-22 Akim Demaille <akim.demaille@gmail.com> cex: update NEWS for 3.7 * NEWS: Update to the current style of cex display. 2020-07-22 Akim Demaille <akim.demaille@gmail.com> doc: catch up with the current display of cex Unfortunately I found no way to use the ↳ glyph in Texinfo, so I used @arrow{} instead, which has a different width, so we have to have all the examples doubled, once for TeX, another for the rest of the world. * doc/bison.texi: Use the current display in the examples. * doc/calc.y, doc/ids.y, doc/if-then-else.y, doc/sequence.y: New. 2020-07-21 Akim Demaille <akim.demaille@gmail.com> cex: make "rerun with '-Wcex'" a note instead of a warning Currently the suggestion to rerun is a -Wother warning: warning: 2 shift/reduce conflicts [-Wconflicts-sr] warning: rerun with option '-Wcounterexamples' to generate conflict counterexamples [-Wother] Instead, let's attach it as a subnote of the diagnostic (in the current case, -Wconflicts-sr): warning: 2 shift/reduce conflicts [-Wconflicts-sr] note: rerun with option '-Wcounterexamples' to generate conflict counterexamples * src/conflicts.c (conflicts_print): Do that. Adjust the test suite. 2020-07-20 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-07-20 Akim Demaille <akim.demaille@gmail.com> version 3.6.93 * NEWS: Record release date. 2020-07-20 Akim Demaille <akim.demaille@gmail.com> cex: label all the derivations by their initial action From input.y: warning: reduce/reduce conflict on token $end [-Wcounterexamples] Example: A b . First derivation a `-> A b . Second derivation a `-> A b `-> b . to input.y: warning: reduce/reduce conflict on token $end [-Wcounterexamples] Example: A b . First reduce derivation a `-> A b . Second reduce derivation a `-> A b `-> b . * src/counterexample.c (print_counterexample): here. Compute the width of the labels to properly align the values. * tests/conflicts.at, tests/counterexample.at, tests/diagnostics.at, * tests/report.at: Adjust. 2020-07-20 Akim Demaille <akim.demaille@gmail.com> cex: improve readability of the subsections Now that the derivation is no longer printed on one line, aligning the example and the derivation is no longer useful. It can actually be harmful, as it makes the overall structure less clear. * src/derivation.h, src/derivation.c (derivation_print_leaves): Remove the `prefix` argument. * src/counterexample.c (print_counterexample): Put the example next to its label. * tests/conflicts.at, tests/counterexample.at, tests/diagnostics.at, * tests/report.at: Adjust. 2020-07-20 Akim Demaille <akim.demaille@gmail.com> cex: don't issue an empty line between counterexamples Now that we use complain, the "sections" are clearer. * src/counterexample.c (print_counterexample): Use the empty line only in reports. * tests/counterexample.at, tests/diagnostics.at, tests/report.at: Adjust. 2020-07-20 Akim Demaille <akim.demaille@gmail.com> cex: use usual routines for diagnostics about S/R conflicts See previous commit. We go from input.y: warning: 3 reduce/reduce conflicts [-Wconflicts-rr] Shift/reduce conflict on token "⊕": Example exp "+" exp • "⊕" exp Shift derivation exp ↳ exp "+" exp ↳ exp • "⊕" exp to input.y: warning: 3 reduce/reduce conflicts [-Wconflicts-rr] input.y: warning: shift/reduce conflict on token "⊕" [-Wcounterexamples] Example exp "+" exp • "⊕" exp Shift derivation exp ↳ exp "+" exp ↳ exp • "⊕" exp with an hyperlink on -Wcounterexamples. * src/counterexample.c (counterexample_report_shift_reduce): Use complain. * tests/counterexample.at, tests/diagnostics.at, tests/report.at: Adjust. 2020-07-20 Akim Demaille <akim.demaille@gmail.com> cex: use usual routines for diagnostics about R/R conflicts This is more consistent, and brings benefits: users know that these diagnostics are attached to -Wcounterexamples, and they can also click on the hyperlink if permitted by their terminal. We go from warning: 1 reduce/reduce conflict [-Wconflicts-rr] Reduce/reduce conflict on token $end: Example A b . First derivation a -> [ A b . ] Second derivation a -> [ A b -> [ b . ] ] to warning: 1 reduce/reduce conflict [-Wconflicts-rr] input.y: warning: reduce/reduce conflict on token $end [-Wcounterexamples] Example A b . First derivation a -> [ A b . ] Second derivation a -> [ A b -> [ b . ] ] with an hyperlink on -Wcounterexamples. * src/counterexample.c (counterexample_report_reduce_reduce): Use complain. * tests/counterexample.at, tests/diagnostics.at, tests/report.at: Adjust. 2020-07-19 Akim Demaille <akim.demaille@gmail.com> diagnostics: use hyperlinks to point to the only documentation * src/complain.c (begin_hyperlink, end_hyperlink): New. (warnings_print_categories): Use them. * tests/local.at (AT_SET_ENV): Disable hyperlinks in the tests, they contain random id's, and brackets (which is not so nice for M4). 2020-07-19 Akim Demaille <akim.demaille@gmail.com> doc: add anchors for warnings Unfortunately Texinfo somewhat mangles anchors such as `-Werror` into `g_t_002dWerror`, so let's not include the dash. * doc/bison.texi (Diagnostics): here. 2020-07-19 Akim Demaille <akim.demaille@gmail.com> glyphs: fix types The code was written on top of buffers of `char[26]`, and then was changed to use `char *`, yet was still using `sizeof buf`, which became `sizeof (char *)` instead of `sizeof (char[26])`. Reported by Dagobert Michelsen. https://lists.gnu.org/r/bug-bison/2020-07/msg00023.html * src/glyphs.h, src/glyphs.c: Get rid of uses of `char *`, use only glyph_buffer_t. 2020-07-19 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-07-19 Akim Demaille <akim.demaille@gmail.com> version 3.6.92 * NEWS: Record release date. 2020-07-19 Akim Demaille <akim.demaille@gmail.com> style: avoid strncpy syntax-check seems to dislike strncpy. The GNU Coreutils replaced their uses of strncpy with stpncpy. strlcpy is not an option. http://sources.redhat.com/ml/libc-alpha/2002-01/msg00159.html http://sources.redhat.com/ml/libc-alpha/2002-01/msg00011.html http://lists.gnu.org/archive/html/bug-gnulib/2004-09/msg00181.html * src/glyphs.c: Use stpncpy. 2020-07-18 Akim Demaille <akim.demaille@gmail.com> cex: display derivations as trees Sometimes, understanding the derivations is difficult, because they are serialized to fit in one line. For instance, the example taken from the NEWS file: %token ID %% s: a ID a: expr expr: expr ID ',' | "expr" gave First example expr • ID ',' ID $end Shift derivation $accept → [ s → [ a → [ expr → [ expr • ID ',' ] ] ID ] $end ] Second example expr • ID $end Reduce derivation $accept → [ s → [ a → [ expr • ] ID ] $end ] Printing as trees, it gives: First example expr • ID ',' ID $end Shift derivation $accept ↳ s $end ↳ a ID ↳ expr ↳ expr • ID ',' Second example expr • ID $end Reduce derivation $accept ↳ s $end ↳ a ID ↳ expr • * src/glyphs.h, src/glyphs.c (down_arrow, empty, derivation_separator): New. * src/derivation.c (derivation_print, derivation_print_impl): Rename as... (derivation_print_flat, derivation_print_flat_impl): These. (fputs_if, derivation_depth, derivation_width, derivation_print_tree) (derivation_print_tree_impl, derivation_print): New. * src/counterexample.c (print_counterexample): Adjust. * tests/conflicts.at, tests/counterexample.at, tests/diagnostics.at, * tests/report.at: Adjust. 2020-07-16 Akim Demaille <akim.demaille@gmail.com> cex: use the glyphs * src/derivation.c: here. * src/gram.h, src/gram.c (print_arrow, print_dot, print_fallback): Remove. 2020-07-16 Akim Demaille <akim.demaille@gmail.com> cex: factor the handling of graphical symbols * src/glyphs.h, src/glyphs.c: New. 2020-07-15 Akim Demaille <akim.demaille@gmail.com> cex: style changes * src/counterexample.c: here. 2020-07-15 Akim Demaille <akim.demaille@gmail.com> cex: simplify tests * tests/counterexample.at (AT_BISON_CHECK_CEX): Handle the keyword. Simplify the signature. 2020-07-15 Akim Demaille <akim.demaille@gmail.com> cex: more colors Provided by Daniela Becker. * data/bison-default.css: More colors. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> style: comments changes * src/print.c: here. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> doc: update GLR sections Reported by Christian Schoenebeck. * doc/bison.texi (GLR Parsers): Minor fixes. (Compiler Requirements for GLR): Remove, quite useless today. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> cex: display shifts before reductions When reporting counterexamples for s/r conflicts, put the shift first. This is more natural, and displays the default resolution first, which is also what happens for r/r conflicts where the smallest rule number is displayed first, and "wins". * src/counterexample.c (counterexample): Add a shift_reduce member. (new_counterexample): Adjust. Swap the derivations when this is a s/r conflict. (print_counterexample): For s/r conflicts, prefer "Shift derivation" and "Reduce derivation" rather than "First/Second derivation". * tests/conflicts.at, tests/counterexample.at, tests/report.at: Adjust. * NEWS, doc/bison.texi: Ditto. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> style: s/lookahead_tokens/lookaheads/g Currently we use both names. Let's stick to the short one. * src/AnnotationList.c, src/conflicts.c, src/counterexample.c, * src/getargs.c, src/getargs.h, src/graphviz.c, src/ielr.c, * src/lalr.c, src/print-graph.c, src/print-xml.c, src/print.c, * src/state-item.c, src/state.c, src/state.h, src/tables.c: s/lookahead_token/lookahead/gi. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> cex: factor memory allocation * src/counterexample.c (counterexample_report_state): Allocate once per conflicted state, instead of once per r/r conflict. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> cex: use state_item_number consistently * src/counterexample.c, src/state-item.c: here. (counterexample_report_state): While at it, prefer c2 to j/k, to match c1. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> cex: more consistent memory allocation/copy * src/counterexample.c, src/parse-simulation.c: It is more usual in Bison to use sizeof on expressions than on types, especially for allocation. Let the compiler do it's job instead of calling memcpy ourselves. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> cex: minor renaming * src/counterexample.c (has_common_prefix): Rename as... (have_common_prefix): this. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> cex: use better type names There are too many gl_list_t in there, it's hard to understand what is going on. Introduce and use more precise types. I sure can be wrong in some places, it's hard to tell without proper tool support. * src/counterexample.c, src/lssi.c, src/lssi.h, src/parse-simulation.c, * src/parse-simulation.h, src/state-item.c, src/state-item.h (si_bfs_node_list, search_state_list, ssb_list, lssi_list) (state_item_list): New. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> cex: minor style changes * src/counterexample.h, src/derivation.h, src/derivation.c: More comments. Use `out` for FILE*, as elsewhere. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> tests: beware of version numbers from git describe * tests/report.at: Be robust to version numbers such as 3.6.4.133-fbac-dirty. 2020-07-14 Akim Demaille <akim.demaille@gmail.com> tests: fix expectations Broken in ee86ea88399ed02243fbceb2704c9ea322a12bf9. * tests/diagnostics.at: here. 2020-07-12 Akim Demaille <akim.demaille@gmail.com> doc: makeinfo wants @arrow{}, not @arrow * doc/bison.texi: here. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-07-11 Akim Demaille <akim.demaille@gmail.com> cex: prefer → to ::= It does not make a lot of sense to use ::= in our counterexamples, that's not something that belongs to the Bison "vocabulary". Using the colon makes sense, but it's too discreet. Let's use the arrow, which we already use in some reports (HTML and Dot). * src/gram.h (print_dot_fallback): Generalize into... (print_fallback): this. (print_arrow): New. * src/derivation.c: Use it. * NEWS, tests/conflicts.at, tests/counterexample.at, * tests/diagnostics.at, tests/report.at: Adjust. * doc/bison.texi: Ditto. Unfortunately the literal `→` is output as `↦`. So we need to use @arrow. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> style: cex: prefer the array notation Prefer `&foos[i]` to `foos + i` when `foos` is an array. IMHO, it makes the semantics clearer. * src/counterexample.c, src/lssi.c, src/parse-simulation.c, * src/state-item.c: With arrays, prefer the array notation rather than the pointer one. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> style: cex: remove variables that don't make it simpler to read * src/counterexample.c: With arrays, prefer the array notation rather than the pointer one. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> bistromathic: demonstrate caret-diagnostics * examples/c/bistromathic/parse.y (user_context): We need the current line. (yyreport_syntax_error): Quote the guilty line, with squiggles. * examples/c/bistromathic/bistromathic.test: Adjust. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> bistromathic: do not display parse errors on completion Currently autocompletion on a line with errors leaks the error messages. It can be useful to let the user know, but GNU Readline does not provide us with an nice way to display the error. So we actually break into the current line of the user. So instead, do not show these errors. * examples/c/bistromathic/parse.y (user_context): New. Use %param to pass it to the parser and scanner. Keep quiet when in computing autocompletion. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> bistromathic: don't stupidly reset the location for each token That quite defeats the whole point of locations... But anyway, we should not see these messages at all. * examples/c/bistromathic/parse.y (expected_tokens): Fix (useless) location tracking. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> bistromathic: promote yytoken_kind_t * examples/c/bistromathic/parse.y: Use yytoken_kind_t rather than int. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> html: capitalize titles * data/xslt/xml2xhtml.xsl: Use "State 0", not "state 0". As we do in text reports. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> html: don't define several times the same anchors Currently when we output useless rules, they appear before the grammar, but using the same invocation. As a result, the anchor is defined twice, and the wrong one, being first, is honored. * data/xslt/xml2xhtml.xsl (rule): Take a new 'anchor' parameter to decide whether being an anchor, or a target. Let it be true when output the grammar. * tests/report.at: Adjust. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> html: simplify * data/xslt/xml2xhtml.xsl: Merge two identical when-clauses. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> reports: let html reports catch up with --report and --graph * data/xslt/xml2xhtml.xsl: Show the symbol types. * tests/report.at: Adjust. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> reports: let xml reports catch up with --report and --graph The text and Dot reports are expected to be identical when generated directly (--report, --graph) or indirectly (via XML). The xml testsuite had not be run for ages, let it catch up a bit. * src/print-xml.c: Pass the type of the symbols. * data/xslt/xml2text.xsl Catch up with the new layout. Display the symbol types. Use '•', not '.' * tests/local.at: Smash '•' to '.' when matching against the direct text report. * tests/report.at: Adjust XML expectations. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> reports: update html ouput * data/xslt/xml2xhtml.xsl: Improve indentation. Use ul/li rather that pre. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> tests: check html * tests/report.at: here. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> style: factor complex expressions * src/print-xml.c, src/print.c: Introduce a variable pointing to the current symbol. 2020-07-11 Akim Demaille <akim.demaille@gmail.com> maint: make it easier to update expectations * tests/local.mk (update-tests): New. 2020-07-09 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-07-09 Akim Demaille <akim.demaille@gmail.com> version 3.6.91 * NEWS: Record release date. 2020-07-09 Akim Demaille <akim.demaille@gmail.com> news: update 2020-07-09 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-07-08 Akim Demaille <akim.demaille@gmail.com> examples: add license headers Prompted by Rici Lake. https://stackoverflow.com/questions/62658368/#comment110853985_62661621 Discussed with Paul Eggert. * doc/bison.texi, examples/c/bistromathic/parse.y, * examples/c/lexcalc/parse.y, examples/c/lexcalc/scan.l, * examples/c/pushcalc/calc.y, examples/c/reccalc/parse.y, * examples/c/reccalc/scan.l, examples/d/calc.y, * examples/java/calc/Calc.y, examples/java/simple/Calc.y: Install the GPL3+ header. 2020-07-05 Akim Demaille <akim.demaille@gmail.com> style: update comments * src/reader.c: action_obstack was removed in 2002... * src/parse-gram.y: Better names. * src/scan-code.h: More comments. 2020-07-05 Akim Demaille <akim.demaille@gmail.com> style: update comments in the skeletons * data/skeletons/c++.m4, data/skeletons/glr.c, data/skeletons/lalr1.d, * data/skeletons/lalr1.java, data/skeletons/yacc.c: Be more accurate about yychar and yytoken. Don't name local variables as if they were members. 2020-07-05 Akim Demaille <akim.demaille@gmail.com> doc: more details about symbols in m4 * data/README.md: here. * README-hacking.md (Vocabulary): More. 2020-07-05 Akim Demaille <akim.demaille@gmail.com> regen 2020-07-05 Akim Demaille <akim.demaille@gmail.com> examples: include the generated header * examples/c/bistromathic/parse.y, examples/c/lexcalc/parse.y, * examples/c/reccalc/parse.y: here. Add some comments. * src/parse-gram.y (api_version): Pull out of handle_require. Bump to 3.7. 2020-07-04 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-07-04 Akim Demaille <akim.demaille@gmail.com> version 3.6.90 * NEWS: Record release date. 2020-07-04 Akim Demaille <akim.demaille@gmail.com> news: update 2020-07-04 Akim Demaille <akim.demaille@gmail.com> package: fix syntax-check errors * examples/c/bistromathic/bistromathic.test, po/POTFILES.in: here. 2020-07-04 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-07-04 Akim Demaille <akim.demaille@gmail.com> cex: give more details about -Wcex and -rcex * data/bison-default.css: Cobalt does not seem to be supported. * doc/bison.texi (Counterexamples): A new section. (Understanding): Show the counterexamples as it shows in the report: with its items. (Bison Options): Document -Wcex and -rcex. 2020-07-03 Akim Demaille <akim.demaille@gmail.com> news: update 2020-07-03 Akim Demaille <akim.demaille@gmail.com> dot: also use a dot in the output * src/print-graph.c (print_core): Use a dot instead of a point. * doc/figs/example-reduce.gv, doc/figs/example-reduce.txt, * doc/figs/example-shift.gv, doc/figs/example-shift.txt, * doc/figs/example.gv: Update. * tests/output.at, tests/report.at: Adjust. 2020-07-02 Akim Demaille <akim@lrde.epita.fr> doc: improve a sentence * doc/bison.texi: here. 2020-07-01 Akim Demaille <akim.demaille@gmail.com> news: formatting changes 2020-07-01 Akim Demaille <akim.demaille@gmail.com> news, todo: update 2020-06-30 Akim Demaille <akim.demaille@gmail.com> doc: clarify that the pcontext interface is *.c only Reported by Rici Lake. https://lists.gnu.org/r/bug-bison/2020-06/msg00054.html * doc/bison.texi (Syntax Error Reporting Function): Make it clear that this is not exported. Remove C++ details that landed in the C doc. 2020-06-30 Akim Demaille <akim.demaille@gmail.com> doc: use color in the cex examples * doc/bison.texi: here. And use smallexample when it no longer fits in PDF. 2020-06-30 Akim Demaille <akim.demaille@gmail.com> doc: repair the references to the Bibliography In commit c80cdf2db2b302db4137fabd4ae11e578fa51fca ("doc: simplify uses of @ref", Jan 27 2020, released in Bison 3.6), I broke the references to the Bibliography. For instance: For a more detailed exposition of the mysterious behavior in LALR parsers -and the benefits of IELR, @pxref{Bibliography,,Denny 2008 March}, and -@ref{Bibliography,,Denny 2010 November}. +and the benefits of IELR, @pxref{Bibliography}, and +@ref{Bibliography}. which results in "see Bibliography" twice, instead of the more precise reference. * doc/bison.texi (@pcite, @tcite): New. Use them instead of @ref to Bibliography. Cite only the first author (that's what we did for the other entries). 2020-06-30 Vincent Imbimbo <vmi6@cornell.edu> doc: cex documentation * NEWS, doc/bison.texi: Add documentation for conflict counterexample generation. 2020-06-30 Akim Demaille <akim.demaille@gmail.com> doc: update Doxygen template file * doc/Doxyfile.in: here. 2020-06-29 Akim Demaille <akim.demaille@gmail.com> yacc.c: push: don't clear the parser state when accepting/rejecting Currently when a push parser finishes its parsing (i.e., it did not return YYPUSH_MORE), it also clears its state. It is therefore impossible to see if it had parse errors. In the context of autocompletion, because error recovery might have fired, the parser is actually already in a different state. For instance on `(1 + + <TAB>` in the bistromathic, because there's a `exp: "(" error ")"` recovery rule, `1 + +` tokens have already been popped, replaced by `error`, and autocompletions think we are ready for the closing ")". So here, we would like to see if there was a syntax error, yet `yynerrs` was cleared. In the case of a successful parse, we still have a problem: if error recovery succeeded, we won't know it, since, again, `yynerrs` is clearer. It seems much more natural to leave the parser state available for analysis when there is a failure. To reuse the parser, we should either: 1. provide an explicit means to reinitialize a parser state for future parses. 2. automatically reset the parser state when it is used in a new parse. Option 2 requires to check whether we need to reinitialize the parser each time we call `yypush_parse`, i.e., each time we give a new token. This seems expensive compared to Option 1, but benchmarks revealed no difference. Option 1 is incompatible with the documentation ("After `yypush_parse` returns a status other than `YYPUSH_MORE`, the parser instance `yyps` may be reused for a new parse."). So Option 2 wins, reusing the private `yynew` member to record that a parse was finished, and therefore that the state must reset in the next call to `yypull_parse`. While at it, this implementation now reuses the previously enlarged stacks from one parse to another. * data/skeletons/yacc.c (yypstate_new): Set up the stacks in their initial configurations (setting their bottom to the stack array), and use yypstate_clear to reset them (moving their top to their bottom). (yypstate_delete): Adjust. (yypush_parse): At the beginning, clear yypstate if needed, and at the end, record when yypstate needs to be clearer. * examples/c/bistromathic/parse.y (expected_tokens): Do not propose autocompletion when there are parse errors. * examples/c/bistromathic/bistromathic.test: Check that case. 2020-06-29 Akim Demaille <akim.demaille@gmail.com> bistromathic: don't display undefined locations Currently, completion when there is a syntax error shows broken locations. * examples/c/bistromathic/parse.y (expected_tokens): Initialize the location. * examples/c/bistromathic/bistromathic.test: Check that. 2020-06-29 Akim Demaille <akim.demaille@gmail.com> yacc.c: simplify initialization of push parsers The previous commit ("yacc.c: declare and initialize and the same time") made b4_initialize_parser_state_variables useless. * data/skeletons/yacc.c (b4_initialize_parser_state_variables): Inline into... (yypstate_clear): here. 2020-06-29 Akim Demaille <akim.demaille@gmail.com> regen 2020-06-29 Akim Demaille <akim.demaille@gmail.com> yacc.c: declare and initialize and the same time In order to factor the code of push and pull parsers, the declaration of the parser's state variable was common (being local variable in pull parsers, and struct members in push parsers). This result in rather poor style in pull parser, with first variable declarations, and then their initializations. The initialization is about to differ between push and pull parsers, so it is no longer worth keeping both cases together. * data/skeletons/yacc.c (b4_declare_parser_state_variables): Accept an argument, and when it is set, initialize the variables. Adjust dependencies. 2020-06-29 Akim Demaille <akim.demaille@gmail.com> yacc.c: style changes in push mode * data/skeletons/yacc.c: here. 2020-06-29 Akim Demaille <akim.demaille@gmail.com> yacc.c: simplify yypull_parse Currently yypull_parse takes a yypstate* as argument, and accepts it to be NULL. This does not seem to make a lot of sense: rather it is its callers that should do that. I believe this is historical: yypull_parse was introduced first (c3d503425f8014b432601a33b3398446d63b5963), with yyparse being a macro. So yyparse could hardly deal with memory allocation properly. In 7172e23e8ffb95b8cafee24c4f36c46ca709507f that yyparse was turned into a genuine function. At that point, it should have allocated its own yypstate*, which would have left yypull_parse deal with only one single non-null ypstate* argument. Fortunately, it is nowhere documented that it is valid to pass NULL to yypull_parse. It is now forbidden. * data/skeletons/yacc.c (yypull_parse): Don't allocate a yypstate. Needs a location to issue the error message. (yyparse): Allocate the yypstate. 2020-06-29 Akim Demaille <akim.demaille@gmail.com> doc: tidy the text files * etc/README: Rename/reformat as... * etc/README.md: this. And ship it. 2020-06-29 Akim Demaille <akim.demaille@gmail.com> bench: simplify the `rand` target * etc/bench.pl.in: There is no need to recompile the bench cases themselves. 2020-06-29 Akim Demaille <akim.demaille@gmail.com> bench: make it easy to edit the generated files * etc/bench.pl.in (&compile): Generate rules that compile the generated files independently of the source files. 2020-06-29 Akim Demaille <akim.demaille@gmail.com> tests: don't use $VERBOSE It is used by the test suite itself, which results in this test failing. * tests/c++.at: Use $DEBUG, not $VERBOSE. 2020-06-28 Akim Demaille <akim.demaille@gmail.com> doc: overhaul of the readmes * README-hacking.md (Working from the Repository): Make it first to make it easier to find the instructions to build from the repo. (Implementation Notes): New. * README: Provide more links. 2020-06-28 Akim Demaille <akim.demaille@gmail.com> java: rename package as api.package * data/skeletons/lalr1.java: here. * doc/bison.texi: Update. * src/muscle-tab.c: Ensure backward compat. * tests/java.at: Check it. 2020-06-28 Akim Demaille <akim.demaille@gmail.com> style: shift/reduce, not shift-reduce * src/reader.c: here. 2020-06-27 Akim Demaille <akim.demaille@gmail.com> style: rename endtoken as eoftoken * src/symtab.h, src/symtab.c (endtoken): Rename as... (eoftoken): this. Adjust dependencies. 2020-06-27 Akim Demaille <akim.demaille@gmail.com> news: fixes Reported by Jacob L. Mandelson. * NEWS: here. 2020-06-27 Akim Demaille <akim.demaille@gmail.com> style: use 'nonterminal' consistently * doc/bison.texi: Formatting changes. * src/gram.h, src/gram.c (nvars): Rename as... (nnterms): this. Adjust dependencies. (section): New. Use it. Replace "non terminal" and "non-terminal" by "nonterminal". 2020-06-27 Akim Demaille <akim.demaille@gmail.com> doc: parse.assert in C++ requires RTTI * doc/bison.texi (%define Summary): Say it. 2020-06-27 Akim Demaille <akim.demaille@gmail.com> c++: by default, use const std::string for file names Reported by Martin Blais and Yuriy Solodkyy. https://lists.gnu.org/r/help-bison/2020-05/msg00011.html https://lists.gnu.org/r/bug-bison/2020-06/msg00038.html While at it, modernize filename_type as api.filename.type and document it properly. * data/skeletons/c++.m4 (filename_type): Rename as... (api.filename.type): this. Default to const std::string. * data/skeletons/location.cc (position, location): Expose the filename_type type. Use api.filename.type. * doc/bison.texi (%define Summary): Document api.filename.type. (C++ Location Values): Document position::filename_type. * src/muscle-tab.c (muscle_percent_variable_update): Ensure backward compatibility. * tests/c++.at: Check that using const file names is ok. tests/input.at: Check backward compat. 2020-06-27 Akim Demaille <akim.demaille@gmail.com> ielr: fix crash on memory management Reported by Dwight Guth. https://lists.gnu.org/r/bug-bison/2020-06/msg00037.html * src/AnnotationList.c (AnnotationList__computePredecessorAnnotations): Beware that SBITSET__FOR_EACH nests _two_ for-loops, so "break" does not actually break out of it. That was the only occurrence in the code. * src/Sbitset.h (SBITSET__FOR_EACH): Warn passersby. 2020-06-25 Akim Demaille <akim.demaille@gmail.com> style: factor the access to a rule from its items * src/counterexample.c (item_rule): Move to... * src/counterexample.h: here. * src/AnnotationList.c, src/counterexample.c, src/ielr.c: Use it. 2020-06-25 Akim Demaille <akim.demaille@gmail.com> style: clean up nullable * src/nullable.c: Reduce scopes. Prefer `r` to `rules_ruleno`, which is truly an ugly name. 2020-06-25 Akim Demaille <akim.demaille@gmail.com> style: clean up ielr * src/AnnotationList.c, src/ielr.c: Fix include order. Prefer `res` to `result`. Reduce scopes. Be free of the oldish 76 cols limitation when it clutters too much the code. Denest when possible (we're starving for horizontal width). 2020-06-23 Akim Demaille <akim.demaille@gmail.com> don't use strlen to compute visual width * src/output.c (prepare_symbol_names): Use mbswidth. 2020-06-23 Akim Demaille <akim.demaille@gmail.com> doc: use dot/'•' rather than point/'.' AFAICT, "dotted rule" is a more frequent synonym of "item" than "pointed rule". So let's migrate to using "dot" only. * doc/bison.texi: Use dot/'•' rather than point/'.'. * src/print-xml.c (print_core): Use dot rather than point. This is not backward compatible, but AFAICT, we don't have actual user of the XML output (but ourselves). So... * data/xslt/xml2dot.xsl, data/xslt/xml2text.xsl, * data/xslt/xml2xhtml.xsl, tests/report.at: ... adjust. 2020-06-23 Akim Demaille <akim.demaille@gmail.com> cex: display all the S/R conflicts, not just one per (state, rule) Before this commit, on %% exp : "if" exp "then" exp | "if" exp "then" exp "else" exp | exp "+" exp | "num" we used to not display the third counterexample below: Shift/reduce conflict on token "+": Example exp "+" exp . "+" exp First derivation exp ::=[ exp ::=[ exp "+" exp . ] "+" exp ] Second derivation exp ::=[ exp "+" exp ::=[ exp . "+" exp ] ] Shift/reduce conflict on token "else": Example "if" exp "then" "if" exp "then" exp . "else" exp First derivation exp ::=[ "if" exp "then" exp ::=[ "if" exp "then" exp . ] "else" exp ] Second derivation exp ::=[ "if" exp "then" exp ::=[ "if" exp "then" exp . "else" exp ] ] Shift/reduce conflict on token "+": Example "if" exp "then" exp . "+" exp First derivation exp ::=[ exp ::=[ "if" exp "then" exp . ] "+" exp ] Second derivation exp ::=[ "if" exp "then" exp ::=[ exp . "+" exp ] ] Shift/reduce conflict on token "+": Example "if" exp "then" exp "else" exp . "+" exp First derivation exp ::=[ exp ::=[ "if" exp "then" exp "else" exp . ] "+" exp ] Second derivation exp ::=[ "if" exp "then" exp "else" exp ::=[ exp . "+" exp ] ] * src/counterexample.c (counterexample_report_state): Don't stop of the first conflicts. * tests/conflicts.at, tests/counterexample.at, tests/diagnostics.at, * tests/report.at: Adjust. 2020-06-22 Akim Demaille <akim.demaille@gmail.com> cex: don't display twice unifying examples if there is no color It makes no sense, and is actually confusing, to display twice the same example with no visible difference. * src/complain.h, src/complain.c (is_styled): New. * src/counterexample.c (print_counterexample): Display the unified example a second time only if it makes a difference. * tests/conflicts.at, tests/counterexample.at, tests/report.at: Adjust. * tests/diagnostics.at: Make sure we do display the unifying examples twice when colors are enabled. And check those colors. 2020-06-22 Vincent Imbimbo <vmi6@cornell.edu> cex: fix reporting of null nonterminals I implemented this to print A ::= [ ], but A ::= [ %empty ] might be clearer. * src/parse-simulation.c (nullable_closure): Don't generate null nonterminal derivations as leaves. * src/derivation.c (derivation_print_impl): Don't print seperator spaces for null nonterminal. * tests/counterexample.at: Update test results. 2020-06-22 Akim Demaille <akim.demaille@gmail.com> cex: use the bullet in HTML * data/xslt/xml2xhtml.xsl: here. 2020-06-19 Akim Demaille <akim.demaille@gmail.com> cex: style changes * src/counterexample.c: Simplify a bit. * src/parse-simulation.c, src/parse-simulation.h: Enforce coding style. 2020-06-16 Akim Demaille <akim.demaille@gmail.com> c++: get rid of global_tokens_and_yystype This was a hack to make it easier for people to migrate from yacc.c to lalr1.cc and from glr.c to glr.cc: when set, YYSTYPE and YYLTYPE were `#defined`. It was never documented (just mentioned in NEWS for Bison 2.2, 2006-05-19), but was used to simplify the test suite. Stop that: adjust the test suite to the skeletons, not the converse. In C++ use yy::parser::semantic_type, yy::parser::location_type, and yy::parser::token::MY_TOKEN, instead of YYSTYPE, YYLTYPE and MY_TOKEN. * data/skeletons/glr.cc, data/skeletons/lalr1.cc: Remove its support. * tests/actions.at, tests/c++.at, tests/calc.at: Adjust. 2020-06-16 Akim Demaille <akim.demaille@gmail.com> cex: don't assume the terminal supports "•" Use of print_unicode_char suggested by Bruno Haible. https://lists.gnu.org/r/bug-gettext/2020-06/msg00012.html * src/gram.h (print_dot_fallback, print_dot): New. * src/gram.c, src/derivation.c: Use it. * tests/counterexample.at, tests/report.at: Adjust the test suite. * .travis.yml, README-hacking.md: Adjust. 2020-06-16 Akim Demaille <akim.demaille@gmail.com> cex: also include in the report on --report=counterexamples And let --report=all include the counterexamples. * src/getargs.h, src/getargs.c (report_cex): New. * src/main.c: Compute counterexamples when -rcex is specified. * src/print.c: Include the counterexamples when -rcex is specified. * tests/conflicts.at, tests/existing.at, tests/local.at: Adjust. 2020-06-16 Akim Demaille <akim.demaille@gmail.com> cex: also include the counterexamples in the report The report is the best place to show the details about counterexamples, since we have the state right under the nose. For instance: State 7 1 exp: exp . "⊕" exp 2 | exp . "+" exp 2 | exp "+" exp . [$end, "+", "⊕"] 3 | exp . "+" exp 3 | exp "+" exp . [$end, "+", "⊕"] "⊕" shift, and go to state 6 $end reduce using rule 2 (exp) $end [reduce using rule 3 (exp)] "+" reduce using rule 2 (exp) "+" [reduce using rule 3 (exp)] "⊕" [reduce using rule 2 (exp)] "⊕" [reduce using rule 3 (exp)] $default reduce using rule 2 (exp) Conflict between rule 2 and token "+" resolved as reduce (%left "+"). Shift/reduce conflict on token "⊕": 2 exp: exp "+" exp . 1 exp: exp . "⊕" exp Example exp "+" exp • "⊕" exp First derivation exp ::=[ exp ::=[ exp "+" exp • ] "⊕" exp ] Example exp "+" exp • "⊕" exp Second derivation exp ::=[ exp "+" exp ::=[ exp • "⊕" exp ] ] Reduce/reduce conflict on tokens $end, "+", "⊕": 2 exp: exp "+" exp . 3 exp: exp "+" exp . Example exp "+" exp • First derivation exp ::=[ exp "+" exp • ] Example exp "+" exp • Second derivation exp ::=[ exp "+" exp • ] Shift/reduce conflict on token "⊕": 3 exp: exp "+" exp . 1 exp: exp . "⊕" exp Example exp "+" exp • "⊕" exp First derivation exp ::=[ exp ::=[ exp "+" exp • ] "⊕" exp ] Example exp "+" exp • "⊕" exp Second derivation exp ::=[ exp "+" exp ::=[ exp • "⊕" exp ] ] * src/conflicts.h, src/conflicts.c (has_conflicts): New. * src/counterexample.h, src/counterexample.c (print_counterexample): Add a `prefix` argument. (counterexample_report_shift_reduce) (counterexample_report_reduce_reduce): Show the items when there's a prefix. * src/state-item.h, src/state-item.c (print_state_item): Add a `prefix` argument. * src/derivation.h, src/derivation.c (derivation_print) (derivation_print_leaves): Add a prefix argument. * src/print.c (print_state): When -Wcex is enabled, show the conflicts. * tests/report.at: Adjust. 2020-06-16 Akim Demaille <akim.demaille@gmail.com> cex: indent the diagnostics to highlight the structure Instead of Shift/reduce conflict on token D: Example A a • D First derivation s ::=[ A a a ::=[ b ::=[ c ::=[ • ] ] ] d ::=[ D ] ] Example A a • D Second derivation s ::=[ A a d ::=[ • D ] ] display Shift/reduce conflict on token D: Example A a • D First derivation s ::=[ A a a ::=[ b ::=[ c ::=[ • ] ] ] d ::=[ D ] ] Example A a • D Second derivation s ::=[ A a d ::=[ • D ] ] * src/counterexample.c (print_counterexample): Indent. * tests/counterexample.at: Adjust. 2020-06-16 Akim Demaille <akim.demaille@gmail.com> cex: don't report the items Showing the items (with the state numbers) is really something we should restrict to the report. * src/counterexample.c (counterexample_report_shift_reduce) (counterexample_report_reduce_reduce): Don't show the pointed rules, we will do that in the report. * tests/counterexample.at: Adjust. 2020-06-16 Akim Demaille <akim.demaille@gmail.com> cex: make sure traces go to stderr * src/parse-simulation.h, src/parse-simulation.c (print_parse_state): here. 2020-06-16 Akim Demaille <akim.demaille@gmail.com> cex: add an argument to the reporting functions to specify the stream * src/conflicts.c (find_state_item_number, report_state_counterexamples): Move to... * src/counterexample.h, src/counterexample.c (find_state_item_number) (counterexample_report_state): this. Add support for `out` as an argument. (counterexample_report_reduce_reduce, counterexample_report_shift_reduce): Accept an `out` argument, and be static. 2020-06-16 Akim Demaille <akim.demaille@gmail.com> style: more uses of const * src/print.c, src/state.h, src/state.c: here. 2020-06-16 Akim Demaille <akim.demaille@gmail.com> Merge 'maint' * upstream/maint: maint: post-release administrivia version 3.6.4 glr.cc: don't leak glr.c/glr.cc scaffolding to the user Some fixes were needed to adjust to recent changes in glr.cc and glr.c. * data/skeletons/glr.cc: Stop messing with the user's epilogue to insert glr.cc code. We need that code to be inserted _before_ the user's epilogue, not after. So define b4_glr_cc_pre_epilogue. * data/skeletons/glr.c: Use it. 2020-06-15 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-06-15 Akim Demaille <akim.demaille@gmail.com> version 3.6.4 * NEWS: Record release date. 2020-06-15 Akim Demaille <akim.demaille@gmail.com> glr.cc: don't leak glr.c/glr.cc scaffolding to the user Until we have a decent reimplementation of glr.cc, we have to use tricks to shoehorn C++ symbols to the C engine of glr.c. Some of them are done via #define. Unfortunately in Bison 3.6 some of these we done in the header file, which broke valid user code. Reported by Egor Pugin. https://lists.gnu.org/r/bug-bison/2020-06/msg00003.html * data/skeletons/glr.cc: Stop playing tricks with b4_pre_epilogue. (b4_glr_cc_setup, b4_glr_cc_cleanup): New. Much cleaner way to instal glr.cc's scaffolding around glr.c. * data/skeletons/glr.c: Adjust to use them. 2020-06-13 Akim Demaille <akim.demaille@gmail.com> reports: the column width differs from the byte count From "number" shift, and go to state 1 "Ñùṃéℝô" shift, and go to state 2 to "number" shift, and go to state 1 "Ñùṃéℝô" shift, and go to state 2 * src/print.c: Use mbswidth, not strlen, to compute visual columns. * tests/report.at: Adjust. 2020-06-13 Akim Demaille <akim.demaille@gmail.com> reports: don't escape the labels Currently we use "quotearg" to escape the strings output in Dot. As a result, if the user's locale is C for instance, all the non-ASCII are escaped. Unfortunately graphviz does not interpret this style of escaping. For instance: 5 -> 2 [style=solid label="\"\303\221\303\271\341\271\203\303\251\342\204\235\303\264\""] was displayed as a sequence of numbers. We now output: 5 -> 2 [style=solid label="\"Ñùṃéℝô\""] independently of the user's locale. * src/system.h (obstack_backslash): New. * src/graphviz.h, src/graphviz.c (escape): Remove, use obstack_backslash instead. * src/print-graph.c: Likewise. * tests/report.at: Adjust. 2020-06-13 Akim Demaille <akim.demaille@gmail.com> regen 2020-06-13 Akim Demaille <akim.demaille@gmail.com> parser: keep string aliases as the user wrote it Currently our scanner decodes all the escapes in the strings, and we later reescape the strings when we emit them. This is troublesome, as we do not respect the user input. For instance, when the user writes in UTF-8, we destroy her string when we write it back. And this shows everywhere: in the reports we show the escaped string instead of the actual alias: 0 $accept: . exp $end 1 exp: . exp "\342\212\225" exp 2 | . exp "+" exp 3 | . exp "+" exp 4 | . "number" 5 | . "\303\221\303\271\341\271\203\303\251\342\204\235\303\264" "number" shift, and go to state 1 "\303\221\303\271\341\271\203\303\251\342\204\235\303\264" shift, and go to state 2 This commit preserves the user's exact spelling of the string aliases, instead of interpreting the escapes and then reescaping. The report now shows: 0 $accept: . exp $end 1 exp: . exp "⊕" exp 2 | . exp "+" exp 3 | . exp "+" exp 4 | . "number" 5 | . "Ñùṃéℝô" "number" shift, and go to state 1 "Ñùṃéℝô" shift, and go to state 2 Likewise, the XML (and therefore HTML) outputs are fixed. * src/scan-gram.l (STRING, TSTRING): Do not interpret the escapes in the resulting string. * src/parse-gram.y (unquote, parser_init, parser_free, unquote_free) (handle_defines, handle_language, obstack_for_unquote): New. Use them to unquote where needed. * tests/regression.at, tests/report.at: Update. 2020-06-13 Akim Demaille <akim.demaille@gmail.com> tests: check reports with conflicts and UTF-8 This is to record the current state of the report, which escapes the UTF-8 characters (as parse.error="verbose" does), but shouldn't (as parse.error="detailed" does). * tests/report.at: here. 2020-06-13 Akim Demaille <akim.demaille@gmail.com> style: factor common bits about string scanning * src/scan-gram.l: here. 2020-06-13 Akim Demaille <akim.demaille@gmail.com> style: introduce & use STRING_1GROW * src/flex-scanner.h (STRING_1GROW): New. * src/scan-gram.l, src/scan-skel.l: Use it. 2020-06-13 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes * src/scan-gram.l (STRING_GROW_ESCAPE): Move the static_assert about type sizes here. 2020-06-13 Akim Demaille <akim.demaille@gmail.com> style: prefer 'FOO ()' to 'FOO' for function-like macros * src/flex-scanner.h (STRING_GROW, STRING_FINISH, STRING_FREE): Make them function-like macros. Adjust dependencies. 2020-06-11 Akim Demaille <akim.demaille@gmail.com> regen 2020-06-10 Akim Demaille <akim.demaille@gmail.com> cex: suggest -Wcounterexamples when there are unexpected conflicts Suggesting -Wcounterexamples when there are conflicts is probably not what the user wants. If she knows her conflicts and has set %expect/%expect-rr appropriately, we shouldn't warn. The commit also swaps the counterexamples and the report of conflicts, into, IMHO, a more natural order: from Shift/reduce conflict on token B: 1: 3 a: A . 1: 8 y: A . B Example A • B C First derivation s ::=[ a ::=[ A • ] x ::=[ B C ] ] Example A • B C Second derivation s ::=[ y ::=[ A • B ] c ::=[ C ] ] input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr] input.y:4.4: warning: rule useless in parser due to conflicts [-Wother] to input.y: warning: 1 shift/reduce conflict [-Wconflicts-sr] Shift/reduce conflict on token B: 1: 3 a: A . 1: 8 y: A . B Example A • B C First derivation s ::=[ a ::=[ A • ] x ::=[ B C ] ] Example A • B C Second derivation s ::=[ y ::=[ A • B ] c ::=[ C ] ] input.y:4.4: warning: rule useless in parser due to conflicts [-Wother] * src/conflicts.c (rule_conflicts_print): Rename as... (report_rule_expectation_mismatches): this. Move the handling of report_counterexamples to... (conflicts_print): Here. Display this warning when applicable. 2020-06-10 Akim Demaille <akim.demaille@gmail.com> cex: rename -Wcounterexample as -Wcounterexamples, and support -Wcex Plural vs. singular is always a problem... But we already have conflicts-sr and conflicts-rr, so counterexamples makes more sense than counterexample. Besides, -Wcounterexample will still be accepted as an unambiguous prefix of -Wcounterexamples. Add -Wcex as a convenient alias. While at it, use only "counterexample", never "counter example". * src/complain.h, src/complain.c (Wcounterexample, warning_counterexample): Rename as... (Wcounterexamples, warning_counterexamples): these. (argmatch_warning_docs): Rename -Wcounterexample as -Wcounterexamples. (argmatch_warning_args): Likewise. Add support for -Wcex. Adjust dependencies. 2020-06-09 Akim Demaille <akim.demaille@gmail.com> api.header.include: document it, and fix its default value While defining api.header.include worked as expected, its default value was incorrectly defined. As a result, by default, the generated parsers still duplicated the content of the generated header instead of including it. * data/skeletons/yacc.c (api.header.include): Fix its default value. * tests/output.at: Check it. * doc/bison.texi (%define Summary): Document api.header.include. While at it, move the definition of api.namespace at the proper place. 2020-06-07 Akim Demaille <akim.demaille@gmail.com> cex: color the counterexamples Use colors to show the counterexamples and the derivations in color, to highlight their structure. Align the outputs, and add i18n support. Reduce width by using a one-space separator instead of two-space. From Example A • B C First derivation s ::=[ a ::=[ A • ] x ::=[ B C ] ] Second derivation s ::=[ y ::=[ A • B ] c ::=[ C ] ] to Example A • B C First derivation s ::=[ a ::=[ A • ] x ::=[ B C ] ] Example A • B C Second derivation s ::=[ y ::=[ A • B ] c ::=[ C ] ] with colors. * data/bison-default.css (cex-dot, cex-0, cex-1, cex-2, cex-3, cex-4) (cex-5, cex-6, cex-7, cex-step, cex-leaf): New. * src/derivation.c (derivation_print_styled_impl): New. (derivation_print, derivation_print_leaves): Use it. * src/counterexample.c: Reformat the output. * tests/counterexample.at: Adjust. 2020-06-07 Akim Demaille <akim.demaille@gmail.com> cex: enforce case for tokens/nonterminals It's unfortunate that the traditions between formal language theory and Yacc differs, but here, tokens should be upper case, and nonterminals should be lower case. * tests/counterexample.at: Comply with this. 2020-06-07 Akim Demaille <akim.demaille@gmail.com> cex: reformat the s/r and r/r reports In Bison we refer to "shift/reduce" conflicts, not "shift-reduce" (in Bison 3.6.3 186 occurrences vs 15). Enforce consistency on this. Instead of "spending" a second line for each conflict to report the lookaheads, put that on the same line as the type of conflict. Also, prefer "token" to "symbol". Maybe we should even prefer "lookahead". While at it, enable internationalization, with plurals where appropriate. As a consequence, instead of Shift-Reduce Conflict: 6: 3 b: . %empty 6: 6 d: c . A On Symbol: A display Shift/reduce conflict on token A: 6: 3 b: . %empty 6: 6 d: c . A * NEWS, doc/bison.texi, src/conflicts.c: Spell it "shift/reduce", not "shift-reduce". * src/counterexample.c (counterexample_report_shift_reduce) (counterexample_report_reduce_reduce): Reformat and internationalize output. * tests/counterexample.at: Adjust expectations. 2020-06-07 Akim Demaille <akim.demaille@gmail.com> style: fix syntax-check issues * src/counterexample.c, src/files.c, src/files.h, src/lssi.c, * src/state-item.c: here. 2020-06-07 Akim Demaille <akim.demaille@gmail.com> all: show the rules in comments before the user actions For instance, in the case of Bison's own parser: - case 40: + case 40: /* grammar_declaration: "%code" "identifier" "{...}" */ { muscle_percent_code_grow ((yyvsp[-1].ID), (yylsp[-1]), translate_code_braceless ((yyvsp[0].BRACED_CODE), (yylsp[0])), (yylsp[0])); code_scanner_last_string_free (); } break; * data/skeletons/c.m4: Modified. * data/skeletons/d.m4: Modified. * data/skeletons/java.m4: Modified. * src/output.c (output_escaped): New. (quoted_output): Use it, and rename as... (output_quoted): this. Adjust dependencies. (rule_output): New. (user_actions_output): Use it. * data/skeletons/c.m4, data/skeletons/d.m4, data/skeletons/java.m4 (b4_case): Add support for $3, an optional comment. 2020-06-06 Akim Demaille <akim.demaille@gmail.com> CI: use GCC10 on ppc too We were still using GCC9, because GCC10 was failing. * .travis.yml (PPC64le): Use GCC10. While at it, use -O2 instead of -O3: it's certainly nicer for the CPUs, and allows to test different sets of compiler flags (we use -O3 in several other configurations). 2020-06-06 Akim Demaille <akim.demaille@gmail.com> examples: fix missing includes * examples/c/bistromathic/parse.y: Use abort rather than assert so that the "unused result" warning is silenced even with -DNDEBUG. 2020-06-03 Akim Demaille <akim.demaille@gmail.com> warnings: fix -Wmissing-prototypes issues * src/counterexample.c, src/lssi.c, src/parse-simulation.c, * src/state-item.c: Here. 2020-06-03 Akim Demaille <akim.demaille@gmail.com> Merge maint into HEAD * upstream/maint: maint: post-release administrivia version 3.6.3 build: check -Wmissing-prototypes tests: show logs c++: fix printing of state number on streams 2020-06-03 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-06-03 Akim Demaille <akim.demaille@gmail.com> version 3.6.3 * NEWS: Record release date. 2020-06-01 Akim Demaille <akim.demaille@gmail.com> build: check -Wstrict-aliasing * configure.ac (warn_common): Add -Wstrict-aliasing. 2020-06-01 Akim Demaille <akim.demaille@gmail.com> doc: using asan * README-hacking.md: here. 2020-06-01 Akim Demaille <akim.demaille@gmail.com> style: fix includes * src/fixits.c: Follow our usual pattern. * src/scan-code.l, src/scan-gram.l, src/scan-skel.l: Prefer "" to include src/ headers. * README-hacking.md: Document the pattern. 2020-06-01 Akim Demaille <akim.demaille@gmail.com> lists: fix various issues with the use of gnulib's list First, we should avoid code such as gl_list_iterator_t it = gl_list_iterator (deriv->children); derivation *child = NULL; while (gl_list_iterator_next (&it, (const void **) &child, NULL)) { derivation_print (child, f); because of -Wstrict-aliasing (whose job is to catch type-punning issues). See https://lists.gnu.org/r/bug-bison/2020-05/msg00039.html. Rather we need gl_list_iterator_t it = gl_list_iterator (deriv->children); const void **p = NULL; while (gl_list_iterator_next (&it, &p, NULL)) { derivation *child = (derivation *) p; derivation_print (child, f); Second, list iterators actually have destructors. Even though they are noop in the case of linked-lists, we should use them. Let's address both issues with typed wrappers (such as derivation_list_next) that take care of both issues, and besides allow to scope the iterators within the loop: derivation *child; for (gl_list_iterator_t it = gl_list_iterator (deriv->children); derivation_list_next (&it, &child); ) { derivation_print (child, f); * src/derivation.h, src/derivation.c (derivation_list_next): New. Use it where appropriate. * src/counterexample.c (search_state_list_next): New. Use it where appropriate. * src/parse-simulation.h, src/parse-simulation.c * src/state-item.h (state_item_list_next): New. Use it where appropriate. 2020-06-01 Akim Demaille <akim.demaille@gmail.com> build: check -Wmissing-prototypes pstate_clear is lacking a prototype. Reported by Ryan https://lists.gnu.org/r/bug-bison/2020-05/msg00101.html Besides, none of the C examples were compiled with the warning flags. * configure.ac (warn_c): Add -Wmissing-prototypes. * data/skeletons/yacc.c (pstate_clear): Make it static. * examples/local.mk (TEST_CFLAGS): New. * examples/c/bistromathic/local.mk, examples/c/calc/local.mk, * examples/c/lexcalc/local.mk, examples/c/mfcalc/local.mk, * examples/c/pushcalc/local.mk, examples/c/reccalc/local.mk, * examples/c/rpcalc/local.mk: Use it. GCC's warn_unused_result is not silenced by a cast to void, so we have to "use" scanf's result. https://gcc.gnu.org/bugzilla/show_bug.cgi?id=25509 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66425 Flex generated code produces too many warnings, including things such as, with ICC: examples/c/lexcalc/scan.c(1088): error #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem) 2259 YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), 2260 ^ 2261 2262 I am tired of trying to fix Flex's output. The project does not seem maintained. We ought to avoid it. So, for the time being, don't try to enable warnings with Flex. * examples/c/bistromathic/parse.y, examples/c/reccalc/scan.l: Fix warnings. * doc/bison.texi: Discard scanf's return value to defeat -Werror=unused-result. 2020-05-31 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-05-25 Akim Demaille <akim.demaille@gmail.com> style: make item_index a truly different type from item_number See previous commit. * src/gram.h (item_index): Make it unsigned. Fix remaiming issues. 2020-05-25 Vincent Imbimbo <vmi6@cornell.edu> style: decouple different uses of item_number item_number is used for elements of ritem as well as indices into ritem which is fairly confusing. Introduce item_index to represent indices into ritem. * src/gram.h (item_index): Introduce it for ritem indices. * src/closure.h, src/closure.c, src/ielr.c, src/lr0.c, * src/print-graph.c, src/state.h, src/state.h: Replace uses of item_number with item_index where appropriate. 2020-05-24 Joshua Watt <jpewhacker@gmail.com> bison: add command line option to map file prefixes Teaches bison about a new command line option, --file-prefix-map OLD=NEW (based on the -ffile-prefix-map option from GCC) which causes it to replace and file path of OLD in the text of the output file with NEW, mainly for header guards and comments. The primary use of this is to make builds reproducible with different input paths, and in particular the debugging information produced when the source code is compiled. For example, a distro may know that the bison source code will be located at "/usr/src/bison" and thus can generate bison files that are reproducible with the following command: bison --output=/build/bison/parse.c -d --file-prefix-map=/build/bison/=/usr/src/bison/ parse.y Importantly, this will change the header guards and #line directives from: #ifndef YY_BUILD_BISON_PARSE_H #line 100 "/build/bison/parse.h" to #ifndef YY_USR_SRC_BISON_PARSE_H #line 100 "/usr/src/bison/parse.h" which is reproducible. See https://lists.gnu.org/r/bison-patches/2020-05/msg00016.html * src/files.h, src/files.c (spec_mapped_header_file) (mapped_dir_prefix, map_file_name, add_prefix_map): New. * src/getargs.c (-M, --file-prefix-map): New option. * src/output.c (prepare): Define b4_mapped_dir_prefix and b4_spec_header_file. * src/scan-skel.l (@ofile@): Output the mapped file name. * data/skeletons/glr.c, data/skeletons/glr.cc, * data/skeletons/lalr1.cc, data/skeletons/location.cc, * data/skeletons/yacc.c: Adjust. * doc/bison.texi: Document. * tests/input.at, tests/output.at: Check. 2020-05-24 Akim Demaille <akim.demaille@gmail.com> tests: fix expectations Should have been part of 1ec93ca2a2b4718b5d94871475520a2688b4c5c8. * tests/counterexample.at: here. 2020-05-23 Akim Demaille <akim.demaille@gmail.com> cex: clean the display of conflicted symbols Instead of `On Symbols: {b,c,}`, display `On Symbols: b, c`. * src/counterexample.c (counterexample_report_reduce_reduce): We don't need braces. Use commas as a separator, not a terminator. * tests/counterexample.at: Adjust. 2020-05-23 Akim Demaille <akim.demaille@gmail.com> tests: show logs * examples/c/bistromathic/bistromathic.test, examples/test: here. 2020-05-23 Akim Demaille <akim.demaille@gmail.com> c++: fix printing of state number on streams Avoid this kind of display: LAC: checking lookahead identifier: R4 R3 G^B S5 * data/skeletons/lalr1.cc: Convert state_t to int before printing it. 2020-05-23 Akim Demaille <akim.demaille@gmail.com> c++: fix printing of state number on streams Avoid this kind of display: LAC: checking lookahead identifier: R4 R3 G^B S5 * data/skeletons/lalr1.cc: Convert state_t to int before printing it. 2020-05-23 Vincent Imbimbo <vmi6@cornell.edu> cex: fix pruning crash Fixes a crash on Cim's grammar. https://lists.gnu.org/r/bison-patches/2020-05/msg00107.html * src/state-item.c (prune_disabled_paths): Prune forward and backwards paths in seperate passes. (prune_forward, prune_backward): New. (disable_state_item): Change function argument from state_item_number to state_item. (state_items_report): Add disabling to graph print-out. * src/conflicts.c (find_state_item_number, report_state_counterexamples): Add SI_DISABLED checks. 2020-05-23 Akim Demaille <akim.demaille@gmail.com> regen 2020-05-23 Akim Demaille <akim.demaille@gmail.com> kinds: use the symbol kinds where applicable Instead of generating switch statements with numbers, let's use the symbol kinds. Not only is this more readable, it also makes reading diff easier, as a change in symbol numbers won't have such a large effect on the implementation of symbol actions. * data/skeletons/bison.m4 (_b4_symbol_case): Use the symbol kind rather than its number. 2020-05-23 Akim Demaille <akim.demaille@gmail.com> kinds: also define the possibly qualified symbol kinds * data/skeletons/bison.m4 (b4_symbol_kind): Rename as... (b4_symbol_kind_base): this. (b4_symbol_kind): New, for fully qualified kind name. * data/skeletons/lalr1.cc (b4_symbol_kind): New. Adjust to use b4_symbol_kind where appropriate. * src/parse-gram.h, src/parse-gram.c: regen. 2020-05-23 Akim Demaille <akim.demaille@gmail.com> m4: simplify useless quotation * data/skeletons/bison.m4: The result of b4_symbol is "quoted" already, no need for m4_expand. 2020-05-23 Akim Demaille <akim.demaille@gmail.com> m4: use m4_shift2 etc. * data/skeletons/bison.m4 (m4_shift4): New. Use them where applicable. 2020-05-23 Akim Demaille <akim.demaille@gmail.com> tests: show logs * examples/c/bistromathic/bistromathic.test, examples/test: here. 2020-05-23 Akim Demaille <akim.demaille@gmail.com> style: spell fixes * Makefile.am (codespell): New. * doc/bison.texi: Fixes. Use @option for options. * src/lssi.c, src/lssi.h, src/parse-simulation.h, src/state-item.c: Fix spellos. 2020-05-23 Akim Demaille <akim.demaille@gmail.com> style: rename user_token_number as code This should have been done in 3.6, but I wanted to avoid introducing conflicts into Vincent's work on counterexamples. It turns out it's completely orthogonal. * data/README.md, data/skeletons/bison.m4, data/skeletons/c++.m4, * data/skeletons/c.m4, data/skeletons/glr.c, data/skeletons/java.m4, * data/skeletons/lalr1.d, data/skeletons/lalr1.java, * data/skeletons/variant.hh, data/skeletons/yacc.c, src/conflicts.c, * src/derives.c, src/gram.c, src/gram.h, src/output.c, * src/parse-gram.c, src/parse-gram.y, src/print-xml.c, src/print.c, * src/reader.c, src/symtab.c, src/symtab.h, tests/input.at, * tests/types.at: s/user_token_number/code/g. Plus minor changes. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> Merge maint into master * upstream/maint: fix generated comments traces: provide a means to get short m4 traces traces: show the full m4 invocation 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: replace state-item data structures * src/state-item.h: Add trans, prods, and revs edges to state-item struct. (si_trans, si_revs, si_prods_lookup): Remove. * src/state-item.c, src/lssi.c, src/parse-simulation.c, * src/counterexample.c: Update state-item API usage accordingly. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: fix bad reference counting * src/counterexample.c (si_bfs_free): Fix reference_count decrementing. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: fix miscellaneous leaks * src/counterexample.c (unifying_counterexample): Always free stage3result when it exists. * src/conflicts.c (report_state_counterexamples): free leaked bitset. * src/state-item.c (prune_disabled_paths): free leaked queue. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: fix counterexample leak * src/counterexample.c (free_counterexample): New. Free counterexamples after printing. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: fix lssi leaks * src/lssi.c (shortest_path_from_start): Free the root of shortest_path_from_start search. Free eligible bitset. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: fix parse state leaks * src/parse_simulation.c: Fix bug in parse_state_free. Free new_root when simulate_reduction generates zero states. * src/parse-simulation.c, src/parse-simulation.h (parse_state_list, parse_state_list_append): New. * src/parse-simulation.c, src/parse-simulation.h, * src/counterexample.c: Replace all uses of lists of parse states and appends to parse_state_lists with the new API. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: derivation reference counting * src/derivation.h, src/derivation.c: Make derivation struct opaque. Add derivation_list type for clarity. (derivation_list_new): New. (derivation_list_append): New. (derivation_list_prepend): New. (derivation_new_leaf): New constructor for derivations with no children. * src/counterexample.c, src/parse-simulation.c, * src/parse-simulation.h: Replace uses of gl_list_t containing derivations with derivation_list and its API. Replace calls of dervation_new using null children with derivation_new_leaf. * src/parse-simulation.c: replace ps_chunk and its API with typed versions si_chunk and deriv_chunk. * src/parse-simlation.h, src/parse-simulation.c: Remove parse_state_retain_deriv in favor of derivation reference counting. * src/counterexample.c: Remove search_state_retain_deriv. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: style changes in parse-simulation * src/parse-simulation.c: Formatting changes. (parse_state_list_new): New. Use it. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: style: prefer res for returned value * src/lssi.c, src/parse-simulation.c: here. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: fix memory leaks when there are conflicts * src/counterexample.c (production_step, reduction_step): Release memory of temporary objects. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: be sure to always reclaim memory put in hashes One call to hash_initialize did not provide a function to free memory. * src/state-item.c (hash_pair_table_create): New. Use it. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: properly reclaim hash's allocated memory * src/state-item.c: Use hash_free where appropriate. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: avoid gratuitous heap allocations There's no need to go for the heap when using gnulib's hash module. * src/state-item.c (hash_pair_lookup, hash_pair_remove, state_sym_lookup): Use the heap Luke. That removes a leak from hash_pair_lookup. (init_prods): Use hash_pair_insert instead of duplicating it. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: fix leaks * src/state-item.c: Various functions were using heap allocated locals and not freeing them. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> style: use hash_xinsert * gnulib: Update to get hash_xinsert. Use it where appropriate. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: style changes in state-item * src/state-item.h, src/state-item.c (state_item): Make the state const. (state_item_set): Make it clearer that it works in the state_items global array. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: stylistic changes * src/counterexample.c: Use 'res' as a variable name for returned value, as elsewhere. Avoid uninitialized variables, especially pointers. Avoid assignment where possible. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: avoid uninitialized variables * src/counterexample.c (item_rule_bounds): Split into... (item_rule_start, item_rule_end): these. Adjust dependencies. * src/conflicts.c (find_state_item_number): New. Use it to avoid uninitialized variables. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: isolate missing API from gl_list * src/counterexample.c (list_get_end): New. Use it. Reduce scopes. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: tests: be robust to variations in time limit reports The CI has "failures" such as (253, "Null nonterminals"): @@ -21,7 +21,7 @@ 3: 3 b: . %empty 3: 4 c: . %empty On Symbols: {A,} -time limit exceeded: 6.000000 +time limit exceeded: 11.000000 First Example c • c A A $end First derivation $accept ::=[ a ::=[ c d ::=[ a ::=[ b ::=[ • ] d ::=[ c A A ] ] ] ] $end ] Second Example c • A $end * tests/counterexample.at (AT_BISON_CHECK_CEX): New. Use it to neutralize differences in timeout values. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: fix stack overflow * src/parse-simulation.c: Replace reference counting with parse_state_retain everywhere. (free_parse_state): Make this function iterative instead of recursive. Long parse_state chains were causing stack exhaustion. * tests/counterexample.at: Fix expectations. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: fix crash from zombie result Fixes the SEGV in test 247 (counterexample.at:195): "S/R after first token". * src/counterexample.c: here. * tests/counterexample.at: Fix expectations. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: fixes, and enable tests * src/counterexample.c, src/derivation.c: Do not output diagnostics on stdout, that's the job of stderr, and the testsuite heavily depend on this. Do not leave trailing spaces in the output. * tests/counterexample.at: Use AT_KEYWORDS. Specify the expected outputs. * tests/local.mk: Add counterexample.at. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: fix a crash * src/state-item.c (init_state_items): If the rule has no reductions at all, don't read at all in its list of reduced rules. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: add tests * tests/counterexample.at: New. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: bind counterexample generation * src/complain.h, src/complain.c: Add support for -Wcounterexample. * src/conflicts.c (report_counterexamples): New. (rule_conflicts_print): Use it when -Wcounterexample is given. * src/getargs.h, src/getargs.c: Add support for --trace=cex. * src/main.c (main): Init and deinit counterexample generation. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: introduce counterexample search * src/counterexample.h, src/counterexample.c: New. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: introduce the parse simulator * src/derivation.h, src/derivation.c, * src/parse-simulation.h, src/parse-simulation.c: New. 2020-05-22 Vincent Imbimbo <vmi6@cornell.edu> cex: add support for state-item pair graph generation * src/lssi.h, src/lssi.c, src/state-item.h, src/state-item.c: New. 2020-05-22 Akim Demaille <akim.demaille@gmail.com> cex: add gnulib dependencies * bootstrap.conf (gnulib_modules): Add linked-list. 2020-05-21 Akim Demaille <akim.demaille@gmail.com> fix generated comments In Bison 3.6.2, the comments with brackets lose their brackets, for improper m4 quotation. * data/skeletons/bison.m4 (b4_gsub): New. * data/skeletons/c-like.m4 (_b4_comment): Use it. * tests/m4.at: Check b4_gsub. 2020-05-21 Akim Demaille <akim.demaille@gmail.com> traces: provide a means to get short m4 traces Let --trace=m4-early dump all the logs from the start (as --trace=m4 used to do), and have --trace=m4 now start traces only when actually working of the user's grammar. Can make a big difference in the case of small inputs. E.g. $ bison -S tests/testsuite.dir/001/input.m4 tests/testsuite.dir/001/input.y --trace=m4 |& wc 3952 19446 251068 $ bison -S tests/testsuite.dir/001/input.m4 tests/testsuite.dir/001/input.y --trace=m4-early |& wc 19491 131904 1830495 * data/skeletons/traceon.m4: New. * src/getargs.h, src/getargs.c: Introduce --trace=m4-early. * src/output.c (output_skeleton): Adjust for --trace=m4 and --trace=m4-early. 2020-05-21 Akim Demaille <akim.demaille@gmail.com> traces: show the full m4 invocation Unfortunately the effect of -dV is still position independent. * src/output.c (output_skeleton): here. 2020-05-20 Thomas Petazzoni <thomas.petazzoni@bootlin.com> src: make path to m4 relocatable Commit a4ede8f85b0c9a254fcb01e5888cee1983095669 ("package: make bison a relocatable package") made Bison relocatable, but in fact it still contains one absolute reference: the M4 variable, which points to the M4 program. Let's fix that by using relocate(), see if an M4 binary is available at the relocated location, and otherwise fallback to the original M4 location. See https://lists.gnu.org/r/bison-patches/2020-05/msg00078.html, and https://lists.gnu.org/r/bison-patches/2020-05/msg00087.html. * src/files.h, src/files.c (m4path): New. * src/output.c: Use it. 2020-05-17 Akim Demaille <akim.demaille@gmail.com> CI: fix PPC recipe 2020-05-17 Akim Demaille <akim.demaille@gmail.com> Merge branch 'maint' * upstream/maint: maint: post-release administrivia version 3.6.2 tests: improve update-test CI: add GCC 10 and Clang 10 fix: do not emit nested comments todo: update examples: use markdown hyperlinks tests: don't use == to compare const char *... gnulib: update 2020-05-17 Akim Demaille <akim.demaille@gmail.com> c: more fixes for _Noreturn The previous fix was insufficient. tests/types.at:366: $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -o test test.cc $LIBS ++ ccache clang++-mp-9.0 -Qunused-arguments -ggdb -Wall -Wextra -Wcast-align -Wchar-subscripts -fparse-all-comments -Wdocumentation -Wformat -Wimplicit-fallthrough -Wnull-dereference -Wno-sign-compare -Wno-tautological-constant-out-of-range-compare -Wpointer-arith -Wshadow -Wwrite-strings -Wextra-semi -Wold-style-cast -Wundefined-func-template -Wweak-vtables -Wunreachable-code -Wundef -pedantic -Wconversion -Wdeprecated -Wsign-compare -Wsign-conversion -Wtautological-constant-out-of-range-compare -fno-color-diagnostics -Wno-keyword-macro -Werror -std=c++98 -I/Users/akim/src/gnu/bison/tests -isystem /opt/gostai/include -isystem /opt/local/include -L/opt/gostai/lib -L/opt/local/lib -o test test.cc /Users/akim/src/gnu/bison/_build/c9d/lib/libbison.a -lintl -Wl,-framework -Wl,CoreFoundation stderr: test.cc:955:1: error: _Noreturn functions are a C11-specific feature [-Werror,-Wc11-extensions] _Noreturn static void ^ test.cc:963:1: error: _Noreturn functions are a C11-specific feature [-Werror,-Wc11-extensions] _Noreturn static void ^ 2 errors generated. * data/skeletons/c.m4 (b4_attribute_define): Do not use _Noreturn at all in C++, clang or not. 2020-05-17 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-05-17 Akim Demaille <akim.demaille@gmail.com> version 3.6.2 * NEWS: Record release date. 2020-05-17 Akim Demaille <akim.demaille@gmail.com> tests: improve update-test * build-aux/update-test: When given a directory, use the testsuite.log which it contains. Do not accept empty "from"s, as substituting the empty string with something is rarely a good idea. 2020-05-17 Akim Demaille <akim.demaille@gmail.com> CI: add GCC 10 and Clang 10 * .travis.yml: Here. * tests/input.at, tests/regression.at: Beware of clang's -Wdocumentation. 2020-05-17 Akim Demaille <akim.demaille@gmail.com> fix: do not emit nested comments With input such as %token<fl> yVL_CLOCK "/*verilator sc_clock*/" we generate yVL_CLOCK = 610, /* "/*verilator sc_clock*/" */ which is invalid since the comment will actually be closed on the first "*/". Let's turn "*/" into "*\/" to avoid this. But GCC will also warn about "/*" inside a comment, so let's "escape" it too. Reported by Huang Rui. https://github.com/akimd/bison/issues/38 * data/skeletons/c-like.m4 (_b4_comment): Escape comment delimiters in comments. * tests/input.at (Torturing the Scanner): Check thes cases. * tests/m4.at: New. 2020-05-16 Akim Demaille <akim.demaille@gmail.com> c: restore definition of _Noreturn as [[noreturn]] in C++ c.m4 contains a definition of _Noreturn which is modeled after gnulib's lib/_Noreturn.h. The latter was recently changed (b61bf2f0e8bdc1e522ae8e97d57d5625163b42ea) to not using [[noreturn]] at all, because the uses of _Noreturn in gnulib are sometimes incompatible with the rules of [[noreturn]]. As a result glr.cc started to use _Noreturn in C++, which clang refuses (all the glr.cc tests currently fail with Clang++). * data/skeletons/c.m4 (b4_attribute_define): Restore the definition of _Noreturn as [[noreturn]] in modern C++. The generated code uses _Noreturn in places where [[noreturn]] is valid. 2020-05-16 Akim Demaille <akim.demaille@gmail.com> examples: don't promote unchecked function calls * etc/bench.pl.in, examples/c/bistromathic/parse.y, * examples/c/calc/calc.y, examples/c/pushcalc/calc.y: Check scanf's return value. * doc/bison.texi: Likewise, but only for the second example, to avoid cluttering the very simple case. 2020-05-16 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-05-15 Akim Demaille <akim.demaille@gmail.com> todo: update 2020-05-14 Akim Demaille <akim.demaille@gmail.com> examples: use markdown hyperlinks * examples/c++/README.md, examples/c++/calc++/README.md, * examples/c/README.md: here. 2020-05-14 Akim Demaille <akim.demaille@gmail.com> tests: don't use == to compare const char *... Reported by Dagobert Michelsen. https://lists.gnu.org/r/bug-bison/2020-05/msg00091.html * tests/c++.at: here. 2020-05-14 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-05-13 Akim Demaille <akim.demaille@gmail.com> tests: improve update-test * build-aux/update-test: When given a directory, use the testsuite.log which it contains. Do not accept empty "from"s, as substituting the empty string with something is rarely a good idea. 2020-05-10 Akim Demaille <akim.demaille@gmail.com> Merge branch maint * maint: news: update maint: post-release administrivia version 3.6.1 c++: style: reorder generated code c++: provide yy::parser::symbol_type::name c++: make parser::symbol_name public examples: beware of ~/.inputrc build: also provide lzip compressed tarballs style: minor fixes yacc.c: restore ansi-c compatibility 2020-05-10 Akim Demaille <akim.demaille@gmail.com> news: update 2020-05-10 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-05-10 Akim Demaille <akim.demaille@gmail.com> version 3.6.1 * NEWS: Record release date. 2020-05-10 Akim Demaille <akim.demaille@gmail.com> bench: add support to randomize the order of execution It's amazing how much the order matters. To a point that many of these benches are meaningless. For instance (some of the benches where run with `make -C benches/latest rand BENCHFLAGS=--benchmark_min_time=3`): compiler: g++ -std=c++11 -O2 0. %define nofinal 1. -------------------------------------------------- Benchmark Time CPU Iterations -------------------------------------------------- BM_y0 1543 ns 1541 ns 441660 BM_y1 1521 ns 1520 ns 456535 -------------------------------------------------- BM_y0 1531 ns 1530 ns 440584 BM_y1 1512 ns 1511 ns 457591 -------------------------------------------------- BM_y0 1539 ns 1538 ns 2749330 BM_y1 1516 ns 1515 ns 2771500 -------------------------------------------------- BM_y0 1571 ns 1570 ns 2600782 BM_y1 1542 ns 1541 ns 2708349 -------------------------------------------------- BM_y0 1530 ns 1529 ns 2670363 BM_y1 1519 ns 1518 ns 2764096 -------------------------------------------------- Benchmark Time CPU Iterations -------------------------------------------------- BM_y1 1529 ns 1528 ns 451937 BM_y0 1508 ns 1507 ns 453944 -------------------------------------------------- BM_y1 1525 ns 1524 ns 2750684 BM_y0 1516 ns 1515 ns 2794034 -------------------------------------------------- BM_y1 1526 ns 1525 ns 2749620 BM_y0 1515 ns 1514 ns 2808112 -------------------------------------------------- BM_y1 1524 ns 1523 ns 4475844 BM_y0 1502 ns 1501 ns 4611665 * etc/bench.pl.in: here. 2020-05-10 Akim Demaille <akim.demaille@gmail.com> bench: use a Makefile This makes it much easier to toy with the benchs. * etc/bench.pl.in: Generate a Makefile instead of directly compiling the files. 2020-05-10 Akim Demaille <akim.demaille@gmail.com> examples: use markdown hyperlinks * examples/c++/README.md, examples/c++/calc++/README.md, * examples/c/README.md: here. 2020-05-10 Akim Demaille <akim.demaille@gmail.com> don't use stdnoreturn Reported by Paul Eggert. * src/getargs.c: We don't need it anyway, since we use _Noreturn. * data/skeletons/c.m4: While at it, update the definition of _Noreturn stolen from gnulib. 2020-05-10 Akim Demaille <akim.demaille@gmail.com> c++: style: reorder generated code The implementation of yy::parser::symbol_name is emitted even before the implementation of yy::parser::parser. This makes little sense. * data/skeletons/lalr1.cc (symbol_name): Move its implementation in the same place as in the class definition: after "error" and before "context". 2020-05-10 Akim Demaille <akim.demaille@gmail.com> c++: provide yy::parser::symbol_type::name * data/skeletons/c++.m4 (yy::parser::basic_symbol::name): New. * data/skeletons/lalr1.cc (yy_print_): Use it. * doc/bison.texi: Document. * tests/c++.at: Check. 2020-05-10 Akim Demaille <akim.demaille@gmail.com> c++: make parser::symbol_name public Reported by Martin Blais <blais@furius.ca>. https://lists.gnu.org/r/help-bison/2020-05/msg00005.html * data/skeletons/lalr1.cc (symbol_name): Make it public. Add a private hidden hook to enable testing of private parts. * tests/local.at (AT_DATA_GRAMMAR_PROLOGUE): Help Emacs find the right language mode. * tests/c++.at (C++ Variant-based Symbols Unit Tests): Check that we can read symbol_name. 2020-05-10 Akim Demaille <akim.demaille@gmail.com> examples: beware of ~/.inputrc * examples/c/bistromathic/bistromathic.test: here. 2020-05-10 Akim Demaille <akim.demaille@gmail.com> build: also provide lzip compressed tarballs Suggested by Matias Fonzo <selk@dragora.org>. * cfg.mk: Post announcements to bison-announce. * configure.ac: Build lzip packages. * .travis.yml: Build only xz, we don't care about the other formats here. 2020-05-10 Akim Demaille <akim.demaille@gmail.com> style: minor fixes * examples/c/README.md: here. 2020-05-09 Akim Demaille <akim.demaille@gmail.com> yacc.c: restore ansi-c compatibility Reported by neok-m4700. https://github.com/akimd/bison/issues/37 * data/skeletons/yacc.c: Don't use // comments. 2020-05-09 Akim Demaille <akim.demaille@gmail.com> bench: use *.cc for C++ Using *.c is simpler, but triggers annoying warnings with Clang++. * etc/bench.pl.in: Please the dictator. 2020-05-09 Akim Demaille <akim.demaille@gmail.com> style: minor fixes * examples/c/README.md: here. 2020-05-09 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-05-08 Akim Demaille <akim.demaille@gmail.com> gnulib: update, and use the attribute module * gnulib: Update. * bootstrap.conf: Use attribute. * src/system.h: Remove macros for attributes. Adjust dependencies. * src/scan-gram.l (DEPRECATED): Rename as... (DEPRECATED_DIRECTIVE): this, to avoid the clash with the DEPRECATED macro. 2020-05-08 Akim Demaille <akim.demaille@gmail.com> build: also provide lzip compressed tarballs Suggested by Matias Fonzo <selk@dragora.org>. * cfg.mk: Post announcements to bison-announce. * configure.ac: Build lzip packages. * .travis.yml: Build only xz, we don't care about the other formats here. 2020-05-08 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-05-08 Akim Demaille <akim.demaille@gmail.com> version 3.6 * NEWS: Record release date. 2020-05-08 Akim Demaille <akim.demaille@gmail.com> examples: beware of portability issue on Windows Reported by Jannick. https://lists.gnu.org/r/bug-bison/2020-05/msg00040.html https://lists.gnu.org/r/bug-bison/2020-05/msg00066.html * examples/test (diff_opts): Use --strip-trailing-cr if supported, to avoid \n vs. \r\n issues. * examples/c/bistromathic/bistromathic.test: When on MSYS, don't try to check autocompletion. 2020-05-08 Akim Demaille <akim.demaille@gmail.com> regen 2020-05-08 Akim Demaille <akim.demaille@gmail.com> doc: fix the generation of the man page When there is no bison.1 at all, the procedure fails. * doc/local.mk (bison.1): Be robust to cold starts. 2020-05-08 Akim Demaille <akim.demaille@gmail.com> news: prepare for 3.6 2020-05-08 Akim Demaille <akim.demaille@gmail.com> doc: complete the table of symbols * doc/bison.texi: Add YYEMPTY, YYEOF and YYUNDEF. 2020-05-07 Akim Demaille <akim.demaille@gmail.com> doc: clarify the glossary item about kinds * doc/bison.texi (Glossary): here. 2020-05-06 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-05-06 Akim Demaille <akim.demaille@gmail.com> version 3.5.94 * NEWS: Record release date. 2020-05-06 Akim Demaille <akim.demaille@gmail.com> doc: document yypstate_expected_tokens * doc/bison.texi (Push Parser Interface): Here. 2020-05-06 Akim Demaille <akim.demaille@gmail.com> doc: restructure the push parser documentation I don't think it's fair to have yypstate_new, yypstate_delete, yypush_parse and yypull_parse to have their own section, on par with yyparse and yylex. Let them be in a single section about push parsers. And show new/delete first. * doc/bison.texi (Push Parser Interface): New. Fuse the aforementioned sections into it. 2020-05-06 Akim Demaille <akim@lrde.epita.fr> all: fix the interface of yyexpected_tokens The user gives yyexpected_tokens a limit: the max number of tokens she wants to hear about. That's because an error message that reports a bazillion of possible tokens is useless. In that case yyexpected_tokens returned 0, so the user would not know if there are too many expected tokens or none (yes, that's possible). There are several ways to tell the user in which situation she's in: - return some E2MANY, a negative value. Then it makes the pattern int argsize = yypcontext_expected_tokens (ctx, arg, ARGS_MAX); if (argsize < 0) return argsize; no longer valid, as for E2MANY (i) the user must generate the error message anyway, and (ii) she should not return E2MANY - return ARGS_MAX + 1. Then it makes it dangerous for the user, as she has to iterate update `min (ARGS_MAX, argsize)`. Returning 0 is definitely simpler and safer for the user, as it tells her "this is not an error, just generate your message without a list of expecting tokens". So let's still return 0, but set arg[0] to the empty token when the list is really empty. * data/skeletons/glr.c, data/skeletons/lalr1.cc, data/skeletons/lalr1.java * data/skeletons/yacc.c (yyexpected_tokens): Put the empty symbol first if there are no possible tokens at all. * examples/c/bistromathic/parse.y: Demonstrate how to use that. 2020-05-05 Akim Demaille <akim.demaille@gmail.com> examples: fix handling of syntax errors The shell grammar does not allow empty statements in then/else part of an if, but examples/test failed to catch the syntax errors from the script it ran. So exited with success anyway. You would expect 'set -e' to suffice, but with bash 3.2 actually it does not. As a matter of fact, I could find a way to have this behave properly: $ cat test.sh set -e cleanup () { status=$? echo "cleanup: $status" exit $status } trap cleanup 0 1 2 13 15 . $1 s=$? echo "test.sh: $s" exit $s $ cat bistro.test if true; then fi $ /bin/sh ./test.sh ./bistro.test ./bistro.test: line 2: syntax error near unexpected token `fi' cleanup: 0 $ echo $? 0 Remove the set -e (or the trap), and tada, it works... So we have to deal with the error by hand. * examples/test ($exit): Replace with... ($status): this. Preserve the exit status of the test case. * examples/c/bistromathic/bistromathic.test: Fix syntax error. 2020-05-04 Akim Demaille <akim.demaille@gmail.com> doc: beware of timestamp issues on Haiku On Haiku, help2man is fired on a freshly extracted tarball. Reported by Bruno Haible. https://lists.gnu.org/r/bug-bison/2020-05/msg00055.html * doc/local.mk (bison.1): Be robust to a missing help2man. 2020-05-04 Akim Demaille <akim.demaille@gmail.com> tests: beware of wchar_t portability issues on AIX https://lists.gnu.org/r/bug-bison/2020-05/msg00050.html Reported by Bruno Haible. * tests/diagnostics.at: here. 2020-05-04 Akim Demaille <akim.demaille@gmail.com> glr.c: beware of portability issues with PTRDIFF_MAX For instance test 386, "glr.cc api.value.type={double}": types.at:366: $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -o test test.cc $LIBS stderr: test.cc: In function 'ptrdiff_t yysplitStack(yyGLRStack*, ptrdiff_t)': test.cc:490:4: error: 'PTRDIFF_MAX' was not declared in this scope (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : YY_CAST (ptrdiff_t, SIZE_MAX)) ^ test.cc:1805:37: note: in expansion of macro 'YYSIZEMAX' ptrdiff_t half_max_capacity = YYSIZEMAX / 2 / state_size; ^~~~~~~~~ test.cc:490:4: note: suggested alternative: '__PTRDIFF_MAX__' (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : YY_CAST (ptrdiff_t, SIZE_MAX)) ^ test.cc:1805:37: note: in expansion of macro 'YYSIZEMAX' ptrdiff_t half_max_capacity = YYSIZEMAX / 2 / state_size; ^~~~~~~~~ The failing tests are using glr.cc only, which I don't understand, the problem is rather in glr.c, so I would expect glr.c tests to also fail. Reported by Bruno Haible. https://lists.gnu.org/archive/html/bug-bison/2020-05/msg00053.html * data/skeletons/yacc.c: Move the block that defines YYPTRDIFF_T/YYPTRDIFF_MAXIMUM, YYSIZE_T/YYSIZE_MAXIMUM, and YYSIZEOF to... * data/skeletons/c.m4 (b4_sizes_types_define): Here. (b4_c99_int_type): Also take care of the #undefinition of short. * data/skeletons/yacc.c, data/skeletons/glr.c: Use b4_sizes_types_define. * data/skeletons/glr.c: Adjust to use YYPTRDIFF_T/YYPTRDIFF_MAXIMUM, YYSIZE_T/YYSIZE_MAXIMUM. 2020-05-04 Akim Demaille <akim.demaille@gmail.com> todo: update 2020-05-04 Akim Demaille <akim.demaille@gmail.com> examples: beware of strnlen portability issues One function missing on Solaris 10 Sparc: CCLD examples/c/bistromathic/bistromathic Undefined first referenced symbol in file strnlen examples/c/bistromathic/bistromathic-parse.o ld: fatal: symbol referencing errors. No output written to examples/c/bistromathic/bistromathic Reported by Dagobert Michelsen. https://lists.gnu.org/r/bug-bison/2020-05/msg00048.html * examples/c/bistromathic/parse.y (xstrndup): Don't use strnlen. xstrndup is assembled from gnulib's xstrndup, strndup and strnlen... 2020-05-04 Akim Demaille <akim.demaille@gmail.com> examples: beware of portability issues with sh's trap On AIX 7.2, when invoking "exit 77", we actually exit with 127. The "cleanup" function, called via trap, received an incorrect exit status, something described in Autoconf's doc. Reported by Bruno Haible. https://lists.gnu.org/archive/html/bug-bison/2020-05/msg00029.html https://lists.gnu.org/archive/html/bug-bison/2020-05/msg00047.html * examples/test (skip): New. * examples/c/bistromathic/bistromathic.test, * examples/c/reccalc/reccalc.test: Use it, to ensure $? is set to 77 when the trap is called. 2020-05-04 Akim Demaille <akim.demaille@gmail.com> tests: beware of portability issues with diff -u AIX 7.1 supports diff -u, but its output does not match the expected one. Reported by Bruno Haible. https://lists.gnu.org/r/bug-bison/2020-05/msg00049.html * tests/atlocal.in (DIFF_U_WORKS): New. * tests/local.at (AT_DIFF_U_CHECK): New. * tests/existing.at (_AT_TEST_EXISTING_GRAMMAR): Use AT_DIFF_U_CHECK. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> version 3.5.93 * NEWS: Record release date. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> news: update for 3.5.93 2020-05-03 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-05-03 Akim Demaille <akim.demaille@gmail.com> tests: really skip tricky multichar test on Cygwin In Autotest, anything outside AT_SETUP/AT_CLEANUP is discarded. * tests/diagnostics.at (AT_TEST): Accept a skip-if test. Use it to skip on cygwin. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> bistromathic: beware of portability issues of readline on AIX Readline may emit escape sequences before the prompt. Reported by Bruno Haible. https://lists.gnu.org/r/platform-testers/2020-05/msg00001.html. * examples/c/bistromathic/bistromathic.test: Trust readline _only_ if we get what we expect on some reference computation. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> examples: beware of portability issues with cmp As someone wrote nearly 20 years ago in Autoconf's documentation, don't use cmp to compare text files, but diff. https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=abad4f0576a7dc361e5385e19c7681449103cdb1 Reported by Jannick. * examples/test: Use diff, not cmp. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> build: fix warnings (shown on IRIX) Appearing on IRIX with gcc -mabi=n32. Reported by Bruno Haible. https://lists.gnu.org/r/bug-bison/2020-05/msg00039.html * examples/c++/variant-11.yy, examples/c/bistromathic/parse.y: Don't give chars to isdigit, cast them to unsigned char before. * src/complain.c: Use c_isdigit. * src/fixits.c (fixits_run): Avoid casts. * src/lalr.c (goto_print): Use %zu for a size_t. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> c++: be compatible with the pre-3.6 way to get a symbol's kind Reported by Pramod Kumbhar. https://lists.gnu.org/r/bug-bison/2020-05/msg00025.html * data/skeletons/c++.m4: here. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> bistromathic: beware of portability issues with strndup Reported by Dagobert Michelsen. https://lists.gnu.org/r/bug-bison/2020-05/msg00026.html * examples/c/bistromathic/parse.y (xstrndup): New. Use it. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> flex: fix incorrect use of Automake conditional AM_CONDITIONAL does _not_ define a shell variable... Reported privately by Denis Excoffier. * configure.ac (LEX_CXX_WORKS): Fix its definition. 2020-05-03 Bruno Haible <bruno@clisp.org> package: fix a link error on IRIX https://lists.gnu.org/r/bug-bison/2020-05/msg00035.html * src/local.mk (src_bison_LDADD): Mention libbison.a before, not after, the system libraries. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> bistromathic: beware of portability of readline Don't try to build bistromathic if we don't have readline. Reported by Bruno Haible. https://lists.gnu.org/r/bug-bison/2020-05/msg00028.html * configure.ac (ENABLE_BISTROMATHIC): New. * examples/c/bistromathic/local.mk: Use it. * examples/c/bistromathic/bistromathic.test: Exit 77 for skip. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> tests: beware of portability issues of sh "foo || bar" does not invoke bar on AIX 7.2 when foo does not exist. It just dies. Reported by Bruno Haible. https://lists.gnu.org/r/bug-bison/2020-05/msg00029.html * examples/c/reccalc/reccalc.test: Check for seq in a subshell. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> version 3.5.92 * NEWS: Record release date. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> news: update for 3.5.92 2020-05-03 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-05-03 Akim Demaille <akim.demaille@gmail.com> java: demonstrate push parsers * data/skeletons/lalr1.java (Location): Make it a static class. (Lexer.yylex, Lexer.getLVal, Lexer.getStartPos, Lexer.getEndPos): These are not needed in push parsers. * examples/java/calc/Calc.y: Demonstrate push parsers in the Java. * doc/bison.texi: Push parsers have been supported for a long time, remove incorrect statements stating the opposite. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> doc: clarify what a location is Reported by Arthur Schwarz <aschwarz1309@att.net> https://lists.gnu.org/r/help-bison/2013-12/msg00009.html * doc/bison.texi (Location Type): here. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> tests: beware of mbswidth portability issues Shy away from these issues on Cygwin. Reported Denis Excoffier. https://lists.gnu.org/r/bug-bison/2020-05/msg00003.html * tests/diagnostics.at (Tabulations and multibyte characters): Split in two. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> examples: beware of intl portability issues Reported by Horst von Brand. https://lists.gnu.org/r/bug-bison/2020-04/msg00033.html * examples/c/bistromathic/Makefile: libintl might not be needed, but libm probably is. * examples/c/bistromathic/parse.y: Include locale.h. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> examples: beware of portability issues with readline On OpenBSD 6.5, the prompt is repeated, but not the actual command line... Don't try to cope with that. Reported by Bruno Haible. https://lists.gnu.org/r/bug-bison/2020-05/msg00015.html * examples/c/bistromathic/bistromathic.test: Skip when readline behave this way. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> examples: beware of the portability of flex --header-file The option --header was introduced in version 2.5.6. The option --header-file was introduced in version 2.6.4. Reported by Bruno Haible. https://lists.gnu.org/r/bug-bison/2020-05/msg00013.html So use --header, and do bother with versions that don't support it. * m4/flex.m4: Check whether flex supports --header. * configure.ac (FLEX_WORKS, FLEX_CXX_WORKS): Set to false if it doesn't. * * examples/c/reccalc/local.mk, examples/c/reccalc/Makefile: Use --header rather than --header-file. 2020-05-03 Akim Demaille <akim.demaille@gmail.com> c++: provide backward compatibility on by_type To write unit tests for their scanners, some users depended on symbol_type::token(): Lexer lex("12345"); symbol_type t = lex.nextToken(); assert(t.token() == token::INTLIT); assert(t.value.as<int>() == 12345); But symbol_type::token() was removed in Bison 3.5 because it relied on a conversion table. So users had to find other patterns, such as assert(t.type_get() == by_type(token::INTLIT).type_get()); which relies on several private implementation details. As part of transitioning from "token type" to "token kind", and making this a public and documented interface, "by_type" was renamed "by_kind" and "type_get()" was renamed as "kind()". The latter had backward compatibility mechanisms, not the former. In Bison 3.6 none of this should be used, but rather assert(t.kind() == symbol_kind::S_INTLIT); Reported by Pramod Kumbhar. https://lists.gnu.org/r/bug-bison/2020-05/msg00012.html * data/skeletons/c++.m4 (by_type): Make it an alias to by_kind. 2020-05-02 Akim Demaille <akim.demaille@gmail.com> yacc.c: improve formatting of the generated code * data/skeletons/yacc.c (yy_reduce_print): here. 2020-05-02 Akim Demaille <akim.demaille@gmail.com> doc: java supports push parsers since 3.0 (2013-07-25) * doc/bison.texi: Clarify this. 2020-05-02 Akim Demaille <akim.demaille@gmail.com> java: fix coding style I don't plan to fix everything in one go. But this was in the way of the next commit. * data/skeletons/lalr1.java: Avoid space before parens. * tests/java.at: Adjust. 2020-05-02 Akim Demaille <akim.demaille@gmail.com> style: comment changes * tests/java.at: here. 2020-05-02 Akim Demaille <akim.demaille@gmail.com> todo: more 2020-05-02 Akim Demaille <akim.demaille@gmail.com> style: more documentation about errs Suggested by Angelo Borsotti. https://lists.gnu.org/r/bug-bison/2014-02/msg00003.html * src/state.h: here. 2020-05-01 Akim Demaille <akim.demaille@gmail.com> doc: document the exit status Suggested by Alexandre Duret-Lutz. https://lists.gnu.org/r/bug-bison/2013-09/msg00015.html * doc/bison.texi (Invocation): Here. 2020-05-01 Akim Demaille <akim.demaille@gmail.com> java: add missing i18n requests * data/skeletons/lalr1.java (reportSyntaxError): Here. 2020-05-01 Akim Demaille <akim.demaille@gmail.com> java: style: fix coding style of yyerror/reportSyntaxError * data/skeletons/lalr1.java: here. 2020-05-01 Akim Demaille <akim.demaille@gmail.com> java: avoid useless work * data/skeletons/lalr1.java (yySymbolPrint): Avoid the computation of the argument if useless. While at it, fix Java coding style. 2020-05-01 Akim Demaille <akim.demaille@gmail.com> java: comment changes * data/skeletons/lalr1.java, examples/java/calc/Calc.y: here. 2020-05-01 Akim Demaille <akim.demaille@gmail.com> news: make it more consistent * NEWS: Use the same pattern for titles. 2020-05-01 Akim Demaille <akim.demaille@gmail.com> c++: use modern idioms to make classes non-copyable Reported by Don Macpherson. https://lists.gnu.org/r/bug-bison/2019-05/msg00015.html https://github.com/akimd/bison/issues/36 * data/skeletons/lalr1.cc, data/skeletons/stack.hh, * data/skeletons/variant.hh: Delete the copy-ctor and the copy operator. 2020-04-30 Akim Demaille <akim.demaille@gmail.com> yacc.c: avoid the use of a temporary * data/skeletons/yacc.c: Use YYLLOC_DEFAULT directly with the final destination. 2020-04-29 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-04-29 Akim Demaille <akim.demaille@gmail.com> version 3.5.91 * NEWS: Record release date. 2020-04-29 Akim Demaille <akim.demaille@gmail.com> build: fix syntax-check issues * cfg.mk: We do want to gettextize the examples. * po/POTFILES.in: Adjust. 2020-04-29 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-04-29 Akim Demaille <akim.demaille@gmail.com> doc: document YYEOF, YYUNDEF and YYerror * doc/bison.texi (Special Tokens): New. * examples/c/bistromathic/parse.y: Formatting changes. 2020-04-29 Akim Demaille <akim.demaille@gmail.com> package: fix distcheck Bison emits strings to translate in the generated code, for builtin tokens. So they appear only in generated parsers, which are not shipped, so they are not in the src tree, so we cannot use them in our POTFILE. Except src/parse-gram.c, which is in the source tree. And even in the git repo. But to avoid useless diffs in the repo, we do not keep the src/parse-gram.c _with_ the #lines. This is done in a dist-hook which regenerates src/parse-gram.c when we run "make dist". Unfortunately, then, update-po traverses the whole tree and sees that the location of the strings to translate in src/parse-gram.c have changed, so the bison.pot is to be updated. And that is not possible in the "make dist" which is run within "make distcheck" (not the one preparing the dist for distcheck, the one run by distcheck to check that a distributed tarball can build a tarball) because then the src tree is read-only. So let's not put src/parse-gram.c in the POTFILE, and expose these strings to gettextize by hand. * src/i18n-strings.c: New. * po/POTFILES.in: Add it, and remove src/parse-gram.c. 2020-04-29 Akim Demaille <akim.demaille@gmail.com> style: avoid gettextize warnings * src/scan-gram.l, src/scan-skel.l: Help it see the start and end of "character literals". 2020-04-29 Akim Demaille <akim.demaille@gmail.com> tests: beware of portability of readline * examples/test: here. 2020-04-28 Akim Demaille <akim.demaille@gmail.com> yacc.c: install backward compatibility for YYERRCODE Some people have been using that symbol. Some even have #defined it themselves. https://lists.gnu.org/r/bison-patches/2020-04/msg00138.html Let's provide backward compatibility, having it point to YYUNDEF, so that an error message is generated. * data/skeletons/yacc.c (YYERRCODE): New, at the exact same location it was defined before. 2020-04-28 Akim Demaille <akim.demaille@gmail.com> style: c++: s/type/kind/ where appropriate These are internal details. `type_get ()` is still there to ensure backward compatibility, `kind ()` being the modern way. * data/skeletons/c++.m4 (by_type, by_type::type): Rename as... (by_kind, by_kind::kind_): this. Adjust dependencies. 2020-04-28 Akim Demaille <akim.demaille@gmail.com> java: clean up the definition of token kinds From public interface Lexer { /* Token kinds. */ /** Token number, to be returned by the scanner. */ static final int YYEOF = 0; /** Token number, to be returned by the scanner. */ static final int YYERRCODE = 256; /** Token number, to be returned by the scanner. */ static final int YYUNDEF = 257; /** Token number, to be returned by the scanner. */ static final int BANG = 258; ... /** Deprecated, use b4_symbol(0, id) instead. */ public static final int EOF = YYEOF; to public interface Lexer { /* Token kinds. */ /** Token "end of file", to be returned by the scanner. */ static final int YYEOF = 0; /** Token error, to be returned by the scanner. */ static final int YYerror = 256; /** Token "invalid token", to be returned by the scanner. */ static final int YYUNDEF = 257; /** Token "!", to be returned by the scanner. */ static final int BANG = 258; ... /** Deprecated, use YYEOF instead. */ public static final int EOF = YYEOF; * data/skeletons/java.m4 (b4_token_enum): Display the symbol's tag in comment. * data/skeletons/lalr1.java: Address overquotation issue. * examples/java/calc/Calc.y, examples/java/simple/Calc.y: Use YYEOF, not EOF. 2020-04-28 Akim Demaille <akim.demaille@gmail.com> error: rename the error token from YYERRCODE to YYerror See https://lists.gnu.org/r/bison-patches/2020-04/msg00162.html. * data/skeletons/bison.m4, data/skeletons/c.m4, data/skeletons/glr.cc, * data/skeletons/lalr1.java, doc/bison.texi, * examples/c/bistromathic/parse.y, src/scan-gram.l, src/symtab.c (YYERRCODE): Rename as... (YYerror): this. Adjust dependencies. 2020-04-27 Akim Demaille <akim.demaille@gmail.com> dogfooding: use YYERRCODE in our scanner * src/scan-gram.l: Use it. * tests/input.at: Adjust. 2020-04-27 Akim Demaille <akim.demaille@gmail.com> scanner: avoid spurious errors about empty character literals On an invalid character literal such as "'\777'" we used to produce two errors: input.y:2.9-12: error: invalid number after \-escape: 777 input.y:2.8-13: error: empty character literal Get rid of the second one. * src/scan-gram.l (STRING_GROW_ESCAPE): New. * tests/input.at: Adjust. 2020-04-27 Akim Demaille <akim.demaille@gmail.com> scanner: bad character literals are errors * src/scan-gram.l: These are errors, not warnings. * tests/input.at: Adjust. 2020-04-27 Akim Demaille <akim.demaille@gmail.com> regen 2020-04-26 Akim Demaille <akim.demaille@gmail.com> todo: update 2020-04-26 Akim Demaille <akim.demaille@gmail.com> all: don't emit an error message when the scanner returns YYERRCODE I'm quite pleased to see that the tricky case of glr.c was already prepared by the changes to support syntax_error exceptions. Better yet, it is actually syntax_error that becomes a special case of the general pattern: make yytoken be YYERRCODE. * data/skeletons/glr.c (YYFAULTYTOK): Remove the now useless (Basil) Faulty token. Instead, use the error token. * data/skeletons/lalr1.d, data/skeletons/lalr1.java: When computing the action, first check the case of the error token. * tests/calc.at: Check cases for the error token symbols before and after it. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> c: don't emit an error message when the scanner returns YYERRCODE * data/skeletons/yacc.c (yyparse): When the scanner returns YYERRCODE, go directly to error recovery (yyerrlab1). However, don't keep the error token as lookahead, that token is too special. * data/skeletons/lalr1.cc: Likewise. * examples/c/bistromathic/parse.y (yylex): Use that feature to report nicely invalid characters. * examples/c/bistromathic/bistromathic.test: Check that. * examples/test: Neutralize gratuitous differences such as rule position. * tests/calc.at: Check that case in C only. The other case seem to be working, but that's an illusion that the next commit will address (in fact, they can enter endless loops, and report the error several times anyway). 2020-04-26 Akim Demaille <akim.demaille@gmail.com> examples: bistromathic: demonstrate error recovery * examples/c/bistromathic/parse.y: here. * examples/c/bistromathic/bistromathic.test: Check it. Included a stupid case where the error is actually ignored. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> examples: bistromathic: when quitting, close the current line When the user ctrl-d the line, we left the cursor not at col 0. Let's fix that. This revealed a few short-comings in the testing framework. * examples/test (run): Also display the diffs. And support -n. * examples/c/bistromathic/bistromathic.test * examples/c/bistromathic/parse.y 2020-04-26 Akim Demaille <akim.demaille@gmail.com> examples: bistromathic: comment changes * examples/c/bistromathic/parse.y: here. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> doc: hacking tricks * README-hacking.md: Here. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> c++: make valid to print the empty symbol * data/skeletons/lalr1.cc (yy_print_): here. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> c++: always define symbol_name * data/skeletons/lalr1.cc (symbol_name): Always define it, even when it's actually yytname which is used. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> c++: fix a few style issues * data/skeletons/lalr1.cc (yystack_print_, yy_reduce_print_): Add missing const. (yystack_print_): Rename as... (yy_stack_print_): this. * data/skeletons/glr.cc (yy_symbol_value_print_, yy_symbol_print_): Add missing const. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> all: prefer YYERRCODE to YYERROR We will not keep YYERRCODE anyway, it causes backward compatibility issues. So as a first step, let all the skeletons use that name, until we have a better one. * data/skeletons/bison.m4, data/skeletons/glr.c, * data/skeletons/glr.cc, data/skeletons/lalr1.cc, * data/skeletons/lalr1.d, data/skeletons/lalr1.java, * data/skeletons/yacc.c, doc/bison.texi, tests/headers.at, * tests/input.at: here. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> style: glr.c: clarify * data/skeletons/glr.c: Make the code a bit clearer. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> style: prefer b4_has_translations_if * data/skeletons/glr.c, data/skeletons/yacc.c: here. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> style: glr.c: fix indentation issue * data/skeletons/glr.c (yyparse): here. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> style: fix a few remaining 'type' instead of 'kind' * data/skeletons/glr.c, data/skeletons/yacc.c (YY_SYMBOL_PRINT): Here. 2020-04-26 Akim Demaille <akim.demaille@gmail.com> skeletons: make the warning about implementation details clearer * data/skeletons/bison.m4 (b4_disclaimer): Here. * data/skeletons/lalr1.d, data/skeletons/lalr1.java: Use it. 2020-04-25 Akim Demaille <akim.demaille@gmail.com> style: c: fix a few minor issues about indentation of cpp directives * README-hacking.md: More about cpp. * data/skeletons/c.m4, data/skeletons/yacc.c: Style changes. 2020-04-25 Akim Demaille <akim.demaille@gmail.com> bench: store in benches/012 rather than in benches/12 * etc/bench.pl.in ($basedir): New. Format $count with a least three digits. 2020-04-25 Akim Demaille <akim.demaille@gmail.com> bench: minor improvements * etc/bench.pl.in: Don't force parse.error=detailed Use a simpler way to display the pseudo %bison directive. (&bench_with_gbenchmark): Give details about the compiler. 2020-04-25 Akim Demaille <akim.demaille@gmail.com> style: clarify #endif We could try to avoid the weird "#if 1", but then the indentation of the inner #if would be wrong. Let' keep it this way. * data/skeletons/yacc.c: here. Also, avoid sticking the comment to the directive. 2020-04-25 Akim Demaille <akim.demaille@gmail.com> style: minor fixes * data/skeletons/bison.m4, doc/bison.texi: Spell check. * examples/c/bistromathic/parse.y (N_): Remove, now useless. 2020-04-24 Akim Demaille <akim.demaille@gmail.com> examples: bistromathic: shorten token description * examples/c/bistromathic/parse.y: "number" is enough. * doc/bison.texi: Likewise. 2020-04-24 Akim Demaille <akim.demaille@gmail.com> examples: bistromathic: demonstrate internationalization Currently it was only using stubs. Let's actually translate the strings using gettext. * examples/c/bistromathic/local.mk: Define LOCALEDIR, BISON_LOCALEDIR and link with libintl. * examples/c/bistromathic/parse.y: Use them. Remove useless includes. Take ENABLE_NLS into account. (error_format_string): New. (yyreport_syntax_error): Rewrite to rely on a format string, which is more appropriate for internationalization. * examples/c/bistromathic/Makefile: We no longer use Flex. We need readline and intl. * doc/bison.texi: Point to bistromathic for a better option for internationalization. * po/POTFILES.in: Add bistromathic. 2020-04-24 Akim Demaille <akim.demaille@gmail.com> todo: update for YYERRCODE 2020-04-24 Akim Demaille <akim.demaille@gmail.com> regen 2020-04-24 Akim Demaille <akim.demaille@gmail.com> diagnostics: fix a typo * src/complain.c: here. 2020-04-20 Akim Demaille <akim.demaille@gmail.com> c, c++: provide a default definition for N_ In C/C++, N_ is a no-op. Define it if the user didn't. Suggested by Frank Heckenbach. https://lists.gnu.org/r/bug-bison/2020-04/msg00010.html * src/output.c (prepare_symbol_names): Rename has_translations as has_translations_flag. * data/skeletons/bison.m4 (b4_has_translations_if): New. * data/skeletons/java.m4 (b4_trans): Use it. * data/skeletons/glr.c, data/skeletons/lalr1.cc, data/skeletons/yacc.c (N_): Provide a default definition. 2020-04-19 Akim Demaille <akim.demaille@gmail.com> i18n: also look in src/parse-gram.c Some strings appears in the generated file only, e.g., translation of "end of file". So don't forget to go and see there. 2020-04-19 Akim Demaille <akim.demaille@gmail.com> style: fix comments * data/skeletons/glr.c, data/skeletons/lalr1.cc, * data/skeletons/yacc.c: here. 2020-04-19 Akim Demaille <akim.demaille@gmail.com> tokens: clean up the translation of special symbols * src/output.c (prepare_symbol_names): Don't play tricks with the symbols, it's quite too late. (has_translations): Move to... * src/symtab.c: here. (symbols_pack): Use it to enable translation for special symbols. 2020-04-19 Akim Demaille <akim.demaille@gmail.com> news: fix typo Reported by Frank Heckenbach. 2020-04-19 Akim Demaille <akim.demaille@gmail.com> tests: beware of portability issues with wc On macOS, wc -l always prepends the result with a tab, even when fed by stdin. But anyway, we should have used `grep -c -v`, which appears to be portable according to Autoconf's "Limitations of Usual Tools" section. Reported by Denis Excoffier. https://lists.gnu.org/r/bug-bison/2020-04/msg00009.html * tests/calc.at (_AT_CHECK_CALC): Use grep's -c instead. 2020-04-18 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-04-18 Akim Demaille <akim.demaille@gmail.com> version 3.5.90 * NEWS: Record release date. 2020-04-18 Akim Demaille <akim.demaille@gmail.com> examples: beware of readline on macOS macOS' version of readline does not repeat stdin on stdout in non-interactive mode, contrary to the current version of GNU readline. * examples/test: Add support for strip_prompt. * examples/c/bistromathic/bistromathic.test (strip_prompt): Set it when needed. Early exit when needed. 2020-04-18 Akim Demaille <akim.demaille@gmail.com> c++: give public access to the symbol kind symbol_type::token () was removed: it returned the token kind of a symbol. To do that, one needs to convert from the symbol kind to the token kind, which requires a table. This broke some users' unit tests for scanners, see https://lists.gnu.org/r/bug-bison/2020-01/msg00001.html https://lists.gnu.org/r/bug-bison/2020-03/msg00020.html https://lists.gnu.org/r/help-bison/2020-04/msg00005.html Instead of making this possible again, let's check the symbol's kind instead. So give proper access to a symbol's kind. That feature existed, undocumented, as 'type_get()'. Let's rename this as 'kind()'. * data/skeletons/c++.m4, data/skeletons/glr.cc, * data/skeletons/lalr1.cc (type_get): Rename as... (kind): This. (type_get): Install a backward compatibility alias. * doc/bison.texi (Complete Symbols): Document symbol_type and symbol_type::kind. 2020-04-17 Akim Demaille <akim.demaille@gmail.com> doc: token_kind_type in C++ * data/skeletons/c++.m4: Define the old names in terms on the new ones, instead of the converse. * doc/bison.texi (C++ Parser Interface): Be more extensive about token_kind_type. 2020-04-16 Akim Demaille <akim.demaille@gmail.com> doc: updates for 3.6 * doc/bison.texi: More s/token type/token kind/. * NEWS: Update. 2020-04-16 Akim Demaille <akim.demaille@gmail.com> skeletons: use symbol(-2, kind) Not all the symbols have a fixed symbol code. UNDEF's one is fixed: -2. * data/skeletons/glr.c, data/skeletons/lalr1.cc, data/skeletons/lalr1.d, * data/skeletons/yacc.c: here. 2020-04-16 Akim Demaille <akim.demaille@gmail.com> style: comments changes about error handling * data/skeletons/glr.c, data/skeletons/lalr1.cc, data/skeletons/lalr1.d, * data/skeletons/lalr1.java, data/skeletons/yacc.c: here. * data/skeletons/lalr1.cc: Reduce scope. 2020-04-14 Akim Demaille <akim.demaille@gmail.com> examples: bistro: don't be lazy with switch * examples/c/bistromathic/parse.y (yylex): Use the switch to discriminate all the cases. 2020-04-13 Akim Demaille <akim.demaille@gmail.com> doc: spell check * doc/bison.texi, NEWS, README-hacking.md: here. And elsewhere. 2020-04-13 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-04-13 Akim Demaille <akim.demaille@gmail.com> doc: more about the coding style * README-hacking.md: here. (Troubleshooting): New. 2020-04-13 Akim Demaille <akim.demaille@gmail.com> java: promote YYEOF rather that Lexer.EOF * doc/bison.texi: here. * data/skeletons/lalr1.java: Use YYEOF. 2020-04-13 Akim Demaille <akim.demaille@gmail.com> java: fix names * data/skeletons/lalr1.java (yySymbolPrint): There are no pointers here, remove the `p` suffix. Use the appropriate type for locations. 2020-04-13 Akim Demaille <akim.demaille@gmail.com> doc: java: SymbolKind, etc. Why didn't I think about this before??? symbolName should be a method of SymbolKind. * data/skeletons/lalr1.java (YYParser::yysymbolName): Move as... * data/skeletons/java.m4 (SymbolKind::getName): this. Make the table a static final table, not a local variable. Adjust dependencies. * doc/bison.texi (Java Parser Interface): Document i18n. (Java Parser Context Interface): Document SymbolKind. * examples/java/calc/Calc.y, tests/local.at: Adjust. 2020-04-13 Akim Demaille <akim.demaille@gmail.com> style: java: get closer to the Java style * examples/java/calc/Calc.y, examples/java/simple/Calc.y: here. 2020-04-13 Akim Demaille <akim.demaille@gmail.com> doc: c++: document parser::context * doc/bison.texi (C++ Parser Context): New. * data/skeletons/lalr1.cc (parser::yysymbol_name): Rename as... (parser::symbol_name): this. (A Complete C++ Example): Promote LAC, now that we have it. Promote parse.error detailed over verbose. * examples/c++/calc++/calc++.test, tests/local.at: Adjust. 2020-04-13 Akim Demaille <akim.demaille@gmail.com> doc: promote YYEOF * NEWS (Deep overhaul of the symbol and token kinds): New. * doc/bison.texi: Promote YYEOF over "0" in scanners. (Token Decl): No longer show YYEOF here, it now works by default. (Token I18n): More details about YYEOF here. (Calc++): Just use YYEOF. 2020-04-13 Akim Demaille <akim.demaille@gmail.com> d: put YYEMPTY in the TokenKind * data/skeletons/d.m4, data/skeletons/lalr1.d (b4_token_enums): Rename YYTokenType as TokenKind. Define YYEMPTY. * examples/d/calc.y, tests/calc.at, tests/scanner.at: Adjust. 2020-04-13 Akim Demaille <akim.demaille@gmail.com> regen 2020-04-13 Akim Demaille <akim.demaille@gmail.com> c, c++: also define YYEMPTY in yytoken_kind_t I have been hesitating a lot before doing it ---after all the user must not use this kind, so what's the point of showing it in yytoken_kind_t. And eventually I chose to play it safe with the typing system and make it possible to use yytoken_kind_t for all the tokens, even the "empty token". * data/skeletons/c.m4: Give an id and a tag to YYEMPTY. (b4_token_enums): Define YYEMPTY. * data/skeletons/c++.m4 (b4_token_enums): Define YYEMPTY. * data/skeletons/glr.c, data/skeletons/glr.cc, data/skeletons/yacc.c: (YYEMPTY): Remove. Use b4_symbol(-2, id) instead. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> doc: use "code", not "number", for token (and symbol) kinds "Number" is too much about arithmethics. "Code" conveys better the "enum" nature of token kinds. And of symbol kinds. * doc/bison.texi: Here. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> doc: promote yytoken_kind_t, not yytokentype * data/skeletons/c.m4 (yytoken_kind_t): New. * data/skeletons/c++.m4, data/skeletons/lalr1.cc (yysymbol_kind_type): New. * examples/c/lexcalc/parse.y, examples/c/reccalc/parse.y, * tests/regression.at: Use them. * doc/bison.texi: Replace "enum yytokentype" by "yytoken_kind_t". (api.token.raw): Explain that it forces "yytoken_kind_t" to coincide with "yysymbol_kind_t". (Calling Convention): Mention YYEOF. (Table of Symbols): Add entries for "yytoken_kind_t" and "yysymbol_kind_t". (Glossary): Add entries for "Kind", "Token kind" and "Symbol kind". 2020-04-12 Akim Demaille <akim.demaille@gmail.com> doc: document yypcontext_t, and api.symbol.prefix * doc/bison.texi (%define Summary): Document api.symbol.prefix. (Syntax Error Reporting Function): Document yypcontext_t, yypcontext_location, yypcontext_token, yypcontext_expected_tokens, and yysymbol_kind_t. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> c: rename yyexpected_tokens as yypcontext_expected_tokens The user should think of yypcontext fields as accessible only via yypcontext_* functions. So let's rename yyexpected_tokens to reflect that. Let's _not_ rename yyreport_syntax_error, as the user may define this function, and is not allowed to access directly the fields of yypcontext_t: she *must* use the "accessors". This is comparable to the case of C++/Java where the user defines parser::report_syntax_error, not parser::context::report_syntax_error. * data/skeletons/glr.c, data/skeletons/yacc.c (yyexpected_tokens): Rename as... (yypcontext_expected_tokens): this. Adjust dependencies. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> skeletons: clarify the tag of special tokens From GRAM_EOF = 0, /* $end */ GRAM_ERRCODE = 1, /* error */ GRAM_UNDEF = 2, /* $undefined */ to GRAM_EOF = 0, /* "end of file" */ GRAM_ERRCODE = 1, /* error */ GRAM_UNDEF = 2, /* "invalid token" */ * src/output.c (symbol_tag): New. Use it to pass the token names and the symbol tags to the skeletons. * tests/input.at: Adjust. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> skeletons: use "invalid token" instead of "$undefined" * src/output.c (prepare_symbol_names): Also handle undeftoken. * tests/actions.at, tests/calc.at, tests/regression.at: Adjust. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> skeletons: make the eof token translatable if i18n is enabled * src/output.c (has_translations): New. (prepare_symbol_names): Translate endtoken if the user already translated tokens. * examples/c/bistromathic/parse.y, src/parse-gram.y: Simplify. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> skeletons: use "end of file" instead of "$end" The name "$end" is nice in the report, in particular it avoids that pointed-rules (aka items) be too long. It also helps keeping them "standard". But it is bad in error messages, we should report "end of file" (or maybe "end of input", this is debatable). So, unless the user already defined the alias for the error token herself, make it "end of file". It should even be translated if the user already translated some tokens, so that there is now no strong reason to redefine the $end token. * src/output.c (prepare_symbol_names): Issue "end of file" instead of "$end". * data/skeletons/lalr1.java (yytnamerr_): Remove the renaming hack. * build-aux/update-test: Accept files with names containing a "+", such as c++.at. * tests/actions.at, tests/c++.at, tests/conflicts.at, * tests/glr-regression.at, tests/regression.at, tests/skeletons.at: Adjust. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> diagnostics: replace "user token number" by "token code" Yet, don't change the structure identifier to avoid introducing conflicts in Vincent Imbimbo's PR (which, amusingly enough, is about conflicts). * src/symtab.c: here. * tests/diagnostics.at, tests/input.at: Adjust. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> c++: remove the yy prefix from some functions yy::parser features a parse() function, not a yyparse() one. * data/skeletons/lalr1.cc (yyreport_syntax_error) (context::yyexpected_tokens): Rename as... (report_syntax_error, context::expected_tokens): these. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> tokens: properly define the YYEOF token kind Currently EOF is handled in an adhoc way, with a #define YYEOF 0 in the implementation file. As a result, the user has to define her own EOF token if she wants to use it, which is a pity. Give the $end token a visible kind name, YYEOF. Except that in C, where enums are not scoped, we would have collisions between all the definitions of YYEOFs in the header files, so in C, make it <api.PREFIX>EOF. * data/skeletons/c.m4 (YYEOF): Override its name to avoid collisions. Unless the user already gave it a different name. * data/skeletons/glr.c (YYEOF): Remove. Use ]b4_symbol(0, [id])[ instead. Add support for "pre_epilogue", for glr.cc. * data/skeletons/glr.cc: Remove dead code (never emitted #undefs). * data/skeletons/yacc.c * src/parse-gram.c * src/reader.c * src/symtab.c * tests/actions.at * tests/input.at 2020-04-12 Akim Demaille <akim.demaille@gmail.com> tokens: define the "$undefined" token kind * data/skeletons/bison.m4 (b4_symbol_token_kind): Give a definition to $undefined. (b4_token_visible_if): $undefined has an id. * src/output.c (prepare_symbol_definitions): Stop lying: $undefined _is_ a token. * tests/input.at: Adjust. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> tokens: properly define the "error" token kind There are people out there that do use YYERRCODE (the token kind of the error token). See for instance https://github.com/borbolla-automation/SPC_Machines/blob/3812012bb782bfdfe7b325950a35cd337925fcad/unixODBC-2.3.2/Drivers/nn/yylex.c. Currently, YYERRCODE is defined by yacc.c in an adhoc way as a #define in the *.c file only. It belongs with the other token kinds. YYERRCODE is not a nice name, it does not fit in our naming scheme. YYERROR would be more logical, but it collides with the YYERROR macro. Shall we keep the same name in all the skeletons? Besides, to avoid collisions in C, we need to apply the api prefix: YYERRCODE is actually <PREFIX>ERRCODE. This is not needed in the other languages. * data/skeletons/bison.m4 (b4_symbol_token_kind): New. Map the error token to "YYERRCODE". * data/skeletons/yacc.c (YYERRCODE): Don't define it, it's handled by... * src/output.c (prepare_symbol_definitions): this. * tests/input.at (Redefining the error token): Check it. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> tokens: style: minor fixes * data/skeletons/bison.m4 (b4_symbol_kind): Dispatch on the UNDEF token number rather than its name. * data/skeletons/c++.m4, data/skeletons/c.m4, data/skeletons/java.m4: Comment changes. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> glr.cc: remove dead code * data/skeletons/glr.cc: here. 2020-04-12 Akim Demaille <akim.demaille@gmail.com> c++: fix generated headers A forthcoming commit (tokens: properly define the "error" token kind) revealed a problem in the C++ generated headers: they are not self-contained. With this file: %language "c++" %define api.value.type variant %code { static int yylex (yy::parser::semantic_type *lvalp); } %token <int> X %% exp: X { printf ("x\n"); } ; %% void yy::parser::error (const std::string& m) { std::cerr << m << '\n'; } static int yylex (yy::parser::semantic_type *lvalp) { static int const input[] = {yy::parser::token::X, 0}; static int toknum = 0; return input[toknum++]; } int main (int argc, char const* argv[]) { yy::parser p; return p.parse (); } the generated header fails to compile cleanly (foo.cc just #includes the generated header): $ clang++-mp-9.0 -c -Wundefined-func-template foo.cc In file included from foo.cc:1: bar.tab.hh:550:12: warning: instantiation of function 'yy::parser::basic_symbol<yy::parser::by_type>::basic_symbol' required here, but no definition is available [-Wundefined-func-template] struct symbol_type : basic_symbol<by_type> ^ bar.tab.hh:436:7: note: forward declaration of template entity is here basic_symbol (basic_symbol&& that); ^ bar.tab.hh:550:12: note: add an explicit instantiation declaration to suppress this warning if 'yy::parser::basic_symbol<yy::parser::by_type>::basic_symbol' is explicitly instantiated in another translation unit struct symbol_type : basic_symbol<by_type> ^ 1 warning generated. * data/skeletons/c++.m4 (b4_public_types_define): Move the implementation of the basic_symbol move-ctor to... (b4_public_types_define): here, its declaration. * tests/headers.at (Sane headers): Use a declared token so that the corresponding token constructor is declared. Which triggers the aforementioned issue. 2020-04-10 Akim Demaille <akim.demaille@gmail.com> style: rename YYNOMEM as YYENOMEM This is clearer. * data/skeletons/glr.c, data/skeletons/yacc.c (YYNOMEM): Rename as... (YYENOMEM): here. 2020-04-10 Akim Demaille <akim.demaille@gmail.com> todo: update 2020-04-10 Akim Demaille <akim.demaille@gmail.com> c++: improvements on symbol kinds Instead of /// (Internal) symbol kind. enum symbol_kind_type { YYNTOKENS = 5, ///< Number of tokens. YYSYMBOL_YYEMPTY = -2, YYSYMBOL_YYEOF = 0, // END_OF_FILE YYSYMBOL_YYERROR = 1, // error YYSYMBOL_YYUNDEF = 2, // $undefined YYSYMBOL_TEXT = 3, // TEXT YYSYMBOL_NUMBER = 4, // NUMBER YYSYMBOL_YYACCEPT = 5, // $accept YYSYMBOL_result = 6, // result YYSYMBOL_list = 7, // list YYSYMBOL_item = 8 // item }; generate /// Symbol kinds. struct symbol_kind { enum symbol_kind_type { YYNTOKENS = 5, ///< Number of tokens. S_YYEMPTY = -2, S_YYEOF = 0, // END_OF_FILE S_YYERROR = 1, // error S_YYUNDEF = 2, // $undefined S_TEXT = 3, // TEXT S_NUMBER = 4, // NUMBER S_YYACCEPT = 5, // $accept S_result = 6, // result S_list = 7, // list S_item = 8 // item }; }; * data/skeletons/c++.m4 (api.symbol.prefix): Define to S_. Adjust all the uses. (b4_public_types_declare): Nest the enum inside 'struct symbol_kind'. * data/skeletons/glr.cc, data/skeletons/lalr1.cc, * tests/headers.at, tests/local.at: Adjust. 2020-04-10 Akim Demaille <akim.demaille@gmail.com> d: improvements on symbol kinds public enum SymbolKind { S_YYEMPTY = -2, /* No symbol. */ S_YYEOF = 0, /* $end */ S_YYERROR = 1, /* error */ S_YYUNDEF = 2, /* $undefined */ S_EQ = 3, /* "=" */ * data/skeletons/d.m4 (api.symbol.prefix): Default to S_. Output the symbol kind definitions with a comment. 2020-04-10 Akim Demaille <akim.demaille@gmail.com> symbols: minor fixes * data/skeletons/bison.m4 (b4_symbol_kind): Series of _ are useless, one is enough. * data/skeletons/c.m4 (b4_token_enum): Fix overquoting. 2020-04-07 Akim Demaille <akim.demaille@gmail.com> skeletons: introduce api.symbol.prefix * data/skeletons/bison.m4 (b4_symbol_prefix): New. (b4_symbol_kind): Use it. * data/skeletons/c++.m4, data/skeletons/c.m4, data/skeletons/d.m4 * data/skeletons/java.m4 (api.symbol.prefix): Provide a default value. * data/skeletons/glr.c, data/skeletons/glr.cc, data/skeletons/lalr1.cc, * data/skeletons/lalr1.d, data/skeletons/lalr1.java, data/skeletons/yacc.c: Adjust: use b4_symbol_prefix instead of YYSYMBOL_. 2020-04-07 Akim Demaille <akim.demaille@gmail.com> java: also emit documenting comments for symbol kinds * data/skeletons/java.m4 (b4_symbol_enum): here. And stop defined YYSYMBOL_YYEMPTY, we no longer use it. 2020-04-06 Akim Demaille <akim.demaille@gmail.com> todo: update * TODO (YYERRCODE): Remove, handled by YYSYMBOL_ERROR. 2020-04-06 Akim Demaille <akim.demaille@gmail.com> skeletons: beware not to use yyarg when it's null Reported by Adrian Vogelsgesang. * data/skeletons/glr.c, data/skeletons/lalr1.cc, * data/skeletons/lalr1.java, data/skeletons/yacc.c: Here. 2020-04-06 Akim Demaille <akim.demaille@gmail.com> java: document new features * data/skeletons/lalr1.java: More comments. (Context.EMPTY): Remove. * doc/bison.texi (Java Parser Context Interface): New. 2020-04-06 Akim Demaille <akim.demaille@gmail.com> java: prefer null to YYSYMBOL_YYEMPTY That's one nice benefit from using enums. * data/skeletons/lalr1.java (YYSYMBOL_YYEMPTY): No longer define it. Use 'null' instead. * examples/java/calc/Calc.y, tests/local.at: Adjust. 2020-04-06 Akim Demaille <akim.demaille@gmail.com> java: rename Lexer.yyreportSyntaxError as reportSyntaxError * data/skeletons/lalr1.java: here. * examples/java/calc/Calc.y, tests/local.at: Adjust. 2020-04-06 Akim Demaille <akim.demaille@gmail.com> java: use getExpectedTokens, not yyexpectedTokens * data/skeletons/lalr1.java, examples/java/calc/Calc.y, tests/local.at: here. 2020-04-06 Akim Demaille <akim.demaille@gmail.com> java: style: fix coding style * data/skeletons/java.m4: Indent by two. * data/skeletons/lalr1.java (yynnts_): Remove. (yyfinal_, yyntokens_, yylast_, yyempty_): Rename as... (YYFINAL_, YYNTOKENS_, YYLAST_, YYEMPTY_): these, they are constants. 2020-04-06 Akim Demaille <akim.demaille@gmail.com> c: make the symbol kind definition nicer to read From enum yysymbol_kind_t { YYSYMBOL_YYEMPTY = -2, YYSYMBOL_YYEOF = 0, YYSYMBOL_YYERROR = 1, YYSYMBOL_YYUNDEF = 2, to enum yysymbol_kind_t { YYSYMBOL_YYEMPTY = -2, YYSYMBOL_YYEOF = 0, /* "end of file" */ YYSYMBOL_YYERROR = 1, /* error */ YYSYMBOL_YYUNDEF = 2, /* $undefined */ * data/skeletons/bison.m4 (b4_last_symbol): New. (b4_symbol_enum, b4_symbol_enums): Reformat the output. * data/skeletons/c.m4 2020-04-06 Akim Demaille <akim.demaille@gmail.com> c: make the token kind definition nicer to read From enum gram_tokentype { GRAM_EOF = 0, STRING = 3, TSTRING = 4, PERCENT_TOKEN = 5, To enum gram_tokentype { GRAM_EOF = 0, /* "end of file" */ STRING = 3, /* "string" */ TSTRING = 4, /* "translatable string" */ PERCENT_TOKEN = 5, /* "%token" */ * data/skeletons/bison.m4 (b4_last_enum_token): New. * data/skeletons/c.m4 (b4_token_enum, b4_token_enums): Show the corresponding symbol. 2020-04-06 Akim Demaille <akim.demaille@gmail.com> c: make the generated YYSTYPE nicer to read From union GRAM_STYPE { /* precedence_declarator */ assoc precedence_declarator; /* "string" */ char* STRING; /* "translatable string" */ char* TSTRING; /* "{...}" */ char* BRACED_CODE; /* "%?{...}" */ to union GRAM_STYPE { assoc precedence_declarator; /* precedence_declarator */ char* STRING; /* "string" */ char* TSTRING; /* "translatable string" */ char* BRACED_CODE; /* "{...}" */ * data/skeletons/c.m4 (b4_symbol_type_register): Use m4_format to align the comments. * src/parse-gram.h: Regen. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> regen 2020-04-05 Akim Demaille <akim.demaille@gmail.com> bison: use consistently "token kind", not "token type" * src/output.c, src/reader.c, src/scan-gram.l, src/tables.c: here. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> skeletons: use consistently "kind" instead of "type" in the code * data/skeletons/bison.m4, data/skeletons/c++.m4, data/skeletons/c.m4, * data/skeletons/glr.cc, data/skeletons/lalr1.cc, * data/skeletons/lalr1.d, data/skeletons/lalr1.java: Refer to the "kind" of a symbol, not its "type", where appropriate. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> doc: refer to the token kind rather than the token type * doc/bison.texi: Replace occurrences of "token type" with "token kind". Stop referring to the "macro definitions" of the token kinds, just name them "definitions". 2020-04-05 Akim Demaille <akim.demaille@gmail.com> m4: we don't need undef_token_number It's replaced by YYSYMBOL_YYUNDEF. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> m4: rename b4_symbol_sid as b4_symbol_kind * data/skeletons/bison.m4, data/skeletons/c++.m4, data/skeletons/c.m4, * data/skeletons/d.m4, data/skeletons/java.m4 (b4_symbol_sid): Rename as... (b4_symbol_kind): this. Adjust dependencies. * data/README.md: Document the kind. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> d, java: rename SymbolType as SymbolKind See https://lists.gnu.org/r/bison-patches/2020-04/msg00031.html. * data/skeletons/d.m4, data/skeletons/lalr1.d, * data/skeletons/java.m4, data/skeletons/lalr1.java (SymbolType): Rename as... (SymbolKind): this. Adjust dependencies. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> c, c++: rename yysymbol_type_t as yysymbol_kind_t See https://lists.gnu.org/r/bison-patches/2020-04/msg00031.html * data/skeletons/c.m4, data/skeletons/glr.c, data/skeletons/yacc.c (yysymbol_type_t): Rename as... (yysymbol_kind_t): this. Adjust dependencies. * data/skeletons/c++.m4, data/skeletons/glr.cc, data/skeletons/lalr1.cc (symbol_type_type): Rename as... (symbol_kind_type): this. Adjust dependencies. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> doc: remove obsolete release instructions * README-hacking.md: here. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> Merge branch 'maint' * maint: maint: post-release administrivia version 3.5.4 examples: reccalc: really compile cleanly in C99 news: announce that Bison 3.6 drops YYERROR_VERBOSE news: update for 3.5.4 style: fix spellos typo: succesful -> successful package: improve the readme java: check and fix support for api.token.raw java: style: prefer 'int[] foo' to 'int foo[]' build: fix syntax-check issues tests: recheck: work properly when the test suite was interrupted doc: c++: promote api.token.raw build: fix compatibility with old compilers examples: reccalc: compile cleanly in C99 2020-04-05 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> version 3.5.4 * NEWS: Record release date. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> news: update the yyreport_syntax_error example * examples/c/bistromathic/parse.y, tests/local.at (yyreport_syntax_error): Fix use of YYSYMBOL_YYEMPTY. * NEWS: Update. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> todo: update 2020-04-05 Akim Demaille <akim.demaille@gmail.com> style: rename yysyntax_error_arguments as yy_syntax_error_arguments It's a private implementation detail. * NEWS, data/skeletons/glr.c, data/skeletons/lalr1.cc, * data/skeletons/yacc.c, doc/bison.texi: here. 2020-04-05 Akim Demaille <akim.demaille@gmail.com> examples: reccalc: really compile cleanly in C99 The previous fix does not suffice, and actually managed to make things worse by defining yyscan_t twice in parse.y... Reported by kencu. https://trac.macports.org/ticket/59927#comment:29 * examples/c/reccalc/parse.y (yyscan_t): Define it with the same guards as used by Flex. 2020-04-04 Akim Demaille <akim.demaille@gmail.com> c: rename yyparse_context_t as yypcontext_t The first name is too long. We already have `yypstate`, so `yypcontext` is ok. We are also migrating to using `*_t` for our types. * NEWS, data/skeletons/glr.c, data/skeletons/yacc.c, doc/bison.texi, * examples/c/bistromathic/parse.y, src/parse-gram.y, tests/local.at: (yyparse_context_t, yyparse_context_location, yyparse_context_token): Rename as... (yypcontext_t, yypcontext_location, yypcontext_token): these. 2020-04-04 Akim Demaille <akim.demaille@gmail.com> readme: more about the coding style 2020-04-04 Akim Demaille <akim.demaille@gmail.com> java: fixes in SymbolType Reported by Paolo Bonzini. https://github.com/akimd/bison/pull/34#issuecomment-609029634 * data/skeletons/java.m4 (SymbolType): Use 'final' where possible. (get): Rewrite on top of an array instead of a switch. 2020-04-04 Akim Demaille <akim.demaille@gmail.com> java: use SymbolType The Java enums are very different from the C model. As a consequence, one cannot "build" an enum directly from an integer, we must retrieve it. That's the purpose of the SymbolType.get class method. * data/skeletons/java.m4 (b4_symbol_enum, b4_case_code_symbol) (b4_declare_symbol_enum): New. * data/skeletons/lalr1.java: Use SymbolType, SymbolType.YYSYMBOL_YYEMPTY, etc. * examples/java/calc/Calc.y, tests/local.at: Adjust. 2020-04-04 Akim Demaille <akim.demaille@gmail.com> examples: java: use explicit token identifiers * examples/java/calc/Calc.y: Declare all the tokens, so that we are compatibile with api.token.raw. * examples/java/calc/Calc.test: Adjust. 2020-04-04 Akim Demaille <akim.demaille@gmail.com> news: announce that Bison 3.6 drops YYERROR_VERBOSE * NEWS: here. 2020-04-04 Akim Demaille <akim.demaille@gmail.com> news: update for 3.5.4 2020-04-04 Akim Demaille <akim.demaille@gmail.com> style: fix spellos * src/complain.c, src/print.c, src/print-xml.c, src/symtab.h: here. 2020-04-04 Adrian Vogelsgesang <avogelsgesang@tableau.com> typo: succesful -> successful * tests/calc.at: Here. 2020-04-04 Akim Demaille <akim.demaille@gmail.com> package: improve the readme * README: Describe what Bison is. 2020-04-04 Akim Demaille <akim.demaille@gmail.com> java: check and fix support for api.token.raw * tests/local.at (AT_LANG_MATCH, AT_YYERROR_DECLARE(java)) (AT_YYERROR_DECLARE_EXTERN(java), AT_PARSER_CLASS): New. (AT_MAIN_DEFINE(java)): Use AT_PARSER_CLASS. * tests/scanner.at: Add a test for Java. * data/skeletons/lalr1.java (yytranslate_): Cast the result. 2020-04-04 Akim Demaille <akim.demaille@gmail.com> d: use the SymbolType enum for symbol kinds * data/skeletons/d.m4 (b4_symbol_enum, b4_declare_symbol_enum): New. * data/skeletons/lalr1.d: Use them. Use SymbolType, SymbolType.YYSYMBOL_YYEMPTY etc. where appropriate. (undef_token_, token_number_type, yy_error_token_): Remove. 2020-04-04 Akim Demaille <akim.demaille@gmail.com> java: style: prefer 'int[] foo' to 'int foo[]' * data/skeletons/java.m4 (b4_typed_parser_table_define): Here. 2020-04-04 Akim Demaille <akim.demaille@gmail.com> build: fix syntax-check issues * src/system.h, tests/local.mk: Fix indentation. 2020-04-02 Akim Demaille <akim.demaille@gmail.com> tests: recheck: work properly when the test suite was interrupted * tests/local.mk (recheck): Look at the per-test logs, not the overall log, which, when interrupted, contains only information about... the tests that passed. 2020-04-02 Akim Demaille <akim.demaille@gmail.com> doc: c++: promote api.token.raw * doc/bison.texi (Calc++ Parser): Here. 2020-04-02 Akim Demaille <akim.demaille@gmail.com> build: fix compatibility with old compilers GCC 4.2 dies with src/InadequacyList.c: In function 'InadequacyList__new_conflict': src/InadequacyList.c:37: error: #pragma GCC diagnostic not allowed inside functions src/InadequacyList.c:37: error: #pragma GCC diagnostic not allowed inside functions src/InadequacyList.c:40: error: #pragma GCC diagnostic not allowed inside functions Reported by Evan Lavelle. See https://lists.gnu.org/r/bug-bison/2020-03/msg00021.html and https://trac.macports.org/ticket/59927. * src/system.h (GCC_VERSION): New. Use it to control IGNORE_TYPE_LIMITS_BEGIN and IGNORE_TYPE_LIMITS_END. 2020-04-02 Akim Demaille <akim.demaille@gmail.com> examples: reccalc: compile cleanly in C99 See https://trac.macports.org/ticket/59927. * examples/c/reccalc/parse.y: C99 does not allow multiple typedefs. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> c++: replace symbol_number_type with symbol_type_type * data/skeletons/c++.m4, data/skeletons/glr.cc, * data/skeletons/lalr1.cc: here. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> c++: also use symbol_type_type Because of the insane current implementation of glr.cc, things are a bit nasty. We will rename symbol_number_type as symbol_type_type later, to keep this commit small. * data/skeletons/c++.m4 (b4_declare_symbol_enum): New. Also define YYNTOKENS to avoid type clashes when yyntokens_ was actually defined in another enum. Use it. (symbol_number_type): Be an alias of symbol_type_type. Use YYSYMBOL_YYEMPTY and the like. Use symbol_number_type where appropriate. (empty_symbol): Remove. (yytranslate_): Use symbol_number_type, not token_number_type. * data/skeletons/lalr1.cc: Use symbol_number_type where appropriate. Adjust to the replacement of empty_symbol by YYSYMBOL_YYEMPTY. (yy_error_token_, yy_undef_token_, yyeof_, yyntokens_): Remove. Adjust dependencies. * data/skeletons/glr.cc: Use symbol_number_type where appropriate. Forward definitions of YYSYMBOL_YYEMPTY, etc. to glr.c. * tests/headers.at: Accept YYNTOKENS and other YYSYMBOL_*. * tests/local.at (AT_YYERROR_DEFINE(c++)): Use symbol_number_type. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> glr.c: remove the yySymbol alias * data/skeletons/glr.c: Use yysymbol_type_t only. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> regen 2020-04-01 Akim Demaille <akim.demaille@gmail.com> glr.c, yacc.c: propagate yysymbol_type_t Now that yacc.c and glr.c both know yysymbol_type_t, convert the common routines. * data/skeletons/c.m4 (yydestruct, yy_symbol_value_print) (yy_symbol_print): Use yysymbol_type_t instead of int. * data/skeletons/glr.c: Use yySymbol where appropriate. * data/skeletons/yacc.c (YY_ACCESSING_SYMBOL): New wrapper around yystos. Use it. * tests/local.at (yyreport_syntax_error): Use yysymbol_type_t where appropriate. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> glr.c: use yysymbol_type_t, YYSYMBOL_YYEOF etc. Apply the same changes as in yacc.c. Now yySymbol and yysymbol_type_t are aliases. We will remove the former later, to avoid cluttering this commit. * data/skeletons/glr.c: Use b4_declare_symbol_enum. Use YYSYMBOL_YYEOF etc. where appropriate. (YYUNDEFTOK, YYTERROR): Remove. (YYTRANSLATE, yySymbol, yyexpected_tokens, yysyntax_error_arguments): Adjust. (yy_accessing_symbol): New. Use it where appropriate. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> regen 2020-04-01 Akim Demaille <akim.demaille@gmail.com> yacc.c: fix more errors from make maintainer-check-g++ * data/skeletons/yacc.c (yyexpected_tokens): Use casts where needed. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> regen 2020-04-01 Akim Demaille <akim.demaille@gmail.com> yacc.c: revert to not using yysymbol_type_t in the yytranslate table This triggers warnings with several compilers. For instance ICC fills the logs with pages and pages of input.c(477): error: a value of type "int" cannot be used to initialize an entity of type "const yysymbol_type_t={yysymbol_type_t}" 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, ^ input.c(477): error: a value of type "int" cannot be used to initialize an entity of type "const yysymbol_type_t={yysymbol_type_t}" 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, ^ And so does G++9 when compiling yacc.c's (C) output input.c:545:8: error: invalid conversion from 'int' to 'yysymbol_type_t' [-fpermissive] 545 | 0, 5, 9, 2, 2, 2, 2, 2, 2, 2, | ^ | | | int input.c:545:15: error: invalid conversion from 'int' to 'yysymbol_type_t' [-fpermissive] 545 | 0, 5, 9, 2, 2, 2, 2, 2, 2, 2, | ^ | | | int Clang++ is no exception input.c:545:8: error: cannot initialize an array element of type 'const yysymbol_type_t' with an rvalue of type 'int' 0, 5, 9, 2, 2, 2, 2, 2, 2, 2, ^ input.c:545:15: error: cannot initialize an array element of type 'const yysymbol_type_t' with an rvalue of type 'int' 0, 5, 9, 2, 2, 2, 2, 2, 2, 2, ^ At some point we could use yysymbol_type_t's enumerators to define yytranslate. Meanwhile... * data/skeletons/yacc.c (yytranslate): Use the original integral type to define it. (YYTRANSLATE): Cast the result into yysymbol_type_t. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> regen 2020-04-01 Akim Demaille <akim.demaille@gmail.com> yysymbol_type_t: always assign an enumerator Currently we define enumerators only for symbols that have an identifier. That rules out tokens such as '+', and nonterminals such as foo-bar and foo.bar. As a consequence we are taking chances: the compiler might compile yysymbol_type_t as too small an integral type for some symbol codes. * data/skeletons/bison.m4 (b4_symbol_sid): Forge a unique symbol identifier for symbols that don't have an ID. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> bistromathic: use symbol numbers instead of YYTRANSLATE * examples/c/bistromathic/parse.y: here. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> regen 2020-04-01 Akim Demaille <akim.demaille@gmail.com> yacc.c: prefer YYSYMBOL_YYERROR to YYSYMBOL_error * data/skeletons/bison.m4 (b4_symbol_sid): Map "error" to YYSYMBOL_YYERROR. * data/skeletons/yacc.c: Adjust. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> regen 2020-04-01 Akim Demaille <akim.demaille@gmail.com> yacc.c: also define a symbol number for the empty token This is not only cleaner, it also protects us from mixing signed values (YYEMPTY is #defined as -2) with unsigned types (the yysymbol_type_t enum is typically compiled as a small unsigned). For instance GCC 9: input.c: In function 'yyparse': input.c:1107:7: error: conversion to 'unsigned int' from 'int' may change the sign of the result [-Werror=sign-conversion] 1107 | yyn += yytoken; | ^~ input.c:1107:10: error: conversion to 'int' from 'unsigned int' may change the sign of the result [-Werror=sign-conversion] 1107 | yyn += yytoken; | ^~~~~~~ input.c:1108:47: error: comparison of integer expressions of different signedness: 'yytype_int8' {aka 'const signed char'} and 'yysymbol_type_t' {aka 'enum yysymbol_type_t'} [-Werror=sign-compare] 1108 | if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken) | ^~ input.c:702:25: error: operand of ?: changes signedness from 'int' to 'unsigned int' due to unsignedness of other operand [-Werror=sign-compare] 702 | #define YYEMPTY (-2) | ^~~~ input.c:1220:33: note: in expansion of macro 'YYEMPTY' 1220 | yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); | ^~~~~~~ input.c:1220:41: error: unsigned conversion from 'int' to 'unsigned int' changes value from '-2' to '4294967294' [-Werror=sign-conversion] 1220 | yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar); | ^ Eventually, it might be interesting to move away from -2 (which is the only possible negative symbol number) and use the next available number, to save bits. We could actually even simply use "0" and shift the rest, which would allow to write "!yytoken" to mean really "yytoken != YYEMPTY". * data/skeletons/c.m4 (b4_declare_symbol_enum): Define YYSYMBOL_YYEMPTY. * data/skeletons/yacc.c: Use it. * src/parse-gram.y (yyreport_syntax_error): Use YYSYMBOL_YYEMPTY, not YYEMPTY, when dealing with a symbol. * tests/regression.at: Adjust. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> yacc.c: use yysymbol_type_t instead of int for yytoken Now that we have a proper type for internal symbol numbers, let's use it. More code needs conversion, e.g., printers and destructors, but they are shared with glr.c, which is not ready yet for this change. It will also help us deal with warnings such as (GCC9 on GNU/Linux): input.c: In function 'int yyparse()': input.c:475:37: error: enumeral and non-enumeral type in conditional expression [-Werror=extra] 475 | (0 <= (YYX) && (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYSYMBOL_YYUNDEF) | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ input.c:1024:17: note: in expansion of macro 'YYTRANSLATE' 1024 | yytoken = YYTRANSLATE (yychar); | ^~~~~~~~~~~ * data/skeletons/yacc.c (yytranslate, yysymbol_name) (yyparse_context_t, yyexpected_tokens, yypstate_expected_tokens) (yysyntax_error_arguments): Use yysymbol_type_t instead of int. 2020-04-01 Akim Demaille <akim.demaille@gmail.com> regen 2020-04-01 Akim Demaille <akim.demaille@gmail.com> yacc.c: introduce an enum that defines the symbol's number There's a number of advantage in exposing the symbol (internal) numbers: - custom error messages can use them to decide how to represent a given symbol, or a set of symbols. - we need something similar in uses of yyexpected_tokens. For instance, currently, bistromathic's completion() reads: int ntokens = expected_tokens (line, tokens, YYNTOKENS); [...] for (int i = 0; i < ntokens; ++i) if (tokens[i] == YYTRANSLATE (TOK_VAR)) [...] else if (tokens[i] == YYTRANSLATE (TOK_FUN)) [...] else [...] - now that it's a compile-time expression, we can easily build static tables, switch, etc. - some users depended on the ability to get the token number from a symbol to write test cases for their scanners. But Bison 3.5 removed the table this feature depended upon (a reverse yytranslate). Now they can check against the actual symbol number, without having pay (space and time) a conversion. See https://lists.gnu.org/r/bug-bison/2020-01/msg00001.html, and https://lists.gnu.org/archive/html/bug-bison/2020-03/msg00015.html. - it helps us clearly separate the internal symbol numbers from the external token numbers, whose difference is sometimes blurred in the code when values coincide (e.g. "yychar = yytoken = YYEOF"). - it allows us to get rid of ugly macros with inconsistent names such as YYUNDEFTOK and YYTERROR, and to group related definitions together. - similarly it provides a clean access to the $accept symbol (which proves convenient in a current experimentation of mine with several %start symbols). Let's declare this type as a private type (in the *.c file, not the *.h one). So it does not need to be influenced by the api prefix. * data/skeletons/bison.m4 (b4_symbol_sid): New. (b4_symbol): Use it. * data/skeletons/c.m4 (b4_symbol_enum, b4_declare_symbol_enum): New. * data/skeletons/yacc.c: Use b4_declare_symbol_enum. (YYUNDEFTOK, YYTERROR): Remove. Use the corresponding symbol enum instead. 2020-03-30 Akim Demaille <akim.demaille@gmail.com> style: comment changes about token numbers * data/skeletons/bison.m4, data/skeletons/c.m4: here. 2020-03-30 Akim Demaille <akim.demaille@gmail.com> tests: recheck: work properly when the test suite was interrupted * tests/local.mk (recheck): Look at the per-test logs, not the overall log, which, when interrupted, contains only information about... the tests that passed. 2020-03-30 Akim Demaille <akim.demaille@gmail.com> java: move away from _ for internationalization The "_" is becoming a keyword in Java, which causes tons of warnings currently in our test suite. GNU Gettext is now using "i18n" instead of "_" (https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff;h=e89fea36545f27487d9652a13e6a0adbea1117d0). * data/skeletons/java.m4: Use "i18n", not "_". * examples/java/calc/Calc.y, tests/calc.at: Adjust. 2020-03-28 Akim Demaille <akim.demaille@gmail.com> regen 2020-03-28 Akim Demaille <akim.demaille@gmail.com> c: use YYNOMEM instead of -2 See 84b1972c96060866b4bd94a33b97711f8f7d0b6c. * data/skeletons/glr.c, data/skeletons/yacc.c (YYNOMEM): New. Use it. 2020-03-28 Akim Demaille <akim.demaille@gmail.com> todo: update * TODO (Token Number): We have to clean this. (Naming conventions, Symbol numbers): New. (Bad styling): Addressed in e21ff47f5d0b64da693a47b7dd200a1a44a5bbeb. 2020-03-28 Akim Demaille <akim.demaille@gmail.com> regen 2020-03-28 Akim Demaille <akim.demaille@gmail.com> java: make yysyntaxErrorArguments a private detail * data/skeletons/lalr1.java (yysyntaxErrorArguments): Move it from the context, to the parser object. Generate only for detailed and verbose error messages. * tests/local.at (AT_YYERROR_DEFINE(java)): Use yyexpectedTokens instead. 2020-03-28 Akim Demaille <akim.demaille@gmail.com> skeletons: make yysyntax_error_arguments a private detail We could just "inline yysyntax_error_arguments back" in the routines it was originally extracted from, but I think the code is nicer to read this way. * data/skeletons/glr.c (yysyntax_error_arguments): Generate only for detailed and verbose error messages. * data/skeletons/yacc.c: Likewise. * data/skeletons/lalr1.cc (parser::context::yysyntax_error_arguments): Move as... (parser::yysyntax_error_arguments_): this. And only for detailed and verbose error messages. 2020-03-28 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: avoid using yysyntax_error_arguments * data/skeletons/lalr1.cc (context::token): New. * tests/local.at (yyreport_syntax_error): Don't use yysyntax_error_arguments. 2020-03-28 Akim Demaille <akim.demaille@gmail.com> bison: avoid using yysyntax_error_arguments * src/parse-gram.y (yyreport_syntax_error): Use yyparse_context_token and yyexpected_tokens. 2020-03-28 Akim Demaille <akim.demaille@gmail.com> tests: yacc.c: avoid yysyntax_error_arguments Because glr.c shares the same testing routines, we also need to convert it. * data/skeletons/glr.c (yyparse_context_token): New. * tests/local.at (yyreport_syntax_error): here. 2020-03-28 Akim Demaille <akim.demaille@gmail.com> examples: don't use yysyntax_error_arguments Suggested by Adrian Vogelsgesang. https://lists.gnu.org/archive/html/bison-patches/2020-02/msg00069.html * data/skeletons/lalr1.java (Context.EMPTY, Context.getToken): New. (Context.yyntokens): Rename as... (Context.NTOKENS): this. Because (i) all the Java coding styles recommend upper case for constants, and (ii) the Java Skeleton exposes Lexer.EOF, not Lexer.YYEOF. * data/skeletons/yacc.c (yyparse_context_token): New. * examples/c/bistromathic/parse.y (yyreport_syntax_error): Don't use yysyntax_error_arguments. * examples/java/calc/Calc.y (yyreportSyntaxError): Likewise. 2020-03-28 Akim Demaille <akim.demaille@gmail.com> skeletons: fix incorrect type for translatable tokens * data/skeletons/glr.c, data/skeletons/lalr1.c, data/skeletons/yacc.c: Fix confusion between the "translatable" and the "translate" tables. 2020-03-23 Akim Demaille <akim.demaille@gmail.com> yacc.c: use negative numbers for errors in auxiliary functions yyparse returns 0, 1, 2 since ages (accept, reject, memory exhausted). Some of our auxiliary functions such as yy_lac and yyreport_syntax_error also need to return error codes and also use 0, 1, 2. Because it uses yy_lac, yyexpected_tokens also needs to return "problem", "memory exhausted", but in case of success, it needs to return the number of tokens, so it cannot use 1 and 2 as error code. Currently it uses -1 and -2, which is later converted into 1 and 2 as yacc.c expects it. Let's simplify this and use consistently -1 and -2 for auxiliary functions that are not exposed (or not yet exposed) to the user. In particular this will save the user from having to convert yyexpected_tokens's -2 into yyreport_syntax_error's 2: both return -1 or -2. * data/skeletons/yacc.c (yy_lac, yyreport_syntax_error) (yy_lac_stack_realloc): Return -1, -2 for errors instead of 1, 2. Adjust callers. * examples/c/bistromathic/parse.y (yyreport_syntax_error): Do take error codes into account. Issue a syntax error message even if we ran out of memory. * src/parse-gram.y, tests/local.at (yyreport_syntax_error): Adjust. 2020-03-23 Akim Demaille <akim.demaille@gmail.com> style: reduce length of private constant * data/skeletons/glr.c, data/skeletons/lalr1.cc, data/skeletons/yacc.c (YYERROR_VERBOSE_ARGS_MAXIMUM): Rename as... (YYARGS_MAX): this. * src/parse-gram.y (YYERROR_VERBOSE_ARGS_MAXIMUM): Rename as... (ARGS_MAX): this. 2020-03-23 Akim Demaille <akim.demaille@gmail.com> doc: c++: promote api.token.raw * doc/bison.texi (Calc++ Parser): Here. 2020-03-22 Akim Demaille <akim.demaille@gmail.com> bench: calc: no need for super long inputs * etc/bench.pl.in ($iterations): Restore initial value, -1, meaning "at least one second". ($calc_input): There is no need to generate 400 lines. 2020-03-22 Akim Demaille <akim.demaille@gmail.com> bench: calc: work on a string instead of a file The cost of the file layer is large and makes benchmarks too coarse, as seen for in following example, first with a file, then with a literal string: 0. %skeleton "yacc.c" %define parse.lac full 1. %skeleton "yacc-v1.c" %define nofinal %define parse.lac full 2. %skeleton "yacc-v2.c" %define nofinal %define parse.lac full 3. %skeleton "yacc-v3.c" %define nofinal %define parse.lac full 4. %skeleton "yacc.c" 5. %skeleton "yacc-v1.c" %define nofinal 6. %skeleton "yacc-v2.c" %define nofinal 7. %skeleton "yacc-v3.c" %define nofinal -------------------------------------------------- Benchmark Time CPU Iterations -------------------------------------------------- BM_y0 32558 ns 32537 ns 21228 BM_y1 32400 ns 32369 ns 21233 BM_y2 33485 ns 33464 ns 20625 BM_y3 32139 ns 32125 ns 21446 BM_y4 31343 ns 31329 ns 21747 BM_y5 31344 ns 31317 ns 22035 BM_y6 31287 ns 31255 ns 22039 BM_y7 31387 ns 31373 ns 22178 -------------------------------------------------- Benchmark Time CPU Iterations -------------------------------------------------- BM_y0 10642 ns 10634 ns 63601 BM_y1 10657 ns 10654 ns 63625 BM_y2 10441 ns 10432 ns 65957 BM_y3 10558 ns 10554 ns 64546 BM_y4 9521 ns 9516 ns 72011 BM_y5 9179 ns 9157 ns 75028 BM_y6 9360 ns 9356 ns 73770 BM_y7 9365 ns 9359 ns 72609 Of course, at the same time it is less realistic: most users read files rather that strings, so it might lead to us to pay attention to costs most people don't see. * etc/bench.pl.in (&calc_input): Output into a file given as argument. Output in C syntax. (&generate_grammar_calc): Use it. Simplify the grammar: remove operators we don't care about. Rewrite the scanner to work on a char* instead of a FILE*. 2020-03-22 Akim Demaille <akim.demaille@gmail.com> bench: add a "latest" symlink * etc/bench.pl.in: here. 2020-03-22 Akim Demaille <akim.demaille@gmail.com> bench: use the same prefix in both bench methods * etc/bench.pl.in (&bench_with_timethese): Also use y$i, as in &bench_with_gbenchmark. (&generate_grammar_calc): Don't add a prefix, let the callers do it. 2020-03-22 Akim Demaille <akim.demaille@gmail.com> bench: use a C++-11 compiler See https://github.com/google/benchmark#a-faster-keeprunning-loop. * etc/bench.pl.in ($cxx): Be C++11. (&bench_with_gbenchmark): Adjust. 2020-03-22 Akim Demaille <akim.demaille@gmail.com> bench: create a README file with benches * etc/bench.pl.in (&bench_with_gbenchmark): Here. 2020-03-21 Akim Demaille <akim.demaille@gmail.com> bench: calc: add support for google benchmark * etc/bench.pl.in (&compiler): New, extracted from... (&compile): here. Don't link when using gbm. (&calc_input): Don't make massive input for micro benchmarks. (&generate_grammar_calc): When using gbm, use api.prefix to avoid name collisions. Be ready to issue BENCHMARKS instead of a main. (&bench): Rename as... (&bench_with_timethese): this. (&bench_with_gbenchmark): New. (&bench): New. Dispatch on these two. 2020-03-21 Akim Demaille <akim.demaille@gmail.com> bench: better error messages on invalid input * etc/bench.pl.in: here. 2020-03-21 Akim Demaille <akim.demaille@gmail.com> bench: simplify the calc grammar * etc/bench.pl.in (generate_grammar_calc): We don't need global_result etc. 2020-03-21 Akim Demaille <akim.demaille@gmail.com> bench: die clearly on incorrect --grammar arguments * etc/bench.pl.in (getopt): here. 2020-03-17 Akim Demaille <akim.demaille@gmail.com> regen 2020-03-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: style: prefer switch to if * data/skeletons/yacc.c: Prefer switch to decode yy_lac's return value. 2020-03-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: yypstate_expected_tokens In push parsers, when asking for the list of expected tokens at some point, it makes no sense to build a yyparse_context_t: the yypstate alone suffices (the only difference being the lookahead). Instead of forcing the user to build a useless shell around yypstate, let's offer yypstate_expected_tokens. See https://lists.gnu.org/r/bison-patches/2020-03/msg00025.html. * data/skeletons/yacc.c (yypstate): Declare earlier, so that we can use it for... (yypstate_expected_tokens): this new function, when in push parsers. Adjust dependencies. * examples/c/bistromathic/parse.y: Simplify: use yypstate_expected_tokens. Style fixes. Reduce scopes (reported by Joel E. Denny). 2020-03-09 Akim Demaille <akim.demaille@gmail.com> examples: bistromathic: simplify * examples/c/bistromathic/parse.y (expected_tokens): Remove useless "break". 2020-03-08 Akim Demaille <akim.demaille@gmail.com> merge branch 'maint' * upstream/maint: maint: post-release administrivia version 3.5.3 news: update for 3.5.3 yacc.c: make sure we properly propagated the user's number for error diagnostics: don't crash because of repeated definitions of error style: initialize some struct members diagnostics: beware of zero-width characters diagnostics: be sure to close the styling when lines are too short muscles: fix incorrect decoding of $ code: be robust to reference with invalid tags build: fix typo doc: update recommandation for libtextstyle style: comment changes examples: use consistently the GFDL header for readmes style: remove useless declarations typo: succesful -> successful README: point to tests/bison, and document --trace gnulib: update maint: post-release administrivia 2020-03-08 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-03-08 Akim Demaille <akim.demaille@gmail.com> version 3.5.3 * NEWS: Record release date. 2020-03-08 Akim Demaille <akim.demaille@gmail.com> news: update for 3.5.3 2020-03-08 Akim Demaille <akim.demaille@gmail.com> yacc.c: make sure we properly propagated the user's number for error * data/skeletons/yacc.c (YYERRCODE): Be truthful. * tests/input.at (Redefining the error token): Check that. 2020-03-08 Akim Demaille <akim.demaille@gmail.com> diagnostics: don't crash because of repeated definitions of error According to https://www.unix.com/man-page/POSIX/1posix/yacc/, the user is allowed to specify her user number for the error token: The token error shall be reserved for error handling. The name error can be used in grammar rules. It indicates places where the parser can recover from a syntax error. The default value of error shall be 256. Its value can be changed using a %token declaration. The lexical analyzer should not return the value of error. I think this feature is useless, the user should not have to deal with that. The intend is probably to give the user a means to use 256 if she wants to, but provided "error" cleared the path first by being assigned another number. In the case of Bison, 256 is assigned to "error" at the end if the user did not use it for a token of hers. So this feature is useless. Yet it is valid, and if the user assigns twice a token number to "error", then the second time we want to complain about it and want to show the original definition. At this point, we try to display the built-in definition of "error", whose location is NULL, and we crash. Rather, the location of the first user definition of "error" should become its defining location. Reported byg Ahcheong Lee. https://lists.gnu.org/r/bug-bison/2020-03/msg00007.html * src/symtab.c (symbol_class_set): If this is a declaration and the symbol was not declared yet, keep this as defining location. * tests/input.at (Redefining the error token): New. 2020-03-08 Akim Demaille <akim.demaille@gmail.com> style: initialize some struct members * src/symtab.c (sym_content_new): Initialize all the location members. Not needed by the code, but disturbing values when using a debugger. 2020-03-08 Akim Demaille <akim.demaille@gmail.com> diagnostics: beware of zero-width characters Currenly we rely on (visual) width of the characters to decide where to open and close the styling of the quoted lines. This breaks when we deal with zero-width characters: we cannot just rely on (visual) columns, we need to know whether we are before, inside, or after the highlighted portion. * src/location.c (location_caret): col_end: no longer add 1, "regular" characters have a width of 1, only 0-width characters have 0-width. opened: replace with 'state', a three-valued enum. Don't reopen the style if we already did. * tests/diagnostics.at (Zero-width characters): New. 2020-03-07 Akim Demaille <akim.demaille@gmail.com> diagnostics: be sure to close the styling when lines are too short bar.y:4.12-17: <error>error:</error> redefining user token number of foo - 4 | %token foo <error>123 + 4 | %token foo <error>123</error> | <error>^~~~~~</error> * src/location.c (location_caret): Be sure to close. * tests/diagnostics.at (Line is too short, and then you die): New. 2020-03-07 Akim Demaille <akim.demaille@gmail.com> muscles: fix incorrect decoding of $ Bug introduced in 458171e6df5a0110a35ee45ad8b2e9f6fb426f1d. https://lists.gnu.org/archive/html/bison-patches/2013-11/msg00009.html Reported by Ahcheong Lee. https://lists.gnu.org/r/bug-bison/2020-03/msg00010.html * src/muscle-tab.c (COMMON_DECODE): "$" is coded as "$][", not "$[][". * tests/input.at ("%define" enum variables): Check that case. 2020-03-06 Akim Demaille <akim.demaille@gmail.com> code: be robust to reference with invalid tags Because we want to support $<a->b>$, we must accept -> in type tags, and reject $<->$, as it is unfinished. Reported by Ahcheong Lee. * src/scan-code.l (yylex): Make sure "tag" does not end with -, since -> does not close the tag. * tests/input.at (Stray $ or @): Check this. 2020-03-06 Akimn Demaille <akim.demaille@gmail.com> build: fix typo * build-aux/cross-options.pl: here. 2020-03-06 Akim Demaille <akim.demaille@gmail.com> doc: update recommandation for libtextstyle * README: here. 2020-03-06 Akim Demaille <akim.demaille@gmail.com> style: comment changes * src/symtab.h, src/lr0.c: here. 2020-03-06 Akim Demaille <akim.demaille@gmail.com> examples: use consistently the GFDL header for readmes * examples/c++/README.md, examples/c++/calc++/README.md, * examples/c/calc/README.md, examples/c/lexcalc/README.md, * examples/c/reccalc/README.md: Prefer the GFDL banner to the GPL one. 2020-03-06 Akim Demaille <akim.demaille@gmail.com> style: remove useless declarations * src/reader.h: Don't duplicate what parse-gram.h already exposes. * src/lr0.h: Remove useless include. 2020-03-06 Adrian Vogelsgesang <avogelsgesang@tableau.com> typo: succesful -> successful * data/skeletons/lalr1.cc: here * etc/bench.pl.in: here * src/location.c: and here. 2020-03-06 Akim Demaille <akim.demaille@gmail.com> README: point to tests/bison, and document --trace Reported by Victor Morales Cayuela. * README, README-hacking.md: here. 2020-03-06 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-03-05 Akim Demaille <akim.demaille@gmail.com> README: point to tests/bison, and document --trace Reported by Victor Morales Cayuela. * README, README-hacking.md: here. 2020-03-05 Akim Demaille <akim.demaille@gmail.com> yacc.c: simplify yyparse_context_t member names * data/skeletons/yacc.c (yyparse_context_t): Rename yyes_p and yyes_capacity_p as... (yyes, yyes_capacity): These. 2020-03-05 Akim Demaille <akim.demaille@gmail.com> yacc.c: yyerror_range does not need to be preserved accross calls * data/skeletons/yacc.c (b4_parse_state_variable_macros): Don't define yyerror_range. (yyparse): Add yyerror_range as local variable. 2020-03-05 Akim Demaille <akim.demaille@gmail.com> yacc.c: push: undefine the pstate macros for the epilogue * data/skeletons/yacc.c (b4_macro_define, b4_macro_undef) (b4_pstate_macro_define, b4_parse_state_variable_macros): New. Use them. * examples/c/bistromathic/parse.y: Remove now useless undefs. 2020-03-05 Akim Demaille <akim.demaille@gmail.com> yacc.c: push: initialize the pstate variables in pstate_new Currently pstate_new does not set up its variables, this task is left to yypush_parse. This was probably to share more code with usual pull parsers, where these (local) variables are indeed initialized by yyparse. But as a consequence yyexpected_tokens crashes at the very beginning of the parse, since, for instance, the stacks are not even set up. See https://lists.gnu.org/r/bison-patches/2020-03/msg00001.html. The fix could have very simple, but the documentation actually makes it very clear that we can reuse a pstate for several parses: After yypush_parse returns a status other than YYPUSH_MORE, the parser instance yyps may be reused for a new parse. so we need to restore the parser to its pristine state so that (i) it is ready to run the next parse, (ii) it properly supports yyexpected_tokens for the next run. * data/skeletons/yacc.c (b4_initialize_parser_state_variables): New, extracted from the top of yyparse/yypush_parse. (yypstate_clear): New. (yypstate_new): Use it when push parsers are enabled. Define after the yyps macros so that we can use the same code as the regular pull parsers. (yyparse): Use it when push parsers are _not_ enabled. * examples/c/bistromathic/bistromathic.test: Check the completion on the beginning of the line. 2020-03-04 Akim Demaille <akim.demaille@gmail.com> style: formatting changes * data/skeletons/yacc.c, tests/torture.at: here. 2020-03-04 Akim Demaille <akim.demaille@gmail.com> bistromathic: properly compute the lcp, as expected by readline Currently completion on "at" proposes only "atan", but does not actually complete "at" into "atan". * examples/c/bistromathic/parse.y (completion): Install the lcp in matches[0]. * examples/c/bistromathic/bistromathic.test: Check that case. 2020-03-04 Akim Demaille <akim.demaille@gmail.com> bistromathic: don't require spaces after operators for completion Currently "(1+<TAB>" does not work as expected, because "+" is not a word breaking character. * examples/c/bistromathic/parse.y (init_readline): Specify our word breaking characters. * examples/c/bistromathic/bistromathic.test: Avoid trailing spaces. 2020-03-02 Akim Demaille <akim.demaille@gmail.com> bistromathic: check completion * examples/c/bistromathic/bistromathic.test: here. * examples/c/bistromathic/parse.y (expected_tokens): Fix a memory leak. 2020-03-02 Akim Demaille <akim.demaille@gmail.com> m4: remove b4_function_define and b4_function_declare * data/skeletons/c.m4: here. 2020-03-02 Akim Demaille <akim.demaille@gmail.com> m4: decommission b4_function_declare * data/skeletons/glr.c, data/skeletons/glr.cc, data/skeletons/yacc.c: Stop using b4_function_declare. 2020-03-02 Akim Demaille <akim.demaille@gmail.com> m4: decommission function generating macro These macros have been extremely useful when we had to support K&R C, which we dropped long ago. Now, they merely make the code uselessly hard to read. * data/skeletons/c.m4, data/skeletons/glr.c, data/skeletons/glr.cc, * data/skeletons/yacc.c: Stop using b4_function_define. 2020-03-01 Akim Demaille <akim.demaille@gmail.com> examples: bistromathic: demonstrate the use of yyexpected_tokens Let's use GNU readline and its TAB autocompletion to demonstrate the use of yyexpected_tokens. This shows a number of weaknesses in our current approach: - some macros (yyssp, etc.) from push parsers "leak" in user code, we need to undefine them - the context needed by yyexpected_tokens does not need the token, yypstate actually suffices - yypstate is not properly setup when first allocated, which results in a crash of yyexpected_tokens if fired before a first token was read. We should move initialization from yypush_parse into yypstate_new. * examples/c/bistromathic/parse.y (yylex): Take input as a string, not a file. (EXIT): New token. (input): Adjust to work only on a line. (line): Remove. (symbol_count, process_line, expected_tokens, completion) (init_readline): New. * examples/c/bistromathic/bistromathic.test: Adjust expectations. 2020-03-01 Akim Demaille <akim.demaille@gmail.com> examples: use consistently the GFDL header for readmes * examples/c++/README.md, examples/c++/calc++/README.md, * examples/c/calc/README.md, examples/c/lexcalc/README.md, * examples/c/pushcalc/README.md, examples/c/reccalc/README.md: Prefer the GFDL banner to the GPL one. 2020-03-01 Akim Demaille <akim.demaille@gmail.com> gnulib: use readline 2020-02-29 Akim Demaille <akim.demaille@gmail.com> examples: bistromathic: don't use Flex This example will soon use GNU readline, so its scanner should be easy to use (concurrently) on strings, not streams. This is not a place where Flex shines, and anyway, these are examples of Bison, not Flex. There's already lexcalc and reccalc that demonstrate the use of Flex. * examples/c/bistromathic/scan.l: Remove. * examples/c/bistromathic/parse.y (yylex): New. Adjust dependencies. 2020-02-29 Akim Demaille <akim.demaille@gmail.com> examples: bistromathic: strengthen tests * examples/c/bistromathic/bistromathic.test: here. * examples/test: Be clearer on failing tests. 2020-02-29 Akim Demaille <akim.demaille@gmail.com> examples: lexcalc: demonstrate location tracking The bistromathic example should not use Flex, it makes it too complex. But it was the only example to show location tracking with Flex. * examples/c/lexcalc/lexcalc.test, examples/c/lexcalc/parse.y, * examples/c/lexcalc/scan.l: Demonstrate location tracking as is done in bistromathic. 2020-02-27 Akim Demaille <akim.demaille@gmail.com> c++: don't copy the lookahead The current implementation of parser::context keeps a copy of the lookahead. This is troublesome since we support move-only types. Besides, while GCC is happy with the current implementation, Clang complains that the ctor it needs to build the copy of the lookahead is not yet available. 461. calc.at:1120: testing Calculator C++ %defines %locations parse.error=verbose %name-prefix "calc" %verbose ... calc.at:1120: COLUMNS=1000; export COLUMNS; bison --color=no -fno-caret -Wno-deprecated -o calc.cc calc.y calc.at:1120: $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -o calc calc.cc calc-lex.cc calc-main.cc $LIBS stderr: In file included from calc-lex.cc:7: calc.hh:351:12: error: instantiation of function 'calc::parser::basic_symbol<calc::parser::by_type>::basic_symbol' required here, but no definition is available [-Werror,-Wundefined-func-template] struct symbol_type : basic_symbol<by_type> ^ calc.hh:273:7: note: forward declaration of template entity is here basic_symbol (const basic_symbol& that); ^ calc.hh:351:12: note: add an explicit instantiation declaration to suppress this warning if 'calc::parser::basic_symbol<calc::parser::by_type>::basic_symbol' is explicitly instantiated in another translation unit struct symbol_type : basic_symbol<by_type> ^ 1 error generated. In file included from calc-main.cc:7: calc.hh:351:12: error: instantiation of function 'calc::parser::basic_symbol<calc::parser::by_type>::basic_symbol' required here, but no definition is available [-Werror,-Wundefined-func-template] struct symbol_type : basic_symbol<by_type> ^ calc.hh:273:7: note: forward declaration of template entity is here basic_symbol (const basic_symbol& that); ^ calc.hh:351:12: note: add an explicit instantiation declaration to suppress this warning if 'calc::parser::basic_symbol<calc::parser::by_type>::basic_symbol' is explicitly instantiated in another translation unit struct symbol_type : basic_symbol<by_type> ^ 1 error generated. stdout: calc.at:1120: exit code was 1, expected 0 461. calc.at:1120: 461. Calculator C++ %defines %locations parse.error=verbose %name-prefix "calc" %verbose (calc.at:1120): FAILED (calc.at:1120) * data/skeletons/lalr1.cc (context::yyla_): Make it a const-ref. Move the implementation out of the declaration. 2020-02-27 Akim Demaille <akim.demaille@gmail.com> c++: minor fixes Address compiler warnings such as warning: declaration of 'yyla' shadows a member of 'yy::parser::context' [-Wshadow] * data/skeletons/lalr1.cc (context): Don't use the same names for variables and members. Use foo_ for private members, as in parser. Also, use the + trick in array accesses to please ICC and provide it with an int. 2020-02-27 Adrian Vogelsgesang <avogelsgesang@tableau.com> c++: add support for parse.error=custom * data/skeletons/lalr1.cc: added support here * tests/calc.at: added test cases * tests/local.at: added yyreport_syntax_error implementation for C++ test cases 2020-02-27 Adrian Vogelsgesang <avogelsgesang@tableau.com> c++: add parser::context for syntax error handling * data/skeletons/lalr1.cc: here 2020-02-27 Adrian Vogelsgesang <avogelsgesang@tableau.com> c++: add support for parse.error=detailed * data/skeletons/lalr1.cc: added support here * tests/calc.at: added a test case 2020-02-27 Adrian Vogelsgesang <avogelsgesang@tableau.com> skeletons: prefer b4_parse_error_{case,bmatch} over manual solution Prefer b4_parse_error_case over the adhoc solution `m4_case + b4_percent_define_get`. Same for b4_parse_error_bmatch. * data/skeletons/glr.c: here * data/skeletons/yacc.c: here 2020-02-27 Adrian Vogelsgesang <avogelsgesang@tableau.com> typo: succesful -> successful * data/skeletons/lalr1.cc: here * etc/bench.pl.in: here * src/location.c: here * tests/calc.at: and here 2020-02-24 Akim Demaille <akim.demaille@gmail.com> bench.pl: clean up the dust * etc/bench.pl.in: Adjust to the current use of %define's values. Don't use %error-verbose. Prefer Bison to CPP (e.g., api.value.type). Avoid returning characters directly, so that %define api.token.raw works. 2020-02-23 Akim Demaille <akim.demaille@gmail.com> style: comment changes * src/symtab.h, src/lr0.c: here. 2020-02-23 Akim Demaille <akim.demaille@gmail.com> style: avoid using 'this' as an identifier LLDB insists on parsing 'this' as a C++ keyword, even when debugging a C program. * src/symtab.c: Please the dictator. 2020-02-23 Akim Demaille <akim.demaille@gmail.com> style: remove useless declarations * src/reader.h: Don't duplicate what parse-gram.h already exposes. * src/lr0.h: Remove useless include. 2020-02-19 Akim Demaille <akim.demaille@gmail.com> examples: fix c/calc * examples/c/calc/calc.y: Remove experiment traces. 2020-02-19 Akim Demaille <akim.demaille@gmail.com> todo: update 2020-02-15 Akim Demaille <akim.demaille@gmail.com> doc: update recommandation for libtextstyle * README: here. 2020-02-15 Akimn Demaille <akim.demaille@gmail.com> build: fix typo * build-aux/cross-options.pl: here. 2020-02-15 Akim Demaille <akim.demaille@gmail.com> doc: simplify the cross references * doc/bison.texi: here. 2020-02-15 Akim Demaille <akim.demaille@gmail.com> doc: document token internationalization * doc/bison.texi (Parser Internationalization): Move most of its content into... (Enabling I18n): this new node. (Token I18n): New. (Token Decl): Refer to token internationalization. (Error Reporting Function): Promote parse.error detailed. 2020-02-15 Akim Demaille <akim.demaille@gmail.com> regen 2020-02-15 Victor Morales Cayuela <victor.morales_cayuela@nokia-sbell.com> diagnostics: modernize the display of submessages Since Bison 2.7, output was indented four spaces for explanatory statements. For example: input.y:2.7-13: error: %type redeclaration for exp input.y:1.7-11: previous declaration Since the introduction of caret-diagnostics, it became less clear. Remove the indentation and display submessages as in GCC: input.y:2.7-13: error: %type redeclaration for exp 2 | %type <float> exp | ^~~~~~~ input.y:1.7-11: note: previous declaration 1 | %type <int> exp | ^~~~~ * src/complain.h (SUB_INDENT): Remove. (warnings): Add "note" to the enum. * src/complain.h, src/complain.c (complain_indent): Replace by... (subcomplain): this. Adjust all dependencies. * tests/actions.at, tests/diagnostics.at, tests/glr-regression.at, * tests/input.at, tests/named-refs.at, tests/regression.at: Adjust expectations. 2020-02-13 Akim Demaille <akim.demaille@gmail.com> doc: simplify uses of references This reverts "doc: work around problems with PDF generation", commit d810aa3d8f76b1a4d7d402072f45a0662152ffd4. Upstream issue is fixed. https://lists.gnu.org/r/bug-texinfo/2020-02/msg00006.html * gnulib: Update. * doc/bison.texi: Simplify. 2020-02-13 Akim Demaille <akim.demaille@gmail.com> java: provide a Context ctor This is really a private auxiliary inner class, so it should not matter. But it's better style. * data/skeletons/lalr1.java: here. 2020-02-13 Akim Demaille <akim.demaille@gmail.com> Merge tag 'v3.5.2' bison 3.5.2 * tag 'v3.5.2': version 3.5.2 news: 3.5.2 gnulib: update doc: update Doxygen template java: avoid trailing white spaces m4: fix b4_token_format doc: clearly state that %yacc only makes sense with yacc.c doc: spell check examples: be more robust to spaces in paths larlr1.cc: Reject unsupported values for parse.lac 2020-02-13 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-02-13 Akim Demaille <akim.demaille@gmail.com> version 3.5.2 * NEWS: Record release date. 2020-02-13 Akim Demaille <akim.demaille@gmail.com> news: 3.5.2 * NEWS: Update. 2020-02-13 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-02-13 Akim Demaille <akim.demaille@gmail.com> doc: update Doxygen template * Doxyfile.in: Run doxygen -u on it. 2020-02-13 Akim Demaille <akim.demaille@gmail.com> java: avoid trailing white spaces * data/skeletons/java.m4 (b4_maybe_throws): Issue a space before when needed. * data/skeletons/lalr1.java: Avoid trailing spaces. 2020-02-13 Akim Demaille <akim.demaille@gmail.com> m4: fix b4_token_format We used to emit: /** Token number,to be returned by the scanner. */ static final int NUM = 258; /** Token number,to be returned by the scanner. */ static final int NEG = 259; with no space after the comma. Fix that. * data/skeletons/bison.m4 (b4_token_format): Quote where appropriate. 2020-02-13 Akim Demaille <akim.demaille@gmail.com> doc: clearly state that %yacc only makes sense with yacc.c * doc/bison.texi: here. 2020-02-13 Akim Demaille <akim.demaille@gmail.com> doc: spell check * doc/bison.texi: here. 2020-02-12 Akim Demaille <akim.demaille@gmail.com> examples: bistromathic: demonstrate named references * examples/c/bistromathic/parse.y: here. 2020-02-12 Akim Demaille <akim.demaille@gmail.com> c++: simplify * data/skeletons/stack.hh (ssize): Remove, same as size. 2020-02-12 Akim Demaille <akim.demaille@gmail.com> tests: check calls to yyerror from the user actions This revealed a number of things I had not realized: - the Java location tracking was aliasing the same pair of positions for all the symbols (see previous commit). - in impure parsers, it's quite easy to use incorrect locations for diagnostics, since yyerror uses yylloc, which is the location of the lookahead, not that of the current lhs. So we need something like { YYLTYPE old_yylloc = yylloc; yylloc = @$; yyerror (]AT_PARAM_IF([result, count, nerrs, ])[buf); yylloc = old_yylloc; } Maybe we should do that little yylloc dance in the skeleton instead of leaving it to the user? It might be costly... But that's only for users of the impure parsers, which are asking for trouble anyway. - in glr.cc invoking yyerror is somewhat cumbersome: the C++ interface is not available as we are in yyparse (which in C), and yyerror is used by glr.cc itself to bind it to the user's parser::error. If we call yyerror, we need: yyerror (]AT_LOCATION_IF([[&@$, ]])[yyparser, ]AT_PARAM_IF([result, count, nerrs, ])[msg); However calling yy::parser::error is easier, once we know that the current parser object is available as 'yyparser'. Which also saves us from having to pass the parse-params ourselves: yyparser.error (]AT_LOCATION_IF([[@$, ]])[msg); * tests/calc.at: Invoke yyerror by hand, instead of using fprintf etc. Adjust expectations. 2020-02-11 Akim Demaille <akim.demaille@gmail.com> java: beware not to alias the locations of the various symbols * examples/java/calc/Calc.y, tests/calc.at, tests/local.at (getStartPos, getEndPos): Always return a new object. * doc/bison.texi: Clarify this. 2020-02-11 Akim Demaille <akim.demaille@gmail.com> java: check that parse.error custom|detailed work with push parsers * tests/calc.at: here. 2020-02-11 Akim Demaille <akim.demaille@gmail.com> java: don't expose the Context's members * data/skeletons/lalr1.java (Context): Make data members private. (Context.getLocation): New. * examples/java/calc/Calc.y, tests/java.at, tests/local.at: Adjust. 2020-02-10 Akim Demaille <akim.demaille@gmail.com> build: pacify syntax-check * src/complain.c: Fix indentation. * cfg.mk: Using strcmp is ok in the tests. Test cases and examples don't need Bison's PO support. 2020-02-10 Akim Demaille <akim.demaille@gmail.com> regen 2020-02-10 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-02-10 Akim Demaille <akim.demaille@gmail.com> build: prefer %D% and %C% to hard coded values * doc/local.mk: here. 2020-02-10 Akim Demaille <akim.demaille@gmail.com> parse.error: document and diagnose the incompatibility with %token-table * doc/bison.texi (Tokens from Literals): Move to code using %token-table to... (Decl Summary: %token-table): here. * data/skeletons/bison.m4: Implement mutual exclusion. * tests/input.at: Check it. * doc/local.mk: Be robust to the removal of doc/. 2020-02-10 Akim Demaille <akim.demaille@gmail.com> doc: spell check * doc/bison.texi: here. 2020-02-10 Akim Demaille <akim.demaille@gmail.com> doc: formatting changes * doc/bison.texi: here. 2020-02-10 Akim Demaille <akim.demaille@gmail.com> doc: work around problems with PDF generation With texinfo.tex 2019-09-24.13, node names with + are not properly handled. https://lists.gnu.org/r/bug-texinfo/2020-02/msg00004.html * doc/bison.texi: Always use the three-argument form for references to node with a + in the name. 2020-02-10 Akim Demaille <akim.demaille@gmail.com> java: revert "style: avoid useless initializers" This reverts commit ebab1ffca8a728158051481795ae798231cfd93d. This commit removed "useless" initializers, going from /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ private static final byte yypact_[] = yypact_init (); private static final byte[] yypact_init () { return new byte[] { 25, -7, -8, 37, -8, 40, -8, 20, -8, 61, -8, -8, 3, 9, 51, -8, -8, -2, -2, -2, -2, -2, -2, -8, -8, -8, 1, 66, 66, 3, 3, 3 }; } to /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ private static final byte[] yypact_ = { 25, -7, -8, 37, -8, 40, -8, 20, -8, 61, -8, -8, 3, 9, 51, -8, -8, -2, -2, -2, -2, -2, -2, -8, -8, -8, 1, 66, 66, 3, 3, 3 }; But it turns out that this was on purpose, to work around the 64KB limitation in JVM methods. It was introduced on the 2008-11-10 by Di-an Jan in 09ccae9b18a7c09ebf7bb8df2a18c8c4a6def248: "Work around Java's ``code too large'' problem for parser tables". See https://lists.gnu.org/r/help-bison/2008-11/msg00004.html. A real test, where we would hit the JVM limitation, would be nice. To avoid further regressions, add comments. 2020-02-10 Akim Demaille <akim.demaille@gmail.com> skeletons: avoid b4_error_verbose_if, which is confusing parse.error has more than two possible values. * data/skeletons/bison.m4 (b4_error_verbose_if, b4_error_verbose_flag): Remove. (b4_parse_error_case, b4_parse_error_bmatch): New. Adjust dependencies. 2020-02-10 Akim Demaille <akim.demaille@gmail.com> skeletons: decorelate %token-table from verbose error messages Reported by Adrian Vogelsgesang. * data/skeletons/bison.m4: Here. * data/skeletons/lalr1.cc: Adjust. 2020-02-10 Akim Demaille <akim.demaille@gmail.com> doc: formatting changes * doc/bison.texi: here. 2020-02-09 Akim Demaille <akim.demaille@gmail.com> doc: clearly state that %yacc only makes sense with yacc.c * doc/bison.texi: here. * tests/calc.at: Stop testing %yacc with non yacc.c skeletons. 2020-02-09 Adrian Vogelsgesang <avogelsgesang@tableau.com> style: stylistic cleanups in the C skeletons * data/skeletons/glr.c, data/skeletons/yacc.c: Avoid duplicated declaration of yysymbol_name. 2020-02-08 Akim Demaille <akim.demaille@gmail.com> java: provide Context with a more OO interface * data/skeletons/lalr1.java (yyexpectedTokens) (yysyntaxErrorArguments): Make them methods of Context. (Context.yysymbolName): New. * tests/local.at: Adjust. 2020-02-08 Akim Demaille <akim.demaille@gmail.com> java: add support for parse.error custom * data/skeletons/lalr1.java: Add support for custom parse errors. (yyntokens_): Make it public. Under... (yyntokens): this name. (Context): Capture the location too. * examples/c/bistromathic/parse.y, * examples/c/bistromathic/bistromathic.test: Improve error message. * examples/java/calc/Calc.test, examples/java/calc/Calc.y: Use custom error messages. * tests/calc.at, tests/local.at: Check custom error messages. 2020-02-08 Akim Demaille <akim.demaille@gmail.com> java: let the Context give access to yyntokens * data/skeletons/lalr1.java (Context.yytokens): New. 2020-02-08 Akim Demaille <akim.demaille@gmail.com> java: make the syntax error format string translatable The error format should be translated, but contrary to the case of C/C++, we cannot just depend on macros to adapt on the presence/absence of '_'. Let's consider that the message format is to be translated iff there are some internationalized tokens. * src/output.c (prepare_symbol_names): Define b4_has_translations. * data/skeletons/java.m4 (b4_trans): New. * data/skeletons/lalr1.java: Use it to emit translatable or not the format string. 2020-02-08 Akim Demaille <akim.demaille@gmail.com> java: introduce yyexpectedTokens And allow syntax error messages for 'detailed' and 'verbose' to be translated. * data/skeletons/lalr1.java (Context, yyexpectedTokens) (yysyntaxErrorArguments): New. (yysyntax_error): Use it. 2020-02-08 Akim Demaille <akim.demaille@gmail.com> java: add support for parse.error=detailed In Java there is no need for N_ and yytranslate_. So instead of hard-coding the use of N_ in the table of the symbol names, rely on b4_symbol_translate. * src/output.c (prepare_symbol_names): Use b4_symbol_translate instead of N_. * data/skeletons/c.m4 (b4_symbol_translate): New. * data/skeletons/lalr1.java (yysymbolName): New. Use it. * examples/java/calc/Calc.y: Use parse.error=detailed. * tests/calc.at: Check parse.error=detailed. 2020-02-08 Akim Demaille <akim.demaille@gmail.com> m4: fix b4_token_format We used to emit: /** Token number,to be returned by the scanner. */ static final int NUM = 258; /** Token number,to be returned by the scanner. */ static final int NEG = 259; with no space after the comma. Fix that. * data/skeletons/bison.m4 (b4_token_format): Quote where appropriate. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> java: tests: remove now redundant tests * tests/javapush.at: here. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> java: tests: check push parsers like the others Currently in javapush.at. * tests/calc.at: Here. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> java: tests: remove now redundant tests * tests/java.at: Calculator tests are now in calc.at. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> java: tests: check location tracking in the calculator Unfortunately in the Java skeleton the user cannot override the way locations are displayed, and locations don't know the structure of the positions. So they cannot implement the tricks used in the C/C++ skeletons to display "1.1" instead of "1.1-1.2". * tests/local.at (Java): Add support for column tracking in the locations, as we did in examples/java/calc. * tests/calc.at: Use AT_CALC_YYLEX. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> java: tests: prepare the replacement of calculator tests Soon calculator tests for Java will move from java.at to calc.at. Which implies improving the Java testing infrastructure in local.at (for instance really tracking columns in positions, not just token number). Detach java.at from local.at. * tests/java.at (AT_JAVA_POSITION_DEFINE_OLD): New. Use it. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> java: style: avoid useless initializers Instead of /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ private static final byte yypact_[] = yypact_init (); private static final byte[] yypact_init () { return new byte[] { 25, -7, -8, 37, -8, 40, -8, 20, -8, 61, -8, -8, 3, 9, 51, -8, -8, -2, -2, -2, -2, -2, -2, -8, -8, -8, 1, 66, 66, 3, 3, 3 }; } generate /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ private static final byte[] yypact_ = { 25, -7, -8, 37, -8, 40, -8, 20, -8, 61, -8, -8, 3, 9, 51, -8, -8, -2, -2, -2, -2, -2, -2, -8, -8, -8, 1, 66, 66, 3, 3, 3 }; I have no idea what motivated the previous approach. * data/skeletons/java.m4 (b4_typed_parser_table_define): Here. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> java: style: prefer putting the square brackets on the type * examples/java/calc/Calc.y, examples/java/simple/Calc.y, * tests/calc.at, tests/local.at: here. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> java: examples: fix the tracking of locations * examples/java/calc/Calc.y: The StreamTokenizer cannot "peek" for the next character, it reads it, and keeps it for the next call. So the current location is one passed the end of the current token. To avoid this, keep the previous position, and use it to end the current token. * examples/java/calc/Calc.test: Adjust. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> java: examples: prefer switch to chains of else-if * examples/java/calc/Calc.y, examples/java/simple/Calc.y: here. * examples/java/simple/Calc.y: Use the tokenizer's handling of blanks. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> java: examples: split in two * examples/java: Split in... * examples/java/simple, examples/java/calc: these. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> traces: don't print the stack before the gotos The C, C++ and D skeletons used to show the stack right after popping the stack during the reduction. Now that the stack is printed after reaching a new state, that has become useless: Entering state 1 Stack now 0 1 Reducing stack by rule 5 (line 83): $1 = token "number" (1) -> $$ = nterm exp (1) Stack now 0 Entering state 8 Stack now 0 8 Remove the "Stack now 0" line. * data/skeletons/lalr1.cc, data/skeletons/lalr1.d, * data/skeletons/lalr1.java, data/skeletons/yacc.c: Here. 2020-02-05 Akim Demaille <akim.demaille@gmail.com> traces: show the stack after reading a token Currently, if we have long rules and series of shift, we stack states without showing stack. Let's be more incremental, and do how the Java skeleton does. * data/skeletons/lalr1.cc, data/skeletons/lalr1.d, * data/skeletons/yacc.c: Here. Adjust test cases. * tests/torture.at (AT_DATA_STACK_TORTURE): Disable stack traces: this test produces a very large stack, and showing the stack each time we shift a token goes quadatric. 2020-02-04 Akim Demaille <akim.demaille@gmail.com> traces: write the "Reading a token" alone on its line The Java skeleton displays Reading a token: Next token is token "number" (1) while the other display Reading a token: Next token is token "number" (1) When generating logs in the scanner, the first part is separated from the second, and the end of the scanner logs have the second part pasted in. So let's propagate the Java way, but with the colon. * data/skeletons/glr.c, data/skeletons/lalr1.cc, data/skeletons/lalr1.d, * data/skeletons/lalr1.java, data/skeletons/yacc.c: Do it. Adjust test cases and doc. 2020-02-02 Akim Demaille <akim.demaille@gmail.com> java: use the same calc tests as the other skeletons * tests/local.at (AT_LANG_MATCH): New. (AT_YYERROR_DECLARE(java), AT_YYERROR_DECLARE_EXTERN(java)): New. * tests/calc.at: The grammar file for Java is quite different for the others, and continuing to assemble it from pieces makes the grammar file hard to understand. Let's also dispatch on the language to assemble it, and isolate Java from the others. Most of this comes from java.at. 2020-02-02 Akim Demaille <akim.demaille@gmail.com> java: add access to the number of errors * data/skeletons/lalr1.java (yynewrrs, getNumberOfErrors): New. Formatting changes. 2020-02-02 Akim Demaille <akim.demaille@gmail.com> java: formatting changes * data/skeletons/java.m4, data/skeletons/lalr1.java: here. 2020-02-02 Akim Demaille <akim.demaille@gmail.com> java: avoid trailing white spaces * data/skeletons/java.m4 (b4_maybe_throws): Issue a space before when needed. * data/skeletons/lalr1.java: Avoid trailing spaces. 2020-02-02 Akim Demaille <akim.demaille@gmail.com> java: example: properly track the locations This example, so far, was tracking the current token number, not the current column number. This is not nice for an example... * examples/java/Calc.y (PositionReader): New. Use it. * examples/java/Calc.test: Check the output. 2020-02-02 Akim Demaille <akim.demaille@gmail.com> java: example: improve * examples/java/Calc.y: Propagate the exit status. Support -p. 2020-02-02 Akim Demaille <akim.demaille@gmail.com> java: example: rely on autoboxing AFAICT, autoboxing/unboxing was added in Java 5 (September 30, 2004). I think we can afford to use it. It should help us merge some Java tests with the main ones. However, beware that != does not unbox: it compares the object addresses. * examples/java/Calc.y, tests/java.at: Simplify. * examples/java/Calc.test, tests/java.at: Improve tests. 2020-02-02 Akim Demaille <akim.demaille@gmail.com> tests: comment changes * tests/calc.at: Shorten titles and reduce redundancy. 2020-02-02 Akim Demaille <akim.demaille@gmail.com> skeletons: add support for %code epilogue When building the test cases, emitting code in the epilogue is very constraining. Let's make it simpler thanks to %code epilogue. However, I don't want to document this: it is bad style to use it (we should avoid having too many ways to write the same thing, TI!MTOWTDI), just put your code in the true epilogue section. * data/skeletons/glr.c, data/skeletons/lalr1.d, data/skeletons/lalr1.java, * data/skeletons/yacc.c: Implement support for %code epilogue. Remove useless comments. * tests/calc.at, tests/java.at: Simplify. 2020-02-02 Akim Demaille <akim.demaille@gmail.com> examples: bistromathic: fix location tracking * examples/c/bistromathic/scan.l (LOCATION_STEP): New. Use to properly ignore blanks. * examples/c/bistromathic/bistromathic.test: Check that case. 2020-02-02 Akim Demaille <akim.demaille@gmail.com> doc: document new features of parse.error * doc/bison.texi (Error Reporting): Rename as... (Error Reporting Function): this. Adjust dependencies. Make it a subsection of this... (Error Reporting): new section. (Syntax Error Reporting Function): New. (parse.error): Update description. 2020-01-29 Akim Demaille <akim.demaille@gmail.com> glr.c: add support for parse.error=custom * data/skeletons/glr.c (yyreportSyntaxError): Call the user's yyreport_syntax_error in custom mode. * tests/calc.at: Check it. 2020-01-29 Akim Demaille <akim.demaille@gmail.com> glr.c: add support for parse.error=detailed * data/skeletons/glr.c (yystrlen, yysymbol_name): New. Implement parse.error detailed. * tests/calc.at: Check it. 2020-01-29 Akim Demaille <akim.demaille@gmail.com> glr.c: introduce yyexpected_tokens and yysyntax_error_arguments Modeled after what was done in yacc.c, yet somewhat different since yyGLRStack play the role of the full yyparse_context_t. It will probably be defined as a alias, to make interfaces compatible. LAC is not supported here. And is somewhat tricky. * data/skeletons/glr.c (yyexpected_tokens, yysyntax_error_arguments): New. 2020-01-29 Akim Demaille <akim.demaille@gmail.com> glr.c: move code around * data/skeletons/glr.c: Move the handling of error messages after the definition of types. Especially after yyGLRStack, which we will need in forthcoming patches. Simplify: yyGLRStack is defined at this point. 2020-01-29 Akim Demaille <akim.demaille@gmail.com> glr.c: rename yyStateNum as yy_state_t * data/skeletons/glr.c: here. For consistency with yacc.c. 2020-01-29 Akim Demaille <akim.demaille@gmail.com> yacc.c: fix misleading indentation * data/skeletons/yacc.c: here. 2020-01-27 Akim Demaille <akim.demaille@gmail.com> doc: simplify uses of @ref The PDF output is more consistent: some nodes were not pointed to with their title. The HTML output becomes "see section Foo" instead of "see Foo", but this should be addressed in the next Texinfo release. Info output is simplified, as it uses only the node name and not its title. But it's considered easier to read this way. See https://lists.gnu.org/r/help-texinfo/2020-01/msg00031.html. * doc/bison.texi: Set @xrefautomaticsectiontitle on. Simplify all uses of ref. 2020-01-27 Akim Demaille <akim.demaille@gmail.com> examples: be more robust to spaces in paths Reported by Nikki Valen. https://lists.gnu.org/r/bug-bison/2020-01/msg00032.html * examples/test ($prog): Remove, replaced by... (prog): This new function, which pays attention to quoting shell variables. 2020-01-27 Akim Demaille <akim.demaille@gmail.com> doc: don't pretend trigonometry is part of arithmetics * doc/bison.texi (arith_funs): Rename as... (funs): this. 2020-01-27 Akim Demaille <akim.demaille@gmail.com> doc: update Doxygen template * Doxyfile.in: Run doxygen -u on it. 2020-01-27 Akim Demaille <akim.demaille@gmail.com> examples: add a complete example with all the bells and whistles * examples/c/bistromathic/Makefile, * examples/c/bistromathic/README.md, * examples/c/bistromathic/bistromathic.test, * examples/c/bistromathic/local.mk, * examples/c/bistromathic/parse.y, * examples/c/bistromathic/scan.l: New. * Makefile.am (AM_YFLAGS_WITH_LINES): Add -Wdangling-alias. * examples/test: Make failure errors easier to read. 2020-01-26 Akim Demaille <akim.demaille@gmail.com> examples: add an example of a push parser Add an example to demonstrate the use of push parser. I'm pleasantly surprised: parse.error=detailed works like a charm with push parsers. * examples/c/local.mk, examples/c/pushcalc/Makefile * examples/c/pushcalc/README.md, examples/c/pushcalc/calc.test, * examples/c/pushcalc/calc.y, examples/c/pushcalc/local.mk: New. 2020-01-26 Akim Demaille <akim.demaille@gmail.com> examples: more tests * examples/c/mfcalc/mfcalc.test: here. 2020-01-26 Akim Demaille <akim.demaille@gmail.com> examples: clean up * examples/c/calc/calc.y: Restore to its original state, with parse.error=detailed instead of parse.error=custom (this example should be simple). * examples/c/calc/calc.test: Check syntax errors. * examples/c/lexcalc/parse.y: Add comments. 2020-01-26 Akim Demaille <akim.demaille@gmail.com> tests: check custom error messages and push parsers * tests/local.at (AT_LAC_IF): New. * tests/calc.at: And also check the suppot for LAC. 2020-01-26 Akim Demaille <akim.demaille@gmail.com> style: formatting changes * data/skeletons/lalr1.java: here. 2020-01-26 Akim Demaille <akim.demaille@gmail.com> todo: update 2020-01-26 Akim Demaille <akim.demaille@gmail.com> bison: pretend to 3.6 already * src/parse-gram.y: here. 2020-01-26 Akim Demaille <akim.demaille@gmail.com> git: update ignores * lib/.gitignore: here. 2020-01-23 Akim Demaille <akim.demaille@gmail.com> regen 2020-01-23 Akim Demaille <akim.demaille@gmail.com> diagnostics: modernize bison's syntax errors We used to display the unexpected token first: $ bison foo.y foo.y:1.8-13: error: syntax error, unexpected %token, expecting character literal or identifier or <tag> 1 | %token %token | ^~~~~~ GCC uses a different format: $ gcc-mp-9 foo.c foo.c:1:5: error: expected identifier or '(' before ')' token 1 | int()()() | ^ and so does Clang: $ clang-mp-9.0 foo.c foo.c:1:5: error: expected identifier or '(' int()()() ^ 1 error generated. They display the unexpected token last (or not at all). Also, they don't waste width with "syntax error". Let's try that. It gives, for the same example as above: $ bison foo.y foo.y:1.8-13: error: expected character literal or identifier or <tag> before %token 1 | %token %token | ^~~~~~ * src/complain.h, src/complain.c (syntax_error): New. * src/parse-gram.y (yyreport_syntax_error): Use it. 2020-01-23 Akim Demaille <akim.demaille@gmail.com> regen 2020-01-23 Akim Demaille <akim.demaille@gmail.com> diagnostics: report syntax errors in color * src/parse-gram.y (parse.error): Set to 'custom'. (yyreport_syntax_error): New. * data/bison-default.css (.expected, .unexpected): New. * tests/diagnostics.at: Adjust. 2020-01-23 Akim Demaille <akim.demaille@gmail.com> regen 2020-01-23 Akim Demaille <akim.demaille@gmail.com> diagnostics: translate bison's own tokens As a test case, support translations in Bison itself. * src/parse-gram.y: Mark the translatable tokens. While at it, use clearer names. * tests/input.at: Adjust expectations. 2020-01-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: handle -fno-caret in the called functions Don't force callers of location_caret to have to deal with flags that disable it. * src/location.h, src/location.c (location_caret) (location_caret_suggestion): Early return if disabled. * src/complain.c: Simplify. 2020-01-22 Akim Demaille <akim.demaille@gmail.com> yacc.c: fixes * data/skeletons/yacc.c: Avoid warnings about unused functions. Fix typo. 2020-01-21 Akim Demaille <akim.demaille@gmail.com> examples: be more robust to spaces in paths Reported by Nikki Valen. https://lists.gnu.org/r/bug-bison/2020-01/msg00032.html * examples/test ($prog): Remove, replaced by... (prog): This new function, which pays attention to quoting shell variables. 2020-01-21 Adrian Vogelsgesang <avogelsgesang@tableau.com> larlr1.cc: Reject unsupported values for parse.lac Just as the yacc.c skeleton, the lalr1.cc skeleton should reject invalid values for parse.lac. * data/skeletons/lalr1.cc: check validity of parse.lac * tests/input.at: new test cases 2020-01-21 Adrian Vogelsgesang <avogelsgesang@tableau.com> larlr1.cc: Reject unsupported values for parse.lac Just as the yacc.c skeleton, the lalr1.cc skeleton should reject invalid values for parse.lac. * data/skeletons/lalr1.cc: check validity of parse.lac * tests/input.at: new test cases 2020-01-19 Akim Demaille <akim.demaille@gmail.com> parsers: issue tname with i18n markup Some users would like to avoid having to "parse" the *.y file to find the strings to translate. Let's issue the translatable tokens with N_ to allow "parsing" the generated parsers instead. See https://lists.gnu.org/archive/html/bison-patches/2019-01/msg00015.html * src/output.c (prepare_symbol_names): Issue symbol_names with N_() markup. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> tests: check token internationalization * tests/calc.at: Check it. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> regen 2020-01-19 Akim Demaille <akim.demaille@gmail.com> parsers: support translatable token aliases In addition to %token NUM "number" accept %token NUM _("number") in which case the token will be translated in error messages. Do not use _() in the output if there are no translatable tokens. * src/symtab.h, src/symtab.c (symbol): Add a 'translatable' member. * src/parse-gram.y (TSTRING): New token. (string_as_id.opt): Replace with... (alias): this. Use it. * src/scan-gram.l (SC_ESCAPED_TSTRING): New start conditions, to match TSTRINGs. * src/output.c (prepare_symbols): Define b4_translatable if there are translatable strings. * data/skeletons/glr.c, data/skeletons/lalr1.cc, * data/skeletons/yacc.c (yytnamerr): Receive b4_translatable, and use it. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> tests: check that detailed error messages preserve UTF-8 characters * tests/regression.at: here. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> yacc.c: escape trigraphs in detailed parse.error * src/output.c (escape_trigraphs, xescape_trigraphs): New. (prepare_symbol_names): Use it. * tests/regression.at: Check the handling of trigraphs with parse.error = detailed. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> regen 2020-01-19 Akim Demaille <akim.demaille@gmail.com> bison: use detailed error messages * #: . 2020-01-19 Akim Demaille <akim.demaille@gmail.com> regen 2020-01-19 Akim Demaille <akim.demaille@gmail.com> yacc.c: tests: check detailed error messages * tests/local.at (AT_ERROR_DETAILED_IF): New. (AT_ERROR_SIMPLE_IF): Adjust. * tests/calc.at: Check parse.error=detailed. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> yacc.c: add support for parse.error detailed "detailed" error messages are almost like "verbose", except that we don't double escape them, they don't get inner quotes, we don't use yytnamerr, and we hide the table. "custom" is exposed with the "detailed" tokens, not the "verbose" ones: they are not double-quoted. Because there's a risk that some people use yytname even without "verbose", let's keep yytname (instead of yys_name) in "simple" parse.error. * src/output.c (prepare_symbol_names): Be ready to output symbol names unquoted. (prepare_symbol_names): Output both the old tname table, and the new symbol_names one. * data/skeletons/bison.m4: Accept 'detailed'. * data/skeletons/yacc.c: When parse.error is 'detailed', don't emit yytname and yytnamerr, just yysymbol_name with the table inside. * tests/calc.at: Adjust. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> c: use yysymbol_name in traces Only parse.error verbose and simple will get the original yytname: the other options will rely on a different table. So let's move on top of the yysymbol_name function. * data/skeletons/c.m4 (yy_symbol_print): Use yysymbol_name. * data/skeletons/glr.c (yytokenName): Rename as... (yysymbol_name): this. The change of naming scheme is unfortunate, but it's definitely glr.c which is "wrong". 2020-01-19 Akim Demaille <akim.demaille@gmail.com> glr.c: move some functions after the definition of types Currently yy_symbol_print is defined before yytokenName, although it should use it instead of read yytname directly. Move blocks around to avoid this. * data/skeletons/glr.c (yy_symbol_print): Move its definition after that of yytokenName. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> Merge branch 'maint' * maint: maint: post-release administrivia version 3.5.1 news: update CI: use ICC again warnings: pacify ICC in lalr1.cc test: report.at: avoid tiny new failure git: update ignores 2020-01-19 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> version 3.5.1 * NEWS: Record release date. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> news: update 2020-01-19 Akim Demaille <akim.demaille@gmail.com> CI: use ICC again See https://github.com/nemequ/icc-travis/issues/15. Thanks to Jeff Hammond and Evan Nemerson for their help. * configure.ac (warn_common): Disable dubious warnings. * .travis.yml: Use ICC again. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> warnings: pacify ICC in lalr1.cc See 139d0655947c87f90af08718618feaaca0e558d7. * data/skeletons/yacc.c: If I might be a char, write a[+I] instead of a[I], so that ICC does not complain. 2020-01-19 Jim Meyering <meyering@fb.com> test: report.at: avoid tiny new failure Be robust to newer versions of Autoconf where the package URL defaults to https instead of http. * configure.ac (AC_INIT): Use https. * tests/report.at: Adjust expected output s/http/https/ to match updated URL. 2020-01-19 Akim Demaille <akim.demaille@gmail.com> git: update ignores 2020-01-17 Akim Demaille <akim.demaille@gmail.com> regen 2020-01-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: portability to G++ 4.8 Currently we get warnings with GCC 4.8 when running the maintainer-check-g++ tests: 143. skeletons.at:85: testing Installed skeleton file names ... ../../tests/skeletons.at:120: COLUMNS=1000; export COLUMNS; bison --color=no -fno-caret --skeleton=yacc.c -o input-cmd-line.c input-cmd-line.y ../../tests/skeletons.at:121: $CC $CFLAGS $CPPFLAGS $LDFLAGS -o input-cmd-line input-cmd-line.c $LIBS stderr: input-cmd-line.c: In function 'int yysyntax_error(long int*, char**, const yyparse_context_t*)': input-cmd-line.c:977:52: error: conversion to 'int' from 'long int' may alter its value [-Werror=conversion] YYSIZEOF (yyarg) / YYSIZEOF (*yyarg)); ^ cc1plus: all warnings being treated as errors stdout: ../../tests/skeletons.at:121: exit code was 1, expected 0 and 429. calc.at:823: testing Calculator parse.error=custom %locations api.prefix={calc} ... ../../tests/calc.at:823: COLUMNS=1000; export COLUMNS; bison --color=no -fno-caret -Wno-deprecated -o calc.c calc.y ../../tests/calc.at:823: $CC $CFLAGS $CPPFLAGS $LDFLAGS -o calc calc.c $LIBS stderr: calc.y: In function 'int yyreport_syntax_error(const yyparse_context_t*)': calc.y:157:58: error: conversion to 'int' from 'long unsigned int' may alter its value [-Werror=conversion] int n = yysyntax_error_arguments (ctx, arg, sizeof arg / sizeof *arg); ^ cc1plus: all warnings being treated as errors stdout: ../../tests/calc.at:823: exit code was 1, expected 0 We could use a cast to avoid the warning, but it becomes too cluttered. We can also use YYPTRDIFF_T, but that forces the user to use YYPTRDIFF_T too, although this is an array of tokens, which is limited by YYNTOKENS, an int. So let's completely avoid this warning. * data/skeletons/yacc.c, tests/local.at (yyreport_syntax_error): Avoid relying on sizeof to compute the array capacity. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: pass the parse-params to yyreport_syntax_error Enhance the calculator tests: show that passing arguments to yyerror works. * tests/calc.at: Add a new parse-param, nerrs, which counts the number of syntax errors in a run. * tests/local.at: Adjust to handle the new 'nerrs' argument, when present. The custom error reporting function show sees the user's additional arguments. Let's experiment with passing them as arguments to yyreport_syntax_error, but maybe storing them in the context would be a bettter alternative. * data/skeletons/yacc.c (yyreport_syntax_error): Handle the parse-params. * tests/calc.at, tests/local.at: Adjust. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> tests: a clearer test for parse-params Currently the parse-params are tested in calc.at by checking that the global variable and the parse-params have the same value. But it does not check that value, that could remain being 0 just as well. * tests/calc.at: Don't define the params when they are not used. Check the final value of result and count. Also, do count the number of line of logs. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: check custom error messages with parse-params * tests/calc.at: Check with prefix and parse-params. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: let custom error messages see the location * data/skeletons/yacc.c (yyparse_context_t): Add yylloc when applicable. (yyparse_context_location): New. * tests/local.at (AT_YYERROR_DEFINE(c)): Handle the location. * tests/calc.at: Check it. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: isolate yyexpected_tokens Provide users with a means to query for the currently allowed tokens. Could be used for autocompletion for instance. * data/skeletons/yacc.c (yyexpected_tokens): New, extracted from yysyntax_error_arguments. * examples/c/calc/calc.y (PRINT_EXPECTED_TOKENS): New. Use it. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> tests: compute verbose error messages from the custom ones We use a different format to check parse.error custom. Compute the "verbose" one from it instead of forcing the test author to provide the various formats of expected error messages. * tests/calc.at (_AT_CHECK_CALC_ERROR): Handle this transformation when needed. Simplify callers. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: check custom error messages * tests/local.at (AT_ERROR_CUSTOM_IF, AT_ERROR_VERBOSE_IF) (AT_ERROR_SIMPLE_IF): New. (AT_YYERROR_DEFINE(c)): Generate yyreport_syntax_error. * tests/calc.at (_AT_CHECK_CALC_ERROR): Accept custom error messages as additional test case. Use it. Add a new test case for %define parse.error custom. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: add custom error message generation When parse.error is custom, let users define a yyreport_syntax_error function, and use it. * data/skeletons/bison.m4 (b4_error_verbose_if): Accept 'custom'. * data/skeletons/yacc.c: Implement it. * examples/c/calc/calc.y: Experiment with it. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: style: avoid macros * data/skeletons/yacc.c (YYSYNTAX_ERROR): Remove, the call is now sufficiently small so that we can afford to duplicate it. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: store token numbers, not token strings That allows users to cover more cases, such as easily filtering some arguments they don't want to expose. But they now have to call yysymbol_name explicitly. * data/skeletons/yacc.c (yysyntax_error_arguments, yysyntax_error): Deal with symbol numbers instead of symbol names. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: extract yyerror_message_arguments Isolate a function that returns the list of expected and unexpected tokens. It will be exposed to users willing to customize their error messages. * data/skeletons/yacc.c (yyparse_context_t): New. (yyerror_message_arguments): New, extracted from yysyntax_error. 2020-01-17 Akim Demaille <akim.demaille@gmail.com> regen 2020-01-15 Akim Demaille <akim.demaille@gmail.com> tests: make AT_PARSE_PARAMS usable at the end of arguments When not empty, AT_PARSE_PARAMS was guaranteed to end with a comma. Remove the trailing comma, so that we can use AT_PARSE_PARAMS at the end of the arguments, not only at the beginning. * tests/local.at: here. Unfortunately, m4_append relies on the macro not being defined whereas we would have preferred it to check for emptiness. So use m4_define/m4_undefine instead of m4_pushdef/m4_popdef. 2020-01-15 Akim Demaille <akim.demaille@gmail.com> tests: fix AT_BISON_OPTION_PUSHDEFS, AT_BISON_OPTION_POPDEFS pairs * tests/glr-regression.at, tests/java.at, tests/javapush.at: Close properly what is opened. Do not nest. 2020-01-15 Akim Demaille <akim.demaille@gmail.com> d, java: use traces more alike that of C Same order, same places, same content. * data/skeletons/lalr1.d, data/skeletons/lalr1.java: here. 2020-01-15 Akim Demaille <akim.demaille@gmail.com> c++: report the stack at the same places as in C Let's have C be the reference, and match it elsewhere. Maybe C is too verbose and some adjustments are needed, but then that would be done in another batch of patches. * data/skeletons/lalr1.cc: Print the stack once we popped after YYERROR, and before emptying the stack at the end of parsing. 2020-01-15 Akim Demaille <akim.demaille@gmail.com> c++: display the stack in the same order as in C Currently the C and C++ parse traces differ in the order in which the stack is displayed: bottom up in C, top down in C++. Let's stick to the C order. * data/skeletons/stack.hh (stack::iterator, stack::const_iterator) (begin, end): Be forward, not backward. 2020-01-15 Akim Demaille <akim.demaille@gmail.com> style: avoid redundancy in the tests * tests/local.at (m4_rpatsubst): New. Use it to handle %parse-params. * tests/calc.at: Use %parse-params with several arguments. 2020-01-11 Akim Demaille <akim.demaille@gmail.com> yacc.c: comment changes In particular, import Adrian Vogelsgesang's comments about LAC from lalr1.cc. * data/skeletons/yacc.c: here. 2020-01-11 Akim Demaille <akim.demaille@gmail.com> yacc.c: style: double-quote the argument of b4_percent_define_get * data/skeletons/yacc.c: Here, for consistency. 2020-01-11 Akim Demaille <akim.demaille@gmail.com> yacc.c: introduce yysymbol_name Provide the users with a public API to get the name of the tokens. A thin wrapper around yytname. * data/skeletons/yacc.c (yysymbol_name): New. Use it. 2020-01-11 Akim Demaille <akim.demaille@gmail.com> CI: check on PPC64le, ARM64 and s390x I was hoping it would help us catch warnings when char is unsigned (see 78bb152a63f711af65364881c434af4c198e1ee0), but it does not seem to help. It's a pity that the compiler is the same all over the place, I would have preferred testing others. * .travis.yml: here. 2020-01-11 Akim Demaille <akim.demaille@gmail.com> todo: update 2020-01-11 Akim Demaille <akim.demaille@gmail.com> Merge branch 'maint' into HEAD * maint: gnulib: update lalr1.cc: avoid static_cast glr.c: add missing cast regen package: bump copyrights to 2020 gitignore: update 2020-01-11 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2020-01-10 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: avoid static_cast Reported by donmac703. Fixes https://github.com/akimd/bison/issues/20. * data/skeletons/lalr1.cc: here. 2020-01-10 Akim Demaille <akim.demaille@gmail.com> glr.c: add missing cast Reported by psjo. Fixes https://github.com/akimd/bison/issues/19. * data/skeletons/glr.c (yyprocessOneStack): Here. 2020-01-10 Akim Demaille <akim.demaille@gmail.com> regen 2020-01-10 Akim Demaille <akim.demaille@gmail.com> package: bump copyrights to 2020 Run 'make update-copyright'. 2020-01-10 Akim Demaille <akim.demaille@gmail.com> gitignore: update 2020-01-10 Akim Demaille <akim.demaille@gmail.com> regen 2020-01-09 Akim Demaille <akim.demaille@gmail.com> yacc.c: simplify use of YYDPRINTF * data/skeletons/yacc.c (YYDPRINTF): Expand to no-op (instead of nothing) when disabled. Simplify callers. 2020-01-05 Akim Demaille <akim.demaille@gmail.com> package: bump copyrights to 2020 Run 'make update-copyright'. 2020-01-05 Akim Demaille <akim.demaille@gmail.com> gitignore: update 2020-01-04 Akim Demaille <akim.demaille@gmail.com> doc: YYERROR_VERBOSE is no longer supported * doc/bison.texi (Table of Symbols): Remove last reference to it. * NEWS: Be clear about that. 2020-01-04 Akim Demaille <akim.demaille@gmail.com> glr.c: no longer support YYERROR_VERBOSE * data/skeletons/glr.c: Rather, dispatch directly on parse.error's value. 2020-01-04 Akim Demaille <akim.demaille@gmail.com> yacc.c: no longer support YYERROR_VERBOSE Supporting YYERROR_VERBOSE via cpp is a nuisance: m4 is in charge of handling alternatives. When adding more options for %define parse.error, supporting both CPP and M4 is too complex. Anyway, YYERROR_VERBOSE was deprecated long ago. * data/skeletons/yacc.c: Use m4 only to handle verbose/simple error messages. 2020-01-03 Akim Demaille <akim.demaille@gmail.com> yacc.c: avoid negations * data/skeletons/yacc.c (yyerrlab): here. 2019-12-31 Akim Demaille <akim.demaille@gmail.com> glr.c: clarify yyreportSyntaxError See the previous commit. * data/skeletons/glr.c (yyreportSyntaxError): First compute the arguments of the error message, _then_ th error message size. 2019-12-31 Akim Demaille <akim.demaille@gmail.com> yacc: restructure and fix yysyntax_error I would like to offer new ways to build the error message. As a first step, let's simplify yysyntax_error whose first loop does two things at the same time: (i) collect the tokens to be reported in the error message, and (ii) accumulate their sizes and possibly return "overflow". Let's pull (ii) in a second step. Then test 525 (regression.at:1193: parse.error=verbose overflow) failed. This test checks that we correctly report "memory overflow" when the error message is too large. However the test is mistaken: it is triggered in a place where there are five (large) expected tokens, so anyway we would not display them, so there is no (memory) overflow here! Transform this test to (i) check that indeed there is no overflow, and (ii) create syntax_error3 which does check the intended behavior, but with four expected tokens. * data/skeletons/yacc.c (yysyntax_error): First compute the list of arguments, then compute yysize. * tests/regression.at (parse.error=verbose overflow): Enhance and fix. 2019-12-31 Akim Demaille <akim.demaille@gmail.com> tests: also check -Wchar-subscripts GCC's -Wchar-subscripts may report issues on platforms where char is unsigned. Unfortunately the current CI does not reproduce the problem. But that would allow contributors to report issues if the warning appears somewhere. See 139d0655947c87f90af08718618feaaca0e558d7. Problem reported by Andy Fiddaman in: https://lists.gnu.org/r/bug-bison/2019-12/msg00021.html * configure.ac (warn_common): Add -Wchar-subscripts. 2019-12-30 Akim Demaille <akim.demaille@gmail.com> CI: do not specify the language When we give travis the langugage, it overrides our envvars. Instead of the MATRIX_EVAL trick, just stop specifying the language. 2019-12-30 Akim Demaille <akim.demaille@gmail.com> CI: remove ICC support, we can no longer use it https://github.com/nemequ/icc-travis/issues/15 2019-12-29 Akim Demaille <akim.demaille@gmail.com> doc: clean up the description of YYDEBUG * doc/bison.texi: Make it clearer that %define parse.trace is the preferred options. Fix a typo about api.prefix. 2019-12-29 Akim Demaille <akim.demaille@gmail.com> glr.cc: avoid compiler warnings 381. types.at:366: testing glr.cc api.value.type={double} ... test.cc:207:57: error: "__clang_major__" is not defined, evaluates to 0 [-Werror=undef] 207 | #if defined __APPLE__ && YY_CPLUSPLUS < 201103L && 4 <= __clang_major__ | ^~~~~~~~~~~~~~~ * data/skeletons/glr.cc: Check __clang_major__ before using it. 2019-12-18 Paul Eggert <eggert@cs.ucla.edu> warnings: pacify ‘gcc -Wchar-subscripts’ in yacc.c Problem reported by Andy Fiddaman in: https://lists.gnu.org/r/bug-bison/2019-12/msg00021.html * data/skeletons/yacc.c (yy_reduce_print, yy_lac, yysyntax_error) (yyreturn): If I might be a char, write a[+I] instead of a[I], so that ‘gcc -Wchar-subscripts’ does not complain. 2019-12-14 Akim Demaille <akim.demaille@gmail.com> doc: formatting changes * doc/bison.texi: No output changes. 2019-12-14 Akim Demaille <akim.demaille@gmail.com> tests: don't fail if seq is no available As is the case on Solaris. Reported by Dennis Clarke. https://lists.gnu.org/archive/html/bug-bison/2019-12/msg00011.html * examples/c/reccalc/reccalc.test: Skip if there is no seq. 2019-12-11 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-12-11 Akim Demaille <akim.demaille@gmail.com> version 3.5 * NEWS: Record release date. 2019-12-10 Akim Demaille <akim.demaille@gmail.com> news: prepare for 3.5 2019-12-08 Akim Demaille <akim.demaille@gmail.com> glr.cc: disable warnings from Clang on macOS $ cat test.cc #include <stddef.h> #include <stdint.h> ptrdiff_t half_max_capacity = PTRDIFF_MAX; $ clang++-mp-9.0 -pedantic -std=c++98 /tmp/test.cc -c /tmp/test.cc:4:31: warning: 'long long' is a C++11 extension [-Wc++11-long-long] ptrdiff_t half_max_capacity = PTRDIFF_MAX; ^ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdint.h:149:23: note: expanded from macro 'PTRDIFF_MAX' #define PTRDIFF_MAX INT64_MAX ^ /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/stdint.h:75:26: note: expanded from macro 'INT64_MAX' #define INT64_MAX 9223372036854775807LL ^ 1 warning generated. * data/skeletons/glr.cc: here. 2019-12-08 Akim Demaille <akim.demaille@gmail.com> api.token.raw: fix it in C++ Another breakage revealed by vcsn. * data/skeletons/c++.m4 (yytranslate_): Do not hard code "yy" and "parser", both can be changed by the user. Actually, since we are in the parser itself, there's really no need to qualify the type. 2019-12-08 Akim Demaille <akim.demaille@gmail.com> c++: fix comments for %code blocks In a project of mine, vcsn, this commit fixes the following comments. --- /tmp/parse.hh 2019-12-08 15:51:24.792934703 +0100 +++ lib/vcsn/rat/parse.hh 2019-12-08 16:00:59.137107503 +0100 @@ -43,7 +43,7 @@ #ifndef YY_YY_USERS_AKIM_SRC_LRDE_2_LIB_VCSN_RAT_PARSE_HH_INCLUDED # define YY_YY_USERS_AKIM_SRC_LRDE_2_LIB_VCSN_RAT_PARSE_HH_INCLUDED -// // "%code requires" blocks. +// "%code requires" blocks. #line 20 "/Users/akim/src/lrde/2/lib/vcsn/rat/parse.yy" #include <iostream> @@ -1851,7 +1851,7 @@ -// // "%code provides" blocks. +// "%code provides" blocks. #line 60 "/Users/akim/src/lrde/2/lib/vcsn/rat/parse.yy" #define YY_DECL_(Class) \ * data/skeletons/bison.m4 (b4_percent_code_get): Pass an expanded string to b4_comment. 2019-12-08 Akim Demaille <akim.demaille@gmail.com> parser: pretend we are Bison 3.5 * src/parse-gram.y: Accept we're Bison 3.5. 2019-12-08 Akim Demaille <akim.demaille@gmail.com> c++: fix spello * data/skeletons/lalr1.cc: here. 2019-12-08 Akim Demaille <akim.demaille@gmail.com> todo: update * TODO: Schedule some features for 3.6. Remove obsolete stuff. 2019-12-08 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-12-08 Akim Demaille <akim.demaille@gmail.com> version 3.4.92 * NEWS: Record release date. 2019-12-08 Akim Demaille <akim.demaille@gmail.com> news: fixes Reported by Paul Eggert. https://lists.gnu.org/archive/html/bison-patches/2019-12/msg00014.html * NEWS: here. 2019-12-07 Akim Demaille <akim.demaille@gmail.com> doc: minor changes * README-hacking.md: here. 2019-12-07 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2019-12-07 Akim Demaille <akim.demaille@gmail.com> doc: clearly deprecate YYPRINT * doc/bison.texi (Prologue): Stop using YYPRINT as an example. (The YYPRINT Macro): Clearly show this macro is deprecated. 2019-12-07 Akim Demaille <akim.demaille@gmail.com> doc: formatting changes * doc/bison.texi: here. No change in content. 2019-12-07 Akim Demaille <akim.demaille@gmail.com> news: update 2019-12-07 Akim Demaille <akim.demaille@gmail.com> d: obey parse.error * data/skeletons/lalr1.d (yysyntax_error): Let the dispatch be bison-time, not runtime. 2019-12-07 Akim Demaille <akim.demaille@gmail.com> c++: also prefer YY_ASSERT to YYASSERT Like the other skeletons. * data/skeletons/variant.hh: here. 2019-12-07 Akim Demaille <akim.demaille@gmail.com> glr.c: obey the parse.assert %define variable * data/skeletons/glr.c (YYASSERT): Rename as... (YY_ASSERT): this, for consistency with yacc.c, and also to emphasize the fact that this is not for the end user (YY_ prefix). * tests/glr-regression.at: Define parse.assert. 2019-12-07 Akim Demaille <akim.demaille@gmail.com> c++: beware of short ranges for state numbers Now that we use small integral types, possibly unsigned (e.g., unsigned char), to store state numbers, using -1 to denote an empty state (i.e., a state that stores no semantical value) is very dangerous: it will be confused with state 255, which might be non-empty. Rather than allocating a larger range of state numbers to keep the empty-state apart, let's use the number of a state known to store no value. The initial state, numbered 0, seems to fit perfectly the job. Reported by Frank Heckenbach. https://lists.gnu.org/archive/html/bug-bison/2019-11/msg00016.html * data/skeletons/lalr1.cc (empty_state): Be 0. 2019-12-07 Akim Demaille <akim.demaille@gmail.com> api.token.raw: check it against api.token.constructor * tests/scanner.at: here. 2019-12-06 Akim Demaille <akim.demaille@gmail.com> regen 2019-12-06 Akim Demaille <akim.demaille@gmail.com> warnings: enable -Wuseless-cast, and eliminate warnings Prompted by Frank Heckenbach. https://lists.gnu.org/archive/html/bug-bison/2019-11/msg00016.html. * configure.ac (warn_cxx): Add -Wuseless-cast. * data/skeletons/c.m4 (b4_attribute_define): Define YY_IGNORE_USELESS_CAST_BEGIN and YY_IGNORE_USELESS_CAST_END. * data/skeletons/glr.c (YY_FPRINTF): New, replaces YYFPRINTF, wrapped with YY_IGNORE_USELESS_CAST_BEGIN and YY_IGNORE_USELESS_CAST_END. (YY_DPRINTF): Likewise. * tests/actions.at: Remove useless cast. * tests/headers.at: Adjust. 2019-12-02 Akim Demaille <akim.demaille@gmail.com> diagnostics: style changes * src/complain.h, src/complain.c: Comment changes. * src/scan-skel.l: Reduce scopes. * data/skeletons/bison.m4: Factor diagnostic functions. 2019-12-02 Akim Demaille <akim.demaille@gmail.com> glr.c: style changes * data/skeletons/glr.c (yysplitStack): Reduce scopes. * tests/atlocal.in: Formatting changes. 2019-12-01 Akim Demaille <akim.demaille@gmail.com> c++: get rid of symbol_type::token () It is not used. And its implementation was wrong when api.token.raw was defined, as it was still mapping to the external token numbers, instead of the internal ones. Besides it was provided only when api.token.constructor is defined, yet always declared. * data/skeletons/c++.m4 (by_type::token): Remove, useless. 2019-12-01 Akim Demaille <akim.demaille@gmail.com> c++: remove useless cast about user_token_number_max_ Reported by Frank Heckenbach. https://lists.gnu.org/archive/html/bug-bison/2019-11/msg00016.html The cast is needed when yytranslate_'s argument type is token_type, i.e., when api.token.constructor is defined. 373. types.at:138: testing lalr1.cc api.value.type=variant api.token.constructor ... ======== Testing with C++ standard flags: '' ../../tests/types.at:138: bison --color=no -fno-caret -o test.cc test.y ../../tests/types.at:138: $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -o test test.cc $LIBS stderr: test.cc:966:16: error: result of comparison of constant 257 with expression of type 'yy::parser::token_type' (aka 'yy::parser::token::yytokentype') is always true [-Werror,-Wtautological-constant-out-of-range-compare] else if (t <= user_token_number_max_) ~ ^ ~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. It is because it is expected that when api.token.constructor is defined, only symbol constructors will be used, that yytranslate_ then takes a token_type. But it is wrong: we still allow literal characters in this case, as demonstrated by test 373 for instance. %define api.value.type variant %define api.token.constructor %token <std::pair<int, int>> '1' '2'; [...] static yy::parser::symbol_type yylex () { static char const input[] = "12"; int res = input[toknum++]; typedef yy::parser::symbol_type symbol; if (res) return symbol (res, std::make_pair (res - '0', res - '0' + 1)); else return symbol (res); } So let yytranslate_ always take an int, which makes the cast truly useless. * data/skeletons/c++.m4, data/skeletons/lalr1.cc (yytranslate_): here. 2019-12-01 Akim Demaille <akim.demaille@gmail.com> c++: clean a few issues wrt special tokens The C++ implementation of LAC did not skip the $undefined token, probably because it was not exposed. Expose it, and use clearer names. * data/skeletons/c++.m4: Don't define undef_token_ in yytranslate_, but... * data/skeletons/lalr1.cc (yy_undef_token_): here. Use a more precise type to define yy_undef_token_ and yy_error_token_. Unfortunately we move from a compile-time value defined via an enum to a static const member. Eventually we should make it constexpr. Make LAC implementation more alike yacc.c's one. 2019-12-01 Akim Demaille <akim.demaille@gmail.com> d, java: improve yytranslate and neighbors * data/skeletons/lalr1.d, data/skeletons/lalr1.java: Don't expose yyuser_token_number_max_ and yyundef_token_. Do as in C++: scope them into yytranslate_, and only when api.token.raw is not defined. (yyterror_): Rename as... (yy_error_token_): this. * data/skeletons/lalr1.d (token_number_type): New. Use it. Can't be done in the Java backend, as Java does not have type aliases. 2019-12-01 Akim Demaille <akim.demaille@gmail.com> d, java: get rid of a useless table * data/skeletons/lalr1.d, data/skeletons/lalr1.java (yytoken_number_): Remove, useless. Was used in ancient C skeletons to support YYPRINT, long obsoleted by %printer. 2019-11-30 Akim Demaille <akim.demaille@gmail.com> c++, d, java: remove yyerrcode It is not used at all. We will remove it also from yacc.c, but later (see TODO). * data/skeletons/lalr1.cc, data/skeletons/lalr1.d, * data/skeletons/lalr1.java (yyerrcode_): Remove. 2019-11-30 Akim Demaille <akim.demaille@gmail.com> c++: improve typing * data/skeletons/lalr1.cc (yysyntax_error_): symbol_type::type_get returns a symbol_number_type (which is indeed an int). 2019-11-30 Akim Demaille <akim.demaille@gmail.com> c++: remove useless cast about yyeof_ Reported by Frank Heckenbach. https://lists.gnu.org/archive/html/bug-bison/2019-11/msg00016.html * data/skeletons/c++.m4 (b4_yytranslate_define): Don't use yyeof_ as if it had two different types. It is used once against the input argument, which is the value returned by yylex, which is an "external token number", typically an int. It is also used as output type, an "internal symbol number". It turns out that in both cases we mean "0", but let's keep yyeof_ only for the case "internal symbol number", i.e., _after_ conversion by yytranslate. This frees us from one cast. 2019-11-30 Akim Demaille <akim.demaille@gmail.com> glr: style change * data/skeletons/glr.c (YYDPRINTF): Expand into an empty statement, instead of nothing. Simplify callers. 2019-11-30 Akim Demaille <akim.demaille@gmail.com> glr: remove useless casts Reported by GCC's -Wuseless-cast. * data/skeletons/glr.c: Don't cast to yybool, it's useless. 2019-11-29 Akim Demaille <akim.demaille@gmail.com> yacc.c, glr.c: fix crash when reporting errors in consistent states The current code for yysyntax_error for %define parse.error verbose is fishy (given that YYEMPTY is -2, invalid argument for yytname[]): static int yysyntax_error ([...]) { YYPTRDIFF_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]); [...] if (yytoken != YYEMPTY) A nearby comment reports The only way there can be no lookahead present (in yychar) is if this state is a consistent state with a default action. Thus, detecting the absence of a lookahead is sufficient to determine that there is no unexpected or expected token to report. In that case, just report a simple "syntax error". So it _is_ possible to call yysyntax_error with yytoken == YYEMPTY, albeit quite difficult when meaning to, so virtually impossible by accident (after all, there was never a bug report about this). I failed to produce a test case, but Joel E. Denny provided me with one (added to the test suite below). The yacc.c skeleton fails on this, and once fixed dies on a second problem. The glr.c skeleton was also dying, but immediately of this second problem. Indeed we were not allocating space for the error message's final \0. This was hidden by the fact that we only had error messages with at least an unexpected token displayed, so with at least one "%s" in the format string, whose size (2) was included (incorrectly) in the final size of the message (where the %s have been replaced by the actual content). * data/skeletons/glr.c, data/skeletons/yacc.c (yysyntax_error): Do not invoke yytnamerr on YYEMPTY. Clarify the computation of the length of the _final_ error message, with the NUL terminator but without the '%s's. * tests/conflicts.at (Syntax error in consistent error state): New, contributed by Joel E. Denny. 2019-11-26 Akim Demaille <akim.demaille@gmail.com> tests: avoid creating files whose name collide with standard headers Having a file named "exception" is risky: the compiler might use that file in #include. Reported by 马俊 <majun123@whu.edu.cn>. * tests/local.at (AT_SKIP_IF_EXCEPTION_SUPPORT_IS_POOR): Generate 'exceptions', not 'exception'. 2019-11-22 Akim Demaille <akim.demaille@gmail.com> doc: more details about the test suite * README-hacking.md: here. 2019-11-20 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-11-20 Akim Demaille <akim.demaille@gmail.com> version 3.4.91 * NEWS: Record release date. 2019-11-20 Akim Demaille <akim.demaille@gmail.com> style: pacify syntax-check * cfg.mk: No need to translate *.md files. * data/skeletons/glr.c, data/skeletons/yacc.c: Fix space issues. 2019-11-19 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2019-11-18 Akim Demaille <akim.demaille@gmail.com> doc: don't promote dangling aliases String literals as tokens serve two distinct purposes: freeing from having to implement the keyword matching in the scanner, and improving error messages. Most of the time both can be achieved at the same time, but on occasions, it does not work so well. We promote their use for error messages. We will also still support the former case, but it is _not_ the recommended approach. * doc/bison.texi (Tokens from Literals): Clearly state that we don't recommend looking up the token types in the list of token names. 2019-11-17 Akim Demaille <akim.demaille@gmail.com> diagnostics: complain about undeclared string tokens String literals, which allow for better error messages, are (too) liberally accepted by Bison, which might result in silent errors. For instance %type <exVal> cond "condition" does not define “condition” as a string alias to 'cond' (nonterminal symbols do not have string aliases). It is rather equivalent to %nterm <exVal> cond %token <exVal> "condition" i.e., it gives the type 'exVal' to the "condition" token, which was clearly not the intention. Introduce -Wdangling-alias to catch this. * src/complain.h, src/complain.c: Add support for -Wdangling-alias. (argmatch_warning_args): Sort. * src/symtab.c (symbol_check_defined): Complain about dangling aliases. * doc/bison.texi: Document it. * tests/input.at (Dangling aliases): New test. 2019-11-17 Akim Demaille <akim.demaille@gmail.com> diagnostics: yacc reserves %type to nonterminals On %token TOKEN1 %type <ival> TOKEN1 TOKEN2 't' %token TOKEN2 %% expr: bison -Wyacc gives input.y:2.15-20: warning: POSIX yacc reserves %type to nonterminals [-Wyacc] 2 | %type <ival> TOKEN1 TOKEN2 't' | ^~~~~~ input.y:2.29-31: warning: POSIX yacc reserves %type to nonterminals [-Wyacc] 2 | %type <ival> TOKEN1 TOKEN2 't' | ^~~ input.y:2.22-27: warning: POSIX yacc reserves %type to nonterminals [-Wyacc] 2 | %type <ival> TOKEN1 TOKEN2 't' | ^~~~~~ The messages appear to be out of order, but they are emitted when the error is found. * src/symtab.h (symbol_class): Add pct_type_sym, used to denote symbols appearing in %type. * src/symtab.c (complain_pct_type_on_token): New. (symbol_class_set): Check that %type is not applied to tokens. (symbol_check_defined): pct_type_sym also means undefined. * src/parse-gram.y (symbol_decl.1): Set the class to pct_type_sym. * src/reader.c (grammar_current_rule_begin): pct_type_sym also means undefined. * tests/input.at (Yacc's %type): New. 2019-11-16 Akim Demaille <akim.demaille@gmail.com> doc: promote %nterm over %type As an extension to POSIX Yacc, Bison's %type accepts tokens. Unfortunately with string literals as implicit tokens, this is misleading, and led some users to write %type <exVal> cond "condition" believing that "condition" would be associated to the 'cond' nonterminal (see https://github.com/apache/httpd/pull/72). * doc/bison.texi: Promote %nterm rather than %type to declare the type of nonterminals. 2019-11-16 Akim Demaille <akim.demaille@gmail.com> doc: formatting changes * doc/bison.texi: No visible changes. 2019-11-16 Akim Demaille <akim.demaille@gmail.com> doc: work around warnings when Flex C output is compiled in C++ * doc/bison.texi (calc++/scanner.ll): here. While at it, clarify clang vs. warnings. 2019-11-16 Akim Demaille <akim.demaille@gmail.com> tests: be robust to old Perl versions on Cygwin Reported by Denis Excoffier. https://lists.gnu.org/archive/html/bug-bison/2019-11/msg00008.html. * tests/output.at: Be sure to remove back up files. 2019-11-16 Akim Demaille <akim.demaille@gmail.com> regen 2019-11-12 kaneko y <spiketeika@gmail.com> gram.c: Fix condition of aver * src/gram.c (grammar_dump): Fix condition of aver. What we want to check is that rhs is followed by its rule. 2019-11-11 Akim Demaille <akim.demaille@gmail.com> doc: clarify build instructions * README: A few fixes. Explain how to install color support. * README-hacking: Rename as... * README-hacking.md: this, and convert to Markdown. Improve typography. Improve explanations about update-test. 2019-11-11 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2019-11-11 Yuichiro Kaneko <spiketeika@gmail.com> gram.c: also print terminals in grammar_dump * src/gram.c (grammar_dump): Print terminals likewise non terminals. * tests/sets.at (Reduced Grammar): Update test case to catch up the change and add a test case where prec and assoc are used. 2019-11-10 Akim Demaille <akim.demaille@gmail.com> doc: work around Texinfo 6.7 bug When @code is used in a @deftype... definition, it issues quotes. Remove them. See https://lists.gnu.org/archive/html/help-texinfo/2019-11/msg00004.html. * doc/local.mk: here. 2019-11-09 Akim Demaille <akim.demaille@gmail.com> doc: formatting changes * doc/bison.texi: Wrap lines. No semantical difference. 2019-11-09 Akim Demaille <akim.demaille@gmail.com> doc: use upper case for tokens * doc/bison.texi: here. 2019-11-07 Akim Demaille <akim.demaille@gmail.com> doc: type-face fixes * doc/bison.texi: Use @code for types in function definitions. 2019-11-06 Akim Demaille <akim.demaille@gmail.com> c++: expose the type used to store line and column numbers * data/skeletons/location.cc (position::counter_type) (location::counter_type): New. Use them. * doc/bison.texi (C++ position, C++ location): Adjust. 2019-11-03 Akim Demaille <akim.demaille@gmail.com> tests: fix comment and adjust to locale names on GNU/Linux Reported by Denis Excoffier. * tests/diagnostics.at: here. 2019-11-03 Akim Demaille <akim.demaille@gmail.com> tests: really check complaints from m4 * tests/diagnostics.at (Locations from M4, Tabulations and multibyte characters from M4): These tests are actually checking a message coming from C, not from M4. Replace with... (Complaints from M4): This. 2019-11-03 Akim Demaille <akim.demaille@gmail.com> tests: simplify prologue * tests/testsuite.h: We no longer load gnulib in the tests. 2019-11-03 Akim Demaille <akim.demaille@gmail.com> diagnostics: add missing translation * src/muscle-tab.c (muscle_percent_define_check_kind): Here. 2019-11-02 Akim Demaille <akim.demaille@gmail.com> c++: fix old cast warnings We still have a few old C casts in lalr1.cc, let's get rid of them. Reported by Frank Heckenbach. Actually, let's monitor all our casts using easy to grep macros. Let's use these macros to use the C++ standard casts when we are in C++. * data/skeletons/c.m4 (b4_cast_define): New. * data/skeletons/glr.c, data/skeletons/glr.cc, * data/skeletons/lalr1.cc, data/skeletons/stack.hh, * data/skeletons/yacc.c: Use it and/or its casts. * tests/actions.at, tests/cxx-type.at, * tests/glr-regression.at, tests/headers.at, tests/torture.at, * tests/types.at: Use YY_CAST instead of C casts. * configure.ac (warn_cxx): Add -Wold-style-cast. * doc/bison.texi: Disable it. 2019-11-01 Akim Demaille <akim.demaille@gmail.com> tests: be robust to tput errors Reported by Denis Excoffier. * tests/bison.in: here. 2019-11-01 Akim Demaille <akim.demaille@gmail.com> git: update ignores I don't understand what happened in 10acc148bb90fac8a52a5d35f2bd18bd824c1639. 2019-10-29 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-10-29 Akim Demaille <akim.demaille@gmail.com> version 3.4.90 * NEWS: Record release date. 2019-10-29 Akim Demaille <akim.demaille@gmail.com> C++: finish propagating the unsigned->signed conversion in locations * data/skeletons/location.cc: Remove the u (for unsigned) suffix from the initial line and column. * NEWS: AFAICT, only C++ backends have their location types changed. 2019-10-29 Akim Demaille <akim.demaille@gmail.com> style: fix cpp indentation Reported by syntax-check. * src/system.h: here. 2019-10-29 Akim Demaille <akim.demaille@gmail.com> style: glr.c: comment changes * data/skeletons/glr.c: here. 2019-10-26 Akim Demaille <akim.demaille@gmail.com> CI: pass -O1 to GCC8 with sanitizers This build never finishes in the 50min credit given by Travis. See if with optimizations it works better. * .travis.yml: here. 2019-10-26 Akim Demaille <akim.demaille@gmail.com> reader: reduce the "scope" of global variables We have too many global variables, adding structure would help. For a start, let's hide some of the variables closer to their usage. * src/getargs.c, src/files.h (current_file): Move to... * src/scan-gram.c: here. * src/scan-gram.h (gram_in, gram__flex_debug): Remove, make them private to the scanner. * src/reader.h, src/reader.c (reader): Take a grammar file as argument. Move the handling of scanner variables to... * src/scan-gram.l (gram_scanner_open, gram_scanner_close): here. (gram_scanner_initialize): Remove, replaced by gram_scanner_open. * src/main.c: Adjust. 2019-10-26 Akim Demaille <akim.demaille@gmail.com> regen 2019-10-26 Akim Demaille <akim.demaille@gmail.com> parser: use grammar_file instead of current_file * src/parse-gram (%initial-action): here. (handle_skeleton): Don't depend on the current file name to look for "local" skeletons (subject to changes coming from "#lines"): depend only on the initial file name, the one given on the command line. 2019-10-26 Akim Demaille <akim.demaille@gmail.com> diagnostics: use grammar_file instead of current_file Currently there are two globals denoting the input file: grammar_file is the one from the command line, and current_file which might change because of #line. Use only the former. * src/complain.c (error_message): here. * tests/diagnostics.at: Adjust. 2019-10-25 Akim Demaille <akim.demaille@gmail.com> reader: let symtab deal with the symbols * src/reader.c (reader): Move the setting up of the builtin symbols to... * src/symtab.c (symbols_new): here. 2019-10-25 Akim Demaille <akim.demaille@gmail.com> style: remove incorrect comment Reported by Paul Eggert. * src/system.h: here. 2019-10-24 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: fix previous commit: printing of state numbers * data/skeletons/lalr1.cc: Printing a char prints... a char. Print ints instead. 2019-10-24 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: use computed state types This skeleton uses a single stack of state structures, so it is less likely to benefit from a stack size reduction than yacc.c (which uses several stacks: state number, value and location). But it will reduce the size of the LAC stack. This skeleton was already using int for state numbers, so, contrary to yacc.c, this brings nothing for large automata. Overall, it is still nicer to make the skeletons alike. * data/skeletons/lalr1.cc (state_type): Here. 2019-10-24 kaneko y <spiketeika@gmail.com> README: Fix a typo * README: Fix a typo. Git command name is submodule. 2019-10-24 Akim Demaille <akim.demaille@gmail.com> examples: fix missing dependencies Reported by Thomas Petazzoni. https://lists.gnu.org/archive/html/bug-bison/2019-08/msg00000.html * examples/c/reccalc/local.mk: Complete dependencies, including for earlier versions of Automake (for sake of our CI, on top of Ubuntu Xenial/Bionic, which feature only Automake 1.15). (%D%/scan.c %D%/scan.h): Upgrade to the full version provided in Automake's documentation. 2019-10-24 Akim Demaille <akim.demaille@gmail.com> diagnostics: simplify location handling Locations start at line 1. Don't accept line 0. * src/location.c (location_print): Don't print locations with line 0. (location_caret): Simplify. 2019-10-24 Akim Demaille <akim.demaille@gmail.com> build: reenable -Wtype-limits See https://lists.gnu.org/archive/html/bug-bison/2019-10/msg00061.html to https://lists.gnu.org/archive/html/bug-bison/2019-10/msg00073.html. Paul Eggert's changes in gnulib do fix the issue for modern GCCs (7, 8, 9) on macOS. Unfortunately these warnings are back on the CI (GNU/Linux) with GCC 4.6, 4.7, (not 4.8) and 4.9. Disable the warning locally. * configure.ac (warn_common, warn_tests): Remove -Wtype-limits. * src/system.h (IGNORE_TYPE_LIMITS_BEGIN, IGNORE_TYPE_LIMITS_END): New. * src/InadequacyList.c, src/parse-gram.c, src/parse-gram.y, * src/symtab.c: Use it. 2019-10-24 Akim Demaille <akim.demaille@gmail.com> build: remove dmalloc support Today sanitizers are a better alternative. * m4/dmalloc.m4: Remove. * configure.ac, src/system.h: Adjust. 2019-10-23 Akim Demaille <akim.demaille@gmail.com> gitignore: update 2019-10-23 Paul Eggert <eggert@cs.ucla.edu> build: update gnulib submodule to latest 2019-10-23 Yuichiro Kaneko <spiketeika@gmail.com> style: update comment in reader.c rrhs and rlhs were removed by b2ed6e5826e772162719db595446b2c58e4ac5d6. * src/reader.c (packgram): Update comment. 2019-10-22 kaneko y <spiketeika@gmail.com> yacc.c: fix a typo * data/skeletons/yacc.c (yysetstate): fix comment. 2019-10-22 Akim Demaille <akim.demaille@gmail.com> style: pacify syntax-check * doc/.gitignore, src/complain.c, src/getargs.c, * src/output.c: here. 2019-10-21 Akim Demaille <akim.demaille@gmail.com> main: also free memory on errors * src/derives.c (derives_free): Beware of NULL. * src/main.c (main): Let the 'finish' label include memory release. 2019-10-21 Akim Demaille <akim.demaille@gmail.com> gnulib: update To get bitset_free accept NULL. See https://lists.gnu.org/archive/html/bug-gnulib/2019-10/msg00054.html 2019-10-21 Akim Demaille <akim.demaille@gmail.com> style: reduce scope in derives * src/derives.c: here. And prefer prefix to postfix increment. 2019-10-21 Akim Demaille <akim.demaille@gmail.com> build: disable -Wtautological-constant-out-of-range-compare Also see e31f92495ce14a5d924b148c8ea1470003cc47c1 and https://lists.gnu.org/archive/html/bug-bison/2019-10/msg00061.html * configure.ac (warn_common): Disable -Wtautological-constant-out-of-range-compare. (warn_tests): Restore it. 2019-10-21 Akim Demaille <akim.demaille@gmail.com> CI: formatting changes * .travis.yml: Use the single line form of lists, when reduced to a singletons. 2019-10-21 Akim Demaille <akim.demaille@gmail.com> CI: rename jobs * .travis.yml (compile, test): Rename as... (dist, check): these, which are more traditional for GNU projects. 2019-10-21 Akim Demaille <akim.demaille@gmail.com> doc: update README * README: Be clearer that README-hacking _must_ be read. Convert to Markdown. 2019-10-21 Akim Demaille <akim.demaille@gmail.com> bootstrap: relieve developpers from Gettext version mismatch issues * .travis.yml (compile): Move the workaround from here... * bootstrap.conf (bootstrap_epilogue): to there. 2019-10-20 Akim Demaille <akim.demaille@gmail.com> tests: beware of GCC9 warnings in push mode This is really weird: GCC points to the LHS of the assignment... 260. headers.at:184: testing Sane headers: api.pure api.push-pull=both ... tests/headers.at:184: COLUMNS=1000; export COLUMNS; bison --color=no -fno-caret -d -o input.c input.y tests/headers.at:184: $CC $CFLAGS $CPPFLAGS -c -o input.o input.c stderr: input.c: In function 'yyparse': input.c:1276:16: error: 'yylval' may be used uninitialized in this function [-Werror=maybe-uninitialized] 1276 | yylval = *yypushed_val; | ~~~~~~~^~~~~~~~~~~~~~~ input.c: In function 'yypull_parse': input.c:1276:16: error: 'yylval' may be used uninitialized in this function [-Werror=maybe-uninitialized] 1276 | yylval = *yypushed_val; | ~~~~~~~^~~~~~~~~~~~~~~ cc1: all warnings being treated as errors stdout: tests/headers.at:184: exit code was 1, expected 0 See also d87c8ac79ab844d6a7a4f5103dcf7a842d18b611 and 9645a2b20ee7cbfa8bb4ac2237f87d598afe349c. * tests/headers.at (Several parsers, Several parsers): Disable these warnings when in push parser. 2019-10-20 Akim Demaille <akim.demaille@gmail.com> CI: try GCC9 and Clang9 The logs show: Disallowing sources: llvm-toolchain-bionic-8, ubuntu-toolchain-r-test To add unlisted APT sources, follow instructions in https://docs.travis-ci.com/user/installing-dependencies#Installing-Packages-with-the-APT-Addon * .travis.yml: Remove a few apt sources which are ignored in Bionic (e.g., see https://github.com/travis-ci/apt-source-safelist/issues/410). Where needed, use sources/sourceline instead. Also, don't use -DNDEBUG with older builds. 2019-10-20 Akim Demaille <akim.demaille@gmail.com> parser: clarify version checking * src/parse-gram.y: Use the same conventions for gnulib as elsewhere: <header.h>. (str_to_version): New. (handle_require): Use it. Prefer < to >. 2019-10-20 Akim Demaille <akim.demaille@gmail.com> build: disable -Wtype-limits, except in the test suite The current implementation of lib/intprops.h results in "unsigned < 0" comparisons, which triggers warnings. See https://lists.gnu.org/archive/html/bug-bison/2019-10/msg00061.html * configure.ac (warn_common): Disable -Wtype-limits. (warn_tests): Restore it. 2019-10-17 Paul Eggert <eggert@cs.ucla.edu> c++: port to Sun C++ 5.12 The documentation for Oracle Solaris Studio 12.3 (Sun C++ 5.12 2011/11/16) says it supports C++03. This compiler rejects the location.cc use of std::max for some reason; I don’t know why since I don’t use C++ as a rule. The simplest workaround is to open-code ‘max’. * data/skeletons/location.cc (add_): Do max by hand rather than relying on std::max. Don’t include <algorithm.h>; no longer needed. 2019-10-17 Paul Eggert <eggert@cs.ucla.edu> regen 2019-10-17 Paul Eggert <eggert@cs.ucla.edu> tests: port to Solaris 10 grep * tests/scanner.at (Token numbers: $1): Use $EGREP, not grep -E. 2019-10-17 Paul Eggert <eggert@cs.ucla.edu> tests: port to Solaris 10 sed As documented in the Autoconf manual, Solaris 10 sed rejects script labels contianing more than 7 characters. POSIX requires support for at least 8 characters, but we might as well be portable to Solaris 10 which is still supported. * tests/local.at (AT_SETS_CHECK): Use only the first 7 characters in sed labels. 2019-10-17 Paul Eggert <eggert@cs.ucla.edu> bison: check for int overflow in token numbers * src/symtab.c: Include intprops.h (symbol_user_token_number_set): Don’t allow user_token_number == INT_MAX because too much other code adds 1 to the user token number. (symbols_token_translations_init): Complain on integer overflow instead of indulging in undefined behavior. 2019-10-17 Paul Eggert <eggert@cs.ucla.edu> bison: check for int overflow when scanning * src/scan-gram.l: Include errno.h, for errno. (scan_integer, handle_syncline): Check for integer overflow. * tests/input.at (too-large.y): Adjust to match new diagnostics. 2019-10-17 Paul Eggert <eggert@cs.ucla.edu> bison: check version numbers more carefully * src/parse-gram.y: Include intprops.h. (handle_require): Don’t indulge in undefined behavior if the major or minor number is out of range. Instead, check that the resulting value is nonnegative, fits in int, and that the minor number is less than 100. Also, check that a number was parsed. 2019-10-17 Paul Eggert <eggert@cs.ucla.edu> c: port YY_ATTRIBUTE_UNUSED to Sun C 5.12 Sun C 5.12 defines __SUNPRO_C to 0x5120 but diagnoses ‘__attribute__ ((__unused__))’. Change the ifdefs to use the same method as Gnulib in this area. * data/skeletons/c.m4 (YY_ATTRIBUTE): Remove, since not all attributes were added in the same compiler version. (YY_ATTRIBUTE_PURE, YY_ATTRIBUTE_UNUSED): Use specific GCC version for each attribute. Pay no attention to __SUNPRO_C. * tests/headers.at (Several parsers): Tighten tests accordingly. 2019-10-17 Paul Eggert <eggert@cs.ucla.edu> c: improve port of stdint.h usage to pre-C99 Oracle Solaris Studio 12.3 (Sun C 5.12 2011/11/16) by default does not conform to C99; it defines __STDC_VERSION__ to be 199409L, so the Bison code does not include <stdint.h> (not required by C89 amendment 1) even though this compiler does have <stdint.h>. On this platform <limits.h> defines INT_LEAST8_MAX (POSIX allows this) so the skeleton got confused and thought that <stdint.h> had been included even though it wasn’t. * data/skeletons/c.m4 (b4_c99_int_type_define) [!__PTRDIFF_MAX__]: Always include <limits.h>. (YY_STDINT_H): Define when <stdint.h> was included. All uses of expressions like ‘defined INT_LEAST8_MAX’ changed to ‘defined YY_STDINT_H’, since Sun C 5.12 <limits.h> defines macros like INT_LEAST8_MAX but does not declare types like int_least8_t. 2019-10-17 Paul Eggert <eggert@cs.ucla.edu> gnulib:update 2019-10-17 Paul Eggert <eggert@cs.ucla.edu> autoconf:update 2019-10-15 Akim Demaille <akim.demaille@gmail.com> TODO: more updates 2019-10-15 Akim Demaille <akim.demaille@gmail.com> TODO: update 2019-10-15 Akim Demaille <akim.demaille@gmail.com> yacc: rename types for states * data/skeletons/yacc.c (yy_state_num): Rename as... (yy_state_t): this. (yy_state_fast_t): New. Use it. 2019-10-15 Akim Demaille <akim.demaille@gmail.com> glr: style changes * data/skeletons/glr.c (yytnamerr): here. (yyprocessOneStack): Initialize variables. 2019-10-15 Akim Demaille <akim.demaille@gmail.com> yacc: style changes * data/skeletons/yacc.c: Move call to lac discard to clarify the shifting of the token. Like in lalr1.cc. 2019-10-15 Akim Demaille <akim.demaille@gmail.com> tests: avoid $(...) Reported by Paul Eggert. * tests/local.at (AT_DATA_NO_FINAL_EOL): here. 2019-10-14 Akim Demaille <akim.demaille@gmail.com> tests: use a portable 'truncate' implementation Suggested by Paul Eggert. https://lists.gnu.org/archive/html/bison-patches/2019-10/msg00044.html * tests/local.at (AT_DATA_NO_FINAL_EOL): Use dd instead of perl. 2019-10-13 Akim Demaille <akim.demaille@gmail.com> tests: factor the generation of files without the final eol AFAICT Autotest 2.69 still does not support AT_DATA without the final eol. * tests/local.at (AT_DATA_NO_FINAL_EOL): New. * tests/input.at: Use it. 2019-10-13 Akim Demaille <akim.demaille@gmail.com> tests: refactor the handling of Perl Let's make a difference between places where Perl is required for the test (AT_PERL_REQUIRE), and the places where it's used to run the test, but it's not not to run the test (AT_PERL_CHECK). * tests/local.at (AT_REQUIRE): New. (AT_PERL_CHECK, AT_PERL_REQUIRE): New. Use them where appropriate. * tests/local.mk ($(TESTSUITE)): Beware not to start the line with '-pi' if Perl is empty, as Make understands this as "it's ok to fail". Which it is not. 2019-10-12 Akim Demaille <akim.demaille@gmail.com> d: comment changes * data/skeletons/lalr1.d: Here. 2019-10-12 Akim Demaille <akim.demaille@gmail.com> i18n: don't push too hard for '…' Suggested by Paul Eggert. * src/location.c (ellipsis): Clarify comment for translators. 2019-10-11 Akim Demaille <akim.demaille@gmail.com> regen 2019-10-11 Akim Demaille <akim.demaille@gmail.com> glr: display line numbers in traces Suggested by Lars Maier. * data/skeletons/glr.c: Also display rule locations when rules are deferred, and rejected. 2019-10-11 Akim Demaille <akim.demaille@gmail.com> tests: be really robust to Perl missing My previous tests (with ./configure PERL=false) have been fooled by configure, that managed to find perl anyway. This time, I ran this on a Fedora in Docker, without Perl. * tests/calc.at, tests/diagnostics.at, tests/headers.at, * tests/input.at, tests/local.at, tests/named-refs.at, * tests/output.at, tests/regression.at, tests/skeletons.at, * tests/synclines.at, tests/torture.at: Don't require Perl. 2019-10-10 Akim Demaille <akim.demaille@gmail.com> configure: perl is not required But it's used in various places, including in some tests. * configure.ac: here. 2019-10-10 Akim Demaille <akim.demaille@gmail.com> news: update 2019-10-10 Akim Demaille <akim.demaille@gmail.com> diagnostics: prefer "…" to "..." if the locale supports it * src/location.c (ellipsis, ellipsize): New. Use them. 2019-10-10 Paul Eggert <eggert@cs.ucla.edu> c: improve patch for UCHAR_MAX etc. problem * data/skeletons/c.m4 (b4_c99_int_type_define): Reorder to put the signed types first, since they’re simpler and this keeps similar code closer. For signed types, don’t bother checking whether the type promotes to int since the type must be signed anyway. For unsigned types, protect a test like ‘UCHAR_MAX <= INT_MAX’ with ‘!defined __UINT_LEAST8_MAX__’, as otherwise the logic is wrong for oddball platforms; and once we do that, there should no need for ‘defined INT_MAX’ so remove that. 2019-10-10 Akim Demaille <akim.demaille@gmail.com> tests: do not depend on config.h Currently we face test suite failures in different environments, because of a conflict between the definitions of isnan by gnulib, and by the C++ library: 262. headers.at:186: testing Sane headers: %locations %debug c++ ... ./headers.at:186: COLUMNS=1000; export COLUMNS; bison --color=no -fno-caret -d -o input.cc input.y ./headers.at:186: $CXX $CXXFLAGS $CPPFLAGS -c -o input.o input.cc stderr: In file included from /usr/include/c++/4.8.2/cmath:44:0, from /usr/include/c++/4.8.2/random:38, from /usr/include/c++/4.8.2/bits/stl_algo.h:65, from /usr/include/c++/4.8.2/algorithm:62, from location.hh:41, from input.hh:90, from input.cc:50: /u/cs/fac/eggert/src/gnu/bison/lib/math.h: In function 'bool isnan(double)': /u/cs/fac/eggert/src/gnu/bison/lib/math.h:2849:1: error: new declaration 'bool isnan(double)' _GL_MATH_CXX_REAL_FLOATING_DECL_2 (isnan, isnan, bool) ^ In file included from /usr/include/features.h:375:0, from /usr/include/c++/4.8.2/x86_64-redhat-linux/bits/os_defines.h:39, from /usr/include/c++/4.8.2/x86_64-redhat-linux/bits/c++config.h:2097, from /usr/include/c++/4.8.2/cstdlib:41, from input.hh:48, from input.cc:50: /usr/include/bits/mathcalls.h:235:1: error: ambiguates old declaration 'int isnan(double)' __MATHDECL_1 (int,isnan,, (_Mdouble_ __value)) __attribute__ ((__const__)); ^ There might be something to do in gnulib about this, but I believe that gnulib should not be used in the test suite in the first place. The test suite should work with other compilers than the one used to compile the package. For a start, Bison sources are more demanding (C99) than the generated parsers. Last time I tried, tcc for example, was not able to compile Bison, yet our generated parsers should compile cleanly with it. Besides the problem at hand is with the C++ compiler, with is not the one used to set up gnulib at configuration-time (config.h is mainly built from probing the C compiler). We should really not depend on gnulib in tests. This was introduced in 2001 to check whether including stdlib.h/string.h is safe thanks to STDC_HEADERS (2ce1014469742b5c6618daf8506b69e38787c7d5). Today, we assume at least a C90 compiler, it should be safe enough. * tests/local.at, tests/testsuite.h: Do not include config.h. * tests/atlocal.in (conftest.cc): Likewise. (CPPFLAGS): Do not expose lib/, as because of this we might picked up gnulib replacement headers for system headers. * tests/input.at: Use int instead of ptrdiff_t, for easier portability (some machine on the CI did not find ptrdiff_t). * tests/c++.at: Add missing include for getchar. 2019-10-10 Akim Demaille <akim.demaille@gmail.com> doc: spell check * doc/bison.texi: Remove the index about yyoutput, it is no longer documented. Spell check. 2019-10-10 Akim Demaille <akim.demaille@gmail.com> tests: style changes * tests/actions.at: Prefer printf to fprintf. Prefer yyo to yyoutput in %printer. 2019-10-10 Akim Demaille <akim.demaille@gmail.com> tests: formatting changes * tests/actions.at, tests/local.at: here. 2019-10-10 Akim Demaille <akim.demaille@gmail.com> tests: add missing includes * tests/actions.at, tests/c++.at, tests/headers.at, * tests/regression.at: here. 2019-10-10 Akim Demaille <akim.demaille@gmail.com> c: don't assume that UCHAR_MAX, etc. are defined A number of portability issues with GCC 4.6 .. 4.9 (inclusive): input.c:184:7: error: "UCHAR_MAX" is not defined [-Werror=undef] #elif UCHAR_MAX <= INT_MAX ^ input.c:184:20: error: "INT_MAX" is not defined [-Werror=undef] #elif UCHAR_MAX <= INT_MAX ^ input.c:202:7: error: "USHRT_MAX" is not defined [-Werror=undef] #elif USHRT_MAX <= INT_MAX ^ input.c:202:20: error: "INT_MAX" is not defined [-Werror=undef] #elif USHRT_MAX <= INT_MAX ^ * data/skeletons/c.m4 (b4_c99_int_type_define): Don't assume they are defined. 2019-10-09 Akim Demaille <akim.demaille@gmail.com> configure: don't require Flex Flex should not be required to build Bison or run the test suite (of course it is needed for maintaining Bison). Yet the Automake conditional FLEX_WORKS does not work. * m4/flex.m4 (_AC_PROG_LEX_YYTEXT_DECL): Since this is called conditionally, don't define LEX_IS_FLEX here, but rather... (AC_PROG_LEX): here. * configure.ac: Be more cautious about possibly undefined variables. 2019-10-07 Paul Eggert <eggert@cs.ucla.edu> Move the integer-type selection into c.m4 That way, glr.c can use it too. * data/skeletons/c.m4 (b4_int_type): Do not special-case ‘char’; it’s not worth the trouble, as clang complains about char subscripts. (b4_c99_int_type, b4_c99_int_type_define): New macros, taken from yacc.c. * data/skeletons/glr.c: Use b4_int_type_define. * data/skeletons/yacc.c (b4_int_type): Remove, since there’s no longer any need to redefine it. Use b4_c99_int_type_define rather than its body. 2019-10-07 Paul Eggert <eggert@cs.ucla.edu> Use “least” types for integers in Yacc tables This changes the Yacc skeleton to use “least” integer types to keep tables smaller on some platforms, which should lessen cache pressure. Since Bison uses the Yacc skeleton, it follows suit. * data/skeletons/yacc.c: Include limits.h and stdint.h if this seems to be needed. (yytype_uint8, yytype_int8, yytype_uint16, yytype_int16): If available, use GCC predefined macros __INT_MAX__ etc. to select a “least” type, as this avoids namespace hassles. Otherwise, if available fall back on selecting a “least” type via the C99 macros INT_MAX, INT_LEAST8_MAX, etc. Otherwise, fall further back on one of the builtin C99 types signed char, short, and int. Make sure that any selected type promotes to int. Ignore any macros YYTYPE_INT16, YYTYPE_INT8, YYTYPE_UINT16, YYTYPE_UINT8 defined by the user. (ptrdiff_t, PTRDIFF_MAX): Simplify in the light of the above. (yytype_uint8, yytype_uint16): Do not assume that unsigned char and unsigned short promote to int, as this isn’t true on some platforms (e.g., TI TMS320C55x). * src/parse-gram.y (YYTYPE_INT16, YYTYPE_INT8, YYTYPE_UINT16) (YYTYPE_UINT8): Remove, as these are no longer effective. 2019-10-06 Paul Eggert <eggert@cs.ucla.edu> Port better to C++ platforms * data/skeletons/yacc.c (YYPTRDIFF_T, YYPTRDIFF_MAXIMUM): Default to long, not int. (yy_lac_stack_realloc, yy_lac, yytnamerr, yyparse): Avoid casts to YYPTRDIFF_T that were masking the problem. 2019-10-06 Paul Eggert <eggert@cs.ucla.edu> Work around GCC 4.8 false alarms without casts * data/skeletons/yacc.c (yyparse): Initialize yyes_capacity with a signed expression. * tests/local.at (AT_YYLEX_DEFINE(c)): Use enum to avoid cast. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> regen 2019-10-06 Akim Demaille <akim.demaille@gmail.com> tests: make recheck * tests/local.mk (recheck): New. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> diagnostics: also show suggested %empty * src/reader.c (grammar_rule_check_and_complete): Suggest to add %empty. * tests/actions.at, tests/diagnostics.at: Adjust expectations. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> diagnostics: sort symbols per location Because the checking of the grammar is made by phases after the whole grammar was read, we sometimes have diagnostics that look weird. In some case, within one type of checking, the entities are not checked in the order in which they appear in the file. For instance, checking symbols is done on the list of symbols sorted by tag: foo.y:1.20-22: warning: symbol BAR is used, but is not defined as a token and has no rules [-Wother] 1 | %destructor {} QUX BAR | ^~~ foo.y:1.16-18: warning: symbol QUX is used, but is not defined as a token and has no rules [-Wother] 1 | %destructor {} QUX BAR | ^~~ Let's sort them by location instead: foo.y:1.16-18: warning: symbol 'QUX' is used, but is not defined as a token and has no rules [-Wother] 1 | %destructor {} QUX BAR | ^~~ foo.y:1.20-22: warning: symbol 'BAR' is used, but is not defined as a token and has no rules [-Wother] 1 | %destructor {} QUX BAR | ^~~ * src/location.h (location_cmp): Be robust to empty file names. * src/symtab.c (symbol_cmp): Sort by location. * tests/input.at: Adjust expectations. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> diagnostics: suggest fixes for undeclared symbols From input.y:1.17-19: warning: symbol baz is used, but is not defined as a token and has no rules [-Wother] 1 | %printer {} foo baz | ^~~ to input.y:1.17-19: warning: symbol 'baz' is used, but is not defined as a token and has no rules; did you mean 'bar'? [-Wother] 1 | %printer {} foo baz | ^~~ | bar * bootstrap.conf: We need fstrcmp. * src/symtab.c (symbol_from_uniqstr_fuzzy): New. (complain_symbol_undeclared): Use it. * tests/diagnostics.at (Suggestions): New. * data/bison-default.css (insertion): Rename as... (fixit-insert): this, as this is what GCC uses. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> style: isolate complain_symbol_undeclared * src/symtab.c (complain_symbol_undeclared): New. Use it. Use quote on the guilty symbol (like GCC does, and we also do elsewhere). * tests/input.at: Adjust. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> style: simplify the handling of symbol and semantic_type tables Both are stored in a hash, and back in the days, we used to iterate over these tables using hash_do_for_each. However, the order of traversal was not deterministic, which was a nuisance for deterministic output (and therefore also a problem for tests). So at some point (83b60c97ee1f98bb1f15ffa38acdc4cc765515f5) we generated a sorted list of these symbols, and symbols_do actually iterated on that list. But we kept the constraints of using hash_do_for_each, which requires a lot of ceremonial code, and makes it hard/unnatural to preserve data between iterations (see the next commit). Alas, this is C, not C++. Let's remove this abstraction, and directly iterate on the sorted tables. * src/symtab.c (symbols_do): Remove. Adjust callers to use a simple for-loop instead. (table_sort): New. (symbols_check_defined): Use it. (symbol_check_defined_processor, symbol_pack_processor) (semantic_type_check_defined_processor, symbol_translation_processor): Remove. Simplify the corresponding functions (that no longer need to return a bool). 2019-10-06 Akim Demaille <akim.demaille@gmail.com> diagnostics: display suggested update after the caret-info This commit adds the suggestion in green, on the line below the caret-and-tildes. foo.y:1.1-14: warning: deprecated directive: '%error-verbose', use '%define parse.error verbose' [-Wdeprecated] 1 | %error-verbose | ^~~~~~~~~~~~~~ | %define parse.error verbose The current approach, with location_caret_suggestion, is fragile: there's a protocol of calls to the complain functions which is strict. We should rather have a richer structure describing the diagnostics, including with submessages such as the suggestions, passed in the end to the routines in charge of formatting and printing them. * src/location.h, src/location.c (location_caret_suggestion): New. * src/complain.c (deprecated_directive): Use it. * tests/diagnostics.at, tests/input.at: Adjust expectations. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> diagnostics: isolate caret_set_column * src/location.c (caret_info): Add width and skip members. (caret_set_column): New. Use it. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> diagnostics: isolate caret_set_file * src/location.c (caret_set_file): New. Store the current line's length in caret_info.line_len. Pay attention to fseek's return value. Extracted from... (location_caret): here. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> tests: use tput to get the number of columns * tests/bison.in: here. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> TODO: update I no longer agree with that item, there are indeed two things to report: lack of definition, and being useless. We could have either one without the other, they are not directly related. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> yacc.c: work around warnings from G++ 4.8 input.c: In function 'int yyparse()': input.c: error: conversion to 'long int' from 'long unsigned int' may change the sign of the result [-Werror=sign-conversion] yyes_capacity = sizeof yyesa / sizeof *yyes; ^ cc1plus: all warnings being treated as errors * data/skeletons/yacc.c: here. 2019-10-06 Akim Demaille <akim.demaille@gmail.com> yacc.c: work around warnings from Clang++ 3.3 and 3.4 When we run the test suite with these C++ compilers to compile C code, we get: 239. synclines.at:440: testing syncline escapes: yacc.c ... ../../tests/synclines.at:440: $CC $CFLAGS $CPPFLAGS \"\\\"\".c -o \"\\\"\" || exit 77 stderr: stdout: ../../tests/synclines.at:440: COLUMNS=1000; export COLUMNS; bison --color=no -fno-caret -o \"\\\"\".c \"\\\"\".y ../../tests/synclines.at:440: $CC $CFLAGS $CPPFLAGS $LDFLAGS -o \"\\\"\" \"\\\"\".c $LIBS stderr: "\"".c:1102:41: error: implicit conversion loses integer precision: 'long' to 'int' [-Werror,-Wshorten-64-to-32] YYPTRDIFF_T yysize = yyssp - yyss + 1; ~~~~~~ ~~~~~~~~~~~~~^~~ 1 error generated. 193. conflicts.at:545: testing parse.error=verbose and consistent errors: lr.type=canonical-lr parse.lac=full ... input.c:737:75: error: implicit conversion loses integer precision: 'long' to 'int' [-Werror,-Wshorten-64-to-32] YYPTRDIFF_T yysize_old = *yytop == yytop_empty ? 0 : *yytop - *yybottom + 1; ~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~^~~ input.c:901:48: error: implicit conversion loses integer precision: 'long' to 'int' [-Werror,-Wshorten-64-to-32] YYPTRDIFF_T yysize = yyesp - *yyes + 1; ~~~~~~ ~~~~~~~~~~~~~~^~~ * data/skeletons/yacc.c: Add more casts. 2019-10-05 Akim Demaille <akim.demaille@gmail.com> tests: avoid a GCC 4.8 warning GCC 4.8 reports: input.y:57:33: error: conversion to 'int' from 'long unsigned int' may alter its value [-Werror=conversion] int input_elts = sizeof input / sizeof input[0]; ^ * tests/local.at (AT_YYLEX_DEFINE(c)): Add a cast (sorry, Paul!). 2019-10-05 Paul Eggert <eggert@cs.ucla.edu> * data/skeletons/glr.c (yysplitStack): Pacify Clang 8. 2019-10-05 Paul Eggert <eggert@cs.ucla.edu> Avoid quiet conversion of pointer to bool * src/location.c (caret_set_file): * src/scan-code.l (contains_dot_or_dash): Do not quietly convert pointer to bool, as Oracle Developer Studio 12.6 complains and it is arguably confusing style anyway. 2019-10-05 Paul Eggert <eggert@cs.ucla.edu> Port ARGMATCH_DEFINE_GROUP calls to C99 * src/complain.c, src/getargs.c: Omit ‘;’ after call to ARGMATCH_DEFINE_GROUP, as C99 does not allow ‘;’ there. 2019-10-05 Paul Eggert <eggert@cs.ucla.edu> Port lexcalc scan.l to Solaris 10 * examples/c/lexcalc/scan.l: Include errno.h. 2019-10-05 Akim Demaille <akim.demaille@gmail.com> yacc.c: use casts instead of pragmas when losing integer width For instance with Clang 4, 8, etc.: input.c:1166:12: error: implicit conversion loses integer precision: 'int' to 'yy_state_num' (aka 'signed char') [-Werror,-Wconversion] *yyssp = yystate; ~ ^~~~~~~ And GCC 8: input.c:1166:12: error: implicit conversion loses integer precision: 'int' to 'yy_state_num' (aka 'signed char') [-Werror,-Wimplicit-int-conversion] *yyssp = yystate; ~ ^~~~~~~ * data/skeletons/yacc.c (YY_CONVERT_INT_BEGIN): Remove. Adjust callers. 2019-10-04 Akim Demaille <akim.demaille@gmail.com> yacc.c: fix warnings about undefined macros For instance with GCC 4.9 and --enable-gcc-warnings: 25. input.at:1201: testing Torturing the Scanner ... ../../tests/input.at:1344: $CC $CFLAGS $CPPFLAGS -c -o input.o input.c stderr: input.c:239:18: error: "__STDC_VERSION__" is not defined [-Werror=undef] # elif 199901 <= __STDC_VERSION__ ^ input.c:256:18: error: "__STDC_VERSION__" is not defined [-Werror=undef] # elif 199901 <= __STDC_VERSION__ ^ * data/skeletons/yacc.c: Check that __STDC_VERSION__ is defined before using it. 2019-10-04 Akim Demaille <akim.demaille@gmail.com> tests: check more state numbers * tests/torture.at (State number type): Also check 128, 129 and 32768. 2019-10-03 Paul Eggert <eggert@cs.ucla.edu> * doc/bison.texi (Table of Symbols): Mention memory exhaustion. 2019-10-03 Paul Eggert <eggert@cs.ucla.edu> Simplify mfcalc error handling * doc/bison.texi (Mfcalc Symbol Table, Mfcalc Lexer): Don’t abort on memory allocation failure or integer overflow. Instead, comment that these things aren’t checked for. 2019-10-03 Akim Demaille <akim.demaille@gmail.com> c++: fix comments suggesting to use %require * data/skeletons/location.cc, data/skeletons/stack.hh: Here. 2019-10-03 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: simplify uses of size_t * data/skeletons/stack.hh (stack::index_type): New type. (stack::size, stack::operator[]): Be about an index_type rather than a size_type and an int. 2019-10-03 Akim Demaille <akim.demaille@gmail.com> c++: fixes for old compilers On the CI with GCC 6: examples/c++/calc++/parser.cc:845:5: error: 'ptrdiff_t' was not declared in this scope ptrdiff_t yycount = 0; ^~~~~~~~~ examples/c++/calc++/parser.cc:845:5: note: suggested alternatives: /usr/include/x86_64-linux-gnu/c++/6/bits/c++config.h:202:28: note: 'std::ptrdiff_t' typedef __PTRDIFF_TYPE__ ptrdiff_t; ^~~~~~~~~ * data/skeletons/lalr1.cc: Qualify ptrdiff_t and size_t with std::. 2019-10-03 Akim Demaille <akim.demaille@gmail.com> tests: be robust to -DNDEBUG input.y: In function 'yylex': input.y:67:7: error: unused variable 'input_elts' [-Werror=unused-variable] int input_elts = sizeof input / sizeof input[0]; ^~~~~~~~~~ cc1: all warnings being treated as errors * tests/input.at, tests/local.at: Avoid that. 2019-10-03 Akim Demaille <akim.demaille@gmail.com> CI: remove the symlink before creating it Currently we fail if we rerun a job that succeeded to push the tarball. 2019-10-03 Paul Eggert <eggert@cs.ucla.edu> Adjust ‘Big horizontal’ test case * tests/torture.at (Big horizontal): Adjust to recent changes with integers. If there are states 0..256, Bison now uses a signed rather than an unsigned 16-bit integer. 2019-10-03 Paul Eggert <eggert@cs.ucla.edu> regen 2019-10-03 Paul Eggert <eggert@cs.ucla.edu> Prefer signed to unsigned integers This patch contains more fixes to prefer signed to unsigned integer types, as modern tools like 'gcc -fsanitize=undefined' can check for signed integer overflow but not unsigned overflow. * NEWS: Document the API change. * boostrap.conf (gnulib_modules): Add intprops. * data/skeletons/glr.c: Include stddef.h and stdint.h, since this skeleton can assume C99 or later. (YYSIZEMAX): Now signed, and the minimum of SIZE_MAX and PTRDIFF_MAX. (yybool) [!__cplusplus]: Now signed (which is how bool behaves). (YYTRANSLATE): Avoid use of unsigned, and make the macro safe even for values greater than UINT_MAX. (yytnamerr, struct yyGLRState, struct yyGLRStateSet, struct yyGLRStack) (yyaddDeferredAction, yyinitStateSet, yyinitGLRStack) (yyexpandGLRStack, yymarkStackDeleted, yyremoveDeletes) (yyglrShift, yyglrShiftDefer, yy_reduce_print, yydoAction) (yyglrReduce, yysplitStack, yyreportTree, yycompressStack) (yyprocessOneStack, yyreportSyntaxError, yyrecoverSyntaxError) (yyparse, yy_yypstack, yypstack, yypdumpstack): * tests/input.at (Torturing the Scanner): Prefer ptrdiff_t to size_t. * data/skeletons/c++.m4 (b4_yytranslate_define): * src/AnnotationList.c (AnnotationList__computePredecessorAnnotations): * src/AnnotationList.h (AnnotationIndex): * src/InadequacyList.h (InadequacyListNodeCount): * src/closure.c (closure_new): * src/complain.c (error_message, complains, complain_indent) (complain_args, duplicate_directive, duplicate_rule_directive): * src/gram.c (nritems, ritem_print, grammar_dump): * src/ielr.c (ielr_compute_ritem_sees_lookahead_set) (ielr_item_has_lookahead, ielr_compute_annotation_lists) (ielr_compute_lookaheads): * src/location.c (columns, boundary_print, location_print): * src/muscle-tab.c (muscle_percent_define_insert) (muscle_percent_define_check_values): * src/output.c (prepare_rules, prepare_actions): * src/parse-gram.y (id, handle_require): * src/reader.c (record_merge_function_type, packgram): * src/reduce.c (nuseless_productions, nuseless_nonterminals) (inaccessable_symbols): * src/relation.c (relation_print): * src/scan-code.l (variant, variant_table_size, variant_count) (variant_add, get_at_spec, show_sub_message, show_sub_messages) (parse_ref): * src/scan-gram.l (<SC_ESCAPED_STRING,SC_ESCAPED_CHARACTER>) (scan_integer, convert_ucn_to_byte, handle_syncline): * src/scan-skel.l (at_complain): * src/symtab.c (complain_symbol_redeclared) (complain_semantic_type_redeclared, complain_class_redeclared) (symbol_class_set, complain_user_token_number_redeclared): * src/tables.c (conflict_tos, conflrow, conflict_table) (conflict_list, save_row, pack_vector): * tests/local.at (AT_YYLEX_DEFINE(c)): Prefer signed to unsigned integer. * data/skeletons/lalr1.cc (yy_lac_check_): * tests/actions.at (_AT_CHECK_PRINTER_AND_DESTRUCTOR): * tests/local.at (AT_YYLEX_DEFINE(c)): Omit now-unnecessary casts. * data/skeletons/location.cc (b4_location_define): * doc/bison.texi (Mfcalc Lexer, C++ position, C++ location): Prefer int to unsigned for line and column numbers. Change example to abort explicitly on memory exhaustion, and fix an off-by-one bug that led to undefined behavior. * data/skeletons/stack.hh (stack::operator[]): Also allow ptrdiff_t indexes. (stack::pop, slice::slice, slice::operator[]): Index arg is now ptrdiff_t, not int. (stack::ssize): New method. (slice::range_): Now ptrdiff_t, not int. * data/skeletons/yacc.c (b4_state_num_type): Remove. All uses replaced by b4_int_type. (YY_CONVERT_INT_BEGIN, YY_CONVERT_INT_END): New macros. (yylac, yyparse): Use them around conversions that -Wconversion would give false alarms about. Omit unnecessary casts. (yy_stack_print): Use int rather than unsigned, and omit a cast that doesn’t seem to be needed here any more. * examples/c++/variant.yy (yylex): * examples/c++/variant-11.yy (yylex): Omit no-longer-needed conversions to unsigned. * src/InadequacyList.c (InadequacyList__new_conflict): Don’t assume *node_count is unsigned. * src/output.c (muscle_insert_unsigned_table): Remove; no longer used. 2019-10-02 Paul Eggert <eggert@cs.ucla.edu> Prefer signed types for indexes in skeletons * NEWS: Mention this. * data/skeletons/c.m4 (b4_int_type): Prefer char if it will do, and prefer signed types to unsigned if either will do. * data/skeletons/glr.c (yy_reduce_print): No need to convert rule line to unsigned long. (yyrecoverSyntaxError): Put action into an int to avoid GCC warning of using a char subscript. * data/skeletons/lalr1.cc (yy_lac_check_, yysyntax_error_): Prefer ptrdiff_t to size_t. * data/skeletons/yacc.c (b4_int_type): Prefer signed types to unsigned if either will do. * data/skeletons/yacc.c (b4_declare_parser_state_variables): (YYSTACK_RELOCATE, YYCOPY, yy_lac_stack_realloc, yy_lac) (yytnamerr, yysyntax_error, yyparse): Prefer ptrdiff_t to size_t. (YYPTRDIFF_T, YYPTRDIFF_MAXIMUM): New macros. (YYSIZE_T): Fix "! defined YYSIZE_T" typo. (YYSIZE_MAXIMUM): Take the minimum of PTRDIFF_MAX and SIZE_MAX. (YYSIZEOF): New macro. (YYSTACK_GAP_MAXIMUM, YYSTACK_BYTES, YYSTACK_RELOCATE) (yy_lac_stack_realloc, yyparse): Use it. (YYCOPY, yy_lac_stack_realloc): Cast to YYSIZE_T to pacify GCC. (yy_reduce_print): Use int instead of unsigned long when int will do. (yy_lac_stack_realloc): Prefer long to unsigned long when either will do. * tests/regression.at: Adjust to these changes. 2019-09-30 Akim Demaille <akim.demaille@gmail.com> yacc: use the most appropriate integral type for state numbers Currently we properly use the "best" integral type for tables, including those storing state numbers. However the variables for state numbers used in yyparse (and its dependencies such as yy_stack_print) still use int16_t invariably. As a consequence, very large models overflow these variables. Let's use the "best" type for these variables too. It turns out that we can still use 16 bits for twice larger automata: stick to unsigned types. However using 'unsigned' when 16 bits are not enough is troublesome and generates tons of warnings about signedness issues. Instead, let's use 'int'. Reported by Tom Kramer. https://lists.gnu.org/archive/html/bug-bison/2019-09/msg00018.html * data/skeletons/yacc.c (b4_state_num_type): New. (yy_state_num): Be computed from YYNSTATES. * tests/linear: New. * tests/torture.at (State number type): New. Use it. 2019-09-30 Akim Demaille <akim.demaille@gmail.com> yacc: introduce a type for states * data/skeletons/yacc.c (yy_state_num): New. Use it for arrays of states. 2019-09-30 Akim Demaille <akim.demaille@gmail.com> style: prefer symbolic values rather than litterals Instead of #define YYPACT_NINF -130 #define yypact_value_is_default(Yystate) \ (!!((Yystate) == (-130))) generate #define YYPACT_NINF (-130) #define yypact_value_is_default(Yyn) \ ((Yyn) == YYPACT_NINF) * data/skeletons/c.m4 (b4_table_value_equals): Add support for $4. * data/skeletons/glr.c, data/skeletons/yacc.c: Use it. Also, use shorter macro argument names, the name of the macro is clear enough. 2019-09-30 Akim Demaille <akim.demaille@gmail.com> style: change misleading macro argument name * data/skeletons/glr.c, data/skeletons/yacc.c (yypact_value_is_default): It does not take a rule number as argument. 2019-09-28 Akim Demaille <akim.demaille@gmail.com> Merge remote-tracking branch 'upstream/maint' * upstream/maint: c++: add copy ctors for compatibility with the IAR compiler CI: show git status CI: disable ICC tests: pass -jN from Make to the test suite quotearg: avoid leaks maint: post-release administrivia 2019-09-27 Akim Demaille <akim.demaille@gmail.com> c++: add copy ctors for compatibility with the IAR compiler Reported by Andreas Damm. https://savannah.gnu.org/support/?110032 * data/skeletons/lalr1.cc (stack_symbol_type::operator=): New overload, const, to please the IAR C++ compiler (version ca 2013). 2019-09-23 Akim Demaille <akim.demaille@gmail.com> CI: show git status 2019-09-23 Akim Demaille <akim.demaille@gmail.com> CI: disable ICC It seems that Intel changed something in their license management. https://github.com/nemequ/icc-travis/issues/15 2019-09-23 Akim Demaille <akim.demaille@gmail.com> tests: pass -jN from Make to the test suite I am sooooo tired of typing "make -j5 TESTSUITEFLAGS=-j5"... Should have done this years ago. * cfg.mk (TESTSUITEFLAGS): here. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> quotearg: avoid leaks Reported by Tomasz Kłoczko. https://lists.gnu.org/archive/html/bug-bison/2019-09/msg00008.html * src/main.c (main): Free quotearg's memory later. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: get the screen width from the terminal * bootstrap.conf: We need winsz-ioctl and winsz-termios. * src/location.c (columns): Use winsize to get the number of columns. Code taken from the GNU Coreutils. * src/location.h, src/location.c (caret_init): New. * src/complain.c (complain_init): Call it. * tests/bison.in: Export COLUMNS so that users of tests/bison can enjoy proper line truncation. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: don't print ellipsis on the caret line From 9 | ...TUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKL | ... ^~~~~~~~~~~~~~~~~~~~~~~~~~ to 9 | ...TUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHI... | ^~~~~~~~~~~~~~~~~~~~~~~~~~ * src/location.c (location_caret): here. * tests/diagnostics.at: Adjust expectations. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: also show truncation at the end of line with "..." From 9 | ...TUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHIJKL | ... ^~~~~~~~~~~~~~~~~~~~~~~~~~ to 9 | ...TUVWXYZ ABCDEFGHIJKLMNOPQRSTUVWXYZ ABCDEFGHI... | ... ^~~~~~~~~~~~~~~~~~~~~~~~~~ * src/location.c (location_caret): here. * tests/diagnostics.at: Adjust expectations. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: check that quoted lines are truncated * tests/diagnostics.at (Screen width: 60 columns, Screen width: 80 columns, Screen width: 200 columns): New tests. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: truncate quoted sources to fit the screen * src/location.c (min_int, columns): New. (location_caret): Compute the line width. Based on it, compute how many columns must be skipped before the quoted location and truncated after, to fit the sceen width. * tests/local.at (AT_QUELL_VALGRIND): Transform into... (AT_SET_ENV_IF, AT_SET_ENV): these. Define COLUMNS to protect the test suite from the user's environment. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: learn how to count column number with multibyte chars So far diagnostics were cheating: in addition to the 'column' field of locations (based on actual screen width per multibyte characters and on tabulation expansion), the scanner sets the 'byte' field. Diagnostics used this byte count to decide where to insert (color) style. We want to be able to truncate the quoted lines when there are too wide to fit the screen. This requires that the diagnostics learn how to count columns, the byte-in-boundary trick no longer works. Bytes are still used for fix-its. * bootstrap.conf: We need mbfile for mbf_getc. * src/location.c (caret_info): We need an mbfile. (caret_set_file): Initialize it. (caret_getc): Convert to mbfile. (location_caret): Instead of relying on the byte position to decide where to insert the color style, count the current column using boundary_compute. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: style: rename member for clariy * src/location.c (caret_info): Now that we no longer have a 'file' member (see previous commit), rename 'source' as 'file'. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: style: use a boundary to track the caret_info * src/location.c (caret_info): Replace file and line with pos, a boundary. This will allow us to use features of the boundary type, such as boundary_compute. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: extract boundary_compute from location_compute The handling of the contributions of the tabulations in the columns is burried inside location_compute. We will soon be willing to use the boundary part of the computation (to compute the current column number each time we read a multibyte char). * src/location.c (boundary_compute): New, extracted from... (location_compute): here. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: style: add caret_set_file To make the following commits easier to read. * src/location.c (caret_set_file): New. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: style: minor changes * src/location.c (location_caret): Factor two branches of an if. 2019-09-22 Akim Demaille <akim.demaille@gmail.com> CI: show git status 2019-09-22 Akim Demaille <akim.demaille@gmail.com> git: update ignores 2019-09-22 Akim Demaille <akim.demaille@gmail.com> git: update ignores 2019-09-21 Akim Demaille <akim.demaille@gmail.com> quotearg: avoid leaks Reported by Tomasz Kłoczko. https://lists.gnu.org/archive/html/bug-bison/2019-09/msg00008.html * src/main.c (main): Free quotearg's memory later. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> tests: pass -jN from Make to the test suite I am sooooo tired of typing "make -j5 TESTSUITEFLAGS=-j5"... Should have done this years ago. * cfg.mk (TESTSUITEFLAGS): here. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> java: handle eof in yytranslate * data/skeletons/lalr1.java (yytranslate_): Handle eof here, as is done in lalr1.cc. * tests/javapush.at: Adjust. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> d: handle eof in yytranslate This changes the traces from Reading a token: Now at end of input. to Reading a token: Next token is token $end (7FFEE56E6474) which is ok. Actually it is even better, as it gives the location when locations are enabled, and is clearer when rules explicitly use the EOF token. * data/skeletons/lalr1.d (yytranslate_): Handle eof here, as is done in lalr1.cc. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> regen 2019-09-14 Akim Demaille <akim.demaille@gmail.com> parser: use api.token.raw * src/parse-gram.y: Here. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> api.token.raw: document it * doc/bison.texi: here. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> api.token.raw: cannot be used with character literals * src/parse-gram.y (CHAR): api.token.raw and character literals are mutually exclusive. * tests/input.at (Character literals and api.token.raw): New. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> api.token.raw: apply to the other skeletons * data/skeletons/c++.m4, data/skeletons/glr.c, * data/skeletons/lalr1.c, data/skeletons/lalr1.java: Add support for api.token.raw. * tests/scanner.at: Check them. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> api.token.raw: check it * tests/local.at (AT_TOKEN_RAW_IF): New. * tests/local.mk: New. Use it. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> api.token.raw: implement Bison used to feature %raw, documented as follows: @item %raw The output file @file{@var{name}.h} normally defines the tokens with Yacc-compatible token numbers. If this option is specified, the internal Bison numbers are used instead. (Yacc-compatible numbers start at 257 except for single character tokens; Bison assigns token numbers sequentially for all tokens starting at 3.) Unfortunately, as far as I can tell, it never worked: token numbers are indeed changed in the generated tables (from external token number to internal), yet the code was still applying the mapping from external token numbers to internal token numbers. This commit reintroduces the feature as it was expected to be. * data/skeletons/bison.m4 (b4_token_format): When api.token.raw is enabled, use the internal token number. * data/skeletons/yacc.c (yytranslate): Don't emit if api.token.raw is enabled. (YYTRANSLATE): Adjust. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> style: tidy yacc.c * data/skeletons/yacc.c: Include 'c.m4' first. Then sort the handling of %define variables. * tests/input.at: Adjust. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> CI: disable ICC It seems that Intel changed something in their license management. https://github.com/nemequ/icc-travis/issues/15 2019-09-14 Akim Demaille <akim.demaille@gmail.com> diagnostics: fix use of complain_indent * src/symtab.c (symbol_class_set): Here. * tests/diagnostics.at, tests/input.at, tests/regression.at: Adjust expectations. 2019-09-14 Akim Demaille <akim.demaille@gmail.com> input: stop treating lone CRs as end-of-lines We used to treat lone CRs (\r, aka ^M) as regular NLs (\n), probably to please Classic MacOS. As of today, it makes more sense to treat \r like a plain white space character. https://lists.gnu.org/archive/html/bison-patches/2019-09/msg00027.html * src/scan-gram.l (no_cr_read): Remove. Instead, use... (eol): this new abbreviation denoting end-of-line. * src/location.c (caret_getc): New. (location_caret): Use it. * tests/diagnostics.at (Carriage return): Adjust expectations. (CR NL): New. 2019-09-12 Akim Demaille <akim.demaille@gmail.com> Merge tag 'v3.4.2' into HEAD bison 3.4.2 * tag 'v3.4.2': (24 commits) version 3.4.2 CI: always uninstall icc news: more bug fixes thanks to Marc Schönefeld diagnostics: beware of unexpected EOF when quoting the source file gnulib: update build: fix distcheck tests: add noexcept to please GCC 9 news: update fix: don't die when EOF token is defined twice tests: check token redeclaration yacc.c: beware of GCC's -Wmaybe-uninitialized glr.c: initialize vector of bools gnulib: update check for memory exhaustion diagnostics: avoid global variables diagnostics: fix invalid error message indentation git: ignore files generated in gnulib-po c++: avoid duplicate definition of YYUSE gnulib: update CI: more compilers ... 2019-09-12 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-09-12 Akim Demaille <akim.demaille@gmail.com> version 3.4.2 * NEWS: Record release date. 2019-09-12 Akim Demaille <akim.demaille@gmail.com> CI: always uninstall icc 2019-09-12 Akim Demaille <akim.demaille@gmail.com> news: more bug fixes thanks to Marc Schönefeld 2019-09-12 Akim Demaille <akim.demaille@gmail.com> diagnostics: beware of unexpected EOF when quoting the source file When the input file contains lone CRs (aka, ^M, \r), the locations see a new line. Diagnostics look only at \n as end-of-line, so sometimes there is an offset in diagnostics. Worse yet: sometimes we loop endlessly waiting for \n to come from a continuous stream of EOF. Fix that: - check for EOF - beware not to call end_use_class if begin_use_class was not called (which would abort). This could happen if the actual line is shorter that the expected one. Prompted by a (private) report from Marc Schönefeld. * src/location.c (location_caret): here. * tests/diagnostics.at (Carriage return): New. 2019-09-11 Akim Demaille <akim.demaille@gmail.com> gnulib: update Contains the creation of the xhash module. https://lists.gnu.org/archive/html/bug-gnulib/2019-09/msg00046.html * src/muscle-tab.c, src/state.c, src/symtab.c, src/uniqstr.c: Use hash_xinitialize. 2019-09-11 Akim Demaille <akim.demaille@gmail.com> build: fix distcheck * configure.ac (gl_LIBOBJS): Adjust so that the generated files are indeed the expected ones. 2019-09-10 Akim Demaille <akim.demaille@gmail.com> diagnostics: beware of unexpected EOF when quoting the source file When the input file contains lone CRs (aka, ^M, \r), the locations see a new line. Diagnostics look only at \n as end-of-line, so sometimes there is an offset in diagnostics. Worse yet: sometimes we loop endlessly waiting for \n to come from a continuous stream of EOF. Fix that: - check for EOF - beware not to call end_use_class if begin_use_class was not called (which would abort). This could happen if the actual line is shorter that the expected one. Prompted by a (private) report from Marc Schönefeld. * src/location.c (location_caret): here. * tests/diagnostics.at (Carriage return): New. 2019-09-10 Akim Demaille <akim.demaille@gmail.com> gnulib: update Contains the creation of the xhash module. https://lists.gnu.org/archive/html/bug-gnulib/2019-09/msg00046.html * src/muscle-tab.c, src/state.c, src/symtab.c, src/uniqstr.c: Use hash_xinitialize. 2019-09-10 Akim Demaille <akim.demaille@gmail.com> build: fix distcheck * configure.ac (gl_LIBOBJS): Adjust so that the generated files are indeed the expected ones. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> tests: add noexcept to please GCC 9 bison/tests/c++.at:552: bison --color=no -fno-caret -o list.cc list.y bison/tests/c++.at:552: $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -o list list.cc $LIBS stderr: gcc9/c++/ext/new_allocator.h: In instantiation of 'void __gnu_cxx::new_allocator<_Tp>::construct(_Up*, _Args&& ...) [with _Up = string; _Args = {string}; _Tp = string]': gcc9/c++/bits/alloc_traits.h:482:2: required from 'static void std::allocator_traits<std::allocator<_CharT> >::construct(std::allocator_traits<std::allocator<_CharT> >::allocator_type&, _Up*, _Args&& ...) [with _Up = string; _Args = {string}; _Tp = string; std::allocator_traits<std::allocator<_CharT> >::allocator_type = std::allocator<string>]' gcc9/c++/bits/stl_uninitialized.h:888:67: required from 'void std::__relocate_object_a(_Tp*, _Up*, _Allocator&) [with _Tp = string; _Up = string; _Allocator = std::allocator<string>]' gcc9/c++/bits/stl_uninitialized.h:920:47: required from '_ForwardIterator std::__relocate_a_1(_InputIterator, _InputIterator, _ForwardIterator, _Allocator&) [with _InputIterator = string*; _ForwardIterator = string*; _Allocator = std::allocator<string>]' gcc9/c++/bits/stl_uninitialized.h:942:37: required from '_ForwardIterator std::__relocate_a(_InputIterator, _InputIterator, _ForwardIterator, _Allocator&) [with _InputIterator = string*; _ForwardIterator = string*; _Allocator = std::allocator<string>]' gcc9/c++/bits/stl_vector.h:430:35: required from 'static constexpr bool std::vector<_Tp, _Alloc>::_S_nothrow_relocate(std::true_type) [with _Tp = string; _Alloc = std::allocator<string>; std::true_type = std::integral_constant<bool, true>]' gcc9/c++/bits/stl_vector.h:446:28: required from 'void std::vector<_Tp, _Alloc>::_M_realloc_insert(std::vector<_Tp, _Alloc>::iterator, _Args&& ...) [with _Args = {const string&}; _Tp = string; _Alloc = std::allocator<string>; std::vector<_Tp, _Alloc>::iterator = __gnu_cxx::__normal_iterator<string*, std::vector<string> >; typename std::_Vector_base<_Tp, _Alloc>::pointer = string*]' gcc9/c++/bits/stl_vector.h:1195:4: required from 'void std::vector<_Tp, _Alloc>::push_back(const value_type&) [with _Tp = string; _Alloc = std::allocator<string>; std::vector<_Tp, _Alloc>::value_type = string]' list.y:126:110: required from here gcc9/c++/bits/vector.tcc:459:44: in 'constexpr' expansion of 'std::vector<string>::_S_use_relocate()' list.y:41:7: error: but 'string::string(string&&)' does not throw; perhaps it should be declared 'noexcept' [-Werror=noexcept] 41 | string (string&& s) | ^~~~~~ * tests/c++.at (Variants): Add noexcept where appropriate. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> tests: add noexcept to please GCC 9 bison/tests/c++.at:552: bison --color=no -fno-caret -o list.cc list.y bison/tests/c++.at:552: $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -o list list.cc $LIBS stderr: gcc9/c++/ext/new_allocator.h: In instantiation of 'void __gnu_cxx::new_allocator<_Tp>::construct(_Up*, _Args&& ...) [with _Up = string; _Args = {string}; _Tp = string]': gcc9/c++/bits/alloc_traits.h:482:2: required from 'static void std::allocator_traits<std::allocator<_CharT> >::construct(std::allocator_traits<std::allocator<_CharT> >::allocator_type&, _Up*, _Args&& ...) [with _Up = string; _Args = {string}; _Tp = string; std::allocator_traits<std::allocator<_CharT> >::allocator_type = std::allocator<string>]' gcc9/c++/bits/stl_uninitialized.h:888:67: required from 'void std::__relocate_object_a(_Tp*, _Up*, _Allocator&) [with _Tp = string; _Up = string; _Allocator = std::allocator<string>]' gcc9/c++/bits/stl_uninitialized.h:920:47: required from '_ForwardIterator std::__relocate_a_1(_InputIterator, _InputIterator, _ForwardIterator, _Allocator&) [with _InputIterator = string*; _ForwardIterator = string*; _Allocator = std::allocator<string>]' gcc9/c++/bits/stl_uninitialized.h:942:37: required from '_ForwardIterator std::__relocate_a(_InputIterator, _InputIterator, _ForwardIterator, _Allocator&) [with _InputIterator = string*; _ForwardIterator = string*; _Allocator = std::allocator<string>]' gcc9/c++/bits/stl_vector.h:430:35: required from 'static constexpr bool std::vector<_Tp, _Alloc>::_S_nothrow_relocate(std::true_type) [with _Tp = string; _Alloc = std::allocator<string>; std::true_type = std::integral_constant<bool, true>]' gcc9/c++/bits/stl_vector.h:446:28: required from 'void std::vector<_Tp, _Alloc>::_M_realloc_insert(std::vector<_Tp, _Alloc>::iterator, _Args&& ...) [with _Args = {const string&}; _Tp = string; _Alloc = std::allocator<string>; std::vector<_Tp, _Alloc>::iterator = __gnu_cxx::__normal_iterator<string*, std::vector<string> >; typename std::_Vector_base<_Tp, _Alloc>::pointer = string*]' gcc9/c++/bits/stl_vector.h:1195:4: required from 'void std::vector<_Tp, _Alloc>::push_back(const value_type&) [with _Tp = string; _Alloc = std::allocator<string>; std::vector<_Tp, _Alloc>::value_type = string]' list.y:126:110: required from here gcc9/c++/bits/vector.tcc:459:44: in 'constexpr' expansion of 'std::vector<string>::_S_use_relocate()' list.y:41:7: error: but 'string::string(string&&)' does not throw; perhaps it should be declared 'noexcept' [-Werror=noexcept] 41 | string (string&& s) | ^~~~~~ * tests/c++.at (Variants): Add noexcept where appropriate. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> news: update 2019-09-08 Akim Demaille <akim.demaille@gmail.com> fix: don't die when EOF token is defined twice With %token EOF 0 EOF 0 we get input.y:3.14-16: warning: symbol EOF redeclared [-Wother] 3 | %token EOF 0 EOF 0 | ^~~ input.y:3.8-10: previous declaration 3 | %token EOF 0 EOF 0 | ^~~ Assertion failed: (nsyms == ntokens + nvars), function check_and_convert_grammar, file /Users/akim/src/gnu/bison/src/reader.c, line 839. Reported by Marc Schönefeld. * src/symtab.c (symbol_user_token_number_set): Register only the first definition of the end of input token. * tests/input.at (Symbol redeclared): Check that case. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> tests: check token redeclaration * src/symtab.c (symbol_class_set): Report previous definitions when redeclared. * tests/input.at (Symbol redeclared): New. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> yacc.c: beware of GCC's -Wmaybe-uninitialized Test 400 (calc.at:773: testing Calculator api.push-pull=both api.pure=full parse.error=verbose %debug %locations %defines api.prefix={calc} %verbose %yacc) fails on the CI with GCC 8 on Bionic: 400. calc.at:773: testing Calculator api.push-pull=both api.pure=full parse.error=verbose %debug %locations %defines api.prefix={calc} %verbose %yacc ... ../../tests/calc.at:773: bison --color=no -fno-caret -Wno-deprecated -o calc.c calc.y ../../tests/calc.at:773: $CC $CFLAGS $CPPFLAGS $LDFLAGS -o calc calc.c calc-lex.c calc-main.c $LIBS stderr: calc.y: In function 'int calcpush_parse(calcpstate*, int, const CALCSTYPE*, CALCLTYPE*)': calc.y:26:20: error: 'yylval.CALCSTYPE::ival' may be used uninitialized in this function [-Werror=maybe-uninitialized] %printer { fprintf (yyo, "%d", $$); } <ival>; ^ calc.c:1272:9: note: 'yylval.CALCSTYPE::ival' was declared here YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); ^~~~~~ cc1plus: all warnings being treated as errors stdout: ../../tests/calc.at:773: exit code was 1, expected 0 400. calc.at:773: 400. Calculator api.push-pull=both api.pure=full parse.error=verbose %debug %locations %defines api.prefix={calc} %verbose %yacc (calc.at:773): FAILED (calc.at:773) * data/skeletons/c.m4 (yy_symbol_value_print): Disable the warning locally. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> glr.c: initialize vector of bools The CI, with CC='gcc-7 -fsanitize=undefined,address -fno-omit-frame-pointer', reports: calc.cc:1652:50: runtime error: load of value 190, which is not a valid value for type 'bool' ../../tests/calc.at:867: cat stderr --- expout 2019-09-05 20:30:37.887257545 +0000 +++ /home/travis/build/bison-3.4.1.72-79a1-dirty/_build/tests/testsuite.dir/at-groups/438/stdout 2019-09-05 20:30:37.887257545 +0000 @@ -1 +1,2 @@ syntax error +calc.cc:1652:50: runtime error: load of value 190, which is not a valid value for type 'bool' 438. calc.at:867: 438. Calculator glr.cc (calc.at:867): FAILED (calc.at:867) The problem is that yylookaheadNeeds is not initialized in yyinitStateSet, and when it is copied, the value is not 0 or 1. * data/skeletons/glr.c (yylookaheadNeeds): Initialize yylookaheadNeeds. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> gnulib: update Contains a fix for https://lists.gnu.org/archive/html/bug-bison/2019-08/msg00016.html. See https://lists.gnu.org/archive/html/bug-gnulib/2019-09/msg00005.html. Reported by 江 祖铭 (Zu-Ming Jiang). 2019-09-08 Akim Demaille <akim.demaille@gmail.com> check for memory exhaustion hash_initialize returns NULL when out of memory. Check for it, and die cleanly instead of crashing. Reported by 江 祖铭 (Zu-Ming Jiang). https://lists.gnu.org/archive/html/bug-bison/2019-08/msg00015.html * src/muscle-tab.c, src/state.c, src/symtab.c, src/uniqstr.c: Check the value returned by hash_initialize. 2019-09-08 László Várady <laszlo.varady93@gmail.com> diagnostics: avoid global variables * src/complain.c (indent_ptr): Remove. (error_message, complains): Take indent as an argument. Adjust callers. 2019-09-08 László Várady <laszlo.varady93@gmail.com> diagnostics: fix invalid error message indentation https://lists.gnu.org/archive/html/bison-patches/2019-08/msg00007.html When Bison is started with a flag that suppresses warning messages, the error_message() function can produce a few gigabytes of indentation because of a dangling pointer. * src/complain.c (error_message): Don't reset indent_ptr here, but... (complain_indent): here. * tests/diagnostics.at (Indentation with message suppression): Check this case. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> git: ignore files generated in gnulib-po Because of them, the CI generates "-dirty" tarballs. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> c++: avoid duplicate definition of YYUSE Reported by Frank Heckenbach. https://lists.gnu.org/archive/html/bug-bison/2019-06/msg00009.html * data/skeletons/lalr1.cc (b4_shared_declarations): Remove the duplicate definition of YYUSE, the other one coming from b4_attribute_define. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> gnulib: update This update brings file from Gettext 0.20, which is not available on the CI yet. .travis.yml: Adjust. Use Bionic now that it's available. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> CI: more compilers * .travis.yml: Bionic is now available, with GCC8. GCC7 sanitizers work, but they are too longer: cover only part 1. Redefine part 1 and part 2 so that part 1 is really the core of the tests: not playing with POSIX and C++ compiler for C code. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> CI: fail fast 2019-09-08 Akim Demaille <akim.demaille@gmail.com> CI: propagate sftp failures * .travis.yml (stage: "compile"): here. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> CI: avoid useless git costs Travis answered favorably to my suggestion to provide a means to disable git clone on some jobs (issue 7542). See https://docs.travis-ci.com/user/customizing-the-build/#disabling-git-clone. * .travis.yml: Disable git globally, enable it for i. the compile job, and ii. the test job on ICC which needs the install-icc.sh script. 2019-09-08 Akim Demaille <akim.demaille@gmail.com> CI: factor * .travis.yml (Clang 7 libc++ and ASAN part 2): Reuse bits from "Clang 7 libc++ and ASAN part 1". 2019-09-08 Akim Demaille <akim.demaille@gmail.com> regen 2019-09-08 Akim Demaille <akim.demaille@gmail.com> gnulib: update Contains a fix for https://lists.gnu.org/archive/html/bug-bison/2019-08/msg00016.html. See https://lists.gnu.org/archive/html/bug-gnulib/2019-09/msg00005.html. Reported by 江 祖铭 (Zu-Ming Jiang). 2019-09-07 Akim Demaille <akim.demaille@gmail.com> fix: don't die when EOF token is defined twice With %token EOF 0 EOF 0 we get input.y:3.14-16: warning: symbol EOF redeclared [-Wother] 3 | %token EOF 0 EOF 0 | ^~~ input.y:3.8-10: previous declaration 3 | %token EOF 0 EOF 0 | ^~~ Assertion failed: (nsyms == ntokens + nvars), function check_and_convert_grammar, file /Users/akim/src/gnu/bison/src/reader.c, line 839. Reported by Marc Schönefeld. * src/symtab.c (symbol_user_token_number_set): Register only the first definition of the end of input token. * tests/input.at (Symbol redeclared): Check that case. 2019-09-07 Akim Demaille <akim.demaille@gmail.com> tests: check token redeclaration * src/symtab.c (symbol_class_set): Report previous definitions when redeclared. * tests/input.at (Symbol redeclared): New. 2019-09-06 Akim Demaille <akim.demaille@gmail.com> glr.c: initialize vector of bools The CI, with CC='gcc-7 -fsanitize=undefined,address -fno-omit-frame-pointer', reports: calc.cc:1652:50: runtime error: load of value 190, which is not a valid value for type 'bool' ../../tests/calc.at:867: cat stderr --- expout 2019-09-05 20:30:37.887257545 +0000 +++ /home/travis/build/bison-3.4.1.72-79a1-dirty/_build/tests/testsuite.dir/at-groups/438/stdout 2019-09-05 20:30:37.887257545 +0000 @@ -1 +1,2 @@ syntax error +calc.cc:1652:50: runtime error: load of value 190, which is not a valid value for type 'bool' 438. calc.at:867: 438. Calculator glr.cc (calc.at:867): FAILED (calc.at:867) The problem is that yylookaheadNeeds is not initialized in yyinitStateSet, and when it is copied, the value is not 0 or 1. * data/skeletons/glr.c (yylookaheadNeeds): Initialize yylookaheadNeeds. 2019-09-06 Akim Demaille <akim.demaille@gmail.com> yacc.c: beware of GCC's -Wmaybe-uninitialized Test 400 (calc.at:773: testing Calculator api.push-pull=both api.pure=full parse.error=verbose %debug %locations %defines api.prefix={calc} %verbose %yacc) fails on the CI with GCC 8 on Bionic: 400. calc.at:773: testing Calculator api.push-pull=both api.pure=full parse.error=verbose %debug %locations %defines api.prefix={calc} %verbose %yacc ... ../../tests/calc.at:773: bison --color=no -fno-caret -Wno-deprecated -o calc.c calc.y ../../tests/calc.at:773: $CC $CFLAGS $CPPFLAGS $LDFLAGS -o calc calc.c calc-lex.c calc-main.c $LIBS stderr: calc.y: In function 'int calcpush_parse(calcpstate*, int, const CALCSTYPE*, CALCLTYPE*)': calc.y:26:20: error: 'yylval.CALCSTYPE::ival' may be used uninitialized in this function [-Werror=maybe-uninitialized] %printer { fprintf (yyo, "%d", $$); } <ival>; ^ calc.c:1272:9: note: 'yylval.CALCSTYPE::ival' was declared here YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); ^~~~~~ cc1plus: all warnings being treated as errors stdout: ../../tests/calc.at:773: exit code was 1, expected 0 400. calc.at:773: 400. Calculator api.push-pull=both api.pure=full parse.error=verbose %debug %locations %defines api.prefix={calc} %verbose %yacc (calc.at:773): FAILED (calc.at:773) * data/skeletons/c.m4 (yy_symbol_value_print): Disable the warning locally. 2019-09-06 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: fix LAC support * data/skeletons/lalr1.cc (ctor): Initialize yy_lac_established_. This is quite painful to write, and ugly to read. 2019-09-06 Akim Demaille <akim.demaille@gmail.com> style: fix comment * tests/atlocal.in: here. 2019-09-06 Akim Demaille <akim.demaille@gmail.com> CI: more compilers * .travis.yml: Bionic is now available, with GCC8. GCC7 sanitizers work, but they are too longer: cover only part 1. Redefine part 1 and part 2 so that part 1 is really the core of the tests: not playing with POSIX and C++ compiler for C code. 2019-09-06 Akim Demaille <akim.demaille@gmail.com> CI: fail fast 2019-09-04 Akim Demaille <akim.demaille@gmail.com> gnulib: update This update brings file from Gettext 0.20, which is not available on the CI yet. .travis.yml: Adjust. Use Bionic now that it's available. 2019-09-01 Akim Demaille <akim.demaille@gmail.com> check for memory exhaustion hash_initialize returns NULL when out of memory. Check for it, and die cleanly instead of crashing. Reported by 江 祖铭 (Zu-Ming Jiang). https://lists.gnu.org/archive/html/bug-bison/2019-08/msg00015.html * src/muscle-tab.c, src/state.c, src/symtab.c, src/uniqstr.c: Check the value returned by hash_initialize. 2019-08-30 Akim Demaille <akim.demaille@gmail.com> news: LAC for C++ 2019-08-29 Akim Demaille <akim.demaille@gmail.com> d: remove useless imports * examples/d/calc.y, tests/calc.at: here. 2019-08-18 László Várady <laszlo.varady93@gmail.com> diagnostics: avoid global variables * src/complain.c (indent_ptr): Remove. (error_message, complains): Take indent as an argument. Adjust callers. 2019-08-18 László Várady <laszlo.varady93@gmail.com> diagnostics: fix invalid error message indentation https://lists.gnu.org/archive/html/bison-patches/2019-08/msg00007.html When Bison is started with a flag that suppresses warning messages, the error_message() function can produce a few gigabytes of indentation because of a dangling pointer. * src/complain.c (error_message): Don't reset indent_ptr here, but... (complain_indent): here. * tests/diagnostics.at (Indentation with message suppression): Check this case. 2019-08-18 Akim Demaille <akim.demaille@gmail.com> c++: use resize to shrink a vector Suggested by Adrian Vogelsgesang. https://lists.gnu.org/archive/html/bison-patches/2019-08/msg00009.html * data/skeletons/lalr1.cc (yy_lac_check_): here. 2019-08-09 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: check LAC support * tests/conflicts.at, tests/input.at, tests/regression.at: here. 2019-08-09 Adrian Vogelsgesang <avogelsgesang@tableau.com> lalr1.cc: add LAC support Implement lookahead correction (LAC) for the C++ skeleton. LAC is a mechanism to make sure that we report the correct list of expected tokens if a syntax error occurs. So far, LAC was only supported for the C skeleton "yacc.c". * data/skeletons/lalr1.cc: Add LAC support. * doc/bison.texi: Update. 2019-08-09 Adrian Vogelsgesang <avogelsgesang@tableau.com> style: readability improvements to yacc.c * data/skeletons/yacc.c (yysyntax_error): Change the nesting of `m4` conditions slightly to make it more readable. The generated C code stays unchanged. 2019-08-09 Adrian Vogelsgesang <avogelsgesang@tableau.com> lalr1.cc: reduce "scope" * data/skeletons/lalr1.cc (yy_lr_goto_state_): Make it static. 2019-08-09 Adrian Vogelsgesang <avogelsgesang@tableau.com> lalr1.cc: fix indentation of table declarations in the header * data/skeletons/lalr1.cc: Fix indentation of table declarations in the generated header. 2019-08-09 Akim Demaille <akim.demaille@gmail.com> tests: prepare LAC tests for more languages * tests/regression.at: Use %expect to avoid warnings. Set the keywords to facilitate running specific tests. Use macros such as AT_YYLEX_DECLARE to facilitate tests for other languages. Likewise for AT_FULL_COMPILE. 2019-08-09 Akim Demaille <akim.demaille@gmail.com> git: ignore files generated in gnulib-po Because of them, the CI generates "-dirty" tarballs. 2019-07-26 Akim Demaille <akim.demaille@gmail.com> diagnostics: use the modern argmatch interface * src/complain.h (warnings): Remove Werror. Adjust dependencies. Sort. Remove useless comments (see the doc in argmatch group). * src/complain.c (warnings_args, warnings_types): Remove. (warning_argmatch): Use argmatch_warning_value. (warnings_print_categories): Use argmatch_warning_argument. 2019-07-19 Akim Demaille <akim.demaille@gmail.com> doc: avoid spurious empty lines in the option table In Texinfo. empty lines in multitable rows generate empty lines in the output. Avoid them altogether. With help from Gavin Smith. https://lists.gnu.org/archive/html/bug-texinfo/2019-07/msg00000.html * build-aux/cross-options.pl: Separate rows with empty lines. So, to be more readable, generate a single line for each row. Use Perl format to this end. 2019-07-07 Akim Demaille <akim.demaille@gmail.com> --fixed-output-files: detach from --yacc See the previous commit. This option should be removed, -o suffices. * src/getargs.c (FIXED_OUTPUT_FILES): New. Add support for it. (getargs): Define loc, and use it. This is safer when we need to pass a pointer to a location. 2019-07-07 Akim Demaille <akim.demaille@gmail.com> %fixed-output-files: detach from %yacc The name fixed-output-files is pretty clear: generate y.tab.c, as Yacc does. So let's detach this from %yacc which does more: it requires POSIX Yacc behavior. This directive is obsolete since December 29th 2001 8c9a50bee13474c1491df8f79f075f5214dda0d1. It does not show in the doc. I don't want to spend more time on improving its diagnostics, it could be removed just as well as far as I'm concerned. * src/scan-gram.l, src/parse-gram.y (%fixed-output-files): Detach from %yacc. 2019-07-07 Akim Demaille <akim.demaille@gmail.com> style: clarify control flow * src/getargs.c (language_argmatch): Initialize msg. Check it instead of relying on a return. 2019-07-07 Akim Demaille <akim.demaille@gmail.com> remove MS-DOS support DJGPP support was dropped in Bison 3.3 (c239e53bab8e87b30889ac446d3b513da9951a35). AS_FILE_NAME was introduced in ae4048011562c250d2f3c96687422d99a38745ce. * src/getargs.c (AS_FILE_NAME): Remove. 2019-07-07 Akim Demaille <akim.demaille@gmail.com> style: declare options in the same order as in --help * src/getargs.c (long_options): here. 2019-07-07 Akim Demaille <akim.demaille@gmail.com> regen 2019-07-07 Akim Demaille <akim.demaille@gmail.com> gnulib: update Contains a fix for argmatch to get proper man pages. See https://lists.gnu.org/archive/html/bug-gnulib/2019-07/msg00038.html 2019-07-07 Akim Demaille <akim.demaille@gmail.com> style: comment change * src/getargs.c: here. 2019-07-07 Akim Demaille <akim.demaille@gmail.com> doc: remove the --report=look-aheads alias Years ago we moved from 'look-ahead' to 'lookahead', and that alias was kept for backward compatibility. But now that we use argmatch to generate the documentation, that value clutters the doc. * src/getargs.c (argmatch_report_args): Remove the --report=look-aheads alias. 2019-07-07 Akim Demaille <akim.demaille@gmail.com> doc: fix inaccuracies wrt --define and --force-define The doc says that -Dfoo=bar is the same as %define foo "bar". It is not: the quotes are not added (and it makes a difference). * doc/bison.texi (Tuning the Parser): Fix the definition of -D/-F * src/getargs.c (usage): Likewise. 2019-07-07 Akim Demaille <akim.demaille@gmail.com> doc: put diagnostics related options together * doc/bison.texi (Diagnostics): New section. Move --warning, --color and --style there. * src/getargs.c (usage): Likewise. 2019-07-07 Akim Demaille <akim.demaille@gmail.com> doc: move -y's documentation into "Tuning the Parser" Let's clarify --help: use clearer "section" names, as in the doc. Move --yacc to where it belongs. * src/getargs.c (usage): Rename "Parser" as "Tuning the Parser", as in the doc. Rename "Output" as "Output Files" Move --yacc to "Tuning the Parser". * doc/bison.texi: Likewise. 2019-07-07 Akim Demaille <akim.demaille@gmail.com> doc: document colorized diagnostics * src/getargs.c (argmatch_color_group): New. (usage): Document --color and --style. * doc/bison.texi (Bison Options): Split into three subsections. Document --color and --style. 2019-07-03 Akim Demaille <akim.demaille@gmail.com> gnulib: use new features of the argmatch module It can now generate the usage message. * src/complain.h (feature_fixit_parsable): Rename as... (feature_fixit): this, for column economy. Adjust dependencies. (warning_usage): New. Use it. * src/complain.h, src/complain.c, src/getargs.h, src/getargs.c: Use ARGMATCH_DEFINE_GROUP instead of the older interface. 2019-07-02 Akim Demaille <akim.demaille@gmail.com> preserve the indentation in the ouput Preserve the actions' initial indentation. For instance, on | %define api.value.type {int} | %% | exp: exp '/' exp { if ($3) | $$ = $1 + $3; | else | $$ = 0; } we used to generate | { if (yyvsp[0]) | yyval = yyvsp[-2] + yyvsp[0]; | else | yyval = 0; } now we produce | { if (yyvsp[0]) | yyval = yyvsp[-2] + yyvsp[0]; | else | yyval = 0; } See https://lists.gnu.org/archive/html/bison-patches/2019-06/msg00012.html. * data/skeletons/bison.m4 (b4_symbol_action): Output the code in column 0, leave indentation matters to the C code. * src/output.c (user_actions_output): Preserve the incoming indentation in the output. (prepare_symbol_definitions): Likewise for %printer/%destructor. * tests/synclines.at (Output columns): New. 2019-07-01 Akim Demaille <akim.demaille@gmail.com> style: prefer passing locations by pointer The code is inconsistent: sometimes we pass by value, sometimes by reference. Let's stick to the last, more conventional for large values in C. * src/scan-code.l: Pass locations by reference. 2019-06-30 Akim Demaille <akim.demaille@gmail.com> c++: avoid duplicate definition of YYUSE Reported by Frank Heckenbach. https://lists.gnu.org/archive/html/bug-bison/2019-06/msg00009.html * data/skeletons/lalr1.cc (b4_shared_declarations): Remove the duplicate definition of YYUSE, the other one coming from b4_attribute_define. 2019-06-27 Akim Demaille <akim.demaille@gmail.com> style: comment changes * examples/c/lexcalc/local.mk, examples/c/reccalc/local.mk: Here. 2019-06-23 Akim Demaille <akim.demaille@gmail.com> tests: restructure for clarity * tests/calc.at (AT_CALC_MAIN, AT_CALC_LEX): Rewrite on top of AT_LANG_DISPATCH. 2019-06-23 Akim Demaille <akim.demaille@gmail.com> d: track locations * configure.ac (DCFLAGS): Pass -g. * data/skeletons/d.m4 (b4_locations_if): Remove, let bison.m4's one do its job. * data/skeletons/lalr1.d (position): Leave filename empty by default. (position::toString): Don't print empty file names. (location::this): New ctor. (location::toString): Match the implementations of C/C++. (yy_semantic_null): Leave undefined, the previous implementation does not compile. * tests/calc.at: Improve the implementation for D. Enable more checks, in particular using locations. * tests/local.at (AT_YYERROR_DEFINE(d)): Fix its implementation. 2019-06-23 Akim Demaille <akim.demaille@gmail.com> d: style changes * data/skeletons/lalr1.d: Use a more traditional quotation scheme. Formatting changes. 2019-06-23 Akim Demaille <akim.demaille@gmail.com> d: put internal details inside the parser Avoid name clashes, etc. * data/skeletons/lalr1.d (YYStackElement, YYStack): Move inside the parser. 2019-06-22 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2019-06-22 Akim Demaille <akim.demaille@gmail.com> remove "experimental" warnings Sadly enough, AFAIK, there were never answers to the "More user feedback will help to stabilize it" sentences. Remove them. * src/getargs.c: IELR, canonical LR and XML output are here to stay, and they are no more experimental than some other features. * doc/bison.texi: Likewise. Also remove "experimental" warning for Java, LAC, LR tuning options, and named references. 2019-06-22 Akim Demaille <akim.demaille@gmail.com> CI: propagate sftp failures * .travis.yml (stage: "compile"): here. 2019-06-20 Akim Demaille <akim.demaille@gmail.com> d: honor %define parse.trace * data/skeletons/lalr1.d: Don't generate debug code if parse.trace is not enabled. 2019-06-20 Akim Demaille <akim.demaille@gmail.com> d: style changes * data/skeletons/lalr1.d: here. 2019-06-20 Akim Demaille <akim.demaille@gmail.com> d: prefer delegation to duplication * data/skeletons/lalr1.d: Delegate the construction of the scanner. 2019-06-20 Akim Demaille <akim.demaille@gmail.com> d: enable #line output * data/skeletons/d.m4 (b4_sync_start): New. 2019-06-20 Akim Demaille <akim.demaille@gmail.com> d: style changes * data/skeletons/lalr1.d: here. * examples/d/calc.y: Remove incorrect support for decimal numbers. Formatting changes. 2019-06-20 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes in glr.c * data/skeletons/glr.c: here. 2019-06-20 Akim Demaille <akim.demaille@gmail.com> java: honor %define parse.trace * data/skeletons/lalr1.java: Don't generate debug code if parse.trace is not enabled. 2019-06-19 Akim Demaille <akim.demaille@gmail.com> java: fix support for api.prefix * data/skeletons/java.m4: here. * tests/java.at: Check it. 2019-06-19 Akim Demaille <akim.demaille@gmail.com> java: style changes * data/skeletons/lalr1.java: Use more conventional function names for Java. Prefer < and <= to => and >. Use the same approach for m4 quotation as in the other skeletons. Fix indentation issues. * tests/calc.at, tests/java.at, tests/javapush.at: Fix quotation style. (main): Use 'args', not 'argv', the former seems more conventional and is used elsewhere in Bison. Prefer character literals to integers to denote characters. * examples/java/Calc.y: Likewise. 2019-06-15 Akim Demaille <akim.demaille@gmail.com> CI: avoid useless git costs Travis answered favorably to my suggestion to provide a means to disable git clone on some jobs (issue 7542). See https://docs.travis-ci.com/user/customizing-the-build/#disabling-git-clone. * .travis.yml: Disable git globally, enable it for i. the compile job, and ii. the test job on ICC which needs the install-icc.sh script. 2019-06-12 Akim Demaille <akim.demaille@gmail.com> style: simplify strings to translate * src/conflicts.c (log_resolution): Don't translate indentation. 2019-06-12 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes, propagate const * src/conflicts.c (conflicts_output): here. 2019-06-12 Akim Demaille <akim.demaille@gmail.com> style: use clearer types * src/conflicts.c (conflicts): Array of Booleans. 2019-06-11 Akim Demaille <akim.demaille@gmail.com> tests: prefer %empty * tests/regression.at: here. 2019-06-09 Akim Demaille <akim.demaille@gmail.com> CI: factor * .travis.yml (Clang 7 libc++ and ASAN part 2): Reuse bits from "Clang 7 libc++ and ASAN part 1". 2019-06-09 Akim Demaille <akim.demaille@gmail.com> lr0: more debug traces * src/lr0.c (kernel_check): New. (new_itemsets, save_reductions): Add traces. 2019-06-09 Akim Demaille <akim.demaille@gmail.com> traces: add some colors This is an experiment. Maybe more styles will be used (in which case a short-hand function will be useful), maybe it will be just reverted. * data/bison-default.css (.traces0): New. * src/lalr.c (lalr): Use it. 2019-06-09 Akim Demaille <akim.demaille@gmail.com> tests: make sure the default action properly works in C++ See e3fdc370495ffdedadd6ac621e32e34a0e1a9de0: in C++ we generate explicitly the code for the default action instead of simply copying blindly the semantic value buffer. This is important when copying raw memory is not enough, as exemplified by move-only types. This is currently tested by examples/c++/variant.yy and variant-11.yy. But it is safer to also have a test in the main test suite. * tests/local.at (AT_REQUIRE_CXX_STD): Fix. (AT_BISON_OPTION_PUSHDEFS, AT_BISON_OPTION_POPDEFS): Define/undefine AT_BISON_OPTIONS. * tests/c++.at (Default action): New. 2019-06-09 Akim Demaille <akim.demaille@gmail.com> tests: main: support -s and -p * tests/local.at (AT_MAIN_DEFINE(c), AT_MAIN_DEFINE(c++)): here. 2019-06-04 Akim Demaille <akim.demaille@gmail.com> tests: remove useless support of '.' in integers * tests/calc.at: here. * doc/bison.texi: Avoid uninitialized variables. 2019-05-29 Akim Demaille <akim.demaille@gmail.com> tests: refactor checks on sets It will be convenient to check sets elsewhere. * tests/sets.at (AT_EXTRACT_SETS): Transform into... * tests/local.at (AT_SETS_CHECK): this. * tests/sets.at: Adjust. 2019-05-29 Akim Demaille <akim.demaille@gmail.com> update-test: some file names have dashes in them * build-aux/update-test (log): Rename as... (trace): this, to avoid clashes with the log variable. (getargs): Clarify the type of the arguments. 2019-05-26 Akim Demaille <akim.demaille@gmail.com> tests: take SHELL into account Reported by Dennis Clarke. http://lists.gnu.org/archive/html/bug-bison/2019-05/msg00053.html * examples/local.mk, tests/local.mk: here. 2019-05-26 Akim Demaille <akim.demaille@gmail.com> gnulib: update to get gnulib translations This update contains a fix needed for gnulib-po to work properly. https://lists.gnu.org/archive/html/bug-gnulib/2019-05/msg00146.html 2019-05-25 Akim Demaille <akim.demaille@gmail.com> doc: clarify the purpose of symbol_type constructors Reported by Frank Heckenbach. http://lists.gnu.org/archive/html/bug-bison/2019-02/msg00006.html * doc/bison.texi (Complete Symbols): Here. 2019-05-22 Akim Demaille <akim.demaille@gmail.com> thanks: fix an address 2019-05-22 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-05-22 Akim Demaille <akim.demaille@gmail.com> version 3.4.1 * NEWS: Record release date. 2019-05-22 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2019-05-20 Akim Demaille <akim.demaille@gmail.com> CI: remove useless apt-get update The apt addons already ran it for us, it is not needed. * .travis.yml: here. 2019-05-20 Akim Demaille <akim.demaille@gmail.com> c++: beware of to_string portability issues Reported by Bruno Haible. http://lists.gnu.org/archive/html/bug-bison/2019-05/msg00033.html * m4/bison-cxx-std.m4 (_BISON_CXXSTD_11_snippet): Check it. 2019-05-20 Akim Demaille <akim.demaille@gmail.com> doc: avoid Texinfo portability issues Reported by Bruno Haible. http://lists.gnu.org/archive/html/bug-bison/2019-05/msg00024.html Fixed by Karl Berry. http://lists.gnu.org/archive/html/bug-bison/2019-05/msg00034.html * doc/bison.texi: Don't specify the langage, rely on the default. Avoid blank pages. 2019-05-19 Akim Demaille <akim.demaille@gmail.com> examples: don't run those that require f?lex when it's not available Reported by Bruno Haible. http://lists.gnu.org/archive/html/bug-bison/2019-05/msg00026.html * configure.ac (FLEX_WORKS): New. * examples/c/lexcalc/local.mk, examples/c/reccalc/local.mk: Use it. 2019-05-19 Akim Demaille <akim.demaille@gmail.com> diagnostics: don't crash when libtextstyle is installed Reported by neok m4700. https://lists.gnu.org/archive/html/bison-patches/2019-05/msg00025.html https://github.com/akimd/bison/pull/11 * src/complain.c (complain_init_color): style_file_prepare _needs_ a string as second argument. 2019-05-19 Akim Demaille <akim.demaille@gmail.com> CI: avoid useless git costs The final gain is small: 2h2min instead 2h9min. But that is still an improvement. * .travis.yml (git.depth): Make the clone very shallow. (git.submodules): Don't clone gnulib in test jobs. (jobs.include.compile.script): Do it here. 2019-05-19 Akim Demaille <akim.demaille@gmail.com> fix: copyable instead of copiable Reported by Frank Heckenbach. http://lists.gnu.org/archive/html/bug-bison/2019-05/msg00020.html * data/skeletons/lalr1.cc, doc/bison.texi: here. 2019-05-19 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-05-19 Akim Demaille <akim.demaille@gmail.com> version 3.4 * NEWS: Record release date. 2019-05-19 Akim Demaille <akim.demaille@gmail.com> fix: use copiable, not copyable Reported by Hans Åberg. http://lists.gnu.org/archive/html/bug-bison/2019-05/msg00017.html * data/skeletons/lalr1.cc, doc/bison.texi: here. 2019-05-19 Akim Demaille <akim.demaille@gmail.com> NEWS: update for 3.4 2019-05-19 Akim Demaille <akim.demaille@gmail.com> tests: adjust to GCC9 diagnostics with a margin * tests/synclines.at (_AT_SYNCLINES_COMPILE): Remove the margin. 2019-05-19 Akim Demaille <akim.demaille@gmail.com> regen 2019-05-19 Akim Demaille <akim.demaille@gmail.com> diagnostics: %pure-parser is obsolete Reported by Uxio Prego. http://lists.gnu.org/archive/html/bug-bison/2018-12/msg00029.html * src/scan-gram.l, src/parse-gram.y (PERCENT_PURE_PARSER) (handle_pure_parser): New. Issue a deprecation/update notice for %pure-parser. * doc/bison.texi (Java Bison Interface): Don't mention %pure-parser. * tests/actions.at, tests/input.at: Adjust. 2019-05-19 Akim Demaille <akim.demaille@gmail.com> diagnostics: clean up convention for colored diagnostics * data/diagnostics.css: Rename as... * data/bison-default.css: this. Add the GPL header. This is the convention followed by Bruno Haible in gettext. Adjust dependencies. * src/complain.c (complain_init_color): Use BISON_STYLE instead of BISON_DIAGNOSTICS_STYLE. 2019-05-19 Akim Demaille <akim.demaille@gmail.com> CI: use a pipeline: first build the tarball, then check it Build the tarball in one job, check it in many. Unfortunately no real gain in overall duration. With help from Clément Démoulins. * .travis.yml: here. Remove all the tricks that were used to be able to boostrap on old distros. (before_install): Merge into 'script', because before_install applies to all the jobs, and we don't want to run it for the 'compile' job. 2019-05-18 Akim Demaille <akim.demaille@gmail.com> examples: fix srcdir/builddir issues * examples/d/local.mk, examples/java/local.mk: here. 2019-05-18 Akim Demaille <akim.demaille@gmail.com> gnulib: update In preparation for Bison 3.4, revert to the version before this commit: commit 03752516b21091cf3c4beea7e8b9bcad462d50ed Author: John Darrington <john@darrington.wattle.id.au> Date: Sun May 12 00:42:36 2019 +0200 version-etc: Ease translation. * lib/version-etc.c (version_etc_arn, emit_bug_reporting_address): Move URLs and formatting newlines out of translatable string. because it changes the messages for --version, translated in gnulib.po. These changes are not yet available on the translation project, so we would have a regression in the set of translated strings. 2019-05-13 Akim Demaille <akim.demaille@gmail.com> build: do not use $< in plain rules It works only in implicit rules (or with GNU Make, but not with Solaris Make). Reported by Bruno Haible. http://lists.gnu.org/archive/html/bug-bison/2019-05/msg00009.html Diagnosed thanks to Kiyoshi Kanazawa. * examples/c/reccalc/local.mk, examples/d/local.mk, * examples/java/local.mk: Don't use $< in non implicit rules. 2019-05-12 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-05-12 Akim Demaille <akim.demaille@gmail.com> version 3.3.91 * NEWS: Record release date. 2019-05-12 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2019-05-12 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2019-05-11 Akim Demaille <akim.demaille@gmail.com> style: remove incorrect comment * src/getargs.c: here. It's documented in getargs.h anyway. 2019-05-09 Akim Demaille <akim.demaille@gmail.com> doc: use colors for diagnostics in TeX too Thanks to Gavin Smith and Patrice Dumas. http://lists.gnu.org/archive/html/help-texinfo/2019-04/msg00015.html * doc/bison.texi (@colorWarning, @colorError, @colorNotice) (@colorOff): Define for TeX and HTML. (@dwarning, @derror, @dnotice): Use them. 2019-05-08 Akim Demaille <akim.demaille@gmail.com> gnulib: update to fix location tracking in UTF-8 on Solaris This update contains Bruno Haible's fix for the location tracking issue reported by Kiyoshi Kanazawa. https://lists.gnu.org/archive/html/bug-gnulib/2019-05/msg00020.html https://lists.gnu.org/archive/html/bug-bison/2019-04/msg00020.html 2019-05-08 Akim Demaille <akim.demaille@gmail.com> diagnostics: rename --style=debug as --color=debug It is more consistent with --color=html, --color=test, etc. * src/getargs.h, src/getargs.c (style_debug): Rename as... (color_debug): this. (getargs_colors): Rename --style=debug as --color=debug. Adjust dependencies. 2019-05-08 Akim Demaille <akim.demaille@gmail.com> diagnostics: support --color=html Based on a message from Bruno Haible. https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commitdiff;h=fe18e92743b7226791a5f28d7c786941a1bf8cc9 This does not generate proper HTML: special characters are not escaped for instance. This is a hidden feature meant for Bison developers, not end users. * src/complain.c (complain_init_color): Support --color=html. 2019-05-08 Akim Demaille <akim.demaille@gmail.com> tests: use %empty instead of comments * tests/c++.at, tests/glr-regression.at: here. 2019-05-08 Akim Demaille <akim.demaille@gmail.com> fixits: sort them before applying them An experimental commit introduced a fix-it hint that changes comments such as "/* empty */" into %empty. But in some case, because diagnostics are not necessarily emitted in order, the fixits also come in disorder, which must never happen, as the fixes are installed in one pass. * src/fixits.c (fixits_register): Insert them in order. 2019-05-04 Akim Demaille <akim.demaille@gmail.com> style: use warning_is_enabled instead of duplicating it * src/complain.c (deprecated_directive): Here. 2019-05-03 Akim Demaille <akim.demaille@gmail.com> fixits: be sure to preserve the action when adding %empty Currently we remove the rhs to install %empty instead. * src/reader.c (grammar_rule_check_and_complete): Insert the missing %empty in front of the rhs, not in replacement thereof. * tests/actions.at (Add missing %empty): Check that. 2019-05-03 Akim Demaille <akim.demaille@gmail.com> tests: don't duplicate the portability prologue * tests/actions.at, tests/input.at: Don't repeat the prologue, skip it. * tests/diagnostics.at, tests/local.at: Comment changes. 2019-05-03 Akim Demaille <akim.demaille@gmail.com> style: use consistently *_loc for locations Some members are called foo_location, others are foo_loc. Stick to the latter. * src/gram.h, src/location.h, src/location.c, src/output.c, * src/parse-gram.y, src/reader.h, src/reader.c, src/reduce.c, * src/scan-gram.l, src/symlist.h, src/symlist.c, src/symtab.h, * src/symtab.c: Use _loc consistently, not _location. 2019-05-03 Akim Demaille <akim.demaille@gmail.com> style: clarify the use of symbol_lists' locations symbol_list features a 'location' and a 'sym_loc' member. The former is expected to be set only for symbol_lists that denote a symbol (not a type name), and the latter should only denote the location of the symbol/type name. Yet both are set, and the name "location" is too unprecise. * src/symlist.h, src/symlist.c (symbol_list::location): Rename as rhs_loc for clarity. Move it to the "section" of data valid only for rules. * src/reader.c, src/scan-code.l: Adjust. 2019-05-03 Akim Demaille <akim.demaille@gmail.com> maint: update gnulib-po/.gitignore 2019-04-29 Akim Demaille <akim.demaille@gmail.com> tests: don't require a D compiler Reported by Kiyoshi Kanazawa. http://lists.gnu.org/archive/html/bug-bison/2019-04/msg00018.html * tests/atlocal.in (BISON_DC_WORKS): New. * tests/local.at (AT_COMPILE_D): Use it. 2019-04-29 Akim Demaille <akim.demaille@gmail.com> doc: use svg instead of png * doc/bison.texi, doc/local.mk: here. 2019-04-29 Akim Demaille <akim.demaille@gmail.com> doc: use colors * doc/bison.texi (dwarning, derror, dnotice): New. Use them in the diagnostics. * doc/local.mk (AM_MAKEINFOFLAGS): Pass customization variables. 2019-04-28 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-04-28 Akim Demaille <akim.demaille@gmail.com> version 3.3.90 * NEWS: Record release date. 2019-04-28 Akim Demaille <akim.demaille@gmail.com> package: add missing CLEANFILES * examples: here. 2019-04-28 Akim Demaille <akim.demaille@gmail.com> build: don't generate the graph reports Revert "build: also generate the graph reports" (4ec413da32760defe1bf382c048d1d2f67e0b58a). The problem is Automake's ylwrap which does not rename y.dot with the appropriate name. We should completely stop using Automake's support for Yacc, which is not something I will do right now. So step back. * Makefile.am (AM_YFLAGS_WITH_LINES): Don't pass --graph. 2019-04-28 Akim Demaille <akim.demaille@gmail.com> package: don't regen the parser during dist if unneeded * Makefile.am (gen-synclines): New. 2019-04-28 Akim Demaille <akim.demaille@gmail.com> package: don't ship the sources generated from the parser Because some of our examples use %C%_reccalc_SOURCES = %D%/parse.y Automake ships parse.y and parse.c, and possibly parse.h when it "understands" that there is one. This is not what we want: ship only parser.y. Yet we still want to use Automake to compile the sources from parser.y. The easiest seems to use nodist_%C%_reccalc_SOURCES = %D%/parse.y together with dist_reccalc_DATA = %D%/parse.y %D%/scan.l %D%/Makefile %D%/README.md which guarantees that parse.y is indeed shipped. * examples/c/calc/local.mk, examples/c/lexcalc/local.mk, * examples/c/reccalc/local.mk: Always use nodist_*SOURCES for parsers, let the dist_*_DATA rules do their job. 2019-04-28 Akim Demaille <akim.demaille@gmail.com> package: various fixes for syntax-check * cfg.mk: Disable checks where needed (e.g., we do want to check the behavior with tabs). (sc_at_parser_check): Remove. Unfortunately since a11c144609255bc6e42c2aff83548e91cbd05425 we no longer use the './' prefix to run programs in the current directory. That was so that we could run Java programs like the other, although they are no run with the `./` prefix (see 967a59d2c08a33f24708450561e2f8010b604523). As a consequence this sc check no longer makes sense. However, since now AT_PARSER_CHECK passes the `./` prefix itself, this sc-check was superfluous. * examples/c/reccalc/scan.l: Use memcpy, not strncpy. * src/ielr.c, src/reader.c: Obfuscate "lr(0)" so that the sc-check for "space before paren" does not fire. * tests/diagnostics.at: Avoid space-tab, use tab-tab. 2019-04-27 Akim Demaille <akim.demaille@gmail.com> doc: clarify -fsyntax-error * NEWS, doc/bison.texi: here. 2019-04-27 Akim Demaille <akim.demaille@gmail.com> regen 2019-04-27 Akim Demaille <akim.demaille@gmail.com> traces: use colors for the semantic values This makes reading the trace slightly easier. It would be very nice to highlight the "big steps", especially reductions. But this is a private experiment: do not use it. * data/diagnostics.css (value): New. * src/parse-gram.y: Use no delimiters and no c quotation for strings to facilitate debugging. (tron, troff, TRACE): New. Not very elegant, but until there is support for printf-formats in libtextstyle, it shall be enough. 2019-04-27 Akim Demaille <akim.demaille@gmail.com> diagnostics: give m4 precise locations Currently we pass only the columns based on the screen-width, which is important for the carets. But we don't pass the bytes-based columns, which is important for the colors. Pass both. * src/muscle-tab.c (muscle_boundary_grow): Also pass the byte-based column. * src/location.c (location_caret): Clarify. (boundary_set_from_string): Adjust to the new format. * tests/diagnostics.at (Tabulations and multibyte characters from M4): New. 2019-04-27 Akim Demaille <akim.demaille@gmail.com> diagnostics: fix locations coming from M4 Locations issued from M4 need the byte-based column for the diagnostics to work properly. Currently they were unassigned, which typically resulted in partially non-colored diagnostics. * src/location.c (boundary_set_from_string): Fix the parsed location. * src/muscle-tab.c (muscle_percent_define_default): Set the byte values. * tests/diagnostics.at (Locations from M4): New. 2019-04-27 Akim Demaille <akim.demaille@gmail.com> diagnostics: show locations in full when debugging This is meant for developers, not end users, that's why I attached it to --trace. * src/getargs.h, src/getargs.c (trace_locations): New. * src/location.c (location_print): Use it. 2019-04-27 Akim Demaille <akim.demaille@gmail.com> diagnostics: use flush, not fflush * src/complain.c: here. 2019-04-25 Akim Demaille <akim.demaille@gmail.com> build: use gettext-h We were using the gnulib's gettext module with tricks in bootstrap.conf to avoid useless files. Instead, use gnulib's gettext-h module. * .travis.yml: Force Gettext 0.18.3 on Trusty. * bootstrap.conf: Use gettext-h instead of gettext. (excluded_files): Remove. * configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.19. 2019-04-25 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2019-04-25 Akim Demaille <akim.demaille@gmail.com> api.location.type: support it in C Reported by Balázs Scheidler. * data/skeletons/c.m4 (b4_location_type_define): Use api.location.type if defined. * doc/bison.texi: Document it. * tests/local.at (AT_C_IF, AT_LANG_CASE): New. Support Span in C. * tests/calc.at (Span): Convert it to be usable in C and C++. Check api.location.type with yacc.c and glr.c. 2019-04-24 Akim Demaille <akim.demaille@gmail.com> updates: insert/remove %empty * src/reader.c (grammar_rule_check_and_complete): Generate fixits for adding/removing %empty. * tests/actions.at, tests/diagnostics.at, tests/existing.at: Adjust. 2019-04-24 Akim Demaille <akim.demaille@gmail.com> regen 2019-04-24 Akim Demaille <akim.demaille@gmail.com> diagnostics: better rule locations The "identifier and colon" of a rule is implemented as a single token, but whose location is only that of the identifier (so that messages about the lhs of a rule are accurate). When reducing empty rules, the default location is the single point location on the end of the previous symbol. As a consequence, when Bison parses a grammar, the location of the right-hand side of an empty rule is based on the lhs, *independently of the position of the colon*. And the colon can be way farther, separated by comments, white spaces, including empty lines. As a result, some messages look really bad. For instance: $ cat foo.y %% foo : /* empty */ bar : /* empty */ gives $ bison -Wall foo.y foo.y:2.4: warning: empty rule without %empty [-Wempty-rule] 2 | foo : /* empty */ | ^ foo.y:3.4: warning: empty rule without %empty [-Wempty-rule] 3 | bar | ^ The carets are not at the right column, not even the right line. This commit passes the colon "again" after the "id colon" token, which gives more accurate locations for these messages: $ bison -Wall foo.y foo.y:2.10: warning: empty rule without %empty [-Wempty-rule] 2 | foo : /* empty */ | ^ foo.y:4.2: warning: empty rule without %empty [-Wempty-rule] 4 | : /* empty */ | ^ * src/scan-gram.l (SC_AFTER_IDENTIFIER): Rollback the colon, so that we scan it again afterwards. (INITIAL): Scan colons. * src/parse-gram.y (COLON): New. (rules): Parse the colon after the rule's id_colon (and possible named reference). * tests/actions.at, tests/conflicts.at, tests/diagnostics.at, * tests/existing.at: Adjust. 2019-04-24 Akim Demaille <akim.demaille@gmail.com> fixits: track byte-columns, not character-columns Because the fix-its were ready the character-based columns, but were applied on byte-based columns, the result with multibyte characters or tabs could be "interesting". For instance %fixed-output_files %fixed_output-files %fixed-output-files %define api.prefix {foo} %no-default-prec would give %fixed-%fixed-output-files %fixed_output-files %fixed-orefix= "foo" o_default-prec * src/fixits.c (fixit_print, fixits_run): Work on byte-base columns. * tests/input.at: Check it. 2019-04-24 Akim Demaille <akim.demaille@gmail.com> diagnostics: expose a means to know whether a warning is enabled * src/complain.h, src/complain.c (warning_is_enabled): New. 2019-04-23 Akim Demaille <akim.demaille@gmail.com> gnulib: let it use its own PO domain See https://www.gnu.org/software/gnulib/manual/html_node/Localization.html. * bootstrap.conf: Create gnulib-po. * Makefile.am, configure.ac: Use it. * po/POTFILES.in: Remove files now in gnulib. * src/main.c: Open the bison-gnulib domain. 2019-04-23 Akim Demaille <akim.demaille@gmail.com> diagnostics: don't try to quote special files Based on a report by Todd Freed. http://lists.gnu.org/archive/html/bug-bison/2019-04/msg00000.html See also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90034 * src/location.c (caret_info): Also track the file name. (location_caret): Don't quote special files. 2019-04-23 Akim Demaille <akim.demaille@gmail.com> diagnostics: document the change of format * doc/bison.texiL Adjust output. Also, Graphviz has no uppercsae V. * NEWS: Explain the format change. 2019-04-23 Akim Demaille <akim.demaille@gmail.com> diagnostics: copy GCC9's format Currently, when we quote the source file, we indent it with one space, and preserve tabulations, so there is a discrepancy and the visual rendering is bad. One way out is to indent with a tab instead of a space, but then this space can be used for more information. This is what GCC9 does. Let's play copy cats. See https://lists.gnu.org/archive/html/bison-patches/2019-04/msg00025.html https://developers.redhat.com/blog/2019/03/08/usability-improvements-in-gcc-9/ https://gcc.gnu.org/onlinedocs/gccint/Guidelines-for-Diagnostics.html#Guidelines-for-Diagnostics * src/location.c (location_caret): Prefix quoted lines with the line number and a pipe, fitting 8 columns. * tests/actions.at, tests/c++.at, tests/conflicts.at, * tests/diagnostics.at, tests/input.at, tests/java.at, * tests/named-refs.at, tests/reduce.at, tests/regression.at, * tests/sets.at: Adjust expectations. Partly by "./build-aux/update-test tests/testsuite.dir/*/testsuite.log" repeatedly, and partly by hand. 2019-04-23 Akim Demaille <akim.demaille@gmail.com> diagnostics: fix the handling of multibyte characters This is a pity: efforts were invested in computing correctly the number of screen columns consumed by multibyte characters, but the routines that do that were fed by single-byte inputs... As a consequence Bison never displayed correctly locations when there are multibyte characters. * src/scan-gram.l (mbchar): New. Use it instead of . in the catch-all clause. * tests/diagnostics.at (Tabulations): Enhance into... (Tabulations and multibyte characters): this. 2019-04-23 Akim Demaille <akim.demaille@gmail.com> diagnostics: check the handling of tabulations * tests/diagnostics.at (Tabulations): here. 2019-04-23 Akim Demaille <akim.demaille@gmail.com> diagnostics: fix styling issues Single point locations (equal boundaries) are troublesome, and we were incorrectly ending the style in their case. Which results in an abort in libtextstyle. There is also a confusion between columns as displayed on the screen (which take into account multibyte characters and tabulations), and the number of bytes. Counting the screen-column incrementally (character by character) is uneasy (because of multibyte characters), and I don't want to maintain a buffer of the current line when displaying the diagnostic. So I believe the simplest solution is to track the byte number in addition to the screen column. * src/location.h, src/location.c (boundary): Add the byte-column. Adjust dependencies. * src/getargs.c, src/scan-gram.l: Adjust. * tests/diagnostics.at: Check zero-width locations. 2019-04-23 Akim Demaille <akim.demaille@gmail.com> diagnostics: check the styling Enable checking of styles even when libtextstyle is not installed. * src/getargs.h, src/getargs.c (style_debug): New. (getargs_colors): Set it when --style=debug. * src/complain.c (begin_use_class, end_use_class): Use it. * tests/diagnostics.at: New. 2019-04-23 Akim Demaille <akim.demaille@gmail.com> TODO: update Let's prepare 3.4 with more or less what we have. Schedule some features for 3.5 and 3.6. Remove obsolete stuff. 2019-04-19 Akim Demaille <akim.demaille@gmail.com> doc: sort the warning categories * doc/bison.texi, src/getargs.c: here. 2019-04-19 Akim Demaille <akim.demaille@gmail.com> style: formatting changes * tests/actions.at, tests/calc.at, tests/input.at: here. 2019-04-19 Akim Demaille <akim.demaille@gmail.com> graphviz: move constant computation out of a loop * src/graphviz.c (output_red): here. 2019-04-18 Akim Demaille <akim.demaille@gmail.com> diagnostics: fix memory leak in libtextstyle * src/complain.h, src/complain.c (complain_free): New. * src/main.c: Use it. 2019-04-17 Akim Demaille <akim.demaille@gmail.com> tests: remove useless feature * tests/calc.at (read_signed_integer): Rename as... (read_integer): this. We never read signs here. 2019-04-14 Akim Demaille <akim.demaille@gmail.com> traces: make closure() less verbose * src/getargs.h, src/getargs.c (trace_closure): New. * src/closure.c (closure): Use it. 2019-04-14 Akim Demaille <akim.demaille@gmail.com> build: also generate the graph reports * Makefile.am (AM_YFLAGS_WITH_LINES): here. 2019-04-12 Akim Demaille <akim.demaille@gmail.com> yacc.c: minor style change * data/skeletons/yacc.c: To improve consistency with other similar pieces of code. 2019-04-12 Akim Demaille <akim.demaille@gmail.com> style: scope reduction in lalr.c * src/lalr.c (initialize_goto_follows): here. 2019-04-12 Akim Demaille <akim.demaille@gmail.com> style: comment changes * src/closure.h, src/closure.c, src/lalr.c: here. 2019-04-12 Akim Demaille <akim.demaille@gmail.com> traces: improve logs * src/lalr.c: Move logs to a better place to understand the chronology of events. * src/symlist.c (symbol_list_syms_print): Don't dump core on type elements. 2019-04-07 Akim Demaille <akim.demaille@gmail.com> doc: minor fixes * doc/bison.texi: Use consistently $ and @kbd in shell examples. Prefer sticking to English words: output and file instead of outfile and infile. 2019-04-03 Akim Demaille <akim.demaille@gmail.com> regen 2019-04-03 Akim Demaille <akim.demaille@gmail.com> bison: use no-lines The 'regen' commit in Bison's history are a nuisance. They are especially big because of the #lines. Let's generate our parse without these lines in the repository, but generate them in the tarball. * Makefile.am (AM_YFLAGS_WITH_LINES): New. (AM_YFLAGS): Use it. (dist-hook): Regenerate the parser with #lines. 2019-04-03 Akim Demaille <akim.demaille@gmail.com> no-lines: avoid leaving an empty line instead of the syncline Currently, with --no-lines, instead of "#line file line\n", we emit "\n". Let's emit nothing. * data/skeletons/bison.m4 (b4_syncline): Emit at end-of-line when enabled. * data/skeletons/bison.m4, data/skeletons/c.m4, data/skeletons/glr.cc, * data/skeletons/lalr1.cc, src/output.c: Use dnl after b4_syncline to avoid spurious empty lines. * tests/synclines.at (Sync Lines): Make sure that --no-lines is like grep -v #line. * tests/calc.at: Make sure that a rich grammar file behaves properly with %no-lines. 2019-04-03 Akim Demaille <akim.demaille@gmail.com> java: use full locations for diagnostics about destructors Currently we use the syncline to report errors about a symbol's destructor/printer. This is not accurate (only file and line), and this is incorrect: the file name is double quotes (a recent change, needed to make sure we escape properly double quotes in it). And worst of all: with --no-line, b4_syncline expands to nothing. Rather, push the locations into the backend, and use them. * src/muscle-tab.h, src/muscle-tab.c (muscle_location_grow): Make it public. * src/output.c (prepare_symbol_definitions): Use it to pubish the location of the printer and destructor. * data/skeletons/lalr1.java: Use complain_at instead of complain. * tests/java.at (Java invalid directives): Adjust expectations. * data/skeletons/bison.m4 (b4_symbol_action_location): Remove. We should not use b4_syncline this way. 2019-04-03 Akim Demaille <akim.demaille@gmail.com> java: prefer errors to fatal errors Fatal errors are inconvenient, and should be reserved to cases where we cannot continue. Here, it could even be warnings actually: these directives will simply be ignored. * data/skeletons/lalr1.java: Prefer error (b4_complain) to fatal errors (b4_fatal). * tests/java.at (Java invalid directives): New. 2019-04-03 Akim Demaille <akim.demaille@gmail.com> tests: formatting changes * tests/javapush.at: here. 2019-04-03 Akim Demaille <akim.demaille@gmail.com> lalr: offer more flexibility in debugging routines * src/state.h, src/state.c (state_transitions_print): New, extracted from... (state_transitions_set): here. 2019-03-31 Akim Demaille <akim.demaille@gmail.com> lalr: don't overbook memory I never understood why we book ngotos+1 slots for relations between gotos: there are at most ngotos images, not ngotos+1 (and "includes" does have cases where a goto is in relation with itself, so it's not ngotos-1). Maybe bbf37f2534a8e5a6b4e28047f0a10903e6dc73f9 explains the +1: a bug left us register a goto several times on occasion, and the +1 might have been a means to avoid this problem in most cases. Now that this bug is addressed, we should no longer overbook memory, if only for the clarity of the code ("why ngotos+1 instead of ngotos?"). * src/lalr.c: A goto has at most ngotos images, not ngotos+1. While at it, avoid useless repeated call to map_goto introduced in bbf37f2534a8e5a6b4e28047f0a10903e6dc73f9. 2019-03-30 Akim Demaille <akim.demaille@gmail.com> lalr: show lookback for debug * src/lalr.c (lookback_print): New. (build_relations): Use it. Also show edges. 2019-03-30 Akim Demaille <akim.demaille@gmail.com> diagnostics: don't crash when declaring the error token as an nterm Reported by wcventure. http://lists.gnu.org/archive/html/bug-bison/2019-03/msg00008.html * src/symtab.c (complain_class_redeclared): Don't print empty locations. There can only be empty locations for predefined symbols. And the only symbol that is lexically available is the error token. So this appears to be the only possible way to have an error involving an empty location. * tests/input.at (Symbol class redefinition): Check it. 2019-03-30 Akim Demaille <akim.demaille@gmail.com> lalr: fix segmentation violation The "includes" relation [DeRemer 1982] is between gotos, so of course, for a given goto, there cannot be more that ngotos (number of gotos) images. But we manipulate the set of images of a goto as a list, without checking that an image was not already introduced. So we can "register" way more images than ngotos, leading to a crash (heap buffer overflow). Reported by wcventure. http://lists.gnu.org/archive/html/bug-bison/2019-03/msg00007.html For the records, this bug is present in the first committed version of Bison. * src/lalr.c (build_relations): Don't insert the same goto several times. * tests/sets.at (Build Relations): New. 2019-03-30 Akim Demaille <akim.demaille@gmail.com> state: more debug traces * src/state.c (state_transitions_set): Show the transitions. 2019-03-30 Akim Demaille <akim.demaille@gmail.com> style: rename variables for consistency * src/lalr.c: Use trans for transitions, and reds for reductions, as elsewhere in the code. * src/state.h: Comment changes. 2019-03-30 Akim Demaille <akim.demaille@gmail.com> gram: fix and improve log message It seems that not many people read these logs: the error was introduced in 2001 (3067fbef531832df1e43bbd28787655808361eed), * src/gram.c (grammar_dump): Fix the headers of the table: remove duplicate display of "Ritem Range". While at it, remove duplicate display of the rule number (and remove an incorrect comment about it: these numbers _are_ equal). * tests/sets.at (Reduced Grammar): Use useless rule, nterm and token in the example. 2019-03-30 Akim Demaille <akim.demaille@gmail.com> tests: add a tool for mass updates When we update some output format, too many adjustements must be made by hand. This script updates most tests based on the actual output made during the tests. * build-aux/update-test: New. 2019-03-25 Akim Demaille <akim.demaille@gmail.com> style: remove now useless _GL_UNUSED * src/getargs.c (getargs_colors): Here. Useless since 4d34b06fb3a38eb050439084476a6b3e292c5680. 2019-03-24 Theophile Ranquet <ranquet@lrde.epita.fr> tables: use bitsets for a performance boost Suggested by Yuri at <http://lists.gnu.org/archive/html/bison-patches/2012-01/msg00000.html>. The improvement is marginal for most grammars, but notable for large grammars (e.g., PosgreSQL's postgre.y), and very large for the sample.y grammar submitted by Yuri in http://lists.gnu.org/archive/html/bison-patches/2012-01/msg00012.html. Measured with --trace=time -fsyntax-only. parser action tables postgre.y sample.y Before 0,129 (44%) 37,095 (99%) After 0,117 (42%) 5,046 (93%) * src/tables.c (pos): Replace this set of integer coded as an unsorted array or integers with... (pos_set): this bitset. 2019-03-24 Akim Demaille <akim.demaille@gmail.com> yacc.c: don't suggest api.header.include when --defines is not used See 4e19ab9fcd28c9361ff08f46e5e353effb0a0520: the suggestion to include the header file should not be emitted when the header is not generated. * data/skeletons/yacc.c: Here. 2019-03-24 Akim Demaille <akim.demaille@gmail.com> reader: clarify variable names * src/reader.c (grammar_rule_check_and_complete): When 'p' and 'lhs' are aliases, prefer the latter, for clarity and consistency. (grammar_current_rule_begin): Avoid 'p', current_rule suffices. * src/gram.h, src/gram.c: Comment changes. ptdr# calc.tab.c 2019-03-24 Akim Demaille <akim.demaille@gmail.com> diagnostics: style changes * src/location.c (location_caret): Clarify a bit. 2019-03-24 Akim Demaille <akim.demaille@gmail.com> diagnostics: use gnulib's libtextstyle-optional Bruno Haible just added a default implementation of libtextstyle's interface when the library is not available. https://lists.gnu.org/archive/html/bison-patches/2019-03/msg00025.html * gnulib: Update. * bootstrap.conf: Replace libtextstyle with libtextstyle-optional. * src/complain.c, src/getargs.c: Remove now useless cpp guards. 2019-03-23 Akim Demaille <akim.demaille@gmail.com> diagnostics: fix handling of style in limit cases * src/location.c (location_caret): Beware of the cases where the start and end columns are the same, or when the location is multilines. 2019-03-23 Akim Demaille <akim.demaille@gmail.com> warnings: don't use _Noreturn with G++ 4.7 in C++98 mode The timevar and bitset modules now use the c99 module which causes $CXX to now include -std=gnu++11 when possible. Unfortunately, G++ 4.7 does not implement [[noreturn]] in C++11 mode, so our tests of glr.cc (which uses _Noreturn) fail with input.cc:954:1: error: expected unqualified-id before '[' token right before [[noreturn]]. 4.8 works fine. * data/skeletons/c.m4 (b4_attribute_define): Do not use [[noreturn]] with GCC 4.7. 2019-03-17 Akim Demaille <akim.demaille@gmail.com> d: tests: use more a natural approach for the scanner See f8408562f8439654261418406296e4108d2a995f. * tests/calc.at: Stop imitating the C API. Prepare more tests to run in the future. %verbose works as expected (what a surprise, it's unrelated to the skeleton...). 2019-03-17 Akim Demaille <akim.demaille@gmail.com> regen 2019-03-17 Akim Demaille <akim.demaille@gmail.com> style: rename spec_defines_file as spec_header_file The variable spec_defines_file denotes the name of the generated header. Its name is derived from --defines/%defines, whose name in turn is derived from the fact that the header, in Yacc, contained the Not only does the header now contain a lot more than just the token definitions, but we no longer even generate macros, but an enum... Let's modernize our vocabulary. * src/files.h, src/files.c (spec_defines_file): Rename as... (spec_header_file): this. 2019-03-17 Akim Demaille <akim.demaille@gmail.com> yacc.c: provide a means to include the header in the implementation Currently when --defines is used, we generate a header, and paste an exact copy of it into the generated parser implementation file. Let's provide a means to #include it instead. We don't do it by default because of the Autotools' ylwrap. This program wraps invocations of yacc (that uses a fixed output name: y.tab.c, y.tab.h, y.output) to support a more modern naming scheme (dir/foo.y -> dir/foo.tab.c, dir/foo.tab.h, etc.). It does that by renaming the generated files, and then by running sed to propagate these renamings inside the files themselves. Unfortunately Automake's Makefiles uses Bison as if it were Yacc (with --yacc or with -o y.tab.c) and invoke bison via ylwrap. As a consequence, as far as Bison is concerned, the output files are y.tab.c and y.tab.h, so it emits '#include "y.tab.h"'. So far, so good. But now ylwrap processes this '#include "y.tab.h"' into '#include "dir/foo.tab.h"', which is not guaranteed to always work. So, let's do the Right Thing when the output file is not y.tab.c, in which case the user should %define api.header.include. Binding this behavior to --yacc is tempting, but we recently told people to stop using --yacc (as it also enables the Yacc warnings), but rather to use -o y.tab.c. Yacc.c is the only skeleton concerned: all the others do include their header. * data/skeletons/yacc.c (b4_header_include_if): New. (api.header.include): Provide a default value when the output is not y.tab.c. * src/parse-gram.y (api.header.include): Define. 2019-03-17 Akim Demaille <akim.demaille@gmail.com> d: don't link against LIBS * tests/local.at (AT_COMPILE_D): Don't pass LIBS, dmd does not like being given -lintl. 2019-03-17 Akim Demaille <akim.demaille@gmail.com> address warnings from GCC's UB sanitizer Running with CC='gcc-mp-8 -fsanitize=undefined' revealed Undefined Behaviors. https://lists.gnu.org/archive/html/bison-patches/2019-03/msg00008.html * src/state.c (errs_new): Don't call memcpy with NULL as source. * src/location.c (add_column_width): Don't assume that the column argument is nonnegative: the scanner sometimes "backtracks" (e.g., see ROLLBACK_CURRENT_TOKEN and DEPRECATED) in which case we can have negative column numbers (temporarily). Found in test 3 (Invalid inputs). 2019-03-16 Akim Demaille <akim.demaille@gmail.com> diagnostics: use libtextstyle for colored output Bruno Haible released libtextstyle, a library for colored output based on CSS. Let's use it to generate colored diagnostics, provided libtextstyle is available. See https://lists.gnu.org/archive/html/bug-gnulib/2019-01/msg00176.html https://lists.gnu.org/archive/html/bison-patches/2019-02/msg00073.html https://lists.gnu.org/archive/html/bison-patches/2019-02/msg00084.html https://lists.gnu.org/archive/html/bison-patches/2019-03/msg00007.html * bootstrap.conf (gnulib_modules): Use libtextstyle when possible. * data/diagnostics.css: New. * src/complain.c (begin_use_class, end_use_class, flush) (severity_style, complain_init_color): New. Use them. * src/getargs.c (getargs_colors): New. (getargs): Use it. Skip --color and --style. * src/location.h, src/location.c (location_print): Use a style. * tests/bison.in: Force --color=yes when stderr is a tty. * tests/local.at: Disable colors during the test suite. * tests/input.at: Adjust expectations to the extra options passed on the command line. 2019-03-16 Akim Demaille <akim.demaille@gmail.com> style: clean up complain.c * src/complain.c (severity_prefix): New. (error_message): Take the severity as argument, instead of the prefix. 2019-03-16 Akim Demaille <akim.demaille@gmail.com> yacc.c: emit the header before the implementation file * data/skeletons/yacc.c: here. This is more logical for the time stamps, but it's also required by following patches: the shared declarations are also in charge of handling api.value.type=union. So far, they are run in the implementation file in both cases (with or without header). But if we run them only in the header, then the implementation file is emited with incorrect support for api.value.type=union. Arguably we should not have such dependencies. This is because we have side-effects in our backend (redefining the symbols' type and type_tag). In the future we should find a better solution for this, without sacrificing the independence of the backend from bison itself (i.e., I don't think we should handle api.value.type=union in bison, leave it to m4). 2019-03-16 Akim Demaille <akim.demaille@gmail.com> simplify the generated #line Currently we generate things like: #line 683 "src/parse-gram.y" /* yacc.c:316 */ The first part is of course very important: compilers point the users to their grammar file rather than into the generated parser. The second part points to the place in the skeletons that generated this piece of code. This dependency on the Bison skeletons generates lots of useless 'git diff'. This location is useless for the regular user (who does not care about the skeletons) and is actually not useful for Bison developpers too (I never used this to locate the code in skeletons that generated output). So disable it completely. If someone thinks this was actually useful, a %define variable should be provided to control the level of verbosity of '#line', in replacement of --no-lines. So now, generate: #line 683 "src/parse-gram.y" * data/skeletons/bison.m4 (b4_sync_end): Emit nothing. 2019-03-13 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2019-03-13 Akim Demaille <akim.demaille@gmail.com> tests: remove duplicates * tests/regression.at (Invalid inputs, Invalid inputs with {}): Remove, there are exact copies of them in input.at. 2019-03-02 Akim Demaille <akim.demaille@gmail.com> d: simplify the API to build the scanner of the example * examples/d/calc.y (calcLexer): Add an overload for File. Use it. 2019-03-01 H. S. Teoh <hsteoh@quickfur.ath.cx> d: modernize the scanner of the example https://lists.gnu.org/archive/html/bison-patches/2019-02/msg00121.html * examples/d/calc.y (CalcLexer): Stop shoehorning C's API into D: use a range based approach in the scanner, rather than some imitation of getc/ungetc. (main): Adjust. 2019-03-01 Akim Demaille <akim.demaille@gmail.com> d: tests: use fewer global variables * tests/calc.at: Move 'input' into the scanner. 2019-02-28 Akim Demaille <akim.demaille@gmail.com> lalr: clarify the count of lookaheads * src/lalr.c (state_lookahead_tokens_count): Remove wierd `+=` that is actually an `=`. 2019-02-28 Akim Demaille <akim.demaille@gmail.com> lalr: clarify the API * src/state.h, src/state.c (state_reduction_find): Clarify. Die on errors. * src/lalr.c (goto_list_new): New. Use it. 2019-02-28 Akim Demaille <akim.demaille@gmail.com> lalr: improve traces * src/lalr.c (follows_print): Just print the symbol tag. Take and print a title. Indent the output. Use it to print the various steps of the computation. (lookahead_tokens_print): Fix a lie: the number displayed is not the number of tokens. Don't display states that don't even have reductions. 2019-02-27 Akim Demaille <akim.demaille@gmail.com> lalr: print the 'reads' relation * src/relation.h, src/relation.c (relation_print): Accept and use a title. Don't print empty rows. Indent the output. Adjust dependencies. * src/lalr.c (initialize_goto_follows): Print 'reads' in traces. 2019-02-27 Akim Demaille <akim.demaille@gmail.com> style: comment changes * src/lr0.c: here. 2019-02-26 Akim Demaille <akim.demaille@gmail.com> dlang: initial changes to run the calc tests on it * configure.ac (DCFLAGS): Define. * tests/atlocal.in: Receive it. * data/skeletons/d.m4 (api.parser.class): Remove spurious YY. * data/skeletons/lalr1.d (yylex): Return an int instead of a YYTokenType, so that we can use characters as tokens. * examples/d/calc.y: Adjust. * tests/local.at: Initial support for D. (AT_D_IF, AT_DATA_GRAMMAR(D), AT_YYERROR_DECLARE(d)) (AT_YYERROR_DECLARE_EXTERN(d), AT_YYERROR_DEFINE(d)) (AT_MAIN_DEFINE(d), AT_COMPILE_D, AT_LANG_COMPILE(d), AT_LANG_EXT(d)): New. * tests/calc.at: Initial support for D. * tests/headers.at 2019-02-26 Akim Demaille <akim.demaille@gmail.com> d: improve the example * examples/d/calc.y: Exit with failure on errors. Remove useless operators (=, !) meant for the test suite. Add unary + for symmetry. * examples/d/calc.test: Adjust expectations. 2019-02-26 Akim Demaille <akim.demaille@gmail.com> tests: style changes * tests/local.at AT_YYERROR_DEFINE(java): Use more consistent names. 2019-02-25 Akim Demaille <akim.demaille@gmail.com> style: eliminate useless indirection * src/relation.h, src/relation.c (relation_digraph): Don't take the biteetv as a pointer, it is already a pointer (as it's an array). 2019-02-25 Akim Demaille <akim.demaille@gmail.com> style: rename function for clarity Commit db34f7988941444bdc5f2b6adcf7fb83648f9a18 renames the variable F as goto_follows, but forgot to rename this function. * src/lalr.c (initialize_F): Rename as... (initialize_goto_follows): this. 2019-02-25 Akim Demaille <akim.demaille@gmail.com> lalr: more debug traces I need to be able to read includes and goto_follows. * src/relation.h, src/relation.c (relation_print): Provide a means to pretty-print the nodes of the relation. * src/lalr.c (goto_print, follows_print): New. (set_goto_map): Use goto_print. (build_relations): Show INCLUDES. (compute_FOLLOWS): Rename as... (compute_follows): this. Show FOLLOWS. 2019-02-24 Akim Demaille <akim.demaille@gmail.com> style: minor changes * examples/c/calc/calc.y, src/lalr.c: Reduce scope. * src/gram.c: Prefer < to >. 2019-02-24 Akim Demaille <akim.demaille@gmail.com> style: clarify the computation of the lookback edges * src/lalr.c (build_relations): Reduce the scopes. Instead of keeping rp alive in two different loops, clarify the second one by having an index on the path we traverse (i.e., use that index to compute the source state _and_ the symbol that labels the transition). This allows to turn an obscure 'while'-loop in a clearer (IMHO) 'for'-loop. We also consume more variables (by introducing p instead of making more side effects on length), but we're in 2019, I don't think this matters. What does matter is that (IMHO again), this is now clearer. Also, use clearer names. 2019-02-24 Akim Demaille <akim.demaille@gmail.com> style: scope reduction in tables.c * src/tables.c: here. * src/lalr.c: Prefer < to >. 2019-02-24 Akim Demaille <akim.demaille@gmail.com> d: formatting changes * data/skeletons/d.m4, data/skeletons/lalr1.d: Avoid trailing spaces. 2019-02-23 Akim Demaille <akim.demaille@gmail.com> examples: remove stray examples * examples/c/reentrant-calc: Remove. I did not mean to include this example, it was replaced by examples/c/reccalc. 2019-02-21 Akim Demaille <akim.demaille@gmail.com> tests: factor the execution of Java parsers * tests/local.at (AT_MAIN_DEFINE(java)): Exit failure on failure. (AT_PARSER_CHECK): If in Java, run AT_JAVA_PARSER_CHECK. * tests/conflicts.at (AT_CONSISTENT_ERRORS_CHECK): Simplify. 2019-02-21 Akim Demaille <akim.demaille@gmail.com> tests: fix a Java tests * tests/conflicts.at (AT_CONSISTENT_ERRORS_CHECK): Fix quotation error. 2019-02-21 Akim Demaille <akim.demaille@gmail.com> tests: simplify AT_PARSER_CHECK usage Currently the caller must specify the ./ prefix to its command. Let's avoid that: it will be nicer to read, make it easier to have a version that works for Java and C/C++. * tests/local.at (AT_PARSER_CHECK): Prefix the command with ./. Adjust callers. 2019-02-21 Akim Demaille <akim.demaille@gmail.com> tests: java: factor the definition of Position * tests/local.at (AT_JAVA_POSITION_DEFINE): New. * tests/java.at, tests/javapush.at: Use it. 2019-02-21 Akim Demaille <akim.demaille@gmail.com> tests: dispatch per lang on AT_DATA_GRAMMAR * tests/java.at: Do that. * tests/conflicts.at: Simplify. * tests/actions.at, tests/c++.at, tests/input.at, tests/local.at, * tests/named-refs.at: Use AT_BISON_OPTION_PUSHDEFS/AT_BISON_OPTION_POPDEFS. 2019-02-21 Akim Demaille <akim.demaille@gmail.com> tests: dispatch per lang on the definition of yylex * tests/local.at (AT_YYLEX_DEFINE): Dispatch on the language. (AT_YYLEX_DEFINE(java)): New. * tests/conflicts.at, tests/java.at: Use it. 2019-02-21 Akim Demaille <akim.demaille@gmail.com> tests: de-duplicate * tests/conflicts.at (AT_YYLEX_PROTOTYPE): Don't define it, leave that task to AT_DATA_GRAMMAR. But be honest: tell AT_BISON_OPTION_PUSHDEFS all the options we use. 2019-02-21 Akim Demaille <akim.demaille@gmail.com> tests: formatting changes * tests/local.at: here. 2019-02-21 Akim Demaille <akim.demaille@gmail.com> graph: prefer *.gv to *.dot Reported by Hans Åberg. https://lists.gnu.org/archive/html/help-bison/2019-02/msg00064.html * src/files.c (spec_graph_file): Use `*.gv` when 3.4 or better, otherwise `*.dot`. * src/parse-gram.y (handle_require): Pretend we are already 3.4. * doc/bison.texi: Adjust. * tests/local.at, tests/output.at: Exercise this. 2019-02-21 Akim Demaille <akim.demaille@gmail.com> doc: fixes to please older versions of Texinfo Currently, we have errors: ./doc/bison.texi:13005: node `History' lacks menu item for `Yacc' despite being its Up target * doc/bison.texi (History): Add the local menu. While at it, add a few index entries. 2019-02-17 Akim Demaille <akim.demaille@gmail.com> doc: style changes * doc/bison.texi (Bibliography): Add [Corbett 1984] and [Johnson 1978]. (History): Use them. And other minor changes. 2019-02-17 Eric S. Raymond <esr@thyrsus.com> doc: a history section * bison.texi (A Brief History of the Greater Ungulates): New section. 2019-02-17 Akim Demaille <akim.demaille@gmail.com> examples: add an example with a reentrant parser in Flex+Bison Suggested by Eric S. Raymond. https://lists.gnu.org/archive/html/bison-patches/2019-02/msg00066.html * examples/c/reentrant-calc/Makefile, examples/c/reentrant-calc/README.md, * examples/c/reentrant-calc/parse.y, examples/c/reentrant-calc/scan.l * examples/c/reentrant-calc/lexcalc.test, * examples/c/reentrant-calc/local.mk: New. 2019-02-16 Akim Demaille <akim.demaille@gmail.com> examples: fixes in lexcalc * examples/c/lexcalc/parse.y: Formatting/comment changes. (line): Don't return a value. Print the result here, which avoids printing a value for lines with an error. (yyerror): Be sure to increment the pointed, not the pointer... * examples/c/lexcalc/lexcalc.test: Check errors. * examples/c/lexcalc/local.mk: Fix a dependency. 2019-02-16 Akim Demaille <akim.demaille@gmail.com> build: fix distcheck Regression introduced in 05a80977798abf472bfc11c477751303ad604733. * doc/local.mk (bison.help): Don't depend on the path of the bison executable. 2019-02-16 Akim Demaille <akim.demaille@gmail.com> style: move pkgdatadir to files.* Let's move it to a more logical place. * src/output.h, src/output.c (pkgdatadir): Move to... * src/files.h, src/files.c: here. 2019-02-14 Akim Demaille <akim.demaille@gmail.com> style: rename cleanup_caret as caret_free * src/location.c, src/location.h, src/main.c: here. 2019-02-14 Akim Demaille <akim.demaille@gmail.com> style: avoid default in switch on enums * src/assoc.c (assoc_to_string): here. 2019-02-14 Akim Demaille <akim.demaille@gmail.com> doc: run tests/bison, not src/bison * doc/local.mk: Don't run src/bison, as it expects to find all its files installed. Instead, run tests/bison which is ready to run in builddir. 2019-02-13 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2019-02-12 Akim Demaille <akim.demaille@gmail.com> style: comment and names changes in map_goto * src/lalr.h, src/lalr.c: Use clearer names. 2019-02-12 Akim Demaille <akim.demaille@gmail.com> yacc: support parse.assert While hacking on the computation of the automaton, I had yystate being equal to -1, and the parser loops. Let's catch this when parser.assert is enabled. * data/skeletons/yacc.c (YY_ASSERT): New. Use it. Not using the name YYASSERT, to make it clear that this is private. glr.c should probably move to YY_ASSERT too. Also, while at it, report 'Entering state...' even before growing the stacks. 2019-02-12 Akim Demaille <akim.demaille@gmail.com> examples: depend on Bison's sources * examples/c/calc/local.mk, examples/c/lexcalc/local.mk, * examples/c/mfcalc/local.mk, examples/c/rpcalc/local.mk: Regenerate the files if dependencies have changed. 2019-02-12 Eric S. Raymond <esr@thyrsus.com> README: point to README-hacking * README (Build from git): New. * README-hacking: Describe easier submodule update. 2019-02-10 Akim Demaille <akim.demaille@gmail.com> doc: a single space before closing comments I don't think this style: /* If buffer is full, make it bigger. */ if (i == length) { length *= 2; symbuf = (char *) realloc (symbuf, length + 1); } /* Add this character to the buffer. */ symbuf[i++] = c; /* Get another character. */ c = getchar (); or more readable than /* If buffer is full, make it bigger. */ if (i == length) { length *= 2; symbuf = (char *) realloc (symbuf, length + 1); } /* Add this character to the buffer. */ symbuf[i++] = c; /* Get another character. */ c = getchar (); Actually, I think the latter is more readable, and helps with width issues in the PDF. As a matter of fact, I would happily move to // only for single line comments. * doc/bison.texi: A single space before closing comments. 2019-02-10 Akim Demaille <akim.demaille@gmail.com> doc: modernize the examples * doc/bison.texi: Prefer 'fun' to 'fnct'. Reduce local variable scopes. Prefer strdup to malloc + strcpy. Avoid gratuitous casts. Use simpler names (e.g., 'name' instead of 'fname'). Avoid uses of 0 for NULL. Avoid using NULL when possible (e.g., 'p' instead of 'p != NULL'). Prefer union names to casts (e.g. 'yylval.VAR = s' instead of '*((symrec**) &yylval) = s'). Give arguments a name in fun declarations. Use our typedefs instead of duplicating them (func_t). Stop promoting an explicit $$ = $1;, it should be implicit (Bison might be able to eliminate useless chain rules). Help a bit Texinfo by making smaller groups. Rely on the C compiler to call function pointers (prefer '$1->value.fun ($3)' to (*($1->value.fnctptr))($3)'). 2019-02-10 Akim Demaille <akim.demaille@gmail.com> examples: add a simple infix calculator in C Currently we have no simple example: rpcalc in reverse Polish, mfcalc has functions, and lexcalc is using lex. * examples/c/calc/Makefile, examples/c/calc/calc.y, * examples/c/calc/calc.test, examples/c/calc/local.mk: New. 2019-02-10 Akim Demaille <akim.demaille@gmail.com> examples: fix annoying off-by-one errors * examples/extexi: Since we issue #lines only at the beginning of @example, leave empty line when removing content (such as @comment lines), otherwise the lines that follow have incorrect source line location. This leaves ugly empty lines, but they are removed when you tidy the output for the end user: sequences of \n are mapped to at most two sucessive \n. 2019-02-09 Akim Demaille <akim.demaille@gmail.com> style: factor printing of rules * src/gram.h, src/gram.c (rule_print): New. Use it. 2019-02-09 Akim Demaille <akim.demaille@gmail.com> style: use lower case for variable names * src/relation.c (INDEX, VERTICES): Rename as... (indexes, vertices): these. 2019-02-09 Akim Demaille <akim.demaille@gmail.com> style: scope reduction in relation.c 2019-02-09 Akim Demaille <akim.demaille@gmail.com> report: stop counting uselessly * src/print.c (print_nonterminal_symbols): Replace left_count and right_count with on_left and on_right. 2019-02-09 Akim Demaille <akim.demaille@gmail.com> report: clean up its format The format is inconsistent. For instance most sections are indented (including "Terminals unused in grammar" for instance), but the sections "Terminals, with rules where they appear" and "Nonterminals, with rules where they appear" are not. Let's indent them. Also, these two sections try to wrap the output to avoid lines too long. Yet we don't do that in the rest of the file, for instance when listing the lookaheads of an item. For instance in the case of Bison's parse-gram.output we go from: Terminals, with rules where they appear "end of file" (0) 0 error (256) 28 88 "string" <char*> (258) 9 13 16 17 20 23 24 109 116 [...] Nonterminals, with rules where they appear $accept (58) on left: 0 input (59) on left: 1, on right: 0 prologue_declarations (60) on left: 2 3, on right: 1 3 prologue_declaration (61) on left: 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 22 23 24 25 26 27 28 29, on right: 3 [...] to Terminals, with rules where they appear "end of file" (0) 0 error (256) 28 88 "string" <char*> (258) 9 13 16 17 20 23 24 109 116 [...] Nonterminals, with rules where they appear $accept (58) on left: 0 input (59) on left: 1 on right: 0 prologue_declarations (60) on left: 2 3 on right: 1 3 prologue_declaration (61) on left: 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 22 23 24 25 26 27 28 29 on right: 3 [...] * src/print.c (END_TEST): Remove. (print_terminal_symbols): Don't try to wrap the output. (print_nonterminal_symbols): Likewise. Make two different lines for occurrences on the left, and occurrence on the rhs of the rules. Indent by 4 and 8, not 3. * src/reduce.c (reduce_output): Indent by 4, not 3. * tests/conflicts.at, tests/existing.at, tests/reduce.at, * tests/regression.at, tests/report.at: Adjust. 2019-02-05 Akim Demaille <akim.demaille@gmail.com> add LR(0) output This should not be used to generate parsers. My point is actually to facilitate debugging (when tweaking the generation of the LR(0) automaton for instance, not carying -yet- about lookaheads). * src/reader.c (prepare_percent_define_front_end_variables): Add lr(0). * src/conflicts.c (set_conflicts): Be robust to reds not having lookaheads at all. * src/ielr.c (LrType, lr_type_get): Adjust. (ielr): Implement support for LR(0). * src/lalr.c (lalr_free): Don't free LA when it's not computed. 2019-02-05 Akim Demaille <akim.demaille@gmail.com> style: scope reduction in derives.c * src/derives.c: here. 2019-02-05 Akim Demaille <akim.demaille@gmail.com> style: comment changes and refactoring in state.c * src/state.h, src/state.c: Comment changes. (transitions_to): Take a state* as argument. * src/lalr.h, src/lalr.c: Comment changes. (initialize_F): Use clear variable names. 2019-02-05 Akim Demaille <akim.demaille@gmail.com> tests: fix typos * tests/reduce.at: here. 2019-02-03 Akim Demaille <akim.demaille@gmail.com> Merge branch maint * maint: maint: post-release administrivia version 3.3.2 style: minor fixes NEWS: named constructors are preferable to symbol_type ctors gram: fix handling of nterms in actions when some are unused style: rename local variable CI: update the ICC serial number for travis-ci.org 2019-02-03 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-02-03 Akim Demaille <akim.demaille@gmail.com> version 3.3.2 * NEWS: Record release date. 2019-02-03 Akim Demaille <akim.demaille@gmail.com> style: minor fixes * NEWS, src/reduce.c, src/reduce.h: Use 'nonterminal'. Fix comments. 2019-02-03 Akim Demaille <akim.demaille@gmail.com> NEWS: named constructors are preferable to symbol_type ctors Reported by Frank Heckenbach. http://lists.gnu.org/archive/html/bug-bison/2019-01/msg00043.html 2019-02-03 Akim Demaille <akim.demaille@gmail.com> gram: fix handling of nterms in actions when some are unused Since Bison 3.3, semantic values in rule actions (i.e., '$...') are passed to the m4 backend as the symbol number. Unfortunately, when there are unused symbols, the symbols are renumbered _after_ the numbers were used in the rule actions. As a result, the evaluation of the skeleton failed because it used non existing symbol numbers. Which is the happy scenario: we could use numbers of other existing symbols... Reported by Balázs Scheidler. http://lists.gnu.org/archive/html/bug-bison/2019-01/msg00044.html Translating the rule actions after the symbol renumbering moves too many parts in bison. Relying on the symbol identifiers is more troublesome than it might first seem: some don't have an identifier (tokens with only a literal string), some might have a complex one (tokens with a literal string with characters special for M4). Well, these are tokens, but nterms also have issues: "dummy" nterms (for midrule actions) are named $@32 etc. which is risky for M4. Instead, let's simply give M4 the mapping between the old numbers and the new ones. To avoid confusion between old and new numbers, always emit pre-renumbering numbers as "orig NUM". * data/README: Give details about "orig NUM". * data/skeletons/bison.m4 (__b4_symbol, _b4_symbol): Resolve the "orig NUM". * src/output.c (prepare_symbol_definitions): Pass nterm_map to m4. * src/reduce.h, src/reduce.c (nterm_map): Extract it from nonterminals_reduce, to make it public. (reduce_free): Free it. * src/scan-code.l (handle_action_dollar): When referring to a nterm, use "orig NUM". * tests/reduce.at (Useless Parts): New, based Balázs Scheidler's report. 2019-02-03 Akim Demaille <akim.demaille@gmail.com> tests: strengthen some of them * tests/reduce.at: Check that the generated parsers are proper C. 2019-02-03 Akim Demaille <akim.demaille@gmail.com> package: rename data/README as data/README.md So that it is properly rendered by online git services. 2019-02-03 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes * src/symlist.c (symbol_list_free): New. 2019-02-03 Akim Demaille <akim.demaille@gmail.com> style: prefer snprintf to sprintf * src/symtab.c (dummy_symbol_get): There's no need for the buffer to be so big and static. Use snprintf for safety. 2019-02-02 Akim Demaille <akim.demaille@gmail.com> style: comment and name changes * src/output.c (prepare_symbol_names): here. * src/reader.c: Remove obsolete comment. * src/scan-code.l: Use || for Boolean or. 2019-02-02 Akim Demaille <akim.demaille@gmail.com> style: comment changes * src/reader.c, src/scan-code.l: here. 2019-02-02 Akim Demaille <akim.demaille@gmail.com> make: regenerate the example parsers when bison changes * Makefile.am (dependencies): Also depend on Bison's sources. 2019-02-02 Akim Demaille <akim.demaille@gmail.com> style: rename local variable * src/reduce.c (nonterminals_reduce): Rename nontermmap as nterm_map. We will expose it. 2019-01-30 Akim Demaille <akim.demaille@gmail.com> gram: detect and report (in debug traces) useless chain rules A rule is a useless chain iff it's a chain (aka unit, or injection) rule (i.e., the RHS has length 1), and it's useless (it has no used defined semantic action). * src/gram.h, src/gram.c (rule_useless_chain_p): New. (grammar_dump): Report useless chain rules. * tests/sets.at: Check the traces. 2019-01-30 Akim Demaille <akim.demaille@gmail.com> lr(0): more debug traces * src/lr0.c (core_print, kernel_print): New. Use them. 2019-01-30 Akim Demaille <akim.demaille@gmail.com> lr(0): remove useless conditional * src/lr0.c (new_itemsets): There's no harm in setting a Boolean several times. 2019-01-30 Akim Demaille <akim.demaille@gmail.com> style: sort includes and avoid assignments * src/symtab.c: Sort includes. * src/gram.c (grammar_rules_print_xml): Avoid assignments to define 'usefulness'. 2019-01-30 Akim Demaille <akim.demaille@gmail.com> style: use item_rule * src/print-graph.c, src/print-xml.c: here. 2019-01-30 Akim Demaille <akim.demaille@gmail.com> gram: factor the printing of items and the computation of their rule There are several places where we need to recover the rule from an item, let's factor that into item_rule. We also want to print items in a nice way: we do it when generating the *output file, but it is also useful in debug messages. * src/gram.h, src/gram.c (item_rule, item_print): New. * src/print.c (print_core): Use them. * src/state.h, src/state.c: Propagate constness. 2019-01-30 Akim Demaille <akim.demaille@gmail.com> style: scope reduction in print-xml * src/print-xml.c: here. 2019-01-30 Akim Demaille <akim.demaille@gmail.com> tests: check XML and dot reports * tests/report.at: Here. 2019-01-28 Akim Demaille <akim.demaille@gmail.com> CI: update the ICC serial number for travis-ci.org On travis-ci.org, there are five concurrent slaves, instead of three on travis-ci.com. 2019-01-28 Akim Demaille <akim.demaille@gmail.com> CI: update the ICC serial number for travis-ci.org On travis-ci.org, there are five concurrent slaves, instead of three on travis-ci.com. 2019-01-28 Akim Demaille <akim.demaille@gmail.com> style: comment changes * src/lr0.c, src/state.c, src/state.h: here. 2019-01-28 Akim Demaille <akim.demaille@gmail.com> closure: initialize it once for all The memory allocated by 'closure' (and some data such as 'fderives') is used to computed a state's full itemset from its core. This is needed during the construction of the LR(0) automaton, and the memory is reclaimed immediately afterwards. Unfortunately the reports (graph, text, xml) also need this information when describing the states with their full itemsets. As a consequence the memory was allocated again, fderives computed again too, and more --trace reports are generated which only duplicate what was already reported. Stop that. It does mean that we release the memory later (hence the peak memory usage is higher now), but I don't think that's a problem today. * src/lr0.c (generate_states): Don't call closure_free. * src/state.c (states_free): Do it here. (for symmetry with closure_new which is called in generate_states). * src/print-graph.c, src/print-xml.c, src/print.c: You can now expect the closure module to be functional. 2019-01-28 Akim Demaille <akim.demaille@gmail.com> style: rename closure_* functions as closure_* This is more consistent with the other files. * closure.h, closure.c (new_closure, free_closure): Rename as... (closure_new, closure_free): this. Adjust dependencies. 2019-01-28 Akim Demaille <akim.demaille@gmail.com> lr0: use a bitset for the set of "shiftable symbols" This will make it easier to add new elements (that might already be part of shift_symbol) without having to worry about the size of shift_symbol (which is currently a fixed size vector). I could not measure any significant differences in performances in the generation of LR(0) automaton (benched on gramamrs of Ruby, C, and C++). * src/lr0.c (shift_symbol): Make it a bitset. 2019-01-28 Akim Demaille <akim.demaille@gmail.com> add -fsyntax-only When debugging Bison itself, this is very handy, especially when tweaking the frontend badly enough to break the backends. It can also be used to check a grammar. * src/getargs.h, src/getargs.c (feature_syntax_only): New. (feature_args, feature_types): Adjust. * src/main.c (main): Use it. 2019-01-27 Akim Demaille <akim.demaille@gmail.com> style: beware of collisions on status * src/symtab.h (status): Rename as... (declaration_status): this, to avoid colliding with status, the argument of 'usage'. 'status' seems a tad too general to be used only here. 2019-01-27 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2019-01-27 Akim Demaille <akim.demaille@gmail.com> usage: document -ffixit * src/getargs.c (usage): Document -ffixit. Document the aliases of -f. 2019-01-27 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes in state.c and ielr.c 2019-01-27 Akim Demaille <akim.demaille@gmail.com> Merge branch 'maint' * maint: maint: post-release administrivia version 3.3.1 yacc: issue warnings, not errors, for Bison extensions style: formatting changes in NEWS and complain.c tests: don't depend on the user's definition of SHELL 2019-01-27 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-01-27 Akim Demaille <akim.demaille@gmail.com> version 3.3.1 * NEWS: Record release date. 2019-01-27 Akim Demaille <akim.demaille@gmail.com> yacc: issue warnings, not errors, for Bison extensions Reported by Kiyoshi Kanazawa. http://lists.gnu.org/archive/html/bug-bison/2019-01/msg00029.html * src/getargs.c (getargs): Let --yacc imply -Wyacc, not -Werror=yacc. * tests/input.at: Adjust. * doc/bison.tex (Bison Options): Document. 2019-01-27 Akim Demaille <akim.demaille@gmail.com> style: formatting changes in NEWS and complain.c 2019-01-27 Kiyoshi Kanazawa <yoi_no_myoujou@yahoo.co.jp> tests: don't depend on the user's definition of SHELL http://lists.gnu.org/archive/html/bug-bison/2019-01/msg00031.html * examples/test (SHELL): Set it to /bin/sh. 2019-01-26 Akim Demaille <akim.demaille@gmail.com> traces: always print the reduced grammar and fix it * src/gram.c (grammar_dump): Print the effective number first instead of last. And fix it (remove the incorrect "+1"). Use t/f for Booleans. * src/reduce.c: When asked, always print the reduced grammar, even if there was nothing useless. * tests/sets.at (Reduced Grammar): Check that. 2019-01-26 Akim Demaille <akim.demaille@gmail.com> style: rename LR0.* as lr0.* Let's stick to lower case for file names. * src/LR0.h, src/LR0.c: Rename as... * src/lr0.h, src/lr0.c: these. 2019-01-26 Akim Demaille <akim.demaille@gmail.com> style: rename print_graph.* as print-graph.* These are the only files with _. * src/print_graph.h, src/print_graph.c: Rename as... * src/print-graph.h, src/print-graph.c: these. 2019-01-26 Akim Demaille <akim.demaille@gmail.com> style: various fixes * src/gram.c: Use consistent variable names. Prefix prefix unary operators. (grammar_dump): Use rule_rhs_length instead of duplicating it. * src/reduce.c: Avoid useless variables. 2019-01-26 Akim Demaille <akim.demaille@gmail.com> style: comment changes in gram.h * src/gram.h: Shorten comments. 2019-01-26 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-01-26 Akim Demaille <akim.demaille@gmail.com> version 3.3 * NEWS: Record release date. 2019-01-26 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2019-01-26 Akim Demaille <akim.demaille@gmail.com> c++: fix comment * data/skeletons/c++.m4: here. 2019-01-26 Akim Demaille <akim.demaille@gmail.com> style: formatting changes * data/skeletons/lalr1.cc: Add dnl. * data/skeletons/bison.m4: Comment the use of dnl. 2019-01-26 Akim Demaille <akim.demaille@gmail.com> tests: run the printer/destructor test on glr.cc * tests/actions.at (_AT_CHECK_PRINTER_AND_DESTRUCTOR): Adjust for glr.cc, and use it. 2019-01-24 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2019-01-22 Akim Demaille <akim.demaille@gmail.com> --update: when used, do not generate the output files It is inconvenient that we also generate the output files when we update the grammar file, and it's somewhat unexpected. Let's not do that. * src/main.c (main): Skip generation when --update is passed. * src/getargs.c (usage): Update the help message. * doc/bison.texi (Bison Options): Likewise. * tests/input.at: Check that we don't generate the output. 2019-01-22 Akim Demaille <akim.demaille@gmail.com> diagnostics: let redundant definitions be only warnings After all, this is clearly harmless. * src/muscle-tab.c (muscle_percent_define_insert): Let equal definitions of a %define variable be only a warning. Adjust test cases. 2019-01-22 Akim Demaille <akim.demaille@gmail.com> tests: improve check for updated variable names * tests/input.at ("%define" backward compatibility): Don't define twice "api.namespace", so that we don't get an error, which stops the process too soon to see an error about the value given to 'lr.keep-unreachable-state'. 2019-01-21 Akim Demaille <akim.demaille@gmail.com> diagnostics: remove redundancy Don't repeat the name of the warning in the sub messages. E.g., remove the second "[-Wother]" in the following message foo.y:2.1-27: warning: %define variable 'parse.error' redefined [-Wother] %define parse.error verbose ^~~~~~~~~~~~~~~~~~~~~~~~~~~ foo.y:1.1-27: previous definition [-Wother] %define parse.error verbose ^~~~~~~~~~~~~~~~~~~~~~~~~~~ * src/complain.c (error_message): Don't print the warning type when it's indented. Adjust test cases. 2019-01-20 Akim Demaille <akim.demaille@gmail.com> c++: better "scope" a workaround for GCC * data/skeletons/lalr1.cc: Enable it only for GCC 4.8 and before. 2019-01-20 Akim Demaille <akim.demaille@gmail.com> c++: address -Wweak-vtables warnings Reported by Derek Clegg http://lists.gnu.org/archive/html/bug-bison/2019-01/msg00021.html aux/parser-internal.h:429:12: error: 'syntax_error' has no out-of-line virtual method definitions; its vtable will be emitted in every translation unit [-Werror,-Wweak-vtables] struct syntax_error : std::runtime_error To avoid this warning, we need syntax_error to have a virtual function defined in a compilation unit. Let it be the destructor. To comply with C++98, this dtor should be 'throw()'. Merely making YY_NOEXCEPT be 'throw()' in C++98 triggers errors (http://lists.gnu.org/archive/html/bug-bison/2019-01/msg00022.html), so let's introduce YY_NOTHROW and flag only ~syntax_error with it. Also, since we now have an explicit dtor, we need to provide an copy ctor. * configure.ac (warn_cxx): Add -Wweak-vtables. * data/skeletons/c++.m4 (YY_NOTHROW): New. (syntax_error): Declare the dtor, and define the copy ctor. * data/skeletons/glr.cc, data/skeletons/lalr1.cc (~syntax_error): Define. 2019-01-20 Akim Demaille <akim.demaille@gmail.com> style: prefer bool to char * src/state.h, src/state.c (state::consistent): Make it a bool. Adjust dependencies. 2019-01-20 Akim Demaille <akim.demaille@gmail.com> glr.cc: be more alike lalr1.cc 2019-01-20 Akim Demaille <akim.demaille@gmail.com> style: formatting changes * data/skeletons/c++.m4: Un-remove an end-of-line. 2019-01-20 Akim Demaille <akim.demaille@gmail.com> NEWS: fixes 2019-01-19 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-01-19 Akim Demaille <akim.demaille@gmail.com> version 3.2.91 * NEWS: Record release date. 2019-01-18 Akim Demaille <akim.demaille@gmail.com> style: various fixes Some reported by syntax-check. * po/POTFILES.in: Add fixits.cc. * src/muscle-tab.c: Don't cast for free. * src/files.c: Reduce scopes. * cfg.mk: We need the cast for free in muscle_percent_define_insert. 2019-01-18 Akim Demaille <akim.demaille@gmail.com> doc: document -ffixit and --update * doc/bison.texi (Bison Options): here. 2019-01-18 Akim Demaille <akim.demaille@gmail.com> doc: style fixes * doc/bison.texi: Use @kbd where appropriate. Update ^~~~ marks for caret-errors. * build-aux/cross-options.pl: Do not add quotes to %define's argument. 2019-01-18 Akim Demaille <akim.demaille@gmail.com> NEWS: update for fixits and --update 2019-01-17 Akim Demaille <akim.demaille@gmail.com> fixits: handle duplicates of %name-prefix The test case "Deprecated directives" (currently 56) no longer emits warnings after 'bison -u'! * src/files.h, src/files.c (spec_name_prefix_loc): New. * src/parse-gram.y (handle_name_prefix): Emit fixits for duplicate %name-prefix. * tests/input.at (Deprecated directives): Adjust. 2019-01-17 Akim Demaille <akim.demaille@gmail.com> regen 2019-01-17 Akim Demaille <akim.demaille@gmail.com> fixits: handle %file-prefix * src/files.h, src/files.c (spec_file_prefix_loc): New. * src/scan-gram.l (%file-prefix): Delegate diagnostics to... * src/parse-gram.y (handle_file_prefix): here. * src/complain.c (duplicate_directive): Quote the directive. * tests/input.at: Adjust. 2019-01-17 Akim Demaille <akim.demaille@gmail.com> fixits: handle per-rule duplicates * src/complain.c (duplicate_rule_directive): Here. * tests/actions.at (Invalid uses of %empty): Check it. 2019-01-17 Akim Demaille <akim.demaille@gmail.com> fixits: fix warnings about duplicates * src/complain.c (duplicate_directive): Fix the complaint level. * tests/input.at: Adjust. 2019-01-16 Akim Demaille <akim.demaille@gmail.com> diagnostics: properly indent the "previous declaration" message * src/complain.c (duplicate_directive, duplicate_rule_directive): Here. 2019-01-16 Akim Demaille <akim.demaille@gmail.com> regen 2019-01-16 Akim Demaille <akim.demaille@gmail.com> style: rename some functions for consistency "handle_" is the prefix used in scan-code.l for instance. * src/parse-gram.y (do_error_verbose, do_name_prefix, do_require) (do_skeleton, do_yacc): Rename as... (handle_error_verbose, handle_name_prefix, handle_require) (handle_skeleton, handle_yacc): these. 2019-01-16 Akim Demaille <akim.demaille@gmail.com> fixits: report duplicate %yacc directives We should use -ffixit and --update to clean files with duplicate directives. And we should complain only once about duplicate obsolete directives: keep only the "duplicate" warning. Let's start with %yacc. For instance on: %fixed-output_files %fixed-output-files %yacc %% exp: This run of bison: $ bison /tmp/foo.y -u foo.y:1.1-19: warning: deprecated directive, use '%fixed-output-files' [-Wdeprecated] %fixed-output_files ^~~~~~~~~~~~~~~~~~~ foo.y:2.1-19: warning: duplicate directive [-Wother] %fixed-output-files ^~~~~~~~~~~~~~~~~~~ foo.y:1.1-19: previous declaration %fixed-output_files ^~~~~~~~~~~~~~~~~~~ foo.y:3.1-5: warning: duplicate directive [-Wother] %yacc ^~~~~ foo.y:1.1-19: previous declaration %fixed-output_files ^~~~~~~~~~~~~~~~~~~ bison: file 'foo.y' was updated (backup: 'foo.y~') gives: %fixed-output-files %% exp: * src/location.h, src/location.c (location_empty): New. * src/complain.h, src/complain.c (duplicate_directive): New. * src/getargs.h, src/getargs.c (yacc_flag): Instead of a Boolean, be the location of the definition. Update dependencies. * src/scan-gram.l (%yacc, %fixed-output-files): Move the handling of its warnings to... * src/parse-gram.y (do_yacc): This new function. * tests/input.at (Deprecated Directives): Adjust expectations. 2019-01-16 Akim Demaille <akim.demaille@gmail.com> style: rename duplicate_directive as duplicate_rule_directive * src/complain.h, src/complain.c: here. Adjust callers. 2019-01-16 Akim Demaille <akim.demaille@gmail.com> fixits: suggest running --update if there are fixits * src/fixits.h, src/fixits.c (fixits_empty): New. * src/complain.c (deprecated_directive): Register the Wdeprecated fixits only if -Wdeprecated was enabled, so that we don't apply updates if the user didn't ask for them. * src/main.c (main): If there were fixits, issue a warning suggesting running with --update. Free uniqstrs after the fixits, since the latter use the former. * tests/headers.at, tests/input.at: Update expectations. 2019-01-16 Akim Demaille <akim.demaille@gmail.com> fixits: avoid generating empty lines * src/fixits.c (fixits_run): If erase the content of a line, also erase the following \n. * tests/input.at (Deprecated directives): Update expectations. 2019-01-15 Akim Demaille <akim.demaille@gmail.com> configure: don't try to run C++ warnings on C Reported by Derek Clegg. https://lists.gnu.org/archive/html/bison-patches/2019-01/msg00066.html * configure.ac: here. 2019-01-15 Akim Demaille <akim.demaille@gmail.com> c, c++: avoid implicit fall-throw Reported by Derek Clegg. http://lists.gnu.org/archive/html/bug-bison/2019-01/msg00004.html * configure.ac (warn_common): Add -Wimplicit-fallthrough. This does trigger failures in the test suite. * data/skeletons/glr.c, data/skeletons/lalr1.cc, * data/skeletons/yacc.c, tests/c++.at: Make fall-throws explicit. 2019-01-15 Akim Demaille <akim.demaille@gmail.com> c++: avoid -Wundefined-func-template warnings from clang Reported by Derek Clegg. http://lists.gnu.org/archive/html/bug-bison/2019-01/msg00006.html Clang does not like this: template <typename D> struct basic_symbol : D { basic_symbol(); }; struct by_type {}; struct symbol_type : basic_symbol<by_type> { symbol_type(){} }; It gives: $ clang++-mp-7.0 -Wundefined-func-template foo.cc -c foo.cc:11:3: warning: instantiation of function 'basic_symbol<by_type>::basic_symbol' required here, but no definition is available [-Wundefined-func-template] symbol_type(){} ^ foo.cc:4:3: note: forward declaration of template entity is here basic_symbol(); ^ foo.cc:11:3: note: add an explicit instantiation declaration to suppress this warning if 'basic_symbol<by_type>::basic_symbol' is explicitly instantiated in another translation unit symbol_type(){} ^ 1 warning generated. The same applies for the basic_symbol's destructor and `clear()`. * configure.ac (warn_cxx): Add -Wundefined-func-template. This triggered one failure in the test suite: * tests/headers.at (Sane headers): here, where we check that we can compile the generated headers in other compilation units than the parser's. Add a variant type to make sure that basic_symbol and symbol_type are properly generated in this case. * data/skeletons/c++.m4 (basic_symbol): Inline the definitions of the destructor and of `clear` in the class definition. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> Revert the last two commits They should not have been pushed, sorry about that. This reverts - commit 8575bd06ae6e65f3a30b21a3e022a968e4c7ae7a. - commit 55bf52860eac5c1394dc344a691220272df32b09. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> c++: avoid warnings about extraneous semi-colons Reported by Derek Clegg. * configure.ac (warn_common): Add -Wextra-semi. * data/skeletons/c++.m4: Remove extraneous semi-colon. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> WIP 2019-01-14 Akim Demaille <akim.demaille@gmail.com> diagnostics: add fixit support for duplicate removal * src/muscle-tab.c (muscle_percent_define_insert): Register a fixit for duplicate removal. * tests/input.at: Adjust expectations. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> regen 2019-01-14 Akim Demaille <akim.demaille@gmail.com> diagnostics: improve the accuracy for %error-verbose Avoid duplicate warnings about %error-verbose, once for deprecation, another for duplicate. Keep only the duplicate warning for the second occurrence of %error-verbose. This will help removal fixits. * src/scan-gram.l (%error-verbose): Return as a PERCENT_ERROR_VERBOSE token. * src/parse-gram.y (do_error_verbose): New. Use it. * src/muscle-tab.c (muscle_percent_variable_update): Handle pseudo variables such as %error-verbose. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> diagnostics: avoid duplicate warnings for deprecated directives Currently, on %define parser_class_name "Parser" %define parser_class_name "Parser" %% exp:; we issue: foo.y:1.9-25: warning: deprecated directive, use '%define api.parser.class {Parser}' [-Wdeprecated] %define parser_class_name "Parser" ^~~~~~~~~~~~~~~~~ foo.y:2.9-25: warning: deprecated directive, use '%define api.parser.class {Parser}' [-Wdeprecated] %define parser_class_name "Parser" ^~~~~~~~~~~~~~~~~ foo.y:2.9-25: error: %define variable 'api.parser.class' redefined %define parser_class_name "Parser" ^~~~~~~~~~~~~~~~~ foo.y:1.9-25: previous definition %define parser_class_name "Parser" ^~~~~~~~~~~~~~~~~ Let's get rid of the second warning about the deprecated variable parser_class_name. This is noise, but it will also be a problem with fixits for removing duplicates, as we will first generate the update, and then it's too late to remove it: fixits do not edit the result of previous fixits. So generate this instead: foo.y:1.1-34: warning: deprecated directive, use '%define api.parser.class {Parser}' [-Wdeprecated] %define parser_class_name "Parser" ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ foo.y:2.1-34: error: %define variable 'api.parser.class' redefined %define parser_class_name "Parser" ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ foo.y:1.1-34: previous definition %define parser_class_name "Parser" ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * src/muscle-tab.c (muscle_percent_variable_update): Pass the warning to the caller, instead of issuing it. (muscle_percent_define_insert): Issue this warning only if we don't have to complain about a duplicate definition. * tests/input.at: Adjust expectations. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> diagnostics: update the grammar file Let's use the fixits to actually update the grammar files. * src/getargs.h, src/getargs.c (update_flag): New. * src/fixits.h, src/fixits.c (fixits_run): New. * src/main.c (main): Invoke fixits_run when --update is passed. * tests/input.at (Deprecated directives): Check --update. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> diagnostics: improve accuracy for deprecated %define variables * src/parse-gram.y: Use the location of the whole definition to record the location of a %define variable, instead of just the name of the variable. Adjust tests. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> diagnostics: keep the fixits Introduce proper support for fixits, instead of just printing them on demand. * bootstrap.conf: We need gnulib's xlists. * src/fixits.h, src/fixits.c: New. * src/complain.c (deprecated_directive): Use fixits_register. * src/main.c (main): Use fixits_free. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> diagnostics: add -ffixit support for deprecated features Issue directives for IDE/editors to fix the source file. http://clang.llvm.org/docs/UsersManual.html#cmdoption-fdiagnostics-parseable-fixits Do it for deprecated features. For instance: $ cat foo.y %error-verbose %name-prefix = "foo" %name-prefix="bar" %define parser_class_name "Parser" %% exp:; $ LC_ALL=C ./_build/8d/tests/bison -ffixit /tmp/foo.yy /tmp/foo.yy:1.1-14: warning: deprecated directive, use '%define parse.error verbose' [-Wdeprecated] %error-verbose ^^^^^^^^^^^^^^ fix-it:"/tmp/foo.yy":{1:1-1:15}:"%define parse.error verbose" /tmp/foo.yy:3.1-20: warning: deprecated directive, use '%define api.prefix {foo}' [-Wdeprecated] %name-prefix = "foo" ^^^^^^^^^^^^^^^^^^^^ fix-it:"/tmp/foo.yy":{3:1-3:21}:"%define api.prefix {foo}" /tmp/foo.yy:4.1-18: warning: deprecated directive, use '%define api.prefix {bar}' [-Wdeprecated] %name-prefix="bar" ^^^^^^^^^^^^^^^^^^ fix-it:"/tmp/foo.yy":{4:1-4:19}:"%define api.prefix {bar}" /tmp/foo.yy:5.9-25: warning: deprecated directive, use '%define api.parser.class {Parser}' [-Wdeprecated] %define parser_class_name "Parser" ^^^^^^^^^^^^^^^^^ fix-it:"/tmp/foo.yy":{5:9-5:26}:"%define api.parser.class {Parser}" /tmp/foo.yy:5.9-25: error: %define variable 'api.parser.class' is not used %define parser_class_name "Parser" ^^^^^^^^^^^^^^^^^ * src/getargs.h, src/getargs.c (feature_fixit_parsable): New. (feature_types, feature_args): Use it. * src/complain.c (deprecated_directive): Use it. * tests/input.at: Check it. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> diagnostics: prefer ^~~~ to ^^^^ to underline code That's what both GCC and Clang do, and it is indeed much nicer to read. From: foo.y:1.1-14: warning: deprecated directive, use '%define parse.error verbose' [-Wdeprecated] %error-verbose ^^^^^^^^^^^^^^ foo.y:4.1-20: warning: deprecated directive, use '%define api.prefix {foo}' [-Wdeprecated] %name-prefix = "foo" ^^^^^^^^^^^^^^^^^^^^ to: foo.y:1.1-14: warning: deprecated directive, use '%define parse.error verbose' [-Wdeprecated] %error-verbose ^~~~~~~~~~~~~~ foo.y:4.1-20: warning: deprecated directive, use '%define api.prefix {foo}' [-Wdeprecated] %name-prefix = "foo" ^~~~~~~~~~~~~~~~~~~~ * src/location.c (location_caret): Use ^~~~. Adjust tests expectations. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> regen 2019-01-14 Akim Demaille <akim.demaille@gmail.com> diagnostics: improve them for %name-prefix Currently the diagnostics for %name-prefix are not precise enough. In particular, they does not show that braces must be used instead of quotes. Before: foo.y:3.1-14: warning: deprecated directive, use '%define api.prefix' [-Wdeprecated] %name-prefix = "foo" ^^^^^^^^^^^^^^ After: foo.y:3.1-20: warning: deprecated directive, use '%define api.prefix {foo}' [-Wdeprecated] %name-prefix = "foo" ^^^^^^^^^^^^^^^^^^^^ To do this we need the value passed to %name-prefix, so move the warning from the scanner to the parser. Accuracy will be very important for the forthcoming changes. * src/parse-gram.y (do_name_prefix): New. (PERCENT_NAME_PREFIX): Have a semantic value: the raw source, with possibly underscores, equal sign, and spaces. This is used to provide a more accurate message. It does not take comments into account, but... * src/scan-gram.l (%name-prefix): Delegate the warnings to the parser. * tests/headers.at, tests/input.at: Adjust expectations. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> diagnostics: style: avoid allocating memory when not needed * src/muscle-tab.c (muscle_percent_variable_update): Avoid allocating memory when it is not needed, which should be most of the time (when there's no update to perform). Adjust callers. 2019-01-14 Akim Demaille <akim.demaille@gmail.com> c++: avoid warnings about extraneous semi-colons Reported by Derek Clegg. http://lists.gnu.org/archive/html/bug-bison/2019-01/msg00005.html * configure.ac (warn_cxx): Add -Wextra-semi. * data/skeletons/c++.m4: Remove extraneous semi-colon. 2019-01-13 Akim Demaille <akim.demaille@gmail.com> style: minor changes * src/muscle-tab.c: Sort alphabetically. * src/scan-gram.l: Reduce scopes. Initialize variables. 2019-01-13 Akim Demaille <akim.demaille@gmail.com> c++: beware of -Wshadow This line: slice<stack_symbol_type, stack_type> slice (yystack_, yylen); triggers warnings: parse.h:1790:11: note: shadowed declaration is here Reported by Frank Heckenbach. http://lists.gnu.org/archive/html/bug-bison/2019-01/msg00002.html * configure.ac (warn_c): Move -Wshadow to... (warn_common): here. * data/skeletons/stack.hh (slice): Define as an inner class of stack. * data/skeletons/lalr1.cc: Adjust. Rename the variable as 'range' instead of 'slice'. 2019-01-12 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2019-01-12 Akim Demaille <akim.demaille@gmail.com> version 3.2.90 * NEWS: Record release date. 2019-01-12 Akim Demaille <akim.demaille@gmail.com> yacc: fix relocatability * src/yacc.in (prefix): Define it, as it's typically needed for exec_prefix. 2019-01-12 Akim Demaille <akim.demaille@gmail.com> syntax-check: adjust paths * cfg.mk: here. (require_config_h): New. 2019-01-12 Akim Demaille <akim.demaille@gmail.com> style: formatting clean up * data/skeletons/d.m4, examples/d/calc.y, src/output.c, * src/parse-gram.y: No tab, no trailing spaces. Reported by syntax-check. 2019-01-12 Akim Demaille <akim.demaille@gmail.com> po: remove bitset/stats.c * po/POTFILES.in: here. 2019-01-12 Akim Demaille <akim.demaille@gmail.com> tests: fix usage of AT_PARSER_CHECK The parser must be the first command. Caught by syntax-check. * tests/c++.at: here. 2019-01-12 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2019-01-12 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2019-01-12 Akim Demaille <akim.demaille@gmail.com> style: isolate the creation of tname in a function * src/output.c (prepare_symbol_names): New. Use it. 2019-01-12 Akim Demaille <akim.demaille@gmail.com> tests: formatting changes * tests/input.at, tests/regression.at: here. 2019-01-05 Akim Demaille <akim.demaille@gmail.com> doc: use @option consistently * doc/bison.texi: Use @option, not @code, for options. 2019-01-05 Akim Demaille <akim.demaille@gmail.com> yacc.c: avoid negated if * data/skeletons/yacc.c: Prefer a "direct" conditional. 2019-01-05 Akim Demaille <akim.demaille@gmail.com> package: bump copyrights to 2019 2019-01-05 Akim Demaille <akim.demaille@gmail.com> java/d: rename some %define variables for consistency See 890ee8a1fd288b3cc1c21c49ea0ece696ef40565 and https://lists.gnu.org/archive/html/bison-patches/2019-01/msg00024.html. * data/skeletons/d.m4, data/skeletons/java.m4 (abstract, annotations, extends, final, implements, public, strictfp): Rename as... (api.parser.abstract, api.parser.annotations, api.parser.extends) (api.parser.final, api.parser.implements, api.parser.public) (api.parser.strictfp): these. * src/muscle-tab.c (muscle_percent_variable_update): Ensure backward compatibility. * doc/bison.texi, examples/d/calc.y, examples/java/Calc.y, tests/input.at: Adjust. 2019-01-05 Akim Demaille <akim.demaille@gmail.com> java/d: remove useless macros There are many macros that are defined and used just once (b4_public_if, b4_abstract_if, etc.). That's overkill. Rather, let's define a macro to build the "public class YYParser" line. It appears that the same syntax with "extends", "abstract", etc. is implemented in the D parser, which looks very fishy... * data/skeletons/d.m4, data/skeletons/java.m4 (b4_public_if) (b4_abstract_if, b4_final_if, b4_strictfp_if): Replace with (b4_parser_class_declaration): this. * data/skeletons/lalr1.d, data/skeletons/lalr1.java: Adjust. 2019-01-05 Akim Demaille <akim.demaille@gmail.com> style: clean tests * tests/named-refs.at: here. 2019-01-05 Akim Demaille <akim.demaille@gmail.com> gnulib: update In particular, report uninitialized submodules instead of breaking symlinks. For reports, see https://lists.gnu.org/archive/html/bug-bison/2011-05/msg00012.html https://lists.gnu.org/archive/html/help-bison/2018-12/msg00034.html For a fix, see https://lists.gnu.org/archive/html/bug-gnulib/2019-01/msg00024.html 2019-01-05 Akim Demaille <akim.demaille@gmail.com> glr.cc: fix the handling of syntax_error from the scanner Commit 90a8537e6287f92fb3d5be0258a69247a742f12e was right, but issued two error messages. Commit 80ef7e7639f99618bee490b2dea02b5fd9ab28e5 tried to address that by mapping yychar and yytoken to empty, but that completely breaks the invariants of glr.c. In particular, yygetToken can be called repeatedly and is expected to return the latest result, unless yytoken is YYEMPTY. Since the previous attempt was "recording" that the token was coming from an exception by setting it to YYEMPTY, instead of getting again the faulty token, we fetched another one. Rather, revert to the first approach: map yytoken to "invalid token", but record in yychar the fact that we come from an exception thrown in the scanner. * data/skeletons/glr.c (YYFAULTYTOK): New. (yygetToken): Use it to record syntax errors from the scanner. * tests/c++.at (Syntax error as exception): In addition to checking syntax_error with error recovery, make sure it also behaves as expected without. 2019-01-03 Akim Demaille <akim.demaille@gmail.com> clearly deprecate %name-prefix * src/scan-gram.l (%name-prefix): Issue a deprecation warning. * tests/calc.at, tests/headers.at, tests/input.at, tests/java.at, * tests/javapush.at, tests/local.at: Adjust expectations. Or disable -Wdeprecated. * doc/bison.texi: Document that %name-prefix is replaced by %define api.prefix. 2019-01-03 Akim Demaille <akim.demaille@gmail.com> examples: clean up the Java/D examples * examples/java/Calc.y: Fix indentation. Sort. Don't use %name-prefix, since api.parser.class is already defined. * examples/d/calc.y: Likewise. 2019-01-03 Akim Demaille <akim.demaille@gmail.com> doc: formatting changes * doc/bison.texi: here. 2019-01-02 Akim Demaille <akim.demaille@gmail.com> rename parser_class_name as api.parser.class The previous name was historical and inconsistent. * src/muscle-tab.c (define_directive): Use the proper value passing syntax, based on the muscle kind. (muscle_percent_variable_update): Use the right value passing syntax. Migrate from parser_class_name to api.parser.class. * data/skeletons: Migrate from parser_class_name to api.parser.class. * doc/bison.texi (%define Summary): Document both parser_class_name and api.parser.class. Promote the latter over the former. 2019-01-02 Akim Demaille <akim.demaille@gmail.com> style: formatting changes * src/scan-gram.l: Here. 2019-01-02 Akim Demaille <akim.demaille@gmail.com> style: glr.c: prefer returning a value rather than passing pointers This is very debatable. This function is not pure at all, so it could stick to returning void: that's a common coding style to tell the difference between "real" (pure) functions and side-effecting subroutines. However, we already have this style elsewhere (e.g., yylex), and I feel the callers are somewhat nice to read this way. * data/skeletons/glr.c (yygetLRActions): Return the action rather than passing by pointer. While at it, fix type of yytoken. Adjust callers. 2019-01-02 Akim Demaille <akim.demaille@gmail.com> glr.cc: don't issue two error messages when syntax_error is thrown Reported by Askar Safin. https://lists.gnu.org/archive/html/bison-patches/2019-01/msg00000.html * data/skeletons/glr.c (yygetToken): Return YYEMPTY when an exception is thrown. * data/skeletons/lalr1.cc: Log when an exception is caught. * tests/c++.at (Syntax error as exception): Be sure to recover from error before triggering another error. 2019-01-02 Akim Demaille <akim.demaille@gmail.com> skeletons: shorten b4_parser_class_name to b4_parser_class * skeletons/c++.m4, skeletons/d.m4, skeletons/glr.c, skeletons/glr.cc, * skeletons/java.m4, skeletons/lalr1.cc, skeletons/lalr1.d, * skeletons/lalr1.java: Here. 2019-01-02 Akim Demaille <akim.demaille@gmail.com> glr.cc: remove duplicate definition of YYLLOC_DEFAULT It's already provided by glr.c. * data/skeletons/glr.cc (b4_post_prologue): Here. 2019-01-02 Akim Demaille <akim.demaille@gmail.com> style: sort includes in scanners * src/scan-code.l, src/scan-gram.l, src/scan-skel.l: Reorder includes. 2019-01-02 Akim Demaille <akim.demaille@gmail.com> style: formatting changes in the doc * doc/bison.texi: here. 2019-01-02 Akim Demaille <akim.demaille@gmail.com> style: remove stray empty lines * data/skeletons/glr.c, data/skeletons/glr.cc: here. * data/skeletons/bison.m4 (b4_glr_cc_if): Move it here. 2018-12-31 Akim Demaille <akim.demaille@gmail.com> glr.cc: support syntax_error exceptions Kindly requested by Аскар Сафин (Askar Safin). http://lists.gnu.org/archive/html/bug-bison/2018-12/msg00033.html * data/skeletons/glr.c (b4_glr_cc_if): New. Use it. (yygetToken): Catch syntax_errors. * data/skeletons/glr.cc (YY_EXCEPTIONS): New. * tests/c++.at: Check it. 2018-12-31 Akim Demaille <akim.demaille@gmail.com> glr.c: factor the calls to yylex The call protocol of yylex is quite complex, and repeated three times. Let's factor it. * data/skeletons/glr.c (yygetToken): New. Use it. 2018-12-31 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes in glr.c * data/skeletons/glr.c (yyrecoverSyntaxError): here. 2018-12-30 Akim Demaille <akim.demaille@gmail.com> tests: refactor 2018-12-30 Akim Demaille <akim.demaille@gmail.com> c++: inline the implementation of syntax_error in its definition This way, it is easier to make sure its implementation is available in glr.cc too, which is not the case currently. * data/skeletons/c++.m4 (b4_public_types_define): Move the implementation of syntax_error... (b4_public_types_declare): here. 2018-12-29 Akim Demaille <akim.demaille@gmail.com> style: formatting changes * tests/input.at: here. 2018-12-29 Akim Demaille <akim.demaille@gmail.com> symbol: don't crash on symbol without content When running with --trace=parse, we may crash. * src/symtab.c (symbol_print): Avoid that. 2018-12-28 Akim Demaille <akim.demaille@gmail.com> README-hacking: update 2018-12-28 Akim Demaille <akim.demaille@gmail.com> reader: get rid of a useless function Useless since 58d7a1a1c7497ba51a35fcf991c5b047f692fe18 (2006). * src/parse-gram.y, src/reader.h (token_name): Remove, unused. 2018-12-27 Akim Demaille <akim.demaille@gmail.com> parsers: fix minor stylistic issues * data/skeletons/variant.hh (b4_token_constructor_declare): Remove, unused since the previous commit. Fix indentation issues. * data/skeletons/c++.m4: Fix indentation issues. 2018-12-27 Akim Demaille <akim.demaille@gmail.com> c++: check several parsers in the same program * tests/local.at (AT_LOCATION_TYPE_IF): Turn into... (AT_LOCATION_TYPE_SPAN_IF): this. Adjust dependencies. * tests/headers.at (Several parsers): Add another C++ parser, which uses the first C++ parser's locations. 2018-12-26 Akim Demaille <akim.demaille@gmail.com> c++: variants: fuse declarations and definitions We used to create a short definition of yy::parser with all the implementations of its member functions outside. But yy::parser is no longer short and simple to read. Maintaining each function twice is painful: a lot of redundancy but different indentation levels, output which depends on whether we are in a header or not (see d132c2d5455135f63a7497c38358eadd6e3a6af8), etc. Let's simplify this and put the implementations into the class definition itself. Discussed in this monologue: https://lists.gnu.org/archive/html/bison-patches/2018-12/msg00058.html. * data/skeletons/c++.m4, data/skeletons/lalr1.cc, * data/skeletons/variant.hh (b4_basic_symbol_constructor_define) (_b4_token_constructor_declare, b4_token_constructor_declare) Merge into... (b4_basic_symbol_constructor_define, _b4_token_constructor_define) (b4_token_constructor_define): these. 2018-12-26 Akim Demaille <akim.demaille@gmail.com> examples: fix dependencies Commit 112ccb5ed73ba5c64b0b5300d8b9b686f02f094c moved the skeletons from dist_pkgdata_DATA to dist_skeletons_DATA, hence broke the dependencies. * Makefile.am (dependencies): New. Use it where appropriate. 2018-12-26 Akim Demaille <akim.demaille@gmail.com> c++: move stack<T> inside yy::parser We used to define such auxiliary structures outside the class, mainly as a matter of style to keep the definition of yy::parser short and simple. However, now there's a lot more code generated inside the class definition (e.g., all the token constructors), so the readability no longer applies. However, if we move stack (and slice) inside yy::parser, then it should no longer be needed to change the namespace to have multiple parsers: changing the class name should suffice. One common argument against inner classes is that they code bloat. It hardly applies here, since typically different parsers will have different semantic value types, hence different actual stack types. * data/skeletons/lalr1.cc: Invoke b4_stack_define inside yy::parser. 2018-12-25 Akim Demaille <akim.demaille@gmail.com> package: make bison a relocatable package Suggested by David Barto https://lists.gnu.org/archive/html/help-bison/2015-02/msg00004.html and Victor Zverovich. https://lists.gnu.org/archive/html/bison-patches/2018-10/msg00121.html This is very easy to do, thanks to work by Bruno Haible in gnulib. See "Supporting Relocation" in gnulib's documentation. * bootstrap.conf: We need relocatable-prog and relocatable-script (for yacc). * src/yacc.in: New. * configure.ac, src/local.mk: Instantiate it. * src/main.c, src/output.c (main, pkgdatadir): Use relocatable2. * doc/bison.texi (FAQ): Document it. 2018-12-25 Akim Demaille <akim.demaille@gmail.com> README: wrap paragraphs 2018-12-25 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2018-12-25 Akim Demaille <akim.demaille@gmail.com> package: move skeletons into data/skeletons * data/bison.m4, data/c++-skel.m4, data/c++.m4, data/c-like.m4, * data/c-skel.m4, data/c.m4, data/d-skel.m4, data/d.m4, data/glr.c, * data/glr.cc, data/java-skel.m4, data/java.m4, data/lalr1.cc, * data/lalr1.d, data/lalr1.java, data/location.cc, data/stack.hh, * data/variant.hh, data/yacc.c: Move to... * data/skeletons: here. Use b4_skeletonsdir instead of b4_pkgdatadir. * data/local.mk, src/output.c: Adjust. 2018-12-24 Akim Demaille <akim.demaille@gmail.com> c++: style: use consistently this/that instead of this/other * data/lalr1.cc, data/variant.hh: here. 2018-12-24 Akim Demaille <akim.demaille@gmail.com> c++: also provide a copy constructor for symbol_type Suggested by Wolfgang Thaller. http://lists.gnu.org/archive/html/bug-bison/2018-12/msg00081.html * data/c++.m4 (basic_symbol, by_type): Instead of provide either move or copy constructor, always provide the copy one. * tests/c++.at (C++ Variant-based Symbols Unit Tests): Check it. 2018-12-24 Akim Demaille <akim.demaille@gmail.com> c++: fix double free when a symbol_type was moved Currently the following piece of code crashes (with parse.assert), because we don't record that s was moved-from, and we invoke its dtor. { auto s = parser::make_INT (42); auto s2 = std::move (s); } Reported by Wolfgang Thaller. http://lists.gnu.org/archive/html/bug-bison/2018-12/msg00077.html * data/c++.m4 (by_type): Provide a move-ctor. (basic_symbol): Be sure not to read a moved-from value. * tests/c++.at (C++ Variant-based Symbols Unit Tests): Check this case. 2018-12-24 Akim Demaille <akim.demaille@gmail.com> c++: style: improve tests * tests/c++.at (C++ Variant-based Symbols Unit Tests): Provide better assertions. Use them. Avoid useless Bison invocations. 2018-12-24 Akim Demaille <akim.demaille@gmail.com> c++: style: use consistently this/that instead of this/other * data/c++.m4: here. 2018-12-23 Akim Demaille <akim.demaille@gmail.com> tests: fixes * tests/c++.at: Use AT_YYLEX_PROTOTYPE etc. Which requires that we use the same argument names (lvalp, etc.). * tests/local.at (AT_NAME_PREFIX): Fix regex. 2018-12-22 Akim Demaille <akim.demaille@gmail.com> c++: style: rename a few macros for clarity * data/c++.m4, data/lalr1.cc, data/variant.hh: s/b4_symbol_constructor/b4_token_constructor/g, as this is really what is being defined. 2018-12-22 Akim Demaille <akim.demaille@gmail.com> c++: exhibit a safe symbol_type Instead of introducing make_symbol (whose name, btw, somewhat infringes on the user's "name space", if she defines a token named "symbol"), let's make the construction of symbol_type safer, using assertions. For instance with: %token ':' <std::string> ID <int> INT; generate: symbol_type (int token, const std::string&); symbol_type (int token, const int&); symbol_type (int token); It does mean that now named token constructors (make_ID, make_INT, etc.) go through a useless assert, but I think we can ignore this: I assume any decent compiler will inline the symbol_type ctor inside the make_TOKEN functions, which will show that the assert is trivially verified, hence I expect no code will be emitted for it. And anyway, that's an assert, NDEBUG controls it. * data/c++.m4 (symbol_type): Turn into a subclass of basic_symbol<by_type>. Declare symbol constructors when variants are enabled. * data/variant.hh (_b4_type_constructor_declare) (_b4_type_constructor_define): Replace with... (_b4_symbol_constructor_declare, _b4_symbol_constructor_def): these. Generate symbol_type constructors. * doc/bison.texi (Complete Symbols): Document. * tests/types.at: Check. 2018-12-22 Akim Demaille <akim.demaille@gmail.com> c++: provide symbol constructors per type On %token <int> FOO BAR we currently generate make_FOO(int) and make_BAR(int). However, in order to factor their scanners, some users would also like to have make_symbol(tok, int), where tok is FOO or BAR. To ensure type safety, add assertions that do check that value type and token type match. Bind this assertion to the parse.assert %define variable. Suggested by Frank Heckenbach. http://lists.gnu.org/archive/html/bug-bison/2018-12/msg00034.html Should also match expectations from Аскар Сафин. http://lists.gnu.org/archive/html/bug-bison/2018-12/msg00023.html * data/variant.hh: Use b4_token_visible_if where applicable. (_b4_type_constructor_declare, _b4_type_constructor_define): New. Use them. 2018-12-22 Akim Demaille <akim.demaille@gmail.com> c++: style changes * data/c++.m4, data/variant.hh: Improve layout of the generated code. Avoid casts. (_b4_symbol_constructor_declare, _b4_symbol_constructor_define): Rename as... (_b4_token_maker_declare, _b4_token_maker_define): these. * tests/types.at: Improve pair printing. 2018-12-22 Akim Demaille <akim.demaille@gmail.com> style: simplify tests * tests/types.at: Simplify C++ instantiations. 2018-12-19 Akim Demaille <akim.demaille@gmail.com> style: use b4_token_visible_if And other formatting/comment changes. * data/variant.hh: Here. 2018-12-19 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2018-12-19 Akim Demaille <akim.demaille@gmail.com> c++: fix token constructors for types with commas Bitten by macros, again. See 680b715518795c8648360fcf05f3772c04d2eed2. * data/variant.hh (_b4_symbol_constructor_declare) (_b4_symbol_constructor_define): Do not use user types, which can include commas as in `std::pair<int, int>`, to macros. * tests/local.at: Adjust the lex related macros to support the case of token constructors. * tests/types.at: Also check token constructors on types with commas. 2018-12-19 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2018-12-17 Akim Demaille <akim.demaille@gmail.com> symbols: document the overhaul of symbol declarations * doc/bison.texi (Symbol Decls): New. 2018-12-16 Akim Demaille <akim.demaille@gmail.com> symbols: check more invalid declarations * tests/input.at (Invalid %nterm uses): Rename as... (Invalid symbol declarations): this. Extend. 2018-12-16 Akim Demaille <akim.demaille@gmail.com> symbols: check the previous commit * tests/input.at (Symbol declarations): New. 2018-12-16 Akim Demaille <akim.demaille@gmail.com> regen 2018-12-16 Akim Demaille <akim.demaille@gmail.com> symbols: clean up their parsing Prompted by Rici Lake. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00000.html We have four classes of directives that declare symbols: %nterm, %type, %token, and the family of %left etc. Currently not all of them support the possibility to have several type tags (`<type>`), and not all of them support the fact of not having any type tag at all (%type). Let's unify this. - %type POSIX Yacc specifies that %type is for nonterminals only. However, some Bison users want to use it for both tokens and nterms (actually, Bison's own grammar does this in several places, e.g., CHAR). So it should accept char/string literals. As a consequence cannot be used to declare tokens with their alias: `%type foo "foo"` would be ambiguous (are we defining foo = "foo", or are these two different symbols?) POSIX specifies that it is OK to use %type without a type tag. I'm not sure what it means, but we support it. - %token Accept token declarations with number and string literal: (ID|CHAR) NUM? STRING?. - %left, etc. They cannot be the same as %token, because we accept to declare the symbol with %token, and to then qualify its precedence with %left. Then `%left foo "foo"` would also be ambiguous: foo="foo", or two symbols. They cannot be simply a list of identifiers, but POSIX Yacc says we can declare token numbers here. I personally think this is a bad idea, precedence management is tricky in itself and should not be cluttered with token declaration issues. We used to accept declaring a token number on a string literal here (e.g., `%left "token" 1`). This is abnormal. Either the feature is useful, and then it should be supported in %token, or it's useless and we should not support it in corner cases. - %nterm Obviously cannot accept tokens, nor char/string literals. Does not exist in POSIX Yacc, but since %type also works for terminals, it is a nice option to have. * src/parse-gram.y: Avoid relying on side effects. For instance, get rid of current_type, rather, build the list of symbols and iterate over it to assign the type. It's not always possible/convenient. For instance, we still use current_class. Prefer "decl" to "def", since in the rest of the implementation we actually "declare" symbols, we don't "define" them. (token_decls, token_decls_for_prec, symbol_decls, nterm_decls): New. Use them for %token, %left, %type and %nterm. * src/symlist.h, src/symlist.c (symbol_list_type_set): New. * tests/regression.at b/tests/regression.at (Token number in precedence declaration): We no longer accept to give a number to string literals. 2018-12-15 Akim Demaille <akim.demaille@gmail.com> symbols: set tag_seen when assigning a type to symbols * src/reader.h, src/reader.c (tag_seen): Move to... * src/symtab.h, src/symtab.c: here. (symbol_type_set): Set it to true. * src/parse-gram.y: Don't. 2018-12-14 Akim Demaille <akim.demaille@gmail.com> tests: isolate test about Yacc warnings * tests/input.at (Yacc warnings): New. (AT_CHECK_UNUSED_VALUES): Remove checks about yacc. 2018-12-14 Akim Demaille <akim.demaille@gmail.com> parser: warn about string literals in Yacc mode * src/scan-gram.l (scan_integer): Warn. * tests/input.at (Yacc warnings on symbols): Check. 2018-12-14 Akim Demaille <akim.demaille@gmail.com> parser: warn about hexadecimal token numbers in Yacc mode * src/scan-gram.l (scan_integer): Warn. * tests/input.at (Yacc warnings on symbols): Check. 2018-12-14 Akim Demaille <akim.demaille@gmail.com> parser: reprecate %nterm back After having spent quite some time on cleaning the handling of symbol declarations in the grammar files, I believe we should keep it. It looks like it's a duplicate of %type, but it is not. While POSIX Yacc requires %type to apply only to nonterminal symbols, it appears that both byacc and bison accept it for tokens too. And some experienced users do actually expect this feature to group symbols (terminal or not) by type ("On the other hand, it is generally more useful IMHO to group terminals and non-terminals with the same type tag together", http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00000.html). Even Bison's own parser does this today (see CHAR). Basically reverts 7928c3e6fbdf47ff81184966cee937e6aa694b94. * src/scan-gram.l (%nterm): Dedeprecate, but issue a Wyacc warning. * tests/input.at: Adjust expectations. (Yacc warnings on symbols): New. * src/symtab.c (symbol_class_set): Fix error introduced in 20b07467938cf880a1d30eb30d6e191843a21fec. 2018-12-11 Eduard Staniloiu <edi33416@gmail.com> CI: add dmd support * .travis.yml: here. 2018-12-11 Akim Demaille <akim.demaille@gmail.com> style: s/non-terminal/nonterminal/ I personally prefer 'non terminal', or 'non-terminal', but 'nonterminal' is the common spelling. * data/glr.c, src/parse-gram.y, src/symtab.c, src/symtab.h, * tests/input.at, doc/refcard.tex: here. 2018-12-11 Akim Demaille <akim.demaille@gmail.com> style: rename error functions for clarity * src/symtab.c (symbol_redeclaration, semantic_type_redeclaration) (user_token_number_redeclaration): Rename as... (complain_symbol_redeclared, complain_semantic_type_redeclared) (complain_user_token_number_redeclared): this. 2018-12-11 Akim Demaille <akim.demaille@gmail.com> parser: improve the error message for symbol class redefinition Currently our error messages include both "symbol redeclared" and "symbol redefined", and they mean something different. This is obscure, let's make this clearer. I think the idea between 'definition' vs. 'declaration' is that in the case of the nonterminals, the actual definition is its set of rules, so %nterm would be about declaration. The case of %token is less clear. * src/symtab.c (complain_class_redefined): New. (symbol_class_set): Use it. Simplify the logic of this function to clearly skip its body when the preconditions are not met. * tests/input.at (Symbol class redefinition): New. 2018-12-11 Akim Demaille <akim.demaille@gmail.com> examples: simplify computation of yydebug * examples/c/lexcalc/parse.y: here. 2018-12-10 Akim Demaille <akim.demaille@gmail.com> C++: support variadic emplace Suggested by Askar Safin. http://lists.gnu.org/archive/html/bug-bison/2018-12/msg00006.html * data/variant.hh: Implement. * tests/types.at: Check. * doc/bison.texi: Document. 2018-12-09 Akim Demaille <akim.demaille@gmail.com> examples: add a simple Flex+Bison example in C Suggested by Askar Safin. http://lists.gnu.org/archive/html/bug-bison/2018-12/msg00003.html * examples/c/lexcalc/Makefile, examples/c/lexcalc/README.md, * examples/c/lexcalc/lexcalc.test, examples/c/lexcalc/local.mk, * examples/c/lexcalc/parse.y, examples/c/lexcalc/scan.l: New. 2018-12-09 Akim Demaille <akim.demaille@gmail.com> regen 2018-12-09 Akim Demaille <akim.demaille@gmail.com> examples: sort them per language and complete them Convert some of the READMEs to Markdown, which is now more common, and nicely displayed in some git hosting services. Add missing READMEs and Makefiles. Generate XML, HTML and Dot files. Be sure to ship the test files. Complete CLEANFILES to remove all generated files. * examples/calc++: Move into... * examples/c++: here. * examples/mfcalc, examples/rpcalc: Move into... * examples/c: here. * examples/README.md, examples/c++/calc++/Makefile, examples/c/local.mk, * examples/c/mfcalc/Makefile, examples/c/rpcalc/Makefile, * examples/d/README.md, examples/java/README.md: New files. * examples/test (medir): Be robust to deeper directory nesting. 2018-12-09 Akim Demaille <akim.demaille@gmail.com> regen 2018-12-09 Akim Demaille <akim.demaille@gmail.com> parser: minor refactoring * src/parse-gram.y (symbol.prec): Reuse int.opt. 2018-12-09 Akim Demaille <akim.demaille@gmail.com> parser: move checks inside the called functions Revamping the handling of the symbols is the grammar is much more delicate than I anticipated. Let's first move things around for clarity. * src/symtab.c (symbol_make_alias): Don't accept to alias non-terminals. (symbol_user_token_number_set): Don't accept user token numbers for non-terminals. Don't do anything in case of redefinition, instead of trying to update. The flow is eaier to follow this way. 2018-12-08 Akim Demaille <akim.demaille@gmail.com> d: fix double definition of YYSemanticType * data/lalr1.d: When moving to b4_user_union_members, it also defines b4_tag_seen_flag, so we had two definitions. 2018-12-08 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2018-12-06 Akim Demaille <akim.demaille@gmail.com> parser: fix incorrect condition to raise a syntax error * src/parse-gram.y (symbol_def): Fix test. 2018-12-06 Akim Demaille <akim.demaille@gmail.com> d: fix use of b4_union_members * data/lalr1.d: Use b4_user_union_members instead. 2018-12-06 Akim Demaille <akim.demaille@gmail.com> style: comment changes * data/variant.hh: here. 2018-12-06 Akim Demaille <akim.demaille@gmail.com> java, d: add a Makefile for the example * examples/java/Makefile, examples/d/Makefile: New. 2018-12-05 Akim Demaille <akim.demaille@gmail.com> style: scope reduction in ielr.c * src/ielr.c: here. 2018-12-05 Akim Demaille <akim.demaille@gmail.com> style: scope reduction in lalr.c * src/lalr.c: here. 2018-12-05 Akim Demaille <akim.demaille@gmail.com> d, java: compute static subtractions * data/d.m4, data/java.m4: Use b4_subtract where appropriate. 2018-12-04 Akim Demaille <akim.demaille@gmail.com> d: add an example * examples/d/calc.test, examples/d/calc.y, examples/d/local.mk: 2018-12-04 Akim Demaille <akim.demaille@gmail.com> d: update the skeleton * data/d.m4, data/lalr1.d: Catch up with Bison. And actually, also catch up with D. 2018-12-04 Akim Demaille <akim.demaille@gmail.com> d: add experimental support for the D language * configure.ac (ENABLE_D): New. * src/getargs.c (valid_languages): Add d. 2018-12-04 Akim Demaille <akim.demaille@gmail.com> d: add skeleton for the D language Contributed by Oliver Mangold. https://lists.gnu.org/archive/html/help-bison/2012-01/msg00000.html * README-D.txt, d-skel.m4, d.m4, lalr1.d: New. 2018-12-04 Akim Demaille <akim.demaille@gmail.com> examples: regenerate them when version.texi changes When we extract the examples from the documentation, %require "@value{VERSION}" is replaced with the current version. If we change the git branch, without changing the documentation, the generated examples will %require a version of Bison that differs from the actual version. * examples/local.mk (extracted.stamp): Depend on doc/version.texi. 2018-12-04 Akim Demaille <akim.demaille@gmail.com> skeletons: start some technical documentation * data/README: Convert to Markdown. Start documenting some of the macros used in all our skeletons. Simplify and fix the documentation of the macros in the skeletons. 2018-12-03 Akim Demaille <akim.demaille@gmail.com> regen 2018-12-03 Akim Demaille <akim.demaille@gmail.com> backend: revamp the handling of symbol types Currently it is the front end that passes the symbol types to the backend. For instance: %token <ival> NUM %type <ival> exp1 exp2 exp1: NUM { $$ = $1; } exp2: NUM { $<ival>$ = $<ival>1; } In both cases, $$ and $1 are passed to the backend as having type 'ival' resulting in code like `val.ival`. This is troublesome in the case of api.value.type=union, since in that the case the code this: %define api.value.type union %token <int> NUM %type <int> exp1 exp2 exp1: NUM { $$ = $1; } exp2: NUM { $<int>$ = $<int>1; } because in this case, since the backend does not know the symbol being processed, it is forced to generate casts in both cases: *(int*)(&val)`. This is unfortunate in the first case (exp1) where there is no reason at all to use a cast instead of `val.NUM` and `val.exp1`. So instead delegate the computation of the actual value type to the backend: pass $<ival>$ as `symbol-number, ival` and $$ as `symbol-number, MULL`, instead of passing `ival` before. * src/scan-code.l (handle_action_dollar): Find the symbol the action is about, not just its tyye. Pass both symbol-number, and explicit type tag ($<tag>n when there is one) to b4_lhs_value and b4_rhs_value. * data/bison.m4 (b4_symbol_action): adjust to the new signature to b4_dollar_pushdef. * data/c-like.m4 (_b4_dollar_dollar, b4_dollar_pushdef): Accept the symbol-number as new argument. * data/c.m4 (b4_symbol_value): Accept the symbol-number as new argument, and use it. (b4_symbol_value_union): Accept the symbol-number as new argument, and use it to prefer ready a union member rather than casting the union. * data/yacc.c (b4_lhs_value, b4_rhs_value): Accept the new symbol-number argument. Adjust uses of b4_dollar_pushdef. * data/glr.c (b4_lhs_value, b4_rhs_value): Adjust. * data/lalr1.cc (b4_symbol_value_template, b4_lhs_value): Adjust to the new symbol-number argument. * data/variant.hh (b4_symbol_value, b4_symbol_value_template): Accept the new symbol-number argument. * data/java.m4 (b4_symbol_value, b4_rhs_data): New. (b4_rhs_value): Use them. * data/lalr1.java: Adjust to b4_dollar_pushdef, and use b4_rhs_data. 2018-12-03 Akim Demaille <akim.demaille@gmail.com> style: comment and formatting changes * data/bison.m4, data/c++.m4, data/glr.c, data/java.m4, data/lalr1.cc, * data/yacc.c, src/scan-code.l: Fix comments. Prefer POS to denote the position of a symbol in a rule, since NUM is also used to denote symbol numbers. 2018-12-03 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2018-12-03 Akim Demaille <akim.demaille@gmail.com> java: make sure the build dir exists * examples/java/local.mk (%D%/Calc.java): here. 2018-12-03 Akim Demaille <akim.demaille@gmail.com> c++: don't define variant<S>, directly define semantic_type Instead of defining yy::variant<S> and then alias yy::parser::semantic_type to variant<sizeof (union_type)>, directly define yy::parser::semantic_type. This model is more appropriate if we want to sit the storage on top of unions in C++11. * data/variant.hh (b4_variant_define): Specialize and inline the definition into... (b4_value_type_declare): Here. Define union_type here. * data/lalr1.cc: Adjust. 2018-12-01 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2018-12-01 Akim Demaille <akim.demaille@gmail.com> C++: use noexcept and constexpr There are probably more opportunities for them. So far, I observed no performance improvements. * data/c++.m4, data/lalr1.cc, data/stack.hh: here. 2018-12-01 Akim Demaille <akim.demaille@gmail.com> CI: also display the examples' test suite log * .travis.yml: here. 2018-12-01 Akim Demaille <akim.demaille@gmail.com> java: add an example * examples/java/Calc.y: New, based on test 495: "Calculator parse.error=verbose %locations". * examples/java/Calc.test, examples/java/local.mk: New. * configure.ac (ENABLE_JAVA): New. * examples/test (prog): Be ready to run Java programs. 2018-12-01 Akim Demaille <akim.demaille@gmail.com> style: unsigned int -> unsigned See https://lists.gnu.org/archive/html/bison-patches/2018-08/msg00027.html * src/output.c (muscle_insert_unsigned_int_table): Rename as... (muscle_insert_unsigned_table): this. 2018-12-01 Akim Demaille <akim.demaille@gmail.com> output: restore yyrhs and yyprhs This was demanded several times. See for instance: - David M. Warme https://lists.gnu.org/archive/html/help-bison/2011-04/msg00003.html - box12009 http://lists.gnu.org/archive/html/bug-bison/2016-10/msg00001.html Basically, this reverts: - commit 3d3bc1fe30f356cf674a979409e86ea0f88de4a0 Get rid of (yy)rhs and (yy)prhs - commit d333175f63f402dbadb647175e40ad88bf1defb5 Avoid compiler warning. Note that since these tables are not needed in the generated parsers, no skeleton requests them. This change only brings back their definition to M4, making it possible to user-defined skeletons to use these tables. * src/output.c (muscle_insert_item_number_table): Define. (prepare_rules): Generate the rhs and prhs tables. 2018-11-30 Akim Demaille <akim.demaille@gmail.com> regen 2018-11-30 Akim Demaille <akim.demaille@gmail.com> parser: shorten side-effects on current_type * src/parse-gram.y (tag.opt): Don't change current_type. Rather, return its value. Adjust dependencies. 2018-11-30 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes * src/symlist.c: here. 2018-11-29 Akim Demaille <akim.demaille@gmail.com> tests: don't name C++ files *.c * tests/synclines.at (syncline escapes): Here. Otherwise, Clang generates an error and skips the test. 2018-11-29 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2018-11-29 Akim Demaille <akim.demaille@gmail.com> regen 2018-11-29 Akim Demaille <akim.demaille@gmail.com> parser: factor the symbol definition * src/parse-gram.y (int.opt, string_as_id.opt): New. (symbol_def): Use it. 2018-11-29 Akim Demaille <akim.demaille@gmail.com> parser: improve location of string alias errors * src/parse-gram.y (symbol_def): Pass the right location for symbol_make_alias. * tests/regression.at (Duplicate string): Move to... * tests/input.at: here. (Token collisions): New. 2018-11-29 Akim Demaille <akim@lrde.epita.fr> diagnostics: complain about Bison directives when -Wyacc * src/complain.h, src/complain.c (bison_directive): New. * src/scan-gram.l (BISON_DIRECTIVE): New. Use it for Bison extensions. 2018-11-28 Akim Demaille <akim.demaille@gmail.com> doc: formatting changes * doc/bison.texi: here. 2018-11-27 Akim Demaille <akim.demaille@gmail.com> style: fix quotation in the test suite * tests/input.at: here. 2018-11-27 Akim Demaille <akim.demaille@gmail.com> regen 2018-11-27 Akim Demaille <akim.demaille@gmail.com> %nterm: do not accept character literals Reported by Rici Lake. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00000.html * src/complain.h: Formatting change. * src/parse-gram.y (id): Reject character literals used in a context for non-terminals. * tests/input.at (Invalid %nterm uses): Check that. 2018-11-27 Akim Demaille <akim.demaille@gmail.com> %nterm: do not accept numbers nor string alias Reported by Rici Lake. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00000.html * src/parse-gram.y (symbol_def): Refuse string aliases and numbers for non-terminals. (prologue_declaration): Recover from errors ended with ';'. * tests/input.at (Invalid %nterm uses): New. 2018-11-27 Akim Demaille <akim.demaille@gmail.com> TODO: update 2018-11-26 Akim Demaille <akim.demaille@gmail.com> doc: formatting changes * doc/bison.texi: Here. 2018-11-26 Akim Demaille <akim.demaille@gmail.com> style: comment changes * tests/testsuite.at: here. 2018-11-26 Akim Demaille <akim.demaille@gmail.com> gnulib: update ignores 2018-11-26 Akim Demaille <akim.demaille@gmail.com> gnulib: update to use its bitsets Bison's bitset were moved to gnulib. * lib/abitset.c, lib/abitset.h, lib/bbitset.h, lib/bitset.c, * lib/bitset.h, lib/ebitset.c, lib/ebitset.h, lib/lbitset.c, * lib/bitset_stats.c, lib/bitset_stats.h, lib/bitsetv-print.c, * lib/bitsetv-print.h, lib/bitsetv.c, lib/bitsetv.h, * lib/lbitset.h, lib/vbitset.c, lib/vbitset.h: Remove. * gnulib: Update. * bootstrap.conf, lib/local.mk: Adjust. 2018-11-25 Akim Demaille <akim.demaille@gmail.com> gnulib: use conditional dependencies * bootstrap.conf: here. 2018-11-25 Akim Demaille <akim.demaille@gmail.com> CI: run on xenial Xenial (Ubuntu 16.04) is finally available on Travis. Let's use it. Among the changes: - Automake 1.14.1 -> 1.15.0 - Doxygen 1.8.6 -> 1.8.11 - Flex 2.5.35 -> 2.6.0, with plenty of new compiler warnings - Gettext 0.18.3 -> 0.19.7 - Graphviz 2.36.0 -> 2.38.0 - Texinfo 5.2 -> 6.1 * .travis.yml: here. 2018-11-25 Akim Demaille <akim.demaille@gmail.com> CI: we don't need git show * .travis.yml: Don't run it. 2018-11-25 Akim Demaille <akim.demaille@gmail.com> regen 2018-11-25 Akim Demaille <akim.demaille@gmail.com> warning: avoid warnings about unreachable code Reported by Uxio Prego. https://lists.gnu.org/archive/html/help-bison/2018-11/msg00031.html We also need to move the unreachable 'goto' to a reachable place, otherwise clang complains about the code being unreachable anyway. See also https://bugs.llvm.org/show_bug.cgi?id=39736. Interestingly, we don't have to apply that trick to `#define YYCDEBUG if (false) std::cerr`, clang does not warn when the code comes from macro expansion. * configure.ac: Use -Wunreachable-code when supported. * data/lalr1.cc, data/yacc.c: Pacify clang's warning about `if (0)` by using a macro. Another possibility was to move this statement to a reachable place. * tests/actions.at, tests/c++.at: Avoid generating unreachable code. 2018-11-24 Akim Demaille <akim.demaille@gmail.com> yacc.c: avoid generating dead code We should probably introduce some struct and functions to deal with stack management, rather than open coding it. yyparse would be much nicer to read, and a better model for possible other skeletons. * data/yacc.c (yyparse::yysetstate): Avoid generating code when neither yyoverflow nor YYSTACK_RELOCATE is defined. 2018-11-22 Akim Demaille <akim.demaille@gmail.com> %expect-rr: tune the number of conflicts per rule Currently on a grammar such as exp : a '1' | a '2' | a '3' | b '1' | b '2' | b '3' a: b: we count only one rr-conflict on the `b:` rule, i.e., we expect: b: %expect-rr 1 although there are 3 conflicts in total. That's because in the conflicted state we count only a single conflict, not three (one for each of the lookaheads: '1', '2', '3'). State 0 0 $accept: . exp $end 1 exp: . a '1' 2 | . a '2' 3 | . a '3' 4 | . b '1' 5 | . b '2' 6 | . b '3' 7 a: . %empty ['1', '2', '3'] 8 b: . %empty ['1', '2', '3'] '1' reduce using rule 7 (a) '1' [reduce using rule 8 (b)] '2' reduce using rule 7 (a) '2' [reduce using rule 8 (b)] '3' reduce using rule 7 (a) '3' [reduce using rule 8 (b)] $default reduce using rule 7 (a) exp go to state 1 a go to state 2 b go to state 3 See https://lists.gnu.org/archive/html/bison-patches/2013-02/msg00106.html. * src/conflicts.c (rule_has_state_rr_conflicts): Rename as... (count_rule_state_sr_conflicts): this. DWIM. (count_rule_rr_conflicts): Adjust. * tests/conflicts.at (%expect-rr in grammar rules) (%expect-rr too much in grammar rules) (%expect-rr not enough in grammar rules): New. 2018-11-22 Akim Demaille <akim.demaille@gmail.com> %expect-rr: fix the computation of the overall number of conflicts On a grammar such as exp: "num" | "num" | "num" we currently report only one RR conflict, instead of two. This bug is present since the origins of Bison commit 08089d5d35ece0c7d41659cc1bc09638e2abb151 Author: David MacKenzie <djm@djmnet.org> Date: Tue Apr 20 05:42:52 1993 +0000 Initial revision and was preserved in commit 676385e29c4aedfc05d20daf1ef20cd4ccc84856 Author: Paul Hilfinger <Hilfinger@CS.Berkeley.EDU> Date: Fri Jun 28 02:26:44 2002 +0000 Initial check-in introducing experimental GLR parsing. See entry in ChangeLog dated 2002-06-27 from Paul Hilfinger for details. See https://lists.gnu.org/archive/html/bison-patches/2018-11/msg00011.html * src/conflicts.h, src/conflicts.c (count_state_rr_conflicts) (count_rr_conflicts): Use only the correct count of conflicts. * tests/glr-regression.at: Fix expectations. 2018-11-21 Akim Demaille <akim.demaille@gmail.com> tests: generate *.output files * tests/glr-regression.at: here. 2018-11-21 Akim Demaille <akim.demaille@gmail.com> %expect: tune the number of conflicts per rule Currently on a grammar such as exp: "number" | exp "+" exp | exp "*" exp we count only one sr-conflict for both binary rules, i.e., we expect: exp: "number" | exp "+" exp %expect 1 | exp "*" exp %expect 1 although there are 4 conflicts in total. That's because in the states in conflict, for instance that for the "+" rule: State 6 2 exp: exp . "+" exp 2 | exp "+" exp . [$end, "+", "*"] 3 | exp . "*" exp "+" shift, and go to state 4 "*" shift, and go to state 5 "+" [reduce using rule 2 (exp)] "*" [reduce using rule 2 (exp)] $default reduce using rule 2 (exp) we count only a single conflict, although there are two (one on "+" and another with "*"). See https://lists.gnu.org/archive/html/bison-patches/2013-02/msg00106.html. * src/conflicts.c (rule_has_state_sr_conflicts): Rename as... (count_rule_state_sr_conflicts): this. DWIM. (count_rule_sr_conflicts): Adjust. * tests/conflicts.at (%expect in grammar rules): New. 2018-11-21 Akim Demaille <akim.demaille@gmail.com> regen 2018-11-21 Akim Demaille <akim@lrde.epita.fr> style: reduce scopes * src/conflicts.c, src/reader.c: Minor style changes. 2018-11-21 Paul Hilfinger <hilfingr@eecs.berkeley.edu> allow %expect and %expect-rr modifiers on individual rules This change allows one to document (and check) which rules participate in shift/reduce and reduce/reduce conflicts. This is particularly important GLR parsers, where conflicts are a normal occurrence. For example, %glr-parser %expect 1 %% ... argument_list: arguments %expect 1 | arguments ',' | %empty ; arguments: expression | argument_list ',' expression ; ... Looking at the output from -v, one can see that the shift-reduce conflict here is due to the fact that the parser does not know whether to reduce arguments to argument_list until it sees the token AFTER the following ','. By marking the rule with %expect 1 (because there is a conflict in one state), we document the source of the 1 overall shift- reduce conflict. In GLR parsers, we can use %expect-rr in a rule for reduce/reduce conflicts. In this case, we mark each of the conflicting rules. For example, %glr-parser %expect-rr 1 %% stmt: target_list '=' expr ';' | expr_list ';' ; target_list: target | target ',' target_list ; target: ID %expect-rr 1 ; expr_list: expr | expr ',' expr_list ; expr: ID %expect-rr 1 | ... ; In a statement such as x, y = 3, 4; the parser must reduce x to a target or an expr, but does not know which until it sees the '='. So we notate the two possible reductions to indicate that each conflicts in one rule. See https://lists.gnu.org/archive/html/bison-patches/2013-02/msg00105.html. * doc/bison.texi (Suppressing Conflict Warnings): Document %expect, %expect-rr in grammar rules. * src/conflicts.c (count_state_rr_conflicts): Adjust comment. (rule_has_state_sr_conflicts): New static function. (count_rule_sr_conflicts): New static function. (rule_nast_state_rr_conflicts): New static function. (count_rule_rr_conflicts): New static function. (rule_conflicts_print): New static function. (conflicts_print): Also use rule_conflicts_print to report on individual rules. * src/gram.h (struct rule): Add new fields expected_sr_conflicts, expected_rr_conflicts. * src/reader.c (grammar_midrule_action): Transfer expected_sr_conflicts, expected_rr_conflicts to new rule, and turn off in current_rule. (grammar_current_rule_expect_sr): New function. (grammar_current_rule_expect_rr): New function. (packgram): Transfer expected_sr_conflicts, expected_rr_conflicts to new rule. * src/reader.h (grammar_current_rule_expect_sr): New function. (grammar_current_rule_expect_rr): New function. * src/symlist.c (symbol_list_sym_new): Initialize expected_sr_conflicts, expected_rr_conflicts. * src/symlist.h (struct symbol_list): Add new fields expected_sr_conflicts, expected_rr_conflicts. * tests/conflicts.at: Add tests "%expect in grammar rule not enough", "%expect in grammar rule right.", "%expect in grammar rule too much." 2018-11-21 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2018-11-21 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2018-11-21 Akim Demaille <akim.demaille@gmail.com> remove ancient lint directives * data/c++.m4, data/yacc.c: Remove surprising remains of lint directives. 2018-11-21 Jannick <thirdedition@gmx.net> doc: calc++: remove ancient fix for flex * doc/bison.texi (Calc++ Scanner): Remove fix for Flex 2.5.31-2.5.33. 2018-11-21 Jannick <thirdedition@gmx.net> doc: calc++: ignore \r in the scaner * doc/bison.texi (Calc++ Scanner): Ignore \r. 2018-11-20 Akim Demaille <akim.demaille@gmail.com> style: harmonize the labels of yyparse * data/glr.c, data/lalr1.cc, data/yacc.c: Fix indentation and other formatting issues. 2018-11-20 Akim Demaille <akim.demaille@gmail.com> regen 2018-11-20 Akim Demaille <akim.demaille@gmail.com> style: avoid lengthy actions We also lack a consistent naming for directive implementations. `directive_skeleton` is too long, `percent_skeleton` is not very nice looking, `process_skeleton` looks ambiguous, `do_skeleton` is somewhat ambiguous too, but seems a better track. * src/parse-gram.y (version_check): Rename as... (do_require): this. (do_skeleton): New. Use it. 2018-11-20 Akim Demaille <akim.demaille@gmail.com> c++: using macros around user types breaks when they include comma We may generate code such as basic_symbol (typename Base::kind_type t, YY_RVREF (std::pair<int,int>) v); which, of course, breaks, because YY_RVREF sees two arguments. Let's not play tricks with _VA_ARGS__, I'm unsure about it portability. Anyway, I plan to change more things in this area. Reported by Sébastien Villemot. http://lists.gnu.org/archive/html/bug-bison/2018-11/msg00014.html * data/variant.hh (b4_basic_symbol_constructor_declare) (b4_basic_symbol_constructor_define): Don't use macro on user types. * tests/types.at: Check that we support pairs. 2018-11-16 Akim Demaille <akim.demaille@gmail.com> README: update 2018-11-16 Akim Demaille <akim.demaille@gmail.com> tests: remove duplicate definition Probably imported by 6d58c632025cb6928a90e4176577982bfb9c3981, a merge commit. * tests/atlocal.in (POSIXLY_CORRECT_IS_EXPORTED): Define it once. 2018-11-16 Akim Demaille <akim.demaille@gmail.com> glr.c: fix use of _Noreturn In C++, [[noreturn]] must not be between "static" and the rest of the function signature, it must precede it. C's _Noreturn does not seem to have such a constraint, but it is therefore compatible with the C++ constraint. Since we #define _Noreturn as [[noreturn]] is modern C++, be sure to push the _Noreturn first. Unfortunately this was not caught by the test suite, because it always loads config.h first, and config.h contains another definition of _Noreturn that does not use [[noreturn]], and hides ours. That's probably a sign we should avoid always loading config.h. * data/glr.c (yyFail, yyMemoryExhausted): here. 2018-11-16 Akim Demaille <akim.demaille@gmail.com> tests: run the api.value.type tests for all C++ standards * tests/local.at (AT_LANG_FOR_EACH_STD): New. (AT_REQUIRE_CXX_VERSION): Rename as... (AT_REQUIRE_CXX_STD): this. Accept an argument for what to do when the requirement is not met. * tests/types.at (api.value.type): Check all the C++ stds. 2018-11-16 Akim Demaille <akim.demaille@gmail.com> CI: split the ASAN job in two The following commit introduce even more compilations/runs than before, and with ASAN on, we go beyond to 50min credit from Travis. * .travis.yml (Clang 7 libc++ and ASAN): Split in two. 2018-11-14 Akim Demaille <akim.demaille@gmail.com> c++: use YY_CPLUSPLUS * data/c++.m4: here. 2018-11-13 Akim Demaille <akim.demaille@gmail.com> c++: factor the handling of __cplusplus into YY_CPLUSPLUS * data/c++.m4 (b4_cxx_portability): Define it. Use it. * data/lalr1.cc, data/variant.hh: Use it. 2018-11-13 Akim Demaille <akim.demaille@gmail.com> style: formatting changes * src/scan-gram.l: here. 2018-11-13 Akim Demaille <akim.demaille@gmail.com> tests: clarify some magic constant * tests/c++.at (C++ Variant-based Symbols Unit Tests): here. 2018-11-13 Akim Demaille <akim.demaille@gmail.com> examples: remove useless includes * examples/c++/variant-11.yy, examples/c++/variant.yy: here. Fix warning when storing a long into an int. 2018-11-12 Akim Demaille <akim.demaille@gmail.com> tests: compile the C++ examples with warnings * examples/c++/local.mk: Pass $(WARN_CXXFLAGS_TEST). 2018-11-12 Akim Demaille <akim.demaille@gmail.com> regen 2018-11-12 Akim Demaille <akim.demaille@gmail.com> parser: deprecate %error-verbose It is unfortunate that %error_verbose was properly diagnosed as obsoleted by "%define parse.error verbose", but %error-verbose was not. * src/parse-gram.y (%error-verbose): Remove support. * src/scan-gram.l: Do it here instead, with a warning. * tests/input.at (Deprecated directives): Check it. 2018-11-12 Akim Demaille <akim.demaille@gmail.com> tests: migrate from %error-verbose to %define parse.error verbose * tests/actions.at, tests/c++.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/javapush.at, * tests/local.at, tests/regression.at, tests/skeletons.at, * tests/torture.at: Here. 2018-11-12 Akim Demaille <akim.demaille@gmail.com> parser: deprecate %nterm It has several weaknesses. Reported by Rici Lake. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00000.html * src/scan-gram.l: here. 2018-11-12 Akim Demaille <akim.demaille@gmail.com> tests: fix syncline tests These tests are skipped with GCC: "\"".c:1:5: error: function declaration isn't a prototype [-Werror=strict-prototypes] int main() { return 0; } ^~~~ * tests/synclines.at: Stop writing C++ in C. * tests/local.at: Formatting changes. 2018-11-11 Akim Demaille <akim.demaille@gmail.com> NEWS: expected features of Bison 3.3 2018-11-11 Akim Demaille <akim.demaille@gmail.com> yacc: reduce scope in push mode * data/yacc.c (yypull_parse): Here. 2018-11-11 Akim Demaille <akim.demaille@gmail.com> style: comment changes * data/c++.m4, data/glr.c, data/lalr1.java, data/yacc.c (yytranslate, YYTRANSLATE): Harmonize comments. 2018-11-10 Akim Demaille <akim.demaille@gmail.com> c++: simplify a default construction * data/lalr1.cc (yytnamerr_): here. 2018-11-10 Akim Demaille <akim.demaille@gmail.com> regen 2018-11-10 Akim Demaille <akim.demaille@gmail.com> reader: no longer accept %define variable names in quotes It was never documented. * src/parse-gram.y (variable): Here. 2018-11-10 Akim Demaille <akim.demaille@gmail.com> dogfooding: use api.value.type union * src/parse-gram.y (api.value.type): Set to union. Replace occurrences of %union with explicit %types. * src/scan-gram.l: Adjust yylval's field names. (RETURN_VALUE): No longer needs the Field argument. Use it more. 2018-11-10 Akim Demaille <akim.demaille@gmail.com> djgpp: remove Support for DJGPP was announced to be removed in the NEWS of Bison 3.1 (2018-08-27) unless someone expressed interest. There was no answer. * djgpp: Remove. * NEWS, Makefile.am, cfg.mk, po/POTFILES.in: Adjust. 2018-11-10 Akim Demaille <akim.demaille@gmail.com> scanner: simplify use of gettext * src/scan-gram.l (unexpected_end): Leave the actual call to gettext to the caller. 2018-11-10 Akim Demaille <akim.demaille@gmail.com> style: clean up the scanner and parser * src/scan-gram.l: Formatting changes. Add "missing" assertion for symmetry. * src/parse-gram.y: Formatting changes. 2018-11-09 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2018-11-09 Akim Demaille <akim.demaille@gmail.com> version 3.2.1 * NEWS: Record release date. 2018-11-08 Akim Demaille <akim.demaille@gmail.com> build: fix issues in the generated tarball Reported by Andre da Costa Barros. https://savannah.gnu.org/patch/?9716 * examples/calc++/local.mk: We no longer generate position.hh and stack.hh. Leaving them here triggers their concurrent generation, which fails. (%C%_calc___CPPFLAGS): Fix the extracted headers in the source tree. * examples/mfcalc/local.mk (%C%_mfcalc_CPPFLAGS): Ditto. 2018-11-07 Akim Demaille <akim.demaille@gmail.com> build: fix typo Reported by Horst Von Brand. https://savannah.gnu.org/support/?109580 * examples/local.mk (.PHOMY): Rename as... (.PHONY): this. 2018-11-06 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2018-11-06 Akim Demaille <akim.demaille@gmail.com> examples: ship them Currently, the examples are extracted on the user's side. Unfortunately, that requires that the user has Perl, which is otherwise not needed for Bison. Let's ship the examples instead. The examples were handled this way so that we could depend on configure flags: if --enable-gcc-warnings is passed, it is understood as "I'm a maintainer", so the examples are generated with `#line`s. Regular users should not see them, so they are now unconditionally removed when rolling a tarball. Reported by Mike Frysinger. https://lists.gnu.org/archive/html/bison-patches/2015-04/msg00000.html * examples/local.mk: Ship all the extracted files. (examples-unline): New. Make sure that the generated tarballs do not contain the #lines. 2018-11-06 Akim Demaille <akim.demaille@gmail.com> build: minor fixes in doc/ * doc/local.mk: Consistently use *.tmp for temporary files. Fix comments. 2018-11-05 Akim Demaille <akim.demaille@gmail.com> CI: maximize chances of errors sooner * .travis.yml: Try clang and icc soon, so that we don't have to wait for the end of the run to know that they fail. 2018-11-04 Akim Demaille <akim.demaille@gmail.com> c++: improve the generated documentation * data/lalr1.cc, data/location.cc: Improve documenting comments. * tests/c++.at (Doxygen Documentation): Fix AT_BISON_OPTION_PUSHDEFS, so that the generated yyerror is correct. * tests/c++.at, tests/headers.at: Prefer %empty. 2018-11-04 Akim Demaille <akim.demaille@gmail.com> tests: don't fail if the C++ compiler does not work Also, make sure that `make dist` generates a correct tarball even if the C++ compiler does not work. Reported by Nelson H. F. Beebe. * m4/cxx.m4 (BISON_CXX_WORKS): Define to true/false instead of true/exit 77. The latter is too dangerous to use (it directly quits). (ENABLE_CXX): New name for the Automake conditional, for consistency with ENABLE_CXX11 etc. * tests/local.at (AT_COMPILE, AT_COMPILE_CXX): Adjust to the new semantics of BISON_CXX_WORKS. * examples/c++/local.mk: Skip the variant test if C++ does not work. * examples/calc++/local.mk: Likewise. 2018-11-04 Akim Demaille <akim.demaille@gmail.com> tests: don't disable C++ warnings in C files This triggers error with GCC. See eff6739124c61bb5660d78453210d1d6a17d30e7. * tests/testsuite.h: Disable -Wzero-as-null-pointer-constant only for C++. 2018-11-04 Akim Demaille <akim.demaille@gmail.com> c++: workaround portability issue On some systems (x86_64-pc-solaris2.11), with Developer Studio 12.5's CC, we get: ".../include/CC/Cstd/vector.cc", line 127: Error: Cannot assign const yy::parser::stack_symbol_type to yy::parser::stack_symbol_type without "yy::parser::stack_symbol_type::operator=(const yy::parser::stack_symbol_type&)";. ".../include/CC/Cstd/vector", line 475: Where: While instantiating "std::vector<yy::parser::stack_symbol_type>::__insert_aux(yy::parser::stack_symbol_type*, const yy::parser::stack_symbol_type&)". ".../include/CC/Cstd/vector", line 475: Where: Instantiated from non-template code. 1 Error(s) detected. Don't expect __cplusplus to be always defined. If it's not, consider this is C++98. Reported by Nelson H. F. Beebe. * data/c++.m4, data/lalr1.cc, examples/c++/variant.yy, tests/local.at, * tests/testsuite.h: An undefined __cplusplus means pre C++11. 2018-11-03 Akim Demaille <akim.demaille@gmail.com> tests: work around getopt portability issues On some systems, we don't use our getopt. As a consequence the error messages vary: $ bison --skeleton bison: option requires an argument -- skeleton Try 'bison --help' for more information. instead of bison: option '--skeleton' requires an argument Try 'bison --help' for more information. Reported by Jannick and Nelson H. F. Beebe. https://lists.gnu.org/archive/html/bison-patches/2018-10/msg00140.html * tests/input.at (Invalid number of arguments): work around getopt portability issues. 2018-11-03 Akim Demaille <akim.demaille@gmail.com> doc: -Wzero-as-null-pointer-constant was added to GCC 4.7 It is not supported by previous versions. See https://www.gnu.org/software/gcc/gcc-4.7/changes.html Reported by Nelson H. F. Beebe. * doc/bison.texi (Calc++ Scanner): here. 2018-11-02 Adam Sampson <ats@offog.org> examples: #include <cstring> in calc++ strerror is defined by <string.h>, and recent versions of GNU libstdc++ no longer include this automatically from <string>. 2018-10-31 Akim Demaille <akim.demaille@gmail.com> c: provide a definition of _Noreturn that works for C++ On Solaris, GCC 7.3 defines: -std=c++14 -std=c++17 __cplusplus 201402L 201703L __STDC_VERSION__ 199901L 201112L So the current #definition of _Noreturn sees that 201112 <= __STDC_VERSION__, i.e., that C11 is supported, so it expects _Noreturn to be supported. Apparently it is not. This is only for C++, the test suite works for C. However, the test suite does not try several C standards, maybe we should... http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00064.html * data/c.m4 (b4_attribute_define): Define _Noreturn as [[noreturn]] in modern C++. 2018-10-30 Akim Demaille <akim.demaille@gmail.com> c: update the definition of _Noreturn Does not work on Solaris 11.3 x86/64: 479. c++.at:1293: testing C++ GLR parser identifier shadowing ... ======== Testing with C++ standard flags: '-std=c++17' ./c++.at:1332: $BISON_CXX_WORKS stderr: stdout: ./c++.at:1332: $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS -o input input.cc $LIBS stderr: input.cc:837:8: error: '_Noreturn' does not name a type static _Noreturn void ^~~~~~~~~ input.cc:845:8: error: '_Noreturn' does not name a type static _Noreturn void ^~~~~~~~~ Reported by Kiyoshi Kanazawa. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00051.html * data/c.m4 (b4_attribute_define): Use the snippet which is currently in gnulib's m4/gnulib-common.m4 (which seems a little more advanced than lib/_Noreturn.h). 2018-10-30 Akim Demaille <akim.demaille@gmail.com> tests: don't expect the shell to support 'local' It doesn't work on Solaris 11.3 x86/64. Reported by Kiyoshi Kanazawa. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00051.html * examples/test: Don't use 'local'. 2018-10-30 Akim Demaille <akim.demaille@gmail.com> bitset: fix warning Reported by Hans Åberg. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00047.html * lib/bitset.c (bitset_count_): here. 2018-10-30 Akim Demaille <akim.demaille@gmail.com> build: fix use of gnulib Make variables Reported by Kiyoshi Kanazawa. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00048.html * lib/local.mk (lib_libbison_a_LIBADD): Merge into... * src/local.mk (src_bison_LDADD): here. 2018-10-29 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2018-10-29 Akim Demaille <akim.demaille@gmail.com> version 3.2 * NEWS: Record release date. 2018-10-29 Akim Demaille <akim.demaille@gmail.com> build: don't depend on the libc to generate bison.help The "Report translation bugs to..." part of --help is issued only on glibc systems. So if the tarball is not wrapped on such a system, and used on such a system (or the converse), then bison.help will differ on the user's system, and help2man will be called to update bison.1. But help2man should not be a requirement. Reported by Alexandre Duret-Lutz. * doc/local.mk (doc/bison.help): Remove the possible doc about translation bugs. Pass LC_ALL=C, as reported in src/getargs.c's usage(). (doc/cross-options.texi): Use bison.help instead of calling bison --help. 2018-10-29 Akim Demaille <akim.demaille@gmail.com> c++: always issue the "generated by" message Some users rely on this sentence to know that the file can be ignored. Reported by Alexandre Duret-Lutz. * data/bison.m4 (b4_generated_by): New. (b4_copyright): Use it. * data/location.cc, data/stack.hh: Use it too, for the stub files (position.hh and stack.hh). 2018-10-28 Akim Demaille <akim.demaille@gmail.com> cfg.mk: remove exceptions for timevar They appear to be no longer needed. * cfg.mk: here. 2018-10-28 Akim Demaille <akim.demaille@gmail.com> style: clean up src/AnnotationList.c * src/AnnotationList.c: Reduce scopes. 2018-10-28 Akim Demaille <akim.demaille@gmail.com> style: clean up print.c * src/print.c: Reduce scopes. 2018-10-27 Akim Demaille <akim.demaille@gmail.com> bitset: clean up bbitset.h * lib/libiberty.h: Inline in... * lib/bbitset.h: here. * lib/local.mk: Adjust. 2018-10-27 Akim Demaille <akim.demaille@gmail.com> bitset: clean up bitset.h * lib/bitset.h: Fix include order. 2018-10-27 Akim Demaille <akim.demaille@gmail.com> bitset: clean up vbitset.c * lib/vbitset.c: Reduce scopes, etc. 2018-10-27 Akim Demaille <akim.demaille@gmail.com> bitset: clean up lbitset.c * lib/lbitset.c: Reduce scopes, etc. 2018-10-27 Akim Demaille <akim.demaille@gmail.com> bitset: clean up ebitset.c * lib/ebitset.c: Reduce scopes, etc. 2018-10-27 Akim Demaille <akim.demaille@gmail.com> bitset: clean up bitset_stats.c * lib/bitset_stats.c: Reduce scopes, etc. 2018-10-27 Akim Demaille <akim.demaille@gmail.com> bitset: clean up bitset.c * lib/bitset.c: Reduce scopes, etc. 2018-10-27 Akim Demaille <akim.demaille@gmail.com> bitset: clean up abitset.c * lib/abitset.c: Reduce scopes, etc. 2018-10-27 Jannick <thirdedition@gmx.net> xml2dot.xsl: fix typos in comments 2018-10-27 Akim Demaille <akim.demaille@gmail.com> doc: fix distcheck The extracted example, simple.yy, does not use %require "3.2", so it generates a stack.hh, which breaks distcheck. * doc/bison.texi: Fix it. 2018-10-27 Akim Demaille <akim.demaille@gmail.com> NEWS: prepare for 3.2 2018-10-26 Akim Demaille <akim.demaille@gmail.com> tests: beware of Windows file name constraints Don't expect to be able to build a file named '"\"".y' (6 characters) on Windows. Reported by Jannick. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00042.html * tests/synclines.at (syncline escapes): Skip if we failed to create the file. 2018-10-26 Akim Demaille <akim.demaille@gmail.com> tests: fix invocation of m4_map * tests/actions.at, tests/synclines.at: m4_map takes a list of arguments in $2, m4_map_args takes arguments in $2, $3, etc. 2018-10-26 Akim Demaille <akim.demaille@gmail.com> doc: spell check * README, doc/bison.texi, examples/README, examples/c++/README: here. 2018-10-26 Akim Demaille <akim.demaille@gmail.com> examples: add a Makefile for C++ short examples * examples/c++/Makefile: New. * examples/c++/local.mk, examples/c++/README: Adjust. 2018-10-26 Akim Demaille <akim.demaille@gmail.com> doc: some improvements * doc/bison.texi (Calc++ Scanner): Show how exception can be thrown from auxiliary functions. Clarify the meaning of the various flex %options we use. Get rid of a warning. (Calc++ Parsing Driver): Use the parser as a functor. 2018-10-26 Akim Demaille <akim.demaille@gmail.com> examples: check the errors * examples/test (run): Check stderr, unless -noerr is passed. * examples/calc++/calc++.test, examples/mfcalc/mfcalc.test: Check errors. 2018-10-25 Akim Demaille <akim.demaille@gmail.com> doc: minor fixes * doc/bison.texi: Simplify wording. Fix Texinfo error. (Complete Symbols): Handle the token EOF. (Calc++ Parser): In the modern C++ world, prefer assignment to swap. (Strings are Destroyed): Prefer an explicit 'continue' to a comment. 2018-10-24 Akim Demaille <akim.demaille@gmail.com> configure: quit on trying to get ICC and Flex be friends The CI is using Flex 2.5.35. And ICC is too picky for it. Let's stop making these warnings errors. I wish I could disable them in the source files using the ICC version and the Flex version, but ICC's pragma support is unclear, and I'm tired of fighting it. * configure.ac (FLEX_SCANNER_CXXFLAGS): Make warnings warnings. * examples/c++/local.mk: Comment changes. 2018-10-24 Akim Demaille <akim.demaille@gmail.com> doc: mention earlier how to disable the generation of location.hh Suggested by Victor Khomenko. * doc/bison.texi (C++ Bison Interface): Here. 2018-10-24 Akim Demaille <akim.demaille@gmail.com> c++: std::to_string is available in C++11 Reported by Victor Khomenko. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00033.html * doc/bison.texi, examples/c++/variant-11.yy: Use std::to_string instead of ours. 2018-10-24 Akim Demaille <akim.demaille@gmail.com> examples: move the variant examples into the C++ directory * examples/variant-11.test examples/variant-11.yy, * examples/variant.test examples/variant.yy: Move into examples/c++/. * examples/c++/README: New. * examples/README, examples/c++/local.mk, examples/local.mk: Adjust. 2018-10-24 Akim Demaille <akim.demaille@gmail.com> doc: an introductory example for C++ Suggested by Victor Khomenko. http://lists.gnu.org/archive/html/bug-bison/2018-08/msg00037.html * doc/bison.texi (A Simple C++ Example): New. * examples/c++/local.mk, examples/c++/simple.test: New. Extract, check, and install this new example. * examples/local.mk: Adjust. * examples/test: Adjust to the case where the dirname differs from the test name. 2018-10-24 Akim Demaille <akim.demaille@gmail.com> build: remove a few copies of the Copyright from the generated Makefile * build-aux/local.mk, cfg.mk, examples/calc++/local.mk, * examples/local.mk, examples/mfcalc/local.mk, * examples/rpcalc/local.mk, lib/local.mk, src/local.mk, * tests/local.mk: Use Automake comments so that we don't get a copy of each in the generated Makefile. 2018-10-24 Akim Demaille <akim.demaille@gmail.com> c++: make operator() an alias to the parse function * data/glr.cc, data/lalr1.cc (operator()): New. * doc/bison.texi: Update. 2018-10-23 Akim Demaille <akim.demaille@gmail.com> build: enable more warnings during tests Prompted by Derek Clegg. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00018.html * configure.ac: here. 2018-10-23 Akim Demaille <akim.demaille@gmail.com> regen 2018-10-23 Akim Demaille <akim.demaille@gmail.com> yacc.c: work around strange typing issues On the CI, both GCC and Clang report: src/parse-gram.c: In function 'yy_lac': src/parse-gram.c:1479:29: error: format '%hd' expects argument of type 'int', but argument 3 has type 'yytype_int16 {aka long int}' [-Werror=format=] YYDPRINTF ((stderr, " G%hd", yystate)); ^ Although yytype_int16 is supposed to be a short int, not a long int. This must be explored. * data/yacc.c (yy_lac): Work around typing issue. 2018-10-23 Akim Demaille <akim.demaille@gmail.com> yacc.c: don't define _Noreturn uselessly Clang warns: aux/x.h:97:11: error: macro name is a reserved identifier [-Werror,-Wreserved-id-macro] # define _Noreturn YY_ATTRIBUTE ((__noreturn__)) Reported by Derek Clegg. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00024.html * data/c.m4 (b4_attribute_define): Don't define _Noreturn unconditionally. * data/glr.c: Ask for _Noreturn. 2018-10-23 Akim Demaille <akim.demaille@gmail.com> pacify ICC 16.0.3 20160415 Found on the CI. yacc.c: error #2259: non-pointer conversion from "int" to "yytype_int16={short}" may lose significant bits yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyesp ^ glr.c: error #2259: non-pointer conversion from "int" to "yybool={unsigned char}" may lose significant bits yybool yynormal YY_ATTRIBUTE_UNUSED = (yystackp->yysplitPoint == YY_NULLPTR); ^ error #2259: non-pointer conversion from "int" to "yybool={unsigned char}" may lose significant bits return yypact_value_is_default (yypact[yystate]); ^ error #2259: non-pointer conversion from "int" to "yybool={unsigned char}" may lose significant bits return 0 < yyaction; ^ error #2259: non-pointer conversion from "int" to "yybool={unsigned char}" may lose significant bits return yyaction == 0; ^ error #2259: non-pointer conversion from "int" to "yybool={unsigned char}" may lose significant bits yystackp->yytops.yylookaheadNeeds[yys] = yychar != YYEMPTY; ^ * data/glr.c, data/yacc.c: Avoid these warnings. 2018-10-23 Akim Demaille <akim.demaille@gmail.com> flex: work around more warnings * doc/bison.texi: here. 2018-10-23 Akim Demaille <akim.demaille@gmail.com> examples: clang 5 defines nullptr as a macro * examples/variant.yy: So don't do it. * examples/variant-11.yy: Fix comment. 2018-10-23 Akim Demaille <akim.demaille@gmail.com> glr.c: be strict about types * data/glr.c: Don't use `foo |= bar` with foo and bar being yybool: the result appears to be an int, not a yybool. Use yybool where appropriate. Add casts where needed. 2018-10-23 Akim Demaille <akim.demaille@gmail.com> yacc.c: fix warnings about integral types Reported by Derek Clegg. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00018.html Rather than adding casts, we should be more careful with types. For instance yystate should be a yytype_int16. But currently we can't: it is also used sometimes for storing other things that state numbers. * data/yacc.c (yyparse): Add missing casts. 2018-10-22 Akim Demaille <akim.demaille@gmail.com> yacc.c: clarify the computation of yystate The yacc.c skeleton is old, and was using many tricks to save registers. Today's register allocators can do this themselves. Let's keep the code simpler to read and let compilers do their job. * data/yacc.c: Avoid using yystate for different types of content. An inline function would be better, but doing this portably will be a problem. 2018-10-22 Akim Demaille <akim.demaille@gmail.com> printf returns a signed int * tests/local.at: Adjust location_print's signature. 2018-10-22 Akim Demaille <akim.demaille@gmail.com> tests: be strict about types * tests/actions.at, tests/c++.at, tests/cxx-type.at, * tests/glr-regression.at, tests/local.at, tests/torture.at, * tests/types.at: Pay stricter attention to types to avoid warnings. 2018-10-22 Akim Demaille <akim.demaille@gmail.com> c++: fix signedness issues * data/lalr1.cc, data/stack.hh: The callers of stack use int, while stack is based on size_type. Add overloads to avoid warnings. 2018-10-22 Akim Demaille <akim.demaille@gmail.com> c++: minor changes * data/lalr1.cc: Fix oldish comment. * data/stack.hh: Prefer typename for type names. Use size() instead of duplicating it. * examples/variant-11.yy, examples/variant.yy (yylex): Use int, as this is the type of the semantic value. 2018-10-22 Akim Demaille <akim.demaille@gmail.com> all: display a clear warning about private macros * data/bison.m4 (b4_disclaimer): New. * data/glr.c, data/glr.cc, data/lalr1.cc, data/yacc.c: Use it. 2018-10-21 Akim Demaille <akim.demaille@gmail.com> c++: minor simplification * data/stack.hh: Prefer a default argument value to two constructors. 2018-10-21 Akim Demaille <akim.demaille@gmail.com> regen 2018-10-21 Akim Demaille <akim.demaille@gmail.com> all: avoid useless comments and #lines Currently we emit useless code for places where we might issue user content, but there is none. This commit avoids this. Besides, some of the comments looked like implementation details ("Copy the first part of user declarations"), rather than made for the reader of the result ("First part of user prologue"). On Bison's parse-gram.c we get: @@ -76,10 +76,6 @@ #define yynerrs gram_nerrs -/* Copy the first part of user declarations. */ - -#line 82 "src/parse-gram.c" /* yacc.c:339 */ - * data/bison.m4 (b4_define_user_code): Accept a comment to document the section. Do not emit any code if the content is empty. Adjust callers to not emit the comment. Do not * data/glr.c, data/glr.cc, data/lalr1.cc, data/lalr1.java, data/yacc.c: Adjust. 2018-10-21 Akim Demaille <akim.demaille@gmail.com> tests: refactor * tests/actions.at, tests/synclines.at: Prefer iteration to copy-paste. 2018-10-21 Akim Demaille <akim.demaille@gmail.com> tests: rename AT_SKEL_CC_IF/AT_SKEL_JAVA_IF as AT_CXX_IF/AT_JAVA_IF The previous name is too obscure, and the other macros for C++ use CXX, not CC. * tests/local.at (AT_SKEL_CC_IF, AT_SKEL_JAVA_IF): Rename as... (AT_CXX_IF, AT_JAVA_IF): these. Adjust callers. 2018-10-21 Akim Demaille <akim.demaille@gmail.com> c++: check that emplace for rvalues works See the previous commit. * tests/local.at (AT_REQUIRE_CXX_VERSION): New. * tests/types.at (api.value.type): Check emplace in C++14. 2018-10-20 Akim Demaille <akim.demaille@gmail.com> c++: prefer a perfect forwarding version of variant's emplace * data/variant.hh (emplace): In modern C++, use only a perfect forwarding version. And use it. * doc/bison.texi: Document it. 2018-10-20 Akim Demaille <akim.demaille@gmail.com> c++: prefer 'emplace' to 'build' When we introduced variants in Bison, C++ did not have the 'emplace' functions, and we chose 'build'. Let's align with modern C++ and promote 'emplace' rather than 'build'. * data/lalr1.cc, data/variant.hh (emplace): New. (build): Deprecate in favor of emplace. * doc/bison.texi: Adjust. 2018-10-20 Akim Demaille <akim.demaille@gmail.com> %printer: promote yyo rather than yyoutput * doc/bison.texi: Promote yyo rather than yyoutput. * data/c.m4, data/glr.cc, tests/types.at, tests/calc.at, tests/regression.at: Adjust. 2018-10-20 Akim Demaille <akim.demaille@gmail.com> doc: improve the C++ section * doc/bison.texi (C++ Parser): file.hh and location.hh are no longer mandatory. Various minor fixes. 2018-10-20 Akim Demaille <akim.demaille@gmail.com> doc: reorder C++ sections * doc/bison.texi (C++ Parser Interface): Document before semantic_type and location_type. 2018-10-20 Akim Demaille <akim.demaille@gmail.com> git: don't ignore auxiliary Texinfo files As a matter of fact, I think it is wrong to gitignore generated files that belong to the build tree. There should be the strict minimum, and it's up to people that build in place to adjust their own ~/.gitignore. * doc/.gitignore: here. Remove files we no longer produce (thanks to texi2dvi). 2018-10-20 Akim Demaille <akim.demaille@gmail.com> c++: do not exhibit private macros * examples/variant-11.yy: here. 2018-10-20 Akim Demaille <akim.demaille@gmail.com> c++: don't obfuscate std::move when not needed * data/lalr1.cc, data/variant.hh: Avoid macros that depend on the version of C++ when not needed. 2018-10-20 Akim Demaille <akim.demaille@gmail.com> build: add missing gnulib libs Reported by Denis Excoffier. * lib/local.mk, src/local.mk: here. 2018-10-18 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2018-10-18 Akim Demaille <akim.demaille@gmail.com> version 3.1.91 * NEWS: Record release date. 2018-10-18 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2018-10-18 Akim Demaille <akim.demaille@gmail.com> examples: force stack resizing with unique_ptr In the previous commit we fixed a problem when the C++ stack was resized. The test was using ints. Let's add a test with someone quite touchy: unique_ptr * examples/variant-11.yy: Accept an argument, which is the number of numbers to send to the parser. * examples/variant-11.test: Check with many numbers. 2018-10-18 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: fix stack symbol move In some casing, once we moved a stack symbol, we forget to mark the source stack symbol as emptied. As a consequence, it may be destroyed a second time. This happens when the stack has to be resized. * data/lalr1.cc (stack_symbol_type::stack_symbol_type): Record that the source was emptied. (stack_symbol_type::operator=): Likewise. * tests/c++.at (C++ Variant-based Symbols Unit Tests): Force the stack to be resized. Check its content. 2018-10-17 Akim Demaille <akim.demaille@gmail.com> doc: improve the doc of the examples * examples/README: here. 2018-10-17 Akim Demaille <akim.demaille@gmail.com> reader: recognize C++ even when it's not lalr1.cc or glr.cc * src/reader.c (grammar_rule_check_and_complete): If a user uses her own skeleton but sets the language to C++, recognize it as C++. 2018-10-17 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2018-10-17 Akim Demaille <akim.demaille@gmail.com> version 3.1.90 * NEWS: Record release date. 2018-10-16 Akim Demaille <akim.demaille@gmail.com> examples: don't generate the position/stack files * examples/variant-11.yy, examples/variant.yy: Require 3.2. 2018-10-16 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2018-10-16 Akim Demaille <akim.demaille@gmail.com> pacify syntax-checks * lib/lbitset.c, tests/c++.at: here. * cfg.mk: Add exceptions. 2018-10-16 Akim Demaille <akim.demaille@gmail.com> regen 2018-10-16 Akim Demaille <akim.demaille@gmail.com> generate the default action only for C++ This commit adds restrictions to what was done in 01898726e27c8cf64f8fcea7f26f8ce62f3f5cf2 [1]. Rici Lake [2] has shown that it's risky to disable the pre-action, at least now. Also, generating the default $$ = $1 action can have bad effects in some cases [3]. The original change [1] was prompted for C++. Let's try it there only, for a start. We could restrict it further to lalr1.cc with variants, but we need to see in the wild how this change behaves. And it is not unreasonable to expect grammar files in C++ to behave better wrt types. See [1] https://lists.gnu.org/archive/html/bison-patches/2018-10/msg00050.html [2] https://lists.gnu.org/archive/html/bison-patches/2018-10/msg00061.html [3] https://lists.gnu.org/archive/html/bison-patches/2018-10/msg00066.html * src/getargs.c: Style changes. * src/reader.c (grammar_rule_check_and_complete): Complete only for C++. 2018-10-16 Akim Demaille <akim.demaille@gmail.com> regen 2018-10-16 Akim Demaille <akim.demaille@gmail.com> C++: let %require "3.2" disable the generation of obsolete files The files stack.hh and position.hh are deprecated. Rather than devoting specify %define variables to discard them (api.position.file and api.stack.file), and rather than having to use special rules when api.location.file is used, let's simply decide that from %require "3.2" onwards, these files will not be generated. The only noticeable thing here is that, in order to be able to check the behavior of %require "3.2", to have this version (which is still 3.1-*) to accept %require "3.2". * src/gram.h, src/gram.c (required_version): New. * src/parse-gram.y (version_check): Set it. * src/output.c (prepare): Pass it m4. * data/bison.m4 (b4_required_version_if): Receive it and use it. * data/location.cc, data/stack.hh: Replace the api.*.file with only required version comparison. * tests/input.at: No longer check api.stack.file and api.position.file. * NEWS, doc/bison.texi: Don't mention them. Document the %require 3.2 behavior. * tests/output.at: Use %require 3.2 instead. 2018-10-15 Akim Demaille <akim.demaille@gmail.com> java: bump to Java SE 7 macOS 10.14 no longer supports versions of Java earlier than 5. And Java 6 will be deprecated by the end of this year. So let's move our requirement to Java 7. Reported by Yu Yijun. https://lists.gnu.org/archive/html/bug-bison/2018-09/msg00060.html Suggested by Paul Eggert and Bruno Haible. http://lists.gnu.org/archive/html/bug-gnulib/2018-10/msg00094.html * configure.ac: Require Java 7, both compiler and runtime. 2018-10-15 Akim Demaille <akim.demaille@gmail.com> doc: do not advertise %nterm Reported by Rici Lake. http://lists.gnu.org/archive/html/bug-bison/2018-10/msg00000.html * NEWS, doc/bison.texi: here. 2018-10-14 Akim Demaille <akim.demaille@gmail.com> generate the default semantic action Currently, in C, the default semantic action is implemented by being always run before running the actual user semantic action. As a consequence, when the user action is run, $$ is already set as $1. In C++ with variants, we don't do that, since we cannot manipulate the semantic value without knowing its exact type. When variants are enabled, the only guarantee is that $$ is default contructed and ready to the used. Some users still would like the default action to be run with variants. Frank Heckenbach's parser in C++17 (http://lists.gnu.org/archive/html/bug-bison/2018-04/msg00011.html) provides this feature, but relying on std::variant's dynamic typing, which we forbid in lalr1.cc. The simplest seems to be actually generating the default semantic action (in all languages/skeletons). This makes the pre-action (that sets $$ to $1) useless. But... maybe some users depend on this, in spite of the comments that clearly warn againt this. So let's not turn this off just yet. * src/reader.c (grammar_rule_check_and_complete): Rename as... (grammar_rule_check_and_complete): this. Install the default semantic action when applicable. * examples/variant-11.yy, examples/variant.yy, tests/calc.at: Exercise the default semantic action, even with variants. 2018-10-14 Jannick <thirdedition@gmx.net> xml2xhtml.xsl: add UTF-8 encoding To make arrows appear nicely in the browser. Currently it is shown as some garbled something in mine (Firefox). * data/xslt/xml2xhtml.xsl: here. 2018-10-14 Akim Demaille <akim.demaille@gmail.com> reader: reorder some calls to separate checks from assignments * src/reader.c (packgram): Move assignments to rules[ruleno] after the checks on the rule. 2018-10-14 Akim Demaille <akim.demaille@gmail.com> C++: style: add missing space before parens * data/c++.m4, data/lalr1.cc, data/stack.hh, data/variant.hh, * examples/variant-11.yy: here. 2018-10-14 Akim Demaille <akim.demaille@gmail.com> gnulib: update timevar See https://lists.gnu.org/archive/html/bug-gnulib/2018-10/msg00005.html. 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/vbitset.h 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/vbitset.c 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/lbitset.c 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/lbitset.h 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/ebitset.c 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/ebitset.h 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/bitsetv.c 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/bitsetv.h 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/bitsetv-print.c 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/bitsetv-print.h 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/bitset_stats.c 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/bitset_stats.h 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/bitset.c 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/bitset.h 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/bbitset.h 2018-10-11 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/abitset.c 2018-10-10 Akim Demaille <akim.demaille@gmail.com> style: modernize lib/abitset.h 2018-10-09 Akim Demaille <akim.demaille@gmail.com> C++: issue a better CPP guard and Doxygen file command Currently we use "<dir><api.location.file>" as \file argument, and as base for the CPP guard. This is not nice when <dir> is absolute, in which case it is expected that the user will use api.location.include to get something nicer. If defined, use that name instead. * data/location.cc (b4_location_path): New. Use it. * tests/c++.at (Shared locations): Check the guard and Doxygen doc. 2018-10-09 Akim Demaille <akim.demaille@gmail.com> C++: remove stray empty line * data/stack.hh: here. 2018-10-09 Akim Demaille <akim.demaille@gmail.com> doc: spell check 2018-10-09 Akim Demaille <akim.demaille@gmail.com> doc: document api.*.file and the like * doc/bison.texi (Exposing the Location Classes): New. (%define Summary): Document api.location.file, api.location.include, api.stack.file and api.position.file. (C++ Bison Interface): stack.hh and position.hh are deprecated. 2018-10-07 Akim Demaille <akim.demaille@gmail.com> build: add missing gnulib libs * src/local.mk (LDADD): Here. 2018-10-07 Akim Demaille <akim.demaille@gmail.com> build: let timevar be dealt with by gnulib * lib/local.mk (lib_libbison_a_SOURCES): Remove timevar. 2018-10-07 Akim Demaille <akim.demaille@gmail.com> build: fix distcheck Now that distcheck no longer fails (see previous commit), let's address the shortcomings. * Makefile.am (CLEANDIRS, clean-local): New. * doc/local.mk, examples/calc++/local.mk, examples/local.mk, * examples/mfcalc/local.mk, examples/rpcalc/local.mk, * src/local.mk (CLEANDIRS): Get rid of Apple's *.dSYM directories. (CLEANFILES): Get rid of *.output files. * examples/variant-11.yy, examples/variant.yy: Don't generate any of the auxiliary files (location.hh and the like). 2018-10-07 Akim Demaille <akim.demaille@gmail.com> README: work around a nasty behavior of gettext `make update-po` runs: package_gnu="$(PACKAGE_GNU)"; \ test -n "$$package_gnu" || { \ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ -size -10000000c -exec grep 'GNU @PACKAGE@' \ /dev/null '{}' ';' 2>/dev/null; \ else \ LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ fi; \ } | grep -v 'libtool:' >/dev/null; then \ package_gnu=yes; \ else \ package_gnu=no; \ fi; \ }; \ and based on the result, put GNU or not in the following line from bison.pot: # This file is distributed under the same license as the GNU bison package. It turns out that in my environment some log files had the 'GNU bison' string (note the lower case), but in distcheck, these files are no longer visible, so the generate bison.pot was different, and distcheck failed because we try to update bison.pot, which is read only in distcheck. The heuristics should look accept 'GNU Bison', not just 'GNU bison'. But let's please it to make sure we have our 'GNU'. * README: Mention 'GNU bison'. 2018-10-07 Akim Demaille <akim.demaille@gmail.com> NEWS: document api.*.file changes 2018-10-06 Akim Demaille <akim.demaille@gmail.com> c++: provide a means to control how location.hh is included Users may want to generate the location file elsewhere, say $top_srcdir/include/ast/location.hh. Yet, we should not generate `#include "$top_srcdir/include/ast/location.hh"` but probably something like `#include <ast/location.hh>`, or `#include "ast/location.hh", or `#include <location.hh>`. It entirely depends on the compiler flags (-I/-isystem) that are used. Bison cannot guess what is expected, so let's give the user a means to tell how the location file should be included. * data/location.cc (b4_location_file): New. * data/glr.cc, data/lalr1.cc: Use it. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> c++: support absolute api.location.file names In the case a user wants to create location.hh elsewhere, it can be helpful to define api.location.file to some possibly absolute path such as -Dapi.location.file='"$(top_srcdir)/include/ast/location.hh"'. Currently this does not work with `-o foo/parser.cc`, as we join foo/ and $(top_srcdir) together, the latter starting with slash. We should not try to do that in m4, manipulating file names is quite complex when you through Windows file name in. Let m4 delegate this to gnulib. * src/scan-skel.l (at_output): Accept up to two arguments. * data/bison.m4 (b4_output): Adjust. * tests/skeletons.at (Fatal errors but M4 continues producing output): Adjust to keep the error. * data/location.cc, data/stack.hh: Leave the concatenation to @output. * tests/output.at: Exercise api.location.file with an absolute path. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> c++: when api.location.file is defined, don't generate stack.hh Make it easier to have fewer files. * data/stack.hh: Don't generate stack.hh when api.location.file is specified. * tests/calc++.at, tests/output.at: Adjust tests. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> c++: make position.hh completely useless Let's put the definition of position into location.hh, there's no real value in keeping them separate: they are small, and share the same requirements. To help users transition to this new model, still generate position.hh by default, but as a simple include to location.hh. * data/location.cc (api.position.file): Accept only 'none' as possible value. (position.hh): Make it a stub. (location.hh): Adjust. (b4_position_define): Merge into... (b4_location_define): this. * data/glr.cc, data/lalr1.cc, tests/input.at, tests/output.at: Adjust. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> c++: make stack.hh completely useless Let's completely deprecate stack.hh. Don't provide a means to give it a new name, allow only its removal. See https://lists.gnu.org/archive/html/bison-patches/2018-09/msg00151.html and https://lists.gnu.org/archive/html/bison-patches/2018-09/msg00182.html. * data/stack.hh: Reduce stack.hh to a simple comment explaining how to get rid of it. * data/lalr1.cc: Adjust * tests/input.at (%define file variables): Adjust. * tests/output.at: Remove cases where stack.hh was removed. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> c++: add support for api.position.file and api.location.file * data/location.cc: Sort includes. (b4_position_file, b4_location_file): New. When there's a file for locations but not for positions, include the definition of position in the location file. * data/lalr1.cc (b4_shared_declarations): Include the position/location file when it exists. Otherwise, define the class. * data/glr.cc: Likewise. * tests/input.at (%define file variables): Check them. * tests/output.at (C++ output): Check various cases with api.position.file and api.location.file. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> c++: provide control over the stack.hh file name It was not a good idea to generate the file stack.hh. It never was. But now we have to deal with backward compatibility: if we stop generating it, the build system of some build system will probably break. So offer the user a means to (i) decide what the name of the output file should be, and (ii) not generate this file at all (its content will be inline where the parser is defined). * data/lalr1.cc (b4_percent_define_check_file_complain) (b4_percent_define_check_file): New. * data/stack.hh: Generate the file only if api.stack.file is not empty. In that case, use it as file name. * data/lalr1.cc: Adjust to include the right file, or to include the definition of stack. * tests/calc.at, tests/output.at: Exercise api.stack.file. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> tests: c++: don't fuse prefix and namespace They are not the same concept. It appears that we still consider that api.prefix is the default for api.namespace. We should stop that. * tests/local.at (AT_BISON_OPTION_PUSHDEFS, AT_BISON_OPTION_POPDEFS): Separate namespace and prefix. Adjust dependencies. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> style: tests: factor file extension computations * tests/local.at (AT_LANG_HDR): New. * tests/calc.at, tests/headers.at, tests/synclines.at: Use it, and AT_LANG_EXT. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> c++: style changes * data/lalr1.cc: Formatting changes. Remove duplicate definition of YY_NULLPTR. Add quotes to help Emacs track balanced parens. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> lib: introduce xpath_join * lib/path-join.h, lib/path-join.c: New. * lib/local.mk: Adjust. * src/output.c: Use it. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> CI: travis finally knows about llvm-toolchain-trusty-7 See https://github.com/travis-ci/apt-source-safelist/pull/392. 2018-10-06 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2018-10-06 Akim Demaille <akim.demaille@gmail.com> doc: restore spello made on purpose 2018-10-05 Akim Demaille <akim.demaille@gmail.com> THANKS: add Josh Soref 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: whether 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: typedef 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: troubleshooting 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: transparent 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: translated 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: transitions 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: transition 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: tracking 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: suppress 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: succesful 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: storage 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: safely 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: responsibility 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: resources 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: releases 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: reduction 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: reachable 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: rawtoknumflag 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: possibly 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: persistent 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: outputting 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: otherwise 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: occurrence 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: namespace 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: minimal 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: invocations 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: initialize 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: incorrectly 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: included 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: illicit 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: handling 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: gratuitously 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: grammar 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: generation 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: generate 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: forewarn 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: fnchange 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: family 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: extensions 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: enum 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: diagnostics 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: determined 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: detailed 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: descriptive 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: definitions 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: declaration 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: corrupted 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: consuming 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: consistently 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: conflicts 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: concatenation 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: complete 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: compatibility 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: comparison 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: combination 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: characters 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: builddir 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: assoc 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: appropriate 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: alignment 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: aggregate 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: adjust 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: additional 2018-10-05 Josh Soref <jsoref@users.noreply.github.com> spelling: accurately 2018-10-05 Akim Demaille <akim.demaille@gmail.com> README-hacking: details about make check-local 2018-10-05 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2018-10-04 Akim Demaille <akim.demaille@gmail.com> main: fix error message for missing argument * src/getargs.c (getargs): Don't display any argv other that argv[0] when reporting a missing argument. * tests/bison.in: Neutralize path differences in stderr. * tests/input.at (Invalid number of arguments): New. 2018-09-30 Akim Demaille <akim.demaille@gmail.com> gnulib: move timevar to it * lib/timevar.c, lib/timevar.h, m4/timevar.m4: Remove. * gnulib: Update. * configure.ac: Adjust. * lib/timevar.def: Use lower case for the timevvars. Adjust dependencies. 2018-09-29 Akim Demaille <akim.demaille@gmail.com> style: comment changes * data/glr.cc, data/lalr1.cc: here. 2018-09-29 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2018-09-29 Paul Eggert <eggert@cs.ucla.edu> getargs: use LC_MESSAGES trick only on glibc * src/getargs.c (usage): Rely on setlocale (LC_MESSAGES, NULL) trick only on glibc, as POSIX does not specify the output of setlocale in this case, and the Gnulib localename module source code indicates that the trick works only on glibc. 2018-09-29 Paul Eggert <eggert@cs.ucla.edu> uniqstr: avoid need for VLAs C11 no longer requires support for variable-length arrays, and VS2015 does not have them. Redo UNIQSTR_CONCAT to use a method that is simpler and better anyway. * src/uniqstr.c (uniqstr_vsprintf): Remove; no longer needed. * src/uniqstr.h (UNIQSTR_GEN_FORMAT, UNIQSTR_GEN_FORMAT_): * src/uniqstr.c (uniqstr_concat): New function. * src/uniqstr.h (UNIQSTR_CONCAT): Use it instead of using uniqstr_vsprintf. 2018-09-26 Akim Demaille <akim.demaille@gmail.com> doc: clean up the C++ section * doc/bison.texi: Minor fixes in typography. It is no longer require to pass --defines for C++ (it was addressed long ago). No longer refer to the `variant` define variable, it was replaced by `api.value.type variant`. Prefer nullptr to 0 for the null pointer. Use deftypeop for constructors. (Complete Symbols): Give the expected signature of yylex. Don't document the symbol_type constructors, as we want users to focus on make_TOKEN. Also show the case without locations. 2018-09-26 Akim Demaille <akim.demaille@gmail.com> CI: fixes for clang and asan Bison's test 464 (Syntax error as exception) fails on the CI. Do not use clang with asan on Ubuntu's libc++. https://bugs.llvm.org/show_bug.cgi?id=17379 * .travis.yml (Clang 7 libc++ and ASAN): New. (Clang 6 -O3 and libc++): Really use libc++. (Clang 5): Don't use libc++, nor asan (does not work either, same reason). 2018-09-24 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes in muscle-tab.c 2018-09-24 Akim Demaille <akim.demaille@gmail.com> style: remove useless parens * data/bison.m4, data/glr.c, data/glr.cc, data/lalr1.cc, * data/lalr1.java, data/location.cc, data/yacc.c: Call b4_output_end without parens. 2018-09-24 Akim Demaille <akim.demaille@gmail.com> c++: fix warning message for automove * src/scan-code.l: Remove 'enabled'. Use only $k (numeric), even for named references, for clarity. * tests/c++.at: Adjust expectations. 2018-09-24 Akim Demaille <akim.demaille@gmail.com> style: minor refactoring * data/bison.m4: Formatting changes. * src/scan-code.l: Avoid loops, prefer standard string functions. (find_prefix_end): Be const correct. Avoid useless intermediate variables. (variant_add): Be const correct. (parse_ref): Prefer variable definitions to assignments. 2018-09-24 Akim Demaille <akim.demaille@gmail.com> CI: don't exit * .travis.yml: Prefer `false` to `exit`, as it completely ends the script (so we don't get the logs). 2018-09-24 Akim Demaille <akim.demaille@gmail.com> CI: really use Clang 3.3 and 3.4, not 5.0 * .travis.yml: Don't define CC/CXX, it does not work. Use `[[...]]` instead of `[...]`. Show the compiler versions. (Clang 3.3, Clang 3.4): Specify the path to avoid using /usr/local/clang-5.0.0/bin's clang. 2018-09-23 Akim Demaille <akim.demaille@gmail.com> CI: more compiler configurations * .travis.yml (GCC 8): Use sanitizers. (Clang 5 -O3): Remove, replaced by... (Clang 7 ASAN and libc++, Clang 6 -O3 and libc++): New. 2018-09-23 Akim Demaille <akim.demaille@gmail.com> build: rename and simplify the -std checks for C++ Too much code duplication. * m4/bison-cxx-std.m4: s/BISON_CXX_COMPILE_STDCXX/BISON_CXXSTD/. (BISON_CXXSTD): New. * configure.ac: Use it. 2018-09-23 Akim Demaille <akim.demaille@gmail.com> build: check for C++98 and 03 like the others * m4/bison-cxx-std.m4 (BISON_CXX_COMPILE_STDCXX_98) (BISON_CXX_COMPILE_STDCXX_03): New. * configure.ac: Use them. 2018-09-23 Akim Demaille <akim.demaille@gmail.com> build: use our own version of ax_check_link_flag The message on configure is misleading: checking whether the linker accepts -std=c++11... yes checking whether the linker accepts -std=c++14... yes checking whether the linker accepts -std=c++17... no It is the compiler that we check, not just the linker. * m4/ax_check_link_flag.m4: Remove. * m4/bison-check-compiler-flag.m4: New. * m4/bison-cxx-std.m4: Use it. 2018-09-23 Akim Demaille <akim.demaille@gmail.com> build: fix Autoconf macros to check for C++ standard flags * m4/bison-cxx-std.m4: Since now we link the program, we need a program: main was missing and linking was failing. 2018-09-23 Akim Demaille <akim.demaille@gmail.com> tests: fix a memory leak This has been bugging me for while. I was hard to reproduce: it worked only on GNU/Linux, probably because libc++ implements the small string optimization, while libstdc++ did not and actually allocated on the heap for this small string. See https://lists.gnu.org/archive/html/bison-patches/2018-09/msg00110.html. * tests/types.at (api.value.type): Do not provide a semantic value to EOF. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> doc: work around Flex's use of 'register' The CI uses an old version of Flex. See 65fa634cdcfc5cf59b8b074670f488bba4df57cd. * doc/bison.texi (calc++/scanner.ll): Here. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: don't declare getrusage if we don't use it This fails on MinGW. Reported by Simon Sobisch. http://lists.gnu.org/archive/html/bug-bison/2018-09/msg00058.html * lib/timevar.c: Don't provide default prototypes for functions we don't use. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: get rid of a useless macro * lib/timevar.h (timevar_report): Rename as... (timevar_enabled): this. * lib/timevar.c (TIMEVAR_ENABLE): Remove. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: introduce and use get_current_time * lib/timevar.c: here. Remove useless prototypes. (timevar_accumulate): Be const correct. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: rename get_time as set_to_current_time * lib/timevar.c: here. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: reduce scopes * lib/timevar.c: here. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: document in the header, not in the implementation * lib/timevar.c: Move documentation from here... * lib/timevar.h: to there. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: remove useless 'extern' for prototypes * lib/timevar.h, lib/timevar.c: here. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: rename init_timevar as timevar_init * lib/timevar.h, lib/timevar.c: here. * src/main.c: Adjust. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: we don't care about backward compatibility * lib/timevar.h, lib/timevar.c (get_run_time, print_time): Remove. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: prefer #elif * lib/timevar.c: Use #if/#elif to be clearer about mutually exclusive cases. Indent CPP nested directives. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: assume ANSI C Suggested by Bruno Haible. https://lists.gnu.org/archive/html/bug-gnulib/2018-09/msg00102.html * lib/timevar.c: Wow... This was still KnR C! 2018-09-22 Akim Demaille <akim.demaille@gmail.com> timevar: remove remains of GCC * lib/timevar.h, lib/timevar.c: Rename the header guard. Get rid of parts meant for GCC only. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> news: c++: move semantics 2018-09-22 Akim Demaille <akim.demaille@gmail.com> c++: issue a warning with a value is moved several times Suggested by Frank Heckenbach. http://lists.gnu.org/archive/html/bug-bison/2018-09/msg00022.html * src/scan-code.l (parse_ref): Check multiple occurrences of rhs values. * tests/c++.at (Multiple occurrences of $n and api.value.automove): New. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> c++: introduce api.value.automove Based on work by Frank Heckenbach. See http://lists.gnu.org/archive/html/bug-bison/2018-04/msg00000.html and http://lists.gnu.org/archive/html/bug-bison/2018-09/msg00019.html. * data/lalr1.cc (b4_rhs_value): Use YY_MOVE api.rhs.automove is set. * doc/bison.texi (%define Summary): Document api.rhs.automove. * examples/variant-11.yy: Use it. * tests/local.at (AT_AUTOMOVE_IF): New. * tests/c++.at (Variants): Check move semantics. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> tests: c++: use a custom string type The forthcoming automove feature, to be properly checked, will require that we can rely on the value of a moved-from string, which is not something the C++ standard guarantees. So introduce our own wrapper. Suggested by Frank Heckenbach. https://lists.gnu.org/archive/html/bison-patches/2018-09/msg00111.html * tests/c++.at (Variants): Introduce and use a new 'string' class. 2018-09-22 Akim Demaille <akim.demaille@gmail.com> tests: prepare a test for automove The 'Variants' tests are well suited to check support for move, and in particular for the forthcoming automove feature. But the tests were written to show the best practice in C++98, using swap: list "," item { std::swap ($$, $1); $$.push_back ($3); } This cannot work with std::move. So, make this example simpler, based on regular assignment instead of swap, which is a regression for C++98 (as the new traces show), but will be an improvement for modern C++ with automove. * tests/c++.at (Variants): Stop using swap. We don't generate a header file, so remove the 'require' code section. Adjust expectations. 2018-09-20 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes in gram.c * src/gram.c: here. 2018-09-20 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes in reduce.c * src/reduce.c: Here. 2018-09-20 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2018-09-20 Akim Demaille <akim.demaille@gmail.com> build: work around ICC's limitations Several types of failures. First, unable to pass the file name properly to the linker. ./synclines.at:416: $CC $CFLAGS $CPPFLAGS $LDFLAGS -o \"\\\"\" \"\\\"\".c $LIBS stderr: ld: cannot open output file "/"": No such file or directory stdout: Unable to save under such a file name. ./synclines.at:421: $CXX $CXXFLAGS $CPPFLAGS -c $LDFLAGS -o \"\\\"\" \"\\\"\".cc $LIBS stderr: error: can't open file "/"" for write compilation aborted for "\"".cc (code 1) Spurious output because of warning flags is failed to reject as an error during configure: ./headers.at:343: $CXX $CXXFLAGS $CPPFLAGS $LDFLAGS c-only.o cxx-only.o -o c-and-cxx || exit 77 --- /dev/null 2018-09-18 21:21:37.745649000 +0000 +++ /home/travis/build/akimd/bison/tests/testsuite.dir/at-groups/222/stderr 2018-09-18 21:28:17.291919519 +0000 @@ -0,0 +1,7 @@ +icpc: command line warning #10006: ignoring unknown option '-Wcast-align' +icpc: command line warning #10006: ignoring unknown option '-fparse-all-comments' +icpc: command line warning #10006: ignoring unknown option '-Wdocumentation' +icpc: command line warning #10006: ignoring unknown option '-Wnull-dereference' +icpc: command line warning #10006: ignoring unknown option '-Wnoexcept' +icpc: command line warning #10006: ignoring unknown option '-fno-color-diagnostics' +icpc: command line warning #10006: ignoring unknown option '-Wno-keyword-macro' stdout: * tests/local.at (AT_SKIP_IF_CANNOT_LINK_C_AND_CXX): Also ignore stderr, as with ICC we get * tests/synclines.at (syncline escapes): Don't link the output. 2018-09-19 Akim Demaille <akim.demaille@gmail.com> doc: fix typo Introduced in the previous commit. * doc/bison.texi: here. 2018-09-19 Akim Demaille <akim.demaille@gmail.com> style: use midrule only, not mid-rule The code was already using midrule only, never mid_rule. This is simpler to remember, and matches a similar change we made from look-ahead to lookahead. * NEWS, doc/bison.texi, src/reader.c, src/scan-code.h, src/scan-code.l * tests/actions.at, tests/c++.at, tests/existing.at: here. 2018-09-19 Akim Demaille <akim.demaille@gmail.com> style: use _foo for private macros, not foo_ We use both styles, let's stick to a single one. Autoconf uses the prefix one, let's do the same. * data/bison.m4, data/c++.m4, data/c-like.m4, data/lalr1.cc, * data/variant.hh, data/yacc.c: Rename all the b4_*_ macros as _b4_*. 2018-09-19 Akim Demaille <akim.demaille@gmail.com> build: don't accept a broken standard lib for C++ On the CI, we had failures such as: ./c++.at:401: $PREPARSER ./list stderr: ./list: error while loading shared libraries: libc++.so.1: cannot open shared object file: No such file or directory because we accepted `-std=c++ -stdlib=libc++` although libc++ is not installed on the machine. * m4/ax_check_compile_flag.m4 (AX_CHECK_COMPILE_FLAG): Rewrite as... * m4/bison-check-compile-flag.m4 (BISON_CHECK_COMPILE_FLAG): this, so that we use AC_LINK_IFELSE to check the compiler (and its std lib) instead of AC_COMPILE_IFELSE. 2018-09-18 Paul Eggert <eggert@cs.ucla.edu> doc: document older compiler issues * doc/bison.texi (Compiler Requirements for GLR): Rename from Compiler Requirements. (I can't build Bison): Add FAQ for older compilers. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> glr.c: work around ICC limitations The CI is littered with # -*- compilation -*- 423. regression.at:907: testing Dancer %glr-parser ... ./regression.at:907: bison -fno-caret -o dancer.c dancer.y ./regression.at:907: $BISON_C_WORKS stderr: stdout: ./regression.at:907: $CC $CFLAGS $CPPFLAGS $LDFLAGS -o dancer dancer.c $LIBS stderr: icc: command line warning #10006: ignoring unknown option '-Wcast-align' icc: command line warning #10006: ignoring unknown option '-fparse-all-comments' icc: command line warning #10006: ignoring unknown option '-Wdocumentation' icc: command line warning #10006: ignoring unknown option '-Wnull-dereference' icc: command line warning #10006: ignoring unknown option '-Wbad-function-cast' icc: command line warning #10006: ignoring unknown option '-fno-color-diagnostics' icc: command line warning #10006: ignoring unknown option '-Wno-keyword-macro' dancer.c(755): error #1628: function declared with "noreturn" does return } ^ dancer.c(761): error #1628: function declared with "noreturn" does return } ^ compilation aborted for dancer.c (code 2) ICC sees that `longjmp(buf, 1);` does not return, it sees that `abort();` does not either, but fails to see it for `longjmp(buf, 1); abort();` * data/glr.c (YYLONGJMP): Be even clearer on the fact this does not return. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> TODO: more 2018-09-18 Akim Demaille <akim.demaille@gmail.com> CI: change strategy to pass CXXFLAGS and the like Putting them in the env is useless. We don't want to pass `CPPFLAGS="$CPPFLAGS"` to configure, as it means "set it to nothing" when $CPPFLAGS is not set, which is not what we want. This correctly started to use libc++, but it is not installed on the Ubuntu. We will see later if we can use it. * .travis.yml: Define CONFIGUREFLAGS, and pass it to configure. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> CI: also use GCC 4.7 and 4.8 * .travis.yml (matrix): here. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> CI: name the items of the matrix * .travis.yml: here. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> CI: also check with ICC * build-aux/install-icc.sh: New. * .travis.yml (icc): New. Use -k to get as many errors as possible from the start. * src/complain.c (warnings_types): Use a more precise type. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> CI: be sure to exit on failures a807cfa6eb1a5362ead0b7c99bdc8fd2f4f896da completely broke the whole point of having a CI: we always exit with success! 2018-09-18 Akim Demaille <akim.demaille@gmail.com> build: strengthen the C++ standard flag test On the CI, we have this spurious failure with clang 3.9 with -std=c++17: In file included from list.y:23: In file included from /usr/include/c++/4.8/iostream:39: In file included from /usr/include/c++/4.8/ostream:38: In file included from /usr/include/c++/4.8/ios:42: In file included from /usr/include/c++/4.8/bits/ios_base.h:41: In file included from /usr/include/c++/4.8/bits/locale_classes.h:40: In file included from /usr/include/c++/4.8/string:52: In file included from /usr/include/c++/4.8/bits/basic_string.h:2815: In file included from /usr/include/c++/4.8/ext/string_conversions.h:43: /usr/include/c++/4.8/cstdio:120:11: error: no member named 'gets' in the global namespace using ::gets; ~~^ This shows that our test, based on gl_WARN_ADD, is a joke. We have to really check for at least a bit of C++. * m4/ax_check_compile_flag.m4, m4/bison-cxx-std.m4: New. * configure.ac: Use them to make sure the compiler actually works. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> tests: fix memory leak This was reported by ASAN on the CI. * tests/types.at (api.value.type): Don't set a semantic value to EOF. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> glr.c: prefer true/false to 1/0 in C++ * data/glr.c: here. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> doc: work around Flex's use of 'register' The CI uses an old version of Flex. * doc/bison.texi (calc++/scanner.ll): Here. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> tests: fight G++ warnings about zero as null pointer constant In C++ pre C++11 it is standard practice to use 0 for the null pointer. But GCC pre 8 -std=c++98 with -Wzero-as-null-pointer-constant warns about this. So disable -Wzero-as-null-pointer-constant when compiling C++ pre 11. Let's do this in AT_DATA_SOURCE_PROLOGUE (which is pasted on top of all the test grammar files). Unfortunately, that shifts all the locations in the expected error messages, which would be too noisy. Instead, let's introduce testsuite.h, which can vary in length, and include it in AT_DATA_SOURCE_PROLOGUE. * tests/testsuite.h: New. Disable -Wzero-as-null-pointer-constant's warning with GCC pre 8, C++ pre 11. * tests/local.at (AT_DATA_SOURCE_PROLOGUE): Use it. * tests/atlocal.in (CPPFLAGS): Find it. * tests/local.mk: Ship it. * data/c.m4 (YY_NULLPTR): Prefer ((void*)0) to 0 in C. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> CI: make sure `git describe` works For some reasons, the checkout on travis may not have any tags, so `git describe` fails, so bootstrap fails. * .travis.yml: If git describe fails, install some tag. 2018-09-18 Akim Demaille <akim.demaille@gmail.com> CI: install Doxygen * .travis.yml: here, so that its tests are not skipped. Remove valgrind: it's too expensive on the CI, and asan does the job. 2018-09-16 Akim Demaille <akim.demaille@gmail.com> style: prefer %D% in Automake files * tests/local.mk: Prefer %D%/ to tests/. 2018-09-15 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes in complain.c 2018-09-15 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes in tables.c * src/tables.c: here. * src/state.h: Formatting changes. 2018-09-15 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes in graphviz.c 2018-09-15 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes in LR0.c 2018-09-15 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes in print_graph.c * src/print_graph.c: here. 2018-09-15 Akim Demaille <akim.demaille@gmail.com> doc: formatting changes * doc/bison.texi: No changes in the output. 2018-09-13 Akim Demaille <akim.demaille@gmail.com> tests: run the C++ tests on all the available standards This is much of course more efficient than in the matrix of the CI (or on our own machines), but a bit more tedious. * configure.ac (CXX03_CXXFLAGS, CXX11_CXXFLAGS, CXX14_CXXFLAGS) (CXX17_CXXFLAGS, CXX2A_CXXFLAGS, STDCXX_FLAGS): New. * tests/atlocal.in: Receive them. * tests/local.at (AT_FOR_EACH_CXX): New. * tests/c++.at: Use AT_FOR_EACH_CXX. 2018-09-13 Akim Demaille <akim.demaille@gmail.com> tests: allow to override variables with envvars * tests/atlocal.in: Allow the user to change interesting variables (CFLAGS, CXXFLAGS, etc.). 2018-09-13 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: modern C++ no longer needs an assignment for symbols Reported by Frank Heckenbach. http://lists.gnu.org/archive/html/bug-bison/2018-03/msg00002.html Actually the assignment operator should never be needed: the C++98 requirements for vector::push_back is CopyInsertable, which does not require an assignment operator. However, libstdc++ shipped with GCC up to (and including) 6 uses the assignment operator (which affects Clang on top of libstdc++, but also ICC). So let's keep it for legacy C++. See https://gcc.godbolt.org/z/q0XXmC. * data/lalr1.cc (stack_symbol_type::operator=): Remove. * data/c++.m4 (basic_symbol::operator=): Ditto. * tests/c++.at (C++ Variant-based Symbols Unit Tests): Adjust. 2018-09-13 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: support move semantics Modern C++ (i.e., C++11 and later) introduced "move only" types: types such as std::unique_ptr<T> that can never be duplicated. They must never be copied (by assignments and constructors), they must be "moved". The implementation of lalr1.cc used to copy symbols (including their semantic values). This commit ensures that values are only moved in modern C++, yet remain compatible with C++98/C++03. Suggested by Frank Heckenbach, who provided a full implementation on top of C++17's std::variant. See http://lists.gnu.org/archive/html/bug-bison/2018-03/msg00002.html, and https://lists.gnu.org/archive/html/bison-patches/2018-04/msg00002.html. Symbols (terminal/non terminal) are handled by several functions that used to take const-refs, which resulted eventually in a copy pushed on the stack. With modern C++ (C++11 and later) the callers must use std::move, and the callees must take their arguments as rvalue refs (foo&&). In order to avoid duplicating these functions to support both legacy C++ and modern C++, let's introduce macros (YY_MOVE, YY_RVREF, etc.) that rely on copy-semantics for C++98/03, and move-semantics for modern C++. That's easy for inner types, when the parser's functions pass arguments to each other. Functions facing the user (make_NUMBER, make_STRING, etc.) should support both rvalue-refs (for instance to support move-only types: make_INT (std::make_unique<int> (1))), and lvalue-refs (so that we can pass a variable: make_INT (my_int)). To avoid the multiplication of the signatures (there is also the location), let's take the argument by value. See: https://lists.gnu.org/archive/html/bison-patches/2018-09/msg00024.html. * data/c++.m4 (b4_cxx_portability): New. (basic_symbol): In C++11, replace copy-ctors with move-ctors. In C++11, replace copies with moves. * data/lalr1.cc (stack_symbol_type, yypush_): Likewise. Use YY_MOVE to avoid useless copies. * data/variant.hh (variant): Support move-semantics. (make_SYMBOL): In C++11, in order to support both read-only lvalues, and rvalues, take the argument as a copy. * data/stack.hh (yypush_): Use rvalue-refs in C++11. * tests/c++.at: Use move semantics. * tests/headers.at: Adjust to the new macros (YY_MOVE, etc.). * configure.ac (CXX98_CXXFLAGS, CXX11_CXXFLAGS, CXX14_CXXFLAGS) (CXX17_CXXFLAGS, ENABLE_CXX11): New. * tests/atlocal.in: Receive them. * examples/variant.yy: Don't define things in std. * examples/variant-11.test, examples/variant-11.yy: New. Check the support of move-only types. * examples/README, examples/local.mk: Adjust. 2018-09-12 Akim Demaille <akim.demaille@gmail.com> tests: factor the definition of full compilation * tests/local.at (AT_LANG_EXT): New. (AT_FULL_COMPILE): Simplify. 2018-09-10 Akim Demaille <akim.demaille@gmail.com> CI: use clang with libc++ GCC uses libstdc++. Let's also check libc++. * .travis.yml: here. 2018-09-10 Akim Demaille <akim.demaille@gmail.com> CI: use address sanitizer * .travis.yml (matrix): Use the latest (available) clang with asan. 2018-09-10 Akim Demaille <akim.demaille@gmail.com> CI: sort the matrix in reverse-chronological There are only three builds at a time: show the result of modern compilers first. * .travis.yml (matrix): Sort in reverse-chronological. 2018-09-10 Akim Demaille <akim.demaille@gmail.com> build: use -fparse-all-comments with -Wdocumentation Clang checks only /** ... */ comments without this flag. * configure.ac (warn_common): Also check -fparse-all-comments. 2018-09-09 Akim Demaille <akim.demaille@gmail.com> TODO: minor updates 2018-09-09 Akim Demaille <akim.demaille@gmail.com> build: fix support for --disable-dependency-tracking Reported by Juan Manuel Guerrero. https://lists.gnu.org/archive/html/bug-bison/2014-07/msg00000.html. * examples/local.mk (%D%/extracted.stamp): Make sure the output directory exists. * examples/extexi (process): Likewise. 2018-09-09 Akim Demaille <akim.demaille@gmail.com> configure.ac: fix definition of NO_EXCEPTIONS_CXXFLAGS * configure.ac: Always define it, not just when --enable-gcc-warnings is passed. 2018-09-09 Akim Demaille <akim.demaille@gmail.com> skeletons: style/comment changes * data/c++.m4, data/c.m4, data/glr.c: Here. 2018-09-09 Akim Demaille <akim.demaille@gmail.com> variant: indent better the generated code * data/variant.hh (b4_basic_symbol_constructor_declare) (b4_basic_symbol_constructor_define): here. 2018-09-09 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: don't generate useless constructors when variant is used This generates less code, which is nicer to read, but also takes less chances with compilers such as G++ 4.8 that are too strict and check "dead code" (templated code that is not instantiated). * data/c++.m4 (b4_symbol_type_declare, b4_symbol_type_define): When variants are used, don't generate code meant for non variants. 2018-09-09 Akim Demaille <akim.demaille@gmail.com> CI: Clang 6.0 is not available But Clang 3.3 and 3.4 are. * .travis.yml (addons): Remove, it appears to be ignore if the matrix also defines it. (matrix): Update. 2018-09-08 Akim Demaille <akim.demaille@gmail.com> build: work around warnings in Flex See ea0db44fedc8d5cbdc5c3180bef0285d7ae83803. We also need to disable the warning in the examples (but don't want to clutter the documentation with such details). * doc/bison.texi (scanner.ll): Disable Clang's -Wdocumentation. While at it, hide the other kludges. 2018-09-08 Akim Demaille <akim.demaille@gmail.com> CI: more compiler configurations * .travis.yml: here. 2018-09-08 Akim Demaille <akim.demaille@gmail.com> configure: reveal the name of the Valgrind suppression file we use * configure.ac: here. * build-aux/Linux.valgrind (libstdcxx_init): New. 2018-09-08 Akim Demaille <akim.demaille@gmail.com> build: work around warnings in Flex 2.5.35 That's the version on Ubuntu Precise. See also 1dac131ec45ffa1e382319a94640c65bd10f6aa5. * src/flex-scanner.h: Disable -Wdocumentation. * doc/bison.texi: Turn off a warning triggered by Flex 2.6.4. 2018-09-08 Akim Demaille <akim.demaille@gmail.com> CI: show the version of the tools we use We have failures on Flex output, which are probably related to an old release. Let's check. In file included from src/scan-code-c.c:3: src/scan-code.c:2198:21: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation] * @param line_number ~~~~~~~~~~~~~~~~~^ * .travis.yml: here. 2018-09-08 Akim Demaille <akim.demaille@gmail.com> CI: run more maintainer tests and show the logs Running all these tests might be overkill: it is very long, and don't need full portability checks. Besides, some tests under Valgrind are too slow and get killed by the CI (timeout of 10min without output). * .travis.yml: here. 2018-09-08 Akim Demaille <akim.demaille@gmail.com> CI: enable compiler warnings * .travis.yml: here. * README-hacking: We no longer aim at K&R C. 2018-09-06 Akim Demaille <akim.demaille@gmail.com> build: work around GCC warnings on Flex code See ef98967ada3c1cd48c177d7349e65a709bb49b97. * src/flex-scanner.h: Disable -Wnull-dereference for GCC 6+. 2018-09-06 Akim Demaille <akim.demaille@gmail.com> tests: fix target naming convention We have some maintainer-check-foo and some maintainer-foo-check. Keep only the former. * tests/local.mk (maintainer-push-check, maintainer-xml-check) (maintainer-release-check): Rename as... (maintainer-check-push, maintainer-check-xml) (maintainer-check-release): these. 2018-09-06 Akim Demaille <akim.demaille@gmail.com> tests: fix variable naming convention Most of our variables for C++ flags are named FOO_CXXFLAGS, not CXXFLAGS_FOO. * configure.ac, tests/atlocal.in, tests/calc.at (NO_EXCEPTIONS_CXXFLAGS): Rename as... (CXXFLAGS_NO_EXCEPTIONS): this. 2018-09-06 Akim Demaille <akim.demaille@gmail.com> tests: fix maintainer-check-g++ make recipe Clang++ issues warnings when it's used to compile C. This make target is precisely checking whether we can do that. * configure.ac (NO_DEPRECATED_CXXFLAGS): New. * tests/atlocal.in: Use it. 2018-09-06 Akim Demaille <akim.demaille@gmail.com> tests: fix maintainer-check-valgrind make recipe * tests/local.mk (maintainer-check-valgrind): Run the with Valgrind when it's available, not the converse. 2018-09-06 Akim Demaille <akim.demaille@gmail.com> CI: prepare for travis * .travis.yml: New. 2018-09-06 Akim Demaille <akim.demaille@gmail.com> examples: beware of shell portability issues This completes 2d7e7438024e47650c3a0c9f5f313c6eb6acae2d. Some shells don't grok "local var=`cmd`" very well: they need the rhs to be quoted. ./examples/test: 72: local: you.,: bad variable name FAIL examples/variant.test (exit status: 2) Reported by Étienne Renault. * examples/test (run): Quote the values in 'local' assignments. 2018-09-04 Akim Demaille <akim.demaille@gmail.com> tests: style changes * tests/c++.at: Formatting changes. Use 'using' to shorten the code. 2018-09-02 Akim Demaille <akim.demaille@gmail.com> tests: disable GCC7 warnings for some tests With GCC7 we have warnings (false positive): x8.c: In function 'x8_parse': x8.c:1233:16: error: 'yylval' may be used uninitialized in this function [-Werror=maybe-uninitialized] yylval = *yypushed_val; ~~~~~~~^~~~~~~~~~~~~~~ x8.c: In function 'x8_pull_parse': x8.c:1233:16: error: 'yylval' may be used uninitialized in this function [-Werror=maybe-uninitialized] yylval = *yypushed_val; ~~~~~~~^~~~~~~~~~~~~~~ See also 9645a2b20ee7cbfa8bb4ac2237f87d598afe349c. * tests/local.at (AT_PUSH_IF): New. (AT_BISON_OPTION_POPDEFS): Pop it, and pop AT_PURE_IF. * tests/headers.at (Several parsers, Several parsers): Disable these warnings when in push parser. 2018-09-02 Akim Demaille <akim.demaille@gmail.com> C++: don't issue the definition of symbol_type when not used Currently, in glr.cc, we emit the definitions of basic_symbol and symbol_type, although there are not used. * data/c++.m4 (b4_public_types_declare): Extract these definitions from here, and move them... (b4_symbol_type_declare): here. (b4_public_types_declare): Also remove the definition of the symbol constructors. * data/lalr1.cc (b4_shared_declarations): Adjust: call b4_symbol_type_declare and b4_symbol_constructor_declare. 2018-09-02 Akim Demaille <akim.demaille@gmail.com> examples: beware of shell portability issues Some shells don't grok `local var=$val` very well: they need the rhs to be quoted. ./examples/test: 66: local: you.,: bad variable name FAIL examples/variant.test (exit status: 2) Reported by Étienne Renault. * examples/test (run): Quote the values in 'local' assignments. 2018-08-31 Akim Demaille <akim.demaille@gmail.com> C++: leave 'inline' on the definition, not the declaration This is for consistency with the other uses of 'inline' in the C++ skeletons. On examples/variant.yy, this change gives: --- examples/variant.hh 2018-08-31 07:16:57.214222580 +0200 +++ examples/variant.hh 2018-08-31 07:19:52.285431997 +0200 @@ -444,15 +444,15 @@ typedef basic_symbol<by_type> symbol_type; // Symbol constructors declarations. - static inline + static symbol_type make_END_OF_FILE (const location_type& l); - static inline + static symbol_type make_TEXT (const ::std::string& v, const location_type& l); - static inline + static symbol_type make_NUMBER (const int& v, const location_type& l); @@ -945,19 +945,23 @@ }; return static_cast<token_type> (yytoken_number_[type]); } + // Implementation of make_symbol for each symbol type. + inline parser::symbol_type parser::make_END_OF_FILE (const location_type& l) { return symbol_type (token::END_OF_FILE, l); } + inline parser::symbol_type parser::make_TEXT (const ::std::string& v, const location_type& l) { return symbol_type (token::TEXT, v, l); } + inline parser::symbol_type parser::make_NUMBER (const int& v, const location_type& l) { @@ -967,7 +971,7 @@ } // yy -#line 971 "examples/variant.hh" // lalr1.cc:380 +#line 975 "examples/variant.hh" // lalr1.cc:380 and no changes on variant.cc. * data/c++.m4 (b4_public_types_define): Formatting changes. * data/variant.hh (b4_symbol_value_template_, b4_symbol_constructor_declare_): Move the 'inline' from declaration to implementation. 2018-08-30 Akim Demaille <akim.demaille@gmail.com> c++: style changes Instead of parser::stack_symbol_type::stack_symbol_type (const stack_symbol_type& that) : super_type (that.state, that.location) { value = that.value; } generate parser::stack_symbol_type::stack_symbol_type (const stack_symbol_type& that) : super_type (that.state, that.value, that.location) {} * data/lalr1.cc (stack_symbol_type): Improve the copy ctor, when not using the variants. (yypush_): Rename arguments for clarity. 2018-08-30 Akim Demaille <akim.demaille@gmail.com> c++: the assignment operator does not have to be const * data/lalr1.cc (stack_symbol_type::operator=): Don't copy the argument, move it. 2018-08-30 Akim Demaille <akim.demaille@gmail.com> tests: style changes * tests/c++.at (C++ Variant-based Symbols): Rename as... (C++ Variant-based Symbols Unit Tests): this. Comment/style changes. 2018-08-27 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2018-08-27 Akim Demaille <akim.demaille@gmail.com> version 3.1 * NEWS: Record release date. 2018-08-27 Akim Demaille <akim.demaille@gmail.com> build: tabs are ok in a Makefile * cfg.mk: TABs are ok in examples/calc++/Makefile. 2018-08-26 Akim Demaille <akim.demaille@gmail.com> C++: make sure the generated header is self container See the previous commit. * data/lalr1.cc: Be sure to define YY_NULLPTR. * tests/headers.at: Check the case that was failing. 2018-08-26 Akim Demaille <akim.demaille@gmail.com> tests: check that headers are sane The header generated for variants with assertions but without locations, is not self-contained. Prepare a check for this. * tests/headers.at (Sane headers): New, extracted from... (Several parsers): here. 2018-08-25 Akim Demaille <akim.demaille@gmail.com> "C++: restore copy-constructor for stack_symbol_type Benchmarks show that it is more efficient to keep this copy constructor, rather than forcing the use of the default constructor and then assignment. This reverts commit 7ab25ad0208d00f509613e1e151aa3043cf2862f. 2018-08-25 Akim Demaille <akim.demaille@gmail.com> examples: calc++: a Makefile and a README * examples/calc++/Makefile, examples/calc++/README: New. * examples/calc++/local.mk: Ship and install them. * doc/bison.texi: Formatting changes. 2018-08-25 Akim Demaille <akim.demaille@gmail.com> gnulib: update 2018-08-25 Jiahao Li <jiahaoli@fb.com> variant: fix uninitialized memory access in `variant<>` Currently, in bison's C++ parser template (`lalr.cc`), the `variant<>` struct's `build()` method uses placement-new in the form `new (...) T` to initialize a variant type. However, for POD variant types, this will leave the memory space uninitialized. If we subsequently tries to `::move` into a variant object in such state, the call can trigger clang's undefined behavior sanitizer due to accessing the uninitialized memory. https://lists.gnu.org/archive/html/bison-patches/2018-08/msg00098.html * data/variant.hh (build): Always initialize the stored value. 2018-08-24 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2018-08-24 Akim Demaille <akim.demaille@gmail.com> examples: calc++: minor improvements * doc/bison.texi (A Complete C++ Example): Prefer throw exceptions from the scanner. Show the invalid characters. Since the scanner sends exceptions, it no longer needs to report errors, so we can get rid of the driver's routine to report error, do it in yyerror. Use @group/@end group to improve rendering. 2018-08-24 Akim Demaille <akim.demaille@gmail.com> examples: calc++: make sure the file name in location is set Reported by Hans Åberg. http://lists.gnu.org/archive/html/bug-bison/2018-08/msg00039.html * doc/bison.texi (A Complete C++ Example): Move the token's location from the scanner to the driver. 2018-08-24 Akim Demaille <akim.demaille@gmail.com> examples: calc++: remove prefixes This example uses the calcxx_ prefix for each class. That's uselessly heavy. * doc/bison.texi (A Complete C++ Example): Simplify the class names. Since now 'driver' denotes the class, use 'drv' for the values. Formatting changes. 2018-08-23 Akim Demaille <akim.demaille@gmail.com> examples: fix the leading empty line * examples/extexi: Really avoid the first empty line. Remove useless `next`. 2018-08-23 Akim Demaille <akim.demaille@gmail.com> examples: shorten the name of the calc++ files * doc/bison.texi: Turn the calc++- prefix into calc++/. * examples/extexi (%file_wanted): Replace with (&file_wanted): this. * examples/calc++/local.mk: Adjust. 2018-08-23 Akim Demaille <akim.demaille@gmail.com> tests: disable -Wmaybe-uninitialized in some tests On these tests, at -O2 and above, GCC 8 complains that yylval may be uninitialized. But it seems wrong: it is initialized. Rather than turning off the warning in the skeleton (hence possibility hiding relevant warnings of user parsers), let's turn it off in the tests only. 163: parse.error=verbose and consistent errors: FAILED (conflicts.at:625) 165: parse.error=verbose and consistent errors: lr.default-reduction=consistent FAILED (conflicts.at:635) 166: parse.error=verbose and consistent errors: lr.default-reduction=accepting FAILED (conflicts.at:641) 167: parse.error=verbose and consistent errors: lr.type=canonical-lr FAILED (conflicts.at:645) 168: parse.error=verbose and consistent errors: parse.lac=full FAILED (conflicts.at:650) 169: parse.error=verbose and consistent errors: parse.lac=full lr.default-reduction=accepting FAILED (conflicts.at:655) We get: input.c: In function 'yyparse': input.c:980:9: error: 'yylval' may be used uninitialized in this function [-Werror=maybe-uninitialized] YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default); ^~~~~~ cc1: all warnings being treated as errors See https://lists.gnu.org/archive/html/bison-patches/2018-08/msg00063.html. * tests/conflicts.at (AT_CONSISTENT_ERRORS_CHECK): Disable -Wmaybe-uninitialized. 2018-08-19 Akim Demaille <akim.demaille@gmail.com> doc: clarify that the push parser object can be reused Suggested by Rici Lake. https://lists.gnu.org/archive/html/bug-bison/2018-08/msg00033.html * doc/bison.texi: Complete description of the first node in the main @menu. (Push Decl): Remove the 'experimental' warnings about push parser. Clarify that the push parser object can be reused in several parses. 2018-08-19 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: support compilation with disabled support for exceptions Reported by Brooks Moses <bmoses@google.com> http://lists.gnu.org/archive/html/bison-patches/2018-02/msg00000.html * data/lalr1.cc (YY_EXCEPTIONS): New. Use it to disable try/catch clauses. * doc/bison.texi (C++ Parser Interface): Document it. * configure.ac (CXXFLAGS_NO_EXCEPTIONS): New. * tests/atlocal.in: Receive it. * tests/local.at (AT_FULL_COMPILE, AT_LANG_COMPILE): Accept a new argument, extra compiler flags. * tests/calc.at: Run the C++ calculator with exception support disabled. 2018-08-19 Akim Demaille <akim.demaille@gmail.com> examples: add empty lines Currently the examples are too dense, let's put empty lines where '#line' would be issued. And also remove some spurious empty lines (remains from @group, @end group, etc.). * examples/extexi: Do that. * examples/local.mk (extexiFLAGS): Rename as... (EXTEXIFLAGS): this. 2018-08-19 Akim Demaille <akim.demaille@gmail.com> examples: check the variant example * examples/mfcalc/local.mk, examples/rpcalc/local.mk: Define the programs in a more natural order, source, preproc, then linker. * examples/test: Be ready to work on programs that are not in a subdir. * examples/variant.test: New. * examples/local.mk: Use it. * examples/variant.yy: Don't use 0 for nullptr. Use a more natural output for a list of string. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> C++: fix portability issue with MSVC 2017 Visual Studio issues a C4146 warning on '-static_cast<unsigned>(rhs)'. The code is weird, probably to cope with INT_MIN. Let's go back to using std::max (whose header is still included in position.hh...) like originally, but with the needed casts. Reported by 長田偉伸, and with help from Rici Lake. See also http://lists.gnu.org/archive/html/bug-bison/2013-02/msg00000.html and commit 75ae8299840bbd854fa2474d38402bbb933c6511. * data/location.cc (position::add_): Take min as an int. Use std::max. While here, get rid of a couple of useless inlines. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> build: fix concurrent build failure Reported by Dengke Du and Robert Yang. https://lists.gnu.org/archive/html/bison-patches/2017-07/msg00000.html * src/local.mk (src/yacc): Make sure the directory exists. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> lalr1.cc: remove debug comment * data/lalr1.cc: Remove a comment about indentation. I'm not sure it would be nice to indent even more, it's already quite of the right. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> doc: fix the name of the GFDL section Reported by dine <2500418497@qq.com>. http://lists.gnu.org/archive/html/bug-bison/2016-10/msg00000.html I mirrored what the Coreutils do. * doc/bison.texi (Copying This Manual): Rename as... (GNU Free Documentation License): this, since that the name we used in the preamble. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> doc: clarify the destructor selection example Reported by Gary L Peskin. http://lists.gnu.org/archive/html/help-bison/2016-02/msg00000.html * doc/bison.texi (Destructor Decl): here. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> portability: don't use _Pragma with ICC ICC defines __GNUC__ [1], but does not support GCC's _Pragma for diagnostics. As a matter of fact, I believe it does not support _Pragma at all (only #pragma) [2]. Reported by Maxim Prohorenko. https://savannah.gnu.org/support/index.php?108339 [1] https://software.intel.com/en-us/cpp-compiler-18.0-developer-guide-and-reference-gcc-compatibility-and-interoperability [2] https://software.intel.com/en-us/cpp-compiler-18.0-developer-guide-and-reference-pragmas * data/c.m4 (YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN): Exclude ICC from the club. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> doc: typed mid-rule actions * doc/bison.texi (Mid-Rule Actions): Restructure to insert... (Typed Mid-Rule Actions): this new section. Move the manual translation of mid-rule actions into regular actions to... (Mid-Rule Action Translation): here. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> escape properly the file names in #line for printer/destructor Reported by Jannick. http://lists.gnu.org/archive/html/bug-bison/2017-05/msg00001.html "Amusingly" enough, we have the same problem with %defines when the parser file name has backslashes or quotes: we generate #includes with an incorrect C string. * src/output.c (prepare_symbol_definitions): Escape properly the file names before passing them to M4. * data/bison.m4, data/lalr1.cc: Don't simply put the file name between two quotes (that should have been strong enough a smell...), expect the string to be properly quoted. * tests/synclines.at: New tests to check this. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> tests: fix title and improve quoting * tests/synclines.at: here. Also, prefer '%code' to ;%{...%}' for yylex/yyerror prototypes. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes * src/output.c: here. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes * src/scan-code.l: here. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> regen 2018-08-18 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes * src/parse-gram.y: Declare iterator within the for-loop. 2018-08-18 Akim Demaille <akim.demaille@gmail.com> tests: style changes * tests/c++.at, tests/local.at: Formatting and title changes. 2018-08-17 Akim Demaille <akim.demaille@gmail.com> reader: simplify the search of the start symbol Suggested by Paul Eggert. * src/reader.c (find_start_symbol): Don't check 'res', we know it is not null. That suffices to avoid the GCC warnings. * bootstrap.conf: We don't need 'assume', which doesn't exist anyway. 2018-08-15 Akim Demaille <akim.demaille@gmail.com> c++: fix GCC8 warnings about uninitialized values In 0931d14728fb4a2272399f2c927ae78e2607b4fb I removed too many initializations from some ctors: some were not about base ctors, but about member variables. In fact, more of them were missing to please GCC 8. While at it, generate more natural code for C++ without variant: instead of template <typename Base> parser::basic_symbol<Base>::basic_symbol (const basic_symbol& other) : Base (other) , value () { value = other.value } generate template <typename Base> parser::basic_symbol<Base>::basic_symbol (const basic_symbol& other) : Base (other) , value (other.value) {} * data/c++.m4 (basic_symbol::basic_symbol): Always initialize 'value', it might be a POD without a ctor. * data/lalr1.cc (stack_symbol_type::stack_symbol_type): Likewise. * data/variant.hh (variant::variant): Default initialize the buffer too. 2018-08-15 Akim Demaille <akim.demaille@gmail.com> tests: style: use %empty * tests/conflicts.at: here. 2018-08-15 Akim Demaille <akim.demaille@gmail.com> tests: fix warnings in push mode Fix warning with GCC 8, -DNDEBUG. 422. push.at:83: testing Multiple impure instances ... input.y: In function 'main': input.c:1022:12: error: potential null pointer dereference [-Werror=null-dereference] if (!yyps->yynew && yyps->yyss != yyps->yyssa) ~~~~^~~~~~~ * data/yacc.c (pstate_delete): Do nothing if called on null pointer. 2018-08-15 Akim Demaille <akim.demaille@gmail.com> c++: avoid GCC 8 warnings GCC 8 issues warnings whose root cause was a bit hard to find. calc.cc: In member function 'virtual int yy::parser::parse()': calc.cc:810:18: warning: '*((void*)&<anonymous> +8)' may be used uninitialized in this function [-Wmaybe-uninitialized] , location (l) ^ calc.cc: In member function 'void yy::parser::yypush_(const char*, yy::parser::stack_symbol_type&)': calc.cc:810:18: warning: '*((void*)&<anonymous> +8)' may be used uninitialized in this function [-Wmaybe-uninitialized] , location (l) ^ calc.cc: In member function 'void yy::parser::yypush_(const char*, yy::parser::state_type, yy::parser::symbol_type&)': calc.cc:810:18: warning: '*((void*)&<anonymous> +8)' may be used uninitialized in this function [-Wmaybe-uninitialized] , location (l) ^ The problem is with locations that don't have a constructor, such as Span (in calc.cc) which is POD. It is POD on purpose: so that we can use that structure to test glr.cc which cannot use non POD in its (C) stacks. * data/c++.m4 (basic_symbol): Also ensure that 'location' is initialized. 2018-08-15 Akim Demaille <akim.demaille@gmail.com> tests: avoid compiler warnings * tests/calc.at (AT_CALC_MAIN): Declare yyparse and operator<< in an unnamed namespace to avoid "not declared" warnings (clang -Weverything). Remove useless prototypes. 2018-08-15 Akim Demaille <akim.demaille@gmail.com> build: work around GCC warnings on Flex code With GCC 7.3.0 and Flex 2.6.4, we get warnings on all the generated scanners: examples/calc++/calc++-scanner.cc: In function 'void yyrestart(FILE*)': examples/calc++/calc++-scanner.cc:1611:20: error: potential null pointer dereference [-Werror=null-dereference] /* %endif */ ~~~~~~~~~~~ ^ examples/calc++/calc++-scanner.cc:1607:19: error: potential null pointer dereference [-Werror=null-dereference] /* %if-c-only */ ~~~~~~~~~~~~~~~ ^ examples/calc++/calc++-scanner.cc:1611:20: error: potential null pointer dereference [-Werror=null-dereference] /* %endif */ ~~~~~~~~~~~ ^ examples/calc++/calc++-scanner.cc:1607:19: error: potential null pointer dereference [-Werror=null-dereference] /* %if-c-only */ ~~~~~~~~~~~~~~~ ^ cc1plus: all warnings being treated as errors Obviously the lines are incorrect, and the warnings are emitted twice. Still, let's get rid of these warnings. * doc/bison.texi, src/flex-scanner.h: Disable these warnings in code generated by Flex. 2018-08-15 Akim Demaille <akim.demaille@gmail.com> fix incorrect C code Commit 3df32101e7978eaafa63bce8908de3dcae4d9cda introduced invalid C code. Caught by GCC 7.3.0. * bootstrap.conf (gnulib_modules): We need assume. * src/reader.c (find_start_symbol): Fix the signature (too much C++, sorry...). Prefer 'assume' to 'assert', so that we don't have these warnings even when NDEBUG is defined. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> examples: fix Englishoes * examples/README: Fix my mistakes. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> examples: ship and install variant.yy This file was meant to be shown as an example. Install it. * README, data/README: Put Emacs metadata in the final section. * examples/README: New. * examples/variant.yy: Use %empty. * examples/local.mk: Install both these files. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> C++: remove useless copy-constructor We currently generate copy constructors such as the following one (taken from examples/variant.yy): parser::stack_symbol_type::stack_symbol_type (const stack_symbol_type& that) : super_type (that.state, that.location) { switch (that.type_get ()) { case 3: // TEXT case 8: // item value.copy< ::std::string > (that.value); break; case 7: // list value.copy< ::std::vector<std::string> > (that.value); break; case 4: // NUMBER value.copy< int > (that.value); break; default: break; } } they are actually useless: we never need it. * data/lalr1.cc: Don't generate the stack_symbol_type copy ctor. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> C++: symbol constructors: add a missing reference Fix a typo so that instead of basic_symbol::basic_symbol (typename Base::kind_type t, const int v) we now generate basic_symbol::basic_symbol (typename Base::kind_type t, const int& v) * data/variant.hh (b4_basic_symbol_constructor_declare) (b4_basic_symbol_constructor_define): Add missing reference. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> C++: remove useless calls to the base default constructor * data/c++.m4, data/stack.hh, data/variant.hh: here. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> C++: prefer size_type to unsigned for indexes * data/stack.hh (size_type): New, based on the container type. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> regen 2018-08-14 Akim Demaille <akim.demaille@gmail.com> style: m4: remove useless reference to 'int' in integral types * m4/cxx.m4: Prefer 'unsigned' to 'unsigned int'. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> style: doc: remove useless reference to 'int' in integral types * doc/bison.texi: Prefer 'unsigned' to 'unsigned int'. Likewise for long and short. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> style: lib: remove useless reference to 'int' in integral types * lib/abitset.c, lib/bbitset.h, lib/bitset.c, lib/bitset.h, * lib/bitset_stats.c, lib/bitsetv-print.c, lib/bitsetv.c, * lib/bitsetv.h, lib/ebitset.c, lib/lbitset.c, lib/timevar.c, * lib/vbitset.c: Prefer 'unsigned' to 'unsigned int'. Likewise for long and short. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> style: src: remove useless reference to 'int' in integral types * src/AnnotationList.c, src/AnnotationList.h, src/InadequacyList.h, * src/closure.c, src/closure.h, src/gram.c, src/gram.h, src/ielr.c, * src/location.c, src/output.c, src/reader.c, src/relation.c, * src/scan-code.l, src/scan-gram.l, src/tables.c, src/tables.h: Prefer 'unsigned' to 'unsigned int'. Likewise for long and short. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> style: tests: remove useless reference to 'int' in integral types * tests/actions.at, tests/cxx-type.at: Prefer 'unsigned' to 'unsigned int'. Likewise for long and short. 2018-08-14 Akim Demaille <akim.demaille@gmail.com> style: data: remove useless reference to 'int' in integral types * data/c.m4, data/glr.c, data/yacc.c: Prefer 'unsigned' to 'unsigned int'. Likewise for long and short. 2018-08-12 Akim Demaille <akim.demaille@gmail.com> gnulib: update * bootstrap.conf: gnulib_mk is defined again by bootstrap. 2018-08-12 Akim Demaille <akim.demaille@gmail.com> doc: avoid type aliases * doc/bison.texi (C++ Location Values): Use 'unsigned' instead of 'uint'. 2018-08-12 Akim Demaille <akim.demaille@gmail.com> doc: remove the "experimental" warning for some features Several features were flagged 'experimental' and waiting for user feedback to 'stabilize', but i. AFAIK, no user ever reported anything about them, ii. they'be been here long enough to prove they don't do harm. * doc/bison.texi: No longer experimental: default %printer and %destructor (typed: <*> and untyped: <>), %define api.value.type union and variant, Java parsers, XML output, LR family (lr, ielr, lalr), semantic predicates (%?). 2018-08-12 Akim Demaille <akim.demaille@gmail.com> tests: check variants and typed mid-rule actions See http://lists.gnu.org/archive/html/bison-patches/2018-08/msg00013.html * tests/c++.at (Variants and Typed Mid-rule Actions): New. 2018-08-12 Akim Demaille <akim.demaille@gmail.com> tests: fix minor issues * tests/actions.at: Fix some log messages. Prefer #error to fprintf: it fixes the invalid use of yyoutput in %destructor, and it is an even stronger check: that the code is not even emitted. The portability of #error is not really a problem here, since the point is anyway to have the compilation fail. 2018-08-11 Akim Demaille <akim.demaille@gmail.com> c++: variant: add more assertions * data/variant.hh (variant::as): Check yytypeid_ before checking *yytypeid_. 2018-08-11 Akim Demaille <akim.demaille@gmail.com> doc: -fcaret is enabled by default * doc/bison.texi (Mid-Rule Action Translation): So no need to pass it. 2018-08-11 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes * src/closure.c, src/conflicts.c: here. 2018-08-11 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2018-08-11 Akim Demaille <akim.demaille@gmail.com> rule actions cannot be typed Make sure that we cannot apply a type to the (main) action of a rule. * src/reader.c (grammar_rule_check): Issue the warning. * tests/input.at (Cannot type action): Check the warning. 2018-08-11 Akim Demaille <akim.demaille@gmail.com> warn about typed mid-rule actions in Yacc mode * src/reader.c (grammar_current_rule_action_append): Warn. * tests/input.at (AT_CHECK_UNUSED_VALUES): Check. 2018-08-11 Akim Demaille <akim.demaille@gmail.com> tests: check typed mid-rule actions * tests/input.at (_AT_UNUSED_VALUES_DECLARATIONS): Check typed mid-rule actions. * tests/report.at (Reports): Check that types of typed mid-rule actions are reported. * tests/actions.at (Typed mid-rule actions): Check that the values of typed mid-rule actions are correct. 2018-08-11 Akim Demaille <akim.demaille@gmail.com> regen 2018-08-11 Akim Demaille <akim.demaille@gmail.com> add support for typed mid-rule actions Prompted on Piotr Marcińczyk's message: http://lists.gnu.org/archive/html/bug-bison/2017-06/msg00000.html. See also http://lists.gnu.org/archive/html/bug-bison/2018-06/msg00001.html. Because their type is unknown to Bison, the values of midrule actions are not treated like the others: they don't have %printer and %destructor support. In addition, in C++, (Bison) variants cannot work properly. Typed midrule actions address these issues. Instead of: exp: { $<ival>$ = 1; } { $<ival>$ = 2; } { $$ = $<ival>1 + $<ival>2; } write: exp: <ival>{ $$ = 1; } <ival>{ $$ = 2; } { $$ = $1 + $2; } * src/scan-code.h, src/scan-code.l (code_props): Add a `type` field to record the declared type of an action. (code_props_rule_action_init): Add a type argument. * src/parse-gram.y: Accept an optional type tag for actions. * src/reader.h, src/reader.c (grammar_current_rule_action_append): Add a type argument. (grammar_midrule_action): When a mid-rule is typed, pass its type to the defined dummy non terminal symbol. 2018-08-05 Akim Demaille <akim.demaille@gmail.com> tests: make room for more cases * tests/input.at (AT_CHECK_UNUSED_VALUES): Add an empty line to allow more symbols, and adjust line numbers. Use a more consistent m4 quoting scheme. 2018-08-05 Akim Demaille <akim.demaille@gmail.com> warnings: address -Wnull-dereference in reader.c Based on a patch by David Michael. http://lists.gnu.org/archive/html/bison-patches/2018-07/msg00000.html * src/reader.c (find_start): New, extracted from... (check_and_convert_grammar): here. 2018-08-05 Akim Demaille <akim.demaille@gmail.com> style: ielr: reduce scopes * src/ielr.c: Use modern C to reduce the scopes of some variables. 2018-07-26 Akim Demaille <akim.demaille@gmail.com> style: move to C99 to reduce scopes * src/symtab.c, src/reader.c: Freely mix statements and variable definitions. And use for-loops with initializers. 2018-07-26 Akim Demaille <akim.demaille@gmail.com> style: split a function in two grammar_current_rule_action_append was used in two different places: for actual action (`{...}`), and for predicates (`%?{...}`). Let's split this in two different functions. * src/reader.h, src/reader.c (grammar_current_rule_predicate_append): New. Extracted from... (grammar_current_rule_action_append): here. Remove arguments that don't apply. Adjust dependencies. 2018-07-26 Akim Demaille <akim.demaille@gmail.com> tests: fix typo * tests/actions.at: Remove (harmless) stray character. 2018-07-26 Akim Demaille <akim.demaille@gmail.com> print: remove unused function This function was unused since 1991's original import by rms (e06f0c34427faedc7afbec9554adbffc4c87312e). * src/print.c (print_token): Remove. 2018-06-23 Akim Demaille <akim.demaille@gmail.com> doc: fix Texinfo syntax error * doc/bison.texi (Understanding): here. 2018-06-22 Akim Demaille <akim.demaille@gmail.com> doc: we now show the type of the symbols * doc/bison.texi (Understanding Your Parser): Update the output from Bison. Use types in the example, and show them in the report. * NEWS: Update. 2018-06-18 Akim Demaille <akim.demaille@gmail.com> tests: check the typed symbols in the reports * tests/report.at: New. * tests/local.mk, tests/testsuite.at: Use it. 2018-06-18 Akim Demaille <akim.demaille@gmail.com> report: display the type of the symbols * src/print.c (print_nonterminal_symbols, print_terminal_symbols): Also should the type of the symbols. 2018-06-18 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes * src/print.c (print_terminal_symbols, print_nonterminal_symbols): Here. 2018-06-18 Akim Demaille <akim.demaille@gmail.com> style: split large function * src/print.c (print_grammar): Split into... (print_terminal_symbols, print_nonterminal_symbols): these. Adjust dependencies. 2018-06-18 Akim Demaille <akim.demaille@gmail.com> style: reduce scopes * src/print.c (print_grammar): Shorten scopes. 2018-06-18 Akim Demaille <akim.demaille@gmail.com> gnulib: update Fixes the `make install-pdf` problem reported by Hans Åberg in http://lists.gnu.org/archive/html/bug-bison/2018-06/msg00000.html that had already been fixed by Joel E. Denny in http://lists.gnu.org/archive/html/bug-bison/2012-04/msg00011.html Final fix in http://lists.gnu.org/archive/html/bug-gnulib/2018-06/msg00019.html 2018-06-17 Akim Demaille <akim.demaille@gmail.com> Merge maint into master * upstream/maint: (48 commits) THANKS: update an address tests: adjust syncline tests to GCC 7 glr: fix improperly placed synclines bison: be git grep friendly Replace ftp with https maint: post-release administrivia version 3.0.5 bison: style: indentation fixes regen bison: please address sanitizer C++: style: fix indentation NEWS: update C++: style: prefer `unsigned` to `unsigned int` C++: style: space before paren C++: fix -Wdeprecated warnings tests: fix -Wdeprecated warning maint: update syntax-check exclusions autoconf: update regen Update copyright years ... 2018-05-30 Akim Demaille <akim.demaille@gmail.com> THANKS: update an address 2018-05-30 Akim Demaille <akim.demaille@gmail.com> tests: adjust syncline tests to GCC 7 GCC 7 also underlines the error. syncline.c:4:2: error: #error "4" #error "4" ^~~~~ * tests/synclines.at (_AT_SYNCLINES_COMPILE): Remove tildas from GCC 7. 2018-05-29 Akim Demaille <akim.demaille@gmail.com> glr: fix improperly placed synclines Predicates with GLR are issued with synclines in the middle of C code: case 2: if (! (#line 6 "sempred.y" /* glr.c:816 */ new_syntax)) YYERROR; #line 793 "sempred.tab.c" /* glr.c:816 */ break; Reported by Rici Lake. http://lists.gnu.org/archive/html/bug-bison/2018-05/msg00033.html * data/c.m4 (b4_predicate_case): Be sure to start on column 0. It would be nicer if b4_syncline could ensure this by itself (that would avoid ugly code when synclines are disabled), but that's way more work. * tests/glr-regression.at (Predicates): Be a real end-to-end test. This would have caught this error years ago... 2018-05-29 Akim Demaille <akim.demaille@gmail.com> bison: be git grep friendly * src/output.c (user_actions_output): Make calls to b4_case and b4_predicate_case explicit. 2018-05-29 Akim Demaille <akim.demaille@gmail.com> Replace ftp with https Reported by Hans Åberg. * README, cfg.mk, doc/bison.texi: here. 2018-05-27 Akim Demaille <akim.demaille@gmail.com> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2018-05-27 Akim Demaille <akim.demaille@gmail.com> version 3.0.5 * NEWS: Record release date. 2018-05-27 Akim Demaille <akim.demaille@gmail.com> bison: style: indentation fixes * src/parse-gram.y: here. 2018-05-27 Akim Demaille <akim.demaille@gmail.com> regen 2018-05-27 Akim Demaille <akim.demaille@gmail.com> bison: please address sanitizer * src/parse-gram.y (add_param): Asan does not like that the second argument of strspn is not 0-terminated. 2018-05-27 Akim Demaille <akim.demaille@gmail.com> C++: style: fix indentation * data/variant.hh (b4_symbol_variant): De-indent, as the callers are indented. 2018-05-27 Akim Demaille <akim.demaille@gmail.com> NEWS: update 2018-05-27 Akim Demaille <akim.demaille@gmail.com> C++: style: prefer `unsigned` to `unsigned int` * data/c++.m4: here. 2018-05-27 Akim Demaille <akim.demaille@gmail.com> C++: style: space before paren * data/c++.m4, data/lalr1.cc: here. 2018-05-27 Akim Demaille <akim.demaille@gmail.com> C++: fix -Wdeprecated warnings For instance on test 99: In file included from @@.cc:56: @@.hh:409:26: error: definition of implicit copy constructor for 'stack_symbol_type' is deprecated because it has a user-declared copy assignment operator [-Werror,-Wdeprecated] stack_symbol_type& operator= (const stack_symbol_type& that); ^ Reported by Derek Clegg. https://lists.gnu.org/archive/html/bison-patches/2018-05/msg00036.html * configure.ac (warn_tests): Add -Wdeprecated. * data/lalr1.cc (stack_symbol_type): Add an explicit copy ctor. We cannot rely on the explicit default implementation (`= default`) as we support C++ 98. 2018-05-27 Akim Demaille <akim.demaille@gmail.com> tests: fix -Wdeprecated warning With recent compilers: input.yy:49:5: error: definition of implicit copy assignment operator for 'Object' is deprecated because it has a user-declared destructor [-Werror,-Wdeprecated] ~Object () ^ input.yy:130:35: note: in implicit copy assignment operator for 'Object' first required here { yylhs.value.as< Object > () = yystack_[0].value.as< Object > (); } * tests/c++.at (Object): Add missing assignment operator. 2018-05-19 Akim Demaille <akim.demaille@gmail.com> maint: update syntax-check exclusions sc_two_space_separator_in_usage complains about bootstrap: two_space_separator_in_usage /Users/akim/src/gnu/bison/bootstrap:905: --aux-dir $build_aux\ /Users/akim/src/gnu/bison/bootstrap:906: --doc-base $doc_base\ /Users/akim/src/gnu/bison/bootstrap:907: --lib $gnulib_name\ /Users/akim/src/gnu/bison/bootstrap:908: --m4-base $m4_base/\ /Users/akim/src/gnu/bison/bootstrap:909: --source-base $source_base/\ /Users/akim/src/gnu/bison/bootstrap:910: --tests-base $tests_base\ /Users/akim/src/gnu/bison/bootstrap:911: --local-dir $local_gl_dir\ maint.mk: help2man requires at least two spaces between an option and its description * cfg.mk: Exclude bootstrap from this check. 2018-05-19 Akim Demaille <akim.demaille@gmail.com> autoconf: update * submodules/autoconf: Update to latest master. No difference on the M4 files we use. 2018-05-19 Akim Demaille <akim.demaille@gmail.com> regen 2018-05-12 Akim Demaille <akim.demaille@gmail.com> Update copyright years Run `make update-copyright`. 2018-05-12 Nate Guerin <nathan.guerin@riseup.net> Add a missing word in the documentation Small patch adds the word 'to' to the documentation. 2018-05-12 Akim Demaille <akim.demaille@gmail.com> Examples: improve C++ style * examples/variant.yy: Prefer vector to list. Remove useless inline. 2018-05-12 Akim Demaille <akim.demaille@gmail.com> Avoid compiler warnings At least GCC 7.3, with -O1 or -O2 (but not -O0 or -O3) generates warnings with -Wnull-dereference when using yyformat: it fails to see yyformat cannot be null. Reported by Frank Heckenbach, https://savannah.gnu.org/patch/?9620. * configure.ac: Use -Wnull-dereference if supported. * data/glr.c, data/lalr1.cc, data/yacc.c: Define yyformat in such a way that GCC cannot not see that yyformat is defined. Using `default: abort();` also addresses the issue, but forces the inclusion of `stdlib.h`, which we avoid. 2018-05-10 Akim Demaille <akim.demaille@gmail.com> C++: fix uses of `inline` Sometimes `inline` would be used in *.cc files on symbols that are not exported (useless but harmless), and sometimes on exported symbols such as the constructor of syntax_error (harmful: linking fails). Reported several times, including: - by Dennis T http://lists.gnu.org/archive/html/bug-bison/2016-03/msg00002.html - by Frank Heckenbach https://savannah.gnu.org/patch/?9616 * data/c++.m4 (b4_inline): New: expands to `inline` or nothing. Use it where appropriate. * data/lalr1.cc: Use it where appropriate. * tests/c++.at (Syntax error as exception): Put the scanner in another compilation unit to exercise the constructor of syntax_error. 2018-05-10 Akim Demaille <akim.demaille@gmail.com> C++: remove useless `inline` in CC files * data/glr.cc, data/lalr1.cc: Remove `inline` from implementations that are not in headers. 2018-05-10 Akim Demaille <akim.demaille@gmail.com> C++: remove useless `inline` on templates Templates are implicitly `inline`. * data/c++.m4, data/lalr1.cc: Remove `inline` from templates. 2018-05-08 Akim Demaille <akim.demaille@gmail.com> style: don't use std::endl * data/lalr1.cc, doc/bison.texi, etc/bench.pl.in, examples/variant.yy, * tests/actions.at, tests/atlocal.in, tests/c++.at, tests/headers.at, * tests/local.at, tests/types.at: Don't use std::endl, it flushes uselessly, and is considered bad style. 2018-05-08 Akim Demaille <akim.demaille@gmail.com> doc: wrap * README-hacking: Refill paragraphs. 2018-05-08 Akim Demaille <akim.demaille@gmail.com> gnulib: update * README-hacking: Commit before bootstrapping. * bootstrap.conf: gnulib_mk is no longer defined by bootstrap. * bootstrap, gnulib, lib/.gitignore, m4/.gitignore: Update/regen. 2018-05-08 Akim Demaille <akim.demaille@gmail.com> tests: we might need to find gnulib headers 315. calc.at:596: testing Calculator ... ++ cat ++ test x = x1 ++ set +x bison/tests/calc.at:596: bison -fno-caret -o calc.c calc.y ++ bison -fno-caret -o calc.c calc.y ++ set +x bison/tests/calc.at:596: $BISON_C_WORKS stderr: stdout: ++ set +x bison/tests/calc.at:596: $CC $CFLAGS $CPPFLAGS $LDFLAGS -o calc calc.c $LIBS ++ ccache clang-mp-6.0 -Qunused-arguments -O3 -g -Wall -Wextra -Wno-sign-compare -Wcast-align -Wdocumentation -Wformat -Wpointer-arith -Wwrite-strings -Wbad-function-cast -Wshadow -Wstrict-prototypes -Wmissing-declarations -Wmissing-prototypes -Wmissing-declarations -Wmissing-prototypes -Wundef -pedantic -Wsign-compare -fno-color-diagnostics -Wno-keyword-macro -Werror -Ibison/_build/6s/lib -DNDEBUG -isystem /opt/local/include -I/opt/local/include -L/opt/local/lib -o calc calc.c bison/_build/6s/lib/libbison.a -lintl -Wl,-framework -Wl,CoreFoundation stderr: In file included from calc.y:198: bison/_build/6s/lib/unistd.h:592:11: fatal error: 'getopt-pfx-core.h' file not found # include <getopt-pfx-core.h> ^~~~~~~~~~~~~~~~~~~ 1 error generated. stdout: bison/tests/calc.at:596: exit code was 1, expected 0 315. calc.at:596: 315. Calculator (calc.at:596): FAILED (calc.at:596) * tests/atlocal.in (CPPFLAGS): Find gnulib's headers. 2018-05-08 Akim Demaille <akim.demaille@gmail.com> getargs: rename argument to avoid gnulib's renaming With Clang 6.0: CC src/bison-getargs.o bison/src/getargs.c:67:12: error: parameter 'option' not found in the function declaration [-Werror,-Wdocumentation] * \param option option being decoded. ^~~~~~ bison/src/getargs.c:67:12: note: did you mean 'rpl_option'? * src/getargs.c: Don't use `option` as a documentation argument. 2017-09-22 Paul Eggert <eggert@cs.ucla.edu> Capitalize "Polish" when it's a proper adjective 2017-09-17 Paul Eggert <eggert@cs.ucla.edu> Adjust to recent Gnulib changes 2017-09-17 Paul Eggert <eggert@cs.ucla.edu> autoconf: update 2017-09-17 Paul Eggert <eggert@cs.ucla.edu> gnulib: update 2015-08-12 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2015-08-12 Akim Demaille <akim@lrde.epita.fr> lalr1, yacc: use the default location as initial error location Currently lalr1.cc makes an out-of-bound access when trying to read @1 in rules with an empty rhs (i.e., when there is no @1) that raises an error (YYERROR). glr.c already gracefully handles this by using @$ as initial location for the errors. Let's do that in yacc.c and lalr1.cc. * data/lalr1.cc, data/yacc.c: Use @$ to initialize the error location. * tests/actions.at: Check that case. 2015-08-12 Akim Demaille <akim@lrde.epita.fr> style: formatting and comment changes * data/glr.c: Avoid empty lines. * data/lalr1.cc: Use the same comments as in glr.c and yacc.c. 2015-08-12 Akim Demaille <akim@lrde.epita.fr> c++: style: use "unsigned", not "unsigned int" This style appears to be more traditional, at least in C++. For instance in the standard, [facets.examples]. There are occurrences using "unsigned int" too though. * data/lalr1.cc, data/location.cc, data/stack.hh: here. 2015-08-12 Akim Demaille <akim@lrde.epita.fr> c++: style: remove useless "inline" and fix space issues * data/lalr1.cc, data/c++.m4: Formatting changes. * data/stack.hh: Remove useless "inline". Add documentation. * data/location.cc: Prefer {} for empty bodies. 2015-08-12 Akim Demaille <akim@lrde.epita.fr> tests: beware of additional warnings from GCC 5 * tests/synclines.at (AT_SYNCLINES_COMPILE): Avoid warnings about unused functions. 2015-08-12 Akim Demaille <akim@lrde.epita.fr> tests: beware that clang warns about "#define private public" We use this trick to write some test about internal details. But since we use -Werror, clang++ 3.6 dies issueing a warning about it. * configure.ac (warn_tests): Disable this warning. 2015-08-12 Akim Demaille <akim@lrde.epita.fr> tests: update our Valgrind suppression files * build-aux/linux-gnu.valgrind, build-aux/darwin11.4.0.valgrind: Rename as... * build-aux/Linux.valgrind, build-aux/Darwin.valgrind: these. * build-aux/Linux.valgrind: Add suppression clause. * configure.ac: Update. * tests/local.mk: Use it. 2015-03-03 Akim Demaille <akim@lrde.epita.fr> doc: improve html and pdf rendering * doc/bison.texi: Help html conversion to understand where the function names end. Beware of PDF width. 2015-03-03 Akim Demaille <akim@lrde.epita.fr> doc: fixes in the C++ part Reported by Askar Safin. http://lists.gnu.org/archive/html/bug-bison/2015-02/msg00018.html http://lists.gnu.org/archive/html/bug-bison/2015-02/msg00019.html * doc/bison.texi (Split Symbols): Fix access to token types. yylval is a pointer, so use ->. Fix coding style issues: space before paren. 2015-02-10 Akim Demaille <akim@lrde.epita.fr> tests: be robust to platforms that support UTF-8 even with LC_ALL=C Because musl supports UTF-8 with LC_ALL=C, gcc produces: input.y: In function ‘yyparse’: instead of: input.y: In function 'yyparse': Reported by Ferdinand Thiessen. http://lists.gnu.org/archive/html/bug-bison/2015-02/msg00001.html * tests/synclines.at (AT_SYNCLINES_COMPILE): Skip syncline tests when we can't trust error messages issued about a function body. 2015-02-10 Akim Demaille <akim@lrde.epita.fr> tests: java: avoid recent Java features Tests 463 and 464 fail with Java 1.4 compilers. Reported by Michael Felt. <http://lists.gnu.org/archive/html/bug-bison/2015-01/msg00091.html> * tests/javapush.at: Use StringBuffer instead of StringBuilder. 2015-01-26 Akim Demaille <akim@lrde.epita.fr> tests: c++: fix symbol lookup issue Sun C 5.13 SunOS_sparc 2014/10/20 reports errors on tests 430-432. Reported by Dennis Clarke. <http://lists.gnu.org/archive/html/bug-bison/2015-01/msg00087.html> * tests/c++.at (Variants): Be sure to emit operator<< before using it: use "%code top" rather than "%code". Prefer std::vector to std::list. Do not define anything in std::, to avoid undefined behavior. 2015-01-23 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: maint: post-release administrivia version 3.0.4 gnulib: update build: re-enable compiler warnings, and fix them tests: c++: fix a C++03 conformance issue tests: fix a title c++: reserve 200 slots in the parser's stack tests: be more robust to unrecognized synclines, and try to recognize xlc tests: fix C++ conformance build: fix some warnings build: avoid infinite recursions on include_next 2015-01-23 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2015-01-23 Akim Demaille <akim@lrde.epita.fr> version 3.0.4 * NEWS: Record release date. 2015-01-23 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2015-01-23 Akim Demaille <akim@lrde.epita.fr> build: re-enable compiler warnings, and fix them There are warnings (-Wextra) in generated C++ code: ltlparse.cc: In member function 'ltlyy::parser::symbol_number_type ltlyy::parser::by_state::type_get() const': ltlparse.cc:452:33: warning: enumeral and non-enumeral type in conditional expression return state == empty_state ? empty_symbol : yystos_[state]; Reported by Alexandre Duret-Lutz. It turns out that -Wall and -Wextra were disabled because of a stupid typo. * configure.ac: Fix the stupid typo. * data/lalr1.cc, src/AnnotationList.c, src/InadequacyList.c, * src/ielr.c, src/print.c, src/scan-code.l, src/symlist.c, * src/symlist.h, src/symtab.c, src/tables.c, tests/actions.at, * tests/calc.at, tests/cxx-type.at, tests/glr-regression.at, * tests/named-refs.at, tests/torture.at: Fix warnings, mostly issues about variables used only with assertions, which are disabled with -DNDEBUG. 2015-01-22 Akim Demaille <akim@lrde.epita.fr> tests: c++: fix a C++03 conformance issue This fixes test 241 on xLC: "input.y", line 42.11: 1540-0274 (S) The name lookup for "report" did not find a declaration. "input.y", line 42.11: 1540-1292 (I) Static declarations are not considered for a function call if the function is not qualified. where report is: static void report (std::ostream& yyo, int ival, float fval) { yyo << "ival: " << ival << ", fval: " << fval; } and line 42 is: %printer { report (yyo, $$, $<fval>$); } <ival>; It turns out that indeed this function must not be declared static, <http://stackoverflow.com/a/17662745/1353549>. Let's put it into an anonymous namespace. Reported by Thomas Jahns. http://lists.gnu.org/archive/html/bug-bison/2015-01/msg00059.html * tests/actions.at (Qualified $$ in actions): Don't use "static", prefer anonymous namespace. 2015-01-20 Akim Demaille <akim@lrde.epita.fr> tests: fix a title * tests/conflicts.at: De-overquote. 2015-01-20 Akim Demaille <akim@lrde.epita.fr> c++: reserve 200 slots in the parser's stack This is consistent with what is done with yacc.c and glr.c. Because it also avoids that the stack needs to be resized very soon, it should help keeping tests about destructors more reliable. Indeed, if the stack is created too small, very soon the C++ library needs to enlarge it, which means creating a new one, copying the elements from the initial one onto it, and then destroy the elements of the initial stack: that would be a spurious call to a destructor. Reported by Thomas Jahns. http://lists.gnu.org/archive/html/bug-bison/2015-01/msg00059.html * data/stack.hh (stack::stack): Reserve 200 slots. * tests/c++.at: Remove traces of stack expansions. 2015-01-20 Akim Demaille <akim@lrde.epita.fr> tests: be more robust to unrecognized synclines, and try to recognize xlc Reported by Thomas Jahns. http://lists.gnu.org/archive/html/bug-bison/2015-01/msg00059.html * tests/synclines.at (AT_SYNCLINES_COMPILE): Rename as... (_AT_SYNCLINES_COMPILE): this. Try to recognize xlc locations. (AT_SYNCLINES_COMPILE): New. Skips the test if we can't read the synclines. 2015-01-20 Akim Demaille <akim@lrde.epita.fr> tests: fix C++ conformance Reported by Thomas Jahns. http://lists.gnu.org/archive/html/bug-bison/2015-01/msg00059.html * tests/c++.at (Exception safety): Add missing include. Don't use const_iterator for erase. 2015-01-18 Akim Demaille <akim@lrde.epita.fr> build: fix some warnings Reported by John Horigan. http://lists.gnu.org/archive/html/bug-bison/2015-01/msg00034.html * src/graphviz.c, src/symtab.h: Address compiler warnings. 2015-01-16 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' into origin/master * origin/maint: doc: minor fixes gnulib: strtoul is considered obsolete and now useless c++: avoid warnings when destructors don't use $$ maint: post-release administrivia version 3.0.3 gnulib: update 2015-01-16 Akim Demaille <akim@lrde.epita.fr> build: avoid infinite recursions on include_next On MacOS X 10.5 PPC with Apple's GCC 4.0.1: % uname -a Darwin aria.cielonegro.org 9.8.0 Darwin Kernel Version 9.8.0: Wed Jul 15 16:57:0 1 PDT 2009; root:xnu-1228.15.4~1/RELEASE_PPC Power Macintosh % gcc --version powerpc-apple-darwin9-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5493) Copyright (C) 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. building in place enters into an infinite recursion on "#include_next": % gmake V=1 [snip] depbase=`echo lib/math.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\ gcc -std=gnu99 -I. -Ilib -I. -I./lib -g -O2 -MT lib/math.o -MD -MP -MF $depbase.Tpo -c -o lib/math.o lib/math.c &&\ mv -f $depbase.Tpo $depbase.Po In file included from lib/math.h:27, from lib/math.h:27, from lib/math.h:27, from lib/math.h:27, [snip] from lib/math.h:27, from lib/math.h:27, from lib/math.c:3: lib/math.h:27:23: error: #include nested too deeply Makefile:3414: recipe for target 'lib/math.o' failed gmake[2]: *** [lib/math.o] Error 1 Using -I./lib instead of -Ilib fixes the problem. Reported by Pho. <https://lists.gnu.org/archive/html/bison-patches/2014-01/msg00000.html> * Makefile.am (AM_CPPFLAGS): Use -I./lib instead of -Ilib. 2015-01-16 Akim Demaille <akim@lrde.epita.fr> doc: minor fixes * doc/bison.texi: Fix warnings about colon in reference names. * data/bison.m4, src/files.h: Fix comments. * doc/Doxyfile.in: update. 2015-01-15 Akim Demaille <akim@lrde.epita.fr> gnulib: strtoul is considered obsolete and now useless * bootstrap.conf: here. 2015-01-15 Akim Demaille <akim@lrde.epita.fr> c++: avoid warnings when destructors don't use $$ * data/c++.m4: here. 2015-01-15 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2015-01-15 Akim Demaille <akim@lrde.epita.fr> version 3.0.3 * NEWS: Record release date. 2015-01-15 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2015-01-14 Akim Demaille <akim@lrde.epita.fr> symbol: use the first occurrence as an LHS as defining location Currently on the following grammar: %type <foo> foo %% start: foo | bar | "baz" foo: foo bar: bar bison reports: warning: 2 nonterminals useless in grammar [-Wother] warning: 4 rules useless in grammar [-Wother] 1.13-15: warning: nonterminal useless in grammar: foo [-Wother] %type <foo> foo ^^^ 3.14-16: warning: nonterminal useless in grammar: bar [-Wother] start: foo | bar | "baz" ^^^ [...] i.e., the location of the first occurrence of a symbol is taken as its definition point. In the case of nonterminals, the first occurrence as a left-hand side of a rule makes more sense: warning: 2 nonterminals useless in grammar [-Wother] warning: 4 rules useless in grammar [-Wother] 4.1-3: warning: nonterminal useless in grammar: foo [-Wother] foo: foo ^^^ 5.1-3: warning: nonterminal useless in grammar: bar [-Wother] bar: bar ^^^ [...] * src/symtab.h, src/symtab.c (symbol::location_of_lhs): New. (symbol_location_as_lhs_set): New. * src/parse-gram.y (current_lhs): Use it. * tests/reduce.at: Update locations. 2015-01-14 Akim Demaille <akim@lrde.epita.fr> reduce: don't complain about rules whose lhs is useless In the following grammar, the 'exp' nonterminal is trivially useless. So, of course, its rules are useless too. %% input: '0' | exp exp: exp '+' exp | exp '-' exp | '(' exp ')' Previously all the useless rules were reported, including those whose left-hand side is the 'exp' nonterminal: warning: 1 nonterminal useless in grammar [-Wother] warning: 4 rules useless in grammar [-Wother] 2.14-16: warning: nonterminal useless in grammar: exp [-Wother] input: '0' | exp ^^^ 2.14-16: warning: rule useless in grammar [-Wother] input: '0' | exp ^^^ ! 3.6-16: warning: rule useless in grammar [-Wother] ! exp: exp '+' exp | exp '-' exp | '(' exp ')' ! ^^^^^^^^^^^ ! 3.20-30: warning: rule useless in grammar [-Wother] ! exp: exp '+' exp | exp '-' exp | '(' exp ')' ! ^^^^^^^^^^^ ! 3.34-44: warning: rule useless in grammar [-Wother] ! exp: exp '+' exp | exp '-' exp | '(' exp ')' ! ^^^^^^^^^^^ The interest of being so verbose is dubious. I suspect most of the time nonterminals are not expected to be useless, so the user wants to fix the nonterminal, not remove its rules. And even if the user wanted to get rid of its rules, the position of these rules probably does not help more that just having the name of the nonterminal. This commit discard these messages, marked with '!', and keep the others. In particular, we still report: 2.14-16: warning: rule useless in grammar [-Wother] input: '0' | exp ^^^ All the useless rules (including the '!' ones) are still reported in the reports (xml, text, etc.); only the diagnostics on stderr change. * src/gram.c (grammar_rules_useless_report): Don't complain about useless rules whose lhs is useless. * src/reduce.h, src/reduce.c (reduce_nonterminal_useless_in_grammar): Take a sym_content as argument. Adjust callers. * tests/reduce.at (Useless Rules, Underivable Rules, Reduced Automaton): Adjust. 2015-01-14 Akim Demaille <akim@lrde.epita.fr> style: reduce: use unsigned to count a number of objects * src/reduce.h, src/reduce.c (nuseful_productions, nuseless_productions) (nuseful_nonterminals, nuseless_nonterminals): Declare as unsigned. Simplify "0 <" tests into non-zero tests. 2015-01-14 Akim Demaille <akim@lrde.epita.fr> style: reduce: introduce and use a swap for bitset * src/reduce.c (bitset_swap): New. Use it. 2015-01-14 Akim Demaille <akim@lrde.epita.fr> style: reduce: reduce scopes and other stylistic changes * src/reduce.c: Various stylistic changes: Reduce scopes. Prefer ++i to i++. Prefer < to >. 2015-01-13 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: tests: split a large test case into several smaller ones package: a bit of trouble shooting indications doc: liby's main arms the internationalization bison: avoid warnings from static code analysis c++: fix the use of destructors when variants are enabled style: tests: simplify the handling of some C++ tests c++: symbols can be empty, so use it c++: variants: don't leak the lookahead in error recovery c++: provide a means to clear symbols c++: clean up the handling of empty symbols c++: comment and style changes c++: variants: comparing addresses of typeid.name() is undefined c++: locations: complete the API and fix comments build: do not clean figure sources in make clean 2015-01-13 Akim Demaille <akim@lrde.epita.fr> tests: split a large test case into several smaller ones * tests/conflicts.at (AT_CONSISTENT_ERRORS_CHECK): Move AT_SETUP/AT_CLEANUP into it, so that we don't skip non Java tests following a test case in Java. 2015-01-12 Akim Demaille <akim@lrde.epita.fr> package: a bit of trouble shooting indications * README-hacking: here. 2015-01-12 Akim Demaille <akim@lrde.epita.fr> doc: liby's main arms the internationalization Reported by Nicolas Bedon. <https://lists.gnu.org/archive/html/bug-bison/2014-11/msg00005.html> * doc/bison.texi (Yacc Library): Document the call the setlocale. 2015-01-09 Akim Demaille <akim@lrde.epita.fr> bison: avoid warnings from static code analysis A static analysis tool reports that some callers of symbol_list_n_get might get NULL and not handle it properly. This is not the case, yet we can suppress this pattern. Reported by Mike Sullivan. <https://lists.gnu.org/archive/html/bug-bison/2013-12/msg00027.html> * src/symlist.c (symbol_list_n_get): Actually it is never called to return 0. Enforce this postcondition via aver. (symbol_list_n_type_name_get): Simplify accordingly. In particular, discards a (translated) useless error message. * src/symlist.h: Adjust documentation. * src/scan-code.l: Style change. 2015-01-09 Akim Demaille <akim@lrde.epita.fr> c++: fix the use of destructors when variants are enabled When using variants, destructors generate invalid code. <http://lists.gnu.org/archive/html/bug-bison/2014-09/msg00005.html> Reported by Michael Catanzaro. * data/c++.m4 (~basic_symbol): b4_symbol_foreach works on yysym: define it. * tests/c++.at (Variants): Check it. 2015-01-08 Akim Demaille <akim@lrde.epita.fr> style: tests: simplify the handling of some C++ tests * tests/c++.at: here. (Doxygen): Pass %define, so that files such as position.hh etc. are generated, instead of putting everything into input.hh. 2015-01-08 Akim Demaille <akim@lrde.epita.fr> c++: symbols can be empty, so use it The previous patches ensure that symbols (symbol_type and stack_symbol_type) can be empty, cleared, and their emptiness can be checked. Therefore, yyempty, which codes whether yyla is empty or not, is now useless. In C skeletons (e.g., yacc.c), the fact that the lookahead is empty is coded by "yychar = YYEMPTY", which is exactly what this patch restores, since yychar/yytoken corresponds to yyla.type. * data/lalr1.cc (yyempty): Remove. Rather, depend on yyla.empty (). 2015-01-08 Akim Demaille <akim@lrde.epita.fr> c++: variants: don't leak the lookahead in error recovery During error recovery, when discarding the lookeahead, we don't destroy it, which is caught by parse.assert assertions. Reported by Antonio Silva Correia. With an analysis and suggested patch from Michel d'Hooge. <http://savannah.gnu.org/support/?108481> * tests/c++.at (Variants): Strengthen the test to try syntax errors with discarded lookahead. 2015-01-08 Akim Demaille <akim@lrde.epita.fr> c++: provide a means to clear symbols The symbol destructor is currently the only means to clear a symbol. Unfortunately during error recovery we might have to clear the lookahead, which is a local variable (yyla) that has not yet reached its end of scope. Rather that duplicating the code to destroy a symbol, or rather than destroying and recreating yyla, let's provide a means to clear a symbol. Reported by Antonio Silva Correia, with an analysis from Michel d'Hooge. <http://savannah.gnu.org/support/?108481> * data/c++.m4, data/lalr1.cc (basis_symbol::clear, by_state::clear) (by_type::clear): New. (basic_symbol::~basic_symbol): Use clear. 2015-01-08 Akim Demaille <akim@lrde.epita.fr> c++: clean up the handling of empty symbols * data/c++.m4, data/lalr1.cc (yyempty_): Remove, replaced by... (empty_symbol, by_state::empty_state): these. (basic_symbol::empty): New. 2015-01-08 Akim Demaille <akim@lrde.epita.fr> c++: comment and style changes * data/c++.m4, data/lalr1.cc: More documentation. Tidy. * tests/c++.at (string_cast): Rename as... (to_string): this C++11 name. 2015-01-07 Akim Demaille <akim@lrde.epita.fr> c++: variants: comparing addresses of typeid.name() is undefined Instead of storing and comparing pointers to names of types, store pointers to the typeids, and compares the typeids. Reported by Thomas Jahns. <http://lists.gnu.org/archive/html/bug-bison/2014-03/msg00001.html> * data/variant.hh (yytname_): Replace with... (yytypeid_): this. 2015-01-05 Akim Demaille <akim@lrde.epita.fr> c++: locations: complete the API and fix comments There are no support for += between locations, and some comments are wrong. Reported by Alexandre Duret-Lutz. * data/location.cc: Fix. * doc/bison.texi: Document. * tests/c++.at: Check. 2015-01-05 Akim Demaille <akim@lrde.epita.fr> build: do not clean figure sources in make clean "make clean && make" fails in in-tree builds. * doc/local.mk (CLEANDIRS): Replace with... (CLEANFILES): this safer list of files to clean. 2015-01-05 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: build: don't try to generate docs when cross-compiling package: fix a reporter's name %union: fix the support for named %union package: bump to 2015 flex: don't trust YY_USER_INIT yacc.c: fix broken union when api.value.type=union and %defines are used doc: fix missing xref gnulib: update location: remove some ugly debugging code traces build: use abort to pacify compiler errors package: bump to 2014 doc: specify documentation encoding 2015-01-05 Akim Demaille <akim@lrde.epita.fr> build: don't try to generate docs when cross-compiling When cross-compiling don't run the generated bison to update the docs. Reported by Aaro Koskinen. <http://lists.gnu.org/archive/html/bison-patches/2014-03/msg00000.html> * configure.ac (CROSS_COMPILING): New. * doc/local.mk: Use it. 2015-01-04 Akim Demaille <akim@lrde.epita.fr> package: fix a reporter's name * THANKS, build-aux/git-log-fix: s/Bernd Edligner/Bernd Edlinger/. 2015-01-04 Akim Demaille <akim@lrde.epita.fr> %union: fix the support for named %union Bison supports a union tag, for obscure reasons. But it does a poor job at it, especially since Bison 3.0. Reported by Stephen Cameron and Tobias Frost. It did not ensure that the name was not given several times. An easy way to do this is to make the %union tag be handled as a %define variable, as they cannot be defined several times. Since Bison 3.0, the synclines were wrongly placed, resulting in invalid code. Addressing this issue, because of the way the union tag was stored (as a code muscle), would have been tedious. Unless we rather define the %union tag as a %percent variable, whose synclines are easier to manipulate. So replace the b4_union_name muscle by the api.value.union.name %define variable, document, and check. * data/bison.m4: Make sure that api.value.union.name has a keyword value. * data/c++.m4: Make sure that api.value.union.name is not defined. * data/c.m4 (b4_union_name): No longer use it, use api.value.union.name. * doc/bison.texi (%define Summary): Document it. * src/parse-gram.y (union_name): No longer define b4_uion_name, but api.value.union.name. * tests/input.at (Redefined %union name): New. * tests/synclines.at (%union name syncline): New. * tests/types.at: Check named %unions. 2015-01-04 Akim Demaille <akim@lrde.epita.fr> package: bump to 2015 Which also requires: * gnulib: Update. 2014-12-31 Akim Demaille <akim@lrde.epita.fr> flex: don't trust YY_USER_INIT Reported by Bernd Edlinger and others. * src/scan-gram.l: here. 2014-12-31 Akim Demaille <akim@lrde.epita.fr> yacc.c: fix broken union when api.value.type=union and %defines are used Reported by Rich Wilson. * data/c.m4 (b4_symbol_type_register): Append to b4_union_members, not b4_user_union_members. The latter invokes the former, but it is the former which is reinitialized to empty by b4_value_type_setup_union. * tests/types.at: Check it. This reveals another bug, this time in the case of glr.c parsers. * data/glr.c: Generate the header file before the implementation file, to be sure that the setup is run before what depends on it. 2014-12-31 Akim Demaille <akim@lrde.epita.fr> doc: fix missing xref Reported by xolodho. * doc/bison.texi (Printer Decl): here. 2014-12-29 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2014-02-03 Akim Demaille <akim@lrde.epita.fr> location: remove some ugly debugging code traces * data/location.cc: here. 2014-02-03 Akim Demaille <akim@lrde.epita.fr> build: use abort to pacify compiler errors clang, with -DNDEBUG and -Werror fails on some functions that might lack a return. This is because aver is just another assert, discarded with -DNDEBUG. So use abort. * src/muscle-tab.c, src/scan-skel.l: here. 2014-02-03 Akim Demaille <akim@lrde.epita.fr> package: bump to 2014 * AUTHORS, ChangeLog-2012, Makefile.am, NEWS, PACKAGING, README, * README-alpha, README-hacking, THANKS, TODO, bootstrap.conf, * build-aux/darwin11.4.0.valgrind, build-aux/local.mk, * build-aux/update-b4-copyright, * build-aux/update-package-copyright-year, cfg.mk, configure.ac, * data/README, data/bison.m4, data/c++-skel.m4, data/c++.m4, * data/c-like.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/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/local.mk, djgpp/subpipe.c, djgpp/subpipe.h, * djgpp/testsuite.sed, doc/bison.texi, doc/local.mk, doc/refcard.tex, * etc/README, etc/bench.pl.in, etc/local.mk, * examples/calc++/calc++.test, examples/calc++/local.mk, * examples/extexi, examples/local.mk, examples/mfcalc/local.mk, * examples/mfcalc/mfcalc.test, examples/rpcalc/local.mk, * examples/rpcalc/rpcalc.test, examples/test, examples/variant.yy, * 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/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/flex.m4, * m4/timevar.m4, src/AnnotationList.c, src/AnnotationList.h, * src/InadequacyList.c, src/InadequacyList.h, src/LR0.c, src/LR0.h, * src/Sbitset.c, src/Sbitset.h, src/assoc.c, src/assoc.h, * src/closure.c, src/closure.h, src/complain.c, src/complain.h, * src/conflicts.c, src/conflicts.h, 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/graphviz.h, src/ielr.c, 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, src/output.c, * src/output.h, src/parse-gram.c, src/parse-gram.y, src/print-xml.c, * src/print-xml.h, src/print.c, src/print.h, src/print_graph.c, * src/print_graph.h, src/reader.c, src/reader.h, src/reduce.c, * src/reduce.h, src/relation.c, src/relation.h, src/scan-code.h, * src/scan-code.l, src/scan-gram.h, src/scan-gram.l, src/scan-skel.h, * src/scan-skel.l, src/state.c, src/state.h, src/symlist.c, * src/symlist.h, src/symtab.c, src/symtab.h, src/system.h, * src/tables.c, src/tables.h, src/uniqstr.c, src/uniqstr.h, * tests/actions.at, tests/atlocal.in, tests/bison.in, tests/c++.at, * 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/javapush.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, tests/types.at: here. 2014-01-03 Paul Eggert <eggert@cs.ucla.edu> doc: specify documentation encoding * doc/bison.texi: Add '@documentencoding UTF-8'; needed since the manual contains UTF-8 characters. This will cause the .info files to contain UTF-8 quotes and the like, which should be OK nowadays. Add @documentlanguage while we're at it. 2013-12-10 Akim Demaille <akim@lrde.epita.fr> symbols: properly fuse the properties of two symbol aliases This completes and fixes a7280757105b2909f6a58fdd1c582de8e278319a. Reported by Valentin Tolmer. Before it Bison used to put the properties of the symbols (associativity, printer, etc.) in the 'symbol' structure. An identifier-named token (FOO) and its string-named alias ("foo") duplicated these properties, and symbol_check_alias_consistency() checked that both had compatible properties and fused them, at the end of the parsing of the grammar. The commit a7280757105b2909f6a58fdd1c582de8e278319a introduces a sym_content structure that keeps all these properties, and ensures that both aliases point to the same sym_content (instead of duplicating). However, it removed symbol_check_alias_consistency, which resulted in the non-fusion of *existing* properties: %token FOO "foo" %left FOO %left "foo" was properly diagnosed as a redeclaration, but %left FOO %left "foo" %token FOO "foo" was not, as the properties of FOO and "foo" were not checked before fusion. It certainly also means that %left "foo" %token FOO "foo" did not transfer properly the associativity to FOO. The fix is simple: reintroduce symbol_check_alias_consistency (under a better name, symbol_merge_properties) and call it where appropriate. Also, that commit made USER_NUMBER_HAS_STRING_ALIAS useless, but left it. * src/symtab.h (USER_NUMBER_HAS_STRING_ALIAS): Remove, unused. Adjust dependencies. * src/symtab.c (symbol_merge_properties): New, based on the former symbol_check_alias_consistency. * tests/input.at: Re-enable tests that we now pass. 2013-12-10 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: package: install the examples package: install README and the like in docdir diagnostics: fix the order of multiple declarations reports symbol: provide an easy means to compare them in source order 2013-12-09 Akim Demaille <akim@lrde.epita.fr> package: install the examples Currently, we do not install the various examples extracted from the documentation. Let's do it, as they are useful starting points. * configure.ac: When --enable-gcc-warnings is set, enable ENABLE_GCC_WARNINGS. * examples/extexi: No longer issue synclines by default. * examples/local.mk: Except if ENABLE_GCC_WARNINGS. * examples/calc++/local.mk, examples/mfcalc/local.mk, * examples/rpcalc/local.mk: Install the example files. 2013-12-09 Akim Demaille <akim@lrde.epita.fr> package: install README and the like in docdir * Makefile.am: here. 2013-12-09 Akim Demaille <akim@lrde.epita.fr> diagnostics: fix the order of multiple declarations reports On %token FOO "foo" %printer {} "foo" %printer {} FOO we report /tmp/foo.yy:2.10-11: error: %printer redeclaration for FOO %printer {} "foo" ^^ /tmp/foo.yy:3.10-11: previous declaration %printer {} FOO ^^ * src/symtab.c (locations_sort): New. Use it. * tests/input.at (Invalid Aliases): Stress the order of diagnostics. 2013-12-09 Akim Demaille <akim@lrde.epita.fr> symbol: provide an easy means to compare them in source order * src/symtab.c (symbols_sort): New. (user_token_number_redeclaration): Taken from here. 2013-12-09 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: (43 commits) maint: post-release administrivia version 3.0.2 gnulib: update output: do not generate source files when late errors are caught output: record what generated files are source or report files output: do not generate source files when early errors are caught xml: also use "%empty" with html output style: formatting changes xml: also display %empty for empty right-hand sides reports: display %empty in the generated pointed-rules news: YYERROR vs variants style: scope reduction in lalr.cc lalr1.cc: formatting changes lalr1.cc: fix the support of YYERROR with variants tests: check $$'s destruction with variant, YYERROR, and no error recovery tests: simplify useless obfuscation skeletons: use better names when computing a "goto" maint: post-release administrivia version 3.0.1 aver: it is no longer "protected against NDEBUG" ... 2013-12-05 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2013-12-05 Akim Demaille <akim@lrde.epita.fr> version 3.0.2 * NEWS: Record release date. 2013-12-05 Akim Demaille <akim@lrde.epita.fr> gnulib: update * gnulib: here. 2013-12-04 Akim Demaille <akim@lrde.epita.fr> output: do not generate source files when late errors are caught Reported by Alexandre Duret-Lutz as "second problem" in: http://lists.gnu.org/archive/html/bug-bison/2013-09/msg00015.html * bootstrap.conf: We need the "unlink" module. * src/files.h, src/files.c (unlink_generated_sources): New. * src/output.c: Use it. * tests/output.at: Check the case of late errors. 2013-12-04 Akim Demaille <akim@lrde.epita.fr> output: record what generated files are source or report files * src/files.h, src/files.c (output_file_name_check): Take an additional argument to record whether a file is a source or report file. * src/files.c (generated_file): New. (file_names, file_names_count): Replace with... (generated_files, generated_files_size): these. * src/scan-skel.l: Adjust. 2013-12-04 Akim Demaille <akim@lrde.epita.fr> output: do not generate source files when early errors are caught Reported by Alexandre Duret-Lutz as "second problem" in: http://lists.gnu.org/archive/html/bug-bison/2013-09/msg00015.html One problem is that some errors are caught early, before the generation of output files, while others can only be detected afterwards (since, for instance, skeletons can raise errors themselves). This will be addressed in two steps: early errors do not generate source files at all, while later errors will remove the files that have already been generated. * src/scan-skel.l (yyout): Open to /dev/null when there are errors. * tests/output.at (AT_CHECK_FILES): Factored out of... (AT_CHECK_OUTPUT): this. Fuse the "SHELLIO" argument in the "FLAGS" one. Use $5 to denote the expected exit status. Add a test case for early errors. 2013-11-26 Akim Demaille <akim@lrde.epita.fr> xml: also use "%empty" with html output * data/xslt/xml2xhtml.xsl: No longer issue an Epsilon, display as in dot and text formats. 2013-11-26 Akim Demaille <akim@lrde.epita.fr> style: formatting changes * src/print-xml.c: here. 2013-11-26 Akim Demaille <akim@lrde.epita.fr> xml: also display %empty for empty right-hand sides * data/xslt/xml2dot.xsl, data/xslt/xml2text.xsl: Display %empty where needed. 2013-11-26 Akim Demaille <akim@lrde.epita.fr> reports: display %empty in the generated pointed-rules * src/print.c (print_core): Use %empty for empty rules. * src/print_graph.c (print_core): Ditto. * tests/conflicts.at, tests/output.at, tests/reduce.at: Adjust expectations. 2013-11-26 Akim Demaille <akim@lrde.epita.fr> news: YYERROR vs variants 2013-11-18 Akim Demaille <akim@lrde.epita.fr> style: scope reduction in lalr.cc * src/lalr.c: Shorten variable scopes. (lookahead_tokens_print): Use the same variable name in two loops iterating over the same structure. 2013-11-15 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: formatting changes * data/lalr1.cc: Fix indentation. 2013-11-15 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: fix the support of YYERROR with variants When variant are enabled, the yylhs variable (the left-hand side of the rule being reduced, i.e. $$ and @$) is explicitly destroyed when YYERROR is called. This is because before running the user code, $$ is initialized, so that the user can properly use it. However, when quitting yyparse, yylhs is also reclaimed by the C++ compiler: the variable goes out of scope. Instead of trying to be too smart, let the compiler do its job: reduce the scope of yylhs to exactly the reduction. This way, whatever the type of scope exit (regular, exception, return, goto...) this variable will be properly reclaimed. Reported by Paolo Simone Gasparello. <http://lists.gnu.org/archive/html/bug-bison/2013-10/msg00003.html> * data/lalr1.cc (yyparse): Reduce the scope of yylhs. * tests/c++.at: We now pass this test. 2013-11-15 Akim Demaille <akim@lrde.epita.fr> tests: check $$'s destruction with variant, YYERROR, and no error recovery When variant are enabled, the yylhs variable (the left-hand side of the rule being reduced, i.e. $$ and @$) is explicitly destroyed when YYERROR is called. This is because before running the user code, $$ is initialized, so that the user can properly use it. However, when quitting yyparse, yylhs is also reclaimed by the C++ compiler: the variable goes out of scope. This was not detected by the test suite because (i) the Object tracker was too weak, and (ii) the problem does not show when there is error recovery. Reported by Paolo Simone Gasparello. <http://lists.gnu.org/archive/html/bug-bison/2013-10/msg00003.html> * tests/c++.at (Exception safety): Improve the objects logger to make sure that we never destroy twice an object. Also track copy-constructors. Use a set instead of a list. Display the logs before running the function body, this is more useful in case of failure. Generalize to track with and without error recovery. 2013-11-15 Akim Demaille <akim@lrde.epita.fr> tests: simplify useless obfuscation * tests/c++.at: $$ is not special for M4, there is no need to "escape" it. 2013-11-14 Akim Demaille <akim@lrde.epita.fr> skeletons: use better names when computing a "goto" * data/glr.c (yyLRgotoState): Name the symbol argument yysym, instead of yylhs. * data/lalr1.cc (yy_lr_goto_state_): Likewise. * data/lalr1.java (yy_lr_goto_state_): New, modeled after the previous two routines. Use it. 2013-11-12 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2013-11-12 Akim Demaille <akim@lrde.epita.fr> version 3.0.1 * NEWS: Record release date. 2013-11-12 Akim Demaille <akim@lrde.epita.fr> aver: it is no longer "protected against NDEBUG" Apply the same rules for aver as for assert: no side effects, especially not important ones. * src/AnnotationList.c, src/muscle-tab.c: Adjust aver uses to resist to -DNDEBUG. 2013-11-08 Akim Demaille <akim@lrde.epita.fr> parsers: rename YY_NULL as YY_NULLPTR to avoid conflicts with Flex Flex also defines YY_NULL (to 0). Avoid gratuitous conflicts. * data/c.m4 (b4_null_define): Rename YY_NULL as YY_NULLPTR. * data/glr.c, data/lalr1.cc, data/location.cc, data/variant.hh, * data/yacc.c, src/parse-gram.c, tests/actions.at, tests/c++.at, * tests/cxx-type.at, tests/glr-regression.at, tests/headers.at, * tests/push.at, tests/regression.at: Adjust. 2013-11-05 Akim Demaille <akim@lrde.epita.fr> build: use Automake 1.14's non-recursive Makefile features * configure.ac: Require Automake 1.14. * examples/calc++/local.mk, examples/local.mk, examples/mfcalc/local.mk, * examples/rpcalc/local.mk, tests/local.mk: Use %D% and %C%. 2013-11-05 Akim Demaille <akim@lrde.epita.fr> build: restore maintainer-push-check * tests/local.mk: here. 2013-11-05 Akim Demaille <akim@lrde.epita.fr> c++: use __attribute__((__pure__)) to avoid warnings Building C++ parsers with -Wsuggest-attribute=const and -Wsuggest-attribute=noreturn triggers warning in generated code. * data/lalr1.cc: Call b4_attribute_define. (debug_stream, debug_level): Flag as pure. * tests/headers.at (Several parsers): There are now more YY macros that "leak". 2013-11-05 Akim Demaille <akim@lrde.epita.fr> skeletons: update the handling of compiler attributes * data/c.m4 (b4_attribute_define): Instead of defining __attribute__, define YY_ATTRIBUTE conditionally. (YY_ATTRIBUTE_PURE, YY_ATTRIBUTE_UNUSED, _Noreturn): New. Use them. * data/glr.c: Use them. 2013-11-05 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2013-10-24 Akim Demaille <akim@lrde.epita.fr> style: use /* ... */ comments * src/complain.c: Here. 2013-10-24 Akim Demaille <akim@lrde.epita.fr> tests: skip C++ tests that are too demanding for some compilers Some tests now fail when compiled with G++ 4.3 or 4.4 on MacPorts. * tests/local.at (AT_SKIP_IF_EXCEPTION_SUPPORT_IS_POOR): New. * tests/c++.at (Exception safety): Use it. 2013-10-22 Akim Demaille <akim@lrde.epita.fr> install: do not install yacc.1 when --disable-yacc * configure.ac (ENABLE_YACC): New conditional. (YACC_SCRIPT, YACC_LIBRARY): Remove. * lib/local.mk, src/local.mk: Use the former instead of the latter. * doc/local.mk: Use ENABLE_YACC to avoid installing yacc.1. 2013-10-22 Akim Demaille <akim@lrde.epita.fr> style: avoid tabs * src/scan-code.l: here. 2013-10-22 Akim Demaille <akim@lrde.epita.fr> c++: fix generated doxygen comments * configure.ac: Enable -Wdocumentation if supported. * data/lalr1.cc: Fix comments. 2013-10-22 Akim Demaille <akim@lrde.epita.fr> fix: uniqstr are already pointers * src/uniqstr.c (uniqstr_assert): Remove incorrect double indirection, and now useless cast. 2013-10-22 Paul Eggert <eggert@cs.ucla.edu> bison: pacify Sun C 5.12 * src/scan-code.l (show_sub_message): Redo initializations to work around a bogus Sun C 5.12 warning. (parse_ref): Remove unreachable code that Sun C 5.12 complains about. * src/uniqstr.h (uniqstr_vsprintf): Use _GL_ATTRIBUTE_FORMAT_PRINTF (...) instead of __attribute__ ((__format__ (__printf__, ...))). Otherwise, Sun C 5.12 complains about an unknown attribute. 2013-10-22 Paul Eggert <eggert@cs.ucla.edu> maint: git now ignores rpcalc * examples/rpcalc/.gitignore: Ignore rpcalc. 2013-10-22 Paul Eggert <eggert@cs.ucla.edu> build: examples/calc++/calc++ requires flex * configure.ac (FLEX_CXX_WORKS): New AM_CONDITIONAL. * examples/calc++/local.mk (examples/calc++/calc++): Build if FLEX_CXX_WORKS, not BISON_CXX_WORKS. 2013-10-22 Paul Eggert <eggert@cs.ucla.edu> maint: mention help2man, texinfo, apt-get * README-hacking: Add help2man, texinfo. Describe how to add packages if you're using Debian. 2013-10-22 Paul Eggert <eggert@cs.ucla.edu> maint: git now ignores .log and .trs files * .gitignore: Add *.log, *.trs. 2013-10-21 Akim Demaille <akim@lrde.epita.fr> tests: fix incorrect object construction Reported by Ken Moffat. http://lists.gnu.org/archive/html/bug-bison/2013-10/msg00009.html * tests/c++.at (Exception safety): Here. 2013-10-16 Akim Demaille <akim@lrde.epita.fr> glr: allow spaces between "%?" and "{" in predicates Reported by Rici Lake. http://lists.gnu.org/archive/html/bug-bison/2013-10/msg00004.html http://stackoverflow.com/questions/19330171/ * src/scan-gram.l: Do not try to be too smart when diagnosing invalid directives. * tests/glr-regression.at (Predicates): New test. 2013-10-16 Akim Demaille <akim@lrde.epita.fr> diagnostics: "-Werror -Wno-error=foo" must not emit errors Currently "-Werror -Wno-error=foo" still turns "foo" warnings into errors. Reported by Alexandre Duret-Lutz. See http://lists.gnu.org/archive/html/bug-bison/2013-09/msg00015.html. * src/complain.c (errority, errority_flag): New. (complain_init): Initialize the latter. (warning_argmatch): Extract the loop iterating on the flag's bits. Set and unset errority_flag here. (warnings_argmatch): -Wno-error is not the same as -Wno-error=everything: we must remember if category foo was explicitly turned in an error/warning via -W(no-)error=foo. (warning_severity): Use errority_flag. * tests/input.at (Symbols): Just check --yacc, not -Wyacc, that's the job of tests on -W. (-Werror is not affected by -Wnone and -Wall): Rename as... (-Werror combinations): this. Tests more combinations of -W, -W(no-)error, and -W(no-)error=foo. * tests/local.at (AT_BISON_CHECK_WARNINGS): Don't expect -Werror to turn runs that issue warnings into runs with errors, as the warnings might be enforced as warnings by -Wno-error=foo, in which case -Werror does not change anything. * doc/bison.texi (Bison Options): Try to be clearer about how -W(no-)error and -W(no-)error=foo interact. 2013-10-16 Akim Demaille <akim@lrde.epita.fr> comment changes * src/complain.h, src/complain.c: More documentation, more comments. 2013-10-04 Andreas Schwab <schwab@linux-m68k.org> location: fix EOF check * location.c (location_caret): Use int, not char, for values from getc. 2013-09-19 Akim Demaille <akim@lrde.epita.fr> style: variant: remove empty line * data/variant.hh (b4_symbol_constructor_define_): Remove stray eol. 2013-09-19 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: glr: more assertions glr: shorten scopes glr: formatting changes glr: better use of tracing macros examples: improve the output of the "variant" example variant: remove useless assertion tests: remove stray debugging traces tests: do not use grep -q build: don't require flex for ordinary builds maint: update .gitignore build: port to pre-5.8.7 perl tests: minor change to make it easier to test other skeletons uniqstr: fix assertion 2013-09-19 Akim Demaille <akim@lrde.epita.fr> glr: simplify the invocation of YYLLOC_DEFAULT The commit which introduces yyresolveLocations (commit 8710fc41aaebc5d167a2783a4b8b60849a803869) saves and restores the look-ahead (type, value and location) for no clear reason. This appears to be useless. * data/glr.c (yyresolveLocations): Don't save/restore the current look-ahead to call YYLLOC_DEFAULT. Minor style changes. 2013-09-19 Akim Demaille <akim@lrde.epita.fr> glr: more assertions * data/glr.c (yyaddDeferredAction, yyglrShiftDefer, yypdumpstack): More assertions. 2013-09-19 Akim Demaille <akim@lrde.epita.fr> glr: shorten scopes * data/glr.c (yyglrReduce): Define yyflag with its value. 2013-09-19 Akim Demaille <akim@lrde.epita.fr> glr: formatting changes * data/glr.c: here. 2013-09-19 Akim Demaille <akim@lrde.epita.fr> glr: better use of tracing macros * data/glr.c (yydestroyGLRState): Use YY_SYMBOL_PRINT instead of yy_symbol_print. 2013-09-19 Akim Demaille <akim@lrde.epita.fr> examples: improve the output of the "variant" example * examples/variant.yy: Improve the printing of lists. 2013-09-19 Akim Demaille <akim@lrde.epita.fr> variant: remove useless assertion * data/variant.hh (move): Remove precondition assertion which is ensured by the first call of the body (this precondition is also one of "build"). 2013-09-19 Akim Demaille <akim@lrde.epita.fr> tests: remove stray debugging traces * tests/atlocal.in: Remove traces. Be ready to remove conftest.dSYM generated on OS X. 2013-09-04 Akim Demaille <akim@lrde.epita.fr> tests: do not use grep -q Reported by Daniel Galloway. http://lists.gnu.org/archive/html/bug-bison/2013-08/msg00020.html * tests/java.at: Ignore grep's output instead. 2013-08-25 Paul Eggert <eggert@cs.ucla.edu> build: don't require flex for ordinary builds * configure.ac (LEX): Don't fail if this is lex, as flex is not required for ordinary builds. Instead, issue a warning and substitute a no-op LEX. Reported by Michael Felt in <http://lists.gnu.org/archive/html/bug-bison/2013-08/msg00009.html>. 2013-08-25 Paul Eggert <eggert@cs.ucla.edu> maint: update .gitignore * .gitignore: Add *.eps, *.o, *.pdf, *.png, *.stamp, *~, .deps, .dirstamp. Needed to suppress unwanted chatter from 'git status' after a bootstrap build. 2013-08-24 Paul Eggert <eggert@cs.ucla.edu> build: port to pre-5.8.7 perl * examples/local.mk (extract): Omit -f from perl options. This doesn't work with perl versions before 5.8.7 that are configured without USE_SITECUSTOMIZE. Reported by Michael Felt in <http://lists.gnu.org/archive/html/bug-bison/2013-08/msg00006.html>. 2013-08-01 Akim Demaille <akim@lrde.epita.fr> tests: minor change to make it easier to test other skeletons * tests/c++.at (Variants): Pass the skeleton as argument. 2013-08-01 Valentin Tolmer <valentin.tolmer@gmail.com> uniqstr: fix assertion * src/uniqstr.c (uniqstr_assert): Really make sure str is a uniqstr, not just whether some uniqstr with the same content was registered. 2013-08-01 Valentin Tolmer <nitnelave1@gmail.com> symbols: improve symbol aliasing Rather than having duplicate info in the symbol and the alias that has to be resolved later on, both the symbol and the alias have a common pointer to a separate structure containing this info. * src/symtab.h (sym_content): New structure. * src/symtab.c (sym_content_new, sym_content_free, symbol_free): New * src/AnnotationList.c, src/conflicts.c, src/gram.c, src/gram.h, * src/graphviz.c, src/ielr.c, src/output.c, src/parse-gram.y, src/print.c * src/print-xml.c, src/print_graph.c, src/reader.c, src/reduce.c, * src/state.h, src/symlist.c, src/symtab.c, src/symtab.h, src/tables.c: Adjust. * tests/input.at: Fix expectations (order changes). 2013-08-01 Akim Demaille <akim@lrde.epita.fr> build: ship the ASCII art figures We don't ship the *.txt files that are used to build the info file. Reported by Colin Daley. * doc/figs/example.txt: New. * doc/local.mk (bison.info): Depend on the txt files. And ship them. 2013-08-01 Akim Demaille <akim@lrde.epita.fr> doc: prefer the ".gv" extension to ".dot" See http://marc.info/?l=graphviz-devel&m=129418103126092 for the motivation (basically, some word processor now uses *.dot). * doc/figs/example-reduce.dot: Rename as... * doc/figs/example-reduce.gv: this. * doc/figs/example-shift.dot: Rename as... * doc/figs/example-shift.gv: this. * doc/figs/example.dot: Rename as... * doc/figs/example.gv: this. * doc/local.mk: Adjust. 2013-07-25 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2013-07-25 Akim Demaille <akim@lrde.epita.fr> version 3.0 * NEWS: Record release date. 2013-07-25 Akim Demaille <akim@lrde.epita.fr> regen 2013-07-25 Akim Demaille <akim@lrde.epita.fr> news: prepare 3.0 * NEWS (3.0): Reorder. 2013-07-25 Akim Demaille <akim@lrde.epita.fr> tests: fix invalid assignment when using variants in C++11 * tests/c++.at (Exception safety): In variant mode $$ is an instance of Object. Assigning YY_NULL in C++98 is incorrect, but behaves ok, as it assigns YY_NULL=0 using Object::operator= (char v). It is wrong in C++11 as there is operator for "$$ = nullptr". 2013-07-25 Akim Demaille <akim@lrde.epita.fr> yacc: beware of "uninitialized uses" warnings Again some issues with the fact that yylval is reported by GCC as possibly not initialized in some cases. Here, the case at hand is the %destructor. I am still not convinced that it is worth going all the trouble of using pragmas to disable temporarily some warnings, instead of just initializing the looking symbol once for all, but that's what Paul voted for, see <http://lists.gnu.org/archive/html/bison-patches/2012-10/msg00050.html>. * data/c.m4 (b4_attribute_define): Define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN, YY_IGNORE_MAYBE_UNINITIALIZED_END, YY_INITIAL_VALUE here, as we will need them in the generation of the destructor function, which is defined in yacc.c before yyparse, which was in charge of defining these macros. * data/yacc.c (b4_declare_scanner_communication_variables): Simplify: trying to factor the definitions of the case pure and impure is too complex. Actually, it is not even clear that this macro should really exist, as even the calls are complex. Be careful not to issue a lone ";", as this is a statement, and C90 forbids declarations after statements ; so write "YY_INITIAL_VALUE(Decl;)", not "YY_INITIAL_VALUE(Decl);". 2013-07-25 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2013-07-03 Akim Demaille <akim@lrde.epita.fr> tests: skip C++ tests if we can't compile a simple program There are possible conflicts between gnulib replacement functions (in <stdio.h>) and their C++ wrappers (in <stream>). Trying to address these in configure seems too hard, and I don't know how to fix the issue in gnulib. Cowardly avoid the problem by skipping C++ tests when this happens. Reported by Stefano Lattarini. http://lists.gnu.org/archive/html/bug-bison/2013-06/msg00001.html * tests/atlocal.in (BISON_CXX_WORKS): Also set it to "skip" if we can't compile a simple program using <stream>. * tests/local.at: Comment changes. 2013-07-03 Akim Demaille <akim@lrde.epita.fr> tests: fix 'find' portability issues Reported by Stefano Lattarini. http://lists.gnu.org/archive/html/bug-bison/2013-06/msg00000.html * tests/output.at (AT_CHECK_OUTPUT): Use Perl instead. 2013-06-24 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2013-06-24 Akim Demaille <akim@lrde.epita.fr> version 2.7.91 * NEWS: Record release date. 2013-06-24 Akim Demaille <akim@lrde.epita.fr> NEWS: prepare for 2.7.91 * NEWS (2.7.91): Java push parsers. 2013-06-24 Akim Demaille <akim@lrde.epita.fr> java: rename YYMORE as YYPUSH_MORE for consistency with C http://lists.gnu.org/archive/html/bison-patches/2013-06/msg00008.html * data/lalr1.java, doc/bison.texi, tests/javapush.at: s/YYMORE/YYPUSH_MORE. 2013-06-21 Akim Demaille <akim@lrde.epita.fr> tests: fix Java push failure when running with BISON_USE_PUSH_FOR_PULL * tests/javapush.at (Trivial Push Parser with api.push-pull verification): When push for pull is enabled, there is one such function generated. 2013-06-21 Akim Demaille <akim@lrde.epita.fr> style: minor changes in the Java tests * tests/java.at (AT_CHECK_JAVA_GREP): Ignore the exit status. * tests/javapush.at (AT_CHECK_JAVA_GREP): Be more alike the previous one. Formating changes. Remove stray debugging "jj" file. 2013-06-21 Akim Demaille <akim@lrde.epita.fr> java: push: do not reset the error counter * data/lalr1.java (parse): here, when in push-pull is in "both" mode. This breaks the test suite, for instance make check TESTSUITEFLAGS='-d 388 BISON_USE_PUSH_FOR_PULL=1'. More generally make maintainer-push-check. 2013-06-14 Akim Demaille <akim@lrde.epita.fr> build: add Valgrind suppression file for GNU/Linux * build-aux/linux-gnu.valgrind: New. * build-aux/local.mk: Ship it. * configure.ac: Use it. 2013-06-13 Dennis Heimbigner <dmh@unidata.ucar.edu> java: add push-parser support * data/lalr1.java: Capture the declarations as m4 macros to avoid duplication. When push parsing, the declarations occur at the class instance level rather than within the parse() function. Change the way that the parser state is initialized. For push-parsing, the parse state declarations are moved to "push_parse_initialize()", which is called on the first invocation of "push_parse()". The %initial-action code is also inserted after the invocation of "push_parse_initialize()". The body of the parse loop is modified to return values at appropriate points when doing push parsing. In order to make push parsing work, it is necessary to divide YYNEWSTATE into two states: YYNEWSTATE and YYGETTOKEN. On the first call to push_parse(), the state is YYNEWSTATE. On all later entries, the state is set to YYGETTOKEN. The YYNEWSTATE switch arm falls through into YYGETTOKEN. YYGETTOKEN indicates that a new token is potentially needed. Normally, with a pull parser, this new token would be obtained by calling "yylex()". In the push parser, the value YYMORE is returned to the caller. On the next call to push_parse(), the parser will return to the YYGETTOKEN state and continue operation. * tests/javapush.at: New test file for java push parsing. * tests/testsuite.at: Use it. * tests/local.mk: Adjust. * doc/bison.texi (Java Push Parser Interface): New. 2013-06-11 Akim Demaille <akim@lrde.epita.fr> build: ship all the files, even if the C++ compiler is broken * examples/calc++/local.mk: Be sure to ship calc++.test even if the current C++ compiler is not sufficient to run the tests. 2013-06-05 Dennis Heimbigner <dmh@unidata.ucar.edu> style: comment changes in Java skeleton * data/lalr1.java: Here. 2013-06-03 Akim Demaille <akim@lrde.epita.fr> tests: fix a G++ warning * tests/c++.at: Use YY_NULL instead of 0 for the null pointer. And formatting changes. 2013-06-03 Akim Demaille <akim@lrde.epita.fr> build: fix a warning from clang * src/muscle-tab.c: Declare local functions static. 2013-05-30 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2013-05-30 Akim Demaille <akim@lrde.epita.fr> version 2.7.90 * NEWS: Record release date. 2013-05-30 Akim Demaille <akim@lrde.epita.fr> style: syntax-check fixes * data/yacc.c, src/Sbitset.c, src/Sbitset.h, src/muscle-tab.h, * src/output.c, src/parse-gram.y, src/reader.c, src/symtab.c, * src/uniqstr.c, src/uniqstr.h: Fix space before parens. * cfg.mk (_space_before_paren_exempt): Add needed exceptions. 2013-05-30 Akim Demaille <akim@lrde.epita.fr> xml: use %empty in the text output * data/xslt/xml2text.xsl: here. 2013-05-30 Akim Demaille <akim@lrde.epita.fr> build: locally disable new GCC warnings that fail on Flex generated code * configure.ac: here. 2013-05-30 Akim Demaille <akim@lrde.epita.fr> fix a memory leak * src/print-xml.c (num_escape_bufs): New. (print_xml): Be sure to release all the escape_bufs. 2013-05-30 Akim Demaille <akim@lrde.epita.fr> regen 2013-05-30 Akim Demaille <akim@lrde.epita.fr> build: be sure to include config.h first in the generated parser Using %code for config.h is wrong, as some headers will already have been included by Bison. In some cases, e.g., glibc's string.h, this results in some declaration not being made for lack of definition of _GNU_SOURCE, which is performed by config.h. * src/parse-gram.y: here. 2013-05-29 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: maint: post-release administrivia version 2.7.1 regen 2013-05-29 Petr Machata <pmachata@redhat.com> drop unused options --raw, -n, -e, --include and -I * --raw appears to be ignored. It was marked as obsolete in the commit ec3bc39, and documented as no longer supported as of 1.29 (2001-09-07). Support for %raw appears to have been dropped in e9955c83 on 2002-06-11, but --raw was kept around. Maybe it's time to drop it as well? * Commit e9955c83 dropped support for %no-parser as well, and converted it to option. --no-parser was later dropped in 728c4be2 on 2007-08-12, but -n was kept around, probably as an omission. All three are documented as removed since 2.3b (2008-05-27). * -e existed for a single day in 2001. It was introduced in eeeb962b on 2001-11-27. The handling was removed in c7925b99 on 2001-11-28, but "e" was kept in the list of short options. Probably an omission. * --include appears to be dead code. The option sets a variable, but that variable is not used anywhere. It was added in f6bd5427 on 2001-11-26 as a %-directive, with comments that it's not yet implemented. It was converted to a command-line option later, but doesn't seem to ever have been actually implemented. 2013-05-28 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2013-04-22 Akim Demaille <akim@lrde.epita.fr> diagnostics: always point to the first directive Some directives cannot be used several times (e.g., a given symbol may only have a single printer). In case of repeated definitions, an error is issued for the second definition, yet it is not discarded, and becomes the definition used for the rest of the file. This is not consistent with the idea that multiple definitions are not allowed: discard any repeated directive. * src/symtab.c (symbol_type_set, symbol_code_props_set) (semantic_type_code_props_set, symbol_class_set, symbol_translation): Discard repeated directives. * tests/input.at (Default %printer and %destructor redeclared) (Per-type %printer and %destructor redeclared): Update expectations. 2013-04-22 Akim Demaille <akim@lrde.epita.fr> tests: factor test for printer/desctructor redefined * tests/input.at (Default %printer and %destructor redeclared): Introduce AT_TEST to factor. 2013-04-22 Akim Demaille <akim@lrde.epita.fr> diagnostics: use appropriate location for useless precedence/associativity * src/symtab.c (symbol_precedence_set): Use prec_location, not location (which is the first occurrence of the symbol, possibly just %token). Also, as redefinitions are not allowed, keep the first values, not the subsequent ones. * tests/conflicts.at, tests/existing.at, tests/regression.at: Adjust. 2013-04-22 Akim Demaille <akim@lrde.epita.fr> tests: factor duplicate expected warnings * tests/existing.at: Instead of "t ? abc : aBc", write "a(t?b:B)c". 2013-04-19 Akim Demaille <akim@lrde.epita.fr> tests: enable -Wsign-compare and fix corresponding warnings -Wsign-compare was disabled for bison's own code, following gnulib's approach. However, the generated parsers should not trigger such warnings. Reported by Efi Fogel. http://lists.gnu.org/archive/html/help-bison/2013-04/msg00018.html See also http://stackoverflow.com/questions/16101062 for the weird "-(unsigned)i" piece of code. * configure.ac (warn_tests): Enable -Wsign-compare. * data/location.cc (position::add_): New. (position::lines, position::columns): Use it. * tests/actions.at (AT_CHECK_PRINTER_AND_DESTRUCTOR): Fix signedness issues. 2013-04-18 Akim Demaille <akim@lrde.epita.fr> muscle: check more cases of %define variables with code values * data/bison.m4 (b4_percent_define_check_kind): Fix overquotation. (api.location.type, api.position.type): Check they have code values here. * data/c++.m4 (api.location.type): No longer checked here. (parser_class_name): Check it here. * data/java.m4 (api.value.type, init_throws, lex_throws, parser_class_name) (throws, annotations, extends, implements): Check they have code values. * doc/bison.texi: Fix every incorrect occurrence of %define. Document the additional syntax for %define: code values. Document the additional syntax for -D/-F: string and code values. * tests/calc.at, tests/headers.at, tests/input.at, tests/java.at, * tests/local.at: Fix dependencies. 2013-04-18 Akim Demaille <akim@lrde.epita.fr> regen 2013-04-18 Akim Demaille <akim@lrde.epita.fr> parser: do not convert $ and @ in code values of %define variables * src/parse-gram.y (value: "{...}"): Just strip the braces, but pass the value as is. 2013-04-18 Akim Demaille <akim@lrde.epita.fr> parser: no longer use the "braceless" non-terminal The purpose of this symbol was only to factor function calls. As a result the actions were indeed simpler, but the grammar was somewhat uselessly obfuscated. Get rid of this symbol, but introduce functions to simplify dependencies. There is no (intended) changes of behavior here. * src/parse-gram.y (strip_braces, translate_code( (translate_code_braceless): New. (braceless): Remove, use "{...}" instead, and one of the previous functions depending on the context. (STRING, "%{...%}", EPILOGUE): Declare as <code>, instead of <chars>, the difference between both is useless (well, I couldn't make sense of it, even after having read the initial commit that introduced them). (%union): Remove the now useless "chars" type. Adjust the printers. * src/scan-gram.l: Adjust. 2013-04-18 Akim Demaille <akim@lrde.epita.fr> regen 2013-04-18 Akim Demaille <akim@lrde.epita.fr> style: avoid %{...%} in our parser * src/parse-gram.y (%{...%}): Split in %code and %code requires. * src/location.h: Add missing includes for self containedness. 2013-04-18 Akim Demaille <akim@lrde.epita.fr> style: use %code for local function declarations in our parser * src/parse-gram.y (version_check, gram_error, char_name, lloc_default): Move their prototypes from %{...%} to %code. (YYLLOC_DEFAULT, YY_LOCATION_PRINT): Move from %{...%} to %code. (current_lhs): Move its implementation to the epilogue. 2013-04-16 Akim Demaille <akim@lrde.epita.fr> regen 2013-04-16 Akim Demaille <akim@lrde.epita.fr> muscle: check the kind of api.prefix, api.location.type * data/bison.m4: Check api.prefix. * data/c++.m4: Check api.location.type. * doc/bison.texi: Fix uses of api.value.type, api.prefix, api.location.type. Document {...} values for %define. * src/parse-gram.y: Fix use of api.prefix. * tests/calc.at: Fix uses of api.location.type. * tests/input.at: Check api.prefix, and api.location.type. 2013-04-15 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2013-04-15 Akim Demaille <akim@lrde.epita.fr> version 2.7.1 * NEWS: Record release date. 2013-04-15 Akim Demaille <akim@lrde.epita.fr> regen 2013-04-15 Akim Demaille <akim@lrde.epita.fr> muscle: enforce definition syntax for keyword variables * src/muscle-tab.c (muscle_percent_define_get_kind) (muscle_percent_define_check_kind): New. (muscle_percent_define_default): Variables with a default value are of "keyword" kind. (muscle_percent_define_flag_if, muscle_percent_define_check_values): Check that the variable is of keyword kind. * data/bison.m4: Likewise, but in M4. That is to say... (b4_percent_define_default): Define the kind when the variable is undefined. (b4_percent_define_check_kind): Use a better error message. (_b4_percent_define_check_values, _b4_percent_define_check_values): Former "enum" variables should be defined using the keyword syntax. * doc/bison.texi: Update. A couple of fixes. * tests/input.at (%define keyword variables): New. 2013-04-15 Akim Demaille <akim@lrde.epita.fr> muscle: let -D/-F support the three kinds of %define variable values See http://lists.gnu.org/archive/html/bison-patches/2013-04/msg00012.html * src/getargs.c (getargs): Recognize {value} and "value" for -D and -F. 2013-04-15 Akim Demaille <akim@lrde.epita.fr> muscle: minor refactoring * src/muscle-tab.c (muscle_percent_define_default): Reduce the scopes. 2013-04-15 Akim Demaille <akim@lrde.epita.fr> muscle: minor simplification which uncovers a missing warning * src/muscle-tab.c (muscle_percent_define_ensure): Discover the virtues of || to factor conditionals. * NEWS: As api.pure is no longer flagged as "used" by accident, we now have warnings for useless definitions. * tests/calc.at: So remove api.pure settings when running C++ tests, since C++ skeletons use a pure interface. 2013-04-15 Akim Demaille <akim@lrde.epita.fr> muscle: factor the field retrieval * src/muscle-tab.c (muscle_percent_define_get_raw): New. Use it where appropriate. (location_decode): No longer fetch the value from the table, take the value as argument. 2013-04-15 Akim Demaille <akim@lrde.epita.fr> muscle: factor the handling of used variables * src/muscle-tab.c (muscle_percent_define_use): New, corresponding to b4_percent_define_use. Use it where appropriate. 2013-04-15 Akim Demaille <akim@lrde.epita.fr> muscle: factor the computation of variable names * src/muscle-tab.c (muscle_name): New. Use it. Propagate "uniqstr" as value type instead of plain "char const *". 2013-04-15 Akim Demaille <akim@lrde.epita.fr> muscle: factor the kind check in M4 * data/bison.m4 (b4_percent_define_check_kind): New. Use it to check api.token.prefix. * data/c++.m4: Check the kind of api.namespace. * doc/bison.texi: Update a reference to former 'namespace' variable. * tests/input.at ("%define" code variables): Check api.namespace. 2013-04-15 Akim Demaille <akim@lrde.epita.fr> muscle: factor conditionals on defined %define variables * data/bison.m4 (b4_percent_define_ifdef_): New. Use it where appropriate. 2013-04-11 Akim Demaille <akim@lrde.epita.fr> api.token.prefix: use code values * data/bison.m4: Remove useless (and incorrect: m4_* instead of b4_*) default assignment to api.token.prefix. Check that api.token.prefix is assigned code. * tests/input.at (%define code variables): New test. * NEWS, doc/bison.texi, tests/c++.at, tests/calc.at, * tests/java.at, tests/local.at: Adjust to use braces. 2013-04-11 Akim Demaille <akim@lrde.epita.fr> c++: fix several issues with locations Reported by Daniel Frużyński. http://lists.gnu.org/archive/html/bug-bison/2013-02/msg00000.html * data/location.cc (position::columns, position::lines): Check for underflow. Fix some weird function signatures. (location): Accept signed integers as arguments where appropriate. Add operator- and operator+=. * doc/bison.texi (C++ position, C++ location): Various fixes and completion. * tests/c++.at (C++ Locations): New tests. 2013-04-11 Akim Demaille <akim@lrde.epita.fr> muscles: be sure that %code snippets are not glue together on a single line Recently "braceless" in the parser was changed so that an eol was no longer added to the value. This is not correct when a %code is used multiple times, because the syncline of the next snippet might be appended to the last (and not ended) line of the previous snippet. * src/muscle-tab.h (muscle_grow): Make it private. * src/muscle-tab.c (muscle_grow): Accept a fourth argument: a required terminator. Adjust callers. * tests/input.at (Multiple %code): New. 2013-04-11 Akim Demaille <akim@lrde.epita.fr> style: fix comments * tests/actions.at: Fix incorrect "prototype". 2013-04-10 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: glr.cc: fix a clang warning maint: update copyright years build: fix VPATH issue build: avoid clang's colored diagnostics in the test suite tests: please clang and use ".cc", not ".c", for C++ input gnulib: update skeletons: avoid empty switch constructs lalr1.cc: fix compiler warnings yacc.c: do not use __attribute__ unprotected tests: style changes 2013-04-09 Akim Demaille <akim@lrde.epita.fr> api.value.type: use keyword/brace values Suggested by Joel E. Denny. http://lists.gnu.org/archive/html/bison-patches/2013-03/msg00016.html * data/bison.m4 (b4_percent_define_get_kind): New. (b4_variant_flag): Check that api.value.type is defined as the 'variant' keyword value. * data/c.m4 (_b4_value_type_setup_keyword): New. (b4_value_type_setup): Use it to simplify reading. Use b4_define_silent. Decode api.value.type, including its type. (b4_value_type_define): Likewise. * data/c++.m4 (b4_value_type_declare): Adjust the decoding of api.value.type, taking its kind into account. * doc/bison.texi: Adjust all the examples to the new syntax. * NEWS: Ditto. * tests/types.at: Adjust 2013-04-09 Akim Demaille <akim@lrde.epita.fr> api.value.type: diagnose guaranteed failure with --yacc Instead of generating invalid C code, generate an error when --yacc and '%define api.value.type union' are used together. * data/bison.m4: Issue an error in this case. * tests/types.at (%yacc vs. %define api.value.type union): New, check this error. * doc/bison.texi (Type Generation): Document it. * tests/output.at: Check that '-o y.tab.c' and '-y' behave equally wrt generated file names. * NEWS (Use of YACC='bison -y'): New. Promote the use of 'bison -o y.tab.c'. 2013-04-09 Akim Demaille <akim@lrde.epita.fr> doc: style changes * doc/bison.texi (Destructor Decl, Printer Decl): Group series of %token and %type together. 2013-04-09 Akim Demaille <akim@lrde.epita.fr> doc: display locations in error as recommended by GNU Coding Standards * doc/bison.texi (Actions and Locations): here. 2013-04-09 Akim Demaille <akim@lrde.epita.fr> doc: api.value.type union * doc/bison.texi (Type Generation): New section. (Multi-function Calc): Convert to use api.value.type=union. 2013-04-09 Akim Demaille <akim@lrde.epita.fr> doc: move the section about "%union" where types are discussed * doc/bison.texi (Union Decl): Move to... (Defining Language Semantics): here. 2013-04-09 Akim Demaille <akim@lrde.epita.fr> doc: deprecate #define YYSTYPE in favor of %define api.value.type * doc/bison.texi: Convert examples with YYSTYPE to use api.value.type. Deprecate YYSTYPE. 2013-04-09 Akim Demaille <akim@lrde.epita.fr> value type: accept "->" in type tags Provide a means to dereference pointers when defining tags. One example could be: %code requires { typedef struct ListElementType { union value { int intVal; float floatVal; char* charptrVal; } value; struct ListElementType* next; } ListElementType; } %union { ListElementType* list; } %token <list->value.charptrVal> STRING %token <list->value.intVal> INTEGER %token <list->value.floatVal> REAL %type <list> ElementList LiteralType * src/scan-code.l, src/scan-gram.l: Accept "->" in tags. * tests/types.at: Add more test cases to cover this case. 2013-04-09 Akim Demaille <akim@lrde.epita.fr> style: simplify the scanning of type tags * src/scan-gram.l: Remove the rule for simple tags: the "complex" case subsumes it. It was more efficient, but duplicated the code for a negligible benefit. 2013-04-09 Akim Demaille <akim@lrde.epita.fr> api.value.type: implement proper support, check, and document * data/c.m4 (b4_symbol_type_register, b4_type_define_tag) (b4_symbol_value_union, b4_value_type_setup_union) (b4_value_type_setup_variant, b4_value_type_setup): New. (b4_value_type_define): Use it to set up properly the type. Handle the various possible values of api.value.type. * data/c++.m4 (b4_value_type_declare): Likewise. * data/lalr1.cc (b4_value_type_setup_variant): Redefine. * tests/types.at: New. Exercise all the C/C++ skeletons with different types of api.value.type values. * tests/local.mk, tests/testsuite.at: Use it. * doc/bison.texi (%define Summary): Document api.value.type. * NEWS: Advertise it, together with api.token.constructor. 2013-04-09 Akim Demaille <akim@lrde.epita.fr> m4: allow the definition of side-effect only macros * data/bison.m4 (b4_divert_kill, b4_define_silent): New. * data/c.m4: Comment change. 2013-04-09 Akim Demaille <akim@lrde.epita.fr> variant: fix inconsistent quotation * data/variant.hh (b4_char_sizeof): De-overquote. (b4_value_type_declare): De-underquote. 2013-04-09 Akim Demaille <akim@lrde.epita.fr> m4: style changes in error messages * data/bison.m4: Use $0 to denote the current macro's name. 2013-04-08 Akim Demaille <akim@lrde.epita.fr> glr.cc: fix a clang warning * data/glr.cc (b4_epilogue): Be sure to end with an end-of-line, so that the file does end with one. 2013-04-08 Akim Demaille <akim@lrde.epita.fr> maint: update copyright years Run "make update-copyright". 2013-04-08 Akim Demaille <akim@lrde.epita.fr> build: fix VPATH issue * Makefile.am (update-b4-copyright, update-package-copyright-year): Fix path to build-aux. 2013-04-08 Akim Demaille <akim@lrde.epita.fr> build: avoid clang's colored diagnostics in the test suite The syncline tests, which try to recognize compiler diagnostics, are confused by escapes for colors. * configure.ac (warn_tests): New, to factor the warnings for both C and C++ tests. Add -fno-color-diagnostics to it. * tests/local.at (AT_TEST_TABLES_AND_PARSE): Do not remove glue together compiler flags. 2013-04-08 Akim Demaille <akim@lrde.epita.fr> tests: please clang and use ".cc", not ".c", for C++ input When fed with foo.c, clang++ 3.2 answers: clang: error: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated * tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): Use *.cc and *.hh for C++. 2013-04-08 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2013-04-08 Akim Demaille <akim@lrde.epita.fr> skeletons: avoid empty switch constructs Reported by Rob Conde. http://lists.gnu.org/archive/html/bug-bison/2013-03/msg00003.html * data/c.m4 (b4_symbol_actions): Rename as... (_b4_symbol_actions): this. (b4_symbol_actions): New wrapper. Do not emit empty switches. Adjust all b4_symbol_actions callers. 2013-04-08 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: fix compiler warnings Reported by Rob Conde. http://lists.gnu.org/archive/html/bug-bison/2013-03/msg00003.html * data/stack.hh (operator=, stack(const stack&)): Make this class uncopyable, i.e., "undefine" these operators: make them private and don't implement them. (clear): New. * data/lalr1.cc: Use it instead of an assignment. (parser): Make this class uncopyable. 2013-04-08 Akim Demaille <akim@lrde.epita.fr> yacc.c: do not use __attribute__ unprotected Reported by Victor Khomenko. http://lists.gnu.org/archive/html/bug-bison/2013-04/msg00001.html * data/glr.c (YYUSE, __attribute__): Fuse their definition into... * data/c.m4 (b4_attribute_define): this new macro. * data/yacc.c, data/glr.c: Use it. 2013-04-05 Akim Demaille <akim@lrde.epita.fr> api.namespace: demonstrate and use {...} values instead of "..." values * tests/c++.at, tests/input.at: Use "%define api.namespace {foo}" instead of using quotes. * tests/local.at (AT_SETUP_STRIP, AT_NAME_PREFIX): Recognize uses of braces instead of quotes. * doc/bison.texi: Use braces for api.namespace's values. 2013-04-05 Akim Demaille <akim@lrde.epita.fr> grammar: do not add a \n at the end of blocks of code Now that we use "braceless" (which is {...} blocks of code with initial and final braces stripped) to denote "short" values (such as api.namespaces), the added end-of-line is a nuisance. As a matter of fact, this extra-safety was useless, as every expansion of "braceless" (aka, "user code") is followed by an end of line. * src/parse-gram.y, src/parse-gram.c (braceless): Instead of replacing the final brace by \n, just delete the brace. 2013-04-04 Akim Demaille <akim@lrde.epita.fr> regen 2013-04-04 Akim Demaille <akim@lrde.epita.fr> grammar: record the kind of %define variable values Provide a means to tell the difference between "keyword" values (e.g., %define api.pull both), "string" values (e.g., %define file.name "foo"), and "code" values (e.g., %define api.namespace {calc}). Suggested by Joel E. Denny. http://lists.gnu.org/archive/html/bison-patches/2013-03/msg00016.html * src/muscle-tab.h, src/muscle-tab.c (muscle_kind, muscle_kind_new) (muscle_kind_string): New. (muscle_percent_define_insert): Take the kind as new argument. Insert it in the muscle table. Adjust callers. * src/getargs.c: Adjust callers. * src/parse-gram.y: Ditto. (content.opt): Remove, replaced by... (value): this new non-terminal, whose semantics value is stored in the new "value" union member. Provide a printer. Support values in braces in additions to keyword and string values. fuse me 2013-04-04 Akim Demaille <akim@lrde.epita.fr> style: fix comments * src/muscle-tab.c (muscle_percent_define_ensure): Update obsolete comments. 2013-04-04 Akim Demaille <akim@lrde.epita.fr> regen 2013-04-04 Akim Demaille <akim@lrde.epita.fr> grammar: style changes * src/parse-gram.y (PARAM_TYPE): Remove useless typedef guard. There's a header guard. Use 'yyo' with %printer. Use a consistent style for %union one-liners. 2013-04-04 Akim Demaille <akim@lrde.epita.fr> grammar: split %union to group together related aspects * src/parse-gram.y (INT): Fuse the %type and %token declaration. Move its %union right before its introduction. (%union): Split in several %unions, right before their use. 2013-04-04 Akim Demaille <akim@lrde.epita.fr> muscle: refactor * src/muscle-tab.c (muscle_lookup, muscle_entry_new): New. (muscle_insert, muscle_grow, muscle_find_const, muscle_find): Use them. 2013-04-03 Akim Demaille <akim@lrde.epita.fr> style: comment changes * src/muscle-tab.c: Move the documentation of public functions to... * src/muscle-tab.h: here. Fix comment consistency issues. 2013-04-03 Akim Demaille <akim@lrde.epita.fr> muscle: minor refactoring * src/muscle-tab.h (MUSCLE_INSERT_C_STRING): Use MUSCLE_INSERT_STRING. 2013-03-06 Akim Demaille <akim@lrde.epita.fr> regen 2013-03-06 Valentin Tolmer <nitnelave1@gmail.com> gram: correct token numbering in precedence declarations In a precedence declaration, when tokens are declared with a litteral character (e.g., 'a') or with a identifier (e.g., B), Bison behaved differently: the litteral tokens would be numbered first, and then the other ones, leading to the following grammar: %right A B 'c' 'd' being numbered as such: 'c' 'd' A B. * src/parse-gram.y (symbol.prec): Set the symbol number when reading the symbols. * tests/conflicts.at (Token declaration order: literals vs. identifiers): New. 2013-03-04 Akim Demaille <akim@lrde.epita.fr> maint: update autoconf submodule * submodules/autoconf: Up to master. No significant changes in the files we use (m4sugar.m4 and foreach.m4). 2013-03-04 Akim Demaille <akim@lrde.epita.fr> diagnostics: no longer include the yacc category in -Wall It would be a pity to warn the users against Bison features... http://lists.gnu.org/archive/html/bison-patches/2013-02/msg00107.html * src/complain.h, src/complain.c (Wall): Disable Wyacc. (Weverything): New (hidden so far) category which really denotes all the categories (what used to be Wall). (warnings_args, warnings_types): Adjust. (warning_argmatch): Now !none = Weverything and conversely, no longer Wall. * NEWS, doc/bison.texi, src/getargs.c: Adjust the documentation. * tests/input.at (-Werror is not affected by -Wnone and -Wall): Adjust by not using a -Wyacc type of warning. 2013-03-04 Akim Demaille <akim@lrde.epita.fr> grammar: no longer detect and cure missing semicolon at end of actions Bison 3.0 is already breaking backward compatibility with other features. It is an appropriate time to drop this feature. Note that it was disabled when --yacc is passed. See http://lists.gnu.org/archive/html/bison-patches/2013-02/msg00102.html Basically, revert e8cd1ad655bcc704b06fb2f191dc3ac1df32b796. * src/scan-code.l (braces_level, need_semicolon, in_cpp): Remove. Remove every rule needed to detect and add missing semicolon. * tests/actions.at (Fix user actions without a trailing semicolon): Remove. * NEWS: Adjust. 2013-03-04 Akim Demaille <akim@lrde.epita.fr> build: stop using bison -y * Makefile.am (YACC): Pass -o y.tab.c, so that ylwrap is happy, and yet we don't pass --yacc to bison. (AM_YFLAGS): Disable Yacc warnings. 2013-02-23 Akim Demaille <akim@lrde.epita.fr> c++: rename b4_semantic_type_declare as b4_value_type_declare This is to match the names used in C and api.value.type, even if the parser actually defines semantic_type. * data/c++.m4 (b4_semantic_type_declare): Rename as... (b4_value_type_declare): this. * data/variant.hh: Likewise. 2013-02-23 Akim Demaille <akim@lrde.epita.fr> news: typo * NEWS: here. 2013-02-23 Akim Demaille <akim@lrde.epita.fr> style: space changes in the tests * tests/local.at: here. 2013-02-22 Akim Demaille <akim@lrde.epita.fr> style: formatting changes in the doc * doc/bison.texi: Use @file where appropriate. 2013-02-19 Akim Demaille <akim@lrde.epita.fr> tests: fix invalid C++11 code * tests/c++.at (Object): Somehow instances of Object were assigned YY_NULL, which is 0 most of the time (that case passes), but is nullptr in C++11, and there is nothing in Object to support such an assignment (failure). Use 0 as value, and provide the needed assignment operator. Also, use a more natural order within the class definition. 2013-02-19 Akim Demaille <akim@lrde.epita.fr> tests: fix failures with G++ 4.8 in Flex scanner * configure.ac (WARN_NO_NULL_CONVERSION_CXXFLAGS): Rename as... (FLEX_SCANNER_CXXFLAGS): this. Pass -Wno-zero-as-null-pointer-constant to G++ if it supports it. * examples/calc++/local.mk: Adjust. 2013-02-19 Akim Demaille <akim@lrde.epita.fr> regen 2013-02-19 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2013-02-19 Akim Demaille <akim@lrde.epita.fr> style: rename variant private members * data/variant.hh (buffer, tname, as_, raw, align_me): Rename as... (yybuffer_, yytname_,yyas_, yyraw, yyalign_me): these. 2013-02-19 Akim Demaille <akim@lrde.epita.fr> style: space changes * data/variant.hh: Be sure to leave a space before arguments in function calls. 2013-02-19 Akim Demaille <akim@lrde.epita.fr> variant: fix G++ 4.4 warnings The changes by Théophile Ranquet about type punning issues need to be extend to in-place new to please G++ 4.4.7. * data/variant.hh (variant::as_): New, factors the casts that avoid compiler warnings. (as, build): Use them. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> news: spell fixes * NEWS: here. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> diagnostics: factor and enhance messages about duplicate rule directives When reporting a duplicate directive on a rule, point to its first occurrence: one.y:11.10-15: error: only one %empty allowed per rule %empty {} %empty ^^^^^^ one.y:11.3-8: previous declaration %empty {} %empty ^^^^^^ And consistently discard the second one. * src/complain.h, src/complain.c (duplicate_directive): New. * src/reader.c: Use it where appropriate. * src/symlist.h, src/symlist.c (symbol_list): Add a dprec_location member. * tests/actions.at: Adjust expected output. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> style: no longer use backquotes * tests/actions.at, tests/atlocal.in, tests/c++.at, tests/calc.at, * tests/conflicts.at, tests/existing.at, tests/glr-regression.at, * tests/input.at, tests/java.at, tests/local.at, tests/sets.at, * tests/synclines.at, doc/bison.texi, lib/libiberty.h, lib/timevar.h: Use single quotes. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> style: no longer use backquotes * README, REFERENCES, TODO, configure.ac, data/README, data/bison.m4, * data/c++.m4, data/c.m4, data/java.m4, data/lalr1.cc, * data/lalr1.java, data/yacc.c, doc/local.mk, etc/bench.pl.in, * src/conflicts.c, src/files.c, src/getargs.c, src/gram.h, src/lalr.c, * src/location.c, src/location.h, src/muscle-tab.c, src/muscle-tab.h, * src/output.c, src/parse-gram.c, src/parse-gram.y, src/print-xml.c, * src/print.c, src/reader.c, src/reduce.c, src/scan-skel.l, * src/symtab.h, src/system.h, src/tables.c: Use single quotes, as currently recommended by the GNU Coding Standards. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> style: no longer use backquotes in messages * src/getargs.c (usage): Use single quotes. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> doc: use %empty instead of /* empty */ * doc/bison.texi: Change the comments into explicit %empty. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> doc: introduce %empty and -Wempty-rule * doc/bison.texi (Grammar Rules): Make it a @section which contains... (Rules Syntax): this new subsection (with the previous contents of "Grammar Rules". (Empty Rules): New subsection, extracted from the former "Grammar Rules". Document %empty. (Recursion): New a subsection of "Grammar Rules". Complete a few index entries. (Bison Options): Document -Wempty-rule. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> report: use %empty to denote empty rules * src/gram.c (rule_rhs_print): Use %empty for empty rules. * tests/conflicts.at, tests/regression.at, tests/sets.at: Adjust. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> diagnostics: %empty enables -Wempty-rule * src/complain.h, src/complain.c (warning_is_unset): New. * src/reader.c (grammar_current_rule_empty_set): If enabled -Wempty-rule, if not disabled. * tests/actions.at (Implicitly empty rule): Check this feature. Also check that -Wno-empty-rule does disable this warning. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> -Wempty-rule: diagnose empty rules without %empty * src/complain.h, src/complain.c (warning_empty_rule, Wempty_rule): New warning category. (warnings_args, warnings_types): Adjust. * src/reader.c (grammar_rule_check): Check the empty rules are flagged by %empty. * tests/actions.at (Implicitly empty rule): New. * tests/existing.at: Add expected warnings. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> tests: use %empty * tests/actions.at, tests/input.at, tests/reduce.at, * tests/regression.at: here. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> regen 2013-02-18 Akim Demaille <akim@lrde.epita.fr> parser: use %empty Avoid that Bison's own use of "bison -Wall" trigger warnings. * src/parse-gram.y: Use %empty for every empty rule. 2013-02-18 Akim Demaille <akim@lrde.epita.fr> grammar: introduce %empty Provide a means to explicitly denote empty right-hand sides of rules: instead of exp: { ... } allow exp: %empty { ... } Make sure that %empty is properly used. With help from Joel E. Denny and Gabriel Rassoul. http://lists.gnu.org/archive/html/bison-patches/2013-01/msg00142.html * src/reader.h, src/reader.c (grammar_current_rule_empty_set): New. * src/parse-gram.y (%empty): New token. Use it. * src/scan-gram.l (%empty): Scan it. * src/reader.c (grammar_rule_check): Check that %empty is properly used. * tests/actions.at (Invalid uses of %empty, Valid uses of %empty): New. 2013-02-16 Akim Demaille <akim@lrde.epita.fr> getargs: minor simplification * src/getargs.c (flag_argmatch): Simplify the handling of "none". 2013-02-16 Akim Demaille <akim@lrde.epita.fr> style: move argument handling of -W into the diagnostics module This allows to reduce the number of public interfaces. * src/getargs.c (--yacc): Use warning_argmatch instead of tweaking directly warnings_flag (which will be private). (warning_argmatch, warnings_argmatch): Move to... * src/complain.h, src/complain.c: here. * src/getargs.h, src/getargs.c (warnings_args, warnings_types): Move to... * src/complain.c: here, now private. * src/complain.h (severity, warnings_flag): Move to... * src/complain.c: here, now private. 2013-02-16 Akim Demaille <akim@lrde.epita.fr> diagnostics: revamp the handling of -Werror Recent discussions with Joel E. Denny (http://lists.gnu.org/archive/html/bison-patches/2013-02/msg00026.html) show that it is desirable to tell the difference between an option that was explicitly disabled with -Wno-foo, as opposed to be left unset. The current framework does not allow this. Instead of having a first int to store which options are enabled, and another to store which are turned into errors, use an array that for each warning category tells its status: disabled, unset, warning, error. * src/complain.h, src/complain.c (warning_bit): New enum. (warnings): Use it. (severity): New enum. (warnings_flag): Now an array of severity. (errors_flag): Remove, now done by warnings_flag. (complain_init): New function, to initialie warnings_flag. (warnings_are_errors): New Boolean, for -Werror. * src/complain.c (warning_severity): New. (warnings_print_categories, complains): Use it. * src/getargs.c (warning_argmatch): Adjust to use warnings_flag. (warnings_argmatch): Ditto. Handle -Werror and -Wno-error here. (getargs): Adjust. * src/main.c (main): Call complain_init. * tests/input.at (Invalid options): Add more corner cases. 2013-02-14 Akim Demaille <akim@lrde.epita.fr> options: simplify the handling of -W * src/getargs.c (warnings_argmatch, warning_argmatch): Simplify by replacing function arguments with their actual values. (WARNING_ARGMATCH): Remove, useless. Adjust callers. 2013-02-14 Akim Demaille <akim@lrde.epita.fr> options: don't accept "error=" for -f and -r * src/getargs.c (warning_argmatch, warnings_argmatch, WARNINGS_ARGMATCH): New. Use them for -W/--warning. They are copied from... (flag_argmatch, flags_argmatch, FLAGS_ARGMATCH): these. Simplify by removing the support for "error". * tests/input.at (Invalid options): New. * TODO (Laxism in Bison invocation arguments): Remove. 2013-02-14 Akim Demaille <akim@lrde.epita.fr> diagnostics: factor the list of warning names * src/getargs.h, src/getargs.c (warnings_args, warnings_types): Make them public. * src/complain.h, src/complain.c (warnings_print_categories): Its only use outside complain.c was removed in a recent commit, so make it static. Simplify its implementation. Use warnings_args and warnings_types. * src/muscle-tab.c (muscle_percent_define_check_values): Make it silent. 2013-02-14 Akim Demaille <akim@lrde.epita.fr> diagnostics: no longer pretty-print rules in error messages, carets suffice * src/gram.c (grammar_rules_useless_report): Let -fcaret handle the pretty-printing of the guilty rules. (rule_print): Inline in its only use. * tests/conflicts.at, tests/existing.at, tests/reduce.at, * tests/regression.at: Adjust. * NEWS: Document. 2013-02-14 Akim Demaille <akim@lrde.epita.fr> options: no longer document warnings when diagnosing an invalid -W The argmatch functions accept prefixes of the alternatives (like getopt does for long options). Bison uses this to document the warning categories. This is troublesome: it duplicates the --help documentation, it is not gettextized, it is displayed with ugly quotes (because argmatch uses it to display the list of possible answers), and it prevents straighforward uses of the tables of valid warning categories (for instance so that warning diagnostics end with the name of the warning). The "hidden" option --trace uses the same trick, but it does not need to be translated, nor to be described in --help. * src/getargs.c (warnings_args): Remove pseudo documentation. Comment changes. 2013-02-11 Akim Demaille <akim@lrde.epita.fr> tests: enlarge the allowed duration for calc tests Hydra "often" fails on this test: 252. calc.at:658: 252. Calculator %glr-parser api.pure parse.error=verbose %debug %locations %defines api.prefix="calc" %verbose %yacc %parse-param {semantic_value *result} %parse-param {int *count} (calc.at:658): FAILED * tests/calc.at: Give 200s instead of 100s. Use AT_DEBUG_IF. 2013-02-11 Akim Demaille <akim@lrde.epita.fr> debug: improve the display of symbol lists * src/symtab.c (symbol_print): Remove useless quotes (the symbol already has quotes). Prefer fputs. * src/symlist.c (symbol_list_syms_print): Likewise. Fix separators. 2013-02-09 Akim Demaille <akim@lrde.epita.fr> style: minor changes * src/complain.c: Space changes. * src/reader.c: Comment changes. Avoid && in assertions. * src/location.c: Move comments to... * src/location.h: here. * src/symlist.h, src/symlist.c: Create a pseudo section for members that apply to the rule. 2013-02-08 Akim Demaille <akim@lrde.epita.fr> news: restructure, document variants for C++ * NEWS: here. 2013-02-08 Akim Demaille <akim@lrde.epita.fr> c++: api.token.constructor requires api.value.type=variant Eventually it should also support "union". * data/glr.cc: Move this check to... * data/c++.m4: here, as lalr1.cc is affected too. 2013-02-05 Akim Demaille <akim@lrde.epita.fr> build: restore C90 compatibility * src/parse-gram.y, src/parse-gram.c: Don't use // comments. 2013-02-05 Akim Demaille <akim@lrde.epita.fr> doc: use @group to improve page breaking * doc/bison.texi: here. 2013-02-04 Akim Demaille <akim@lrde.epita.fr> style: rename internal "stype" as "union_members" for clarity "stype" is quite unclear, and it also collides with the former %define variable that had the same name (replaced by api.value.type). * src/parse-gram.y (stype): Rename as... (union_members): this. * data/bison.m4: Adjust. (b4_user_stype): Rename as... (b4_user_union_members): this. * data/c++.m4, data/c.m4: Adjust. * src/parse-gram.c: regen. 2013-02-04 Akim Demaille <akim@lrde.epita.fr> tests: improve the language independance layer * tests/local.at (_AT_LANG_DISPATCH): New, shamelessly stolen from Autoconf's _AT_LANG_DISPATCH. (AT_LANG_DISPATCH): New. (AT_YYERROR_FORMALS, AT_YYERROR_PROTOTYPE, AT_YYERROR_DECLARE_EXTERN) (AT_YYERROR_DECLARE, AT_YYERROR_DEFINE, AT_MAIN_DEFINE, AT_COMPILE) (AT_FULL_COMPILE): Use AT_LANG_DISPATCH instead of an ad hoc m4_case. 2013-02-04 Akim Demaille <akim@lrde.epita.fr> regen 2013-02-04 Akim Demaille <akim@lrde.epita.fr> style: space changes in the parser * src/parse-gram.y: Fix spaces. 2013-02-04 Akim Demaille <akim@lrde.epita.fr> parser: use api.pure full * src/parse-gram.y: Use api.pure full instead of silly macro tricks. 2013-02-04 Akim Demaille <akim@lrde.epita.fr> style: use a for loop instead of a while loop, and scope reduction * src/reader.c (packgram): Improve readability. The parser calls grammar_current_rule_end at the end of every rhs, which adds a NULL to separate the rules. So there is no need to check whether "p" is non-null before proceeding. 2013-02-01 Theophile Ranquet <ranquet@lrde.epita.fr> variants: stylistic change * data/variant.hh (tname): Respect the GNU Coding Standards for this pointer's declaration. 2013-02-01 Theophile Ranquet <ranquet@lrde.epita.fr> grammar: free the association tracking graph The graph introduced by Valentin wasn't free'd after use. * src/symtab.c (assoc_free): New, clear the array of linked lists with... (linkedlist_free): This, new. (print_precedence_warnings): Call assoc_free when done. (print_assoc_warnings): Free used_assoc after use. 2013-02-01 Theophile Ranquet <ranquet@lrde.epita.fr> tests: use AT_FULL_COMPILE where possible * tests/c++.at (C++ Variant-based Symbol, Variants): Here. Rename the generated input files to use .y instead of .yy, as a requirement for using AT_FULL_COMPILE instead of a combination of AT_BISON_CHECK and AT_BISON_COMPILE_CXX. 2013-02-01 Theophile Ranquet <ranquet@lrde.epita.fr> variants: avoid type punning issue This is based on what is recommended by both Scott Meyers, in 'Effective C++', and Andrei Alexandrescu and Herb Sutter in 'C++ Coding Standards'. Use a static_cast on void* rather than directly use a reinterpret_cast, which can have nefarious effects on objects. However, even though following this guideline is good practice in general, I am not quite sure how relevant it is when applied to conversions from POD to objects. Actually, it might very well be the opposite: isn't this exactly what reinterpret_cast is for? What we really want *is* to transmit the memory map as a series of bytes, which, if I am correct, falls into the kind of "low level" hack for which this cast is meant. In any case, this silences the warning, which will be greatly appreciated by anyone using variants with a compiler supporting -fstrict-aliasing. * data/variant.hh (as): Here. * tests/c++.at (Exception safety, C++ Variant-based Symbols, Variants): Don't use NO_STRICT_ALIAS_CXXFLAGS (revert commit ddb9db15), as type punning is no longer an issue. * tests/atlocal.in, configure.ac (NO_STRICT_ALIAS_CXXFLAGS): Remove definition. * examples/local.mk (NO_STRICT_ALIAS_CXXFLAGS): Remove from AM_CXXFLAGS. * doc/bison.texi: Don't mention type punning issues. 2013-02-01 Theophile Ranquet <ranquet@lrde.epita.fr> todo: update Reformulate and give more details on my thoughts concerning the graphical visualization, and add an entry about a bug in the options processing for warnings as errors. * TODO: Here. 2013-02-01 Akim Demaille <akim@lrde.epita.fr> regen 2013-02-01 Akim Demaille <akim@lrde.epita.fr> location: pass the location first * src/location.h, src/location.c (location_print): For consistency with other data structures and other location_* routines, pass the location argument first. * src/complain.c: Adjust. (location_caret): Likewise. * src/parse-gram.y: Adjust. 2013-02-01 Akim Demaille <akim@lrde.epita.fr> symlist: use the right stream * src/symlist.c (symbol_list_syms_print): Use "f", not stderr. 2013-01-30 Akim Demaille <akim@lrde.epita.fr> tests: put two related tests together * tests/conflicts.at (Useless associativity warning): Move next to "Useless precedence warning". 2013-01-30 Akim Demaille <akim@lrde.epita.fr> news: name contributors * NEWS: here. 2013-01-30 Valentin Tolmer <nitnelave1@gmail.com> warnings: introduce -Wprecedence The new warning category "precedence" flags useless precedence and associativity. -Wprecedence can now be used, it is disabled by default. The warnings about precedence and associativity are grouped into one, and the testsuite was corrected accordingly. * src/complain.h (warnings): Introduce "precedence". * src/complain.c (warnings_print_categories): Adjust. * src/getargs.c (warnings_args, warning_types): Likewise. * src/symtab.h, src/symtab.c (print_associativity_warnings): Remove. * src/symtab.h (register_assoc): Correct arguments. * src/symtab.c (print_precedence_warnings): Print both warnings together. * doc/bison.texi (Bison options): Document the warnings and provide an example. * tests/conflicts.at, tests/existing.at, tests/local.at, * tests/regression.at: Adapt the testsuite for the new category (-Wprecedence instead of -Wother where appropriate). 2013-01-30 Akim Demaille <akim@lrde.epita.fr> build: avoid clang's colored diagnostics in the test suite The syncline tests, which try to recognize compiler diagnostics, are confused by escapes for colors. * configure.ac (warn_tests): New, to factor the warnings for both C and C++ tests. Add -fno-color-diagnostics to it. * tests/local.at (AT_TEST_TABLES_AND_PARSE): Do not remove glue together compiler flags. 2013-01-30 Akim Demaille <akim@lrde.epita.fr> build: please Clang++ 3.2+ on Flex scanners Clang++, with -Wall, rejects code generated by Flex (for C scanners): CXX examples/calc++/examples_calc___calc__-calc++-scanner.o In file included from examples/calc++/calc++-scanner.cc:1: error: implicit conversion of NULL constant to 'bool' [-Werror,-Wnull-conversion] if ( ! ( (yy_buffer_stack) ? (yy_buffer_stack)[(yy_buffer_stack_top)] : __null) ) { ~ ^~~~~~ false * configure.ac (WARN_NO_NULL_CONVERSION_CXXFLAGS): Compute it. * examples/calc++/local.mk (examples_calc___calc___CXXFLAGS): Use it. 2013-01-30 Valentin Tolmer <nitnelave1@gmail.com> grammar: record used associativity and print useless ones Record which symbol associativity is used, and display useless ones. * src/symtab.h, src/symtab.c (register_assoc, print_assoc_warnings): New * src/symtab.c (init_assoc, is_assoc_used): New * src/main.c: Use print_assoc_warnings * src/conflicts.c: Use register_assoc * tests/conflicts.at (Useless associativity warning): New. Due to the new warning, many tests had to be updated. * tests/conflicts.at tests/existing.at tests/regression.at: Add the associativity warning in the expected results. * tests/java.at: Fix the java calculator's grammar to remove a useless associativity. * doc/bison.texi (mfcalc example): Fix associativity to remove warning. 2013-01-29 Valentin Tolmer <nitnelave1@gmail.com> grammar: warn about unused precedence for symbols Symbols with precedence but no associativity, and whose precedence is never used, can be declared with %token instead. The used precedence relationships are recorded and a warning about useless ones is issued. * src/conflicts.c (resolve_sr_conflict): Record precedence relation. * src/symtab.c, src/symtab.h (prec_nodes, init_prec_nodes) (symgraphlink_new, register_precedence_second_symbol) (print_precedence_warnings): New. Record relationships in a graph and warn about useless ones. * src/main.c (main): Print precedence warnings. * tests/conflicts.at: New. 2013-01-29 Theophile Ranquet <ranquet@lrde.epita.fr> variants: remove the 'built' assertions When using %define parse.assert, the variants come with additional variables that are useful for development purposes. One is a Boolean indicating if the variant is built (to make sure we don't read a non-built variant), and the other is a string describing the stored type. There is no need to have both of these, the string is enough. * data/variant.hh (built): Remove. 2013-01-29 Akim Demaille <akim@lrde.epita.fr> style: indentation fixes * src/parse-gram.y: here. 2013-01-29 Akim Demaille <akim@lrde.epita.fr> maint: be sure to neutralize out-of-tree paths from our parser * tests/bison.in: Adjust to support fixed versions of ylwrap. 2013-01-29 Theophile Ranquet <ranquet@lrde.epita.fr> m4: generate a basic_symbol constructor for each symbol type Recently, there was a slightly vicious bug hidden in the make_ functions: parser::symbol_type parser::make_TEXT (const ::std::string& v) { return symbol_type (token::TOK_TEXT, v); } The constructor for symbol_type doesn't take an ::std::string& as argument, but a constant variant. However, because there is a variant constructor which takes an ::std::string&, this caused the implicit construction of a built variant. Considering that the variant argument for the symbol_type constructor was cv-qualified, this temporary variant was never destroyed. As a temporary solution, the symbol was built in two stages: symbol_type res (token::TOK_TEXT); res.value.build< ::std::string&> (v); return res; However, the solution introduced in this patch contributes to letting the symbols handle themselves, by supplying them with constructors that take a non-variant value and build the symbol's own variant with that value. * data/variant.hh (b4_symbol_constructor_define_): Use the new constructors rather than building in a temporary symbol. (b4_basic_symbol_constructor_declare, b4_basic_symbol_constructor_define): New macros generating the constructors. * data/c++.m4 (basic_symbol): Invoke the macros here. 2013-01-29 Theophile Ranquet <ranquet@lrde.epita.fr> c++: minor stylistic changes * data/c++m4: Remove useless comment lines. * data/variant.hh (self_type): Use this typedef instead of variant<S>. (b4_symbol_constructor_define_): Remove commented-out line, and stylistic change (avoid blank line). 2013-01-29 Akim Demaille <akim@lrde.epita.fr> c++: please G++ 4.8 with -O3: type puning issue * tests/c++.at (Exception safety): Now that this test covers variants, pass -fno-strict-aliasing to g++. 2013-01-29 Akim Demaille <akim@lrde.epita.fr> c++: please G++ 4.8 with -O3: array bounds * data/c++.m4, data/lalr1.cc (by_state, by_type): Do not use -1 to denote the absence of value, as GCC then fears that this -1 might be used to dereference arrays (such as yytname). Use 0, which corresponds to $accept, which is valueless (the needed property: the symbol destructor must not try to reclaim the memory associated with the symbol). 2013-01-29 Akim Demaille <akim@lrde.epita.fr> c++: use more explicit types than int * data/c++.m4 (b4_public_types_declare): Declare token_number_type soon. Introduce symbol_number_type (wider than token_number_type). Clarify the requirement that kind_type from by_state and by_type denote the _input_ type (required by the constructor), not the stored type. Use symbol_number_type and token_number_type where appropriate, instead of int. * data/lalr1.cc: Adjust to these changes. Propagate "symbol_number_type". Invoke "type_get ()" instead of read "type" directly. 2013-01-29 Akim Demaille <akim@lrde.epita.fr> c++: value_type -> kind_type * data/c++.m4, data/lalr1.cc (by_type, by_state): Rename 'value_type' as 'kind_type', as it is clearer. 2013-01-29 Akim Demaille <akim@lrde.epita.fr> c++: improve the signature of yysyntax_error_ * data/lalr1.cc: This function is const. It takes a symbol_number_type. 2013-01-29 Akim Demaille <akim@lrde.epita.fr> c++: style changes * data/lalr1.cc: Formatting changes. And name changes. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> doxygen: upgrade Doxyfile, and complete it * doc/Doxyfile.in: Let doxygen upgrade it. (INCLUDE_PATH): Point to lib too. (PROJECT_BRIEF): New. (EXCLUDE): Update to reflect the current file hierarchy. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> maint: fix syntax-check issues * cfg.mk: Ignore strcmp in local.at. * tests/conflicts.at: Use AT_PARSER_CHECK. * tests/regression.at: Preserve the exit status of the generated parsers. * tests/local.mk ($(TESTSUITE)): Map @tb@ to a tabulation. * tests/c++.at, tests/input.at, tests/regression.at: Use @tb@. * cfg.mk: (space-tab): There are no longer exceptions. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> tests: please C90 compilers * tests/actions.at, tests/conflicts.at: Use /* ... */ comments. Let "main" return a value. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> maint: update todo * TODO: Remove fixed items. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> news: minor improvements * NEWS: Name some more contributors. Restructure slightly. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> tests: please clang and use ".cc", not ".c", for C++ input When fed with foo.c, clang++ 3.2 answers: clang: error: treating 'c' input as 'c++' when in C++ mode, this behavior is deprecated * tests/output.at (AT_CHECK_OUTPUT_FILE_NAME): Use *.cc and *.hh for C++. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> tests: formatting changes * tests/local.at: Restore proper indentation. 2013-01-28 Theophile Ranquet <ranquet@lrde.epita.fr> c++: better inline expansion Many 'inline' keywords were in the declarations. They rather belong in definitions, so move them. * data/c++.m4 (basic_symbol, by_type): Many inlines here. * data/lalr1.cc (yytranslate_, yy_destroy_, by_state, yypush_, yypop_): Inline these as well. (move): Move the definition outside the struct, where it belongs. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> tests: check that using variants is exception safe * tests/local.at: (Slightly) improve the regexp by escaping '.' when it denotes a point. (AT_VARIANT_IF): New. * tests/c++.at (Exception Safety): Run it for variants too. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> tests: remove useless %defines Many tests were using %defines because C++ skeletons used to require it. * tests/actions.at, tests/c++.at, tests/input.at, tests/regression.at: Remove useless %defines. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> c++: remove now-useless operators Now that symbols behaves properly, we can eliminate special routines that are no longer needed. * data/c++.m4, data/glr.cc, data/lalr1.cc, data/variant.hh: Remove useless assignment operators and copy constructors. As a consequence, remove useless includes for "abort". 2013-01-28 Akim Demaille <akim@lrde.epita.fr> tests: enable support for --debug * tests/c++.at (Variants): Here. And remove useless clutter when api.token.constructor is enabled. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> c++: revamp the support for variants The current approach was too adhoc: the symbols were not sufficiently self-contained, in particular wrt memory management. The "new" guideline is the one that should have been followed from the start: let the symbols handle themslves, instead of leaving their users to it. It was justified by the will to avoid gratuitious moves and copies, but the current approach does not seem to be slower, yet it will probably be simpler to adjust to support move semantics from C++11. The documentation says that the %parse-param are available from the %destructor. In retrospect, that was a silly design decision, which we can break for variants, as its a new feature. It should be phased out for non-variants too. * data/variant.hh: A variant never knows if it stores something or not, it is up to its users to store this information. Yet, in parse.assert mode, make sure the empty/filled variants are properly used. (b4_symbol_constructor_define_): Don't call directly the symbol constructor, to save a useless temporary. * data/stack.hh (push): Steal the pushed value instead of duplicating it. This will simplify the callers of push, who handled this "move" approach themselves. * data/c++.m4 (basic_symbol): Let -1, as kind, denote the fact that a symbol is empty. This is needed for instance when shifting the lookahead: yyla is given as argument to "push", and its value is then moved on the stack. But then yyla must be declared "empty" so that its destructor won't be called. (basic_symbol::move): New. Move the responsibility of calling the destructor from yy_destroy to ~basic_symbol in the case of variants. * data/lalr1.cc (stack_symbol_type): Now a derived class from its previous value, so that we can add a constructor from a symbol_type. (by_state): State -1 means empty. (yypush_): Factor, by calling one overload from the other one, and using the new semantics of stack::push. No longer reclaim by hand the memory from rhs symbols, since now that we store objects with proper destructors, they will be reclaimed automatically. Conversely, be sure to delete yylhs. * tests/c++.at (C++ Variant-based Symbols): New "unit" test for symbols. 2013-01-28 Akim Demaille <akim@lrde.epita.fr> c++: formatting and comment changes * data/c++.m4, data/lalr1.cc, data/stack.hh, data/variant.hh: Fix indentation. Fix some comments. 2013-01-27 Valentin Tolmer <nitnelave1@gmail.com> tests: add token declaration order test * tests/conflicts.at: New test. 2013-01-27 Akim Demaille <akim@lrde.epita.fr> regen 2013-01-27 Valentin Tolmer <nitnelave1@gmail.com> grammar: preserve token declaration order In a declaration %token A B, the token A is declared before B, but in %left A B (or with %precedence or %nonassoc or %right), the token B was declared before A (tokens were declared in reverse order). * src/symlist.h, src/symlist.c (symbol_list_append): New. * src/parse-gram.y: Use it instead of symbol_list_prepend. * tests/input.at: Adjust expectations. 2013-01-25 Akim Demaille <akim@lrde.epita.fr> tests: improve test group titles * tests/local.at (AT_SETUP_STRIP): AT_SETUP does not behave properly with new-lines in its argument. Remove them. Fix the handling of %define with quotes. 2013-01-25 Akim Demaille <akim@lrde.epita.fr> c: no longer require stdio.h when locations are enabled Recent changes (in 2.7) introduced a dependency on both FILE and fprintf, which are "available" only in %debug mode. This was to define yy_location_print_, which is used only in %debug mode by the parser, but massively used by the test suite to output the locations in yyerror. Break this dependency: the test suite should define its own routines to display the locations. Eventually Bison will provide the user with a means to display locations, but not yet. * data/c.m4 (b4_yy_location_print_define): Use YYFPRINTF instead of fprintf directly. * data/yacc.c (b4_yy_location_print_define): Invoke it only in %debug mode, so that stdio.h is included (needed for FILE*), and YYFPRINTF is defined. * tests/local.at (AT_YYERROR_DECLARE, AT_YYERROR_DEFINE): Declare and define location_print and LOCATION_PRINT. * tests/actions.at, tests/existing.at, tests/glr-regression.at, * tests/input.at, tests/named-refs.at, tests/regression.at: Adjust to use them. Fix the expected line numbers (as the prologue's length has changed). 2013-01-25 Akim Demaille <akim@lrde.epita.fr> c: minor simplification in the debug code * data/c.m4 (yy_symbol_print): Minor factoring. 2013-01-25 Akim Demaille <akim@lrde.epita.fr> c++: display locations as C does See commit 3804aa260b956dd012adde3894767254422a5fcf. * data/location.cc (operator<<): Display location exactly as is done in C skeletons. * tests/local.at (AT_LOC_PUSHDEF, AT_LOC_POPDEF): Also define AT_FIRST_LINE, AT_LAST_LINE, AT_FIRST_COLUMN, AT_LAST_COLUMN. * tests/actions.at (Location Print): Also check C++ skeletons. 2013-01-25 Akim Demaille <akim@lrde.epita.fr> tests: highlight empty right-hand sides * tests/actions.at, tests/c++.at, tests/headers.at, * tests/input.at: here. 2013-01-25 Akim Demaille <akim@lrde.epita.fr> news: prepare for 2.8 * NEWS: Restructure. Name contributors. 2013-01-21 Akim Demaille <akim@lrde.epita.fr> tests: generalize default main for api.namespace * tests/local.at (AT_NAME_PREFIX): Also match api.namespace. (AT_MAIN_DEFINE): Take it into account. * tests/c++.at, tests/headers.at: Use AT_NAME_PREFIX. (AT_CHECK_NAMESPACE): Rename as... (AT_TEST): this. 2013-01-21 Akim Demaille <akim@lrde.epita.fr> tests: improve factoring of the main function * tests/local.at (AT_MAIN_DEFINE): If %debug is used, check if -d/--debug is passed to the generated parser, and enable the traces. Return exactly the result of yyparse, so that we can check exit code 2 too. * tests/actions.at, tests/glr-regression.at, tests/regression.at: Use AT_MAIN_DEFINE, helping AT_BISON_OPTION_PUSHDEFS where needed, preferably to option -t. 2013-01-21 Akim Demaille <akim@lrde.epita.fr> tests: factor the definition of main With Théophile Ranquet. * tests/local.at (AT_MAIN_DEFINE): New. (AT_YYERROR_DEFINE): Improve formatting. * tests/actions.at, tests/c++.at, tests/conflicts.at, * tests/glr-regression.at, tests/input.at, tests/regression.at, * tests/skeletons.at, tests/torture.at: Adjust. * tests/c++.at: Add missing %skeleton for a PUSHDEFS, and a missing PUSH/POPDEFS for another test. 2013-01-21 Akim Demaille <akim@lrde.epita.fr> tests: minor refactoring * tests/named-refs.at: Use AT_FULL_COMPILE where applicable. 2013-01-21 Akim Demaille <akim@lrde.epita.fr> diagnostics: avoid useless caret stuttering * src/scan-code.l: When reporting a missing ending ';', don't display the guilty action twice. 2013-01-21 Theophile Ranquet <ranquet@lrde.epita.fr> examples: please clang * doc/bison.texi (calc++-scanner.ll): Don't output useless yyinput function. 2013-01-21 Theophile Ranquet <ranquet@lrde.epita.fr> tests: better silencing of unused argument warnings input.yy:35:44: error: unused parameter 'msg' [-Werror,-Wunused-parameter] void yy::parser::error (std::string const& msg) ^ * tests/c++.at (C++ GLR parser identifier shadowing): Don't name unused argument, use YYUSE instead of a direct cast to void. 2013-01-21 Theophile Ranquet <ranquet@lrde.epita.fr> bench: compatibility for Bison <= 2.7 There used to be a bug in some skeletons, which caused the expansion of 'yylval' and 'yylloc', generating these errors: input.cc:547:16: error: expected ',' or '...' before '(' token #define yylval (yystackp->yyval) ^ input.yy:29:39: note: in expansion of macro 'yylval' int yylex (yy::parser::semantic_type *yylval) ^ This bug is fixed by 'skel: better aliasing of identifiers', but a workaround is useful when benchmarking against older versions of Bison, which are still affected by the bug. * etc/bench.pl.in: Rename yylval to yylvalp and yylloc to yyllocp in base grammar 'list'. 2013-01-15 Theophile Ranquet <ranquet@lrde.epita.fr> c++: remove useless inlines * data/c++.m4 (basic_symbol): Keep 'inline' in the prototypes, but don't duplicate it in the implementation. * data/variant.hh (variant): 'inline' is not needed when the implementation is provided in the class definition. 2013-01-15 Theophile Ranquet <ranquet@lrde.epita.fr> c++: m4 stylistic change * data/c++.m4 (syntax_error): Fix the indentation of 'inline'. 2013-01-14 Theophile Ranquet <ranquet@lrde.epita.fr> c++: silence warnings * data/c++.m4 (basic_symbol<Base>::operator=): Unused parameter. * tests/c++.at (C++ GLR parser identifier shadowing): Here too. - 2013-01-14 Theophile Ranquet <ranquet@lrde.epita.fr> news: typos * NEWS: Fix a typo, use YYSTYPE rather than semantic_type. 2013-01-12 Akim Demaille <akim@lrde.epita.fr> regen 2013-01-12 Akim Demaille <akim@lrde.epita.fr> maint: update copyright years Suggested by Stefano Lattarini. Run "make update-copyright". 2013-01-12 Akim Demaille <akim@lrde.epita.fr> build: fix VPATH issue * Makefile.am (update-b4-copyright, update-package-copyright-year): Fix path to build-aux. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> carets: document default activation * NEWS: Announce it. * doc/bison.texi: Adjust. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> carets: show them in more tests * tests/input.at, tests/named-refs.at: Here. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> carets: activate by default * src/getargs.c (feature_flag): Here. * tests/local.at (AT_BISON_CHECK_, AT_BISON_CHECK_NO_XML): Deactivate carets for the testsuite, by default. * tests/input.at: Adjust the locations for command line definitions. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> variants: document move and swap * data/variant.hh (swap): Doc. (build): Rename as... (move): This, more coherent naming with clearer meaning. * data/c++.m4 (move): Adjust. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> c++: privatize variant blind copies * data/variant.hh (variant, operator=): Make private. * data/c++.m4 (operator=): New, to avoid needing a definition of that operator for each class member (such as a possible variant). * data/glr.cc, data/lalr.cc: Add the necessary include for the abort. 2013-01-11 Akim Demaille <akim@lrde.epita.fr> glr.c: fix an unused argument issue * data/glr.c (yyuserAction): "Use" yyrhslen, as in variant mode, we might not use it. 2013-01-11 Akim Demaille <akim@lrde.epita.fr> glr.c: style changes * data/glr.c (yyuserAction): Use a size_t for sizes. 2013-01-11 Akim Demaille <akim@lrde.epita.fr> c.m4: style fix * data/c.m4 (b4_parse_param_use): Add missing space before paren. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> skel: better aliasing of identifiers * data/glr.c, data/yacc.c: Avoid emitting useless defines. * data/glr.cc: Restore prefixes for epilogue. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> glr.cc: fatal if using api.token.ctor without variants * data/glr.cc: Here. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> skel: correctly indent switch cases * data/bison.m4 (b4_type_action_): Here. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> variants: assert changes * data/variant.hh (swap): More asserts can't hurt. Don't perform useless swaps. (build): Deactivate problematic asserts, pending further investigation. (variant): Prohibit copy construction. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> lalr1.cc: use a vector for the symbol stack * data/lalr1.cc: Adjust includes. * data/stack.hh (push, pop): Use push_back and pop_back. (operator []): Access vector from the end. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> lalr1.cc: change symbols implementation A "symbol" groups together the symbol type (INT, PLUS, etc.), its possible semantic value, and its optional location. The type is needed to access the value, as it is stored as a variant/union. There are two kinds of symbols. "symbol_type" are "external symbols": they have type, value and location, and are returned by yylex. "stack_symbol_type" are "internal symbols", they group state number, value and location, and are stored in the parser stack. The type of the symbol is computed from the state number. The class template symbol_base_type<Exact> factors the code common to stack_symbol_type and symbol_type. It uses the Curiously Recurring Template pattern so that we can always (static_) downcast to the exact type. symbol_base_type features value and location, and delegates the handling of the type to its parameter. When trying to generalize the support for variant, a significant issue was revealed: because stack_symbol_type and symbol_type _derive_ from symbol_base_type, the type/state member is defined _after_ the value and location. In C++ the order of the definition of the members defines the order in which they are initialized, things go backward: the value is initialized _before_ the type. This is wrong, since the type is needed to access the value. Therefore, we need another means to factor the common code, one that ensures the order of the members. The idea is simple: define two (base) classes that code the symbol type ("by_type" codes it by its type, and "by_state" by the state number). Define basic_symbol<Base> as the class template that provides value and location support. Make it _derive_ from its parameter, by_type or by_state. Then define stack_symbol_type and symbol_type as basic_symbol<by_state>, basic_symbol<by_type>. The name basic_symbol was chosen by similarity with basic_string and basic_ostream. * data/c++.m4 (symbol_base_type<Exact>): Remove, replace by... (basic_symbol<Base>): which derives from its parameter, one of... (by_state, by_type): which provide means to retrieve the actual type of symbol. (symbol_type): Is now basic_symbol<by_type>. (stack_symbol_type): Is now basic_symbol<by_state>. * data/lalr1.cc: Many adjustments. 2013-01-11 Theophile Ranquet <ranquet@lrde.epita.fr> bench: add %b directive to use a specific Bison For example, $ bench.pl -v '%s lalr1.cc & %d variant & ( %b ~/old-bison/bin/bison | %b ~/new-bison/bin/bison )' -g list -i 10000 * etc/bench.pl.in: Here. 2013-01-09 Akim Demaille <akim@lrde.epita.fr> regen 2013-01-04 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-12-31 Akim Demaille <akim@lrde.epita.fr> doc: use deffn to declare the list of %define variables * doc/bison.texi (%define Summary): Use @deffn instead of @table, it spares a lot of width, especially in PDF, and looks nicer in the other formats too. It is also more consistent with the rest of the document. 2012-12-31 Akim Demaille <akim@lrde.epita.fr> doc: minor completion and fixes * doc/bison.texi (%define Summary): Provide more history to some variables. 2012-12-31 Akim Demaille <akim@lrde.epita.fr> java: stype is obsoleted by api.value.type This is consistent with the other %define variable names. * data/java.m4: Use api.value.type instead of stype. * doc/bison.texi, NEWS: Document that change. * src/muscle-tab.c (muscle_percent_variable_update): Provide backward compatibility. * tests/java.at: Adjust. 2012-12-31 Akim Demaille <akim@lrde.epita.fr> doc: fix html build * doc/local.mk (bison.html): Fix dependencies. 2012-12-31 Akim Demaille <akim@lrde.epita.fr> todo: remove erroneous task * tests/input.at: Check that there are no warnings about stray $ and @ in the epilogue. * TODO: Remove the correponding task. 2012-12-31 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-12-28 Akim Demaille <akim@lrde.epita.fr> regen 2012-12-28 Akim Demaille <akim@lrde.epita.fr> syncline: one line is enough So far we were issuing two lines for each syncline change: /* Line 356 of yacc.c */ #line 1 "src/parse-gram.y" This is a lot of clutter, especially when reading diffs, as these lines change often. Fuse them into a single, shorter, line: #line 1 "src/parse-gram.y" /* yacc.c:356 */ * data/bison.m4 (b4_syncline): Issue a single line. Comment improvements. (b4_sync_start, b4_sync_end): Issue a shorter comment. * data/c++.m4 (b4_semantic_type_declare): b4_user_code must be on its own line as it might start with a "#line" directive. 2012-12-28 Akim Demaille <akim@lrde.epita.fr> regen 2012-12-28 Akim Demaille <akim@lrde.epita.fr> maint: restore ANSI 89 compliance * data/bison.m4, src/conflicts.c, src/files.c, src/output.c, * src/symtab.c: Use /* ... */ comments only. Declare variables before statements. 2012-12-28 Akim Demaille <akim@lrde.epita.fr> graph: minor simplification * src/gram.c (print_lhs): Use %*s to indent. * src/print_graph.c (print_lhs): Use obstack_printf. Became simple enough to be inlined in... (print_core): here. Use a "rule*" instead of an index in "rules[]". 2012-12-28 Akim Demaille <akim@lrde.epita.fr> closure, gram: add missing const * src/closure.h, src/closure.c, src/gram.h, src/gram.c: Add some missing const where appropriate. 2012-12-27 Theophile Ranquet <ranquet@lrde.epita.fr> carets: properly display when no line feed is present * src/location.c (location_caret): finish the line with one whether or not it is present in input. Rewrite code without getline. (cleanup_caret): Reset the caret_info global. * bootstrap.conf: No longer require getline. 2012-12-27 Theophile Ranquet <ranquet@lrde.epita.fr> scanner: reintroduce unput for missing end tokens Unput was no longer used since a POSIX-compatiblity issue with Flex 2.5.31, which has been adressed in newer versions of Flex. See this discussion: <http://lists.gnu.org/archive/html/bug-bison/2003-04/msg00029.html> This partially reverts commit aa4180418fff518198e1b0f2c43fec6432210dc7. * src/scan-gram.l (unexpected_end): Here. * tests/input.at: Adjust for new order of error reports. 2012-12-27 Akim Demaille <akim@lrde.epita.fr> tables: scope reduction * src/tables.c (default_goto): Make it easier to understand. 2012-12-27 Akim Demaille <akim@lrde.epita.fr> regen 2012-12-27 Akim Demaille <akim@lrde.epita.fr> skeletons: fix comments The commit 38de4e570fdc7c8db9633c3b2054e565d8c1c6b9 underquoted the content of the comments, which resulted in losing square brackets in the comments. Besides, some other invocations were underquoting the effective arguments. * data/c.m4 (b4_comment_): Properly quote the comment. (b4_comment_, b4_comment): Move to... * data/c-like.m4: here, so that... * data/java.m4: can use it instead of its own copy. * data/bison.m4 (b4_integral_parser_tables_map): Fix some comments. * data/lalr1.cc, data/lalr1.java, data/yacc.c: Comment fixes. * data/lalr1.cc: Reorder a bit to factor some CPP directives. 2012-12-27 Akim Demaille <akim@lrde.epita.fr> maint: which -> whose Apparently, I was confusing both. * data/bison.m4, data/c.m4, data/glr.c, data/lalr1.cc, data/yacc.c: Use "whose" where appropriate. 2012-12-26 Akim Demaille <akim@lrde.epita.fr> tables: scope reduction * src/tables.c (matching_state): here. 2012-12-26 Akim Demaille <akim@lrde.epita.fr> tables: scope reduction * src/tables.c (token_actions): here. 2012-12-26 Akim Demaille <akim@lrde.epita.fr> tables: scope reduction * src/tables.c (save_row): here. 2012-12-26 Akim Demaille <akim@lrde.epita.fr> tables: scope reduction * src/tables.c (save_column, pack_vector): Reduce the scope to emphasize the structure of the code. Rename the returned value "res" to make understanding easier. 2012-12-26 Akim Demaille <akim@lrde.epita.fr> tables: use size_t where appropriate These changes aim at making the code easier to understand. * src/tables.c (tally): This is a size, always >= 0, so make it a size_t. 2012-12-26 Akim Demaille <akim@lrde.epita.fr> tables: style changes * src/tables.c: Prefer < to >. Fix/complete some comments. Remove useless parens. 2012-12-26 Akim Demaille <akim@lrde.epita.fr> skeletons: no longer call yylex via a CPP macro The YYLEX existed only to support YYLEX_PARAM, which is now removed. This macro was a nuisance, since incorrect yylex calls where pointed the macro _use_, instead of its definition. * data/c.m4 (b4_lex_formals, b4_lex): New. * data/glr.c, data/yacc.c: Use it. * data/lalr1.cc (b4_lex): New. Use it. squash! skeletons: no longer call yylex via a CPP macro 2012-12-26 Akim Demaille <akim@lrde.epita.fr> YYLEX_PARAM: drop support * data/yacc.c, doc/bison.texi: Remove YYLEX_PARAM support. * NEWS: Document it. 2012-12-26 Akim Demaille <akim@lrde.epita.fr> examples: minor improvements * examples/variant.yy: Don't use debug_stream(), obsoleted. Use <*>. 2012-12-26 Akim Demaille <akim@lrde.epita.fr> skeletons: factor comments about symbols * data/variant.hh (b4_char_sizeof_): Rename as... * data/bison.m4 (b4_symbol_tag_comment): this. Provide more documentation about b4_symbol_*. 2012-12-26 Akim Demaille <akim@lrde.epita.fr> c: improve the definition of public types * data/c.m4 (b4_token_enum): Improve comments. (b4_value_type_define, b4_location_type_define): New, extracted from... (b4_declare_yylstype): here. Separate the typedefs from the union/struct definitions. 2012-12-26 Akim Demaille <akim@lrde.epita.fr> doc: update variant usage * doc/bison.texi, examples/variant.yy: Use "%define api.value.type variant", instead of "%define variant". 2012-12-26 Akim Demaille <akim@lrde.epita.fr> tests: check the "%define variant" is deprecated. * tests/input.at: Rename some AT_SETUP to avoid that AT_SETUP_STRIP thinks they contain %define directives. ("%define" backward compatibility): Merge tests together to speed up the test suite, and to make maintenance easier (multiple AT_CHECK means multiple runs of the test suite to be sure to have updated all the error messages). Check the "%define variant" is properly obsoleted. 2012-12-23 Akim Demaille <akim@lrde.epita.fr> %define variables: support value changes in deprecation * src/muscle-tab.c (define_directive): Be robust to "assignment" containing '='. (muscle_percent_variable_update): Upgrade "variant" to "api.value.type". Support such upgrade patterns. Adjust callers. * data/bison.m4: Use api.value.type for variants. * tests/c++.at: Adjust tests. 2012-12-23 Akim Demaille <akim@lrde.epita.fr> diagnostics: treat obsolete %define variable names as obsolete directives Instead of warning: deprecated %define variable name: 'namespace', use 'api.namespace' [-Wdeprecated] display (in -fno-caret mode): warning: deprecated directive: '%define namespace foo', use '%define api.namespace foo' [-Wdeprecated] and (in -fcaret mode): warning: deprecated directive, use '%define api.namespace toto' [-Wdeprecated] %define namespace toto ^^^^^^^^^ This is in preparation of cases where not only the variable is renamed, but the values are too: warning: deprecated directive: '%define variant', use '%define api.value.type variant' [-Wdeprecated] * src/muscle-tab.c (define_directive): New. (muscle_percent_variable_update): Take the value as argument, and use it in the diagnostics. Loop with a pointer instead of an index. * tests/input.at (%define backward compatibility): Adjust. 2012-12-23 Akim Demaille <akim@lrde.epita.fr> diagnostics: factor the deprecated directive message * src/complain.h, src/complain.c (deprecated_directive): New. * src/muscle-tab.c: Use it. 2012-12-23 Akim Demaille <akim@lrde.epita.fr> variant: produce stable results Improve the output by ensuring a well defined order for type switches. * src/uniqstr.h: Style changes for macro arguments. (UNIQSTR_CMP): Replace by... (uniqstr_cmp): this. * src/uniqstr.c (uniqstr_cmp): New. Produce well defined results. * src/output.c: Use it. 2012-12-23 Akim Demaille <akim@lrde.epita.fr> uniqstr: formatting changes * src/uniqstr.h: Sort functions by object type. 2012-12-23 Akim Demaille <akim@lrde.epita.fr> skeletons: fix an error message * data/bison.m4 (b4_flag_if): Display the invalid value. 2012-12-23 Akim Demaille <akim@lrde.epita.fr> tests: improve titles * tests/local.at (AT_SETUP_STRIP): New. (AT_SETUP): Use it to shorten the test titles: remove %defines, %language and %skeleton whose arguments suffice. * tests/synclines.at: Use more precise AT_SETUP. 2012-12-23 Akim Demaille <akim@lrde.epita.fr> c++: comment changes * data/c++.m4, data/glr.cc, data/lalr1.cc: Convert some /* ... */ comments to //. 2012-12-23 Akim Demaille <akim@lrde.epita.fr> c++: use // comments in the output This is mostly used for the license header, the synclines, and the generated tables: - /* STOS_[STATE-NUM] -- The (internal number of the) accessing - symbol of state STATE-NUM. */ + // STOS_[STATE-NUM] -- The (internal number of the) accessing + // symbol of state STATE-NUM. static const unsigned char yystos_[]; * data/c.m4: Comment changes. (b4_comment_): Expand the text argument. Before this change, we were actually formatting M4 code as a C comment, and then expand it. (b4_comment): Fix the closing of comments: there is no reason to add the (line) prefix before the closing "*/". * data/c++.m4 (b4_comment): New. 2012-12-21 Akim Demaille <akim@lrde.epita.fr> maint: disable sc_prohibit_test_backticks * cfg.mk: here. And fix typos. Reported by Stefano Lattarini. 2012-12-21 Akim Demaille <akim@lrde.epita.fr> maint: more syntax-checks * cfg.mk (sc_prohibit_tab_based_indentation, sc_prohibit_test_backticks) (sc_preprocessor_indentation, sc_space_before_open_paren): New, stolen from Coreutils (2e9f5ca4ebbbdb6a9fa2dd3d5add3f7720a172d7). 2012-12-21 Akim Demaille <akim@lrde.epita.fr> debug: no longer generate tabs * src/closure.c, src/derives.c, src/nullable.c, tests/sets.at: Use spaces. 2012-12-21 Akim Demaille <akim@lrde.epita.fr> style changes: run cppi Run it in src/ for a start. * src/AnnotationList.h, src/InadequacyList.h, src/Sbitset.h, * src/closure.c, src/complain.h, src/flex-scanner.h, src/getargs.h, * src/gram.h, src/graphviz.h, src/ielr.h, src/location.h, * src/muscle-tab.h, src/named-ref.h, src/relation.h, src/scan-code.h, * src/state.h, src/symtab.h, src/system.h, src/uniqstr.h: Reindent preprocessor directives. 2012-12-21 Akim Demaille <akim@lrde.epita.fr> style changes: untabify * data/xslt/xml2dot.xsl, data/xslt/xml2text.xsl, m4/flex.m4, * tests/glr-regression.at, tests/torture.at: here. 2012-12-21 Akim Demaille <akim@lrde.epita.fr> tests: be robust to set -e. * examples/test (run): here. 2012-12-19 Akim Demaille <akim@lrde.epita.fr> variants: prohibit simple copies The "variant" structure provides a means to store, in a typeless way, C++ objects. Manipulating it without provide the type of the stored content is doomed to failure. So provide a means to copy in a type safe way, and prohibit typeless assignments. * data/c++.m4 (symbol_type::move): New. * data/lalr1.cc: Use it. * data/variant.hh (b4_variant_define): Provide variant::copy. Let variant::operator= abort. We cannot undefine it, yet, as it is still uses by the implicit assigment in symbols, which must also be disabled. 2012-12-19 Akim Demaille <akim@lrde.epita.fr> variant: more assertions Equip variants with more checking code. Provide a means to request includes. * data/variant.hh (b4_variant_includes): New. * data/lalr1.cc: Use it. * data/variant.hh (variant::built): Define at the end, as a private member. (variant::tname): New. Somewhat makes "built" useless, but let's keep both for a start, in case using "typeinfo" is considered unacceptable in some environments. Fix some formatting issues. 2012-12-19 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-12-19 Akim Demaille <akim@lrde.epita.fr> skeletons: fix output directives * data/lalr1.cc, data/location.cc, data/glr.cc: Use b4_output_begin. Broken during a merge. 2012-12-19 Akim Demaille <akim@lrde.epita.fr> yacc.c: style changes * data/yacc.c (b4_lex_param): Provide arguments with a name. 2012-12-19 Akim Demaille <akim@lrde.epita.fr> glr.cc: simplifying the handling of parse/lex params The fact that glr.cc uses glr.c makes the handling of parse params more complex, as the parser object of glr.cc must be passed to the parse function of glr.c. Yet not all the functions need access to the parser object. * data/glr.cc (b4_parse_param_wrap): New. Use them. 2012-12-19 Akim Demaille <akim@lrde.epita.fr> glr: rename lex params * data/glr.c (b4_lex_param): Rename as... (b4_lex_formals): this, for consistency. Provide arguments a name. (LEX): Adjust. 2012-12-19 Akim Demaille <akim@lrde.epita.fr> glr.c: move function declaration earlier * data/glr.c (yypstack, yypdumpstack): Declare earlier, to make it easier to call them from other functions. 2012-12-19 Akim Demaille <akim@lrde.epita.fr> %define variables: backward compatibility * src/muscle-tab.c (muscle_percent_variable_update): Accept lex_symbol. Reported by Roland Levillain. 2012-12-16 Akim Demaille <akim@lrde.epita.fr> diagnostics: improve -fcaret for list of accepted values Instead of input.y:1.9-21: error: invalid value for %define variable 'api.push-pull': 'neither' %define api.push_pull "neither" ^^^^^^^^^^^^^ input.y:1.9-21: accepted value: 'pull' %define api.push_pull "neither" ^^^^^^^^^^^^^ input.y:1.9-21: accepted value: 'push' %define api.push_pull "neither" ^^^^^^^^^^^^^ input.y:1.9-21: accepted value: 'both' %define api.push_pull "neither" ^^^^^^^^^^^^^ report input.y:1.9-21: error: invalid value for %define variable 'api.push-pull': 'neither' %define api.push_pull "neither" ^^^^^^^^^^^^^ input.y:1.9-21: accepted value: 'pull' input.y:1.9-21: accepted value: 'push' input.y:1.9-21: accepted value: 'both' * src/complain.h (no_caret): New. * src/complain.c (error_message): Use it. * src/muscle-tab.c (muscle_percent_define_check_values): Use it. * src/scan-skel.l (flag): Ditto. * tests/input.at: Adjust and check. 2012-12-16 Akim Demaille <akim@lrde.epita.fr> skeletons: simplify the handling of default api.location.type * data/bison.m4 (b4_bison_locations_if): New. * data/glr.cc, data/lalr1.cc: Use it. 2012-12-16 Akim Demaille <akim@lrde.epita.fr> tests: address syntax-check failures * cfg.mk: Ignore failures in timevar (uses GCC style configuration, not gnulib's). * doc/local.mk: Space changes. * lib/main.c, tests/calc.at: Remove useless HAVE_ tests. 2012-12-15 Akim Demaille <akim@lrde.epita.fr> remove duplicate definitions * src/system.h: here, inherited from a merge. 2012-12-15 Akim Demaille <akim@lrde.epita.fr> tests: style changes * tests/glr-regression.at: Issue yyerror before yylex. 2012-12-15 Akim Demaille <akim@lrde.epita.fr> doc: fix dependencies * doc/local.mk: here. 2012-12-14 Akim Demaille <akim@lrde.epita.fr> doc: style fixes * doc/bison.texi: Add a couple of missing @var and @code. 2012-12-14 Theophile Ranquet <ranquet@lrde.epita.fr> doc: fix build dependencies Suggested by Nick Bowler <http://lists.gnu.org/archive/html/bug-automake/2012-12/msg00001.html> * doc/local.mk: Avoid overwriting Automake's rules. 2012-12-14 Akim Demaille <akim@lrde.epita.fr> Merge branch 'origin/maint' * origin/maint: maint: credit Wojciech Polak maint: post-release administrivia version 2.7 yacc.c: scope reduction tests: C90 compliance fix C90 compliance glr.c: scope reduction gnulib: update 2012-12-14 Theophile Ranquet <ranquet@lrde.epita.fr> symtab: add missing initializations * src/symtab.c (semantic_type_new): Here. 2012-12-14 Theophile Ranquet <ranquet@lrde.epita.fr> symtab: fix some leaks * src/symlist.c (symbol_list_free): Deep free it. * src/symtab.c (symbols_free, semantic_types_sorted): Free it too. (symbols_do, sorted): Call by address. 2012-12-14 Theophile Ranquet <ranquet@lrde.epita.fr> tests: remove use of PARSE_PARAM * tests/header.at: Here. 2012-12-13 Akim Demaille <akim@lrde.epita.fr> maint: credit Wojciech Polak * NEWS, THANKS: He is the author of XML support (including XSLTs). 2012-12-12 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-12-12 Akim Demaille <akim@lrde.epita.fr> version 2.7 * NEWS: Record release date. 2012-12-12 Akim Demaille <akim@lrde.epita.fr> yacc.c: scope reduction * data/yacc.c (yysyntax_error): here. 2012-12-12 Akim Demaille <akim@lrde.epita.fr> tests: C90 compliance * tests/synclines.at: here. 2012-12-12 Akim Demaille <akim@lrde.epita.fr> fix C90 compliance * data/glr.c, src/graphviz.h, src/ielr.c, src/scan-gram.l, * src/system.h, tests/actions.at, tests/glr-regression.at: Do not use // comments. Do not introduce variables after statements. Provide "main" with a return value. 2012-12-12 Akim Demaille <akim@lrde.epita.fr> glr.c: scope reduction * data/glr.c (yyreportSyntaxError): Reduce the scope of yysize1 (now yysz). 2012-12-12 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-12-10 Theophile Ranquet <ranquet@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: news: prepare for forthcoming release doc: explain how mid-rule actions are translated error: use better locations for unused midrule values doc: various minor improvements and fixes tests: ignore more useless compiler warnings tests: be robust to C being compiled with a C++11 compiler build: beware of Clang++ not supporting POSIXLY_CORRECT maint: post-release administrivia version 2.6.90 build: fix syntax-check error. cpp: simplify the Flex version checking macro news: improve the carets example and fix a typo cpp: improve the Flex version checking macro carets: improve the code maint: update news build: keep -Wmissing-declarations and -Wmissing-prototypes for modern GCCs build: drop -Wcast-qual gnulib: update 2012-12-09 Akim Demaille <akim@lrde.epita.fr> news: prepare for forthcoming release * NEWS: Fill paragraph. Reorder. Update examples. Remove line for 2.6.90. 2012-12-09 Akim Demaille <akim@lrde.epita.fr> doc: explain how mid-rule actions are translated * doc/bison.texi (Actions in Mid-Rule): Mention and use named references. Split into three subsections, among which... (Mid-Rule Action Translation): this new section. 2012-12-09 Akim Demaille <akim@lrde.epita.fr> error: use better locations for unused midrule values On %% exp: {;} {$$;} { $$ = $1; } instead of reporting (with -fcaret -Wmidrule-value) midrule.y:2.6-8: warning: unset value: $$ [-Wmidrule-values] exp: {;} {$$;} { $$ = $1; } ^^^ midrule.y:2.6-27: warning: unused value: $2 [-Wmidrule-values] exp: {;} {$$;} { $$ = $1; } ^^^^^^^^^^^^^^^^^^^^^^ report midrule.y:2.6-8: warning: unset value: $$ exp: {;} {$$;} { $$ = $1; } ^^^ midrule.y:2.10-14: warning: unused value: $2 exp: {;} {$$;} { $$ = $1; } ^^^^^ * src/reader.c (grammar_rule_check): When warning about the value of a midrule action, use the location of the midrule action instead of the location of the rule. the location of the part of the rule. * tests/actions.at (Default %printer and %destructor for mid-rule values): Adjust expectations * tests/input.at (Unused values with default %destructor): Ditto. (AT_CHECK_UNUSED_VALUES): Ditto. And use -fcaret. 2012-12-09 Akim Demaille <akim@lrde.epita.fr> doc: various minor improvements and fixes * doc/figs/example.dot, doc/figs/example.y: New. * doc/bison.texi: Prefer "token" to TOKEN. Use @group where appropriate. Adjust with style changes in the output (State 0, not state 0). Fix some @ref that were missing the third argument. Fix some incorrect line numbers. Use "nonterminal", not "non-terminal". Fix overfull and underfull TeX hboxes. Put the comments in the index. Remove duplicate index entries. Fuse glossary entries where appropriate. (Understanding): Improve the continuity between sections. Use example.dot to show the whole graph. * doc/Makefile.am: Adjust. 2012-12-09 Akim Demaille <akim@lrde.epita.fr> tests: ignore more useless compiler warnings * tests/synclines.at (AT_SYNCLINES_COMPILE): Ignore complains about using c++ to compile C. 2012-12-09 Akim Demaille <akim@lrde.epita.fr> tests: be robust to C being compiled with a C++11 compiler * tests/glr-regression.at: Use YY_NULL instead of NULL. Comment changes. 2012-12-09 Akim Demaille <akim@lrde.epita.fr> build: beware of Clang++ not supporting POSIXLY_CORRECT * m4/c-working.m4 (BISON_LANG_COMPILER_POSIXLY_CORRECT): New. (BISON_C_COMPILER_POSIXLY_CORRECT): Use it. For consistency with C++, also define BISON_C_WORKS. * m4/cxx.m4 (BISON_CXX_COMPILER_POSIXLY_CORRECT): New. * configure.ac: Use it. * tests/atlocal.in: Get its result. Propagate properly CXX values when used to compile C. When POSIXLY_CORRECT, adjust BISON_C_WORKS and BISON_CXX_WORKS. * tests/local.at (AT_COMPILE): Use BISON_C_WORKS. 2012-12-07 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-12-07 Akim Demaille <akim@lrde.epita.fr> version 2.6.90 * NEWS: Record release date. 2012-12-07 Akim Demaille <akim@lrde.epita.fr> build: fix syntax-check error. * cfg.mk: Exclude names-refs, it includes a "double" if (end of first line, first of second line below). test.y:43.12-44.59: symbol not found in production: if if-stmt-a: IF expr[cond] THEN stmt.list[then] ELSE stmt.list[else] FI ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ 2012-12-07 Theophile Ranquet <ranquet@lrde.epita.fr> cpp: simplify the Flex version checking macro * src/flex-scanner,h (FLEX_VERSION): Consider YY_FLEX_SUBMINOR_VERSION defined. 2012-12-07 Theophile Ranquet <ranquet@lrde.epita.fr> news: improve the carets example and fix a typo * NEWS: Here. 2012-12-07 Theophile Ranquet <ranquet@lrde.epita.fr> cpp: improve the Flex version checking macro * src/flex-scanner.h (FLEX_VERSION): Here. 2012-12-07 Theophile Ranquet <ranquet@lrde.epita.fr> carets: improve the code * src/location.c: Remove duplicate documentations. (caret_info): Stylistic change. (location_caret): Many reworks. 2012-12-07 Akim Demaille <akim@lrde.epita.fr> maint: update news * NEWS: There is no 2.6.6, remove its stub. 2012-12-07 Akim Demaille <akim@lrde.epita.fr> build: keep -Wmissing-declarations and -Wmissing-prototypes for modern GCCs Fixes a -Werror failure of xalloc.h used in src. From Eric Blake. http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00006.html * configure.ac: Check whether GCC pragma diagnostic push/pop works. Enable these warnings for bison if it does. Enable these warnings for the test suite anyway. 2012-12-07 Akim Demaille <akim@lrde.epita.fr> build: drop -Wcast-qual Suggested by Jim Meyering. http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00017.html * configure.ac (warn_common): Remove -Wcast-qual. 2012-12-07 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-12-06 Theophile Ranquet <ranquet@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: misc: pacify the Tiny C Compiler cpp: make the check of Flex version portable misc: require getline c++: support wide strings for file names doc: document carets tests: enhance existing tests with carets errors: show carets getargs: add support for --flags/-f 2012-12-06 Theophile Ranquet <ranquet@lrde.epita.fr> misc: pacify the Tiny C Compiler * src/graphviz.c (conclude_red): Remove a useless return. 2012-12-05 Theophile Ranquet <ranquet@lrde.epita.fr> cpp: make the check of Flex version portable This was problematic with tcc 0.9.25 * src/flex-scanner.h (FLEX_VERSION_GT): Rewrite and rename as... (FLEX_VERSION): This. 2012-12-05 Theophile Ranquet <ranquet@lrde.epita.fr> misc: require getline * bootstrap.conf: Here, used by src/location.c. * src/getargs.c (long_options): Rename --flags to --feature. 2012-12-05 Akim Demaille <akim@lrde.epita.fr> c++: support wide strings for file names Reported by Mark Boyall. http://lists.gnu.org/archive/html/help-bison/2011-08/msg00002.html * data/location.cc (operator<<): Be templated on the type of output stream. * tests/headers.at (Several parsers): Adjust. 2012-12-05 Theophile Ranquet <ranquet@lrde.epita.fr> doc: document carets * NEWS: Announce it. * doc/bison.texi (Bison Options): Here. 2012-12-05 Theophile Ranquet <ranquet@lrde.epita.fr> tests: enhance existing tests with carets * tests/actions.at: Unset value. * tests/conflicts.at: Rule useless due to conflicts. * tests/input.at: Missing terminator, unexpected end of file, command line redefinition of variable. * tests/named-refs.at: Many errors. * tests/reduce.at: Useless nonterminals and rules. * tests/regression.at: Large token. 2012-12-05 Theophile Ranquet <ranquet@lrde.epita.fr> errors: show carets * src/locations.c (caret_info): New, persistant information useful for... (location_caret): New, print a caret. (cleanup_caret): Release caret_info cleanly, call it... * src/main.c (main): Here. * src/complain.c (error_message): Call location_caret here. 2012-12-05 Theophile Ranquet <ranquet@lrde.epita.fr> getargs: add support for --feature/-f Introduce -fdiagnostics-show-caret * src/getargs.c (feature_flag): New global. * src/getargs.h (feature): New enum. 2012-12-05 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: getargs: don't label --language/-l as experimental getargs: fix the locations of command-line input errors: indent missing action code semicolon warning 2012-12-04 Theophile Ranquet <ranquet@lrde.epita.fr> getargs: don't label --language/-l as experimental * NEWS: Announce it. * doc/bison.texi, src/getargs.c (usage): Here. 2012-12-03 Akim Demaille <akim@lrde.epita.fr> tests: minor improvements * tests/calc.at (AT_CHECK_SPACES): To speed up, accept several files at once, and factor some calls. 2012-12-03 Theophile Ranquet <ranquet@lrde.epita.fr> getargs: fix the locations of command-line input * src/getargs.c (command_line_location): Here. * tests/input.at: Adjust. 2012-12-03 Theophile Ranquet <ranquet@lrde.epita.fr> errors: indent missing action code semicolon warning Also, remove a duplicate #define. * src/scan-code.l (SC_RULE_ACTION): Here. * tests/actions.at: Adjust. 2012-12-03 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: parser: accept #line NUM m4: use a safer pattern to enable/disable output tests: beware of gnulib's need for config.h gnulib: update yacc.c, glr.c: check and fix the display of locations formatting changes glr.c: remove stray macro 2012-12-03 Akim Demaille <akim@lrde.epita.fr> parser: accept #line NUM * src/scan-gram.l (scanner): Accept '#line NUM'. (handle_syncline): Adjust to the possible missing file name. 2012-12-03 Akim Demaille <akim@lrde.epita.fr> m4: use a safer pattern to enable/disable output Work on some other areas of Bison revealed that some macros expanded to be expanded only once were actually expanded several times. This was due to the fact that changecom was not properly restored each time, and macro names appearing in comments were then expanded. Introduce begin/end macros which are easier to match that changecom()/changecom(#). * data/bison.m4 (b4_output_begin, b4_output_end): New. * data/glr.c, data/glr.cc, data/lalr1.cc, data/lalr1.java, * data/location.cc, data/stack.hh, data/yacc.c: Use them. 2012-12-03 Akim Demaille <akim@lrde.epita.fr> tests: beware of gnulib's need for config.h * tests/skeletons.at, tests/torture.at: Be sure to include config.h where appropriate. 2012-11-30 Akim Demaille <akim@lrde.epita.fr> gnulib: update * lib/yyerror.c: Include config.h since the following stdio.h might be from gnulib. 2012-11-30 Akim Demaille <akim@lrde.epita.fr> yacc.c, glr.c: check and fix the display of locations In some case, negative column number could be displayed. Make YY_LOCATION_PRINT similar to bison's own implementation of locations. Since the macro is getting fat, make it a static function. Reported by Jonathan Fabrizio. * data/c.m4 (yy_location_print_define): Improve the implementation, and generate the yy_location_print_ function. Adjust YY_LOCATION_PRINT. * tests/actions.at (Location Print): New tests. 2012-11-30 Akim Demaille <akim@lrde.epita.fr> formatting changes * data/c.m4: Fix comments, put macros in a more natural order. Space changes (from M-x whitespace-cleanup). * src/location.c: Fix spaces. * tests/actions.at: Space changes. 2012-11-30 Akim Demaille <akim@lrde.epita.fr> glr.c: remove stray macro * data/glr.c (YYOPTIONAL_LOC): Remove, unused since commit 769a8ef9bcb5e14d0be9d0869f5dca20ab093930. 2012-11-29 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: doc: minor fixes doc: improve the index doc: introduce api.pure full, rearrange some examples yacc.c: support "%define api.pure full" local.at: improvements 2012-11-29 Akim Demaille <akim@lrde.epita.fr> doc: minor fixes * doc/bison.texi: Use stderr for error messages. Meta-variables are usually spelled in lower case. Use @code for function names. 2012-11-29 Akim Demaille <akim@lrde.epita.fr> doc: improve the index * doc/bison.texi: Fix uses of "deffn" so that the arguments of the directives do not show in the index. Remove a duplicate entry for api.pure. 2012-11-29 Theophile Ranquet <ranquet@lrde.epita.fr> doc: introduce api.pure full, rearrange some examples * NEWS: Add entry. * doc/bison.texi (%define Summary): Show the old Yacc behaviour. (Parser Function): Move parse-param examples here. (Pure Calling): Remove parse-param examples. (Error Reporting): Don't show the old behavior, stick to 'full'. 2012-11-29 Theophile Ranquet <ranquet@lrde.epita.fr> yacc.c: support "%define api.pure full" This makes the interface for yyerror() pure without the need for a spurious parse_param. * data/yacc.c (b4_pure_if, b4_pure_flag): New definition, accept three states. (b4_yacc_pure_if): Rename as... (b4_yyerror_arg_loc_if): This, and use b4_pure_flag. * tests/actions.at (%define api.pure): Modernize. * test/calc.at (Simple LALR Calculator): Modernize. * tests/local.at (AT_YYERROR_ARG_LOC_IF): Adjust. 2012-11-28 Akim Demaille <akim@lrde.epita.fr> tests: check variants without locations * tests/c++.at (Variants): Support non-use of locations, and check its support. 2012-11-26 Theophile Ranquet <ranquet@lrde.epita.fr> local.at: improvements * tests/local.at (AT_YYERROR_FORMALS): Make llocp const. (AT_PURE_AND_LOC_IF, AT_GLR_OR_PARAM_IF): Remove, expand... (AT_YYERROR_ARG_LOC_IF): Here, and use m4_join for readability. 2012-11-26 Akim Demaille <akim@lrde.epita.fr> tests: use -fno-strict-aliasing with variants Reported by Théophile Ranquet. * configure.ac (NO_STRICT_ALIAS_CXXFLAGS): New. * tests/c++.at, tests/atlocal.in, examples/local.mk: Use it. 2012-11-26 Akim Demaille <akim@lrde.epita.fr> tests: remove leftover * tests/atlocal.in: Remove duplicate handling of --compile-c-with-cxx. 2012-11-26 Akim Demaille <akim@lrde.epita.fr> doc: use %precedence instead of nonassoc when associativity is not wanted * doc/bison.texi: here. Formatting changes in some grammars. Fix a %prec into %precedence. 2012-11-26 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: yacc.c: always initialize yylloc scanner: issue a single error for groups of invalid characters tests: formatting changes doc: one of the fixes for an ambiguous grammar was ambiguous too doc: fix the dangling else with precedence directives doc: prefer "token" to TOKEN doc: formatting changes scanner: use explicit "ignore" statements 2012-11-26 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/branch-2.6' into maint * origin/branch-2.6: yacc.c: always initialize yylloc doc: one of the fixes for an ambiguous grammar was ambiguous too doc: fix the dangling else with precedence directives doc: prefer "token" to TOKEN doc: formatting changes 2012-11-23 Theophile Ranquet <ranquet@lrde.epita.fr> yacc.c: always initialize yylloc The initial location might be used if the parser starts by an empty reduction, so really ensure proper initialization of the initial location. The previous approach fails for PostgreSQL, which uses Reported by Peter Eisentraut. http://lists.gnu.org/archive/html/bug-bison/2012-11/msg00023.html With help from Théophile Ranquet. * data/yacc.c (b4_declare_scanner_communication_variables): Be sure to initialize yylloc, even when its structure is unknown. (yyparse): Simplify the call to b4_dollar_pushdef. * tests/actions.at (Initial location): Check of similar pattern as in the case of PostgreSQL. 2012-11-23 Akim Demaille <akim@lrde.epita.fr> scanner: issue a single error for groups of invalid characters * src/scan-gram.l: Scan groups of invalid characters together. * tests/input.at, tests/named-refs.at: Adjust. 2012-11-23 Akim Demaille <akim@lrde.epita.fr> tests: formatting changes * tests/named-refs.at: Here. 2012-11-23 Akim Demaille <akim@lrde.epita.fr> doc: one of the fixes for an ambiguous grammar was ambiguous too Reported by Аскар Сафин. http://lists.gnu.org/archive/html/bug-bison/2012-11/msg00024.html * doc/bison.texi (Reduce/Reduce): Fix the resulting ambiguity using precedence/associativity directives. 2012-11-22 Akim Demaille <akim@lrde.epita.fr> doc: fix the dangling else with precedence directives * doc/bison.texi (Non Operators): New node. (Shift/Reduce): Point to it. Don't promote "%expect n" too much. 2012-11-22 Akim Demaille <akim@lrde.epita.fr> doc: prefer "token" to TOKEN This is more readable in short examples. * doc/bison.texi (Shift/Reduce): here. Make "win" and "lose" action more alike. 2012-11-22 Akim Demaille <akim@lrde.epita.fr> doc: formatting changes * doc/bison.texi: Use @group. 2012-11-14 Akim Demaille <akim@lrde.epita.fr> scanner: use explicit "ignore" statements * src/scan-gram.l: here. 2012-11-13 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: tests: close files in glr-regression xml: match DOT output and xml2dot.xsl processing xml: factor xslt space template graph: fix a memory leak xml: documentation output: capitalize State 2012-11-12 Theophile Ranquet <ranquet@lrde.epita.fr> tests: close files in glr-regression * tests/glr-regression.at: Here. 2012-11-12 Theophile Ranquet <ranquet@lrde.epita.fr> xml: match DOT output and xml2dot.xsl processing Make the DOT produced by XSLT processing equivalent to the one made with the --graph option. * data/xslt/xml2dot.xsl: Stylistic changes, and add support for reductions. * doc/bison.texi (Xml): Update. * src/graphviz.c (conclude_red): Minor stylistic changes to DOT internals. (output_red): Swap enabled and disabled reductions output, for coherence with XSLT output. * src/print_graph.c (print_core): Minor stylistic change to States' output. (print_actions): Swap order of output for reductions and transitions. * tests/local.at (AT_BISON_CHECK_XML): Ignore differences in order. * tests/output.at: Adjust to changes in DOT internals. 2012-11-12 Theophile Ranquet <ranquet@lrde.epita.fr> xml: factor xslt space template * data/xslt/bison.xsl (space): New, import from... * data/xslt/xml2text.xsl: Here. 2012-11-12 Theophile Ranquet <ranquet@lrde.epita.fr> graph: fix a memory leak * src/graphviz.c (output_red): Here. 2012-11-12 Theophile Ranquet <ranquet@lrde.epita.fr> xml: documentation The XML output combined with the XSL Transformations provided in data/ are incredibly useful, they should be documented. * doc/bison.texi (Xml): New node. 2012-11-12 Theophile Ranquet <ranquet@lrde.epita.fr> output: capitalize State * src/print.c (print_state): Here. * tests/conflicts.at, tests/existing.at, tests/local.at, tests/reduce.at, tests/regression.at, tests/sets.at: Adjust. 2012-11-12 Akim Demaille <akim@lrde.epita.fr> tests: fix syntax-check errors Reported by Théophile Ranquet. * tests/c++.at: Use AT_PARSER_CHECK. Avoid using "strcmp", which triggers an error from syntax-check. 2012-11-12 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: maint: address syntax-check errors. tests: use valgrind where appropriate tests: use valgrind where appropriate tests: don't expect $EGREP to support -w tests: more possible error compiler messages for "#error" 2012-11-12 Akim Demaille <akim@lrde.epita.fr> maint: address syntax-check errors. * cfg.mk: Ignore the "error" call in tests/c++.at, it is not to be translated. * doc/bison.texi: Fix incorrect @pxref use. * po/POTFILES.in: Add missing file. * src/print_graph.c: Remove useless include. 2012-11-12 Akim Demaille <akim@lrde.epita.fr> tests: use valgrind where appropriate Reported by Théophile Ranquet. * cfg.mk (sc_at_parser_check): New. * tests/c++.at: Fix use of AT_CHECK vs. AT_PARSER_CHECK. 2012-11-12 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/branch-2.6' into maint * origin/branch-2.6: tests: use valgrind where appropriate tests: don't expect $EGREP to support -w 2012-11-10 Akim Demaille <akim@lrde.epita.fr> tests: use valgrind where appropriate Reported by Théophile Ranquet. * tests/glr-regression.at: Rewrite some test cases so that AT_PARSER_CHECK, which runs valgrind, is exposed with the parser, not with "echo". * tests/local.at, tests/regression.at, tests/headers.at: Use AT_PARSER_CHECK for generated parsers. 2012-11-08 Akim Demaille <akim@lrde.epita.fr> tests: don't expect $EGREP to support -w Does not work on Solaris 10. Reported by Dennis Clarke. http://lists.gnu.org/archive/html/bug-bison/2012-11/msg00009.html * tests/headers.at (Several parsers): Use Perl instead. While at it, run it only once, on all the generated headers. Adjust to YY_NULL be defined in position.hh. 2012-11-08 Akim Demaille <akim@lrde.epita.fr> tests: more possible error compiler messages for "#error" * tests/synclines.at (AT_SYNCLINES_COMPILE): Adjust for Clang. Verified with GCC 4.0, 4.2 to 4.8, and Clang 2.9, 3.2: none skip. 2012-11-08 Akim Demaille <akim@lrde.epita.fr> regen 2012-11-08 Akim Demaille <akim@lrde.epita.fr> Merge branch 'maint' * origin/maint: regen maint: post-release administrivia version 2.6.5 regen tests: syntax-check tests: beware of compilers that do not support POSIXLY_CORRECT gnulib: update 2012-11-08 Akim Demaille <akim@lrde.epita.fr> regen 2012-11-08 Akim Demaille <akim@lrde.epita.fr> Merge branch 'branch-2.6' into maint * origin/branch-2.6: maint: post-release administrivia version 2.6.5 regen tests: syntax-check tests: beware of compilers that do not support POSIXLY_CORRECT gnulib: update 2012-11-07 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-11-07 Akim Demaille <akim@lrde.epita.fr> version 2.6.5 * NEWS: Record release date. 2012-11-07 Akim Demaille <akim@lrde.epita.fr> regen 2012-11-07 Akim Demaille <akim@lrde.epita.fr> tests: syntax-check * tests/actions.at: Fix typo. 2012-11-07 Akim Demaille <akim@lrde.epita.fr> tests: beware of compilers that do not support POSIXLY_CORRECT Running "maintainer-release-check" on OS X with Clang 2.9 fails, because "clang-mp-2.9 -o test -g test.c" launches "/usr/bin/dsymutil test -o test.dSYM" which fails with "error: unable to open executable '-o'". * m4/c-working.m4 (BISON_CHECK_WITH_POSIXLY_CORRECT) (BISON_C_COMPILER_POSIXLY_CORRECT): New. * configure.ac: Use the latter. * tests/atlocal.in (POSIXLY_CORRECT_IS_EXPORTED): New. * tests/local.at (AT_BISON_CHECK_WARNINGS_): Use it instead of computing its value each time. (AT_QUELL_VALGRIND): Skip tests that cannot work because of compilers that do not support POSIXLY_CORRECT. 2012-11-07 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-11-06 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: (24 commits) tests: calc: modernize the use of locations tests: remove useless location initializations lalr1.cc: always initialize yylval. tests: check that C and C++ objects can be linked together. yacc.c: also disable -Wuninitialized. glr.cc, yacc.c: initialize yylloc properly yacc.c, glr.c: a better YY_LOCATION_PRINT yacc.c: simplify initialization doc: formatting changes c++: fix position operator signatures tests: remove useless location initialization. tests: fix locations in C tests: handle %parse-param in the generated yyerror tests: simplifications grammars: fix display of nul character in error message tests: sort tests: cosmetic changes comment changes autoconf: update gnulib: update ... 2012-11-06 Akim Demaille <akim@lrde.epita.fr> Merge branch 'branch-2.6' into maint * origin/branch-2.6: (24 commits) tests: calc: modernize the use of locations tests: remove useless location initializations lalr1.cc: always initialize yylval. tests: check that C and C++ objects can be linked together. yacc.c: also disable -Wuninitialized. glr.cc, yacc.c: initialize yylloc properly yacc.c, glr.c: a better YY_LOCATION_PRINT yacc.c: simplify initialization doc: formatting changes c++: fix position operator signatures tests: remove useless location initialization. tests: fix locations in C tests: handle %parse-param in the generated yyerror tests: simplifications grammars: fix display of nul character in error message tests: sort tests: cosmetic changes comment changes autoconf: update gnulib: update ... 2012-11-06 Akim Demaille <akim@lrde.epita.fr> tests: calc: modernize the use of locations * tests/calc.at: Don't initialize the location, let the parser do it. Use a $printer. Change some testing input to be easier to distinguish (instead of always "0 0" for instance). 2012-11-06 Akim Demaille <akim@lrde.epita.fr> tests: remove useless location initializations * tests/actions.at, tests/calc.at: here. 2012-11-06 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: always initialize yylval. * data/lalr1.cc: here. 2012-11-06 Akim Demaille <akim@lrde.epita.fr> tests: check that C and C++ objects can be linked together. * tests/local.at (AT_SKIP_IF_CANNOT_LINK_C_AND_CXX): New. * tests/headers.at (Several parsers): Use it. 2012-11-06 Akim Demaille <akim@lrde.epita.fr> yacc.c: also disable -Wuninitialized. * data/yacc.c (YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN): For some versions of GCC, -Wmaybe-uninitialized alone does not suffice. 2012-11-06 Akim Demaille <akim@lrde.epita.fr> glr.cc, yacc.c: initialize yylloc properly There are several issues to address here. One is that yylloc should be initialized when possible. Another is that the push parser needs to update yypushed_loc when the user modified it. And if the parser starts by a reduction of an empty, it uses the first location on the stack, which, therefore, must also be initialized to this initial location. This is getting complex, especially since because initializing a global (impure interface) is different from initializing a local variable. To simplify, the local yylloc is not initialized during its definition. * data/c.m4 (b4_yyloc_default_define): Replace by... (b4_yyloc_default): this. Adjust dependencies. * data/glr.cc: Initialize yylloc. * data/yacc.c (b4_declare_scanner_communication_variables): Initialize yylloc during its definition. Don't define yyloc_default. (yypush_parse): The location formal is not const, as we might initialize it. (yyparse): Define yyloc_default. Use it before running the user initial action. Possibly update the first location on the stack, and the pushed location after the user initial action. * tests/actions.at (Initial locations): Check that the initial location is correct. 2012-11-06 Akim Demaille <akim@lrde.epita.fr> yacc.c, glr.c: a better YY_LOCATION_PRINT * data/c.m4 (b4_yy_location_print_define): New. Now issues "short" locations, e.g., "1.1" instead of "1.1-1.1". Was initially a function, but then we face "static but unused" warnings. Simpler as a macro. * tests/local.at, data/glr.c, data/yacc.c: Use it instead of duplicating. * tests/actions.at: Adjust expectations. 2012-11-06 Akim Demaille <akim@lrde.epita.fr> yacc.c: simplify initialization * data/yacc.c: Fuse the initializations of yyssp, yyss and the like. Remove an obsolete comment: we do initialize these initial stack members (in some cases). 2012-11-05 Akim Demaille <akim@lrde.epita.fr> doc: formatting changes * doc/bison.texi: In a pointer type. 2012-11-05 Akim Demaille <akim@lrde.epita.fr> c++: fix position operator signatures * data/location.cc (operator+=, operator-=): Remove const from return type. 2012-11-05 Akim Demaille <akim@lrde.epita.fr> tests: remove useless location initialization. * tests/glr-regression.at: here. glr.c does initialize yylloc. 2012-11-05 Akim Demaille <akim@lrde.epita.fr> tests: fix locations in C * tests/local.at (AT_YYERROR_DEFINE): Don't display the end of the location if it is not after its beginning. * tests/actions.at, tests/cxx-type.at: Adjust the expected output. 2012-11-05 Akim Demaille <akim@lrde.epita.fr> tests: handle %parse-param in the generated yyerror * tests/local.at (AT_PARSE_PARAMS): New. (AT_YYERROR_FORMALS, AT_YYERROR_DEFINE): Use it to add the parse-param to yyerror. * tests/calc.at, tests/regression.at: Use AT_YYERROR_DEFINE and AT_YYERROR_DECLARE, now that they handle properly the parse-params. Be sure to let AT_BISON_OPTION_PUSHDEFS now what parse-params are used. 2012-11-05 Akim Demaille <akim@lrde.epita.fr> tests: simplifications * tests/actions.at (Exotic Dollars): Formatting changes. Use AT_FULL_COMPILE. (AT_CHECK_PRINTER_AND_DESTRUCTOR): Remove useless initialization of @$. 2012-11-01 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: rename lex_symbol as api.token.constructor * data/bison.m4 (b4_lex_symbol_if): Rename as... (b4_token_ctor_if): this. Depend upon api.token.constructor. * data/c++.m4, data/lalr1.cc: Adjust. * doc/bison.texi: Fix all the occurrences of lex_symbol. * etc/bench.pl.in: Adjust. * examples/variant.yy: Likewise. * tests/local.at (AT_BISON_OPTION_PUSHDEFS, AT_BISON_OPTION_POPDEFS): Handle AT_TOKEN_CTOR_IF. * tests/c++.at: Adjust to using api.token.constructor and AT_TOKEN_CTOR_IF. Simplify the test of both build call styles. (AT_CHECK_VARIANTS): Rename as... (AT_TEST): this. And undef when done. 2012-11-01 Akim Demaille <akim@lrde.epita.fr> examples: simplify/improve * examples/variant.yy: Put yylex in yy::, and simplify accordingly. Minor formatting changes. 2012-11-01 Akim Demaille <akim@lrde.epita.fr> bison.m4: support b4_*_if macros whose name differ from their variable * data/bison.m4 (b4_percent_define_if_define_, b4_percent_define_if_define): Accept a second argument. 2012-11-01 Akim Demaille <akim@lrde.epita.fr> grammars: fix display of nul character in error message Reported by Marc Mendiola. http://lists.gnu.org/archive/html/help-bison/2012-10/msg00017.html * gnulib: Update to get quote_mem. * src/scan-gram.l: Use it. * tests/input.at (Invalid inputs): Additional checks. * tests/named-refs.at: Likewise. 2012-11-01 Akim Demaille <akim@lrde.epita.fr> tests: sort * tests/regression.at (Invalid inputs, Invalid inputs with {}): Move to... * tests/input.at: here, for consistency. 2012-11-01 Akim Demaille <akim@lrde.epita.fr> tests: cosmetic changes * tests/actions.at (AT_CHECK_PRINTER_AND_DESTRUCTOR): Improve the displayed title. 2012-11-01 Akim Demaille <akim@lrde.epita.fr> comment changes * data/lalr1.cc: here. 2012-11-01 Akim Demaille <akim@lrde.epita.fr> autoconf: update There are comment changes only in the files we use. 2012-11-01 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-10-28 Akim Demaille <akim@lrde.epita.fr> regen 2012-10-28 Akim Demaille <akim@lrde.epita.fr> yacc.c: initialize yylval and yylloc. When generating a pure push parser, the initialization of yylval and yylloc may not be visible to the compiler. With warnings enabled, GCC 4.3.6, 4.4.7, 4.5.4, and 4.6.3 report uninitialized uses of yylval/yylloc. Using local pragmas to disable these warnings is not supported before 4.6, and 4.6 does not support it properly. So initialize yylval and yylloc at their definition. Reported by Peter Simons. See http://lists.gnu.org/archive/html/bison-patches/2012-10/msg00133.html * data/c.m4 (b4_yyloc_default_define): New. * data/yacc.c: Use it when locations are requested. (YYLVAL_INITIALIZE): Replace by... (YY_INITIAL_VALUE): this. (yyparse): Initialize yylloc and yylval. Therefore, remove the initialization of yylloc's field. * data/glr.c: Likewise. 2012-10-26 Theophile Ranquet <ranquet@lrde.epita.fr> graphs: fix spacing refactoring * src/print_graph.c (print_lhs, print_core): Here. 2012-10-26 Theophile Ranquet <ranquet@lrde.epita.fr> tests: make deprecation tests more specific * tests/input.at (Deprecated directives): Here, don't generate unrelated errors or warnings. 2012-10-26 Theophile Ranquet <ranquet@lrde.epita.fr> tests: fix AT_BISON_CHECK_WARNINGS_ stderr rewriting * tests/input.at (Deprecated directives): Avoid spurious error. * tests/locat.at (AT_BISON_CHECK_WARNINGS): Adjust for recent changes. 2012-10-26 Theophile Ranquet <ranquet@lrde.epita.fr> scan-skel.l: consider m4 notes as related to "complaint" errors * src/scan-skel.l (flag): Here. 2012-10-26 Theophile Ranquet <ranquet@lrde.epita.fr> warnings: distinguish context information based on warning type * src/scan-code.l (show_sub_message, show_sub_messages): Take a new warnings argument. 2012-10-26 Theophile Ranquet <ranquet@lrde.epita.fr> warnings: fix early exit of warnings treated as errors Treating warnings as errors caused Bison to exit earlier than needed, making it hide warnings that would have been printed had -Werror not been set. Also, fix a bug that caused some context information of errors to not be shown. * src/complain.c (complaint_issued): Rename as... (complaint_status): This, and change its type from boolean to * src/complain.h (err_status): This, new enumeration. * src/main.c (main): Adjust (only finish early if an actual complaint was risen, not a mere warning treated an error). * src/reader.c: Adjust. 2012-10-26 Theophile Ranquet <ranquet@lrde.epita.fr> tests: reindent for legibility * tests/local.at (AT_BISON_CHECK_WARNINGS_): Here. 2012-10-26 Akim Demaille <akim@lrde.epita.fr> build: fix Texinfo compilation * doc/local.mk: fix dependencies. 2012-10-26 Akim Demaille <akim@lrde.epita.fr> regen 2012-10-26 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: (46 commits) doc: minor style change maint: use gendocs's new -I option regen yacc.c: do not define location support when not using locations maint: be compilable with GCC 4.0 tests: address a warning from GCC 4.4 tests: don't use options that Clang does not support tests: restore the tests on -Werror regen parse-gram: update the Bison interface fix comment maint: post-release administrivia version 2.6.4 regen 2.6.4: botched 2.6.3 maint: post-release administrivia version 2.6.3 gnulib: update tests: check %no-lines NEWS: warnings with clang ... 2012-10-26 Akim Demaille <akim@lrde.epita.fr> Merge branch 'branch-2.6' into maint * origin/branch-2.6: regen yacc.c: do not define location support when not using locations maint: be compilable with GCC 4.0 tests: address a warning from GCC 4.4 tests: don't use options that Clang does not support tests: restore the tests on -Werror regen parse-gram: update the Bison interface fix comment 2012-10-26 Akim Demaille <akim@lrde.epita.fr> doc: minor style change * doc/figs/example-reduce.txt: here. 2012-10-26 Akim Demaille <akim@lrde.epita.fr> maint: use gendocs's new -I option * gnulib: Update gendocs. * cfg.mk (gendocs_options_): New. 2012-10-26 Akim Demaille <akim@lrde.epita.fr> regen 2012-10-26 Akim Demaille <akim@lrde.epita.fr> yacc.c: don't use _Pragma GCC diagnostic with 4.6 Reported by Peter Simons. http://lists.gnu.org/archive/html/bug-bison/2012-10/msg00033.html * data/yacc.c (b4_declare_scanner_communication_variables): 4.7 seems fine though. 2012-10-26 Akim Demaille <akim@lrde.epita.fr> regen 2012-10-26 Akim Demaille <akim@lrde.epita.fr> yacc.c: do not define location support when not using locations * data/yacc.c (YYLLOC_DEFAULT, YYRHSLOC): Don't define when not using locations. 2012-10-26 Akim Demaille <akim@lrde.epita.fr> maint: be compilable with GCC 4.0 The "shadows a global declaration" warning in GCC 4.0 was a bit annoying. It does not like that a type name be used in a prototype of a function (not the implementation, just the declaration): In file included from src/LR0.c:38: src/reader.h:56: warning: declaration of 'named_ref' shadows a global declaration src/named-ref.h:35: warning: shadowed declaration is here It does not like either when a global variable name is used in a prototype. Flex 2.5.37 generates this prototype: void gram_set_debug (int debug_flag ); * src/getargs.h, src/getargs.c (debug_flag): Rename as... (debug): this. Adjust dependencies. * src/reader.h: Don't use "named_ref" as a formal argument name. 2012-10-26 Theophile Ranquet <ranquet@lrde.epita.fr> misc: document TESTSUITEFLAGS in README-hacking * README-hacking: Document -j and -k flags. 2012-10-26 Theophile Ranquet <ranquet@lrde.epita.fr> deprecation: add tests * tests/input.at (Deprecated directives warn, Non-deprecated directives don't, Unput doesn't mess up locations): New tests. 2012-10-25 Akim Demaille <akim@lrde.epita.fr> tests: address a warning from GCC 4.4 236. torture.at:465: testing Exploding the Stack Size with Alloca ... ../../../tests/torture.at:474: bison -o input.c input.y ../../../tests/torture.at:474: $CC $CFLAGS $CPPFLAGS $LDFLAGS -o input input.c $LIBS stderr: cc1: warnings being treated as errors input.y: In function 'main': input.y:60: error: 'status' may be used uninitialized in this function * tests/torture.at (AT_DATA_STACK_TORTURE): Initial status to avoid the previous error. 2012-10-25 Akim Demaille <akim@lrde.epita.fr> tests: don't use options that Clang does not support * configure.ac (WARN_CFLAGS, WARN_CXXFLAGS): Do not include options that Clang does not support. 2012-10-25 Akim Demaille <akim@lrde.epita.fr> tests: restore the tests on -Werror When run as /bin/sh, Bash sets the shell variable POSIXLY_CORRECT to y. The test suite checks for the envvar POSIXLY_CORRECT to turn of some tests not supported in POSIX mode. Restore these tests. Reported by the Hydra build farm, from Rob Vermaas. * tests/local.at (AT_BISON_CHECK_WARNINGS_): Check the envvar POSIXLY_CORRECT, not the shell variable. 2012-10-25 Akim Demaille <akim@lrde.epita.fr> regen 2012-10-25 Akim Demaille <akim@lrde.epita.fr> parse-gram: update the Bison interface * src/parse-gram.y (%pure-parser, %name-prefix): Replace with... (%define api.pure, %define api.prefix) * src/location.h, src/scan-gram.h: Adjust to api.prefix. 2012-10-25 Akim Demaille <akim@lrde.epita.fr> fix comment * data/c.m4 (b4_YYDEBUG_define): here. 2012-10-24 Theophile Ranquet <ranquet@lrde.epita.fr> regen 2012-10-24 Theophile Ranquet <ranquet@lrde.epita.fr> deprecation: issue warnings in scanner * src/parse-gram.y: Move the handling of (three) deprecated constructs ... * src/scan-gram.l: ...Here, and issue warnings. (DEPRECATED): New. 2012-10-23 Akim Demaille <akim@lrde.epita.fr> Merge branch 'branch-2.6' into maint * origin/branch-2.6: maint: post-release administrivia version 2.6.4 regen 2.6.4: botched 2.6.3 2012-10-23 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-10-23 Akim Demaille <akim@lrde.epita.fr> version 2.6.4 * NEWS: Record release date. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> regen 2012-10-22 Akim Demaille <akim@lrde.epita.fr> 2.6.4: botched 2.6.3 * NEWS: here. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> Merge branch '2.6.3' into maint * 2.6.3: (22 commits) maint: post-release administrivia version 2.6.3 gnulib: update tests: check %no-lines NEWS: warnings with clang warnings: avoid warnings from clang tests: no longer disable -O compiler options yacc.c: initialize yylval in pure-parser mode skeletons: style changes tests: minor improvements tests: use $PERL instead of perl build: look for Perl in configure. tests: fix sed portability issues tests: diff -u is not portable maint: word changes lalr1.cc: fix test suite portability maint: fix an erroneous include tests: check that headers are self contained doc: add missing documentation for --report headers: move CPP guards into YY_*_INCLUDED to avoid collisions ... 2012-10-22 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> version 2.6.3 * NEWS: Record release date. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-10-22 Akim Demaille <akim@lrde.epita.fr> tests: check %no-lines * tests/synclines.at: here. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> NEWS: warnings with clang * NEWS: here. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> warnings: avoid warnings from clang Fix the following warning parse-gram.c:2078:14: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality] if (((yyn) == (-91))) ~~~~~~^~~~~~~~ parse-gram.c:2078:14: note: remove extraneous parentheses around the comparison to silence this warning if (((yyn) == (-91))) ~ ^ ~ parse-gram.c:2078:14: note: use '=' to turn this equality comparison into an assignment if (((yyn) == (-91))) ^~ = 1 error generated. and the following one: input.cc:740:1: error: function declared 'noreturn' should not return [-Werror,-Winvalid-noreturn] static void yyMemoryExhausted (yyGLRStack* yystackp) __attribute__ ((__noreturn__)); static void yyMemoryExhausted (yyGLRStack* yystackp) { YYLONGJMP (yystackp->yyexception_buffer, 2); } ^ 1 warning and 1 error generated. This is Apple clang version 3.1 (tags/Apple/clang-318.0.61). * data/c.m4 (b4_table_value_equals): Use (!!(A == B)) instead of (A == B) to avoid this warning. Any reasonable compiler should generate the same code. * src/uniqstr.h (UNIQSTR_EQ): Likewise. * data/glr.c (LONGJMP): abort after longjmp to pacify clang. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> tests: no longer disable -O compiler options Tests are running without -O since f377f69fec28013c79db4efe12bbb9d48987fb2c because some warnings (about yylval not being initialized) show only when GCC is given -O2. The previous patch fixes the warnings. Run the test suite with compiler options unmodified. * tests/atlocal.in (O0CFLAGS, O0CXXFLAGS): Remove, use CFLAGS and CXXFLAGS. 2012-10-22 Paul Eggert <eggert@cs.ucla.edu> yacc.c: initialize yylval in pure-parser mode See http://lists.gnu.org/archive/html/bison-patches/2012-08/msg00024.html (spreading over September and October). * data/yacc.c (YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN) (YY_IGNORE_MAYBE_UNINITIALIZED_END, YYLVAL_INITIALIZE): New macros. Use them to suppress an unwanted GCC diagnostic. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> skeletons: style changes * data/yacc.c, data/glr.c: Prefer Title case for (CPP) macro arguments. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> tests: minor improvements * tests/c++.at: Space changes. Use AT_YYERROR_DEFINE. * tests/local.at (AT_YYERROR_DEFINE): Issue errors on unknown languages. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> tests: use $PERL instead of perl * tests/atlocal.in (PERL): New. Sort. * tests/calc.at, tests/input.at, tests/local.at, tests/regression.at, * tests/skeletons.at, tests/synclines.at, tests/torture.at: here. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> build: look for Perl in configure. Bison uses "/usr/bin/perl" or "perl" in several places, and it does not appear to be a problem. But, at least to make it simpler to change PERL on the make command line, check for perl in configure. * configure.ac (PERL): New. * doc/Doxyfile.in, doc/Makefile.am, tests/bison.in: Use it. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> tests: fix sed portability issues Reported by Didier Godefroy, <http://lists.gnu.org/archive/html/bug-bison/2012-10/msg00005.html>. * tests/calc.at (AT_CHECK_SPACES): Use Perl. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> tests: diff -u is not portable Reported by Didier Godefroy <http://lists.gnu.org/archive/html/bug-bison/2012-10/msg00006.html>. * tests/existing.at (AT_LALR1_DIFF_CHECK): Skip if diff -u does not work. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> maint: word changes * README-hacking (Typical errors): Improve wording. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: fix test suite portability Reported by Rob Vermaas' Hydra build farm on x86_64-darwin 10.2.0 with G++ 4.6.3. * tests/headers.at (Several parsers): Include AT_DATA_SOURCE_PROLOGUE in the files to compile. * data/location.cc: Do not include twice string and iostream (once by position.hh, and then by location.hh). * README-hacking (Typical errors): Some hints for other maintainers. 2012-10-22 Theophile Ranquet <theophile.ranquet@gmail.com> maint: fix an erroneous include This fixes test 130 (Several parsers). * data/location.cc: Include <iostream> rather than <iosfwd> since we really need << on strings for instance. * NEWS: Document this. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> tests: check that headers are self contained Reported by Alexandre Duret-Lutz. * tests/headers.at (Several parsers): here. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> doc: add missing documentation for --report * doc/bison.texi (Bison Options): Document --report's "solved", "all", and "none". 2012-10-22 Akim Demaille <akim@lrde.epita.fr> headers: move CPP guards into YY_*_INCLUDED to avoid collisions See <http://lists.gnu.org/archive/html/bug-bison/2012-09/msg00016.html>. * data/c.m4 (b4_cpp_guard): Prepend YY_ and append _INCLUDED. * tests/headers.at: Adjust. * NEWS, doc/bison.texi: Document. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> minor changes. * NEWS: Word changes. * doc/bison.texi: Spell check. Fix minor issues. * tests/headers.at: Comment and formatting changes. 2012-10-22 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-10-19 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-10-19 Akim Demaille <akim@lrde.epita.fr> xml: slight improvement of the DOT output This was completely forgotten... Nothing about XML is actually documented... * data/xslt/xml2dot.xsl: Use boxes, and Courier font. 2012-10-19 Akim Demaille <akim@lrde.epita.fr> maint: check for dot before using it * configure.ac: here. * doc/Makefile.am: Use $(DOT). Ship the generated files, to spare the user the need for Graphviz. 2012-10-18 Theophile Ranquet <theophile.ranquet@gmail.com> graphs: documentation Note that 'make web-manual' fails. * NEWS: Document these changes. * doc/Makefile.am: Adjust to generate example files. * doc/bison.texi: Add a Graphviz section after "Understanding::", the section describing the .output file, because these are similar. * doc/figs/example-reduce.dot, doc/figs/example-reduce.txt, doc/figs/example-shift.dot, doc/figs/example-shift.txt: New, minimal examples to illustrate the documentation. 2012-10-18 Theophile Ranquet <theophile.ranquet@gmail.com> graphs: add tests, introducing -k graph * tests/output.at (AT_TEST): New. Use it to add 6 --graph tests. 2012-10-18 Theophile Ranquet <theophile.ranquet@gmail.com> graphs: change the output format of the rules Use something similar to the report file. * src/print_graph.c (print_lhs): New, obstack equivalent of rule_lhs_print. (print_core): Use here. 2012-10-18 Theophile Ranquet <theophile.ranquet@gmail.com> graphs: style changes * src/graphviz.c (start_graph): Use courier font. (conclude_red): Use commas to separate attributes. Show the acceptation as a special reduction, with a blue color and an "Acc" label. Show the lookahead tokens between square brackets. (output_red): No longer label default reductions. * src/print_graph.c (print_core): Refactor spacing, and print an additional space between a rule's rhs and its lookahead tokens. Also, capitalize "State". (print_actions): Style, move a declaration. 2012-10-18 Theophile Ranquet <theophile.ranquet@gmail.com> graphs: address an issue with R/R conflicts All disabled reductions should now be shown as such. * src/graphviz.c (output_red): Here. (conclude_red): New. 2012-10-16 Akim Demaille <akim@lrde.epita.fr> news: spell check * NEWS: here. 2012-10-16 Akim Demaille <akim@lrde.epita.fr> Merge branch 'maint' * origin/maint: java: use api.location.type and api.position.type 2012-10-16 Akim Demaille <akim@lrde.epita.fr> variables: use singular in %define variable names See http://lists.gnu.org/archive/html/bison-patches/2012-02/msg00045.html * doc/bison.texi, src/lalr.c, src/main.c, src/muscle-tab.c, * src/print.c, src/reader.c, src/tables.c, tests/conflicts.at, * tests/input.at, tests/reduce.at: s/lr.default-reductions/lr.default-reduction/ s/lr.keep-unreachable-states/lr.keep-unreachable-state/. * NEWS: Document. 2012-10-16 Akim Demaille <akim@lrde.epita.fr> java: fixes * data/java.m4: Remove stray M4 characters. 2012-10-16 Akim Demaille <akim@lrde.epita.fr> api.tokens.prefix -> api.token.prefix See http://lists.gnu.org/archive/html/bison-patches/2012-02/msg00045.html Note that api.tokens.prefix has not been released, yet. * NEWS, data/bison.m4, doc/bison.texi, tests/c++.at, * tests/calc.at, tests/java.at, tests/local.at: Do it. * src/muscle-tab.c (muscle_percent_variable_update): Ensure backward compatibility. 2012-10-15 Theophile Ranquet <theophile.ranquet@gmail.com> scan-skel.l: shift complain_args arguments Because argv[0] is never used, shift it out from the argument list. * src/complain.c (complain_args): Here. * src/scan-skel.l (at_complain): Adjust argv and argc. 2012-10-15 Theophile Ranquet <theophile.ranquet@gmail.com> scan-skel.l: formatting changes * src/scan-skel.l (fail_for_at_directive_too_few_args): Here. 2012-10-12 Akim Demaille <akim@lrde.epita.fr> java: use api.location.type and api.position.type * data/java.m4: here. * NEWS, doc/bison.texi, tests/java.at: Adjust. 2012-10-12 Akim Demaille <akim@lrde.epita.fr> Merge branch 'maint' * origin/maint: tests: check %no-lines tests: minor simplification graphs: stylistic changes. graphs: minor style changes graphs: show reductions graphs: style: prefix state number with "state" graphs: style: use left justification for states graphs: style: prefix rules and change shapes obstack: import obstack_finish0 from master c++: api.location.type muscles: a function for backward compatibility maint: more macros 2012-10-12 Akim Demaille <akim@lrde.epita.fr> tests: check %no-lines * tests/synclines.at: here. 2012-10-12 Akim Demaille <akim@lrde.epita.fr> tests: minor simplification * tests/headers.at (Several parsers): Use *.y even for C++. 2012-10-11 Akim Demaille <akim@lrde.epita.fr> graphs: stylistic changes. * src/graphviz.c (output_red): Comment and formatting changes. 2012-10-11 Theophile Ranquet <ranquet@lrde.epita.fr> graphs: minor style changes * src/graphviz.c (output_red): Fix C90 issues. Reduce variable scopes. 2012-10-11 Theophile Ranquet <ranquet@lrde.epita.fr> graphs: show reductions * src/graphviz.c (output_red): New, show reductions on the graph. (no_reduce_bitset_init): New, initialize a bitset. (print_token): New, print a lookahead token. (escape): New, print "foo" as \"foo\" because Dot doesn't like quotes within a label. * src/graphviz.h : Adjust. * src/print_graph.c (print_actions): Call output_red here. 2012-10-11 Theophile Ranquet <theophile.ranquet@gmail.com> graphs: style: prefix state number with "state" * src/print_graph.c (print_core): Here. 2012-10-11 Theophile Ranquet <ranquet@lrde.epita.fr> graphs: style: use left justification for states The label text of nodes is centered "by default" (by the use of '\n' as a line feed). This gives bad readability to the grammar rules shown in state nodes, a left justification is much nicer. This is done by using '\l' as the line feed. In order to allow \l in the DOT file, changes to the quoting system seem necessary. * src/print_graph.c (print_core): Escape tokens here, instead of... * src/graphviz.c (output_node): Here... (escape): Using this, new. 2012-10-11 Theophile Ranquet <theophile.ranquet@gmail.com> graphs: style: prefix rules and change shapes * src/graphviz.c (start_graph): Use box rather than ellipsis. * src/print_graph.c (print_core): Prefix rules with their number. 2012-10-11 Theophile Ranquet <theophile.ranquet@gmail.com> obstack: import obstack_finish0 from master * src/system.h (obstack_finish0): New. 2012-10-11 Akim Demaille <akim@lrde.epita.fr> Merge branch 'maint' * origin/maint: NEWS: warnings with clang warnings: avoid warnings from clang tests: no longer disable -O compiler options yacc.c: initialize yylval in pure-parser mode skeletons: style changes lalr1.cc: document exception safety lalr1.cc: check exception safety of error handling lalr1.cc: check (and fix) %printer exception safety lalr1.cc: check (and fix) %initial-action exception safety lalr1.cc: fix exception safety lalr1.cc: check exception safety. lalr1.cc: indentation fixes. lalr1.cc: don't leave macros define to nothing tests: minor improvements tests: use $PERL instead of perl build: look for Perl in configure. tests: fix sed portability issues tests: diff -u is not portable 2012-10-09 Akim Demaille <akim@lrde.epita.fr> c++: api.location.type This feature was introduced in 95a2de5695670ae0df98cb3c42141cad549f0204 (which is part of 2.5), but not documented. Give it a proper name, and make it public. * data/c++.m4, data/lalr1.cc, data/glr.cc, data/java.m4: Use api.location.type instead of location_type. * src/muscle-tab.c (muscle_percent_variable_update): Map the latter to the former. * tests/local.at: Adjust. * tests/calc.at: Use api.location.type. Leave tests/java.at with location_type, at least for the time being, to cover both names. * doc/bison.texi: Document api.location.type. (User Defined Location Type): New. * NEWS: Update. 2012-10-09 Akim Demaille <akim@lrde.epita.fr> muscles: a function for backward compatibility Based on commit 171ad99d6421935a278656be6dc7161591835d00 from master. * src/muscle-tab.c (muscle_percent_variable_update): New. (muscle_percent_define_insert): Use it. Define the variables with their initial value. 2012-10-09 Akim Demaille <akim@lrde.epita.fr> maint: more macros * src/output.c (ARRAY_CARDINALITY): Move to... * src/system.h: here. (STREQ, STRNEQ): new. 2012-10-08 Akim Demaille <akim@lrde.epita.fr> NEWS: warnings with clang * NEWS: here. 2012-10-08 Akim Demaille <akim@lrde.epita.fr> warnings: avoid warnings from clang Fix the following warning parse-gram.c:2078:14: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality] if (((yyn) == (-91))) ~~~~~~^~~~~~~~ parse-gram.c:2078:14: note: remove extraneous parentheses around the comparison to silence this warning if (((yyn) == (-91))) ~ ^ ~ parse-gram.c:2078:14: note: use '=' to turn this equality comparison into an assignment if (((yyn) == (-91))) ^~ = 1 error generated. and the following one: input.cc:740:1: error: function declared 'noreturn' should not return [-Werror,-Winvalid-noreturn] static void yyMemoryExhausted (yyGLRStack* yystackp) __attribute__ ((__noreturn__)); static void yyMemoryExhausted (yyGLRStack* yystackp) { YYLONGJMP (yystackp->yyexception_buffer, 2); } ^ 1 warning and 1 error generated. This is Apple clang version 3.1 (tags/Apple/clang-318.0.61). * data/c.m4 (b4_table_value_equals): Use (!!(A == B)) instead of (A == B) to avoid this warning. Any reasonable compiler should generate the same code. * src/uniqstr.h (UNIQSTR_EQ): Likewise. * data/glr.c (LONGJMP): abort after longjmp to pacify clang. 2012-10-08 Akim Demaille <akim@lrde.epita.fr> tests: no longer disable -O compiler options Tests are running without -O since f377f69fec28013c79db4efe12bbb9d48987fb2c because some warnings (about yylval not being initialized) show only when GCC is given -O2. The previous patch fixes the warnings. Run the test suite with compiler options unmodified. * tests/atlocal.in (O0CFLAGS, O0CXXFLAGS): Remove, use CFLAGS and CXXFLAGS. 2012-10-08 Paul Eggert <eggert@cs.ucla.edu> yacc.c: initialize yylval in pure-parser mode See http://lists.gnu.org/archive/html/bison-patches/2012-08/msg00024.html (spreading over September and October). * data/yacc.c (YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN) (YY_IGNORE_MAYBE_UNINITIALIZED_END, YYLVAL_INITIALIZE): New macros. Use them to suppress an unwanted GCC diagnostic. 2012-10-08 Akim Demaille <akim@lrde.epita.fr> skeletons: style changes * data/yacc.c, data/glr.c: Prefer Title case for (CPP) macro arguments. 2012-10-06 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: document exception safety * NEWS: here. * doc/bison.texi (Destructor Decl, C++ Parser Interface): and there. 2012-10-06 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: check exception safety of error handling * tests/c++.at (Exception safety): Don't use swap here, it is useless. Cover more test cases: yyerror, YYERROR, YYABORT, and error recovery. (Object): Instead of just keeping a counter of instances, keep a list of them. 2012-10-06 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: check (and fix) %printer exception safety * tests/c++.at (Exception safety): Let the parser support the --debug option. On 'p', throw an exception from the %printer. * data/lalr1.cc (yyparse): Do not display the values we discard, as it uses %printer, which might have thrown the exception. 2012-10-06 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: check (and fix) %initial-action exception safety * data/lalr1.cc: Check size > 1, rather than size != 1, when cleaning the stack, as at the beginning, size is 0. * tests/c++.at (Exception safety): Check exception safety in %initial-action. 2012-10-06 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: fix exception safety lalr1.cc does not reclaim its memory when ended by an exception. Reported by Oleksii Taran: http://lists.gnu.org/archive/html/help-bison/2012-09/msg00000.html * data/lalr1.cc (yyparse): Protect the whole yyparse by a try-catch block that cleans the stack and the lookahead. 2012-10-06 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: check exception safety. * tests/c++.at (Exception safety): New. 2012-10-06 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: indentation fixes. * data/lalr1.cc (yyparse): here. Untabify a block of code. 2012-10-06 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: don't leave macros define to nothing * data/lalr1.cc (YY_SYMBOL_PRINT, YY_REDUCE_PRINT, YY_STACK_PRINT): Define to something so that, for instance, "if (foo) YY_SYMBOL_PRINT" is valid even when !YYDEBUG. 2012-10-06 Akim Demaille <akim@lrde.epita.fr> tests: minor improvements * tests/c++.at: Space changes. Use AT_YYERROR_DEFINE. * tests/local.at (AT_YYERROR_DEFINE): Issue errors on unknown languages. 2012-10-05 Akim Demaille <akim@lrde.epita.fr> tests: use $PERL instead of perl * tests/atlocal.in (PERL): New. Sort. * tests/calc.at, tests/input.at, tests/local.at, tests/regression.at, * tests/skeletons.at, tests/synclines.at, tests/torture.at: here. 2012-10-05 Akim Demaille <akim@lrde.epita.fr> build: look for Perl in configure. Bison uses "/usr/bin/perl" or "perl" in several places, and it does not appear to be a problem. But, at least to make it simpler to change PERL on the make command line, check for perl in configure. * configure.ac (PERL): New. * doc/Doxyfile.in, doc/Makefile.am, tests/bison.in: Use it. 2012-10-05 Akim Demaille <akim@lrde.epita.fr> tests: fix sed portability issues Reported by Didier Godefroy, <http://lists.gnu.org/archive/html/bug-bison/2012-10/msg00005.html>. * tests/calc.at (AT_CHECK_SPACES): Use Perl. 2012-10-05 Akim Demaille <akim@lrde.epita.fr> tests: diff -u is not portable Reported by Didier Godefroy <http://lists.gnu.org/archive/html/bug-bison/2012-10/msg00006.html>. * tests/existing.at (AT_LALR1_DIFF_CHECK): Skip if diff -u does not work. 2012-10-04 Akim Demaille <akim@lrde.epita.fr> Merge branch 'maint' * origin/maint: maint: word changes lalr1.cc: fix test suite portability maint: fix an erroneous include tests: check that headers are self contained doc: add missing documentation for --report 2012-10-04 Akim Demaille <akim@lrde.epita.fr> scan-skel: use the scanner to reject all invalid directives * src/scan-skel.l: Use a simpler and more consistent pattern escaping scheme. Catch all the invalid directives here by just removing the previous catch-all-but-alphabetical rule. 2012-10-04 Theophile Ranquet <theophile.ranquet@gmail.com> scan-skel: recognize the @directives directly in scanner * src/scan-skel.l (at_directive, at_init): New. (at_ptr): New, function pointer used to call the right at_directive function (at_basename, etc.). (outname): Rename as... (out_name): this, for consistency with out_lineno. 2012-10-04 Theophile Ranquet <theophile.ranquet@gmail.com> scan-skel: split @directive functions * src/scan-skel.l (at_directive_perform): Split as... (at_basename, at_complain, at_output): these. 2012-10-04 Theophile Ranquet <theophile.ranquet@gmail.com> errors: support indented context info in m4 macros * TODO: Address the issue, so remove it. * data/bison.m4: Use b4_error with [[note]] rather than a complain_at for context information. * src/complain.c (complain_args): Take an additional argument, an indentation pointer, to allow the dispatching of context information. * src/complain.h (complain_args): Adjust prototype. * src/scan-skel.l (at_directive_perform): Recognize the new @note mark. * tests/input.at: Adjust. 2012-10-04 Theophile Ranquet <theophile.ranquet@gmail.com> errors: factor b4_error @directives Instead of @complain, @warn, and @fatal, use a unique @complain directive. This directive's first argument is "complain", "warn", etc. * data/bison.m4 (m4_error): Here. * src/scan-skel.l (at_directive_perform): Adjust. (flag): Replace the switch by safer and more explicit if branches. 2012-10-04 Theophile Ranquet <theophile.ranquet@gmail.com> errors: pointerize complain_at_indent * src/complain.c (complain_at_indent): Rename as... (complaint_indent): This, and take the location as a pointer. * src/complain.h, src/muscle-tab.c, src/reader.c, src/scan-code.l, src/symtab.c: Adjust. 2012-10-04 Akim Demaille <akim@lrde.epita.fr> maint: word changes * README-hacking (Typical errors): Improve wording. 2012-10-04 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: fix test suite portability Reported by Rob Vermaas' Hydra build farm on x86_64-darwin 10.2.0 with G++ 4.6.3. * tests/headers.at (Several parsers): Include AT_DATA_SOURCE_PROLOGUE in the files to compile. * data/location.cc: Do not include twice string and iostream (once by position.hh, and then by location.hh). * README-hacking (Typical errors): Some hints for other maintainers. 2012-10-03 Theophile Ranquet <theophile.ranquet@gmail.com> maint: fix an erroneous include This fixes test 130 (Several parsers). * data/location.cc: Include <iostream> rather than <iosfwd> since we really need << on strings for instance. * NEWS: Document this. 2012-10-03 Akim Demaille <akim@lrde.epita.fr> tests: check that headers are self contained Reported by Alexandre Duret-Lutz. * tests/headers.at (Several parsers): here. 2012-10-03 Akim Demaille <akim@lrde.epita.fr> doc: add missing documentation for --report * doc/bison.texi (Bison Options): Document --report's "solved", "all", and "none". 2012-10-01 Akim Demaille <akim@lrde.epita.fr> build: use gnulib's non-recursive-gnulib-prefix-hack Suggested by Jim Meyering. * etc/prefix-gnulib-mk: Remove, as it is now provided by... * bootstrap.conf (modules): the non-recursive-gnulib-prefix-hack module. * build-aux/.gitignore, configure.ac, m4/.gitignore: Adjust. 2012-10-01 Akim Demaille <akim@lrde.epita.fr> warnings: simplify the m4 interface * data/bison.m4 (error_at): Replace... (error): this. (b4_warn, b4_complain, b4_fatal): Bounce to their _at equivalent, with empty location. * src/scan-skel.l (at_directive_perform): Simplify accordingly. 2012-10-01 Theophile Ranquet <theophile.ranquet@gmail.com> warnings: separate flags_argmatch This function is now a mere iterator that calls flag_argmatch, a new function, that matches a single option parameter. * src/getargs.c (flag_argmatch): New, taken from... (flags_argmatch): Here. 2012-10-01 Theophile Ranquet <theophile.ranquet@gmail.com> warnings: refactoring The code here was too confusing, this seems more natural. * src/complain.c (error_message): Move the indentation check and the category output to complains. Also, no longer take a 'warnings' argument. (complains): Factor calls to error_message. 2012-10-01 Theophile Ranquet <theophile.ranquet@gmail.com> formatting changes * src/complain.c: Here. 2012-10-01 Theophile Ranquet <theophile.ranquet@gmail.com> warnings: organize variadic complaints call Move the dispatch of variadic complains to complain.c, rather than do it in a scanner. * src/complain.h, src/complain.c (complain_args): New. * src/scan-skel.l (at_directive_perform): Use it. 2012-10-01 Theophile Ranquet <theophile.ranquet@gmail.com> warnings: fusion of complain and complain_at These functions are very similar, and keeping them seperate makes future improvements difficult, so merge them. This impacts 89 calls. * src/bootstrap.conf: Adjust. * src/complain.c (complain, complain_at): Merge into... (complain): this. (complain_args): Adjust. * src/complain.h, src/conflicts.c, src/files.c, src/getargs.c, * src/gram.c, src/location.c, src/muscle-tab.c, src/parse-gram.y, * src/reader.c, src/reduce.c, src/scan-code.l, src/scan-gram.l, * src/scan-skel.l, src/symlist.c, src/symtab.c: Adjust. 2012-10-01 Theophile Ranquet <theophile.ranquet@gmail.com> warnings: remove spurious suffixes on context Rectify a bug that introduced suffixes out of place. * src/complainc.c (complains): Handle all three special warning bits. * src/scan-code.l (show_sub_message): Remove useless argument. * tests/named-refs.at: Adjust. 2012-10-01 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: headers: move CPP guards into YY_*_INCLUDED to avoid collisions minor changes. 2012-10-01 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: gnulib: update errors: indent "user token number redeclaration" context 2012-10-01 Akim Demaille <akim@lrde.epita.fr> headers: move CPP guards into YY_*_INCLUDED to avoid collisions See <http://lists.gnu.org/archive/html/bug-bison/2012-09/msg00016.html>. * data/c.m4 (b4_cpp_guard): Prepend YY_ and append _INCLUDED. * tests/headers.at: Adjust. * NEWS, doc/bison.texi: Document. 2012-10-01 Akim Demaille <akim@lrde.epita.fr> minor changes. * NEWS: Word changes. * doc/bison.texi: Spell check. Fix minor issues. * tests/headers.at: Comment and formatting changes. 2012-09-28 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-09-28 Theophile Ranquet <theophile.ranquet@gmail.com> errors: indent "user token number redeclaration" context This is the continuation of the work on the readability of errors context. * src/symtab.c (user_token_number_redeclaration): Use complain_at_indent to output with increased indentation level. * tests/input:at: Apply this change. 2012-09-27 Theophile Ranquet <theophile.ranquet@gmail.com> errors: don't display "warnings treated as errors" This line doesn't add any meaningful information anymore, the appended [-Werror=CATEGORY] is enough. It is actually more insightful, as it allows to distinguish warnings treated as errors from those that aren't. This line is also removed by gcc 4.8. * src/complain.c (set_warnings_issued): The only action left was checking if the error bit corresponding to the warning issued was set, and that function was only called once. Therefore, remove it, and do its job directly in the caller... (complains): here. * src/complains.h: Adjust. * tests/input.at: Adjust. * NEWS: Document this change. 2012-09-27 Akim Demaille <akim@lrde.epita.fr> errors: change output, and improve -y coherence The prefix of warnings treated as errors is now "error: ". Also, their suffix now reflects the changes in the Werror option format. An output for -Werror=other used to be: bison: warnings being treated as errors input.y:1.1: warning: stray ',' treated as white space [-Wother] It is now: bison: warnings being treated as errors input.y:1.1: error: stray ',' treated as white space [-Werror=other] The line "warnings being treated as errors" no longer adds any info, it will be removed in a forthcoming change. * NEWS: Add entry "Enhancement of the -Werror" * doc/bison.texi: Move the warnings-as-error to a new bullet. * src/complain.c (complains): Refactor, change the prefix of warnings that are treated as errors. (warnings_print_categories): Support for [-Werror=CATEGORY] display * src/getargc.c (getargs): -y implies -Werror=yacc * tests/input.at: Update expected --yacc output for coherence. 2012-09-27 Theophile Ranquet <theophile.ranquet@gmail.com> errors: introduce the -Werror=CATEGORY option This new option is a lot more flexible than the previous one. Its details will be discussed in the NEWS and info file, in a forthcoming change. If no category is specified (ie: used as simply "-Werror"), the functionality is the same as before. * src/complain.c (errors_flag): New variable. (set_warning_issued): Accept warning categories as an argument. * src/complain.h (Wall): Better definition. * src/getargs.c (flags_argmatch): Support for the new format. (usage): Update -Werror to -Werror[=CATEGORY] format. * src/complain.c (errors_flag): New variable. (set_warning_issued): Accept warning categories as an argument. * src/complain.h (Wall): Better definition. * src/getargs.c (flags_argmatch): Support for the new format. (usage): Update -Werror to -Werror=[CATEGORY] format. 2012-09-26 Akim Demaille <akim@lrde.epita.fr> Merge branch 'maint' * maint: warnings: introduce -Wdeprecated in the usage info errors: prefix the output with "error: " errors: indent "invalid value for %define" context errors: indent "%define var" redefinition context errors: indent "symbol redeclaration" context errors: indent "result type clash" error context 2012-09-26 Theophile Ranquet <ranquet@lrde.epita.fr> warnings: introduce -Wdeprecated in the usage info The deprecated warning, introduced some time ago, was not displayed in the usage message. This patch addresses the issue. * src/getargs.c (usage): Insert here. 2012-09-26 Akim Demaille <akim@lrde.epita.fr> regen 2012-09-26 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: regen yacc: fix handling of CPP guards when no header is generated gnulib: update 2012-09-26 Theophile Ranquet <ranquet@lrde.epita.fr> errors: prefix the output with "error: " This improves readability. This is also what gcc does. * NEWS: Document this change. * src/complain.c (complain_at): Prefix all errors with "error: ". (complain_at_indent, warn_at_indent): Do not prefix the context information of errors, which are basically just indented errors. * tests/conflicts.at, tests/glr-regression.at, tests/input.at, tests/named-refs.at, tests/output.at, tests/push.at, tests/regression.at, tests/skeletons.at: Apply this change. 2012-09-26 Theophile Ranquet <ranquet@lrde.epita.fr> errors: indent "invalid value for %define" context This is the continuation of the work on the readability of errors context. For example, what used to be: input.y:1.9-29: invalid value for %define variable 'foo' : 'bar' input.y:1.9-29: accepted value: 'most' is now: input.y:1.9-29: invalid value for %define variable 'foo' : 'bar' input.y:1.9-29: accepted value: 'most' * src/muscle-tab.c (muscle_percent_define_check_values): Use complain_at_indent to output with increased indentation level. * tests/input:at: Apply this change. 2012-09-26 Theophile Ranquet <ranquet@lrde.epita.fr> errors: indent "%define var" redefinition context This is the continuation of the work on the readability of errors context. For example, what used to be: input.y:2.9-11: %define variable 'var' redefined input.y:1.9-11: previous definition is now: input.y:2.9-11: %define variable 'var' redefined input.y:1.9-11: previous definition * src/muscle-tab.c (muscle_percent_define_insert): Use complain_at_indent to output with increased indentation level. * tests/input.at: Apply this change. 2012-09-26 Theophile Ranquet <ranquet@lrde.epita.fr> errors: indent "symbol redeclaration" context This is the continuation of the work on the readability of errors context. For example, what used to be: input.y:5.10-24: %printer redeclaration for <field2> input.y:3.11-25: previous declaration is now: input.y:5.10-24: %printer redeclaration for <field2> input.y:3.11-25: previous declaration * NEWS: Document this change. * src/symtab.c (symbol_redeclaration, semantic_type_redeclaration, user_token_number_redeclaration, default_tagged_destructor_set, default_tagless_destructor_set, default_tagged_printer_set, default_tagless_printer_set): Use complain_at_indent to output with increased indentation level. * tests/input.at: Apply this change. 2012-09-26 Theophile Ranquet <ranquet@lrde.epita.fr> errors: indent "result type clash" error context This used to be the format of the error report: input.y:6.5-10: result type clash on merge function 'merge': [...] input.y:2.4-9: previous declaration In order to distinguish the actual error from the context provided, we rather this new output: input.y:6.5-10: result type clash on merge function 'merge': [...] input.y:2.4-9: previous declaration Another patch will introduce an "error: " prefix to all non-indented lines, giving yet better readability to the reports. * src/complain.h (SUB_INDENT): Move to here. * src/reader.c (record_merge_function_type): Use complain_at_indent to output with increased indentation level. * src/scan-code.l (SUB_INDENT): Remove from here. * tests/glr-regression.at: Apply this change. 2012-09-25 Akim Demaille <akim@lrde.epita.fr> warnings: use the regular interface for s/r and r/r conflicts The current routines used to display s/r and r/r conflicts are both inconvenient from the programmer point of view (they do not use the warning infrastructure) and for the user (the messages are rather terse, not necessarily pleasant to read, and because they don't use the same routines, they look different). It was due to the belief (dating back to the initial checked-in version of Bison) that, at some point, POSIX Yacc mandated the format for these messages. Today, the Open Group's manual page for Yacc, <http://pubs.opengroup.org/onlinepubs/009695399/utilities/yacc.html>, explicitly states that the format of these messages is unspecified. See commit be7280480c175bed203883f524c7dcd6cf37c13d and <http://lists.gnu.org/archive/html/bison-patches/2002-12/msg00027.html>. For a discussion on the chosen warning format, see http://lists.gnu.org/archive/html/bison-patches/2012-09/msg00039.html In an effort to factor the handling of errors and warnings, use the Bison warning routines to report these messages. * src/conflicts.c (conflicts_print): Rewrite with clearer sections about S/R and then R/R conflicts. (conflict_report): Remove, inlined in its sole caller... (conflicts_output): here. * tests/conflicts.at, tests/existing.at, tests/glr-regression.at, * tests/reduce.at, tests/regression.at: Adjust the expected results. * NEWS: Update. 2012-09-25 Akim Demaille <akim@lrde.epita.fr> regen 2012-09-25 Akim Demaille <akim@lrde.epita.fr> yacc: fix handling of CPP guards when no header is generated When no header was to be generated, Bison would issue: /* In a future release of Bison, this section will be replaced by #include "". */ #ifndef YY_ # define YY_ It now properly generates nothing. * data/c.m4 (b4_cpp_guard_open, b4_cpp_guard_close): Issue nothing when the file name is empty. * data/yacc.c: Do not generate the above comment when there is no header to generate. * NEWS: Update. 2012-09-25 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-09-21 Akim Demaille <akim@lrde.epita.fr> conflicts: refactor the counting routines * src/conflicts.c (count_sr_conflicts, count_rr_conflicts): Rename as... (count_sr_conflicts, count_rr_conflicts): these. Use size_t for counts. (count_sr_conflicts, count_rr_conflicts): New. Use them. 2012-09-21 Akim Demaille <akim@lrde.epita.fr> %expect-rr is for GLR only * src/conflicts.c (conflicts_print): Complain about %expect-rr if not in GLR mode, regardless of the number of reduce/reduce conflicts. * tests/conflicts.at (%expect-rr non GLR): New test. * NEWS: Update. 2012-09-21 Akim Demaille <akim@lrde.epita.fr> TODO: lalr1.cc master vs maint * TODO: here. 2012-09-21 Akim Demaille <akim@lrde.epita.fr> c++: coding style fixes * data/lalr1.cc, tests/c++.at: Formatting changes. 2012-09-21 Akim Demaille <akim@lrde.epita.fr> Revert "introduced a GCC-like -Werror=type" This reverts commit 981c53e257f1974854edc4f6ad0e88c7f18e2bea. 2012-09-21 Akim Demaille <akim@lrde.epita.fr> Revert "made previous commit less hairy" This reverts commit fd01e1d05ea3e627033d148b5400b99a18ac7ba3. 2012-09-21 Akim Demaille <akim@lrde.epita.fr> Revert "new Werror report format fixed in a test" This reverts commit 41511178a71ebaf81bde7ffc682c575537af45cb. 2012-09-21 Theophile Ranquet <ranquet@lrde.epita.fr> new Werror report format fixed in a test * tests/input.at : replaced [-Wyacc] with [-Werror=yacc] todo: fix the other failed test of the suite, tests/conflicts.at:1554 2012-09-21 Theophile Ranquet <ranquet@lrde.epita.fr> made previous commit less hairy * src/getargs.c : here 2012-09-20 Theophile Ranquet <ranquet@lrde.epita.fr> introduced a GCC-like -Werror=type * src/complain.h : errors_flag variable * src/complain.c : actual stuff happens here * src/conflits.c : differentiated SR and RR conflicts * src/getargs.c : flags_argmatch recognizes the new -Werror format 2012-09-04 Akim Demaille <akim@lrde.epita.fr> regen 2012-09-04 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: maint: remove useless file update files to ignore remove useless include use locale-indep. c_is* functions for parsing, not isspace, isprint etc gnulib: update --help: include a place to report translation issues tests: style changes tests: fix push-pull test yacc.c: style changes 2012-09-04 Akim Demaille <akim@lrde.epita.fr> maint: remove useless file * externals/bootstrap.cfg: Remove. This file was used by a specific build system. It was added to the master repository by accident. 2012-09-04 Akim Demaille <akim@lrde.epita.fr> update files to ignore * doc/.gitignore: Don't ignore split info files as we don't split our info file. See <http://lists.gnu.org/archive/html/bug-bison/2012-08/msg00006.html>. 2012-09-04 Akim Demaille <akim@lrde.epita.fr> remove useless include * src/system.h: Don't include sys/types.h. Reported by Eric Blake, <http://lists.gnu.org/archive/html/bug-bison/2012-09/msg00002.html>. (FUNCTION_PRINT): Remove, unused. 2012-09-03 Jim Meyering <meyering@redhat.com> use locale-indep. c_is* functions for parsing, not isspace, isprint etc * src/parse-gram.y: Include "c-ctype.h". (add_param): Parse with c_isspace, not isspace. * src/parse-gram.c: Likewise. * src/scan-gram.l: Include c-ctype.h, not ctype.h. (SC_ESCAPED_STRING,SC_ESCAPED_CHARACTER): Use c_isspace and c_isprint, not ctype.h's locale-dependent functions. 2012-09-03 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-09-03 Akim Demaille <akim@lrde.epita.fr> --help: include a place to report translation issues http://lists.gnu.org/archive/html/bug-bison/2012-08/msg00007.html shows that it is useful to help users report translation issues. While at it, include other informative bits that the coreutils shows. * src/getargs.c (usage): Report more URLs where the user can refer to. Mostly copied/pasted from coreutils' emit_ancillary_info function. 2012-09-03 Akim Demaille <akim@lrde.epita.fr> news: style changes * NEWS: Minor improvements. 2012-09-03 Akim Demaille <akim@lrde.epita.fr> use -Wdeprecated for obsolete %define variable names * src/muscle-tab.c (muscle_percent_variable_update): Here. * tests/input.at (%define backward compatibility): Update expectations. 2012-09-03 Akim Demaille <akim@lrde.epita.fr> introduce -Wdeprecated GCC seems to be using "deprecated" consistently over "obsoleted", so use -Wdeprecated rather than -Wobsolete. * src/complain.h (warnings): Add Wdeprecated. * src/complain.c (warnings_print_categories): Adjust. * src/getargs.c: Likewise. * doc/bison.texi: Document it. * src/scan-code.l: Use this category for the trailing ';' support. * tests/actions.at: Adjust expected output. 2012-09-03 Akim Demaille <akim@lrde.epita.fr> undefined but unused is a warning * src/symtab.c (symbol_check_defined): Undeclared symbols are only a warning. * tests/input.at (Undeclared symbols used for a printer or destructor): Rename as... (Undefined symbols): this, and check this case. * NEWS: Doc it. 2012-09-03 Akim Demaille <akim@lrde.epita.fr> glr.cc: %defines is no longer mandatory * data/glr.cc: No longer require %defines. When it is not given, define the position and location classes instead of including their headers. (b4_shared_declarations): Use the original parse-params. * data/glr.c (b4_shared_declarations): Define only if undefined. * tests/actions.at, tests/calc.at: No longer force the use of %defines for glr.cc. * NEWS: Doc it. 2012-09-03 Akim Demaille <akim@lrde.epita.fr> todo: check push parsers 2012-09-03 Akim Demaille <akim@lrde.epita.fr> style: remove useless C++ provisio * src/complain.h: here. 2012-09-03 Akim Demaille <akim@lrde.epita.fr> parser: style changes * src/parse-gram.y: Avoid deprecated directives. 2012-09-03 Akim Demaille <akim@lrde.epita.fr> doc: address a fixme * doc/bison.texi (Calc++ Parser): Add a cross-reference. 2012-09-03 Akim Demaille <akim@lrde.epita.fr> style changes * data/glr.cc, tests/actions.at: Fix comments. * src/symtab.h, src/symtab.c: Fix indentation/comments. * src/symlist.c: Fix indentation. 2012-08-31 Akim Demaille <akim@lrde.epita.fr> tests: style changes * tests/torture.at (AT_DATA_STACK_TORTURE): M4 style changes to improve readability. Fix an assertion which, because of a <= instead of ==, did not check new_status as visibly meant. (get_args): New. 2012-08-31 Akim Demaille <akim@lrde.epita.fr> tests: fix push-pull test * tests/torture.at: %push-pull-parser is no longer supported. 2012-08-31 Akim Demaille <akim@lrde.epita.fr> yacc.c: style changes * data/yacc.c: (yytoken): Define with initial value. 2012-08-12 Akim Demaille <akim@lrde.epita.fr> refactoring: define variables with a value * src/muscle-tab.c: Where possible, fuse definition and initial assignment. 2012-08-12 Akim Demaille <akim@lrde.epita.fr> minor refactoring: shorten variable names * src/scan-skel.l (at_directive_argc, at_directive_argv) (AT_DIRECTIVE_ARGC_MAX): Rename as... (argc, argv, ARGC_MAX): these, as there is no possible confusion. (flags): New. (QPUTS): Remove, inline its only use. 2012-08-12 Akim Demaille <akim@lrde.epita.fr> obstacks: simplifications * src/system.h (obstack_finish0): New. Use it to simplify several uses. * src/muscle-tab.h (MUSCLE_INSERTF): New. * src/muscle-tab.c: Use obstack_printf where simpler. 2012-08-12 Akim Demaille <akim@lrde.epita.fr> minor refactoring in user code scanning * src/scan-code.l (show_sub_message, show_sub_messages): Instead of a Boolean, take a "warnings" argument. Avoid storing printf-like format strings in a variable, so that GCC can check them. 2012-08-12 Akim Demaille <akim@lrde.epita.fr> minor refactoring in user code scanning * src/scan-code.l (show_sub_message): New, extracted from... (show_sub_messages): here. 2012-08-03 Akim Demaille <akim@lrde.epita.fr> tests: strengthen the trailing spaces check * tests/calc.at: here. * data/glr.c: Fix accordingly. 2012-08-03 Akim Demaille <akim@lrde.epita.fr> regen 2012-08-03 Akim Demaille <akim@lrde.epita.fr> Merge branch 'maint' * origin/maint: maint: post-release administrivia version 2.6.2 NEWS: update. yacc: remove trailing end of line at end of file thanks: fix a contributor name gnulib: update tests: synch line -> syncline, for consistency tests: synclines: style changes tests: synclines: fix perl invocation regen c++: trailing end-of-lines in %parse-param tests: simplify 2012-08-03 Akim Demaille <akim@lrde.epita.fr> regen 2012-08-03 Akim Demaille <akim@lrde.epita.fr> remove support for lint Basically revert commit 12ce2df60d16961eaa03a5aa009eeaa645e4e1cb. http://lists.gnu.org/archive/html/bison-patches/2012-08/msg00004.html * data/c.m4, data/glr.c, data/yacc.c (YYID): Remove. No longer use ARGSUSED. * src/getargs.c: Restore simpler inclusion of getopt.h (anyway, since then we now use gnulib which certainly protects us from such issues). 2012-08-03 Akim Demaille <akim@lrde.epita.fr> skeletons: renamings after knr removal * data/c.m4 (b4_yydestruct_generate, b4_yy_symbol_print_generate): Rename as... (b4_yydestruct_define, b4_yy_symbol_print_define): these, for consistency. * data/glr.c, data/glr.cc, data/yacc.c: Adjust. 2012-08-03 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-08-03 Akim Demaille <akim@lrde.epita.fr> version 2.6.2 * NEWS: Record release date. 2012-08-02 Akim Demaille <akim@lrde.epita.fr> c++: fix a comment * data/c++.m4: Be sure to attach a ';' to its declaration, otherwise it appears in the preceding comment. 2012-08-02 Akim Demaille <akim@lrde.epita.fr> skeletons: simplify after knr removal * data/c.m4 (b4_yydestruct_generate, b4_yy_symbol_print_generate): They no longer need an argument, it has a single possible value. * data/glr.c, data/yacc.c: Adjust. 2012-08-02 Akim Demaille <akim@lrde.epita.fr> skeletons: renamings after knr removal * data/c.m4 (b4_c_comment_, b4_c_args, b4_c_function_def) (b4_c_function_decl, b4_c_formals, b4_c_call, b4_c_arg): Rename as... (b4_comment, b4_args, b4_function_define, b4_function_declare, b4_formals, b4_function_call, b4_arg): these. * data/glr.c, data/glr.cc, data/lalr1.cc, data/yacc.c: Adjust. 2012-08-02 Akim Demaille <akim@lrde.epita.fr> skeletons: b4_args -> b4_join to prepare forthcoming changes * data/bison.m4 (b4_args, _b4_args): Rename as... (b4_join, _b4_join): these. * data/c++.m4, data/lalr1.cc, data/variant.hh: Adjust. 2012-08-02 Akim Demaille <akim@lrde.epita.fr> regen 2012-08-02 Akim Demaille <akim@lrde.epita.fr> YYPARSE_PARAM: drop support * data/yacc.c: No longer support it. * doc/bison.texi, tests/headers.at: Adjust. * NEWS: Document. 2012-08-02 Akim Demaille <akim@lrde.epita.fr> skeletons: remove K&R C support * data/c.m4 (b4_c_modern, b4_c_knr_formal_names, b4_c_knr_formal_decls) (b4_c_knr_formal_decl, b4_c_formal_names, b4_c_formal_decls) (b4_c_formal_decl): Remove. (b4_c_ansi_formal_names, b4_c_ansi_formal_decls, b4_c_ansi_formal_decl): Rename as... (b4_c_formal_names, b4_c_formal_decls, b4_c_formal_decl): these. * data/glr.c, data/glr.cc, data/yacc.c: Adjust. 2012-08-02 Akim Demaille <akim@lrde.epita.fr> NEWS: update. * NEWS: Catch up with the other changes from 2.6.1. 2012-08-02 Akim Demaille <akim@lrde.epita.fr> yacc: remove trailing end of line at end of file There are still spurious spaces at the end of some lines. But this is addressed in the master branch, and I am reluctant to try to backport this. * data/yacc.c, data/glr.c, data/lalr1.cc, data/glr.cc: here. * tests/calc.at (AT_CHECK_SPACES): New. Use it. Be sure not to introduce trailing empty lines in the *.y files. * NEWS: Doc it. * cfg.mk (syntax-check): Remove the exception. 2012-08-02 Akim Demaille <akim@lrde.epita.fr> thanks: fix a contributor name * THANKS: On his request. 2012-08-01 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-08-01 Akim Demaille <akim@lrde.epita.fr> tests: synch line -> syncline, for consistency * tests/synclines.at: Do it, as "syncline" is used consistently everywhere else in Bison. 2012-08-01 Akim Demaille <akim@lrde.epita.fr> tests: synclines: style changes * tests/synclines.at (AT_TEST_SYNCLINE): Rename as... (AT_TEST): this. Use pushdef/popdef. Formatting changes. Use '+' instead of '*' where appropriate. 2012-08-01 Akim Demaille <akim@lrde.epita.fr> tests: synclines: fix perl invocation Reported by Summum Bonum. * tests/synclines.at: Fix Perl invocation: its -f is not like sed's. 2012-08-01 Akim Demaille <akim@lrde.epita.fr> regen 2012-08-01 Akim Demaille <akim@lrde.epita.fr> c++: trailing end-of-lines in %parse-param * src/parse-gram.y (add_param): No only skip ' ' and '\t', skip all leading and trailing spaces. * tests/regression.at (Lex and parse params): Check it. * NEWS: Document it. 2012-08-01 Akim Demaille <akim@lrde.epita.fr> tests: simplify * tests/regression.at: Remove useless compilations: AT_FULL_COMPILE includes the compilation by bison. 2012-07-31 Akim Demaille <akim@lrde.epita.fr> todo: more items * TODO: $ in the epilogue, and obstack_copy. 2012-07-31 Akim Demaille <akim@lrde.epita.fr> Merge branch 'maint' * maint: use obstack_printf scanner: restore a missing start condition gnulib: update maint: post-release administrivia version 2.6.1 gnulib: update maint: fix some syntax-check issues tests: do not depend on __cplusplus to decide for C++ or C output 2012-07-31 Akim Demaille <akim@lrde.epita.fr> tests: comment changes * tests/actions.at, tests/input.at: here. 2012-07-31 Akim Demaille <akim@lrde.epita.fr> tests: really check the set of generated files * tests/output.at (AT_CHECK_OUTPUT): It used to check that the expected files are indeed generated, but it did not check that there are no additional ones. Do that, and adjust expectations (in particular alphabetical order). 2012-07-31 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: do not create stack.hh without %defines * data/stack.hh (b4_stack_define): New. * data/lalr1.cc: Use it when %defines is not passed. * tests/output.at: Adjust expected output. 2012-07-31 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: location.hh and position.hh are not generated without %defines * data/location.cc (b4_position_define, b4_location_define): New. (location.hh, position.hh): Generate only if %defines. * data/lalr1.cc: therefore, define these classes when locations are needed, but headers are not generated. * tests/output.at: Check that these files are not generated. * NEWS: Document. 2012-07-31 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: no longer require %defines. * data/lalr1.cc: Generate the parser header only when %defines is passed. * tests/calc.at: Check it. 2012-07-31 Akim Demaille <akim@lrde.epita.fr> skeletons: style changes * data/glr.c, data/lalr1.cc: Use more consistent comments, and YY_NULL declaration. 2012-07-31 Akim Demaille <akim@lrde.epita.fr> glr.cc, lalr1.cc: define b4_shared_declarations * data/glr.cc, data/lalr1.cc: here. The name is no longer right, but at least it is consistent with the other skeletons. 2012-07-31 Akim Demaille <akim@lrde.epita.fr> glr.cc: no longer require location support * data/glr.cc: Use b4_locations_if where appropriate. * data/lalr1.cc: M4 quotation changes to highlight code duplication with glr.cc. * tests/calc.at: Check glr.cc with and without %location. While at it, fuse multiple %parse-params into one. * tests/actions.at: Simplify. * NEWS: Doc this. Some other wording changes. 2012-07-31 Akim Demaille <akim@lrde.epita.fr> use obstack_printf This is not just nicer, it is also much safer, since we were using sprintf... * bootstrap.conf: Require it. * src/system.h (obstack_fgrow1, obstack_fgrow2, obstack_fgrow3) (obstack_fgrow4): Remove. Adjust dependencies. 2012-07-30 Akim Demaille <akim@lrde.epita.fr> scanner: restore a missing start condition $ flex src/scan-skel.l src/scan-skel.l:145: multiple <<EOF>> rules for start condition SC_AT_DIRECTIVE_ARGS src/scan-skel.l:145: multiple <<EOF>> rules for start condition SC_AT_DIRECTIVE_SKIP_WS This is warning, and it seems there are no means to make it an error. * src/scan-skel.l: Restore the start-condition INITIAL for an <<EOF>> clause. 2012-07-30 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-07-30 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-07-30 Akim Demaille <akim@lrde.epita.fr> version 2.6.1 * NEWS: Record release date. 2012-07-30 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-07-27 Akim Demaille <akim@lrde.epita.fr> maint: fix some syntax-check issues * cfg.mk: Nuke the following warnings which are confused by our text reports (that state that the error token is number 256). prohibit_magic_number_exit ../../doc/bison.texi:8170:error (256) ../../tests/conflicts.at:570:error (256) ../../tests/conflicts.at:673:error (256) ../../tests/conflicts.at:811:error (256) ../../tests/conflicts.at:1154:error (256) ../../tests/regression.at:281:error (256) ../../tests/regression.at:582:error (256) maint.mk: use EXIT_* values rather than magic number 2012-07-27 Akim Demaille <akim@lrde.epita.fr> regen 2012-07-27 Akim Demaille <akim@lrde.epita.fr> tests: do not depend on __cplusplus to decide for C++ or C output Since we do support compiling C code with a C++ compiler. * tests/actions.at (Qualified $$ in actions): Use AT_SKEL_CC_IF. 2012-07-27 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: (29 commits) regen synclines: remove spurious empty line also support $<foo>$ in the %initial-action skeletons: b4_dollar_pushdef and popdef to simpify complex definitions regen printer/destructor: translate only once factor the handling of m4 escaping news: schedule the removal of the ";" hack style changes in the scanners regen support $<tag>$ in printers and destructors scan-code: factor the handling of the type in $<TYPE>$ muscles: fix another occurrence of unescaped type name glr.cc: fix the handling of yydebug gnulib: update formatting changes tests: fix an assertion tests: adjust to GCC 4.8, which displays caret errors be sure to properly escape type names obstack_quote: escape and quote for M4 muscles: shuffle responsabilities muscles: make private functions static muscles: rename private functions/macros obstack_escape: escape M4 characters remove dead macro maint: style changes doc: avoid problems with case insensitive file systems configure: fix botched quoting news: fix typo. 2012-07-27 Akim Demaille <akim@lrde.epita.fr> regen 2012-07-27 Akim Demaille <akim@lrde.epita.fr> synclines: remove spurious empty line * data/bison.m4 (b4_syncline): Do not start with an empty line. 2012-07-27 Akim Demaille <akim@lrde.epita.fr> also support $<foo>$ in the %initial-action scan-code.l is already passing argument to b4_dollar_dollar for the initial acton, but its definition (of b4_dollar_dollar) does not use this argument. Generalize this definition, and use it for the %initial-action too. * data/c.m4 (b4_dollar_dollar_, b4_dollar_pushdef, b4_dollar_popdef): Instead of expecting a pointer, require a value, and use ".". Since they are now generic enough, move to... * data/c-like.m4: this new file. * data/c.m4, data/java.m4: Load it. * data/glr.c, data/lalr1.cc, data/lalr1.java, data/yacc.c: Use b4_dollar_pushdef for the %initial-action. * tests/actions.at: Check that. * data/Makefile.am: Adjust. * NEWS, doc/bison.texi: Document. 2012-07-27 Akim Demaille <akim@lrde.epita.fr> skeletons: b4_dollar_pushdef and popdef to simpify complex definitions M4 is really making it uselessly hard to define macros that define macros. * data/c.m4 (b4_dollar_pushdef, b4_dollar_popdef): New. Use it. 2012-07-27 Akim Demaille <akim@lrde.epita.fr> regen 2012-07-27 Akim Demaille <akim@lrde.epita.fr> printer/destructor: translate only once Currently "%printer {...} a b c d e f" translates the {...} six times. Not only is this bad for time and space, it also issues six times the same warnings. * src/symlist.h, src/symlist.c (symbol_list_destructor_set) (symbol_list_printer_set): Take the action as code_props instead of const char *. * src/parse-gram.y: Translate these actions here. * src/scan-code.h: Comment change. * tests/input.at: Check that warnings are issued only once. 2012-07-27 Akim Demaille <akim@lrde.epita.fr> factor the handling of m4 escaping The conversion from @ to @@ and so forth is coded is too many different places. Factor, a bit. * src/scan-code.l: Instead of duplicating the logic of obstack_escape, use it. It sure is less efficient, but the cost is negligible. This allows to factor rules that are alike. And to factor some start-condition clauses. * tests/input.at (Stray $ or @): New. * NEWS: Document it. 2012-07-27 Akim Demaille <akim@lrde.epita.fr> news: schedule the removal of the ";" hack scan-code.l is significantly more complex because of this. * NEWS: Doc it. 2012-07-27 Akim Demaille <akim@lrde.epita.fr> style changes in the scanners * src/scan-code.l, src/scan-skel.l: Use a more traditional indentation style for start-conditions. Prefer "continue" to a comment, for empty actions. Strip useless {}. Remove useless start-condition clauses. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> regen 2012-07-26 Akim Demaille <akim@lrde.epita.fr> support $<tag>$ in printers and destructors * src/scan-code.l (SC_SYMBOL_ACTION): Accept $<tag>$, not just $$. * data/c.m4 (b4_dollar_dollar_): New. (b4_symbol_actions): Let b4_dollar_dollar use b4_dollar_dollar_. * NEWS, doc/bison.texi: Document it. * tests/actions.at: Check this for C and C++. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> scan-code: factor the handling of the type in $<TYPE>$ * src/scan-code.l (fetch_type_name): New. (handle_action_dollar): Use it. (gt_ptr): Remove, useless. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> muscles: fix another occurrence of unescaped type name * src/output.c (quoted_output): Split into... (quoted_output, string_output): these. Use the former when outputting a type_name. * tests/input.at: Check this case. * src/symtab.h: Comment changes. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> glr.cc: fix the handling of yydebug * data/glr.cc (yydebug_): Remove, unused. (set_debug_level, debug_level): Work on yydebug instead. * doc/bison.texi, NEWS: Document this. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-07-26 Akim Demaille <akim@lrde.epita.fr> formatting changes * src/symtab.h: here. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> tests: fix an assertion * tests/local.at (AT_YYLEX_DEFINE): Be sure to check the array against its length, not its size in bytes. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> tests: adjust to GCC 4.8, which displays caret errors With GCC 4.8, the tests on synclines are skipped. Transform input.y:1:2: error: #error "1" #error "1" ^ into input.y:1: #error "1" * tests/synclines.at (AT_SYNCLINES_COMPILE): Do it, using Perl instead of sed. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> be sure to properly escape type names * src/scan-code.l: Use obstack_quote when passing type_name to m4. * tests/input.at (Code injection): New. * NEWS: Document it. Thanks to Paul Eggert for the wording. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> obstack_quote: escape and quote for M4 * src/system.h (obstack_quote): New. * src/muscle-tab.c: Use it instead of obstack_escape where applicable. * src/scan-code.l: Since obstack_quote supports NULL, leave type_name as NULL instead of defaulting to "". 2012-07-26 Akim Demaille <akim@lrde.epita.fr> muscles: shuffle responsabilities * src/muscle-tab.c (muscle_boundary_grow): Be in charge of quotation, instead of leaving this to the caller. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> muscles: make private functions static * src/muscle-tab.h, src/muscle-tab.c (muscle_boundary_grow) (muscle_location_grow): Now static. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> muscles: rename private functions/macros * src/muscle-tab.c (MUSCLE_COMMON_DECODE, muscle_string_decode) (muscle_location_decode): Not related to muscles, rename as... (COMMON_DECODE, string_decode, location_decode): these. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> obstack_escape: escape M4 characters * src/muscle-tab.h (MUSCLE_OBSTACK_SGROW): This is not related to muscles, so move to, and rename as... * src/system.h (obstack_escape): this. Adjust dependencies. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> remove dead macro * src/system.h (DEFAULT_TMPDIR): Remove, unused. 2012-07-26 Akim Demaille <akim@lrde.epita.fr> maint: style changes * src/scan-code.l: Remove useless braces. Formatting changes. Prefer NULL to 0. * src/muscle-tab.c, src/system.h: Formatting changes. 2012-07-24 Akim Demaille <akim@lrde.epita.fr> doc: avoid problems with case insensitive file systems makeinfo --html generates index.html, and the node "Index" will result in Index.html. On case insensitive file systems, such as on Mac OS X by default, this results in a single, invalid, file (Texinfo 4.13). See http://lists.gnu.org/archive/html/bug-texinfo/2012-07/msg00032.html * doc/bison.texi (Index): Rename as... (Index of Terms): this. 2012-07-24 Stefano Lattarini <stefano.lattarini@gmail.com> (tiny change) configure: fix botched quoting * configure.ac: In the AC_SUBST call on 'VALGRIND_PREBISON'. Without this change, when running ./configure, I see: ... checking for valgrind... valgrind ./configure: line 35221: -q: command not found checking for Java compiler... gcj -C -fsource=1.3 -ftarget=1.4 ... 2012-07-24 Akim Demaille <akim@lrde.epita.fr> regen 2012-07-24 Akim Demaille <akim@lrde.epita.fr> yystype, yyltype: remove. * data/c.m4: here. * NEWS: Doc it. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> regen 2012-07-22 Akim Demaille <akim@lrde.epita.fr> YYFAIL: remove. * data/lalr1.java, data/yacc.c, src/scan-code.l: Remove YYFAIL support. * NEWS, TODO: Update. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> todo: update. * TODO: obsolete items. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> regen. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> space changes. * data/bison.m4 (b4_symbol_action): Remove spurious eol in the output. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> parser: fix %printer usage. * src/parse-gram.y: Instead of stderr, using yyo. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> parser: factor the handling of code_props * src/parse-gram.y: Now that %printer and %destructor are treated equally, let... (code_props_type): handle them. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> parser: factor handling of type tags * src/parse-gram.y: Now that <*> and <> are processed like regular tags, let... (tag): handle them. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> regen. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> simplify the handling of <> and <*>'s code_props. Currently they are treated in separated variables, contrary to other <TYPE> code_props. This duplicates code (and messages for translators) uselessly, as demonstrated by the fact that thanks to this patch, now useless <*> and <> code_props are reported like the others. * src/parse-gram.y (generic_symlist_item): Treat "<*>" and "<>" as regular type tags. * src/symlist.h, src/symlist.c (symbol_list_default_tagged_new) (symbol_list_default_tagless_new,SYMLIST_DEFAULT_TAGGED) (SYMLIST_DEFAULT_TAGLESS): Remove. * src/symtab.h, src/symtab.c (default_tagged_code_props) (default_tagless_code_props, default_tagged_code_props_set) (default_tagless_code_props_set): Remove. (symbol_code_props_get): Default to <*> or <>'s code_props. * tests/actions.at: Complete expected errors: there are new warnings. * tests/input.at: Likewise. (Useless printers or destructors): Extend. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> allow modification on retrieved code_props. The logic to compute the %printer or %destructor to used (i.e., a code_props) is implemented twice: one, of course, in symbol_code_props_get, and another time in symbol_check_defined to record the fact that a code_props is used (so that we can reported unused ones). Let the former use the latter. I would probably use "mutable" in C++ and keep these guys const, but this is C. And casting away constness triggers warnings. * src/scan-code.h, src/scan-code.l (code_props_none): Is not const. * src/symtab.h, src/symtab.c (symbol_code_props_get): The symbol is not const. (symbol_check_defined): Use it. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> maint: regen. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> maint: fix bison's own header guards. Because I'm using a VPATH build with an absolute srcdir, I have GRAM__USERS_AKIM_SRC_GNU_BISON_SRC_PARSE_GRAM_H. Before, I was using a relative srcdir, and had GRAM_______SRC_PARSE_GRAM_H (coming from ../../). Let it be GRAM_SRC_PARSE_GRAM_H. * tests/bison.in: Do not depend on the value of $top_srcdir for Bison itself. If we were to use relative paths from .c to .y, we would not have this problem. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> maint: add missing const. * src/symtab.h, src/symtab.c (symbol_print): here. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> style changes. * src/parse-gram.y, src/symtab.c: Space changes. * src/symtab.h: Comment changes. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> autoconf: update. * submodules/autoconf: here. No significant changes for our use of m4sugar.m4. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> output: no longer use b4_tokens. * data/glr.c, data/glr.cc, data/lalr1.cc, data/lalr1.java, data/yacc.c: Since the previous commit, b4_tokens_define and the like no longer need b4_tokens. * src/output.c (token_definitions_output): Remove. 2012-07-22 Akim Demaille <akim@lrde.epita.fr> output: use the token list to define the yytokentype There are currently two systems used to pass information about tokens to m4: the original one, and another, which is used for instance for printers and destructors, variants etc. Move to using only the latter. * data/bison.m4 (b4_symbol_map, b4_token_visible_if) (b4_token_has_definition, b4_any_token_visible_if, b4_token_format): New. * data/c++.m4, data/c.m4, data/glr.c, data/java.m4: Adjust to use them. 2012-07-20 Akim Demaille <akim@lrde.epita.fr> tests: fix VPATH issue * examples/test: With an absolute VPATH build, "../" is incorrect. 2012-07-20 Akim Demaille <akim@lrde.epita.fr> news: fix typo. * NEWS: here. Reported by Ben Pfaff. 2012-07-19 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: maint: update gnu-web-doc-update. maint: post-release administrivia version 2.6 maint: prepare for release 2.6 maint: post-release administrivia version 2.5.91 maint: prepare NEWS. maint: fix spaces. tests: adjust to case where the C compiler is actually a C++ compiler tests: fix dependencies doc: fix Texinfo command maint: Valgrind on OS X. tests: be sure that backups are safe. maint: dead comment. tests: refactor for legibility. tests: refactor the bison invocations. maint: fix syntax-check ignore patterns. gnulib: update gnulib: update. gnulib: update 2012-07-19 Akim Demaille <akim@lrde.epita.fr> maint: update gnu-web-doc-update. * gnulib: here. 2012-07-19 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-07-19 Akim Demaille <akim@lrde.epita.fr> version 2.6 * NEWS: Record release date. 2012-07-19 Akim Demaille <akim@lrde.epita.fr> maint: prepare for release 2.6 * NEWS: here. 2012-07-18 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-07-18 Akim Demaille <akim@lrde.epita.fr> version 2.5.91 * NEWS: Record release date. 2012-07-18 Akim Demaille <akim@lrde.epita.fr> maint: prepare NEWS. 2012-07-18 Akim Demaille <akim@lrde.epita.fr> maint: fix spaces. * build-aux/Makefile.am: here. 2012-07-18 Akim Demaille <akim@lrde.epita.fr> tests: adjust to case where the C compiler is actually a C++ compiler * tests/atlocal.in (CC_IS_CXX): New. * tests/headers.at (Several parsers): Use it. 2012-07-18 Akim Demaille <akim@lrde.epita.fr> tests: fix dependencies * tests/Makefile.am: we need atconfig and atlocal to be up to date when calling testsuite. 2012-07-18 Akim Demaille <akim@lrde.epita.fr> doc: fix Texinfo command * doc/bison.texi: In parens, use @pxref. 2012-07-18 Akim Demaille <akim@lrde.epita.fr> maint: Valgrind on OS X. * configure.ac (VALGRIND_PREBISON): New. * tests/Makefile.am (maintainer-check-valgrind): Use it. * etc/darwin11.4.0.supp: New. * configure.ac, etc/Makefile.am: Use it. * configure.ac: Disable Valgrind on Mac OS X. * README-hacking: Explain why. 2012-07-17 Akim Demaille <akim@lrde.epita.fr> tests: be sure that backups are safe. * tests/local.at (at_save_special_files): here. 2012-07-17 Akim Demaille <akim@lrde.epita.fr> maint: dead comment. * etc/README: here. 2012-07-17 Akim Demaille <akim@lrde.epita.fr> tests: refactor for legibility. * tests/local.at (AT_BISON_CHECK_WARNINGS, AT_BISON_CHECK_WARNINGS_): New. 2012-07-17 Akim Demaille <akim@lrde.epita.fr> tests: refactor the bison invocations. * tests/local.at (m4_null_if, AT_BISON_CHECK_): New. 2012-07-17 Akim Demaille <akim@lrde.epita.fr> maint: fix syntax-check ignore patterns. * cfg.mk: here. 2012-07-17 Akim Demaille <akim@lrde.epita.fr> gnulib: update 2012-07-16 Akim Demaille <akim@lrde.epita.fr> gnulib: update. * gnulib: Update so that gitlog-to-changelog support --srcdir. * Makefile.am: Use it. 2012-07-10 Akim Demaille <akim@lrde.epita.fr> gnulib: update * bootstrap, build-aux/.gitignore, gnulib, m4/.gitignore: update. 2012-07-06 Akim Demaille <akim@lrde.epita.fr> maint: minor fixes * NEWS: restore missing entry. * cfg.mk: Adjust to *.texinfo -> *.texi. * src/symtab.c: Spaces fixes. 2012-07-06 Akim Demaille <akim@lrde.epita.fr> tests: address g++-4.8 warnings. list.yy: In function 'yy::parser::symbol_type yylex()': list.yy:107:29: error: typedef 'token' locally defined but not used [-Werror=unused-local-typedefs] typedef yy::parser::token token; ^ * tests/c++.at (AT_CHECK_VARIANTS): here. 2012-07-06 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: maint: update release instructions maint: post-release administrivia version 2.5.90 build: fix gen-ChangeLog call. gnulib: update. tests: fix SKIP_IF for Java. api.prefix: incompatible with %name-prefix. api.prefix: strengthen the tests and fix push-parsers. skeletons: style changes. NEWS: minor changes. api.prefix: improve the documentation for YYDEBUG. gnulib: update. 2012-07-06 Akim Demaille <akim@lrde.epita.fr> maint: update release instructions * README-hacking: here. 2012-07-05 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-07-05 Akim Demaille <akim@lrde.epita.fr> version 2.5.90 * NEWS: Record release date. 2012-07-05 Akim Demaille <akim@lrde.epita.fr> build: fix gen-ChangeLog call. * Makefile.am: Be sure to catch errors, and fix option name 2012-07-05 Akim Demaille <akim@lrde.epita.fr> gnulib: update. * gnulib/build-aux/do-release-commit-and-tag: Fix. 2012-07-05 Akim Demaille <akim@lrde.epita.fr> tests: fix SKIP_IF for Java. * tests/local.at (AT_JAVA_COMPILE): here. 2012-07-05 Akim Demaille <akim@lrde.epita.fr> api.prefix: incompatible with %name-prefix. * data/bison.m4: Make it incompatible. * tests/input.at: Check that it is. 2012-07-05 Akim Demaille <akim@lrde.epita.fr> api.prefix: strengthen the tests and fix push-parsers. * tests/calc.at: Check api.prefix in addition to %name-prefix. * tests/headers.at: Check push parsers and pure interface. * tests/local.at: Use YYLTYPE renamed. * data/yacc.c (b4_declare_yyparse_push_): Handle api.prefix. * doc/bison.texi: Style changes. 2012-07-05 Akim Demaille <akim@lrde.epita.fr> skeletons: style changes. * data/bison.m4: Define default values after having defined the support macros. Kill a dead comment. 2012-07-05 Akim Demaille <akim@lrde.epita.fr> NEWS: minor changes. * NEWS: style changes. 2012-07-05 Akim Demaille <akim@lrde.epita.fr> api.prefix: improve the documentation for YYDEBUG. * doc/bison.texi: Explain how api.prefix is applied to YYDEBUG. 2012-07-05 Akim Demaille <akim@lrde.epita.fr> gnulib: update. * bootstrap, gnulib: Update. * cfg.mk (syntax-check): Don't check "error" usage in bison.texi. 2012-07-04 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: tests: headers.at: strengthen. glr.cc: do not override C++ definitions by C macros. YYLLOC_DEFAULT: factor, and don't export it in headers. api.prefix: do not use #define to handle YYSTYPE_IS_TRIVIAL etc. tests: portability fixes. c++: fewer #includes in the headers. glr.cc: formatting changes. tests: more logs. api.prefix: also rename YYDEBUG. 2012-07-04 Akim Demaille <akim@lrde.epita.fr> tests: headers.at: strengthen. * tests/headers.at (Several headers): Be stricter when checking the exported macros. 2012-07-04 Akim Demaille <akim@lrde.epita.fr> glr.cc: do not override C++ definitions by C macros. * data/glr.c: here. * data/glr.cc: Fix overquotation. * tests/headers.at: Comment changes. 2012-07-04 Akim Demaille <akim@lrde.epita.fr> YYLLOC_DEFAULT: factor, and don't export it in headers. * data/c++.m4, data/c.m4 (b4_yylloc_default_define): New. * data/glr.c, data/glr.cc, data/lalr1.cc, data/yacc.c: Use it. * data/glr.cc: Do not define YYLLOC_DEFAULT in the header file, but in the implementation one. 2012-07-04 Akim Demaille <akim@lrde.epita.fr> api.prefix: do not use #define to handle YYSTYPE_IS_TRIVIAL etc. The following mixture is insane: #define YYSTYPE_IS_TRIVIAL PREFIX_STYPE_IS_TRIVIAL #if (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL) since, of course YYSTYPE_IS_TRIVIAL is defined. Instead we could define YYSTYPE_IS_TRIVIAL as PREFIX_STYPE_IS_TRIVIAL only when the later is defined, but let's avoid stacking CPP on top of M4: rather, use #if (defined PREFIX_STYPE_IS_TRIVIAL && PREFIX_STYPE_IS_TRIVIAL) * data/glr.c, data/yacc.c: Use YYSTYPE_IS_TRIVIAL, YYSTYPE_IS_DECLARED, YYLTYPE_IS_TRIVIAL and YYLTYPE_IS_DECLARED under their api.prefix-renamed name. 2012-07-04 Akim Demaille <akim@lrde.epita.fr> tests: portability fixes. Reported by Hydra. * tests/headers.at (Several headers): Be sure to include config.h in the files to compile. 2012-07-04 Akim Demaille <akim@lrde.epita.fr> c++: fewer #includes in the headers. * data/lalr1.cc: Define YY_NULL in the *.cc file, it is not needed in the header. * data/location.cc: iosfwd suffices. 2012-07-04 Akim Demaille <akim@lrde.epita.fr> glr.cc: formatting changes. * data/glr.cc: here. 2012-07-04 Akim Demaille <akim@lrde.epita.fr> tests: more logs. * tests/headers.at (Several parsers): Here. 2012-07-04 Akim Demaille <akim@lrde.epita.fr> api.prefix: also rename YYDEBUG. The testsuite in master has shown weird errors for the "Mulitple Parsers" tests: the caller of p5.parse() received some apparently random value, while tracing p5.parse() showed that the function was consistently returning 0. It happens when mixing several parser headers, some generated without %debug, others with. In particular the C++ parser was generated with %debug, i.e., with: #ifndef YYDEBUG # define YYDEBUG 1 #endif and compiled separatedly. Yet, its header was included after the one of another parser, this time without %debug, i.e., with #ifndef YYDEBUG # define YYDEBUG 0 #endif in its header. As a result, the parser was compiled with YYDEBUG set, but its header was used without. Since the layout of the objects are then completely different, boom. Therefore, do not change the value of YYDEBUG. Rather, use it as a default value for <API.PREFIX>DEBUG. * data/c.m4 (b4_YYDEBUG_define): New. (b4_declare_yydebug): Rename as... (b4_yydebug_declare): this, for consistency. * data/glr.c, data/glr.cc, data/lalr1.cc, data/yacc.c: Use it. * NEWS: Document it. 2012-07-02 Akim Demaille <akim@lrde.epita.fr> formatting changes. * data/lalr1.cc: here. 2012-07-02 Akim Demaille <akim@lrde.epita.fr> NEWS: spell fixes. * NEWS: here. Reported by Stefano Lattarini. 2012-07-02 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: NEWS: spell check. api.prefix. 2012-07-02 Akim Demaille <akim@lrde.epita.fr> NEWS: spell check. * NEWS: here. 2012-06-29 Akim Demaille <akim@lrde.epita.fr> api.prefix. * data/c.m4 (b4_api_prefix, b4_api_PREFIX): New. (b4_prefix, b4_union_name, b4_token_enums, b4_declare_yylstype): Use them. * data/glr.c, data/yacc.c, data/glr.cc, data/lalr1.cc: Use them to change the prefix of exported preprocessor symbols. * src/getargs.c (usage): Ditto. * tests/headers.at (Several parsers): New. * tests/local.at (AT_API_PREFIX): New. AT_YYSTYPE, AT_YYLTYPE): Adjust. * doc/bison.texi (Multiple Parsers): Move documentation of %name-prefix to... (Table of Symbols): here. (Multiple Parsers): Document api.prefix. (%define Summary): Point to it. Use @code for variable names. (Bison Options): -p/--name-prefix are obsoleted. * NEWS: Announce api.prefix. 2012-06-29 Victor Santet <victor.santet@epita.fr> warnings: display warnings categories * src/complain.c (error_message): Call 'warnings_print_categories'. * src/gram.c (grammar_rules_useless_report): Display itself warning category. * tests/actions.at, tests/conflicts.at, tests/existing.at, tests/input.at, tests/named-refs.at, tests/output.at, tests/reduce.at, tests/regression.at, tests/skeletons.at: Adjust. * NEWS: Document this. 2012-06-29 Victor Santet <victor.santet@epita.fr> warnings: be ready to print warnings categories A function to print warnings categories, like -Wyacc, -Wother, etc. * src/complain.h, src/complain.c (print_warning_categories): New function. * src/output.c (ARRAY_CARDINALITY): Move it to file 'src/system.h'. * src/complain.h (enum warnings): New value, 'silent', "complain" must not display the warning type. 2012-06-29 Akim Demaille <akim@lrde.epita.fr> maint: prepare forthcoming changes * src/gram.c (rule_rhs_print): Do not print new line anymore. (rule_print): Make it static. * src/closure.c, src/derives.c, src/gram.c: Adjust. 2012-06-29 Victor Santet <victor.santet@epita.fr> style changes * src/complain.c, src/reader.c, src/reduce.c, src/main.c: Fix indentation. Simplify a bit. 2012-06-28 Akim Demaille <akim@lrde.epita.fr> regen. 2012-06-28 Victor Santet <victor.santet@epita.fr> warnings: factoring: complaints * src/complain.c (error_message): Accept warning categories (an integer) as argument. Location is a 'const location *' instead of 'location *'. (ERROR_MESSAGE): Delete it. * src/complain.c, src/complain.h (complains): New function. (complain, complain_at, complain_at_indent): Generic functions for complaints. Call 'complains'. (warn_at, warn_at_indent, warn, yacc_at, midrule_value_at) (fatal_at, fatal): Delete them. Adjust dependencies. * src/complain.h (enum warnings): New fields 'complaint' and 'fatal'. * bootstrap.conf (XGETTEXT_OPTIONS): Adjust. 2012-06-28 Victor Santet <victor.santet@epita.fr> warnings: move them to complain.c. * src/getargs.h, src/getargs.c (warnings, warnings_flags): Move to... * src/complain.h, src/complain.c: Here. 2012-06-28 Victor Santet <victor.santet@epita.fr> warnings: rename the categories Forthcoming changes will use the warning categories much more often, so shortening them will improve readability. * src/complain.c, src/complain.h, src/conflicts.c, * src/getargs.c, src/getargs.h, src/gram.c (enum warnings): s/warnings_/W/g. 2012-06-28 Akim Demaille <akim@lrde.epita.fr> fix merge. * data/bison.m4: Use b4_error_verbose_if after it was defined. 2012-06-28 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: tests: use the generalized default yylex. tests: AT_YYERROR_DEFINE: prepare for list of ints. skeletons: no longer define YYLSP_NEEDED. c++: do not export YYTOKEN_TABLE and YYERROR_VERBOSE. 2012-06-28 Akim Demaille <akim@lrde.epita.fr> tests: use the generalized default yylex. * tests/actions.at, tests/glr-regression.at, tests/regression.at: here. 2012-06-28 Akim Demaille <akim@lrde.epita.fr> tests: AT_YYERROR_DEFINE: prepare for list of ints. * tests/local.at (AT_YYERROR_DEFINE): Don't add quotes, check their presence to detect char/int types. * tests/actions.at, tests/conflicts.at, tests/glr-regression.at, * tests/push.at, tests/regression.at: Adjust. 2012-06-27 Akim Demaille <akim@lrde.epita.fr> skeletons: no longer define YYLSP_NEEDED. * data/c.m4, data/glr.cc: here. * NEWS, TODO: Adjust. 2012-06-27 Akim Demaille <akim@lrde.epita.fr> c++: do not export YYTOKEN_TABLE and YYERROR_VERBOSE. * src/output.c (prepare_symbols): Do not define b4_token_table. (prepare): Define b4_token_table_flag. * data/bison.m4 (b4_token_table_if): New. Arm it when error-verbose. * data/glr.c, data/yacc.c (YYTOKEN_TABLE): Remove. Use m4. * data/lalr1.cc: Likewise. (YYERROR_VERBOSE): Remove. * NEWS, doc/bison.texi: Document this. 2012-06-26 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: maint: use *.texi. 2012-06-26 Akim Demaille <akim@lrde.epita.fr> maint: use *.texi. This is more consistent with the other packages, and Automake-NG supports only *.texi. * doc/bison.texinfo: Rename as... * doc/bison.texi: this. * doc/Makefile.am, examples/calc++/Makefile.am: Adjust. 2012-06-26 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: tests: do not output m4 set up. tests: use the generic yyerror function. tests: use assert instead of plain abort. tests: improve the generic yylex implementation. tests: generalize the compilation macros. tests: fix confusion between api.prefix and name-prefix. maint: gitignores. yacc: work around the ylwrap limitation. 2012-06-26 Victor Santet <victor.santet@epita.fr> warnings: raise warning for useless printers or destructors * src/scan-code.h (code_props): Add field 'is_used'. (CODE_PROPS_NONE_INIT): Adjust. * src/scan-code.l (code_props_plain_init, code_props_symbol_action_init) (code_props_rule_action_init): Instead of implementing several times the initialization of the code_props structures, use code_props_none_init. * src/symtab.c (symbol_check_defined): If a symbol does not have a destructor (resp. printer) but has a type which has a destructor (resp. printer), then set field 'is_used' to true. (semantic_type_check_defined): If a type has a destructor (resp. printer) but all symbols of this type have already a destructor (resp. printer), then raise a warning. * tests/input.at (Useless printers or destructors): New. 2012-06-26 Akim Demaille <akim@lrde.epita.fr> tests: do not output m4 set up. * tests/local.at (AT_BISON_OPTION_PUSHDEFS, AT_BISON_OPTION_POPDEFS): Use a diversion to avoid outputting comments etc. Removes 17k lines from testsuite (10% of the number of lines). 2012-06-26 Akim Demaille <akim@lrde.epita.fr> tests: use the generic yyerror function. * tests/actions.at (_AT_CHECK_PRINTER_AND_DESTRUCTOR): Factor. Use AT_YYERROR_DEFINE. Therefore, instead of using stdout, use and check stderr. * tests/glr-regression.at (Uninitialized location when reporting ambiguity): Use AT_YYERROR_DEFINE. 2012-06-26 Akim Demaille <akim@lrde.epita.fr> tests: use assert instead of plain abort. * tests/actions.at, tests/calc.at, tests/conflicts.at, * tests/cxx-type.at, tests/glr-regression.at, tests/input.at, * tests/named-refs.at, tests/regression.at, tests/torture.at, * tests/local.at: Prefer assert to abort. 2012-06-26 Akim Demaille <akim@lrde.epita.fr> tests: improve the generic yylex implementation. * tests/local.at (AT_YYSTYPE, AT_YYLTYPE): New. (AT_YYLEX_FORMALS): Use them. (AT_YYLEX_DEFINE): Be independent of the location implementation. 2012-06-26 Akim Demaille <akim@lrde.epita.fr> tests: generalize the compilation macros. * tests/local.at (AT_COMPILE, AT_COMPILE_CXX): If OUTPUT ends with ".o", then append the "natural" extension for the input file (.c or .cc). If there is no source, pass -c. * tests/headers.at, tests/input.at, tests/regression.at: Adjust. 2012-06-26 Akim Demaille <akim@lrde.epita.fr> tests: fix confusion between api.prefix and name-prefix. * tests/local.at (AT_NAME_PREFIX): Take api.prefix into account. (AT_API_PREFIX): Rename as... (AT_API_prefix): this. Do not take %name-prefix into account. Fix misuses. 2012-06-26 Akim Demaille <akim@lrde.epita.fr> maint: gitignores. 2012-06-25 Victor Santet <victor.santet@epita.fr> warnings: useless semantic types * src/symtab.h (symbol_list): Represent semantic types as structure 'semantic_type'. * src/symlist.c (symbol_list_type_new): Allocate this structure. (symbol_list_code_props_set): Set this semantic type's status to used if it was not declared. * src/symtab.c (semantic_types_sorted): New. (semantic_type_new): Set the new semantic type's location appropriately. (symbol_check_defined): If a symbol has a type, then set this type's status to "declared". (semantic_type_check_defined, semantic_type_check_defined_processor): Same as symbol_check_defined and symbol_check_defined_processor, but for semantic types. (symbol_check_defined): Check semantic types usefulness. * src/symtab.h (semantic_type): New fields 'location' and 'status'. * src/symtab.h, src/symtab.c (semantic_type_new) (semantic_type_from_uniqstr, semantic_type_get): Accept a location as a supplementary argument. * tests/input.at (Unassociated types used for printer of destructor): New. * tests/c++.at (AT_CHECK_VARIANTS): Fix an error caught by this commit. 2012-06-25 Akim Demaille <akim@lrde.epita.fr> yacc: work around the ylwrap limitation. * data/yacc.c (b4_shared_declarations): Include the header guards. Do not include the header in the *.c file, duplicate it. * NEWS (Future Changes): Extend, and announce the forthcoming change about the use of the parser header. 2012-06-25 Akim Demaille <akim@lrde.epita.fr> fix for printers and destructors. The previous "code_props: factor more" patch sends has_%printer etc. to m4, instead of has_printer. * src/output.c (prepare_symbol_definitions): Fix value of pname. 2012-06-25 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: tests: more uniformity. tests: handle locations in a more generic way. tests: handle locations in the generic yyerror functions. tests: fix AT_CHECK_CALC. tests: improve infrastructure tests: factor. skeletons: minor style changes tests: AT_LANG. c skeletons: factor the declaration of yylloc and yylval. news: condemn YYPARSE_PARAM and YYLEX_PARAM. maint: regen. 2012-06-22 Akim Demaille <akim@lrde.epita.fr> code_props: factor more. * src/symtab.h, src/symtab.c (code_props_type_string): No longer static. * src/output.c (CODE_PROPS): Remove, we can now iterate on both the destructor and the printer. (SET_KEY2): New. 2012-06-22 Victor Santet <victor.santet@epita.fr> maint: factor the handling of %printer and %destructor There is too much code duplication between %printer and %destructor. We used to have two functions for each action: the first one for destructors, the second one for printers. Factor using a 'code_props_type', and an array of code_props instead of two members. * src/symlist.h, src/symlist.c (symbol_list_destructor_set) (symbol_list_printer_set): Fuse into... (symbol_list_code_props_set): this. * src/symtab.h, src/symtab.c (default_tagged_destructor) (default_tagged_printer): Fuse into... (default_tagged_code_props): this. (default_tagless_destructor, default_tagless_printer) (default_tagless_code_props): Likewise. (code_props_type_string): new. (symbol_destructor_set, symbol_destructor_get, semantic_type_destructor_set) (default_tagged_destructor_set, default_tagless_destructor_set) (symbol_printer_set, symbol_printer_get, semantic_type_printer_set) (default_tagged_printer_set, default_tagless_printer_set): Replace by... (symbol_code_props_set, symbol_code_props_get, semantic_type_code_props_set) (default_tagged_code_props_set, default_tagless_code_props_set): these. * src/parse-gram.y (grammar_declaration): Adjust. * src/output.c (CODE_PROP, grammar_declaration): Ditto. * src/reader.c (symbol_should_be_used): Ditto. 2012-06-22 Akim Demaille <akim@lrde.epita.fr> tests: more uniformity. * tests/local.at (AT_LEX_FORMALS, AT_LEX_ARGS, AT_LEX_PRE_FORMALS) (AT_LEX_PRE_ARGS): Rename as... (AT_YYLEX_FORMALS, AT_YYLEX_ARGS, AT_YYLEX_PRE_FORMALS) (AT_YYLEX_PRE_ARGS): these, for consistency. (AT_API_PREFIX): Take %name-prefix into account. (AT_YYLEX_PROTOTYPE): New. Use it. * tests/actions.at, tests/calc.at, tests/cxx-type.at: Adjust to use them. 2012-06-22 Akim Demaille <akim@lrde.epita.fr> tests: handle locations in a more generic way. * tests/local.at (AT_YYERROR_PROTOTYPE): New. Use it. * tests/cxx-type.at: Extensive revamp to use a more traditional quotation scheme, and to use the generic yyerror implementation. Prefer Autotest macros to CPP macros. * tests/java.at: . 2012-06-22 Akim Demaille <akim@lrde.epita.fr> tests: handle locations in the generic yyerror functions. * tests/local.at (AT_YYERROR_DECLARE_EXTERN, AT_YYERROR_DECLARE) (AT_YYERROR_DEFINE): Handle locations for C and C++. * tests/calc.at: Use it for C++ (as C has extra arguments which are not yet handled by AT_BISON_OPTION_PUSHDEFS). * tests/actions.at: Adjust. 2012-06-22 Akim Demaille <akim@lrde.epita.fr> tests: fix AT_CHECK_CALC. * tests/calc.at (AT_CHECK_CALC): Contrary to its documentation, the test was skipped if given a second argument. Unused feature, remove it. 2012-06-22 Akim Demaille <akim@lrde.epita.fr> tests: improve infrastructure * tests/local.at (AT_LANG): Use c++ instead of cxx for C++. Adjust dependencies. (AT_YYERROR_DECLARE_EXTERN, AT_YYERROR_DECLARE): Issue nothing for C++/Java. (AT_YYERROR_DEFINE): Use m4_case. (AT_JAVA_COMPILE): Use AT_SKIP_IF. 2012-06-21 Akim Demaille <akim@lrde.epita.fr> tests: factor. * tests/glr-regression.at, tests/output.at, tests/push.at, * tests/regression.at, tests/torture.at, tests/actions.at: Use AT_YYLEX_* and AT_YYERROR_*. 2012-06-21 Akim Demaille <akim@lrde.epita.fr> skeletons: minor style changes * data/glr.c, data/yacc.c: here. 2012-06-21 Akim Demaille <akim@lrde.epita.fr> tests: AT_LANG. * tests/local.at (AT_BISON_OPTION_PUSHDEFS, AT_BISON_OPTION_POPDEFS): Define/undefine AT_LANGE (AT_LANG_COMPILE): New. (AT_FULL_COMPILE): Use AT_LANG. 2012-06-21 Victor Santet <victor.santet@epita.fr> symtab: refactoring Prepares forthcoming changes. * src/symtab.c (symbols_do): Accept the hash table and the sorted list as arguments. Adjust dependencies. 2012-06-21 Akim Demaille <akim@lrde.epita.fr> maint: address syntax-check issues. * examples/calc++/local.mk: Space changes. * src/files.c: Avoid unmarked_diagnostics. * src/output.c: Remove useless include. 2012-06-21 Akim Demaille <akim@lrde.epita.fr> c skeletons: factor the declaration of yylloc and yylval. There is one difference: now, even without --defines, we generate extern declarations for these variables. The factoring is worth it. * data/c.m4 (b4_declare_yylstype): Declare them. * data/glr.c, data/yacc.c: Adjust. 2012-06-21 Akim Demaille <akim@lrde.epita.fr> news: condemn YYPARSE_PARAM and YYLEX_PARAM. * NEWS: here. (Bison 1.875): Add %parse-param and %lex-param. * doc/bison.texinfo: Spello. 2012-06-20 Akim Demaille <akim@lrde.epita.fr> fix warnings for useless %printer/%destructor The previous commit, which turns into a warning what used to be an error: %printer {} foo; %% exp: '0'; has two shortcomings: the warning is way too long (foo is reported to be useless later), and besides, it also turns into a warning much more serious errors: %printer {} foo; %% exp: foo; Reduce the amount to warnings in the first case, restore the error in the second. * src/symtab.h (status): Add a new inital state: undeclared. * src/symtab.c (symbol_new): Initialize to undeclared. (symbol_class_set): Simplify the logic of the code that neutralize the "redeclared" warning after the "redefined" one. (symbol_check_defined): "undeclared" is also an error. * src/reader.c (grammar_current_rule_symbol_append): Symbols appearing in a rule are "needed". * src/symlist.c (symbol_list_destructor_set, symbol_list_printer_set): An unknown symbol appearing in a %printer/%destructor is "used". * src/reduce.c (nonterminals_reduce): Do not report as "useless" symbols that are not used (e.g., those that for instance appeared only in a %printer). * tests/input.at (Undeclared symbols used for a printer or destructor): Improve the cover the cases described above. 2012-06-20 Akim Demaille <akim@lrde.epita.fr> gitignore: test-driver. 2012-06-20 Akim Demaille <akim@lrde.epita.fr> maint: style changes. * src/reduce.c (reduce_grammar_tables): Define variables with their initial value. 2012-06-20 Akim Demaille <akim@lrde.epita.fr> news: fixes. * NEWS: Fix spelling. 2012-06-20 Victor Santet <victor.santet@epita.fr> warnings: used but undeclared symbols are warnings We used to raise an error if a symbol appears only in a %printer or %destructor. Make it a warning. * src/symtab.h (status): New enum. (symbol): Replace the binary "declared" with the three-state "status". Adjust dependencies. * src/symtab.c (symbol_check_defined): Needed symbols are an error, whereas "used" are simply warnings. * src/symlist.c (symbol_list_destructor_set, symbol_list_printer): Set symbol status to 'used' when associated to destructors or printers. * input.at (Undeclared symbols used for a printer or destructor): New. 2012-06-20 Akim Demaille <akim@lrde.epita.fr> maint: regen. * Makefile.am (regen): New target. 2012-06-20 Akim Demaille <akim@lrde.epita.fr> regen. 2012-06-20 Akim Demaille <akim@lrde.epita.fr> maint: regen. * Makefile.am (regen): New target. 2012-06-19 Akim Demaille <akim@lrde.epita.fr> tests: enhance AT_YYERROR_DEFINE. * tests/local.at: Handle the fact that locations are no longer needed with lalr1.cc. 2012-06-19 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: maint: formatting changes. tests: support api.prefix. tests: pacify font-lock-mode. tests: remove test covered elsewhere. tests: factor the declaration/definition of yyerror and yylex. regen. tests: portability issues. tests: call the parser from another compilation unit. glr.c, yacc.c: declare yydebug in the header. skeletons: use header guards. tests: improve AT_FULL_COMPILE. tests: reorder. tests: strengthen the test on generated headers inclusion yacc.c: instead of duplicating y.tab.h inside y.tac.c, include it. yacc.c: factor. 2012-06-19 Akim Demaille <akim@lrde.epita.fr> maint: formatting changes. * NEWS: Fix indentation of code snippets. Untabify. 2012-06-17 Akim Demaille <akim@lrde.epita.fr> tests: support api.prefix. * tests/local.at (AT_BISON_OPTION_PUSHDEFS, AT_BISON_OPTION_POPDEFS): Define AT_API_PREFIX. (AT_YYERROR_DEFINE, AT_YYERROR_DECLARE_EXTERN, AT_YYLEX_DECLARE_EXTERN) (AT_YYLEX_DEFINE): Use it. * tests/input.at, tests/regression.at, tests/torture.at: Add AT_BISON_OPTION_PUSHDEFS/POPDEFS. 2012-06-17 Akim Demaille <akim@lrde.epita.fr> tests: pacify font-lock-mode. * tests/local.at: here. 2012-06-17 Akim Demaille <akim@lrde.epita.fr> tests: remove test covered elsewhere. * tests/headers.at (%union and --defines): Remove, pretty useless and insignificant. 2012-06-17 Akim Demaille <akim@lrde.epita.fr> tests: factor the declaration/definition of yyerror and yylex. * tests/local.at (AT_YYERROR_DECLARE, AT_YYERROR_DECLARE_EXTERN) (AT_YYERROR_DEFINE, AT_YYLEX_DECLARE, AT_YYLEX_DECLARE_EXTERN) (AT_YYLEX_DEFINE): New. Must be used inside AT_BISON_OPTION_PUSHDEFS/POPDEFS pair. * tests/actions.at, tests/conflicts.at, tests/glr-regression.at, * tests/headers.at, tests/input.at, tests/named-refs.at, * tests/regression.at, tests/skeletons.at, tests/synclines.at, * tests/torture.at: Use them. 2012-06-17 Akim Demaille <akim@lrde.epita.fr> regen. 2012-06-17 Akim Demaille <akim@lrde.epita.fr> tests: portability issues. * tests/calc.at (AT_CALC_MAIN): Missing include reported by Hydra. 2012-06-15 Akim Demaille <akim@lrde.epita.fr> tests: call the parser from another compilation unit. In order to improve the testing of %defines, which exports the interface of the generated parser, change the calc.at tests so that when %defines is passed, main will be in another compilation unit. It loads the generated header. * tests/calc.at (AT_CALC_MAIN): New. Includes the definition of the global variables. Therefore, now declare them from the %requires section of the parser. Adjust to yydebug and yyparse being renamed by %name-prefix. 2012-06-15 Akim Demaille <akim@lrde.epita.fr> glr.c, yacc.c: declare yydebug in the header. * data/c.m4 (b4_declare_yydebug): New. * data/glr.c, data/yacc.c (b4_shared_declarations): Use it. Remove the corresponding code from the parser body. * NEWS: Doc this. 2012-06-15 Akim Demaille <akim@lrde.epita.fr> skeletons: use header guards. * data/glr.c, data/glr.cc, data/yacc.c: here. * NEWS: Document it. 2012-06-15 Akim Demaille <akim@lrde.epita.fr> tests: improve AT_FULL_COMPILE. * tests/local.at: Accept a third argument. Simplify quotation pattern. Calls for better refactoring, but will suffice for a while. 2012-06-15 Akim Demaille <akim@lrde.epita.fr> tests: reorder. * tests/calc.at (power): Move its definition, as a preparation for forthcoming changes. And space changes. 2012-06-15 Akim Demaille <akim@lrde.epita.fr> tests: strengthen the test on generated headers inclusion * tests/headers.at (AT_TEST_CPP_GUARD_H): Accept Bison directives. (Invalid CPP headers): Check glr. 2012-06-15 Akim Demaille <akim@lrde.epita.fr> yacc.c: instead of duplicating y.tab.h inside y.tac.c, include it. This is already what glr.c and lalr1.cc do. * data/yacc.c: here. 2012-06-15 Akim Demaille <akim@lrde.epita.fr> maint: xfdopen, and scope reduction. * src/files.h, src/files.c (xfdopen): New. * src/output.c (output_skeleton): Use it. Reduce the scope of argv. 2012-06-15 Akim Demaille <akim@lrde.epita.fr> maint: space changes * configure.ac, src/complain.c: space changes. 2012-06-13 Akim Demaille <akim@lrde.epita.fr> yacc.c: factor. yacc.c used to include two almost identical sections: one for the *.h file, and another for the *.c file. The main difference is that in the *.c file we used the yy* names (as %name-prefix is handled by "#define yy* <prefix>*" before), while the *.hh used <prefix>* names. Keep only the later. If this is troublesome, b4_shared_declarations can easily take the desired prefix as argument. * data/yacc.c (b4_shared_declarations): New. Use it to factor duplicated declarations. 2012-06-13 Stefano Lattarini <stefano.lattarini@gmail.com> (tiny change) cosmetics: prettify names for compiled object for bison * src/local.mk (src_bison_SHORTNAME): Define to "bison". 2012-06-13 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: spello. * data/lalr1.cc: Reported by Gilles Espinasse. 2012-06-13 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: skeletons: factor yacc.c and glr.c. glr.c: minor refactoring. tests: remove all the -On flags. maint: fix spello. maint: improve release procedure instructions. gnulib: update readme-release. maint: cfg.mk: manual title. maint: cfg.mk: simplify maint: post-release administrivia 2012-06-12 Akim Demaille <akim@lrde.epita.fr> skeletons: factor yacc.c and glr.c. yacc.c and glr.c share common declarations. Their YYLTYPE are exactly equal, and their YYSTYPE are sufficiently alike to be fused (its declaration was protected by YYSTYPE_IS_DECLARED in yacc.c, but not in glr.c). Besides, yacc.c duplicated the definitions of YYLTYPE and YYSTYPE (*.h/*.c). * data/c.m4 (b4_declare_yylstype): New. * data/yacc.c, data/glr.c: Use it. 2012-06-12 Akim Demaille <akim@lrde.epita.fr> glr.c: minor refactoring. * data/glr.c (b4_shared_declarations): Move from the generated file section, to the M4 prologue. 2012-06-12 Akim Demaille <akim@lrde.epita.fr> tests: remove all the -On flags. * tests/atlocal.in: Here. Reported by Gilles Espinasse. 2012-06-12 Akim Demaille <akim@lrde.epita.fr> maint: fix spello. * README-hacking: Here. * THANKS: Reported by Gilles Espinasse. 2012-06-12 Akim Demaille <akim@lrde.epita.fr> maint: improve release procedure instructions. * gnulib: Update, in particular (README-release). * bootstrap.conf: don't require gendocs, provided by gnu-web-doc-update, provided by readme-release. * README-hacking: Update accordingly. 2012-06-07 Akim Demaille <akim@lrde.epita.fr> gnulib: update readme-release. * gnulib (readme-release): Now includes the modules it promotes. * bootstrap.conf: Simplify accordingly. 2012-06-07 Akim Demaille <akim@lrde.epita.fr> maint: cfg.mk: manual title. * cfg.mk (manuel_title): New. 2012-06-07 Akim Demaille <akim@lrde.epita.fr> maint: cfg.mk: simplify * cfg.mk: Remove bits provided by maint.mk. 2012-06-07 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-06-05 Akim Demaille <akim@lrde.epita.fr> maint: an envvar equal to "00" is 0. * src/output.c (prepare): here. Reported by Paul Eggert. 2012-06-05 Akim Demaille <akim@lrde.epita.fr> maint: don't use mbsr?chr. Basically, revert ba60c39547a445dee3e07920931b4d7a81843868's move to mbs* functions, which was prompted by -DGNULIB_POSIXCHECK. See <http://lists.gnu.org/archive/html/bison-patches/2012-05/msg00052.html> and following. * bootstrap.conf: No longer ask for them. * src/files.c, src/getargs.c, src/location.c, * src/parse-gram.c, src/parse-gram.y, src/scan-gram.l, * src/symtab.c: s/mbs(r?chr)/str$1/g. 2012-06-05 Akim Demaille <akim@lrde.epita.fr> maint: use xconcat-filename. * bootstrap.conf (gnulib_modules): Request it. * src/output.h, src/output.c (compute_pkgdatadir): Rename as... (pkgdatadir): this. Adjust dependencies. * src/output.c (output_skeleton): Reduce the scope of "in". Use xconcatenated_filename to simplify the construction of the qualified paths to m4sugar.m4, bison.m4, and the selected skeleton. There are a few minor differences: the new code uses strchr instead of mbschr (but this was not really justified), and the new code does not garantee a single slash even if $BISON_PKGDATADIR ends with several (which was considered more accurate). See the discussion at <http://lists.gnu.org/archive/html/bison-patches/2012-05/msg00052.html>. 2012-06-05 Akim Demaille <akim@lrde.epita.fr> maint: minor simplification * src/output.c (prepare): Assign use_push_for_pull_flag's value at its declaration. 2012-06-05 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: version 2.5.1 NEWS: prepare for 2.5.1. maint: update release procedure maint: fix comment typos maint: post-release administrivia 2012-06-05 Akim Demaille <akim@lrde.epita.fr> version 2.5.1 * NEWS: Record release date. 2012-06-05 Akim Demaille <akim@lrde.epita.fr> NEWS: prepare for 2.5.1. * NEWS: Be compliant with do-release-commit-and-tag. 2012-06-05 Akim Demaille <akim@lrde.epita.fr> maint: update release procedure * bootstrap.conf: Request do-release-commit-and-tag and readme-release. * README-hacking: Adjust. 2012-06-05 Jim Meyering <meyering@redhat.com> maint: fix comment typos Using http://github.com/lyda/misspell-check, massage its output into sed commands to perform the suggested changes. Initially, I filtered out the THRU->Through changes, because that failed to retain capitalization in the grammar token. Instead, do this manually, beforehand: sed -i s/THRU/THROUGH/ tests/existing.at git ls-files|misspellings -f -|perl -nl \ -e '/^(.*?)\[(\d+)\]: (\w+) -> "(.*?)"$/ or next;' \ -e '($file,$n,$l,$r)=($1,$2,$3,$4); $q="'\''"; $r=~s/$q/$q\\$q$q/g;'\ -e 'print "sed -i $q${n}s!$l!$r!$q $file"'|bash 2012-05-24 Akim Demaille <akim@lrde.epita.fr> build: regen. 2012-05-24 Akim Demaille <akim@lrde.epita.fr> Merge tag 'v2.5.1_rc2' Bison 2.5.1_rc2. * tag 'v2.5.1_rc2': (34 commits) Bison 2.5.1_rc2. doc: fixes. build: fix ChangeLog generation. c++: compute the header guards. skeletons: remove support for unused directive. lalr1.cc: improve Doxygen documentation. lalr1.cc: extract stack.hh. news: convert to double quotes. space changes. build: do not prototype flex-generated functions. build: fix ChangeLog generation. Bison 2.5.1_rc1. tests: save/restore Autotest special files when checking XML support. tests: AT_SAVE_SPECIAL_FILES / AT_RESTORE_SPECIAL_FILES. tests: honor TESTSUITEFLAGS in all the check targets. build: do not enable c++ warnings on 0 when nullptr is not supported. maint: update gnulib. build: config.in.h. build: move silent rules. glr.c: reduce variable scopes. maint: maintainer-release-check. maint: shush a syntax-check. maint: prefer "commit message" to "log entry". command line: fix minor leaks. maint: we no longer maintain the ChangeLog. maint: fix the generation of the synclines for bison's parser. maint: regen. maint: import the xmemdup0 gnulib module. maint: remove left-over gnulib modules. maint: ignore files imported by autopoint. build: AC_PROG_LEX: use more readable variable names. maint: regen src/parse-gram.[ch] maint: simplify parse-gram.y maint: s/strncpy/memcpy/, when equivalent 2012-05-23 Akim Demaille <akim@lrde.epita.fr> maint: post-release administrivia * NEWS: Add header line for next release. * .prev-version: Record previous version. * cfg.mk (old_NEWS_hash): Auto-update. 2012-05-23 Akim Demaille <akim@lrde.epita.fr> Bison 2.5.1_rc2. * NEWS: Update. 2012-05-23 Akim Demaille <akim@lrde.epita.fr> doc: fixes. * doc/bison.texinfo: Fix errors spotted by syntax-check. 2012-05-23 Akim Demaille <akim@lrde.epita.fr> build: fix ChangeLog generation. * gnulib: Update to get newest gitlog-to-changelog. * bootstrap: Update. * Makefile.am (gen-ChangeLog): Fix for Bison's git log style. 2012-05-21 Akim Demaille <akim@lrde.epita.fr> c++: compute the header guards. This is a frequent request. Recently pointed out by Wei Song, <http://lists.gnu.org/archive/html/help-bison/2012-05/msg00002.html>. * data/c.m4 (b4_tocpp, b4_cpp_guard, b4_cpp_guard_open) (b4_cpp_guard_close): New. * data/lalr1.cc, data/location.cc, data/stack.hh: Use them. * TODO (Header Guards): Move to... * NEWS: here. Formatting changes. 2012-05-21 Akim Demaille <akim@lrde.epita.fr> skeletons: remove support for unused directive. * src/scan-skel.l (@dir_prefix@): Remove support, has never been used, not even in the commit that introduced it, 2b81e969ea04c1a6502928ba7e847ec8ff7dcb2f. 2012-05-21 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: improve Doxygen documentation. * data/location.cc: Qualify file names with directory name. 2012-05-21 Akim Demaille <akim@lrde.epita.fr> lalr1.cc: extract stack.hh. See commit 51bacae6b58fd5c6cce861f00440dc917384625e. * data/stack.hh: New, extracted from... * data/lalr1.cc: here. * data/Makefile.am: Adjust. 2012-05-21 Akim Demaille <akim@lrde.epita.fr> news: convert to double quotes. * NEWS: Convert from `quoted' to "quoted". Reported by Stefano Lattarini. http://lists.gnu.org/archive/html/bison-patches/2012-05/msg00039.html 2012-05-21 Akim Demaille <akim@lrde.epita.fr> space changes. * src/flex-scanner.h: Indent nested cpp directives. 2012-05-21 Akim Demaille <akim@lrde.epita.fr> build: do not prototype flex-generated functions. Some versions of Flex, possibly modified by the distribution package maintainers, have incompatible signatures. Since newer versions of Flex prototype their functions, avoid the conflicts in that case. Reported by Stefano Lattarini. <http://lists.gnu.org/archive/html/bug-bison/2012-05/msg00012.html>. * src/flex-scanner.h (FLEX_VERSION_GT): New. Use it to issue prototypes for flex-generated functions only for versions up to 2.5.31, in accordance with the comment. See commit dc9701e848f27ae64b6ddcf809580998667d60f2. Use it to define yylex_destroy when needed. 2012-05-16 Akim Demaille <akim@lrde.epita.fr> build: fix ChangeLog generation. * Makefile.am (gen-ChangeLog): Fix for VPATH builds. 2012-05-14 Akim Demaille <akim@lrde.epita.fr> Bison 2.5.1_rc1. * NEWS: Update. * src/parse-gram.c, src/parse-gram.h: Regen. 2012-05-11 Akim Demaille <akim@lrde.epita.fr> tests: save/restore Autotest special files when checking XML support. Currently the test 248, "parse-gram.y: LALR = IELR", fails BISON_TEST_XML is set. * tests/local.at (AT_BISON_CHECK_XML): Belt: Save/restore files. * tests/regression.at (parse-gram.y: LALR = IELR): Suspenders: Don't rely on expout. Each one of these changes suffices. 2012-05-11 Akim Demaille <akim@lrde.epita.fr> tests: AT_SAVE_SPECIAL_FILES / AT_RESTORE_SPECIAL_FILES. Some of our macros play with expout and other Autotest special files, which may break their callers (e.g., currently TESTSUITEFLAGS='248 BISON_TEST_XML=1' fails). There is already some support for this. Expand it to be ready to use it elsewhere. * tests/local.at (AT_RESTORE_SPECIAL_FILES, AT_SAVE_SPECIAL_FILES) (at_save_special_files, at_restore_special_files): New. (AT_BISON_CHECK_NO_XML): Use them. 2012-05-11 Akim Demaille <akim@lrde.epita.fr> tests: honor TESTSUITEFLAGS in all the check targets. * tests/Makefile.am (installcheck-local): Simplify. (maintainer-check-posix, maintainer-check-valgrind): Honor $(TESTSUITEFLAGS). 2012-05-11 Akim Demaille <akim@lrde.epita.fr> build: do not enable c++ warnings on 0 when nullptr is not supported. * configure.ac (WARN_CXXFLAGS): Enable -Wzero-as-null-pointer-constant only when nullptr is supported.. 2012-05-11 Akim Demaille <akim@lrde.epita.fr> maint: update gnulib. * bootstrap, gnulib: Update. 2012-05-09 Akim Demaille <akim@lrde.epita.fr> build: config.in.h. Historically we used config.hin (where everybody else used config.h.in) to please DOS. Now that we use gnulib, there are already tons of files with several dots, especially *.in.h. * configure.ac: Rename config.hin as config.in.h. 2012-05-09 Akim Demaille <akim@lrde.epita.fr> build: move silent rules. * tests/Makefile.am: In the generation of the test suite. 2012-05-09 Akim Demaille <demaille@gostai.com> glr.c: reduce variable scopes. * data/glr.c: Where appropriate, fuse variable declarations followed by assignments by variable declarations with a value. Where appropriate, introduce new scopes to limit variable spans. 2012-05-08 Akim Demaille <akim@lrde.epita.fr> maint: maintainer-release-check. * tests/Makefile.am (maintainer-release-check): New. * Makefile.am (MAINTAINER_CHECKS): New. Support maintainer-release-check. * README-hacking: Document it, and syntax-check too. 2012-05-08 Akim Demaille <akim@lrde.epita.fr> maint: shush a syntax-check. * cfg.mk: lib/timevar is not planned to be gnulib'ed, as it comes from GCC. 2012-05-08 Akim Demaille <akim@lrde.epita.fr> maint: prefer "commit message" to "log entry". * README-hacking: here. Suggested by Stefano Lattarini. 2012-05-08 Akim Demaille <akim@lrde.epita.fr> command line: fix minor leaks. * src/getargs.c (getargs): Free pointers before allocating them new content. 2012-05-08 Akim Demaille <akim@lrde.epita.fr> maint: we no longer maintain the ChangeLog. * .gitattributes: No need to merge it. * README-hacking: Update release instructions. 2012-05-06 Akim Demaille <akim@lrde.epita.fr> maint: fix the generation of the synclines for bison's parser. * tests/bison.in: Import from master the changes that make this script generate synclines that are independant of the builddir/srcdir user's set up. 2012-05-06 Akim Demaille <akim@lrde.epita.fr> maint: regen. * src/parse-gram.c, src/parse-gram.h: Regen. 2012-05-06 Akim Demaille <akim@lrde.epita.fr> maint: import the xmemdup0 gnulib module. * bootstrap.conf: Require this module. * src/parse-gram.y: Include xmemdup0.h. 2012-05-06 Akim Demaille <akim@lrde.epita.fr> maint: remove left-over gnulib modules. * bootstrap.conf (gnulib_modules): Remove pipe-posix. * lib/.gitignore, m4/.gitignore: Remove files that we no longer use. 2012-05-06 Akim Demaille <akim@lrde.epita.fr> maint: ignore files imported by autopoint. * m4/.gitignore: here. 2012-05-06 Akim Demaille <akim@lrde.epita.fr> build: AC_PROG_LEX: use more readable variable names. * m4/flex.m4 (AC_PROG_LEX): Prefer LEX_IS_FLEX to FLEX. Prefer true/false to yes/no for such variables. * configure.ac: Adjust. 2012-05-06 Jim Meyering <meyering@redhat.com> maint: regen src/parse-gram.[ch] 2012-05-06 Jim Meyering <meyering@redhat.com> Akim Demaille <akim@lrde.epita.fr> maint: simplify parse-gram.y * src/parse-gram.y (add_param): Use xmemdup0 in place of xmalloc+memcpy, and strspn in place of an open-coded loop. 2012-05-06 Jim Meyering <meyering@redhat.com> maint: s/strncpy/memcpy/, when equivalent * src/output.c (output_skeleton): Use memcpy, not strncpy, since the source is known to fit in the destination buffer. * src/parse-gram.y (%skeleton): Likewise. 2012-05-04 Akim Demaille <akim@lrde.epita.fr> glr.c: formatting changes. * data/glr.c: Fix indentation. 2012-05-04 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/master' * origin/master: glr.c: untabify. glr.cc: untabify. glr.cc: formatting changes. glr.cc: remove unused signature. glr.cc: properly declare locations are const where appropriate. doc: fix @xref. 2012-05-04 Akim Demaille <akim@lrde.epita.fr> glr.c: untabify. * data/glr.c: here. 2012-05-04 Akim Demaille <akim@lrde.epita.fr> glr.cc: untabify. * data/glr.cc: here. 2012-05-04 Akim Demaille <akim@lrde.epita.fr> glr.cc: formatting changes. * data/glr.cc: Fit in 80 columns. 2012-05-04 Akim Demaille <akim@lrde.epita.fr> glr.cc: remove unused signature. * data/glr.cc (yydestruct_): Not used, remove. It is yydestruct which is used. 2012-05-04 Akim Demaille <akim@lrde.epita.fr> glr.cc: properly declare locations are const where appropriate. * data/glr.cc (yyerror): The location is const. 2012-05-04 Akim Demaille <akim@lrde.epita.fr> doc: fix @xref. * doc/bison.texinfo: here. 2012-05-04 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: (22 commits) tests: ignore code coverage/profiling failure messages doc: fix some invalid @ref. build: fix previous commit. install-pdf: fix. NEWS: Update. %printer: support both yyo and yyoutput. doc: mfcalc: demonstrate %printer. tests: style changes. build: require Flex. build: flex.m4: check for Flex. build: flex.m4: quote properly. build: flex.m4. build: autoconf: update. glr: eliminate last bits of unwanted locations. NEWS: 2.6 will drop K&R. TODO: remove dead items. TODO: import from master. gnulib: update. maint: update NEWS. doc: fix index. doc: fix documentation of YYERROR. c++: more YY_NULL 2012-05-02 Akim Demaille <akim@lrde.epita.fr> tests: ignore code coverage/profiling failure messages The Hydra buildfarm provides code coverage analysis. For some reason, in some test cases, code coverage data seem to be incompatible, and generate error messages at parser run-time. Ignore these messages so that (i) these tests do pass, (ii) coverage results be provided by Hydra. * tests/local.at (AT_PARSER_CHECK): Ignore messages for failed merges of code coverage/profiling results. 2012-04-16 Akim Demaille <akim@lrde.epita.fr> doc: fix some invalid @ref. * doc/bison.texinfo: Fix incorrect @ref uses. 2012-04-16 Akim Demaille <akim@lrde.epita.fr> build: fix previous commit. * bootstrap: Update from gnulib. 2012-04-16 Akim Demaille <akim@lrde.epita.fr> install-pdf: fix. * gnulib: Fix install-pdf in po/ and runtime-po/. Reported by Hans Aberg. Fixed by Joel E. Denny. http://lists.gnu.org/archive/html/bug-bison/2011-05/msg00008.html 2012-04-16 Akim Demaille <akim@lrde.epita.fr> NEWS: Update. * NEWS: Spell check. (%printer): is now documented. 2012-04-16 Akim Demaille <akim@lrde.epita.fr> %printer: support both yyo and yyoutput. lalr1.cc used to support yyo, but not yyoutput. Support both, but document only yyoutput (at least until there is some consensus on this). * data/c.m4 (yy_symbol_value_print): Also support yyo. * data/glr.cc (yy_symbol_value_print_): Support both yyo and yyoutput. * data/lalr1.cc: Also support yyoutput. * doc/bison.texinfo: Explicitly use yyoutput in the examples. * examples/mfcalc/mfcalc.test: Test the -p option. 2012-04-16 Akim Demaille <akim@lrde.epita.fr> doc: mfcalc: demonstrate %printer. * doc/bison.texinfo (Printer Decl): New. Number mfcalc.y snippets so that they are output in the proper order. (The mfcalc Main): Use yydebug. (Debugging): Simplify the text. (Enabling Traces, Mfcalc Traces, The YYPRINT Macro): New. (Table of Symbols): Document YYPRINT and YYFPRINTF. 2012-04-16 Akim Demaille <akim@lrde.epita.fr> tests: style changes. * tests/input.at: Use "print" in %printer instead of "destroy". It is unused, so we don't care, yet it is less surprising. * tests/actions.at: Comment changes. 2012-04-16 Akim Demaille <akim@lrde.epita.fr> %printer: support both yyo and yyoutput. lalr1.cc used to support yyo, but not yyoutput. Support both, but document only yyoutput (at least until there is some consensus on this). * data/c.m4 (yy_symbol_value_print): Also support yyo. * data/glr.cc (yy_symbol_value_print_): Support both yyo and yyoutput. * data/lalr1.cc: Also support yyoutput. * doc/bison.texinfo: Explicitly use yyoutput in the examples. * examples/mfcalc/mfcalc.test: Test the -p option. 2012-04-16 Akim Demaille <akim@lrde.epita.fr> doc: mfcalc: demonstrate %printer. * doc/bison.texinfo (Printer Decl): New. Number mfcalc.y snippets so that they are output in the proper order. (The mfcalc Main): Use yydebug. (Debugging): Simplify the text. (Enabling Traces, Mfcalc Traces, The YYPRINT Macro): New. (Table of Symbols): Document YYPRINT and YYFPRINTF. 2012-04-16 Akim Demaille <akim@lrde.epita.fr> tests: style changes. * tests/input.at: Use "print" in %printer instead of "destroy". It is unused, so we don't care, yet it is less surprising. * tests/actions.at: Comment changes. 2012-04-10 Akim Demaille <akim@lrde.epita.fr> build: require Flex. * configure.ac: Require Flex. 2012-04-10 Akim Demaille <akim@lrde.epita.fr> build: flex.m4: check for Flex. * m4/flex.m4 (_AC_PROG_LEX_YYTEXT_DECL): Check that $LEX supports some of the Flex options, and exclusive start conditions. Define FLEX to 'yes'/'', as AC_PROG_CC does for GCC. 2012-04-10 Akim Demaille <akim@lrde.epita.fr> build: flex.m4: quote properly. * m4/flex.m4: Use quotes more systematically. 2012-04-10 Akim Demaille <akim@lrde.epita.fr> build: flex.m4. * m4/flex.m4: New. An exact copy of what is in Autoconf currently. 2012-04-10 Akim Demaille <akim@lrde.epita.fr> build: autoconf: update. * submodules/autoconf: Update. There are no changes in data/m4sugar/foreach.m4, and the changes in data/m4sugar/m4sugar.m4 are minor. 2012-04-10 Akim Demaille <akim@lrde.epita.fr> glr: eliminate last bits of unwanted locations. * data/glr.c (YYLTYPE): Do not define when locations are not demanded. Adjust all dependencies. 2012-04-10 Akim Demaille <akim@lrde.epita.fr> NEWS: 2.6 will drop K&R. * NEWS: here. (glr.c): Fix a spello. 2012-04-09 Akim Demaille <akim@lrde.epita.fr> TODO: remove dead items. * TODO (Documentation, %printer, Java): Remove, already done (or just waiting for approval). (Fortran, BTYacc): Remove, there does not seem to be demand. 2012-04-09 Akim Demaille <akim@lrde.epita.fr> TODO: import from master. * TODO: Copy the current version. 2012-04-08 Akim Demaille <akim@lrde.epita.fr> tests: fix bison wrapper. * tests/bison.in (PERL): Fix. 2012-04-08 Akim Demaille <akim@lrde.epita.fr> doc: fix some invalid @ref. * doc/bison.texinfo: Fix incorrect @ref uses. 2012-04-08 Akim Demaille <akim@lrde.epita.fr> build: extexi: support out-of-order blocks. * examples/extexi (%file_output): Remove. (&process): Accept "FILE: BLOCK-NUM" requests. 2012-04-08 Akim Demaille <akim@lrde.epita.fr> build: look for Perl in configure. Bison uses "/usr/bin/perl" or "perl" in several places, and it does not appear to be a problem. But, at least to make it simpler to change PERL on the make command line, check for perl in configure. * configure.ac (PERL): New. * doc/Doxyfile.in, doc/local.mk, examples/local.mk, * tests/bison.in: Use it. 2012-04-08 Akim Demaille <akim@lrde.epita.fr> maint: rewrite extexi in Perl. * examples/extexi: Rewrite in Perl. * examples/local.mk (extract): Adjust. 2012-04-07 Akim Demaille <akim@lrde.epita.fr> build: simplify clean. * doc/local.mk (CLEANFILES): Since the previous commit, there a no longer such files. * Makefile.in (CLEANFILES): Initialize here. 2012-04-07 Akim Demaille <akim@lrde.epita.fr> gnulib: update. * bootstrap.conf (bootstrap_sync): True again. It was disabled while waiting for changes to be integrated in gnulib's bootstrap, which was done long ago. * bootstrap, gnulib: Update. 2012-04-04 Akim Demaille <akim@lrde.epita.fr> maint: update NEWS. * NEWS: Fix entry about __attribute__. Reorder by "decreasing" order of importance. 2012-04-04 Akim Demaille <akim@lrde.epita.fr> doc: fix index. http://lists.gnu.org/archive/html/bison-patches/2012-04/msg00006.html * doc/bison.texinfo: Avoid using @def* variant with more than the defined entity as main entity, as it results in an incorrect index. For instance, don't document {return YYERROR;}, which results in a single index entry "return YYERROR;", but rather as typed function whose return type is "type", and whose argument list is ";". 2012-04-04 Akim Demaille <akim@lrde.epita.fr> doc: fix documentation of YYERROR. * doc/bison.texinfo (Table of Symbols): Fix the documentation of YYERROR by copying that from "Action Features". 2012-04-01 Akim Demaille <akim@lrde.epita.fr> build: fix distcheck issues. For some reason it seems that texi2dvi -o no longer forces --clean mode, so we have stray TeX compilation files staying in top_builddir since TeX is run from there. While at it, upgrade the generation of the (completely obsolete) reference card. Target PDF. * doc/local.mk (TEXI2DVI): Pass --build-dir. (CLEANDIRS): More accurate. (doc/refcard.dvi): Replace with... (doc/refcard.pdf): this. Adjust dependencies. 2012-04-01 Akim Demaille <akim@lrde.epita.fr> build: don't rely on $< in non-pattern rules. * doc/local.mk, tests/local.mk: here. Reported by Stefano Lattarini. 2012-04-01 Akim Demaille <akim@lrde.epita.fr> doc: upgrade Doxyfile. * doc/Doxyfile.in: Run doxygen -u. Prompted by Tim Landscheidt. 2012-04-01 Akim Demaille <akim@lrde.epita.fr> doc: help Doxygen find our files. * doc/Doxyfile.in (INCLUDE_PATH): here. 2012-04-01 Tim Landscheidt <tim@tim-landscheidt.de> Fix Doxygen generation and clean-up. * doc/Doxyfile.in: Amend OUTPUT_DIRECTORY. * doc/local.mk (html-local): Amend working directory. (CLEANDIRS): Fix "html", remove "latex". 2012-04-01 Tim Landscheidt <tim@tim-landscheidt.de> Fix Doxygen comment. * src/InadequacyList.h: s#</t>#</tt>#. 2012-04-01 Akim Demaille <akim@lrde.epita.fr> c++: more YY_NULL Caught by maintainer-check-g++. * data/glr.c, data/lalr1.cc, data/yacc.c, tests/cxx-type.at, * tests/glr-regression.at, tests/push.at: When simple to do, avoid expliciting the null ptr. Otherwise use YY_NULL. 2012-04-01 Akim Demaille <akim@lrde.epita.fr> c++: more YY_NULL Caught by maintainer-check-g++. * data/glr.c, data/lalr1.cc, data/yacc.c, tests/cxx-type.at, * tests/glr-regression.at, tests/push.at: When simple to do, avoid expliciting the null ptr. Otherwise use YY_NULL. 2012-04-01 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'origin/maint' * origin/maint: bump to 2012 in skeletons. build: remove ancient Autoconf tests. doc: c++: complete the location documentation. c++: locations: provide convenience constructors. c++: locations: remove useless "inline". glr: do not use locations when they are not requested c++: use nullptr for C++11. build: simplify and improve the compiler warnings for tests. gnulib: update. maint: formatting changes. NEWS: update. Java: Fix syntax error handling without error token. tests: beware of -pedantic on large #line numbers. tests: when using the C++ compiler, use its flags too. 2012-04-01 Akim Demaille <akim@lrde.epita.fr> bump to 2012 in skeletons. * data/glr.c, data/glr.cc, data/lalr1.cc, data/lalr1.java, * data/location.cc, data/yacc.c: Bump copyright year ranges. 2012-04-01 Akim Demaille <akim@lrde.epita.fr> build: remove ancient Autoconf tests. lib/subpipe.c was removed in 47fa574761319b0a422691223c9b8a9a72f36aa2. * m4/subpipe.m4: Remove. * configure.ac (BISON_PREREQ_SUBPIPE): Remove. 2012-03-31 Akim Demaille <akim@lrde.epita.fr> doc: c++: complete the location documentation. * data/location.cc (position::initialize, location::initialize): Also accept line and column, with default values. * doc/bison.texinfo (C++ position, C++ location): New nodes. Describe more thoroughly these classes. Fix several Texinfo misuses. 2012-03-31 Akim Demaille <demaille@gostai.com> c++: locations: provide convenience constructors. * 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. 2012-03-31 Akim Demaille <akim@lrde.epita.fr> c++: locations: remove useless "inline". * data/location.cc: "inline" is implicit when defining methods in the class definition. 2012-03-31 Akim Demaille <akim@lrde.epita.fr> glr: do not use locations when they are not requested When the test suite runs with -O2 and warnings enabled, G++ complains of locations being used, but not initialized. The simplest is to not use locations. * data/glr.c (b4_locuser_formals, b4_locuser_args): New. Use them when locations should not be used. Use b4_locations_if where appropriate. (yyuserAction): Modify the order to the arguments to make it more alike the other routines, and to make use of b4_locuser_args simpler. 2012-03-31 Akim Demaille <akim@lrde.epita.fr> c++: use nullptr for C++11. C++11 introduces "nullptr" which plays the role of C's NULL, in replacement of "0". Fix the C++ skeletons to avoid warnings about uses of "0" in place of "nullptr", and improve C skeletons to also use this "nullptr" when compiled with a C++11 compiler. * configure.ac: More C++ warnings. * NEWS (2.5.1): Document this. * data/c++.m4, data/c.m4 (b4_null_define): New. (b4_null): Use YY_NULL instead of 0. * data/glr.c, data/lalr1.cc, data/location.cc, data/yacc.c: Call b4_null_define/b4_null where appropriate. Use YY_NULL instead of NULL. * data/location.cc (initialize): Accept a default argument, YY_NULL. * tests/actions.at, tests/calc.at: Adjust. * data/glr.c, lib/libiberty.h, src/system.h (__attribute__): Do not disable it when __STRICT_ANSI__ is defined, as, for instance, it disables the __attribute__((unused)) which protects us from some compiler warnings. This was already done elsewhere in Bison, in 2001, see 4a0d89369599a2cea01f4fbdf791f426a02cb5a3. * tests/regression.at: Adjust output. 2012-03-30 Akim Demaille <akim@lrde.epita.fr> build: simplify and improve the compiler warnings for tests. * configure.ac (warn_common, warn_c, warn_cxx): New. Use them to compute independently the options supported by the C and C++ compilers. Don't AC_SUBST the variables passed to gl_WARN_ADD: it does it for us. (WARN_CFLAGS_TEST, WARN_CXXFLAGS_TEST): Don't aggregate $WARN_CFLAGS and $WARN_CXXFLAGS in them now, leave it to atlocal.in. (O0CFLAGS, O0CXXFLAGS): Move their definition to... * tests/atlocal.in: here. Be more systematic between C and C++. Reorder to factor between variables. Propagate all of the variables when --compile-c-with-cxx. 2012-03-30 Akim Demaille <akim@lrde.epita.fr> gnulib: update. 2012-03-30 Akim Demaille <akim@lrde.epita.fr> maint: formatting changes. * src/system.h: Indent CPP directives using cppi. 2012-03-27 Akim Demaille <akim@lrde.epita.fr> NEWS: update. * NEWS: Java fixes, more about the doc changes, liby issues. 2012-03-27 Tim Landscheidt <tim@tim-landscheidt.de> Java: Fix syntax error handling without error token. * data/lalr1.java (YYParser::parse): Here. * tests/java.at: Add test case. 2012-03-24 Akim Demaille <akim@lrde.epita.fr> tests: beware of -pedantic on large #line numbers. * tests/local.at (AT_TEST_TABLES_AND_PARSE): Don't pass -pedantic when compiling large canonical-LR parsers. Reported by Tys Lefering. http://lists.gnu.org/archive/html/bug-bison/2012-03/msg00025.html 2012-03-24 Akim Demaille <akim@lrde.epita.fr> tests: when using the C++ compiler, use its flags too. * tests/local.at: Go for colors. (--compile-c-with-cxx): New option. We used to pass "CC=$CXX" as command line argument, but it was not possible to adjust CFLAGS accordingly in atlocal, since it is loaded before assignments on the command line are honored (so that the command line takes precedence). * tests/atlocal.in: Implement it. * tests/local.mk: Use it. 2012-03-24 Akim Demaille <akim@lrde.epita.fr> tests: style changes in the Makefile. * tests/local.mk: Prefer passing variable assignment by the command line, instead of the environment, so that it is reported in the logs. Prefer single quotes for shell literal strings. 2012-03-24 Akim Demaille <akim@lrde.epita.fr> tests: beware of -pedantic on large #line numbers. * tests/local.at (AT_TEST_TABLES_AND_PARSE): Don't pass -pedantic when compiling large canonical-LR parsers. Reported by Tys Lefering. http://lists.gnu.org/archive/html/bug-bison/2012-03/msg00025.html 2012-03-24 Akim Demaille <akim@lrde.epita.fr> tests: when using the C++ compiler, use its flags too. * tests/local.at: Go for colors. (--compile-c-with-cxx): New option. We used to pass "CC=$CXX" as command line argument, but it was not possible to adjust CFLAGS accordingly in atlocal, since it is loaded before assignments on the command line are honored (so that the command line takes precedence). * tests/atlocal.in: Implement it. * tests/local.mk: Use it. 2012-03-24 Akim Demaille <akim@lrde.epita.fr> tests: fix dependencies. * tests/local.mk (check_SCRIPTS): Add atlocal and atconfig so that they are properly updated before running tests. (RUN_TESTSUITE_deps): New. Use it to factor the dependencies of "*-check" targets, especially those that don't bounce to the regular "check-local" target, since then they don't benefit from the proper dependencies (such as atlocal). 2012-03-19 Akim Demaille <akim@lrde.epita.fr> Merge remote-tracking branch 'fsf/maint' * fsf/maint: (404 commits) doc: update the --verbose report format. doc: spell check. doc: stmt, not stmnt. doc: save width. doc: reformat grammar snippets. doc: use only @example, not @smallexample. doc: style changes. doc: minor fixes to "Understanding" section tests: minor fixes/simplifications tests: be robust to quote style. maint: update gnulib. tests: be robust to POSIXLY_CORRECT being defined. doc: fix environment issues. regen. tests: fix regressions. glr: fix ambiguity reports. doc: stylistic improvements. maint: address sc_prohibit_doubled_word. maint: address sc_prohibit_always-defined_macros. maint: address sc_bindtextdomain, sc_program_name and sc_prohibit_HAVE_MBRTOWC. ... 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: spell fix. * doc/bison.texinfo: here. Reported by Tim Landscheidt. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: update the --verbose report format. * doc/bison.texinfo (Understanding): Adjust to match the current format. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: spell check. * doc/bison.texinfo: here. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: stmt, not stmnt. * doc/bison.texinfo: s/stmnt/stmt/g. This is a much more common abbreviation for "statement". 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: save width. * doc/bison.texinfo (Language and Grammar): Use the same layout for an example in all the versions, i.e., keep as general case what used to be used only for Info. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: reformat grammar snippets. * doc/bison.texinfo: Convert the grammar examples to use a narrower style. This helps fitting into the @smallbook constraints. http://lists.gnu.org/archive/html/bison-patches/2012-03/msg00011.html 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: use only @example, not @smallexample. * doc/bison.texinfo: Convert all @smallexamples into @examples. Adjust layout where needed. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: style changes. * doc/bison.texinfo: Avoid line width issues with TeX. Upgrade ancient messages. Move some comments to better looking places. Add more @group. (Mfcalc Symbol Table): Reduce variable scopes. Prefer size_t for sizes. Prefer declarations with an initial value. Fix a @group environment. 2012-03-19 Paul Eggert <eggert@cs.ucla.edu> doc: minor fixes to "Understanding" section * doc/bison.texinfo (Understanding): Minor wording fixes and improvements. Fixes problems reported in <https://savannah.gnu.org/patch/?4306>. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: update the --verbose report format. * doc/bison.texinfo (Understanding): Adjust to match the current format. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: spell check. * doc/bison.texinfo: here. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: stmt, not stmnt. * doc/bison.texinfo: s/stmnt/stmt/g. This is a much more common abbreviation for "statement". 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: save width. * doc/bison.texinfo (Language and Grammar): Use the same layout for an example in all the versions, i.e., keep as general case what used to be used only for Info. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: reformat grammar snippets. * doc/bison.texinfo: Convert the grammar examples to use a narrower style. This helps fitting into the @smallbook constraints. http://lists.gnu.org/archive/html/bison-patches/2012-03/msg00011.html 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: use only @example, not @smallexample. * doc/bison.texinfo: Convert all @smallexamples into @examples. Adjust layout where needed. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> doc: style changes. * doc/bison.texinfo: Avoid line width issues with TeX. Upgrade ancient messages. Move some comments to better looking places. Add more @group. (Mfcalc Symbol Table): Reduce variable scopes. Prefer size_t for sizes. Prefer declarations with an initial value. Fix a @group environment. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> c.m4: better newline control with b4_parse_param_use. * data/c.m4: Use m4_ifvaln instead of m4_ifval where applicable. (b4_parse_param_use): Switch order between two nested "if"s to avoid useless empty lines. Adjust callers to avoid useless lines. 2012-03-19 Akim Demaille <akim@lrde.epita.fr> glr.c: remove (broken) support for YYPRINT. YYPRINT uses yytoknum which glr does not define. Since YYPRINT is considered obsolete, and did not work, don't fix its support, remove it from glr.c. * data/c.m4 (yy_symbol_value_print): Use YYPRINT only for yacc.c. * TODO: Done. 2012-03-17 Paul Eggert <eggert@cs.ucla.edu> doc: minor fixes to "Understanding" section * doc/bison.texinfo (Understanding): Minor wording fixes and improvements. Fixes problems reported in <https://savannah.gnu.org/patch/?4306>. 2012-03-15 Akim Demaille <akim@lrde.epita.fr> TODO: update. 2012-03-15 Akim Demaille <akim@lrde.epita.fr> gnulib: update. 2012-03-13 Akim Demaille <demaille@gostai.com> tests: minor fixes/simplifications * tests/local.at (AT_BISON_CHECK_NO_XML): Simplify sed programs, quotation, and default value assignments. Ensure a proper value to the numeric variables. Reported by Lie Yan. http://lists.gnu.org/archive/html/bug-bison/2012-03/msg00000.html 2012-03-13 Akim Demaille <akim@lrde.epita.fr> maint: fix distcheck. * examples/local.mk (MAINTAINERCLEANFILES): Complete, and rename as... (CLEANFILES): this, * examples/calc++/local.mk, examples/mfcalc/local.mk, * examples/rpcalc/local.mk (CLEANFILES): Add the generated files. 2012-03-13 Akim Demaille <demaille@gostai.com> tests: minor fixes/simplifications * tests/local.at (AT_BISON_CHECK_NO_XML): Simplify sed programs, quotation, and default value assignments. Ensure a proper value to the numeric variables. Reported by Lie Yan. http://lists.gnu.org/archive/html/bug-bison/2012-03/msg00000.html 2012-03-09 Akim Demaille <demaille@gostai.com> tests: be robust to POSIXLY_CORRECT being defined. * tests/local.at (AT_BISON_CHECK_NO_XML): Check if POSIXLY_CORRECT is defined, not if it is defined to 1. Reported by Lie Yan. http://lists.gnu.org/archive/html/bug-bison/2012-03/msg00000.html 2012-03-09 Akim Demaille <demaille@gostai.com> tests: be robust to quote style. See <http://lists.gnu.org/archive/html/bug-bison/2012-01/msg00120.html>. * src/main.c (main): Define the quoting style we use. * tests/atlocal.in: Use ASCII style quotes during the tests. 2012-03-09 Akim Demaille <demaille@gostai.com> maint: update gnulib. * gnulib: update. * src/scan-gram.l: Don't use the (former version of) STREQ. 2012-03-09 Akim Demaille <demaille@gostai.com> tests: remove quote magic from the bison test wrapper. Basically, revert 4c4d35394d1bdb4dc3392482ab002bc111a3378f. * tests/bison.in: Leave bison's stderr as is. 2012-03-09 Akim Demaille <demaille@gostai.com> tests: be robust to quote style. See <http://lists.gnu.org/archive/html/bug-bison/2012-01/msg00120.html>. * src/main.c (main): Define the quoting style we use. * tests/atlocal.in: Use ASCII style quotes during the tests. 2012-03-09 Akim Demaille <demaille@gostai.com> avoid direct strncmp calls. Before this change, bison would accept either .tab and _tab equivalently, whatever the current platform. Besides, it was not obeying everywhere to the possible definition of TAB_EXT to something else than .tab. For consistency, handle only TAB_EXT (".tab" on non DJGPP platforms). Support for "_tab" is neither documented, nor tested. * src/system.h (STRNCMP_LIT): New. From Jim Meyering. (STRPREFIX_LIT): New. * src/files.c, src/getargs.c: Use it. 2012-03-06 Akim Demaille <demaille@gostai.com> tests: be robust to POSIXLY_CORRECT being defined. * tests/local.at (AT_BISON_CHECK_NO_XML): Check if POSIXLY_CORRECT is defined, not if it is defined to 1. Reported by Lie Yan. http://lists.gnu.org/archive/html/bug-bison/2012-03/msg00000.html 2012-02-24 Akim Demaille <demaille@gostai.com> build: comment changes. * Makefile.am, examples/calc++/local.mk, examples/local.mk, * examples/mfcalc/local.mk, examples/rpcalc/local.mk, * lib/local.mk, src/local.mk, tests/local.mk: Make the copyright licenses more uniform. 2012-02-24 Akim Demaille <demaille@gostai.com> build: fix more example extraction issues. * Makefile.am (dist_TESTS): New. (TESTS, EXTRA_DIST): Run and ship them. * examples/calc++/local.mk: examples/calc++/calc++.stamp no longer exists, don't try to ship it. (.yy.stamp): New recipe. Use it. * examples/calc++/local.mk, examples/mfcalc/local.mk, * examples/rpcalc/local.mk: Don't ship the sources. Adjust the CPPFLAGS: there is nothing left in srcdir. (MAINTAINERCLEANFILES): Remove, now we are in builddir. (TESTS): Rename as... (dist_TESTS): this. 2012-02-24 Akim Demaille <demaille@gostai.com> maint: fix example extraction issues. calc++: don't rely on Automake to compile a C++ parser. Basically, revert commit 609b3d8096fb0cc1fa4d908b6e1a860ced260bda, Automake 1.11.3 is not safe enough for C++ parser. * examples/calc++/calc++-parser.hh: Remove. * examples/calc++/local.mk (examples/calc++/calc++-parser.stamp): New. examples: factor the extractions into a single step extexi had to be run in the extraction directory. Now, it can be given the files with expected output directory. This allows to use $(*_extracted) variables (before we had to list again their members, but limited to their base names). In turn, this also allows fusing the extraction recipes into a single one. Also, it is currently too hard (or requires too much duplication, since Make wants all the occurrences of the files to be prefixed with $(srcdir)/, which is something Automake cannot support for *_SOURCES) to work in the source tree. So extract, and compile scanners and parsers in the build tree. * examples/extexi (basename): New. (BEGIN): Now "file_wanted" maps base name to extracted file name. * examples/calc++/local.mk, examples/mfcalc/local.mk, * examples/rpcalc/local.mk: Fuse extraction rules into... * examples/local.mk: Here. (extract, extracted): New. 2012-02-23 Akim Demaille <demaille@gostai.com> maint: use STREQ/STRNEQ. * doc/bison.texinfo: Space change. * src/system.h (STREQ, STRNEQ): New. * src/files.c, src/ielr.c, src/lalr.c, src/muscle-tab.c, * src/output.c, src/print.c, src/print_graph.c, * src/reader.c, src/scan-skel.l, src/tables.c, * src/uniqstr.c: Use them. * src/scan-gram.l: Do not use streq.h, use system.h's STREQ. * cfg.mk: The documentation is an exception. 2012-02-23 Akim Demaille <demaille@gostai.com> doc: fix environment issues. * doc/bison.texinfo: Do not use @verbatim, in particular when we use @group inside. Use @quotation instead of @display for frequently asked questions, it looks much nicer. 2012-02-23 Akim Demaille <demaille@gostai.com> doc: fix environment issues. * doc/bison.texinfo: Do not use @verbatim, in particular when we use @group inside. Use @quotation instead of @display for frequently asked questions, it looks much nicer. 2012-02-23 Akim Demaille <demaille@gostai.com> regen. * src/parse-gram.h, src/parse-gram.c: regen. 2012-02-23 Akim Demaille <demaille@gostai.com> tests: fix regressions. Exit status 63 is documented for version-mismatch. * bootstrap.conf (gnulib_modules): Remove sysexits. * src/system.h (EX_MISMATCH): Define. * src/parse-gram.y (version_check): Use it instead of EX_CONFIG. Missing includes. * tests/calc.at, tests/named-refs.at: Include assert.h. 2012-02-22 Akim Demaille <demaille@gostai.com> maint: gitignore. * examples/mfcalc/.gitignore, examples/rpcalc/.gitignore: Fix. 2012-02-21 Akim Demaille <demaille@gostai.com> regen. * src/parse-gram.c, src/parse-gram.h: regen. 2012-02-21 Akim Demaille <demaille@gostai.com> tests: fix regressions. Exit status 63 is documented for version-mismatch. * bootstrap.conf (gnulib_modules): Remove sysexits. * src/system.h (EX_MISMATCH): Define. * src/parse-gram.y (version_check): Use it instead of EX_CONFIG. Missing includes. * tests/calc.at, tests/named-refs.at: Include assert.h. 2012-02-21 Akim Demaille <demaille@gostai.com> tests: post-process stderr to normalize quotes. * tests/bison.in: Save bison's stderr, and convert gettextized quotes to plain ASCII. 2012-02-21 Akim Demaille <demaille@gostai.com> glr: fix ambiguity reports. * tests/glr-regression.at (Ambiguity reports): New. 2012-02-21 Akim Demaille <demaille@gostai.com> glr: fix ambiguity reports. Fix a regression introduced in commit 783aa653f4ca70a75919c8516b950494c612cbfe. * tests/glr-regression.at (Ambiguity reports): New. * data/glr.c (yyreportTree): Fix an offset error. 2012-02-19 Akim Demaille <demaille@gostai.com> doc: stylistic improvements. * doc/bison.texinfo: Prefer "continue" to empty loop bodies. Add some @group/@end group to avoid poor page breaks. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: address sc_prohibit_doubled_word. * data/yacc.c, doc/bison.texinfo: Reword to avoid having to disable that check. * cfg.mk: No longer skip this test. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: address sc_prohibit_always-defined_macros. * cfg.mk: No longer skip it, except where EXIT_SUCCESS is used as a witness for stdlib.h. Skip this test when appropriate. * data/yacc.c: Drop a note about why EXIT_SUCCESS is defined here. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: address sc_bindtextdomain, sc_program_name and sc_prohibit_HAVE_MBRTOWC. * bootstrap.conf (gnulib_modules): Require progname. * src/complain.c, src/getargs.c, src/getargs.h, src/main.c: Use it. * cfg.mk (exclude): New. Use it. Skip lib/main.c for bindtextdomain and set_program_name. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: remove stray file. * config.hin: Remove. 2012-02-19 Akim Demaille <demaille@gostai.com> doc: stylistic improvements. * doc/bison.texinfo: Prefer "continue" to empty loop bodies. Add some @group/@end group to avoid poor page breaks. 2012-02-19 Akim Demaille <demaille@gostai.com> doc: check the rpcalc. * doc/bison.texinfo: Tag rpcalc.y snippets. Add missing includes. (Rpcalc Rules): Don't issue leading tabs. Complete an Info menu. Use @result. * examples/rpcalc/local.mk: New. * examples/rpcalc/rpcalc.test: New. * examples/local.mk: Use them. * examples/mfcalc/mfcalc.test: Remove dup test. * examples/test: Disable debug traces. 2012-02-19 Akim Demaille <demaille@gostai.com> regen. * src/parse-gram.c, src/parse-gram.h: Regen. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: address sc_prohibit_doubled_word. * data/yacc.c, doc/bison.texinfo: Reword to avoid having to disable that check. * cfg.mk: No longer skip this test. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: address sc_prohibit_always-defined_macros. * cfg.mk: No longer skip it, except where EXIT_SUCCESS is used as a witness for stdlib.h. Skip this test when appropriate. * data/yacc.c: Drop a note about why EXIT_SUCCESS is defined here. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: address sc_bindtextdomain, sc_program_name and sc_prohibit_HAVE_MBRTOWC. * bootstrap.conf (gnulib_modules): Require progname. * src/complain.c, src/getargs.c, src/getargs.h, src/main.c: Use it. * cfg.mk (exclude): New. Use it. Skip lib/main.c for bindtextdomain and set_program_name. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: remove stray file. * config.hin: Remove. 2012-02-19 Akim Demaille <demaille@gostai.com> bitset: fix an incorrect error message. * lib/bitset_stats.c: here. Reported by Stefano Lattarini. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: address some syntax-issues remaining after cherry-picking from master. * cfg.mk: Skip bison generated files, 2.5 is generating trailing blanks. This is already fixed in master. * tests/conflicts.at, tests/java.at: Fix white space issues. 2012-02-19 Akim Demaille <demaille@gostai.com> regen. * src/parse-gram.c, src/parse-gram.h: Regen. 2012-02-19 Akim Demaille <demaille@gostai.com> bitset: fix an incorrect error message. * lib/bitset_stats.c: here. Reported by Stefano Lattarini. 2012-02-19 Jim Meyering <meyering@redhat.com> maint: reenable sc_m4_quote_check * cfg.mk (local-checks-to-skip): Reenable sc_m4_quote_check. * m4/dmalloc.m4: Add quotes. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: remove trailing empty lines. * cfg.mk: No longer skip sc_prohibit_empty_lines_at_EOF, except for parse-gram.h (generated). * examples/mfcalc/.gitignore, lib/.gitignore, m4/.gitignore, * po/.gitignore, runtime-po/.gitignore: Remove trailing/leading empty lines. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: avoid "magic number exit". * cfg.mk (local-checks-to-skip): No longer skip it. * bootstrap.conf (gnulib_modules): Add sysexits. * doc/bison.texinfo, etc/bench.pl.in, src/parse-gram.y, * src/system.h, tests/calc.at, tests/named-refs.at: Use assert where appropriate instead of "if (...) exit". Use symbolic exit status elsewhere. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: fix some syntax-check issues. * cfg.mk (local-checks-to-skip): Remove sc_prohibit_quotearg_without_use, sc_prohibit_strcmp, sc_unmarked_diagnostics, sc_useless_cpp_parens. (sc_unmarked_diagnostics): Skip DJGPP. * data/yacc.c, src/LR0.c, src/closure.c, * src/flex-scanner.h, src/gram.c, src/lalr.c, * src/print-xml.c, src/print.c, src/print_graph.c, * src/reader.c, src/reduce.c, src/tables.c: Don't use parens with cpp's defined. Remove useless includes. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: address a couple of syntax-check errors. * cfg.mk (local-checks-to-skip): Remove sc_error_message_period and sc_error_message_uppercase. Address the uncovered issues. * po/POTFILES.in: Add missing files. * src/symtab.c: Remove useless includes. * lib/bitset_stats.c, src/files.c, tests/glr-regression.at: Use conformant error messages. 2012-02-19 Akim Demaille <demaille@gostai.com> maint: gnulib: upgrade. 2012-02-18 Akim Demaille <demaille@gostai.com> maint: remove trailing empty lines. * cfg.mk: No longer skip sc_prohibit_empty_lines_at_EOF, except for parse-gram.h (generated). * examples/mfcalc/.gitignore, lib/.gitignore, m4/.gitignore, * po/.gitignore, runtime-po/.gitignore: Remove trailing/leading empty lines. 2012-02-18 Akim Demaille <demaille@gostai.com> maint: regen. * src/parse-gram.c, src/parse-gram.h: regen. 2012-02-18 Akim Demaille <demaille@gostai.com> maint: avoid "magic number exit". * cfg.mk (local-checks-to-skip): No longer skip it. * bootstrap.conf (gnulib_modules): Add sysexits. * doc/bison.texinfo, etc/bench.pl.in, src/parse-gram.y, * src/system.h, tests/calc.at, tests/named-refs.at: Use assert where appropriate instead of "if (...) exit". Use symbolic exit status elsewhere. 2012-02-18 Akim Demaille <demaille@gostai.com> maint: fix some syntax-check issues. * cfg.mk (local-checks-to-skip): Remove sc_prohibit_quotearg_without_use, sc_prohibit_strcmp, sc_unmarked_diagnostics, sc_useless_cpp_parens. (sc_unmarked_diagnostics): Skip DJGPP. * data/yacc.c, src/LR0.c, src/closure.c, * src/flex-scanner.h, src/gram.c, src/lalr.c, * src/print-xml.c, src/print.c, src/print_graph.c, * src/reader.c, src/reduce.c, src/tables.c: Don't use parens with cpp's defined. Remove useless includes. 2012-02-18 Akim Demaille <demaille@gostai.com> maint: address a couple of syntax-check errors. * cfg.mk (local-checks-to-skip): Remove sc_error_message_period and sc_error_message_uppercase. Address the uncovered issues. * po/POTFILES.in: Add missing files. * src/symtab.c: Remove useless includes. * lib/bitset_stats.c, src/files.c, tests/glr-regression.at: Use conformant error messages. 2012-02-18 Akim Demaille <demaille@gostai.com> maint: gnulib: upgrade. 2012-02-17 Akim Demaille <demaille@gostai.com> doc: mfcalc: fix includes. * doc/bison.texinfo: math.h is needed early. 2012-02-17 Akim Demaille <demaille@gostai.com> examples: factor the test suite. * examples/mfcalc/test, examples/calc++/test: Extract the common bits into... * examples/test: here. (cwd): New. Use it to avoid a race on the temporary directory. Reported by Jim Meyering. * examples/mfcalc/test, examples/calc++/test: Rename into... * examples/mfcalc/mfcalc.test, examples/calc++/calc++.test: these. * examples/calc++/local.mk, examples/mfcalc/local.mk, * examples/local.mk: Adjust. 2012-02-17 Akim Demaille <demaille@gostai.com> examples: fix the test suites. * examples/calc++/test, examples/mfcalc/test (me): Be more meaningfull: include the example name. (prog): Factor. (run): Avoid printf, use echo. Add missing parens. (cleanup): New. Call it on trap. Remove the previous "rm" that did the cleanup. Move into a private directory to avoid concurrency issues. Reported by Jim Meyering. 2012-02-17 Jim Meyering <meyering@redhat.com> examples: link mfcalc with -lm for uses of pow, cos, atan, etc. * examples/mfcalc/local.mk (examples_mfcalc_mfcalc_LDADD): Define. 2012-02-16 Akim Demaille <demaille@gostai.com> mfcalc: extract and exercise. * examples/mfcalc/local.mk, examples/mfcalc/test: New, based on calc++'s ones. * examples/local.mk: Include mfcalc/local.mk. 2012-02-16 Akim Demaille <demaille@gostai.com> calc++: factor for other extracted tests. * Makefile.am (TESTS, check_PROGRAMS): Initialize here. * examples/local.mk (doc, extexi): Define here. * examples/calc++/local.mk: Adjust accordingly. * configure.ac: Ask for parallel-tests (for the way the logs are handled). * examples/calc++/test: As a consequence, always be verbose. ($prog): New. (run): Use it. Sort the tests in a more natural order (simplest first). 2012-02-16 Akim Demaille <demaille@gostai.com> doc: mfcalc: send errors to stderr. * doc/bison.texinfo (Mfcalc Lexer): New. (Mfcalc Main): Move the definition of main and yyerror here, for clarity. Let yyerror report on stderr. 2012-02-16 Akim Demaille <demaille@gostai.com> doc: fix mfcalc code. * doc/bison.texinfo (Multi-function Calc): Add missing includes. Fix the rendering of the result: use @result and remove the initial tabulation in the actual code. Fix stylistic issues: avoid the , operator. Add extexi mark-up. * examples/extexi: Also support @smallexample. 2012-02-16 Akim Demaille <demaille@gostai.com> tests: c++: stylistic changes. * tests/c++.at: Don't use void for incoming arguments. Prefer cstdlib to stdlib.h. 2012-02-16 Jim Meyering <meyering@redhat.com> tests: avoid c++ failure due to lack of getenv decl * tests/c++.at (Syntax error as exception): Avoid spurious failure at least when compiling with g++-4.7.x due to lack of declaration of getenv. Include <stdlib.h>. 2012-02-15 Akim Demaille <demaille@gostai.com> maint: rely on Automake for parsers. * Makefile.am (AM_YFLAGS): Automake looks for "-d" alone. Move other options in here. (BISON): New. (YACC): Use it. (bison_SOURCES): Now that automake can see `-d' in AM_YFLAGS, we can rely on it to compile and ship the parser header files. Based on commit 737406a32c201471699bfa0843d1f432f3ec29ab and commit 3d6ca339083c278d907c9f030f4ba6bc5ecb07f2. 2012-02-15 Akim Demaille <demaille@gostai.com> maint: trust Automake for parser headers. * examples/calc++/local.mk, src/local.mk: Now that automake can see `-d' in AM_YFLAGS, we can rely on it to compile and ship the parser header files. 2012-02-15 Akim Demaille <demaille@gostai.com> maint: help Automake reading Yacc flags. * Makefile.am (AM_YFLAGS): Automake looks for "-d" alone. 2012-02-15 Akim Demaille <demaille@gostai.com> calc++: rely on Automake. Rely on $(YACC) being the bison being built, and let Automake do the rest. It turned out to be much more difficult than anticipated, for various reasons, including some bad behavior from Automake 1.11.2 which (i) generates calc++-parser.h instead of calc++-parser.hh, and (ii) leaves an #include "y.tab.h" in the generated parser instead of #include "calc++-parser.h". The authors of Automake appear to be aware of the problem, http://lists.gnu.org/archive/html/automake/2011-05/msg00008.html so a simple work around will suffice for the time being. * examples/calc++/y.tab.h, examples/calc++/calc++-parser.hh: New. To work around Automake 1.11.2 issues. * examples/calc++/local.mk: Remove all the rules for compilation with bison, leave them to Automake. So provide it with "calc++-parse.yy" as a source file. (calc_sources_generated, calc_sources_extracted): Rename as. (calc_generated, calc_extracted): these. (calc_sources): New. Fix them. 2012-02-14 Akim Demaille <demaille@gostai.com> maint: tidy the Makefile a bit. * src/local.mk: Put yacc related variables together. (AUTOMAKE_OPTIONS): Move to... * Makefile.am: here. Remove an old Emacs mode request which disables Automake support. * src/local.mk (YACC, AM_YFLAGS): Move to... * Makefile.am: here, as they will be used by other local.mks. 2012-02-14 Akim Demaille <demaille@gostai.com> maint: de-recurse the handling of examples The directory was still using a local Makefile.am because it provides "scoped" Make variables: these examples are not meant to use the same CPPFLAGS etc. If we were to use the same -I set, we'd pick up gnulib's stdio.h for instance, which we do not want for these simple examples. Yet, as a result, the dependencies are less accurate, there is code duplication, etc. This is especially perceptible when trying to extract more examples from the documentation, as will be done in forthcoming changes. In order to make the tuning of CPPFLAGS easier, discard the predefined -I from Automake. * examples/calc++/Makefile.am: Rename as... * examples/calc++/local.mk: this. Adjust the paths which are now rooted in top_srcdir/top_builddir. Handle BISON_CXX_WORKS here, instead of the too crude previous approach that completely discarded the whole directory. ($(BISON)): Remove now useless bouncing recipe. (calc___CPPFLAGS): New. Stay away from -Ilib. * Makefile.am, configure.ac, examples/local.mk, * examples/calc++/test: Adjust. * configure.ac: Pass nostdinc to Automake. * src/local.mk, lib/local.mk (AM_CPPFLAGS): Move to... * Makefile.am: here. * src/local.mk, examples/calc++/Makefile.am (BISON, BISON_IN): Factor to... * Makefile.am: here. * tests/local.mk: Use it. 2012-02-14 Akim Demaille <demaille@gostai.com> variant: fix the example. * examples/variant.yy: Adjust to "assert" being now "parse.assert". 2012-02-14 Akim Demaille <demaille@gostai.com> maint: more authors. * AUTHORS: here. Suggested by Tys Lefering. 2012-02-14 Akim Demaille <demaille@gostai.com> maint: add license headers. * examples/calc++/test, examples/variant.yy, AUTHORS, THANKS, * tests/atlocal.in, tests/bison.in: Add license headers. Reported by Tys Lefering. 2012-02-14 Akim Demaille <demaille@gostai.com> maint: remove obsolete file. * etc/make-ChangeLogs: Remove (used for rcs to cvs migration!). Reported by Tys Lefering. 2012-02-14 Akim Demaille <demaille@gostai.com> maint: more authors. * AUTHORS: here. Suggested by Tys Lefering. 2012-02-14 Akim Demaille <demaille@gostai.com> maint: add license headers. * examples/calc++/test, examples/variant.yy, AUTHORS, THANKS, * tests/atlocal.in, tests/bison.in: Add license headers. Reported by Tys Lefering. 2012-02-14 Akim Demaille <demaille@gostai.com> maint: remove obsolete file. * etc/make-ChangeLogs: Remove (used for rcs to cvs migration!). Reported by Tys Lefering. 2012-02-10 Akim Demaille <demaille@gostai.com> lalr1.cc: also handle syntax_error when calling yylex. * data/lalr1.cc (parse): Catch syntax_error around yylex and forward them to errlab1. * tests/c++.at (Syntax error as exception): Check support for syntax exceptions raised by the scanner. * NEWS, doc/bison.texinfo: Document it. 2012-02-10 Akim Demaille <demaille@gostai.com> tests: lalr1.cc: check syntax_error. * tests/c++.at (Syntax error as exception): New. 2012-02-10 Akim Demaille <demaille@gostai.com> tests: don't require locations uselessly. * tests/c++.at (Syntax error discarding no lookahead): Contrary to 2.5, C++ parsers can work without locations. 2012-02-10 Akim Demaille <demaille@gostai.com> maint: more silent rules. * tests/local.mk (TESTSUITE_AT): Include plackage.m4. Adjust dependencies. Make testsuite.at its first argument. (package.m4): Be silent. (testsuite): Be silent. Use $<. 2012-02-10 Akim Demaille <demaille@gostai.com> skeletons: simplify the protections against "unused" warnings. * data/c.m4 (b4_parse_param_use): Also accept optional arguments to "use". Simplify callers. * data/glr.c (yyuserAction): Simplify use of b4_parse_param_use. (yy_reduce_print): Don't use b4_parse_param_use, as all the arguments _are_ used. * data/lalr1.cc (YY_SYMBOL_PRINT): Even when disabled, "use" the symbol argument. This neutralizes a warning in yypush_ when there are no symbols with a semantic values. (yy_destroy_): Remove useless "use" of yymsg. 2012-02-10 Akim Demaille <demaille@gostai.com> glr: formatting changes. * data/glr.c: Split long strings. 2012-02-08 Akim Demaille <demaille@gostai.com> use a more consistent quoting style. See <http://lists.gnu.org/archive/html/bug-bison/2012-01/msg00120.html>. Use quotearg as often as possible instead of leaving the choice of the quotes to the translators. Use shorter messages. Factor similar messages to a single format, to make localization easier. * src/files.c, src/getargs.c, src/muscle-tab.c, src/reader.c * src/scan-code.l, src/scan-gram.l, src/symtab.c: Use quote() or quotearg_colon() on printf arguments instead of quotes in the format string. * data/bison.m4: Keep sync with the changes in muscle-tab.c. * tests/skeletons.at, tests/input.at, tests/regression.at: Adjust expected messages. 2012-02-08 Akim Demaille <demaille@gostai.com> use a more consistent quoting style. See <http://lists.gnu.org/archive/html/bug-bison/2012-01/msg00120.html>. Use quotearg as often as possible instead of leaving the choice of the quotes to the translators. Use shorter messages. Factor similar messages to a single format, to make localization easier. * src/files.c, src/getargs.c, src/muscle-tab.c, src/reader.c * src/scan-code.l, src/scan-gram.l, src/symtab.c: Use quote() or quotearg_colon() on printf arguments instead of quotes in the format string. * data/bison.m4: Keep sync with the changes in muscle-tab.c. * tests/skeletons.at, tests/input.at, tests/regression.at: Adjust expected messages. 2012-01-31 Jim Meyering <meyering@redhat.com> maint: reenable sc_m4_quote_check * cfg.mk (local-checks-to-skip): Reenable sc_m4_quote_check. * m4/dmalloc.m4: Add quotes. 2012-01-31 Jim Meyering <meyering@redhat.com> maint: force "make syntax-check" to pass by skipping failing tests * cfg.mk (local-checks-to-skip): Skip all currently-failing tests. Remove changelog-check; it's long gone. 2012-01-31 Akim Demaille <demaille@gostai.com> maint: remove stray debug code. * src/Makefile.am (echo): Remove. 2012-01-31 Akim Demaille <demaille@gostai.com> maint: space changes. * src/Makefile.am: Use 2 leading spaces for variable definition spreading over several lines. 2012-01-31 Akim Demaille <demaille@gostai.com> maint: more silent-rules. * doc/local.mk, src/local.mk, examples/calc++/Makefile.am: Use $(AM_V_GEN) and $(AM_V_at) where appropriate. 2012-01-31 Jim Meyering <meyering@redhat.com> do not ignore errors like ENOSPC,EIO when writing to stdout Standard output was never explicitly closed, so we could not detect failure. Thus, bison would ignore the errors of writing to a full file system and getting an I/O error on write, but only for standard output, e.g., for --print-localedir, --print-datadir, --help and some verbose output. Now, "bison --print-datadir > /dev/full" reports the write failure: bison: write error: No space left on device Before, it would exit 0 with no diagnostic, implying success. This is not an issue for "--output=-" or the other FILE-accepting command-line options, because unlike most other GNU programs, an output file argument of "-" is treated as the literal "./-", rather than standard output. * bootstrap.conf (gnulib_modules): Add closeout. * src/main.c: Include "closeout.h". Use atexit to ensure we close stdout. * .gitignore: Ignore new files pulled in via gnulib-tool. 2012-01-31 Akim Demaille <demaille@gostai.com> maint: more silent-rules. * doc/local.mk, src/local.mk, examples/calc++/Makefile.am: Use $(AM_V_GEN) and $(AM_V_at) where appropriate. 2012-01-29 Jim Meyering <meyering@redhat.com> do not ignore errors like ENOSPC,EIO when writing to stdout Standard output was never explicitly closed, so we could not detect failure. Thus, bison would ignore the errors of writing to a full file system and getting an I/O error on write, but only for standard output, e.g., for --print-localedir, --print-datadir, --help and some verbose output. Now, "bison --print-datadir > /dev/full" reports the write failure: bison: write error: No space left on device Before, it would exit 0 with no diagnostic, implying success. This is not an issue for "--output=-" or the other FILE-accepting command-line options, because unlike most other GNU programs, an output file argument of "-" is treated as the literal "./-", rather than standard output. * bootstrap.conf (gnulib_modules): Add closeout. * src/main.c: Include "closeout.h". Use atexit to ensure we close stdout. * .gitignore: Ignore new files pulled in via gnulib-tool. 2012-01-26 Akim Demaille <demaille@gostai.com> tests: fix expected output. * tests/actions.at (YYBACKUP): here. 2012-01-26 Akim Demaille <demaille@gostai.com> tests: fix expected output. * tests/actions.at (YYBACKUP): here. 2012-01-26 Akim Demaille <demaille@gostai.com> maint: fix configure.ac Fix commit 1890a2a816dab86c23cc1d0af8fac3986335deb7. * configure.ac: Fix variable assignment. 2012-01-26 Akim Demaille <demaille@gostai.com> yacc: fix YYBACKUP. Reported by David Kastrup: https://lists.gnu.org/archive/html/bug-bison/2011-10/msg00002.html. * data/yacc.c (YYBACKUP): Accept rhs size. Restore the proper state value. * TODO (YYBACKUP): Make it... * tests/actions.at: a new test case. * NEWS, THANKS: Update. 2012-01-26 Akim Demaille <demaille@gostai.com> maint: update TODO. * TODO (Labeling the symbols): Remove, it's done ("Name references"). 2012-01-26 Akim Demaille <demaille@gostai.com> maint: update THANKS. * THANKS: Update Tys's address, on his request. 2012-01-26 Akim Demaille <demaille@gostai.com> maint: fix --gcc-warnings support. * configure.ac: Use enable_gcc_warnings instead of enableval, which is valid only with AC_ARG_ENABLE. 2012-01-26 Akim Demaille <demaille@gostai.com> maint: silent-rules. * configure.ac: Ask for silent-rules support. Enable it by default. 2012-01-26 Akim Demaille <demaille@gostai.com> maint: remove trailing blanks. * src/scan-code.l: Here. 2012-01-26 Akim Demaille <demaille@gostai.com> yacc: fix YYBACKUP. Reported by David Kastrup: https://lists.gnu.org/archive/html/bug-bison/2011-10/msg00002.html. * data/yacc.c (YYBACKUP): Accept rhs size. Restore the proper state value. * TODO (YYBACKUP): Make it... * tests/actions.at: a new test case. * NEWS, THANKS: Update. 2012-01-25 Akim Demaille <demaille@gostai.com> maint: update TODO. * TODO (Labeling the symbols): Remove, it's done ("Name references"). 2012-01-25 Akim Demaille <demaille@gostai.com> maint: update THANKS. * THANKS: Update Tys's address, on his request. 2012-01-25 Akim Demaille <demaille@gostai.com> maint: fix --gcc-warnings support. * configure.ac: Use enable_gcc_warnings instead of enableval, which is valid only with AC_ARG_ENABLE. 2012-01-25 Akim Demaille <demaille@gostai.com> maint: silent-rules. * configure.ac: Ask for silent-rules support. Enable it by default. 2012-01-25 Paul Eggert <eggert@cs.ucla.edu> tests: port to Solaris 10 'diff -u' * tests/regression.at (parse-gram.y: LALR = IELR): Port to Solaris 10, where "diff -u X X" outputs "No differences encountered" instead of outputting nothing. Reported by Tomohiro Suzuki in <http://lists.gnu.org/archive/html/bug-bison/2012-01/msg00101.html>. 2012-01-25 Jim Meyering <meyering@redhat.com> build: avoid possibly-replaced fprintf in liby-source, yyerror.c * lib/yyerror.c (yyerror): Use fputs and fputc rather than fprintf with a mere "%s\n" format. Always return 0 now, on the assumption that the return value was never used anyway. Don't include <config.h> after all. This avoids a problem reported by Thiru Ramakrishnan in http://lists.gnu.org/archive/html/help-bison/2011-11/msg00000.html * cfg.mk: Exempt lib/yyerror.c from the sc_require_config_h_first test. * THANKS: Update. 2012-01-24 Paul Eggert <eggert@cs.ucla.edu> tests: port to Solaris 10 'diff -u' * tests/regression.at (parse-gram.y: LALR = IELR): Port to Solaris 10, where "diff -u X X" outputs "No differences encountered" instead of outputting nothing. Reported by Tomohiro Suzuki in <http://lists.gnu.org/archive/html/bug-bison/2012-01/msg00101.html>. 2012-01-24 Jim Meyering <meyering@redhat.com> maint: generate ChangeLog from git log * Makefile.am (gen-ChangeLog): New rule. (dist-hook): Depend on it. (EXTRA_DIST): Distribute the two ChangeLog-* files. * bootstrap.conf (gnulib_modules): Add gitlog-to-changelog. (bootstrap_post_import_hook): Ensure that ChangeLog exists. * build-aux/git-log-fix: New file. * ChangeLog-2012: Renamed ... * ChangeLog: ... from this. * ChangeLog-1998: Renamed ... * OChangeLog: ...from this * .gitignore: Add ChangeLog. 2012-01-24 Jim Meyering <meyering@redhat.com> change more quotes in source, and adjust tests to match Run this command to change each `%s' to '%s' in source directories: git grep -l '`%s'\' src djgpp data \ |xargs perl -pi -e '$q="'\''";s/`%s$q/$q%s$q/g' * data/bison.m4: Affected per the above. * djgpp/subpipe.c: Likewise. * src/files.c: Likewise. * src/getargs.c: Likewise. * src/muscle-tab.c: Likewise. * src/reader.c: Likewise. * tests/glr-regression.at: Adjust to match. * tests/input.at: Likewise. * tests/push.at: Likewise. * tests/skeletons.at: Likewise. 2012-01-23 Jim Meyering <meyering@redhat.com> quote consistently and make tests pass with new quoting from gnulib Updating to gnulib pulled in new quote and quotarg modules, by which quoting is now done like 'this' rather than `this'. That change induces many "make check" test failures. This change adapts code and tests so that "make check" passes once again. * src/scan-code.l: Quote like 'this', not like `this'. * src/scan-gram.l: Likewise. * src/symtab.c: Likewise. * tests/actions.at: Adjust tests to match. * tests/input.at: Likewise. * tests/named-refs.at: Likewise. * tests/output.at: Likewise. * tests/regression.at: Likewise. * lib/.gitignore: Regenerate. * m4/.gitignore: Likewise. 2012-01-23 Jim Meyering <meyering@redhat.com> build: avoid possibly-replaced fprintf in liby-source, yyerror.c * lib/yyerror.c (yyerror): Use fputs and fputc rather than fprintf with a mere "%s\n" format. Always return 0 now, on the assumption that the return value was never used anyway. Don't include <config.h> after all. This avoids a problem reported by Thiru Ramakrishnan in http://lists.gnu.org/archive/html/help-bison/2011-11/msg00000.html * cfg.mk: Exempt lib/yyerror.c from the sc_require_config_h_first test. * THANKS: Update. 2012-01-23 Jim Meyering <meyering@redhat.com> build: update gnulib and autoconf submodules to latest (cherry picked from commit 728415f885e5cb8e518c8576fa6e1f541e384130) 2012-01-23 Jim Meyering <meyering@redhat.com> build: manually update bootstrap from gnulib, and adapt Updating to the latest bootstrap from gnulib involves more of a change than usual, and updating to the latest gnulib would involve its own set of challenges with the upcoming quoting changes, so we update bootstrap manually and separately. * bootstrap: Update from gnulib. * lib/Makefile.am: Initialize more variables to empty, so that gnulib.mk can append to them with "+=". * bootstrap.conf (gnulib_mk_hook): Remove. No longer honored. (gnulib_tool_option_extras): Generate gnulib.mk. 2012-01-23 Jim Meyering <meyering@redhat.com> maint: include <config.h> first * cfg.mk (exclude_file_name_regexp--sc_require_config_h_first): Exempt data/glr.c and data/yacc.c from the include-config.h-first requirement. 2012-01-23 Jim Meyering <meyering@redhat.com> build: include <config.h> from lib/yyerror.c * lib/yyerror.c: Include <config.h>. 2012-01-23 Jim Meyering <meyering@redhat.com> maint: list djgpp/subpipe.c in po/POTFILES.in * po/POTFILES.in: Add djgpp/subpipe.c. 2012-01-23 Jim Meyering <meyering@redhat.com> maint: placate the space-TAB syntax-check * cfg.mk (exclude_file_name_regexp--sc_space_tab): Exempt tests/input.at and tests/c++.at, since they appear to use SP-TAB sequences deliberately. * OChangeLog: Remove space-before-TAB. 2012-01-23 Jim Meyering <meyering@redhat.com> doc: correct typo: s/can not/cannot/ * doc/bison.texinfo (Bug Reports): s/can not/cannot/ And remove trailing blanks. 2012-01-23 Jim Meyering <meyering@redhat.com> build: generalize etc/prefix-gnulib-mk This script hard-coded "libbison" and lib/gnulib.mk. Adjust the script to require a --lib-name=$gnulib_name option and a FILE argument like lib/$gnulib_mk. Also add support for --help and --version. * etc/prefix-gnulib-mk: Generalize. * bootstrap.conf (bootstrap_post_import_hook): Update its invocation. 2012-01-22 Jim Meyering <meyering@redhat.com> maint: get gpl-3.0 from gnulib * bootstrap.conf (gnulib_modules): Add gpl-3.0. * doc/gpl-3.0.texi: Remove from version control, now that we get it via gnulib. * doc/.gitignore: Ignore it. 2012-01-20 Akim Demaille <demaille@gostai.com> maint: be more robust to gnulib's FOO_H variables. * configure.ac: Instead of listing gnulib's variables, look for them among AC_SUBST variables. 2012-01-20 Jim Meyering <meyering@redhat.com> maint: generate ChangeLog from git log * Makefile.am (gen-ChangeLog): New rule. (dist-hook): Depend on it. (EXTRA_DIST): Distribute the two ChangeLog-* files. * bootstrap.conf (gnulib_modules): Add gitlog-to-changelog. (bootstrap_post_import_hook): Ensure that ChangeLog exists. * build-aux/git-log-fix: New file. * ChangeLog-2012: Renamed ... * ChangeLog: ... from this. * ChangeLog-1998: Renamed ... * OChangeLog: ...from this * .gitignore: Add ChangeLog. 2012-01-19 Jim Meyering <meyering@redhat.com> change more quotes in source, and adjust tests to match Run this command to change each `%s' to '%s' in source directories: git grep -l '`%s'\' src djgpp data \ |xargs perl -pi -e '$q="'\''";s/`%s$q/$q%s$q/g' * data/bison.m4: Affected per the above. * djgpp/subpipe.c: Likewise. * src/files.c: Likewise. * src/getargs.c: Likewise. * src/muscle-tab.c: Likewise. * src/reader.c: Likewise. * tests/glr-regression.at: Adjust to match. * tests/input.at: Likewise. * tests/push.at: Likewise. * tests/skeletons.at: Likewise. 2012-01-19 Jim Meyering <meyering@redhat.com> quote consistently and make tests pass with new quoting from gnulib Updating to gnulib pulled in new quote and quotarg modules, by which quoting is now done like 'this' rather than `this'. That change induces many "make check" test failures. This change adapts code and tests so that "make check" passes once again. * src/scan-code.l: Quote like 'this', not like `this'. * src/scan-gram.l: Likewise. * src/symtab.c: Likewise. * tests/actions.at: Adjust tests to match. * tests/input.at: Likewise. * tests/named-refs.at: Likewise. * tests/output.at: Likewise. * tests/regression.at: Likewise. * lib/.gitignore: Regenerate. * m4/.gitignore: Likewise. 2012-01-19 Jim Meyering <meyering@redhat.com> build: update gnulib and autoconf submodules to latest 2012-01-19 Jim Meyering <meyering@redhat.com> build: manually update bootstrap from gnulib, and adapt Updating to the latest bootstrap from gnulib involves more of a change than usual, and updating to the latest gnulib would involve its own set of challenges with the upcoming quoting changes, so we update bootstrap manually and separately. * bootstrap: Update from gnulib. * Makefile.am: Initialize more variables to empty, so that gnulib.mk can append to them with "+=". * bootstrap.conf (gnulib_mk_hook): Remove. No longer honored. (bootstrap_post_import_hook): Instead, run the same command, etc/prefix-gnulib-mk lib/$gnulib_mk, via slightly different API. Temporarily disable "bootstrap_sync=true". * etc/prefix-gnulib-mk: Don't prepend "lib/" to tokens like -I$(... or "\". 2012-01-19 Jim Meyering <meyering@redhat.com> maint: include <config.h> first * cfg.mk (exclude_file_name_regexp--sc_require_config_h_first): Exempt data/glr.c and data/yacc.c from the include-config.h-first requirement. 2012-01-19 Jim Meyering <meyering@redhat.com> build: include <config.h> from lib/yyerror.c * lib/yyerror.c: Include <config.h>. 2012-01-19 Jim Meyering <meyering@redhat.com> maint: list djgpp/subpipe.c in po/POTFILES.in * po/POTFILES.in: Add djgpp/subpipe.c. 2012-01-19 Jim Meyering <meyering@redhat.com> maint: placate the space-TAB syntax-check * cfg.mk (exclude_file_name_regexp--sc_space_tab): Exempt tests/input.at and tests/c++.at, since they appear to use SP-TAB sequences deliberately. * OChangeLog: Remove space-before-TAB. 2012-01-19 Jim Meyering <meyering@redhat.com> maint: remove final trailing space * src/scan-gram.l (%): Remove single space at end of line. 2012-01-19 Jim Meyering <meyering@redhat.com> maint: get gpl-3.0 from gnulib * bootstrap.conf (gnulib_modules): Add gpl-3.0. * doc/gpl-3.0.texi: Remove from version control, now that we get it via gnulib. * doc/.gitignore: Ignore it. 2012-01-19 Jim Meyering <meyering@redhat.com> doc: correct typo: s/can not/cannot/ * doc/bison.texinfo (Bug Reports): s/can not/cannot/ And remove trailing blanks. PK r�!\�JBa�� �� m4sugar/m4sugar.m4nu �[��� divert(-1)# -*- Autoconf -*- # This file is part of Autoconf. # Base M4 layer. # Requires GNU M4. # # Copyright (C) 1999-2017 Free Software Foundation, Inc. # This file is part of Autoconf. 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. # # Under Section 7 of GPL version 3, you are granted additional # permissions described in the Autoconf Configure Script Exception, # version 3.0, as published by the Free Software Foundation. # # You should have received a copy of the GNU General Public License # and a copy of the Autoconf Configure Script Exception along with # this program; see the files COPYINGv3 and COPYING.EXCEPTION # respectively. If not, see <https://www.gnu.org/licenses/>. # Written by Akim Demaille. # Set the quotes, whatever the current quoting system. changequote() changequote([, ]) # Some old m4's don't support m4exit. But they provide # equivalent functionality by core dumping because of the # long macros we define. ifdef([__gnu__], , [errprint(M4sugar requires GNU M4. Install it before installing M4sugar or set the M4 environment variable to its absolute file name.) m4exit(2)]) ## ------------------------------- ## ## 1. Simulate --prefix-builtins. ## ## ------------------------------- ## # m4_define # m4_defn # m4_undefine define([m4_define], defn([define])) define([m4_defn], defn([defn])) define([m4_undefine], defn([undefine])) m4_undefine([define]) m4_undefine([defn]) m4_undefine([undefine]) # m4_copy(SRC, DST) # ----------------- # Define DST as the definition of SRC. # What's the difference between: # 1. m4_copy([from], [to]) # 2. m4_define([to], [from($@)]) # Well, obviously 1 is more expensive in space. Maybe 2 is more expensive # in time, but because of the space cost of 1, it's not that obvious. # Nevertheless, one huge difference is the handling of `$0'. If `from' # uses `$0', then with 1, `to''s `$0' is `to', while it is `from' in 2. # The user would certainly prefer to see `to'. # # This definition is in effect during m4sugar initialization, when # there are no pushdef stacks; later on, we redefine it to something # more powerful for all other clients to use. m4_define([m4_copy], [m4_define([$2], m4_defn([$1]))]) # m4_rename(SRC, DST) # ------------------- # Rename the macro SRC to DST. m4_define([m4_rename], [m4_copy([$1], [$2])m4_undefine([$1])]) # m4_rename_m4(MACRO-NAME) # ------------------------ # Rename MACRO-NAME to m4_MACRO-NAME. m4_define([m4_rename_m4], [m4_rename([$1], [m4_$1])]) # m4_copy_unm4(m4_MACRO-NAME) # --------------------------- # Copy m4_MACRO-NAME to MACRO-NAME. m4_define([m4_copy_unm4], [m4_copy([$1], m4_bpatsubst([$1], [^m4_\(.*\)], [[\1]]))]) # Some m4 internals have names colliding with tokens we might use. # Rename them a` la `m4 --prefix-builtins'. Conditionals first, since # some subsequent renames are conditional. m4_rename_m4([ifdef]) m4_rename([ifelse], [m4_if]) m4_rename_m4([builtin]) m4_rename_m4([changecom]) m4_rename_m4([changequote]) m4_ifdef([changeword],dnl conditionally available in 1.4.x [m4_undefine([changeword])]) m4_rename_m4([debugfile]) m4_rename_m4([debugmode]) m4_rename_m4([decr]) m4_rename_m4([divnum]) m4_rename_m4([dumpdef]) m4_rename_m4([errprint]) m4_rename_m4([esyscmd]) m4_rename_m4([eval]) m4_rename_m4([format]) m4_undefine([include]) m4_rename_m4([incr]) m4_rename_m4([index]) m4_rename_m4([indir]) m4_rename_m4([len]) m4_rename([m4exit], [m4_exit]) m4_undefine([m4wrap]) m4_ifdef([mkstemp],dnl added in M4 1.4.8 [m4_rename_m4([mkstemp]) m4_copy([m4_mkstemp], [m4_maketemp]) m4_undefine([maketemp])], [m4_rename_m4([maketemp]) m4_copy([m4_maketemp], [m4_mkstemp])]) m4_rename([patsubst], [m4_bpatsubst]) m4_rename_m4([popdef]) m4_rename_m4([pushdef]) m4_rename([regexp], [m4_bregexp]) m4_rename_m4([shift]) m4_undefine([sinclude]) m4_rename_m4([substr]) m4_ifdef([symbols],dnl present only in alpha-quality 1.4o [m4_rename_m4([symbols])]) m4_rename_m4([syscmd]) m4_rename_m4([sysval]) m4_rename_m4([traceoff]) m4_rename_m4([traceon]) m4_rename_m4([translit]) # _m4_defn(ARG) # ------------- # _m4_defn is for internal use only - it bypasses the wrapper, so it # must only be used on one argument at a time, and only on macros # known to be defined. Make sure this still works if the user renames # m4_defn but not _m4_defn. m4_copy([m4_defn], [_m4_defn]) # _m4_divert_raw(NUM) # ------------------- # _m4_divert_raw is for internal use only. Use this instead of # m4_builtin([divert], NUM), so that tracing diversion flow is easier. m4_rename([divert], [_m4_divert_raw]) # _m4_popdef(ARG...) # ------------------ # _m4_popdef is for internal use only - it bypasses the wrapper, so it # must only be used on macros known to be defined. Make sure this # still works if the user renames m4_popdef but not _m4_popdef. m4_copy([m4_popdef], [_m4_popdef]) # _m4_undefine(ARG...) # -------------------- # _m4_undefine is for internal use only - it bypasses the wrapper, so # it must only be used on macros known to be defined. Make sure this # still works if the user renames m4_undefine but not _m4_undefine. m4_copy([m4_undefine], [_m4_undefine]) # _m4_undivert(NUM...) # -------------------- # _m4_undivert is for internal use only, and should always be given # arguments. Use this instead of m4_builtin([undivert], NUM...), so # that tracing diversion flow is easier. m4_rename([undivert], [_m4_undivert]) ## ------------------- ## ## 2. Error messages. ## ## ------------------- ## # m4_location # ----------- # Output the current file, colon, and the current line number. m4_define([m4_location], [__file__:__line__]) # m4_errprintn(MSG) # ----------------- # Same as `errprint', but with the missing end of line. m4_define([m4_errprintn], [m4_errprint([$1 ])]) # m4_warning(MSG) # --------------- # Warn the user. m4_define([m4_warning], [m4_errprintn(m4_location[: warning: $1])]) # m4_fatal(MSG, [EXIT-STATUS]) # ---------------------------- # Fatal the user. :) m4_define([m4_fatal], [m4_errprintn(m4_location[: error: $1] m4_expansion_stack)m4_exit(m4_if([$2],, 1, [$2]))]) # m4_assert(EXPRESSION, [EXIT-STATUS = 1]) # ---------------------------------------- # This macro ensures that EXPRESSION evaluates to true, and exits if # EXPRESSION evaluates to false. m4_define([m4_assert], [m4_if(m4_eval([$1]), 0, [m4_fatal([assert failed: $1], [$2])])]) ## ------------- ## ## 3. Warnings. ## ## ------------- ## # _m4_warn(CATEGORY, MESSAGE, [STACK-TRACE]) # ------------------------------------------ # Report a MESSAGE to the user if the CATEGORY of warnings is enabled. # This is for traces only. # If present, STACK-TRACE is a \n-separated list of "LOCATION: MESSAGE", # where the last line (and no other) ends with "the top level". # # Within m4, the macro is a no-op. This macro really matters # when autom4te post-processes the trace output. m4_define([_m4_warn], []) # m4_warn(CATEGORY, MESSAGE) # -------------------------- # Report a MESSAGE to the user if the CATEGORY of warnings is enabled. m4_define([m4_warn], [_m4_warn([$1], [$2], m4_ifdef([_m4_expansion_stack], [m4_expansion_stack]))]) ## ------------------- ## ## 4. File inclusion. ## ## ------------------- ## # We also want to neutralize include (and sinclude for symmetry), # but we want to extend them slightly: warn when a file is included # several times. This is, in general, a dangerous operation, because # too many people forget to quote the first argument of m4_define. # # For instance in the following case: # m4_define(foo, [bar]) # then a second reading will turn into # m4_define(bar, [bar]) # which is certainly not what was meant. # m4_include_unique(FILE) # ----------------------- # Declare that the FILE was loading; and warn if it has already # been included. m4_define([m4_include_unique], [m4_ifdef([m4_include($1)], [m4_warn([syntax], [file `$1' included several times])])dnl m4_define([m4_include($1)])]) # m4_include(FILE) # ---------------- # Like the builtin include, but warns against multiple inclusions. m4_define([m4_include], [m4_include_unique([$1])dnl m4_builtin([include], [$1])]) # m4_sinclude(FILE) # ----------------- # Like the builtin sinclude, but warns against multiple inclusions. m4_define([m4_sinclude], [m4_include_unique([$1])dnl m4_builtin([sinclude], [$1])]) ## ------------------------------------ ## ## 5. Additional branching constructs. ## ## ------------------------------------ ## # Both `m4_ifval' and `m4_ifset' tests against the empty string. The # difference is that `m4_ifset' is specialized on macros. # # In case of arguments of macros, eg. $1, it makes little difference. # In the case of a macro `FOO', you don't want to check `m4_ifval(FOO, # TRUE)', because if `FOO' expands with commas, there is a shifting of # the arguments. So you want to run `m4_ifval([FOO])', but then you just # compare the *string* `FOO' against `', which, of course fails. # # So you want the variation `m4_ifset' that expects a macro name as $1. # If this macro is both defined and defined to a non empty value, then # it runs TRUE, etc. # m4_ifblank(COND, [IF-BLANK], [IF-TEXT]) # m4_ifnblank(COND, [IF-TEXT], [IF-BLANK]) # ---------------------------------------- # If COND is empty, or consists only of blanks (space, tab, newline), # then expand IF-BLANK, otherwise expand IF-TEXT. This differs from # m4_ifval only if COND has just whitespace, but it helps optimize in # spite of users who mistakenly leave trailing space after what they # thought was an empty argument: # macro( # [] # ) # # Writing one macro in terms of the other causes extra overhead, so # we inline both definitions. m4_define([m4_ifblank], [m4_if(m4_translit([[$1]], [ ][ ][ ]), [], [$2], [$3])]) m4_define([m4_ifnblank], [m4_if(m4_translit([[$1]], [ ][ ][ ]), [], [$3], [$2])]) # m4_ifval(COND, [IF-TRUE], [IF-FALSE]) # ------------------------------------- # If COND is not the empty string, expand IF-TRUE, otherwise IF-FALSE. # Comparable to m4_ifdef. m4_define([m4_ifval], [m4_if([$1], [], [$3], [$2])]) # m4_n(TEXT) # ---------- # If TEXT is not empty, return TEXT and a new line, otherwise nothing. m4_define([m4_n], [m4_if([$1], [], [], [$1 ])]) # m4_ifvaln(COND, [IF-TRUE], [IF-FALSE]) # -------------------------------------- # Same as `m4_ifval', but add an extra newline to IF-TRUE or IF-FALSE # unless that argument is empty. m4_define([m4_ifvaln], [m4_if([$1], [], [m4_n([$3])], [m4_n([$2])])]) # m4_ifset(MACRO, [IF-TRUE], [IF-FALSE]) # -------------------------------------- # If MACRO has no definition, or of its definition is the empty string, # expand IF-FALSE, otherwise IF-TRUE. m4_define([m4_ifset], [m4_ifdef([$1], [m4_ifval(_m4_defn([$1]), [$2], [$3])], [$3])]) # m4_ifndef(NAME, [IF-NOT-DEFINED], [IF-DEFINED]) # ----------------------------------------------- m4_define([m4_ifndef], [m4_ifdef([$1], [$3], [$2])]) # m4_case(SWITCH, VAL1, IF-VAL1, VAL2, IF-VAL2, ..., DEFAULT) # ----------------------------------------------------------- # m4 equivalent of # switch (SWITCH) # { # case VAL1: # IF-VAL1; # break; # case VAL2: # IF-VAL2; # break; # ... # default: # DEFAULT; # break; # }. # All the values are optional, and the macro is robust to active # symbols properly quoted. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_case], [m4_if([$#], 0, [], [$#], 1, [], [$#], 2, [$2], [$1], [$2], [$3], [$0([$1], m4_shift3($@))])]) # m4_bmatch(SWITCH, RE1, VAL1, RE2, VAL2, ..., DEFAULT) # ----------------------------------------------------- # m4 equivalent of # # if (SWITCH =~ RE1) # VAL1; # elif (SWITCH =~ RE2) # VAL2; # elif ... # ... # else # DEFAULT # # All the values are optional, and the macro is robust to active symbols # properly quoted. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_bmatch], [m4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])], [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])], [$#], 2, [$2], [m4_if(m4_bregexp([$1], [$2]), -1, [$0([$1], m4_shift3($@))], [$3])])]) # m4_argn(N, ARGS...) # ------------------- # Extract argument N (greater than 0) from ARGS. Example: # m4_define([b], [B]) # m4_argn([2], [a], [b], [c]) => b # # Rather than using m4_car(m4_shiftn([$1], $@)), we exploit the fact that # GNU m4 can directly reference any argument, through an indirect macro. m4_define([m4_argn], [m4_assert([0 < $1])]dnl [m4_pushdef([_$0], [_m4_popdef([_$0])]m4_dquote([$]m4_incr([$1])))_$0($@)]) # m4_car(ARGS...) # m4_cdr(ARGS...) # --------------- # Manipulate m4 lists. m4_car returns the first argument. m4_cdr # bundles all but the first argument into a quoted list. These two # macros are generally used with list arguments, with quoting removed # to break the list into multiple m4 ARGS. m4_define([m4_car], [[$1]]) m4_define([m4_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], [$#], 1, [], [m4_dquote(m4_shift($@))])]) # _m4_cdr(ARGS...) # ---------------- # Like m4_cdr, except include a leading comma unless only one argument # remains. Why? Because comparing a large list against [] is more # expensive in expansion time than comparing the number of arguments; so # _m4_cdr can be used to reduce the number of arguments when it is time # to end recursion. m4_define([_m4_cdr], [m4_if([$#], 1, [], [, m4_dquote(m4_shift($@))])]) # m4_cond(TEST1, VAL1, IF-VAL1, TEST2, VAL2, IF-VAL2, ..., [DEFAULT]) # ------------------------------------------------------------------- # Similar to m4_if, except that each TEST is expanded when encountered. # If the expansion of TESTn matches the string VALn, the result is IF-VALn. # The result is DEFAULT if no tests passed. This macro allows # short-circuiting of expensive tests, where it pays to arrange quick # filter tests to run first. # # For an example, consider a previous implementation of _AS_QUOTE_IFELSE: # # m4_if(m4_index([$1], [\]), [-1], [$2], # m4_eval(m4_index([$1], [\\]) >= 0), [1], [$2], # m4_eval(m4_index([$1], [\$]) >= 0), [1], [$2], # m4_eval(m4_index([$1], [\`]) >= 0), [1], [$3], # m4_eval(m4_index([$1], [\"]) >= 0), [1], [$3], # [$2]) # # Here, m4_index is computed 5 times, and m4_eval 4, even if $1 contains # no backslash. It is more efficient to do: # # m4_cond([m4_index([$1], [\])], [-1], [$2], # [m4_eval(m4_index([$1], [\\]) >= 0)], [1], [$2], # [m4_eval(m4_index([$1], [\$]) >= 0)], [1], [$2], # [m4_eval(m4_index([$1], [\`]) >= 0)], [1], [$3], # [m4_eval(m4_index([$1], [\"]) >= 0)], [1], [$3], # [$2]) # # In the common case of $1 with no backslash, only one m4_index expansion # occurs, and m4_eval is avoided altogether. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_cond], [m4_if([$#], [0], [m4_fatal([$0: cannot be called without arguments])], [$#], [1], [$1], m4_eval([$# % 3]), [2], [m4_fatal([$0: missing an argument])], [_$0($@)])]) m4_define([_m4_cond], [m4_if(($1), [($2)], [$3], [$#], [3], [], [$#], [4], [$4], [$0(m4_shift3($@))])]) ## ---------------------------------------- ## ## 6. Enhanced version of some primitives. ## ## ---------------------------------------- ## # m4_bpatsubsts(STRING, RE1, SUBST1, RE2, SUBST2, ...) # ---------------------------------------------------- # m4 equivalent of # # $_ = STRING; # s/RE1/SUBST1/g; # s/RE2/SUBST2/g; # ... # # All the values are optional, and the macro is robust to active symbols # properly quoted. # # I would have liked to name this macro `m4_bpatsubst', unfortunately, # due to quotation problems, I need to double quote $1 below, therefore # the anchors are broken :( I can't let users be trapped by that. # # Recall that m4_shift3 always results in an argument. Hence, we need # to distinguish between a final deletion vs. ending recursion. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_bpatsubsts], [m4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])], [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])], [$#], 2, [m4_unquote(m4_builtin([patsubst], [[$1]], [$2]))], [$#], 3, [m4_unquote(m4_builtin([patsubst], [[$1]], [$2], [$3]))], [_$0($@m4_if(m4_eval($# & 1), 0, [,]))])]) m4_define([_m4_bpatsubsts], [m4_if([$#], 2, [$1], [$0(m4_builtin([patsubst], [[$1]], [$2], [$3]), m4_shift3($@))])]) # m4_copy(SRC, DST) # ----------------- # Define the pushdef stack DST as a copy of the pushdef stack SRC; # give an error if DST is already defined. This is particularly nice # for copying self-modifying pushdef stacks, where the top definition # includes one-shot initialization that is later popped to the normal # definition. This version intentionally does nothing if SRC is # undefined. # # Some macros simply can't be renamed with this method: namely, anything # involved in the implementation of m4_stack_foreach_sep. m4_define([m4_copy], [m4_ifdef([$2], [m4_fatal([$0: won't overwrite defined macro: $2])], [m4_stack_foreach_sep([$1], [m4_pushdef([$2],], [)])])]dnl [m4_ifdef([m4_location($1)], [m4_define([m4_location($2)], m4_location)])]) # m4_copy_force(SRC, DST) # m4_rename_force(SRC, DST) # ------------------------- # Like m4_copy/m4_rename, except blindly overwrite any existing DST. # Note that m4_copy_force tolerates undefined SRC, while m4_rename_force # does not. m4_define([m4_copy_force], [m4_ifdef([$2], [_m4_undefine([$2])])m4_copy($@)]) m4_define([m4_rename_force], [m4_ifdef([$2], [_m4_undefine([$2])])m4_rename($@)]) # m4_define_default(MACRO, VALUE) # ------------------------------- # If MACRO is undefined, set it to VALUE. m4_define([m4_define_default], [m4_ifndef([$1], [m4_define($@)])]) # m4_default(EXP1, EXP2) # m4_default_nblank(EXP1, EXP2) # ----------------------------- # Returns EXP1 if not empty/blank, otherwise EXP2. Expand the result. # # m4_default is called on hot paths, so inline the contents of m4_ifval, # for one less round of expansion. m4_define([m4_default], [m4_if([$1], [], [$2], [$1])]) m4_define([m4_default_nblank], [m4_ifblank([$1], [$2], [$1])]) # m4_default_quoted(EXP1, EXP2) # m4_default_nblank_quoted(EXP1, EXP2) # ------------------------------------ # Returns EXP1 if non empty/blank, otherwise EXP2. Leave the result quoted. # # For comparison: # m4_define([active], [ACTIVE]) # m4_default([active], [default]) => ACTIVE # m4_default([], [active]) => ACTIVE # -m4_default([ ], [active])- => - - # -m4_default_nblank([ ], [active])- => -ACTIVE- # m4_default_quoted([active], [default]) => active # m4_default_quoted([], [active]) => active # -m4_default_quoted([ ], [active])- => - - # -m4_default_nblank_quoted([ ], [active])- => -active- # # m4_default macro is called on hot paths, so inline the contents of m4_ifval, # for one less round of expansion. m4_define([m4_default_quoted], [m4_if([$1], [], [[$2]], [[$1]])]) m4_define([m4_default_nblank_quoted], [m4_ifblank([$1], [[$2]], [[$1]])]) # m4_defn(NAME) # ------------- # Like the original, except guarantee a warning when using something which is # undefined (unlike M4 1.4.x). This replacement is not a full-featured # replacement: if any of the defined macros contain unbalanced quoting, but # when pasted together result in a well-quoted string, then only native m4 # support is able to get it correct. But that's where quadrigraphs come in # handy, if you really need unbalanced quotes inside your macros. # # This macro is called frequently, so minimize the amount of additional # expansions by skipping m4_ifndef. Better yet, if __m4_version__ exists, # (added in M4 1.6), then let m4 do the job for us (see m4_init). m4_define([m4_defn], [m4_if([$#], [0], [[$0]], [$#], [1], [m4_ifdef([$1], [_m4_defn([$1])], [m4_fatal([$0: undefined macro: $1])])], [m4_map_args([$0], $@)])]) # m4_dumpdef(NAME...) # ------------------- # In m4 1.4.x, dumpdef writes to the current debugfile, rather than # stderr. This in turn royally confuses autom4te; so we follow the # lead of newer m4 and always dump to stderr. Unlike the original, # this version requires an argument, since there is no convenient way # in m4 1.4.x to grab the names of all defined macros. Newer m4 # always dumps to stderr, regardless of the current debugfile; it also # provides m4symbols as a way to grab all current macro names. But # dumpdefs is not frequently called, so we don't need to worry about # conditionally using these newer features. Also, this version # doesn't sort multiple arguments. # # If we detect m4 1.6 or newer, then provide an alternate definition, # installed during m4_init, that allows builtins through. # Unfortunately, there is no nice way in m4 1.4.x to dump builtins. m4_define([m4_dumpdef], [m4_if([$#], [0], [m4_fatal([$0: missing argument])], [$#], [1], [m4_ifdef([$1], [m4_errprintn( [$1: ]m4_dquote(_m4_defn([$1])))], [m4_fatal([$0: undefined macro: $1])])], [m4_map_args([$0], $@)])]) m4_define([_m4_dumpdef], [m4_if([$#], [0], [m4_fatal([$0: missing argument])], [$#], [1], [m4_builtin([dumpdef], [$1])], [m4_map_args_sep([m4_builtin([dumpdef],], [)], [], $@)])]) # m4_dumpdefs(NAME...) # -------------------- # Similar to `m4_dumpdef(NAME)', but if NAME was m4_pushdef'ed, display its # value stack (most recent displayed first). Also, this version silently # ignores undefined macros, rather than erroring out. # # This macro cheats, because it relies on the current definition of NAME # while the second argument of m4_stack_foreach_lifo is evaluated (which # would be undefined according to the API). m4_define([m4_dumpdefs], [m4_if([$#], [0], [m4_fatal([$0: missing argument])], [$#], [1], [m4_stack_foreach_lifo([$1], [m4_dumpdef([$1])m4_ignore])], [m4_map_args([$0], $@)])]) # m4_esyscmd_s(COMMAND) # --------------------- # Like m4_esyscmd, except strip any trailing newlines, thus behaving # more like shell command substitution. m4_define([m4_esyscmd_s], [m4_chomp_all(m4_esyscmd([$1]))]) # m4_popdef(NAME) # --------------- # Like the original, except guarantee a warning when using something which is # undefined (unlike M4 1.4.x). # # This macro is called frequently, so minimize the amount of additional # expansions by skipping m4_ifndef. Better yet, if __m4_version__ exists, # (added in M4 1.6), then let m4 do the job for us (see m4_init). m4_define([m4_popdef], [m4_if([$#], [0], [[$0]], [$#], [1], [m4_ifdef([$1], [_m4_popdef([$1])], [m4_fatal([$0: undefined macro: $1])])], [m4_map_args([$0], $@)])]) # m4_shiftn(N, ...) # ----------------- # Returns ... shifted N times. Useful for recursive "varargs" constructs. # # Autoconf does not use this macro, because it is inherently slower than # calling the common cases of m4_shift2 or m4_shift3 directly. But it # might as well be fast for other clients, such as Libtool. One way to # do this is to expand $@ only once in _m4_shiftn (otherwise, for long # lists, the expansion of m4_if takes twice as much memory as what the # list itself occupies, only to throw away the unused branch). The end # result is strictly equivalent to # m4_if([$1], 1, [m4_shift(,m4_shift(m4_shift($@)))], # [_m4_shiftn(m4_decr([$1]), m4_shift(m4_shift($@)))]) # but with the final `m4_shift(m4_shift($@)))' shared between the two # paths. The first leg uses a no-op m4_shift(,$@) to balance out the (). # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_shiftn], [m4_assert(0 < $1 && $1 < $#)_$0($@)]) m4_define([_m4_shiftn], [m4_if([$1], 1, [m4_shift(], [$0(m4_decr([$1])]), m4_shift(m4_shift($@)))]) # m4_shift2(...) # m4_shift3(...) # -------------- # Returns ... shifted twice, and three times. Faster than m4_shiftn. m4_define([m4_shift2], [m4_shift(m4_shift($@))]) m4_define([m4_shift3], [m4_shift(m4_shift(m4_shift($@)))]) # _m4_shift2(...) # _m4_shift3(...) # --------------- # Like m4_shift2 or m4_shift3, except include a leading comma unless shifting # consumes all arguments. Why? Because in recursion, it is nice to # distinguish between 1 element left and 0 elements left, based on how many # arguments this shift expands to. m4_define([_m4_shift2], [m4_if([$#], [2], [], [, m4_shift(m4_shift($@))])]) m4_define([_m4_shift3], [m4_if([$#], [3], [], [, m4_shift(m4_shift(m4_shift($@)))])]) # m4_undefine(NAME) # ----------------- # Like the original, except guarantee a warning when using something which is # undefined (unlike M4 1.4.x). # # This macro is called frequently, so minimize the amount of additional # expansions by skipping m4_ifndef. Better yet, if __m4_version__ exists, # (added in M4 1.6), then let m4 do the job for us (see m4_init). m4_define([m4_undefine], [m4_if([$#], [0], [[$0]], [$#], [1], [m4_ifdef([$1], [_m4_undefine([$1])], [m4_fatal([$0: undefined macro: $1])])], [m4_map_args([$0], $@)])]) # _m4_wrap(PRE, POST) # ------------------- # Helper macro for m4_wrap and m4_wrap_lifo. Allows nested calls to # m4_wrap within wrapped text. Use _m4_defn and _m4_popdef for speed. m4_define([_m4_wrap], [m4_ifdef([$0_text], [m4_define([$0_text], [$1]_m4_defn([$0_text])[$2])], [m4_builtin([m4wrap], [m4_unquote( _m4_defn([$0_text])_m4_popdef([$0_text]))])m4_define([$0_text], [$1$2])])]) # m4_wrap(TEXT) # ------------- # Append TEXT to the list of hooks to be executed at the end of input. # Whereas the order of the original may be LIFO in the underlying m4, # this version is always FIFO. m4_define([m4_wrap], [_m4_wrap([], [$1[]])]) # m4_wrap_lifo(TEXT) # ------------------ # Prepend TEXT to the list of hooks to be executed at the end of input. # Whereas the order of m4_wrap may be FIFO in the underlying m4, this # version is always LIFO. m4_define([m4_wrap_lifo], [_m4_wrap([$1[]])]) ## ------------------------- ## ## 7. Quoting manipulation. ## ## ------------------------- ## # m4_apply(MACRO, LIST) # --------------------- # Invoke MACRO, with arguments provided from the quoted list of # comma-separated quoted arguments. If LIST is empty, invoke MACRO # without arguments. The expansion will not be concatenated with # subsequent text. m4_define([m4_apply], [m4_if([$2], [], [$1], [$1($2)])[]]) # _m4_apply(MACRO, LIST) # ---------------------- # Like m4_apply, except do nothing if LIST is empty. m4_define([_m4_apply], [m4_if([$2], [], [], [$1($2)[]])]) # m4_count(ARGS) # -------------- # Return a count of how many ARGS are present. m4_define([m4_count], [$#]) # m4_curry(MACRO, ARG...) # ----------------------- # Perform argument currying. The expansion of this macro is another # macro that takes exactly one argument, appends it to the end of the # original ARG list, then invokes MACRO. For example: # m4_curry([m4_curry], [m4_reverse], [1])([2])([3]) => 3, 2, 1 # Not quite as practical as m4_incr, but you could also do: # m4_define([add], [m4_eval(([$1]) + ([$2]))]) # m4_define([add_one], [m4_curry([add], [1])]) # add_one()([2]) => 3 m4_define([m4_curry], [$1(m4_shift($@,)_$0]) m4_define([_m4_curry], [[$1])]) # m4_do(STRING, ...) # ------------------ # This macro invokes all its arguments (in sequence, of course). It is # useful for making your macros more structured and readable by dropping # unnecessary dnl's and have the macros indented properly. No concatenation # occurs after a STRING; use m4_unquote(m4_join(,STRING)) for that. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_do], [m4_if([$#], 0, [], [$#], 1, [$1[]], [$1[]$0(m4_shift($@))])]) # m4_dquote(ARGS) # --------------- # Return ARGS as a quoted list of quoted arguments. m4_define([m4_dquote], [[$@]]) # m4_dquote_elt(ARGS) # ------------------- # Return ARGS as an unquoted list of double-quoted arguments. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_dquote_elt], [m4_if([$#], [0], [], [$#], [1], [[[$1]]], [[[$1]],$0(m4_shift($@))])]) # m4_echo(ARGS) # ------------- # Return the ARGS, with the same level of quoting. Whitespace after # unquoted commas are consumed. m4_define([m4_echo], [$@]) # m4_expand(ARG) # _m4_expand(ARG) # --------------- # Return the expansion of ARG as a single string. Unlike # m4_quote($1), this preserves whitespace following single-quoted # commas that appear within ARG. It also deals with shell case # statements. # # m4_define([active], [ACT, IVE]) # m4_define([active2], [[ACT, IVE]]) # m4_quote(active, active2) # => ACT,IVE,ACT, IVE # m4_expand([active, active2]) # => ACT, IVE, ACT, IVE # # Unfortunately, due to limitations in m4, ARG must expand to # something with balanced quotes (use quadrigraphs to get around # this), and should not contain the unlikely delimiters -=<{( or # )}>=-. It is possible to have unbalanced quoted `(' or `)', as well # as unbalanced unquoted `)'. m4_expand can handle unterminated # comments or dnl on the final line, at the expense of speed; it also # aids in detecting attempts to incorrectly change the current # diversion inside ARG. Meanwhile, _m4_expand is faster but must be # given a terminated expansion, and has no safety checks for # mis-diverted text. # # Exploit that extra unquoted () will group unquoted commas and the # following whitespace. m4_bpatsubst can't handle newlines inside $1, # and m4_substr strips quoting. So we (ab)use m4_changequote, using # temporary quotes to remove the delimiters that conveniently included # the unquoted () that were added prior to the changequote. # # Thanks to shell case statements, too many people are prone to pass # underquoted `)', so we try to detect that by passing a marker as a # fourth argument; if the marker is not present, then we assume that # we encountered an early `)', and re-expand the first argument, but # this time with one more `(' in the second argument and in the # open-quote delimiter. We must also ignore the slop from the # previous try. The final macro is thus half line-noise, half art. m4_define([m4_expand], [m4_pushdef([m4_divert], _m4_defn([_m4_divert_unsafe]))]dnl [m4_pushdef([m4_divert_push], _m4_defn([_m4_divert_unsafe]))]dnl [m4_chomp(_$0([$1 ]))_m4_popdef([m4_divert], [m4_divert_push])]) m4_define([_m4_expand], [$0_([$1], [(], -=<{($1)}>=-, [}>=-])]) m4_define([_m4_expand_], [m4_if([$4], [}>=-], [m4_changequote([-=<{$2], [)}>=-])$3m4_changequote([, ])], [$0([$1], [($2], -=<{($2$1)}>=-, [}>=-])m4_ignore$2])]) # m4_ignore(ARGS) # --------------- # Expands to nothing. Useful for conditionally ignoring an arbitrary # number of arguments (see _m4_list_cmp for an example). m4_define([m4_ignore]) # m4_make_list(ARGS) # ------------------ # Similar to m4_dquote, this creates a quoted list of quoted ARGS. This # version is less efficient than m4_dquote, but separates each argument # with a comma and newline, rather than just comma, for readability. # When developing an m4sugar algorithm, you could temporarily use # m4_pushdef([m4_dquote],m4_defn([m4_make_list])) # around your code to make debugging easier. m4_define([m4_make_list], [m4_join([, ], m4_dquote_elt($@))]) # m4_noquote(STRING) # ------------------ # Return the result of ignoring all quotes in STRING and invoking the # macros it contains. Among other things, this is useful for enabling # macro invocations inside strings with [] blocks (for instance regexps # and help-strings). On the other hand, since all quotes are disabled, # any macro expanded during this time that relies on nested [] quoting # will likely crash and burn. This macro is seldom useful; consider # m4_unquote or m4_expand instead. m4_define([m4_noquote], [m4_changequote([-=<{(],[)}>=-])$1-=<{()}>=-m4_changequote([,])]) # m4_quote(ARGS) # -------------- # Return ARGS as a single argument. Any whitespace after unquoted commas # is stripped. There is always output, even when there were no arguments. # # It is important to realize the difference between `m4_quote(exp)' and # `[exp]': in the first case you obtain the quoted *result* of the # expansion of EXP, while in the latter you just obtain the string # `exp'. m4_define([m4_quote], [[$*]]) # _m4_quote(ARGS) # --------------- # Like m4_quote, except that when there are no arguments, there is no # output. For conditional scenarios (such as passing _m4_quote as the # macro name in m4_mapall), this feature can be used to distinguish between # one argument of the empty string vs. no arguments. However, in the # normal case with arguments present, this is less efficient than m4_quote. m4_define([_m4_quote], [m4_if([$#], [0], [], [[$*]])]) # m4_reverse(ARGS) # ---------------- # Output ARGS in reverse order. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_reverse], [m4_if([$#], [0], [], [$#], [1], [[$1]], [$0(m4_shift($@)), [$1]])]) # m4_unquote(ARGS) # ---------------- # Remove one layer of quotes from each ARG, performing one level of # expansion. For one argument, m4_unquote([arg]) is more efficient than # m4_do([arg]), but for multiple arguments, the difference is that # m4_unquote separates arguments with commas while m4_do concatenates. # Follow this macro with [] if concatenation with subsequent text is # undesired. m4_define([m4_unquote], [$*]) ## -------------------------- ## ## 8. Implementing m4 loops. ## ## -------------------------- ## # m4_for(VARIABLE, FIRST, LAST, [STEP = +/-1], EXPRESSION) # -------------------------------------------------------- # Expand EXPRESSION defining VARIABLE to FROM, FROM + 1, ..., TO with # increments of STEP. Both limits are included, and bounds are # checked for consistency. The algorithm is robust to indirect # VARIABLE names. Changing VARIABLE inside EXPRESSION will not impact # the number of iterations. # # Uses _m4_defn for speed, and avoid dnl in the macro body. Factor # the _m4_for call so that EXPRESSION is only parsed once. m4_define([m4_for], [m4_pushdef([$1], m4_eval([$2]))]dnl [m4_cond([m4_eval(([$3]) > ([$2]))], 1, [m4_pushdef([_m4_step], m4_eval(m4_default_quoted([$4], 1)))m4_assert(_m4_step > 0)_$0(_m4_defn([$1]), m4_eval((([$3]) - ([$2])) / _m4_step * _m4_step + ([$2])), _m4_step,], [m4_eval(([$3]) < ([$2]))], 1, [m4_pushdef([_m4_step], m4_eval(m4_default_quoted([$4], -1)))m4_assert(_m4_step < 0)_$0(_m4_defn([$1]), m4_eval((([$2]) - ([$3])) / -(_m4_step) * _m4_step + ([$2])), _m4_step,], [m4_pushdef([_m4_step])_$0(_m4_defn([$1]), _m4_defn([$1]), 0,])]dnl [[m4_define([$1],], [)$5])m4_popdef([_m4_step], [$1])]) # _m4_for(COUNT, LAST, STEP, PRE, POST) # ------------------------------------- # Core of the loop, no consistency checks, all arguments are plain # numbers. Expand PRE[COUNT]POST, then alter COUNT by STEP and # iterate if COUNT is not LAST. m4_define([_m4_for], [$4[$1]$5[]m4_if([$1], [$2], [], [$0(m4_eval([$1 + $3]), [$2], [$3], [$4], [$5])])]) # Implementing `foreach' loops in m4 is much more tricky than it may # seem. For example, the old M4 1.4.4 manual had an incorrect example, # which looked like this (when translated to m4sugar): # # | # foreach(VAR, (LIST), STMT) # | m4_define([foreach], # | [m4_pushdef([$1])_foreach([$1], [$2], [$3])m4_popdef([$1])]) # | m4_define([_arg1], [$1]) # | m4_define([_foreach], # | [m4_if([$2], [()], , # | [m4_define([$1], _arg1$2)$3[]_foreach([$1], (m4_shift$2), [$3])])]) # # But then if you run # # | m4_define(a, 1) # | m4_define(b, 2) # | m4_define(c, 3) # | foreach([f], [([a], [(b], [c)])], [echo f # | ]) # # it gives # # => echo 1 # => echo (2,3) # # which is not what is expected. # # Of course the problem is that many quotes are missing. So you add # plenty of quotes at random places, until you reach the expected # result. Alternatively, if you are a quoting wizard, you directly # reach the following implementation (but if you really did, then # apply to the maintenance of m4sugar!). # # | # foreach(VAR, (LIST), STMT) # | m4_define([foreach], [m4_pushdef([$1])_foreach($@)m4_popdef([$1])]) # | m4_define([_arg1], [[$1]]) # | m4_define([_foreach], # | [m4_if($2, [()], , # | [m4_define([$1], [_arg1$2])$3[]_foreach([$1], [(m4_shift$2)], [$3])])]) # # which this time answers # # => echo a # => echo (b # => echo c) # # Bingo! # # Well, not quite. # # With a better look, you realize that the parens are more a pain than # a help: since anyway you need to quote properly the list, you end up # with always using an outermost pair of parens and an outermost pair # of quotes. Rejecting the parens both eases the implementation, and # simplifies the use: # # | # foreach(VAR, (LIST), STMT) # | m4_define([foreach], [m4_pushdef([$1])_foreach($@)m4_popdef([$1])]) # | m4_define([_arg1], [$1]) # | m4_define([_foreach], # | [m4_if($2, [], , # | [m4_define([$1], [_arg1($2)])$3[]_foreach([$1], [m4_shift($2)], [$3])])]) # # # Now, just replace the `$2' with `m4_quote($2)' in the outer `m4_if' # to improve robustness, and you come up with a nice implementation # that doesn't require extra parentheses in the user's LIST. # # But wait - now the algorithm is quadratic, because every recursion of # the algorithm keeps the entire LIST and merely adds another m4_shift to # the quoted text. If the user has a lot of elements in LIST, you can # bring the system to its knees with the memory m4 then requires, or trip # the m4 --nesting-limit recursion factor. The only way to avoid # quadratic growth is ensure m4_shift is expanded prior to the recursion. # Hence the design below. # # The M4 manual now includes a chapter devoted to this issue, with # the lessons learned from m4sugar. And still, this design is only # optimal for M4 1.6; see foreach.m4 for yet more comments on why # M4 1.4.x uses yet another implementation. # m4_foreach(VARIABLE, LIST, EXPRESSION) # -------------------------------------- # # Expand EXPRESSION assigning each value of the LIST to VARIABLE. # LIST should have the form `item_1, item_2, ..., item_n', i.e. the # whole list must *quoted*. Quote members too if you don't want them # to be expanded. # # This macro is robust to active symbols: # | m4_define(active, [ACT, IVE]) # | m4_foreach(Var, [active, active], [-Var-]) # => -ACT--IVE--ACT--IVE- # # | m4_foreach(Var, [[active], [active]], [-Var-]) # => -ACT, IVE--ACT, IVE- # # | m4_foreach(Var, [[[active]], [[active]]], [-Var-]) # => -active--active- # # This macro is called frequently, so avoid extra expansions such as # m4_ifval and dnl. Also, since $2 might be quite large, try to use it # as little as possible in _m4_foreach; each extra use requires that much # more memory for expansion. So, rather than directly compare $2 against # [] and use m4_car/m4_cdr for recursion, we instead unbox the list (which # requires swapping the argument order in the helper), insert an ignored # third argument, and use m4_shift3 to detect when recursion is complete, # at which point this looks very much like m4_map_args. m4_define([m4_foreach], [m4_if([$2], [], [], [m4_pushdef([$1])_$0([m4_define([$1],], [)$3], [], $2)m4_popdef([$1])])]) # _m4_foreach(PRE, POST, IGNORED, ARG...) # --------------------------------------- # Form the common basis of the m4_foreach and m4_map macros. For each # ARG, expand PRE[ARG]POST[]. The IGNORED argument makes recursion # easier, and must be supplied rather than implicit. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([_m4_foreach], [m4_if([$#], [3], [], [$1[$4]$2[]$0([$1], [$2], m4_shift3($@))])]) # m4_foreach_w(VARIABLE, LIST, EXPRESSION) # ---------------------------------------- # Like m4_foreach, but the list is whitespace separated. Depending on # EXPRESSION, it may be more efficient to use m4_map_args_w. # # This macro is robust to active symbols: # m4_foreach_w([Var], [ active # b act\ # ive ], [-Var-])end # => -active--b--active-end # # This used to use a slower implementation based on m4_foreach: # m4_foreach([$1], m4_split(m4_normalize([$2]), [ ]), [$3]) m4_define([m4_foreach_w], [m4_pushdef([$1])m4_map_args_w([$2], [m4_define([$1],], [)$3])m4_popdef([$1])]) # m4_map(MACRO, LIST) # m4_mapall(MACRO, LIST) # ---------------------- # Invoke MACRO($1), MACRO($2) etc. where $1, $2... are the elements of # LIST. $1, $2... must in turn be lists, appropriate for m4_apply. # If LIST contains an empty sublist, m4_map skips the expansion of # MACRO, while m4_mapall expands MACRO with no arguments. # # Since LIST may be quite large, we want to minimize how often it # appears in the expansion. Rather than use m4_car/m4_cdr iteration, # we unbox the list, and use _m4_foreach for iteration. For m4_map, # an empty list behaves like an empty sublist and gets ignored; for # m4_mapall, we must special-case the empty list. m4_define([m4_map], [_m4_foreach([_m4_apply([$1],], [)], [], $2)]) m4_define([m4_mapall], [m4_if([$2], [], [], [_m4_foreach([m4_apply([$1],], [)], [], $2)])]) # m4_map_sep(MACRO, [SEPARATOR], LIST) # m4_mapall_sep(MACRO, [SEPARATOR], LIST) # --------------------------------------- # Invoke MACRO($1), SEPARATOR, MACRO($2), ..., MACRO($N) where $1, # $2... $N are the elements of LIST, and are in turn lists appropriate # for m4_apply. SEPARATOR is expanded, in order to allow the creation # of a list of arguments by using a single-quoted comma as the # separator. For each empty sublist, m4_map_sep skips the expansion # of MACRO and SEPARATOR, while m4_mapall_sep expands MACRO with no # arguments. # # For m4_mapall_sep, merely expand the first iteration without the # separator, then include separator as part of subsequent recursion; # but avoid extra expansion of LIST's side-effects via a helper macro. # For m4_map_sep, things are trickier - we don't know if the first # list element is an empty sublist, so we must define a self-modifying # helper macro and use that as the separator instead. m4_define([m4_map_sep], [m4_pushdef([m4_Sep], [m4_define([m4_Sep], _m4_defn([m4_unquote]))])]dnl [_m4_foreach([_m4_apply([m4_Sep([$2])[]$1],], [)], [], $3)m4_popdef([m4_Sep])]) m4_define([m4_mapall_sep], [m4_if([$3], [], [], [_$0([$1], [$2], $3)])]) m4_define([_m4_mapall_sep], [m4_apply([$1], [$3])_m4_foreach([m4_apply([$2[]$1],], [)], m4_shift2($@))]) # m4_map_args(EXPRESSION, ARG...) # ------------------------------- # Expand EXPRESSION([ARG]) for each argument. More efficient than # m4_foreach([var], [ARG...], [EXPRESSION(m4_defn([var]))]) # Shorthand for m4_map_args_sep([EXPRESSION(], [)], [], ARG...). m4_define([m4_map_args], [m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])], [$#], [1], [], [$#], [2], [$1([$2])[]], [_m4_foreach([$1(], [)], $@)])]) # m4_map_args_pair(EXPRESSION, [END-EXPR = EXPRESSION], ARG...) # ------------------------------------------------------------- # Perform a pairwise grouping of consecutive ARGs, by expanding # EXPRESSION([ARG1], [ARG2]). If there are an odd number of ARGs, the # final argument is expanded with END-EXPR([ARGn]). # # For example: # m4_define([show], [($*)m4_newline])dnl # m4_map_args_pair([show], [], [a], [b], [c], [d], [e])dnl # => (a,b) # => (c,d) # => (e) # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_map_args_pair], [m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])], [$#], [1], [m4_fatal([$0: too few arguments: $#: $1])], [$#], [2], [], [$#], [3], [m4_default([$2], [$1])([$3])[]], [$#], [4], [$1([$3], [$4])[]], [$1([$3], [$4])[]$0([$1], [$2], m4_shift(m4_shift3($@)))])]) # m4_map_args_sep([PRE], [POST], [SEP], ARG...) # --------------------------------------------- # Expand PRE[ARG]POST for each argument, with SEP between arguments. m4_define([m4_map_args_sep], [m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])], [$#], [1], [], [$#], [2], [], [$#], [3], [], [$#], [4], [$1[$4]$2[]], [$1[$4]$2[]_m4_foreach([$3[]$1], [$2], m4_shift3($@))])]) # m4_map_args_w(STRING, [PRE], [POST], [SEP]) # ------------------------------------------- # Perform the expansion of PRE[word]POST[] for each word in STRING # separated by whitespace. More efficient than: # m4_foreach_w([var], [STRING], [PRE[]m4_defn([var])POST]) # Additionally, expand SEP between words. # # As long as we have to use m4_bpatsubst to split the string, we might # as well make it also apply PRE and POST; this avoids iteration # altogether. But we must be careful of any \ in PRE or POST. # _m4_strip returns a quoted string, but that's okay, since it also # supplies an empty leading and trailing argument due to our # intentional whitespace around STRING. We use m4_substr to strip the # empty elements and remove the extra layer of quoting. m4_define([m4_map_args_w], [_$0(_m4_split([ ]m4_flatten([$1])[ ], [[ ]+], m4_if(m4_index([$2$3$4], [\]), [-1], [[$3[]$4[]$2]], [m4_bpatsubst([[$3[]$4[]$2]], [\\], [\\\\])])), m4_len([[]$3[]$4]), m4_len([$4[]$2[]]))]) m4_define([_m4_map_args_w], [m4_substr([$1], [$2], m4_eval(m4_len([$1]) - [$2] - [$3]))]) # m4_stack_foreach(MACRO, FUNC) # m4_stack_foreach_lifo(MACRO, FUNC) # ---------------------------------- # Pass each stacked definition of MACRO to the one-argument macro FUNC. # m4_stack_foreach proceeds in FIFO order, while m4_stack_foreach_lifo # processes the topmost definitions first. In addition, FUNC should # not push or pop definitions of MACRO, and should not expect anything about # the active definition of MACRO (it will not be the topmost, and may not # be the one passed to FUNC either). # # Some macros simply can't be examined with this method: namely, # anything involved in the implementation of _m4_stack_reverse. m4_define([m4_stack_foreach], [_m4_stack_reverse([$1], [m4_tmp-$1])]dnl [_m4_stack_reverse([m4_tmp-$1], [$1], [$2(_m4_defn([m4_tmp-$1]))])]) m4_define([m4_stack_foreach_lifo], [_m4_stack_reverse([$1], [m4_tmp-$1], [$2(_m4_defn([m4_tmp-$1]))])]dnl [_m4_stack_reverse([m4_tmp-$1], [$1])]) # m4_stack_foreach_sep(MACRO, [PRE], [POST], [SEP]) # m4_stack_foreach_sep_lifo(MACRO, [PRE], [POST], [SEP]) # ------------------------------------------------------ # Similar to m4_stack_foreach and m4_stack_foreach_lifo, in that every # definition of a pushdef stack will be visited. But rather than # passing the definition as a single argument to a macro, this variant # expands the concatenation of PRE[]definition[]POST, and expands SEP # between consecutive expansions. Note that m4_stack_foreach([a], [b]) # is equivalent to m4_stack_foreach_sep([a], [b(], [)]). m4_define([m4_stack_foreach_sep], [_m4_stack_reverse([$1], [m4_tmp-$1])]dnl [_m4_stack_reverse([m4_tmp-$1], [$1], [$2[]_m4_defn([m4_tmp-$1])$3], [$4[]])]) m4_define([m4_stack_foreach_sep_lifo], [_m4_stack_reverse([$1], [m4_tmp-$1], [$2[]_m4_defn([m4_tmp-$1])$3], [$4[]])]dnl [_m4_stack_reverse([m4_tmp-$1], [$1])]) # _m4_stack_reverse(OLD, NEW, [ACTION], [SEP]) # -------------------------------------------- # A recursive worker for pushdef stack manipulation. Destructively # copy the OLD stack into the NEW, and expanding ACTION for each # iteration. After the first iteration, SEP is promoted to the front # of ACTION (note that SEP should include a trailing [] if it is to # avoid interfering with ACTION). The current definition is examined # after the NEW has been pushed but before OLD has been popped; this # order is important, as ACTION is permitted to operate on either # _m4_defn([OLD]) or _m4_defn([NEW]). Since the operation is # destructive, this macro is generally used twice, with a temporary # macro name holding the swapped copy. m4_define([_m4_stack_reverse], [m4_ifdef([$1], [m4_pushdef([$2], _m4_defn([$1]))$3[]_m4_popdef([$1])$0([$1], [$2], [$4$3])])]) ## --------------------------- ## ## 9. More diversion support. ## ## --------------------------- ## # m4_cleardivert(DIVERSION-NAME...) # --------------------------------- # Discard any text in DIVERSION-NAME. # # This works even inside m4_expand. m4_define([m4_cleardivert], [m4_if([$#], [0], [m4_fatal([$0: missing argument])], [_m4_divert_raw([-1])m4_undivert($@)_m4_divert_raw( _m4_divert(_m4_defn([_m4_divert_diversion]), [-]))])]) # _m4_divert(DIVERSION-NAME or NUMBER, [NOWARN]) # ---------------------------------------------- # If DIVERSION-NAME is the name of a diversion, return its number, # otherwise if it is a NUMBER return it. Issue a warning about # the use of a number instead of a name, unless NOWARN is provided. m4_define([_m4_divert], [m4_ifdef([_m4_divert($1)], [m4_indir([_m4_divert($1)])], [m4_if([$2], [], [m4_warn([syntax], [prefer named diversions])])$1])]) # KILL is only used to suppress output. m4_define([_m4_divert(KILL)], -1) # The empty diversion name is a synonym for 0. m4_define([_m4_divert()], 0) # m4_divert_stack # --------------- # Print the diversion stack, if it's nonempty. The caller is # responsible for any leading or trailing newline. m4_define([m4_divert_stack], [m4_stack_foreach_sep_lifo([_m4_divert_stack], [], [], [ ])]) # m4_divert_stack_push(MACRO-NAME, DIVERSION-NAME) # ------------------------------------------------ # Form an entry of the diversion stack from caller MACRO-NAME and # entering DIVERSION-NAME and push it. m4_define([m4_divert_stack_push], [m4_pushdef([_m4_divert_stack], m4_location[: $1: $2])]) # m4_divert(DIVERSION-NAME) # ------------------------- # Change the diversion stream to DIVERSION-NAME. m4_define([m4_divert], [m4_popdef([_m4_divert_stack])]dnl [m4_define([_m4_divert_diversion], [$1])]dnl [m4_divert_stack_push([$0], [$1])]dnl [_m4_divert_raw(_m4_divert([$1]))]) # m4_divert_push(DIVERSION-NAME, [NOWARN]) # ---------------------------------------- # Change the diversion stream to DIVERSION-NAME, while stacking old values. # For internal use only: if NOWARN is not empty, DIVERSION-NAME can be a # number instead of a name. m4_define([m4_divert_push], [m4_divert_stack_push([$0], [$1])]dnl [m4_pushdef([_m4_divert_diversion], [$1])]dnl [_m4_divert_raw(_m4_divert([$1], [$2]))]) # m4_divert_pop([DIVERSION-NAME]) # ------------------------------- # Change the diversion stream to its previous value, unstacking it. # If specified, verify we left DIVERSION-NAME. # When we pop the last value from the stack, we divert to -1. m4_define([m4_divert_pop], [m4_if([$1], [], [], [$1], _m4_defn([_m4_divert_diversion]), [], [m4_fatal([$0($1): diversion mismatch: ]m4_divert_stack)])]dnl [_m4_popdef([_m4_divert_stack], [_m4_divert_diversion])]dnl [m4_ifdef([_m4_divert_diversion], [], [m4_fatal([too many m4_divert_pop])])]dnl [_m4_divert_raw(_m4_divert(_m4_defn([_m4_divert_diversion]), [-]))]) # m4_divert_text(DIVERSION-NAME, CONTENT) # --------------------------------------- # Output CONTENT into DIVERSION-NAME (which may be a number actually). # An end of line is appended for free to CONTENT. m4_define([m4_divert_text], [m4_divert_push([$1])$2 m4_divert_pop([$1])]) # m4_divert_once(DIVERSION-NAME, CONTENT) # --------------------------------------- # Output CONTENT into DIVERSION-NAME once, if not already there. # An end of line is appended for free to CONTENT. m4_define([m4_divert_once], [m4_expand_once([m4_divert_text([$1], [$2])])]) # _m4_divert_unsafe(DIVERSION-NAME) # --------------------------------- # Issue a warning that the attempt to change the current diversion to # DIVERSION-NAME is unsafe, because this macro is being expanded # during argument collection of m4_expand. m4_define([_m4_divert_unsafe], [m4_fatal([$0: cannot change diversion to `$1' inside m4_expand])]) # m4_undivert(DIVERSION-NAME...) # ------------------------------ # Undivert DIVERSION-NAME. Unlike the M4 version, this requires at # least one DIVERSION-NAME; also, due to support for named diversions, # this should not be used to undivert files. m4_define([m4_undivert], [m4_if([$#], [0], [m4_fatal([$0: missing argument])], [$#], [1], [_m4_undivert(_m4_divert([$1]))], [m4_map_args([$0], $@)])]) ## --------------------------------------------- ## ## 10. Defining macros with bells and whistles. ## ## --------------------------------------------- ## # `m4_defun' is basically `m4_define' but it equips the macro with the # needed machinery for `m4_require'. A macro must be m4_defun'd if # either it is m4_require'd, or it m4_require's. # # Two things deserve attention and are detailed below: # 1. Implementation of m4_require # 2. Keeping track of the expansion stack # # 1. Implementation of m4_require # =============================== # # Of course m4_defun calls m4_provide, so that a macro which has # been expanded is not expanded again when m4_require'd, but the # difficult part is the proper expansion of macros when they are # m4_require'd. # # The implementation is based on three ideas, (i) using diversions to # prepare the expansion of the macro and its dependencies (by Franc,ois # Pinard), (ii) expand the most recently m4_require'd macros _after_ # the previous macros (by Axel Thimm), and (iii) track instances of # provide before require (by Eric Blake). # # # The first idea: why use diversions? # ----------------------------------- # # When a macro requires another, the other macro is expanded in new # diversion, GROW. When the outer macro is fully expanded, we first # undivert the most nested diversions (GROW - 1...), and finally # undivert GROW. To understand why we need several diversions, # consider the following example: # # | m4_defun([TEST1], [Test...m4_require([TEST2])1]) # | m4_defun([TEST2], [Test...m4_require([TEST3])2]) # | m4_defun([TEST3], [Test...3]) # # Because m4_require is not required to be first in the outer macros, we # must keep the expansions of the various levels of m4_require separated. # Right before executing the epilogue of TEST1, we have: # # GROW - 2: Test...3 # GROW - 1: Test...2 # GROW: Test...1 # BODY: # # Finally the epilogue of TEST1 undiverts GROW - 2, GROW - 1, and # GROW into the regular flow, BODY. # # GROW - 2: # GROW - 1: # GROW: # BODY: Test...3; Test...2; Test...1 # # (The semicolons are here for clarification, but of course are not # emitted.) This is what Autoconf 2.0 (I think) to 2.13 (I'm sure) # implement. # # # The second idea: first required first out # ----------------------------------------- # # The natural implementation of the idea above is buggy and produces # very surprising results in some situations. Let's consider the # following example to explain the bug: # # | m4_defun([TEST1], [m4_require([TEST2a])m4_require([TEST2b])]) # | m4_defun([TEST2a], []) # | m4_defun([TEST2b], [m4_require([TEST3])]) # | m4_defun([TEST3], [m4_require([TEST2a])]) # | # | AC_INIT # | TEST1 # # The dependencies between the macros are: # # 3 --- 2b # / \ is m4_require'd by # / \ left -------------------- right # 2a ------------ 1 # # If you strictly apply the rules given in the previous section you get: # # GROW - 2: TEST3 # GROW - 1: TEST2a; TEST2b # GROW: TEST1 # BODY: # # (TEST2a, although required by TEST3 is not expanded in GROW - 3 # because is has already been expanded before in GROW - 1, so it has # been AC_PROVIDE'd, so it is not expanded again) so when you undivert # the stack of diversions, you get: # # GROW - 2: # GROW - 1: # GROW: # BODY: TEST3; TEST2a; TEST2b; TEST1 # # i.e., TEST2a is expanded after TEST3 although the latter required the # former. # # Starting from 2.50, we use an implementation provided by Axel Thimm. # The idea is simple: the order in which macros are emitted must be the # same as the one in which macros are expanded. (The bug above can # indeed be described as: a macro has been m4_provide'd before its # dependent, but it is emitted after: the lack of correlation between # emission and expansion order is guilty). # # How to do that? You keep the stack of diversions to elaborate the # macros, but each time a macro is fully expanded, emit it immediately. # # In the example above, when TEST2a is expanded, but it's epilogue is # not run yet, you have: # # GROW - 2: # GROW - 1: TEST2a # GROW: Elaboration of TEST1 # BODY: # # The epilogue of TEST2a emits it immediately: # # GROW - 2: # GROW - 1: # GROW: Elaboration of TEST1 # BODY: TEST2a # # TEST2b then requires TEST3, so right before the epilogue of TEST3, you # have: # # GROW - 2: TEST3 # GROW - 1: Elaboration of TEST2b # GROW: Elaboration of TEST1 # BODY: TEST2a # # The epilogue of TEST3 emits it: # # GROW - 2: # GROW - 1: Elaboration of TEST2b # GROW: Elaboration of TEST1 # BODY: TEST2a; TEST3 # # TEST2b is now completely expanded, and emitted: # # GROW - 2: # GROW - 1: # GROW: Elaboration of TEST1 # BODY: TEST2a; TEST3; TEST2b # # and finally, TEST1 is finished and emitted: # # GROW - 2: # GROW - 1: # GROW: # BODY: TEST2a; TEST3; TEST2b: TEST1 # # The idea is simple, but the implementation is a bit involved. If # you are like me, you will want to see the actual functioning of this # implementation to be convinced. The next section gives the full # details. # # # The Axel Thimm implementation at work # ------------------------------------- # # We consider the macros above, and this configure.ac: # # AC_INIT # TEST1 # # You should keep the definitions of _m4_defun_pro, _m4_defun_epi, and # m4_require at hand to follow the steps. # # This implementation tries not to assume that the current diversion is # BODY, so as soon as a macro (m4_defun'd) is expanded, we first # record the current diversion under the name _m4_divert_dump (denoted # DUMP below for short). This introduces an important difference with # the previous versions of Autoconf: you cannot use m4_require if you # are not inside an m4_defun'd macro, and especially, you cannot # m4_require directly from the top level. # # We have not tried to simulate the old behavior (better yet, we # diagnose it), because it is too dangerous: a macro m4_require'd from # the top level is expanded before the body of `configure', i.e., before # any other test was run. I let you imagine the result of requiring # AC_STDC_HEADERS for instance, before AC_PROG_CC was actually run.... # # After AC_INIT was run, the current diversion is BODY. # * AC_INIT was run # DUMP: undefined # diversion stack: BODY |- # # * TEST1 is expanded # The prologue of TEST1 sets _m4_divert_dump, which is the diversion # where the current elaboration will be dumped, to the current # diversion. It also m4_divert_push to GROW, where the full # expansion of TEST1 and its dependencies will be elaborated. # DUMP: BODY # BODY: empty # diversions: GROW, BODY |- # # * TEST1 requires TEST2a # _m4_require_call m4_divert_pushes another temporary diversion, # GROW - 1, and expands TEST2a in there. # DUMP: BODY # BODY: empty # GROW - 1: TEST2a # diversions: GROW - 1, GROW, BODY |- # Then the content of the temporary diversion is moved to DUMP and the # temporary diversion is popped. # DUMP: BODY # BODY: TEST2a # diversions: GROW, BODY |- # # * TEST1 requires TEST2b # Again, _m4_require_call pushes GROW - 1 and heads to expand TEST2b. # DUMP: BODY # BODY: TEST2a # diversions: GROW - 1, GROW, BODY |- # # * TEST2b requires TEST3 # _m4_require_call pushes GROW - 2 and expands TEST3 here. # (TEST3 requires TEST2a, but TEST2a has already been m4_provide'd, so # nothing happens.) # DUMP: BODY # BODY: TEST2a # GROW - 2: TEST3 # diversions: GROW - 2, GROW - 1, GROW, BODY |- # Then the diversion is appended to DUMP, and popped. # DUMP: BODY # BODY: TEST2a; TEST3 # diversions: GROW - 1, GROW, BODY |- # # * TEST1 requires TEST2b (contd.) # The content of TEST2b is expanded... # DUMP: BODY # BODY: TEST2a; TEST3 # GROW - 1: TEST2b, # diversions: GROW - 1, GROW, BODY |- # ... and moved to DUMP. # DUMP: BODY # BODY: TEST2a; TEST3; TEST2b # diversions: GROW, BODY |- # # * TEST1 is expanded: epilogue # TEST1's own content is in GROW... # DUMP: BODY # BODY: TEST2a; TEST3; TEST2b # GROW: TEST1 # diversions: BODY |- # ... and it's epilogue moves it to DUMP and then undefines DUMP. # DUMP: undefined # BODY: TEST2a; TEST3; TEST2b; TEST1 # diversions: BODY |- # # # The third idea: track macros provided before they were required # --------------------------------------------------------------- # # Using just the first two ideas, Autoconf 2.50 through 2.63 still had # a subtle bug for more than seven years. Let's consider the # following example to explain the bug: # # | m4_defun([TEST1], [1]) # | m4_defun([TEST2], [2[]m4_require([TEST1])]) # | m4_defun([TEST3], [3 TEST1 m4_require([TEST2])]) # | TEST3 # # After the prologue of TEST3, we are collecting text in GROW with the # intent of dumping it in BODY during the epilogue. Next, we # encounter the direct invocation of TEST1, which provides the macro # in place in GROW. From there, we encounter a requirement for TEST2, # which must be collected in a new diversion. While expanding TEST2, # we encounter a requirement for TEST1, but since it has already been # expanded, the Axel Thimm algorithm states that we can treat it as a # no-op. But that would lead to an end result of `2 3 1', meaning # that we have once again output a macro (TEST2) prior to its # requirements (TEST1). # # The problem can only occur if a single defun'd macro first provides, # then later indirectly requires, the same macro. Note that directly # expanding then requiring a macro is okay: because the dependency was # met, the require phase can be a no-op. For that matter, the outer # macro can even require two helpers, where the first helper expands # the macro, and the second helper indirectly requires the macro. # Out-of-order expansion is only present if the inner macro is # required by something that will be hoisted in front of where the # direct expansion occurred. In other words, we must be careful not # to warn on: # # | m4_defun([TEST4], [4]) # | m4_defun([TEST5], [5 TEST4 m4_require([TEST4])]) # | TEST5 => 5 4 # # or even the more complex: # # | m4_defun([TEST6], [6]) # | m4_defun([TEST7], [7 TEST6]) # | m4_defun([TEST8], [8 m4_require([TEST6])]) # | m4_defun([TEST9], [9 m4_require([TEST8])]) # | m4_defun([TEST10], [10 m4_require([TEST7]) m4_require([TEST9])]) # | TEST10 => 7 6 8 9 10 # # So, to detect whether a require was direct or indirect, m4_defun and # m4_require track the name of the macro that caused a diversion to be # created (using the stack _m4_diverting, coupled with an O(1) lookup # _m4_diverting([NAME])), and m4_provide stores the name associated # with the diversion at which a macro was provided. A require call is # direct if it occurs within the same diversion where the macro was # provided, or if the diversion associated with the providing context # has been collected. # # The implementation of the warning involves tracking the set of # macros which have been provided since the start of the outermost # defun'd macro (the set is named _m4_provide). When starting an # outermost macro, the set is emptied; when a macro is provided, it is # added to the set; when require expands the body of a macro, it is # removed from the set; and when a macro is indirectly required, the # set is checked. If a macro is in the set, then it has been provided # before it was required, and we satisfy dependencies by expanding the # macro as if it had never been provided; in the example given above, # this means we now output `1 2 3 1'. Meanwhile, a warning is issued # to inform the user that her macros trigger the bug in older autoconf # versions, and that her output file now contains redundant contents # (and possibly new problems, if the repeated macro was not # idempotent). Meanwhile, macros defined by m4_defun_once instead of # m4_defun are idempotent, avoiding any warning or duplicate output. # # # 2. Keeping track of the expansion stack # ======================================= # # When M4 expansion goes wrong it is often extremely hard to find the # path amongst macros that drove to the failure. What is needed is # the stack of macro `calls'. One could imagine that GNU M4 would # maintain a stack of macro expansions, unfortunately it doesn't, so # we do it by hand. This is of course extremely costly, but the help # this stack provides is worth it. Nevertheless to limit the # performance penalty this is implemented only for m4_defun'd macros, # not for define'd macros. # # Each time we enter an m4_defun'd macros, we add a definition in # _m4_expansion_stack, and when we exit the macro, we remove it (thanks # to pushdef/popdef). m4_stack_foreach is used to print the expansion # stack in the rare cases when it's needed. # # In addition, we want to detect circular m4_require dependencies. # Each time we expand a macro FOO we define _m4_expanding(FOO); and # m4_require(BAR) simply checks whether _m4_expanding(BAR) is defined. # m4_expansion_stack # ------------------ # Expands to the entire contents of the expansion stack. The caller # must supply a trailing newline. This macro always prints a # location; check whether _m4_expansion_stack is defined to filter out # the case when no defun'd macro is in force. m4_define([m4_expansion_stack], [m4_stack_foreach_sep_lifo([_$0], [_$0_entry(], [) ])m4_location[: the top level]]) # _m4_expansion_stack_entry(MACRO) # -------------------------------- # Format an entry for MACRO found on the expansion stack. m4_define([_m4_expansion_stack_entry], [_m4_defn([m4_location($1)])[: $1 is expanded from...]]) # m4_expansion_stack_push(MACRO) # ------------------------------ # Form an entry of the expansion stack on entry to MACRO and push it. m4_define([m4_expansion_stack_push], [m4_pushdef([_m4_expansion_stack], [$1])]) # _m4_divert(GROW) # ---------------- # This diversion is used by the m4_defun/m4_require machinery. It is # important to keep room before GROW because for each nested # AC_REQUIRE we use an additional diversion (i.e., two m4_require's # will use GROW - 2. More than 3 levels has never seemed to be # needed.) # # ... # - GROW - 2 # m4_require'd code, 2 level deep # - GROW - 1 # m4_require'd code, 1 level deep # - GROW # m4_defun'd macros are elaborated here. m4_define([_m4_divert(GROW)], 10000) # _m4_defun_pro(MACRO-NAME) # ------------------------- # The prologue for Autoconf macros. # # This is called frequently, so minimize the number of macro invocations # by avoiding dnl and m4_defn overhead. m4_define([_m4_defun_pro], [m4_ifdef([_m4_expansion_stack], [], [_m4_defun_pro_outer([$1])])]dnl [m4_expansion_stack_push([$1])m4_pushdef([_m4_expanding($1)])]) m4_define([_m4_defun_pro_outer], [m4_set_delete([_m4_provide])]dnl [m4_pushdef([_m4_diverting([$1])])m4_pushdef([_m4_diverting], [$1])]dnl [m4_pushdef([_m4_divert_dump], m4_divnum)m4_divert_push([GROW])]) # _m4_defun_epi(MACRO-NAME) # ------------------------- # The Epilogue for Autoconf macros. MACRO-NAME only helps tracing # the PRO/EPI pairs. # # This is called frequently, so minimize the number of macro invocations # by avoiding dnl and m4_popdef overhead. m4_define([_m4_defun_epi], [_m4_popdef([_m4_expanding($1)], [_m4_expansion_stack])]dnl [m4_ifdef([_m4_expansion_stack], [], [_m4_defun_epi_outer([$1])])]dnl [m4_provide([$1])]) m4_define([_m4_defun_epi_outer], [_m4_popdef([_m4_divert_dump], [_m4_diverting([$1])], [_m4_diverting])]dnl [m4_divert_pop([GROW])m4_undivert([GROW])]) # _m4_divert_dump # --------------- # If blank, we are outside of any defun'd macro. Otherwise, expands # to the diversion number (not name) where require'd macros should be # moved once completed. m4_define([_m4_divert_dump]) # m4_divert_require(DIVERSION, NAME-TO-CHECK, [BODY-TO-EXPAND]) # ------------------------------------------------------------- # Same as m4_require, but BODY-TO-EXPAND goes into the named DIVERSION; # requirements still go in the current diversion though. # m4_define([m4_divert_require], [m4_ifdef([_m4_expanding($2)], [m4_fatal([$0: circular dependency of $2])])]dnl [m4_if(_m4_divert_dump, [], [m4_fatal([$0($2): cannot be used outside of an m4_defun'd macro])])]dnl [m4_provide_if([$2], [], [_m4_require_call([$2], [$3], _m4_divert([$1], [-]))])]) # m4_defun(NAME, EXPANSION, [MACRO = m4_define]) # ---------------------------------------------- # Define a macro NAME which automatically provides itself. Add # machinery so the macro automatically switches expansion to the # diversion stack if it is not already using it, prior to EXPANSION. # In this case, once finished, it will bring back all the code # accumulated in the diversion stack. This, combined with m4_require, # achieves the topological ordering of macros. We don't use this # macro to define some frequently called macros that are not involved # in ordering constraints, to save m4 processing. # # MACRO is an undocumented argument; when set to m4_pushdef, and NAME # is already defined, the new definition is added to the pushdef # stack, rather than overwriting the current definition. It can thus # be used to write self-modifying macros, which pop themselves to a # previously m4_define'd definition so that subsequent use of the # macro is faster. m4_define([m4_defun], [m4_define([m4_location($1)], m4_location)]dnl [m4_default([$3], [m4_define])([$1], [_m4_defun_pro(]m4_dquote($[0])[)$2[]_m4_defun_epi(]m4_dquote($[0])[)])]) # m4_defun_init(NAME, INIT, COMMON) # --------------------------------- # Like m4_defun, but split EXPANSION into two portions: INIT which is # done only the first time NAME is invoked, and COMMON which is # expanded every time. # # For now, the COMMON definition is always m4_define'd, giving an even # lighter-weight definition. m4_defun allows self-providing, but once # a macro is provided, m4_require no longer cares if it is m4_define'd # or m4_defun'd. m4_defun also provides location tracking to identify # dependency bugs, but once the INIT has been expanded, we know there # are no dependency bugs. However, if a future use needs COMMON to be # m4_defun'd, we can add a parameter, similar to the third parameter # to m4_defun. m4_define([m4_defun_init], [m4_define([$1], [$3[]])m4_defun([$1], [$2[]_m4_popdef(]m4_dquote($[0])[)m4_indir(]m4_dquote($[0])dnl [m4_if(]m4_dquote($[#])[, [0], [], ]m4_dquote([,$]@)[))], [m4_pushdef])]) # m4_defun_once(NAME, EXPANSION) # ------------------------------ # Like m4_defun, but guarantee that EXPANSION only happens once # (thereafter, using NAME is a no-op). # # If _m4_divert_dump is empty, we are called at the top level; # otherwise, we must ensure that we are required in front of the # current defun'd macro. Use a helper macro so that EXPANSION need # only occur once in the definition of NAME, since it might be large. m4_define([m4_defun_once], [m4_define([m4_location($1)], m4_location)]dnl [m4_define([$1], [_m4_defun_once([$1], [$2], m4_if(_m4_divert_dump, [], [[_m4_defun_pro([$1])m4_unquote(], [)_m4_defun_epi([$1])]], m4_ifdef([_m4_diverting([$1])], [-]), [-], [[m4_unquote(], [)]], [[_m4_require_call([$1],], [, _m4_divert_dump)]]))])]) m4_define([_m4_defun_once], [m4_pushdef([$1])$3[$2[]m4_provide([$1])]$4]) # m4_pattern_forbid(ERE, [WHY]) # ----------------------------- # Declare that no token matching the forbidden perl extended regular # expression ERE should be seen in the output unless... m4_define([m4_pattern_forbid], []) # m4_pattern_allow(ERE) # --------------------- # ... that token also matches the allowed extended regular expression ERE. # Both used via traces, by autom4te post-processing. m4_define([m4_pattern_allow], []) ## --------------------------------- ## ## 11. Dependencies between macros. ## ## --------------------------------- ## # m4_before(THIS-MACRO-NAME, CALLED-MACRO-NAME) # --------------------------------------------- # Issue a warning if CALLED-MACRO-NAME was called before THIS-MACRO-NAME. m4_define([m4_before], [m4_provide_if([$2], [m4_warn([syntax], [$2 was called before $1])])]) # m4_require(NAME-TO-CHECK, [BODY-TO-EXPAND = NAME-TO-CHECK]) # ----------------------------------------------------------- # If NAME-TO-CHECK has never been expanded (actually, if it is not # m4_provide'd), expand BODY-TO-EXPAND *before* the current macro # expansion; follow the expansion with a newline. Once expanded, emit # it in _m4_divert_dump. Keep track of the m4_require chain in # _m4_expansion_stack. # # The normal cases are: # # - NAME-TO-CHECK == BODY-TO-EXPAND # Which you can use for regular macros with or without arguments, e.g., # m4_require([AC_PROG_CC], [AC_PROG_CC]) # m4_require([AC_CHECK_HEADERS(threads.h)], [AC_CHECK_HEADERS(threads.h)]) # which is just the same as # m4_require([AC_PROG_CC]) # m4_require([AC_CHECK_HEADERS(threads.h)]) # # - BODY-TO-EXPAND == m4_indir([NAME-TO-CHECK]) # In the case of macros with irregular names. For instance: # m4_require([AC_LANG_COMPILER(C)], [indir([AC_LANG_COMPILER(C)])]) # which means `if the macro named `AC_LANG_COMPILER(C)' (the parens are # part of the name, it is not an argument) has not been run, then # call it.' # Had you used # m4_require([AC_LANG_COMPILER(C)], [AC_LANG_COMPILER(C)]) # then m4_require would have tried to expand `AC_LANG_COMPILER(C)', i.e., # call the macro `AC_LANG_COMPILER' with `C' as argument. # # You could argue that `AC_LANG_COMPILER', when it receives an argument # such as `C' should dispatch the call to `AC_LANG_COMPILER(C)'. But this # `extension' prevents `AC_LANG_COMPILER' from having actual arguments that # it passes to `AC_LANG_COMPILER(C)'. # # This is called frequently, so minimize the number of macro invocations # by avoiding dnl and other overhead on the common path. m4_define([m4_require], [m4_ifdef([_m4_expanding($1)], [m4_fatal([$0: circular dependency of $1])])]dnl [m4_if(_m4_divert_dump, [], [m4_fatal([$0($1): cannot be used outside of an ]dnl m4_if([$0], [m4_require], [[m4_defun]], [[AC_DEFUN]])['d macro])])]dnl [m4_provide_if([$1], [m4_set_contains([_m4_provide], [$1], [_m4_require_check([$1], _m4_defn([m4_provide($1)]), [$0])], [m4_ignore])], [_m4_require_call])([$1], [$2], _m4_divert_dump)]) # _m4_require_call(NAME-TO-CHECK, [BODY-TO-EXPAND = NAME-TO-CHECK], # DIVERSION-NUMBER) # ----------------------------------------------------------------- # If m4_require decides to expand the body, it calls this macro. The # expansion is placed in DIVERSION-NUMBER. # # This is called frequently, so minimize the number of macro invocations # by avoiding dnl and other overhead on the common path. # The use of a witness macro protecting the warning allows aclocal # to silence any warnings when probing for what macros are required # and must therefore be located, when using the Autoconf-without-aclocal-m4 # autom4te language. For more background, see: # https://lists.gnu.org/archive/html/automake-patches/2012-11/msg00035.html m4_define([_m4_require_call], [m4_pushdef([_m4_divert_grow], m4_decr(_m4_divert_grow))]dnl [m4_pushdef([_m4_diverting([$1])])m4_pushdef([_m4_diverting], [$1])]dnl [m4_divert_push(_m4_divert_grow, [-])]dnl [m4_if([$2], [], [$1], [$2]) m4_provide_if([$1], [m4_set_remove([_m4_provide], [$1])], [m4_ifndef([m4_require_silent_probe], [m4_warn([syntax], [$1 is m4_require'd but not m4_defun'd])])])]dnl [_m4_divert_raw($3)_m4_undivert(_m4_divert_grow)]dnl [m4_divert_pop(_m4_divert_grow)_m4_popdef([_m4_divert_grow], [_m4_diverting([$1])], [_m4_diverting])]) # _m4_require_check(NAME-TO-CHECK, OWNER, CALLER) # ----------------------------------------------- # NAME-TO-CHECK has been identified as previously expanded in the # diversion owned by OWNER. If this is a problem, warn on behalf of # CALLER and return _m4_require_call; otherwise return m4_ignore. m4_define([_m4_require_check], [m4_if(_m4_defn([_m4_diverting]), [$2], [m4_ignore], m4_ifdef([_m4_diverting([$2])], [-]), [-], [m4_warn([syntax], [$3: `$1' was expanded before it was required https://www.gnu.org/software/autoconf/manual/autoconf.html#Expanded-Before-Required])_m4_require_call], [m4_ignore])]) # _m4_divert_grow # --------------- # The counter for _m4_require_call. m4_define([_m4_divert_grow], _m4_divert([GROW])) # m4_expand_once(TEXT, [WITNESS = TEXT]) # -------------------------------------- # If TEXT has never been expanded, expand it *here*. Use WITNESS as # as a memory that TEXT has already been expanded. m4_define([m4_expand_once], [m4_provide_if(m4_default_quoted([$2], [$1]), [], [m4_provide(m4_default_quoted([$2], [$1]))[]$1])]) # m4_provide(MACRO-NAME) # ---------------------- m4_define([m4_provide], [m4_ifdef([m4_provide($1)], [], [m4_set_add([_m4_provide], [$1], [m4_define([m4_provide($1)], m4_ifdef([_m4_diverting], [_m4_defn([_m4_diverting])]))])])]) # m4_provide_if(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) # ------------------------------------------------------- # If MACRO-NAME is provided do IF-PROVIDED, else IF-NOT-PROVIDED. # The purpose of this macro is to provide the user with a means to # check macros which are provided without letting her know how the # information is coded. m4_define([m4_provide_if], [m4_ifdef([m4_provide($1)], [$2], [$3])]) ## --------------------- ## ## 12. Text processing. ## ## --------------------- ## # m4_cr_letters # m4_cr_LETTERS # m4_cr_Letters # ------------- m4_define([m4_cr_letters], [abcdefghijklmnopqrstuvwxyz]) m4_define([m4_cr_LETTERS], [ABCDEFGHIJKLMNOPQRSTUVWXYZ]) m4_define([m4_cr_Letters], m4_defn([m4_cr_letters])dnl m4_defn([m4_cr_LETTERS])dnl ) # m4_cr_digits # ------------ m4_define([m4_cr_digits], [0123456789]) # m4_cr_alnum # ----------- m4_define([m4_cr_alnum], m4_defn([m4_cr_Letters])dnl m4_defn([m4_cr_digits])dnl ) # m4_cr_symbols1 # m4_cr_symbols2 # -------------- m4_define([m4_cr_symbols1], m4_defn([m4_cr_Letters])dnl _) m4_define([m4_cr_symbols2], m4_defn([m4_cr_symbols1])dnl m4_defn([m4_cr_digits])dnl ) # m4_cr_all # --------- # The character range representing everything, with `-' as the last # character, since it is special to m4_translit. Use with care, because # it contains characters special to M4 (fortunately, both ASCII and EBCDIC # have [] in order, so m4_defn([m4_cr_all]) remains a valid string). It # also contains characters special to terminals, so it should never be # displayed in an error message. Also, attempts to map [ and ] to other # characters via m4_translit must deal with the fact that m4_translit does # not add quotes to the output. # # In EBCDIC, $ is immediately followed by *, which leads to problems # if m4_cr_all is inlined into a macro definition; so swap them. # # It is mainly useful in generating inverted character range maps, for use # in places where m4_translit is faster than an equivalent m4_bpatsubst; # the regex `[^a-z]' is equivalent to: # m4_translit(m4_dquote(m4_defn([m4_cr_all])), [a-z]) m4_define([m4_cr_all], m4_translit(m4_dquote(m4_format(m4_dquote(m4_for( ,1,255,,[[%c]]))m4_for([i],1,255,,[,i]))), [$*-], [*$])-) # _m4_define_cr_not(CATEGORY) # --------------------------- # Define m4_cr_not_CATEGORY as the inverse of m4_cr_CATEGORY. m4_define([_m4_define_cr_not], [m4_define([m4_cr_not_$1], m4_translit(m4_dquote(m4_defn([m4_cr_all])), m4_defn([m4_cr_$1])))]) # m4_cr_not_letters # m4_cr_not_LETTERS # m4_cr_not_Letters # m4_cr_not_digits # m4_cr_not_alnum # m4_cr_not_symbols1 # m4_cr_not_symbols2 # ------------------ # Inverse character sets _m4_define_cr_not([letters]) _m4_define_cr_not([LETTERS]) _m4_define_cr_not([Letters]) _m4_define_cr_not([digits]) _m4_define_cr_not([alnum]) _m4_define_cr_not([symbols1]) _m4_define_cr_not([symbols2]) # m4_newline([STRING]) # -------------------- # Expands to a newline, possibly followed by STRING. Exists mostly for # formatting reasons. m4_define([m4_newline], [ $1]) # m4_re_escape(STRING) # -------------------- # Escape RE active characters in STRING. m4_define([m4_re_escape], [m4_bpatsubst([$1], [[][*+.?\^$]], [\\\&])]) # m4_re_string # ------------ # Regexp for `[a-zA-Z_0-9]*' # m4_dquote provides literal [] for the character class. m4_define([m4_re_string], m4_dquote(m4_defn([m4_cr_symbols2]))dnl [*]dnl ) # m4_re_word # ---------- # Regexp for `[a-zA-Z_][a-zA-Z_0-9]*' m4_define([m4_re_word], m4_dquote(m4_defn([m4_cr_symbols1]))dnl m4_defn([m4_re_string])dnl ) # m4_tolower(STRING) # m4_toupper(STRING) # ------------------ # These macros convert STRING to lowercase or uppercase. # # Rather than expand the m4_defn each time, we inline them up front. m4_define([m4_tolower], [m4_translit([[$1]], ]m4_dquote(m4_defn([m4_cr_LETTERS]))[, ]m4_dquote(m4_defn([m4_cr_letters]))[)]) m4_define([m4_toupper], [m4_translit([[$1]], ]m4_dquote(m4_defn([m4_cr_letters]))[, ]m4_dquote(m4_defn([m4_cr_LETTERS]))[)]) # m4_split(STRING, [REGEXP]) # -------------------------- # Split STRING into an m4 list of quoted elements. The elements are # quoted with [ and ]. Beginning spaces and end spaces *are kept*. # Use m4_strip to remove them. # # REGEXP specifies where to split. Default is [\t ]+. # # If STRING is empty, the result is an empty list. # # Pay attention to the m4_changequotes. When m4 reads the definition of # m4_split, it still has quotes set to [ and ]. Luckily, these are matched # in the macro body, so the definition is stored correctly. Use the same # alternate quotes as m4_noquote; it must be unlikely to appear in $1. # # Also, notice that $1 is quoted twice, since we want the result to # be quoted. Then you should understand that the argument of # patsubst is -=<{(STRING)}>=- (i.e., with additional -=<{( and )}>=-). # # This macro is safe on active symbols, i.e.: # m4_define(active, ACTIVE) # m4_split([active active ])end # => [active], [active], []end # # Optimize on regex of ` ' (space), since m4_foreach_w already guarantees # that the list contains single space separators, and a common case is # splitting a single-element list. This macro is called frequently, # so avoid unnecessary dnl inside the definition. m4_define([m4_split], [m4_if([$1], [], [], [$2], [ ], [m4_if(m4_index([$1], [ ]), [-1], [[[$1]]], [_$0([$1], [$2], [, ])])], [$2], [], [_$0([$1], [[ ]+], [, ])], [_$0([$1], [$2], [, ])])]) m4_define([_m4_split], [m4_changequote([-=<{(],[)}>=-])]dnl [[m4_bpatsubst(-=<{(-=<{($1)}>=-)}>=-, -=<{($2)}>=-, -=<{(]$3[)}>=-)]m4_changequote([, ])]) # m4_chomp(STRING) # m4_chomp_all(STRING) # -------------------- # Return STRING quoted, but without a trailing newline. m4_chomp # removes at most one newline, while m4_chomp_all removes all # consecutive trailing newlines. Embedded newlines are not touched, # and a trailing backslash-newline leaves just a trailing backslash. # # m4_bregexp is slower than m4_index, and we don't always want to # remove all newlines; hence the two variants. We massage characters # to give a nicer pattern to match, particularly since m4_bregexp is # line-oriented. Both versions must guarantee a match, to avoid bugs # with precision -1 in m4_format in older m4. m4_define([m4_chomp], [m4_format([[%.*s]], m4_index(m4_translit([[$1]], [ /.], [/ ])[./.], [/.]), [$1])]) m4_define([m4_chomp_all], [m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [ /], [/ ]), [/*$]), [$1])]) # m4_flatten(STRING) # ------------------ # If STRING contains end of lines, replace them with spaces. If there # are backslashed end of lines, remove them. This macro is safe with # active symbols. # m4_define(active, ACTIVE) # m4_flatten([active # act\ # ive])end # => active activeend # # In m4, m4_bpatsubst is expensive, so first check for a newline. m4_define([m4_flatten], [m4_if(m4_index([$1], [ ]), [-1], [[$1]], [m4_translit(m4_bpatsubst([[[$1]]], [\\ ]), [ ], [ ])])]) # m4_strip(STRING) # ---------------- # Expands into STRING with tabs and spaces singled out into a single # space, and removing leading and trailing spaces. # # This macro is robust to active symbols. # m4_define(active, ACTIVE) # m4_strip([ active <tab> <tab>active ])end # => active activeend # # First, notice that we guarantee trailing space. Why? Because regular # expressions are greedy, and `.* ?' would always group the space into the # .* portion. The algorithm is simpler by avoiding `?' at the end. The # algorithm correctly strips everything if STRING is just ` '. # # Then notice the second pattern: it is in charge of removing the # leading/trailing spaces. Why not just `[^ ]'? Because they are # applied to over-quoted strings, i.e. more or less [STRING], due # to the limitations of m4_bpatsubsts. So the leading space in STRING # is the *second* character; equally for the trailing space. m4_define([m4_strip], [m4_bpatsubsts([$1 ], [[ ]+], [ ], [^. ?\(.*\) .$], [[[\1]]])]) # m4_normalize(STRING) # -------------------- # Apply m4_flatten and m4_strip to STRING. # # The argument is quoted, so that the macro is robust to active symbols: # # m4_define(active, ACTIVE) # m4_normalize([ act\ # ive # active ])end # => active activeend m4_define([m4_normalize], [m4_strip(m4_flatten([$1]))]) # m4_join(SEP, ARG1, ARG2...) # --------------------------- # Produce ARG1SEPARG2...SEPARGn. Avoid back-to-back SEP when a given ARG # is the empty string. No expansion is performed on SEP or ARGs. # # Since the number of arguments to join can be arbitrarily long, we # want to avoid having more than one $@ in the macro definition; # otherwise, the expansion would require twice the memory of the already # long list. Hence, m4_join merely looks for the first non-empty element, # and outputs just that element; while _m4_join looks for all non-empty # elements, and outputs them following a separator. The final trick to # note is that we decide between recursing with $0 or _$0 based on the # nested m4_if ending with `_'. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_join], [m4_if([$#], [1], [], [$#], [2], [[$2]], [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift2($@))])]) m4_define([_m4_join], [m4_if([$#$2], [2], [], [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift2($@))])]) # m4_joinall(SEP, ARG1, ARG2...) # ------------------------------ # Produce ARG1SEPARG2...SEPARGn. An empty ARG results in back-to-back SEP. # No expansion is performed on SEP or ARGs. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_joinall], [[$2]_$0([$1], m4_shift($@))]) m4_define([_m4_joinall], [m4_if([$#], [2], [], [[$1$3]$0([$1], m4_shift2($@))])]) # m4_combine([SEPARATOR], PREFIX-LIST, [INFIX], SUFFIX...) # -------------------------------------------------------- # Produce the pairwise combination of every element in the quoted, # comma-separated PREFIX-LIST with every element from the SUFFIX arguments. # Each pair is joined with INFIX, and pairs are separated by SEPARATOR. # No expansion occurs on SEPARATOR, INFIX, or elements of either list. # # For example: # m4_combine([, ], [[a], [b], [c]], [-], [1], [2], [3]) # => a-1, a-2, a-3, b-1, b-2, b-3, c-1, c-2, c-3 # # This definition is a bit hairy; the thing to realize is that we want # to construct m4_map_args_sep([[prefix$3]], [], [[$1]], m4_shift3($@)) # as the inner loop, using each prefix generated by the outer loop, # and without recalculating m4_shift3 every outer iteration. m4_define([m4_combine], [m4_if([$2], [], [], m4_eval([$# > 3]), [1], [m4_map_args_sep([m4_map_args_sep(m4_dquote(], [)[[$3]], [], [[$1]],]]]dnl [m4_dquote(m4_dquote(m4_shift3($@)))[[)], [[$1]], $2)])]) # m4_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ # Redefine MACRO-NAME to hold its former content plus `SEPARATOR`'STRING' # at the end. It is valid to use this macro with MACRO-NAME undefined, # in which case no SEPARATOR is added. Be aware that the criterion is # `not being defined', and not `not being empty'. # # Note that neither STRING nor SEPARATOR are expanded here; rather, when # you expand MACRO-NAME, they will be expanded at that point in time. # # This macro is robust to active symbols. It can be used to grow # strings. # # | m4_define(active, ACTIVE)dnl # | m4_append([sentence], [This is an])dnl # | m4_append([sentence], [ active ])dnl # | m4_append([sentence], [symbol.])dnl # | sentence # | m4_undefine([active])dnl # | sentence # => This is an ACTIVE symbol. # => This is an active symbol. # # It can be used to define hooks. # # | m4_define(active, ACTIVE)dnl # | m4_append([hooks], [m4_define([act1], [act2])])dnl # | m4_append([hooks], [m4_define([act2], [active])])dnl # | m4_undefine([active])dnl # | act1 # | hooks # | act1 # => act1 # => # => active # # It can also be used to create lists, although this particular usage was # broken prior to autoconf 2.62. # | m4_append([list], [one], [, ])dnl # | m4_append([list], [two], [, ])dnl # | m4_append([list], [three], [, ])dnl # | list # | m4_dquote(list) # => one, two, three # => [one],[two],[three] # # Note that m4_append can benefit from amortized O(n) m4 behavior, if # the underlying m4 implementation is smart enough to avoid copying existing # contents when enlarging a macro's definition into any pre-allocated storage # (m4 1.4.x unfortunately does not implement this optimization). We do # not implement m4_prepend, since it is inherently O(n^2) (pre-allocated # storage only occurs at the end of a macro, so the existing contents must # always be moved). # # Use _m4_defn for speed. m4_define([m4_append], [m4_define([$1], m4_ifdef([$1], [_m4_defn([$1])[$3]])[$2])]) # m4_append_uniq(MACRO-NAME, STRING, [SEPARATOR], [IF-UNIQ], [IF-DUP]) # -------------------------------------------------------------------- # Like `m4_append', but append only if not yet present. Additionally, # expand IF-UNIQ if STRING was appended, or IF-DUP if STRING was already # present. Also, warn if SEPARATOR is not empty and occurs within STRING, # as the algorithm no longer guarantees uniqueness. # # Note that while m4_append can be O(n) (depending on the quality of the # underlying M4 implementation), m4_append_uniq is inherently O(n^2) # because each append operation searches the entire string. m4_define([m4_append_uniq], [m4_ifval([$3], [m4_if(m4_index([$2], [$3]), [-1], [], [m4_warn([syntax], [$0: `$2' contains `$3'])])])_$0($@)]) m4_define([_m4_append_uniq], [m4_ifdef([$1], [m4_if(m4_index([$3]_m4_defn([$1])[$3], [$3$2$3]), [-1], [m4_append([$1], [$2], [$3])$4], [$5])], [m4_define([$1], [$2])$4])]) # m4_append_uniq_w(MACRO-NAME, STRINGS) # ------------------------------------- # For each of the words in the whitespace separated list STRINGS, append # only the unique strings to the definition of MACRO-NAME. # # Use _m4_defn for speed. m4_define([m4_append_uniq_w], [m4_map_args_w([$2], [_m4_append_uniq([$1],], [, [ ])])]) # m4_escape(STRING) # ----------------- # Output quoted STRING, but with embedded #, $, [ and ] turned into # quadrigraphs. # # It is faster to check if STRING is already good using m4_translit # than to blindly perform four m4_bpatsubst. # # Because the translit is stripping quotes, it must also neutralize # anything that might be in a macro name, as well as comments, commas, # and parentheses. All the problem characters are unified so that a # single m4_index can scan the result. # # Rather than expand m4_defn every time m4_escape is expanded, we # inline its expansion up front. m4_define([m4_escape], [m4_if(m4_index(m4_translit([$1], [[]#,()]]m4_dquote(m4_defn([m4_cr_symbols2]))[, [$$$]), [$]), [-1], [m4_echo], [_$0])([$1])]) m4_define([_m4_escape], [m4_changequote([-=<{(],[)}>=-])]dnl [m4_bpatsubst(m4_bpatsubst(m4_bpatsubst(m4_bpatsubst( -=<{(-=<{(-=<{(-=<{(-=<{($1)}>=-)}>=-)}>=-)}>=-)}>=-, -=<{(#)}>=-, -=<{(@%:@)}>=-), -=<{(\[)}>=-, -=<{(@<:@)}>=-), -=<{(\])}>=-, -=<{(@:>@)}>=-), -=<{(\$)}>=-, -=<{(@S|@)}>=-)m4_changequote([,])]) # m4_text_wrap(STRING, [PREFIX], [FIRST-PREFIX], [WIDTH]) # ------------------------------------------------------- # Expands into STRING wrapped to hold in WIDTH columns (default = 79). # If PREFIX is given, each line is prefixed with it. If FIRST-PREFIX is # specified, then the first line is prefixed with it. As a special case, # if the length of FIRST-PREFIX is greater than that of PREFIX, then # FIRST-PREFIX will be left alone on the first line. # # No expansion occurs on the contents STRING, PREFIX, or FIRST-PREFIX, # although quadrigraphs are correctly recognized. More precisely, # you may redefine m4_qlen to recognize whatever escape sequences that # you will post-process. # # Typical outputs are: # # m4_text_wrap([Short string */], [ ], [/* ], 20) # => /* Short string */ # # m4_text_wrap([Much longer string */], [ ], [/* ], 20) # => /* Much longer # => string */ # # m4_text_wrap([Short doc.], [ ], [ --short ], 30) # => --short Short doc. # # m4_text_wrap([Short doc.], [ ], [ --too-wide ], 30) # => --too-wide # => Short doc. # # m4_text_wrap([Super long documentation.], [ ], [ --too-wide ], 30) # => --too-wide # => Super long # => documentation. # # FIXME: there is no checking of a longer PREFIX than WIDTH, but do # we really want to bother with people trying each single corner # of a software? # # This macro does not leave a trailing space behind the last word of a line, # which complicates it a bit. The algorithm is otherwise stupid and simple: # all the words are preceded by m4_Separator which is defined to empty for # the first word, and then ` ' (single space) for all the others. # # The algorithm uses a helper that uses $2 through $4 directly, rather than # using local variables, to avoid m4_defn overhead, or expansion swallowing # any $. It also bypasses m4_popdef overhead with _m4_popdef since no user # macro expansion occurs in the meantime. Also, the definition is written # with m4_do, to avoid time wasted on dnl during expansion (since this is # already a time-consuming macro). m4_define([m4_text_wrap], [_$0(m4_escape([$1]), [$2], m4_default_quoted([$3], [$2]), m4_default_quoted([$4], [79]))]) m4_define([_m4_text_wrap], m4_do(dnl set up local variables, to avoid repeated calculations [[m4_pushdef([m4_Indent], m4_qlen([$2]))]], [[m4_pushdef([m4_Cursor], m4_qlen([$3]))]], [[m4_pushdef([m4_Separator], [m4_define([m4_Separator], [ ])])]], dnl expand the first prefix, then check its length vs. regular prefix dnl same length: nothing special dnl prefix1 longer: output on line by itself, and reset cursor dnl prefix1 shorter: pad to length of prefix, and reset cursor [[[$3]m4_cond([m4_Cursor], m4_Indent, [], [m4_eval(m4_Cursor > m4_Indent)], [1], [ [$2]m4_define([m4_Cursor], m4_Indent)], [m4_format([%*s], m4_max([0], m4_eval(m4_Indent - m4_Cursor)), [])m4_define([m4_Cursor], m4_Indent)])]], dnl now, for each word, compute the cursor after the word is output, then dnl check if the cursor would exceed the wrap column dnl if so, reset cursor, and insert newline and prefix dnl if not, insert the separator (usually a space) dnl either way, insert the word [[m4_map_args_w([$1], [$0_word(], [, [$2], [$4])])]], dnl finally, clean up the local variables [[_m4_popdef([m4_Separator], [m4_Cursor], [m4_Indent])]])) m4_define([_m4_text_wrap_word], [m4_define([m4_Cursor], m4_eval(m4_Cursor + m4_qlen([$1]) + 1))]dnl [m4_if(m4_eval(m4_Cursor > ([$3])), [1], [m4_define([m4_Cursor], m4_eval(m4_Indent + m4_qlen([$1]) + 1)) [$2]], [m4_Separator[]])[$1]]) # m4_text_box(MESSAGE, [FRAME-CHARACTER = `-']) # --------------------------------------------- # Turn MESSAGE into: # ## ------- ## # ## MESSAGE ## # ## ------- ## # using FRAME-CHARACTER in the border. # # Quadrigraphs are correctly recognized. More precisely, you may # redefine m4_qlen to recognize whatever escape sequences that you # will post-process. m4_define([m4_text_box], [m4_pushdef([m4_Border], m4_translit(m4_format([[[%*s]]], m4_decr(m4_qlen(_m4_expand([$1 ]))), []), [ ], m4_default_quoted([$2], [-])))]dnl [[##] _m4_defn([m4_Border]) [##] [##] $1 [##] [##] _m4_defn([m4_Border]) [##]_m4_popdef([m4_Border])]) # m4_qlen(STRING) # --------------- # Expands to the length of STRING after autom4te converts all quadrigraphs. # # If you use some other means of post-processing m4 output rather than # autom4te, then you may redefine this macro to recognize whatever # escape sequences your post-processor will handle. For that matter, # m4_define([m4_qlen], m4_defn([m4_len])) is sufficient if you don't # do any post-processing. # # Avoid bpatsubsts for the common case of no quadrigraphs. Cache # results, as configure scripts tend to ask about lengths of common # strings like `/*' and `*/' rather frequently. Minimize the number # of times that $1 occurs in m4_qlen, so there is less text to parse # on a cache hit. m4_define([m4_qlen], [m4_ifdef([$0-$1], [_m4_defn([$0-]], [_$0(])[$1])]) m4_define([_m4_qlen], [m4_define([m4_qlen-$1], m4_if(m4_index([$1], [@]), [-1], [m4_len([$1])], [m4_len(m4_bpatsubst([[$1]], [@\(\(<:\|:>\|S|\|%:\|\{:\|:\}\)\(@\)\|&t@\)], [\3]))]))_m4_defn([m4_qlen-$1])]) # m4_copyright_condense(TEXT) # --------------------------- # Condense the copyright notice in TEXT to only display the final # year, wrapping the results to fit in 80 columns. m4_define([m4_copyright_condense], [m4_text_wrap(m4_bpatsubst(m4_flatten([[$1]]), [(C)[- ,0-9]*\([1-9][0-9][0-9][0-9]\)], [(C) \1]))]) ## ----------------------- ## ## 13. Number processing. ## ## ----------------------- ## # m4_cmp(A, B) # ------------ # Compare two integer expressions. # A < B -> -1 # A = B -> 0 # A > B -> 1 m4_define([m4_cmp], [m4_eval((([$1]) > ([$2])) - (([$1]) < ([$2])))]) # m4_list_cmp(A, B) # ----------------- # # Compare the two lists of integer expressions A and B. For instance: # m4_list_cmp([1, 0], [1]) -> 0 # m4_list_cmp([1, 0], [1, 0]) -> 0 # m4_list_cmp([1, 2], [1, 0]) -> 1 # m4_list_cmp([1, 2, 3], [1, 2]) -> 1 # m4_list_cmp([1, 2, -3], [1, 2]) -> -1 # m4_list_cmp([1, 0], [1, 2]) -> -1 # m4_list_cmp([1], [1, 2]) -> -1 # m4_define([xa], [oops])dnl # m4_list_cmp([[0xa]], [5+5]) -> 0 # # Rather than face the overhead of m4_case, we use a helper function whose # expansion includes the name of the macro to invoke on the tail, either # m4_ignore or m4_unquote. This is particularly useful when comparing # long lists, since less text is being expanded for deciding when to end # recursion. The recursion is between a pair of macros that alternate # which list is trimmed by one element; this is more efficient than # calling m4_cdr on both lists from a single macro. Guarantee exactly # one expansion of both lists' side effects. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_list_cmp], [_$0_raw(m4_dquote($1), m4_dquote($2))]) m4_define([_m4_list_cmp_raw], [m4_if([$1], [$2], [0], [_m4_list_cmp_1([$1], $2)])]) m4_define([_m4_list_cmp], [m4_if([$1], [], [0m4_ignore], [$2], [0], [m4_unquote], [$2m4_ignore])]) m4_define([_m4_list_cmp_1], [_m4_list_cmp_2([$2], [m4_shift2($@)], $1)]) m4_define([_m4_list_cmp_2], [_m4_list_cmp([$1$3], m4_cmp([$3+0], [$1+0]))( [_m4_list_cmp_1(m4_dquote(m4_shift3($@)), $2)])]) # m4_max(EXPR, ...) # m4_min(EXPR, ...) # ----------------- # Return the decimal value of the maximum (or minimum) in a series of # integer expressions. # # M4 1.4.x doesn't provide ?:. Hence this huge m4_eval. Avoid m4_eval # if both arguments are identical, but be aware of m4_max(0xa, 10) (hence # the use of <=, not just <, in the second multiply). # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_max], [m4_if([$#], [0], [m4_fatal([too few arguments to $0])], [$#], [1], [m4_eval([$1])], [$#$1], [2$2], [m4_eval([$1])], [$#], [2], [_$0($@)], [_m4_minmax([_$0], $@)])]) m4_define([_m4_max], [m4_eval((([$1]) > ([$2])) * ([$1]) + (([$1]) <= ([$2])) * ([$2]))]) m4_define([m4_min], [m4_if([$#], [0], [m4_fatal([too few arguments to $0])], [$#], [1], [m4_eval([$1])], [$#$1], [2$2], [m4_eval([$1])], [$#], [2], [_$0($@)], [_m4_minmax([_$0], $@)])]) m4_define([_m4_min], [m4_eval((([$1]) < ([$2])) * ([$1]) + (([$1]) >= ([$2])) * ([$2]))]) # _m4_minmax(METHOD, ARG1, ARG2...) # --------------------------------- # Common recursion code for m4_max and m4_min. METHOD must be _m4_max # or _m4_min, and there must be at least two arguments to combine. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([_m4_minmax], [m4_if([$#], [3], [$1([$2], [$3])], [$0([$1], $1([$2], [$3]), m4_shift3($@))])]) # m4_sign(A) # ---------- # The sign of the integer expression A. m4_define([m4_sign], [m4_eval((([$1]) > 0) - (([$1]) < 0))]) ## ------------------------ ## ## 14. Version processing. ## ## ------------------------ ## # m4_version_unletter(VERSION) # ---------------------------- # Normalize beta version numbers with letters to numeric expressions, which # can then be handed to m4_eval for the purpose of comparison. # # Nl -> (N+1).-1.(l#) # # for example: # [2.14a] -> [0,2,14+1,-1,[0r36:a]] -> 2.15.-1.10 # [2.14b] -> [0,2,15+1,-1,[0r36:b]] -> 2.15.-1.11 # [2.61aa.b] -> [0,2.61,1,-1,[0r36:aa],+1,-1,[0r36:b]] -> 2.62.-1.370.1.-1.11 # [08] -> [0,[0r10:0]8] -> 8 # # This macro expects reasonable version numbers, but can handle double # letters and does not expand any macros. Original version strings can # use both `.' and `-' separators. # # Inline constant expansions, to avoid m4_defn overhead. # _m4_version_unletter is the real workhorse used by m4_version_compare, # but since [0r36:a] and commas are less readable than 10 and dots, we # provide a wrapper for human use. m4_define([m4_version_unletter], [m4_substr(m4_map_args([.m4_eval], m4_unquote(_$0([$1]))), [3])]) m4_define([_m4_version_unletter], [m4_bpatsubst(m4_bpatsubst(m4_translit([[[[0,$1]]]], [.-], [,,]),]dnl m4_dquote(m4_dquote(m4_defn([m4_cr_Letters])))[[+], [+1,-1,[0r36:\&]]), [,0], [,[0r10:0]])]) # m4_version_compare(VERSION-1, VERSION-2) # ---------------------------------------- # Compare the two version numbers and expand into # -1 if VERSION-1 < VERSION-2 # 0 if = # 1 if > # # Since _m4_version_unletter does not output side effects, we can # safely bypass the overhead of m4_version_cmp. m4_define([m4_version_compare], [_m4_list_cmp_raw(_m4_version_unletter([$1]), _m4_version_unletter([$2]))]) # m4_PACKAGE_NAME # m4_PACKAGE_TARNAME # m4_PACKAGE_VERSION # m4_PACKAGE_STRING # m4_PACKAGE_BUGREPORT # -------------------- # If m4sugar/version.m4 is present, then define version strings. This # file is optional, provided by Autoconf but absent in Bison. m4_sinclude([m4sugar/version.m4]) # m4_version_prereq(VERSION, [IF-OK], [IF-NOT = FAIL]) # ---------------------------------------------------- # Check this Autoconf version against VERSION. m4_define([m4_version_prereq], m4_ifdef([m4_PACKAGE_VERSION], [[m4_if(m4_version_compare(]m4_dquote(m4_defn([m4_PACKAGE_VERSION]))[, [$1]), [-1], [m4_default([$3], [m4_fatal([Autoconf version $1 or higher is required], [63])])], [$2])]], [[m4_fatal([m4sugar/version.m4 not found])]])) ## ------------------ ## ## 15. Set handling. ## ## ------------------ ## # Autoconf likes to create arbitrarily large sets; for example, as of # this writing, the configure.ac for coreutils tracks a set of more # than 400 AC_SUBST. How do we track all of these set members, # without introducing duplicates? We could use m4_append_uniq, with # the set NAME residing in the contents of the macro NAME. # Unfortunately, m4_append_uniq is quadratic for set creation, because # it costs O(n) to search the string for each of O(n) insertions; not # to mention that with m4 1.4.x, even using m4_append is slow, costing # O(n) rather than O(1) per insertion. Other set operations, not used # by Autoconf but still possible by manipulation of the definition # tracked in macro NAME, include O(n) deletion of one element and O(n) # computation of set size. Because the set is exposed to the user via # the definition of a single macro, we cannot cache any data about the # set without risking the cache being invalidated by the user # redefining NAME. # # Can we do better? Yes, because m4 gives us an O(1) search function # for free: ifdef. Additionally, even m4 1.4.x gives us an O(1) # insert operation for free: pushdef. But to use these, we must # represent the set via a group of macros; to keep the set consistent, # we must hide the set so that the user can only manipulate it through # accessor macros. The contents of the set are maintained through two # access points; _m4_set([name]) is a pushdef stack of values in the # set, useful for O(n) traversal of the set contents; while the # existence of _m4_set([name],value) with no particular value is # useful for O(1) querying of set membership. And since the user # cannot externally manipulate the set, we are free to add additional # caching macros for other performance improvements. Deletion can be # O(1) per element rather than O(n), by reworking the definition of # _m4_set([name],value) to be 0 or 1 based on current membership, and # adding _m4_set_cleanup(name) to defer the O(n) cleanup of # _m4_set([name]) until we have another reason to do an O(n) # traversal. The existence of _m4_set_cleanup(name) can then be used # elsewhere to determine if we must dereference _m4_set([name],value), # or assume that definition implies set membership. Finally, size can # be tracked in an O(1) fashion with _m4_set_size(name). # # The quoting in _m4_set([name],value) is chosen so that there is no # ambiguity with a set whose name contains a comma, and so that we can # supply the value via _m4_defn([_m4_set([name])]) without needing any # quote manipulation. # m4_set_add(SET, VALUE, [IF-UNIQ], [IF-DUP]) # ------------------------------------------- # Add VALUE as an element of SET. Expand IF-UNIQ on the first # addition, and IF-DUP if it is already in the set. Addition of one # element is O(1), such that overall set creation is O(n). # # We do not want to add a duplicate for a previously deleted but # unpruned element, but it is just as easy to check existence directly # as it is to query _m4_set_cleanup($1). m4_define([m4_set_add], [m4_ifdef([_m4_set([$1],$2)], [m4_if(m4_indir([_m4_set([$1],$2)]), [0], [m4_define([_m4_set([$1],$2)], [1])_m4_set_size([$1], [m4_incr])$3], [$4])], [m4_define([_m4_set([$1],$2)], [1])m4_pushdef([_m4_set([$1])], [$2])_m4_set_size([$1], [m4_incr])$3])]) # m4_set_add_all(SET, VALUE...) # ----------------------------- # Add each VALUE into SET. This is O(n) in the number of VALUEs, and # can be faster than calling m4_set_add for each VALUE. # # Implement two recursion helpers; the check variant is slower but # handles the case where an element has previously been removed but # not pruned. The recursion helpers ignore their second argument, so # that we can use the faster m4_shift2 and 2 arguments, rather than # _m4_shift2 and one argument, as the signal to end recursion. # # Please keep foreach.m4 in sync with any adjustments made here. m4_define([m4_set_add_all], [m4_define([_m4_set_size($1)], m4_eval(m4_set_size([$1]) + m4_len(m4_ifdef([_m4_set_cleanup($1)], [_$0_check], [_$0])([$1], $@))))]) m4_define([_m4_set_add_all], [m4_if([$#], [2], [], [m4_ifdef([_m4_set([$1],$3)], [], [m4_define([_m4_set([$1],$3)], [1])m4_pushdef([_m4_set([$1])], [$3])-])$0([$1], m4_shift2($@))])]) m4_define([_m4_set_add_all_check], [m4_if([$#], [2], [], [m4_set_add([$1], [$3])$0([$1], m4_shift2($@))])]) # m4_set_contains(SET, VALUE, [IF-PRESENT], [IF-ABSENT]) # ------------------------------------------------------ # Expand IF-PRESENT if SET contains VALUE, otherwise expand IF-ABSENT. # This is always O(1). m4_define([m4_set_contains], [m4_ifdef([_m4_set_cleanup($1)], [m4_if(m4_ifdef([_m4_set([$1],$2)], [m4_indir([_m4_set([$1],$2)])], [0]), [1], [$3], [$4])], [m4_ifdef([_m4_set([$1],$2)], [$3], [$4])])]) # m4_set_contents(SET, [SEP]) # --------------------------- # Expand to a single string containing all the elements in SET, # separated by SEP, without modifying SET. No provision is made for # disambiguating set elements that contain non-empty SEP as a # sub-string, or for recognizing a set that contains only the empty # string. Order of the output is not guaranteed. If any elements # have been previously removed from the set, this action will prune # the unused memory. This is O(n) in the size of the set before # pruning. # # Use _m4_popdef for speed. The existence of _m4_set_cleanup($1) # determines which version of _1 helper we use. m4_define([m4_set_contents], [m4_set_map_sep([$1], [], [], [[$2]])]) # _m4_set_contents_1(SET) # _m4_set_contents_1c(SET) # _m4_set_contents_2(SET, [PRE], [POST], [SEP]) # --------------------------------------------- # Expand to a list of quoted elements currently in the set, each # surrounded by PRE and POST, and moving SEP in front of PRE on # recursion. To avoid nesting limit restrictions, the algorithm must # be broken into two parts; _1 destructively copies the stack in # reverse into _m4_set_($1), producing no output; then _2 # destructively copies _m4_set_($1) back into the stack in reverse. # If no elements were deleted, then this visits the set in the order # that elements were inserted. Behavior is undefined if PRE/POST/SEP # tries to recursively list or modify SET in any way other than # calling m4_set_remove on the current element. Use _1 if all entries # in the stack are guaranteed to be in the set, and _1c to prune # removed entries. Uses _m4_defn and _m4_popdef for speed. m4_define([_m4_set_contents_1], [_m4_stack_reverse([_m4_set([$1])], [_m4_set_($1)])]) m4_define([_m4_set_contents_1c], [m4_ifdef([_m4_set([$1])], [m4_set_contains([$1], _m4_defn([_m4_set([$1])]), [m4_pushdef([_m4_set_($1)], _m4_defn([_m4_set([$1])]))], [_m4_popdef([_m4_set([$1],]_m4_defn( [_m4_set([$1])])[)])])_m4_popdef([_m4_set([$1])])$0([$1])], [_m4_popdef([_m4_set_cleanup($1)])])]) m4_define([_m4_set_contents_2], [_m4_stack_reverse([_m4_set_($1)], [_m4_set([$1])], [$2[]_m4_defn([_m4_set_($1)])$3], [$4[]])]) # m4_set_delete(SET) # ------------------ # Delete all elements in SET, and reclaim any memory occupied by the # set. This is O(n) in the set size. # # Use _m4_defn and _m4_popdef for speed. m4_define([m4_set_delete], [m4_ifdef([_m4_set([$1])], [_m4_popdef([_m4_set([$1],]_m4_defn([_m4_set([$1])])[)], [_m4_set([$1])])$0([$1])], [m4_ifdef([_m4_set_cleanup($1)], [_m4_popdef([_m4_set_cleanup($1)])])m4_ifdef( [_m4_set_size($1)], [_m4_popdef([_m4_set_size($1)])])])]) # m4_set_difference(SET1, SET2) # ----------------------------- # Produce a LIST of quoted elements that occur in SET1 but not SET2. # Output a comma prior to any elements, to distinguish the empty # string from no elements. This can be directly used as a series of # arguments, such as for m4_join, or wrapped inside quotes for use in # m4_foreach. Order of the output is not guaranteed. # # Short-circuit the idempotence relation. m4_define([m4_set_difference], [m4_if([$1], [$2], [], [m4_set_map_sep([$1], [_$0([$2],], [)])])]) m4_define([_m4_set_difference], [m4_set_contains([$1], [$2], [], [,[$2]])]) # m4_set_dump(SET, [SEP]) # ----------------------- # Expand to a single string containing all the elements in SET, # separated by SEP, then delete SET. In general, if you only need to # list the contents once, this is faster than m4_set_contents. No # provision is made for disambiguating set elements that contain # non-empty SEP as a sub-string. Order of the output is not # guaranteed. This is O(n) in the size of the set before pruning. # # Use _m4_popdef for speed. Use existence of _m4_set_cleanup($1) to # decide if more expensive recursion is needed. m4_define([m4_set_dump], [m4_ifdef([_m4_set_size($1)], [_m4_popdef([_m4_set_size($1)])])m4_ifdef([_m4_set_cleanup($1)], [_$0_check], [_$0])([$1], [], [$2])]) # _m4_set_dump(SET, [SEP], [PREP]) # _m4_set_dump_check(SET, [SEP], [PREP]) # -------------------------------------- # Print SEP and the current element, then delete the element and # recurse with empty SEP changed to PREP. The check variant checks # whether the element has been previously removed. Use _m4_defn and # _m4_popdef for speed. m4_define([_m4_set_dump], [m4_ifdef([_m4_set([$1])], [[$2]_m4_defn([_m4_set([$1])])_m4_popdef([_m4_set([$1],]_m4_defn( [_m4_set([$1])])[)], [_m4_set([$1])])$0([$1], [$2$3])])]) m4_define([_m4_set_dump_check], [m4_ifdef([_m4_set([$1])], [m4_set_contains([$1], _m4_defn([_m4_set([$1])]), [[$2]_m4_defn([_m4_set([$1])])])_m4_popdef( [_m4_set([$1],]_m4_defn([_m4_set([$1])])[)], [_m4_set([$1])])$0([$1], [$2$3])], [_m4_popdef([_m4_set_cleanup($1)])])]) # m4_set_empty(SET, [IF-EMPTY], [IF-ELEMENTS]) # -------------------------------------------- # Expand IF-EMPTY if SET has no elements, otherwise IF-ELEMENTS. m4_define([m4_set_empty], [m4_ifdef([_m4_set_size($1)], [m4_if(m4_indir([_m4_set_size($1)]), [0], [$2], [$3])], [$2])]) # m4_set_foreach(SET, VAR, ACTION) # -------------------------------- # For each element of SET, define VAR to the element and expand # ACTION. ACTION should not recursively list SET's contents, add # elements to SET, nor delete any element from SET except the one # currently in VAR. The order that the elements are visited in is not # guaranteed. This is faster than the corresponding m4_foreach([VAR], # m4_indir([m4_dquote]m4_set_listc([SET])), [ACTION]) m4_define([m4_set_foreach], [m4_pushdef([$2])m4_set_map_sep([$1], [m4_define([$2],], [)$3])m4_popdef([$2])]) # m4_set_intersection(SET1, SET2) # ------------------------------- # Produce a LIST of quoted elements that occur in both SET1 or SET2. # Output a comma prior to any elements, to distinguish the empty # string from no elements. This can be directly used as a series of # arguments, such as for m4_join, or wrapped inside quotes for use in # m4_foreach. Order of the output is not guaranteed. # # Iterate over the smaller set, and short-circuit the idempotence # relation. m4_define([m4_set_intersection], [m4_if([$1], [$2], [m4_set_listc([$1])], m4_eval(m4_set_size([$2]) < m4_set_size([$1])), [1], [$0([$2], [$1])], [m4_set_map_sep([$1], [_$0([$2],], [)])])]) m4_define([_m4_set_intersection], [m4_set_contains([$1], [$2], [,[$2]])]) # m4_set_list(SET) # m4_set_listc(SET) # ----------------- # Produce a LIST of quoted elements of SET. This can be directly used # as a series of arguments, such as for m4_join or m4_set_add_all, or # wrapped inside quotes for use in m4_foreach or m4_map. With # m4_set_list, there is no way to distinguish an empty set from a set # containing only the empty string; with m4_set_listc, a leading comma # is output if there are any elements. m4_define([m4_set_list], [m4_set_map_sep([$1], [], [], [,])]) m4_define([m4_set_listc], [m4_set_map_sep([$1], [,])]) # m4_set_map(SET, ACTION) # ----------------------- # For each element of SET, expand ACTION with a single argument of the # current element. ACTION should not recursively list SET's contents, # add elements to SET, nor delete any element from SET except the one # passed as an argument. The order that the elements are visited in # is not guaranteed. This is faster than either of the corresponding # m4_map_args([ACTION]m4_set_listc([SET])) # m4_set_foreach([SET], [VAR], [ACTION(m4_defn([VAR]))]) m4_define([m4_set_map], [m4_set_map_sep([$1], [$2(], [)])]) # m4_set_map_sep(SET, [PRE], [POST], [SEP]) # ----------------------------------------- # For each element of SET, expand PRE[value]POST[], and expand SEP # between elements. m4_define([m4_set_map_sep], [m4_ifdef([_m4_set_cleanup($1)], [_m4_set_contents_1c], [_m4_set_contents_1])([$1])_m4_set_contents_2($@)]) # m4_set_remove(SET, VALUE, [IF-PRESENT], [IF-ABSENT]) # ---------------------------------------------------- # If VALUE is an element of SET, delete it and expand IF-PRESENT. # Otherwise expand IF-ABSENT. Deleting a single value is O(1), # although it leaves memory occupied until the next O(n) traversal of # the set which will compact the set. # # Optimize if the element being removed is the most recently added, # since defining _m4_set_cleanup($1) slows down so many other macros. # In particular, this plays well with m4_set_foreach and m4_set_map. m4_define([m4_set_remove], [m4_set_contains([$1], [$2], [_m4_set_size([$1], [m4_decr])m4_if(_m4_defn([_m4_set([$1])]), [$2], [_m4_popdef([_m4_set([$1],$2)], [_m4_set([$1])])], [m4_define([_m4_set_cleanup($1)])m4_define( [_m4_set([$1],$2)], [0])])$3], [$4])]) # m4_set_size(SET) # ---------------- # Expand to the number of elements currently in SET. This operation # is O(1), and thus more efficient than m4_count(m4_set_list([SET])). m4_define([m4_set_size], [m4_ifdef([_m4_set_size($1)], [m4_indir([_m4_set_size($1)])], [0])]) # _m4_set_size(SET, ACTION) # ------------------------- # ACTION must be either m4_incr or m4_decr, and the size of SET is # changed accordingly. If the set is empty, ACTION must not be # m4_decr. m4_define([_m4_set_size], [m4_define([_m4_set_size($1)], m4_ifdef([_m4_set_size($1)], [$2(m4_indir([_m4_set_size($1)]))], [1]))]) # m4_set_union(SET1, SET2) # ------------------------ # Produce a LIST of double quoted elements that occur in either SET1 # or SET2, without duplicates. Output a comma prior to any elements, # to distinguish the empty string from no elements. This can be # directly used as a series of arguments, such as for m4_join, or # wrapped inside quotes for use in m4_foreach. Order of the output is # not guaranteed. # # We can rely on the fact that m4_set_listc prunes SET1, so we don't # need to check _m4_set([$1],element) for 0. Short-circuit the # idempotence relation. m4_define([m4_set_union], [m4_set_listc([$1])m4_if([$1], [$2], [], [m4_set_map_sep([$2], [_$0([$1],], [)])])]) m4_define([_m4_set_union], [m4_ifdef([_m4_set([$1],$2)], [], [,[$2]])]) ## ------------------- ## ## 16. File handling. ## ## ------------------- ## # It is a real pity that M4 comes with no macros to bind a diversion # to a file. So we have to deal without, which makes us a lot more # fragile than we should. # m4_file_append(FILE-NAME, CONTENT) # ---------------------------------- m4_define([m4_file_append], [m4_syscmd([cat >>$1 <<_m4eof $2 _m4eof ]) m4_if(m4_sysval, [0], [], [m4_fatal([$0: cannot write: $1])])]) ## ------------------------ ## ## 17. Setting M4sugar up. ## ## ------------------------ ## # _m4_divert_diversion should be defined. m4_divert_push([KILL]) # m4_init # ------- # Initialize the m4sugar language. m4_define([m4_init], [# All the M4sugar macros start with `m4_', except `dnl' kept as is # for sake of simplicity. m4_pattern_forbid([^_?m4_]) m4_pattern_forbid([^dnl$]) # If __m4_version__ is defined, we assume that we are being run by M4 # 1.6 or newer, thus $@ recursion is linear, and debugmode(+do) # is available for faster checks of dereferencing undefined macros # and forcing dumpdef to print to stderr regardless of debugfile. # But if it is missing, we assume we are being run by M4 1.4.x, that # $@ recursion is quadratic, and that we need foreach-based # replacement macros. Also, m4 prior to 1.4.8 loses track of location # during m4wrap text; __line__ should never be 0. # # Use the raw builtin to avoid tripping up include tracing. # Meanwhile, avoid m4_copy, since it temporarily undefines m4_defn. m4_ifdef([__m4_version__], [m4_debugmode([+do]) m4_define([m4_defn], _m4_defn([_m4_defn])) m4_define([m4_dumpdef], _m4_defn([_m4_dumpdef])) m4_define([m4_popdef], _m4_defn([_m4_popdef])) m4_define([m4_undefine], _m4_defn([_m4_undefine]))], [m4_builtin([include], [m4sugar/foreach.m4]) m4_wrap_lifo([m4_if(__line__, [0], [m4_pushdef([m4_location], ]]m4_dquote(m4_dquote(m4_dquote(__file__:__line__)))[[)])])]) # Rewrite the first entry of the diversion stack. m4_divert([KILL]) # Check the divert push/pop perfect balance. # Some users are prone to also use m4_wrap to register last-minute # m4_divert_text; so after our diversion cleanups, we restore # KILL as the bottom of the diversion stack. m4_wrap([m4_popdef([_m4_divert_diversion])m4_ifdef( [_m4_divert_diversion], [m4_fatal([$0: unbalanced m4_divert_push: ]m4_divert_stack)])_m4_popdef([_m4_divert_stack])m4_divert_push([KILL])]) ]) PK r�!\��+֣9 �9 m4sugar/foreach.m4nu �[��� # -*- Autoconf -*- # This file is part of Autoconf. # foreach-based replacements for recursive functions. # Speeds up GNU M4 1.4.x by avoiding quadratic $@ recursion, but penalizes # GNU M4 1.6 by requiring more memory and macro expansions. # # Copyright (C) 2008-2017 Free Software Foundation, Inc. # This file is part of Autoconf. 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. # # Under Section 7 of GPL version 3, you are granted additional # permissions described in the Autoconf Configure Script Exception, # version 3.0, as published by the Free Software Foundation. # # You should have received a copy of the GNU General Public License # and a copy of the Autoconf Configure Script Exception along with # this program; see the files COPYINGv3 and COPYING.EXCEPTION # respectively. If not, see <https://www.gnu.org/licenses/>. # Written by Eric Blake. # In M4 1.4.x, every byte of $@ is rescanned. This means that an # algorithm on n arguments that recurses with one less argument each # iteration will scan n * (n + 1) / 2 arguments, for O(n^2) time. In # M4 1.6, this was fixed so that $@ is only scanned once, then # back-references are made to information stored about the scan. # Thus, n iterations need only scan n arguments, for O(n) time. # Additionally, in M4 1.4.x, recursive algorithms did not clean up # memory very well, requiring O(n^2) memory rather than O(n) for n # iterations. # # This file is designed to overcome the quadratic nature of $@ # recursion by writing a variant of m4_foreach that uses m4_for rather # than $@ recursion to operate on the list. This involves more macro # expansions, but avoids the need to rescan a quadratic number of # arguments, making these replacements very attractive for M4 1.4.x. # On the other hand, in any version of M4, expanding additional macros # costs additional time; therefore, in M4 1.6, where $@ recursion uses # fewer macros, these replacements actually pessimize performance. # Additionally, the use of $10 to mean the tenth argument violates # POSIX; although all versions of m4 1.4.x support this meaning, a # future m4 version may switch to take it as the first argument # concatenated with a literal 0, so the implementations in this file # are not future-proof. Thus, this file is conditionally included as # part of m4_init(), only when it is detected that M4 probably has # quadratic behavior (ie. it lacks the macro __m4_version__). # # Please keep this file in sync with m4sugar.m4. # _m4_foreach(PRE, POST, IGNORED, ARG...) # --------------------------------------- # Form the common basis of the m4_foreach and m4_map macros. For each # ARG, expand PRE[ARG]POST[]. The IGNORED argument makes recursion # easier, and must be supplied rather than implicit. # # This version minimizes the number of times that $@ is evaluated by # using m4_for to generate a boilerplate into _m4_f then passing $@ to # that temporary macro. Thus, the recursion is done in m4_for without # reparsing any user input, and is not quadratic. For an idea of how # this works, note that m4_foreach(i,[1,2],[i]) calls # _m4_foreach([m4_define([i],],[)i],[],[1],[2]) # which defines _m4_f: # $1[$4]$2[]$1[$5]$2[]_m4_popdef([_m4_f]) # then calls _m4_f([m4_define([i],],[)i],[],[1],[2]) for a net result: # m4_define([i],[1])i[]m4_define([i],[2])i[]_m4_popdef([_m4_f]). m4_define([_m4_foreach], [m4_if([$#], [3], [], [m4_pushdef([_m4_f], _m4_for([4], [$#], [1], [$0_([1], [2],], [)])[_m4_popdef([_m4_f])])_m4_f($@)])]) m4_define([_m4_foreach_], [[$$1[$$3]$$2[]]]) # m4_case(SWITCH, VAL1, IF-VAL1, VAL2, IF-VAL2, ..., DEFAULT) # ----------------------------------------------------------- # Find the first VAL that SWITCH matches, and expand the corresponding # IF-VAL. If there are no matches, expand DEFAULT. # # Use m4_for to create a temporary macro in terms of a boilerplate # m4_if with final cleanup. If $# is even, we have DEFAULT; if it is # odd, then rounding the last $# up in the temporary macro is # harmless. For example, both m4_case(1,2,3,4,5) and # m4_case(1,2,3,4,5,6) result in the intermediate _m4_case being # m4_if([$1],[$2],[$3],[$1],[$4],[$5],_m4_popdef([_m4_case])[$6]) m4_define([m4_case], [m4_if(m4_eval([$# <= 2]), [1], [$2], [m4_pushdef([_$0], [m4_if(]_m4_for([2], m4_eval([($# - 1) / 2 * 2]), [2], [_$0_(], [)])[_m4_popdef( [_$0])]m4_dquote($m4_eval([($# + 1) & ~1]))[)])_$0($@)])]) m4_define([_m4_case_], [$0_([1], [$1], m4_incr([$1]))]) m4_define([_m4_case__], [[[$$1],[$$2],[$$3],]]) # m4_bmatch(SWITCH, RE1, VAL1, RE2, VAL2, ..., DEFAULT) # ----------------------------------------------------- # m4 equivalent of # # if (SWITCH =~ RE1) # VAL1; # elif (SWITCH =~ RE2) # VAL2; # elif ... # ... # else # DEFAULT # # We build the temporary macro _m4_b: # m4_define([_m4_b], _m4_defn([_m4_bmatch]))_m4_b([$1], [$2], [$3])... # _m4_b([$1], [$m-1], [$m])_m4_b([], [], [$m+1]_m4_popdef([_m4_b])) # then invoke m4_unquote(_m4_b($@)), for concatenation with later text. m4_define([m4_bmatch], [m4_if([$#], 0, [m4_fatal([$0: too few arguments: $#])], [$#], 1, [m4_fatal([$0: too few arguments: $#: $1])], [$#], 2, [$2], [m4_pushdef([_m4_b], [m4_define([_m4_b], _m4_defn([_$0]))]_m4_for([3], m4_eval([($# + 1) / 2 * 2 - 1]), [2], [_$0_(], [)])[_m4_b([], [],]m4_dquote([$]m4_eval( [($# + 1) / 2 * 2]))[_m4_popdef([_m4_b]))])m4_unquote(_m4_b($@))])]) m4_define([_m4_bmatch], [m4_if(m4_bregexp([$1], [$2]), [-1], [], [[$3]m4_define([$0])])]) m4_define([_m4_bmatch_], [$0_([1], m4_decr([$1]), [$1])]) m4_define([_m4_bmatch__], [[_m4_b([$$1], [$$2], [$$3])]]) # m4_cond(TEST1, VAL1, IF-VAL1, TEST2, VAL2, IF-VAL2, ..., [DEFAULT]) # ------------------------------------------------------------------- # Similar to m4_if, except that each TEST is expanded when encountered. # If the expansion of TESTn matches the string VALn, the result is IF-VALn. # The result is DEFAULT if no tests passed. This macro allows # short-circuiting of expensive tests, where it pays to arrange quick # filter tests to run first. # # m4_cond already guarantees either 3*n or 3*n + 1 arguments, 1 <= n. # We only have to speed up _m4_cond, by building the temporary _m4_c: # m4_define([_m4_c], _m4_defn([m4_unquote]))_m4_c([m4_if(($1), [($2)], # [[$3]m4_define([_m4_c])])])_m4_c([m4_if(($4), [($5)], # [[$6]m4_define([_m4_c])])])..._m4_c([m4_if(($m-2), [($m-1)], # [[$m]m4_define([_m4_c])])])_m4_c([[$m+1]]_m4_popdef([_m4_c])) # We invoke m4_unquote(_m4_c($@)), for concatenation with later text. m4_define([_m4_cond], [m4_pushdef([_m4_c], [m4_define([_m4_c], _m4_defn([m4_unquote]))]_m4_for([2], m4_eval([$# / 3 * 3 - 1]), [3], [$0_(], [)])[_m4_c(]m4_dquote(m4_dquote( [$]m4_eval([$# / 3 * 3 + 1])))[_m4_popdef([_m4_c]))])m4_unquote(_m4_c($@))]) m4_define([_m4_cond_], [$0_(m4_decr([$1]), [$1], m4_incr([$1]))]) m4_define([_m4_cond__], [[_m4_c([m4_if(($$1), [($$2)], [[$$3]m4_define([_m4_c])])])]]) # m4_bpatsubsts(STRING, RE1, SUBST1, RE2, SUBST2, ...) # ---------------------------------------------------- # m4 equivalent of # # $_ = STRING; # s/RE1/SUBST1/g; # s/RE2/SUBST2/g; # ... # # m4_bpatsubsts already validated an odd number of arguments; we only # need to speed up _m4_bpatsubsts. To avoid nesting, we build the # temporary _m4_p: # m4_define([_m4_p], [$1])m4_define([_m4_p], # m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$2], [$3]))m4_define([_m4_p], # m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$4], [$5]))m4_define([_m4_p],... # m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$m-1], [$m]))m4_unquote( # _m4_defn([_m4_p])_m4_popdef([_m4_p])) m4_define([_m4_bpatsubsts], [m4_pushdef([_m4_p], [m4_define([_m4_p], ]m4_dquote([$]1)[)]_m4_for([3], [$#], [2], [$0_(], [)])[m4_unquote(_m4_defn([_m4_p])_m4_popdef([_m4_p]))])_m4_p($@)]) m4_define([_m4_bpatsubsts_], [$0_(m4_decr([$1]), [$1])]) m4_define([_m4_bpatsubsts__], [[m4_define([_m4_p], m4_bpatsubst(m4_dquote(_m4_defn([_m4_p])), [$$1], [$$2]))]]) # m4_shiftn(N, ...) # ----------------- # Returns ... shifted N times. Useful for recursive "varargs" constructs. # # m4_shiftn already validated arguments; we only need to speed up # _m4_shiftn. If N is 3, then we build the temporary _m4_s, defined as # ,[$5],[$6],...,[$m]_m4_popdef([_m4_s]) # before calling m4_shift(_m4_s($@)). m4_define([_m4_shiftn], [m4_if(m4_incr([$1]), [$#], [], [m4_pushdef([_m4_s], _m4_for(m4_eval([$1 + 2]), [$#], [1], [[,]m4_dquote($], [)])[_m4_popdef([_m4_s])])m4_shift(_m4_s($@))])]) # m4_do(STRING, ...) # ------------------ # This macro invokes all its arguments (in sequence, of course). It is # useful for making your macros more structured and readable by dropping # unnecessary dnl's and have the macros indented properly. # # Here, we use the temporary macro _m4_do, defined as # $1[]$2[]...[]$n[]_m4_popdef([_m4_do]) m4_define([m4_do], [m4_if([$#], [0], [], [m4_pushdef([_$0], _m4_for([1], [$#], [1], [$], [[[]]])[_m4_popdef([_$0])])_$0($@)])]) # m4_dquote_elt(ARGS) # ------------------- # Return ARGS as an unquoted list of double-quoted arguments. # # _m4_foreach to the rescue. m4_define([m4_dquote_elt], [m4_if([$#], [0], [], [[[$1]]_m4_foreach([,m4_dquote(], [)], $@)])]) # m4_reverse(ARGS) # ---------------- # Output ARGS in reverse order. # # Invoke _m4_r($@) with the temporary _m4_r built as # [$m], [$m-1], ..., [$2], [$1]_m4_popdef([_m4_r]) m4_define([m4_reverse], [m4_if([$#], [0], [], [$#], [1], [[$1]], [m4_pushdef([_m4_r], [[$$#]]_m4_for(m4_decr([$#]), [1], [-1], [[, ]m4_dquote($], [)])[_m4_popdef([_m4_r])])_m4_r($@)])]) # m4_map_args_pair(EXPRESSION, [END-EXPR = EXPRESSION], ARG...) # ------------------------------------------------------------- # Perform a pairwise grouping of consecutive ARGs, by expanding # EXPRESSION([ARG1], [ARG2]). If there are an odd number of ARGs, the # final argument is expanded with END-EXPR([ARGn]). # # Build the temporary macro _m4_map_args_pair, with the $2([$m+1]) # only output if $# is odd: # $1([$3], [$4])[]$1([$5], [$6])[]...$1([$m-1], # [$m])[]m4_default([$2], [$1])([$m+1])[]_m4_popdef([_m4_map_args_pair]) m4_define([m4_map_args_pair], [m4_if([$#], [0], [m4_fatal([$0: too few arguments: $#])], [$#], [1], [m4_fatal([$0: too few arguments: $#: $1])], [$#], [2], [], [$#], [3], [m4_default([$2], [$1])([$3])[]], [m4_pushdef([_$0], _m4_for([3], m4_eval([$# / 2 * 2 - 1]), [2], [_$0_(], [)])_$0_end( [1], [2], [$#])[_m4_popdef([_$0])])_$0($@)])]) m4_define([_m4_map_args_pair_], [$0_([1], [$1], m4_incr([$1]))]) m4_define([_m4_map_args_pair__], [[$$1([$$2], [$$3])[]]]) m4_define([_m4_map_args_pair_end], [m4_if(m4_eval([$3 & 1]), [1], [[m4_default([$$2], [$$1])([$$3])[]]])]) # m4_join(SEP, ARG1, ARG2...) # --------------------------- # Produce ARG1SEPARG2...SEPARGn. Avoid back-to-back SEP when a given ARG # is the empty string. No expansion is performed on SEP or ARGs. # # Use a self-modifying separator, since we don't know how many # arguments might be skipped before a separator is first printed, but # be careful if the separator contains $. _m4_foreach to the rescue. m4_define([m4_join], [m4_pushdef([_m4_sep], [m4_define([_m4_sep], _m4_defn([m4_echo]))])]dnl [_m4_foreach([_$0([$1],], [)], $@)_m4_popdef([_m4_sep])]) m4_define([_m4_join], [m4_if([$2], [], [], [_m4_sep([$1])[$2]])]) # m4_joinall(SEP, ARG1, ARG2...) # ------------------------------ # Produce ARG1SEPARG2...SEPARGn. An empty ARG results in back-to-back SEP. # No expansion is performed on SEP or ARGs. # # A bit easier than m4_join. _m4_foreach to the rescue. m4_define([m4_joinall], [[$2]m4_if(m4_eval([$# <= 2]), [1], [], [_m4_foreach([$1], [], m4_shift($@))])]) # m4_list_cmp(A, B) # ----------------- # Compare the two lists of integer expressions A and B. # # m4_list_cmp takes care of any side effects; we only override # _m4_list_cmp_raw, where we can safely expand lists multiple times. # First, insert padding so that both lists are the same length; the # trailing +0 is necessary to handle a missing list. Next, create a # temporary macro to perform pairwise comparisons until an inequality # is found. For example, m4_list_cmp([1], [1,2]) creates _m4_cmp as # m4_if(m4_eval([($1) != ($3)]), [1], [m4_cmp([$1], [$3])], # m4_eval([($2) != ($4)]), [1], [m4_cmp([$2], [$4])], # [0]_m4_popdef([_m4_cmp])) # then calls _m4_cmp([1+0], [0*2], [1], [2+0]) m4_define([_m4_list_cmp_raw], [m4_if([$1], [$2], 0, [_m4_list_cmp($1+0_m4_list_pad(m4_count($1), m4_count($2)), $2+0_m4_list_pad(m4_count($2), m4_count($1)))])]) m4_define([_m4_list_pad], [m4_if(m4_eval($1 < $2), [1], [_m4_for(m4_incr([$1]), [$2], [1], [,0*])])]) m4_define([_m4_list_cmp], [m4_pushdef([_m4_cmp], [m4_if(]_m4_for( [1], m4_eval([$# >> 1]), [1], [$0_(], [,]m4_eval([$# >> 1])[)])[ [0]_m4_popdef([_m4_cmp]))])_m4_cmp($@)]) m4_define([_m4_list_cmp_], [$0_([$1], m4_eval([$1 + $2]))]) m4_define([_m4_list_cmp__], [[m4_eval([($$1) != ($$2)]), [1], [m4_cmp([$$1], [$$2])], ]]) # m4_max(EXPR, ...) # m4_min(EXPR, ...) # ----------------- # Return the decimal value of the maximum (or minimum) in a series of # integer expressions. # # _m4_foreach to the rescue; we only need to replace _m4_minmax. Here, # we need a temporary macro to track the best answer so far, so that # the foreach expression is tractable. m4_define([_m4_minmax], [m4_pushdef([_m4_best], m4_eval([$2]))_m4_foreach( [m4_define([_m4_best], $1(_m4_best,], [))], m4_shift($@))]dnl [_m4_best[]_m4_popdef([_m4_best])]) # m4_set_add_all(SET, VALUE...) # ----------------------------- # Add each VALUE into SET. This is O(n) in the number of VALUEs, and # can be faster than calling m4_set_add for each VALUE. # # _m4_foreach to the rescue. If no deletions have occurred, then # avoid the speed penalty of m4_set_add. m4_define([m4_set_add_all], [m4_if([$#], [0], [], [$#], [1], [], [m4_define([_m4_set_size($1)], m4_eval(m4_set_size([$1]) + m4_len(_m4_foreach(m4_ifdef([_m4_set_cleanup($1)], [[m4_set_add]], [[_$0]])[([$1],], [)], $@))))])]) m4_define([_m4_set_add_all], [m4_ifdef([_m4_set([$1],$2)], [], [m4_define([_m4_set([$1],$2)], [1])m4_pushdef([_m4_set([$1])], [$2])-])]) PK r�!\!ƥ�ǐ ǐ skeletons/lalr1.javanu �[��� # Java skeleton for Bison -*- autoconf -*- # Copyright (C) 2007-2015, 2018-2020 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/>. m4_include(b4_skeletonsdir/[java.m4]) b4_defines_if([b4_complain([%defines does not make sense in Java])]) m4_define([b4_symbol_no_destructor_assert], [b4_symbol_if([$1], [has_destructor], [b4_complain_at(m4_unquote(b4_symbol([$1], [destructor_loc])), [%destructor does not make sense in Java])])]) b4_symbol_foreach([b4_symbol_no_destructor_assert]) # Setup some macros for api.push-pull. b4_percent_define_default([[api.push-pull]], [[pull]]) b4_percent_define_check_values([[[[api.push-pull]], [[pull]], [[push]], [[both]]]]) # Define m4 conditional macros that encode the value # of the api.push-pull flag. b4_define_flag_if([pull]) m4_define([b4_pull_flag], [[1]]) b4_define_flag_if([push]) m4_define([b4_push_flag], [[1]]) m4_case(b4_percent_define_get([[api.push-pull]]), [pull], [m4_define([b4_push_flag], [[0]])], [push], [m4_define([b4_pull_flag], [[0]])]) # Define a macro to be true when api.push-pull has the value "both". m4_define([b4_both_if],[b4_push_if([b4_pull_if([$1],[$2])],[$2])]) # Handle BISON_USE_PUSH_FOR_PULL for the test suite. So that push parsing # tests function as written, do not let BISON_USE_PUSH_FOR_PULL modify the # behavior of Bison at all when push parsing is already requested. b4_define_flag_if([use_push_for_pull]) b4_use_push_for_pull_if([ b4_push_if([m4_define([b4_use_push_for_pull_flag], [[0]])], [m4_define([b4_push_flag], [[1]])])]) # Define a macro to encapsulate the parse state variables. This # allows them to be defined either in parse() when doing pull parsing, # or as class instance variable when doing push parsing. m4_define([b4_define_state],[[ /* Lookahead token kind. */ int yychar = YYEMPTY_; /* Lookahead symbol kind. */ SymbolKind yytoken = null; /* State. */ int yyn = 0; int yylen = 0; int yystate = 0; YYStack yystack = new YYStack (); int label = YYNEWSTATE; ]b4_locations_if([[ /* The location where the error started. */ ]b4_location_type[ yyerrloc = null; /* Location. */ ]b4_location_type[ yylloc = new ]b4_location_type[ (null, null);]])[ /* Semantic value of the lookahead. */ ]b4_yystype[ yylval = null; ]])[ ]b4_output_begin([b4_parser_file_name])[ ]b4_copyright([Skeleton implementation for Bison LALR(1) parsers in Java], [2007-2015, 2018-2020])[ ]b4_disclaimer[ ]b4_percent_define_ifdef([api.package], [package b4_percent_define_get([api.package]);[ ]])[ ]b4_user_pre_prologue[ ]b4_user_post_prologue[ import java.text.MessageFormat; ]b4_percent_code_get([[imports]])[ /** * A Bison parser, automatically generated from <tt>]m4_bpatsubst(b4_file_name, [^"\(.*\)"$], [\1])[</tt>. * * @@author LALR (1) parser skeleton written by Paolo Bonzini. */ ]b4_parser_class_declaration[ { ]b4_identification[ ][ ]b4_parse_error_bmatch( [detailed\|verbose], [[ /** * True if verbose error messages are enabled. */ private boolean yyErrorVerbose = true; /** * Whether verbose error messages are enabled. */ public final boolean getErrorVerbose() { return yyErrorVerbose; } /** * Set the verbosity of error messages. * @@param verbose True to request verbose error messages. */ public final void setErrorVerbose(boolean verbose) { yyErrorVerbose = verbose; } ]])[ ]b4_locations_if([[ /** * A class defining a pair of positions. Positions, defined by the * <code>]b4_position_type[</code> class, denote a point in the input. * Locations represent a part of the input through the beginning * and ending positions. */ public static class ]b4_location_type[ { /** * The first, inclusive, position in the range. */ public ]b4_position_type[ begin; /** * The first position beyond the range. */ public ]b4_position_type[ end; /** * Create a <code>]b4_location_type[</code> denoting an empty range located at * a given point. * @@param loc The position at which the range is anchored. */ public ]b4_location_type[ (]b4_position_type[ loc) { this.begin = this.end = loc; } /** * Create a <code>]b4_location_type[</code> from the endpoints of the range. * @@param begin The first position included in the range. * @@param end The first position beyond the range. */ public ]b4_location_type[ (]b4_position_type[ begin, ]b4_position_type[ end) { this.begin = begin; this.end = end; } /** * Print a representation of the location. For this to be correct, * <code>]b4_position_type[</code> should override the <code>equals</code> * method. */ public String toString () { if (begin.equals (end)) return begin.toString (); else return begin.toString () + "-" + end.toString (); } } private ]b4_location_type[ yylloc(YYStack rhs, int n) { if (0 < n) return new ]b4_location_type[(rhs.locationAt(n-1).begin, rhs.locationAt(0).end); else return new ]b4_location_type[(rhs.locationAt(0).end); }]])[ ]b4_declare_symbol_enum[ /** * Communication interface between the scanner and the Bison-generated * parser <tt>]b4_parser_class[</tt>. */ public interface Lexer { ]b4_token_enums[ /** Deprecated, use ]b4_symbol(0, id)[ instead. */ public static final int EOF = ]b4_symbol(0, id)[; ]b4_pull_if([b4_locations_if([[ /** * Method to retrieve the beginning position of the last scanned token. * @@return the position at which the last scanned token starts. */ ]b4_position_type[ getStartPos(); /** * Method to retrieve the ending position of the last scanned token. * @@return the first position beyond the last scanned token. */ ]b4_position_type[ getEndPos();]])[ /** * Method to retrieve the semantic value of the last scanned token. * @@return the semantic value of the last scanned token. */ ]b4_yystype[ getLVal(); /** * Entry point for the scanner. Returns the token identifier corresponding * to the next token and prepares to return the semantic value * ]b4_locations_if([and beginning/ending positions ])[of the token. * @@return the token identifier corresponding to the next token. */ int yylex()]b4_maybe_throws([b4_lex_throws])[; ]])[ /** * Emit an error]b4_locations_if([ referring to the given location])[in a user-defined way. * *]b4_locations_if([[ @@param loc The location of the element to which the * error message is related.]])[ * @@param msg The string for the error message. */ void yyerror(]b4_locations_if([b4_location_type[ loc, ]])[String msg); ]b4_parse_error_bmatch( [custom], [[ /** * Build and emit a "syntax error" message in a user-defined way. * * @@param ctx The context of the error. */ void reportSyntaxError (][Context ctx); ]])[ } ]b4_lexer_if([[ private class YYLexer implements Lexer { ]b4_percent_code_get([[lexer]])[ } ]])[ /** * The object doing lexical analysis for us. */ private Lexer yylexer; ]b4_parse_param_vars[ ]b4_lexer_if([[ /** * Instantiates the Bison-generated parser. */ public ]b4_parser_class (b4_parse_param_decl([b4_lex_param_decl])[)]b4_maybe_throws([b4_init_throws])[ { ]b4_percent_code_get([[init]])[ this.yylexer = new YYLexer (]b4_lex_param_call[); ]b4_parse_param_cons[ } ]])[ /** * Instantiates the Bison-generated parser. * @@param yylexer The scanner that will supply tokens to the parser. */ ]b4_lexer_if([[protected]], [[public]]) b4_parser_class[ (]b4_parse_param_decl([[Lexer yylexer]])[)]b4_maybe_throws([b4_init_throws])[ { ]b4_percent_code_get([[init]])[ this.yylexer = yylexer; ]b4_parse_param_cons[ } ]b4_parse_trace_if([[ private java.io.PrintStream yyDebugStream = System.err; /** * The <tt>PrintStream</tt> on which the debugging output is printed. */ public final java.io.PrintStream getDebugStream () { return yyDebugStream; } /** * Set the <tt>PrintStream</tt> on which the debug output is printed. * @@param s The stream that is used for debugging output. */ public final void setDebugStream (java.io.PrintStream s) { yyDebugStream = s; } private int yydebug = 0; /** * Answer the verbosity of the debugging output; 0 means that all kinds of * output from the parser are suppressed. */ public final int getDebugLevel () { return yydebug; } /** * Set the verbosity of the debugging output; 0 means that all kinds of * output from the parser are suppressed. * @@param level The verbosity level for debugging output. */ public final void setDebugLevel (int level) { yydebug = level; } ]])[ private int yynerrs = 0; /** * The number of syntax errors so far. */ public final int getNumberOfErrors () { return yynerrs; } /** * Print an error message via the lexer. *]b4_locations_if([[ Use a <code>null</code> location.]])[ * @@param msg The error message. */ public final void yyerror(String msg) { yylexer.yyerror(]b4_locations_if([[(]b4_location_type[)null, ]])[msg); } ]b4_locations_if([[ /** * Print an error message via the lexer. * @@param loc The location associated with the message. * @@param msg The error message. */ public final void yyerror(]b4_location_type[ loc, String msg) { yylexer.yyerror(loc, msg); } /** * Print an error message via the lexer. * @@param pos The position associated with the message. * @@param msg The error message. */ public final void yyerror(]b4_position_type[ pos, String msg) { yylexer.yyerror(new ]b4_location_type[ (pos), msg); }]])[ ]b4_parse_trace_if([[ protected final void yycdebug (String s) { if (0 < yydebug) yyDebugStream.println (s); }]])[ private final class YYStack { private int[] stateStack = new int[16];]b4_locations_if([[ private ]b4_location_type[[] locStack = new ]b4_location_type[[16];]])[ private ]b4_yystype[[] valueStack = new ]b4_yystype[[16]; public int size = 16; public int height = -1; public final void push (int state, ]b4_yystype[ value]b4_locations_if([, ]b4_location_type[ loc])[) { height++; if (size == height) { int[] newStateStack = new int[size * 2]; System.arraycopy (stateStack, 0, newStateStack, 0, height); stateStack = newStateStack;]b4_locations_if([[ ]b4_location_type[[] newLocStack = new ]b4_location_type[[size * 2]; System.arraycopy (locStack, 0, newLocStack, 0, height); locStack = newLocStack;]]) b4_yystype[[] newValueStack = new ]b4_yystype[[size * 2]; System.arraycopy (valueStack, 0, newValueStack, 0, height); valueStack = newValueStack; size *= 2; } stateStack[height] = state;]b4_locations_if([[ locStack[height] = loc;]])[ valueStack[height] = value; } public final void pop () { pop (1); } public final void pop (int num) { // Avoid memory leaks... garbage collection is a white lie! if (0 < num) { java.util.Arrays.fill (valueStack, height - num + 1, height + 1, null);]b4_locations_if([[ java.util.Arrays.fill (locStack, height - num + 1, height + 1, null);]])[ } height -= num; } public final int stateAt (int i) { return stateStack[height - i]; } ]b4_locations_if([[ public final ]b4_location_type[ locationAt (int i) { return locStack[height - i]; } ]])[ public final ]b4_yystype[ valueAt (int i) { return valueStack[height - i]; } // Print the state stack on the debug stream. public void print (java.io.PrintStream out) { out.print ("Stack now"); for (int i = 0; i <= height; i++) { out.print (' '); out.print (stateStack[i]); } out.println (); } } /** * Returned by a Bison action in order to stop the parsing process and * return success (<tt>true</tt>). */ public static final int YYACCEPT = 0; /** * Returned by a Bison action in order to stop the parsing process and * return failure (<tt>false</tt>). */ public static final int YYABORT = 1; ]b4_push_if([ /** * Returned by a Bison action in order to request a new token. */ public static final int YYPUSH_MORE = 4;])[ /** * Returned by a Bison action in order to start error recovery without * printing an error message. */ public static final int YYERROR = 2; /** * Internal return codes that are not supported for user semantic * actions. */ private static final int YYERRLAB = 3; private static final int YYNEWSTATE = 4; private static final int YYDEFAULT = 5; private static final int YYREDUCE = 6; private static final int YYERRLAB1 = 7; private static final int YYRETURN = 8; ]b4_push_if([[ private static final int YYGETTOKEN = 9; /* Signify that a new token is expected when doing push-parsing. */]])[ private int yyerrstatus_ = 0; ]b4_push_if([b4_define_state])[ /** * Whether error recovery is being done. In this state, the parser * reads token until it reaches a known state, and then restarts normal * operation. */ public final boolean recovering () { return yyerrstatus_ == 0; } /** Compute post-reduction state. * @@param yystate the current state * @@param yysym the nonterminal to push on the stack */ private int yyLRGotoState (int yystate, int yysym) { int yyr = yypgoto_[yysym - YYNTOKENS_] + yystate; if (0 <= yyr && yyr <= YYLAST_ && yycheck_[yyr] == yystate) return yytable_[yyr]; else return yydefgoto_[yysym - YYNTOKENS_]; } private int yyaction(int yyn, YYStack yystack, int yylen)]b4_maybe_throws([b4_throws])[ { /* If YYLEN is nonzero, implement the default value of the action: '$$ = $1'. Otherwise, use the top of the stack. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison users should not rely upon it. */ ]b4_yystype[ yyval = (0 < yylen) ? yystack.valueAt(yylen - 1) : yystack.valueAt(0);]b4_locations_if([[ ]b4_location_type[ yyloc = yylloc(yystack, yylen);]])[]b4_parse_trace_if([[ yyReducePrint(yyn, yystack);]])[ switch (yyn) { ]b4_user_actions[ default: break; }]b4_parse_trace_if([[ yySymbolPrint("-> $$ =", SymbolKind.get(yyr1_[yyn]), yyval]b4_locations_if([, yyloc])[);]])[ yystack.pop(yylen); yylen = 0; /* Shift the result of the reduction. */ int yystate = yyLRGotoState(yystack.stateAt(0), yyr1_[yyn]); yystack.push(yystate, yyval]b4_locations_if([, yyloc])[); return YYNEWSTATE; } ]b4_parse_trace_if([[ /*--------------------------------. | Print this symbol on YYOUTPUT. | `--------------------------------*/ private void yySymbolPrint(String s, SymbolKind yykind, ]b4_yystype[ yyvalue]b4_locations_if([, ]b4_location_type[ yylocation])[) { if (0 < yydebug) { yycdebug(s + (yykind.getCode() < YYNTOKENS_ ? " token " : " nterm ") + yykind.getName() + " ("]b4_locations_if([ + yylocation + ": "])[ + (yyvalue == null ? "(null)" : yyvalue.toString()) + ")"); } }]])[ ]b4_push_if([],[[ /** * Parse input from the scanner that was specified at object construction * time. Return whether the end of the input was reached successfully. * * @@return <tt>true</tt> if the parsing succeeds. Note that this does not * imply that there were no syntax errors. */ public boolean parse()]b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])[]])[ ]b4_push_if([ /** * Push Parse input from external lexer * * @@param yylextoken current token * @@param yylexval current lval]b4_locations_if([[ * @@param yylexloc current position]])[ * * @@return <tt>YYACCEPT, YYABORT, YYPUSH_MORE</tt> */ public int push_parse(int yylextoken, b4_yystype yylexval[]b4_locations_if([, b4_location_type yylexloc]))b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])])[ {]b4_locations_if([[ /* @@$. */ ]b4_location_type[ yyloc;]])[ ]b4_push_if([],[[ ]b4_define_state[]b4_parse_trace_if([[ yycdebug ("Starting parse");]])[ yyerrstatus_ = 0; yynerrs = 0; /* Initialize the stack. */ yystack.push (yystate, yylval]b4_locations_if([, yylloc])[); ]m4_ifdef([b4_initial_action], [ b4_dollar_pushdef([yylval], [], [], [yylloc])dnl b4_user_initial_action b4_dollar_popdef[]dnl ])[ ]])[ ]b4_push_if([[ if (!this.push_parse_initialized) { push_parse_initialize (); ]m4_ifdef([b4_initial_action], [ b4_dollar_pushdef([yylval], [], [], [yylloc])dnl b4_user_initial_action b4_dollar_popdef[]dnl ])[]b4_parse_trace_if([[ yycdebug ("Starting parse");]])[ yyerrstatus_ = 0; } else label = YYGETTOKEN; boolean push_token_consumed = true; ]])[ for (;;) switch (label) { /* New state. Unlike in the C/C++ skeletons, the state is already pushed when we come here. */ case YYNEWSTATE:]b4_parse_trace_if([[ yycdebug ("Entering state " + yystate); if (0 < yydebug) yystack.print (yyDebugStream);]])[ /* Accept? */ if (yystate == YYFINAL_) ]b4_push_if([{label = YYACCEPT; break;}], [return true;])[ /* Take a decision. First try without lookahead. */ yyn = yypact_[yystate]; if (yyPactValueIsDefault (yyn)) { label = YYDEFAULT; break; } ]b4_push_if([ /* Fall Through */ case YYGETTOKEN:])[ /* Read a lookahead token. */ if (yychar == YYEMPTY_) { ]b4_push_if([[ if (!push_token_consumed) return YYPUSH_MORE;]b4_parse_trace_if([[ yycdebug ("Reading a token");]])[ yychar = yylextoken; yylval = yylexval;]b4_locations_if([ yylloc = yylexloc;])[ push_token_consumed = false;]], [b4_parse_trace_if([[ yycdebug ("Reading a token");]])[ yychar = yylexer.yylex (); yylval = yylexer.getLVal();]b4_locations_if([[ yylloc = new ]b4_location_type[(yylexer.getStartPos(), yylexer.getEndPos());]])[ ]])[ } /* Convert token to internal form. */ yytoken = yytranslate_ (yychar);]b4_parse_trace_if([[ yySymbolPrint("Next token is", yytoken, yylval]b4_locations_if([, yylloc])[);]])[ if (yytoken == ]b4_symbol(1, kind)[) { // The scanner already issued an error message, process directly // to error recovery. But do not keep the error token as // lookahead, it is too special and may lead us to an endless // loop in error recovery. */ yychar = Lexer.]b4_symbol(2, id)[; yytoken = ]b4_symbol(2, kind)[;]b4_locations_if([[ yyerrloc = yylloc;]])[ label = YYERRLAB1; } else { /* If the proper action on seeing token YYTOKEN is to reduce or to detect an error, take that action. */ yyn += yytoken.getCode(); if (yyn < 0 || YYLAST_ < yyn || yycheck_[yyn] != yytoken.getCode()) label = YYDEFAULT; /* <= 0 means reduce or error. */ else if ((yyn = yytable_[yyn]) <= 0) { if (yyTableValueIsError (yyn)) label = YYERRLAB; else { yyn = -yyn; label = YYREDUCE; } } else { /* Shift the lookahead token. */]b4_parse_trace_if([[ yySymbolPrint("Shifting", yytoken, yylval]b4_locations_if([, yylloc])[); ]])[ /* Discard the token being shifted. */ yychar = YYEMPTY_; /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus_ > 0) --yyerrstatus_; yystate = yyn; yystack.push (yystate, yylval]b4_locations_if([, yylloc])[); label = YYNEWSTATE; } } break; /*-----------------------------------------------------------. | yydefault -- do the default action for the current state. | `-----------------------------------------------------------*/ case YYDEFAULT: yyn = yydefact_[yystate]; if (yyn == 0) label = YYERRLAB; else label = YYREDUCE; break; /*-----------------------------. | yyreduce -- Do a reduction. | `-----------------------------*/ case YYREDUCE: yylen = yyr2_[yyn]; label = yyaction(yyn, yystack, yylen); yystate = yystack.stateAt (0); break; /*------------------------------------. | yyerrlab -- here on detecting error | `------------------------------------*/ case YYERRLAB: /* If not already recovering from an error, report this error. */ if (yyerrstatus_ == 0) { ++yynerrs; if (yychar == YYEMPTY_) yytoken = null; yyreportSyntaxError (new Context (yystack, yytoken]b4_locations_if([[, yylloc]])[)); } ]b4_locations_if([[ yyerrloc = yylloc;]])[ if (yyerrstatus_ == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ if (yychar <= Lexer.]b4_symbol(0, id)[) { /* Return failure if at end of input. */ if (yychar == Lexer.]b4_symbol(0, id)[) ]b4_push_if([{label = YYABORT; break;}], [return false;])[ } else yychar = YYEMPTY_; } /* Else will try to reuse lookahead token after shifting the error token. */ label = YYERRLAB1; break; /*-------------------------------------------------. | errorlab -- error raised explicitly by YYERROR. | `-------------------------------------------------*/ case YYERROR:]b4_locations_if([[ yyerrloc = yystack.locationAt (yylen - 1);]])[ /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ yystack.pop (yylen); yylen = 0; yystate = yystack.stateAt (0); label = YYERRLAB1; break; /*-------------------------------------------------------------. | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ case YYERRLAB1: yyerrstatus_ = 3; /* Each real token shifted decrements this. */ // Pop stack until we find a state that shifts the error token. for (;;) { yyn = yypact_[yystate]; if (!yyPactValueIsDefault (yyn)) { yyn += ]b4_symbol(1, kind)[.getCode(); if (0 <= yyn && yyn <= YYLAST_ && yycheck_[yyn] == ]b4_symbol(1, kind)[.getCode()) { yyn = yytable_[yyn]; if (0 < yyn) break; } } /* Pop the current state because it cannot handle the * error token. */ if (yystack.height == 0) ]b4_push_if([{label = YYABORT; break;}],[return false;])[ ]b4_locations_if([[ yyerrloc = yystack.locationAt (0);]])[ yystack.pop (); yystate = yystack.stateAt (0);]b4_parse_trace_if([[ if (0 < yydebug) yystack.print (yyDebugStream);]])[ } if (label == YYABORT) /* Leave the switch. */ break; ]b4_locations_if([[ /* Muck with the stack to setup for yylloc. */ yystack.push (0, null, yylloc); yystack.push (0, null, yyerrloc); yyloc = yylloc (yystack, 2); yystack.pop (2);]])[ /* Shift the error token. */]b4_parse_trace_if([[ yySymbolPrint("Shifting", SymbolKind.get(yystos_[yyn]), yylval]b4_locations_if([, yyloc])[);]])[ yystate = yyn; yystack.push (yyn, yylval]b4_locations_if([, yyloc])[); label = YYNEWSTATE; break; /* Accept. */ case YYACCEPT: ]b4_push_if([this.push_parse_initialized = false; return YYACCEPT;], [return true;])[ /* Abort. */ case YYABORT: ]b4_push_if([this.push_parse_initialized = false; return YYABORT;], [return false;])[ } } ]b4_push_if([[ boolean push_parse_initialized = false; /** * (Re-)Initialize the state of the push parser. */ public void push_parse_initialize () { /* Lookahead and lookahead in internal form. */ this.yychar = YYEMPTY_; this.yytoken = null; /* State. */ this.yyn = 0; this.yylen = 0; this.yystate = 0; this.yystack = new YYStack (); this.label = YYNEWSTATE; /* Error handling. */ this.yynerrs = 0;]b4_locations_if([[ /* The location where the error started. */ this.yyerrloc = null; this.yylloc = new ]b4_location_type[ (null, null);]])[ /* Semantic value of the lookahead. */ this.yylval = null; yystack.push (this.yystate, this.yylval]b4_locations_if([, this.yylloc])[); this.push_parse_initialized = true; } ]b4_locations_if([[ /** * Push parse given input from an external lexer. * * @@param yylextoken current token * @@param yylexval current lval * @@param yyylexpos current position * * @@return <tt>YYACCEPT, YYABORT, YYPUSH_MORE</tt> */ public int push_parse(int yylextoken, ]b4_yystype[ yylexval, ]b4_position_type[ yylexpos)]b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])[ { return push_parse(yylextoken, yylexval, new ]b4_location_type[(yylexpos)); } ]])])[ ]b4_both_if([[ /** * Parse input from the scanner that was specified at object construction * time. Return whether the end of the input was reached successfully. * This version of parse() is defined only when api.push-push=both. * * @@return <tt>true</tt> if the parsing succeeds. Note that this does not * imply that there were no syntax errors. */ public boolean parse()]b4_maybe_throws([b4_list2([b4_lex_throws], [b4_throws])])[ { if (yylexer == null) throw new NullPointerException("Null Lexer"); int status; do { int token = yylexer.yylex(); ]b4_yystype[ lval = yylexer.getLVal();]b4_locations_if([[ ]b4_location_type[ yyloc = new ]b4_location_type[(yylexer.getStartPos(), yylexer.getEndPos()); status = push_parse(token, lval, yyloc);]], [[ status = push_parse(token, lval);]])[ } while (status == YYPUSH_MORE); return status == YYACCEPT; } ]])[ /** * Information needed to get the list of expected tokens and to forge * a syntax error diagnostic. */ public static final class Context { Context (YYStack stack, SymbolKind token]b4_locations_if([[, ]b4_location_type[ loc]])[) { yystack = stack; yytoken = token;]b4_locations_if([[ yylocation = loc;]])[ } private YYStack yystack; /** * The symbol kind of the lookahead token. */ public final SymbolKind getToken () { return yytoken; } private SymbolKind yytoken;]b4_locations_if([[ /** * The location of the lookahead. */ public final ]b4_location_type[ getLocation () { return yylocation; } private ]b4_location_type[ yylocation;]])[ static final int NTOKENS = ]b4_parser_class[.YYNTOKENS_; /** * Put in YYARG at most YYARGN of the expected tokens given the * current YYCTX, and return the number of tokens stored in YYARG. If * YYARG is null, return the number of expected tokens (guaranteed to * be less than YYNTOKENS). */ int getExpectedTokens (SymbolKind yyarg[], int yyargn) { return getExpectedTokens (yyarg, 0, yyargn); } int getExpectedTokens (SymbolKind yyarg[], int yyoffset, int yyargn) { int yycount = yyoffset; int yyn = yypact_[this.yystack.stateAt (0)]; if (!yyPactValueIsDefault (yyn)) { /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. In other words, skip the first -YYN actions for this state because they are default actions. */ int yyxbegin = yyn < 0 ? -yyn : 0; /* Stay within bounds of both yycheck and yytname. */ int yychecklim = YYLAST_ - yyn + 1; int yyxend = yychecklim < NTOKENS ? yychecklim : NTOKENS; for (int yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck_[yyx + yyn] == yyx && yyx != ]b4_symbol(1, kind)[.getCode() && !yyTableValueIsError(yytable_[yyx + yyn])) { if (yyarg == null) yycount += 1; else if (yycount == yyargn) return 0; // FIXME: this is incorrect. else yyarg[yycount++] = SymbolKind.get(yyx); } } if (yyarg != null && yycount == yyoffset && yyoffset < yyargn) yyarg[yycount] = null; return yycount - yyoffset; } } ]b4_parse_error_bmatch( [detailed\|verbose], [[ private int yysyntaxErrorArguments (Context yyctx, SymbolKind[] yyarg, int yyargn) { /* There are many possibilities here to consider: - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected tokens because there are none. - The only way there can be no lookahead present (in tok) is if this state is a consistent state with a default action. Thus, detecting the absence of a lookahead is sufficient to determine that there is no unexpected or expected token to report. In that case, just report a simple "syntax error". - Don't assume there isn't a lookahead just because this state is a consistent state with a default action. There might have been a previous inconsistent state, consistent state with a non-default action, or user semantic action that manipulated yychar. (However, yychar is currently out of scope during semantic actions.) - Of course, the expected token list depends on states to have correct lookahead information, and it depends on the parser not to perform extra reductions after fetching a lookahead from the scanner and before detecting a syntax error. Thus, state merging (from LALR or IELR) and default reductions corrupt the expected token list. However, the list is correct for canonical LR with one exception: it will still contain any token that will not be accepted due to an error action in a later state. */ int yycount = 0; if (yyctx.getToken() != null) { if (yyarg != null) yyarg[yycount] = yyctx.getToken(); yycount += 1; yycount += yyctx.getExpectedTokens(yyarg, 1, yyargn); } return yycount; } ]])[ /** * Build and emit a "syntax error" message in a user-defined way. * * @@param ctx The context of the error. */ private void yyreportSyntaxError(Context yyctx) {]b4_parse_error_bmatch( [custom], [[ yylexer.reportSyntaxError(yyctx);]], [detailed\|verbose], [[ if (yyErrorVerbose) { final int argmax = 5; SymbolKind[] yyarg = new SymbolKind[argmax]; int yycount = yysyntaxErrorArguments(yyctx, yyarg, argmax); String[] yystr = new String[yycount]; for (int yyi = 0; yyi < yycount; ++yyi) { yystr[yyi] = yyarg[yyi].getName(); } String yyformat; switch (yycount) { default: case 0: yyformat = ]b4_trans(["syntax error"])[; break; case 1: yyformat = ]b4_trans(["syntax error, unexpected {0}"])[; break; case 2: yyformat = ]b4_trans(["syntax error, unexpected {0}, expecting {1}"])[; break; case 3: yyformat = ]b4_trans(["syntax error, unexpected {0}, expecting {1} or {2}"])[; break; case 4: yyformat = ]b4_trans(["syntax error, unexpected {0}, expecting {1} or {2} or {3}"])[; break; case 5: yyformat = ]b4_trans(["syntax error, unexpected {0}, expecting {1} or {2} or {3} or {4}"])[; break; } yyerror(]b4_locations_if([[yyctx.yylocation, ]])[new MessageFormat(yyformat).format(yystr)); } else { yyerror(]b4_locations_if([[yyctx.yylocation, ]])[]b4_trans(["syntax error"])[); }]], [simple], [[ yyerror(]b4_locations_if([[yyctx.yylocation, ]])[]b4_trans(["syntax error"])[);]])[ } /** * Whether the given <code>yypact_</code> value indicates a defaulted state. * @@param yyvalue the value to check */ private static boolean yyPactValueIsDefault (int yyvalue) { return yyvalue == yypact_ninf_; } /** * Whether the given <code>yytable_</code> * value indicates a syntax error. * @@param yyvalue the value to check */ private static boolean yyTableValueIsError (int yyvalue) { return yyvalue == yytable_ninf_; } private static final ]b4_int_type_for([b4_pact])[ yypact_ninf_ = ]b4_pact_ninf[; private static final ]b4_int_type_for([b4_table])[ yytable_ninf_ = ]b4_table_ninf[; ]b4_parser_tables_define[ ]b4_parse_trace_if([[ ]b4_integral_parser_table_define([rline], [b4_rline], [[YYRLINE[YYN] -- Source line where rule number YYN was defined.]])[ // Report on the debug stream that the rule yyrule is going to be reduced. private void yyReducePrint (int yyrule, YYStack yystack) { if (yydebug == 0) return; int yylno = yyrline_[yyrule]; int yynrhs = yyr2_[yyrule]; /* Print the symbols being reduced, and their result. */ yycdebug ("Reducing stack by rule " + (yyrule - 1) + " (line " + yylno + "):"); /* The symbols being reduced. */ for (int yyi = 0; yyi < yynrhs; yyi++) yySymbolPrint(" $" + (yyi + 1) + " =", SymbolKind.get(yystos_[yystack.stateAt (yynrhs - (yyi + 1))]), ]b4_rhs_data(yynrhs, yyi + 1)b4_locations_if([, b4_rhs_location(yynrhs, yyi + 1)])[); }]])[ /* YYTRANSLATE_(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM as returned by yylex, with out-of-bounds checking. */ private static final SymbolKind yytranslate_(int t) ]b4_api_token_raw_if(dnl [[ { return SymbolKind.get(t); } ]], [[ { // Last valid token kind. int code_max = ]b4_code_max[; if (t <= 0) return ]b4_symbol(0, kind)[; else if (t <= code_max) return SymbolKind.get(yytranslate_table_[t]); else return ]b4_symbol(2, kind)[; } ]b4_integral_parser_table_define([translate_table], [b4_translate])[ ]])[ private static final int YYLAST_ = ]b4_last[; private static final int YYEMPTY_ = -2; private static final int YYFINAL_ = ]b4_final_state_number[; private static final int YYNTOKENS_ = ]b4_tokens_number[; ]b4_percent_code_get[ } ]b4_percent_code_get([[epilogue]])[]dnl b4_epilogue[]dnl b4_output_end PK r�!\��k k skeletons/yacc.cnu �[��� # -*- C -*- # Yacc compatible skeleton for Bison # Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2020 Free Software # Foundation, Inc. m4_pushdef([b4_copyright_years], [1984, 1989-1990, 2000-2015, 2018-2020]) # 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/>. m4_include(b4_skeletonsdir/[c.m4]) ## ---------- ## ## api.pure. ## ## ---------- ## b4_percent_define_default([[api.pure]], [[false]]) b4_percent_define_check_values([[[[api.pure]], [[false]], [[true]], [[]], [[full]]]]) m4_define([b4_pure_flag], [[0]]) m4_case(b4_percent_define_get([[api.pure]]), [false], [m4_define([b4_pure_flag], [[0]])], [true], [m4_define([b4_pure_flag], [[1]])], [], [m4_define([b4_pure_flag], [[1]])], [full], [m4_define([b4_pure_flag], [[2]])]) m4_define([b4_pure_if], [m4_case(b4_pure_flag, [0], [$2], [1], [$1], [2], [$1])]) [m4_fatal([invalid api.pure value: ]$1)])]) ## --------------- ## ## api.push-pull. ## ## --------------- ## # b4_pull_if, b4_push_if # ---------------------- # Whether the pull/push APIs are needed. Both can be enabled. b4_percent_define_default([[api.push-pull]], [[pull]]) b4_percent_define_check_values([[[[api.push-pull]], [[pull]], [[push]], [[both]]]]) b4_define_flag_if([pull]) m4_define([b4_pull_flag], [[1]]) b4_define_flag_if([push]) m4_define([b4_push_flag], [[1]]) m4_case(b4_percent_define_get([[api.push-pull]]), [pull], [m4_define([b4_push_flag], [[0]])], [push], [m4_define([b4_pull_flag], [[0]])]) # Handle BISON_USE_PUSH_FOR_PULL for the test suite. So that push parsing # tests function as written, do not let BISON_USE_PUSH_FOR_PULL modify the # behavior of Bison at all when push parsing is already requested. b4_define_flag_if([use_push_for_pull]) b4_use_push_for_pull_if([ b4_push_if([m4_define([b4_use_push_for_pull_flag], [[0]])], [m4_define([b4_push_flag], [[1]])])]) ## ----------- ## ## parse.lac. ## ## ----------- ## b4_percent_define_default([[parse.lac]], [[none]]) b4_percent_define_default([[parse.lac.es-capacity-initial]], [[20]]) b4_percent_define_default([[parse.lac.memory-trace]], [[failures]]) b4_percent_define_check_values([[[[parse.lac]], [[full]], [[none]]]], [[[[parse.lac.memory-trace]], [[failures]], [[full]]]]) b4_define_flag_if([lac]) m4_define([b4_lac_flag], [m4_if(b4_percent_define_get([[parse.lac]]), [none], [[0]], [[1]])]) ## ---------------- ## ## Default values. ## ## ---------------- ## # Stack parameters. m4_define_default([b4_stack_depth_max], [10000]) m4_define_default([b4_stack_depth_init], [200]) # b4_yyerror_arg_loc_if(ARG) # -------------------------- # Expand ARG iff yyerror is to be given a location as argument. m4_define([b4_yyerror_arg_loc_if], [b4_locations_if([m4_case(b4_pure_flag, [1], [m4_ifset([b4_parse_param], [$1])], [2], [$1])])]) # b4_yyerror_args # --------------- # Arguments passed to yyerror: user args plus yylloc. m4_define([b4_yyerror_args], [b4_yyerror_arg_loc_if([&yylloc, ])dnl m4_ifset([b4_parse_param], [b4_args(b4_parse_param), ])]) ## ----------------- ## ## Semantic Values. ## ## ----------------- ## # b4_lhs_value(SYMBOL-NUM, [TYPE]) # -------------------------------- # See README. m4_define([b4_lhs_value], [b4_symbol_value(yyval, [$1], [$2])]) # b4_rhs_value(RULE-LENGTH, POS, [SYMBOL-NUM], [TYPE]) # ---------------------------------------------------- # See README. m4_define([b4_rhs_value], [b4_symbol_value([yyvsp@{b4_subtract([$2], [$1])@}], [$3], [$4])]) ## ----------- ## ## Locations. ## ## ----------- ## # b4_lhs_location() # ----------------- # Expansion of @$. # Overparenthetized to avoid obscure problems with "foo$$bar = foo$1bar". m4_define([b4_lhs_location], [(yyloc)]) # b4_rhs_location(RULE-LENGTH, POS) # --------------------------------- # Expansion of @POS, where the current rule has RULE-LENGTH symbols # on RHS. # Overparenthetized to avoid obscure problems with "foo$$bar = foo$1bar". m4_define([b4_rhs_location], [(yylsp@{b4_subtract([$2], [$1])@})]) ## -------------- ## ## Declarations. ## ## -------------- ## # b4_declare_scanner_communication_variables # ------------------------------------------ # Declare the variables that are global, or local to YYPARSE if # pure-parser. m4_define([b4_declare_scanner_communication_variables], [[ /* Lookahead token kind. */ int yychar; ]b4_pure_if([[ /* The semantic value of the lookahead symbol. */ /* Default value used for initialization, for pacifying older GCCs or non-GCC compilers. */ YY_INITIAL_VALUE (static YYSTYPE yyval_default;) YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);]b4_locations_if([[ /* Location data for the lookahead symbol. */ static YYLTYPE yyloc_default]b4_yyloc_default[; YYLTYPE yylloc = yyloc_default;]])], [[/* The semantic value of the lookahead symbol. */ YYSTYPE yylval;]b4_locations_if([[ /* Location data for the lookahead symbol. */ YYLTYPE yylloc]b4_yyloc_default[;]])[ /* Number of syntax errors so far. */ int yynerrs;]])]) # b4_declare_parser_state_variables([INIT]) # ----------------------------------------- # Declare all the variables that are needed to maintain the parser state # between calls to yypush_parse. # If INIT is non-null, initialize these variables. m4_define([b4_declare_parser_state_variables], [b4_pure_if([[ /* Number of syntax errors so far. */ int yynerrs]m4_ifval([$1], [ = 0])[; ]])[ yy_state_fast_t yystate]m4_ifval([$1], [ = 0])[; /* Number of tokens to shift before error messages enabled. */ int yyerrstatus]m4_ifval([$1], [ = 0])[; /* Refer to the stacks through separate pointers, to allow yyoverflow to reallocate them elsewhere. */ /* Their size. */ YYPTRDIFF_T yystacksize]m4_ifval([$1], [ = YYINITDEPTH])[; /* The state stack: array, bottom, top. */ yy_state_t yyssa[YYINITDEPTH]; yy_state_t *yyss]m4_ifval([$1], [ = yyssa])[; yy_state_t *yyssp]m4_ifval([$1], [ = yyss])[; /* The semantic value stack: array, bottom, top. */ YYSTYPE yyvsa[YYINITDEPTH]; YYSTYPE *yyvs]m4_ifval([$1], [ = yyvsa])[; YYSTYPE *yyvsp]m4_ifval([$1], [ = yyvs])[;]b4_locations_if([[ /* The location stack: array, bottom, top. */ YYLTYPE yylsa[YYINITDEPTH]; YYLTYPE *yyls]m4_ifval([$1], [ = yylsa])[; YYLTYPE *yylsp]m4_ifval([$1], [ = yyls])[;]])[]b4_lac_if([[ yy_state_t yyesa@{]b4_percent_define_get([[parse.lac.es-capacity-initial]])[@}; yy_state_t *yyes]m4_ifval([$1], [ = yyesa])[; YYPTRDIFF_T yyes_capacity][]m4_ifval([$1], [m4_do([ = b4_percent_define_get([[parse.lac.es-capacity-initial]]) < YYMAXDEPTH], [ ? b4_percent_define_get([[parse.lac.es-capacity-initial]])], [ : YYMAXDEPTH])])[;]])]) m4_define([b4_macro_define], [[#]define $1 $2]) m4_define([b4_macro_undef], [[#]undef $1]) m4_define([b4_pstate_macro_define], [b4_macro_define([$1], [yyps->$1])]) # b4_parse_state_variable_macros(b4_macro_define|b4_macro_undef) # -------------------------------------------------------------- m4_define([b4_parse_state_variable_macros], [b4_pure_if([$1([b4_prefix[]nerrs])]) $1([yystate]) $1([yyerrstatus]) $1([yyssa]) $1([yyss]) $1([yyssp]) $1([yyvsa]) $1([yyvs]) $1([yyvsp])[]b4_locations_if([ $1([yylsa]) $1([yyls]) $1([yylsp])]) $1([yystacksize])[]b4_lac_if([ $1([yyesa]) $1([yyes]) $1([yyes_capacity])])]) # _b4_declare_yyparse_push # ------------------------ # Declaration of yyparse (and dependencies) when using the push parser # (including in pull mode). m4_define([_b4_declare_yyparse_push], [[#ifndef YYPUSH_MORE_DEFINED # define YYPUSH_MORE_DEFINED enum { YYPUSH_MORE = 4 }; #endif typedef struct ]b4_prefix[pstate ]b4_prefix[pstate; ]b4_pull_if([[ int ]b4_prefix[parse (]m4_ifset([b4_parse_param], [b4_formals(b4_parse_param)], [void])[);]])[ int ]b4_prefix[push_parse (]b4_prefix[pstate *ps]b4_pure_if([[, int pushed_char, ]b4_api_PREFIX[STYPE const *pushed_val]b4_locations_if([[, ]b4_api_PREFIX[LTYPE *pushed_loc]])])b4_user_formals[); ]b4_pull_if([[int ]b4_prefix[pull_parse (]b4_prefix[pstate *ps]b4_user_formals[);]])[ ]b4_prefix[pstate *]b4_prefix[pstate_new (void); void ]b4_prefix[pstate_delete (]b4_prefix[pstate *ps); ]]) # _b4_declare_yyparse # ------------------- # When not the push parser. m4_define([_b4_declare_yyparse], [[int ]b4_prefix[parse (]m4_ifset([b4_parse_param], [b4_formals(b4_parse_param)], [void])[);]]) # b4_declare_yyparse # ------------------ m4_define([b4_declare_yyparse], [b4_push_if([_b4_declare_yyparse_push], [_b4_declare_yyparse])[]dnl ]) # b4_shared_declarations # ---------------------- # Declaration that might either go into the header (if --defines) # or open coded in the parser body. m4_define([b4_shared_declarations], [b4_cpp_guard_open([b4_spec_mapped_header_file])[ ]b4_declare_yydebug[ ]b4_percent_code_get([[requires]])[ ]b4_token_enums_defines[ ]b4_declare_yylstype[ ]b4_declare_yyparse[ ]b4_percent_code_get([[provides]])[ ]b4_cpp_guard_close([b4_spec_mapped_header_file])[]dnl ]) # b4_header_include_if(IF-TRUE, IF-FALSE) # --------------------------------------- # Run IF-TRUE if we generate an output file and api.header.include # is defined. m4_define([b4_header_include_if], [m4_ifval(m4_quote(b4_spec_header_file), [b4_percent_define_ifdef([[api.header.include]], [$1], [$2])], [$2])]) m4_if(b4_spec_header_file, [y.tab.h], [], [b4_percent_define_default([[api.header.include]], [["@basename(]b4_spec_header_file[@)"]])]) ## -------------- ## ## Output files. ## ## -------------- ## b4_defines_if([[ ]b4_output_begin([b4_spec_header_file])[ ]b4_copyright([Bison interface for Yacc-like parsers in C])[ ]b4_disclaimer[ ]b4_shared_declarations[ ]b4_output_end[ ]])# b4_defines_if b4_output_begin([b4_parser_file_name])[ ]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. */ ]b4_disclaimer[ /* All symbols defined below should begin with yy or YY, to avoid infringing on user name space. This should be done even for local variables, as they might otherwise be expanded by user macros. There are some unavoidable exceptions within include files to define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ ]b4_identification[ ]b4_percent_code_get([[top]])[]dnl m4_if(b4_api_prefix, [yy], [], [[/* Substitute the type names. */ #define YYSTYPE ]b4_api_PREFIX[STYPE]b4_locations_if([[ #define YYLTYPE ]b4_api_PREFIX[LTYPE]])])[ ]m4_if(b4_prefix, [yy], [], [[/* Substitute the variable and function names. */]b4_pull_if([[ #define yyparse ]b4_prefix[parse]])b4_push_if([[ #define yypush_parse ]b4_prefix[push_parse]b4_pull_if([[ #define yypull_parse ]b4_prefix[pull_parse]])[ #define yypstate_new ]b4_prefix[pstate_new #define yypstate_clear ]b4_prefix[pstate_clear #define yypstate_delete ]b4_prefix[pstate_delete #define yypstate ]b4_prefix[pstate]])[ #define yylex ]b4_prefix[lex #define yyerror ]b4_prefix[error #define yydebug ]b4_prefix[debug #define yynerrs ]b4_prefix[nerrs]]b4_pure_if([], [[ #define yylval ]b4_prefix[lval #define yychar ]b4_prefix[char]b4_locations_if([[ #define yylloc ]b4_prefix[lloc]])]))[ ]b4_user_pre_prologue[ ]b4_cast_define[ ]b4_null_define[ ]b4_header_include_if([[#include ]b4_percent_define_get([[api.header.include]])], [m4_ifval(m4_quote(b4_spec_header_file), [/* Use api.header.include to #include this header instead of duplicating it here. */ ])b4_shared_declarations])[ ]b4_declare_symbol_enum[ ]b4_user_post_prologue[ ]b4_percent_code_get[ ]b4_c99_int_type_define[ ]b4_sizes_types_define[ /* Stored state numbers (used for stacks). */ typedef ]b4_int_type(0, m4_eval(b4_states_number - 1))[ yy_state_t; /* State numbers in computations. */ typedef int yy_state_fast_t; #ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ # define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ # define YY_(Msgid) Msgid # endif #endif ]b4_has_translations_if([ #ifndef N_ # define N_(Msgid) Msgid #endif ])[ ]b4_attribute_define[ ]b4_parse_assert_if([[#ifdef NDEBUG # define YY_ASSERT(E) ((void) (0 && (E))) #else # include <assert.h> /* INFRINGES ON USER NAME SPACE */ # define YY_ASSERT(E) assert (E) #endif ]], [[#define YY_ASSERT(E) ((void) (0 && (E)))]])[ #if ]b4_lac_if([[1]], [b4_parse_error_case([simple], [[!defined yyoverflow]], [[1]])])[ /* The parser invokes alloca or malloc; define the necessary symbols. */]dnl b4_push_if([], [b4_lac_if([], [[ # ifdef YYSTACK_USE_ALLOCA # if YYSTACK_USE_ALLOCA # ifdef __GNUC__ # define YYSTACK_ALLOC __builtin_alloca # elif defined __BUILTIN_VA_ARG_INCR # include <alloca.h> /* INFRINGES ON USER NAME SPACE */ # elif defined _AIX # define YYSTACK_ALLOC __alloca # elif defined _MSC_VER # include <malloc.h> /* INFRINGES ON USER NAME SPACE */ # define alloca _alloca # else # define YYSTACK_ALLOC alloca # if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ /* Use EXIT_SUCCESS as a witness for stdlib.h. */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 # endif # endif # endif # endif # endif]])])[ # ifdef YYSTACK_ALLOC /* Pacify GCC's 'empty if-body' warning. */ # define YYSTACK_FREE(Ptr) do { /* empty */; } while (0) # ifndef YYSTACK_ALLOC_MAXIMUM /* The OS might guarantee only one guard page at the bottom of the stack, and a page size can be as small as 4096 bytes. So we cannot safely invoke alloca (N) if N exceeds 4096. Use a slightly smaller number to allow for a few compiler-allocated temporary stack slots. */ # define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */ # endif # else # define YYSTACK_ALLOC YYMALLOC # define YYSTACK_FREE YYFREE # ifndef YYSTACK_ALLOC_MAXIMUM # define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM # endif # if (defined __cplusplus && ! defined EXIT_SUCCESS \ && ! ((defined YYMALLOC || defined malloc) \ && (defined YYFREE || defined free))) # include <stdlib.h> /* INFRINGES ON USER NAME SPACE */ # ifndef EXIT_SUCCESS # define EXIT_SUCCESS 0 # endif # endif # ifndef YYMALLOC # define YYMALLOC malloc # if ! defined malloc && ! defined EXIT_SUCCESS void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */ # endif # endif # ifndef YYFREE # define YYFREE free # if ! defined free && ! defined EXIT_SUCCESS void free (void *); /* INFRINGES ON USER NAME SPACE */ # endif # endif # endif]b4_lac_if([[ # define YYCOPY_NEEDED 1]])[ #endif /* ]b4_lac_if([[1]], [b4_parse_error_case([simple], [[!defined yyoverflow]], [[1]])])[ */ #if (! defined yyoverflow \ && (! defined __cplusplus \ || (]b4_locations_if([[defined ]b4_api_PREFIX[LTYPE_IS_TRIVIAL && ]b4_api_PREFIX[LTYPE_IS_TRIVIAL \ && ]])[defined ]b4_api_PREFIX[STYPE_IS_TRIVIAL && ]b4_api_PREFIX[STYPE_IS_TRIVIAL))) /* A type that is properly aligned for any stack member. */ union yyalloc { yy_state_t yyss_alloc; YYSTYPE yyvs_alloc;]b4_locations_if([ YYLTYPE yyls_alloc;])[ }; /* The size of the maximum gap between one aligned stack and the next. */ # define YYSTACK_GAP_MAXIMUM (YYSIZEOF (union yyalloc) - 1) /* The size of an array large to enough to hold all stacks, each with N elements. */ ]b4_locations_if( [# define YYSTACK_BYTES(N) \ ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE) \ + YYSIZEOF (YYLTYPE)) \ + 2 * YYSTACK_GAP_MAXIMUM)], [# define YYSTACK_BYTES(N) \ ((N) * (YYSIZEOF (yy_state_t) + YYSIZEOF (YYSTYPE)) \ + YYSTACK_GAP_MAXIMUM)])[ # define YYCOPY_NEEDED 1 /* Relocate STACK from its old location to the new one. The local variables YYSIZE and YYSTACKSIZE give the old and new number of 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 \ { \ YYPTRDIFF_T yynewbytes; \ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \ Stack = &yyptr->Stack_alloc; \ yynewbytes = yystacksize * YYSIZEOF (*Stack) + YYSTACK_GAP_MAXIMUM; \ yyptr += yynewbytes / YYSIZEOF (*yyptr); \ } \ while (0) #endif #if defined YYCOPY_NEEDED && YYCOPY_NEEDED /* Copy COUNT objects from SRC to DST. The source and destination do not overlap. */ # ifndef YYCOPY # if defined __GNUC__ && 1 < __GNUC__ # define YYCOPY(Dst, Src, Count) \ __builtin_memcpy (Dst, Src, YY_CAST (YYSIZE_T, (Count)) * sizeof (*(Src))) # else # define YYCOPY(Dst, Src, Count) \ do \ { \ YYPTRDIFF_T yyi; \ for (yyi = 0; yyi < (Count); yyi++) \ (Dst)[yyi] = (Src)[yyi]; \ } \ while (0) # endif # endif #endif /* !YYCOPY_NEEDED */ /* YYFINAL -- State number of the termination state. */ #define YYFINAL ]b4_final_state_number[ /* YYLAST -- Last index in YYTABLE. */ #define YYLAST ]b4_last[ /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS ]b4_tokens_number[ /* YYNNTS -- Number of nonterminals. */ #define YYNNTS ]b4_nterms_number[ /* YYNRULES -- Number of rules. */ #define YYNRULES ]b4_rules_number[ /* YYNSTATES -- Number of states. */ #define YYNSTATES ]b4_states_number[ /* YYMAXUTOK -- Last valid token kind. */ #define YYMAXUTOK ]b4_code_max[ /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM as returned by yylex, with out-of-bounds checking. */ ]b4_api_token_raw_if(dnl [[#define YYTRANSLATE(YYX) YY_CAST (yysymbol_kind_t, YYX)]], [[#define YYTRANSLATE(YYX) \ (0 <= (YYX) && (YYX) <= YYMAXUTOK \ ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ : ]b4_symbol_prefix[YYUNDEF) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM as returned by yylex. */ static const ]b4_int_type_for([b4_translate])[ yytranslate[] = { ]b4_translate[ };]])[ #if ]b4_api_PREFIX[DEBUG ]b4_integral_parser_table_define([rline], [b4_rline], [[YYRLINE[YYN] -- Source line where rule number YYN was defined.]])[ #endif /** Accessing symbol of state STATE. */ #define YY_ACCESSING_SYMBOL(State) YY_CAST (yysymbol_kind_t, yystos[State]) #if ]b4_parse_error_case([simple], [b4_api_PREFIX[DEBUG || ]b4_token_table_flag], [[1]])[ /* The user-facing name of the symbol whose (internal) number is YYSYMBOL. No bounds checking. */ static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; ]b4_parse_error_bmatch([simple\|verbose], [[/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { ]b4_tname[ }; static const char * yysymbol_name (yysymbol_kind_t yysymbol) { return yytname[yysymbol]; }]], [[static const char * yysymbol_name (yysymbol_kind_t yysymbol) { static const char *const yy_sname[] = { ]b4_symbol_names[ };]b4_has_translations_if([[ /* YYTRANSLATABLE[SYMBOL-NUM] -- Whether YY_SNAME[SYMBOL-NUM] is internationalizable. */ static ]b4_int_type_for([b4_translatable])[ yytranslatable[] = { ]b4_translatable[ }; return (yysymbol < YYNTOKENS && yytranslatable[yysymbol] ? _(yy_sname[yysymbol]) : yy_sname[yysymbol]);]], [[ return yy_sname[yysymbol];]])[ }]])[ #endif #ifdef YYPRINT /* 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 #define YYPACT_NINF (]b4_pact_ninf[) #define yypact_value_is_default(Yyn) \ ]b4_table_value_equals([[pact]], [[Yyn]], [b4_pact_ninf], [YYPACT_NINF])[ #define YYTABLE_NINF (]b4_table_ninf[) #define yytable_value_is_error(Yyn) \ ]b4_table_value_equals([[table]], [[Yyn]], [b4_table_ninf], [YYTABLE_NINF])[ ]b4_parser_tables_define[ enum { YYENOMEM = -2 }; #define yyerrok (yyerrstatus = 0) #define yyclearin (yychar = ]b4_symbol(-2, id)[) #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab #define YYERROR goto yyerrorlab #define YYRECOVERING() (!!yyerrstatus) #define YYBACKUP(Token, Value) \ do \ if (yychar == ]b4_symbol(-2, id)[) \ { \ yychar = (Token); \ yylval = (Value); \ YYPOPSTACK (yylen); \ yystate = *yyssp; \]b4_lac_if([[ YY_LAC_DISCARD ("YYBACKUP"); \]])[ goto yybackup; \ } \ else \ { \ yyerror (]b4_yyerror_args[YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (0) /* Backward compatibility with an undocumented macro. Use ]b4_symbol(1, id)[ or ]b4_symbol(2, id)[. */ #define YYERRCODE ]b4_symbol(2, id)[ ]b4_locations_if([[ ]b4_yylloc_default_define[ #define YYRHSLOC(Rhs, K) ((Rhs)[K]) ]])[ /* Enable debugging if requested. */ #if ]b4_api_PREFIX[DEBUG # ifndef YYFPRINTF # include <stdio.h> /* INFRINGES ON USER NAME SPACE */ # define YYFPRINTF fprintf # endif # define YYDPRINTF(Args) \ do { \ if (yydebug) \ YYFPRINTF Args; \ } while (0) ]b4_yy_location_print_define[ # define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ do { \ if (yydebug) \ { \ YYFPRINTF (stderr, "%s ", Title); \ yy_symbol_print (stderr, \ Kind, Value]b4_locations_if([, Location])[]b4_user_args[); \ YYFPRINTF (stderr, "\n"); \ } \ } while (0) ]b4_yy_symbol_print_define[ /*------------------------------------------------------------------. | yy_stack_print -- Print the state stack from its BOTTOM up to its | | TOP (included). | `------------------------------------------------------------------*/ static void yy_stack_print (yy_state_t *yybottom, yy_state_t *yytop) { YYFPRINTF (stderr, "Stack now"); for (; yybottom <= yytop; yybottom++) { int yybot = *yybottom; YYFPRINTF (stderr, " %d", yybot); } YYFPRINTF (stderr, "\n"); } # define YY_STACK_PRINT(Bottom, Top) \ do { \ if (yydebug) \ yy_stack_print ((Bottom), (Top)); \ } while (0) /*------------------------------------------------. | Report that the YYRULE is going to be reduced. | `------------------------------------------------*/ static void yy_reduce_print (yy_state_t *yyssp, YYSTYPE *yyvsp,]b4_locations_if([[ YYLTYPE *yylsp,]])[ int yyrule]b4_user_formals[) { int yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; YYFPRINTF (stderr, "Reducing stack by rule %d (line %d):\n", yyrule - 1, yylno); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, YY_ACCESSING_SYMBOL (+yyssp[yyi + 1 - yynrhs]), &]b4_rhs_value(yynrhs, yyi + 1)[]b4_locations_if([, &]b4_rhs_location(yynrhs, yyi + 1))[]b4_user_args[); YYFPRINTF (stderr, "\n"); } } # define YY_REDUCE_PRINT(Rule) \ do { \ if (yydebug) \ yy_reduce_print (yyssp, yyvsp, ]b4_locations_if([yylsp, ])[Rule]b4_user_args[); \ } while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; #else /* !]b4_api_PREFIX[DEBUG */ # define YYDPRINTF(Args) ((void) 0) # define YY_SYMBOL_PRINT(Title, Kind, Value, Location) # define YY_STACK_PRINT(Bottom, Top) # define YY_REDUCE_PRINT(Rule) #endif /* !]b4_api_PREFIX[DEBUG */ /* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH # define YYINITDEPTH ]b4_stack_depth_init[ #endif /* YYMAXDEPTH -- maximum size the stacks can grow to (effective only if the built-in stack extension method is used). Do not make this value too large; the results are undefined if YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH) evaluated with infinite-precision integer arithmetic. */ #ifndef YYMAXDEPTH # define YYMAXDEPTH ]b4_stack_depth_max[ #endif]b4_push_if([[ /* Parser data structure. */ struct yypstate {]b4_declare_parser_state_variables[ /* Whether this instance has not started parsing yet. * If 2, it corresponds to a finished parsing. */ int yynew; };]b4_pure_if([], [[ /* Whether the only allowed instance of yypstate is allocated. */ static char yypstate_allocated = 0;]])])[ ]b4_lac_if([[ /* Given a state stack such that *YYBOTTOM is its bottom, such that *YYTOP is either its top or is YYTOP_EMPTY to indicate an empty stack, and such that *YYCAPACITY is the maximum number of elements it can hold without a reallocation, make sure there is enough room to store YYADD more elements. If not, allocate a new stack using YYSTACK_ALLOC, copy the existing elements, and adjust *YYBOTTOM, *YYTOP, and *YYCAPACITY to reflect the new capacity and memory location. If *YYBOTTOM != YYBOTTOM_NO_FREE, then free the old stack using YYSTACK_FREE. Return 0 if successful or if no reallocation is required. Return YYENOMEM if memory is exhausted. */ static int yy_lac_stack_realloc (YYPTRDIFF_T *yycapacity, YYPTRDIFF_T yyadd, #if ]b4_api_PREFIX[DEBUG char const *yydebug_prefix, char const *yydebug_suffix, #endif yy_state_t **yybottom, yy_state_t *yybottom_no_free, yy_state_t **yytop, yy_state_t *yytop_empty) { YYPTRDIFF_T yysize_old = *yytop == yytop_empty ? 0 : *yytop - *yybottom + 1; YYPTRDIFF_T yysize_new = yysize_old + yyadd; if (*yycapacity < yysize_new) { YYPTRDIFF_T yyalloc = 2 * yysize_new; yy_state_t *yybottom_new; /* Use YYMAXDEPTH for maximum stack size given that the stack should never need to grow larger than the main state stack needs to grow without LAC. */ if (YYMAXDEPTH < yysize_new) { YYDPRINTF ((stderr, "%smax size exceeded%s", yydebug_prefix, yydebug_suffix)); return YYENOMEM; } if (YYMAXDEPTH < yyalloc) yyalloc = YYMAXDEPTH; yybottom_new = YY_CAST (yy_state_t *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yyalloc * YYSIZEOF (*yybottom_new)))); if (!yybottom_new) { YYDPRINTF ((stderr, "%srealloc failed%s", yydebug_prefix, yydebug_suffix)); return YYENOMEM; } if (*yytop != yytop_empty) { YYCOPY (yybottom_new, *yybottom, yysize_old); *yytop = yybottom_new + (yysize_old - 1); } if (*yybottom != yybottom_no_free) YYSTACK_FREE (*yybottom); *yybottom = yybottom_new; *yycapacity = yyalloc;]m4_if(b4_percent_define_get([[parse.lac.memory-trace]]), [full], [[ YY_IGNORE_USELESS_CAST_BEGIN YYDPRINTF ((stderr, "%srealloc to %ld%s", yydebug_prefix, YY_CAST (long, yyalloc), yydebug_suffix)); YY_IGNORE_USELESS_CAST_END]])[ } return 0; } /* Establish the initial context for the current lookahead if no initial context is currently established. We define a context as a snapshot of the parser stacks. We define the initial context for a lookahead as the context in which the parser initially examines that lookahead in order to select a syntactic action. Thus, if the lookahead eventually proves syntactically unacceptable (possibly in a later context reached via a series of reductions), the initial context can be used to determine the exact set of tokens that would be syntactically acceptable in the lookahead's place. Moreover, it is the context after which any further semantic actions would be erroneous because they would be determined by a syntactically unacceptable token. YY_LAC_ESTABLISH should be invoked when a reduction is about to be performed in an inconsistent state (which, for the purposes of LAC, includes consistent states that don't know they're consistent because their default reductions have been disabled). Iff there is a lookahead token, it should also be invoked before reporting a syntax error. This latter case is for the sake of the debugging output. For parse.lac=full, the implementation of YY_LAC_ESTABLISH is as follows. If no initial context is currently established for the current lookahead, then check if that lookahead can eventually be shifted if syntactic actions continue from the current context. Report a syntax error if it cannot. */ #define YY_LAC_ESTABLISH \ do { \ if (!yy_lac_established) \ { \ YYDPRINTF ((stderr, \ "LAC: initial context established for %s\n", \ yysymbol_name (yytoken))); \ yy_lac_established = 1; \ switch (yy_lac (yyesa, &yyes, &yyes_capacity, yyssp, yytoken)) \ { \ case YYENOMEM: \ goto yyexhaustedlab; \ case 1: \ goto yyerrlab; \ } \ } \ } while (0) /* Discard any previous initial lookahead context because of Event, which may be a lookahead change or an invalidation of the currently established initial context for the current lookahead. The most common example of a lookahead change is a shift. An example of both cases is syntax error recovery. That is, a syntax error occurs when the lookahead is syntactically erroneous for the currently established initial context, so error recovery manipulates the parser stacks to try to find a new initial context in which the current lookahead is syntactically acceptable. If it fails to find such a context, it discards the lookahead. */ #if ]b4_api_PREFIX[DEBUG # define YY_LAC_DISCARD(Event) \ do { \ if (yy_lac_established) \ { \ YYDPRINTF ((stderr, "LAC: initial context discarded due to " \ Event "\n")); \ yy_lac_established = 0; \ } \ } while (0) #else # define YY_LAC_DISCARD(Event) yy_lac_established = 0 #endif /* Given the stack whose top is *YYSSP, return 0 iff YYTOKEN can eventually (after perhaps some reductions) be shifted, return 1 if not, or return YYENOMEM if memory is exhausted. As preconditions and postconditions: *YYES_CAPACITY is the allocated size of the array to which *YYES points, and either *YYES = YYESA or *YYES points to an array allocated with YYSTACK_ALLOC. yy_lac may overwrite the contents of either array, alter *YYES and *YYES_CAPACITY, and free any old *YYES other than YYESA. */ static int yy_lac (yy_state_t *yyesa, yy_state_t **yyes, YYPTRDIFF_T *yyes_capacity, yy_state_t *yyssp, yysymbol_kind_t yytoken) { yy_state_t *yyes_prev = yyssp; yy_state_t *yyesp = yyes_prev; /* Reduce until we encounter a shift and thereby accept the token. */ YYDPRINTF ((stderr, "LAC: checking lookahead %s:", yysymbol_name (yytoken))); if (yytoken == ]b4_symbol_prefix[YYUNDEF) { YYDPRINTF ((stderr, " Always Err\n")); return 1; } while (1) { int yyrule = yypact[+*yyesp]; if (yypact_value_is_default (yyrule) || (yyrule += yytoken) < 0 || YYLAST < yyrule || yycheck[yyrule] != yytoken) { /* Use the default action. */ yyrule = yydefact[+*yyesp]; if (yyrule == 0) { YYDPRINTF ((stderr, " Err\n")); return 1; } } else { /* Use the action from yytable. */ yyrule = yytable[yyrule]; if (yytable_value_is_error (yyrule)) { YYDPRINTF ((stderr, " Err\n")); return 1; } if (0 < yyrule) { YYDPRINTF ((stderr, " S%d\n", yyrule)); return 0; } yyrule = -yyrule; } /* By now we know we have to simulate a reduce. */ YYDPRINTF ((stderr, " R%d", yyrule - 1)); { /* Pop the corresponding number of values from the stack. */ YYPTRDIFF_T yylen = yyr2[yyrule]; /* First pop from the LAC stack as many tokens as possible. */ if (yyesp != yyes_prev) { YYPTRDIFF_T yysize = yyesp - *yyes + 1; if (yylen < yysize) { yyesp -= yylen; yylen = 0; } else { yyesp = yyes_prev; yylen -= yysize; } } /* Only afterwards look at the main stack. */ if (yylen) yyesp = yyes_prev -= yylen; } /* Push the resulting state of the reduction. */ { yy_state_fast_t yystate; { const int yylhs = yyr1[yyrule] - YYNTOKENS; const int yyi = yypgoto[yylhs] + *yyesp; yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyesp ? yytable[yyi] : yydefgoto[yylhs]); } if (yyesp == yyes_prev) { yyesp = *yyes; YY_IGNORE_USELESS_CAST_BEGIN *yyesp = YY_CAST (yy_state_t, yystate); YY_IGNORE_USELESS_CAST_END } else { if (yy_lac_stack_realloc (yyes_capacity, 1, #if ]b4_api_PREFIX[DEBUG " (", ")", #endif yyes, yyesa, &yyesp, yyes_prev)) { YYDPRINTF ((stderr, "\n")); return YYENOMEM; } YY_IGNORE_USELESS_CAST_BEGIN *++yyesp = YY_CAST (yy_state_t, yystate); YY_IGNORE_USELESS_CAST_END } YYDPRINTF ((stderr, " G%d", yystate)); } } }]])[ ]b4_parse_error_case([simple], [], [[/* Context of a parse error. */ typedef struct {]b4_push_if([[ yypstate* yyps;]], [[ yy_state_t *yyssp;]b4_lac_if([[ yy_state_t *yyesa; yy_state_t **yyes; YYPTRDIFF_T *yyes_capacity;]])])[ yysymbol_kind_t yytoken;]b4_locations_if([[ YYLTYPE *yylloc;]])[ } yypcontext_t; /* Put in YYARG at most YYARGN of the expected tokens given the current YYCTX, and return the number of tokens stored in YYARG. If YYARG is null, return the number of expected tokens (guaranteed to be less than YYNTOKENS). Return YYENOMEM on memory exhaustion. Return 0 if there are more than YYARGN expected tokens, yet fill YYARG up to YYARGN. */]b4_push_if([[ static int yypstate_expected_tokens (yypstate *yyps, yysymbol_kind_t yyarg[], int yyargn)]], [[ static int yypcontext_expected_tokens (const yypcontext_t *yyctx, yysymbol_kind_t yyarg[], int yyargn)]])[ { /* Actual size of YYARG. */ int yycount = 0; ]b4_lac_if([[ int yyx; for (yyx = 0; yyx < YYNTOKENS; ++yyx) { yysymbol_kind_t yysym = YY_CAST (yysymbol_kind_t, yyx); if (yysym != ]b4_symbol(1, kind)[ && yysym != ]b4_symbol_prefix[YYUNDEF) switch (yy_lac (]b4_push_if([[yyps->yyesa, &yyps->yyes, &yyps->yyes_capacity, yyps->yyssp, yysym]], [[yyctx->yyesa, yyctx->yyes, yyctx->yyes_capacity, yyctx->yyssp, yysym]])[)) { case YYENOMEM: return YYENOMEM; case 1: continue; default: if (!yyarg) ++yycount; else if (yycount == yyargn) return 0; else yyarg[yycount++] = yysym; } }]], [[ int yyn = yypact@{+*]b4_push_if([yyps], [yyctx])[->yyssp@}; if (!yypact_value_is_default (yyn)) { /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. In other words, skip the first -YYN actions for this state because they are default actions. */ int yyxbegin = yyn < 0 ? -yyn : 0; /* Stay within bounds of both yycheck and yytname. */ int yychecklim = YYLAST - yyn + 1; int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; int yyx; for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != ]b4_symbol(1, kind)[ && !yytable_value_is_error (yytable[yyx + yyn])) { if (!yyarg) ++yycount; else if (yycount == yyargn) return 0; else yyarg[yycount++] = YY_CAST (yysymbol_kind_t, yyx); } }]])[ if (yyarg && yycount == 0 && 0 < yyargn) yyarg[0] = ]b4_symbol(-2, kind)[; return yycount; } ]b4_push_if([[ /* Similar to the previous function. */ static int yypcontext_expected_tokens (const yypcontext_t *yyctx, yysymbol_kind_t yyarg[], int yyargn) { return yypstate_expected_tokens (yyctx->yyps, yyarg, yyargn); }]])[ ]])[ ]b4_parse_error_bmatch( [custom], [[/* The kind of the lookahead of this context. */ static yysymbol_kind_t yypcontext_token (const yypcontext_t *yyctx) YY_ATTRIBUTE_UNUSED; static yysymbol_kind_t yypcontext_token (const yypcontext_t *yyctx) { return yyctx->yytoken; } ]b4_locations_if([[/* The location of the lookahead of this context. */ static YYLTYPE * yypcontext_location (const yypcontext_t *yyctx) YY_ATTRIBUTE_UNUSED; static YYLTYPE * yypcontext_location (const yypcontext_t *yyctx) { return yyctx->yylloc; }]])[ /* User defined function to report a syntax error. */ static int yyreport_syntax_error (const yypcontext_t *yyctx]b4_user_formals[);]], [detailed\|verbose], [[#ifndef yystrlen # if defined __GLIBC__ && defined _STRING_H # define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S))) # else /* Return the length of YYSTR. */ static YYPTRDIFF_T yystrlen (const char *yystr) { YYPTRDIFF_T yylen; for (yylen = 0; yystr[yylen]; yylen++) continue; return yylen; } # endif #endif #ifndef yystpcpy # if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ static char * yystpcpy (char *yydest, const char *yysrc) { char *yyd = yydest; const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; return yyd - 1; } # endif #endif ]b4_parse_error_case( [verbose], [[#ifndef yytnamerr /* Copy to YYRES the contents of YYSTR after stripping away unnecessary quotes and backslashes, so that it's suitable for yyerror. The heuristic is that double-quoting is unnecessary unless the string contains an apostrophe, a comma, or backslash (other than backslash-backslash). YYSTR is taken from yytname. If YYRES is null, do not copy; instead, return the length of what the result would have been. */ static YYPTRDIFF_T yytnamerr (char *yyres, const char *yystr) { if (*yystr == '"') { YYPTRDIFF_T yyn = 0; char const *yyp = yystr; for (;;) switch (*++yyp) { case '\'': case ',': goto do_not_strip_quotes; case '\\': if (*++yyp != '\\') goto do_not_strip_quotes; else goto append; append: default: if (yyres) yyres[yyn] = *yyp; yyn++; break; case '"': if (yyres) yyres[yyn] = '\0'; return yyn; } do_not_strip_quotes: ; } if (yyres) return yystpcpy (yyres, yystr) - yyres; else return yystrlen (yystr); } #endif ]])[ static int yy_syntax_error_arguments (const yypcontext_t *yyctx, yysymbol_kind_t yyarg[], int yyargn) { /* Actual size of YYARG. */ int yycount = 0; /* There are many possibilities here to consider: - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected tokens because there are none. - The only way there can be no lookahead present (in yychar) is if this state is a consistent state with a default action. Thus, detecting the absence of a lookahead is sufficient to determine that there is no unexpected or expected token to report. In that case, just report a simple "syntax error". - Don't assume there isn't a lookahead just because this state is a consistent state with a default action. There might have been a previous inconsistent state, consistent state with a non-default action, or user semantic action that manipulated yychar.]b4_lac_if([[ In the first two cases, it might appear that the current syntax error should have been detected in the previous state when yy_lac was invoked. However, at that time, there might have been a different syntax error that discarded a different initial context during error recovery, leaving behind the current lookahead.]], [[ - Of course, the expected token list depends on states to have correct lookahead information, and it depends on the parser not to perform extra reductions after fetching a lookahead from the scanner and before detecting a syntax error. Thus, state merging (from LALR or IELR) and default reductions corrupt the expected token list. However, the list is correct for canonical LR with one exception: it will still contain any token that will not be accepted due to an error action in a later state.]])[ */ if (yyctx->yytoken != ]b4_symbol(-2, kind)[) { int yyn;]b4_lac_if([[ YYDPRINTF ((stderr, "Constructing syntax error message\n"));]])[ if (yyarg) yyarg[yycount] = yyctx->yytoken; ++yycount; yyn = yypcontext_expected_tokens (yyctx, yyarg ? yyarg + 1 : yyarg, yyargn - 1); if (yyn == YYENOMEM) return YYENOMEM;]b4_lac_if([[ else if (yyn == 0) YYDPRINTF ((stderr, "No expected tokens.\n"));]])[ else yycount += yyn; } return yycount; } /* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message about the unexpected token YYTOKEN for the state stack whose top is YYSSP.]b4_lac_if([[ In order to see if a particular token T is a valid looakhead, invoke yy_lac (YYESA, YYES, YYES_CAPACITY, YYSSP, T).]])[ Return 0 if *YYMSG was successfully written. Return -1 if *YYMSG is not large enough to hold the message. In that case, also set *YYMSG_ALLOC to the required number of bytes. Return YYENOMEM if the required number of bytes is too large to store]b4_lac_if([[ or if yy_lac returned YYENOMEM]])[. */ static int yysyntax_error (YYPTRDIFF_T *yymsg_alloc, char **yymsg, const yypcontext_t *yyctx) { enum { YYARGS_MAX = 5 }; /* Internationalized format string. */ const char *yyformat = YY_NULLPTR; /* Arguments of yyformat: reported tokens (one for the "unexpected", one per "expected"). */ yysymbol_kind_t yyarg[YYARGS_MAX]; /* Cumulated lengths of YYARG. */ YYPTRDIFF_T yysize = 0; /* Actual size of YYARG. */ int yycount = yy_syntax_error_arguments (yyctx, yyarg, YYARGS_MAX); if (yycount == YYENOMEM) return YYENOMEM; switch (yycount) { #define YYCASE_(N, S) \ case N: \ yyformat = S; \ break default: /* Avoid compiler warnings. */ YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); #undef YYCASE_ } /* Compute error message size. Don't count the "%s"s, but reserve room for the terminator. */ yysize = yystrlen (yyformat) - 2 * yycount + 1; { int yyi; for (yyi = 0; yyi < yycount; ++yyi) { YYPTRDIFF_T yysize1 = yysize + ]b4_parse_error_case( [verbose], [[yytnamerr (YY_NULLPTR, yytname[yyarg[yyi]])]], [[yystrlen (yysymbol_name (yyarg[yyi]))]]);[ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) yysize = yysize1; else return YYENOMEM; } } if (*yymsg_alloc < yysize) { *yymsg_alloc = 2 * yysize; if (! (yysize <= *yymsg_alloc && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM)) *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM; return -1; } /* Avoid sprintf, as that infringes on the user's name space. Don't have undefined behavior even if the translation produced a string with the wrong number of "%s"s. */ { char *yyp = *yymsg; int yyi = 0; while ((*yyp = *yyformat) != '\0') if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) {]b4_parse_error_case([verbose], [[ yyp += yytnamerr (yyp, yytname[yyarg[yyi++]]);]], [[ yyp = yystpcpy (yyp, yysymbol_name (yyarg[yyi++]));]])[ yyformat += 2; } else { ++yyp; ++yyformat; } } return 0; } ]])[ ]b4_yydestruct_define[ ]b4_pure_if([], [b4_declare_scanner_communication_variables])[ ]b4_push_if([b4_pull_if([[ int yyparse (]m4_ifset([b4_parse_param], [b4_formals(b4_parse_param)], [void])[) { yypstate *yyps = yypstate_new (); if (!yyps) {]b4_pure_if([b4_locations_if([[ static YYLTYPE yyloc_default][]b4_yyloc_default[; YYLTYPE yylloc = yyloc_default;]])[ yyerror (]b4_yyerror_args[YY_("memory exhausted"));]], [[ if (!yypstate_allocated) yyerror (]b4_yyerror_args[YY_("memory exhausted"));]])[ return 2; } int yystatus = yypull_parse (yyps]b4_user_args[); yypstate_delete (yyps); return yystatus; } int yypull_parse (yypstate *yyps]b4_user_formals[) { YY_ASSERT (yyps);]b4_pure_if([b4_locations_if([[ static YYLTYPE yyloc_default][]b4_yyloc_default[; YYLTYPE yylloc = yyloc_default;]])])[ int yystatus; do { ]b4_pure_if([[ YYSTYPE yylval; int ]])[yychar = ]b4_lex[; yystatus = yypush_parse (yyps]b4_pure_if([[, yychar, &yylval]b4_locations_if([[, &yylloc]])])m4_ifset([b4_parse_param], [, b4_args(b4_parse_param)])[); } while (yystatus == YYPUSH_MORE); return yystatus; }]])[ ]b4_parse_state_variable_macros([b4_pstate_macro_define])[ /* Initialize the parser data structure. */ static void yypstate_clear (yypstate *yyps) { yynerrs = 0; yystate = 0; yyerrstatus = 0; yyssp = yyss; yyvsp = yyvs;]b4_locations_if([[ yylsp = yyls;]])[ /* Initialize the state stack, in case yypcontext_expected_tokens is called before the first call to yyparse. */ *yyssp = 0; yyps->yynew = 1; } /* Initialize the parser data structure. */ yypstate * yypstate_new (void) { yypstate *yyps;]b4_pure_if([], [[ if (yypstate_allocated) return YY_NULLPTR;]])[ yyps = YY_CAST (yypstate *, YYMALLOC (sizeof *yyps)); if (!yyps) return YY_NULLPTR;]b4_pure_if([], [[ yypstate_allocated = 1;]])[ yystacksize = YYINITDEPTH; yyss = yyssa; yyvs = yyvsa;]b4_locations_if([[ yyls = yylsa;]])[]b4_lac_if([[ yyes = yyesa; yyes_capacity = ]b4_percent_define_get([[parse.lac.es-capacity-initial]])[; if (YYMAXDEPTH < yyes_capacity) yyes_capacity = YYMAXDEPTH;]])[ yypstate_clear (yyps); return yyps; } void yypstate_delete (yypstate *yyps) { if (yyps) { #ifndef yyoverflow /* If the stack was reallocated but the parse did not complete, then the stack still needs to be freed. */ if (yyss != yyssa) YYSTACK_FREE (yyss); #endif]b4_lac_if([[ if (yyes != yyesa) YYSTACK_FREE (yyes);]])[ YYFREE (yyps);]b4_pure_if([], [[ yypstate_allocated = 0;]])[ } } ]])[ ]b4_push_if([[ /*---------------. | yypush_parse. | `---------------*/ int yypush_parse (yypstate *yyps]b4_pure_if([[, int yypushed_char, YYSTYPE const *yypushed_val]b4_locations_if([[, YYLTYPE *yypushed_loc]])])b4_user_formals[)]], [[ /*----------. | yyparse. | `----------*/ int yyparse (]m4_ifset([b4_parse_param], [b4_formals(b4_parse_param)], [void])[)]])[ {]b4_pure_if([b4_declare_scanner_communication_variables ])b4_push_if([b4_pure_if([], [[ int yypushed_char = yychar; YYSTYPE yypushed_val = yylval;]b4_locations_if([[ YYLTYPE yypushed_loc = yylloc;]]) ])], [b4_declare_parser_state_variables([init]) ])b4_lac_if([[ /* Whether LAC context is established. A Boolean. */ int yy_lac_established = 0;]])[ int yyn; /* The return value of yyparse. */ int yyresult; /* Lookahead symbol kind. */ yysymbol_kind_t yytoken = ]b4_symbol(-2, kind)[; /* The variables used to return semantic value and location from the action routines. */ YYSTYPE yyval;]b4_locations_if([[ YYLTYPE yyloc; /* The locations where the error started and ended. */ YYLTYPE yyerror_range[3];]])[ ]b4_parse_error_bmatch([detailed\|verbose], [[ /* Buffer for error messages, and its allocated size. */ char yymsgbuf[128]; char *yymsg = yymsgbuf; YYPTRDIFF_T yymsg_alloc = sizeof yymsgbuf;]])[ #define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N)]b4_locations_if([, yylsp -= (N)])[) /* The number of symbols on the RHS of the reduced rule. Keep to zero when no symbol should be popped. */ int yylen = 0;]b4_push_if([[ switch (yyps->yynew) { case 2: yypstate_clear (yyps); goto case_0; case_0: case 0: yyn = yypact[yystate]; goto yyread_pushed_token; }]])[ YYDPRINTF ((stderr, "Starting parse\n")); yychar = ]b4_symbol(-2, id)[; /* Cause a token to be read. */ ]m4_ifdef([b4_initial_action], [ b4_dollar_pushdef([m4_define([b4_dollar_dollar_used])yylval], [], [], [b4_push_if([b4_pure_if([*])yypushed_loc], [yylloc])])dnl b4_user_initial_action b4_dollar_popdef[]dnl m4_ifdef([b4_dollar_dollar_used],[[ yyvsp[0] = yylval; ]])])dnl b4_locations_if([[ yylsp[0] = ]b4_push_if([b4_pure_if([*])yypushed_loc], [yylloc])[; ]])dnl [ goto yysetstate; /*------------------------------------------------------------. | yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; /*--------------------------------------------------------------------. | yysetstate -- set current state (the top of the stack) to yystate. | `--------------------------------------------------------------------*/ yysetstate: YYDPRINTF ((stderr, "Entering state %d\n", yystate)); YY_ASSERT (0 <= yystate && yystate < YYNSTATES); YY_IGNORE_USELESS_CAST_BEGIN *yyssp = YY_CAST (yy_state_t, yystate); YY_IGNORE_USELESS_CAST_END YY_STACK_PRINT (yyss, yyssp); if (yyss + yystacksize - 1 <= yyssp) #if !defined yyoverflow && !defined YYSTACK_RELOCATE goto yyexhaustedlab; #else { /* Get the current used size of the three stacks, in elements. */ YYPTRDIFF_T yysize = yyssp - yyss + 1; # if defined 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. */ yy_state_t *yyss1 = yyss; YYSTYPE *yyvs1 = yyvs;]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 * YYSIZEOF (*yyssp), &yyvs1, yysize * YYSIZEOF (*yyvsp),]b4_locations_if([ &yyls1, yysize * YYSIZEOF (*yylsp),])[ &yystacksize); yyss = yyss1; yyvs = yyvs1;]b4_locations_if([ yyls = yyls1;])[ } # else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) goto yyexhaustedlab; yystacksize *= 2; if (YYMAXDEPTH < yystacksize) yystacksize = YYMAXDEPTH; { yy_state_t *yyss1 = yyss; union yyalloc *yyptr = YY_CAST (union yyalloc *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, 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); } # endif yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1;]b4_locations_if([ yylsp = yyls + yysize - 1;])[ YY_IGNORE_USELESS_CAST_BEGIN YYDPRINTF ((stderr, "Stack size increased to %ld\n", YY_CAST (long, yystacksize))); YY_IGNORE_USELESS_CAST_END if (yyss + yystacksize - 1 <= yyssp) YYABORT; } #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ if (yystate == YYFINAL) YYACCEPT; goto yybackup; /*-----------. | yybackup. | `-----------*/ yybackup: /* Do appropriate processing given the current state. Read a lookahead token if we need one and don't already have one. */ /* First try to decide what to do without reference to lookahead token. */ yyn = yypact[yystate]; if (yypact_value_is_default (yyn)) goto yydefault; /* Not known => get a lookahead token if don't already have one. */ /* YYCHAR is either empty, or end-of-input, or a valid lookahead. */ if (yychar == ]b4_symbol(-2, id)[) {]b4_push_if([[ if (!yyps->yynew) {]b4_use_push_for_pull_if([], [[ YYDPRINTF ((stderr, "Return for a new token:\n"));]])[ yyresult = YYPUSH_MORE; goto yypushreturn; } yyps->yynew = 0;]b4_pure_if([], [[ /* Restoring the pushed token is only necessary for the first yypush_parse invocation since subsequent invocations don't overwrite it before jumping to yyread_pushed_token. */ yychar = yypushed_char; yylval = yypushed_val;]b4_locations_if([[ yylloc = yypushed_loc;]])])[ yyread_pushed_token:]])[ YYDPRINTF ((stderr, "Reading a token\n"));]b4_push_if([b4_pure_if([[ yychar = yypushed_char; if (yypushed_val) yylval = *yypushed_val;]b4_locations_if([[ if (yypushed_loc) yylloc = *yypushed_loc;]])])], [[ yychar = ]b4_lex[;]])[ } if (yychar <= ]b4_symbol(0, [id])[) { yychar = ]b4_symbol(0, [id])[; yytoken = ]b4_symbol(0, [kind])[; YYDPRINTF ((stderr, "Now at end of input.\n")); } else if (yychar == ]b4_symbol(1, [id])[) { /* The scanner already issued an error message, process directly to error recovery. But do not keep the error token as lookahead, it is too special and may lead us to an endless loop in error recovery. */ yychar = ]b4_symbol(2, [id])[; yytoken = ]b4_symbol(1, [kind])[;]b4_locations_if([[ yyerror_range[1] = yylloc;]])[ goto yyerrlab1; } else { yytoken = YYTRANSLATE (yychar); YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } /* If the proper action on seeing token YYTOKEN is to reduce or to detect an error, take that action. */ yyn += yytoken; if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)]b4_lac_if([[ { YY_LAC_ESTABLISH; goto yydefault; }]], [[ goto yydefault;]])[ yyn = yytable[yyn]; if (yyn <= 0) { if (yytable_value_is_error (yyn)) goto yyerrlab;]b4_lac_if([[ YY_LAC_ESTABLISH;]])[ yyn = -yyn; goto yyreduce; } /* Count tokens shifted since error; after three, turn off error status. */ if (yyerrstatus) yyerrstatus--; /* Shift the lookahead token. */ YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); yystate = yyn; YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; YY_IGNORE_MAYBE_UNINITIALIZED_END]b4_locations_if([ *++yylsp = yylloc;])[ /* Discard the shifted token. */ yychar = ]b4_symbol(-2, id)[;]b4_lac_if([[ YY_LAC_DISCARD ("shift");]])[ goto yynewstate; /*-----------------------------------------------------------. | yydefault -- do the default action for the current state. | `-----------------------------------------------------------*/ yydefault: yyn = yydefact[yystate]; if (yyn == 0) goto yyerrlab; goto yyreduce; /*-----------------------------. | yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ yylen = yyr2[yyn]; /* If YYLEN is nonzero, implement the default value of the action: '$$ = $1'. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison users should not rely upon it. Assigning to YYVAL unconditionally makes the parser a bit smaller, and it avoids a GCC warning that YYVAL may be used uninitialized. */ yyval = yyvsp[1-yylen]; ]b4_locations_if( [[ /* Default location. */ YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen); yyerror_range[1] = yyloc;]])[ YY_REDUCE_PRINT (yyn);]b4_lac_if([[ { int yychar_backup = yychar; switch (yyn) { ]b4_user_actions[ default: break; } if (yychar_backup != yychar) YY_LAC_DISCARD ("yychar change"); }]], [[ switch (yyn) { ]b4_user_actions[ default: break; }]])[ /* User semantic actions sometimes alter yychar, and that requires that yytoken be updated with the new translation. We take the approach of translating immediately before every use of yytoken. One alternative is translating here after every semantic action, but that translation would be missed if the semantic action invokes YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or if it invokes YYBACKUP. In the case of YYABORT or YYACCEPT, an incorrect destructor might then be invoked immediately. In the case of YYERROR or YYBACKUP, subsequent parser actions might lead to an incorrect destructor call or verbose syntax error message before the lookahead is translated. */ YY_SYMBOL_PRINT ("-> $$ =", YY_CAST (yysymbol_kind_t, yyr1[yyn]), &yyval, &yyloc); YYPOPSTACK (yylen); yylen = 0; *++yyvsp = yyval;]b4_locations_if([ *++yylsp = yyloc;])[ /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ { const int yylhs = yyr1[yyn] - YYNTOKENS; const int yyi = yypgoto[yylhs] + *yyssp; yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp ? yytable[yyi] : yydefgoto[yylhs]); } goto yynewstate; /*--------------------------------------. | yyerrlab -- here on detecting error. | `--------------------------------------*/ yyerrlab: /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ yytoken = yychar == ]b4_symbol(-2, id)[ ? ]b4_symbol(-2, kind)[ : YYTRANSLATE (yychar); /* If not already recovering from an error, report this error. */ if (!yyerrstatus) { ++yynerrs; ]b4_parse_error_case( [custom], [[ { yypcontext_t yyctx = {]b4_push_if([[yyps]], [[yyssp]b4_lac_if([[, yyesa, &yyes, &yyes_capacity]])])[, yytoken]b4_locations_if([[, &yylloc]])[};]b4_lac_if([[ if (yychar != ]b4_symbol(-2, id)[) YY_LAC_ESTABLISH;]])[ if (yyreport_syntax_error (&yyctx]m4_ifset([b4_parse_param], [[, ]b4_args(b4_parse_param)])[) == 2) goto yyexhaustedlab; }]], [simple], [[ yyerror (]b4_yyerror_args[YY_("syntax error"));]], [[ { yypcontext_t yyctx = {]b4_push_if([[yyps]], [[yyssp]b4_lac_if([[, yyesa, &yyes, &yyes_capacity]])])[, yytoken]b4_locations_if([[, &yylloc]])[}; char const *yymsgp = YY_("syntax error"); int yysyntax_error_status;]b4_lac_if([[ if (yychar != ]b4_symbol(-2, id)[) YY_LAC_ESTABLISH;]])[ yysyntax_error_status = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx); if (yysyntax_error_status == 0) yymsgp = yymsg; else if (yysyntax_error_status == -1) { if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg); yymsg = YY_CAST (char *, YYSTACK_ALLOC (YY_CAST (YYSIZE_T, yymsg_alloc))); if (yymsg) { yysyntax_error_status = yysyntax_error (&yymsg_alloc, &yymsg, &yyctx); yymsgp = yymsg; } else { yymsg = yymsgbuf; yymsg_alloc = sizeof yymsgbuf; yysyntax_error_status = YYENOMEM; } } yyerror (]b4_yyerror_args[yymsgp); if (yysyntax_error_status == YYENOMEM) goto yyexhaustedlab; }]])[ } ]b4_locations_if([[ yyerror_range[1] = yylloc;]])[ if (yyerrstatus == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ if (yychar <= ]b4_symbol(0, [id])[) { /* Return failure if at end of input. */ if (yychar == ]b4_symbol(0, [id])[) YYABORT; } else { yydestruct ("Error: discarding", yytoken, &yylval]b4_locations_if([, &yylloc])[]b4_user_args[); yychar = ]b4_symbol(-2, id)[; } } /* Else will try to reuse lookahead token after shifting the error token. */ goto yyerrlab1; /*---------------------------------------------------. | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: /* Pacify compilers when the user code never invokes YYERROR and the label yyerrorlab therefore never appears in user code. */ if (0) YYERROR; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); yylen = 0; YY_STACK_PRINT (yyss, yyssp); yystate = *yyssp; goto yyerrlab1; /*-------------------------------------------------------------. | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: yyerrstatus = 3; /* Each real token shifted decrements this. */ /* Pop stack until we find a state that shifts the error token. */ for (;;) { yyn = yypact[yystate]; if (!yypact_value_is_default (yyn)) { yyn += ]b4_symbol(1, kind)[; if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == ]b4_symbol(1, kind)[) { yyn = yytable[yyn]; if (0 < yyn) break; } } /* Pop the current state because it cannot handle the error token. */ if (yyssp == yyss) YYABORT; ]b4_locations_if([[ yyerror_range[1] = *yylsp;]])[ yydestruct ("Error: popping", YY_ACCESSING_SYMBOL (yystate), yyvsp]b4_locations_if([, yylsp])[]b4_user_args[); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); }]b4_lac_if([[ /* If the stack popping above didn't lose the initial context for the current lookahead token, the shift below will for sure. */ YY_LAC_DISCARD ("error recovery");]])[ YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN *++yyvsp = yylval; YY_IGNORE_MAYBE_UNINITIALIZED_END ]b4_locations_if([[ yyerror_range[2] = yylloc; ++yylsp; YYLLOC_DEFAULT (*yylsp, yyerror_range, 2);]])[ /* Shift the error token. */ YY_SYMBOL_PRINT ("Shifting", YY_ACCESSING_SYMBOL (yyn), yyvsp, yylsp); yystate = yyn; goto yynewstate; /*-------------------------------------. | yyacceptlab -- YYACCEPT comes here. | `-------------------------------------*/ yyacceptlab: yyresult = 0; goto yyreturn; /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: yyresult = 1; goto yyreturn; #if ]b4_lac_if([[1]], [b4_parse_error_case([simple], [[!defined yyoverflow]], [[1]])])[ /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ yyexhaustedlab: yyerror (]b4_yyerror_args[YY_("memory exhausted")); yyresult = 2; goto yyreturn; #endif /*-------------------------------------------------------. | yyreturn -- parsing is finished, clean up and return. | `-------------------------------------------------------*/ yyreturn: if (yychar != ]b4_symbol(-2, id)[) { /* Make sure we have latest lookahead translation. See comments at user semantic actions for why this is necessary. */ yytoken = YYTRANSLATE (yychar); yydestruct ("Cleanup: discarding lookahead", yytoken, &yylval]b4_locations_if([, &yylloc])[]b4_user_args[); } /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ YYPOPSTACK (yylen); YY_STACK_PRINT (yyss, yyssp); while (yyssp != yyss) { yydestruct ("Cleanup: popping", YY_ACCESSING_SYMBOL (+*yyssp), yyvsp]b4_locations_if([, yylsp])[]b4_user_args[); YYPOPSTACK (1); }]b4_push_if([[ yyps->yynew = 2; goto yypushreturn; /*-------------------------. | yypushreturn -- return. | `-------------------------*/ yypushreturn:]], [[ #ifndef yyoverflow if (yyss != yyssa) YYSTACK_FREE (yyss); #endif]b4_lac_if([[ if (yyes != yyesa) YYSTACK_FREE (yyes);]])])[ ]b4_parse_error_bmatch([detailed\|verbose], [[ if (yymsg != yymsgbuf) YYSTACK_FREE (yymsg);]])[ return yyresult; } ]b4_push_if([b4_parse_state_variable_macros([b4_macro_undef])])[ ]b4_percent_code_get([[epilogue]])[]dnl b4_epilogue[]dnl b4_output_end PK r�!\I�@�c1 c1 skeletons/glr.ccnu �[��� # C++ GLR skeleton for Bison # Copyright (C) 2002-2015, 2018-2020 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/>. # This skeleton produces a C++ class that encapsulates a C glr parser. # This is in order to reduce the maintenance burden. The glr.c # skeleton is clean and pure enough so that there are no real # problems. The C++ interface is the same as that of lalr1.cc. In # fact, glr.c can replace yacc.c without the user noticing any # difference, and similarly for glr.cc replacing lalr1.cc. # # The passing of parse-params # # The additional arguments are stored as members of the parser # object, yyparser. The C routines need to carry yyparser # throughout the C parser; that's easy: make yyparser an # additional parse-param. But because the C++ skeleton needs to # know the "real" original parse-param, we save them # (b4_parse_param_orig). Note that b4_parse_param is overquoted # (and c.m4 strips one level of quotes). This is a PITA, and # explains why there are so many levels of quotes. # # The locations # # We use location.cc just like lalr1.cc, but because glr.c stores # the locations in a union, the position and location classes # must not have a constructor. Therefore, contrary to lalr1.cc, we # must not define "b4_location_constructors". As a consequence the # user must initialize the first positions (in particular the # filename member). # We require a pure interface. m4_define([b4_pure_flag], [1]) m4_include(b4_skeletonsdir/[c++.m4]) b4_bison_locations_if([m4_include(b4_skeletonsdir/[location.cc])]) m4_define([b4_parser_class], [b4_percent_define_get([[api.parser.class]])]) # Save the parse parameters. m4_define([b4_parse_param_orig], m4_defn([b4_parse_param])) # b4_parse_param_wrap # ------------------- # New ones. m4_ifset([b4_parse_param], [m4_define([b4_parse_param_wrap], [[b4_namespace_ref::b4_parser_class[& yyparser], [[yyparser]]],] m4_defn([b4_parse_param]))], [m4_define([b4_parse_param_wrap], [[b4_namespace_ref::b4_parser_class[& yyparser], [[yyparser]]]]) ]) # b4_yy_symbol_print_define # ------------------------- # Bypass the default implementation to generate the "yy_symbol_print" # and "yy_symbol_value_print" functions. m4_define([b4_yy_symbol_print_define], [[/*--------------------. | Print this symbol. | `--------------------*/ static void yy_symbol_print (FILE *, ]b4_namespace_ref::b4_parser_class[::symbol_kind_type yytoken, const ]b4_namespace_ref::b4_parser_class[::semantic_type *yyvaluep]b4_locations_if([[, const ]b4_namespace_ref::b4_parser_class[::location_type *yylocationp]])[]b4_user_formals[) { ]b4_parse_param_use[]dnl [ yyparser.yy_symbol_print_ (yytoken, yyvaluep]b4_locations_if([, yylocationp])[); } ]])[ # Hijack the initial action to initialize the locations. ]b4_bison_locations_if([m4_define([b4_initial_action], [yylloc.initialize ();]m4_ifdef([b4_initial_action], [ m4_defn([b4_initial_action])]))])[ # Hijack the post prologue to declare yyerror. ]m4_append([b4_post_prologue], [b4_syncline([@oline@], [@ofile@])dnl [static void yyerror (]b4_locations_if([[const ]b4_namespace_ref::b4_parser_class[::location_type *yylocationp, ]])[]m4_ifset([b4_parse_param], [b4_formals(b4_parse_param), ])[const char* msg);]])[ # Inserted before the epilogue to define implementations (yyerror, parser member # functions etc.). ]m4_define([b4_glr_cc_pre_epilogue], [b4_syncline([@oline@], [@ofile@])dnl [ /*------------------. | Report an error. | `------------------*/ static void yyerror (]b4_locations_if([[const ]b4_namespace_ref::b4_parser_class[::location_type *yylocationp, ]])[]m4_ifset([b4_parse_param], [b4_formals(b4_parse_param), ])[const char* msg) { ]b4_parse_param_use[]dnl [ yyparser.error (]b4_locations_if([[*yylocationp, ]])[msg); } ]b4_namespace_open[ ]dnl In this section, the parse params are the original parse_params. m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl [ /// Build a parser object. ]b4_parser_class::b4_parser_class[ (]b4_parse_param_decl[)]m4_ifset([b4_parse_param], [ :])[ #if ]b4_api_PREFIX[DEBUG ]m4_ifset([b4_parse_param], [ ], [ :])[yycdebug_ (&std::cerr)]m4_ifset([b4_parse_param], [,])[ #endif]b4_parse_param_cons[ {} ]b4_parser_class::~b4_parser_class[ () {} ]b4_parser_class[::syntax_error::~syntax_error () YY_NOEXCEPT YY_NOTHROW {} int ]b4_parser_class[::operator() () { return parse (); } int ]b4_parser_class[::parse () { return ::yyparse (*this]b4_user_args[); } #if ]b4_api_PREFIX[DEBUG /*--------------------. | Print this symbol. | `--------------------*/ void ]b4_parser_class[::yy_symbol_value_print_ (symbol_kind_type yykind, const semantic_type* yyvaluep]b4_locations_if([[, const location_type* yylocationp]])[) const {]b4_locations_if([[ YYUSE (yylocationp);]])[ YYUSE (yyvaluep); std::ostream& yyo = debug_stream (); std::ostream& yyoutput = yyo; YYUSE (yyoutput); ]b4_symbol_actions([printer])[ } void ]b4_parser_class[::yy_symbol_print_ (symbol_kind_type yykind, const semantic_type* yyvaluep]b4_locations_if([[, const location_type* yylocationp]])[) const { *yycdebug_ << (yykind < YYNTOKENS ? "token" : "nterm") << ' ' << yysymbol_name (yykind) << " ("]b4_locations_if([[ << *yylocationp << ": "]])[; yy_symbol_value_print_ (yykind, yyvaluep]b4_locations_if([[, yylocationp]])[); *yycdebug_ << ')'; } std::ostream& ]b4_parser_class[::debug_stream () const { return *yycdebug_; } void ]b4_parser_class[::set_debug_stream (std::ostream& o) { yycdebug_ = &o; } ]b4_parser_class[::debug_level_type ]b4_parser_class[::debug_level () const { return yydebug; } void ]b4_parser_class[::set_debug_level (debug_level_type l) { // Actually, it is yydebug which is really used. yydebug = l; } #endif ]m4_popdef([b4_parse_param])dnl b4_namespace_close[]dnl ]) m4_define([b4_define_symbol_kind], [m4_format([#define %-15s %s], b4_symbol($][1, kind_base), b4_namespace_ref[::]b4_parser_class[::symbol_kind::]b4_symbol($1, kind_base)) ]) # b4_glr_cc_setup # --------------- # Setup redirections for glr.c: Map the names used in c.m4 to the ones used # in c++.m4. m4_define([b4_glr_cc_setup], [[#undef ]b4_symbol(-2, [id])[ #define ]b4_symbol(-2, [id])[ ]b4_namespace_ref[::]b4_parser_class[::token::]b4_symbol(-2, [id])[ #undef ]b4_symbol(0, [id])[ #define ]b4_symbol(0, [id])[ ]b4_namespace_ref[::]b4_parser_class[::token::]b4_symbol(0, [id])[ #undef ]b4_symbol(1, [id])[ #define ]b4_symbol(1, [id])[ ]b4_namespace_ref[::]b4_parser_class[::token::]b4_symbol(1, [id])[ #ifndef ]b4_api_PREFIX[STYPE # define ]b4_api_PREFIX[STYPE ]b4_namespace_ref[::]b4_parser_class[::semantic_type #endif #ifndef ]b4_api_PREFIX[LTYPE # define ]b4_api_PREFIX[LTYPE ]b4_namespace_ref[::]b4_parser_class[::location_type #endif typedef ]b4_namespace_ref[::]b4_parser_class[::symbol_kind_type yysymbol_kind_t; // Expose C++ symbol kinds to C. ]b4_define_symbol_kind(-2)dnl b4_symbol_foreach([b4_define_symbol_kind])])[ ]]) m4_define([b4_undef_symbol_kind], [[#undef ]b4_symbol($1, kind_base)[ ]]) # b4_glr_cc_cleanup # ----------------- # Remove redirections for glr.c. m4_define([b4_glr_cc_cleanup], [[#undef ]b4_symbol(-2, [id])[ #undef ]b4_symbol(0, [id])[ #undef ]b4_symbol(1, [id])[ ]b4_undef_symbol_kind(-2)dnl b4_symbol_foreach([b4_undef_symbol_kind])dnl ]) # b4_shared_declarations(hh|cc) # ----------------------------- # Declaration that might either go into the header (if --defines, $1 = hh) # or in the implementation file. m4_define([b4_shared_declarations], [m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_orig]))dnl b4_percent_code_get([[requires]])[ #include <iostream> #include <stdexcept> #include <string> ]b4_cxx_portability[ ]m4_ifdef([b4_location_include], [[# include ]b4_location_include])[ ]b4_variant_if([b4_variant_includes])[ ]b4_attribute_define[ ]b4_null_define[ // This skeleton is based on C, yet compiles it as C++. // So expect warnings about C style casts. #if defined __clang__ && 306 <= __clang_major__ * 100 + __clang_minor__ # pragma clang diagnostic ignored "-Wold-style-cast" #elif defined __GNUC__ && 406 <= __GNUC__ * 100 + __GNUC_MINOR__ # pragma GCC diagnostic ignored "-Wold-style-cast" #endif // On MacOS, PTRDIFF_MAX is defined as long long, which Clang's // -pedantic reports as being a C++11 extension. #if defined __APPLE__ && YY_CPLUSPLUS < 201103L \ && defined __clang__ && 4 <= __clang_major__ # pragma clang diagnostic ignored "-Wc++11-long-long" #endif // Whether we are compiled with exception support. #ifndef YY_EXCEPTIONS # if defined __GNUC__ && !defined __EXCEPTIONS # define YY_EXCEPTIONS 0 # else # define YY_EXCEPTIONS 1 # endif #endif ]b4_YYDEBUG_define[ ]b4_namespace_open[ ]b4_bison_locations_if([m4_ifndef([b4_location_file], [b4_location_define])])[ /// A Bison parser. class ]b4_parser_class[ { public: ]b4_public_types_declare[ /// Build a parser object. ]b4_parser_class[ (]b4_parse_param_decl[); virtual ~]b4_parser_class[ (); /// Parse. An alias for parse (). /// \returns 0 iff parsing succeeded. int operator() (); /// Parse. /// \returns 0 iff parsing succeeded. virtual int parse (); #if ]b4_api_PREFIX[DEBUG /// The current debugging stream. std::ostream& debug_stream () const; /// Set the current debugging stream. void set_debug_stream (std::ostream &); /// Type for debugging levels. typedef int debug_level_type; /// The current debugging level. debug_level_type debug_level () const; /// Set the current debugging level. void set_debug_level (debug_level_type l); #endif /// Report a syntax error.]b4_locations_if([[ /// \param loc where the syntax error is found.]])[ /// \param msg a description of the syntax error. virtual void error (]b4_locations_if([[const location_type& loc, ]])[const std::string& msg); # if ]b4_api_PREFIX[DEBUG public: /// \brief Report a symbol value on the debug stream. /// \param yykind The symbol kind. /// \param yyvaluep Its semantic value.]b4_locations_if([[ /// \param yylocationp Its location.]])[ virtual void yy_symbol_value_print_ (symbol_kind_type yykind, const semantic_type* yyvaluep]b4_locations_if([[, const location_type* yylocationp]])[) const; /// \brief Report a symbol on the debug stream. /// \param yykind The symbol kind. /// \param yyvaluep Its semantic value.]b4_locations_if([[ /// \param yylocationp Its location.]])[ virtual void yy_symbol_print_ (symbol_kind_type yykind, const semantic_type* yyvaluep]b4_locations_if([[, const location_type* yylocationp]])[) const; private: /// Debug stream. std::ostream* yycdebug_; #endif ]b4_parse_param_vars[ }; ]b4_namespace_close[ ]b4_percent_code_get([[provides]])[ ]m4_popdef([b4_parse_param])dnl ])[ ]b4_defines_if( [b4_output_begin([b4_spec_header_file]) b4_copyright([Skeleton interface for Bison GLR parsers in C++], [2002-2015, 2018-2020])[ // C++ GLR parser skeleton written by Akim Demaille. ]b4_disclaimer[ ]b4_cpp_guard_open([b4_spec_mapped_header_file])[ ]b4_shared_declarations[ ]b4_cpp_guard_close([b4_spec_mapped_header_file])[ ]b4_output_end]) # Let glr.c (and b4_shared_declarations) believe that the user # arguments include the parser itself. m4_pushdef([b4_parse_param], m4_defn([b4_parse_param_wrap])) m4_include(b4_skeletonsdir/[glr.c]) m4_popdef([b4_parse_param]) PK r�!\R���) �) skeletons/d.m4nu �[��� -*- Autoconf -*- # D language support for Bison # Copyright (C) 2018-2020 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/>. # _b4_comment(TEXT, OPEN, CONTINUE, END) # -------------------------------------- # Put TEXT in comment. Avoid trailing spaces: don't indent empty lines. # Avoid adding indentation to the first line, as the indentation comes # from OPEN. That's why we don't patsubst([$1], [^\(.\)], [ \1]). # # Prefix all the output lines with PREFIX. m4_define([_b4_comment], [$2[]m4_bpatsubst(m4_expand([[$1]]), [ \(.\)], [ $3\1])$4]) # b4_comment(TEXT, [PREFIX]) # -------------------------- # Put TEXT in comment. Prefix all the output lines with PREFIX. m4_define([b4_comment], [_b4_comment([$1], [$2/* ], [$2 ], [ */])]) # b4_sync_start(LINE, FILE) # ------------------------- m4_define([b4_sync_start], [[#]line $1 $2]) # b4_list2(LIST1, LIST2) # ---------------------- # Join two lists with a comma if necessary. m4_define([b4_list2], [$1[]m4_ifval(m4_quote($1), [m4_ifval(m4_quote($2), [[, ]])])[]$2]) # b4_percent_define_get3(DEF, PRE, POST, NOT) # ------------------------------------------- # Expand to the value of DEF surrounded by PRE and POST if it's %define'ed, # otherwise NOT. m4_define([b4_percent_define_get3], [m4_ifval(m4_quote(b4_percent_define_get([$1])), [$2[]b4_percent_define_get([$1])[]$3], [$4])]) # b4_flag_value(BOOLEAN-FLAG) # --------------------------- m4_define([b4_flag_value], [b4_flag_if([$1], [true], [false])]) # b4_parser_class_declaration # --------------------------- # The declaration of the parser class ("class YYParser"), with all its # qualifiers/annotations. b4_percent_define_default([[api.parser.abstract]], [[false]]) b4_percent_define_default([[api.parser.final]], [[false]]) b4_percent_define_default([[api.parser.public]], [[false]]) m4_define([b4_parser_class_declaration], [b4_percent_define_get3([api.parser.annotations], [], [ ])dnl b4_percent_define_flag_if([api.parser.public], [public ])dnl b4_percent_define_flag_if([api.parser.abstract], [abstract ])dnl b4_percent_define_flag_if([api.parser.final], [final ])dnl [class ]b4_parser_class[]dnl b4_percent_define_get3([api.parser.extends], [ extends ])dnl b4_percent_define_get3([api.parser.implements], [ implements ])]) # b4_lexer_if(TRUE, FALSE) # ------------------------ m4_define([b4_lexer_if], [b4_percent_code_ifdef([[lexer]], [$1], [$2])]) # b4_position_type_if(TRUE, FALSE) # -------------------------------- m4_define([b4_position_type_if], [b4_percent_define_ifdef([[position_type]], [$1], [$2])]) # b4_location_type_if(TRUE, FALSE) # -------------------------------- m4_define([b4_location_type_if], [b4_percent_define_ifdef([[location_type]], [$1], [$2])]) # b4_identification # ----------------- m4_define([b4_identification], [[/** Version number for the Bison executable that generated this parser. */ public static immutable string yy_bison_version = "]b4_version_string["; /** Name of the skeleton that generated this parser. */ public static immutable string yy_bison_skeleton = ]b4_skeleton[; ]]) ## ------------ ## ## Data types. ## ## ------------ ## # b4_int_type(MIN, MAX) # --------------------- # Return the smallest int type able to handle numbers ranging from # MIN to MAX (included). m4_define([b4_int_type], [m4_if(b4_ints_in($@, [-128], [127]), [1], [byte], b4_ints_in($@, [-32768], [32767]), [1], [short], [int])]) # b4_int_type_for(NAME) # --------------------- # Return the smallest int type able to handle numbers ranging from # `NAME_min' to `NAME_max' (included). m4_define([b4_int_type_for], [b4_int_type($1_min, $1_max)]) # b4_null # ------- m4_define([b4_null], [null]) # b4_integral_parser_table_define(NAME, DATA, COMMENT) #----------------------------------------------------- # Define "yy<TABLE-NAME>" whose contents is CONTENT. m4_define([b4_integral_parser_table_define], [m4_ifvaln([$3], [b4_comment([$3], [ ])])dnl private static immutable b4_int_type_for([$2])[[]] yy$1_ = @{ $2 @};dnl ]) ## ------------- ## ## Token kinds. ## ## ------------- ## m4_define([b4_symbol(-2, id)], [[YYEMPTY]]) # b4_token_enum(TOKEN-NAME, TOKEN-NUMBER) # --------------------------------------- # Output the definition of this token as an enum. m4_define([b4_token_enum], [b4_token_format([ %s = %s, ], [$1])]) # b4_token_enums # -------------- # Output the definition of the tokens as enums. m4_define([b4_token_enums], [/* Token kinds. */ public enum TokenKind { ]b4_symbol_kind([-2])[ = -2, b4_symbol_foreach([b4_token_enum])dnl } ]) ## -------------- ## ## Symbol kinds. ## ## -------------- ## b4_percent_define_default([[api.symbol.prefix]], [[S_]]) # b4_symbol_kind(NUM) # ------------------- m4_define([b4_symbol_kind], [SymbolKind.b4_symbol_kind_base($@)]) # b4_symbol_enum(SYMBOL-NUM) # -------------------------- # Output the definition of this symbol as an enum. m4_define([b4_symbol_enum], [m4_format([ %-30s %s], m4_format([[%s = %s,]], b4_symbol([$1], [kind_base]), [$1]), [b4_symbol_tag_comment([$1])])]) # b4_declare_symbol_enum # ---------------------- # The definition of the symbol internal numbers as an enum. # Defining YYEMPTY here is important: it forces the compiler # to use a signed type, which matters for yytoken. m4_define([b4_declare_symbol_enum], [[ /* Symbol kinds. */ public enum SymbolKind { ]b4_symbol(-2, kind_base)[ = -2, /* No symbol. */ ]b4_symbol_foreach([b4_symbol_enum])dnl [ }; ]])]) # b4-case(ID, CODE, [COMMENTS]) # ----------------------------- m4_define([b4_case], [ case $1:m4_ifval([$3], [ b4_comment([$3])]) $2 break;]) ## ---------------- ## ## Default values. ## ## ---------------- ## m4_define([b4_yystype], [b4_percent_define_get([[stype]])]) b4_percent_define_default([[stype]], [[YYSemanticType]])]) # %name-prefix m4_define_default([b4_prefix], [[YY]]) b4_percent_define_default([[api.parser.class]], [b4_prefix[]Parser])]) m4_define([b4_parser_class], [b4_percent_define_get([[api.parser.class]])]) #b4_percent_define_default([[location_type]], [Location])]) m4_define([b4_location_type], b4_percent_define_ifdef([[location_type]],[b4_percent_define_get([[location_type]])],[YYLocation])) #b4_percent_define_default([[position_type]], [Position])]) m4_define([b4_position_type], b4_percent_define_ifdef([[position_type]],[b4_percent_define_get([[position_type]])],[YYPosition])) ## ----------------- ## ## Semantic Values. ## ## ----------------- ## # b4_symbol_value(VAL, [SYMBOL-NUM], [TYPE-TAG]) # ---------------------------------------------- # See README. FIXME: factor in c-like? m4_define([b4_symbol_value], [m4_ifval([$3], [($1.$3)], [m4_ifval([$2], [b4_symbol_if([$2], [has_type], [($1.b4_symbol([$2], [type]))], [$1])], [$1])])]) # b4_lhs_value(SYMBOL-NUM, [TYPE]) # -------------------------------- # See README. m4_define([b4_lhs_value], [b4_symbol_value([yyval], [$1], [$2])]) # b4_rhs_value(RULE-LENGTH, POS, SYMBOL-NUM, [TYPE]) # -------------------------------------------------- # See README. # # In this simple implementation, %token and %type have class names # between the angle brackets. m4_define([b4_rhs_value], [b4_symbol_value([(yystack.valueAt (b4_subtract([$1], [$2])))], [$3], [$4])]) # b4_lhs_location() # ----------------- # Expansion of @$. m4_define([b4_lhs_location], [(yyloc)]) # b4_rhs_location(RULE-LENGTH, POS) # --------------------------------- # Expansion of @POS, where the current rule has RULE-LENGTH symbols # on RHS. m4_define([b4_rhs_location], [yystack.locationAt ([$1], [$2])]) # b4_lex_param # b4_parse_param # -------------- # If defined, b4_lex_param arrives double quoted, but below we prefer # it to be single quoted. Same for b4_parse_param. # TODO: should be in bison.m4 m4_define_default([b4_lex_param], [[]])) m4_define([b4_lex_param], b4_lex_param)) m4_define([b4_parse_param], b4_parse_param)) # b4_lex_param_decl # ------------------- # Extra formal arguments of the constructor. m4_define([b4_lex_param_decl], [m4_ifset([b4_lex_param], [b4_remove_comma([$1], b4_param_decls(b4_lex_param))], [$1])]) m4_define([b4_param_decls], [m4_map([b4_param_decl], [$@])]) m4_define([b4_param_decl], [, $1]) m4_define([b4_remove_comma], [m4_ifval(m4_quote($1), [$1, ], [])m4_shift2($@)]) # b4_parse_param_decl # ------------------- # Extra formal arguments of the constructor. m4_define([b4_parse_param_decl], [m4_ifset([b4_parse_param], [b4_remove_comma([$1], b4_param_decls(b4_parse_param))], [$1])]) # b4_lex_param_call # ------------------- # Delegating the lexer parameters to the lexer constructor. m4_define([b4_lex_param_call], [m4_ifset([b4_lex_param], [b4_remove_comma([$1], b4_param_calls(b4_lex_param))], [$1])]) m4_define([b4_param_calls], [m4_map([b4_param_call], [$@])]) m4_define([b4_param_call], [, $2]) # b4_parse_param_cons # ------------------- # Extra initialisations of the constructor. m4_define([b4_parse_param_cons], [m4_ifset([b4_parse_param], [b4_constructor_calls(b4_parse_param)])]) m4_define([b4_constructor_calls], [m4_map([b4_constructor_call], [$@])]) m4_define([b4_constructor_call], [this.$2 = $2; ]) # b4_parse_param_vars # ------------------- # Extra instance variables. m4_define([b4_parse_param_vars], [m4_ifset([b4_parse_param], [ /* User arguments. */ b4_var_decls(b4_parse_param)])]) m4_define([b4_var_decls], [m4_map_sep([b4_var_decl], [ ], [$@])]) m4_define([b4_var_decl], [ protected $1;]) PK r�!\��!�h h skeletons/README-D.txtnu �[��� Some usage notes for the D Parser: - it is a port of the Java parser, so interface is very similar. - the lexer class needs to implement the interface 'Lexer' (similar to java). It typically (depending on options) looks like this: public interface Lexer { /** * Method to retrieve the beginning position of the last scanned token. * @return the position at which the last scanned token starts. */ @property YYPosition startPos (); /** * Method to retrieve the ending position of the last scanned token. * @return the first position beyond the last scanned token. */ @property YYPosition endPos (); /** * Method to retrieve the semantic value of the last scanned token. * @return the semantic value of the last scanned token. */ @property YYSemanticType semanticVal (); /** * Entry point for the scanner. Returns the token identifier corresponding * to the next token and prepares to return the semantic value * and beginning/ending positions of the token. * @return the token identifier corresponding to the next token. */ TokenKind yylex (); /** * Entry point for error reporting. Emits an error * referring to the given location in a user-defined way. * * @param loc The location of the element to which the * error message is related * @param s The string for the error message. */ void yyerror (YYLocation loc, string s); } - semantic types are handled by D unions (same as for C/C++ parsers) - the following (non-standard) %defines are supported: %define package "<package_name>" %define api.parser.class "my_class_name>" %define position_type "my_position_type" %define location_type "my_location_type" - the following declarations basically work like in C/C++: %locations %error-verbose %parse-param %initial-action %code %union - %destructor is not yet supported PK r�!\�a;9 9 skeletons/java.m4nu �[��� -*- Autoconf -*- # Java language support for Bison # Copyright (C) 2007-2015, 2018-2020 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/>. m4_include(b4_skeletonsdir/[c-like.m4]) # b4_list2(LIST1, LIST2) # ---------------------- # Join two lists with a comma if necessary. m4_define([b4_list2], [$1[]m4_ifval(m4_quote($1), [m4_ifval(m4_quote($2), [[, ]])])[]$2]) # b4_percent_define_get3(DEF, PRE, POST, NOT) # ------------------------------------------- # Expand to the value of DEF surrounded by PRE and POST if it's %define'ed, # otherwise NOT. m4_define([b4_percent_define_get3], [m4_ifval(m4_quote(b4_percent_define_get([$1])), [$2[]b4_percent_define_get([$1])[]$3], [$4])]) # b4_flag_value(BOOLEAN-FLAG) # --------------------------- m4_define([b4_flag_value], [b4_flag_if([$1], [true], [false])]) # b4_parser_class_declaration # --------------------------- # The declaration of the parser class ("class YYParser"), with all its # qualifiers/annotations. b4_percent_define_default([[api.parser.abstract]], [[false]]) b4_percent_define_default([[api.parser.final]], [[false]]) b4_percent_define_default([[api.parser.public]], [[false]]) b4_percent_define_default([[api.parser.strictfp]], [[false]]) m4_define([b4_parser_class_declaration], [b4_percent_define_get3([api.parser.annotations], [], [ ])dnl b4_percent_define_flag_if([api.parser.public], [public ])dnl b4_percent_define_flag_if([api.parser.abstract], [abstract ])dnl b4_percent_define_flag_if([api.parser.final], [final ])dnl b4_percent_define_flag_if([api.parser.strictfp], [strictfp ])dnl [class ]b4_parser_class[]dnl b4_percent_define_get3([api.parser.extends], [ extends ])dnl b4_percent_define_get3([api.parser.implements], [ implements ])]) # b4_lexer_if(TRUE, FALSE) # ------------------------ m4_define([b4_lexer_if], [b4_percent_code_ifdef([[lexer]], [$1], [$2])]) # b4_identification # ----------------- m4_define([b4_identification], [[ /** Version number for the Bison executable that generated this parser. */ public static final String bisonVersion = "]b4_version_string["; /** Name of the skeleton that generated this parser. */ public static final String bisonSkeleton = ]b4_skeleton[; ]]) ## ------------ ## ## Data types. ## ## ------------ ## # b4_int_type(MIN, MAX) # --------------------- # Return the smallest int type able to handle numbers ranging from # MIN to MAX (included). m4_define([b4_int_type], [m4_if(b4_ints_in($@, [-128], [127]), [1], [byte], b4_ints_in($@, [-32768], [32767]), [1], [short], [int])]) # b4_int_type_for(NAME) # --------------------- # Return the smallest int type able to handle numbers ranging from # 'NAME_min' to 'NAME_max' (included). m4_define([b4_int_type_for], [b4_int_type($1_min, $1_max)]) # b4_null # ------- m4_define([b4_null], [null]) # b4_typed_parser_table_define(TYPE, NAME, DATA, COMMENT) # ------------------------------------------------------- # We use intermediate functions (e.g., yypact_init) to work around the # 64KB limit for JVM methods. See # https://lists.gnu.org/r/help-bison/2008-11/msg00004.html. m4_define([b4_typed_parser_table_define], [m4_ifval([$4], [b4_comment([$4]) ])dnl [private static final ]$1[[] yy$2_ = yy$2_init(); private static final ]$1[[] yy$2_init() { return new ]$1[[] { ]$3[ }; }]]) # b4_integral_parser_table_define(NAME, DATA, COMMENT) #----------------------------------------------------- m4_define([b4_integral_parser_table_define], [b4_typed_parser_table_define([b4_int_type_for([$2])], [$1], [$2], [$3])]) ## ------------- ## ## Token kinds. ## ## ------------- ## # b4_token_enum(TOKEN-NUM) # ------------------------ # Output the definition of this token as an enum. m4_define([b4_token_enum], [b4_token_visible_if([$1], [m4_format([[ /** Token %s, to be returned by the scanner. */ static final int %s = %s%s; ]], b4_symbol([$1], [tag]), b4_symbol([$1], [id]), b4_symbol([$1], b4_api_token_raw_if([[number]], [[code]])))])]) # b4_token_enums # -------------- # Output the definition of the tokens (if there are) as enums. m4_define([b4_token_enums], [b4_any_token_visible_if([ /* Token kinds. */ b4_symbol_foreach([b4_token_enum])])]) ## -------------- ## ## Symbol kinds. ## ## -------------- ## # b4_symbol_kind(NUM) # ------------------- m4_define([b4_symbol_kind], [SymbolKind.b4_symbol_kind_base($@)]) # b4_symbol_enum(SYMBOL-NUM) # -------------------------- # Output the definition of this symbol as an enum. m4_define([b4_symbol_enum], [m4_format([ %-30s %s], m4_format([[%s(%s)%s]], b4_symbol([$1], [kind_base]), [$1], m4_if([$1], b4_last_symbol, [[;]], [[,]])), [b4_symbol_tag_comment([$1])])]) # b4_declare_symbol_enum # ---------------------- # The definition of the symbol internal numbers as an enum. m4_define([b4_declare_symbol_enum], [[ public enum SymbolKind { ]b4_symbol_foreach([b4_symbol_enum])[ private final int yycode_; SymbolKind (int n) { this.yycode_ = n; } private static final SymbolKind[] values_ = { ]m4_map_args_sep([b4_symbol_kind(], [)], [, ], b4_symbol_numbers)[ }; static final SymbolKind get(int code) { return values_[code]; } public final int getCode() { return this.yycode_; } ]b4_parse_error_bmatch( [simple\|verbose], [[ /* Return YYSTR after stripping away unnecessary quotes and backslashes, so that it's suitable for yyerror. The heuristic is that double-quoting is unnecessary unless the string contains an apostrophe, a comma, or backslash (other than backslash-backslash). YYSTR is taken from yytname. */ private static String yytnamerr_(String yystr) { if (yystr.charAt (0) == '"') { StringBuffer yyr = new StringBuffer(); strip_quotes: for (int i = 1; i < yystr.length(); i++) switch (yystr.charAt(i)) { case '\'': case ',': break strip_quotes; case '\\': if (yystr.charAt(++i) != '\\') break strip_quotes; /* Fall through. */ default: yyr.append(yystr.charAt(i)); break; case '"': return yyr.toString(); } } return yystr; } /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at \a YYNTOKENS_, nonterminals. */ ]b4_typed_parser_table_define([String], [tname], [b4_tname])[ /* The user-facing name of this symbol. */ public final String getName() { return yytnamerr_(yytname_[yycode_]); } ]], [custom\|detailed], [[ /* YYNAMES_[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at \a YYNTOKENS_, nonterminals. */ ]b4_typed_parser_table_define([String], [names], [b4_symbol_names])[ /* The user-facing name of this symbol. */ public final String getName() { return yynames_[yycode_]; }]])[ }; ]])]) # b4_case(ID, CODE, [COMMENTS]) # ----------------------------- # We need to fool Java's stupid unreachable code detection. m4_define([b4_case], [ case $1:m4_ifval([$3], [ b4_comment([$3])]) if (yyn == $1) $2; break; ]) # b4_predicate_case(LABEL, CONDITIONS) # ------------------------------------ m4_define([b4_predicate_case], [ case $1: if (! ($2)) YYERROR; break; ]) ## -------- ## ## Checks. ## ## -------- ## b4_percent_define_check_kind([[api.value.type]], [code], [deprecated]) b4_percent_define_check_kind([[annotations]], [code], [deprecated]) b4_percent_define_check_kind([[extends]], [code], [deprecated]) b4_percent_define_check_kind([[implements]], [code], [deprecated]) b4_percent_define_check_kind([[init_throws]], [code], [deprecated]) b4_percent_define_check_kind([[lex_throws]], [code], [deprecated]) b4_percent_define_check_kind([[api.parser.class]], [code], [deprecated]) b4_percent_define_check_kind([[throws]], [code], [deprecated]) ## ---------------- ## ## Default values. ## ## ---------------- ## m4_define([b4_yystype], [b4_percent_define_get([[api.value.type]])]) b4_percent_define_default([[api.value.type]], [[Object]]) b4_percent_define_default([[api.symbol.prefix]], [[S_]]) # b4_api_prefix, b4_api_PREFIX # ---------------------------- # Corresponds to %define api.prefix b4_percent_define_default([[api.prefix]], [[YY]]) m4_define([b4_api_prefix], [b4_percent_define_get([[api.prefix]])]) m4_define([b4_api_PREFIX], [m4_toupper(b4_api_prefix)]) # b4_prefix # --------- # If the %name-prefix is not given, it is api.prefix. m4_define_default([b4_prefix], [b4_api_prefix]) b4_percent_define_default([[api.parser.class]], [b4_prefix[]Parser]) m4_define([b4_parser_class], [b4_percent_define_get([[api.parser.class]])]) b4_percent_define_default([[lex_throws]], [[java.io.IOException]]) m4_define([b4_lex_throws], [b4_percent_define_get([[lex_throws]])]) b4_percent_define_default([[throws]], []) m4_define([b4_throws], [b4_percent_define_get([[throws]])]) b4_percent_define_default([[init_throws]], []) m4_define([b4_init_throws], [b4_percent_define_get([[init_throws]])]) b4_percent_define_default([[api.location.type]], [Location]) m4_define([b4_location_type], [b4_percent_define_get([[api.location.type]])]) b4_percent_define_default([[api.position.type]], [Position]) m4_define([b4_position_type], [b4_percent_define_get([[api.position.type]])]) ## ----------------- ## ## Semantic Values. ## ## ----------------- ## # b4_symbol_translate(STRING) # --------------------------- # Used by "bison" in the array of symbol names to mark those that # require translation. m4_define([b4_symbol_translate], [[i18n($1)]]) # b4_trans(STRING) # ---------------- # Translate a string if i18n is enabled. Avoid collision with b4_translate. m4_define([b4_trans], [b4_has_translations_if([i18n($1)], [$1])]) # b4_symbol_value(VAL, [SYMBOL-NUM], [TYPE-TAG]) # ---------------------------------------------- # See README. m4_define([b4_symbol_value], [m4_ifval([$3], [(($3)($1))], [m4_ifval([$2], [b4_symbol_if([$2], [has_type], [((b4_symbol([$2], [type]))($1))], [$1])], [$1])])]) # b4_lhs_value([SYMBOL-NUM], [TYPE]) # ---------------------------------- # See README. m4_define([b4_lhs_value], [yyval]) # b4_rhs_data(RULE-LENGTH, POS) # ----------------------------- # See README. m4_define([b4_rhs_data], [yystack.valueAt (b4_subtract($@))]) # b4_rhs_value(RULE-LENGTH, POS, SYMBOL-NUM, [TYPE]) # -------------------------------------------------- # See README. # # In this simple implementation, %token and %type have class names # between the angle brackets. m4_define([b4_rhs_value], [b4_symbol_value([b4_rhs_data([$1], [$2])], [$3], [$4])]) # b4_lhs_location() # ----------------- # Expansion of @$. m4_define([b4_lhs_location], [(yyloc)]) # b4_rhs_location(RULE-LENGTH, POS) # --------------------------------- # Expansion of @POS, where the current rule has RULE-LENGTH symbols # on RHS. m4_define([b4_rhs_location], [yystack.locationAt (b4_subtract($@))]) # b4_lex_param # b4_parse_param # -------------- # If defined, b4_lex_param arrives double quoted, but below we prefer # it to be single quoted. Same for b4_parse_param. # TODO: should be in bison.m4 m4_define_default([b4_lex_param], [[]]) m4_define([b4_lex_param], b4_lex_param) m4_define([b4_parse_param], b4_parse_param) # b4_lex_param_decl # ----------------- # Extra formal arguments of the constructor. m4_define([b4_lex_param_decl], [m4_ifset([b4_lex_param], [b4_remove_comma([$1], b4_param_decls(b4_lex_param))], [$1])]) m4_define([b4_param_decls], [m4_map([b4_param_decl], [$@])]) m4_define([b4_param_decl], [, $1]) m4_define([b4_remove_comma], [m4_ifval(m4_quote($1), [$1, ], [])m4_shift2($@)]) # b4_parse_param_decl # ------------------- # Extra formal arguments of the constructor. m4_define([b4_parse_param_decl], [m4_ifset([b4_parse_param], [b4_remove_comma([$1], b4_param_decls(b4_parse_param))], [$1])]) # b4_lex_param_call # ----------------- # Delegating the lexer parameters to the lexer constructor. m4_define([b4_lex_param_call], [m4_ifset([b4_lex_param], [b4_remove_comma([$1], b4_param_calls(b4_lex_param))], [$1])]) m4_define([b4_param_calls], [m4_map([b4_param_call], [$@])]) m4_define([b4_param_call], [, $2]) # b4_parse_param_cons # ------------------- # Extra initialisations of the constructor. m4_define([b4_parse_param_cons], [m4_ifset([b4_parse_param], [b4_constructor_calls(b4_parse_param)])]) m4_define([b4_constructor_calls], [m4_map([b4_constructor_call], [$@])]) m4_define([b4_constructor_call], [this.$2 = $2; ]) # b4_parse_param_vars # ------------------- # Extra instance variables. m4_define([b4_parse_param_vars], [m4_ifset([b4_parse_param], [ /* User arguments. */ b4_var_decls(b4_parse_param)])]) m4_define([b4_var_decls], [m4_map_sep([b4_var_decl], [ ], [$@])]) m4_define([b4_var_decl], [ protected final $1;]) # b4_maybe_throws(THROWS) # ----------------------- # Expand to either an empty string or "throws THROWS". m4_define([b4_maybe_throws], [m4_ifval($1, [ throws $1])]) PK r�!\�ibL�( �( skeletons/location.ccnu �[��� # C++ skeleton for Bison # Copyright (C) 2002-2015, 2018-2020 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/>. m4_pushdef([b4_copyright_years], [2002-2015, 2018-2020]) # b4_position_file # ---------------- # Name of the file containing the position class, if we want this file. b4_defines_if([b4_required_version_if([30200], [], [m4_define([b4_position_file], [position.hh])])])]) # b4_location_file # ---------------- # Name of the file containing the position/location class, # if we want this file. b4_percent_define_check_file([b4_location_file], [[api.location.file]], b4_defines_if([[location.hh]])) # b4_location_include # ------------------- # If location.hh is to be generated, the name under which should it be # included. # # b4_location_path # ---------------- # The path to use for the CPP guard. m4_ifdef([b4_location_file], [m4_define([b4_location_include], [b4_percent_define_get([[api.location.include]], ["b4_location_file"])]) m4_define([b4_location_path], b4_percent_define_get([[api.location.include]], ["b4_mapped_dir_prefix[]b4_location_file"])) m4_define([b4_location_path], m4_substr(m4_defn([b4_location_path]), 1, m4_eval(m4_len(m4_defn([b4_location_path])) - 2))) ]) # b4_location_define # ------------------ # Define the position and location classes. m4_define([b4_location_define], [[ /// A point in a source file. class position { public: /// Type for file name. typedef ]b4_percent_define_get([[api.filename.type]])[ filename_type; /// Type for line and column numbers. typedef int counter_type; ]m4_ifdef([b4_location_constructors], [[ /// Construct a position. explicit position (filename_type* f = YY_NULLPTR, counter_type l = ]b4_location_initial_line[, counter_type c = ]b4_location_initial_column[) : filename (f) , line (l) , column (c) {} ]])[ /// Initialization. void initialize (filename_type* fn = YY_NULLPTR, counter_type l = ]b4_location_initial_line[, counter_type c = ]b4_location_initial_column[) { filename = fn; line = l; column = c; } /** \name Line and Column related manipulators ** \{ */ /// (line related) Advance to the COUNT next lines. void lines (counter_type count = 1) { if (count) { column = ]b4_location_initial_column[; line = add_ (line, count, ]b4_location_initial_line[); } } /// (column related) Advance to the COUNT next columns. void columns (counter_type count = 1) { column = add_ (column, count, ]b4_location_initial_column[); } /** \} */ /// File name to which this position refers. filename_type* filename; /// Current line number. counter_type line; /// Current column number. counter_type column; private: /// Compute max (min, lhs+rhs). static counter_type add_ (counter_type lhs, counter_type rhs, counter_type min) { return lhs + rhs < min ? min : lhs + rhs; } }; /// Add \a width columns, in place. inline position& operator+= (position& res, position::counter_type width) { res.columns (width); return res; } /// Add \a width columns. inline position operator+ (position res, position::counter_type width) { return res += width; } /// Subtract \a width columns, in place. inline position& operator-= (position& res, position::counter_type width) { return res += -width; } /// Subtract \a width columns. inline position operator- (position res, position::counter_type width) { return res -= width; } ]b4_percent_define_flag_if([[define_location_comparison]], [[ /// Compare two position objects. inline bool operator== (const position& pos1, const position& pos2) { return (pos1.line == pos2.line && pos1.column == pos2.column && (pos1.filename == pos2.filename || (pos1.filename && pos2.filename && *pos1.filename == *pos2.filename))); } /// Compare two position objects. inline bool operator!= (const position& pos1, const position& pos2) { return !(pos1 == pos2); } ]])[ /** \brief Intercept output stream redirection. ** \param ostr the destination output stream ** \param pos a reference to the position to redirect */ template <typename YYChar> std::basic_ostream<YYChar>& operator<< (std::basic_ostream<YYChar>& ostr, const position& pos) { if (pos.filename) ostr << *pos.filename << ':'; return ostr << pos.line << '.' << pos.column; } /// Two points in a source file. class location { public: /// Type for file name. typedef position::filename_type filename_type; /// Type for line and column numbers. typedef position::counter_type counter_type; ]m4_ifdef([b4_location_constructors], [ /// Construct a location from \a b to \a e. location (const position& b, const position& e) : begin (b) , end (e) {} /// Construct a 0-width location in \a p. explicit location (const position& p = position ()) : begin (p) , end (p) {} /// Construct a 0-width location in \a f, \a l, \a c. explicit location (filename_type* f, counter_type l = ]b4_location_initial_line[, counter_type c = ]b4_location_initial_column[) : begin (f, l, c) , end (f, l, c) {} ])[ /// Initialization. void initialize (filename_type* f = YY_NULLPTR, counter_type l = ]b4_location_initial_line[, counter_type c = ]b4_location_initial_column[) { begin.initialize (f, l, c); end = begin; } /** \name Line and Column related manipulators ** \{ */ public: /// Reset initial location to final location. void step () { begin = end; } /// Extend the current location to the COUNT next columns. void columns (counter_type count = 1) { end += count; } /// Extend the current location to the COUNT next lines. void lines (counter_type count = 1) { end.lines (count); } /** \} */ public: /// Beginning of the located region. position begin; /// End of the located region. position end; }; /// Join two locations, in place. inline location& operator+= (location& res, const location& end) { res.end = end.end; return res; } /// Join two locations. inline location operator+ (location res, const location& end) { return res += end; } /// Add \a width columns to the end position, in place. inline location& operator+= (location& res, location::counter_type width) { res.columns (width); return res; } /// Add \a width columns to the end position. inline location operator+ (location res, location::counter_type width) { return res += width; } /// Subtract \a width columns to the end position, in place. inline location& operator-= (location& res, location::counter_type width) { return res += -width; } /// Subtract \a width columns to the end position. inline location operator- (location res, location::counter_type width) { return res -= width; } ]b4_percent_define_flag_if([[define_location_comparison]], [[ /// Compare two location objects. inline bool operator== (const location& loc1, const location& loc2) { return loc1.begin == loc2.begin && loc1.end == loc2.end; } /// Compare two location objects. inline bool operator!= (const location& loc1, const location& loc2) { return !(loc1 == loc2); } ]])[ /** \brief Intercept output stream redirection. ** \param ostr the destination output stream ** \param loc a reference to the location to redirect ** ** Avoid duplicate information. */ template <typename YYChar> std::basic_ostream<YYChar>& operator<< (std::basic_ostream<YYChar>& ostr, const location& loc) { location::counter_type end_col = 0 < loc.end.column ? loc.end.column - 1 : 0; ostr << loc.begin; if (loc.end.filename && (!loc.begin.filename || *loc.begin.filename != *loc.end.filename)) ostr << '-' << loc.end.filename << ':' << loc.end.line << '.' << end_col; else if (loc.begin.line < loc.end.line) ostr << '-' << loc.end.line << '.' << end_col; else if (loc.begin.column < end_col) ostr << '-' << end_col; return ostr; } ]]) m4_ifdef([b4_position_file], [[ ]b4_output_begin([b4_dir_prefix], [b4_position_file])[ ]b4_generated_by[ // Starting with Bison 3.2, this file is useless: the structure it // used to define is now defined in "]b4_location_file[". // // To get rid of this file: // 1. add '%require "3.2"' (or newer) to your grammar file // 2. remove references to this file from your build system // 3. if you used to include it, include "]b4_location_file[" instead. #include ]b4_location_include[ ]b4_output_end[ ]]) m4_ifdef([b4_location_file], [[ ]b4_output_begin([b4_dir_prefix], [b4_location_file])[ ]b4_copyright([Locations for Bison parsers in C++])[ /** ** \file ]b4_location_path[ ** Define the ]b4_namespace_ref[::location class. */ ]b4_cpp_guard_open([b4_location_path])[ # include <iostream> # include <string> ]b4_null_define[ ]b4_namespace_open[ ]b4_location_define[ ]b4_namespace_close[ ]b4_cpp_guard_close([b4_location_path])[ ]b4_output_end[ ]]) m4_popdef([b4_copyright_years]) PK r�!\�-N � � skeletons/c++-skel.m4nu �[��� -*- Autoconf -*- # C++ skeleton dispatching for Bison. # Copyright (C) 2006-2007, 2009-2015, 2018-2020 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/>. b4_glr_if( [m4_define([b4_used_skeleton], [b4_skeletonsdir/[glr.cc]])]) b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_skeletonsdir/[glr.cc]])]) m4_define_default([b4_used_skeleton], [b4_skeletonsdir/[lalr1.cc]]) m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"]) m4_include(b4_used_skeleton) PK r�!\y�;�� �� skeletons/c.m4nu �[��� -*- Autoconf -*- # C M4 Macros for Bison. # Copyright (C) 2002, 2004-2015, 2018-2020 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/>. m4_include(b4_skeletonsdir/[c-like.m4]) # b4_tocpp(STRING) # ---------------- # Convert STRING into a valid C macro name. m4_define([b4_tocpp], [m4_toupper(m4_bpatsubst(m4_quote($1), [[^a-zA-Z0-9]+], [_]))]) # b4_cpp_guard(FILE) # ------------------ # A valid C macro name to use as a CPP header guard for FILE. m4_define([b4_cpp_guard], [[YY_]b4_tocpp(m4_defn([b4_prefix])/[$1])[_INCLUDED]]) # b4_cpp_guard_open(FILE) # b4_cpp_guard_close(FILE) # ------------------------ # If FILE does not expand to nothing, open/close CPP inclusion guards for FILE. m4_define([b4_cpp_guard_open], [m4_ifval(m4_quote($1), [#ifndef b4_cpp_guard([$1]) # define b4_cpp_guard([$1])])]) m4_define([b4_cpp_guard_close], [m4_ifval(m4_quote($1), [#endif b4_comment([!b4_cpp_guard([$1])])])]) ## ---------------- ## ## Identification. ## ## ---------------- ## # b4_identification # ----------------- # Depends on individual skeletons to define b4_pure_flag, b4_push_flag, or # b4_pull_flag if they use the values of the %define variables api.pure or # api.push-pull. m4_define([b4_identification], [[/* Identify Bison output, and Bison version. */ #define YYBISON ]b4_version[ /* Bison version string. */ #define YYBISON_VERSION "]b4_version_string[" /* Skeleton name. */ #define YYSKELETON_NAME ]b4_skeleton[]m4_ifdef([b4_pure_flag], [[ /* Pure parsers. */ #define YYPURE ]b4_pure_flag])[]m4_ifdef([b4_push_flag], [[ /* Push parsers. */ #define YYPUSH ]b4_push_flag])[]m4_ifdef([b4_pull_flag], [[ /* Pull parsers. */ #define YYPULL ]b4_pull_flag])[ ]]) ## ---------------- ## ## Default values. ## ## ---------------- ## # b4_api_prefix, b4_api_PREFIX # ---------------------------- # Corresponds to %define api.prefix b4_percent_define_default([[api.prefix]], [[yy]]) m4_define([b4_api_prefix], [b4_percent_define_get([[api.prefix]])]) m4_define([b4_api_PREFIX], [m4_toupper(b4_api_prefix)]) # b4_prefix # --------- # If the %name-prefix is not given, it is api.prefix. m4_define_default([b4_prefix], [b4_api_prefix]) # If the %union is not named, its name is YYSTYPE. b4_percent_define_default([[api.value.union.name]], [b4_api_PREFIX[][STYPE]]) b4_percent_define_default([[api.symbol.prefix]], [[YYSYMBOL_]]) ## ------------------------ ## ## Pure/impure interfaces. ## ## ------------------------ ## # b4_lex_formals # -------------- # All the yylex formal arguments. # b4_lex_param arrives quoted twice, but we want to keep only one level. m4_define([b4_lex_formals], [b4_pure_if([[[[YYSTYPE *yylvalp]], [[&yylval]]][]dnl b4_locations_if([, [[YYLTYPE *yyllocp], [&yylloc]]])])dnl m4_ifdef([b4_lex_param], [, ]b4_lex_param)]) # b4_lex # ------ # Call yylex. m4_define([b4_lex], [b4_function_call([yylex], [int], b4_lex_formals)]) # b4_user_args # ------------ m4_define([b4_user_args], [m4_ifset([b4_parse_param], [, b4_args(b4_parse_param)])]) # b4_user_formals # --------------- # The possible parse-params formal arguments preceded by a comma. m4_define([b4_user_formals], [m4_ifset([b4_parse_param], [, b4_formals(b4_parse_param)])]) # b4_parse_param # -------------- # If defined, b4_parse_param arrives double quoted, but below we prefer # it to be single quoted. m4_define([b4_parse_param], b4_parse_param) # b4_parse_param_for(DECL, FORMAL, BODY) # --------------------------------------- # Iterate over the user parameters, binding the declaration to DECL, # the formal name to FORMAL, and evaluating the BODY. m4_define([b4_parse_param_for], [m4_foreach([$1_$2], m4_defn([b4_parse_param]), [m4_pushdef([$1], m4_unquote(m4_car($1_$2)))dnl m4_pushdef([$2], m4_shift($1_$2))dnl $3[]dnl m4_popdef([$2])dnl m4_popdef([$1])dnl ])]) # b4_parse_param_use([VAL], [LOC]) # -------------------------------- # 'YYUSE' VAL, LOC if locations are enabled, and all the parse-params. m4_define([b4_parse_param_use], [m4_ifvaln([$1], [ YYUSE ([$1]);])dnl b4_locations_if([m4_ifvaln([$2], [ YYUSE ([$2]);])])dnl b4_parse_param_for([Decl], [Formal], [ YYUSE (Formal); ])dnl ]) ## ------------ ## ## Data Types. ## ## ------------ ## # b4_int_type(MIN, MAX) # --------------------- # Return a narrow int type able to handle integers ranging from MIN # to MAX (included) in portable C code. Assume MIN and MAX fall in # 'int' range. m4_define([b4_int_type], [m4_if(b4_ints_in($@, [-127], [127]), [1], [signed char], b4_ints_in($@, [0], [255]), [1], [unsigned char], b4_ints_in($@, [-32767], [32767]), [1], [short], b4_ints_in($@, [0], [65535]), [1], [unsigned short], [int])]) # b4_c99_int_type(MIN, MAX) # ------------------------- # Like b4_int_type, but for C99. # b4_c99_int_type_define replaces b4_int_type with this. m4_define([b4_c99_int_type], [m4_if(b4_ints_in($@, [-127], [127]), [1], [yytype_int8], b4_ints_in($@, [0], [255]), [1], [yytype_uint8], b4_ints_in($@, [-32767], [32767]), [1], [yytype_int16], b4_ints_in($@, [0], [65535]), [1], [yytype_uint16], [int])]) # b4_c99_int_type_define # ---------------------- # Define private types suitable for holding small integers in C99 or later. m4_define([b4_c99_int_type_define], [m4_copy_force([b4_c99_int_type], [b4_int_type])dnl [#ifdef short # undef short #endif /* On compilers that do not define __PTRDIFF_MAX__ etc., make sure <limits.h> and (if available) <stdint.h> are included so that the code can choose integer types of a good width. */ #ifndef __PTRDIFF_MAX__ # include <limits.h> /* INFRINGES ON USER NAME SPACE */ # if defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ # include <stdint.h> /* INFRINGES ON USER NAME SPACE */ # define YY_STDINT_H # endif #endif /* Narrow types that promote to a signed type and that can represent a signed or unsigned integer of at least N bits. In tables they can save space and decrease cache pressure. Promoting to a signed type helps avoid bugs in integer arithmetic. */ #ifdef __INT_LEAST8_MAX__ typedef __INT_LEAST8_TYPE__ yytype_int8; #elif defined YY_STDINT_H typedef int_least8_t yytype_int8; #else typedef signed char yytype_int8; #endif #ifdef __INT_LEAST16_MAX__ typedef __INT_LEAST16_TYPE__ yytype_int16; #elif defined YY_STDINT_H typedef int_least16_t yytype_int16; #else typedef short yytype_int16; #endif #if defined __UINT_LEAST8_MAX__ && __UINT_LEAST8_MAX__ <= __INT_MAX__ typedef __UINT_LEAST8_TYPE__ yytype_uint8; #elif (!defined __UINT_LEAST8_MAX__ && defined YY_STDINT_H \ && UINT_LEAST8_MAX <= INT_MAX) typedef uint_least8_t yytype_uint8; #elif !defined __UINT_LEAST8_MAX__ && UCHAR_MAX <= INT_MAX typedef unsigned char yytype_uint8; #else typedef short yytype_uint8; #endif #if defined __UINT_LEAST16_MAX__ && __UINT_LEAST16_MAX__ <= __INT_MAX__ typedef __UINT_LEAST16_TYPE__ yytype_uint16; #elif (!defined __UINT_LEAST16_MAX__ && defined YY_STDINT_H \ && UINT_LEAST16_MAX <= INT_MAX) typedef uint_least16_t yytype_uint16; #elif !defined __UINT_LEAST16_MAX__ && USHRT_MAX <= INT_MAX typedef unsigned short yytype_uint16; #else typedef int yytype_uint16; #endif]]) # b4_sizes_types_define # --------------------- # Define YYPTRDIFF_T/YYPTRDIFF_MAXIMUM, YYSIZE_T/YYSIZE_MAXIMUM, # and YYSIZEOF. m4_define([b4_sizes_types_define], [[#ifndef YYPTRDIFF_T # if defined __PTRDIFF_TYPE__ && defined __PTRDIFF_MAX__ # define YYPTRDIFF_T __PTRDIFF_TYPE__ # define YYPTRDIFF_MAXIMUM __PTRDIFF_MAX__ # elif defined PTRDIFF_MAX # ifndef ptrdiff_t # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # endif # define YYPTRDIFF_T ptrdiff_t # define YYPTRDIFF_MAXIMUM PTRDIFF_MAX # else # define YYPTRDIFF_T long # define YYPTRDIFF_MAXIMUM LONG_MAX # endif #endif #ifndef YYSIZE_T # ifdef __SIZE_TYPE__ # define YYSIZE_T __SIZE_TYPE__ # elif defined size_t # define YYSIZE_T size_t # elif defined __STDC_VERSION__ && 199901 <= __STDC_VERSION__ # include <stddef.h> /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else # define YYSIZE_T unsigned # endif #endif #define YYSIZE_MAXIMUM \ YY_CAST (YYPTRDIFF_T, \ (YYPTRDIFF_MAXIMUM < YY_CAST (YYSIZE_T, -1) \ ? YYPTRDIFF_MAXIMUM \ : YY_CAST (YYSIZE_T, -1))) #define YYSIZEOF(X) YY_CAST (YYPTRDIFF_T, sizeof (X)) ]]) # b4_int_type_for(NAME) # --------------------- # Return a narrow int type able to handle numbers ranging from # 'NAME_min' to 'NAME_max' (included). m4_define([b4_int_type_for], [b4_int_type($1_min, $1_max)]) # b4_table_value_equals(TABLE, VALUE, LITERAL, SYMBOL) # ---------------------------------------------------- # Without inducing a comparison warning from the compiler, check if the # literal value LITERAL equals VALUE from table TABLE, which must have # TABLE_min and TABLE_max defined. SYMBOL denotes m4_define([b4_table_value_equals], [m4_if(m4_eval($3 < m4_indir([b4_]$1[_min]) || m4_indir([b4_]$1[_max]) < $3), [1], [[0]], [(($2) == $4)])]) ## ----------------- ## ## Compiler issues. ## ## ----------------- ## # b4_attribute_define([noreturn]) # ------------------------------- # Provide portable compiler "attributes". If "noreturn" is passed, define # _Noreturn. m4_define([b4_attribute_define], [[#ifndef YY_ATTRIBUTE_PURE # if defined __GNUC__ && 2 < __GNUC__ + (96 <= __GNUC_MINOR__) # define YY_ATTRIBUTE_PURE __attribute__ ((__pure__)) # else # define YY_ATTRIBUTE_PURE # endif #endif #ifndef YY_ATTRIBUTE_UNUSED # if defined __GNUC__ && 2 < __GNUC__ + (7 <= __GNUC_MINOR__) # define YY_ATTRIBUTE_UNUSED __attribute__ ((__unused__)) # else # define YY_ATTRIBUTE_UNUSED # endif #endif ]m4_bmatch([$1], [\bnoreturn\b], [[/* The _Noreturn keyword of C11. */ ]dnl This is close to lib/_Noreturn.h, except that we do enable dnl the use of [[noreturn]], because _Noreturn is used in places dnl where [[noreturn]] works in C++. We need this in particular dnl because of glr.cc which compiles code from glr.c in C++. dnl And the C++ compiler chokes on _Noreturn. Also, we do not dnl use C' _Noreturn in C++, to avoid -Wc11-extensions warnings. [#ifndef _Noreturn # if (defined __cplusplus \ && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \ || (defined _MSC_VER && 1900 <= _MSC_VER))) # define _Noreturn [[noreturn]] # elif (!defined __cplusplus \ && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \ || 4 < __GNUC__ + (7 <= __GNUC_MINOR__) \ || (defined __apple_build_version__ \ ? 6000000 <= __apple_build_version__ \ : 3 < __clang_major__ + (5 <= __clang_minor__)))) /* _Noreturn works as-is. */ # elif 2 < __GNUC__ + (8 <= __GNUC_MINOR__) || 0x5110 <= __SUNPRO_C # define _Noreturn __attribute__ ((__noreturn__)) # elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0) # define _Noreturn __declspec (noreturn) # else # define _Noreturn # endif #endif ]])[/* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) #else # define YYUSE(E) /* empty */ #endif #if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"") \ _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"") # define YY_IGNORE_MAYBE_UNINITIALIZED_END \ _Pragma ("GCC diagnostic pop") #else # define YY_INITIAL_VALUE(Value) Value #endif #ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN # define YY_IGNORE_MAYBE_UNINITIALIZED_END #endif #ifndef YY_INITIAL_VALUE # define YY_INITIAL_VALUE(Value) /* Nothing. */ #endif #if defined __cplusplus && defined __GNUC__ && ! defined __ICC && 6 <= __GNUC__ # define YY_IGNORE_USELESS_CAST_BEGIN \ _Pragma ("GCC diagnostic push") \ _Pragma ("GCC diagnostic ignored \"-Wuseless-cast\"") # define YY_IGNORE_USELESS_CAST_END \ _Pragma ("GCC diagnostic pop") #endif #ifndef YY_IGNORE_USELESS_CAST_BEGIN # define YY_IGNORE_USELESS_CAST_BEGIN # define YY_IGNORE_USELESS_CAST_END #endif ]]) # b4_cast_define # -------------- m4_define([b4_cast_define], [# ifndef YY_CAST # ifdef __cplusplus # define YY_CAST(Type, Val) static_cast<Type> (Val) # define YY_REINTERPRET_CAST(Type, Val) reinterpret_cast<Type> (Val) # else # define YY_CAST(Type, Val) ((Type) (Val)) # define YY_REINTERPRET_CAST(Type, Val) ((Type) (Val)) # endif # endif[]dnl ]) # b4_null_define # -------------- # Portability issues: define a YY_NULLPTR appropriate for the current # language (C, C++98, or C++11). # # In C++ pre C++11 it is standard practice to use 0 (not NULL) for the # null pointer. In C, prefer ((void*)0) to avoid having to include stdlib.h. m4_define([b4_null_define], [# ifndef YY_NULLPTR # if defined __cplusplus # if 201103L <= __cplusplus # define YY_NULLPTR nullptr # else # define YY_NULLPTR 0 # endif # else # define YY_NULLPTR ((void*)0) # endif # endif[]dnl ]) # b4_null # ------- # Return a null pointer constant. m4_define([b4_null], [YY_NULLPTR]) ## ---------## ## Values. ## ## ---------## # b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT) # ------------------------------------------------------------- # Define "yy<TABLE-NAME>" whose contents is CONTENT. m4_define([b4_integral_parser_table_define], [m4_ifvaln([$3], [b4_comment([$3], [ ])])dnl static const b4_int_type_for([$2]) yy$1[[]] = { $2 };dnl ]) ## ------------- ## ## Token kinds. ## ## ------------- ## # Because C enums are not scoped, because tokens are exposed in the # header, and because these tokens are common to all the parsers, we # need to make sure their names don't collide: use the api.prefix. # YYEOF is special, since the user may give it a different name. m4_define([b4_symbol(-2, id)], [b4_api_PREFIX[][EMPTY]]) m4_define([b4_symbol(-2, tag)], [[No symbol.]]) m4_if(b4_symbol(0, id), [YYEOF], [m4_define([b4_symbol(0, id)], [b4_api_PREFIX[][EOF]])]) m4_define([b4_symbol(1, id)], [b4_api_PREFIX[][error]]) m4_define([b4_symbol(2, id)], [b4_api_PREFIX[][UNDEF]]) # b4_token_define(TOKEN-NUM) # -------------------------- # Output the definition of this token as #define. m4_define([b4_token_define], [b4_token_format([#define %s %s], [$1])]) # b4_token_defines # ---------------- # Output the definition of the tokens. m4_define([b4_token_defines], [[/* Token kinds. */ #define ]b4_symbol([-2], [id])[ -2 ]m4_join([ ], b4_symbol_map([b4_token_define])) ]) # b4_token_enum(TOKEN-NUM) # ------------------------ # Output the definition of this token as an enum. m4_define([b4_token_enum], [b4_token_visible_if([$1], [m4_format([ %-30s %s], m4_format([[%s = %s%s%s]], b4_symbol([$1], [id]), b4_symbol([$1], b4_api_token_raw_if([[number]], [[code]])), m4_if([$1], b4_last_enum_token, [], [[,]])), [b4_symbol_tag_comment([$1])])])]) # b4_token_enums # -------------- # The definition of the token kinds. m4_define([b4_token_enums], [b4_any_token_visible_if([[/* Token kinds. */ #ifndef ]b4_api_PREFIX[TOKENTYPE # define ]b4_api_PREFIX[TOKENTYPE enum ]b4_api_prefix[tokentype { ]b4_symbol([-2], [id])[ = -2, ]b4_symbol_foreach([b4_token_enum])dnl [ }; typedef enum ]b4_api_prefix[tokentype ]b4_api_prefix[token_kind_t; #endif ]])]) # b4_token_enums_defines # ---------------------- # The definition of the tokens (if there are any) as enums and, # if POSIX Yacc is enabled, as #defines. m4_define([b4_token_enums_defines], [b4_token_enums[]b4_yacc_if([b4_token_defines])]) # b4_symbol_translate(STRING) # --------------------------- # Used by "bison" in the array of symbol names to mark those that # require translation. m4_define([b4_symbol_translate], [[N_($1)]]) ## -------------- ## ## Symbol kinds. ## ## -------------- ## # b4_symbol_enum(SYMBOL-NUM) # -------------------------- # Output the definition of this symbol as an enum. m4_define([b4_symbol_enum], [m4_format([ %-40s %s], m4_format([[%s = %s%s%s]], b4_symbol([$1], [kind_base]), [$1], m4_if([$1], b4_last_symbol, [], [[,]])), [b4_symbol_tag_comment([$1])])]) # b4_declare_symbol_enum # ---------------------- # The definition of the symbol internal numbers as an enum. # Defining YYEMPTY here is important: it forces the compiler # to use a signed type, which matters for yytoken. m4_define([b4_declare_symbol_enum], [[/* Symbol kind. */ enum yysymbol_kind_t { ]b4_symbol([-2], kind_base)[ = -2, ]b4_symbol_foreach([b4_symbol_enum])dnl [}; typedef enum yysymbol_kind_t yysymbol_kind_t; ]])]) ## ----------------- ## ## Semantic Values. ## ## ----------------- ## # b4_symbol_value(VAL, [SYMBOL-NUM], [TYPE-TAG]) # ---------------------------------------------- # See README. m4_define([b4_symbol_value], [m4_ifval([$3], [($1.$3)], [m4_ifval([$2], [b4_symbol_if([$2], [has_type], [($1.b4_symbol([$2], [type]))], [$1])], [$1])])]) ## ---------------------- ## ## Defining C functions. ## ## ---------------------- ## # b4_formals([DECL1, NAME1], ...) # ------------------------------- # The formal arguments of a C function definition. m4_define([b4_formals], [m4_if([$#], [0], [void], [$#$1], [1], [void], [m4_map_sep([b4_formal], [, ], [$@])])]) m4_define([b4_formal], [$1]) ## --------------------- ## ## Calling C functions. ## ## --------------------- ## # b4_function_call(NAME, RETURN-VALUE, [DECL1, NAME1], ...) # ----------------------------------------------------------- # Call the function NAME with arguments NAME1, NAME2 etc. m4_define([b4_function_call], [$1 (b4_args(m4_shift2($@)))[]dnl ]) # b4_args([DECL1, NAME1], ...) # ---------------------------- # Output the arguments NAME1, NAME2... m4_define([b4_args], [m4_map_sep([b4_arg], [, ], [$@])]) m4_define([b4_arg], [$2]) ## ----------- ## ## Synclines. ## ## ----------- ## # b4_sync_start(LINE, FILE) # ------------------------- m4_define([b4_sync_start], [[#]line $1 $2]) ## -------------- ## ## User actions. ## ## -------------- ## # b4_case(LABEL, STATEMENTS, [COMMENTS]) # -------------------------------------- m4_define([b4_case], [ case $1:m4_ifval([$3], [ b4_comment([$3])]) $2 b4_syncline([@oline@], [@ofile@])dnl break;]) # b4_predicate_case(LABEL, CONDITIONS) # ------------------------------------ m4_define([b4_predicate_case], [ case $1: if (! ( $2)) YYERROR; b4_syncline([@oline@], [@ofile@])dnl break;]) # b4_yydestruct_define # -------------------- # Define the "yydestruct" function. m4_define_default([b4_yydestruct_define], [[/*-----------------------------------------------. | Release the memory associated to this symbol. | `-----------------------------------------------*/ static void yydestruct (const char *yymsg, yysymbol_kind_t yykind, YYSTYPE *yyvaluep]b4_locations_if(dnl [[, YYLTYPE *yylocationp]])[]b4_user_formals[) { ]b4_parse_param_use([yyvaluep], [yylocationp])dnl [ if (!yymsg) yymsg = "Deleting"; YY_SYMBOL_PRINT (yymsg, yykind, yyvaluep, yylocationp); YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN ]b4_symbol_actions([destructor])[ YY_IGNORE_MAYBE_UNINITIALIZED_END }]dnl ]) # b4_yy_symbol_print_define # ------------------------- # Define the "yy_symbol_print" function. m4_define_default([b4_yy_symbol_print_define], [[ /*-----------------------------------. | Print this symbol's value on YYO. | `-----------------------------------*/ static void yy_symbol_value_print (FILE *yyo, yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep]b4_locations_if(dnl [[, YYLTYPE const * const yylocationp]])[]b4_user_formals[) { FILE *yyoutput = yyo; ]b4_parse_param_use([yyoutput], [yylocationp])dnl [ if (!yyvaluep) return;] dnl glr.c does not feature yytoknum. m4_if(b4_skeleton, ["yacc.c"], [[# ifdef YYPRINT if (yykind < YYNTOKENS) YYPRINT (yyo, yytoknum[yykind], *yyvaluep); # endif ]])dnl b4_percent_code_get([[pre-printer]])dnl YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN b4_symbol_actions([printer]) YY_IGNORE_MAYBE_UNINITIALIZED_END b4_percent_code_get([[post-printer]])dnl [} /*---------------------------. | Print this symbol on YYO. | `---------------------------*/ static void yy_symbol_print (FILE *yyo, yysymbol_kind_t yykind, YYSTYPE const * const yyvaluep]b4_locations_if(dnl [[, YYLTYPE const * const yylocationp]])[]b4_user_formals[) { YYFPRINTF (yyo, "%s %s (", yykind < YYNTOKENS ? "token" : "nterm", yysymbol_name (yykind)); ]b4_locations_if([ YY_LOCATION_PRINT (yyo, *yylocationp); YYFPRINTF (yyo, ": "); ])dnl [ yy_symbol_value_print (yyo, yykind, yyvaluep]dnl b4_locations_if([, yylocationp])[]b4_user_args[); YYFPRINTF (yyo, ")"); }]dnl ]) ## ---------------- ## ## api.value.type. ## ## ---------------- ## # ---------------------- # # api.value.type=union. # # ---------------------- # # b4_symbol_type_register(SYMBOL-NUM) # ----------------------------------- # Symbol SYMBOL-NUM has a type (for variant) instead of a type-tag. # Extend the definition of %union's body (b4_union_members) with a # field of that type, and extend the symbol's "type" field to point to # the field name, instead of the type name. m4_define([b4_symbol_type_register], [m4_define([b4_symbol($1, type_tag)], [b4_symbol_if([$1], [has_id], [b4_symbol([$1], [id])], [yykind_[]b4_symbol([$1], [number])])])dnl m4_append([b4_union_members], m4_expand([m4_format([ %-40s %s], m4_expand([b4_symbol([$1], [type]) b4_symbol([$1], [type_tag]);]), [b4_symbol_tag_comment([$1])])])) ]) # b4_type_define_tag(SYMBOL1-NUM, ...) # ------------------------------------ # For the batch of symbols SYMBOL1-NUM... (which all have the same # type), enhance the %union definition for each of them, and set # there "type" field to the field tag name, instead of the type name. m4_define([b4_type_define_tag], [b4_symbol_if([$1], [has_type], [m4_map([b4_symbol_type_register], [$@])]) ]) # b4_symbol_value_union(VAL, SYMBOL-NUM, [TYPE]) # ---------------------------------------------- # Same of b4_symbol_value, but when api.value.type=union. m4_define([b4_symbol_value_union], [m4_ifval([$3], [(*($3*)(&$1))], [m4_ifval([$2], [b4_symbol_if([$2], [has_type], [($1.b4_symbol([$2], [type_tag]))], [$1])], [$1])])]) # b4_value_type_setup_union # ------------------------- # Setup support for api.value.type=union. Symbols are defined with a # type instead of a union member name: build the corresponding union, # and give the symbols their tag. m4_define([b4_value_type_setup_union], [m4_define([b4_union_members]) b4_type_foreach([b4_type_define_tag]) m4_copy_force([b4_symbol_value_union], [b4_symbol_value]) ]) # -------------------------- # # api.value.type = variant. # # -------------------------- # # b4_value_type_setup_variant # --------------------------- # Setup support for api.value.type=variant. By default, fail, specialized # by other skeletons. m4_define([b4_value_type_setup_variant], [b4_complain_at(b4_percent_define_get_loc([[api.value.type]]), [['%s' does not support '%s']], [b4_skeleton], [%define api.value.type variant])]) # _b4_value_type_setup_keyword # ---------------------------- # api.value.type is defined with a keyword/string syntax. Check if # that is properly defined, and prepare its use. m4_define([_b4_value_type_setup_keyword], [b4_percent_define_check_values([[[[api.value.type]], [[none]], [[union]], [[union-directive]], [[variant]], [[yystype]]]])dnl m4_case(b4_percent_define_get([[api.value.type]]), [union], [b4_value_type_setup_union], [variant], [b4_value_type_setup_variant])]) # b4_value_type_setup # ------------------- # Check if api.value.type is properly defined, and possibly prepare # its use. b4_define_silent([b4_value_type_setup], [# Define default value. b4_percent_define_ifdef([[api.value.type]], [], [# %union => api.value.type=union-directive m4_ifdef([b4_union_members], [m4_define([b4_percent_define_kind(api.value.type)], [keyword]) m4_define([b4_percent_define(api.value.type)], [union-directive])], [# no tag seen => api.value.type={int} m4_if(b4_tag_seen_flag, 0, [m4_define([b4_percent_define_kind(api.value.type)], [code]) m4_define([b4_percent_define(api.value.type)], [int])], [# otherwise api.value.type=yystype m4_define([b4_percent_define_kind(api.value.type)], [keyword]) m4_define([b4_percent_define(api.value.type)], [yystype])])])]) # Set up. m4_bmatch(b4_percent_define_get_kind([[api.value.type]]), [keyword\|string], [_b4_value_type_setup_keyword]) ]) ## -------------- ## ## Declarations. ## ## -------------- ## # b4_value_type_define # -------------------- m4_define([b4_value_type_define], [b4_value_type_setup[]dnl /* Value type. */ m4_bmatch(b4_percent_define_get_kind([[api.value.type]]), [code], [[#if ! defined ]b4_api_PREFIX[STYPE && ! defined ]b4_api_PREFIX[STYPE_IS_DECLARED typedef ]b4_percent_define_get([[api.value.type]])[ ]b4_api_PREFIX[STYPE; # define ]b4_api_PREFIX[STYPE_IS_TRIVIAL 1 # define ]b4_api_PREFIX[STYPE_IS_DECLARED 1 #endif ]], [m4_bmatch(b4_percent_define_get([[api.value.type]]), [union\|union-directive], [[#if ! defined ]b4_api_PREFIX[STYPE && ! defined ]b4_api_PREFIX[STYPE_IS_DECLARED ]b4_percent_define_get_syncline([[api.value.union.name]])dnl [union ]b4_percent_define_get([[api.value.union.name]])[ { ]b4_user_union_members[ }; ]b4_percent_define_get_syncline([[api.value.union.name]])dnl [typedef union ]b4_percent_define_get([[api.value.union.name]])[ ]b4_api_PREFIX[STYPE; # define ]b4_api_PREFIX[STYPE_IS_TRIVIAL 1 # define ]b4_api_PREFIX[STYPE_IS_DECLARED 1 #endif ]])])]) # b4_location_type_define # ----------------------- m4_define([b4_location_type_define], [[/* Location type. */ ]b4_percent_define_ifdef([[api.location.type]], [[typedef ]b4_percent_define_get([[api.location.type]])[ ]b4_api_PREFIX[LTYPE; ]], [[#if ! defined ]b4_api_PREFIX[LTYPE && ! defined ]b4_api_PREFIX[LTYPE_IS_DECLARED typedef struct ]b4_api_PREFIX[LTYPE ]b4_api_PREFIX[LTYPE; struct ]b4_api_PREFIX[LTYPE { int first_line; int first_column; int last_line; int last_column; }; # define ]b4_api_PREFIX[LTYPE_IS_DECLARED 1 # define ]b4_api_PREFIX[LTYPE_IS_TRIVIAL 1 #endif ]])]) # b4_declare_yylstype # ------------------- # Declarations that might either go into the header (if --defines) or # in the parser body. Declare YYSTYPE/YYLTYPE, and yylval/yylloc. m4_define([b4_declare_yylstype], [b4_value_type_define[]b4_locations_if([ b4_location_type_define]) b4_pure_if([], [[extern ]b4_api_PREFIX[STYPE ]b4_prefix[lval; ]b4_locations_if([[extern ]b4_api_PREFIX[LTYPE ]b4_prefix[lloc;]])])[]dnl ]) # b4_YYDEBUG_define # ----------------- m4_define([b4_YYDEBUG_define], [[/* Debug traces. */ ]m4_if(b4_api_prefix, [yy], [[#ifndef YYDEBUG # define YYDEBUG ]b4_parse_trace_if([1], [0])[ #endif]], [[#ifndef ]b4_api_PREFIX[DEBUG # if defined YYDEBUG #if YYDEBUG # define ]b4_api_PREFIX[DEBUG 1 # else # define ]b4_api_PREFIX[DEBUG 0 # endif # else /* ! defined YYDEBUG */ # define ]b4_api_PREFIX[DEBUG ]b4_parse_trace_if([1], [0])[ # endif /* ! defined YYDEBUG */ #endif /* ! defined ]b4_api_PREFIX[DEBUG */]])[]dnl ]) # b4_declare_yydebug # ------------------ m4_define([b4_declare_yydebug], [b4_YYDEBUG_define[ #if ]b4_api_PREFIX[DEBUG extern int ]b4_prefix[debug; #endif][]dnl ]) # b4_yylloc_default_define # ------------------------ # Define YYLLOC_DEFAULT. m4_define([b4_yylloc_default_define], [[/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ #ifndef YYLLOC_DEFAULT # define YYLLOC_DEFAULT(Current, Rhs, N) \ do \ if (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; \ } \ while (0) #endif ]]) # b4_yy_location_print_define # --------------------------- # Define YY_LOCATION_PRINT. m4_define([b4_yy_location_print_define], [b4_locations_if([[ /* YY_LOCATION_PRINT -- Print the location on the stream. This macro was not mandated originally: define only if we know we won't break user code: when these are the locations we know. */ # ifndef YY_LOCATION_PRINT # if defined ]b4_api_PREFIX[LTYPE_IS_TRIVIAL && ]b4_api_PREFIX[LTYPE_IS_TRIVIAL /* Print *YYLOCP on YYO. Private, do not rely on its existence. */ YY_ATTRIBUTE_UNUSED static int yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp) { int res = 0; int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0; if (0 <= yylocp->first_line) { res += YYFPRINTF (yyo, "%d", yylocp->first_line); if (0 <= yylocp->first_column) res += YYFPRINTF (yyo, ".%d", yylocp->first_column); } if (0 <= yylocp->last_line) { if (yylocp->first_line < yylocp->last_line) { res += YYFPRINTF (yyo, "-%d", yylocp->last_line); if (0 <= end_col) res += YYFPRINTF (yyo, ".%d", end_col); } else if (0 <= end_col && yylocp->first_column < end_col) res += YYFPRINTF (yyo, "-%d", end_col); } return res; } # define YY_LOCATION_PRINT(File, Loc) \ yy_location_print_ (File, &(Loc)) # else # define YY_LOCATION_PRINT(File, Loc) ((void) 0) # endif # endif /* !defined YY_LOCATION_PRINT */]], [[/* This macro is provided for backward compatibility. */ # ifndef YY_LOCATION_PRINT # define YY_LOCATION_PRINT(File, Loc) ((void) 0) # endif]]) ]) # b4_yyloc_default # ---------------- # Expand to a possible default value for yylloc. m4_define([b4_yyloc_default], [[ # if defined ]b4_api_PREFIX[LTYPE_IS_TRIVIAL && ]b4_api_PREFIX[LTYPE_IS_TRIVIAL = { ]m4_join([, ], m4_defn([b4_location_initial_line]), m4_defn([b4_location_initial_column]), m4_defn([b4_location_initial_line]), m4_defn([b4_location_initial_column]))[ } # endif ]]) PK r�!\VdsBT� T� skeletons/lalr1.ccnu �[��� # C++ skeleton for Bison # Copyright (C) 2002-2015, 2018-2020 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/>. m4_include(b4_skeletonsdir/[c++.m4]) # api.value.type=variant is valid. m4_define([b4_value_type_setup_variant]) # Check the value of %define parse.lac, where LAC stands for lookahead # correction. b4_percent_define_default([[parse.lac]], [[none]]) b4_percent_define_check_values([[[[parse.lac]], [[full]], [[none]]]]) b4_define_flag_if([lac]) m4_define([b4_lac_flag], [m4_if(b4_percent_define_get([[parse.lac]]), [none], [[0]], [[1]])]) # b4_tname_if(TNAME-NEEDED, TNAME-NOT-NEEDED) # ------------------------------------------- m4_define([b4_tname_if], [m4_case(b4_percent_define_get([[parse.error]]), [verbose], [$1], [b4_token_table_if([$1], [$2])])]) # b4_integral_parser_table_declare(TABLE-NAME, CONTENT, COMMENT) # -------------------------------------------------------------- # Declare "parser::yy<TABLE-NAME>_" whose contents is CONTENT. m4_define([b4_integral_parser_table_declare], [m4_ifval([$3], [b4_comment([$3], [ ]) ])dnl static const b4_int_type_for([$2]) yy$1_[[]];dnl ]) # b4_integral_parser_table_define(TABLE-NAME, CONTENT, COMMENT) # ------------------------------------------------------------- # Define "parser::yy<TABLE-NAME>_" whose contents is CONTENT. m4_define([b4_integral_parser_table_define], [ const b4_int_type_for([$2]) b4_parser_class::yy$1_[[]] = { $2 };dnl ]) # b4_symbol_kind(NUM) # ------------------- m4_define([b4_symbol_kind], [symbol_kind::b4_symbol_kind_base($@)]) # b4_symbol_value_template(VAL, SYMBOL-NUM, [TYPE]) # ------------------------------------------------- # Same as b4_symbol_value, but used in a template method. It makes # a difference when using variants. Note that b4_value_type_setup_union # overrides b4_symbol_value, so we must override it again. m4_copy([b4_symbol_value], [b4_symbol_value_template]) m4_append([b4_value_type_setup_union], [m4_copy_force([b4_symbol_value_union], [b4_symbol_value_template])]) # b4_lhs_value(SYMBOL-NUM, [TYPE]) # -------------------------------- # See README. m4_define([b4_lhs_value], [b4_symbol_value([yylhs.value], [$1], [$2])]) # b4_lhs_location() # ----------------- # Expansion of @$. m4_define([b4_lhs_location], [yylhs.location]) # b4_rhs_data(RULE-LENGTH, POS) # ----------------------------- # See README. m4_define([b4_rhs_data], [yystack_@{b4_subtract($@)@}]) # b4_rhs_state(RULE-LENGTH, POS) # ------------------------------ # The state corresponding to the symbol #POS, where the current # rule has RULE-LENGTH symbols on RHS. m4_define([b4_rhs_state], [b4_rhs_data([$1], [$2]).state]) # b4_rhs_value(RULE-LENGTH, POS, SYMBOL-NUM, [TYPE]) # -------------------------------------------------- # See README. m4_define([_b4_rhs_value], [b4_symbol_value([b4_rhs_data([$1], [$2]).value], [$3], [$4])]) m4_define([b4_rhs_value], [b4_percent_define_ifdef([api.value.automove], [YY_MOVE (_b4_rhs_value($@))], [_b4_rhs_value($@)])]) # b4_rhs_location(RULE-LENGTH, POS) # --------------------------------- # Expansion of @POS, where the current rule has RULE-LENGTH symbols # on RHS. m4_define([b4_rhs_location], [b4_rhs_data([$1], [$2]).location]) # b4_symbol_action(SYMBOL-NUM, KIND) # ---------------------------------- # Run the action KIND (destructor or printer) for SYMBOL-NUM. # Same as in C, but using references instead of pointers. m4_define([b4_symbol_action], [b4_symbol_if([$1], [has_$2], [m4_pushdef([b4_symbol_value], m4_defn([b4_symbol_value_template]))[]dnl b4_dollar_pushdef([yysym.value], [$1], [], [yysym.location])dnl _b4_symbol_case([$1])[]dnl b4_syncline([b4_symbol([$1], [$2_line])], [b4_symbol([$1], [$2_file])])dnl b4_symbol([$1], [$2]) b4_syncline([@oline@], [@ofile@])dnl break; m4_popdef([b4_symbol_value])[]dnl b4_dollar_popdef[]dnl ])]) # b4_lex # ------ # Call yylex. m4_define([b4_lex], [b4_token_ctor_if( [b4_function_call([yylex], [symbol_type], m4_ifdef([b4_lex_param], b4_lex_param))], [b4_function_call([yylex], [int], [b4_api_PREFIX[STYPE*], [&yyla.value]][]dnl b4_locations_if([, [[location*], [&yyla.location]]])dnl m4_ifdef([b4_lex_param], [, ]b4_lex_param))])]) m4_pushdef([b4_copyright_years], [2002-2015, 2018-2020]) m4_define([b4_parser_class], [b4_percent_define_get([[api.parser.class]])]) b4_bison_locations_if([# Backward compatibility. m4_define([b4_location_constructors]) m4_include(b4_skeletonsdir/[location.cc])]) m4_include(b4_skeletonsdir/[stack.hh]) b4_variant_if([m4_include(b4_skeletonsdir/[variant.hh])]) # b4_shared_declarations(hh|cc) # ----------------------------- # Declaration that might either go into the header (if --defines, $1 = hh) # or in the implementation file. m4_define([b4_shared_declarations], [b4_percent_code_get([[requires]])[ ]b4_parse_assert_if([# include <cassert>])[ # include <cstdlib> // std::abort # include <iostream> # include <stdexcept> # include <string> # include <vector> ]b4_cxx_portability[ ]m4_ifdef([b4_location_include], [[# include ]b4_location_include])[ ]b4_variant_if([b4_variant_includes])[ ]b4_attribute_define[ ]b4_cast_define[ ]b4_null_define[ ]b4_YYDEBUG_define[ ]b4_namespace_open[ ]b4_bison_locations_if([m4_ifndef([b4_location_file], [b4_location_define])])[ /// A Bison parser. class ]b4_parser_class[ { public: ]b4_public_types_declare[ ]b4_symbol_type_define[ /// Build a parser object. ]b4_parser_class[ (]b4_parse_param_decl[); virtual ~]b4_parser_class[ (); #if 201103L <= YY_CPLUSPLUS /// Non copyable. ]b4_parser_class[ (const ]b4_parser_class[&) = delete; /// Non copyable. ]b4_parser_class[& operator= (const ]b4_parser_class[&) = delete; #endif /// Parse. An alias for parse (). /// \returns 0 iff parsing succeeded. int operator() (); /// Parse. /// \returns 0 iff parsing succeeded. virtual int parse (); #if ]b4_api_PREFIX[DEBUG /// The current debugging stream. std::ostream& debug_stream () const YY_ATTRIBUTE_PURE; /// Set the current debugging stream. void set_debug_stream (std::ostream &); /// Type for debugging levels. typedef int debug_level_type; /// The current debugging level. debug_level_type debug_level () const YY_ATTRIBUTE_PURE; /// Set the current debugging level. void set_debug_level (debug_level_type l); #endif /// Report a syntax error.]b4_locations_if([[ /// \param loc where the syntax error is found.]])[ /// \param msg a description of the syntax error. virtual void error (]b4_locations_if([[const location_type& loc, ]])[const std::string& msg); /// Report a syntax error. void error (const syntax_error& err); ]b4_parse_error_bmatch( [custom\|detailed], [[ /// The user-facing name of the symbol whose (internal) number is /// YYSYMBOL. No bounds checking. static const char *symbol_name (symbol_kind_type yysymbol);]], [simple], [[#if ]b4_api_PREFIX[DEBUG || ]b4_token_table_flag[ /// The user-facing name of the symbol whose (internal) number is /// YYSYMBOL. No bounds checking. static const char *symbol_name (symbol_kind_type yysymbol); #endif // #if ]b4_api_PREFIX[DEBUG || ]b4_token_table_flag[ ]], [verbose], [[ /// The user-facing name of the symbol whose (internal) number is /// YYSYMBOL. No bounds checking. static std::string symbol_name (symbol_kind_type yysymbol);]])[ ]b4_token_constructor_define[ ]b4_parse_error_bmatch([custom\|detailed\|verbose], [[ class context { public: context (const ]b4_parser_class[& yyparser, const symbol_type& yyla); const symbol_type& lookahead () const { return yyla_; } symbol_kind_type token () const { return yyla_.kind (); }]b4_locations_if([[ const location_type& location () const { return yyla_.location; } ]])[ /// Put in YYARG at most YYARGN of the expected tokens, and return the /// number of tokens stored in YYARG. If YYARG is null, return the /// number of expected tokens (guaranteed to be less than YYNTOKENS). int expected_tokens (symbol_kind_type yyarg[], int yyargn) const; private: const ]b4_parser_class[& yyparser_; const symbol_type& yyla_; }; ]])[ private: #if YY_CPLUSPLUS < 201103L /// Non copyable. ]b4_parser_class[ (const ]b4_parser_class[&); /// Non copyable. ]b4_parser_class[& operator= (const ]b4_parser_class[&); #endif ]b4_lac_if([[ /// Check the lookahead yytoken. /// \returns true iff the token will be eventually shifted. bool yy_lac_check_ (symbol_kind_type yytoken) const; /// Establish the initial context if no initial context currently exists. /// \returns true iff the token will be eventually shifted. bool yy_lac_establish_ (symbol_kind_type yytoken); /// Discard any previous initial lookahead context because of event. /// \param event the event which caused the lookahead to be discarded. /// Only used for debbuging output. void yy_lac_discard_ (const char* event);]])[ /// Stored state numbers (used for stacks). typedef ]b4_int_type(0, m4_eval(b4_states_number - 1))[ state_type; ]b4_parse_error_bmatch( [custom], [[ /// Report a syntax error /// \param yyctx the context in which the error occurred. void report_syntax_error (const context& yyctx) const;]], [detailed\|verbose], [[ /// The arguments of the error message. int yy_syntax_error_arguments_ (const context& yyctx, symbol_kind_type yyarg[], int yyargn) const; /// Generate an error message. /// \param yyctx the context in which the error occurred. virtual std::string yysyntax_error_ (const context& yyctx) const;]])[ /// Compute post-reduction state. /// \param yystate the current state /// \param yysym the nonterminal to push on the stack static state_type yy_lr_goto_state_ (state_type yystate, int yysym); /// Whether the given \c yypact_ value indicates a defaulted state. /// \param yyvalue the value to check static bool yy_pact_value_is_default_ (int yyvalue); /// Whether the given \c yytable_ value indicates a syntax error. /// \param yyvalue the value to check static bool yy_table_value_is_error_ (int yyvalue); static const ]b4_int_type(b4_pact_ninf, b4_pact_ninf)[ yypact_ninf_; static const ]b4_int_type(b4_table_ninf, b4_table_ninf)[ yytable_ninf_; /// Convert a scanner token kind \a t to a symbol kind. /// In theory \a t should be a token_kind_type, but character literals /// are valid, yet not members of the token_type enum. static symbol_kind_type yytranslate_ (int t); ]b4_parse_error_bmatch( [simple], [[#if ]b4_api_PREFIX[DEBUG || ]b4_token_table_flag[ /// For a symbol, its name in clear. static const char* const yytname_[]; #endif // #if ]b4_api_PREFIX[DEBUG || ]b4_token_table_flag[ ]], [verbose], [[ /// Convert the symbol name \a n to a form suitable for a diagnostic. static std::string yytnamerr_ (const char *yystr); /// For a symbol, its name in clear. static const char* const yytname_[]; ]])[ // Tables. ]b4_parser_tables_declare[ #if ]b4_api_PREFIX[DEBUG ]b4_integral_parser_table_declare([rline], [b4_rline], [[YYRLINE[YYN] -- Source line where rule number YYN was defined.]])[ /// Report on the debug stream that the rule \a r is going to be reduced. virtual void yy_reduce_print_ (int r) const; /// Print the state stack on the debug stream. virtual void yy_stack_print_ () const; /// Debugging level. int yydebug_; /// Debug stream. std::ostream* yycdebug_; /// \brief Display a symbol kind, value and location. /// \param yyo The output stream. /// \param yysym The symbol. template <typename Base> void yy_print_ (std::ostream& yyo, const basic_symbol<Base>& yysym) const; #endif /// \brief Reclaim the memory associated to a symbol. /// \param yymsg Why this token is reclaimed. /// If null, print nothing. /// \param yysym The symbol. template <typename Base> void yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const; private: /// Type access provider for state based symbols. struct by_state { /// Default constructor. by_state () YY_NOEXCEPT; /// The symbol kind as needed by the constructor. typedef state_type kind_type; /// Constructor. by_state (kind_type s) YY_NOEXCEPT; /// Copy constructor. by_state (const by_state& that) YY_NOEXCEPT; /// Record that this symbol is empty. void clear () YY_NOEXCEPT; /// Steal the symbol kind from \a that. void move (by_state& that); /// The symbol kind (corresponding to \a state). /// \a ]b4_symbol(-2, kind)[ when empty. symbol_kind_type kind () const YY_NOEXCEPT; /// The state number used to denote an empty symbol. /// We use the initial state, as it does not have a value. enum { empty_state = 0 }; /// The state. /// \a empty when empty. state_type state; }; /// "Internal" symbol: element of the stack. struct stack_symbol_type : basic_symbol<by_state> { /// Superclass. typedef basic_symbol<by_state> super_type; /// Construct an empty symbol. stack_symbol_type (); /// Move or copy construction. stack_symbol_type (YY_RVREF (stack_symbol_type) that); /// Steal the contents from \a sym to build this. stack_symbol_type (state_type s, YY_MOVE_REF (symbol_type) sym); #if YY_CPLUSPLUS < 201103L /// Assignment, needed by push_back by some old implementations. /// Moves the contents of that. stack_symbol_type& operator= (stack_symbol_type& that); /// Assignment, needed by push_back by other implementations. /// Needed by some other old implementations. stack_symbol_type& operator= (const stack_symbol_type& that); #endif }; ]b4_stack_define[ /// Stack type. typedef stack<stack_symbol_type> stack_type; /// The stack. stack_type yystack_;]b4_lac_if([[ /// The stack for LAC. /// Logically, the yy_lac_stack's lifetime is confined to the function /// yy_lac_check_. We just store it as a member of this class to hold /// on to the memory and to avoid frequent reallocations. /// Since yy_lac_check_ is const, this member must be mutable. mutable std::vector<state_type> yylac_stack_; /// Whether an initial LAC context was established. bool yy_lac_established_; ]])[ /// Push a new state on the stack. /// \param m a debug message to display /// if null, no trace is output. /// \param sym the symbol /// \warning the contents of \a s.value is stolen. void yypush_ (const char* m, YY_MOVE_REF (stack_symbol_type) sym); /// Push a new look ahead token on the state on the stack. /// \param m a debug message to display /// if null, no trace is output. /// \param s the state /// \param sym the symbol (for its value and location). /// \warning the contents of \a sym.value is stolen. void yypush_ (const char* m, state_type s, YY_MOVE_REF (symbol_type) sym); /// Pop \a n symbols from the stack. void yypop_ (int n = 1); /// Constants. enum { yylast_ = ]b4_last[, ///< Last index in yytable_. yynnts_ = ]b4_nterms_number[, ///< Number of nonterminal symbols. yyfinal_ = ]b4_final_state_number[ ///< Termination state number. }; ]b4_parse_param_vars[ ]b4_percent_code_get([[yy_bison_internal_hook]])[ }; ]b4_token_ctor_if([b4_yytranslate_define([$1])[ ]b4_public_types_define([$1])])[ ]b4_namespace_close[ ]b4_percent_code_get([[provides]])[ ]]) ## -------------- ## ## Output files. ## ## -------------- ## b4_defines_if( [b4_output_begin([b4_spec_header_file]) b4_copyright([Skeleton interface for Bison LALR(1) parsers in C++]) [ /** ** \file ]b4_spec_mapped_header_file[ ** Define the ]b4_namespace_ref[::parser class. */ // C++ LALR(1) parser skeleton written by Akim Demaille. ]b4_disclaimer[ ]b4_cpp_guard_open([b4_spec_mapped_header_file])[ ]b4_shared_declarations(hh)[ ]b4_cpp_guard_close([b4_spec_mapped_header_file])[ ]b4_output_end[ ]]) b4_output_begin([b4_parser_file_name])[ ]b4_copyright([Skeleton implementation for Bison LALR(1) parsers in C++])[ ]b4_disclaimer[ ]b4_percent_code_get([[top]])[]dnl m4_if(b4_prefix, [yy], [], [ // Take the name prefix into account. [#]define yylex b4_prefix[]lex])[ ]b4_user_pre_prologue[ ]b4_defines_if([[#include "@basename(]b4_spec_header_file[@)"]], [b4_shared_declarations([cc])])[ ]b4_user_post_prologue[ ]b4_percent_code_get[ #ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> // FIXME: INFRINGES ON USER NAME SPACE. # define YY_(msgid) dgettext ("bison-runtime", msgid) # endif # endif # ifndef YY_ # define YY_(msgid) msgid # endif #endif ]b4_has_translations_if([ #ifndef N_ # define N_(Msgid) Msgid #endif ])[ // Whether we are compiled with exception support. #ifndef YY_EXCEPTIONS # if defined __GNUC__ && !defined __EXCEPTIONS # define YY_EXCEPTIONS 0 # else # define YY_EXCEPTIONS 1 # endif #endif ]b4_locations_if([dnl [#define YYRHSLOC(Rhs, K) ((Rhs)[K].location) ]b4_yylloc_default_define])[ // Enable debugging if requested. #if ]b4_api_PREFIX[DEBUG // A pseudo ostream that takes yydebug_ into account. # define YYCDEBUG if (yydebug_) (*yycdebug_) # define YY_SYMBOL_PRINT(Title, Symbol) \ do { \ if (yydebug_) \ { \ *yycdebug_ << Title << ' '; \ yy_print_ (*yycdebug_, Symbol); \ *yycdebug_ << '\n'; \ } \ } while (false) # define YY_REDUCE_PRINT(Rule) \ do { \ if (yydebug_) \ yy_reduce_print_ (Rule); \ } while (false) # define YY_STACK_PRINT() \ do { \ if (yydebug_) \ yy_stack_print_ (); \ } while (false) #else // !]b4_api_PREFIX[DEBUG # define YYCDEBUG if (false) std::cerr # define YY_SYMBOL_PRINT(Title, Symbol) YYUSE (Symbol) # define YY_REDUCE_PRINT(Rule) static_cast<void> (0) # define YY_STACK_PRINT() static_cast<void> (0) #endif // !]b4_api_PREFIX[DEBUG #define yyerrok (yyerrstatus_ = 0) #define yyclearin (yyla.clear ()) #define YYACCEPT goto yyacceptlab #define YYABORT goto yyabortlab #define YYERROR goto yyerrorlab #define YYRECOVERING() (!!yyerrstatus_) ]b4_namespace_open[ /// Build a parser object. ]b4_parser_class::b4_parser_class[ (]b4_parse_param_decl[) #if ]b4_api_PREFIX[DEBUG : yydebug_ (false), yycdebug_ (&std::cerr)]b4_lac_if([,], [m4_ifset([b4_parse_param], [,])])[ #else ]b4_lac_if([ :], [m4_ifset([b4_parse_param], [ :])])[ #endif]b4_lac_if([[ yy_lac_established_ (false)]m4_ifset([b4_parse_param], [,])])[]b4_parse_param_cons[ {} ]b4_parser_class::~b4_parser_class[ () {} ]b4_parser_class[::syntax_error::~syntax_error () YY_NOEXCEPT YY_NOTHROW {} /*---------------. | symbol kinds. | `---------------*/ ]b4_token_ctor_if([], [b4_public_types_define([cc])])[ // by_state. ]b4_parser_class[::by_state::by_state () YY_NOEXCEPT : state (empty_state) {} ]b4_parser_class[::by_state::by_state (const by_state& that) YY_NOEXCEPT : state (that.state) {} void ]b4_parser_class[::by_state::clear () YY_NOEXCEPT { state = empty_state; } void ]b4_parser_class[::by_state::move (by_state& that) { state = that.state; that.clear (); } ]b4_parser_class[::by_state::by_state (state_type s) YY_NOEXCEPT : state (s) {} ]b4_parser_class[::symbol_kind_type ]b4_parser_class[::by_state::kind () const YY_NOEXCEPT { if (state == empty_state) return ]b4_symbol(-2, kind)[; else return YY_CAST (symbol_kind_type, yystos_[+state]); } ]b4_parser_class[::stack_symbol_type::stack_symbol_type () {} ]b4_parser_class[::stack_symbol_type::stack_symbol_type (YY_RVREF (stack_symbol_type) that) : super_type (YY_MOVE (that.state)]b4_variant_if([], [, YY_MOVE (that.value)])b4_locations_if([, YY_MOVE (that.location)])[) {]b4_variant_if([ b4_symbol_variant([that.kind ()], [value], [YY_MOVE_OR_COPY], [YY_MOVE (that.value)])])[ #if 201103L <= YY_CPLUSPLUS // that is emptied. that.state = empty_state; #endif } ]b4_parser_class[::stack_symbol_type::stack_symbol_type (state_type s, YY_MOVE_REF (symbol_type) that) : super_type (s]b4_variant_if([], [, YY_MOVE (that.value)])[]b4_locations_if([, YY_MOVE (that.location)])[) {]b4_variant_if([ b4_symbol_variant([that.kind ()], [value], [move], [YY_MOVE (that.value)])])[ // that is emptied. that.kind_ = ]b4_symbol(-2, kind)[; } #if YY_CPLUSPLUS < 201103L ]b4_parser_class[::stack_symbol_type& ]b4_parser_class[::stack_symbol_type::operator= (const stack_symbol_type& that) { state = that.state; ]b4_variant_if([b4_symbol_variant([that.kind ()], [value], [copy], [that.value])], [[value = that.value;]])[]b4_locations_if([ location = that.location;])[ return *this; } ]b4_parser_class[::stack_symbol_type& ]b4_parser_class[::stack_symbol_type::operator= (stack_symbol_type& that) { state = that.state; ]b4_variant_if([b4_symbol_variant([that.kind ()], [value], [move], [that.value])], [[value = that.value;]])[]b4_locations_if([ location = that.location;])[ // that is emptied. that.state = empty_state; return *this; } #endif template <typename Base> void ]b4_parser_class[::yy_destroy_ (const char* yymsg, basic_symbol<Base>& yysym) const { if (yymsg) YY_SYMBOL_PRINT (yymsg, yysym);]b4_variant_if([], [ // User destructor. b4_symbol_actions([destructor], [yysym.kind ()])])[ } #if ]b4_api_PREFIX[DEBUG template <typename Base> void ]b4_parser_class[::yy_print_ (std::ostream& yyo, const basic_symbol<Base>& yysym) const { std::ostream& yyoutput = yyo; YYUSE (yyoutput); if (yysym.empty ()) yyo << "empty symbol"; else { symbol_kind_type yykind = yysym.kind (); yyo << (yykind < YYNTOKENS ? "token" : "nterm") << ' ' << yysym.name () << " ("]b4_locations_if([ << yysym.location << ": "])[; ]b4_symbol_actions([printer])[ yyo << ')'; } } #endif void ]b4_parser_class[::yypush_ (const char* m, YY_MOVE_REF (stack_symbol_type) sym) { if (m) YY_SYMBOL_PRINT (m, sym); yystack_.push (YY_MOVE (sym)); } void ]b4_parser_class[::yypush_ (const char* m, state_type s, YY_MOVE_REF (symbol_type) sym) { #if 201103L <= YY_CPLUSPLUS yypush_ (m, stack_symbol_type (s, std::move (sym))); #else stack_symbol_type ss (s, sym); yypush_ (m, ss); #endif } void ]b4_parser_class[::yypop_ (int n) { yystack_.pop (n); } #if ]b4_api_PREFIX[DEBUG std::ostream& ]b4_parser_class[::debug_stream () const { return *yycdebug_; } void ]b4_parser_class[::set_debug_stream (std::ostream& o) { yycdebug_ = &o; } ]b4_parser_class[::debug_level_type ]b4_parser_class[::debug_level () const { return yydebug_; } void ]b4_parser_class[::set_debug_level (debug_level_type l) { yydebug_ = l; } #endif // ]b4_api_PREFIX[DEBUG ]b4_parser_class[::state_type ]b4_parser_class[::yy_lr_goto_state_ (state_type yystate, int yysym) { int yyr = yypgoto_[yysym - YYNTOKENS] + yystate; if (0 <= yyr && yyr <= yylast_ && yycheck_[yyr] == yystate) return yytable_[yyr]; else return yydefgoto_[yysym - YYNTOKENS]; } bool ]b4_parser_class[::yy_pact_value_is_default_ (int yyvalue) { return yyvalue == yypact_ninf_; } bool ]b4_parser_class[::yy_table_value_is_error_ (int yyvalue) { return yyvalue == yytable_ninf_; } int ]b4_parser_class[::operator() () { return parse (); } int ]b4_parser_class[::parse () { int yyn; /// Length of the RHS of the rule being reduced. int yylen = 0; // Error handling. int yynerrs_ = 0; int yyerrstatus_ = 0; /// The lookahead symbol. symbol_type yyla;]b4_locations_if([[ /// The locations where the error started and ended. stack_symbol_type yyerror_range[3];]])[ /// The return value of parse (). int yyresult;]b4_lac_if([[ /// Discard the LAC context in case there still is one left from a /// previous invocation. yy_lac_discard_ ("init");]])[ #if YY_EXCEPTIONS try #endif // YY_EXCEPTIONS { YYCDEBUG << "Starting parse\n"; ]m4_ifdef([b4_initial_action], [ b4_dollar_pushdef([yyla.value], [], [], [yyla.location])dnl b4_user_initial_action b4_dollar_popdef])[]dnl [ /* Initialize the stack. The initial state will be set in yynewstate, since the latter expects the semantical and the location values to have been already stored, initialize these stacks with a primary value. */ yystack_.clear (); yypush_ (YY_NULLPTR, 0, YY_MOVE (yyla)); /*-----------------------------------------------. | yynewstate -- push a new symbol on the stack. | `-----------------------------------------------*/ yynewstate: YYCDEBUG << "Entering state " << int (yystack_[0].state) << '\n'; YY_STACK_PRINT (); // Accept? if (yystack_[0].state == yyfinal_) YYACCEPT; goto yybackup; /*-----------. | yybackup. | `-----------*/ yybackup: // Try to take a decision without lookahead. yyn = yypact_[+yystack_[0].state]; if (yy_pact_value_is_default_ (yyn)) goto yydefault; // Read a lookahead token. if (yyla.empty ()) { YYCDEBUG << "Reading a token\n"; #if YY_EXCEPTIONS try #endif // YY_EXCEPTIONS {]b4_token_ctor_if([[ symbol_type yylookahead (]b4_lex[); yyla.move (yylookahead);]], [[ yyla.kind_ = yytranslate_ (]b4_lex[);]])[ } #if YY_EXCEPTIONS catch (const syntax_error& yyexc) { YYCDEBUG << "Caught exception: " << yyexc.what() << '\n'; error (yyexc); goto yyerrlab1; } #endif // YY_EXCEPTIONS } YY_SYMBOL_PRINT ("Next token is", yyla); if (yyla.kind () == ]b4_symbol(1, kind)[) { // The scanner already issued an error message, process directly // to error recovery. But do not keep the error token as // lookahead, it is too special and may lead us to an endless // loop in error recovery. */ yyla.kind_ = ]b4_symbol(2, kind)[; goto yyerrlab1; } /* If the proper action on seeing token YYLA.TYPE is to reduce or to detect an error, take that action. */ yyn += yyla.kind (); if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yyla.kind ()) {]b4_lac_if([[ if (!yy_lac_establish_ (yyla.kind ())) goto yyerrlab;]])[ goto yydefault; } // Reduce or error. yyn = yytable_[yyn]; if (yyn <= 0) { if (yy_table_value_is_error_ (yyn)) goto yyerrlab;]b4_lac_if([[ if (!yy_lac_establish_ (yyla.kind ())) goto yyerrlab; ]])[ yyn = -yyn; goto yyreduce; } // Count tokens shifted since error; after three, turn off error status. if (yyerrstatus_) --yyerrstatus_; // Shift the lookahead token. yypush_ ("Shifting", state_type (yyn), YY_MOVE (yyla));]b4_lac_if([[ yy_lac_discard_ ("shift");]])[ goto yynewstate; /*-----------------------------------------------------------. | yydefault -- do the default action for the current state. | `-----------------------------------------------------------*/ yydefault: yyn = yydefact_[+yystack_[0].state]; if (yyn == 0) goto yyerrlab; goto yyreduce; /*-----------------------------. | yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: yylen = yyr2_[yyn]; { stack_symbol_type yylhs; yylhs.state = yy_lr_goto_state_ (yystack_[yylen].state, yyr1_[yyn]);]b4_variant_if([ /* Variants are always initialized to an empty instance of the correct type. The default '$$ = $1' action is NOT applied when using variants. */ b4_symbol_variant([[yyr1_@{yyn@}]], [yylhs.value], [emplace])], [ /* If YYLEN is nonzero, implement the default value of the action: '$$ = $1'. Otherwise, use the top of the stack. Otherwise, the following line sets YYLHS.VALUE to garbage. This behavior is undocumented and Bison users should not rely upon it. */ if (yylen) yylhs.value = yystack_@{yylen - 1@}.value; else yylhs.value = yystack_@{0@}.value;])[ ]b4_locations_if([dnl [ // Default location. { stack_type::slice range (yystack_, yylen); YYLLOC_DEFAULT (yylhs.location, range, yylen); yyerror_range[1].location = yylhs.location; }]])[ // Perform the reduction. YY_REDUCE_PRINT (yyn); #if YY_EXCEPTIONS try #endif // YY_EXCEPTIONS { switch (yyn) { ]b4_user_actions[ default: break; } } #if YY_EXCEPTIONS catch (const syntax_error& yyexc) { YYCDEBUG << "Caught exception: " << yyexc.what() << '\n'; error (yyexc); YYERROR; } #endif // YY_EXCEPTIONS YY_SYMBOL_PRINT ("-> $$ =", yylhs); yypop_ (yylen); yylen = 0; // Shift the result of the reduction. yypush_ (YY_NULLPTR, YY_MOVE (yylhs)); } goto yynewstate; /*--------------------------------------. | yyerrlab -- here on detecting error. | `--------------------------------------*/ yyerrlab: // If not already recovering from an error, report this error. if (!yyerrstatus_) { ++yynerrs_;]b4_parse_error_case( [simple], [[ std::string msg = YY_("syntax error"); error (]b4_join(b4_locations_if([yyla.location]), [[YY_MOVE (msg)]])[);]], [custom], [[ context yyctx (*this, yyla); report_syntax_error (yyctx);]], [[ context yyctx (*this, yyla); std::string msg = yysyntax_error_ (yyctx); error (]b4_join(b4_locations_if([yyla.location]), [[YY_MOVE (msg)]])[);]])[ } ]b4_locations_if([[ yyerror_range[1].location = yyla.location;]])[ if (yyerrstatus_ == 3) { /* If just tried and failed to reuse lookahead token after an error, discard it. */ // Return failure if at end of input. if (yyla.kind () == ]b4_symbol(0, kind)[) YYABORT; else if (!yyla.empty ()) { yy_destroy_ ("Error: discarding", yyla); yyla.clear (); } } // Else will try to reuse lookahead token after shifting the error token. goto yyerrlab1; /*---------------------------------------------------. | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: /* Pacify compilers when the user code never invokes YYERROR and the label yyerrorlab therefore never appears in user code. */ if (false) YYERROR; /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ yypop_ (yylen); yylen = 0; YY_STACK_PRINT (); goto yyerrlab1; /*-------------------------------------------------------------. | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ yyerrlab1: yyerrstatus_ = 3; // Each real token shifted decrements this. // Pop stack until we find a state that shifts the error token. for (;;) { yyn = yypact_[+yystack_[0].state]; if (!yy_pact_value_is_default_ (yyn)) { yyn += ]b4_symbol(1, kind)[; if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == ]b4_symbol(1, kind)[) { yyn = yytable_[yyn]; if (0 < yyn) break; } } // Pop the current state because it cannot handle the error token. if (yystack_.size () == 1) YYABORT; ]b4_locations_if([[ yyerror_range[1].location = yystack_[0].location;]])[ yy_destroy_ ("Error: popping", yystack_[0]); yypop_ (); YY_STACK_PRINT (); } { stack_symbol_type error_token; ]b4_locations_if([[ yyerror_range[2].location = yyla.location; YYLLOC_DEFAULT (error_token.location, yyerror_range, 2);]])[ // Shift the error token.]b4_lac_if([[ yy_lac_discard_ ("error recovery");]])[ error_token.state = state_type (yyn); yypush_ ("Shifting", YY_MOVE (error_token)); } goto yynewstate; /*-------------------------------------. | yyacceptlab -- YYACCEPT comes here. | `-------------------------------------*/ yyacceptlab: yyresult = 0; goto yyreturn; /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ yyabortlab: yyresult = 1; goto yyreturn; /*-----------------------------------------------------. | yyreturn -- parsing is finished, return the result. | `-----------------------------------------------------*/ yyreturn: if (!yyla.empty ()) yy_destroy_ ("Cleanup: discarding lookahead", yyla); /* Do not reclaim the symbols of the rule whose action triggered this YYABORT or YYACCEPT. */ yypop_ (yylen); YY_STACK_PRINT (); while (1 < yystack_.size ()) { yy_destroy_ ("Cleanup: popping", yystack_[0]); yypop_ (); } return yyresult; } #if YY_EXCEPTIONS catch (...) { YYCDEBUG << "Exception caught: cleaning lookahead and stack\n"; // Do not try to display the values of the reclaimed symbols, // as their printers might throw an exception. if (!yyla.empty ()) yy_destroy_ (YY_NULLPTR, yyla); while (1 < yystack_.size ()) { yy_destroy_ (YY_NULLPTR, yystack_[0]); yypop_ (); } throw; } #endif // YY_EXCEPTIONS } void ]b4_parser_class[::error (const syntax_error& yyexc) { error (]b4_join(b4_locations_if([yyexc.location]), [[yyexc.what ()]])[); } ]b4_parse_error_bmatch([custom\|detailed], [[ const char * ]b4_parser_class[::symbol_name (symbol_kind_type yysymbol) { static const char *const yy_sname[] = { ]b4_symbol_names[ };]b4_has_translations_if([[ /* YYTRANSLATABLE[SYMBOL-NUM] -- Whether YY_SNAME[SYMBOL-NUM] is internationalizable. */ static ]b4_int_type_for([b4_translatable])[ yytranslatable[] = { ]b4_translatable[ }; return (yysymbol < YYNTOKENS && yytranslatable[yysymbol] ? _(yy_sname[yysymbol]) : yy_sname[yysymbol]);]], [[ return yy_sname[yysymbol];]])[ } ]], [simple], [[#if ]b4_api_PREFIX[DEBUG || ]b4_token_table_flag[ const char * ]b4_parser_class[::symbol_name (symbol_kind_type yysymbol) { return yytname_[yysymbol]; } #endif // #if ]b4_api_PREFIX[DEBUG || ]b4_token_table_flag[ ]], [verbose], [[ /* Return YYSTR after stripping away unnecessary quotes and backslashes, so that it's suitable for yyerror. The heuristic is that double-quoting is unnecessary unless the string contains an apostrophe, a comma, or backslash (other than backslash-backslash). YYSTR is taken from yytname. */ std::string ]b4_parser_class[::yytnamerr_ (const char *yystr) { if (*yystr == '"') { std::string yyr; char const *yyp = yystr; for (;;) switch (*++yyp) { case '\'': case ',': goto do_not_strip_quotes; case '\\': if (*++yyp != '\\') goto do_not_strip_quotes; else goto append; append: default: yyr += *yyp; break; case '"': return yyr; } do_not_strip_quotes: ; } return yystr; } std::string ]b4_parser_class[::symbol_name (symbol_kind_type yysymbol) { return yytnamerr_ (yytname_[yysymbol]); } ]])[ ]b4_parse_error_bmatch([custom\|detailed\|verbose], [[ // ]b4_parser_class[::context. ]b4_parser_class[::context::context (const ]b4_parser_class[& yyparser, const symbol_type& yyla) : yyparser_ (yyparser) , yyla_ (yyla) {} int ]b4_parser_class[::context::expected_tokens (symbol_kind_type yyarg[], int yyargn) const { // Actual number of expected tokens int yycount = 0; ]b4_lac_if([[ #if ]b4_api_PREFIX[DEBUG // Execute LAC once. We don't care if it is successful, we // only do it for the sake of debugging output. if (!yyparser_.yy_lac_established_) yyparser_.yy_lac_check_ (yyla_.kind ()); #endif for (int yyx = 0; yyx < YYNTOKENS; ++yyx) { symbol_kind_type yysym = YY_CAST (symbol_kind_type, yyx); if (yysym != ]b4_symbol(1, kind)[ && yysym != ]b4_symbol(2, kind)[ && yyparser_.yy_lac_check_ (yysym)) { if (!yyarg) ++yycount; else if (yycount == yyargn) return 0; else yyarg[yycount++] = yysym; } }]], [[ int yyn = yypact_[+yyparser_.yystack_[0].state]; if (!yy_pact_value_is_default_ (yyn)) { /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. In other words, skip the first -YYN actions for this state because they are default actions. */ int yyxbegin = yyn < 0 ? -yyn : 0; // Stay within bounds of both yycheck and yytname. int yychecklim = yylast_ - yyn + 1; int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; for (int yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck_[yyx + yyn] == yyx && yyx != ]b4_symbol(1, kind)[ && !yy_table_value_is_error_ (yytable_[yyx + yyn])) { if (!yyarg) ++yycount; else if (yycount == yyargn) return 0; else yyarg[yycount++] = YY_CAST (symbol_kind_type, yyx); } } ]])[ if (yyarg && yycount == 0 && 0 < yyargn) yyarg[0] = ]b4_symbol(-2, kind)[; return yycount; } ]])b4_lac_if([[ bool ]b4_parser_class[::yy_lac_check_ (symbol_kind_type yytoken) const { // Logically, the yylac_stack's lifetime is confined to this function. // Clear it, to get rid of potential left-overs from previous call. yylac_stack_.clear (); // Reduce until we encounter a shift and thereby accept the token. #if ]b4_api_PREFIX[DEBUG YYCDEBUG << "LAC: checking lookahead " << symbol_name (yytoken) << ':'; #endif std::ptrdiff_t lac_top = 0; while (true) { state_type top_state = (yylac_stack_.empty () ? yystack_[lac_top].state : yylac_stack_.back ()); int yyrule = yypact_[+top_state]; if (yy_pact_value_is_default_ (yyrule) || (yyrule += yytoken) < 0 || yylast_ < yyrule || yycheck_[yyrule] != yytoken) { // Use the default action. yyrule = yydefact_[+top_state]; if (yyrule == 0) { YYCDEBUG << " Err\n"; return false; } } else { // Use the action from yytable. yyrule = yytable_[yyrule]; if (yy_table_value_is_error_ (yyrule)) { YYCDEBUG << " Err\n"; return false; } if (0 < yyrule) { YYCDEBUG << " S" << yyrule << '\n'; return true; } yyrule = -yyrule; } // By now we know we have to simulate a reduce. YYCDEBUG << " R" << yyrule - 1; // Pop the corresponding number of values from the stack. { std::ptrdiff_t yylen = yyr2_[yyrule]; // First pop from the LAC stack as many tokens as possible. std::ptrdiff_t lac_size = std::ptrdiff_t (yylac_stack_.size ()); if (yylen < lac_size) { yylac_stack_.resize (std::size_t (lac_size - yylen)); yylen = 0; } else if (lac_size) { yylac_stack_.clear (); yylen -= lac_size; } // Only afterwards look at the main stack. // We simulate popping elements by incrementing lac_top. lac_top += yylen; } // Keep top_state in sync with the updated stack. top_state = (yylac_stack_.empty () ? yystack_[lac_top].state : yylac_stack_.back ()); // Push the resulting state of the reduction. state_type state = yy_lr_goto_state_ (top_state, yyr1_[yyrule]); YYCDEBUG << " G" << int (state); yylac_stack_.push_back (state); } } // Establish the initial context if no initial context currently exists. bool ]b4_parser_class[::yy_lac_establish_ (symbol_kind_type yytoken) { /* Establish the initial context for the current lookahead if no initial context is currently established. We define a context as a snapshot of the parser stacks. We define the initial context for a lookahead as the context in which the parser initially examines that lookahead in order to select a syntactic action. Thus, if the lookahead eventually proves syntactically unacceptable (possibly in a later context reached via a series of reductions), the initial context can be used to determine the exact set of tokens that would be syntactically acceptable in the lookahead's place. Moreover, it is the context after which any further semantic actions would be erroneous because they would be determined by a syntactically unacceptable token. yy_lac_establish_ should be invoked when a reduction is about to be performed in an inconsistent state (which, for the purposes of LAC, includes consistent states that don't know they're consistent because their default reductions have been disabled). For parse.lac=full, the implementation of yy_lac_establish_ is as follows. If no initial context is currently established for the current lookahead, then check if that lookahead can eventually be shifted if syntactic actions continue from the current context. */ if (!yy_lac_established_) { #if ]b4_api_PREFIX[DEBUG YYCDEBUG << "LAC: initial context established for " << symbol_name (yytoken) << '\n'; #endif yy_lac_established_ = true; return yy_lac_check_ (yytoken); } return true; } // Discard any previous initial lookahead context. void ]b4_parser_class[::yy_lac_discard_ (const char* evt) { /* Discard any previous initial lookahead context because of Event, which may be a lookahead change or an invalidation of the currently established initial context for the current lookahead. The most common example of a lookahead change is a shift. An example of both cases is syntax error recovery. That is, a syntax error occurs when the lookahead is syntactically erroneous for the currently established initial context, so error recovery manipulates the parser stacks to try to find a new initial context in which the current lookahead is syntactically acceptable. If it fails to find such a context, it discards the lookahead. */ if (yy_lac_established_) { YYCDEBUG << "LAC: initial context discarded due to " << evt << '\n'; yy_lac_established_ = false; } }]])b4_parse_error_bmatch([detailed\|verbose], [[ int ]b4_parser_class[::yy_syntax_error_arguments_ (const context& yyctx, symbol_kind_type yyarg[], int yyargn) const { /* There are many possibilities here to consider: - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected tokens because there are none. - The only way there can be no lookahead present (in yyla) is if this state is a consistent state with a default action. Thus, detecting the absence of a lookahead is sufficient to determine that there is no unexpected or expected token to report. In that case, just report a simple "syntax error". - Don't assume there isn't a lookahead just because this state is a consistent state with a default action. There might have been a previous inconsistent state, consistent state with a non-default action, or user semantic action that manipulated yyla. (However, yyla is currently not documented for users.)]b4_lac_if([[ In the first two cases, it might appear that the current syntax error should have been detected in the previous state when yy_lac_check was invoked. However, at that time, there might have been a different syntax error that discarded a different initial context during error recovery, leaving behind the current lookahead.]], [[ - Of course, the expected token list depends on states to have correct lookahead information, and it depends on the parser not to perform extra reductions after fetching a lookahead from the scanner and before detecting a syntax error. Thus, state merging (from LALR or IELR) and default reductions corrupt the expected token list. However, the list is correct for canonical LR with one exception: it will still contain any token that will not be accepted due to an error action in a later state.]])[ */ if (!yyctx.lookahead ().empty ()) { if (yyarg) yyarg[0] = yyctx.token (); int yyn = yyctx.expected_tokens (yyarg ? yyarg + 1 : yyarg, yyargn - 1); return yyn + 1; } return 0; } // Generate an error message. std::string ]b4_parser_class[::yysyntax_error_ (const context& yyctx) const { // Its maximum. enum { YYARGS_MAX = 5 }; // Arguments of yyformat. symbol_kind_type yyarg[YYARGS_MAX]; int yycount = yy_syntax_error_arguments_ (yyctx, yyarg, YYARGS_MAX); char const* yyformat = YY_NULLPTR; switch (yycount) { #define YYCASE_(N, S) \ case N: \ yyformat = S; \ break default: // Avoid compiler warnings. YYCASE_ (0, YY_("syntax error")); YYCASE_ (1, YY_("syntax error, unexpected %s")); YYCASE_ (2, YY_("syntax error, unexpected %s, expecting %s")); YYCASE_ (3, YY_("syntax error, unexpected %s, expecting %s or %s")); YYCASE_ (4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); YYCASE_ (5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); #undef YYCASE_ } std::string yyres; // Argument number. std::ptrdiff_t yyi = 0; for (char const* yyp = yyformat; *yyp; ++yyp) if (yyp[0] == '%' && yyp[1] == 's' && yyi < yycount) { yyres += symbol_name (yyarg[yyi++]); ++yyp; } else yyres += *yyp; return yyres; }]])[ const ]b4_int_type(b4_pact_ninf, b4_pact_ninf) b4_parser_class::yypact_ninf_ = b4_pact_ninf[; const ]b4_int_type(b4_table_ninf, b4_table_ninf) b4_parser_class::yytable_ninf_ = b4_table_ninf[; ]b4_parser_tables_define[ ]b4_parse_error_bmatch([simple\|verbose], [[#if ]b4_api_PREFIX[DEBUG]b4_tname_if([[ || 1]])[ // YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. // First, the terminals, then, starting at \a YYNTOKENS, nonterminals. const char* const ]b4_parser_class[::yytname_[] = { ]b4_tname[ }; #endif ]])[ #if ]b4_api_PREFIX[DEBUG][ ]b4_integral_parser_table_define([rline], [b4_rline])[ void ]b4_parser_class[::yy_stack_print_ () const { *yycdebug_ << "Stack now"; for (stack_type::const_iterator i = yystack_.begin (), i_end = yystack_.end (); i != i_end; ++i) *yycdebug_ << ' ' << int (i->state); *yycdebug_ << '\n'; } void ]b4_parser_class[::yy_reduce_print_ (int yyrule) const { int yylno = yyrline_[yyrule]; int yynrhs = yyr2_[yyrule]; // Print the symbols being reduced, and their result. *yycdebug_ << "Reducing stack by rule " << yyrule - 1 << " (line " << yylno << "):\n"; // The symbols being reduced. for (int yyi = 0; yyi < yynrhs; yyi++) YY_SYMBOL_PRINT (" $" << yyi + 1 << " =", ]b4_rhs_data(yynrhs, yyi + 1)[); } #endif // ]b4_api_PREFIX[DEBUG ]b4_token_ctor_if([], [b4_yytranslate_define([cc])])[ ]b4_namespace_close[ ]b4_epilogue[]dnl b4_output_end m4_popdef([b4_copyright_years])dnl PK r�!\��4M�c �c skeletons/glr.cnu �[��� -*- C -*- # GLR skeleton for Bison # Copyright (C) 2002-2015, 2018-2020 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/>. # If we are loaded by glr.cc, do not override c++.m4 definitions by # those of c.m4. m4_if(b4_skeleton, ["glr.c"], [m4_include(b4_skeletonsdir/[c.m4])]) ## ---------------- ## ## Default values. ## ## ---------------- ## # Stack parameters. m4_define_default([b4_stack_depth_max], [10000]) m4_define_default([b4_stack_depth_init], [200]) ## ------------------------ ## ## Pure/impure interfaces. ## ## ------------------------ ## b4_define_flag_if([pure]) # If glr.cc is including this file and thus has already set b4_pure_flag, # do not change the value of b4_pure_flag, and do not record a use of api.pure. m4_ifndef([b4_pure_flag], [b4_percent_define_default([[api.pure]], [[false]]) m4_define([b4_pure_flag], [b4_percent_define_flag_if([[api.pure]], [[1]], [[0]])])]) # b4_yyerror_args # --------------- # Optional effective arguments passed to yyerror: user args plus yylloc, and # a trailing comma. m4_define([b4_yyerror_args], [b4_pure_if([b4_locations_if([yylocp, ])])dnl m4_ifset([b4_parse_param], [b4_args(b4_parse_param), ])]) # b4_lyyerror_args # ---------------- # Same as above, but on the lookahead, hence &yylloc instead of yylocp. m4_define([b4_lyyerror_args], [b4_pure_if([b4_locations_if([&yylloc, ])])dnl m4_ifset([b4_parse_param], [b4_args(b4_parse_param), ])]) # b4_pure_args # ------------ # Same as b4_yyerror_args, but with a leading comma. m4_define([b4_pure_args], [b4_pure_if([b4_locations_if([, yylocp])])[]b4_user_args]) # b4_lpure_args # ------------- # Same as above, but on the lookahead, hence &yylloc instead of yylocp. m4_define([b4_lpure_args], [b4_pure_if([b4_locations_if([, &yylloc])])[]b4_user_args]) # b4_pure_formals # --------------- # Arguments passed to yyerror: user formals plus yylocp with leading comma. m4_define([b4_pure_formals], [b4_pure_if([b4_locations_if([, YYLTYPE *yylocp])])[]b4_user_formals]) # b4_locuser_formals(LOC = yylocp) # -------------------------------- # User formal arguments, possibly preceded by location argument. m4_define([b4_locuser_formals], [b4_locations_if([, YYLTYPE *m4_default([$1], [yylocp])])[]b4_user_formals]) # b4_locuser_args(LOC = yylocp) # ----------------------------- m4_define([b4_locuser_args], [b4_locations_if([, m4_default([$1], [yylocp])])[]b4_user_args]) ## ----------------- ## ## Semantic Values. ## ## ----------------- ## # b4_lhs_value(SYMBOL-NUM, [TYPE]) # -------------------------------- # See README. m4_define([b4_lhs_value], [b4_symbol_value([(*yyvalp)], [$1], [$2])]) # b4_rhs_data(RULE-LENGTH, POS) # ----------------------------- # See README. m4_define([b4_rhs_data], [YY_CAST (yyGLRStackItem const *, yyvsp)@{YYFILL (b4_subtract([$2], [$1]))@}.yystate]) # b4_rhs_value(RULE-LENGTH, POS, SYMBOL-NUM, [TYPE]) # -------------------------------------------------- # Expansion of $$ or $<TYPE>$, for symbol SYMBOL-NUM. m4_define([b4_rhs_value], [b4_symbol_value([b4_rhs_data([$1], [$2]).yysemantics.yysval], [$3], [$4])]) ## ----------- ## ## Locations. ## ## ----------- ## # b4_lhs_location() # ----------------- # Expansion of @$. m4_define([b4_lhs_location], [(*yylocp)]) # b4_rhs_location(RULE-LENGTH, NUM) # --------------------------------- # Expansion of @NUM, where the current rule has RULE-LENGTH symbols # on RHS. m4_define([b4_rhs_location], [(b4_rhs_data([$1], [$2]).yyloc)]) ## -------------- ## ## Declarations. ## ## -------------- ## # b4_shared_declarations # ---------------------- # Declaration that might either go into the header (if --defines) # or open coded in the parser body. glr.cc has its own definition. m4_if(b4_skeleton, ["glr.c"], [m4_define([b4_shared_declarations], [b4_declare_yydebug[ ]b4_percent_code_get([[requires]])[ ]b4_token_enums[ ]b4_declare_yylstype[ int ]b4_prefix[parse (]m4_ifset([b4_parse_param], [b4_formals(b4_parse_param)], [void])[); ]b4_percent_code_get([[provides]])[]dnl ]) ]) ## -------------- ## ## Output files. ## ## -------------- ## # Unfortunately the order of generation between the header and the # implementation file matters (for glr.c) because of the current # implementation of api.value.type=union. In that case we still use a # union for YYSTYPE, but we generate the contents of this union when # setting up YYSTYPE. This is needed for other aspects, such as # defining yy_symbol_value_print, since we need to now the name of the # members of this union. # # To avoid this issue, just generate the header before the # implementation file. But we should also make them more independent. # ----------------- # # The header file. # # ----------------- # # glr.cc produces its own header. b4_glr_cc_if([], [b4_defines_if( [b4_output_begin([b4_spec_header_file]) b4_copyright([Skeleton interface for Bison GLR parsers in C], [2002-2015, 2018-2020])[ ]b4_cpp_guard_open([b4_spec_mapped_header_file])[ ]b4_shared_declarations[ ]b4_cpp_guard_close([b4_spec_mapped_header_file])[ ]b4_output_end[ ]])]) # ------------------------- # # The implementation file. # # ------------------------- # b4_output_begin([b4_parser_file_name]) b4_copyright([Skeleton implementation for Bison GLR parsers in C], [2002-2015, 2018-2020])[ /* C GLR parser skeleton written by Paul Hilfinger. */ ]b4_disclaimer[ ]b4_identification[ ]b4_percent_code_get([[top]])[ ]m4_if(b4_api_prefix, [yy], [], [[/* Substitute the type names. */ #define YYSTYPE ]b4_api_PREFIX[STYPE]b4_locations_if([[ #define YYLTYPE ]b4_api_PREFIX[LTYPE]])])[ ]m4_if(b4_prefix, [yy], [], [[/* Substitute the variable and function names. */ #define yyparse ]b4_prefix[parse #define yylex ]b4_prefix[lex #define yyerror ]b4_prefix[error #define yydebug ]b4_prefix[debug]]b4_pure_if([], [[ #define yylval ]b4_prefix[lval #define yychar ]b4_prefix[char #define yynerrs ]b4_prefix[nerrs]b4_locations_if([[ #define yylloc ]b4_prefix[lloc]])]))[ ]b4_user_pre_prologue[ ]b4_cast_define[ ]b4_null_define[ ]b4_defines_if([[#include "@basename(]b4_spec_header_file[@)"]], [b4_shared_declarations])[ ]b4_glr_cc_if([b4_glr_cc_setup], [b4_declare_symbol_enum])[ /* Default (constant) value used for initialization for null right-hand sides. Unlike the standard yacc.c template, here we set the default value of $$ to a zeroed-out value. Since the default value is undefined, this behavior is technically correct. */ static YYSTYPE yyval_default;]b4_locations_if([[ static YYLTYPE yyloc_default][]b4_yyloc_default;])[ ]b4_user_post_prologue[ ]b4_percent_code_get[]dnl [#include <stddef.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> ]b4_c99_int_type_define[ ]b4_sizes_types_define[ #ifndef YY_ # if defined YYENABLE_NLS && YYENABLE_NLS # if ENABLE_NLS # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ # define YY_(Msgid) dgettext ("bison-runtime", Msgid) # endif # endif # ifndef YY_ # define YY_(Msgid) Msgid # endif #endif ]b4_has_translations_if([ #ifndef N_ # define N_(Msgid) Msgid #endif ])[ #ifndef YYFREE # define YYFREE free #endif #ifndef YYMALLOC # define YYMALLOC malloc #endif #ifndef YYREALLOC # define YYREALLOC realloc #endif #ifdef __cplusplus typedef bool yybool; # define yytrue true # define yyfalse false #else /* When we move to stdbool, get rid of the various casts to yybool. */ typedef signed char yybool; # define yytrue 1 # define yyfalse 0 #endif #ifndef YYSETJMP # include <setjmp.h> # define YYJMP_BUF jmp_buf # define YYSETJMP(Env) setjmp (Env) /* Pacify Clang and ICC. */ # define YYLONGJMP(Env, Val) \ do { \ longjmp (Env, Val); \ YY_ASSERT (0); \ } while (yyfalse) #endif ]b4_attribute_define([noreturn])[ ]b4_parse_assert_if([[#ifdef NDEBUG # define YY_ASSERT(E) ((void) (0 && (E))) #else # include <assert.h> /* INFRINGES ON USER NAME SPACE */ # define YY_ASSERT(E) assert (E) #endif ]], [[#define YY_ASSERT(E) ((void) (0 && (E)))]])[ /* YYFINAL -- State number of the termination state. */ #define YYFINAL ]b4_final_state_number[ /* YYLAST -- Last index in YYTABLE. */ #define YYLAST ]b4_last[ /* YYNTOKENS -- Number of terminals. */ #define YYNTOKENS ]b4_tokens_number[ /* YYNNTS -- Number of nonterminals. */ #define YYNNTS ]b4_nterms_number[ /* YYNRULES -- Number of rules. */ #define YYNRULES ]b4_rules_number[ /* YYNSTATES -- Number of states. */ #define YYNSTATES ]b4_states_number[ /* YYMAXRHS -- Maximum number of symbols on right-hand side of rule. */ #define YYMAXRHS ]b4_r2_max[ /* YYMAXLEFT -- Maximum number of symbols to the left of a handle accessed by $0, $-1, etc., in any rule. */ #define YYMAXLEFT ]b4_max_left_semantic_context[ /* YYMAXUTOK -- Last valid token kind. */ #define YYMAXUTOK ]b4_code_max[ /* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM as returned by yylex, with out-of-bounds checking. */ ]b4_api_token_raw_if(dnl [[#define YYTRANSLATE(YYX) YY_CAST (yysymbol_kind_t, YYX)]], [[#define YYTRANSLATE(YYX) \ (0 <= (YYX) && (YYX) <= YYMAXUTOK \ ? YY_CAST (yysymbol_kind_t, yytranslate[YYX]) \ : ]b4_symbol_prefix[YYUNDEF) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM as returned by yylex. */ static const ]b4_int_type_for([b4_translate])[ yytranslate[] = { ]b4_translate[ };]])[ #if ]b4_api_PREFIX[DEBUG /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const ]b4_int_type_for([b4_rline])[ yyrline[] = { ]b4_rline[ }; #endif #define YYPACT_NINF (]b4_pact_ninf[) #define YYTABLE_NINF (]b4_table_ninf[) ]b4_parser_tables_define[ /* YYDPREC[RULE-NUM] -- Dynamic precedence of rule #RULE-NUM (0 if none). */ static const ]b4_int_type_for([b4_dprec])[ yydprec[] = { ]b4_dprec[ }; /* YYMERGER[RULE-NUM] -- Index of merging function for rule #RULE-NUM. */ static const ]b4_int_type_for([b4_merger])[ yymerger[] = { ]b4_merger[ }; /* YYIMMEDIATE[RULE-NUM] -- True iff rule #RULE-NUM is not to be deferred, as in the case of predicates. */ static const yybool yyimmediate[] = { ]b4_immediate[ }; /* YYCONFLP[YYPACT[STATE-NUM]] -- Pointer into YYCONFL of start of list of conflicting reductions corresponding to action entry for state STATE-NUM in yytable. 0 means no conflicts. The list in yyconfl is terminated by a rule number of 0. */ static const ]b4_int_type_for([b4_conflict_list_heads])[ yyconflp[] = { ]b4_conflict_list_heads[ }; /* YYCONFL[I] -- lists of conflicting rule numbers, each terminated by 0, pointed into by YYCONFLP. */ ]dnl Do not use b4_int_type_for here, since there are places where dnl pointers onto yyconfl are taken, whose type is "short*". dnl We probably ought to introduce a type for confl. [static const short yyconfl[] = { ]b4_conflicting_rules[ }; ]b4_locations_if([[ ]b4_yylloc_default_define[ # define YYRHSLOC(Rhs, K) ((Rhs)[K].yystate.yyloc) ]])[ ]b4_pure_if( [ #undef yynerrs #define yynerrs (yystackp->yyerrcnt) #undef yychar #define yychar (yystackp->yyrawchar) #undef yylval #define yylval (yystackp->yyval) #undef yylloc #define yylloc (yystackp->yyloc) m4_if(b4_prefix[], [yy], [], [#define b4_prefix[]nerrs yynerrs #define b4_prefix[]char yychar #define b4_prefix[]lval yylval #define b4_prefix[]lloc yylloc])], [YYSTYPE yylval;]b4_locations_if([[ YYLTYPE yylloc;]])[ int yynerrs; int yychar;])[ enum { YYENOMEM = -2 }; typedef enum { yyok, yyaccept, yyabort, yyerr } YYRESULTTAG; #define YYCHK(YYE) \ do { \ YYRESULTTAG yychk_flag = YYE; \ if (yychk_flag != yyok) \ return yychk_flag; \ } while (0) /* YYINITDEPTH -- initial size of the parser's stacks. */ #ifndef YYINITDEPTH # define YYINITDEPTH ]b4_stack_depth_init[ #endif /* YYMAXDEPTH -- maximum size the stacks can grow to (effective only if the built-in stack extension method is used). Do not make this value too large; the results are undefined if SIZE_MAX < YYMAXDEPTH * sizeof (GLRStackItem) evaluated with infinite-precision integer arithmetic. */ #ifndef YYMAXDEPTH # define YYMAXDEPTH ]b4_stack_depth_max[ #endif /* Minimum number of free items on the stack allowed after an allocation. This is to allow allocation and initialization to be completed by functions that call yyexpandGLRStack before the stack is expanded, thus insuring that all necessary pointers get properly redirected to new data. */ #define YYHEADROOM 2 #ifndef YYSTACKEXPANDABLE # define YYSTACKEXPANDABLE 1 #endif #if YYSTACKEXPANDABLE # define YY_RESERVE_GLRSTACK(Yystack) \ do { \ if (Yystack->yyspaceLeft < YYHEADROOM) \ yyexpandGLRStack (Yystack); \ } while (0) #else # define YY_RESERVE_GLRSTACK(Yystack) \ do { \ if (Yystack->yyspaceLeft < YYHEADROOM) \ yyMemoryExhausted (Yystack); \ } while (0) #endif /** State numbers. */ typedef int yy_state_t; /** Rule numbers. */ typedef int yyRuleNum; /** Item references. */ typedef short yyItemNum; typedef struct yyGLRState yyGLRState; typedef struct yyGLRStateSet yyGLRStateSet; typedef struct yySemanticOption yySemanticOption; typedef union yyGLRStackItem yyGLRStackItem; typedef struct yyGLRStack yyGLRStack; struct yyGLRState { /** Type tag: always true. */ yybool yyisState; /** Type tag for yysemantics. If true, yysval applies, otherwise * yyfirstVal applies. */ yybool yyresolved; /** Number of corresponding LALR(1) machine state. */ yy_state_t yylrState; /** Preceding state in this stack */ yyGLRState* yypred; /** Source position of the last token produced by my symbol */ YYPTRDIFF_T yyposn; union { /** First in a chain of alternative reductions producing the * nonterminal corresponding to this state, threaded through * yynext. */ yySemanticOption* yyfirstVal; /** Semantic value for this state. */ YYSTYPE yysval; } yysemantics;]b4_locations_if([[ /** Source location for this state. */ YYLTYPE yyloc;]])[ }; struct yyGLRStateSet { yyGLRState** yystates; /** During nondeterministic operation, yylookaheadNeeds tracks which * stacks have actually needed the current lookahead. During deterministic * operation, yylookaheadNeeds[0] is not maintained since it would merely * duplicate yychar != ]b4_symbol(-2, id)[. */ yybool* yylookaheadNeeds; YYPTRDIFF_T yysize; YYPTRDIFF_T yycapacity; }; struct yySemanticOption { /** Type tag: always false. */ yybool yyisState; /** Rule number for this reduction */ yyRuleNum yyrule; /** The last RHS state in the list of states to be reduced. */ yyGLRState* yystate; /** The lookahead for this reduction. */ int yyrawchar; YYSTYPE yyval;]b4_locations_if([[ YYLTYPE yyloc;]])[ /** Next sibling in chain of options. To facilitate merging, * options are chained in decreasing order by address. */ yySemanticOption* yynext; }; /** Type of the items in the GLR stack. The yyisState field * indicates which item of the union is valid. */ union yyGLRStackItem { yyGLRState yystate; yySemanticOption yyoption; }; struct yyGLRStack { int yyerrState; ]b4_locations_if([[ /* To compute the location of the error token. */ yyGLRStackItem yyerror_range[3];]])[ ]b4_pure_if( [ int yyerrcnt; int yyrawchar; YYSTYPE yyval;]b4_locations_if([[ YYLTYPE yyloc;]])[ ])[ YYJMP_BUF yyexception_buffer; yyGLRStackItem* yyitems; yyGLRStackItem* yynextFree; YYPTRDIFF_T yyspaceLeft; yyGLRState* yysplitPoint; yyGLRState* yylastDeleted; yyGLRStateSet yytops; }; #if YYSTACKEXPANDABLE static void yyexpandGLRStack (yyGLRStack* yystackp); #endif _Noreturn static void yyFail (yyGLRStack* yystackp]b4_pure_formals[, const char* yymsg) { if (yymsg != YY_NULLPTR) yyerror (]b4_yyerror_args[yymsg); YYLONGJMP (yystackp->yyexception_buffer, 1); } _Noreturn static void yyMemoryExhausted (yyGLRStack* yystackp) { YYLONGJMP (yystackp->yyexception_buffer, 2); } /** Accessing symbol of state YYSTATE. */ static inline yysymbol_kind_t yy_accessing_symbol (yy_state_t yystate) { return YY_CAST (yysymbol_kind_t, yystos[yystate]); } #if ]b4_parse_error_case([simple], [b4_api_PREFIX[DEBUG || ]b4_token_table_flag], [[1]])[ /* The user-facing name of the symbol whose (internal) number is YYSYMBOL. No bounds checking. */ static const char *yysymbol_name (yysymbol_kind_t yysymbol) YY_ATTRIBUTE_UNUSED; ]b4_parse_error_bmatch([simple\|verbose], [[/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at YYNTOKENS, nonterminals. */ static const char *const yytname[] = { ]b4_tname[ }; static const char * yysymbol_name (yysymbol_kind_t yysymbol) { return yytname[yysymbol]; }]], [[static const char * yysymbol_name (yysymbol_kind_t yysymbol) { static const char *const yy_sname[] = { ]b4_symbol_names[ };]b4_has_translations_if([[ /* YYTRANSLATABLE[SYMBOL-NUM] -- Whether YY_SNAME[SYMBOL-NUM] is internationalizable. */ static ]b4_int_type_for([b4_translatable])[ yytranslatable[] = { ]b4_translatable[ }; return (yysymbol < YYNTOKENS && yytranslatable[yysymbol] ? _(yy_sname[yysymbol]) : yy_sname[yysymbol]);]], [[ return yy_sname[yysymbol];]])[ }]])[ #endif #if ]b4_api_PREFIX[DEBUG # ifndef YYFPRINTF # define YYFPRINTF fprintf # endif # define YY_FPRINTF \ YY_IGNORE_USELESS_CAST_BEGIN YY_FPRINTF_ # define YY_FPRINTF_(Args) \ do { \ YYFPRINTF Args; \ YY_IGNORE_USELESS_CAST_END \ } while (0) # define YY_DPRINTF \ YY_IGNORE_USELESS_CAST_BEGIN YY_DPRINTF_ # define YY_DPRINTF_(Args) \ do { \ if (yydebug) \ YYFPRINTF Args; \ YY_IGNORE_USELESS_CAST_END \ } while (0) ]b4_yy_location_print_define[ ]b4_yy_symbol_print_define[ # define YY_SYMBOL_PRINT(Title, Kind, Value, Location) \ do { \ if (yydebug) \ { \ YY_FPRINTF ((stderr, "%s ", Title)); \ yy_symbol_print (stderr, Kind, Value]b4_locuser_args([Location])[); \ YY_FPRINTF ((stderr, "\n")); \ } \ } while (0) /* Nonzero means print parse trace. It is left uninitialized so that multiple parsers can coexist. */ int yydebug; static void yypstack (yyGLRStack* yystackp, YYPTRDIFF_T yyk) YY_ATTRIBUTE_UNUSED; static void yypdumpstack (yyGLRStack* yystackp) YY_ATTRIBUTE_UNUSED; #else /* !]b4_api_PREFIX[DEBUG */ # define YY_DPRINTF(Args) do {} while (yyfalse) # define YY_SYMBOL_PRINT(Title, Kind, Value, Location) #endif /* !]b4_api_PREFIX[DEBUG */ ]b4_parse_error_case( [simple], [[]], [[#ifndef yystrlen # define yystrlen(S) (YY_CAST (YYPTRDIFF_T, strlen (S))) #endif ]b4_parse_error_bmatch( [detailed\|verbose], [[#ifndef yystpcpy # if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in YYDEST. */ static char * yystpcpy (char *yydest, const char *yysrc) { char *yyd = yydest; const char *yys = yysrc; while ((*yyd++ = *yys++) != '\0') continue; return yyd - 1; } # endif #endif]])[ ]b4_parse_error_case( [verbose], [[#ifndef yytnamerr /* Copy to YYRES the contents of YYSTR after stripping away unnecessary quotes and backslashes, so that it's suitable for yyerror. The heuristic is that double-quoting is unnecessary unless the string contains an apostrophe, a comma, or backslash (other than backslash-backslash). YYSTR is taken from yytname. If YYRES is null, do not copy; instead, return the length of what the result would have been. */ static YYPTRDIFF_T yytnamerr (char *yyres, const char *yystr) { if (*yystr == '"') { YYPTRDIFF_T yyn = 0; char const *yyp = yystr; for (;;) switch (*++yyp) { case '\'': case ',': goto do_not_strip_quotes; case '\\': if (*++yyp != '\\') goto do_not_strip_quotes; else goto append; append: default: if (yyres) yyres[yyn] = *yyp; yyn++; break; case '"': if (yyres) yyres[yyn] = '\0'; return yyn; } do_not_strip_quotes: ; } if (yyres) return yystpcpy (yyres, yystr) - yyres; else return yystrlen (yystr); } #endif ]])])[ /** Fill in YYVSP[YYLOW1 .. YYLOW0-1] from the chain of states starting * at YYVSP[YYLOW0].yystate.yypred. Leaves YYVSP[YYLOW1].yystate.yypred * containing the pointer to the next state in the chain. */ static void yyfillin (yyGLRStackItem *, int, int) YY_ATTRIBUTE_UNUSED; static void yyfillin (yyGLRStackItem *yyvsp, int yylow0, int yylow1) { int i; yyGLRState *s = yyvsp[yylow0].yystate.yypred; for (i = yylow0-1; i >= yylow1; i -= 1) { #if ]b4_api_PREFIX[DEBUG yyvsp[i].yystate.yylrState = s->yylrState; #endif yyvsp[i].yystate.yyresolved = s->yyresolved; if (s->yyresolved) yyvsp[i].yystate.yysemantics.yysval = s->yysemantics.yysval; else /* The effect of using yysval or yyloc (in an immediate rule) is * undefined. */ yyvsp[i].yystate.yysemantics.yyfirstVal = YY_NULLPTR;]b4_locations_if([[ yyvsp[i].yystate.yyloc = s->yyloc;]])[ s = yyvsp[i].yystate.yypred = s->yypred; } } ]m4_define([b4_yygetToken_call], [[yygetToken (&yychar][]b4_pure_if([, yystackp])[]b4_user_args[)]])[ /** If yychar is empty, fetch the next token. */ static inline yysymbol_kind_t yygetToken (int *yycharp][]b4_pure_if([, yyGLRStack* yystackp])[]b4_user_formals[) { yysymbol_kind_t yytoken; ]b4_parse_param_use()dnl [ if (*yycharp == ]b4_symbol(-2, id)[) { YY_DPRINTF ((stderr, "Reading a token\n"));]b4_glr_cc_if([[ #if YY_EXCEPTIONS try { #endif // YY_EXCEPTIONS *yycharp = ]b4_lex[; #if YY_EXCEPTIONS } catch (const ]b4_namespace_ref[::]b4_parser_class[::syntax_error& yyexc) { YY_DPRINTF ((stderr, "Caught exception: %s\n", yyexc.what()));]b4_locations_if([ yylloc = yyexc.location;])[ yyerror (]b4_lyyerror_args[yyexc.what ()); // Map errors caught in the scanner to the undefined token, // so that error handling is started. However, record this // with this special value of yychar. *yycharp = ]b4_symbol(1, id)[; } #endif // YY_EXCEPTIONS]], [[ *yycharp = ]b4_lex[;]])[ } if (*yycharp <= ]b4_symbol(0, [id])[) { *yycharp = ]b4_symbol(0, [id])[; yytoken = ]b4_symbol_prefix[YYEOF; YY_DPRINTF ((stderr, "Now at end of input.\n")); } else { yytoken = YYTRANSLATE (*yycharp); YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc); } return yytoken; } /* Do nothing if YYNORMAL or if *YYLOW <= YYLOW1. Otherwise, fill in * YYVSP[YYLOW1 .. *YYLOW-1] as in yyfillin and set *YYLOW = YYLOW1. * For convenience, always return YYLOW1. */ static inline int yyfill (yyGLRStackItem *, int *, int, yybool) YY_ATTRIBUTE_UNUSED; static inline int yyfill (yyGLRStackItem *yyvsp, int *yylow, int yylow1, yybool yynormal) { if (!yynormal && yylow1 < *yylow) { yyfillin (yyvsp, *yylow, yylow1); *yylow = yylow1; } return yylow1; } /** Perform user action for rule number YYN, with RHS length YYRHSLEN, * and top stack item YYVSP. YYLVALP points to place to put semantic * value ($$), and yylocp points to place for location information * (@@$). Returns yyok for normal return, yyaccept for YYACCEPT, * yyerr for YYERROR, yyabort for YYABORT. */ static YYRESULTTAG yyuserAction (yyRuleNum yyn, int yyrhslen, yyGLRStackItem* yyvsp, yyGLRStack* yystackp, YYSTYPE* yyvalp]b4_locuser_formals[) { yybool yynormal YY_ATTRIBUTE_UNUSED = yystackp->yysplitPoint == YY_NULLPTR; int yylow; ]b4_parse_param_use([yyvalp], [yylocp])dnl [ YYUSE (yyrhslen); # undef yyerrok # define yyerrok (yystackp->yyerrState = 0) # undef YYACCEPT # define YYACCEPT return yyaccept # undef YYABORT # define YYABORT return yyabort # undef YYERROR # define YYERROR return yyerrok, yyerr # undef YYRECOVERING # define YYRECOVERING() (yystackp->yyerrState != 0) # undef yyclearin # define yyclearin (yychar = ]b4_symbol(-2, id)[) # undef YYFILL # define YYFILL(N) yyfill (yyvsp, &yylow, (N), yynormal) # undef YYBACKUP # define YYBACKUP(Token, Value) \ return yyerror (]b4_yyerror_args[YY_("syntax error: cannot back up")), \ yyerrok, yyerr yylow = 1; if (yyrhslen == 0) *yyvalp = yyval_default; else *yyvalp = yyvsp[YYFILL (1-yyrhslen)].yystate.yysemantics.yysval;]b4_locations_if([[ /* Default location. */ YYLLOC_DEFAULT ((*yylocp), (yyvsp - yyrhslen), yyrhslen); yystackp->yyerror_range[1].yystate.yyloc = *yylocp; ]])[]b4_glr_cc_if([[ #if YY_EXCEPTIONS typedef ]b4_namespace_ref[::]b4_parser_class[::syntax_error syntax_error; try { #endif // YY_EXCEPTIONS]])[ switch (yyn) { ]b4_user_actions[ default: break; }]b4_glr_cc_if([[ #if YY_EXCEPTIONS } catch (const syntax_error& yyexc) { YY_DPRINTF ((stderr, "Caught exception: %s\n", yyexc.what()));]b4_locations_if([ *yylocp = yyexc.location;])[ yyerror (]b4_yyerror_args[yyexc.what ()); YYERROR; } #endif // YY_EXCEPTIONS]])[ return yyok; # undef yyerrok # undef YYABORT # undef YYACCEPT # undef YYERROR # undef YYBACKUP # undef yyclearin # undef YYRECOVERING } static void yyuserMerge (int yyn, YYSTYPE* yy0, YYSTYPE* yy1) { YYUSE (yy0); YYUSE (yy1); switch (yyn) { ]b4_mergers[ default: break; } } /* Bison grammar-table manipulation. */ ]b4_yydestruct_define[ /** Number of symbols composing the right hand side of rule #RULE. */ static inline int yyrhsLength (yyRuleNum yyrule) { return yyr2[yyrule]; } static void yydestroyGLRState (char const *yymsg, yyGLRState *yys]b4_user_formals[) { if (yys->yyresolved) yydestruct (yymsg, yy_accessing_symbol (yys->yylrState), &yys->yysemantics.yysval]b4_locuser_args([&yys->yyloc])[); else { #if ]b4_api_PREFIX[DEBUG if (yydebug) { if (yys->yysemantics.yyfirstVal) YY_FPRINTF ((stderr, "%s unresolved", yymsg)); else YY_FPRINTF ((stderr, "%s incomplete", yymsg)); YY_SYMBOL_PRINT ("", yy_accessing_symbol (yys->yylrState), YY_NULLPTR, &yys->yyloc); } #endif if (yys->yysemantics.yyfirstVal) { yySemanticOption *yyoption = yys->yysemantics.yyfirstVal; yyGLRState *yyrh; int yyn; for (yyrh = yyoption->yystate, yyn = yyrhsLength (yyoption->yyrule); yyn > 0; yyrh = yyrh->yypred, yyn -= 1) yydestroyGLRState (yymsg, yyrh]b4_user_args[); } } } /** Left-hand-side symbol for rule #YYRULE. */ static inline yysymbol_kind_t yylhsNonterm (yyRuleNum yyrule) { return YY_CAST (yysymbol_kind_t, yyr1[yyrule]); } #define yypact_value_is_default(Yyn) \ ]b4_table_value_equals([[pact]], [[Yyn]], [b4_pact_ninf], [YYPACT_NINF])[ /** True iff LR state YYSTATE has only a default reduction (regardless * of token). */ static inline yybool yyisDefaultedState (yy_state_t yystate) { return yypact_value_is_default (yypact[yystate]); } /** The default reduction for YYSTATE, assuming it has one. */ static inline yyRuleNum yydefaultAction (yy_state_t yystate) { return yydefact[yystate]; } #define yytable_value_is_error(Yyn) \ ]b4_table_value_equals([[table]], [[Yyn]], [b4_table_ninf], [YYTABLE_NINF])[ /** The action to take in YYSTATE on seeing YYTOKEN. * Result R means * R < 0: Reduce on rule -R. * R = 0: Error. * R > 0: Shift to state R. * Set *YYCONFLICTS to a pointer into yyconfl to a 0-terminated list * of conflicting reductions. */ static inline int yygetLRActions (yy_state_t yystate, yysymbol_kind_t yytoken, const short** yyconflicts) { int yyindex = yypact[yystate] + yytoken; if (yytoken == ]b4_symbol(1, kind)[) { // This is the error token. *yyconflicts = yyconfl; return 0; } else if (yyisDefaultedState (yystate) || yyindex < 0 || YYLAST < yyindex || yycheck[yyindex] != yytoken) { *yyconflicts = yyconfl; return -yydefact[yystate]; } else if (! yytable_value_is_error (yytable[yyindex])) { *yyconflicts = yyconfl + yyconflp[yyindex]; return yytable[yyindex]; } else { *yyconflicts = yyconfl + yyconflp[yyindex]; return 0; } } /** Compute post-reduction state. * \param yystate the current state * \param yysym the nonterminal to push on the stack */ static inline yy_state_t yyLRgotoState (yy_state_t yystate, yysymbol_kind_t yysym) { int yyr = yypgoto[yysym - YYNTOKENS] + yystate; if (0 <= yyr && yyr <= YYLAST && yycheck[yyr] == yystate) return yytable[yyr]; else return yydefgoto[yysym - YYNTOKENS]; } static inline yybool yyisShiftAction (int yyaction) { return 0 < yyaction; } static inline yybool yyisErrorAction (int yyaction) { return yyaction == 0; } /* GLRStates */ /** Return a fresh GLRStackItem in YYSTACKP. The item is an LR state * if YYISSTATE, and otherwise a semantic option. Callers should call * YY_RESERVE_GLRSTACK afterwards to make sure there is sufficient * headroom. */ static inline yyGLRStackItem* yynewGLRStackItem (yyGLRStack* yystackp, yybool yyisState) { yyGLRStackItem* yynewItem = yystackp->yynextFree; yystackp->yyspaceLeft -= 1; yystackp->yynextFree += 1; yynewItem->yystate.yyisState = yyisState; return yynewItem; } /** Add a new semantic action that will execute the action for rule * YYRULE on the semantic values in YYRHS to the list of * alternative actions for YYSTATE. Assumes that YYRHS comes from * stack #YYK of *YYSTACKP. */ static void yyaddDeferredAction (yyGLRStack* yystackp, YYPTRDIFF_T yyk, yyGLRState* yystate, yyGLRState* yyrhs, yyRuleNum yyrule) { yySemanticOption* yynewOption = &yynewGLRStackItem (yystackp, yyfalse)->yyoption; YY_ASSERT (!yynewOption->yyisState); yynewOption->yystate = yyrhs; yynewOption->yyrule = yyrule; if (yystackp->yytops.yylookaheadNeeds[yyk]) { yynewOption->yyrawchar = yychar; yynewOption->yyval = yylval;]b4_locations_if([ yynewOption->yyloc = yylloc;])[ } else yynewOption->yyrawchar = ]b4_symbol(-2, id)[; yynewOption->yynext = yystate->yysemantics.yyfirstVal; yystate->yysemantics.yyfirstVal = yynewOption; YY_RESERVE_GLRSTACK (yystackp); } /* GLRStacks */ /** Initialize YYSET to a singleton set containing an empty stack. */ static yybool yyinitStateSet (yyGLRStateSet* yyset) { yyset->yysize = 1; yyset->yycapacity = 16; yyset->yystates = YY_CAST (yyGLRState**, YYMALLOC (YY_CAST (YYSIZE_T, yyset->yycapacity) * sizeof yyset->yystates[0])); if (! yyset->yystates) return yyfalse; yyset->yystates[0] = YY_NULLPTR; yyset->yylookaheadNeeds = YY_CAST (yybool*, YYMALLOC (YY_CAST (YYSIZE_T, yyset->yycapacity) * sizeof yyset->yylookaheadNeeds[0])); if (! yyset->yylookaheadNeeds) { YYFREE (yyset->yystates); return yyfalse; } memset (yyset->yylookaheadNeeds, 0, YY_CAST (YYSIZE_T, yyset->yycapacity) * sizeof yyset->yylookaheadNeeds[0]); return yytrue; } static void yyfreeStateSet (yyGLRStateSet* yyset) { YYFREE (yyset->yystates); YYFREE (yyset->yylookaheadNeeds); } /** Initialize *YYSTACKP to a single empty stack, with total maximum * capacity for all stacks of YYSIZE. */ static yybool yyinitGLRStack (yyGLRStack* yystackp, YYPTRDIFF_T yysize) { yystackp->yyerrState = 0; yynerrs = 0; yystackp->yyspaceLeft = yysize; yystackp->yyitems = YY_CAST (yyGLRStackItem*, YYMALLOC (YY_CAST (YYSIZE_T, yysize) * sizeof yystackp->yynextFree[0])); if (!yystackp->yyitems) return yyfalse; yystackp->yynextFree = yystackp->yyitems; yystackp->yysplitPoint = YY_NULLPTR; yystackp->yylastDeleted = YY_NULLPTR; return yyinitStateSet (&yystackp->yytops); } #if YYSTACKEXPANDABLE # define YYRELOC(YYFROMITEMS, YYTOITEMS, YYX, YYTYPE) \ &((YYTOITEMS) \ - ((YYFROMITEMS) - YY_REINTERPRET_CAST (yyGLRStackItem*, (YYX))))->YYTYPE /** If *YYSTACKP is expandable, extend it. WARNING: Pointers into the stack from outside should be considered invalid after this call. We always expand when there are 1 or fewer items left AFTER an allocation, so that we can avoid having external pointers exist across an allocation. */ static void yyexpandGLRStack (yyGLRStack* yystackp) { yyGLRStackItem* yynewItems; yyGLRStackItem* yyp0, *yyp1; YYPTRDIFF_T yynewSize; YYPTRDIFF_T yyn; YYPTRDIFF_T yysize = yystackp->yynextFree - yystackp->yyitems; if (YYMAXDEPTH - YYHEADROOM < yysize) yyMemoryExhausted (yystackp); yynewSize = 2*yysize; if (YYMAXDEPTH < yynewSize) yynewSize = YYMAXDEPTH; yynewItems = YY_CAST (yyGLRStackItem*, YYMALLOC (YY_CAST (YYSIZE_T, yynewSize) * sizeof yynewItems[0])); if (! yynewItems) yyMemoryExhausted (yystackp); for (yyp0 = yystackp->yyitems, yyp1 = yynewItems, yyn = yysize; 0 < yyn; yyn -= 1, yyp0 += 1, yyp1 += 1) { *yyp1 = *yyp0; if (*YY_REINTERPRET_CAST (yybool *, yyp0)) { yyGLRState* yys0 = &yyp0->yystate; yyGLRState* yys1 = &yyp1->yystate; if (yys0->yypred != YY_NULLPTR) yys1->yypred = YYRELOC (yyp0, yyp1, yys0->yypred, yystate); if (! yys0->yyresolved && yys0->yysemantics.yyfirstVal != YY_NULLPTR) yys1->yysemantics.yyfirstVal = YYRELOC (yyp0, yyp1, yys0->yysemantics.yyfirstVal, yyoption); } else { yySemanticOption* yyv0 = &yyp0->yyoption; yySemanticOption* yyv1 = &yyp1->yyoption; if (yyv0->yystate != YY_NULLPTR) yyv1->yystate = YYRELOC (yyp0, yyp1, yyv0->yystate, yystate); if (yyv0->yynext != YY_NULLPTR) yyv1->yynext = YYRELOC (yyp0, yyp1, yyv0->yynext, yyoption); } } if (yystackp->yysplitPoint != YY_NULLPTR) yystackp->yysplitPoint = YYRELOC (yystackp->yyitems, yynewItems, yystackp->yysplitPoint, yystate); for (yyn = 0; yyn < yystackp->yytops.yysize; yyn += 1) if (yystackp->yytops.yystates[yyn] != YY_NULLPTR) yystackp->yytops.yystates[yyn] = YYRELOC (yystackp->yyitems, yynewItems, yystackp->yytops.yystates[yyn], yystate); YYFREE (yystackp->yyitems); yystackp->yyitems = yynewItems; yystackp->yynextFree = yynewItems + yysize; yystackp->yyspaceLeft = yynewSize - yysize; } #endif static void yyfreeGLRStack (yyGLRStack* yystackp) { YYFREE (yystackp->yyitems); yyfreeStateSet (&yystackp->yytops); } /** Assuming that YYS is a GLRState somewhere on *YYSTACKP, update the * splitpoint of *YYSTACKP, if needed, so that it is at least as deep as * YYS. */ static inline void yyupdateSplit (yyGLRStack* yystackp, yyGLRState* yys) { if (yystackp->yysplitPoint != YY_NULLPTR && yystackp->yysplitPoint > yys) yystackp->yysplitPoint = yys; } /** Invalidate stack #YYK in *YYSTACKP. */ static inline void yymarkStackDeleted (yyGLRStack* yystackp, YYPTRDIFF_T yyk) { if (yystackp->yytops.yystates[yyk] != YY_NULLPTR) yystackp->yylastDeleted = yystackp->yytops.yystates[yyk]; yystackp->yytops.yystates[yyk] = YY_NULLPTR; } /** Undelete the last stack in *YYSTACKP that was marked as deleted. Can only be done once after a deletion, and only when all other stacks have been deleted. */ static void yyundeleteLastStack (yyGLRStack* yystackp) { if (yystackp->yylastDeleted == YY_NULLPTR || yystackp->yytops.yysize != 0) return; yystackp->yytops.yystates[0] = yystackp->yylastDeleted; yystackp->yytops.yysize = 1; YY_DPRINTF ((stderr, "Restoring last deleted stack as stack #0.\n")); yystackp->yylastDeleted = YY_NULLPTR; } static inline void yyremoveDeletes (yyGLRStack* yystackp) { YYPTRDIFF_T yyi, yyj; yyi = yyj = 0; while (yyj < yystackp->yytops.yysize) { if (yystackp->yytops.yystates[yyi] == YY_NULLPTR) { if (yyi == yyj) YY_DPRINTF ((stderr, "Removing dead stacks.\n")); yystackp->yytops.yysize -= 1; } else { yystackp->yytops.yystates[yyj] = yystackp->yytops.yystates[yyi]; /* In the current implementation, it's unnecessary to copy yystackp->yytops.yylookaheadNeeds[yyi] since, after yyremoveDeletes returns, the parser immediately either enters deterministic operation or shifts a token. However, it doesn't hurt, and the code might evolve to need it. */ yystackp->yytops.yylookaheadNeeds[yyj] = yystackp->yytops.yylookaheadNeeds[yyi]; if (yyj != yyi) YY_DPRINTF ((stderr, "Rename stack %ld -> %ld.\n", YY_CAST (long, yyi), YY_CAST (long, yyj))); yyj += 1; } yyi += 1; } } /** Shift to a new state on stack #YYK of *YYSTACKP, corresponding to LR * state YYLRSTATE, at input position YYPOSN, with (resolved) semantic * value *YYVALP and source location *YYLOCP. */ static inline void yyglrShift (yyGLRStack* yystackp, YYPTRDIFF_T yyk, yy_state_t yylrState, YYPTRDIFF_T yyposn, YYSTYPE* yyvalp]b4_locations_if([, YYLTYPE* yylocp])[) { yyGLRState* yynewState = &yynewGLRStackItem (yystackp, yytrue)->yystate; yynewState->yylrState = yylrState; yynewState->yyposn = yyposn; yynewState->yyresolved = yytrue; yynewState->yypred = yystackp->yytops.yystates[yyk]; yynewState->yysemantics.yysval = *yyvalp;]b4_locations_if([ yynewState->yyloc = *yylocp;])[ yystackp->yytops.yystates[yyk] = yynewState; YY_RESERVE_GLRSTACK (yystackp); } /** Shift stack #YYK of *YYSTACKP, to a new state corresponding to LR * state YYLRSTATE, at input position YYPOSN, with the (unresolved) * semantic value of YYRHS under the action for YYRULE. */ static inline void yyglrShiftDefer (yyGLRStack* yystackp, YYPTRDIFF_T yyk, yy_state_t yylrState, YYPTRDIFF_T yyposn, yyGLRState* yyrhs, yyRuleNum yyrule) { yyGLRState* yynewState = &yynewGLRStackItem (yystackp, yytrue)->yystate; YY_ASSERT (yynewState->yyisState); yynewState->yylrState = yylrState; yynewState->yyposn = yyposn; yynewState->yyresolved = yyfalse; yynewState->yypred = yystackp->yytops.yystates[yyk]; yynewState->yysemantics.yyfirstVal = YY_NULLPTR; yystackp->yytops.yystates[yyk] = yynewState; /* Invokes YY_RESERVE_GLRSTACK. */ yyaddDeferredAction (yystackp, yyk, yynewState, yyrhs, yyrule); } #if !]b4_api_PREFIX[DEBUG # define YY_REDUCE_PRINT(Args) #else # define YY_REDUCE_PRINT(Args) \ do { \ if (yydebug) \ yy_reduce_print Args; \ } while (0) /*----------------------------------------------------------------------. | Report that stack #YYK of *YYSTACKP is going to be reduced by YYRULE. | `----------------------------------------------------------------------*/ static inline void yy_reduce_print (yybool yynormal, yyGLRStackItem* yyvsp, YYPTRDIFF_T yyk, yyRuleNum yyrule]b4_user_formals[) { int yynrhs = yyrhsLength (yyrule);]b4_locations_if([ int yylow = 1;])[ int yyi; YY_FPRINTF ((stderr, "Reducing stack %ld by rule %d (line %d):\n", YY_CAST (long, yyk), yyrule - 1, yyrline[yyrule])); if (! yynormal) yyfillin (yyvsp, 1, -yynrhs); /* The symbols being reduced. */ for (yyi = 0; yyi < yynrhs; yyi++) { YY_FPRINTF ((stderr, " $%d = ", yyi + 1)); yy_symbol_print (stderr, yy_accessing_symbol (yyvsp[yyi - yynrhs + 1].yystate.yylrState), &yyvsp[yyi - yynrhs + 1].yystate.yysemantics.yysval]b4_locations_if([, &]b4_rhs_location(yynrhs, yyi + 1))[]dnl b4_user_args[); if (!yyvsp[yyi - yynrhs + 1].yystate.yyresolved) YY_FPRINTF ((stderr, " (unresolved)")); YY_FPRINTF ((stderr, "\n")); } } #endif /** Pop the symbols consumed by reduction #YYRULE from the top of stack * #YYK of *YYSTACKP, and perform the appropriate semantic action on their * semantic values. Assumes that all ambiguities in semantic values * have been previously resolved. Set *YYVALP to the resulting value, * and *YYLOCP to the computed location (if any). Return value is as * for userAction. */ static inline YYRESULTTAG yydoAction (yyGLRStack* yystackp, YYPTRDIFF_T yyk, yyRuleNum yyrule, YYSTYPE* yyvalp]b4_locuser_formals[) { int yynrhs = yyrhsLength (yyrule); if (yystackp->yysplitPoint == YY_NULLPTR) { /* Standard special case: single stack. */ yyGLRStackItem* yyrhs = YY_REINTERPRET_CAST (yyGLRStackItem*, yystackp->yytops.yystates[yyk]); YY_ASSERT (yyk == 0); yystackp->yynextFree -= yynrhs; yystackp->yyspaceLeft += yynrhs; yystackp->yytops.yystates[0] = & yystackp->yynextFree[-1].yystate; YY_REDUCE_PRINT ((yytrue, yyrhs, yyk, yyrule]b4_user_args[)); return yyuserAction (yyrule, yynrhs, yyrhs, yystackp, yyvalp]b4_locuser_args[); } else { yyGLRStackItem yyrhsVals[YYMAXRHS + YYMAXLEFT + 1]; yyGLRState* yys = yyrhsVals[YYMAXRHS + YYMAXLEFT].yystate.yypred = yystackp->yytops.yystates[yyk]; int yyi;]b4_locations_if([[ if (yynrhs == 0) /* Set default location. */ yyrhsVals[YYMAXRHS + YYMAXLEFT - 1].yystate.yyloc = yys->yyloc;]])[ for (yyi = 0; yyi < yynrhs; yyi += 1) { yys = yys->yypred; YY_ASSERT (yys); } yyupdateSplit (yystackp, yys); yystackp->yytops.yystates[yyk] = yys; YY_REDUCE_PRINT ((yyfalse, yyrhsVals + YYMAXRHS + YYMAXLEFT - 1, yyk, yyrule]b4_user_args[)); return yyuserAction (yyrule, yynrhs, yyrhsVals + YYMAXRHS + YYMAXLEFT - 1, yystackp, yyvalp]b4_locuser_args[); } } /** Pop items off stack #YYK of *YYSTACKP according to grammar rule YYRULE, * and push back on the resulting nonterminal symbol. Perform the * semantic action associated with YYRULE and store its value with the * newly pushed state, if YYFORCEEVAL or if *YYSTACKP is currently * unambiguous. Otherwise, store the deferred semantic action with * the new state. If the new state would have an identical input * position, LR state, and predecessor to an existing state on the stack, * it is identified with that existing state, eliminating stack #YYK from * *YYSTACKP. In this case, the semantic value is * added to the options for the existing state's semantic value. */ static inline YYRESULTTAG yyglrReduce (yyGLRStack* yystackp, YYPTRDIFF_T yyk, yyRuleNum yyrule, yybool yyforceEval]b4_user_formals[) { YYPTRDIFF_T yyposn = yystackp->yytops.yystates[yyk]->yyposn; if (yyforceEval || yystackp->yysplitPoint == YY_NULLPTR) { YYSTYPE yysval;]b4_locations_if([[ YYLTYPE yyloc;]])[ YYRESULTTAG yyflag = yydoAction (yystackp, yyk, yyrule, &yysval]b4_locuser_args([&yyloc])[); if (yyflag == yyerr && yystackp->yysplitPoint != YY_NULLPTR) YY_DPRINTF ((stderr, "Parse on stack %ld rejected by rule %d (line %d).\n", YY_CAST (long, yyk), yyrule - 1, yyrline[yyrule - 1])); if (yyflag != yyok) return yyflag; YY_SYMBOL_PRINT ("-> $$ =", yylhsNonterm (yyrule), &yysval, &yyloc); yyglrShift (yystackp, yyk, yyLRgotoState (yystackp->yytops.yystates[yyk]->yylrState, yylhsNonterm (yyrule)), yyposn, &yysval]b4_locations_if([, &yyloc])[); } else { YYPTRDIFF_T yyi; int yyn; yyGLRState* yys, *yys0 = yystackp->yytops.yystates[yyk]; yy_state_t yynewLRState; for (yys = yystackp->yytops.yystates[yyk], yyn = yyrhsLength (yyrule); 0 < yyn; yyn -= 1) { yys = yys->yypred; YY_ASSERT (yys); } yyupdateSplit (yystackp, yys); yynewLRState = yyLRgotoState (yys->yylrState, yylhsNonterm (yyrule)); YY_DPRINTF ((stderr, "Reduced stack %ld by rule %d (line %d); action deferred. " "Now in state %d.\n", YY_CAST (long, yyk), yyrule - 1, yyrline[yyrule - 1], yynewLRState)); for (yyi = 0; yyi < yystackp->yytops.yysize; yyi += 1) if (yyi != yyk && yystackp->yytops.yystates[yyi] != YY_NULLPTR) { yyGLRState *yysplit = yystackp->yysplitPoint; yyGLRState *yyp = yystackp->yytops.yystates[yyi]; while (yyp != yys && yyp != yysplit && yyp->yyposn >= yyposn) { if (yyp->yylrState == yynewLRState && yyp->yypred == yys) { yyaddDeferredAction (yystackp, yyk, yyp, yys0, yyrule); yymarkStackDeleted (yystackp, yyk); YY_DPRINTF ((stderr, "Merging stack %ld into stack %ld.\n", YY_CAST (long, yyk), YY_CAST (long, yyi))); return yyok; } yyp = yyp->yypred; } } yystackp->yytops.yystates[yyk] = yys; yyglrShiftDefer (yystackp, yyk, yynewLRState, yyposn, yys0, yyrule); } return yyok; } static YYPTRDIFF_T yysplitStack (yyGLRStack* yystackp, YYPTRDIFF_T yyk) { if (yystackp->yysplitPoint == YY_NULLPTR) { YY_ASSERT (yyk == 0); yystackp->yysplitPoint = yystackp->yytops.yystates[yyk]; } if (yystackp->yytops.yycapacity <= yystackp->yytops.yysize) { YYPTRDIFF_T state_size = YYSIZEOF (yystackp->yytops.yystates[0]); YYPTRDIFF_T half_max_capacity = YYSIZE_MAXIMUM / 2 / state_size; if (half_max_capacity < yystackp->yytops.yycapacity) yyMemoryExhausted (yystackp); yystackp->yytops.yycapacity *= 2; { yyGLRState** yynewStates = YY_CAST (yyGLRState**, YYREALLOC (yystackp->yytops.yystates, (YY_CAST (YYSIZE_T, yystackp->yytops.yycapacity) * sizeof yynewStates[0]))); if (yynewStates == YY_NULLPTR) yyMemoryExhausted (yystackp); yystackp->yytops.yystates = yynewStates; } { yybool* yynewLookaheadNeeds = YY_CAST (yybool*, YYREALLOC (yystackp->yytops.yylookaheadNeeds, (YY_CAST (YYSIZE_T, yystackp->yytops.yycapacity) * sizeof yynewLookaheadNeeds[0]))); if (yynewLookaheadNeeds == YY_NULLPTR) yyMemoryExhausted (yystackp); yystackp->yytops.yylookaheadNeeds = yynewLookaheadNeeds; } } yystackp->yytops.yystates[yystackp->yytops.yysize] = yystackp->yytops.yystates[yyk]; yystackp->yytops.yylookaheadNeeds[yystackp->yytops.yysize] = yystackp->yytops.yylookaheadNeeds[yyk]; yystackp->yytops.yysize += 1; return yystackp->yytops.yysize - 1; } /** True iff YYY0 and YYY1 represent identical options at the top level. * That is, they represent the same rule applied to RHS symbols * that produce the same terminal symbols. */ static yybool yyidenticalOptions (yySemanticOption* yyy0, yySemanticOption* yyy1) { if (yyy0->yyrule == yyy1->yyrule) { yyGLRState *yys0, *yys1; int yyn; for (yys0 = yyy0->yystate, yys1 = yyy1->yystate, yyn = yyrhsLength (yyy0->yyrule); yyn > 0; yys0 = yys0->yypred, yys1 = yys1->yypred, yyn -= 1) if (yys0->yyposn != yys1->yyposn) return yyfalse; return yytrue; } else return yyfalse; } /** Assuming identicalOptions (YYY0,YYY1), destructively merge the * alternative semantic values for the RHS-symbols of YYY1 and YYY0. */ static void yymergeOptionSets (yySemanticOption* yyy0, yySemanticOption* yyy1) { yyGLRState *yys0, *yys1; int yyn; for (yys0 = yyy0->yystate, yys1 = yyy1->yystate, yyn = yyrhsLength (yyy0->yyrule); 0 < yyn; yys0 = yys0->yypred, yys1 = yys1->yypred, yyn -= 1) { if (yys0 == yys1) break; else if (yys0->yyresolved) { yys1->yyresolved = yytrue; yys1->yysemantics.yysval = yys0->yysemantics.yysval; } else if (yys1->yyresolved) { yys0->yyresolved = yytrue; yys0->yysemantics.yysval = yys1->yysemantics.yysval; } else { yySemanticOption** yyz0p = &yys0->yysemantics.yyfirstVal; yySemanticOption* yyz1 = yys1->yysemantics.yyfirstVal; while (yytrue) { if (yyz1 == *yyz0p || yyz1 == YY_NULLPTR) break; else if (*yyz0p == YY_NULLPTR) { *yyz0p = yyz1; break; } else if (*yyz0p < yyz1) { yySemanticOption* yyz = *yyz0p; *yyz0p = yyz1; yyz1 = yyz1->yynext; (*yyz0p)->yynext = yyz; } yyz0p = &(*yyz0p)->yynext; } yys1->yysemantics.yyfirstVal = yys0->yysemantics.yyfirstVal; } } } /** Y0 and Y1 represent two possible actions to take in a given * parsing state; return 0 if no combination is possible, * 1 if user-mergeable, 2 if Y0 is preferred, 3 if Y1 is preferred. */ static int yypreference (yySemanticOption* y0, yySemanticOption* y1) { yyRuleNum r0 = y0->yyrule, r1 = y1->yyrule; int p0 = yydprec[r0], p1 = yydprec[r1]; if (p0 == p1) { if (yymerger[r0] == 0 || yymerger[r0] != yymerger[r1]) return 0; else return 1; } if (p0 == 0 || p1 == 0) return 0; if (p0 < p1) return 3; if (p1 < p0) return 2; return 0; } static YYRESULTTAG yyresolveValue (yyGLRState* yys, yyGLRStack* yystackp]b4_user_formals[); /** Resolve the previous YYN states starting at and including state YYS * on *YYSTACKP. If result != yyok, some states may have been left * unresolved possibly with empty semantic option chains. Regardless * of whether result = yyok, each state has been left with consistent * data so that yydestroyGLRState can be invoked if necessary. */ static YYRESULTTAG yyresolveStates (yyGLRState* yys, int yyn, yyGLRStack* yystackp]b4_user_formals[) { if (0 < yyn) { YY_ASSERT (yys->yypred); YYCHK (yyresolveStates (yys->yypred, yyn-1, yystackp]b4_user_args[)); if (! yys->yyresolved) YYCHK (yyresolveValue (yys, yystackp]b4_user_args[)); } return yyok; } /** Resolve the states for the RHS of YYOPT on *YYSTACKP, perform its * user action, and return the semantic value and location in *YYVALP * and *YYLOCP. Regardless of whether result = yyok, all RHS states * have been destroyed (assuming the user action destroys all RHS * semantic values if invoked). */ static YYRESULTTAG yyresolveAction (yySemanticOption* yyopt, yyGLRStack* yystackp, YYSTYPE* yyvalp]b4_locuser_formals[) { yyGLRStackItem yyrhsVals[YYMAXRHS + YYMAXLEFT + 1]; int yynrhs = yyrhsLength (yyopt->yyrule); YYRESULTTAG yyflag = yyresolveStates (yyopt->yystate, yynrhs, yystackp]b4_user_args[); if (yyflag != yyok) { yyGLRState *yys; for (yys = yyopt->yystate; yynrhs > 0; yys = yys->yypred, yynrhs -= 1) yydestroyGLRState ("Cleanup: popping", yys]b4_user_args[); return yyflag; } yyrhsVals[YYMAXRHS + YYMAXLEFT].yystate.yypred = yyopt->yystate;]b4_locations_if([[ if (yynrhs == 0) /* Set default location. */ yyrhsVals[YYMAXRHS + YYMAXLEFT - 1].yystate.yyloc = yyopt->yystate->yyloc;]])[ { int yychar_current = yychar; YYSTYPE yylval_current = yylval;]b4_locations_if([ YYLTYPE yylloc_current = yylloc;])[ yychar = yyopt->yyrawchar; yylval = yyopt->yyval;]b4_locations_if([ yylloc = yyopt->yyloc;])[ yyflag = yyuserAction (yyopt->yyrule, yynrhs, yyrhsVals + YYMAXRHS + YYMAXLEFT - 1, yystackp, yyvalp]b4_locuser_args[); yychar = yychar_current; yylval = yylval_current;]b4_locations_if([ yylloc = yylloc_current;])[ } return yyflag; } #if ]b4_api_PREFIX[DEBUG static void yyreportTree (yySemanticOption* yyx, int yyindent) { int yynrhs = yyrhsLength (yyx->yyrule); int yyi; yyGLRState* yys; yyGLRState* yystates[1 + YYMAXRHS]; yyGLRState yyleftmost_state; for (yyi = yynrhs, yys = yyx->yystate; 0 < yyi; yyi -= 1, yys = yys->yypred) yystates[yyi] = yys; if (yys == YY_NULLPTR) { yyleftmost_state.yyposn = 0; yystates[0] = &yyleftmost_state; } else yystates[0] = yys; if (yyx->yystate->yyposn < yys->yyposn + 1) YY_FPRINTF ((stderr, "%*s%s -> <Rule %d, empty>\n", yyindent, "", yysymbol_name (yylhsNonterm (yyx->yyrule)), yyx->yyrule - 1)); else YY_FPRINTF ((stderr, "%*s%s -> <Rule %d, tokens %ld .. %ld>\n", yyindent, "", yysymbol_name (yylhsNonterm (yyx->yyrule)), yyx->yyrule - 1, YY_CAST (long, yys->yyposn + 1), YY_CAST (long, yyx->yystate->yyposn))); for (yyi = 1; yyi <= yynrhs; yyi += 1) { if (yystates[yyi]->yyresolved) { if (yystates[yyi-1]->yyposn+1 > yystates[yyi]->yyposn) YY_FPRINTF ((stderr, "%*s%s <empty>\n", yyindent+2, "", yysymbol_name (yy_accessing_symbol (yystates[yyi]->yylrState)))); else YY_FPRINTF ((stderr, "%*s%s <tokens %ld .. %ld>\n", yyindent+2, "", yysymbol_name (yy_accessing_symbol (yystates[yyi]->yylrState)), YY_CAST (long, yystates[yyi-1]->yyposn + 1), YY_CAST (long, yystates[yyi]->yyposn))); } else yyreportTree (yystates[yyi]->yysemantics.yyfirstVal, yyindent+2); } } #endif static YYRESULTTAG yyreportAmbiguity (yySemanticOption* yyx0, yySemanticOption* yyx1]b4_pure_formals[) { YYUSE (yyx0); YYUSE (yyx1); #if ]b4_api_PREFIX[DEBUG YY_FPRINTF ((stderr, "Ambiguity detected.\n")); YY_FPRINTF ((stderr, "Option 1,\n")); yyreportTree (yyx0, 2); YY_FPRINTF ((stderr, "\nOption 2,\n")); yyreportTree (yyx1, 2); YY_FPRINTF ((stderr, "\n")); #endif yyerror (]b4_yyerror_args[YY_("syntax is ambiguous")); return yyabort; }]b4_locations_if([[ /** Resolve the locations for each of the YYN1 states in *YYSTACKP, * ending at YYS1. Has no effect on previously resolved states. * The first semantic option of a state is always chosen. */ static void yyresolveLocations (yyGLRState *yys1, int yyn1, yyGLRStack *yystackp]b4_user_formals[) { if (0 < yyn1) { yyresolveLocations (yys1->yypred, yyn1 - 1, yystackp]b4_user_args[); if (!yys1->yyresolved) { yyGLRStackItem yyrhsloc[1 + YYMAXRHS]; int yynrhs; yySemanticOption *yyoption = yys1->yysemantics.yyfirstVal; YY_ASSERT (yyoption); yynrhs = yyrhsLength (yyoption->yyrule); if (0 < yynrhs) { yyGLRState *yys; int yyn; yyresolveLocations (yyoption->yystate, yynrhs, yystackp]b4_user_args[); for (yys = yyoption->yystate, yyn = yynrhs; yyn > 0; yys = yys->yypred, yyn -= 1) yyrhsloc[yyn].yystate.yyloc = yys->yyloc; } else { /* Both yyresolveAction and yyresolveLocations traverse the GSS in reverse rightmost order. It is only necessary to invoke yyresolveLocations on a subforest for which yyresolveAction would have been invoked next had an ambiguity not been detected. Thus the location of the previous state (but not necessarily the previous state itself) is guaranteed to be resolved already. */ yyGLRState *yyprevious = yyoption->yystate; yyrhsloc[0].yystate.yyloc = yyprevious->yyloc; } YYLLOC_DEFAULT ((yys1->yyloc), yyrhsloc, yynrhs); } } }]])[ /** Resolve the ambiguity represented in state YYS in *YYSTACKP, * perform the indicated actions, and set the semantic value of YYS. * If result != yyok, the chain of semantic options in YYS has been * cleared instead or it has been left unmodified except that * redundant options may have been removed. Regardless of whether * result = yyok, YYS has been left with consistent data so that * yydestroyGLRState can be invoked if necessary. */ static YYRESULTTAG yyresolveValue (yyGLRState* yys, yyGLRStack* yystackp]b4_user_formals[) { yySemanticOption* yyoptionList = yys->yysemantics.yyfirstVal; yySemanticOption* yybest = yyoptionList; yySemanticOption** yypp; yybool yymerge = yyfalse; YYSTYPE yysval; YYRESULTTAG yyflag;]b4_locations_if([ YYLTYPE *yylocp = &yys->yyloc;])[ for (yypp = &yyoptionList->yynext; *yypp != YY_NULLPTR; ) { yySemanticOption* yyp = *yypp; if (yyidenticalOptions (yybest, yyp)) { yymergeOptionSets (yybest, yyp); *yypp = yyp->yynext; } else { switch (yypreference (yybest, yyp)) { case 0:]b4_locations_if([[ yyresolveLocations (yys, 1, yystackp]b4_user_args[);]])[ return yyreportAmbiguity (yybest, yyp]b4_pure_args[); break; case 1: yymerge = yytrue; break; case 2: break; case 3: yybest = yyp; yymerge = yyfalse; break; default: /* This cannot happen so it is not worth a YY_ASSERT (yyfalse), but some compilers complain if the default case is omitted. */ break; } yypp = &yyp->yynext; } } if (yymerge) { yySemanticOption* yyp; int yyprec = yydprec[yybest->yyrule]; yyflag = yyresolveAction (yybest, yystackp, &yysval]b4_locuser_args[); if (yyflag == yyok) for (yyp = yybest->yynext; yyp != YY_NULLPTR; yyp = yyp->yynext) { if (yyprec == yydprec[yyp->yyrule]) { YYSTYPE yysval_other;]b4_locations_if([ YYLTYPE yydummy;])[ yyflag = yyresolveAction (yyp, yystackp, &yysval_other]b4_locuser_args([&yydummy])[); if (yyflag != yyok) { yydestruct ("Cleanup: discarding incompletely merged value for", yy_accessing_symbol (yys->yylrState), &yysval]b4_locuser_args[); break; } yyuserMerge (yymerger[yyp->yyrule], &yysval, &yysval_other); } } } else yyflag = yyresolveAction (yybest, yystackp, &yysval]b4_locuser_args([yylocp])[); if (yyflag == yyok) { yys->yyresolved = yytrue; yys->yysemantics.yysval = yysval; } else yys->yysemantics.yyfirstVal = YY_NULLPTR; return yyflag; } static YYRESULTTAG yyresolveStack (yyGLRStack* yystackp]b4_user_formals[) { if (yystackp->yysplitPoint != YY_NULLPTR) { yyGLRState* yys; int yyn; for (yyn = 0, yys = yystackp->yytops.yystates[0]; yys != yystackp->yysplitPoint; yys = yys->yypred, yyn += 1) continue; YYCHK (yyresolveStates (yystackp->yytops.yystates[0], yyn, yystackp ]b4_user_args[)); } return yyok; } static void yycompressStack (yyGLRStack* yystackp) { yyGLRState* yyp, *yyq, *yyr; if (yystackp->yytops.yysize != 1 || yystackp->yysplitPoint == YY_NULLPTR) return; for (yyp = yystackp->yytops.yystates[0], yyq = yyp->yypred, yyr = YY_NULLPTR; yyp != yystackp->yysplitPoint; yyr = yyp, yyp = yyq, yyq = yyp->yypred) yyp->yypred = yyr; yystackp->yyspaceLeft += yystackp->yynextFree - yystackp->yyitems; yystackp->yynextFree = YY_REINTERPRET_CAST (yyGLRStackItem*, yystackp->yysplitPoint) + 1; yystackp->yyspaceLeft -= yystackp->yynextFree - yystackp->yyitems; yystackp->yysplitPoint = YY_NULLPTR; yystackp->yylastDeleted = YY_NULLPTR; while (yyr != YY_NULLPTR) { yystackp->yynextFree->yystate = *yyr; yyr = yyr->yypred; yystackp->yynextFree->yystate.yypred = &yystackp->yynextFree[-1].yystate; yystackp->yytops.yystates[0] = &yystackp->yynextFree->yystate; yystackp->yynextFree += 1; yystackp->yyspaceLeft -= 1; } } static YYRESULTTAG yyprocessOneStack (yyGLRStack* yystackp, YYPTRDIFF_T yyk, YYPTRDIFF_T yyposn]b4_pure_formals[) { while (yystackp->yytops.yystates[yyk] != YY_NULLPTR) { yy_state_t yystate = yystackp->yytops.yystates[yyk]->yylrState; YY_DPRINTF ((stderr, "Stack %ld Entering state %d\n", YY_CAST (long, yyk), yystate)); YY_ASSERT (yystate != YYFINAL); if (yyisDefaultedState (yystate)) { YYRESULTTAG yyflag; yyRuleNum yyrule = yydefaultAction (yystate); if (yyrule == 0) { YY_DPRINTF ((stderr, "Stack %ld dies.\n", YY_CAST (long, yyk))); yymarkStackDeleted (yystackp, yyk); return yyok; } yyflag = yyglrReduce (yystackp, yyk, yyrule, yyimmediate[yyrule]]b4_user_args[); if (yyflag == yyerr) { YY_DPRINTF ((stderr, "Stack %ld dies " "(predicate failure or explicit user error).\n", YY_CAST (long, yyk))); yymarkStackDeleted (yystackp, yyk); return yyok; } if (yyflag != yyok) return yyflag; } else { yysymbol_kind_t yytoken = ]b4_yygetToken_call[; const short* yyconflicts; const int yyaction = yygetLRActions (yystate, yytoken, &yyconflicts); yystackp->yytops.yylookaheadNeeds[yyk] = yytrue; for (/* nothing */; *yyconflicts; yyconflicts += 1) { YYRESULTTAG yyflag; YYPTRDIFF_T yynewStack = yysplitStack (yystackp, yyk); YY_DPRINTF ((stderr, "Splitting off stack %ld from %ld.\n", YY_CAST (long, yynewStack), YY_CAST (long, yyk))); yyflag = yyglrReduce (yystackp, yynewStack, *yyconflicts, yyimmediate[*yyconflicts]]b4_user_args[); if (yyflag == yyok) YYCHK (yyprocessOneStack (yystackp, yynewStack, yyposn]b4_pure_args[)); else if (yyflag == yyerr) { YY_DPRINTF ((stderr, "Stack %ld dies.\n", YY_CAST (long, yynewStack))); yymarkStackDeleted (yystackp, yynewStack); } else return yyflag; } if (yyisShiftAction (yyaction)) break; else if (yyisErrorAction (yyaction)) { YY_DPRINTF ((stderr, "Stack %ld dies.\n", YY_CAST (long, yyk))); yymarkStackDeleted (yystackp, yyk); break; } else { YYRESULTTAG yyflag = yyglrReduce (yystackp, yyk, -yyaction, yyimmediate[-yyaction]]b4_user_args[); if (yyflag == yyerr) { YY_DPRINTF ((stderr, "Stack %ld dies " "(predicate failure or explicit user error).\n", YY_CAST (long, yyk))); yymarkStackDeleted (yystackp, yyk); break; } else if (yyflag != yyok) return yyflag; } } } return yyok; } ]b4_parse_error_case([simple], [], [[/* Put in YYARG at most YYARGN of the expected tokens given the current YYSTACKP, and return the number of tokens stored in YYARG. If YYARG is null, return the number of expected tokens (guaranteed to be less than YYNTOKENS). */ static int yypcontext_expected_tokens (const yyGLRStack* yystackp, yysymbol_kind_t yyarg[], int yyargn) { /* Actual size of YYARG. */ int yycount = 0; int yyn = yypact[yystackp->yytops.yystates[0]->yylrState]; if (!yypact_value_is_default (yyn)) { /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. In other words, skip the first -YYN actions for this state because they are default actions. */ int yyxbegin = yyn < 0 ? -yyn : 0; /* Stay within bounds of both yycheck and yytname. */ int yychecklim = YYLAST - yyn + 1; int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS; int yyx; for (yyx = yyxbegin; yyx < yyxend; ++yyx) if (yycheck[yyx + yyn] == yyx && yyx != ]b4_symbol(1, kind)[ && !yytable_value_is_error (yytable[yyx + yyn])) { if (!yyarg) ++yycount; else if (yycount == yyargn) return 0; else yyarg[yycount++] = YY_CAST (yysymbol_kind_t, yyx); } } if (yyarg && yycount == 0 && 0 < yyargn) yyarg[0] = ]b4_symbol(-2, kind)[; return yycount; }]])[ ]b4_parse_error_bmatch( [custom], [[/* User defined function to report a syntax error. */ typedef yyGLRStack yypcontext_t; static int yyreport_syntax_error (const yyGLRStack* yystackp]b4_user_formals[); /* The kind of the lookahead of this context. */ static yysymbol_kind_t yypcontext_token (const yyGLRStack *yystackp) YY_ATTRIBUTE_UNUSED; static yysymbol_kind_t yypcontext_token (const yyGLRStack *yystackp) { YYUSE (yystackp); yysymbol_kind_t yytoken = yychar == ]b4_symbol(-2, id)[ ? ]b4_symbol(-2, kind)[ : YYTRANSLATE (yychar); return yytoken; } ]b4_locations_if([[/* The location of the lookahead of this context. */ static YYLTYPE * yypcontext_location (const yyGLRStack *yystackp) YY_ATTRIBUTE_UNUSED; static YYLTYPE * yypcontext_location (const yyGLRStack *yystackp) { YYUSE (yystackp); return &yylloc; }]])], [detailed\|verbose], [[static int yy_syntax_error_arguments (const yyGLRStack* yystackp, yysymbol_kind_t yyarg[], int yyargn) { yysymbol_kind_t yytoken = yychar == ]b4_symbol(-2, id)[ ? ]b4_symbol(-2, kind)[ : YYTRANSLATE (yychar); /* Actual size of YYARG. */ int yycount = 0; /* There are many possibilities here to consider: - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected tokens because there are none. - The only way there can be no lookahead present (in yychar) is if this state is a consistent state with a default action. Thus, detecting the absence of a lookahead is sufficient to determine that there is no unexpected or expected token to report. In that case, just report a simple "syntax error". - Don't assume there isn't a lookahead just because this state is a consistent state with a default action. There might have been a previous inconsistent state, consistent state with a non-default action, or user semantic action that manipulated yychar.]b4_lac_if([[ In the first two cases, it might appear that the current syntax error should have been detected in the previous state when yy_lac was invoked. However, at that time, there might have been a different syntax error that discarded a different initial context during error recovery, leaving behind the current lookahead.]], [[ - Of course, the expected token list depends on states to have correct lookahead information, and it depends on the parser not to perform extra reductions after fetching a lookahead from the scanner and before detecting a syntax error. Thus, state merging (from LALR or IELR) and default reductions corrupt the expected token list. However, the list is correct for canonical LR with one exception: it will still contain any token that will not be accepted due to an error action in a later state.]])[ */ if (yytoken != ]b4_symbol(-2, kind)[) { int yyn; if (yyarg) yyarg[yycount] = yytoken; ++yycount; yyn = yypcontext_expected_tokens (yystackp, yyarg ? yyarg + 1 : yyarg, yyargn - 1); if (yyn == YYENOMEM) return YYENOMEM; else yycount += yyn; } return yycount; } ]])[ static void yyreportSyntaxError (yyGLRStack* yystackp]b4_user_formals[) { if (yystackp->yyerrState != 0) return; ]b4_parse_error_case( [custom], [[ if (yyreport_syntax_error (yystackp]b4_user_args[)) yyMemoryExhausted (yystackp);]], [simple], [[ yyerror (]b4_lyyerror_args[YY_("syntax error"));]], [[ { yybool yysize_overflow = yyfalse; char* yymsg = YY_NULLPTR; enum { YYARGS_MAX = 5 }; /* Internationalized format string. */ const char *yyformat = YY_NULLPTR; /* Arguments of yyformat: reported tokens (one for the "unexpected", one per "expected"). */ yysymbol_kind_t yyarg[YYARGS_MAX]; /* Cumulated lengths of YYARG. */ YYPTRDIFF_T yysize = 0; /* Actual size of YYARG. */ int yycount = yy_syntax_error_arguments (yystackp, yyarg, YYARGS_MAX); if (yycount == YYENOMEM) yyMemoryExhausted (yystackp); switch (yycount) { #define YYCASE_(N, S) \ case N: \ yyformat = S; \ break default: /* Avoid compiler warnings. */ YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s")); YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s")); YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s")); #undef YYCASE_ } /* Compute error message size. Don't count the "%s"s, but reserve room for the terminator. */ yysize = yystrlen (yyformat) - 2 * yycount + 1; { int yyi; for (yyi = 0; yyi < yycount; ++yyi) { YYPTRDIFF_T yysz = ]b4_parse_error_case( [verbose], [[yytnamerr (YY_NULLPTR, yytname[yyarg[yyi]])]], [[yystrlen (yysymbol_name (yyarg[yyi]))]]);[ if (YYSIZE_MAXIMUM - yysize < yysz) yysize_overflow = yytrue; else yysize += yysz; } } if (!yysize_overflow) yymsg = YY_CAST (char *, YYMALLOC (YY_CAST (YYSIZE_T, yysize))); if (yymsg) { char *yyp = yymsg; int yyi = 0; while ((*yyp = *yyformat)) { if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount) {]b4_parse_error_case([verbose], [[ yyp += yytnamerr (yyp, yytname[yyarg[yyi++]]);]], [[ yyp = yystpcpy (yyp, yysymbol_name (yyarg[yyi++]));]])[ yyformat += 2; } else { ++yyp; ++yyformat; } } yyerror (]b4_lyyerror_args[yymsg); YYFREE (yymsg); } else { yyerror (]b4_lyyerror_args[YY_("syntax error")); yyMemoryExhausted (yystackp); } }]])[ yynerrs += 1; } /* Recover from a syntax error on *YYSTACKP, assuming that *YYSTACKP->YYTOKENP, yylval, and yylloc are the syntactic category, semantic value, and location of the lookahead. */ static void yyrecoverSyntaxError (yyGLRStack* yystackp]b4_user_formals[) { if (yystackp->yyerrState == 3) /* We just shifted the error token and (perhaps) took some reductions. Skip tokens until we can proceed. */ while (yytrue) { yysymbol_kind_t yytoken; int yyj; if (yychar == ]b4_symbol(0, [id])[) yyFail (yystackp][]b4_lpure_args[, YY_NULLPTR); if (yychar != ]b4_symbol(-2, id)[) {]b4_locations_if([[ /* We throw away the lookahead, but the error range of the shifted error token must take it into account. */ yyGLRState *yys = yystackp->yytops.yystates[0]; yyGLRStackItem yyerror_range[3]; yyerror_range[1].yystate.yyloc = yys->yyloc; yyerror_range[2].yystate.yyloc = yylloc; YYLLOC_DEFAULT ((yys->yyloc), yyerror_range, 2);]])[ yytoken = YYTRANSLATE (yychar); yydestruct ("Error: discarding", yytoken, &yylval]b4_locuser_args([&yylloc])[); yychar = ]b4_symbol(-2, id)[; } yytoken = ]b4_yygetToken_call[; yyj = yypact[yystackp->yytops.yystates[0]->yylrState]; if (yypact_value_is_default (yyj)) return; yyj += yytoken; if (yyj < 0 || YYLAST < yyj || yycheck[yyj] != yytoken) { if (yydefact[yystackp->yytops.yystates[0]->yylrState] != 0) return; } else if (! yytable_value_is_error (yytable[yyj])) return; } /* Reduce to one stack. */ { YYPTRDIFF_T yyk; for (yyk = 0; yyk < yystackp->yytops.yysize; yyk += 1) if (yystackp->yytops.yystates[yyk] != YY_NULLPTR) break; if (yyk >= yystackp->yytops.yysize) yyFail (yystackp][]b4_lpure_args[, YY_NULLPTR); for (yyk += 1; yyk < yystackp->yytops.yysize; yyk += 1) yymarkStackDeleted (yystackp, yyk); yyremoveDeletes (yystackp); yycompressStack (yystackp); } /* Pop stack until we find a state that shifts the error token. */ yystackp->yyerrState = 3; while (yystackp->yytops.yystates[0] != YY_NULLPTR) { yyGLRState *yys = yystackp->yytops.yystates[0]; int yyj = yypact[yys->yylrState]; if (! yypact_value_is_default (yyj)) { yyj += ]b4_symbol(1, kind)[; if (0 <= yyj && yyj <= YYLAST && yycheck[yyj] == ]b4_symbol(1, kind)[ && yyisShiftAction (yytable[yyj])) { /* Shift the error token. */ int yyaction = yytable[yyj];]b4_locations_if([[ /* First adjust its location.*/ YYLTYPE yyerrloc; yystackp->yyerror_range[2].yystate.yyloc = yylloc; YYLLOC_DEFAULT (yyerrloc, (yystackp->yyerror_range), 2);]])[ YY_SYMBOL_PRINT ("Shifting", yy_accessing_symbol (yyaction), &yylval, &yyerrloc); yyglrShift (yystackp, 0, yyaction, yys->yyposn, &yylval]b4_locations_if([, &yyerrloc])[); yys = yystackp->yytops.yystates[0]; break; } }]b4_locations_if([[ yystackp->yyerror_range[1].yystate.yyloc = yys->yyloc;]])[ if (yys->yypred != YY_NULLPTR) yydestroyGLRState ("Error: popping", yys]b4_user_args[); yystackp->yytops.yystates[0] = yys->yypred; yystackp->yynextFree -= 1; yystackp->yyspaceLeft += 1; } if (yystackp->yytops.yystates[0] == YY_NULLPTR) yyFail (yystackp][]b4_lpure_args[, YY_NULLPTR); } #define YYCHK1(YYE) \ do { \ switch (YYE) { \ case yyok: \ break; \ case yyabort: \ goto yyabortlab; \ case yyaccept: \ goto yyacceptlab; \ case yyerr: \ goto yyuser_error; \ default: \ goto yybuglab; \ } \ } while (0) /*----------. | yyparse. | `----------*/ int yyparse (]m4_ifset([b4_parse_param], [b4_formals(b4_parse_param)], [void])[) { int yyresult; yyGLRStack yystack; yyGLRStack* const yystackp = &yystack; YYPTRDIFF_T yyposn; YY_DPRINTF ((stderr, "Starting parse\n")); yychar = ]b4_symbol(-2, id)[; yylval = yyval_default;]b4_locations_if([ yylloc = yyloc_default;])[ ]m4_ifdef([b4_initial_action], [ b4_dollar_pushdef([yylval], [], [], [yylloc])dnl b4_user_initial_action b4_dollar_popdef])[]dnl [ if (! yyinitGLRStack (yystackp, YYINITDEPTH)) goto yyexhaustedlab; switch (YYSETJMP (yystack.yyexception_buffer)) { case 0: break; case 1: goto yyabortlab; case 2: goto yyexhaustedlab; default: goto yybuglab; } yyglrShift (&yystack, 0, 0, 0, &yylval]b4_locations_if([, &yylloc])[); yyposn = 0; while (yytrue) { /* For efficiency, we have two loops, the first of which is specialized to deterministic operation (single stack, no potential ambiguity). */ /* Standard mode. */ while (yytrue) { yy_state_t yystate = yystack.yytops.yystates[0]->yylrState; YY_DPRINTF ((stderr, "Entering state %d\n", yystate)); if (yystate == YYFINAL) goto yyacceptlab; if (yyisDefaultedState (yystate)) { yyRuleNum yyrule = yydefaultAction (yystate); if (yyrule == 0) {]b4_locations_if([[ yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[ yyreportSyntaxError (&yystack]b4_user_args[); goto yyuser_error; } YYCHK1 (yyglrReduce (&yystack, 0, yyrule, yytrue]b4_user_args[)); } else { yysymbol_kind_t yytoken = ]b4_yygetToken_call;[ const short* yyconflicts; int yyaction = yygetLRActions (yystate, yytoken, &yyconflicts); if (*yyconflicts) /* Enter nondeterministic mode. */ break; if (yyisShiftAction (yyaction)) { YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc); yychar = ]b4_symbol(-2, id)[; yyposn += 1; yyglrShift (&yystack, 0, yyaction, yyposn, &yylval]b4_locations_if([, &yylloc])[); if (0 < yystack.yyerrState) yystack.yyerrState -= 1; } else if (yyisErrorAction (yyaction)) {]b4_locations_if([[ yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[ /* Issue an error message unless the scanner already did. */ if (yychar != ]b4_symbol(1, id)[) yyreportSyntaxError (&yystack]b4_user_args[); goto yyuser_error; } else YYCHK1 (yyglrReduce (&yystack, 0, -yyaction, yytrue]b4_user_args[)); } } /* Nondeterministic mode. */ while (yytrue) { yysymbol_kind_t yytoken_to_shift; YYPTRDIFF_T yys; for (yys = 0; yys < yystack.yytops.yysize; yys += 1) yystackp->yytops.yylookaheadNeeds[yys] = yychar != ]b4_symbol(-2, id)[; /* yyprocessOneStack returns one of three things: - An error flag. If the caller is yyprocessOneStack, it immediately returns as well. When the caller is finally yyparse, it jumps to an error label via YYCHK1. - yyok, but yyprocessOneStack has invoked yymarkStackDeleted (&yystack, yys), which sets the top state of yys to NULL. Thus, yyparse's following invocation of yyremoveDeletes will remove the stack. - yyok, when ready to shift a token. Except in the first case, yyparse will invoke yyremoveDeletes and then shift the next token onto all remaining stacks. This synchronization of the shift (that is, after all preceding reductions on all stacks) helps prevent double destructor calls on yylval in the event of memory exhaustion. */ for (yys = 0; yys < yystack.yytops.yysize; yys += 1) YYCHK1 (yyprocessOneStack (&yystack, yys, yyposn]b4_lpure_args[)); yyremoveDeletes (&yystack); if (yystack.yytops.yysize == 0) { yyundeleteLastStack (&yystack); if (yystack.yytops.yysize == 0) yyFail (&yystack][]b4_lpure_args[, YY_("syntax error")); YYCHK1 (yyresolveStack (&yystack]b4_user_args[)); YY_DPRINTF ((stderr, "Returning to deterministic operation.\n"));]b4_locations_if([[ yystack.yyerror_range[1].yystate.yyloc = yylloc;]])[ yyreportSyntaxError (&yystack]b4_user_args[); goto yyuser_error; } /* If any yyglrShift call fails, it will fail after shifting. Thus, a copy of yylval will already be on stack 0 in the event of a failure in the following loop. Thus, yychar is set to ]b4_symbol(-2, id)[ before the loop to make sure the user destructor for yylval isn't called twice. */ yytoken_to_shift = YYTRANSLATE (yychar); yychar = ]b4_symbol(-2, id)[; yyposn += 1; for (yys = 0; yys < yystack.yytops.yysize; yys += 1) { yy_state_t yystate = yystack.yytops.yystates[yys]->yylrState; const short* yyconflicts; int yyaction = yygetLRActions (yystate, yytoken_to_shift, &yyconflicts); /* Note that yyconflicts were handled by yyprocessOneStack. */ YY_DPRINTF ((stderr, "On stack %ld, ", YY_CAST (long, yys))); YY_SYMBOL_PRINT ("shifting", yytoken_to_shift, &yylval, &yylloc); yyglrShift (&yystack, yys, yyaction, yyposn, &yylval]b4_locations_if([, &yylloc])[); YY_DPRINTF ((stderr, "Stack %ld now in state #%d\n", YY_CAST (long, yys), yystack.yytops.yystates[yys]->yylrState)); } if (yystack.yytops.yysize == 1) { YYCHK1 (yyresolveStack (&yystack]b4_user_args[)); YY_DPRINTF ((stderr, "Returning to deterministic operation.\n")); yycompressStack (&yystack); break; } } continue; yyuser_error: yyrecoverSyntaxError (&yystack]b4_user_args[); yyposn = yystack.yytops.yystates[0]->yyposn; } yyacceptlab: yyresult = 0; goto yyreturn; yybuglab: YY_ASSERT (yyfalse); goto yyabortlab; yyabortlab: yyresult = 1; goto yyreturn; yyexhaustedlab: yyerror (]b4_lyyerror_args[YY_("memory exhausted")); yyresult = 2; goto yyreturn; yyreturn: if (yychar != ]b4_symbol(-2, id)[) yydestruct ("Cleanup: discarding lookahead", YYTRANSLATE (yychar), &yylval]b4_locuser_args([&yylloc])[); /* If the stack is well-formed, pop the stack until it is empty, destroying its entries as we go. But free the stack regardless of whether it is well-formed. */ if (yystack.yyitems) { yyGLRState** yystates = yystack.yytops.yystates; if (yystates) { YYPTRDIFF_T yysize = yystack.yytops.yysize; YYPTRDIFF_T yyk; for (yyk = 0; yyk < yysize; yyk += 1) if (yystates[yyk]) { while (yystates[yyk]) { yyGLRState *yys = yystates[yyk];]b4_locations_if([[ yystack.yyerror_range[1].yystate.yyloc = yys->yyloc;]])[ if (yys->yypred != YY_NULLPTR) yydestroyGLRState ("Cleanup: popping", yys]b4_user_args[); yystates[yyk] = yys->yypred; yystack.yynextFree -= 1; yystack.yyspaceLeft += 1; } break; } } yyfreeGLRStack (&yystack); } return yyresult; } /* DEBUGGING ONLY */ #if ]b4_api_PREFIX[DEBUG static void yy_yypstack (yyGLRState* yys) { if (yys->yypred) { yy_yypstack (yys->yypred); YY_FPRINTF ((stderr, " -> ")); } YY_FPRINTF ((stderr, "%d@@%ld", yys->yylrState, YY_CAST (long, yys->yyposn))); } static void yypstates (yyGLRState* yyst) { if (yyst == YY_NULLPTR) YY_FPRINTF ((stderr, "<null>")); else yy_yypstack (yyst); YY_FPRINTF ((stderr, "\n")); } static void yypstack (yyGLRStack* yystackp, YYPTRDIFF_T yyk) { yypstates (yystackp->yytops.yystates[yyk]); } static void yypdumpstack (yyGLRStack* yystackp) { #define YYINDEX(YYX) \ YY_CAST (long, \ ((YYX) \ ? YY_REINTERPRET_CAST (yyGLRStackItem*, (YYX)) - yystackp->yyitems \ : -1)) yyGLRStackItem* yyp; for (yyp = yystackp->yyitems; yyp < yystackp->yynextFree; yyp += 1) { YY_FPRINTF ((stderr, "%3ld. ", YY_CAST (long, yyp - yystackp->yyitems))); if (*YY_REINTERPRET_CAST (yybool *, yyp)) { YY_ASSERT (yyp->yystate.yyisState); YY_ASSERT (yyp->yyoption.yyisState); YY_FPRINTF ((stderr, "Res: %d, LR State: %d, posn: %ld, pred: %ld", yyp->yystate.yyresolved, yyp->yystate.yylrState, YY_CAST (long, yyp->yystate.yyposn), YYINDEX (yyp->yystate.yypred))); if (! yyp->yystate.yyresolved) YY_FPRINTF ((stderr, ", firstVal: %ld", YYINDEX (yyp->yystate.yysemantics.yyfirstVal))); } else { YY_ASSERT (!yyp->yystate.yyisState); YY_ASSERT (!yyp->yyoption.yyisState); YY_FPRINTF ((stderr, "Option. rule: %d, state: %ld, next: %ld", yyp->yyoption.yyrule - 1, YYINDEX (yyp->yyoption.yystate), YYINDEX (yyp->yyoption.yynext))); } YY_FPRINTF ((stderr, "\n")); } YY_FPRINTF ((stderr, "Tops:")); { YYPTRDIFF_T yyi; for (yyi = 0; yyi < yystackp->yytops.yysize; yyi += 1) YY_FPRINTF ((stderr, "%ld: %ld; ", YY_CAST (long, yyi), YYINDEX (yystackp->yytops.yystates[yyi]))); YY_FPRINTF ((stderr, "\n")); } #undef YYINDEX } #endif #undef yylval #undef yychar #undef yynerrs]b4_locations_if([ #undef yylloc]) m4_if(b4_prefix, [yy], [], [[/* Substitute the variable and function names. */ #define yyparse ]b4_prefix[parse #define yylex ]b4_prefix[lex #define yyerror ]b4_prefix[error #define yylval ]b4_prefix[lval #define yychar ]b4_prefix[char #define yydebug ]b4_prefix[debug #define yynerrs ]b4_prefix[nerrs]b4_locations_if([[ #define yylloc ]b4_prefix[lloc]])])[ ]b4_glr_cc_if([b4_glr_cc_pre_epilogue b4_glr_cc_cleanup])[ ]b4_percent_code_get([[epilogue]])[]dnl b4_epilogue[]dnl b4_output_end PK r�!\�~Z�o o skeletons/d-skel.m4nu �[��� -*- Autoconf -*- # D skeleton dispatching for Bison. # Copyright (C) 2018-2020 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/>. b4_glr_if( [b4_complain([%%glr-parser not supported for D])]) b4_nondeterministic_if([b4_complain([%%nondeterministic-parser not supported for D])]) m4_define_default([b4_used_skeleton], [b4_skeletonsdir/[lalr1.d]]) m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"]) m4_include(b4_used_skeleton) PK r�!\� ] skeletons/c-like.m4nu �[��� -*- Autoconf -*- # Common code for C-like languages (C, C++, Java, etc.) # Copyright (C) 2012-2015, 2018-2020 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/>. # _b4_comment(TEXT, OPEN, CONTINUE, END) # -------------------------------------- # Put TEXT in comment. Avoid trailing spaces: don't indent empty lines. # Avoid adding indentation to the first line, as the indentation comes # from OPEN. That's why we don't patsubst([$1], [^\(.\)], [ \1]). # Turn "*/" in TEXT into "* /" so that we don't unexpectedly close # the comments before its end. # # Prefix all the output lines with PREFIX. m4_define([_b4_comment], [$2[]b4_gsub(m4_expand([$1]), [[*]/], [*\\/], [/[*]], [/\\*], [ \(.\)], [ $3\1])$4]) # b4_comment(TEXT, [PREFIX]) # -------------------------- # Put TEXT in comment. Prefix all the output lines with PREFIX. m4_define([b4_comment], [_b4_comment([$1], [$2/* ], [$2 ], [ */])]) # _b4_dollar_dollar(VALUE, SYMBOL-NUM, FIELD, DEFAULT-FIELD) # ---------------------------------------------------------- # If FIELD (or DEFAULT-FIELD) is non-null, return "VALUE.FIELD", # otherwise just VALUE. Be sure to pass "(VALUE)" if VALUE is a # pointer. m4_define([_b4_dollar_dollar], [b4_symbol_value([$1], [$2], m4_if([$3], [[]], [[$4]], [[$3]]))]) # b4_dollar_pushdef(VALUE-POINTER, SYMBOL-NUM, [TYPE_TAG], LOCATION) # b4_dollar_popdef # ------------------------------------------------------------------ # Define b4_dollar_dollar for VALUE-POINTER and DEFAULT-FIELD, # and b4_at_dollar for LOCATION. m4_define([b4_dollar_pushdef], [m4_pushdef([b4_dollar_dollar], [_b4_dollar_dollar([$1], [$2], m4_dquote($][1), [$3])])dnl m4_pushdef([b4_at_dollar], [$4])dnl ]) m4_define([b4_dollar_popdef], [m4_popdef([b4_at_dollar])dnl m4_popdef([b4_dollar_dollar])dnl ]) PK r�!\�E�#� #� skeletons/bison.m4nu �[��� -*- Autoconf -*- # Language-independent M4 Macros for Bison. # Copyright (C) 2002, 2004-2015, 2018-2020 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/>. # m4_gsub(STRING, RE1, SUBST1, RE2, SUBST2, ...) # ---------------------------------------------- # m4 equivalent of # # $_ = STRING; # s/RE1/SUBST1/g; # s/RE2/SUBST2/g; # ... # # Really similar to m4_bpatsubsts, but behaves properly with quotes. # See m4.at's "Generating Comments". Super inelegant, but so far, I # did not find any better solution. m4_define([b4_gsub], [m4_bpatsubst(m4_bpatsubst(m4_bpatsubst([[[[$1]]]], [$2], [$3]), [$4], [$5]), [$6], [$7])]) # m4_shift2 and m4_shift3 are provided by m4sugar. m4_define([m4_shift4], [m4_shift(m4_shift(m4_shift(m4_shift($@))))]) ## ---------------- ## ## Identification. ## ## ---------------- ## # b4_generated_by # --------------- m4_define([b4_generated_by], [b4_comment([A Bison parser, made by GNU Bison b4_version_string.]) ]) # b4_copyright(TITLE, [YEARS]) # ---------------------------- # If YEARS are not defined, use b4_copyright_years. m4_define([b4_copyright], [b4_generated_by b4_comment([$1 ]m4_dquote(m4_text_wrap([Copyright (C) ]m4_ifval([$2], [[$2]], [m4_defn([b4_copyright_years])])[ 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/>.]) b4_comment([As a special exception, you may create a larger work that contains part or all of the Bison parser skeleton and distribute that work under terms of your choice, so long as that work isn't itself a parser generator using the skeleton or a modified version thereof as a parser skeleton. Alternatively, if you modify or redistribute the parser skeleton itself, you may (at your option) remove this 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.]) ]) # b4_disclaimer # ------------- # Issue a warning about private implementation details. m4_define([b4_disclaimer], [b4_comment([DO NOT RELY ON FEATURES THAT ARE NOT DOCUMENTED in the manual, especially those whose name start with YY_ or yy_. They are private implementation details that can be changed or removed.]) ]) # b4_required_version_if(VERSION, IF_NEWER, IF_OLDER) # --------------------------------------------------- # If the version %require'd by the user is VERSION (or newer) expand # IF_NEWER, otherwise IF_OLDER. VERSION should be an integer, e.g., # 302 for 3.2. m4_define([b4_required_version_if], [m4_if(m4_eval($1 <= b4_required_version), [1], [$2], [$3])]) ## -------- ## ## Output. ## ## -------- ## # b4_output_begin(FILE1, FILE2) # ----------------------------- # Enable output, i.e., send to diversion 0, expand after "#", and # generate the tag to output into FILE. Must be followed by EOL. # FILE is FILE1 concatenated to FILE2. FILE2 can be empty, or be # absolute: do the right thing. m4_define([b4_output_begin], [m4_changecom() m4_divert_push(0)dnl @output(m4_unquote([$1])@,m4_unquote([$2])@)@dnl ]) # b4_output_end # ------------- # Output nothing, restore # as comment character (no expansions after #). m4_define([b4_output_end], [m4_divert_pop(0) m4_changecom([#]) ]) # b4_divert_kill(CODE) # -------------------- # Expand CODE for its side effects, discard its output. m4_define([b4_divert_kill], [m4_divert_text([KILL], [$1])]) # b4_define_silent(MACRO, CODE) # ----------------------------- # Same as m4_define, but throw away the expansion of CODE. m4_define([b4_define_silent], [m4_define([$1], [b4_divert_kill([$2])])]) ## ---------------- ## ## Error handling. ## ## ---------------- ## # The following error handling macros print error directives that should not # become arguments of other macro invocations since they would likely then be # mangled. Thus, they print to stdout directly. # b4_cat(TEXT) # ------------ # Write TEXT to stdout. Precede the final newline with an @ so that it's # escaped. For example: # # b4_cat([[@complain(invalid input@)]]) m4_define([b4_cat], [m4_syscmd([cat <<'_m4eof' ]m4_bpatsubst(m4_dquote($1), [_m4eof], [_m4@`eof])[@ _m4eof ])dnl m4_if(m4_sysval, [0], [], [m4_fatal([$0: cannot write to stdout])])]) # b4_error(KIND, START, END, FORMAT, [ARG1], [ARG2], ...) # ------------------------------------------------------- # Write @KIND(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout. # # For example: # # b4_error([[complain]], [[input.y:2.3]], [[input.y:5.4]], # [[invalid %s]], [[foo]]) m4_define([b4_error], [b4_cat([[@complain][(]$1[@,]$2[@,]$3[@,]$4[]]dnl [m4_if([$#], [4], [], [m4_foreach([b4_arg], m4_dquote(m4_shift4($@)), [[@,]b4_arg])])[@)]])]) # b4_warn(FORMAT, [ARG1], [ARG2], ...) # ------------------------------------ # Write @warn(FORMAT@,ARG1@,ARG2@,...@) to stdout. # # For example: # # b4_warn([[invalid value for '%s': %s]], [[foo]], [[3]]) # # As a simple test suite, this: # # m4_divert(-1) # m4_define([asdf], [ASDF]) # m4_define([fsa], [FSA]) # m4_define([fdsa], [FDSA]) # b4_warn_at([[[asdf), asdf]]], [[[fsa), fsa]]], [[[fdsa), fdsa]]]) # b4_warn_at([[asdf), asdf]], [[fsa), fsa]], [[fdsa), fdsa]]) # b4_warn_at() # b4_warn_at(1) # b4_warn_at(1, 2) # # Should produce this without newlines: # # @warn_at([asdf), asdf]@,@,@,[fsa), fsa]@,[fdsa), fdsa]@) # @warn(asdf), asdf@,@,@,fsa), fsa@,fdsa), fdsa@) # @warn(@) # @warn(1@) # @warn(1@,2@) m4_define([b4_warn], [b4_warn_at([], [], $@)]) # b4_warn_at(START, END, FORMAT, [ARG1], [ARG2], ...) # --------------------------------------------------- # Write @warn(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout. # # For example: # # b4_warn_at([[input.y:2.3]], [[input.y:5.4]], [[invalid %s]], [[foo]]) m4_define([b4_warn_at], [b4_error([[warn]], $@)]) # b4_complain(FORMAT, [ARG1], [ARG2], ...) # ---------------------------------------- # Bounce to b4_complain_at. # # See b4_warn example. m4_define([b4_complain], [b4_complain_at([], [], $@)]) # b4_complain_at(START, END, FORMAT, [ARG1], [ARG2], ...) # ------------------------------------------------------- # Write @complain(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout. # # See b4_warn_at example. m4_define([b4_complain_at], [b4_error([[complain]], $@)]) # b4_fatal(FORMAT, [ARG1], [ARG2], ...) # ------------------------------------- # Bounce to b4_fatal_at. # # See b4_warn example. m4_define([b4_fatal], [b4_fatal_at([], [], $@)]) # b4_fatal_at(START, END, FORMAT, [ARG1], [ARG2], ...) # ---------------------------------------------------- # Write @fatal(START@,END@,FORMAT@,ARG1@,ARG2@,...@) to stdout and exit. # # See b4_warn_at example. m4_define([b4_fatal_at], [b4_error([[fatal]], $@)dnl m4_exit(1)]) ## ------------ ## ## Data Types. ## ## ------------ ## # b4_ints_in(INT1, INT2, LOW, HIGH) # --------------------------------- # Return 1 iff both INT1 and INT2 are in [LOW, HIGH], 0 otherwise. m4_define([b4_ints_in], [m4_eval([$3 <= $1 && $1 <= $4 && $3 <= $2 && $2 <= $4])]) # b4_subtract(LHS, RHS) # --------------------- # Evaluate LHS - RHS if they are integer literals, otherwise expand # to (LHS) - (RHS). m4_define([b4_subtract], [m4_bmatch([$1$2], [^[0123456789]*$], [m4_eval([$1 - $2])], [($1) - ($2)])]) # b4_join(ARG1, ...) # _b4_join(ARG1, ...) # ------------------- # Join with comma, skipping empty arguments. # b4_join calls itself recursively until it sees the first non-empty # argument, then calls _b4_join (i.e., `_$0`) which prepends each # non-empty argument with a comma. m4_define([b4_join], [m4_if([$#$1], [1], [], [m4_ifval([$1], [$1[]_$0(m4_shift($@))], [$0(m4_shift($@))])])]) # _b4_join(ARGS1, ...) # -------------------- m4_define([_b4_join], [m4_if([$#$1], [1], [], [m4_ifval([$1], [, $1])[]$0(m4_shift($@))])]) # b4_integral_parser_tables_map(MACRO) # ------------------------------------- # Map MACRO on all the integral tables. MACRO is expected to have # the signature MACRO(TABLE-NAME, CONTENT, COMMENT). m4_define([b4_integral_parser_tables_map], [$1([pact], [b4_pact], [[YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM.]]) $1([defact], [b4_defact], [[YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM. Performed when YYTABLE does not specify something else to do. Zero means the default is an error.]]) $1([pgoto], [b4_pgoto], [[YYPGOTO[NTERM-NUM].]]) $1([defgoto], [b4_defgoto], [[YYDEFGOTO[NTERM-NUM].]]) $1([table], [b4_table], [[YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If positive, shift that token. If negative, reduce the rule whose number is the opposite. If YYTABLE_NINF, syntax error.]]) $1([check], [b4_check]) $1([stos], [b4_stos], [[YYSTOS[STATE-NUM] -- The (internal number of the) accessing symbol of state STATE-NUM.]]) $1([r1], [b4_r1], [[YYR1[YYN] -- Symbol number of symbol that rule YYN derives.]]) $1([r2], [b4_r2], [[YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.]]) ]) # b4_parser_tables_declare # b4_parser_tables_define # ------------------------ # Define/declare the (deterministic) parser tables. m4_define([b4_parser_tables_declare], [b4_integral_parser_tables_map([b4_integral_parser_table_declare])]) m4_define([b4_parser_tables_define], [b4_integral_parser_tables_map([b4_integral_parser_table_define])]) ## ------------------ ## ## Decoding options. ## ## ------------------ ## # b4_flag_if(FLAG, IF-TRUE, IF-FALSE) # ----------------------------------- # Run IF-TRUE if b4_FLAG_flag is 1, IF-FALSE if FLAG is 0, otherwise fail. m4_define([b4_flag_if], [m4_case(b4_$1_flag, [0], [$3], [1], [$2], [m4_fatal([invalid $1 value: ]b4_$1_flag)])]) # b4_define_flag_if(FLAG) # ----------------------- # Define "b4_FLAG_if(IF-TRUE, IF-FALSE)" that depends on the # value of the Boolean FLAG. m4_define([b4_define_flag_if], [_b4_define_flag_if($[1], $[2], [$1])]) # _b4_define_flag_if($1, $2, FLAG) # -------------------------------- # Work around the impossibility to define macros inside macros, # because issuing '[$1]' is not possible in M4. GNU M4 should provide # $$1 a la M5/TeX. m4_define([_b4_define_flag_if], [m4_if([$1$2], $[1]$[2], [], [m4_fatal([$0: Invalid arguments: $@])])dnl m4_define([b4_$3_if], [b4_flag_if([$3], [$1], [$2])])]) # b4_FLAG_if(IF-TRUE, IF-FALSE) # ----------------------------- # Expand IF-TRUE, if FLAG is true, IF-FALSE otherwise. b4_define_flag_if([defines]) # Whether headers are requested. b4_define_flag_if([glr]) # Whether a GLR parser is requested. b4_define_flag_if([has_translations]) # Whether some tokens are internationalized. b4_define_flag_if([nondeterministic]) # Whether conflicts should be handled. b4_define_flag_if([token_table]) # Whether yytoken_table is demanded. b4_define_flag_if([yacc]) # Whether POSIX Yacc is emulated. # b4_glr_cc_if([IF-TRUE], [IF-FALSE]) # ----------------------------------- m4_define([b4_glr_cc_if], [m4_if(b4_skeleton, ["glr.cc"], $@)]) ## --------- ## ## Symbols. ## ## --------- ## # For a description of the Symbol handling, see README.md. # # The following macros provide access to symbol related values. # __b4_symbol(NUM, FIELD) # ----------------------- # Fetch FIELD of symbol #NUM. Fail if undefined. m4_define([__b4_symbol], [m4_indir([b4_symbol($1, $2)])]) # _b4_symbol(NUM, FIELD) # ---------------------- # Fetch FIELD of symbol #NUM (or "orig NUM", see README.md). # Fail if undefined. m4_define([_b4_symbol], [m4_ifdef([b4_symbol($1, number)], [__b4_symbol(m4_indir([b4_symbol($1, number)]), $2)], [__b4_symbol([$1], [$2])])]) # b4_symbol_token_kind(NUM) # ------------------------- # The token kind of this symbol. m4_define([b4_symbol_token_kind], [b4_percent_define_get([api.token.prefix])dnl _b4_symbol([$1], [id])]) # b4_symbol_kind_base(NUM) # ------------------------ # Build the name of the kind of this symbol. It must always exist, # otherwise some symbols might not be represented in the enum, which # might be compiled into too small a type to contain all the symbol # numbers. m4_define([b4_symbol_prefix], [b4_percent_define_get([api.symbol.prefix])]) m4_define([b4_symbol_kind_base], [b4_percent_define_get([api.symbol.prefix])dnl m4_case([$1], [-2], [[YYEMPTY]], [0], [[YYEOF]], [1], [[YYerror]], [2], [[YYUNDEF]], [m4_case(b4_symbol([$1], [tag]), [$accept], [[YYACCEPT]], [b4_symbol_if([$1], [has_id], _b4_symbol([$1], [id]), [m4_bpatsubst([$1-][]_b4_symbol([$1], [tag]), [[^a-zA-Z_0-9]+], [_])])])])]) # b4_symbol_kind(NUM) # ------------------- # Same as b4_symbol_kind, but possibly with a prefix in some # languages. E.g., EOF's kind_base and kind are YYSYMBOL_YYEOF in C, # but are S_YYEMPTY and symbol_kind::S_YYEMPTY in C++. m4_copy([b4_symbol_kind_base], [b4_symbol_kind]) # b4_symbol(NUM, FIELD) # --------------------- # Fetch FIELD of symbol #NUM (or "orig NUM"). Fail if undefined. # # If FIELD = id, prepend the token prefix. m4_define([b4_symbol], [m4_case([$2], [id], [b4_symbol_token_kind([$1])], [kind_base], [b4_symbol_kind_base([$1])], [kind], [b4_symbol_kind([$1])], [_b4_symbol($@)])]) # b4_symbol_if(NUM, FIELD, IF-TRUE, IF-FALSE) # ------------------------------------------- # If FIELD about symbol #NUM is 1 expand IF-TRUE, if is 0, expand IF-FALSE. # Otherwise an error. m4_define([b4_symbol_if], [m4_case(b4_symbol([$1], [$2]), [1], [$3], [0], [$4], [m4_fatal([$0: field $2 of $1 is not a Boolean:] b4_symbol([$1], [$2]))])]) # b4_symbol_tag_comment(SYMBOL-NUM) # --------------------------------- # Issue a comment giving the tag of symbol NUM. m4_define([b4_symbol_tag_comment], [b4_comment([b4_symbol([$1], [tag])]) ]) # b4_symbol_action(SYMBOL-NUM, ACTION) # ------------------------------------ # Run the action ACTION ("destructor" or "printer") for SYMBOL-NUM. m4_define([b4_symbol_action], [b4_symbol_if([$1], [has_$2], [b4_dollar_pushdef([(*yyvaluep)], [$1], [], [(*yylocationp)])dnl _b4_symbol_case([$1])[]dnl b4_syncline([b4_symbol([$1], [$2_line])], [b4_symbol([$1], [$2_file])])dnl b4_symbol([$1], [$2]) b4_syncline([@oline@], [@ofile@])dnl break; b4_dollar_popdef[]dnl ])]) # b4_symbol_destructor(SYMBOL-NUM) # b4_symbol_printer(SYMBOL-NUM) # -------------------------------- m4_define([b4_symbol_destructor], [b4_symbol_action([$1], [destructor])]) m4_define([b4_symbol_printer], [b4_symbol_action([$1], [printer])]) # b4_symbol_actions(ACTION, [KIND = yykind]) # ------------------------------------------ # Emit the symbol actions for ACTION ("destructor" or "printer"). # Dispatch on KIND. m4_define([b4_symbol_actions], [m4_pushdef([b4_actions_], m4_expand([b4_symbol_foreach([b4_symbol_$1])]))dnl m4_ifval(m4_defn([b4_actions_]), [switch (m4_default([$2], [yykind])) { m4_defn([b4_actions_])[]dnl default: break; }dnl ], [YYUSE (m4_default([$2], [yykind]));])dnl m4_popdef([b4_actions_])dnl ]) # _b4_symbol_case(SYMBOL-NUM) # --------------------------- # Issue a "case NUM" for SYMBOL-NUM. Ends with its EOL to make it # easier to use with m4_map, but then, use []dnl to suppress the last # one. m4_define([_b4_symbol_case], [case b4_symbol([$1], [kind]): b4_symbol_tag_comment([$1])]) ]) # b4_symbol_foreach(MACRO) # ------------------------ # Invoke MACRO(SYMBOL-NUM) for each SYMBOL-NUM. m4_define([b4_symbol_foreach], [m4_map([$1], m4_defn([b4_symbol_numbers]))]) # b4_symbol_map(MACRO) # -------------------- # Return a list (possibly empty elements) of MACRO invoked for each # SYMBOL-NUM. m4_define([b4_symbol_map], [m4_map_args_sep([$1(], [)], [,], b4_symbol_numbers)]) # b4_token_visible_if(NUM, IF-TRUE, IF-FALSE) # ------------------------------------------- # Whether NUM denotes a token kind that has an exported definition # (i.e., shows in enum yytokentype). m4_define([b4_token_visible_if], [b4_symbol_if([$1], [is_token], [b4_symbol_if([$1], [has_id], [$2], [$3])], [$3])]) # b4_token_has_definition(NUM) # ---------------------------- # 1 if NUM is visible, nothing otherwise. m4_define([b4_token_has_definition], [b4_token_visible_if([$1], [1])]) # b4_any_token_visible_if([IF-TRUE], [IF-FALSE]) # ---------------------------------------------- # Whether there is a token that needs to be defined. m4_define([b4_any_token_visible_if], [m4_ifval(b4_symbol_foreach([b4_token_has_definition]), [$1], [$2])]) # b4_token_format(FORMAT, NUM) # ---------------------------- # If token NUM has a visible ID, format FORMAT with ID, USER_NUMBER. m4_define([b4_token_format], [b4_token_visible_if([$2], [m4_format([[$1]], b4_symbol([$2], [id]), b4_symbol([$2], b4_api_token_raw_if([[number]], [[code]])))])]) # b4_last_enum_token # ------------------ # The code of the last token visible token. m4_define([_b4_last_enum_token], [b4_token_visible_if([$1], [m4_define([b4_last_enum_token], [$1])])]) b4_symbol_foreach([_b4_last_enum_token]) # b4_last_symbol # -------------- # The code of the last symbol. m4_define([b4_last_symbol], m4_eval(b4_tokens_number + b4_nterms_number - 1)) ## ------- ## ## Types. ## ## ------- ## # _b4_type_action(NUMS) # --------------------- # Run actions for the symbol NUMS that all have the same type-name. # Skip NUMS that have no type-name. # # To specify the action to run, define b4_dollar_dollar(SYMBOL-NUM, # TAG, TYPE). m4_define([_b4_type_action], [b4_symbol_if([$1], [has_type], [m4_map([ _b4_symbol_case], [$@])[]dnl b4_dollar_dollar([b4_symbol([$1], [number])], [b4_symbol([$1], [tag])], [b4_symbol([$1], [type])]); break; ])]) # b4_type_foreach(MACRO, [SEP]) # ----------------------------- # Invoke MACRO(SYMBOL-NUMS) for each set of SYMBOL-NUMS for each type set. m4_define([b4_type_foreach], [m4_map_sep([$1], [$2], m4_defn([b4_type_names]))]) ## ----------- ## ## Synclines. ## ## ----------- ## # b4_basename(NAME) # ----------------- # Similar to POSIX basename; the differences don't matter here. # Beware that NAME is not evaluated. m4_define([b4_basename], [m4_bpatsubst([$1], [^.*/\([^/]+\)/*$], [\1])]) # b4_syncline(LINE, FILE)dnl # -------------------------- # Should always be following by a dnl. # # Emit "#line LINE FILE /* __LINE__ __FILE__ */". m4_define([b4_syncline], [b4_flag_if([synclines], [b4_sync_start([$1], [$2])[]dnl b4_sync_end([__line__], [b4_basename(m4_quote(__file__))]) ])]) # b4_sync_start(LINE, FILE) # ----------------------- # Syncline for the new place. Typically a directive for the compiler. m4_define([b4_sync_start], [b4_comment([$2:$1])]) # b4_sync_end(LINE, FILE) # ----------------------- # Syncline for the current place, which ends. Typically a comment # left for the reader. m4_define([b4_sync_end], [ b4_comment([$2:$1])] ) # This generates dependencies on the Bison skeletons hence lots of # useless 'git diff'. This location is useless for the regular # user (who does not care about the skeletons) and is actually not # useful for Bison developers too (I, Akim, never used this to locate # the code in skeletons that generated output). So disable it # completely. If someone thinks this was actually useful, a %define # variable should be provided to control the level of verbosity of # '#line', in replacement of --no-lines. m4_define([b4_sync_end]) # b4_user_code(USER-CODE) # ----------------------- # Emit code from the user, ending it with synclines. m4_define([b4_user_code], [$1 b4_syncline([@oline@], [@ofile@])]) # b4_define_user_code(MACRO, COMMENT) # ----------------------------------- # From b4_MACRO, if defined, build b4_user_MACRO that includes the synclines. m4_define([b4_define_user_code], [m4_define([b4_user_$1], [m4_ifdef([b4_$1], [m4_ifval([$2], [b4_comment([$2]) ])b4_user_code([b4_$1])])])]) # b4_user_actions # b4_user_initial_action # b4_user_post_prologue # b4_user_pre_prologue # b4_user_union_members # ---------------------- # Macros that issue user code, ending with synclines. b4_define_user_code([actions]) b4_define_user_code([initial_action], [User initialization code.]) b4_define_user_code([post_prologue], [Second part of user prologue.]) b4_define_user_code([pre_prologue], [First part of user prologue.]) b4_define_user_code([union_members]) # b4_check_user_names(WHAT, USER-LIST, BISON-NAMESPACE) # ----------------------------------------------------- # Complain if any name of type WHAT is used by the user (as recorded in # USER-LIST) but is not used by Bison (as recorded by macros in the # namespace BISON-NAMESPACE). # # USER-LIST must expand to a list specifying all user occurrences of all names # of type WHAT. Each item in the list must be a triplet specifying one # occurrence: name, start boundary, and end boundary. Empty string names are # fine. An empty list is fine. # # For example, to define b4_foo_user_names to be used for USER-LIST with three # name occurrences and with correct quoting: # # m4_define([b4_foo_user_names], # [[[[[[bar]], [[parser.y:1.7]], [[parser.y:1.16]]]], # [[[[bar]], [[parser.y:5.7]], [[parser.y:5.16]]]], # [[[[baz]], [[parser.y:8.7]], [[parser.y:8.16]]]]]]) # # The macro BISON-NAMESPACE(bar) must be defined iff the name bar of type WHAT # is used by Bison (in the front-end or in the skeleton). Empty string names # are fine, but it would be ugly for Bison to actually use one. # # For example, to use b4_foo_bison_names for BISON-NAMESPACE and define that # the names bar and baz are used by Bison: # # m4_define([b4_foo_bison_names(bar)]) # m4_define([b4_foo_bison_names(baz)]) # # To invoke b4_check_user_names with TYPE foo, with USER-LIST # b4_foo_user_names, with BISON-NAMESPACE b4_foo_bison_names, and with correct # quoting: # # b4_check_user_names([[foo]], [b4_foo_user_names], # [[b4_foo_bison_names]]) m4_define([b4_check_user_names], [m4_foreach([b4_occurrence], $2, [m4_pushdef([b4_occurrence], b4_occurrence)dnl m4_pushdef([b4_user_name], m4_car(b4_occurrence))dnl m4_pushdef([b4_start], m4_car(m4_shift(b4_occurrence)))dnl m4_pushdef([b4_end], m4_shift2(b4_occurrence))dnl m4_ifndef($3[(]m4_quote(b4_user_name)[)], [b4_complain_at([b4_start], [b4_end], [[%s '%s' is not used]], [$1], [b4_user_name])])[]dnl m4_popdef([b4_occurrence])dnl m4_popdef([b4_user_name])dnl m4_popdef([b4_start])dnl m4_popdef([b4_end])dnl ])]) ## --------------------- ## ## b4_percent_define_*. ## ## --------------------- ## # b4_percent_define_use(VARIABLE) # ------------------------------- # Declare that VARIABLE was used. m4_define([b4_percent_define_use], [m4_define([b4_percent_define_bison_variables(]$1[)])dnl ]) # b4_percent_define_get(VARIABLE, [DEFAULT]) # ------------------------------------------ # Mimic muscle_percent_define_get in ../src/muscle-tab.h. That is, if # the %define variable VARIABLE is defined, emit its value. Contrary # to its C counterpart, return DEFAULT otherwise. Also, record # Bison's usage of VARIABLE by defining # b4_percent_define_bison_variables(VARIABLE). # # For example: # # b4_percent_define_get([[foo]]) m4_define([b4_percent_define_get], [b4_percent_define_use([$1])dnl _b4_percent_define_ifdef([$1], [m4_indir([b4_percent_define(]$1[)])], [$2])]) # b4_percent_define_get_loc(VARIABLE) # ----------------------------------- # Mimic muscle_percent_define_get_loc in ../src/muscle-tab.h exactly. That is, # if the %define variable VARIABLE is undefined, complain fatally since that's # a Bison or skeleton error. Otherwise, return its definition location in a # form appropriate for the first two arguments of b4_warn_at, b4_complain_at, or # b4_fatal_at. Don't record this as a Bison usage of VARIABLE as there's no # reason to suspect that the user-supplied value has yet influenced the output. # # For example: # # b4_complain_at(b4_percent_define_get_loc([[foo]]), [[invalid foo]]) m4_define([b4_percent_define_get_loc], [m4_ifdef([b4_percent_define_loc(]$1[)], [m4_pushdef([b4_loc], m4_indir([b4_percent_define_loc(]$1[)]))dnl b4_loc[]dnl m4_popdef([b4_loc])], [b4_fatal([[$0: undefined %%define variable '%s']], [$1])])]) # b4_percent_define_get_kind(VARIABLE) # ------------------------------------ # Get the kind (code, keyword, string) of VARIABLE, i.e., how its # value was defined (braces, not delimiters, quotes). # # If the %define variable VARIABLE is undefined, complain fatally # since that's a Bison or skeleton error. Don't record this as a # Bison usage of VARIABLE as there's no reason to suspect that the # user-supplied value has yet influenced the output. m4_define([b4_percent_define_get_kind], [m4_ifdef([b4_percent_define_kind(]$1[)], [m4_indir([b4_percent_define_kind(]$1[)])], [b4_fatal([[$0: undefined %%define variable '%s']], [$1])])]) # b4_percent_define_get_syncline(VARIABLE)dnl # ------------------------------------------- # Should always be following by a dnl. # # Mimic muscle_percent_define_get_syncline in ../src/muscle-tab.h exactly. # That is, if the %define variable VARIABLE is undefined, complain fatally # since that's a Bison or skeleton error. Otherwise, return its definition # location as a b4_syncline invocation. Don't record this as a Bison usage of # VARIABLE as there's no reason to suspect that the user-supplied value has yet # influenced the output. # # For example: # # b4_percent_define_get_syncline([[foo]]) m4_define([b4_percent_define_get_syncline], [m4_ifdef([b4_percent_define_syncline(]$1[)], [m4_indir([b4_percent_define_syncline(]$1[)])], [b4_fatal([[$0: undefined %%define variable '%s']], [$1])])]) # _b4_percent_define_ifdef(VARIABLE, IF-TRUE, [IF-FALSE]) # ------------------------------------------------------ # If the %define variable VARIABLE is defined, expand IF-TRUE, else expand # IF-FALSE. Don't record usage of VARIABLE. # # For example: # # _b4_percent_define_ifdef([[foo]], [[it's defined]], [[it's undefined]]) m4_define([_b4_percent_define_ifdef], [m4_ifdef([b4_percent_define(]$1[)], [$2], [$3])]) # b4_percent_define_ifdef(VARIABLE, IF-TRUE, [IF-FALSE]) # ------------------------------------------------------ # Mimic muscle_percent_define_ifdef in ../src/muscle-tab.h exactly. That is, # if the %define variable VARIABLE is defined, expand IF-TRUE, else expand # IF-FALSE. Also, record Bison's usage of VARIABLE by defining # b4_percent_define_bison_variables(VARIABLE). # # For example: # # b4_percent_define_ifdef([[foo]], [[it's defined]], [[it's undefined]]) m4_define([b4_percent_define_ifdef], [_b4_percent_define_ifdef([$1], [b4_percent_define_use([$1])$2], [$3])]) # b4_percent_define_check_file_complain(VARIABLE) # ----------------------------------------------- # Warn about %define variable VARIABLE having an incorrect # value. m4_define([b4_percent_define_check_file_complain], [b4_complain_at(b4_percent_define_get_loc([$1]), [[%%define variable '%s' requires 'none' or '"..."' values]], [$1])]) # b4_percent_define_check_file(MACRO, VARIABLE, DEFAULT) # ------------------------------------------------------ # If the %define variable VARIABLE: # - is undefined, then if DEFAULT is non-empty, define MACRO to DEFAULT # - is a string, define MACRO to its value # - is the keyword 'none', do nothing # - otherwise, warn about the incorrect value. m4_define([b4_percent_define_check_file], [b4_percent_define_ifdef([$2], [m4_case(b4_percent_define_get_kind([$2]), [string], [m4_define([$1], b4_percent_define_get([$2]))], [keyword], [m4_if(b4_percent_define_get([$2]), [none], [], [b4_percent_define_check_file_complain([$2])])], [b4_percent_define_check_file_complain([$2])]) ], [m4_ifval([$3], [m4_define([$1], [$3])])]) ]) ## --------- ## ## Options. ## ## --------- ## # b4_percent_define_flag_if(VARIABLE, IF-TRUE, [IF-FALSE]) # -------------------------------------------------------- # Mimic muscle_percent_define_flag_if in ../src/muscle-tab.h exactly. That is, # if the %define variable VARIABLE is defined to "" or "true", expand IF-TRUE. # If it is defined to "false", expand IF-FALSE. Complain if it is undefined # (a Bison or skeleton error since the default value should have been set # already) or defined to any other value (possibly a user error). Also, record # Bison's usage of VARIABLE by defining # b4_percent_define_bison_variables(VARIABLE). # # For example: # # b4_percent_define_flag_if([[foo]], [[it's true]], [[it's false]]) m4_define([b4_percent_define_flag_if], [b4_percent_define_ifdef([$1], [m4_case(b4_percent_define_get([$1]), [], [$2], [true], [$2], [false], [$3], [m4_expand_once([b4_complain_at(b4_percent_define_get_loc([$1]), [[invalid value for %%define Boolean variable '%s']], [$1])], [[b4_percent_define_flag_if($1)]])])], [b4_fatal([[$0: undefined %%define variable '%s']], [$1])])]) # b4_percent_define_default(VARIABLE, DEFAULT, [KIND = keyword]) # -------------------------------------------------------------- # Mimic muscle_percent_define_default in ../src/muscle-tab.h exactly. That is, # if the %define variable VARIABLE is undefined, set its value to DEFAULT. # Don't record this as a Bison usage of VARIABLE as there's no reason to # suspect that the value has yet influenced the output. # # For example: # # b4_percent_define_default([[foo]], [[default value]]) m4_define([b4_percent_define_default], [_b4_percent_define_ifdef([$1], [], [m4_define([b4_percent_define(]$1[)], [$2])dnl m4_define([b4_percent_define_kind(]$1[)], [m4_default([$3], [keyword])])dnl m4_define([b4_percent_define_loc(]$1[)], [[[[<skeleton default value>:-1.-1]], [[<skeleton default value>:-1.-1]]]])dnl m4_define([b4_percent_define_syncline(]$1[)], [[]])])]) # b4_percent_define_if_define(NAME, [VARIABLE = NAME]) # ---------------------------------------------------- # Define b4_NAME_if that executes its $1 or $2 depending whether # VARIABLE was %defined. The characters '.' and `-' in VARIABLE are mapped # to '_'. m4_define([_b4_percent_define_if_define], [m4_define(m4_bpatsubst([b4_$1_if], [[-.]], [_]), [b4_percent_define_flag_if(m4_default([$2], [$1]), [$3], [$4])])]) m4_define([b4_percent_define_if_define], [b4_percent_define_default([m4_default([$2], [$1])], [[false]]) _b4_percent_define_if_define([$1], [$2], $[1], $[2])]) # b4_percent_define_check_kind(VARIABLE, KIND, [DIAGNOSTIC = complain]) # --------------------------------------------------------------------- m4_define([b4_percent_define_check_kind], [_b4_percent_define_ifdef([$1], [m4_if(b4_percent_define_get_kind([$1]), [$2], [], [b4_error([m4_default([$3], [complain])], b4_percent_define_get_loc([$1]), [m4_case([$2], [code], [[%%define variable '%s' requires '{...}' values]], [keyword], [[%%define variable '%s' requires keyword values]], [string], [[%%define variable '%s' requires '"..."' values]])], [$1])])])dnl ]) # b4_percent_define_check_values(VALUES) # -------------------------------------- # Mimic muscle_percent_define_check_values in ../src/muscle-tab.h exactly # except that the VALUES structure is more appropriate for M4. That is, VALUES # is a list of sublists of strings. For each sublist, the first string is the # name of a %define variable, and all remaining strings in that sublist are the # valid values for that variable. Complain if such a variable is undefined (a # Bison error since the default value should have been set already) or defined # to any other value (possibly a user error). Don't record this as a Bison # usage of the variable as there's no reason to suspect that the value has yet # influenced the output. # # For example: # # b4_percent_define_check_values([[[[foo]], [[foo-value1]], [[foo-value2]]]], # [[[[bar]], [[bar-value1]]]]) m4_define([b4_percent_define_check_values], [m4_foreach([b4_sublist], m4_quote($@), [_b4_percent_define_check_values(b4_sublist)])]) m4_define([_b4_percent_define_check_values], [_b4_percent_define_ifdef([$1], [b4_percent_define_check_kind(]$1[, [keyword], [deprecated])dnl m4_pushdef([b4_good_value], [0])dnl m4_if($#, 1, [], [m4_foreach([b4_value], m4_dquote(m4_shift($@)), [m4_if(m4_indir([b4_percent_define(]$1[)]), b4_value, [m4_define([b4_good_value], [1])])])])dnl m4_if(b4_good_value, [0], [b4_complain_at(b4_percent_define_get_loc([$1]), [[invalid value for %%define variable '%s': '%s']], [$1], m4_dquote(m4_indir([b4_percent_define(]$1[)]))) m4_foreach([b4_value], m4_dquote(m4_shift($@)), [b4_error([[note]], b4_percent_define_get_loc([$1]), [] [[accepted value: '%s']], m4_dquote(b4_value))])])dnl m4_popdef([b4_good_value])], [b4_fatal([[$0: undefined %%define variable '%s']], [$1])])]) # b4_percent_code_get([QUALIFIER]) # -------------------------------- # If any %code blocks for QUALIFIER are defined, emit them beginning with a # comment and ending with synclines and a newline. If QUALIFIER is not # specified or empty, do this for the unqualified %code blocks. Also, record # Bison's usage of QUALIFIER (if specified) by defining # b4_percent_code_bison_qualifiers(QUALIFIER). # # For example, to emit any unqualified %code blocks followed by any %code # blocks for the qualifier foo: # # b4_percent_code_get # b4_percent_code_get([[foo]]) m4_define([b4_percent_code_get], [m4_pushdef([b4_macro_name], [[b4_percent_code(]$1[)]])dnl m4_ifval([$1], [m4_define([b4_percent_code_bison_qualifiers(]$1[)])])dnl m4_ifdef(b4_macro_name, [b4_comment(m4_if([$#], [0], [[[Unqualified %code blocks.]]], [[["%code ]$1[" blocks.]]])) b4_user_code([m4_indir(b4_macro_name)])])dnl m4_popdef([b4_macro_name])]) # b4_percent_code_ifdef(QUALIFIER, IF-TRUE, [IF-FALSE]) # ----------------------------------------------------- # If any %code blocks for QUALIFIER (or unqualified %code blocks if # QUALIFIER is empty) are defined, expand IF-TRUE, else expand IF-FALSE. # Also, record Bison's usage of QUALIFIER (if specified) by defining # b4_percent_code_bison_qualifiers(QUALIFIER). m4_define([b4_percent_code_ifdef], [m4_ifdef([b4_percent_code(]$1[)], [m4_ifval([$1], [m4_define([b4_percent_code_bison_qualifiers(]$1[)])])$2], [$3])]) ## ------------------ ## ## Common variables. ## ## ------------------ ## # b4_parse_assert_if([IF-ASSERTIONS-ARE-USED], [IF-NOT]) # b4_parse_trace_if([IF-DEBUG-TRACES-ARE-ENABLED], [IF-NOT]) # b4_token_ctor_if([IF-YYLEX-RETURNS-A-TOKEN], [IF-NOT]) # ---------------------------------------------------------- b4_percent_define_if_define([api.token.raw]) b4_percent_define_if_define([token_ctor], [api.token.constructor]) b4_percent_define_if_define([locations]) # Whether locations are tracked. b4_percent_define_if_define([parse.assert]) b4_percent_define_if_define([parse.trace]) # b4_bison_locations_if([IF-TRUE]) # -------------------------------- # Expand IF-TRUE if using locations, and using the default location # type. m4_define([b4_bison_locations_if], [b4_locations_if([b4_percent_define_ifdef([[api.location.type]], [], [$1])])]) # %define parse.error "(custom|detailed|simple|verbose)" # ------------------------------------------------------ b4_percent_define_default([[parse.error]], [[simple]]) b4_percent_define_check_values([[[[parse.error]], [[custom]], [[detailed]], [[simple]], [[verbose]]]]) # b4_parse_error_case(CASE1, THEN1, CASE2, THEN2, ..., ELSE) # ---------------------------------------------------------- m4_define([b4_parse_error_case], [m4_case(b4_percent_define_get([[parse.error]]), $@)]) # b4_parse_error_bmatch(PATTERN1, THEN1, PATTERN2, THEN2, ..., ELSE) # ------------------------------------------------------------------ m4_define([b4_parse_error_bmatch], [m4_bmatch(b4_percent_define_get([[parse.error]]), $@)]) # b4_variant_if([IF-VARIANT-ARE-USED], [IF-NOT]) # ---------------------------------------------- b4_percent_define_if_define([variant]) m4_define([b4_variant_flag], [[0]]) b4_percent_define_ifdef([[api.value.type]], [m4_case(b4_percent_define_get_kind([[api.value.type]]), [keyword], [m4_case(b4_percent_define_get([[api.value.type]]), [variant], [m4_define([b4_variant_flag], [[1]])])])]) b4_define_flag_if([variant]) ## ----------------------------------------------------------- ## ## After processing the skeletons, check that all the user's ## ## %define variables and %code qualifiers were used by Bison. ## ## ----------------------------------------------------------- ## m4_define([b4_check_user_names_wrap], [m4_ifdef([b4_percent_]$1[_user_]$2[s], [b4_check_user_names([[%]$1 $2], [b4_percent_]$1[_user_]$2[s], [[b4_percent_]$1[_bison_]$2[s]])])]) m4_wrap_lifo([ b4_check_user_names_wrap([[define]], [[variable]]) b4_check_user_names_wrap([[code]], [[qualifier]]) ]) ## ---------------- ## ## Default values. ## ## ---------------- ## # m4_define_default([b4_lex_param], []) dnl breaks other skeletons m4_define_default([b4_epilogue], []) m4_define_default([b4_parse_param], []) # The initial column and line. m4_define_default([b4_location_initial_column], [1]) m4_define_default([b4_location_initial_line], [1]) ## --------------- ## ## Sanity checks. ## ## --------------- ## # api.location.type={...} (C, C++ and Java). b4_percent_define_check_kind([api.location.type], [code], [deprecated]) # api.position.type={...} (Java). b4_percent_define_check_kind([api.position.type], [code], [deprecated]) # api.prefix >< %name-prefix. b4_percent_define_check_kind([api.prefix], [code], [deprecated]) b4_percent_define_ifdef([api.prefix], [m4_ifdef([b4_prefix], [b4_complain_at(b4_percent_define_get_loc([api.prefix]), [['%s' and '%s' cannot be used together]], [%name-prefix], [%define api.prefix])])]) # api.token.prefix={...} # Make it a warning for those who used betas of Bison 3.0. b4_percent_define_check_kind([api.token.prefix], [code], [deprecated]) # api.value.type >< %union. b4_percent_define_ifdef([api.value.type], [m4_ifdef([b4_union_members], [b4_complain_at(b4_percent_define_get_loc([api.value.type]), [['%s' and '%s' cannot be used together]], [%union], [%define api.value.type])])]) # api.value.type=union >< %yacc. b4_percent_define_ifdef([api.value.type], [m4_if(b4_percent_define_get([api.value.type]), [union], [b4_yacc_if(dnl [b4_complain_at(b4_percent_define_get_loc([api.value.type]), [['%s' and '%s' cannot be used together]], [%yacc], [%define api.value.type "union"])])])]) # api.value.union.name. b4_percent_define_check_kind([api.value.union.name], [keyword]) # parse.error (custom|detailed) >< token-table. b4_token_table_if( [b4_parse_error_bmatch([custom\|detailed], [b4_complain_at(b4_percent_define_get_loc([parse.error]), [['%s' and '%s' cannot be used together]], [%token-table], [%define parse.error (custom|detailed)])])]) PK r�!\5M� � skeletons/java-skel.m4nu �[��� -*- Autoconf -*- # Java skeleton dispatching for Bison. # Copyright (C) 2007, 2009-2015, 2018-2020 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/>. b4_glr_if( [b4_complain([%%glr-parser not supported for Java])]) b4_nondeterministic_if([b4_complain([%%nondeterministic-parser not supported for Java])]) m4_define_default([b4_used_skeleton], [b4_skeletonsdir/[lalr1.java]]) m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"]) m4_include(b4_used_skeleton) PK r�!\5��^w ^w skeletons/lalr1.dnu �[��� # D skeleton for Bison -*- autoconf -*- # Copyright (C) 2007-2012, 2019-2020 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/>. m4_include(b4_skeletonsdir/[d.m4]) b4_output_begin([b4_parser_file_name]) b4_copyright([Skeleton implementation for Bison LALR(1) parsers in D], [2007-2012, 2019-2020])[ ]b4_disclaimer[ ]b4_percent_define_ifdef([package], [module b4_percent_define_get([package]); ])[ version(D_Version2) { } else { static assert(false, "need compiler for D Version 2"); } ]b4_user_pre_prologue[ ]b4_user_post_prologue[ ]b4_percent_code_get([[imports]])[ import std.format; /** * A Bison parser, automatically generated from <tt>]m4_bpatsubst(b4_file_name, [^"\(.*\)"$], [\1])[</tt>. * * @@author LALR (1) parser skeleton written by Paolo Bonzini. * Port to D language was done by Oliver Mangold. */ /** * Communication interface between the scanner and the Bison-generated * parser <tt>]b4_parser_class[</tt>. */ public interface Lexer {]b4_locations_if([[ /** * Method to retrieve the beginning position of the last scanned token. * @@return the position at which the last scanned token starts. */ @@property ]b4_position_type[ startPos (); /** * Method to retrieve the ending position of the last scanned token. * @@return the first position beyond the last scanned token. */ @@property ]b4_position_type[ endPos (); ]])[ /** * Method to retrieve the semantic value of the last scanned token. * @@return the semantic value of the last scanned token. */ @@property ]b4_yystype[ semanticVal (); /** * Entry point for the scanner. Returns the token identifier corresponding * to the next token and prepares to return the semantic value * ]b4_locations_if([and beginning/ending positions ])[of the token. * @@return the token identifier corresponding to the next token. */ int yylex (); /** * Entry point for error reporting. Emits an error * ]b4_locations_if([referring to the given location ])[in a user-defined way. *]b4_locations_if([[ * @@param loc The location of the element to which the * error message is related]])[ * @@param s The string for the error message. */ void yyerror (]b4_locations_if([b4_location_type[ loc, ]])[string s); } ]b4_locations_if([b4_position_type_if([[ static assert(__traits(compiles, (new ]b4_position_type[[1])[0]=(new ]b4_position_type[[1])[0]), "struct/class ]b4_position_type[ must be default-constructible " "and assignable"); static assert(__traits(compiles, (new string[1])[0]=(new ]b4_position_type[).toString()), "error: struct/class ]b4_position_type[ must have toString method"); ]], [[ /** * A struct denoting a point in the input.*/ public struct ]b4_position_type[ { /** The column index within the line of input. */ public int column = 1; /** The line number within an input file. */ public int line = 1; /** The name of the input file. */ public string filename = null; /** * A string representation of the position. */ public string toString() const { if (filename) return format("%s:%d.%d", filename, line, column); else return format("%d.%d", line, column); } } ]])b4_location_type_if([[ static assert(__traits(compiles, (new ]b4_location_type[((new ]b4_position_type[[1])[0]))) && __traits(compiles, (new ]b4_location_type[((new ]b4_position_type[[1])[0], (new ]b4_position_type[[1])[0]))), "error: struct/class ]b4_location_type[ must have " "default constructor and constructors this(]b4_position_type[) and this(]b4_position_type[, ]b4_position_type[)."); static assert(__traits(compiles, (new ]b4_location_type[[1])[0].begin=(new ]b4_location_type[[1])[0].begin) && __traits(compiles, (new ]b4_location_type[[1])[0].begin=(new ]b4_location_type[[1])[0].end) && __traits(compiles, (new ]b4_location_type[[1])[0].end=(new ]b4_location_type[[1])[0].begin) && __traits(compiles, (new ]b4_location_type[[1])[0].end=(new ]b4_location_type[[1])[0].end), "error: struct/class ]b4_location_type[ must have assignment-compatible " "members/properties 'begin' and 'end'."); static assert(__traits(compiles, (new string[1])[0]=(new ]b4_location_type[[1])[0].toString()), "error: struct/class ]b4_location_type[ must have toString method."); private immutable bool yy_location_is_class = !__traits(compiles, *(new ]b4_location_type[((new ]b4_position_type[[1])[0])));]], [[ /** * A class defining a pair of positions. Positions, defined by the * <code>]b4_position_type[</code> class, denote a point in the input. * Locations represent a part of the input through the beginning * and ending positions. */ public class ]b4_location_type[ { /** The first, inclusive, position in the range. */ public ]b4_position_type[ begin; /** The first position beyond the range. */ public ]b4_position_type[ end; /** * Create a <code>]b4_location_type[</code> denoting an empty range located at * a given point. * @@param loc The position at which the range is anchored. */ public this (]b4_position_type[ loc) { this.begin = this.end = loc; } public this () { } /** * Create a <code>]b4_location_type[</code> from the endpoints of the range. * @@param begin The first position included in the range. * @@param end The first position beyond the range. */ public this (]b4_position_type[ begin, ]b4_position_type[ end) { this.begin = begin; this.end = end; } /** * A representation of the location. For this to be correct, * <code>]b4_position_type[</code> should override the <code>toString</code> * method. */ public override string toString () const { auto end_col = 0 < end.column ? end.column - 1 : 0; auto res = begin.toString (); if (end.filename && begin.filename != end.filename) res ~= "-" ~ format("%s:%d.%d", end.filename, end.line, end_col); else if (begin.line < end.line) res ~= "-" ~ format("%d.%d", end.line, end_col); else if (begin.column < end_col) res ~= "-" ~ format("%d", end_col); return res; } } private immutable bool yy_location_is_class = true; ]])])m4_ifdef([b4_user_union_members], [private union YYSemanticType { b4_user_union_members };], [m4_if(b4_tag_seen_flag, 0, [[private alias int YYSemanticType;]])])[ ]b4_token_enums[ ]b4_parser_class_declaration[ { ]b4_identification[ ]b4_declare_symbol_enum[ ]b4_locations_if([[ private final ]b4_location_type[ yylloc_from_stack (ref YYStack rhs, int n) { static if (yy_location_is_class) { if (n > 0) return new ]b4_location_type[ (rhs.locationAt (n-1).begin, rhs.locationAt (0).end); else return new ]b4_location_type[ (rhs.locationAt (0).end); } else { if (n > 0) return ]b4_location_type[ (rhs.locationAt (n-1).begin, rhs.locationAt (0).end); else return ]b4_location_type[ (rhs.locationAt (0).end); } }]])[ ]b4_lexer_if([[ private class YYLexer implements Lexer { ]b4_percent_code_get([[lexer]])[ } ]])[ /** The object doing lexical analysis for us. */ private Lexer yylexer; ]b4_parse_param_vars[ ]b4_lexer_if([[ /** * Instantiate the Bison-generated parser. */ public this] (b4_parse_param_decl([b4_lex_param_decl])[) { this (new YYLexer(]b4_lex_param_call[)); } ]])[ /** * Instantiate the Bison-generated parser. * @@param yylexer The scanner that will supply tokens to the parser. */ ]b4_lexer_if([[protected]], [[public]]) [this (]b4_parse_param_decl([[Lexer yylexer]])[) { this.yylexer = yylexer;]b4_parse_trace_if([[ this.yyDebugStream = stderr;]])[ ]b4_parse_param_cons[ } ]b4_parse_trace_if([[ private File yyDebugStream; /** * The <tt>File</tt> on which the debugging output is * printed. */ public File getDebugStream () { return yyDebugStream; } /** * Set the <tt>std.File</tt> on which the debug output is printed. * @@param s The stream that is used for debugging output. */ public final void setDebugStream(File s) { yyDebugStream = s; } private int yydebug = 0; /** * Answer the verbosity of the debugging output; 0 means that all kinds of * output from the parser are suppressed. */ public final int getDebugLevel() { return yydebug; } /** * Set the verbosity of the debugging output; 0 means that all kinds of * output from the parser are suppressed. * @@param level The verbosity level for debugging output. */ public final void setDebugLevel(int level) { yydebug = level; } protected final void yycdebug (string s) { if (0 < yydebug) yyDebugStream.write (s); } protected final void yycdebugln (string s) { if (0 < yydebug) yyDebugStream.writeln (s); } ]])[ private final int yylex () { return yylexer.yylex (); } protected final void yyerror (]b4_locations_if(ref [b4_location_type[ loc, ]])[string s) { yylexer.yyerror (]b4_locations_if([loc, ])[s); } /** * Returned by a Bison action in order to stop the parsing process and * return success (<tt>true</tt>). */ public static immutable int YYACCEPT = 0; /** * Returned by a Bison action in order to stop the parsing process and * return failure (<tt>false</tt>). */ public static immutable int YYABORT = 1; /** * Returned by a Bison action in order to start error recovery without * printing an error message. */ public static immutable int YYERROR = 2; // Internal return codes that are not supported for user semantic // actions. private static immutable int YYERRLAB = 3; private static immutable int YYNEWSTATE = 4; private static immutable int YYDEFAULT = 5; private static immutable int YYREDUCE = 6; private static immutable int YYERRLAB1 = 7; private static immutable int YYRETURN = 8; ]b4_locations_if([ private static immutable YYSemanticType yy_semantic_null;])[ private int yyerrstatus_ = 0; /** * Whether error recovery is being done. In this state, the parser * reads token until it reaches a known state, and then restarts normal * operation. */ public final bool recovering () { return yyerrstatus_ == 0; } private int yyaction (int yyn, ref YYStack yystack, int yylen) { ]b4_yystype[ yyval;]b4_locations_if([[ ]b4_location_type[ yyloc = yylloc_from_stack (yystack, yylen);]])[ /* If YYLEN is nonzero, implement the default value of the action: `$$ = $1'. Otherwise, use the top of the stack. Otherwise, the following line sets YYVAL to garbage. This behavior is undocumented and Bison users should not rely upon it. */ if (yylen > 0) yyval = yystack.valueAt (yylen - 1); else yyval = yystack.valueAt (0); ]b4_parse_trace_if([[ yy_reduce_print (yyn, yystack);]])[ switch (yyn) { ]b4_user_actions[ default: break; } ]b4_parse_trace_if([[ import std.conv : to; yy_symbol_print ("-> $$ =", to!SymbolKind (yyr1_[yyn]), yyval]b4_locations_if([, yyloc])[);]])[ yystack.pop (yylen); yylen = 0; /* Shift the result of the reduction. */ yyn = yyr1_[yyn]; int yystate = yypgoto_[yyn - yyntokens_] + yystack.stateAt (0); if (0 <= yystate && yystate <= yylast_ && yycheck_[yystate] == yystack.stateAt (0)) yystate = yytable_[yystate]; else yystate = yydefgoto_[yyn - yyntokens_]; yystack.push (yystate, yyval]b4_locations_if([, yyloc])[); return YYNEWSTATE; } /* Return YYSTR after stripping away unnecessary quotes and backslashes, so that it's suitable for yyerror. The heuristic is that double-quoting is unnecessary unless the string contains an apostrophe, a comma, or backslash (other than backslash-backslash). YYSTR is taken from yytname. */ private final string yytnamerr_ (string yystr) { if (yystr[0] == '"') { string yyr; strip_quotes: for (int i = 1; i < yystr.length; i++) switch (yystr[i]) { case '\'': case ',': break strip_quotes; case '\\': if (yystr[++i] != '\\') break strip_quotes; goto default; default: yyr ~= yystr[i]; break; case '"': return yyr; } } else if (yystr == "$end") return "end of input"; return yystr; } ]b4_parse_trace_if([[ /*--------------------------------. | Print this symbol on YYOUTPUT. | `--------------------------------*/ private final void yy_symbol_print (string s, SymbolKind yykind, ref ]b4_yystype[ yyvaluep]dnl b4_locations_if([, ref ]b4_location_type[ yylocationp])[) { if (0 < yydebug) { string message = s ~ (yykind < yyntokens_ ? " token " : " nterm ") ~ yytname_[yykind] ~ " ("]b4_locations_if([ ~ yylocationp.toString() ~ ": "])[; static if (__traits(compiles, message ~= yyvaluep.toString ())) message ~= yyvaluep.toString (); else message ~= format ("%s", &yyvaluep); message ~= ")"; yycdebugln (message); } } ]])[ /** * Parse input from the scanner that was specified at object construction * time. Return whether the end of the input was reached successfully. * * @@return <tt>true</tt> if the parsing succeeds. Note that this does not * imply that there were no syntax errors. */ public bool parse () { // Lookahead token kind. int yychar = TokenKind.YYEMPTY; // Lookahead symbol kind. SymbolKind yytoken = ]b4_symbol(-2, kind)[; /* State. */ int yyn = 0; int yylen = 0; int yystate = 0; YYStack yystack; /* Error handling. */ int yynerrs_ = 0;]b4_locations_if([[ /// The location where the error started. ]b4_location_type[ yyerrloc = null; /// ]b4_location_type[ of the lookahead. ]b4_location_type[ yylloc; /// @@$. ]b4_location_type[ yyloc;]])[ /// Semantic value of the lookahead. ]b4_yystype[ yylval; bool yyresult;]b4_parse_trace_if([[ yycdebugln ("Starting parse");]])[ yyerrstatus_ = 0; ]m4_ifdef([b4_initial_action], [ m4_pushdef([b4_at_dollar], [yylloc])dnl m4_pushdef([b4_dollar_dollar], [yylval])dnl /* User initialization code. */ b4_user_initial_action m4_popdef([b4_dollar_dollar])dnl m4_popdef([b4_at_dollar])])dnl [ /* Initialize the stack. */ yystack.push (yystate, yylval]b4_locations_if([, yylloc])[); int label = YYNEWSTATE; for (;;) final switch (label) { /* New state. Unlike in the C/C++ skeletons, the state is already pushed when we come here. */ case YYNEWSTATE:]b4_parse_trace_if([[ yycdebugln (format("Entering state %d", yystate)); if (0 < yydebug) yystack.print (yyDebugStream);]])[ /* Accept? */ if (yystate == yyfinal_) return true; /* Take a decision. First try without lookahead. */ yyn = yypact_[yystate]; if (yy_pact_value_is_default_ (yyn)) { label = YYDEFAULT; break; } /* Read a lookahead token. */ if (yychar == TokenKind.YYEMPTY) {]b4_parse_trace_if([[ yycdebugln ("Reading a token");]])[ yychar = yylex ();]b4_locations_if([[ static if (yy_location_is_class) { yylloc = new ]b4_location_type[(yylexer.startPos, yylexer.endPos); } else { yylloc = ]b4_location_type[(yylexer.startPos, yylexer.endPos); }]]) yylval = yylexer.semanticVal;[ } /* Convert token to internal form. */ yytoken = yytranslate_ (yychar);]b4_parse_trace_if([[ yy_symbol_print ("Next token is", yytoken, yylval]b4_locations_if([, yylloc])[);]])[ if (yytoken == ]b4_symbol(1, kind)[) { // The scanner already issued an error message, process directly // to error recovery. But do not keep the error token as // lookahead, it is too special and may lead us to an endless // loop in error recovery. */ yychar = TokenKind.]b4_symbol(2, id)[; yytoken = ]b4_symbol(2, kind)[;]b4_locations_if([[ yyerrloc = yylloc;]])[ label = YYERRLAB1; } else { /* If the proper action on seeing token YYTOKEN is to reduce or to detect an error, take that action. */ yyn += yytoken; if (yyn < 0 || yylast_ < yyn || yycheck_[yyn] != yytoken) label = YYDEFAULT; /* <= 0 means reduce or error. */ else if ((yyn = yytable_[yyn]) <= 0) { if (yy_table_value_is_error_ (yyn)) label = YYERRLAB; else { yyn = -yyn; label = YYREDUCE; } } else { /* Shift the lookahead token. */]b4_parse_trace_if([[ yy_symbol_print ("Shifting", yytoken, yylval]b4_locations_if([, yylloc])[);]])[ /* Discard the token being shifted. */ yychar = TokenKind.YYEMPTY; /* Count tokens shifted since error; after three, turn off error * status. */ if (yyerrstatus_ > 0) --yyerrstatus_; yystate = yyn; yystack.push (yystate, yylval]b4_locations_if([, yylloc])[); label = YYNEWSTATE; } } break; /*-----------------------------------------------------------. | yydefault -- do the default action for the current state. | `-----------------------------------------------------------*/ case YYDEFAULT: yyn = yydefact_[yystate]; if (yyn == 0) label = YYERRLAB; else label = YYREDUCE; break; /*-----------------------------. | yyreduce -- Do a reduction. | `-----------------------------*/ case YYREDUCE: yylen = yyr2_[yyn]; label = yyaction (yyn, yystack, yylen); yystate = yystack.stateAt (0); break; /*--------------------------------------. | yyerrlab -- here on detecting error. | `--------------------------------------*/ case YYERRLAB: /* If not already recovering from an error, report this error. */ if (yyerrstatus_ == 0) { ++yynerrs_; if (yychar == TokenKind.]b4_symbol(-2, id)[) yytoken = ]b4_symbol(-2, kind)[; yyerror (]b4_locations_if([yylloc, ])[yysyntax_error (yystate, yytoken)); } ]b4_locations_if([ yyerrloc = yylloc;])[ if (yyerrstatus_ == 3) { /* If just tried and failed to reuse lookahead token after an * error, discard it. */ if (yychar <= TokenKind.]b4_symbol(0, [id])[) { /* Return failure if at end of input. */ if (yychar == TokenKind.]b4_symbol(0, [id])[) return false; } else yychar = TokenKind.YYEMPTY; } /* Else will try to reuse lookahead token after shifting the error * token. */ label = YYERRLAB1; break; /*-------------------------------------------------. | errorlab -- error raised explicitly by YYERROR. | `-------------------------------------------------*/ case YYERROR:]b4_locations_if([ yyerrloc = yystack.locationAt (yylen - 1);])[ /* Do not reclaim the symbols of the rule which action triggered this YYERROR. */ yystack.pop (yylen); yylen = 0; yystate = yystack.stateAt (0); label = YYERRLAB1; break; /*-------------------------------------------------------------. | yyerrlab1 -- common code for both syntax error and YYERROR. | `-------------------------------------------------------------*/ case YYERRLAB1: yyerrstatus_ = 3; /* Each real token shifted decrements this. */ // Pop stack until we find a state that shifts the error token. for (;;) { yyn = yypact_[yystate]; if (!yy_pact_value_is_default_ (yyn)) { yyn += ]b4_symbol(1, kind)[; if (0 <= yyn && yyn <= yylast_ && yycheck_[yyn] == ]b4_symbol(1, kind)[) { yyn = yytable_[yyn]; if (0 < yyn) break; } } /* Pop the current state because it cannot handle the error token. */ if (yystack.height == 1) return false; ]b4_locations_if([ yyerrloc = yystack.locationAt (0);])[ yystack.pop (); yystate = yystack.stateAt (0);]b4_parse_trace_if([[ if (0 < yydebug) yystack.print (yyDebugStream);]])[ } ]b4_locations_if([ /* Muck with the stack to setup for yylloc. */ yystack.push (0, yy_semantic_null, yylloc); yystack.push (0, yy_semantic_null, yyerrloc); yyloc = yylloc_from_stack (yystack, 2); yystack.pop (2);])[ /* Shift the error token. */]b4_parse_trace_if([[ import std.conv : to; yy_symbol_print ("Shifting", to!SymbolKind (yystos_[yyn]), yylval]b4_locations_if([, yyloc])[);]])[ yystate = yyn; yystack.push (yyn, yylval]b4_locations_if([, yyloc])[); label = YYNEWSTATE; break; /* Accept. */ case YYACCEPT: yyresult = true; label = YYRETURN; break; /* Abort. */ case YYABORT: yyresult = false; label = YYRETURN; break; case YYRETURN:]b4_parse_trace_if([[ if (0 < yydebug) yystack.print (yyDebugStream);]])[ return yyresult; } } // Generate an error message. private final string yysyntax_error (int yystate, SymbolKind tok) {]b4_parse_error_case([verbose], [[ /* There are many possibilities here to consider: - Assume YYFAIL is not used. It's too flawed to consider. See <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html> for details. YYERROR is fine as it does not invoke this function. - If this state is a consistent state with a default action, then the only way this function was invoked is if the default action is an error action. In that case, don't check for expected tokens because there are none. - The only way there can be no lookahead present (in tok) is if this state is a consistent state with a default action. Thus, detecting the absence of a lookahead is sufficient to determine that there is no unexpected or expected token to report. In that case, just report a simple "syntax error". - Don't assume there isn't a lookahead just because this state is a consistent state with a default action. There might have been a previous inconsistent state, consistent state with a non-default action, or user semantic action that manipulated yychar. (However, yychar is currently out of scope during semantic actions.) - Of course, the expected token list depends on states to have correct lookahead information, and it depends on the parser not to perform extra reductions after fetching a lookahead from the scanner and before detecting a syntax error. Thus, state merging (from LALR or IELR) and default reductions corrupt the expected token list. However, the list is correct for canonical LR with one exception: it will still contain any token that will not be accepted due to an error action in a later state. */ if (tok != ]b4_symbol(-2, kind)[) { // FIXME: This method of building the message is not compatible // with internationalization. string res = "syntax error, unexpected "; res ~= yytnamerr_ (yytname_[tok]); int yyn = yypact_[yystate]; if (!yy_pact_value_is_default_ (yyn)) { /* Start YYX at -YYN if negative to avoid negative indexes in YYCHECK. In other words, skip the first -YYN actions for this state because they are default actions. */ int yyxbegin = yyn < 0 ? -yyn : 0; /* Stay within bounds of both yycheck and yytname. */ int yychecklim = yylast_ - yyn + 1; int yyxend = yychecklim < yyntokens_ ? yychecklim : yyntokens_; int count = 0; for (int x = yyxbegin; x < yyxend; ++x) if (yycheck_[x + yyn] == x && x != ]b4_symbol(1, kind)[ && !yy_table_value_is_error_ (yytable_[x + yyn])) ++count; if (count < 5) { count = 0; for (int x = yyxbegin; x < yyxend; ++x) if (yycheck_[x + yyn] == x && x != ]b4_symbol(1, kind)[ && !yy_table_value_is_error_ (yytable_[x + yyn])) { res ~= count++ == 0 ? ", expecting " : " or "; res ~= yytnamerr_ (yytname_[x]); } } } return res; }]])[ return "syntax error"; } /** * Whether the given <code>yypact_</code> value indicates a defaulted state. * @@param yyvalue the value to check */ private static bool yy_pact_value_is_default_ (int yyvalue) { return yyvalue == yypact_ninf_; } /** * Whether the given <code>yytable_</code> value indicates a syntax error. * @@param yyvalue the value to check */ private static bool yy_table_value_is_error_ (int yyvalue) { return yyvalue == yytable_ninf_; } /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing STATE-NUM. */ private static immutable ]b4_int_type_for([b4_pact])[ yypact_ninf_ = ]b4_pact_ninf[; /* 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. */ private static immutable ]b4_int_type_for([b4_table])[ yytable_ninf_ = ]b4_table_ninf[; ]b4_parser_tables_define[ /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM. First, the terminals, then, starting at \a yyntokens_, nonterminals. */ private static immutable string[] yytname_ = @{ ]b4_tname[ @}; ]b4_parse_trace_if([[ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ private static immutable ]b4_int_type_for([b4_rline])[[] yyrline_ = @{ ]b4_rline[ @}; // Report on the debug stream that the rule yyrule is going to be reduced. private final void yy_reduce_print (int yyrule, ref YYStack yystack) { if (yydebug == 0) return; int yylno = yyrline_[yyrule]; int yynrhs = yyr2_[yyrule]; /* Print the symbols being reduced, and their result. */ yycdebugln (format("Reducing stack by rule %d (line %d):", yyrule - 1, yylno)); /* The symbols being reduced. */ import std.conv : to; for (int yyi = 0; yyi < yynrhs; yyi++) yy_symbol_print (format(" $%d =", yyi + 1), to!SymbolKind (yystos_[yystack.stateAt(yynrhs - (yyi + 1))]), ]b4_rhs_value(yynrhs, yyi + 1)b4_locations_if([, b4_rhs_location(yynrhs, yyi + 1)])[); } ]])[ private static SymbolKind yytranslate_ (int t) { ]b4_api_token_raw_if( [[ import std.conv : to; return to!SymbolKind (t);]], [[ /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */ immutable ]b4_int_type_for([b4_translate])[[] translate_table = @{ ]b4_translate[ @}; // Last valid token kind. immutable int code_max = ]b4_code_max[; if (t <= 0) return ]b4_symbol(0, kind)[; else if (t <= code_max) { import std.conv : to; return to!SymbolKind (translate_table[t]); } else return ]b4_symbol(2, kind)[;]])[ } private static immutable int yylast_ = ]b4_last[; private static immutable int yynnts_ = ]b4_nterms_number[; private static immutable int yyfinal_ = ]b4_final_state_number[; private static immutable int yyntokens_ = ]b4_tokens_number[; private final struct YYStackElement { int state; ]b4_yystype[ value;]b4_locations_if( b4_location_type[[] location;])[ } private final struct YYStack { private YYStackElement[] stack = []; public final @@property ulong height() { return stack.length; } public final void push (int state, ]b4_yystype[ value]dnl b4_locations_if([, ref ]b4_location_type[ loc])[) { stack ~= YYStackElement(state, value]b4_locations_if([, loc])[); } public final void pop () { pop (1); } public final void pop (int num) { stack.length -= num; } public final int stateAt (int i) { return stack[$-i-1].state; } ]b4_locations_if([[ public final ref ]b4_location_type[ locationAt (int i) { return stack[$-i-1].location; }]])[ public final ref ]b4_yystype[ valueAt (int i) { return stack[$-i-1].value; } ]b4_parse_trace_if([[ // Print the state stack on the debug stream. public final void print (File stream) { stream.write ("Stack now"); for (int i = 0; i < stack.length; i++) stream.write (" ", stack[i].state); stream.writeln (); }]])[ } ]b4_percent_code_get[ } ]b4_percent_code_get([[epilogue]])[]dnl b4_epilogue[]dnl b4_output_end PK r�!\�r�W W skeletons/traceon.m4nu �[��� dnl GNU M4 treats -dV in a position-independent manner. m4_debugmode(V)m4_traceon()dnl PK r�!\C�9u�R �R skeletons/c++.m4nu �[��� -*- Autoconf -*- # C++ skeleton for Bison # Copyright (C) 2002-2020 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/>. # Sanity checks, before defaults installed by c.m4. b4_percent_define_ifdef([[api.value.union.name]], [b4_complain_at(b4_percent_define_get_loc([[api.value.union.name]]), [named %union is invalid in C++])]) b4_percent_define_default([[api.symbol.prefix]], [[S_]]) m4_include(b4_skeletonsdir/[c.m4]) b4_percent_define_check_kind([api.namespace], [code], [deprecated]) b4_percent_define_check_kind([api.parser.class], [code], [deprecated]) ## ----- ## ## C++. ## ## ----- ## # b4_comment(TEXT, [PREFIX]) # -------------------------- # Put TEXT in comment. Prefix all the output lines with PREFIX. m4_define([b4_comment], [_b4_comment([$1], [$2// ], [$2// ])]) # b4_inline(hh|cc) # ---------------- # Expand to `inline\n ` if $1 is hh. m4_define([b4_inline], [m4_case([$1], [cc], [], [hh], [[inline ]], [m4_fatal([$0: invalid argument: $1])])]) # b4_cxx_portability # ------------------ m4_define([b4_cxx_portability], [#if defined __cplusplus # define YY_CPLUSPLUS __cplusplus #else # define YY_CPLUSPLUS 199711L #endif // Support move semantics when possible. #if 201103L <= YY_CPLUSPLUS # define YY_MOVE std::move # define YY_MOVE_OR_COPY move # define YY_MOVE_REF(Type) Type&& # define YY_RVREF(Type) Type&& # define YY_COPY(Type) Type #else # define YY_MOVE # define YY_MOVE_OR_COPY copy # define YY_MOVE_REF(Type) Type& # define YY_RVREF(Type) const Type& # define YY_COPY(Type) const Type& #endif // Support noexcept when possible. #if 201103L <= YY_CPLUSPLUS # define YY_NOEXCEPT noexcept # define YY_NOTHROW #else # define YY_NOEXCEPT # define YY_NOTHROW throw () #endif // Support constexpr when possible. #if 201703 <= YY_CPLUSPLUS # define YY_CONSTEXPR constexpr #else # define YY_CONSTEXPR #endif[]dnl ]) ## ---------------- ## ## Default values. ## ## ---------------- ## b4_percent_define_default([[api.parser.class]], [[parser]]) # Don't do that so that we remember whether we're using a user # request, or the default value. # # b4_percent_define_default([[api.location.type]], [[location]]) b4_percent_define_default([[api.filename.type]], [[const std::string]]) # Make it a warning for those who used betas of Bison 3.0. b4_percent_define_default([[api.namespace]], m4_defn([b4_prefix])) b4_percent_define_default([[global_tokens_and_yystype]], [[false]]) b4_percent_define_default([[define_location_comparison]], [m4_if(b4_percent_define_get([[filename_type]]), [std::string], [[true]], [[false]])]) ## ----------- ## ## Namespace. ## ## ----------- ## m4_define([b4_namespace_ref], [b4_percent_define_get([[api.namespace]])]) # Don't permit an empty b4_namespace_ref. Any '::parser::foo' appended to it # would compile as an absolute reference with 'parser' in the global namespace. # b4_namespace_open would open an anonymous namespace and thus establish # internal linkage. This would compile. However, it's cryptic, and internal # linkage for the parser would be specified in all translation units that # include the header, which is always generated. If we ever need to permit # internal linkage somehow, surely we can find a cleaner approach. m4_if(m4_bregexp(b4_namespace_ref, [^[ ]*$]), [-1], [], [b4_complain_at(b4_percent_define_get_loc([[api.namespace]]), [[namespace reference is empty]])]) # Instead of assuming the C++ compiler will do it, Bison should reject any # invalid b4_namespace_ref that would be converted to a valid # b4_namespace_open. The problem is that Bison doesn't always output # b4_namespace_ref to uncommented code but should reserve the ability to do so # in future releases without risking breaking any existing user grammars. # Specifically, don't allow empty names as b4_namespace_open would just convert # those into anonymous namespaces, and that might tempt some users. m4_if(m4_bregexp(b4_namespace_ref, [::[ ]*::]), [-1], [], [b4_complain_at(b4_percent_define_get_loc([[api.namespace]]), [[namespace reference has consecutive "::"]])]) m4_if(m4_bregexp(b4_namespace_ref, [::[ ]*$]), [-1], [], [b4_complain_at(b4_percent_define_get_loc([[api.namespace]]), [[namespace reference has a trailing "::"]])]) m4_define([b4_namespace_open], [b4_user_code([b4_percent_define_get_syncline([[api.namespace]])dnl [namespace ]m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref), [^\(.\)[ ]*::], [\1])), [::], [ { namespace ])[ {]])]) m4_define([b4_namespace_close], [b4_user_code([b4_percent_define_get_syncline([[api.namespace]])dnl m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref[ ]), [^\(.\)[ ]*\(::\)?\([^][:]\|:[^:]\)*], [\1])), [::\([^][:]\|:[^:]\)*], [} ])[} // ]b4_namespace_ref])]) ## ------------- ## ## Token kinds. ## ## ------------- ## # b4_token_enums # -------------- # Output the definition of the token kinds. m4_define([b4_token_enums], [[enum token_kind_type { ]b4_symbol([-2], [id])[ = -2, ]b4_symbol_foreach([b4_token_enum])dnl [ };]dnl ]) ## -------------- ## ## Symbol kinds. ## ## -------------- ## # b4_declare_symbol_enum # ---------------------- # The definition of the symbol internal numbers as an enum. # Defining YYEMPTY here is important: it forces the compiler # to use a signed type, which matters for yytoken. m4_define([b4_declare_symbol_enum], [[enum symbol_kind_type { YYNTOKENS = ]b4_tokens_number[, ///< Number of tokens. ]b4_symbol(-2, kind_base)[ = -2, ]b4_symbol_foreach([ b4_symbol_enum])dnl [ };]]) ## ----------------- ## ## Semantic Values. ## ## ----------------- ## # b4_value_type_declare # --------------------- # Declare semantic_type. m4_define([b4_value_type_declare], [b4_value_type_setup[]dnl [ /// Symbol semantic values. ]m4_bmatch(b4_percent_define_get_kind([[api.value.type]]), [code], [[ typedef ]b4_percent_define_get([[api.value.type]])[ semantic_type;]], [m4_bmatch(b4_percent_define_get([[api.value.type]]), [union\|union-directive], [[ union semantic_type { ]b4_user_union_members[ };]])])dnl ]) # b4_public_types_declare # ----------------------- # Define the public types: token, semantic value, location, and so forth. # Depending on %define token_lex, may be output in the header or source file. m4_define([b4_public_types_declare], [[#ifndef ]b4_api_PREFIX[STYPE ]b4_value_type_declare[ #else typedef ]b4_api_PREFIX[STYPE semantic_type; #endif]b4_locations_if([ /// Symbol locations. typedef b4_percent_define_get([[api.location.type]], [[location]]) location_type;])[ /// Syntax errors thrown from user actions. struct syntax_error : std::runtime_error { syntax_error (]b4_locations_if([const location_type& l, ])[const std::string& m) : std::runtime_error (m)]b4_locations_if([ , location (l)])[ {} syntax_error (const syntax_error& s) : std::runtime_error (s.what ())]b4_locations_if([ , location (s.location)])[ {} ~syntax_error () YY_NOEXCEPT YY_NOTHROW;]b4_locations_if([ location_type location;])[ }; /// Token kinds. struct token { ]b4_token_enums[ /// Backward compatibility alias (Bison 3.6). typedef token_kind_type yytokentype; }; /// Token kind, as returned by yylex. typedef token::yytokentype token_kind_type; /// Backward compatibility alias (Bison 3.6). typedef token_kind_type token_type; /// Symbol kinds. struct symbol_kind { ]b4_declare_symbol_enum[ }; /// (Internal) symbol kind. typedef symbol_kind::symbol_kind_type symbol_kind_type; /// The number of tokens. static const symbol_kind_type YYNTOKENS = symbol_kind::YYNTOKENS; ]]) # b4_symbol_type_define # --------------------- # Define symbol_type, the external type for symbols used for symbol # constructors. m4_define([b4_symbol_type_define], [[ /// A complete symbol. /// /// Expects its Base type to provide access to the symbol kind /// via kind (). /// /// Provide access to semantic value]b4_locations_if([ and location])[. template <typename Base> struct basic_symbol : Base { /// Alias to Base. typedef Base super_type; /// Default constructor. basic_symbol () : value ()]b4_locations_if([ , location ()])[ {} #if 201103L <= YY_CPLUSPLUS /// Move constructor. basic_symbol (basic_symbol&& that) : Base (std::move (that)) , value (]b4_variant_if([], [std::move (that.value)]))b4_locations_if([ , location (std::move (that.location))])[ {]b4_variant_if([ b4_symbol_variant([this->kind ()], [value], [move], [std::move (that.value)]) ])[} #endif /// Copy constructor. basic_symbol (const basic_symbol& that);]b4_variant_if([[ /// Constructors for typed symbols. ]b4_type_foreach([b4_basic_symbol_constructor_define], [ ])], [[ /// Constructor for valueless symbols. basic_symbol (typename Base::kind_type t]b4_locations_if([, YY_MOVE_REF (location_type) l])[); /// Constructor for symbols with semantic value. basic_symbol (typename Base::kind_type t, YY_RVREF (semantic_type) v]b4_locations_if([, YY_RVREF (location_type) l])[); ]])[ /// Destroy the symbol. ~basic_symbol () { clear (); } /// Destroy contents, and record that is empty. void clear () {]b4_variant_if([[ // User destructor. symbol_kind_type yykind = this->kind (); basic_symbol<Base>& yysym = *this; (void) yysym; switch (yykind) { ]b4_symbol_foreach([b4_symbol_destructor])dnl [ default: break; } // Value type destructor. ]b4_symbol_variant([[yykind]], [[value]], [[template destroy]])])[ Base::clear (); } ]b4_parse_error_bmatch( [custom\|detailed], [[ /// The user-facing name of this symbol. const char *name () const YY_NOEXCEPT { return ]b4_parser_class[::symbol_name (this->kind ()); }]], [simple], [[#if ]b4_api_PREFIX[DEBUG || ]b4_token_table_flag[ /// The user-facing name of this symbol. const char *name () const YY_NOEXCEPT { return ]b4_parser_class[::symbol_name (this->kind ()); } #endif // #if ]b4_api_PREFIX[DEBUG || ]b4_token_table_flag[ ]], [verbose], [[ /// The user-facing name of this symbol. std::string name () const YY_NOEXCEPT { return ]b4_parser_class[::symbol_name (this->kind ()); }]])[ /// Backward compatibility (Bison 3.6). symbol_kind_type type_get () const YY_NOEXCEPT; /// Whether empty. bool empty () const YY_NOEXCEPT; /// Destructive move, \a s is emptied into this. void move (basic_symbol& s); /// The semantic value. semantic_type value;]b4_locations_if([ /// The location. location_type location;])[ private: #if YY_CPLUSPLUS < 201103L /// Assignment operator. basic_symbol& operator= (const basic_symbol& that); #endif }; /// Type access provider for token (enum) based symbols. struct by_kind { /// Default constructor. by_kind (); #if 201103L <= YY_CPLUSPLUS /// Move constructor. by_kind (by_kind&& that); #endif /// Copy constructor. by_kind (const by_kind& that); /// The symbol kind as needed by the constructor. typedef token_kind_type kind_type; /// Constructor from (external) token numbers. by_kind (kind_type t); /// Record that this symbol is empty. void clear (); /// Steal the symbol kind from \a that. void move (by_kind& that); /// The (internal) type number (corresponding to \a type). /// \a empty when empty. symbol_kind_type kind () const YY_NOEXCEPT; /// Backward compatibility (Bison 3.6). symbol_kind_type type_get () const YY_NOEXCEPT; /// The symbol kind. /// \a ]b4_symbol_prefix[YYEMPTY when empty. symbol_kind_type kind_; }; /// Backward compatibility for a private implementation detail (Bison 3.6). typedef by_kind by_type; /// "External" symbols: returned by the scanner. struct symbol_type : basic_symbol<by_kind> {]b4_variant_if([[ /// Superclass. typedef basic_symbol<by_kind> super_type; /// Empty symbol. symbol_type () {} /// Constructor for valueless symbols, and symbols from each type. ]b4_type_foreach([_b4_token_constructor_define])dnl ])[}; ]]) # b4_public_types_define(hh|cc) # ----------------------------- # Provide the implementation needed by the public types. m4_define([b4_public_types_define], [[ // basic_symbol. template <typename Base> ]b4_parser_class[::basic_symbol<Base>::basic_symbol (const basic_symbol& that) : Base (that) , value (]b4_variant_if([], [that.value]))b4_locations_if([ , location (that.location)])[ {]b4_variant_if([ b4_symbol_variant([this->kind ()], [value], [copy], [YY_MOVE (that.value)]) ])[} ]b4_variant_if([], [[ /// Constructor for valueless symbols. template <typename Base> ]b4_parser_class[::basic_symbol<Base>::basic_symbol (]b4_join( [typename Base::kind_type t], b4_locations_if([YY_MOVE_REF (location_type) l]))[) : Base (t) , value ()]b4_locations_if([ , location (l)])[ {} template <typename Base> ]b4_parser_class[::basic_symbol<Base>::basic_symbol (]b4_join( [typename Base::kind_type t], [YY_RVREF (semantic_type) v], b4_locations_if([YY_RVREF (location_type) l]))[) : Base (t) , value (]b4_variant_if([], [YY_MOVE (v)])[)]b4_locations_if([ , location (YY_MOVE (l))])[ {]b4_variant_if([[ (void) v; ]b4_symbol_variant([this->kind ()], [value], [YY_MOVE_OR_COPY], [YY_MOVE (v)])])[}]])[ template <typename Base> ]b4_parser_class[::symbol_kind_type ]b4_parser_class[::basic_symbol<Base>::type_get () const YY_NOEXCEPT { return this->kind (); } template <typename Base> bool ]b4_parser_class[::basic_symbol<Base>::empty () const YY_NOEXCEPT { return this->kind () == ]b4_symbol(-2, kind)[; } template <typename Base> void ]b4_parser_class[::basic_symbol<Base>::move (basic_symbol& s) { super_type::move (s); ]b4_variant_if([b4_symbol_variant([this->kind ()], [value], [move], [YY_MOVE (s.value)])], [value = YY_MOVE (s.value);])[]b4_locations_if([ location = YY_MOVE (s.location);])[ } // by_kind. ]b4_inline([$1])b4_parser_class[::by_kind::by_kind () : kind_ (]b4_symbol(-2, kind)[) {} #if 201103L <= YY_CPLUSPLUS ]b4_inline([$1])b4_parser_class[::by_kind::by_kind (by_kind&& that) : kind_ (that.kind_) { that.clear (); } #endif ]b4_inline([$1])b4_parser_class[::by_kind::by_kind (const by_kind& that) : kind_ (that.kind_) {} ]b4_inline([$1])b4_parser_class[::by_kind::by_kind (token_kind_type t) : kind_ (yytranslate_ (t)) {} ]b4_inline([$1])[void ]b4_parser_class[::by_kind::clear () { kind_ = ]b4_symbol(-2, kind)[; } ]b4_inline([$1])[void ]b4_parser_class[::by_kind::move (by_kind& that) { kind_ = that.kind_; that.clear (); } ]b4_inline([$1])[]b4_parser_class[::symbol_kind_type ]b4_parser_class[::by_kind::kind () const YY_NOEXCEPT { return kind_; } ]b4_inline([$1])[]b4_parser_class[::symbol_kind_type ]b4_parser_class[::by_kind::type_get () const YY_NOEXCEPT { return this->kind (); } ]]) # b4_token_constructor_define # ---------------------------- # Define symbol constructors for all the value types. # Use at class-level. Redefined in variant.hh. m4_define([b4_token_constructor_define], []) # b4_yytranslate_define(cc|hh) # ---------------------------- # Define yytranslate_. Sometimes used in the header file ($1=hh), # sometimes in the cc file. m4_define([b4_yytranslate_define], [ b4_inline([$1])b4_parser_class[::symbol_kind_type ]b4_parser_class[::yytranslate_ (int t) { ]b4_api_token_raw_if( [[ return static_cast<symbol_kind_type> (t);]], [[ // YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to // TOKEN-NUM as returned by yylex. static const ]b4_int_type_for([b4_translate])[ translate_table[] = { ]b4_translate[ }; // Last valid token kind. const int code_max = ]b4_code_max[; if (t <= 0) return symbol_kind::]b4_symbol_prefix[YYEOF; else if (t <= code_max) return YY_CAST (symbol_kind_type, translate_table[t]); else return symbol_kind::]b4_symbol_prefix[YYUNDEF;]])[ } ]]) # b4_lhs_value([TYPE]) # -------------------- m4_define([b4_lhs_value], [b4_symbol_value([yyval], [$1])]) # b4_rhs_value(RULE-LENGTH, POS, [TYPE]) # -------------------------------------- # FIXME: Dead code. m4_define([b4_rhs_value], [b4_symbol_value([yysemantic_stack_@{($1) - ($2)@}], [$3])]) # b4_lhs_location() # ----------------- # Expansion of @$. m4_define([b4_lhs_location], [(yyloc)]) # b4_rhs_location(RULE-LENGTH, POS) # --------------------------------- # Expansion of @POS, where the current rule has RULE-LENGTH symbols # on RHS. m4_define([b4_rhs_location], [(yylocation_stack_@{($1) - ($2)@})]) # b4_parse_param_decl # ------------------- # Extra formal arguments of the constructor. # Change the parameter names from "foo" into "foo_yyarg", so that # there is no collision bw the user chosen attribute name, and the # argument name in the constructor. m4_define([b4_parse_param_decl], [m4_ifset([b4_parse_param], [m4_map_sep([b4_parse_param_decl_1], [, ], [b4_parse_param])])]) m4_define([b4_parse_param_decl_1], [$1_yyarg]) # b4_parse_param_cons # ------------------- # Extra initialisations of the constructor. m4_define([b4_parse_param_cons], [m4_ifset([b4_parse_param], [ b4_cc_constructor_calls(b4_parse_param)])]) m4_define([b4_cc_constructor_calls], [m4_map_sep([b4_cc_constructor_call], [, ], [$@])]) m4_define([b4_cc_constructor_call], [$2 ($2_yyarg)]) # b4_parse_param_vars # ------------------- # Extra instance variables. m4_define([b4_parse_param_vars], [m4_ifset([b4_parse_param], [ // User arguments. b4_cc_var_decls(b4_parse_param)])]) m4_define([b4_cc_var_decls], [m4_map_sep([b4_cc_var_decl], [ ], [$@])]) m4_define([b4_cc_var_decl], [ $1;]) ## ---------## ## Values. ## ## ---------## # b4_yylloc_default_define # ------------------------ # Define YYLLOC_DEFAULT. m4_define([b4_yylloc_default_define], [[/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N]. If N is 0, then set CURRENT to the empty location which ends the previous symbol: RHS[0] (always defined). */ # ifndef YYLLOC_DEFAULT # define YYLLOC_DEFAULT(Current, Rhs, N) \ do \ if (N) \ { \ (Current).begin = YYRHSLOC (Rhs, 1).begin; \ (Current).end = YYRHSLOC (Rhs, N).end; \ } \ else \ { \ (Current).begin = (Current).end = YYRHSLOC (Rhs, 0).end; \ } \ while (false) # endif ]]) ## -------- ## ## Checks. ## ## -------- ## b4_token_ctor_if([b4_variant_if([], [b4_fatal_at(b4_percent_define_get_loc(api.token.constructor), [cannot use '%s' without '%s'], [%define api.token.constructor], [%define api.value.type variant]))])]) PK r�!\ �W� � skeletons/c-skel.m4nu �[��� -*- Autoconf -*- # C skeleton dispatching for Bison. # Copyright (C) 2006-2007, 2009-2015, 2018-2020 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/>. b4_glr_if( [m4_define([b4_used_skeleton], [b4_skeletonsdir/[glr.c]])]) b4_nondeterministic_if([m4_define([b4_used_skeleton], [b4_skeletonsdir/[glr.c]])]) m4_define_default([b4_used_skeleton], [b4_skeletonsdir/[yacc.c]]) m4_define_default([b4_skeleton], ["b4_basename(b4_used_skeleton)"]) m4_include(b4_used_skeleton) PK r�!\�3�M�: �: skeletons/variant.hhnu �[��� # C++ skeleton for Bison # Copyright (C) 2002-2015, 2018-2020 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/>. ## --------- ## ## variant. ## ## --------- ## # b4_assert # --------- # The name of YY_ASSERT. m4_define([b4_assert], [b4_api_PREFIX[]_ASSERT]) # b4_symbol_variant(YYTYPE, YYVAL, ACTION, [ARGS]) # ------------------------------------------------ # Run some ACTION ("build", or "destroy") on YYVAL of symbol type # YYTYPE. m4_define([b4_symbol_variant], [m4_pushdef([b4_dollar_dollar], [$2.$3< $][3 > (m4_shift3($@))])dnl switch ($1) { b4_type_foreach([_b4_type_action])[]dnl default: break; } m4_popdef([b4_dollar_dollar])dnl ]) # _b4_char_sizeof_counter # ----------------------- # A counter used by _b4_char_sizeof_dummy to create fresh symbols. m4_define([_b4_char_sizeof_counter], [0]) # _b4_char_sizeof_dummy # --------------------- # At each call return a new C++ identifier. m4_define([_b4_char_sizeof_dummy], [m4_define([_b4_char_sizeof_counter], m4_incr(_b4_char_sizeof_counter))dnl dummy[]_b4_char_sizeof_counter]) # b4_char_sizeof(SYMBOL-NUMS) # --------------------------- # To be mapped on the list of type names to produce: # # char dummy1[sizeof (type_name_1)]; # char dummy2[sizeof (type_name_2)]; # # for defined type names. m4_define([b4_char_sizeof], [b4_symbol_if([$1], [has_type], [ m4_map([ b4_symbol_tag_comment], [$@])dnl char _b4_char_sizeof_dummy@{sizeof (b4_symbol([$1], [type]))@}; ])]) # b4_variant_includes # ------------------- # The needed includes for variants support. m4_define([b4_variant_includes], [b4_parse_assert_if([[#include <typeinfo> #ifndef ]b4_assert[ # include <cassert> # define ]b4_assert[ assert #endif ]])]) ## -------------------------- ## ## Adjustments for variants. ## ## -------------------------- ## # b4_value_type_declare # --------------------- # Define semantic_type. m4_define([b4_value_type_declare], [[ /// A buffer to store and retrieve objects. /// /// Sort of a variant, but does not keep track of the nature /// of the stored data, since that knowledge is available /// via the current parser state. class semantic_type { public: /// Type of *this. typedef semantic_type self_type; /// Empty construction. semantic_type () YY_NOEXCEPT : yybuffer_ ()]b4_parse_assert_if([ , yytypeid_ (YY_NULLPTR)])[ {} /// Construct and fill. template <typename T> semantic_type (YY_RVREF (T) t)]b4_parse_assert_if([ : yytypeid_ (&typeid (T))])[ {]b4_parse_assert_if([[ ]b4_assert[ (sizeof (T) <= size);]])[ new (yyas_<T> ()) T (YY_MOVE (t)); } #if 201103L <= YY_CPLUSPLUS /// Non copyable. semantic_type (const self_type&) = delete; /// Non copyable. self_type& operator= (const self_type&) = delete; #endif /// Destruction, allowed only if empty. ~semantic_type () YY_NOEXCEPT {]b4_parse_assert_if([ ]b4_assert[ (!yytypeid_); ])[} # if 201103L <= YY_CPLUSPLUS /// Instantiate a \a T in here from \a t. template <typename T, typename... U> T& emplace (U&&... u) {]b4_parse_assert_if([[ ]b4_assert[ (!yytypeid_); ]b4_assert[ (sizeof (T) <= size); yytypeid_ = & typeid (T);]])[ return *new (yyas_<T> ()) T (std::forward <U>(u)...); } # else /// Instantiate an empty \a T in here. template <typename T> T& emplace () {]b4_parse_assert_if([[ ]b4_assert[ (!yytypeid_); ]b4_assert[ (sizeof (T) <= size); yytypeid_ = & typeid (T);]])[ return *new (yyas_<T> ()) T (); } /// Instantiate a \a T in here from \a t. template <typename T> T& emplace (const T& t) {]b4_parse_assert_if([[ ]b4_assert[ (!yytypeid_); ]b4_assert[ (sizeof (T) <= size); yytypeid_ = & typeid (T);]])[ return *new (yyas_<T> ()) T (t); } # endif /// Instantiate an empty \a T in here. /// Obsolete, use emplace. template <typename T> T& build () { return emplace<T> (); } /// Instantiate a \a T in here from \a t. /// Obsolete, use emplace. template <typename T> T& build (const T& t) { return emplace<T> (t); } /// Accessor to a built \a T. template <typename T> T& as () YY_NOEXCEPT {]b4_parse_assert_if([[ ]b4_assert[ (yytypeid_); ]b4_assert[ (*yytypeid_ == typeid (T)); ]b4_assert[ (sizeof (T) <= size);]])[ return *yyas_<T> (); } /// Const accessor to a built \a T (for %printer). template <typename T> const T& as () const YY_NOEXCEPT {]b4_parse_assert_if([[ ]b4_assert[ (yytypeid_); ]b4_assert[ (*yytypeid_ == typeid (T)); ]b4_assert[ (sizeof (T) <= size);]])[ return *yyas_<T> (); } /// Swap the content with \a that, of same type. /// /// Both variants must be built beforehand, because swapping the actual /// data requires reading it (with as()), and this is not possible on /// unconstructed variants: it would require some dynamic testing, which /// should not be the variant's responsibility. /// Swapping between built and (possibly) non-built is done with /// self_type::move (). template <typename T> void swap (self_type& that) YY_NOEXCEPT {]b4_parse_assert_if([[ ]b4_assert[ (yytypeid_); ]b4_assert[ (*yytypeid_ == *that.yytypeid_);]])[ std::swap (as<T> (), that.as<T> ()); } /// Move the content of \a that to this. /// /// Destroys \a that. template <typename T> void move (self_type& that) { # if 201103L <= YY_CPLUSPLUS emplace<T> (std::move (that.as<T> ())); # else emplace<T> (); swap<T> (that); # endif that.destroy<T> (); } # if 201103L <= YY_CPLUSPLUS /// Move the content of \a that to this. template <typename T> void move (self_type&& that) { emplace<T> (std::move (that.as<T> ())); that.destroy<T> (); } #endif /// Copy the content of \a that to this. template <typename T> void copy (const self_type& that) { emplace<T> (that.as<T> ()); } /// Destroy the stored \a T. template <typename T> void destroy () { as<T> ().~T ();]b4_parse_assert_if([ yytypeid_ = YY_NULLPTR;])[ } private: #if YY_CPLUSPLUS < 201103L /// Non copyable. semantic_type (const self_type&); /// Non copyable. self_type& operator= (const self_type&); #endif /// Accessor to raw memory as \a T. template <typename T> T* yyas_ () YY_NOEXCEPT { void *yyp = yybuffer_.yyraw; return static_cast<T*> (yyp); } /// Const accessor to raw memory as \a T. template <typename T> const T* yyas_ () const YY_NOEXCEPT { const void *yyp = yybuffer_.yyraw; return static_cast<const T*> (yyp); } /// An auxiliary type to compute the largest semantic type. union union_type {]b4_type_foreach([b4_char_sizeof])[ }; /// The size of the largest semantic type. enum { size = sizeof (union_type) }; /// A buffer to store semantic values. union { /// Strongest alignment constraints. long double yyalign_me; /// A buffer large enough to store any of the semantic values. char yyraw[size]; } yybuffer_;]b4_parse_assert_if([ /// Whether the content is built: if defined, the name of the stored type. const std::type_info *yytypeid_;])[ }; ]]) # How the semantic value is extracted when using variants. # b4_symbol_value(VAL, SYMBOL-NUM, [TYPE]) # ---------------------------------------- # See README. m4_define([b4_symbol_value], [m4_ifval([$3], [$1.as< $3 > ()], [m4_ifval([$2], [b4_symbol_if([$2], [has_type], [$1.as < b4_symbol([$2], [type]) > ()], [$1])], [$1])])]) # b4_symbol_value_template(VAL, SYMBOL-NUM, [TYPE]) # ------------------------------------------------- # Same as b4_symbol_value, but used in a template method. m4_define([b4_symbol_value_template], [m4_ifval([$3], [$1.template as< $3 > ()], [m4_ifval([$2], [b4_symbol_if([$2], [has_type], [$1.template as < b4_symbol([$2], [type]) > ()], [$1])], [$1])])]) ## ------------- ## ## make_SYMBOL. ## ## ------------- ## # _b4_includes_tokens(SYMBOL-NUM...) # ---------------------------------- # Expands to non-empty iff one of the SYMBOL-NUM denotes # a token. m4_define([_b4_is_token], [b4_symbol_if([$1], [is_token], [1])]) m4_define([_b4_includes_tokens], [m4_map([_b4_is_token], [$@])]) # _b4_token_maker_define(SYMBOL-NUM) # ---------------------------------- # Declare make_SYMBOL for SYMBOL-NUM. Use at class-level. m4_define([_b4_token_maker_define], [b4_token_visible_if([$1], [#if 201103L <= YY_CPLUSPLUS static symbol_type make_[]_b4_symbol([$1], [id]) (b4_join( b4_symbol_if([$1], [has_type], [b4_symbol([$1], [type]) v]), b4_locations_if([location_type l]))) { return symbol_type (b4_join([token::b4_symbol([$1], [id])], b4_symbol_if([$1], [has_type], [std::move (v)]), b4_locations_if([std::move (l)]))); } #else static symbol_type make_[]_b4_symbol([$1], [id]) (b4_join( b4_symbol_if([$1], [has_type], [const b4_symbol([$1], [type])& v]), b4_locations_if([const location_type& l]))) { return symbol_type (b4_join([token::b4_symbol([$1], [id])], b4_symbol_if([$1], [has_type], [v]), b4_locations_if([l]))); } #endif ])]) # b4_token_kind(SYMBOL-NUM) # ------------------------- # Some tokens don't have an ID. m4_define([b4_token_kind], [b4_symbol_if([$1], [has_id], [token::b4_symbol([$1], [id])], [b4_symbol([$1], [code])])]) # _b4_tok_in(SYMBOL-NUM, ...) # --------------------------- # See b4_tok_in below. The SYMBOL-NUMs... are tokens only. # # We iterate over the tokens to group them by "range" of token numbers (not # symbols numbers!). # # b4_fst is the start of that range. # b4_prev is the previous value. # b4_val is the current value. # If b4_val is the successor of b4_prev in token numbers, update the latter, # otherwise emit the code for range b4_fst .. b4_prev. # $1 is also used as a terminator in the foreach, but it will not be printed. # m4_define([_b4_tok_in], [m4_pushdef([b4_prev], [$1])dnl m4_pushdef([b4_fst], [$1])dnl m4_pushdef([b4_sep], [])dnl m4_foreach([b4_val], m4_dquote(m4_shift($@, $1)), [m4_if(b4_symbol(b4_val, [code]), m4_eval(b4_symbol(b4_prev, [code]) + 1), [], [b4_sep[]m4_if(b4_fst, b4_prev, [tok == b4_token_kind(b4_fst)], [(b4_token_kind(b4_fst) <= tok && tok <= b4_token_kind(b4_prev))])[]dnl m4_define([b4_fst], b4_val)dnl m4_define([b4_sep], [ || ])])dnl m4_define([b4_prev], b4_val)])dnl m4_popdef([b4_sep])dnl m4_popdef([b4_fst])dnl m4_popdef([b4_prev])dnl ]) # _b4_filter_tokens(SYMBOL-NUM, ...) # ---------------------------------- # Expand as the list of tokens amongst SYMBOL-NUM. m4_define([_b4_filter_tokens], [m4_pushdef([b4_sep])dnl m4_foreach([b4_val], [$@], [b4_symbol_if(b4_val, [is_token], [b4_sep[]b4_val[]m4_define([b4_sep], [,])])])dnl m4_popdef([b4_sep])dnl ]) # b4_tok_in(SYMBOL-NUM, ...) # --------------------------- # A C++ conditional that checks that `tok` is a member of this list of symbol # numbers. m4_define([b4_tok_in], [_$0(_b4_filter_tokens($@))]) # _b4_token_constructor_define(SYMBOL-NUM...) # ------------------------------------------- # Define a unique make_symbol for all the SYMBOL-NUM (they # have the same type). Use at class-level. m4_define([_b4_token_constructor_define], [m4_ifval(_b4_includes_tokens($@), [[#if 201103L <= YY_CPLUSPLUS symbol_type (]b4_join( [int tok], b4_symbol_if([$1], [has_type], [b4_symbol([$1], [type]) v]), b4_locations_if([location_type l]))[) : super_type(]b4_join([token_type (tok)], b4_symbol_if([$1], [has_type], [std::move (v)]), b4_locations_if([std::move (l)]))[) #else symbol_type (]b4_join( [int tok], b4_symbol_if([$1], [has_type], [const b4_symbol([$1], [type])& v]), b4_locations_if([const location_type& l]))[) : super_type(]b4_join([token_type (tok)], b4_symbol_if([$1], [has_type], [v]), b4_locations_if([l]))[) #endif {]b4_parse_assert_if([[ ]b4_assert[ (]b4_tok_in($@)[); ]])[} ]])]) # b4_basic_symbol_constructor_define(SYMBOL-NUM) # ---------------------------------------------- # Generate a constructor for basic_symbol from given type. m4_define([b4_basic_symbol_constructor_define], [[#if 201103L <= YY_CPLUSPLUS basic_symbol (]b4_join( [typename Base::kind_type t], b4_symbol_if([$1], [has_type], [b4_symbol([$1], [type])&& v]), b4_locations_if([location_type&& l]))[) : Base (t)]b4_symbol_if([$1], [has_type], [ , value (std::move (v))])[]b4_locations_if([ , location (std::move (l))])[ {} #else basic_symbol (]b4_join( [typename Base::kind_type t], b4_symbol_if([$1], [has_type], [const b4_symbol([$1], [type])& v]), b4_locations_if([const location_type& l]))[) : Base (t)]b4_symbol_if([$1], [has_type], [ , value (v)])[]b4_locations_if([ , location (l)])[ {} #endif ]]) # b4_token_constructor_define # --------------------------- # Define the overloaded versions of make_symbol for all the value types. m4_define([b4_token_constructor_define], [ // Implementation of make_symbol for each symbol type. b4_symbol_foreach([_b4_token_maker_define])]) PK r�!\@x(Ɖ � skeletons/stack.hhnu �[��� # C++ skeleton for Bison # Copyright (C) 2002-2015, 2018-2020 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/>. # b4_stack_file # ------------- # Name of the file containing the stack class, if we want this file. b4_defines_if([b4_required_version_if([30200], [], [m4_define([b4_stack_file], [stack.hh])])]) # b4_stack_define # --------------- m4_define([b4_stack_define], [[ /// A stack with random access from its top. template <typename T, typename S = std::vector<T> > class stack { public: // Hide our reversed order. typedef typename S::iterator iterator; typedef typename S::const_iterator const_iterator; typedef typename S::size_type size_type; typedef typename std::ptrdiff_t index_type; stack (size_type n = 200) : seq_ (n) {} #if 201103L <= YY_CPLUSPLUS /// Non copyable. stack (const stack&) = delete; /// Non copyable. stack& operator= (const stack&) = delete; #endif /// Random access. /// /// Index 0 returns the topmost element. const T& operator[] (index_type i) const { return seq_[size_type (size () - 1 - i)]; } /// Random access. /// /// Index 0 returns the topmost element. T& operator[] (index_type i) { return seq_[size_type (size () - 1 - i)]; } /// Steal the contents of \a t. /// /// Close to move-semantics. void push (YY_MOVE_REF (T) t) { seq_.push_back (T ()); operator[] (0).move (t); } /// Pop elements from the stack. void pop (std::ptrdiff_t n = 1) YY_NOEXCEPT { for (; 0 < n; --n) seq_.pop_back (); } /// Pop all elements from the stack. void clear () YY_NOEXCEPT { seq_.clear (); } /// Number of elements on the stack. index_type size () const YY_NOEXCEPT { return index_type (seq_.size ()); } /// Iterator on top of the stack (going downwards). const_iterator begin () const YY_NOEXCEPT { return seq_.begin (); } /// Bottom of the stack. const_iterator end () const YY_NOEXCEPT { return seq_.end (); } /// Present a slice of the top of a stack. class slice { public: slice (const stack& stack, index_type range) : stack_ (stack) , range_ (range) {} const T& operator[] (index_type i) const { return stack_[range_ - i]; } private: const stack& stack_; index_type range_; }; private: #if YY_CPLUSPLUS < 201103L /// Non copyable. stack (const stack&); /// Non copyable. stack& operator= (const stack&); #endif /// The wrapped container. S seq_; }; ]]) m4_ifdef([b4_stack_file], [b4_output_begin([b4_dir_prefix], [b4_stack_file])[ ]b4_generated_by[ // Starting with Bison 3.2, this file is useless: the structure it // used to define is now defined with the parser itself. // // To get rid of this file: // 1. add '%require "3.2"' (or newer) to your grammar file // 2. remove references to this file from your build system. ]b4_output_end[ ]]) PK r�!\�\ � 2 2 xslt/xml2dot.xslnu �[��� <?xml version="1.0" encoding="UTF-8"?> <!-- xml2dot.xsl - transform Bison XML Report into DOT. Copyright (C) 2007-2015, 2018-2020 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. 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/>. Written by Wojciech Polak <polak@gnu.org>. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:bison="http://www.gnu.org/software/bison/"> <xsl:import href="bison.xsl"/> <xsl:output method="text" encoding="UTF-8" indent="no"/> <xsl:template match="/"> <xsl:apply-templates select="bison-xml-report"/> </xsl:template> <xsl:template match="bison-xml-report"> <xsl:text>// Generated by GNU Bison </xsl:text> <xsl:value-of select="@version"/> <xsl:text>. </xsl:text> <xsl:text>// Report bugs to <</xsl:text> <xsl:value-of select="@bug-report"/> <xsl:text>>. </xsl:text> <xsl:text>// Home page: <</xsl:text> <xsl:value-of select="@url"/> <xsl:text>>. </xsl:text> <xsl:apply-templates select="automaton"> <xsl:with-param name="filename" select="filename"/> </xsl:apply-templates> </xsl:template> <xsl:template match="automaton"> <xsl:param name="filename"/> <xsl:text>digraph "</xsl:text> <xsl:call-template name="escape"> <xsl:with-param name="subject" select="$filename"/> </xsl:call-template> <xsl:text>" { node [fontname = courier, shape = box, colorscheme = paired6] edge [fontname = courier] </xsl:text> <xsl:apply-templates select="state"/> <xsl:text>} </xsl:text> </xsl:template> <xsl:template match="automaton/state"> <xsl:call-template name="output-node"> <xsl:with-param name="number" select="@number"/> <xsl:with-param name="label"> <xsl:apply-templates select="itemset/item"/> </xsl:with-param> </xsl:call-template> <xsl:apply-templates select="actions/transitions"/> <xsl:apply-templates select="actions/reductions"> <xsl:with-param name="staten"> <xsl:value-of select="@number"/> </xsl:with-param> </xsl:apply-templates> </xsl:template> <xsl:template match="actions/reductions"> <xsl:param name="staten"/> <xsl:for-each select='reduction'> <!-- These variables are needed because the current context can't be referred to directly in XPath expressions. --> <xsl:variable name="rul"> <xsl:value-of select="@rule"/> </xsl:variable> <xsl:variable name="ena"> <xsl:value-of select="@enabled"/> </xsl:variable> <!-- The foreach's body is protected by this, so that we are actually going to iterate once per reduction rule, and not per lookahead. --> <xsl:if test='not(preceding-sibling::*[@rule=$rul and @enabled=$ena])'> <xsl:variable name="rule"> <xsl:choose> <!-- The acceptation state is referred to as 'accept' in the XML, but just as '0' in the DOT. --> <xsl:when test="@rule='accept'"> <xsl:text>0</xsl:text> </xsl:when> <xsl:otherwise> <xsl:value-of select="@rule"/> </xsl:otherwise> </xsl:choose> </xsl:variable> <!-- The edge's beginning --> <xsl:call-template name="reduction-edge-start"> <xsl:with-param name="state" select="$staten"/> <xsl:with-param name="rule" select="$rule"/> <xsl:with-param name="enabled" select="@enabled"/> </xsl:call-template> <!-- The edge's tokens --> <!-- Don't show labels for the default action. In other cases, there will always be at least one token, so 'label="[]"' will not occur. --> <xsl:if test='$rule!=0 and not(../reduction[@enabled=$ena and @rule=$rule and @symbol="$default"])'> <xsl:text>label="[</xsl:text> <xsl:for-each select='../reduction[@enabled=$ena and @rule=$rule]'> <xsl:call-template name="escape"> <xsl:with-param name="subject" select="@symbol"/> </xsl:call-template> <xsl:if test="position() != last ()"> <xsl:text>, </xsl:text> </xsl:if> </xsl:for-each> <xsl:text>]", </xsl:text> </xsl:if> <!-- The edge's end --> <xsl:text>style=solid] </xsl:text> <!-- The diamond representing the reduction --> <xsl:call-template name="reduction-node"> <xsl:with-param name="state" select="$staten"/> <xsl:with-param name="rule" select="$rule"/> <xsl:with-param name="color"> <xsl:choose> <xsl:when test='@enabled="true"'> <xsl:text>3</xsl:text> </xsl:when> <xsl:otherwise> <xsl:text>5</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:with-param> </xsl:call-template> </xsl:if> </xsl:for-each> </xsl:template> <xsl:template match="actions/transitions"> <xsl:apply-templates select="transition"/> </xsl:template> <xsl:template match="item"> <xsl:param name="prev-rule-number" select="preceding-sibling::item[1]/@rule-number"/> <xsl:apply-templates select="key('bison:ruleByNumber', @rule-number)"> <xsl:with-param name="dot" select="@dot"/> <xsl:with-param name="num" select="@rule-number"/> <xsl:with-param name="prev-lhs" select="key('bison:ruleByNumber', $prev-rule-number)/lhs[text()]" /> </xsl:apply-templates> <xsl:apply-templates select="lookaheads"/> </xsl:template> <xsl:template match="rule"> <xsl:param name="dot"/> <xsl:param name="num"/> <xsl:param name="prev-lhs"/> <xsl:text> </xsl:text> <xsl:choose> <xsl:when test="$num < 10"> <xsl:text> </xsl:text> </xsl:when> <xsl:when test="$num < 100"> <xsl:text> </xsl:text> </xsl:when> <xsl:otherwise> <xsl:text></xsl:text> </xsl:otherwise> </xsl:choose> <xsl:value-of select="$num"/> <xsl:text> </xsl:text> <xsl:choose> <xsl:when test="$prev-lhs = lhs[text()]"> <xsl:call-template name="lpad"> <xsl:with-param name="str" select="'|'"/> <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 1"/> </xsl:call-template> </xsl:when> <xsl:otherwise> <xsl:value-of select="lhs"/> <xsl:text>:</xsl:text> </xsl:otherwise> </xsl:choose> <xsl:if test="$dot = 0"> <xsl:text> .</xsl:text> </xsl:if> <!-- RHS --> <xsl:for-each select="rhs/symbol|rhs/empty"> <xsl:apply-templates select="."/> <xsl:if test="$dot = position()"> <xsl:text> .</xsl:text> </xsl:if> </xsl:for-each> </xsl:template> <xsl:template match="symbol"> <xsl:text> </xsl:text> <xsl:value-of select="."/> </xsl:template> <xsl:template match="empty"> <xsl:text> %empty</xsl:text> </xsl:template> <xsl:template match="lookaheads"> <xsl:text> [</xsl:text> <xsl:apply-templates select="symbol"/> <xsl:text>]</xsl:text> </xsl:template> <xsl:template match="lookaheads/symbol"> <xsl:value-of select="."/> <xsl:if test="position() != last()"> <xsl:text>, </xsl:text> </xsl:if> </xsl:template> <xsl:template name="reduction-edge-start"> <xsl:param name="state"/> <xsl:param name="rule"/> <xsl:param name="enabled"/> <xsl:text> </xsl:text> <xsl:value-of select="$state"/> <xsl:text> -> "</xsl:text> <xsl:value-of select="$state"/> <xsl:text>R</xsl:text> <xsl:value-of select="$rule"/> <xsl:if test='$enabled = "false"'> <xsl:text>d</xsl:text> </xsl:if> <xsl:text>" [</xsl:text> </xsl:template> <xsl:template name="reduction-node"> <xsl:param name="state"/> <xsl:param name="rule"/> <xsl:param name="color"/> <xsl:text> "</xsl:text> <xsl:value-of select="$state"/> <xsl:text>R</xsl:text> <xsl:value-of select="$rule"/> <xsl:if test="$color = 5"> <xsl:text>d</xsl:text> </xsl:if> <xsl:text>" [label="</xsl:text> <xsl:choose> <xsl:when test="$rule = 0"> <xsl:text>Acc", fillcolor=1</xsl:text> </xsl:when> <xsl:otherwise> <xsl:text>R</xsl:text> <xsl:value-of select="$rule"/> <xsl:text>", fillcolor=</xsl:text> <xsl:value-of select="$color"/> </xsl:otherwise> </xsl:choose> <xsl:text>, shape=diamond, style=filled] </xsl:text> </xsl:template> <xsl:template match="transition"> <xsl:call-template name="output-edge"> <xsl:with-param name="src" select="../../../@number"/> <xsl:with-param name="dst" select="@state"/> <xsl:with-param name="style"> <xsl:choose> <xsl:when test="@symbol = 'error'"> <xsl:text>dotted</xsl:text> </xsl:when> <xsl:when test="@type = 'shift'"> <xsl:text>solid</xsl:text> </xsl:when> <xsl:otherwise> <xsl:text>dashed</xsl:text> </xsl:otherwise> </xsl:choose> </xsl:with-param> <xsl:with-param name="label"> <xsl:if test="not(@symbol = 'error')"> <xsl:value-of select="@symbol"/> </xsl:if> </xsl:with-param> </xsl:call-template> </xsl:template> <xsl:template name="output-node"> <xsl:param name="number"/> <xsl:param name="label"/> <xsl:text> </xsl:text> <xsl:value-of select="$number"/> <xsl:text> [label="</xsl:text> <xsl:text>State </xsl:text> <xsl:value-of select="$number"/> <xsl:text>\n</xsl:text> <xsl:call-template name="escape"> <xsl:with-param name="subject" select="$label"/> </xsl:call-template> <xsl:text>\l"] </xsl:text> </xsl:template> <xsl:template name="output-edge"> <xsl:param name="src"/> <xsl:param name="dst"/> <xsl:param name="style"/> <xsl:param name="label"/> <xsl:text> </xsl:text> <xsl:value-of select="$src"/> <xsl:text> -> </xsl:text> <xsl:value-of select="$dst"/> <xsl:text> [style=</xsl:text> <xsl:value-of select="$style"/> <xsl:if test="$label and $label != ''"> <xsl:text> label="</xsl:text> <xsl:call-template name="escape"> <xsl:with-param name="subject" select="$label"/> </xsl:call-template> <xsl:text>"</xsl:text> </xsl:if> <xsl:text>] </xsl:text> </xsl:template> <xsl:template name="escape"> <xsl:param name="subject"/> <!-- required --> <xsl:call-template name="string-replace"> <xsl:with-param name="subject"> <xsl:call-template name="string-replace"> <xsl:with-param name="subject"> <xsl:call-template name="string-replace"> <xsl:with-param name="subject" select="$subject"/> <xsl:with-param name="search" select="'\'"/> <xsl:with-param name="replace" select="'\\'"/> </xsl:call-template> </xsl:with-param> <xsl:with-param name="search" select="'"'"/> <xsl:with-param name="replace" select="'\"'"/> </xsl:call-template> </xsl:with-param> <xsl:with-param name="search" select="' '"/> <xsl:with-param name="replace" select="'\l'"/> </xsl:call-template> </xsl:template> <xsl:template name="string-replace"> <xsl:param name="subject"/> <xsl:param name="search"/> <xsl:param name="replace"/> <xsl:choose> <xsl:when test="contains($subject, $search)"> <xsl:variable name="before" select="substring-before($subject, $search)"/> <xsl:variable name="after" select="substring-after($subject, $search)"/> <xsl:value-of select="$before"/> <xsl:value-of select="$replace"/> <xsl:call-template name="string-replace"> <xsl:with-param name="subject" select="$after"/> <xsl:with-param name="search" select="$search"/> <xsl:with-param name="replace" select="$replace"/> </xsl:call-template> </xsl:when> <xsl:otherwise> <xsl:value-of select="$subject"/> </xsl:otherwise> </xsl:choose> </xsl:template> <xsl:template name="lpad"> <xsl:param name="str" select="''"/> <xsl:param name="pad" select="0"/> <xsl:variable name="diff" select="$pad - string-length($str)" /> <xsl:choose> <xsl:when test="$diff < 0"> <xsl:value-of select="$str"/> </xsl:when> <xsl:otherwise> <xsl:call-template name="space"> <xsl:with-param name="repeat" select="$diff"/> </xsl:call-template> <xsl:value-of select="$str"/> </xsl:otherwise> </xsl:choose> </xsl:template> </xsl:stylesheet> PK r�!\���$ $ xslt/bison.xslnu �[��� <?xml version="1.0" encoding="UTF-8"?> <!-- bison.xsl - common templates for Bison XSLT. Copyright (C) 2007-2015, 2018-2020 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. 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/>. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:bison="http://www.gnu.org/software/bison/"> <xsl:key name="bison:symbolByName" match="/bison-xml-report/grammar/nonterminals/nonterminal" use="@name" /> <xsl:key name="bison:symbolByName" match="/bison-xml-report/grammar/terminals/terminal" use="@name" /> <xsl:key name="bison:ruleByNumber" match="/bison-xml-report/grammar/rules/rule" use="@number" /> <xsl:key name="bison:ruleByLhs" match="/bison-xml-report/grammar/rules/rule[ @usefulness != 'useless-in-grammar']" use="lhs" /> <xsl:key name="bison:ruleByRhs" match="/bison-xml-report/grammar/rules/rule[ @usefulness != 'useless-in-grammar']" use="rhs/symbol" /> <!-- For the specified state, output: #sr-conflicts,#rr-conflicts --> <xsl:template match="state" mode="bison:count-conflicts"> <xsl:variable name="transitions" select="actions/transitions"/> <xsl:variable name="reductions" select="actions/reductions"/> <xsl:variable name="terminals" select=" $transitions/transition[@type='shift']/@symbol | $reductions/reduction/@symbol " /> <xsl:variable name="conflict-data"> <xsl:for-each select="$terminals"> <xsl:variable name="name" select="."/> <xsl:if test="generate-id($terminals[. = $name][1]) = generate-id(.)"> <xsl:variable name="shift-count" select="count($transitions/transition[@symbol=$name])" /> <xsl:variable name="reduce-count" select="count($reductions/reduction[@symbol=$name])" /> <xsl:if test="$shift-count > 0 and $reduce-count > 0"> <xsl:text>s</xsl:text> </xsl:if> <xsl:if test="$reduce-count > 1"> <xsl:text>r</xsl:text> </xsl:if> </xsl:if> </xsl:for-each> </xsl:variable> <xsl:value-of select="string-length(translate($conflict-data, 'r', ''))"/> <xsl:text>,</xsl:text> <xsl:value-of select="string-length(translate($conflict-data, 's', ''))"/> </xsl:template> <xsl:template name="space"> <xsl:param name="repeat">0</xsl:param> <xsl:param name="fill" select="' '"/> <xsl:if test="number($repeat) >= 1"> <xsl:call-template name="space"> <xsl:with-param name="repeat" select="$repeat - 1"/> <xsl:with-param name="fill" select="$fill"/> </xsl:call-template> <xsl:value-of select="$fill"/> </xsl:if> </xsl:template> </xsl:stylesheet> PK r�!\ ���Z �Z xslt/xml2xhtml.xslnu �[��� <?xml version="1.0" encoding="UTF-8"?> <!-- xml2html.xsl - transform Bison XML Report into XHTML. Copyright (C) 2007-2015, 2018-2020 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. 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/>. Written by Wojciech Polak <polak@gnu.org>. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" xmlns:bison="http://www.gnu.org/software/bison/"> <xsl:import href="bison.xsl"/> <xsl:output method="xml" encoding="UTF-8" doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" indent="yes"/> <xsl:template match="/"> <html> <head> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/> <title> <xsl:value-of select="bison-xml-report/filename"/> <xsl:text> - GNU Bison XML Automaton Report</xsl:text> </title> <style type="text/css"><![CDATA[ body { font-family: "Nimbus Sans L", Arial, sans-serif; font-size: 9pt; } a:link { color: #1f00ff; text-decoration: none; } a:visited { color: #1f00ff; text-decoration: none; } a:hover { color: red; } #menu a { text-decoration: underline; } .i { font-style: italic; } .pre { font-family: monospace; white-space: pre; } ol.decimal { list-style-type: decimal; } ol.lower-alpha { list-style-type: lower-alpha; } .dot { color: #cc0000; } #footer { margin-top: 3.5em; font-size: 7pt; } ]]></style> </head> <body> <xsl:apply-templates select="bison-xml-report"/> <xsl:text> </xsl:text> <div id="footer"><hr />This document was generated using <a href="http://www.gnu.org/software/bison/" title="GNU Bison"> GNU Bison <xsl:value-of select="/bison-xml-report/@version"/></a> XML Automaton Report.<br /> <!-- default copying notice --> Verbatim copying and distribution of this entire page is permitted in any medium, provided this notice is preserved.</div> </body> </html> </xsl:template> <xsl:template match="bison-xml-report"> <h1>GNU Bison XML Automaton Report</h1> <p> input grammar: <span class="i"><xsl:value-of select="filename"/></span> </p> <xsl:text> </xsl:text> <h3>Table of Contents</h3> <ul id="menu"> <li> <a href="#reductions">Reductions</a> <ul class="lower-alpha"> <li><a href="#nonterminals_useless_in_grammar">Nonterminals useless in grammar</a></li> <li><a href="#terminals_unused_in_grammar">Terminals unused in grammar</a></li> <li><a href="#rules_useless_in_grammar">Rules useless in grammar</a></li> <xsl:if test="grammar/rules/rule[@usefulness='useless-in-parser']"> <li><a href="#rules_useless_in_parser">Rules useless in parser due to conflicts</a></li> </xsl:if> </ul> </li> <li><a href="#conflicts">Conflicts</a></li> <li> <a href="#grammar">Grammar</a> <ul class="lower-alpha"> <li><a href="#grammar">Itemset</a></li> <li><a href="#terminals">Terminal symbols</a></li> <li><a href="#nonterminals">Nonterminal symbols</a></li> </ul> </li> <li><a href="#automaton">Automaton</a></li> </ul> <xsl:apply-templates select="grammar" mode="reductions"/> <xsl:apply-templates select="grammar" mode="useless-in-parser"/> <xsl:apply-templates select="automaton" mode="conflicts"/> <xsl:apply-templates select="grammar"/> <xsl:apply-templates select="automaton"/> </xsl:template> <xsl:template match="grammar" mode="reductions"> <h2> <a name="reductions"/> <xsl:text> Reductions</xsl:text> </h2> <xsl:apply-templates select="nonterminals" mode="useless-in-grammar"/> <xsl:apply-templates select="terminals" mode="unused-in-grammar"/> <xsl:apply-templates select="rules" mode="useless-in-grammar"/> </xsl:template> <xsl:template match="nonterminals" mode="useless-in-grammar"> <h3> <a name="nonterminals_useless_in_grammar"/> <xsl:text> Nonterminals useless in grammar</xsl:text> </h3> <xsl:text> </xsl:text> <xsl:if test="nonterminal[@usefulness='useless-in-grammar']"> <p class="pre"> <xsl:for-each select="nonterminal[@usefulness='useless-in-grammar']"> <xsl:text> </xsl:text> <xsl:value-of select="@name"/> <xsl:text> </xsl:text> </xsl:for-each> <xsl:text> </xsl:text> </p> </xsl:if> </xsl:template> <xsl:template match="terminals" mode="unused-in-grammar"> <h3> <a name="terminals_unused_in_grammar"/> <xsl:text> Terminals unused in grammar</xsl:text> </h3> <xsl:text> </xsl:text> <xsl:if test="terminal[@usefulness='unused-in-grammar']"> <p class="pre"> <xsl:for-each select="terminal[@usefulness='unused-in-grammar']"> <xsl:sort select="@symbol-number" data-type="number"/> <xsl:text> </xsl:text> <xsl:value-of select="@name"/> <xsl:text> </xsl:text> </xsl:for-each> <xsl:text> </xsl:text> </p> </xsl:if> </xsl:template> <xsl:template match="rules" mode="useless-in-grammar"> <h3> <a name="rules_useless_in_grammar"/> <xsl:text> Rules useless in grammar</xsl:text> </h3> <xsl:text> </xsl:text> <xsl:variable name="set" select="rule[@usefulness='useless-in-grammar']"/> <xsl:if test="$set"> <p class="pre"> <xsl:call-template name="style-rule-set"> <xsl:with-param name="rule-set" select="$set"/> </xsl:call-template> <xsl:text> </xsl:text> </p> </xsl:if> </xsl:template> <xsl:template match="grammar" mode="useless-in-parser"> <xsl:variable name="set" select="rules/rule[@usefulness='useless-in-parser']" /> <xsl:if test="$set"> <h2> <a name="rules_useless_in_parser"/> <xsl:text> Rules useless in parser due to conflicts</xsl:text> </h2> <xsl:text> </xsl:text> <p class="pre"> <xsl:call-template name="style-rule-set"> <xsl:with-param name="rule-set" select="$set"/> </xsl:call-template> </p> <xsl:text> </xsl:text> </xsl:if> </xsl:template> <xsl:template match="grammar"> <h2> <a name="grammar"/> <xsl:text> Grammar</xsl:text> </h2> <xsl:text> </xsl:text> <p class="pre"> <xsl:call-template name="style-rule-set"> <xsl:with-param name="anchor" select="'true'" /> <xsl:with-param name="rule-set" select="rules/rule[@usefulness!='useless-in-grammar']" /> </xsl:call-template> </p> <xsl:text> </xsl:text> <xsl:apply-templates select="terminals"/> <xsl:apply-templates select="nonterminals"/> </xsl:template> <xsl:template name="style-rule-set"> <xsl:param name="anchor"/> <xsl:param name="rule-set"/> <xsl:for-each select="$rule-set"> <xsl:apply-templates select="."> <xsl:with-param name="anchor" select="$anchor"/> <xsl:with-param name="pad" select="'3'"/> <xsl:with-param name="prev-lhs"> <xsl:if test="position()>1"> <xsl:variable name="position" select="position()"/> <xsl:value-of select="$rule-set[$position - 1]/lhs"/> </xsl:if> </xsl:with-param> </xsl:apply-templates> </xsl:for-each> </xsl:template> <xsl:template match="automaton" mode="conflicts"> <h2> <a name="conflicts"/> <xsl:text> Conflicts</xsl:text> </h2> <xsl:text> </xsl:text> <xsl:variable name="conflict-report"> <xsl:apply-templates select="state" mode="conflicts"/> </xsl:variable> <xsl:if test="string-length($conflict-report) != 0"> <p class="pre"> <xsl:copy-of select="$conflict-report"/> <xsl:text> </xsl:text> </p> </xsl:if> </xsl:template> <xsl:template match="state" mode="conflicts"> <xsl:variable name="conflict-counts"> <xsl:apply-templates select="." mode="bison:count-conflicts" /> </xsl:variable> <xsl:variable name="sr-count" select="substring-before($conflict-counts, ',')" /> <xsl:variable name="rr-count" select="substring-after($conflict-counts, ',')" /> <xsl:if test="$sr-count > 0 or $rr-count > 0"> <a> <xsl:attribute name="href"> <xsl:value-of select="concat('#state_', @number)"/> </xsl:attribute> <xsl:value-of select="concat('State ', @number)"/> </a> <xsl:text> conflicts:</xsl:text> <xsl:if test="$sr-count > 0"> <xsl:value-of select="concat(' ', $sr-count, ' shift/reduce')"/> <xsl:if test="$rr-count > 0"> <xsl:value-of select="(',')"/> </xsl:if> </xsl:if> <xsl:if test="$rr-count > 0"> <xsl:value-of select="concat(' ', $rr-count, ' reduce/reduce')"/> </xsl:if> <xsl:value-of select="' '"/> </xsl:if> </xsl:template> <xsl:template match="grammar/terminals"> <h3> <a name="terminals"/> <xsl:text> Terminals, with rules where they appear</xsl:text> </h3> <xsl:text> </xsl:text> <ul> <xsl:text> </xsl:text> <xsl:apply-templates select="terminal"/> </ul> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="grammar/nonterminals"> <h3> <a name="nonterminals"/> <xsl:text> Nonterminals, with rules where they appear</xsl:text> </h3> <xsl:text> </xsl:text> <ul> <xsl:text> </xsl:text> <xsl:apply-templates select="nonterminal[@usefulness!='useless-in-grammar']" /> </ul> </xsl:template> <xsl:template match="terminal"> <xsl:text> </xsl:text> <li> <b><xsl:value-of select="@name"/></b> <xsl:if test="string-length(@type) != 0"> <xsl:value-of select="concat(' <', @type, '>')"/> </xsl:if> <xsl:value-of select="concat(' (', @token-number, ')')"/> <xsl:for-each select="key('bison:ruleByRhs', @name)"> <xsl:apply-templates select="." mode="number-link"/> </xsl:for-each> </li> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="nonterminal"> <xsl:text> </xsl:text> <li> <b><xsl:value-of select="@name"/></b> <xsl:if test="string-length(@type) != 0"> <xsl:value-of select="concat(' <', @type, '>')"/> </xsl:if> <xsl:value-of select="concat(' (', @symbol-number, ')')"/> <xsl:text> </xsl:text> <ul> <xsl:text> </xsl:text> <xsl:if test="key('bison:ruleByLhs', @name)"> <xsl:text> </xsl:text> <li> <xsl:text>on left:</xsl:text> <xsl:for-each select="key('bison:ruleByLhs', @name)"> <xsl:apply-templates select="." mode="number-link"/> </xsl:for-each> </li> <xsl:text> </xsl:text> </xsl:if> <xsl:if test="key('bison:ruleByRhs', @name)"> <xsl:text> </xsl:text> <li> <xsl:text>on right:</xsl:text> <xsl:for-each select="key('bison:ruleByRhs', @name)"> <xsl:apply-templates select="." mode="number-link"/> </xsl:for-each> </li> <xsl:text> </xsl:text> </xsl:if> <xsl:text> </xsl:text> </ul> <xsl:text> </xsl:text> </li> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="rule" mode="number-link"> <xsl:text> </xsl:text> <a> <xsl:attribute name="href"> <xsl:value-of select="concat('#rule_', @number)"/> </xsl:attribute> <xsl:value-of select="@number"/> </a> </xsl:template> <xsl:template match="automaton"> <h2> <a name="automaton"/> <xsl:text> Automaton</xsl:text> </h2> <xsl:apply-templates select="state"> <xsl:with-param name="pad" select="'3'"/> </xsl:apply-templates> </xsl:template> <xsl:template match="automaton/state"> <xsl:param name="pad"/> <xsl:text> </xsl:text> <h3> <a> <xsl:attribute name="name"> <xsl:value-of select="concat('state_', @number)"/> </xsl:attribute> </a> <xsl:text>State </xsl:text> <xsl:value-of select="@number"/> </h3> <xsl:text> </xsl:text> <p class="pre"> <xsl:apply-templates select="itemset/item"> <xsl:with-param name="pad" select="$pad"/> </xsl:apply-templates> <xsl:apply-templates select="actions/transitions"> <xsl:with-param name="type" select="'shift'"/> </xsl:apply-templates> <xsl:apply-templates select="actions/errors"/> <xsl:apply-templates select="actions/reductions"/> <xsl:apply-templates select="actions/transitions"> <xsl:with-param name="type" select="'goto'"/> </xsl:apply-templates> <xsl:apply-templates select="solved-conflicts"/> </p> </xsl:template> <xsl:template match="actions/transitions"> <xsl:param name="type"/> <xsl:if test="transition[@type = $type]"> <xsl:text> </xsl:text> <xsl:apply-templates select="transition[@type = $type]"> <xsl:with-param name="pad"> <xsl:call-template name="max-width-symbol"> <xsl:with-param name="node" select="transition[@type = $type]"/> </xsl:call-template> </xsl:with-param> </xsl:apply-templates> </xsl:if> </xsl:template> <xsl:template match="actions/errors"> <xsl:if test="error"> <xsl:text> </xsl:text> <xsl:apply-templates select="error"> <xsl:with-param name="pad"> <xsl:call-template name="max-width-symbol"> <xsl:with-param name="node" select="error"/> </xsl:call-template> </xsl:with-param> </xsl:apply-templates> </xsl:if> </xsl:template> <xsl:template match="actions/reductions"> <xsl:if test="reduction"> <xsl:text> </xsl:text> <xsl:apply-templates select="reduction"> <xsl:with-param name="pad"> <xsl:call-template name="max-width-symbol"> <xsl:with-param name="node" select="reduction"/> </xsl:call-template> </xsl:with-param> </xsl:apply-templates> </xsl:if> </xsl:template> <xsl:template match="item"> <xsl:param name="pad"/> <xsl:param name="prev-rule-number" select="preceding-sibling::item[1]/@rule-number"/> <xsl:apply-templates select="key('bison:ruleByNumber', current()/@rule-number)" > <xsl:with-param name="itemset" select="'true'"/> <xsl:with-param name="pad" select="$pad"/> <xsl:with-param name="prev-lhs" select="key('bison:ruleByNumber', $prev-rule-number)/lhs[text()]" /> <xsl:with-param name="dot" select="@dot"/> <xsl:with-param name="lookaheads"> <xsl:apply-templates select="lookaheads"/> </xsl:with-param> </xsl:apply-templates> </xsl:template> <!-- anchor = 'true': define as an <a> anchor. itemset = 'true': show the items. --> <xsl:template match="rule"> <xsl:param name="anchor"/> <xsl:param name="itemset"/> <xsl:param name="pad"/> <xsl:param name="prev-lhs"/> <xsl:param name="dot"/> <xsl:param name="lookaheads"/> <xsl:if test="$itemset != 'true' and not($prev-lhs = lhs[text()])"> <xsl:text> </xsl:text> </xsl:if> <xsl:text> </xsl:text> <xsl:choose> <xsl:when test="$anchor = 'true'"> <a> <xsl:attribute name="name"> <xsl:value-of select="concat('rule_', @number)"/> </xsl:attribute> <xsl:call-template name="lpad"> <xsl:with-param name="str" select="string(@number)"/> <xsl:with-param name="pad" select="number($pad)"/> </xsl:call-template> </a> </xsl:when> <xsl:otherwise> <a> <xsl:attribute name="href"> <xsl:value-of select="concat('#rule_', @number)"/> </xsl:attribute> <xsl:call-template name="lpad"> <xsl:with-param name="str" select="string(@number)"/> <xsl:with-param name="pad" select="number($pad)"/> </xsl:call-template> </a> </xsl:otherwise> </xsl:choose> <xsl:text> </xsl:text> <!-- LHS --> <xsl:choose> <xsl:when test="$prev-lhs = lhs[text()]"> <xsl:call-template name="lpad"> <xsl:with-param name="str" select="'|'"/> <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 2"/> </xsl:call-template> </xsl:when> <xsl:otherwise> <span class="i"> <xsl:value-of select="lhs"/> </span> <xsl:text> →</xsl:text> </xsl:otherwise> </xsl:choose> <!-- RHS --> <xsl:for-each select="rhs/*"> <xsl:if test="position() = $dot + 1"> <xsl:text> </xsl:text> <span class="dot">•</span> </xsl:if> <xsl:apply-templates select="."/> <xsl:if test="position() = last() and position() = $dot"> <xsl:text> </xsl:text> <span class="dot">•</span> </xsl:if> </xsl:for-each> <xsl:if test="$lookaheads"> <xsl:value-of select="$lookaheads"/> </xsl:if> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="symbol"> <xsl:text> </xsl:text> <xsl:choose> <xsl:when test="name(key('bison:symbolByName', .)) = 'nonterminal'"> <span class="i"><xsl:value-of select="."/></span> </xsl:when> <xsl:otherwise> <b><xsl:value-of select="."/></b> </xsl:otherwise> </xsl:choose> </xsl:template> <xsl:template match="empty"> <xsl:text> %empty</xsl:text> </xsl:template> <xsl:template match="lookaheads"> <xsl:text> [</xsl:text> <xsl:apply-templates select="symbol"/> <xsl:text>]</xsl:text> </xsl:template> <xsl:template match="lookaheads/symbol"> <xsl:value-of select="."/> <xsl:if test="position() != last()"> <xsl:text>, </xsl:text> </xsl:if> </xsl:template> <xsl:template match="transition"> <xsl:param name="pad"/> <xsl:text> </xsl:text> <xsl:call-template name="rpad"> <xsl:with-param name="str" select="string(@symbol)"/> <xsl:with-param name="pad" select="number($pad) + 2"/> </xsl:call-template> <xsl:choose> <xsl:when test="@type = 'shift'"> <a> <xsl:attribute name="href"> <xsl:value-of select="concat('#state_', @state)"/> </xsl:attribute> <xsl:value-of select="concat('shift, and go to state ', @state)"/> </a> </xsl:when> <xsl:when test="@type = 'goto'"> <a> <xsl:attribute name="href"> <xsl:value-of select="concat('#state_', @state)"/> </xsl:attribute> <xsl:value-of select="concat('go to state ', @state)"/> </a> </xsl:when> </xsl:choose> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="error"> <xsl:param name="pad"/> <xsl:text> </xsl:text> <xsl:call-template name="rpad"> <xsl:with-param name="str" select="string(@symbol)"/> <xsl:with-param name="pad" select="number($pad) + 2"/> </xsl:call-template> <xsl:text>error</xsl:text> <xsl:text> (</xsl:text> <xsl:value-of select="text()"/> <xsl:text>)</xsl:text> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="reduction"> <xsl:param name="pad"/> <xsl:text> </xsl:text> <xsl:call-template name="rpad"> <xsl:with-param name="str" select="string(@symbol)"/> <xsl:with-param name="pad" select="number($pad) + 2"/> </xsl:call-template> <xsl:if test="@enabled = 'false'"> <xsl:text>[</xsl:text> </xsl:if> <xsl:choose> <xsl:when test="@rule = 'accept'"> <xsl:text>accept</xsl:text> </xsl:when> <xsl:otherwise> <a> <xsl:attribute name="href"> <xsl:value-of select="concat('#rule_', @rule)"/> </xsl:attribute> <xsl:value-of select="concat('reduce using rule ', @rule)"/> </a> <xsl:text> (</xsl:text> <xsl:value-of select="key('bison:ruleByNumber', current()/@rule)/lhs[text()]" /> <xsl:text>)</xsl:text> </xsl:otherwise> </xsl:choose> <xsl:if test="@enabled = 'false'"> <xsl:text>]</xsl:text> </xsl:if> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="solved-conflicts"> <xsl:if test="resolution"> <xsl:text> </xsl:text> <xsl:apply-templates select="resolution"/> </xsl:if> </xsl:template> <xsl:template match="resolution"> <xsl:text> Conflict between </xsl:text> <a> <xsl:attribute name="href"> <xsl:value-of select="concat('#rule_', @rule)"/> </xsl:attribute> <xsl:value-of select="concat('rule ',@rule)"/> </a> <xsl:text> and token </xsl:text> <xsl:value-of select="@symbol"/> <xsl:text> resolved as </xsl:text> <xsl:if test="@type = 'error'"> <xsl:text>an </xsl:text> </xsl:if> <xsl:value-of select="@type"/> <xsl:text> (</xsl:text> <xsl:value-of select="."/> <xsl:text>). </xsl:text> </xsl:template> <xsl:template name="max-width-symbol"> <xsl:param name="node"/> <xsl:variable name="longest"> <xsl:for-each select="$node"> <xsl:sort data-type="number" select="string-length(@symbol)" order="descending"/> <xsl:if test="position() = 1"> <xsl:value-of select="string-length(@symbol)"/> </xsl:if> </xsl:for-each> </xsl:variable> <xsl:value-of select="$longest"/> </xsl:template> <xsl:template name="lpad"> <xsl:param name="str" select="''"/> <xsl:param name="pad" select="0"/> <xsl:variable name="diff" select="$pad - string-length($str)" /> <xsl:choose> <xsl:when test="$diff < 0"> <xsl:value-of select="$str"/> </xsl:when> <xsl:otherwise> <xsl:call-template name="space"> <xsl:with-param name="repeat" select="$diff"/> </xsl:call-template> <xsl:value-of select="$str"/> </xsl:otherwise> </xsl:choose> </xsl:template> <xsl:template name="rpad"> <xsl:param name="str" select="''"/> <xsl:param name="pad" select="0"/> <xsl:variable name="diff" select="$pad - string-length($str)"/> <xsl:choose> <xsl:when test="$diff < 0"> <xsl:value-of select="$str"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="$str"/> <xsl:call-template name="space"> <xsl:with-param name="repeat" select="$diff"/> </xsl:call-template> </xsl:otherwise> </xsl:choose> </xsl:template> <xsl:template name="space"> <xsl:param name="repeat">0</xsl:param> <xsl:param name="fill" select="' '"/> <xsl:if test="number($repeat) >= 1"> <xsl:call-template name="space"> <xsl:with-param name="repeat" select="$repeat - 1"/> <xsl:with-param name="fill" select="$fill"/> </xsl:call-template> <xsl:value-of select="$fill"/> </xsl:if> </xsl:template> </xsl:stylesheet> PK r�!\� V�I �I xslt/xml2text.xslnu �[��� <?xml version="1.0" encoding="UTF-8"?> <!-- xml2text.xsl - transform Bison XML Report into plain text. Copyright (C) 2007-2015, 2018-2020 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. 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/>. Written by Wojciech Polak <polak@gnu.org>. --> <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:bison="http://www.gnu.org/software/bison/"> <xsl:import href="bison.xsl"/> <xsl:output method="text" encoding="UTF-8" indent="no"/> <xsl:template match="/"> <xsl:apply-templates select="bison-xml-report"/> </xsl:template> <xsl:template match="bison-xml-report"> <xsl:apply-templates select="grammar" mode="reductions"/> <xsl:apply-templates select="grammar" mode="useless-in-parser"/> <xsl:apply-templates select="automaton" mode="conflicts"/> <xsl:apply-templates select="grammar"/> <xsl:apply-templates select="automaton"/> </xsl:template> <xsl:template match="grammar" mode="reductions"> <xsl:apply-templates select="nonterminals" mode="useless-in-grammar"/> <xsl:apply-templates select="terminals" mode="unused-in-grammar"/> <xsl:apply-templates select="rules" mode="useless-in-grammar"/> </xsl:template> <xsl:template match="nonterminals" mode="useless-in-grammar"> <xsl:if test="nonterminal[@usefulness='useless-in-grammar']"> <xsl:text>Nonterminals useless in grammar </xsl:text> <xsl:for-each select="nonterminal[@usefulness='useless-in-grammar']"> <xsl:text> </xsl:text> <xsl:value-of select="@name"/> <xsl:text> </xsl:text> </xsl:for-each> <xsl:text> </xsl:text> </xsl:if> </xsl:template> <xsl:template match="terminals" mode="unused-in-grammar"> <xsl:if test="terminal[@usefulness='unused-in-grammar']"> <xsl:text>Terminals unused in grammar </xsl:text> <xsl:for-each select="terminal[@usefulness='unused-in-grammar']"> <xsl:sort select="@symbol-number" data-type="number"/> <xsl:text> </xsl:text> <xsl:value-of select="@name"/> <xsl:text> </xsl:text> </xsl:for-each> <xsl:text> </xsl:text> </xsl:if> </xsl:template> <xsl:template match="rules" mode="useless-in-grammar"> <xsl:variable name="set" select="rule[@usefulness='useless-in-grammar']"/> <xsl:if test="$set"> <xsl:text>Rules useless in grammar </xsl:text> <xsl:call-template name="style-rule-set"> <xsl:with-param name="rule-set" select="$set"/> </xsl:call-template> <xsl:text> </xsl:text> </xsl:if> </xsl:template> <xsl:template match="grammar" mode="useless-in-parser"> <xsl:variable name="set" select="rules/rule[@usefulness='useless-in-parser']" /> <xsl:if test="$set"> <xsl:text>Rules useless in parser due to conflicts </xsl:text> <xsl:call-template name="style-rule-set"> <xsl:with-param name="rule-set" select="$set"/> </xsl:call-template> <xsl:text> </xsl:text> </xsl:if> </xsl:template> <xsl:template match="grammar"> <xsl:text>Grammar </xsl:text> <xsl:call-template name="style-rule-set"> <xsl:with-param name="rule-set" select="rules/rule[@usefulness!='useless-in-grammar']" /> </xsl:call-template> <xsl:text> </xsl:text> <xsl:apply-templates select="terminals"/> <xsl:apply-templates select="nonterminals"/> </xsl:template> <xsl:template name="style-rule-set"> <xsl:param name="rule-set"/> <xsl:for-each select="$rule-set"> <xsl:apply-templates select="."> <xsl:with-param name="pad" select="'3'"/> <xsl:with-param name="prev-lhs"> <xsl:if test="position()>1"> <xsl:variable name="position" select="position()"/> <xsl:value-of select="$rule-set[$position - 1]/lhs"/> </xsl:if> </xsl:with-param> </xsl:apply-templates> </xsl:for-each> </xsl:template> <xsl:template match="grammar/terminals"> <xsl:text>Terminals, with rules where they appear </xsl:text> <xsl:apply-templates select="terminal"/> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="grammar/nonterminals"> <xsl:text>Nonterminals, with rules where they appear </xsl:text> <xsl:apply-templates select="nonterminal[@usefulness!='useless-in-grammar']"/> </xsl:template> <xsl:template match="terminal"> <xsl:text> </xsl:text> <xsl:value-of select="@name"/> <xsl:call-template name="line-wrap"> <xsl:with-param name="first-line-length"> <xsl:choose> <xsl:when test="string-length(@name) > 66">0</xsl:when> <xsl:otherwise> <xsl:value-of select="66 - string-length(@name)" /> </xsl:otherwise> </xsl:choose> </xsl:with-param> <xsl:with-param name="line-length" select="66" /> <xsl:with-param name="text"> <xsl:if test="string-length(@type) != 0"> <xsl:value-of select="concat(' <', @type, '>')"/> </xsl:if> <xsl:value-of select="concat(' (', @token-number, ')')"/> <xsl:for-each select="key('bison:ruleByRhs', @name)"> <xsl:value-of select="concat(' ', @number)"/> </xsl:for-each> </xsl:with-param> </xsl:call-template> </xsl:template> <xsl:template match="nonterminal"> <xsl:text> </xsl:text> <xsl:value-of select="@name"/> <xsl:if test="string-length(@type) != 0"> <xsl:value-of select="concat(' <', @type, '>')"/> </xsl:if> <xsl:value-of select="concat(' (', @symbol-number, ')')"/> <xsl:text> </xsl:text> <xsl:variable name="output"> <xsl:call-template name="line-wrap"> <xsl:with-param name="line-length" select="66" /> <xsl:with-param name="text"> <xsl:text> </xsl:text> <xsl:if test="key('bison:ruleByLhs', @name)"> <xsl:text>on@left:</xsl:text> <xsl:for-each select="key('bison:ruleByLhs', @name)"> <xsl:value-of select="concat(' ', @number)"/> </xsl:for-each> </xsl:if> <xsl:if test="key('bison:ruleByRhs', @name)"> <xsl:if test="key('bison:ruleByLhs', @name)"> <xsl:text> </xsl:text> </xsl:if> <xsl:text>on@right:</xsl:text> <xsl:for-each select="key('bison:ruleByRhs', @name)"> <xsl:value-of select="concat(' ', @number)"/> </xsl:for-each> </xsl:if> </xsl:with-param> </xsl:call-template> </xsl:variable> <xsl:value-of select="translate($output, '@', ' ')" /> </xsl:template> <xsl:template match="automaton" mode="conflicts"> <xsl:variable name="conflict-report"> <xsl:apply-templates select="state" mode="conflicts"/> </xsl:variable> <xsl:if test="string-length($conflict-report) != 0"> <xsl:value-of select="$conflict-report"/> <xsl:text> </xsl:text> </xsl:if> </xsl:template> <xsl:template match="state" mode="conflicts"> <xsl:variable name="conflict-counts"> <xsl:apply-templates select="." mode="bison:count-conflicts" /> </xsl:variable> <xsl:variable name="sr-count" select="substring-before($conflict-counts, ',')" /> <xsl:variable name="rr-count" select="substring-after($conflict-counts, ',')" /> <xsl:if test="$sr-count > 0 or $rr-count > 0"> <xsl:value-of select="concat('State ', @number, ' conflicts:')"/> <xsl:if test="$sr-count > 0"> <xsl:value-of select="concat(' ', $sr-count, ' shift/reduce')"/> <xsl:if test="$rr-count > 0"> <xsl:value-of select="(',')"/> </xsl:if> </xsl:if> <xsl:if test="$rr-count > 0"> <xsl:value-of select="concat(' ', $rr-count, ' reduce/reduce')"/> </xsl:if> <xsl:value-of select="' '"/> </xsl:if> </xsl:template> <xsl:template match="automaton"> <xsl:apply-templates select="state"> <xsl:with-param name="pad" select="'3'"/> </xsl:apply-templates> </xsl:template> <xsl:template match="automaton/state"> <xsl:param name="pad"/> <xsl:text> </xsl:text> <xsl:text>State </xsl:text> <xsl:value-of select="@number"/> <xsl:text> </xsl:text> <xsl:apply-templates select="itemset/item"> <xsl:with-param name="pad" select="$pad"/> </xsl:apply-templates> <xsl:apply-templates select="actions/transitions"> <xsl:with-param name="type" select="'shift'"/> </xsl:apply-templates> <xsl:apply-templates select="actions/errors"/> <xsl:apply-templates select="actions/reductions"/> <xsl:apply-templates select="actions/transitions"> <xsl:with-param name="type" select="'goto'"/> </xsl:apply-templates> <xsl:apply-templates select="solved-conflicts"/> </xsl:template> <xsl:template match="actions/transitions"> <xsl:param name="type"/> <xsl:if test="transition[@type = $type]"> <xsl:text> </xsl:text> <xsl:apply-templates select="transition[@type = $type]"> <xsl:with-param name="pad"> <xsl:call-template name="max-width-symbol"> <xsl:with-param name="node" select="transition[@type = $type]"/> </xsl:call-template> </xsl:with-param> </xsl:apply-templates> </xsl:if> </xsl:template> <xsl:template match="actions/errors"> <xsl:if test="error"> <xsl:text> </xsl:text> <xsl:apply-templates select="error"> <xsl:with-param name="pad"> <xsl:call-template name="max-width-symbol"> <xsl:with-param name="node" select="error"/> </xsl:call-template> </xsl:with-param> </xsl:apply-templates> </xsl:if> </xsl:template> <xsl:template match="actions/reductions"> <xsl:if test="reduction"> <xsl:text> </xsl:text> <xsl:apply-templates select="reduction"> <xsl:with-param name="pad"> <xsl:call-template name="max-width-symbol"> <xsl:with-param name="node" select="reduction"/> </xsl:call-template> </xsl:with-param> </xsl:apply-templates> </xsl:if> </xsl:template> <xsl:template match="item"> <xsl:param name="pad"/> <xsl:param name="prev-rule-number" select="preceding-sibling::item[1]/@rule-number"/> <xsl:apply-templates select="key('bison:ruleByNumber', current()/@rule-number)" > <xsl:with-param name="itemset" select="'true'"/> <xsl:with-param name="pad" select="$pad"/> <xsl:with-param name="prev-lhs" select="key('bison:ruleByNumber', $prev-rule-number)/lhs[text()]" /> <xsl:with-param name="dot" select="@dot"/> <xsl:with-param name="lookaheads"> <xsl:apply-templates select="lookaheads"/> </xsl:with-param> </xsl:apply-templates> </xsl:template> <xsl:template match="rule"> <xsl:param name="itemset"/> <xsl:param name="pad"/> <xsl:param name="prev-lhs"/> <xsl:param name="dot"/> <xsl:param name="lookaheads"/> <xsl:if test="$itemset != 'true' and not($prev-lhs = lhs[text()])"> <xsl:text> </xsl:text> </xsl:if> <xsl:text> </xsl:text> <xsl:call-template name="lpad"> <xsl:with-param name="str" select="string(@number)"/> <xsl:with-param name="pad" select="number($pad)"/> </xsl:call-template> <xsl:text> </xsl:text> <!-- LHS --> <xsl:choose> <xsl:when test="$itemset != 'true' and $prev-lhs = lhs[text()]"> <xsl:call-template name="lpad"> <xsl:with-param name="str" select="'|'"/> <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 1"/> </xsl:call-template> </xsl:when> <xsl:when test="$itemset = 'true' and $prev-lhs = lhs[text()]"> <xsl:call-template name="lpad"> <xsl:with-param name="str" select="'|'"/> <xsl:with-param name="pad" select="number(string-length(lhs[text()])) + 1"/> </xsl:call-template> </xsl:when> <xsl:otherwise> <xsl:value-of select="lhs"/> <xsl:text>:</xsl:text> </xsl:otherwise> </xsl:choose> <!-- RHS --> <xsl:for-each select="rhs/*"> <xsl:if test="position() = $dot + 1"> <xsl:text> •</xsl:text> </xsl:if> <xsl:apply-templates select="."/> <xsl:if test="position() = last() and position() = $dot"> <xsl:text> •</xsl:text> </xsl:if> </xsl:for-each> <xsl:if test="$lookaheads"> <xsl:value-of select="$lookaheads"/> </xsl:if> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="symbol"> <xsl:text> </xsl:text> <xsl:value-of select="."/> </xsl:template> <xsl:template match="empty"> <xsl:text> %empty</xsl:text> </xsl:template> <xsl:template match="lookaheads"> <xsl:text> [</xsl:text> <xsl:apply-templates select="symbol"/> <xsl:text>]</xsl:text> </xsl:template> <xsl:template match="lookaheads/symbol"> <xsl:value-of select="."/> <xsl:if test="position() != last()"> <xsl:text>, </xsl:text> </xsl:if> </xsl:template> <xsl:template match="transition"> <xsl:param name="pad"/> <xsl:text> </xsl:text> <xsl:call-template name="rpad"> <xsl:with-param name="str" select="string(@symbol)"/> <xsl:with-param name="pad" select="number($pad) + 2"/> </xsl:call-template> <xsl:choose> <xsl:when test="@type = 'shift'"> <xsl:text>shift, and go to state </xsl:text> <xsl:value-of select="@state"/> </xsl:when> <xsl:when test="@type = 'goto'"> <xsl:text>go to state </xsl:text> <xsl:value-of select="@state"/> </xsl:when> </xsl:choose> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="error"> <xsl:param name="pad"/> <xsl:text> </xsl:text> <xsl:call-template name="rpad"> <xsl:with-param name="str" select="string(@symbol)"/> <xsl:with-param name="pad" select="number($pad) + 2"/> </xsl:call-template> <xsl:text>error</xsl:text> <xsl:text> (</xsl:text> <xsl:value-of select="text()"/> <xsl:text>)</xsl:text> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="reduction"> <xsl:param name="pad"/> <xsl:text> </xsl:text> <xsl:call-template name="rpad"> <xsl:with-param name="str" select="string(@symbol)"/> <xsl:with-param name="pad" select="number($pad) + 2"/> </xsl:call-template> <xsl:if test="@enabled = 'false'"> <xsl:text>[</xsl:text> </xsl:if> <xsl:choose> <xsl:when test="@rule = 'accept'"> <xsl:text>accept</xsl:text> </xsl:when> <xsl:otherwise> <xsl:text>reduce using rule </xsl:text> <xsl:value-of select="@rule"/> <xsl:text> (</xsl:text> <xsl:value-of select="key('bison:ruleByNumber', current()/@rule)/lhs[text()]"/> <xsl:text>)</xsl:text> </xsl:otherwise> </xsl:choose> <xsl:if test="@enabled = 'false'"> <xsl:text>]</xsl:text> </xsl:if> <xsl:text> </xsl:text> </xsl:template> <xsl:template match="solved-conflicts"> <xsl:if test="resolution"> <xsl:text> </xsl:text> <xsl:apply-templates select="resolution"/> </xsl:if> </xsl:template> <xsl:template match="resolution"> <xsl:text> Conflict between rule </xsl:text> <xsl:value-of select="@rule"/> <xsl:text> and token </xsl:text> <xsl:value-of select="@symbol"/> <xsl:text> resolved as </xsl:text> <xsl:if test="@type = 'error'"> <xsl:text>an </xsl:text> </xsl:if> <xsl:value-of select="@type"/> <xsl:text> (</xsl:text> <xsl:value-of select="."/> <xsl:text>). </xsl:text> </xsl:template> <xsl:template name="max-width-symbol"> <xsl:param name="node"/> <xsl:variable name="longest"> <xsl:for-each select="$node"> <xsl:sort data-type="number" select="string-length(@symbol)" order="descending"/> <xsl:if test="position() = 1"> <xsl:value-of select="string-length(@symbol)"/> </xsl:if> </xsl:for-each> </xsl:variable> <xsl:value-of select="$longest"/> </xsl:template> <xsl:template name="lpad"> <xsl:param name="str" select="''"/> <xsl:param name="pad" select="0"/> <xsl:variable name="diff" select="$pad - string-length($str)" /> <xsl:choose> <xsl:when test="$diff < 0"> <xsl:value-of select="$str"/> </xsl:when> <xsl:otherwise> <xsl:call-template name="space"> <xsl:with-param name="repeat" select="$diff"/> </xsl:call-template> <xsl:value-of select="$str"/> </xsl:otherwise> </xsl:choose> </xsl:template> <xsl:template name="rpad"> <xsl:param name="str" select="''"/> <xsl:param name="pad" select="0"/> <xsl:variable name="diff" select="$pad - string-length($str)"/> <xsl:choose> <xsl:when test="$diff < 0"> <xsl:value-of select="$str"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="$str"/> <xsl:call-template name="space"> <xsl:with-param name="repeat" select="$diff"/> </xsl:call-template> </xsl:otherwise> </xsl:choose> </xsl:template> <xsl:template name="line-wrap"> <xsl:param name="line-length"/> <!-- required --> <xsl:param name="first-line-length" select="$line-length"/> <xsl:param name="text"/> <!-- required --> <xsl:choose> <xsl:when test="normalize-space($text) = ''" /> <xsl:when test="string-length($text) <= $first-line-length"> <xsl:value-of select="concat($text, ' ')" /> </xsl:when> <xsl:otherwise> <xsl:variable name="break-pos"> <xsl:call-template name="ws-search"> <xsl:with-param name="text" select="$text" /> <xsl:with-param name="start" select="$first-line-length+1" /> </xsl:call-template> </xsl:variable> <xsl:value-of select="substring($text, 1, $break-pos - 1)" /> <xsl:text> </xsl:text> <xsl:call-template name="line-wrap"> <xsl:with-param name="line-length" select="$line-length" /> <xsl:with-param name="text" select="concat(' ', substring($text, $break-pos+1))" /> </xsl:call-template> </xsl:otherwise> </xsl:choose> </xsl:template> <xsl:template name="ws-search"> <xsl:param name="text"/> <!-- required --> <xsl:param name="start"/> <!-- required --> <xsl:variable name="search-text" select="substring($text, $start)" /> <xsl:choose> <xsl:when test="not(contains($search-text, ' '))"> <xsl:value-of select="string-length($text)+1" /> </xsl:when> <xsl:otherwise> <xsl:value-of select="$start + string-length(substring-before($search-text, ' '))" /> </xsl:otherwise> </xsl:choose> </xsl:template> </xsl:stylesheet> PK r�!\���zr r README.mdnu �[��� This directory contains data needed by Bison. # Directory Content ## Skeletons Bison skeletons: the general shapes of the different parser kinds, that are specialized for specific grammars by the bison program. Currently, the supported skeletons are: - yacc.c It used to be named bison.simple: it corresponds to C Yacc compatible LALR(1) parsers. - lalr1.cc Produces a C++ parser class. - lalr1.java Produces a Java parser class. - glr.c A Generalized LR C parser based on Bison's LALR(1) tables. - glr.cc A Generalized LR C++ parser. Actually a C++ wrapper around glr.c. These skeletons are the only ones supported by the Bison team. Because the interface between skeletons and the bison program is not finished, *we are not bound to it*. In particular, Bison is not mature enough for us to consider that "foreign skeletons" are supported. ## m4sugar This directory contains M4sugar, sort of an extended library for M4, which is used by Bison to instantiate the skeletons. ## xslt This directory contains XSLT programs that transform Bison's XML output into various formats. - bison.xsl A library of routines used by the other XSLT programs. - xml2dot.xsl Conversion into GraphViz's dot format. - xml2text.xsl Conversion into text. - xml2xhtml.xsl Conversion into XHTML. # Implementation Notes About the Skeletons "Skeleton" in Bison parlance means "backend": a skeleton is fed by the bison executable with LR tables, facts about the symbols, etc. and they generate the output (say parser.cc, parser.hh, location.hh, etc.). They are only in charge of generating the parser and its auxiliary files, they do not generate the XML output, the parser.output reports, nor the graphical rendering. The bits of information passing from bison to the backend is named "muscles". Muscles are passed to M4 via its standard input: it's a set of m4 definitions. To see them, use `--trace=muscles`. Except for muscles, whose names are generated by bison, the skeletons have no constraint at all on the macro names: there is no technical/theoretical limitation, as long as you generate the output, you can do what you want. However, of course, that would be a bad idea if, say, the C and C++ skeletons used different approaches and had completely different implementations. That would be a maintenance nightmare. Below, we document some of the macros that we use in several of the skeletons. If you are to write a new skeleton, please, implement them for your language. Overall, be sure to follow the same patterns as the existing skeletons. ## Symbols ### `b4_symbol(NUM, FIELD)` In order to unify the handling of the various aspects of symbols (tag, type name, whether terminal, etc.), bison.exe defines one macro per (token, field), where field can `has_id`, `id`, etc.: see `prepare_symbols_definitions()` in `src/output.c`. The macro `b4_symbol(NUM, FIELD)` gives access to the following FIELDS: - `has_id`: 0 or 1 Whether the symbol has an `id`. - `id`: string (e.g., `exp`, `NUM`, or `TOK_NUM` with api.token.prefix) If `has_id`, the name of the token kind (prefixed by api.token.prefix if defined), otherwise empty. Guaranteed to be usable as a C identifier. This is used to define the token kind (i.e., the enum used by the return value of yylex). Should be named `token_kind`. - `tag`: string A human readable representation of the symbol. Can be `'foo'`, `'foo.id'`, `'"foo"'` etc. - `code`: integer The token code associated to the token kind `id`. The external number as used by yylex. Can be ASCII code when a character, some number chosen by bison, or some user number in the case of `%token FOO <NUM>`. Corresponds to `yychar` in `yacc.c`. - `is_token`: 0 or 1 Whether this is a terminal symbol. - `kind_base`: string (e.g., `YYSYMBOL_exp`, `YYSYMBOL_NUM`) The base of the symbol kind, i.e., the enumerator of this symbol (token or nonterminal) which is mapped to its `number`. - `kind`: string Same as `kind_base`, but possibly with a prefix in some languages. E.g., EOF's `kind_base` and `kind` are `YYSYMBOL_YYEOF` in C, but are `S_YYEMPTY` and `symbol_kind::S_YYEMPTY` in C++. - `number`: integer The code associated to the `kind`. The internal number (computed from the external number by yytranslate). Corresponds to yytoken in yacc.c. This is the same number that serves as key in b4_symbol(NUM, FIELD). In bison, symbols are first assigned increasing numbers in order of appearance (but tokens first, then nterms). After grammar reduction, unused nterms are then renumbered to appear last (i.e., first tokens, then used nterms and finally unused nterms). This final number NUM is the one contained in this field, and it is the one used as key in `b4_symbol(NUM, FIELD)`. The code of the rule actions, however, is emitted before we know what symbols are unused, so they use the original numbers. To avoid confusion, they actually use "orig NUM" instead of just "NUM". bison also emits definitions for `b4_symbol(orig NUM, number)` that map from original numbers to the new ones. `b4_symbol` actually resolves `orig NUM` in the other case, i.e., `b4_symbol(orig 42, tag)` would return the tag of the symbols whose original number was 42. - `has_type`: 0, 1 Whether has a semantic value. - `type_tag`: string When api.value.type=union, the generated name for the union member. yytype_INT etc. for symbols that has_id, otherwise yytype_1 etc. - `type` If it has a semantic value, its type tag, or, if variant are used, its type. In the case of api.value.type=union, type is the real type (e.g. int). - `has_printer`: 0, 1 - `printer`: string - `printer_file`: string - `printer_line`: integer - `printer_loc`: location If the symbol has a printer, everything about it. - `has_destructor`, `destructor`, `destructor_file`, `destructor_line`, `destructor_loc` Likewise. ### `b4_symbol_value(VAL, [SYMBOL-NUM], [TYPE-TAG])` Expansion of $$, $1, $<TYPE-TAG>3, etc. The semantic value from a given VAL. - `VAL`: some semantic value storage (typically a union). e.g., `yylval` - `SYMBOL-NUM`: the symbol number from which we extract the type tag. - `TYPE-TAG`, the user forced the `<TYPE-TAG>`. The result can be used safely, it is put in parens to avoid nasty precedence issues. ### `b4_lhs_value(SYMBOL-NUM, [TYPE])` Expansion of `$$` or `$<TYPE>$`, for symbol `SYMBOL-NUM`. ### `b4_rhs_data(RULE-LENGTH, POS)` The data corresponding to the symbol `#POS`, where the current rule has `RULE-LENGTH` symbols on RHS. ### `b4_rhs_value(RULE-LENGTH, POS, SYMBOL-NUM, [TYPE])` Expansion of `$<TYPE>POS`, where the current rule has `RULE-LENGTH` symbols on RHS. <!-- Local Variables: mode: markdown fill-column: 76 ispell-dictionary: "american" End: Copyright (C) 2002, 2008-2015, 2018-2020 Free Software Foundation, Inc. This file is part of GNU Bison. 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/>. --> PK r�!\ �6�F F bison-default.cssnu �[��� /* Default styling rules for Bison when doing terminal output. Copyright (C) 2019-2020 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 <https://www.gnu.org/licenses/>. */ /* This is an experimental feature. The class names may change in the future. */ /* Diagnostics. */ .warning { color: purple; } .error { color: red; } .note { color: cyan; } .fixit-insert { color: green; } /* Semantic values in Bison's own parser traces. */ .value { color: green; } /* "Sections" in traces (--trace). */ .trace0 { color: green; } /* Syntax error messages. */ .expected { color: green; } .unexpected { color: red; } /* Counterexamples. */ /* Cex: point in rule. */ .cex-dot { color: red; } /* Cex: coloring various rules. */ .cex-0 { color: yellow; } .cex-1 { color: green; } .cex-2 { color: blue; } .cex-3 { color: purple; } .cex-4 { color: violet; } .cex-5 { color: orange; } .cex-6 { color: brown; } .cex-7 { color: mauve; } .cex-8 { color: #013220; } /* Dark green. */ .cex-9 { color: #e75480; } /* Dark pink. */ .cex-10 { color: cyan; } .cex-11 { color: orange; } /* Cex: derivation rewriting steps. */ .cex-step { font-style: italic; } /* Cex: leaves of a derivation. */ .cex-leaf { font-weight: 600; } PK �s�[,D��� � TODOnu �[��� PK �s�[6��S�i �i :� NEWSnu �[��� PK �s�[�&Z�� � � AUTHORSnu �[��� PK �s�[|�wfK� K� � COPYINGnu �[��� PK �s�[�,���- �- �} THANKSnu �[��� PK �s�[�jj j �� READMEnu �[��� PK �s�[�� � I� ChangeLognu �[��� PK r�!\�JBa�� �� sf m4sugar/m4sugar.m4nu �[��� PK r�!\��+֣9 �9 nD m4sugar/foreach.m4nu �[��� PK r�!\!ƥ�ǐ ǐ S~ skeletons/lalr1.javanu �[��� PK r�!\��k k ^ skeletons/yacc.cnu �[��� PK r�!\I�@�c1 c1 & skeletons/glr.ccnu �[��� PK r�!\R���) �) �W skeletons/d.m4nu �[��� PK r�!\��!�h h ԁ skeletons/README-D.txtnu �[��� PK r�!\�a;9 9 �� skeletons/java.m4nu �[��� PK r�!\�ibL�( �( �� skeletons/location.ccnu �[��� PK r�!\�-N � � �� skeletons/c++-skel.m4nu �[��� PK r�!\y�;�� �� g� skeletons/c.m4nu �[��� PK r�!\VdsBT� T� ;q skeletons/lalr1.ccnu �[��� PK r�!\��4M�c �c �9 skeletons/glr.cnu �[��� PK r�!\�~Z�o o �� skeletons/d-skel.m4nu �[��� PK r�!\� ] G� skeletons/c-like.m4nu �[��� PK r�!\�E�#� #� �� skeletons/bison.m4nu �[��� PK r�!\5M� � �P skeletons/java-skel.m4nu �[��� PK r�!\5��^w ^w �U skeletons/lalr1.dnu �[��� PK r�!\�r�W W f� skeletons/traceon.m4nu �[��� PK r�!\C�9u�R �R � skeletons/c++.m4nu �[��� PK r�!\ �W� � ! skeletons/c-skel.m4nu �[��� PK r�!\�3�M�: �: �% skeletons/variant.hhnu �[��� PK r�!\@x(Ɖ � �` skeletons/stack.hhnu �[��� PK r�!\�\ � 2 2 �p xslt/xml2dot.xslnu �[��� PK r�!\���$ $ ֢ xslt/bison.xslnu �[��� PK r�!\ ���Z �Z 8� xslt/xml2xhtml.xslnu �[��� PK r�!\� V�I �I K xslt/xml2text.xslnu �[��� PK r�!\���zr r =U README.mdnu �[��� PK r�!\ �6�F F �r bison-default.cssnu �[��� PK $ $ ( oz
| ver. 1.6 |
Github
|
.
| PHP 8.2.30 | ??????????? ?????????: 0.03 |
proxy
|
phpinfo
|
???????????