]> git.saurik.com Git - bison.git/log
bison.git
16 years agoTest the make_TOKEN interface.
Akim Demaille [Fri, 10 Oct 2008 14:58:22 +0000 (16:58 +0200)] 
Test the make_TOKEN interface.

* tests/c++.at (AT_CHECK_VARIANTS): Require and use locations.
Factor the common code in yylex.
Use it to test "%define lex_symbol".

16 years agoFormatting change.
Akim Demaille [Fri, 10 Oct 2008 14:58:19 +0000 (16:58 +0200)] 
Formatting change.

16 years agoSimplify code for variants bench marks.
Akim Demaille [Fri, 10 Oct 2008 14:56:00 +0000 (16:56 +0200)] 
Simplify code for variants bench marks.

* etc/bench.pl.in (&generate_grammar_list): Define and use
location_type.
Factor the common code in yylex.

16 years agoBetter error message.
Akim Demaille [Wed, 22 Oct 2008 12:15:25 +0000 (07:15 -0500)] 
Better error message.

* bootstrap (find_tool): Fix the error message.

16 years agoUpdate variant.yy to newest interface.
Akim Demaille [Wed, 22 Oct 2008 11:27:42 +0000 (06:27 -0500)] 
Update variant.yy to newest interface.

* examples/variant.yy: Define lex_symbol.
Adjust.

16 years agoDon't use locations in variant.yy.
Akim Demaille [Wed, 22 Oct 2008 11:23:34 +0000 (06:23 -0500)] 
Don't use locations in variant.yy.

* examples/variant.yy: Adjust to not using locations.

16 years agoComment changes.
Akim Demaille [Tue, 23 Sep 2008 16:18:07 +0000 (18:18 +0200)] 
Comment changes.

* data/local.mk, etc/local.mk, examples/local.mk: Use Automake
comments for the license.

16 years agoRemove tests/Makefile.am.
Akim Demaille [Tue, 23 Sep 2008 14:25:45 +0000 (16:25 +0200)] 
Remove tests/Makefile.am.

* tests/Makefile.am: Rename as...
* tests/local.mk: this.
* Makefile.am, configure.ac: Adjust.
* Makefile.am (DISTCLEANFILES): Define.
(maintainer-check, maintainer-xml-check, maintainer-push-check):
Remove, we no longer need to bounce to the real targets.

16 years agoComment changes.
Akim Demaille [Tue, 23 Sep 2008 14:19:21 +0000 (16:19 +0200)] 
Comment changes.

16 years agodjgpp/local.mk.
Akim Demaille [Tue, 23 Sep 2008 14:18:36 +0000 (16:18 +0200)] 
djgpp/local.mk.

* Makefile.am (EXTRA_DIST): Move djgpp related part to...
* djgpp/local.mk: this new file.

16 years agoRemove doc/Makefile.am.
Akim Demaille [Tue, 23 Sep 2008 14:15:19 +0000 (16:15 +0200)] 
Remove doc/Makefile.am.

* doc/Makefile.am: Rename as...
* doc/local.mk: this.
Adjust paths
* Makefile.am, configure.ac: Adjust.
* Makefile.am (MOSTLYCLEANFILES): New.
* src/local.mk: Adjust.

16 years agoMove sc_tight_scope into maint.mk.
Akim Demaille [Tue, 23 Sep 2008 14:05:52 +0000 (16:05 +0200)] 
Move sc_tight_scope into maint.mk.

It does not work, and I don't know how it was supposed to work: it seems
to be looking for sources in the build tree.  I just moved it at a better
place, fixing it is still required.

* src/local.mk (echo): Remove.
(sc_tight_scope): Move to...
* maint.mk: here.

16 years agoRegen.
Akim Demaille [Sat, 15 Nov 2008 10:03:37 +0000 (11:03 +0100)] 
Regen.

* src/parse-gram.h, src/parse-gram.c: Regen.

16 years agoRemove src/Makefile.am.
Akim Demaille [Tue, 23 Sep 2008 13:54:56 +0000 (15:54 +0200)] 
Remove src/Makefile.am.

* src/Makefile.am: Rename as...
* src/local.mk: this.
Prefix all the paths with src/.
(AUTOMAKE_OPTIONS): Build object files in the sub dirs.
(AM_CPPFLAGS): Find find in builddir/src.
(YACC): Move the flags into...
(AM_YFLAGS): here.
* maint.mk (sc_tight_scope): Disable.
It used to bounce to the version in src/Makefile.am which is now
part of this very Makefile.
* Makefile.am, configure.ac: Adjust.
* src/scan-code-c.c, src/scan-code.l: We can no longer rely on
include "..." to find files "here": we are no longer in src/, so
qualify the includes with src/.
* doc/Makefile.am (PREPATH): No longer include the top_builddir
prefix.
(.x.1): Adjust to be able to create src/foo from the top level
Makefile, instead of going bounce to src/Makefile the creation of
foo.

16 years agoRemove useless variable.
Akim Demaille [Tue, 23 Sep 2008 13:45:03 +0000 (15:45 +0200)] 
Remove useless variable.

* doc/Makefile.am (srcsrcdir): Remove.

