mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-12 22:03:02 +00:00
Merge branch 'maint'
* maint: maint: post-release administrivia version 3.5.4 examples: reccalc: really compile cleanly in C99 news: announce that Bison 3.6 drops YYERROR_VERBOSE news: update for 3.5.4 style: fix spellos typo: succesful -> successful package: improve the readme java: check and fix support for api.token.raw java: style: prefer 'int[] foo' to 'int foo[]' build: fix syntax-check issues tests: recheck: work properly when the test suite was interrupted doc: c++: promote api.token.raw build: fix compatibility with old compilers examples: reccalc: compile cleanly in C99
This commit is contained in:
@@ -260,6 +260,11 @@ m4_rpatsubst([$3], [%parse-param { *\([^{}]*[^{} ]\) *}\([^{}].*\)?$],
|
||||
m4_ifndef([AT_PARSE_PARAMS],
|
||||
[m4_define([AT_PARSE_PARAMS])])
|
||||
|
||||
m4_pushdef([AT_PARSER_CLASS],
|
||||
[m4_bmatch([$3], [%define *api\.parser\.class {\([^\}]*\)}],
|
||||
[m4_bregexp([$3], [%define *api\.parser\.class {\([^\}]*\)}], [\1])],
|
||||
[AT_API_PREFIX[]Parser])])
|
||||
|
||||
m4_pushdef([AT_PURE_IF],
|
||||
[m4_bmatch([$3], [%define *api\.pure\|%pure-parser],
|
||||
[m4_bmatch([$3], [%define *api\.pure *false], [$2], [$1])],
|
||||
@@ -409,6 +414,7 @@ m4_popdef([AT_LOCATION_IF])
|
||||
m4_undefine([AT_PARSE_PARAMS])
|
||||
m4_popdef([AT_PUSH_IF])
|
||||
m4_popdef([AT_PURE_IF])
|
||||
m4_popdef([AT_PARSER_CLASS])
|
||||
m4_popdef([AT_PARAM_IF])
|
||||
m4_popdef([AT_LEXPARAM_IF])
|
||||
m4_popdef([AT_LAC_IF])
|
||||
@@ -1022,7 +1028,9 @@ m4_define([AT_MAIN_DEFINE(java)],
|
||||
public static void main (String[] args) throws IOException
|
||||
{
|
||||
]AT_API_prefix[Parser p = new ]AT_API_prefix[Parser ();
|
||||
System.exit (p.parse () ? 0 : 1);
|
||||
boolean success = p.parse ();
|
||||
if (!success)
|
||||
System.exit (1);
|
||||
}
|
||||
}]])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user