Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-20 09:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

* tests/calc.at (AT_CHECK_PUSHDEFS, AT_CHECK_POPDEFS): Define

Browse Source 
AT_YACC_IF.
Redefine AT_YYERROR_SEES_LOC_IF using it.
(_AT_DATA_CALC_Y): Don't declare yyerror when lalr1.cc, as it is
not defined.
Don't use the location in yy::Parser::error_ and
yy::Parser::print_ when not %locations.
Activate more lalr1.cc tests.
This commit is contained in:
Akim Demaille
2003-02-20 08:14:27 +00:00
parent 0d1c3a04b7
commit d02b25f99b
2 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@@ -1,3 +1,14 @@
2003-02-20 Akim Demaille <akim@epita.fr>
* tests/calc.at (AT_CHECK_PUSHDEFS, AT_CHECK_POPDEFS): Define
AT_YACC_IF.
Redefine AT_YYERROR_SEES_LOC_IF using it.
(_AT_DATA_CALC_Y): Don't declare yyerror when lalr1.cc, as it is
not defined.
Don't use the location in yy::Parser::error_ and
yy::Parser::print_ when not %locations.
Activate more lalr1.cc tests.
2003-02-19 Akim Demaille <akim@epita.fr> 2003-02-19 Akim Demaille <akim@epita.fr>
* data/lalr1.cc: When displaying a line number, be sure to make it * data/lalr1.cc: When displaying a line number, be sure to make it
@@ -68,7 +79,7 @@
these CPP macros with the m4 macros new defined by... these CPP macros with the m4 macros new defined by...
(AT_CHECK_PUSHDEFS): this, i.e.: (AT_CHECK_PUSHDEFS): this, i.e.:
(AT_LALR1_CC_IF, AT_PURE_LEX_IF, AT_LOC, AT_VAL, AT_LEX_FORMALS) (AT_LALR1_CC_IF, AT_PURE_LEX_IF, AT_LOC, AT_VAL, AT_LEX_FORMALS)
(AT_LEX_ARGS, AT_USE_LEX_ARGS, AT_LEX_PRE_FORMALSm AT_LEX_PRE_ARGS) (AT_LEX_ARGS, AT_USE_LEX_ARGS, AT_LEX_PRE_FORMALS, AT_LEX_PRE_ARGS)
New macros. New macros.
(AT_CHECK_POPDEFS): Undefine them. (AT_CHECK_POPDEFS): Undefine them.
(AT_CHECK_CALC_LALR1_CC): New. (AT_CHECK_CALC_LALR1_CC): New.

54
tests/calc.at
View File