16 years agoRemove data/Makefile.am.
Akim Demaille [Tue, 23 Sep 2008 13:05:51 +0000 (15:05 +0200)] 
Remove data/Makefile.am.

* data/Makefile.am: Rename as...
* data/local.mk: this.
Adjust paths.
* Makefile.am, configure.ac: Adjust.

16 years agoRemove etc/Makefile.am.
Akim Demaille [Tue, 23 Sep 2008 13:02:44 +0000 (15:02 +0200)] 
Remove etc/Makefile.am.

* etc/Makefile.am: Rename as...
* etc/local.mk: this.
Adjust.
* Makefile.am, configure.ac: Adjust.

16 years agoRemove examples/local.mk.
Akim Demaille [Tue, 23 Sep 2008 13:00:06 +0000 (15:00 +0200)] 
Remove examples/local.mk.

examples/calc++/Makefile.am might be interesting to keep as is, since
it is an example in itself.

* examples/Makefile.am: Rename as...
* examples/local.mk: this.
Adjust.
* Makefile.am, configure.ac: Adjust.

16 years agoRemove build-aux/Makefile.am.
Akim Demaille [Tue, 23 Sep 2008 12:48:11 +0000 (14:48 +0200)] 
Remove build-aux/Makefile.am.

Recursive Makefiles are really way too slow, let's get rid of some of
them.

* build-aux/Makefile.am: Rename as...
* build-aux/local.mk: this.
Adjust paths.
* Makefile.am, configure.ac: Adjust.

16 years agoProvide convenience constructors for locations and positions.
Akim Demaille [Tue, 23 Sep 2008 11:49:41 +0000 (13:49 +0200)] 
Provide convenience constructors for locations and positions.

* data/location.cc (position::position): Accept file, line and
column as arguments with default values.
Always qualify initial line and column literals as unsigned.
(location::location): Provide convenience constructors.

16 years agoInstead of using make_symbol<TOK_FOO>, generate make_FOO for each token type.
Akim Demaille [Thu, 4 Sep 2008 20:41:01 +0000 (22:41 +0200)] 
Instead of using make_symbol<TOK_FOO>, generate make_FOO for each token type.

Using template buys us nothing, and makes it uselessly complex to
construct a symbol.  Besides, it could not be generalized to other
languages, while make_FOO would work in C/Java etc.

* data/lalr1.cc (b4_symbol_): New.
(b4_symbol): Use it.
(b4_symbol_constructor_declaration_)
(b4_symbol_constructor_definition_): Instead of generating
specializations of an overloaded template function, just generate
several functions whose names are forged from the token names
without the token.prefix.
(b4_symbol_constructor_declarations): Generate them for all the
symbols, not just by class of symbol type, now that instead of
specializing a function template by the token, we generate a
function named after the token.
(b4_symbol_constructor_specialization_)
(b4_symbol_constructor_specializations): Remove.
* etc/bench.pl.in: Adjust to this new API.

16 years ago%define token.prefix.
Akim Demaille [Mon, 1 Sep 2008 14:58:13 +0000 (16:58 +0200)] 
%define token.prefix.

Provide a means to add a prefix to the name of the tokens as output in the
generated files.  Because of name clashes, it is good to have such a
prefix such as TOK_ that protects from names such as EOF, FILE etc.
But it clutters the grammar itself.

* data/bison.m4 (token.prefix): Empty by default.
* data/c.m4 (b4_token_enum, b4_token_define): Use it.
* data/lalr1.cc (b4_symbol): Ditto.

16 years agoCompute at M4 time some of the subtractions.
Akim Demaille [Mon, 1 Sep 2008 09:39:41 +0000 (11:39 +0200)] 
Compute at M4 time some of the subtractions.

* data/lalr1.cc (b4_substract): New.
(b4_rhs_data): Use it.

16 years agosymbol::token.
Akim Demaille [Mon, 1 Sep 2008 08:51:46 +0000 (10:51 +0200)] 
symbol::token.

This is allows the user to get the type of a token return by
yylex.

* data/lalr1.cc (symbol::token): New.
(yytoknum_): Define when %define lex_symbol, independently of
%debug.
(yytoken_number_): Move into...
(symbol::token): here, since that's the only use.
The other one is YYPRINT which was not officially supported
by lalr1.cc, and anyway it did not work since YYPRINT uses this
array under a different name (yytoknum).

16 years agoYYERRCODE.
Akim Demaille [Fri, 29 Aug 2008 18:29:20 +0000 (20:29 +0200)] 
YYERRCODE.

* TODO (YYERRCODE): Mention the case of $undef.

16 years agoTODO: YYPRINT.
Akim Demaille [Fri, 29 Aug 2008 18:11:22 +0000 (20:11 +0200)] 
TODO: YYPRINT.

* TODO (YYPRINT): New.

16 years agoComment changes.
Akim Demaille [Fri, 29 Aug 2008 17:48:50 +0000 (19:48 +0200)] 
Comment changes.

* data/lalr1.cc, data/yacc.c: Fix the description of the
yytranslate and yytoknum tables.

16 years agoDefine make_symbol in the header.
Akim Demaille [Thu, 28 Aug 2008 09:50:09 +0000 (11:50 +0200)] 
Define make_symbol in the header.

