Commit Graph

5136 Commits

Author SHA1 Message Date
Theophile Ranquet
0242bf04ac carets: show them in more tests
* tests/input.at, tests/named-refs.at: Here.
2013-01-11 19:11:21 +01:00
Theophile Ranquet
9c4788b7ee 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 19:11:21 +01:00
Theophile Ranquet
6656c9b52a 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 18:57:10 +01:00
Theophile Ranquet
04816a6f32 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 18:57:09 +01:00
Akim Demaille
39ad6cc6ac 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 18:57:09 +01:00
Akim Demaille
bc19eadd65 glr.c: style changes
* data/glr.c (yyuserAction): Use a size_t for sizes.
2013-01-11 18:57:09 +01:00
Akim Demaille
1092d69c34 c.m4: style fix
* data/c.m4 (b4_parse_param_use): Add missing space before paren.
2013-01-11 18:57:09 +01:00
Theophile Ranquet
99d795e8f2 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 18:57:09 +01:00
Theophile Ranquet
0707d0c7fa glr.cc: fatal if using api.token.ctor without variants
* data/glr.cc: Here.
2013-01-11 18:57:09 +01:00
Theophile Ranquet
462b243e1d skel: correctly indent switch cases
* data/bison.m4 (b4_type_action_): Here.
2013-01-11 18:57:08 +01:00
Theophile Ranquet
bb1f0f5226 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 18:57:08 +01:00
Theophile Ranquet
e7b26e942d 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 18:57:08 +01:00
Theophile Ranquet
1dbaf37f5c 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 18:57:08 +01:00
Theophile Ranquet
ca42755f13 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-11 18:57:08 +01:00
Akim Demaille
bcf54c336e regen 2013-01-09 16:41:16 +01:00
Akim Demaille
19b1b96f87 gnulib: update 2013-01-04 16:26:14 +01:00
Akim Demaille
dbf3962c35 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 16:33:44 +01:00
Akim Demaille
a256496a3a doc: minor completion and fixes
* doc/bison.texi (%define Summary): Provide more history to some
variables.
2012-12-31 16:32:12 +01:00
Akim Demaille
4119d1ea60 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 16:32:12 +01:00
Akim Demaille
bdcbadbe37 doc: fix html build
* doc/local.mk (bison.html): Fix dependencies.
2012-12-31 16:32:12 +01:00
Akim Demaille
b8a8cc42c6 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 16:32:12 +01:00
Akim Demaille
a565e60eef gnulib: update 2012-12-31 16:32:12 +01:00
Akim Demaille
0904099dd5 regen 2012-12-28 11:37:22 +01:00
Akim Demaille
d2e3c807dc 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 11:37:22 +01:00
Akim Demaille
258b45c86b regen 2012-12-28 11:37:21 +01:00
Akim Demaille
c5ae8e85aa 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 11:37:21 +01:00
Akim Demaille
fd7f0289bc 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 10:36:54 +01:00
Akim Demaille
510c8497f8 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-28 10:31:15 +01:00
Theophile Ranquet
432a008d34 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 17:57:03 +01:00
Theophile Ranquet
c1b2677ad0 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 aa4180418f.

* src/scan-gram.l (unexpected_end): Here.
* tests/input.at: Adjust for new order of error reports.
2012-12-27 17:57:03 +01:00
Akim Demaille
11aef5e95b tables: scope reduction
* src/tables.c (default_goto): Make it easier to understand.
2012-12-27 10:52:42 +01:00
Akim Demaille
0a9042a652 regen 2012-12-27 10:33:46 +01:00
Akim Demaille
6f0a6f274c skeletons: fix comments
The commit 38de4e570f 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 10:30:14 +01:00
Akim Demaille
e672a4ba5e 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-27 09:45:17 +01:00
Akim Demaille
465df9c65c tables: scope reduction
* src/tables.c (matching_state): here.
2012-12-26 18:17:21 +01:00
Akim Demaille
33f7f342c3 tables: scope reduction
* src/tables.c (token_actions): here.
2012-12-26 18:17:20 +01:00
Akim Demaille
c95f5dadd6 tables: scope reduction
* src/tables.c (save_row): here.
2012-12-26 18:14:47 +01:00
Akim Demaille
28be3b8e53 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 18:03:51 +01:00
Akim Demaille
e697f05b35 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 17:55:02 +01:00
Akim Demaille
db598939b8 tables: style changes
* src/tables.c: Prefer < to >.
Fix/complete some comments.
Remove useless parens.
2012-12-26 17:53:01 +01:00
Akim Demaille
64b3612ab1 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 10:38:59 +01:00
Akim Demaille
40bb6f78f8 YYLEX_PARAM: drop support
* data/yacc.c, doc/bison.texi: Remove YYLEX_PARAM support.
* NEWS: Document it.
2012-12-26 10:38:59 +01:00
Akim Demaille
304b384ea3 examples: minor improvements
* examples/variant.yy: Don't use debug_stream(), obsoleted.
Use <*>.
2012-12-26 10:38:59 +01:00
Akim Demaille
3fd1d6b2f3 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 10:38:58 +01:00
Akim Demaille
4d9bdbe384 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 10:38:58 +01:00
Akim Demaille
ae8880deec doc: update variant usage
* doc/bison.texi, examples/variant.yy: Use "%define api.value.type variant",
instead of "%define variant".
2012-12-26 10:31:42 +01:00
Akim Demaille
1a06f28efc 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-26 10:31:42 +01:00
Akim Demaille
bc6038978f %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 11:14:11 +01:00
Akim Demaille
53f8e4096d 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 10:27:40 +01:00
Akim Demaille
1dc927a7d4 diagnostics: factor the deprecated directive message
* src/complain.h, src/complain.c (deprecated_directive): New.
* src/muscle-tab.c: Use it.
2012-12-23 10:27:40 +01:00