@@ -66,13 +66,14 @@ static int global_count = 0;
%{ %{
static int power (int base, int exponent); static int power (int base, int exponent);
]AT_LALR1_CC_IF([], [
/* yyerror receives the location if: /* yyerror receives the location if:
- %location & %pure & %glr - %location & %pure & %glr
- %location & %pure & %yacc & %parse-param. */ - %location & %pure & %yacc & %parse-param. */
static void yyerror (]AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])[ static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])
]AT_PARAM_IF([value *result, int *count, ])[ AT_PARAM_IF([value *result, int *count, ])
const char *s const char *s
); );])[
static int yylex (]AT_LEX_FORMALS[); static int yylex (]AT_LEX_FORMALS[);
static int yygetc (]AT_LEX_FORMALS[); static int yygetc (]AT_LEX_FORMALS[);
static void yyungetc (]AT_LEX_PRE_FORMALS[ int c); static void yyungetc (]AT_LEX_PRE_FORMALS[ int c);
@@ -128,14 +129,15 @@ static FILE *yyin;
void void
yy::Parser::print_ () yy::Parser::print_ ()
{ {
std::cerr << location; AT_LOCATION_IF([
std::cerr << location;])
} }
/* A C++ error reporting function. */ /* A C++ error reporting function. */
void void
yy::Parser::error_ () yy::Parser::error_ ()
{ {
std::cerr << location << ": " << message << std::endl; std::cerr << AT_LOCATION_IF([location << ": " << ])message << std::endl;
} }
int int
@@ -253,20 +255,18 @@ yylex (]AT_LEX_FORMALS[)
])])[ ])])[
} }
]AT_LALR1_CC_IF( ]AT_LOCATION_IF([AT_LALR1_CC_IF(
[ AT_LOC.begin = AT_LOC.end;], [ AT_LOC.begin = AT_LOC.end;],
[AT_LOCATION_IF([ [ AT_LOC.first_column = AT_LOC.last_column;
AT_LOC.first_column = AT_LOC.last_column;
AT_LOC.first_line = AT_LOC.last_line; AT_LOC.first_line = AT_LOC.last_line;
])])[ ])])[
/* Skip white space. */ /* Skip white space. */
while ((c = yygetc (]AT_LEX_ARGS[)) == ' ' || c == '\t') while ((c = yygetc (]AT_LEX_ARGS[)) == ' ' || c == '\t')
{ {
]AT_LALR1_CC_IF( ]AT_LOCATION_IF([AT_LALR1_CC_IF(
[ AT_LOC.begin = AT_LOC.end;], [ AT_LOC.begin = AT_LOC.end;],
[AT_LOCATION_IF([ [ AT_LOC.first_column = AT_LOC.last_column;
AT_LOC.first_column = AT_LOC.last_column;
AT_LOC.first_line = AT_LOC.last_line; AT_LOC.first_line = AT_LOC.last_line;
])])[ ])])[
} }
@@ -317,9 +317,8 @@ main (int argc, const char **argv)
exit (1); exit (1);
} }
#if YYDEBUG ]AT_LALR1_CC_IF([], [m4_bmatch([$4], [%debug],
yydebug = 1; [ yydebug = 1;])])[
#endif
status = yyparse (]AT_PARAM_IF([&result, &count])[); status = yyparse (]AT_PARAM_IF([&result, &count])[);
if (global_result != result) if (global_result != result)
abort (); abort ();
@@ -439,6 +438,9 @@ m4_pushdef([AT_LALR1_CC_IF],
[m4_bmatch([$3], ["lalr1.cc"], [$1], [$2])]) [m4_bmatch([$3], ["lalr1.cc"], [$1], [$2])])
m4_pushdef([AT_GLR_IF], m4_pushdef([AT_GLR_IF],
[m4_bmatch([$3], [%glr-parser], [$1], [$2])]) [m4_bmatch([$3], [%glr-parser], [$1], [$2])])
# Using yacc.c?
m4_pushdef([AT_YACC_IF],
[m4_bmatch([$3], [%glr-parser\|%skeleton], [$2], [$1])])
m4_pushdef([AT_PARAM_IF], m4_pushdef([AT_PARAM_IF],
[m4_bmatch([$3], [%parse-param], [$1], [$2])]) [m4_bmatch([$3], [%parse-param], [$1], [$2])])
m4_pushdef([AT_LOCATION_IF], m4_pushdef([AT_LOCATION_IF],
@@ -455,14 +457,13 @@ m4_pushdef([AT_GLR_OR_PARAM_IF],
m4_pushdef([AT_YYERROR_ARG_LOC_IF], m4_pushdef([AT_YYERROR_ARG_LOC_IF],
[AT_GLR_OR_PARAM_IF([AT_PURE_AND_LOC_IF([$1], [$2])], [AT_GLR_OR_PARAM_IF([AT_PURE_AND_LOC_IF([$1], [$2])],
[$2])]) [$2])])
# yyerror cannot see the locations if !glr & pure & !param. # yyerror always sees the locations (when activated), except if
# yacc & pure & !param.
m4_pushdef([AT_YYERROR_SEES_LOC_IF], m4_pushdef([AT_YYERROR_SEES_LOC_IF],
[AT_LALR1_CC_IF([$1], [AT_LOCATION_IF([AT_YACC_IF([AT_PURE_IF([AT_PARAM_IF([$1], [$2])],
[AT_LOCATION_IF([AT_GLR_IF([$1], [$1])],
[AT_PURE_IF([AT_PARAM_IF([$1], [$1])],
[$2])], [$2])])
[$1])])],
[$2])])])
# The interface is pure: either because %pure-parser, or because we # The interface is pure: either because %pure-parser, or because we
# are using the C++ parsers. # are using the C++ parsers.
@@ -512,6 +513,7 @@ m4_popdef([AT_GLR_OR_PARAM_IF])
m4_popdef([AT_PURE_AND_LOC_IF]) m4_popdef([AT_PURE_AND_LOC_IF])
m4_popdef([AT_LOCATION_IF]) m4_popdef([AT_LOCATION_IF])
m4_popdef([AT_PARAM_IF]) m4_popdef([AT_PARAM_IF])
m4_popdef([AT_YACC_IF])
m4_popdef([AT_GLR_IF]) m4_popdef([AT_GLR_IF])
m4_popdef([AT_LALR1_CC_IF]) m4_popdef([AT_LALR1_CC_IF])
]) ])
@@ -696,9 +698,9 @@ m4_define([AT_CHECK_CALC_LALR1_CC],
# AT_CHECK_CALC_LALR1_CC() # AT_CHECK_CALC_LALR1_CC()
AT_CHECK_CALC_LALR1_CC([%defines %pure-parser %locations]) AT_CHECK_CALC_LALR1_CC([%defines %locations])
# AT_CHECK_CALC_LALR1_CC([%defines]) AT_CHECK_CALC_LALR1_CC([%defines])
# AT_CHECK_CALC_LALR1_CC([%locations]) # AT_CHECK_CALC_LALR1_CC([%locations])
# AT_CHECK_CALC_LALR1_CC([%name-prefix="calc"]) # AT_CHECK_CALC_LALR1_CC([%name-prefix="calc"])
# AT_CHECK_CALC_LALR1_CC([%verbose]) # AT_CHECK_CALC_LALR1_CC([%verbose])
@@ -707,11 +709,11 @@ AT_CHECK_CALC_LALR1_CC([%defines %pure-parser %locations])
# AT_CHECK_CALC_LALR1_CC([%error-verbose %locations]) # AT_CHECK_CALC_LALR1_CC([%error-verbose %locations])
# AT_CHECK_CALC_LALR1_CC([%error-verbose %locations %defines %name-prefix="calc" %verbose %yacc]) AT_CHECK_CALC_LALR1_CC([%error-verbose %locations %defines %name-prefix="calc" %verbose %yacc])
# AT_CHECK_CALC_LALR1_CC([%debug]) # AT_CHECK_CALC_LALR1_CC([%debug])
# AT_CHECK_CALC_LALR1_CC([%error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc]) AT_CHECK_CALC_LALR1_CC([%error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
# AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc]) AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc])
# AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}]) # AT_CHECK_CALC_LALR1_CC([%pure-parser %error-verbose %debug %locations %defines %name-prefix="calc" %verbose %yacc %parse-param {value *result} %parse-param {int *count}])