To reach good performances these functions should be inlined (yet this is
to measure precisely).  To this end they must be available to the caller.

* data/lalr1.cc (b4_symbol_constructor_definition_): Qualify
location_type with the class name.
Since will now be output in the header, declare "inline".
No longer use b4_symbol_constructor_specializations, but
b4_symbol_constructor_definitions in the header.
Don't call it in the *.cc file.

16 years agoDefine yytranslate in the header for lex_symbol.
Akim Demaille [Thu, 28 Aug 2008 12:07:29 +0000 (14:07 +0200)] 
Define yytranslate in the header for lex_symbol.

* data/lalr1.cc: Move the invocation of b4_yytranslate_definition
into the header file when using %define lex_symbol.
(yytranslate_): Declare inline.

16 years agoDefine the constructors of symbol_type in b4_symbol_constructor_definitions.
Akim Demaille [Thu, 28 Aug 2008 11:31:56 +0000 (13:31 +0200)] 
Define the constructors of symbol_type in b4_symbol_constructor_definitions.

The constructors are called by the make_symbol functions, which a
forthcoming patch will move elsewhere.  Hence the interest of putting them
together.

The stack_symbol_type does not need to be moved, it is used only by the
parser.

* data/lalr1.cc: Move symbol_type and symbol_base_type
constructors into...
(b4_symbol_constructor_definitions): here.
Adjust.

16 years agoMake it easier to move the definition of yytranslate_.
Akim Demaille [Thu, 28 Aug 2008 11:00:26 +0000 (13:00 +0200)] 
Make it easier to move the definition of yytranslate_.

Forthcoming changes will make it possible to use yytranslate_
from outside the parser implementation file.

* data/lalr1.cc (b4_yytranslate_definition): New.
Use it.

16 years agoRemove useless class specification.
Akim Demaille [Thu, 28 Aug 2008 09:50:14 +0000 (11:50 +0200)] 
Remove useless class specification.

* data/lalr1.cc (b4_symbol_constructor_specialization_): No need
to refer to the class name to use a type defined by the class for
arguments of member functions.

16 years agoFiner input type for yytranslate.
Akim Demaille [Thu, 28 Aug 2008 08:32:14 +0000 (10:32 +0200)] 
Finer input type for yytranslate.

This patch is debatable: the tradition expects yylex to return an int
which happens to correspond to token_number (which is an enum).  This
allows for instance to return characters (such as '*' etc.).  But this
goes against the stronger typing I am trying to have with the new
lex interface which return a symbol_type.  So in this case, feed
yytranslate_ with a token_type.

* data/lalr1.cc (yytranslate_): When in %define lex-symbol,
expect a token_type.

16 years agoHonor lex-params in %define lex_symbol mode.
Akim Demaille [Tue, 26 Aug 2008 20:09:30 +0000 (22:09 +0200)] 
Honor lex-params in %define lex_symbol mode.

* data/lalr1.cc: Use b4_lex_param.

16 years agoSimplify names.
Akim Demaille [Tue, 26 Aug 2008 18:30:40 +0000 (20:30 +0200)] 
Simplify names.

* src/output.c (symbol_definitions_output): Rename symbol
attributes type_name and has_type_name as type and has_type.
* data/lalr1.cc: Adjust uses.

16 years agoUse b4_type_names for the union type.
Akim Demaille [Tue, 26 Aug 2008 18:25:58 +0000 (20:25 +0200)] 
Use b4_type_names for the union type.

The union used to compute the size of the variant used to iterate over the
type of all the symbols, with a lot of redundancy.  Now iterate over the
lists of symbols having the same type-name.

* data/lalr1.cc (b4_char_sizeof_): New.
(b4_char_sizeof): Use it.
Adjust to be called with a list of numbers instead of a single
number.
Adjust its caller for new-line issues.

16 years agoDefine the "identifier" of a symbol.
Akim Demaille [Tue, 26 Aug 2008 18:10:03 +0000 (20:10 +0200)] 
Define the "identifier" of a symbol.

Symbols may have several string representations, for instance if they
have an alias.  What I call its "id" is a string that can be used as
an identifier.  May not exist.

Currently the symbols which have the "tag_is_id" flag set are those that
don't have an alias.  Look harder for the id.

* src/output.c (is_identifier): Move to...
* src/symtab.c (is_identifier): here.
* src/symtab.h, src/symtab.c (symbol_id_get): New.
* src/output.c (symbol_definitions_output): Use it to define "id"
and "has_id".
Remove the definition of "tag_is_id".
* data/lalr1.cc: Use the "id" and "has_id" whereever "tag" and
"tag_is_id" were used to produce code.
We still use "tag" for documentation.

16 years agoRegen.
Akim Demaille [Tue, 11 Nov 2008 15:41:28 +0000 (16:41 +0100)] 
Regen.

* src/parse-gram.h, src/parse-gram.c: Regen.

16 years agoLocations are no longer required by lalr1.cc.
Akim Demaille [Mon, 25 Aug 2008 11:52:51 +0000 (13:52 +0200)] 
Locations are no longer required by lalr1.cc.

