X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/aedcb6c095347f71206ed9410ad27907b4be903e..f038e56cdc211396f54f138e95693d0906d6fafa:/tests/local.at diff --git a/tests/local.at b/tests/local.at index 10179cb3..c1aedf39 100644 --- a/tests/local.at +++ b/tests/local.at @@ -31,15 +31,18 @@ m4_define([m4_null_if], # AT_SETUP_STRIP(TITLE) # --------------------- -# Abbreviate the TITLE to be passed to AT_SETUP. +# Abbreviate the TITLE to be passed to AT_SETUP. Remove new-lines +# that completely break AT_SETUP. m4_define([AT_SETUP_STRIP], [m4_bpatsubsts([$1], [%\(language\|skeleton\) "?\([^\" ]*\)"?], [\2], - [%define "?\([-A-Za-z0-9_.]+\)"? \("\([^\" ]+\)"\|\([-A-Za-z0-9_.]+\)\)], - [\1=\3\4], + [%define "?\([-A-Za-z0-9_.]+\)"? \("[^\"]+"\|[-A-Za-z0-9_.]+\)], + [\1=\2], [%define "?\([-A-Za-z0-9_.]+\)"?], - [\1])dnl + [\1], + [ * ++ *], [ ])dnl ]) @@ -183,10 +186,12 @@ m4_pushdef([AT_NAME_PREFIX], [m4_bregexp([$3], [\(%define api\.\(namespace\|prefix\)\|%name-prefix\) "\([^""]*\)"], [\3])], [yy])]) m4_pushdef([AT_TOKEN_CTOR_IF], -[m4_bmatch([$3], [%define api.token.constructor], [$1], [$2])]) +[m4_bmatch([$3], [%define api\.token\.constructor], [$1], [$2])]) m4_pushdef([AT_TOKEN_PREFIX], -[m4_bmatch([$3], [%define api.token.prefix ".*"], - [m4_bregexp([$3], [%define api.token.prefix "\(.*\)"], [\1])])]) +[m4_bmatch([$3], [%define api\.token\.prefix ".*"], + [m4_bregexp([$3], [%define api\.token\.prefix "\(.*\)"], [\1])])]) +m4_pushdef([AT_VARIANT_IF], +[m4_bmatch([$3], [%define api\.value\.type "?variant"?], [$1], [$2])]) m4_pushdef([AT_API_prefix], [m4_bmatch([$3], [%define api\.prefix ".*"], [m4_bregexp([$3], [%define api\.prefix "\([^""]*\)"], [\1])], @@ -200,7 +205,7 @@ m4_pushdef([AT_API_PREFIX], m4_pushdef([AT_YYERROR_ARG_LOC_IF], [AT_LOCATION_IF([AT_PURE_IF([m4_bmatch([$3], m4_quote(m4_join([\|], - [%define api.pure "?full"?], + [%define api\.pure "?full"?], [%glr-parser], [%parse-param], [%skeleton "?glr.c"?])), @@ -285,6 +290,7 @@ m4_popdef([AT_YYERROR_SEES_LOC_IF]) m4_popdef([AT_YYERROR_ARG_LOC_IF]) m4_popdef([AT_API_PREFIX]) m4_popdef([AT_API_prefix]) +m4_popdef([AT_VARIANT_IF]) m4_popdef([AT_TOKEN_PREFIX]) m4_popdef([AT_TOKEN_CTOR_IF]) m4_popdef([AT_NAME_PREFIX]) @@ -417,12 +423,51 @@ m4_define([AT_YYERROR_DECLARE_EXTERN], m4_define([AT_YYERROR_DECLARE], [m4_case(AT_LANG, -[c], [static AT_YYERROR_DECLARE_EXTERN])[]dnl +[c], [#include +]AT_LOCATION_IF([[ +#if defined ]AT_YYLTYPE[_IS_TRIVIAL && ]AT_YYLTYPE[_IS_TRIVIAL +static unsigned location_print (FILE *yyo, ]AT_YYLTYPE[ const * const yylocp); +# ifndef LOCATION_PRINT +# define LOCATION_PRINT(File, Loc) location_print (File, &(Loc)) +# endif +#endif +]])[ +static AT_YYERROR_DECLARE_EXTERN])[]dnl ]) m4_define([AT_YYERROR_DEFINE], [m4_case(AT_LANG, -[c], [[#include +[c], [[ +]AT_LOCATION_IF([[ +# if defined ]AT_YYLTYPE[_IS_TRIVIAL && ]AT_YYLTYPE[_IS_TRIVIAL +/* Print *YYLOCP on YYO. */ +__attribute__((__unused__)) +static unsigned +location_print (FILE *yyo, ]AT_YYLTYPE[ const * const yylocp) +{ + unsigned res = 0; + int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0; + if (0 <= yylocp->first_line) + { + res += fprintf (yyo, "%d", yylocp->first_line); + if (0 <= yylocp->first_column) + res += fprintf (yyo, ".%d", yylocp->first_column); + } + if (0 <= yylocp->last_line) + { + if (yylocp->first_line < yylocp->last_line) + { + res += fprintf (yyo, "-%d", yylocp->last_line); + if (0 <= end_col) + res += fprintf (yyo, ".%d", end_col); + } + else if (0 <= end_col && yylocp->first_column < end_col) + res += fprintf (yyo, "-%d", end_col); + } + return res; +} +#endif +]])[ /* A C error reporting function. */ static ]AT_YYERROR_PROTOTYPE[ @@ -430,7 +475,7 @@ static [[^,]+[^A-Za-z_0-9]\([A-Za-z_][A-Za-z_0-9]*\), *], [ YYUSE(\1);])dnl AT_YYERROR_SEES_LOC_IF([[ - YY_LOCATION_PRINT (stderr, ]AT_LOC[); + LOCATION_PRINT (stderr, ]AT_LOC[); fprintf (stderr, ": ");]])[ fprintf (stderr, "%s\n", msg); }]], @@ -719,23 +764,23 @@ m4_define([AT_FULL_COMPILE], [java], [AT_BISON_CHECK([-o $1.java $1.y]) AT_LANG_COMPILE([$1], - m4_join([ ], - [$1.java], - m4_ifval($2, [[$1-$2.java]]), + m4_join([ ], + [$1.java], + m4_ifval($2, [[$1-$2.java]]), m4_ifval($3, [[$1-$3.java]])))], [c++], [AT_BISON_CHECK([-o $1.cc $1.y]) AT_LANG_COMPILE([$1], - m4_join([ ], - [$1.cc], - m4_ifval($2, [[$1-$2.cc]]), + m4_join([ ], + [$1.cc], + m4_ifval($2, [[$1-$2.cc]]), m4_ifval($3, [[$1-$3.cc]])))], [c], [AT_BISON_CHECK([-o $1.c $1.y]) AT_LANG_COMPILE([$1], - m4_join([ ], - [$1.c], - m4_ifval($2, [[$1-$2.c]]), + m4_join([ ], + [$1.c], + m4_ifval($2, [[$1-$2.c]]), m4_ifval($3, [[$1-$3.c]])))]) ]) @@ -884,7 +929,6 @@ AT_SETUP([$1]) AT_BISON_OPTION_PUSHDEFS([$4]) AT_DATA_GRAMMAR([[input.y]], [[%code { - #include ]AT_YYERROR_DECLARE[ ]AT_YYLEX_DECLARE[ } @@ -907,11 +951,7 @@ yylex (void) return *inputp++; } -int -main (void) -{ - return yyparse (); -} +]AT_MAIN_DEFINE[ ]]) # In some versions of Autoconf, AT_CHECK invokes AS_ESCAPE before @@ -922,7 +962,7 @@ main (void) m4_if(m4_index(m4_quote($3), [no-xml]), -1, [AT_BISON_CHECK], - [AT_BISON_CHECK_NO_XML])([[--report=all --defines -o input.c input.y]], + [AT_BISON_CHECK_NO_XML])([[-Wall --report=all --defines -o input.c input.y]], [0], [], m4_dquote($7)) m4_if(m4_index(m4_quote($3), [last-state]), -1, @@ -942,8 +982,8 @@ $9 # There is no "" around `wc` since some indent the result. m4_bmatch([$4], [%define lr.type canonical-lr], [if test 32767 -lt `wc -l < input.c`; then - CFLAGS=`echo " $CFLAGS " | sed -e 's/ -pedantic //'` - CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -pedantic //'` + CFLAGS=`echo " $CFLAGS " | sed -e 's/ -pedantic / /'` + CXXFLAGS=`echo " $CXXFLAGS " | sed -e 's/ -pedantic / /'` fi]) AT_COMPILE([[input]])