ee000ba4fc
Let symbols have a location. * src/symtab.h, src/symtab.c (symbol_t): Location is a new member. (getsym): Adjust. Adjust all callers. * src/complain.h, src/complain.c (complain_at, fatal_at, warn_at): Use location_t, not int. * src/symtab.c (symbol_check_defined): Take advantage of the location. * tests/regression.at (Invalid inputs): Adjust.
Akim Demaille
2002-06-15 18:21:46 +00:00
8efe435c05
* src/parse-gram.y (YYLLOC_DEFAULT, current_lhs_location): New. (input): Don't try to initialize yylloc here, do it in the scanner. * src/scan-gram.l (YY_USER_INIT): Initialize yylloc. * src/gram.h (rule_t): Change line and action_line into location and action_location, of location_t type. Adjust all dependencies. * src/location.h, src/location.c (empty_location): New. * src/reader.h, src/reader.c (grammar_start_symbol_set) (grammar_symbol_append, grammar_rule_begin, grammar_rule_end) (grammar_current_rule_symbol_append) (grammar_current_rule_action_append): Expect a location as argument. * src/reader.c (grammar_midrule_action): Adjust to attach an action's location as dummy symbol location. * src/symtab.h, src/symtab.c (startsymbol_location): New. * tests/regression.at (Web2c Report, Rule Line Numbers): Adjust the line numbers.
Akim Demaille
2002-06-15 18:21:11 +00:00
1921f1d7a4
Grammar declarations may be found in the grammar section. * src/parse-gram.y (rules_or_grammar_declaration): New. (declarations): Each declaration may end with a semicolon, not just... (grammar_declaration): `"%union"'. (grammar): Branch to rules_or_grammar_declaration.
Akim Demaille
2002-06-14 17:38:14 +00:00
592e8d4d01
* src/files.c (action_obstack): Remove, unused. (output_obstack): Remove it, and all its dependencies, as it is no longer needed. * src/reader.c (epilogue_set): Build the epilogue in the muscle_obstack. * src/output.h, src/output.c (muscle_obstack): Move to... * src/muscle_tab.h, src/muscle_tab.h: here. (muscle_init): Initialize muscle_obstack. (muscle_free): New. * src/main.c (main): Call it.
Akim Demaille
2002-06-14 17:36:24 +00:00
0c15323de7
* src/location.h: New, extracted from... * src/reader.h: here. * src/Makefile.am (noinst_HEADERS): Merge into (bison_SOURCES): this. Add location.h. * src/parse-gram.y: Use location_t instead of Bison's. * src/reader.h, src/reader.c (prologue_augment, epilogue_set): Use location_t instead of ints.
Akim Demaille
2002-06-14 17:35:45 +00:00
e96c9728da
* data/bison.simple, data/bison.c++: Be sure to restore the current #line when returning to the skeleton contents after having exposed the input file's #line.
Akim Demaille
2002-06-14 17:29:17 +00:00
75d1fe1611
* src/scan-gram.l (SC_BRACED_CODE): Don't use `<.*>', it is too eager. * tests/actions.at (Exotic Dollars): New.
Akim Demaille
2002-06-12 15:14:59 +00:00
3420246357
White space changes.
Akim Demaille
2002-06-11 21:47:16 +00:00
1d6412adeb
* src/scan-gram.l (YY_OBS_INIT): Remove, replace with... [SC_COMMENT,SC_STRING,SC_CHARACTER,SC_BRACED_CODE,SC_PROLOGUE] [SC_EPILOGUE]: Output the quadrigraphs only when not in a comment. * src/reader.h, src/scan-gram.l (scanner_initialize): this. * src/reader.c (reader): Use it.
Akim Demaille
2002-06-11 21:46:16 +00:00
4cdb01db9b
* src/scan-gram.l (YY_OBS_FINISH): Don't set yylval. Adjust all callers. (scanner_last_string_free): New.
Akim Demaille
2002-06-11 21:45:49 +00:00
44995b2e39
* src/scan-gram.l (YY_INIT, YY_GROW, YY_FINISH): Rename as... (YY_OBS_INIT, YY_OBS_GROW, YY_OBS_FINISH): these. (last_string, YY_OBS_FREE): New. Use them when returning an ID.
Akim Demaille
2002-06-11 21:43:18 +00:00
e9955c8373
Have Bison grammars parsed by a Bison grammar. * src/reader.c, src/reader.h (prologue_augment): New. * src/reader.c (copy_definition): Remove. * src/reader.h, src/reader.c (gram_start_symbol_set, prologue_augment) (grammar_symbol_append, grammar_rule_begin, grammar_midrule_action) (grammar_current_rule_prec_set, grammar_current_rule_check) (grammar_current_rule_symbol_append) (grammar_current_rule_action_append): Export. * src/parse-gram.y (symbol_list_new, symbol_list_symbol_append_ (symbol_list_action_append): Remove. Hook the routines from reader. * src/scan-gram.l: In INITIAL, characters and strings are tokens. * src/system.h (ATTRIBUTE_NORETURN, ATTRIBUTE_UNUSED): Now. * src/reader.c (read_declarations): Remove, unused. * src/parse-gram.y: Handle the epilogue. * src/reader.h, src/reader.c (gram_start_symbol_set): Rename as... (grammar_start_symbol_set): this. * src/scan-gram.l: Be sure to `use'' yycontrol to keep GCC quiet. * src/reader.c (readgram): Remove, unused. (reader): Adjust to insert eoftoken and axiom where appropriate. * src/reader.c (copy_dollar): Replace with... * src/scan-gram.h (handle_dollar): this. * src/parse-gram.y: Remove %thong'. * src/reader.c (copy_at): Replace with... * src/scan-gram.h (handle_at): this. * src/complain.h, src/complain.c (warn_at, complain_at, fatal_at): New. * src/scan-gram.l (YY_LINES): Keep lineno synchronized for the time being. * src/reader.h, src/reader.c (grammar_rule_end): New. * src/parse.y (current_type, current_class): New. Implement %nterm', %token' support. Merge %term' into %token'. (string_as_id): New. * src/symtab.h, src/symtab.c (symbol_make_alias): Don't pass the type name. * src/parse-gram.y: Be sure to handle properly the beginning of rules. * src/parse-gram.y: Handle %type. * src/reader.c (grammar_rule_end): Call grammar_current_rule_check. * src/parse-gram.y: More directives support. * src/options.c: No longer handle source directives. * src/parse-gram.y: Fix %output. * src/parse-gram.y: Handle %union. Use the prologue locations. * src/reader.c (parse_union_decl): Remove. * src/reader.h, src/reader.c (epilogue_set): New. * src/parse-gram.y: Use it. * data/bison.simple, data/bison.c++: b4_stype is now either not defined, then default to int, or to the contents of %union, without union' itself. Adjust. * src/muscle_tab.c (muscle_init): Don't predefine stype'. * src/output.c (actions_output): Don't output braces, as they are already handled by the scanner. * src/scan-gram.l (SC_CHARACTER): Set the user_token_number of characters to themselves. * tests/reduce.at (Reduced Automaton): End the grammars with %% so that the epilogue has a proper #line. * src/parse-gram.y: Handle precedence/associativity. * src/symtab.c (symbol_precedence_set): Requires the symbol to be a terminal. * src/scan-gram.l (SC_BRACED_CODE): Catch strings and characters. * tests/calc.at: Do not use %token "foo"' as it makes not sense at all to define terminals that cannot be emitted. * src/scan-gram.l: Escape M4 characters. * src/scan-gram.l: Working properly with escapes in user strings/characters. * tests/torture.at (AT_DATA_TRIANGULAR_GRAMMAR) (AT_DATA_HORIZONTAL_GRAMMAR): Respect the %token ID NUM STRING' grammar. Use more modest sizes, as for the time being the parser does not release memory, and therefore the process swallows a huge amount of memory. * tests/torture.at (AT_DATA_LOOKAHEADS_GRAMMAR): Adjust to the stricter %token grammar. * src/symtab.h (associativity): Add `undef_assoc'. (symbol_precedence_set): Do nothing when passed an undef_assoc. * src/symtab.c (symbol_check_alias_consistence): Adjust. * tests/regression.at (Invalid %directive): Remove, as it is now meaningless. (Invalid inputs): Adjust to the new error messages. (Token definitions): The new grammar doesn't allow too many eccentricities. * src/lex.h, src/lex.c: Remove. * src/reader.c (lastprec, skip_to_char, read_signed_integer) (copy_character, copy_string2, copy_string, copy_identifier) (copy_comment, parse_token_decl, parse_type_decl, parse_assoc_decl) (parse_muscle_decl, parse_dquoted_param, parse_skel_decl) (parse_action): Remove. * po/POTFILES.in: Adjust.
Akim Demaille
2002-06-11 20:16:05 +00:00
2e04746125
* src/reader.c (parse_action): Don't store directly into the rule's action member: return the action as a string. Don't require rule_length' as an argument: compute it. (grammar_current_rule_symbol_append) (grammar_current_rule_action_append): New, eved out from (readgram): here. Remove action_flag', `rulelength', unused now.
Akim Demaille
2002-06-11 08:08:36 +00:00
1485e106a4
* src/reader.c (grammar_midrule_action): New, Eved out from (readgram): here.
Akim Demaille
2002-06-11 08:08:06 +00:00
da4160c30a
* src/reader.c (grammar_rule_begin, previous_rule, current_rule): New. (readgram): Use them as replacement of inlined code, crule and crule1.
Akim Demaille
2002-06-11 08:07:52 +00:00
f6d0f937fd
* src/reader.c (grammar_end, grammar_symbol_append): New. (readgram): Use them. Make the use of `p' as local as possible.
Akim Demaille
2002-06-11 08:07:36 +00:00
69078d4b3b
GCJ's parser requires the tokens to be defined before the prologue. * data/bison.simple: Output the token definition before the user's prologue. * tests/regression.at (Braces parsing, Duplicate string) (Mixing %token styles): Check the output from bison. (Early token definitions): New.
Akim Demaille
2002-06-11 08:01:41 +00:00
5e424082ce
* src/symtab.c (symbol_user_token_number_set): Don't complain when assigning twice the same user number to a token, so that we can use it in... * src/lex.c (lex): here. Also use `symbol_class_set' instead of hand written code. * src/reader.c (parse_assoc_decl): Likewise.
Akim Demaille
2002-06-10 08:38:10 +00:00
44536b35c4
* src/symtab.c, src/symtab.c (symbol_class_set) (symbol_user_token_number_set): New. * src/reader.c (parse_token_decl): Use them. Use a switch instead of ifs. Use a single argument.
Akim Demaille
2002-06-10 08:37:55 +00:00
8b9f2372c7
Remove %thong' support as it is undocumented, unused, duplicates %token's job, and creates useless e-mail traffic with people who want to know what it is, why it is undocumented, unused, and duplicates `%token's job. * src/reader.c (parse_thong_decl): Remove. * src/options.c (option_table): Remove "thong". * src/lex.h (tok_thong): Remove.
Akim Demaille
2002-06-10 08:37:30 +00:00
670ddffd5b
* src/output.c (output_skeleton): Be sure to allocate enough room for /' _and_ for 0' in full_skeleton.
Akim Demaille
2002-05-28 10:02:36 +00:00
769b430fce
* data/bison.c++: Catch up with bison.simple: 2002-05-24 Paul Hilfinger <Hilfinger@CS.Berkeley.EDU> and Paul Eggert <eggert@twinsun.com>: `error' handing. 2002-05-26 Akim Demaille <akim@epita.fr>: stos_, token_number_, and popping traces.
Akim Demaille
2002-05-28 09:53:35 +00:00
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.
Paul Hilfinger
2002-05-27 22:33:54 +00:00
4a713ec2e3
* src/conflicts.c (log_resolution): Correct typo: obstack_printf should be obstack_fgrow1.
Paul Hilfinger
2002-05-27 20:55:43 +00:00
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.
Akim Demaille
2002-05-26 20:25:52 +00:00
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.
Akim Demaille
2002-05-26 18:39:05 +00:00
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.
Akim Demaille
2002-05-26 18:38:41 +00:00
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.
Akim Demaille
2002-05-25 16:12:40 +00:00
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.
Paul Eggert
2002-05-24 12:45:23 +00:00
68cd8af38b
Document the recent error-recovery fix by Paul Hilfinger.
Paul Eggert
2002-05-24 12:38:52 +00:00
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.
Paul Eggert
2002-05-24 12:37:12 +00:00
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.
Paul Hilfinger
2002-05-20 22:56:53 +00:00
6390a83f8b
Use copy_character not obstack_1grow in parse_action.
Florian Krohm
2002-05-14 00:25:23 +00:00
cfaee611d8
* src/muscle_tab.c (muscle_m4_output): Must return TRUE for hash_do_for_each.
Akim Demaille
2002-05-06 08:23:54 +00:00
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.
Akim Demaille
2002-05-06 08:23:41 +00:00
a900a6248c
* src/reader.c (packgram): No longer end `ritem' with a 0 sentinel: it is not used.
Akim Demaille
2002-05-06 08:23:28 +00:00
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.
Akim Demaille
2002-05-05 11:56:49 +00:00
db85e524b4
* configure.in (GETTEXT_VERSION): New. Suggested by Bruno Haible for the forthcoming Gettext 0.10.3.
Akim Demaille
2002-05-03 15:52:53 +00:00
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.
Akim Demaille
2002-05-03 08:42:48 +00:00
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.
Robert Anisko
2002-05-02 16:43:00 +00:00
b2d52318fa
* data/bison.simple (yyparse): Do not implement @$ = @1. (YYLLOC_DEFAULT): Adjust to do it. * doc/bison.texinfo (Location Default Action): Fix.
Akim Demaille
2002-05-02 16:40:54 +00:00
900c877b41
Note: the previous patch partially drops semantic-parser' support: it always does rule_length - n', where semantic parsers ought to always use `-n'.
Akim Demaille
2002-05-02 14:36:39 +00:00
82b6cb3fb2
* src/reader.c (copy_at, copy_dollarm parse_braces, parse_action) (parse_guard): Rename the formal argument stack_offset' as rule_length', which is more readable. Adjust callers. (copy_at, copy_dollar): Instead of outputting the hard coded values of $$, $n and so forth, output invocation to b4_lhs_value, b4_lhs_location, b4_rhs_value, and b4_rhs_location. * data/bison.simple, data/bison.c++ (b4_lhs_value) (b4_lhs_location, b4_rhs_value, and b4_rhs_location: New.
Akim Demaille
2002-05-02 14:33:48 +00:00
6cbfbcc58c
* configure.in (AC_INIT): Bump to 1.49b. (AM_INIT_AUTOMAKE): Short invocation.
Akim Demaille
2002-05-02 09:25:54 +00:00
b85481146a
Version 1.49a.
v1.49a
Akim Demaille
2002-05-02 07:49:00 +00:00
Akim Demaille
Paul Hilfinger
Paul Eggert
Florian Krohm
Robert Anisko