* data/lalr1.cc (_b4_args, b4_args): New.
Adjust all uses of locations to make them optional.
* tests/c++.at (AT_CHECK_VARIANTS): No longer use the locations.
(AT_CHECK_NAMESPACE): Check the use of locations.
* tests/calc.at (_AT_DATA_CALC_Y): Adjust to be usable with or
without locations with lalr1.cc.
Test these cases.
* tests/output.at: Check lalr1.cc with and without location
support.
* tests/regression.at (_AT_DATA_EXPECT2_Y, _AT_DATA_DANCER_Y):
Don't use locations.

16 years agoAT_FULL_COMPILE.
Akim Demaille [Mon, 25 Aug 2008 11:43:00 +0000 (13:43 +0200)] 
AT_FULL_COMPILE.

* tests/local.at (AT_FULL_COMPILE): New.
* tests/actions.at, tests/calc.at, tests/regression.at: Use it.

16 years agoSupport parens in calc++.
Akim Demaille [Thu, 21 Aug 2008 20:39:01 +0000 (22:39 +0200)] 
Support parens in calc++.

* doc/bison.texinfo (Calc++ Scanner, Calc++ Parser): Support parens.
* examples/calc++/test (run): Check the expected output.
Adjust callers.
Check parens too.

16 years agoSimplify lalr1.cc since %defines is mandatory.
Akim Demaille [Thu, 21 Aug 2008 20:12:35 +0000 (22:12 +0200)] 
Simplify lalr1.cc since %defines is mandatory.

* data/lalr1.cc: Remove useless calls to b4_defines_if.

16 years agoTODO: yyfmt.
Akim Demaille [Thu, 21 Aug 2008 20:06:17 +0000 (22:06 +0200)] 
TODO: yyfmt.

* TODO (yysyntax_error): New item.

16 years agoPrefer M4 to CPP.
Akim Demaille [Thu, 21 Aug 2008 20:04:27 +0000 (22:04 +0200)] 
Prefer M4 to CPP.

* data/lalr1.cc: Use b4_error_verbose_if instead of #if
YYERROR_VERBOSE.

16 years agoSupport i18n of the parse error messages.
Akim Demaille [Thu, 21 Aug 2008 19:46:13 +0000 (21:46 +0200)] 
Support i18n of the parse error messages.

* TODO (lalr1.cc/I18n): Remove.
* data/lalr1.cc (yysyntax_error_): Support the translation of the
error messages, as done in yacc.c.
Stay within the yy* pseudo namespace.

16 years agoMore TODO.
Akim Demaille [Thu, 21 Aug 2008 19:43:05 +0000 (21:43 +0200)] 
More TODO.

* TODO (single stack, yysyntax_error): New.

16 years agoMake it possible to return a symbol_type from yylex.
Akim Demaille [Tue, 19 Aug 2008 19:39:03 +0000 (21:39 +0200)] 
Make it possible to return a symbol_type from yylex.

* data/lalr1.cc (b4_lex_symbol_if): New.
(parse): When lex_symbol is defined, expected yylex to return the
complete lookahead.
* etc/bench.pl.in (generate_grammar_list): Extend to support this
yylex interface.
(bench_variant_parser): Exercise it.

16 years agoRemove useless bench case.
Akim Demaille [Mon, 18 Aug 2008 20:54:57 +0000 (22:54 +0200)] 
Remove useless bench case.

* etc/bench.pl.in (bench_variant_parser): VARIANT_DESTROY is
no longer used.

16 years agoImprove display of directives.
Akim Demaille [Mon, 18 Aug 2008 20:54:06 +0000 (22:54 +0200)] 
Improve display of directives.

* etc/bench.pl.in (parse_term): Don't add useless eol.

16 years agoUse string_cast in the bench.
Akim Demaille [Mon, 18 Aug 2008 20:53:15 +0000 (22:53 +0200)] 
Use string_cast in the bench.

* etc/bench.pl.in (generate_grammar_list): Define and use
string_cast.

16 years agoReplace yychar with a Boolean.
Akim Demaille [Mon, 18 Aug 2008 20:31:13 +0000 (22:31 +0200)] 
Replace yychar with a Boolean.

* data/lalr1.cc (parse::yychar): Replace by...
(parse::yyempty): this.

16 years agoFactor the tables.
Akim Demaille [Mon, 18 Aug 2008 20:21:17 +0000 (22:21 +0200)] 
Factor the tables.

* TODO: New item.

16 years agoLet yytranslate handle the eof case.
Akim Demaille [Mon, 18 Aug 2008 20:16:40 +0000 (22:16 +0200)] 
Let yytranslate handle the eof case.

* data/lalr1.cc (yytranslate_): Handle the EOF case.
Adjust callers.
No longer expect yychar to be equal to yyeof_, rather, test the
lookahead's (translated) kind.

16 years agoyychar cannot be empty in yyerrlab.
Akim Demaille [Mon, 18 Aug 2008 19:31:06 +0000 (21:31 +0200)] 
yychar cannot be empty in yyerrlab.

* TODO (yychar == yyempty_): New.
* data/lalr1.cc: Remove the handling of this case.
This eases forthcoming changes related to yychar and yytranslate.

16 years agoBench: syntactic sugar for %define/#define.
Akim Demaille [Mon, 18 Aug 2008 18:21:13 +0000 (20:21 +0200)] 
Bench: syntactic sugar for %define/#define.

