X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/9e32add8e6e9ba278655142e1aa0a85773f18cc7..e743727fcd27ba00c0ae808058ea18d457171da5:/tests/cxx-type.at diff --git a/tests/cxx-type.at b/tests/cxx-type.at index 9562b130..9583b8fd 100644 --- a/tests/cxx-type.at +++ b/tests/cxx-type.at @@ -1,5 +1,5 @@ # Checking GLR Parsing. -*- Autotest -*- -# Copyright (C) 2002 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,13 +18,13 @@ AT_BANNER([[C++ Type Syntax (GLR).]]) -# _AT_TEST_GLR_CALC(DECL, RESOLVE1, RESOLVE2) -# ------------------------------------------- +# _AT_TEST_GLR_CXXTYPES(DECL, RESOLVE1, RESOLVE2) +# ----------------------------------------------- # Store into types.y the calc program, with DECL inserted as a declaration, # and with RESOLVE1 and RESOLVE2 as annotations on the conflicted rule for # stmt. Then compile the result. -m4_define([_AT_TEST_GLR_CALC], -[AT_DATA([types.y], +m4_define([_AT_TEST_GLR_CXXTYPES], +[AT_DATA_GRAMMAR([types.y], [[/* Simplified C++ Type and Expression Grammar. */ $1 @@ -36,7 +36,12 @@ $1 ]m4_bmatch([$2], [stmtMerge], [ static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1);])[ #define YYINITDEPTH 10 - int yyerror (const char *s); + int yyerror ( +#if YYPURE && YYLSP_NEEDED + YYLTYPE *yylocation, +#endif + const char *s + ); #if YYPURE ]m4_bmatch([$1], [location], @@ -67,7 +72,7 @@ stmt : expr ';' $2 | '@' { YYACCEPT; } ; -expr : ID { printf ("%s ", $$); } +expr : ID { printf ("%s ", ]$[1); } | TYPENAME '(' expr ')' { printf ("%s ", ]$[1); } | expr '+' expr { printf ("+ "); } @@ -86,7 +91,6 @@ declarator : ID { printf ("\"%s\" ", ]$[1); } %% -#include #include #include #include @@ -94,7 +98,8 @@ declarator : ID { printf ("\"%s\" ", ]$[1); } int main (int argc, char** argv) { - assert (argc == 2); + if (argc != 2) + abort (); if (!freopen (argv[1], "r", stdin)) abort (); exit (yyparse ()); @@ -130,7 +135,7 @@ yylex () break; default: if (isalpha (c)) - { + { i = 0; do @@ -153,8 +158,16 @@ yylex () } int -yyerror (const char *s) +yyerror ( +#if YYPURE && YYLSP_NEEDED + YYLTYPE *yylocation, +#endif + const char *s + ) { +#if YYPURE && YYLSP_NEEDED + (void) *yylocation; +#endif fprintf (stderr, "%s\n", s); return 0; } @@ -228,11 +241,11 @@ z q + ]]) m4_define([_AT_GLR_STDERR], -[[parse error +[[syntax error ]]) m4_define([_AT_VERBOSE_GLR_STDERR], -[[parse error, unexpected ID, expecting '=' or '+' or ')' +[[syntax error, unexpected ID, expecting '=' or '+' or ')' ]]) ## ---------------------------------------------------- ## @@ -240,57 +253,62 @@ m4_define([_AT_VERBOSE_GLR_STDERR], ## ---------------------------------------------------- ## AT_SETUP([GLR: Resolve ambiguity, impure, no locations]) -_AT_TEST_GLR_CALC([],[%dprec 1],[%dprec 2]) +_AT_TEST_GLR_CXXTYPES([], + [%dprec 1], [%dprec 2]) AT_PARSER_CHECK([[./types test-input | sed 's/ *$//']], 0, _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Resolve ambiguity, impure, locations]) -_AT_TEST_GLR_CALC([%locations],[%dprec 1],[%dprec 2]) +_AT_TEST_GLR_CXXTYPES([%locations],[%dprec 1],[%dprec 2]) AT_PARSER_CHECK([[./types test-input | sed 's/ *$//']], 0, _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Resolve ambiguity, pure, no locations]) -_AT_TEST_GLR_CALC([%pure-parser],[%dprec 1],[%dprec 2]) +_AT_TEST_GLR_CXXTYPES([%pure-parser], + [%dprec 1], [%dprec 2]) AT_PARSER_CHECK([[./types test-input | sed 's/ *$//']], 0, _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Resolve ambiguity, pure, locations]) -_AT_TEST_GLR_CALC([%pure-parser -%locations],[%dprec 1],[%dprec 2]) +_AT_TEST_GLR_CXXTYPES([%pure-parser %locations], + [%dprec 1], [%dprec 2]) AT_PARSER_CHECK([[./types test-input | sed 's/ *$//']], 0, _AT_RESOLVED_GLR_OUTPUT, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Merge conflicting parses, impure, no locations]) -_AT_TEST_GLR_CALC([],[%merge ],[%merge ]) +_AT_TEST_GLR_CXXTYPES([], + [%merge ], [%merge ]) AT_PARSER_CHECK([[./types test-input | sed 's/ *$//']], 0, _AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Merge conflicting parses, impure, locations]) -_AT_TEST_GLR_CALC([%locations],[%merge ],[%merge ]) +_AT_TEST_GLR_CXXTYPES([%locations], + [%merge ], [%merge ]) AT_PARSER_CHECK([[./types test-input | sed 's/ *$//']], 0, _AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Merge conflicting parses, pure, no locations]) -_AT_TEST_GLR_CALC([%pure-parser],[%merge ],[%merge ]) +_AT_TEST_GLR_CXXTYPES([%pure-parser], + [%merge ], [%merge ]) AT_PARSER_CHECK([[./types test-input | sed 's/ *$//']], 0, _AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Merge conflicting parses, pure, locations]) -_AT_TEST_GLR_CALC([%pure-parser -%locations],[%merge ],[%merge ]) +_AT_TEST_GLR_CXXTYPES([%pure-parser %locations], + [%merge ],[%merge ]) AT_PARSER_CHECK([[./types test-input | sed 's/ *$//']], 0, _AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Verbose messages, resolve ambiguity, impure, no locations]) -_AT_TEST_GLR_CALC([%error-verbose], -[%merge ],[%merge ]) +_AT_TEST_GLR_CXXTYPES([%error-verbose], + [%merge ], [%merge ]) AT_PARSER_CHECK([[./types test-input | sed 's/ *$//']], 0, _AT_AMBIG_GLR_OUTPUT, _AT_VERBOSE_GLR_STDERR) AT_CLEANUP