Commit Graph

1153 Commits

Author SHA1 Message Date
Paul Hilfinger
7067cb3620 * src/output.c (output_skeleton): Put an explicit path in front of
the skeleton file name, rather than relying on the -I directory,
to partially alleviate effects of having a skeleton file lying around
in the current directory.
2002-05-27 22:33:54 +00:00
Paul Hilfinger
4a713ec2e3 * src/conflicts.c (log_resolution): Correct typo:
obstack_printf should be obstack_fgrow1.
2002-05-27 20:55:43 +00:00
Akim Demaille
b0e5f19eab Regen. 2002-05-27 06:29:28 +00:00
Akim Demaille
54049e5db0 Add. 2002-05-27 06:18:41 +00:00
Akim Demaille
b408954b40 * src/state.h (state_t): `solved_conflicts' is a new member.
* src/LR0.c (new_state): Set it to 0.
* src/conflicts.h, src/conflicts.c (print_conflicts)
(free_conflicts, solve_conflicts): Rename as...
(conflicts_print, conflicts_free, conflicts_solve): these.
Adjust callers.
* src/conflicts.c (enum conflict_resolution_e)
(solved_conflicts_obstack): New, used by...
(log_resolution): this.
Adjust to attach the conflict resolution to each state.
Complete the description with the precedence/associativity
information.
(resolve_sr_conflict): Adjust.
* src/print.c (print_state): Output its solved_conflicts.
* tests/conflicts.at (Unresolved SR Conflicts)
(Solved SR Conflicts): Exercise --report=all.
2002-05-26 20:25:52 +00:00
Akim Demaille
a49aecd528 * src/LR0.c, src/derives.c, src/gram.c, src/gram.h, src/lalr.c,
* src/nullable.c, src/output.c, src/print.c, src/print_graph.c,
* src/reader.c, src/reduce.c, src/state.h, src/symtab.h
(token_number_t, item_number_as_token_number)
(token_number_as_item_number, muscle_insert_token_number_table):
Rename as...
(symbol_number_t, item_number_as_symbol_number)
(symbol_number_as_item_number, muscle_insert_symbol_number_table):
these, since it is more appropriate.
2002-05-26 18:39:05 +00:00
Akim Demaille
5504898e82 * tests/calc.at (AT_CHECK_CALC): Adjust: there are now additional
`Error:' lines.
* data/bison.simple (yystos) [YYDEBUG]: New.
(yyparse) [YYDEBUG]: Display the symbols which are popped during
error recovery.
* tests/regression.at (Web2c Actions): Adjust: yystos is output now.
2002-05-26 18:38:41 +00:00
Akim Demaille
4fd2214bc6 Regen. 2002-05-26 18:38:21 +00:00
Akim Demaille
ec3bc3961d * doc/bison.texinfo (Debugging): Split into...
(Tracing): this new section, its former contents, and...
(Understanding): this new section.
* src/getargs.h, src/getargs.c (verbose_flag): Remove, replaced
by...
(report_flag): this.
Adjust all dependencies.
(report_args, report_types, report_argmatch): New.
(usage, getargs): Report/support -r, --report.
* src/options.h
(struct option_table_struct): Rename as..,
(struct option_table_s): this.
Rename the `set_flag' member to `flag' to match with getopt_long's
struct.
* src/options.c (option_table): Split verbose into an entry for
%verbose, and another for --verbose.
Support --report/-r, so remove -r from the obsolete --raw.
* src/print.c: Attach full item sets and lookaheads reports to
report_flag instead of trace_flag.
* lib/argmatch.h, lib/argmatch.c: New, from Fileutils 4.1.
2002-05-25 16:12:40 +00:00
Paul Eggert
78df825093 * data/bison.simple (yyparse): Correct error handling to conform to
POSIX and yacc.  Specifically, after syntax error is discovered,
do not reduce further before shifting the error token.
Clean up the code a bit by removing the labels yyerrdefault,
yyerrhandle, yyerrpop.
* NEWS: Document the above.
2002-05-24 12:45:23 +00:00
Paul Eggert
68cd8af38b Document the recent error-recovery fix by Paul Hilfinger. 2002-05-24 12:38:52 +00:00
Paul Eggert
660bc8dd09 (yyparse): Correct error handling to conform to
POSIX and yacc.  Specifically, after syntax error is discovered,
do not reduce further before shifting the error token.
Clean up the code a bit by removing the labels yyerrdefault,
yyerrhandle, yyerrpop.
2002-05-24 12:37:12 +00:00
Paul Hilfinger
c0c9ea051b * data/bison.simple (yyr1): Don't use yy_token_number_type as element
type; it isn't always big enough, since it doesn't necessarily
include non-terminals.
(yytranslate): Expand definition of yy_token_number_type, so that
the latter can be removed.
(yy_token_number_type): Remove, only one use.
* data/bison.c++ (r1_): Parallel change to yyr1 in bison.simple---
don't use TokenNumberType as element type.