* etc/bench.pl.in (parse_dirs): Support %d and #d with arguments.
(&bench_push_parser, bench_variant_parser): Use this feature.
(&eat): New.
Use it.

16 years agoLess memory pressure on the "list" bench.
Akim Demaille [Mon, 18 Aug 2008 18:20:09 +0000 (20:20 +0200)] 
Less memory pressure on the "list" bench.

* etc/bench.pl.in (generate_grammar_list): Do not accumulate all
the values, to limit memory pressure.

16 years agoIntroduce make_symbol.
Akim Demaille [Mon, 18 Aug 2008 13:48:36 +0000 (15:48 +0200)] 
Introduce make_symbol.

make_symbol provides a means to construct a full symbol (kind, value,
location) in a single shot.  It is meant to be a Symbol constructor,
parameterized by the symbol kind so that overloading would prevent
incorrect kind/value pairs.  Unfortunately parameterized constructors do
not work well in C++ (unless the parameter also appears as an argument,
which is not acceptable), hence the use of a function instead of a
constructor.

* data/lalr1.cc (b4_symbol_constructor_declaration_)
(b4_symbol_constructor_declarations)
(b4_symbol_constructor_specialization_)
(b4_symbol_constructor_specializations)
(b4_symbol_constructor_definition_)
(b4_symbol_constructor_definitions): New.
Use them where appropriate to generate declaration, declaration of
the specializations, and implementations of the templated
overloaded function "make_symbol".
(variant::variant): Always define a default ctor.
Also provide a copy ctor.
(symbol_base_type, symbol_type): New ctor overloads for value-less
symbols.
(symbol_type): Now public, so that functions such as yylex can use
it.

16 years agoInform m4 whether a tag is a valid id.
Akim Demaille [Mon, 18 Aug 2008 13:48:45 +0000 (15:48 +0200)] 
Inform m4 whether a tag is a valid id.

* src/output.c (is_identifier): New.
(symbol_definitions_output): Use it to define tag_is_id.
But maybe this should be done at m4 level?

16 years agoAdd ChangeLog entry for the previous checkin.
Akim Demaille [Tue, 11 Nov 2008 13:48:56 +0000 (14:48 +0100)] 
Add ChangeLog entry for the previous checkin.

16 years agoGet rid of tabulations in the Java output.
Akim Demaille [Tue, 11 Nov 2008 13:42:35 +0000 (14:42 +0100)] 
Get rid of tabulations in the Java output.

Test 214 was failing: it greps with a pattern containing [    ]* which
obviously meant to catch spaces and tabs, but contained only tabs.
Tabulations in sources are a nuisance, so to simplify the matter, get rid
of all the tabulations in the Java sources.  The other skeletons will be
treated equally later.

* data/java.m4, data/lalr1.java: Untabify.
* tests/java.at: Simplify AT_CHECK_JAVA_GREP invocations:
tabulations are no longer generated.

16 years agoReplace m4/warning.m4 with warnings module.
Paolo Bonzini [Tue, 11 Nov 2008 12:37:36 +0000 (13:37 +0100)] 
Replace m4/warning.m4 with warnings module.

* bootstrap.conf: Replace m4/warning.m4 with warnings module.
* configure.ac: Adjust usage.
* lib/Makefile.am: Replace $(WARNING_CFLAGS) with $(WARN_CFLAGS).
* src/Makefile.am: Replace $(WARNING_CFLAGS) with $(WARN_CFLAGS).
* tests/atlocal.in: Replace $(WARNING_*FLAGS) with $(WARN_*FLAGS).

16 years agoWork around Java's ``code too large'' problem for parser tables.
Di-an Jan [Mon, 10 Nov 2008 13:34:36 +0000 (14:34 +0100)] 
Work around Java's ``code too large'' problem for parser tables.

* data/java.m4 (b4_typed_parser_table, b4_integral_parser_table): New.
* data/lalr1.java (yypact_, yydefact_, yypgoto_, yydefgoto_,
yytable_, yycheck_, yystos_, yytoken_number_, yyr1_, yyr2_, yyrhs_
yyprhs_, yyrline_, yytranslate_table_): Use b4_integral_parser_table.
(yytname_): Use b4_typed_parser_table.
* doc/bison.texinfo (Java Bison Interface): Add note on Java's
``code too large'' error.

16 years agoVarious Java skeleton improvements.
Di-an Jan [Mon, 10 Nov 2008 13:29:07 +0000 (14:29 +0100)] 
Various Java skeleton improvements.

* NEWS: Document them.

