Akim Demaille [Fri, 26 Oct 2012 15:04:55 +0000 (17:04 +0200)]
build: fix Texinfo compilation
* doc/local.mk: fix dependencies.
Akim Demaille [Fri, 26 Oct 2012 14:59:04 +0000 (16:59 +0200)]
regen
Akim Demaille [Fri, 26 Oct 2012 14:50:26 +0000 (16:50 +0200)]
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
...
Conflicts:
NEWS
TODO
data/c.m4
data/java.m4
doc/Makefile.am
src/getargs.c
src/getargs.h
src/output.c
src/parse-gram.c
src/parse-gram.h
src/parse-gram.y
src/reader.h
Akim Demaille [Fri, 26 Oct 2012 14:33:20 +0000 (16:33 +0200)]
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
Akim Demaille [Wed, 24 Oct 2012 14:59:41 +0000 (16:59 +0200)]
doc: minor style change
* doc/figs/example-reduce.txt: here.
Akim Demaille [Wed, 24 Oct 2012 14:59:30 +0000 (16:59 +0200)]
maint: use gendocs's new -I option
* gnulib: Update gendocs.
* cfg.mk (gendocs_options_): New.
Akim Demaille [Fri, 26 Oct 2012 12:27:32 +0000 (14:27 +0200)]
regen
Akim Demaille [Fri, 26 Oct 2012 08:31:55 +0000 (10:31 +0200)]
yacc.c: do not define location support when not using locations
* data/yacc.c (YYLLOC_DEFAULT, YYRHSLOC): Don't define when not
using locations.
Akim Demaille [Fri, 26 Oct 2012 12:16:29 +0000 (14:16 +0200)]
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.
Theophile Ranquet [Mon, 22 Oct 2012 14:19:31 +0000 (14:19 +0000)]
misc: document TESTSUITEFLAGS in README-hacking
* README-hacking: Document -j and -k flags.
Theophile Ranquet [Mon, 22 Oct 2012 11:10:53 +0000 (11:10 +0000)]
deprecation: add tests
* tests/input.at (Deprecated directives warn, Non-deprecated
directives don't, Unput doesn't mess up locations): New tests.
Akim Demaille [Thu, 25 Oct 2012 12:42:24 +0000 (14:42 +0200)]
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.
Akim Demaille [Thu, 25 Oct 2012 12:26:09 +0000 (14:26 +0200)]
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.
Akim Demaille [Thu, 25 Oct 2012 10:28:35 +0000 (12:28 +0200)]
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.
Akim Demaille [Thu, 25 Oct 2012 07:42:03 +0000 (09:42 +0200)]
regen
Akim Demaille [Thu, 25 Oct 2012 07:34:00 +0000 (09:34 +0200)]
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.
Akim Demaille [Thu, 25 Oct 2012 07:40:20 +0000 (09:40 +0200)]
fix comment
* data/c.m4 (b4_YYDEBUG_define): here.
Theophile Ranquet [Wed, 24 Oct 2012 10:46:03 +0000 (10:46 +0000)]
regen
Theophile Ranquet [Thu, 18 Oct 2012 18:00:51 +0000 (18:00 +0000)]
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.
Akim Demaille [Tue, 23 Oct 2012 12:03:11 +0000 (14:03 +0200)]
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
Akim Demaille [Tue, 23 Oct 2012 11:58:51 +0000 (13:58 +0200)]
maint: post-release administrivia
* NEWS: Add header line for next release.
* .prev-version: Record previous version.
* cfg.mk (old_NEWS_hash): Auto-update.
Akim Demaille [Tue, 23 Oct 2012 11:46:28 +0000 (13:46 +0200)]
version 2.6.4
* NEWS: Record release date.
Akim Demaille [Mon, 22 Oct 2012 16:14:54 +0000 (18:14 +0200)]
regen
Akim Demaille [Mon, 22 Oct 2012 16:13:15 +0000 (18:13 +0200)]
2.6.4: botched 2.6.3
* NEWS: here.
Akim Demaille [Mon, 22 Oct 2012 14:04:12 +0000 (16:04 +0200)]
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
...
Conflicts:
NEWS
doc/bison.texi
tests/headers.at
Akim Demaille [Mon, 22 Oct 2012 13:28:10 +0000 (15:28 +0200)]
maint: post-release administrivia
* NEWS: Add header line for next release.
* .prev-version: Record previous version.
* cfg.mk (old_NEWS_hash): Auto-update.
Akim Demaille [Mon, 22 Oct 2012 13:16:12 +0000 (15:16 +0200)]
version 2.6.3
* NEWS: Record release date.
Akim Demaille [Fri, 19 Oct 2012 09:36:18 +0000 (11:36 +0200)]
gnulib: update
Akim Demaille [Fri, 12 Oct 2012 08:10:18 +0000 (10:10 +0200)]
tests: check %no-lines
* tests/synclines.at: here.
Akim Demaille [Mon, 8 Oct 2012 11:46:50 +0000 (13:46 +0200)]
NEWS: warnings with clang
* NEWS: here.
Akim Demaille [Mon, 8 Oct 2012 07:17:20 +0000 (09:17 +0200)]
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.
Akim Demaille [Mon, 8 Oct 2012 07:02:09 +0000 (09:02 +0200)]
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.
Paul Eggert [Fri, 5 Oct 2012 17:55:11 +0000 (10:55 -0700)]
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.
Akim Demaille [Mon, 8 Oct 2012 07:12:10 +0000 (09:12 +0200)]
skeletons: style changes
* data/yacc.c, data/glr.c: Prefer Title case for (CPP) macro arguments.
Akim Demaille [Thu, 20 Sep 2012 09:42:06 +0000 (11:42 +0200)]
tests: minor improvements
* tests/c++.at: Space changes.
Use AT_YYERROR_DEFINE.
* tests/local.at (AT_YYERROR_DEFINE): Issue errors on unknown languages.
Akim Demaille [Fri, 5 Oct 2012 07:24:59 +0000 (09:24 +0200)]
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.
Akim Demaille [Sun, 8 Apr 2012 06:58:43 +0000 (08:58 +0200)]
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.
Akim Demaille [Fri, 5 Oct 2012 07:20:30 +0000 (09:20 +0200)]
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.
Akim Demaille [Fri, 5 Oct 2012 06:54:15 +0000 (08:54 +0200)]
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.
Akim Demaille [Thu, 4 Oct 2012 09:45:09 +0000 (11:45 +0200)]
maint: word changes
* README-hacking (Typical errors): Improve wording.
Akim Demaille [Thu, 4 Oct 2012 07:07:42 +0000 (09:07 +0200)]
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.
Theophile Ranquet [Wed, 3 Oct 2012 15:26:56 +0000 (15:26 +0000)]
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.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Akim Demaille [Wed, 3 Oct 2012 07:17:58 +0000 (09:17 +0200)]
tests: check that headers are self contained
Reported by Alexandre Duret-Lutz.
* tests/headers.at (Several parsers): here.
Akim Demaille [Wed, 3 Oct 2012 06:43:10 +0000 (08:43 +0200)]
doc: add missing documentation for --report
* doc/bison.texi (Bison Options): Document --report's "solved", "all",
and "none".
Akim Demaille [Thu, 27 Sep 2012 07:43:49 +0000 (09:43 +0200)]
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.
Akim Demaille [Thu, 27 Sep 2012 07:42:57 +0000 (09:42 +0200)]
minor changes.
* NEWS: Word changes.
* doc/bison.texi: Spell check.
Fix minor issues.
* tests/headers.at: Comment and formatting changes.
Akim Demaille [Fri, 28 Sep 2012 13:04:57 +0000 (15:04 +0200)]
gnulib: update
Akim Demaille [Fri, 19 Oct 2012 09:36:18 +0000 (11:36 +0200)]
gnulib: update
Akim Demaille [Fri, 19 Oct 2012 09:28:59 +0000 (11:28 +0200)]
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.
Akim Demaille [Fri, 19 Oct 2012 09:28:01 +0000 (11:28 +0200)]
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.
Theophile Ranquet [Thu, 18 Oct 2012 15:38:32 +0000 (15:38 +0000)]
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.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Thu, 18 Oct 2012 15:38:33 +0000 (15:38 +0000)]
graphs: add tests, introducing -k graph
* tests/output.at (AT_TEST): New.
Use it to add 6 --graph tests.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Thu, 18 Oct 2012 15:38:31 +0000 (15:38 +0000)]
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.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Thu, 18 Oct 2012 15:38:30 +0000 (15:38 +0000)]
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.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Thu, 18 Oct 2012 15:38:29 +0000 (15:38 +0000)]
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.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Akim Demaille [Tue, 16 Oct 2012 13:29:33 +0000 (15:29 +0200)]
news: spell check
* NEWS: here.
Akim Demaille [Tue, 16 Oct 2012 13:26:55 +0000 (15:26 +0200)]
Merge branch 'maint'
* origin/maint:
java: use api.location.type and api.position.type
Conflicts:
NEWS
data/java.m4
doc/bison.texi
tests/java.at
Akim Demaille [Tue, 16 Oct 2012 11:57:31 +0000 (13:57 +0200)]
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.
Akim Demaille [Tue, 16 Oct 2012 09:04:03 +0000 (11:04 +0200)]
java: fixes
* data/java.m4: Remove stray M4 characters.
Akim Demaille [Tue, 16 Oct 2012 08:51:38 +0000 (10:51 +0200)]
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.
Theophile Ranquet [Mon, 15 Oct 2012 17:03:17 +0000 (17:03 +0000)]
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.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Mon, 15 Oct 2012 17:03:16 +0000 (17:03 +0000)]
scan-skel.l: formatting changes
* src/scan-skel.l (fail_for_at_directive_too_few_args): Here.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Akim Demaille [Fri, 12 Oct 2012 11:00:59 +0000 (13:00 +0200)]
java: use api.location.type and api.position.type
* data/java.m4: here.
* NEWS, doc/bison.texi, tests/java.at: Adjust.
Akim Demaille [Fri, 12 Oct 2012 10:39:52 +0000 (12:39 +0200)]
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
Conflicts:
data/glr.cc
data/java.m4
data/lalr1.cc
doc/bison.texi
src/muscle-tab.c
src/system.h
tests/calc.at
Akim Demaille [Fri, 12 Oct 2012 08:10:18 +0000 (10:10 +0200)]
tests: check %no-lines
* tests/synclines.at: here.
Akim Demaille [Fri, 12 Oct 2012 08:09:40 +0000 (10:09 +0200)]
tests: minor simplification
* tests/headers.at (Several parsers): Use *.y even for C++.
Akim Demaille [Thu, 11 Oct 2012 14:58:03 +0000 (16:58 +0200)]
graphs: stylistic changes.
* src/graphviz.c (output_red): Comment and formatting changes.
Theophile Ranquet [Thu, 11 Oct 2012 16:09:03 +0000 (16:09 +0000)]
graphs: minor style changes
* src/graphviz.c (output_red): Fix C90 issues.
Reduce variable scopes.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Mon, 8 Oct 2012 06:11:41 +0000 (06:11 +0000)]
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.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Wed, 10 Oct 2012 17:14:04 +0000 (17:14 +0000)]
graphs: style: prefix state number with "state"
* src/print_graph.c (print_core): Here.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Mon, 8 Oct 2012 15:53:44 +0000 (15:53 +0000)]
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.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Wed, 10 Oct 2012 17:14:02 +0000 (17:14 +0000)]
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.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Wed, 10 Oct 2012 17:14:01 +0000 (17:14 +0000)]
obstack: import obstack_finish0 from master
* src/system.h (obstack_finish0): New.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Akim Demaille [Wed, 10 Oct 2012 15:31:25 +0000 (17:31 +0200)]
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
Conflicts:
data/c.m4
data/glr.c
data/lalr1.cc
data/yacc.c
doc/Makefile.am
tests/atlocal.in
tests/calc.at
Akim Demaille [Tue, 9 Oct 2012 10:09:59 +0000 (12:09 +0200)]
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.
Akim Demaille [Tue, 9 Oct 2012 10:13:55 +0000 (12:13 +0200)]
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.
Akim Demaille [Tue, 9 Oct 2012 10:12:52 +0000 (12:12 +0200)]
maint: more macros
* src/output.c (ARRAY_CARDINALITY): Move to...
* src/system.h: here.
(STREQ, STRNEQ): new.
Akim Demaille [Mon, 8 Oct 2012 11:46:50 +0000 (13:46 +0200)]
NEWS: warnings with clang
* NEWS: here.
Akim Demaille [Mon, 8 Oct 2012 07:17:20 +0000 (09:17 +0200)]
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.
Akim Demaille [Mon, 8 Oct 2012 07:02:09 +0000 (09:02 +0200)]
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.
Paul Eggert [Fri, 5 Oct 2012 17:55:11 +0000 (10:55 -0700)]
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.
Akim Demaille [Mon, 8 Oct 2012 07:12:10 +0000 (09:12 +0200)]
skeletons: style changes
* data/yacc.c, data/glr.c: Prefer Title case for (CPP) macro arguments.
Akim Demaille [Mon, 1 Oct 2012 09:41:26 +0000 (11:41 +0200)]
lalr1.cc: document exception safety
* NEWS: here.
* doc/bison.texi (Destructor Decl, C++ Parser Interface): and there.
Akim Demaille [Tue, 25 Sep 2012 12:18:04 +0000 (14:18 +0200)]
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.
Akim Demaille [Tue, 25 Sep 2012 09:41:22 +0000 (11:41 +0200)]
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.
Akim Demaille [Tue, 25 Sep 2012 09:17:55 +0000 (11:17 +0200)]
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.
Akim Demaille [Thu, 20 Sep 2012 14:59:29 +0000 (16:59 +0200)]
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.
Akim Demaille [Thu, 20 Sep 2012 09:43:19 +0000 (11:43 +0200)]
lalr1.cc: check exception safety.
* tests/c++.at (Exception safety): New.
Akim Demaille [Thu, 20 Sep 2012 15:04:50 +0000 (17:04 +0200)]
lalr1.cc: indentation fixes.
* data/lalr1.cc (yyparse): here.
Untabify a block of code.
Akim Demaille [Tue, 25 Sep 2012 12:14:57 +0000 (14:14 +0200)]
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.
Akim Demaille [Thu, 20 Sep 2012 09:42:06 +0000 (11:42 +0200)]
tests: minor improvements
* tests/c++.at: Space changes.
Use AT_YYERROR_DEFINE.
* tests/local.at (AT_YYERROR_DEFINE): Issue errors on unknown languages.
Akim Demaille [Fri, 5 Oct 2012 07:24:59 +0000 (09:24 +0200)]
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.
Akim Demaille [Sun, 8 Apr 2012 06:58:43 +0000 (08:58 +0200)]
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.
Akim Demaille [Fri, 5 Oct 2012 07:20:30 +0000 (09:20 +0200)]
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.
Akim Demaille [Fri, 5 Oct 2012 06:54:15 +0000 (08:54 +0200)]
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.
Akim Demaille [Thu, 4 Oct 2012 15:16:00 +0000 (17:16 +0200)]
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
Conflicts:
NEWS
data/location.cc
Akim Demaille [Thu, 4 Oct 2012 13:36:00 +0000 (15:36 +0200)]
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.
Theophile Ranquet [Thu, 4 Oct 2012 13:23:40 +0000 (15:23 +0200)]
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.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Thu, 4 Oct 2012 13:12:56 +0000 (15:12 +0200)]
scan-skel: split @directive functions
* src/scan-skel.l (at_directive_perform): Split as...
(at_basename, at_complain, at_output): these.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>
Theophile Ranquet [Thu, 4 Oct 2012 10:35:42 +0000 (10:35 +0000)]
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.
Signed-off-by: Akim Demaille <akim@lrde.epita.fr>