* tests/regression.at: Modify expected output to agree with change
to yyr1 and yytranslate.
2002-05-20 22:56:53 +00:00
Florian Krohm
6390a83f8b Use copy_character not obstack_1grow in parse_action. 2002-05-14 00:25:23 +00:00
Akim Demaille
db7c8e9a72 * tests/regression.at (Token definitions): Prototype yylex and
yyerror.
2002-05-13 08:56:20 +00:00
Paul Hilfinger
158c687b65 * src/scan-skel.l: Correct off-by-one error in handling of __oline__. 2002-05-13 00:44:52 +00:00
Paul Hilfinger
fcc618005a * data/bison.simple (b4_sint_type, b4_uint_type): Correct to reflect
32-bit arithmetic.
* data/bison.c++ (b4_sint_type, b4_uint_type): Ditto.
2002-05-13 00:27:26 +00:00
Akim Demaille
308a2f7637 More. 2002-05-07 09:31:01 +00:00
Akim Demaille
a46c847244 Remove. 2002-05-07 09:20:26 +00:00
Akim Demaille
5683e9b26a * tests/synclines.at: Be sure to prototype yylex and yyerror to
avoid GCC warnings.
2002-05-07 08:13:00 +00:00
Akim Demaille
0c2d3f4cba Kill GCC warnings.
* src/reduce.c (nonterminals_reduce): Don't loop over RITEM: loop
over the RHS of each rule.
* src/gram.h, src/gram.c (nritems): Is `unsigned int', not int.
* src/state.h (state_t): Member `nitems' is unsigned short.
* src/LR0.c (get_state): Adjust.
* src/reader.c (packgram): Likewise.
* src/output.c (GENERATE_MUSCLE_INSERT_TABLE): `max' is of type
`Type'.
(muscle_insert_int_table): Remove, unused.
(prepare_rules): Remove `max'.
2002-05-07 08:07:32 +00:00
Florian Krohm
e41fdc9310 Corrected comment for spec_name_prefix variable. 2002-05-06 13:42:59 +00:00
Akim Demaille
1565b72064 * src/closure.c (print_firsts): Display of the symbol tags.
(bitmatrix_print): Move to...
* lib/bitsetv-print.h, lib/bitsetv-print.c (bitsetv_matrix_dump):
here.
* tests/sets.at (Nullable, Broken Closure, Firsts): Adjust.
2002-05-06 08:42:24 +00:00
Akim Demaille
5181e40827 Regen. 2002-05-06 08:33:43 +00:00
Akim Demaille
cfaee611d8 * src/muscle_tab.c (muscle_m4_output): Must return TRUE for
hash_do_for_each.
2002-05-06 08:23:54 +00:00
Akim Demaille
458be8e0ed * src/LR0.c (new_state, get_state): Instead of using the global
`kernel_size' and `kernel_base', have two new arguments:
`core_size' and `core'.
Adjust callers.
2002-05-06 08:23:41 +00:00
Akim Demaille
a900a6248c * src/reader.c (packgram): No longer end `ritem' with a 0
sentinel: it is not used.
2002-05-06 08:23:28 +00:00
Akim Demaille
9bbd181ae0 Regen. 2002-05-06 07:45:55 +00:00
Akim Demaille
d4e7d3a191 New experimental feature: display the lookaheads in the report and
graph.
* src/print (print_core): When --trace-flag, display the rules
lookaheads.
* src/print_graph.c (print_core): Likewise.
Swap the arguments.
Adjust caller.
2002-05-05 11:56:49 +00:00
Akim Demaille
39ceb25bdb * tests/torture.at (Many lookaheads): New test. 2002-05-05 11:56:37 +00:00
Akim Demaille
5372019fab * src/output.c (GENERATE_OUTPUT_TABLE): Replace with...
(GENERATE_MUSCLE_INSERT_TABLE): this.
(output_int_table, output_unsigned_int_table, output_short_table)
(output_token_number_table, output_item_number_table): Replace with...
(muscle_insert_int_table, muscle_insert_unsigned_int_table)
(muscle_insert_short_table, muscle_insert_token_number_table)
(muscle_insert_item_number_table): these.
Adjust all callers.
(prepare_tokens): Don't free `translations', since...
* src/reader.h, src/reader.c (grammar_free): do it.
Move to...
* src/gram.h, src/gram.c (grammar_free): here.
* data/bison.simple, data/bison.c++: b4_token_number_max is now
b4_translate_max.
2002-05-05 11:56:27 +00:00
Akim Demaille
5df5f6d538 * src/output.c (output_unsigned_int_table): New.
(prepare_rules): `i' is unsigned.
`prhs', `rline', `r2' are unsigned int.
Rename muscle `rhs_number_max' as `rhs_max'.
Output muscles `prhs_max', `rline_max', and `r2_max'.
Free rline and r1.
* data/bison.simple, data/bison.c++: Adjust to use these muscles
to compute types instead of constant types.
* tests/regression.at (Web2c Actions): Adjust.
2002-05-05 11:56:06 +00:00
Akim Demaille
77714df234 update. 2002-05-05 11:55:45 +00:00
Akim Demaille
b87f8b2159 * src/symtab.h (SALIAS, SUNDEF): Rename as...
(USER_NUMBER_ALIAS, USER_NUMBER_UNDEFINED): these.
Adjust dependencies.
* src/output.c (token_definitions_output): Be sure not to output a
`#define 'a'' when fed with `%token 'a' "a"'.
* tests/regression.at (Token definitions): New.
2002-05-04 08:48:04 +00:00
Paul Eggert
8bb936e4f7 * data/bison.simple (b4_token_defines): Also define YYTOKENTYPE
for K&R C.
2002-05-03 17:55:00 +00:00
Paul Eggert
fba798c78e (b4_token_defines): Also define YYTOKENTYPE for K&R C. 2002-05-03 17:54:29 +00:00
Akim Demaille
9306c70c63 More. 2002-05-03 17:09:50 +00:00
Akim Demaille
3c9160d912 More. 2002-05-03 16:53:07 +00:00
Akim Demaille
53c71a12c8 * data/bison.simple (m4_if): Don't output empty enums.
And actually, output valid enum definitions :(.
2002-05-03 16:22:54 +00:00
Akim Demaille
2de3aceee7 Gettext 0.11.3 adjustments. 2002-05-03 16:11:40 +00:00
Akim Demaille
289dd0cf98 * configure.bat: Remove, completely obsolete.
* Makefile.am (EXTRA_DIST): Adjust.
Don't distribute config.rpath...
* config/Makefile.am (EXTRA_DIST): Do it.
2002-05-03 16:10:29 +00:00
Akim Demaille
db85e524b4 * configure.in (GETTEXT_VERSION): New.
Suggested by Bruno Haible for the forthcoming Gettext 0.10.3.
2002-05-03 15:52:53 +00:00
Akim Demaille
0164db681e Warnings. 2002-05-03 15:07:35 +00:00
Akim Demaille
83ccf991a6 * data/bison.simple (b4_token_enum): New.
(b4_token_defines): Use it to output tokens both as #define and
enums.
Suggested by Paul Eggert.
* src/output.c (token_definitions_output): Don't output spurious
white spaces.
2002-05-03 08:42:48 +00:00
Akim Demaille
1f41899519 * data/m4sugar/m4sugar.m4: Update from CVS Autoconf. 2002-05-03 08:26:55 +00:00
Akim Demaille
77f6f42074 Regen. 2002-05-02 16:46:05 +00:00
Robert Anisko
45119f0446 * data/bison.c++: Adapt expansion of $s and @s to the C++ parser.
Update the stack class, give a try to deque as the default container.
2002-05-02 16:43:00 +00:00
Akim Demaille
b2d52318fa * data/bison.simple (yyparse): Do not implement @$ = @1.
(YYLLOC_DEFAULT): Adjust to do it.
* doc/bison.texinfo (Location Default Action): Fix.
2002-05-02 16:40:54 +00:00
Akim Demaille
3a8b410924 * src/reader.c (parse_braces): Merge into...
(parse_action): this.
2002-05-02 16:16:11 +00:00
Akim Demaille
2243f537c6 Update. 2002-05-02 16:12:35 +00:00