General Java skeleton improvements.
* configure.ac (gt_JAVACOMP): Request target of 1.4, which allows
using gcj < 4.3 in the testsuite, according to comments in
gnulib/m4/javacomp.m4.
* data/java.m4 (stype, parser_class_name, lex_throws, throws,
location_type, position_type): Remove extraneous brackets from
b4_percent_define_default.
(b4_lex_param, b4_parse_param): Remove extraneous brackets from
m4_define and m4_define_default.
* data/lalr1.java (b4_pre_prologue): Change to b4_user_post_prologue,
which marks the end of user code with appropriate syncline, like all
the other skeletons.
(b4_user_post_prologue): Add.  Don't silently drop.
(yylex): Remove.
(parse): Inline yylex.
* doc/bison.texinfo (bisonVersion, bisonSkeleton): Document.
(%{...%}): Fix typo of %code imports.
* tests/java.at (AT_JAVA_COMPILE): Add "java" keyword.
Support annotations on parser class with %define annotations.
* data/lalr1.java (annotations): Add to parser class modifier.
* doc/bison.texinfo (Java Parser Interface): Document
%define annotations.
(Java Declarations Summary): Document %define annotations.
* tests/java.at (Java parser class modifiers): Test annotations.
Do not generate code for %error-verbose unless requested.
* data/lalr1.java (errorVerbose): Rename to yyErrorVerbose.
Make private.  Make conditional on %error-verbose.
(getErrorVerbose, setErrorVerbose): New.
(yytnamerr_): Make conditional on %error-verbose.
(yysyntax_error): Make some code conditional on %error-verbose.
* doc/bison.texinfo (Java Bison Interface): Remove the parts
about %error-verbose having no effect.
(getErrorVerbose, setErrorVerbose): Document.
Move constants for token names to Lexer interface.
* data/lalr1.java (Lexer): Move EOF, b4_token_enums(b4_tokens) here.
* data/java.m4 (b4_token_enum): Indent for move to Lexer interface.
(parse): Qualify EOF to Lexer.EOF.
* doc/bison.texinfo (Java Parser Interface): Move documentation of
EOF and token names to Java Lexer Interface.
* tests/java.at (_AT_DATA_JAVA_CALC_Y): Remove Calc qualifier.
Make yyerror public.
* data/lalr1.java (Lexer.yyerror): Use longer parameter name.
(yyerror): Change to public.  Add Javadoc comments.  Use longer
parameter names.  Make the body rather than the declarator
conditional on %locations.
* doc/bison.texinfo (yyerror): Document.  Don't mark as protected.
Allow user to add code to the constructor with %code init.
* data/java.m4 (b4_init_throws): New, for %define init_throws.
* data/lalr1.java (YYParser.YYParser): Add b4_init_throws.
Add %code init to the front of the constructor body.
* doc/bison.texinfo (YYParser.YYParser): Document %code init
and %define init_throws.
(Java Declarations Summary): Document %code init and
%define init_throws.
* tests/java.at (Java %parse-param and %lex-param): Adjust grep.
(Java constructor init and init_throws): Add tests.

16 years agoUpdate TODO.
Akim Demaille [Mon, 18 Aug 2008 12:44:05 +0000 (14:44 +0200)] 
Update TODO.

* TODO (-D): is implemented.
(associativity): Same precedence must have the same associativity.
For instance, how can a * b / c be parsed if * is %left and / is
%right?
(YYERRORCODE, YYFAIL, YYBACKUP): New.

16 years agoFormatting changes.
Akim Demaille [Sat, 16 Aug 2008 21:18:50 +0000 (23:18 +0200)] 
Formatting changes.

16 years agoMore information about the symbols.
Akim Demaille [Sat, 16 Aug 2008 18:32:37 +0000 (20:32 +0200)] 
More information about the symbols.

* src/output.c (type_names_output): Document all the symbols,
including those that don't have a type-name.
(symbol_definitions_output): Define "is_token" and
"has_type_name".
* data/lalr1.cc (b4_type_action_): Skip symbols that have an empty
type-name, now that they are defined too in b4_type_names.

16 years agoRegen.
Akim Demaille [Sat, 16 Aug 2008 13:55:49 +0000 (15:55 +0200)] 
Regen.

16 years agoMake parser::yytranslate static.
Akim Demaille [Sat, 16 Aug 2008 13:47:30 +0000 (15:47 +0200)] 
Make parser::yytranslate static.

Small speedup (1%) on the list grammar.  And makes yytranslate_ available
in non member functions.

* data/lalr1.cc (yytranslate_): Does not need to be a instance
function.

16 years agoAvoid trailing spaces.
Akim Demaille [Sat, 16 Aug 2008 13:29:30 +0000 (15:29 +0200)] 
Avoid trailing spaces.

* data/c.m4: b4_comment(TEXT): Don't indent empty lines.
* data/lalr1.cc: Don't indent before rule and symbol actions, as
they can be empty, and anyway this incorrectly indents the first
action.

16 years agoComment changes.
Akim Demaille [Sat, 16 Aug 2008 13:01:31 +0000 (15:01 +0200)] 
Comment changes.

16 years agoUse "enum" for integral constants.
Akim Demaille [Sat, 16 Aug 2008 08:22:09 +0000 (10:22 +0200)] 
Use "enum" for integral constants.

This is just nicer to read, I observed no speedup.

* data/lalr1.cc (yyeof_, yylast_, yynnts_, yyempty_, yyfinal_)
(yterror_, yyerrcode_, yyntokens_): Define as members of an enum.
(yyuser_token_number_max_, yyundef_token_): Move into...
(yytranslate_): here.

16 years agoShortcuts in bench directives.
Akim Demaille [Sat, 16 Aug 2008 07:40:34 +0000 (09:40 +0200)] 
Shortcuts in bench directives.

* etc/bench.pl.in (parse_dirs): New.
Use it.
(bench_variant_parser, bench_fusion_parser): Use %s and %d.
Create the benches in "benches/".

