X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/aa96fda183953df7df0b6b2d59b6f443b11e42ad..db8837cbe1210e9df3da80472abee9b9896fd152:/ChangeLog diff --git a/ChangeLog b/ChangeLog index a219369c..401bea13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,152 @@ 2002-04-07 Akim Demaille - * src/output.c (output_rule_data): Fix various range errors: - `rules' starts at 1, not 0. + Rename all the `bucket's as `symbol_t'. + + * src/gram.c, src/gram.h, src/lex.c, src/lex.h, src/output.c, + * src/reader.c, src/reader.h, src/reduce.c, src/state.h, + * src/symtab.c, src/symtab.h (bucket): Rename as... + (symbol_t): this. + (symbol_list_new, bucket_check_defined, bucket_make_alias) + (bucket_check_alias_consistence, bucket_pack, bucket_translation) + (bucket_new, bucket_free, hash_compare_bucket, hash_bucket) + (buckets_new, buckets_free, buckets_do): Rename as... + (symbol_list_new, symbol_check_defined, symbol_make_alias) + (symbol_check_alias_consistence, symbol_pack, symbol_translation) + (symbol_new, symbol_free, hash_compare_symbol_t, hash_symbol_t) + (symbols_new, symbols_free, symbols_do): these. 2002-04-07 Akim Demaille - Remove the useless rules from the parser. + Use lib/hash for the symbol table. + + * src/gram.c (ntokens): Initialize to 1, to reserve a slot for + EOF. + * src/lex.c (lex): Set the `number' member of new terminals. + * src/reader.c (bucket_check_defined, bucket_make_alias) + (bucket_check_alias_consistence, bucket_translation): New. + (reader, grammar_free, readgram, token_translations_init) + (packsymbols): Adjust. + (reader): Number the predefined tokens. + * src/reduce.c (inaccessable_symbols): Just use hard coded numbers + for predefined tokens. + * src/symtab.h (bucket): Remove all the hash table related + members. + * src/symtab.c (symtab): Replace by... + (bucket_table): this. + (bucket_new, bucket_free, hash_compare_bucket, hash_bucket) + (buckets_new, buckets_do): New. + +2002-04-07 Akim Demaille + + * src/gram.c (nitems, nrules, nsyms, ntokens, nvars, nritems) + (start_symbol, max_user_token_number, semantic_parser) + (error_token_number): Initialize. + * src/reader.c (grammar, start_flag, startval, typed, lastprec): + Initialize. + (reader): Don't. + (errtoken, eoftoken, undeftoken, axiom): Extern. + +2002-04-07 Akim Demaille + + * src/gram.h (rule_s): prec and precsym are now pointers + to the bucket giving the priority/associativity. + Member `associativity' removed: useless. + * src/reduce.c, src/conflicts.c: Adjust. + +2002-04-07 Akim Demaille + + * src/lalr.c, src/LR0.c, src/closure.c, src/gram.c, src/reduce.c: + Properly escape the symbols' TAG when outputting them. + +2002-04-07 Akim Demaille + + * src/lalr.h (LA): Is a bitsetv, not bitset*. + + +2002-04-07 Akim Demaille + + * src/lalr.h, src/lalr.c (LAruleno): Replace with... + (LArule): this, which is an array to rule_t*. + * src/print.c, src/conflicts.c: Adjust. + + +2002-04-07 Akim Demaille + + * src/gram.h (rule_t): Rename `number' as `user_number'. + `number' is a new member. + Adjust dependencies. + * src/reduce.c (reduce_grammar_tables): Renumber rule_t.number. + +2002-04-07 Akim Demaille + + As a result of the previous patch, it is no longer needed + to reorder ritem itself. + + * src/reduce.c (reduce_grammar_tables): Don't sort RITEM. + +2002-04-07 Akim Demaille + + Be sure never to walk through RITEMS, but use only data related to + the rules themselves. RITEMS should be banished. + + * src/output.c (output_token_translations): Rename as... + (prepare_tokens): this. + In addition to `translate', prepare the muscles `tname' and + `toknum', which were handled by... + (output_rule_data): this. + Remove, and move the remainder of its outputs into... + (prepare_rules): this new routines, which also merges content from + (output_gram): this. + (prepare_rules): Be sure never to walk through RITEMS. + (output_stos): Rename as... + (prepare_stos): this. + (output): Always invoke prepare_states, after all, just don't use it + in the output if you don't need it. + +2002-04-07 Akim Demaille + + * src/LR0.c (new_state): Display `nstates' as the name of the + newly created state. + Adjust to initialize first_state and last_state if needed. + Be sure to distinguish the initial from the final state. + (new_states): Create the itemset of the initial state, and use + new_state. + * src/closure.c (closure): Now that the initial state has its + items properly set, there is no need for a special case when + creating `ruleset'. + + As a result, now the rule 0, reducing to $axiom, is visible in the + outputs. Adjust the test suite. + + * tests/conflicts.at (Solved SR Conflicts) + (Unresolved SR Conflicts): Adjust. + * tests/regression.at (Web2c Report, Rule Line Numbers): Idem. + * tests/conflicts.at (S/R in initial): New. + +2002-04-07 Akim Demaille - * src/gram.h, src/gram.c (rules_swap, rule_rhs_length): New. - (ritem_longest_rhs): Use the latter. + * src/LR0.c (allocate_itemsets): Don't loop over ritem: loop over + the RHS of the rules. + * src/output.c (output_gram): Likewise. + +2002-04-07 Akim Demaille + + * src/gram.h (rule_t): `lhs' is now a pointer to the symbol's + bucket. + Adjust all dependencies. + * src/reduce.c (nonterminals_reduce): Don't forget to renumber the + `number' of the buckets too. + * src/gram.h: Include `symtab.h'. + (associativity): Move to... + * src/symtab.h: here. + No longer include `gram.h'. + + +2002-04-07 Akim Demaille + + * src/gram.h, src/gram.c (rules_rhs_length): New. + (ritem_longest_rhs): Use it. * src/gram.h (rule_t): `number' is a new member. * src/reader.c (packgram): Set it. * src/reduce.c (reduce_grammar_tables): Move the useless rules at @@ -19,470 +156,32 @@ the usefulness of a rule, as useless rules are beyond `nrules + 1'. * tests/reduce.at (Reduced Automaton): New test. -diff -x *.po -ur -x testsuite bison-1.49a/NEWS bison/NEWS ---- bison-1.49a/NEWS Sun Apr 7 17:36:56 2002 -+++ bison/NEWS Sun Apr 7 18:19:39 2002 -@@ -3,6 +3,10 @@ - - Changes in version 1.49a: - -+* Useless rules are actually removed. -+ Before, Bison reported the useless rules, but, although not used, -+ included them in the parsers. -+ - * False `Token not used' report fixed. - On a grammar such as - -diff -x *.po -ur -x testsuite bison-1.49a/src/gram.c bison/src/gram.c ---- bison-1.49a/src/gram.c Sun Apr 7 17:36:56 2002 -+++ bison/src/gram.c Sun Apr 7 18:19:39 2002 -@@ -1,5 +1,5 @@ - /* Allocate input grammar variables for bison, -- Copyright 1984, 1986, 1989, 2001 Free Software Foundation, Inc. -+ Copyright 1984, 1986, 1989, 2001, 2002 Free Software Foundation, Inc. - - This file is part of Bison, the GNU Compiler Compiler. - -@@ -51,6 +51,51 @@ - int error_token_number; - - -+/*----------------------------------. -+| Swap the rules number R1 and R2. | -+`----------------------------------*/ -+ -+void -+rules_swap (int r1, int r2) -+{ -+ /* The easy part: swap the immediate contents of the structures. */ -+ { -+ rule_t rule = rules[r1]; -+ rules[r1] = rules[r2]; -+ rules[r2] = rule; -+ } -+ -+ /* The first negative number in the RHS is the rule number. */ -+ { -+ short *rhsp; -+ for (rhsp = rules[r1].rhs; *rhsp >= 0; ++rhsp) -+ /* Nothing. */; -+ assert (*rhsp == -r2); -+ *rhsp = -r1; -+ -+ for (rhsp = rules[r2].rhs; *rhsp >= 0; ++rhsp) -+ /* Nothing. */; -+ assert (*rhsp == -r1); -+ *rhsp = -r2; -+ } -+} -+ -+ -+/*--------------------------------------. -+| Return the number of symbols in RHS. | -+`--------------------------------------*/ -+ -+int -+rule_rhs_length (rule_t *rule) -+{ -+ int res = 0; -+ short *rhsp; -+ for (rhsp = rule->rhs; *rhsp >= 0; ++rhsp) -+ ++res; -+ return res; -+} -+ -+ - /*------------------------. - | Dump RITEM for traces. | - `------------------------*/ -@@ -76,23 +121,15 @@ - size_t - ritem_longest_rhs (void) - { -- int length; -- int max; -+ int max = 0; - int i; - -- length = 0; -- max = 0; -- for (i = 0; i < nritems; ++i) -- if (ritem[i] >= 0) -- { -- length++; -- } -- else -- { -- if (length > max) -- max = length; -- length = 0; -- } -+ for (i = 1; i < nrules + 1; ++i) -+ { -+ int length = rule_rhs_length (&rules[i]); -+ if (length > max) -+ max = length; -+ } - - return max; - } -diff -x *.po -ur -x testsuite bison-1.49a/src/gram.h bison/src/gram.h ---- bison-1.49a/src/gram.h Sun Apr 7 17:55:00 2002 -+++ bison/src/gram.h Sun Apr 7 18:19:39 2002 -@@ -124,6 +124,10 @@ - - typedef struct rule_s - { -+ /* The number of the rule in the source. It is usually the index in -+ RULES too, except if there are useless rules. */ -+ short number; -+ - short lhs; - short *rhs; - short prec; -@@ -166,6 +170,11 @@ - - extern int error_token_number; - -+/* Swap two rules. */ -+void rules_swap PARAMS ((int r1, int r2)); -+ -+/* Report the length of the RHS. */ -+int rule_rhs_length PARAMS ((rule_t *rule)); - - /* Dump RITEM for traces. */ - void ritem_print PARAMS ((FILE *out)); -diff -x *.po -ur -x testsuite bison-1.49a/src/print.c bison/src/print.c ---- bison-1.49a/src/print.c Sun Apr 7 17:55:00 2002 -+++ bison/src/print.c Sun Apr 7 18:19:39 2002 -@@ -366,19 +366,17 @@ - fprintf (out, "%s\n\n", _("Grammar")); - fprintf (out, " %s\n", _("Number, Line, Rule")); - for (i = 1; i < nrules + 1; i++) -- /* Don't print rules disabled in reduce_grammar_tables. */ -- if (rules[i].useful) -- { -- fprintf (out, _(" %3d %3d %s ->"), -- i - 1, rules[i].line, escape (symbols[rules[i].lhs]->tag)); -- rule = rules[i].rhs; -- if (*rule >= 0) -- while (*rule >= 0) -- fprintf (out, " %s", escape (symbols[*rule++]->tag)); -- else -- fprintf (out, " /* %s */", _("empty")); -- fputc ('\n', out); -- } -+ { -+ fprintf (out, _(" %3d %3d %s ->"), -+ i - 1, rules[i].line, escape (symbols[rules[i].lhs]->tag)); -+ rule = rules[i].rhs; -+ if (*rule >= 0) -+ while (*rule >= 0) -+ fprintf (out, " %s", escape (symbols[*rule++]->tag)); -+ else -+ fprintf (out, " /* %s */", _("empty")); -+ fputc ('\n', out); -+ } - fputs ("\n\n", out); - - -diff -x *.po -ur -x testsuite bison-1.49a/src/reader.c bison/src/reader.c ---- bison-1.49a/src/reader.c Sun Apr 7 17:56:13 2002 -+++ bison/src/reader.c Sun Apr 7 18:19:39 2002 -@@ -1687,6 +1687,7 @@ - while (p) - { - bucket *ruleprec = p->ruleprec; -+ rules[ruleno].number = ruleno; - rules[ruleno].lhs = p->sym->number; - rules[ruleno].rhs = ritem + itemno; - rules[ruleno].line = p->line; -diff -x *.po -ur -x testsuite bison-1.49a/src/reduce.c bison/src/reduce.c ---- bison-1.49a/src/reduce.c Sun Apr 7 17:55:00 2002 -+++ bison/src/reduce.c Sun Apr 7 18:19:39 2002 -@@ -220,70 +220,59 @@ - bitset_set (V1, rules[i].precsym); - } - -+ -+/*-------------------------------------------------------------------. -+| Put the useless productions at the end of RULES, and adjust NRULES | -+| accordingly. | -+`-------------------------------------------------------------------*/ -+ - static void - reduce_grammar_tables (void) - { -- /* This is turned off because we would need to change the numbers in -- the case statements in the actions file. -- -- We don't disable it via CPP so that it is still checked with the -- rest of the code, to avoid its becoming completely obsolete. -- -- FIXME: I think the comment above demonstrates this code must be -- turned off for *semantic* parser, not in the general case. Try -- to understand this better --akim. */ -- -- if (0) -- /* remove useless productions */ -- if (nuseless_productions > 0) -- { -- short np, pn, ni, pi; -- -- np = 0; -- ni = 0; -- for (pn = 1; pn < nrules + 1; pn++) -- if (bitset_test (P, pn)) -- { -- np++; -- if (pn != np) -- { -- rules[np].lhs = rules[pn].lhs; -- rules[np].line = rules[pn].line; -- rules[np].prec = rules[pn].prec; -- rules[np].assoc = rules[pn].assoc; -- rules[np].rhs = rules[pn].rhs; -- if (rules[np].rhs - ritem != ni) -- { -- pi = rules[np].rhs - ritem; -- rules[np].rhs = ritem + ni; -- while (ritem[pi] >= 0) -- ritem[ni++] = ritem[pi++]; -- ritem[ni++] = -np; -- } -- } -- else -- { -- while (ritem[ni++] >= 0) -- /* Nothing. */; -- } -- } -- -- ritem[ni] = 0; -- nrules -= nuseless_productions; -- nitems = ni; -- nritems = ni; -- -- /* Is it worth it to reduce the amount of memory for the -- grammar? Probably not. */ -- } -- -- /* Disable useless productions. */ -+ /* Flag useless productions. */ - if (nuseless_productions > 0) - { - int pn; - for (pn = 1; pn < nrules + 1; pn++) - rules[pn].useful = bitset_test (P, pn); - } -+ -+ /* Map the nonterminals to their new index: useful first, useless -+ afterwards. Kept for later report. */ -+ if (nuseless_productions > 0) -+ { -+ short *map = XCALLOC (short, nrules + 1) - 1; -+ int useful = 1; -+ int useless = nrules + 1 - nuseless_productions; -+ int i; -+ for (i = 1; i < nrules + 1; ++i) -+ map[i] = rules[i].useful ? useful++ : useless++; -+ -+ /* Shuffle elements of tables indexed by symbol number. */ -+ for (i = 1; i < nrules + 1; ++i) -+ if (i != map[i]) -+ { -+ int j = map[i]; -+ rules_swap (i, map[i]); -+ map[i] = map[j]; -+ map[j] = j; -+ } -+ -+ free (map + 1); -+ nrules -= nuseless_productions; -+ } -+ -+ /* Adjust NRITEMS and NITEMS. */ -+ { -+ int r; -+ int length; -+ for (r = nrules + 1; r < nrules + 1 + nuseless_productions; ++r) -+ { -+ length = rule_rhs_length (&rules[r]); -+ nritems -= length + 1; -+ nitems -= length + 1; -+ } -+ } - } - - -@@ -378,16 +367,15 @@ - { - int i; - fprintf (out, "%s\n\n", _("Useless rules:")); -- for (i = 1; i < nrules + 1; i++) -- if (!rules[i].useful) -- { -- rule r; -- fprintf (out, "#%-4d ", i - 1); -- fprintf (out, "%s:", symbols[rules[i].lhs]->tag); -- for (r = rules[i].rhs; *r >= 0; r++) -- fprintf (out, " %s", symbols[*r]->tag); -- fputs (";\n", out); -- } -+ for (i = nrules + 1; i < nuseless_productions + nrules + 1; i++) -+ { -+ rule r; -+ fprintf (out, "#%-4d ", rules[i].number - 1); -+ fprintf (out, "%s:", symbols[rules[i].lhs]->tag); -+ for (r = rules[i].rhs; *r >= 0; r++) -+ fprintf (out, " %s", symbols[*r]->tag); -+ fputs (";\n", out); -+ } - fputs ("\n\n", out); - } - } -@@ -411,7 +399,7 @@ - fprintf (out, "\n\n"); - fprintf (out, "Rules\n-----\n\n"); - fprintf (out, "Num (Prec, Assoc, Useful, Ritem Range) Lhs -> Rhs (Ritem range) [Num]\n"); -- for (i = 1; i < nrules + 1; i++) -+ for (i = 1; i < nrules + nuseless_productions + 1; i++) - { - int rhs_count = 0; - /* Find the last RHS index in ritems. */ -@@ -429,7 +417,7 @@ - } - fprintf (out, "\n\n"); - fprintf (out, "Rules interpreted\n-----------------\n\n"); -- for (i = 1; i < nrules + 1; i++) -+ for (i = 1; i < nrules + nuseless_productions + 1; i++) - { - fprintf (out, "%-5d %s :", i, symbols[rules[i].lhs]->tag); - for (r = rules[i].rhs; *r >= 0; r++) -diff -x *.po -ur -x testsuite bison-1.49a/tests/reduce.at bison/tests/reduce.at ---- bison-1.49a/tests/reduce.at Sun Apr 7 17:36:56 2002 -+++ bison/tests/reduce.at Sun Apr 7 18:19:39 2002 -@@ -174,6 +174,89 @@ - - - ## ------------------- ## -+## Reduced Automaton. ## -+## ------------------- ## -+ -+# Check that the automaton is that as the for the grammar reduced by -+# hand. -+ -+AT_SETUP([Reduced Automaton]) -+ -+# The non reduced grammar. -+# ------------------------ -+AT_DATA([[not-reduced.y]], -+[[/* A useless token. */ -+%token useless_token -+/* A useful one. */ -+%token useful -+%verbose -+%output="not-reduced.c" -+ -+%% -+ -+exp: useful { /* A useful action. */ } -+ | non_productive { /* A non productive action. */ } -+ ; -+ -+not_reachable: useful { /* A not reachable action. */ } -+ ; -+ -+non_productive: non_productive useless_token -+ { /* Another non productive action. */ } -+ ; -+]]) -+ -+AT_CHECK([[bison not-reduced.y]], 0, [], -+[[not-reduced.y contains 2 useless nonterminals and 3 useless rules -+]]) -+ -+AT_CHECK([[sed -n '/^Grammar/q;/^$/!p' not-reduced.output]], 0, -+[[Useless nonterminals: -+ not_reachable -+ non_productive -+Terminals which are not used: -+ useless_token -+Useless rules: -+#2 exp: non_productive; -+#3 not_reachable: useful; -+#4 non_productive: non_productive useless_token; -+]]) -+ -+# The reduced grammar. -+# -------------------- -+AT_DATA([[reduced.y]], -+[[/* A useless token. */ -+%token useless_token -+/* A useful one. */ -+%token useful -+%verbose -+%output="reduced.c" -+ -+%% -+ -+exp: useful { /* A useful action. */ } -+// | non_productive { /* A non productive action. */ } */ -+ ; -+ -+//not_reachable: useful { /* A not reachable action. */ } -+// ; -+ -+//non_productive: non_productive useless_token -+// { /* Another non productive action. */ } -+// ; -+]]) -+ -+AT_CHECK([[bison reduced.y]]) -+ -+# Comparing the parsers. -+cp reduced.c expout -+AT_CHECK([sed 's/not-reduced/reduced/g' not-reduced.c], 0, [expout]) -+ -+AT_CLEANUP -+ -+ -+ -+## ------------------- ## - ## Underivable Rules. ## - ## ------------------- ## - 2002-04-07 Akim Demaille * src/reduce.c (inaccessable_symbols): Fix a buglet: because of a lacking `+ 1' to nrules, Bison reported as useless a token if it was used solely to set the precedence of the last rule... - 2002-04-07 Akim Demaille * data/bison.c++, data/bison.simple: Don't output the current file name in #line, to avoid useless diffs between two identical outputs under different names. - 2002-04-07 Akim Demaille * src/closure.c, src/print.c, src/reader.c, src/reduce.c: Normalize loops to using `< nrules + 1', not `<= nrules'. - 2002-04-07 Akim Demaille * TODO: Update. - 2002-04-07 Akim Demaille * src/output.c, src/reader.c, src/symtab.c, src/symtab.h: Rename bucket.value as bucket.number. - 2002-04-07 Akim Demaille * src/closure.c, src/derives.c, src/gram.h, src/lalr.c, @@ -504,7 +203,7 @@ diff -x *.po -ur -x testsuite bison-1.49a/tests/reduce.at bison/tests/reduce.at YYERROR_VERBOSE is nonzero, not whether it is defined. Merge changes from bison-1_29-branch. - + 2002-03-20 Paul Eggert Merge fixes from Debian bison_1.34-1.diff. @@ -536,7 +235,6 @@ diff -x *.po -ur -x testsuite bison-1.49a/tests/reduce.at bison/tests/reduce.at * src/reader.c (parse_union_decl): Define the muscle stype_line. * data/bison.simple, data/bison.c++: Use it. - 2002-03-19 Akim Demaille * tests/regression.at (%nonassoc and eof, Unresolved SR Conflicts)