16 years agoFormatting changes.
Akim Demaille [Sat, 16 Aug 2008 07:06:00 +0000 (09:06 +0200)] 
Formatting changes.

* data/lalr1.cc: here.

16 years agoAdjust verbose message to using emacs.
Akim Demaille [Wed, 13 Aug 2008 11:18:22 +0000 (13:18 +0200)] 
Adjust verbose message to using emacs.

* etc/bench.pl.in: Inform compilation-mode when we change the
directory.
(generate_grammar_list): Recognize %define "variant" in addition
to %define variant.

16 years agoClassify symbols by type-name.
Akim Demaille [Tue, 12 Aug 2008 20:46:36 +0000 (22:46 +0200)] 
Classify symbols by type-name.

* src/uniqstr.h (UNIQSTR_CMP): New.
* src/output.c (symbol_type_name_cmp, symbols_by_type_name)
(type_names_output): New.
(muscles_output): Use it.
* data/lalr1.cc (b4_symbol_action_): Remove.
(b4_symbol_case_, b4_type_action_): New.
Adjust uses of b4_symbol_action_ to use b4_type_action_.

16 years agoChange the handling of the symbols in the skeletons.
Akim Demaille [Tue, 12 Aug 2008 19:48:53 +0000 (21:48 +0200)] 
Change the handling of the symbols in the skeletons.

Before we were using tables which lines were the symbols and which
columns were things like number, tag, type-name etc.  It is was
difficult to extend: each time a column was added, all the numbers had
to be updated (you asked for colon $2, not for "tag").  Also, it was
hard to filter these tables when only a subset of the symbols (say the
tokens, or the nterms, or the tokens that have and external number
*and* a type-name) was of interest.

Now instead of monolithic tables, we define one macro per cell.  For
instance "b4_symbol(0, tag)" is a macro name which contents is
self-decriptive.  The macro "b4_symbol" provides easier access to
these cells.

* src/output.c (type_names_output): Remove.
(symbol_numbers_output, symbol_definitions_output): New.
(muscles_output): Call them.
(prepare_symbols): Define b4_symbols_number.

16 years ago--trace=muscles
Akim Demaille [Tue, 12 Aug 2008 19:48:44 +0000 (21:48 +0200)] 
--trace=muscles

* src/getargs.h, src/getargs.c (trace_muscle): New.
(trace_types, trace_args): Support it.
* src/output.c (output_skeleton): Use it.

16 years agomuscles_output.
Akim Demaille [Tue, 12 Aug 2008 19:11:53 +0000 (21:11 +0200)] 
muscles_output.

* src/output.c (muscles_output): New, extracted from...
(output_skeleton): here.
Adjust.

16 years agoFormatting changes.
Akim Demaille [Tue, 12 Aug 2008 19:11:00 +0000 (21:11 +0200)] 
Formatting changes.

16 years agoUpdate the variant example.
Akim Demaille [Sat, 9 Aug 2008 12:59:34 +0000 (14:59 +0200)] 
Update the variant example.

* examples/variant.yy: Formatting changes.
One stage build.

16 years agoSupport constructor with an argument.
Akim Demaille [Thu, 7 Aug 2008 22:38:07 +0000 (00:38 +0200)] 
Support constructor with an argument.

This improves the "list" bench by 2%.

* data/lalr1.cc (variant::build): Add an overloaded version with
an argument.
* tests/c++.at (AT_CHECK_VARIANT): Check it.

16 years agoTest variants.
Akim Demaille [Thu, 7 Aug 2008 21:40:09 +0000 (23:40 +0200)] 
Test variants.

* tests/c++.at (AT_CHECK_VARIANTS): New.
Use it with and without %define assert.

16 years agoRegen.
Akim Demaille [Thu, 7 Aug 2008 21:21:44 +0000 (23:21 +0200)] 
Regen.

16 years agoAdd %precedence support.
Akim Demaille [Thu, 7 Aug 2008 21:15:34 +0000 (23:15 +0200)] 
Add %precedence support.

Unfortunately it is not possible to reuse the %prec directive.  This
is because to please POSIX, we do not require to end the rules with a
semicolon.  As a result,

foo: bar %prec baz

is ambiguous: either a rule which precedence is that of baz, or a rule,
and then a declaration of the precedence of the token baz.

* doc/bison.texinfo: Document %precedence.
(Precedence Only): New.
* src/assoc.h, src/assoc.c (precedence_assoc): New.
* src/conflicts.c (resolve_sr_conflict): Support it.
* src/scan-gram.l, src/parse-gram.y (%precedence): New token.
Parse it.
* tests/calc.at: Use %precedence for NEG.
* tests/conflicts.at (%precedence does not suffice)
(%precedence suffices): New tests.

16 years agoMake benches in a sub dirs.
Akim Demaille [Thu, 7 Aug 2008 19:23:41 +0000 (21:23 +0200)] 
Make benches in a sub dirs.

* etc/bench.pl.in ($dir): New.
Use it.
Check the use of constructors with an argument.
(bench_variant_parser): Fix.

16 years agofix eof condition
Akim Demaille [Thu, 7 Aug 2008 18:53:08 +0000 (20:53 +0200)] 
fix eof condition

16 years agoFix --help.
Akim Demaille [Thu, 7 Aug 2008 18:49:10 +0000 (20:49 +0200)] 
Fix --help.

16 years agoRequire the generation of parse-gram.output.
Akim Demaille [Thu, 7 Aug 2008 18:46:28 +0000 (20:46 +0200)] 
Require the generation of parse-gram.output.

* src/Makefile.am (YACC): Pass --report=all.

16 years agoFormatting changes.
Akim Demaille [Thu, 7 Aug 2008 12:45:17 +0000 (14:45 +0200)] 
Formatting changes.

16 years agoUpdate TODO.
Akim Demaille [Tue, 5 Aug 2008 11:48:03 +0000 (13:48 +0200)] 
Update TODO.

* TODO: Remove obsolete items.
Update others.

16 years agoEnhance bench.pl.
Akim Demaille [Mon, 4 Aug 2008 19:56:21 +0000 (21:56 +0200)] 
Enhance bench.pl.

* etc/bench.pl.in (parse, parse_expr, parse_term, parse_fact)
(@token, $grammar, $bench): New.
(generate_grammar_variant): Rename as...
(generate_grammar_list): this.
(generate_grammar): Adjust.
(bench_grammar): Rename as...
(bench): this.
Use it in the various bench-marking routines.
(-b, -g): New options.

16 years agoUse a static hierarchy for symbols in the C++ parser.
Akim Demaille [Mon, 4 Aug 2008 19:54:26 +0000 (21:54 +0200)] 
Use a static hierarchy for symbols in the C++ parser.

* data/lalr1.cc (symbol_base_type, symbol_type)
(stack_symbol_type): Make it a static hierarchy.
Adjust dependencies.

16 years agobench.pl -d, --directive.
Akim Demaille [Sat, 2 Aug 2008 20:06:49 +0000 (22:06 +0200)] 
bench.pl -d, --directive.

* etc/bench.pl.in (@directive): New.
(&bench_grammar): Use it.
(&bench_list_grammar): New, to provide access to the "variant"
grammar.
Use it.
(getopts): Support -d, --directive.

16 years agoUse inline for small operations.
Akim Demaille [Sat, 2 Aug 2008 20:04:05 +0000 (22:04 +0200)] 
Use inline for small operations.

* data/lalr1.cc (symbol_base_type, symbol_type)
(stack_symbol_type): Declare constructor and other operations as
inline.
(yy_destroy_): Inline.

16 years agoIntroduce a hierarchy for symbols.
Akim Demaille [Sat, 2 Aug 2008 19:42:48 +0000 (21:42 +0200)] 
Introduce a hierarchy for symbols.

* data/lalr1.cc (symbol_base_type, symbol_type): New.
(data_type): Rename as...
(stack_symbol_type): this.
Derive from symbol_base_type.
(yy_symbol_value_print_): Merge into...
(yy_symbol_print_): this.
Rename as...
(yy_print_): this.
(yydestruct_): Rename as...
(yy_destroy_): this.
(b4_symbols_actions, YY_SYMBOL_PRINT): Adjust.
(parser::parse): yyla is now of symbol_type.
Use its type member instead of yytoken.

16 years agoRename data_type and stack_symbol_type.
Akim Demaille [Sat, 2 Aug 2008 12:29:23 +0000 (14:29 +0200)] 
Rename data_type and stack_symbol_type.

* data/lalr1.cc (data_type): Rename as...
(stack_symbol_type): this.

16 years agoHandle semantic value and location together.
Akim Demaille [Sat, 2 Aug 2008 12:18:48 +0000 (14:18 +0200)] 
Handle semantic value and location together.

* data/lalr1.cc (b4_symbol_actions): Bounce $$ and @$ to
yydata.value and yydata.location.
(yy_symbol_value_print_, yy_symbol_print_, yydestruct_)
(YY_SYMBOL_PRINT): Now take semantic value and location as a
single arg.
Adjust all callers.
(yydestruct_): New overload for a stack symbol.

16 years agoPush a complete symbol, not connected parts.
Akim Demaille [Sat, 2 Aug 2008 12:00:39 +0000 (14:00 +0200)] 
Push a complete symbol, not connected parts.

* data/lalr1.cc (yypush_): Take a data_type&, not disconnected
state, value and location.
Adjust callers.

16 years agoAgregate yylval and yylloc.
Akim Demaille [Sat, 2 Aug 2008 11:54:33 +0000 (13:54 +0200)] 
Agregate yylval and yylloc.

* data/lalr1.cc (parser::yylval, parser::yylloc): Replace by...
(parser::yyla): this.

16 years agoRely on the state stack to display reduction traces.
Akim Demaille [Thu, 31 Jul 2008 10:50:42 +0000 (12:50 +0200)] 
Rely on the state stack to display reduction traces.

To display rhs symbols before a reduction, we used information about the rule
reduced, which required the tables yyrhs and yyprhs.  Now use rely only on the
state stack to get the same information.

* data/lalr1.cc (b4_rhs_data, b4_rhs_state): New.
Use them.
(parser::yyrhs_, parser::yyprhs_): Remove.
(parser::yy_reduce_print_): Use the state stack.