X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/500bbfcd816776d0ddbf3555fedd41b529c405b3..95f22ad2a777be59535616142910f8914dac6f26:/tests/cxx-type.at diff --git a/tests/cxx-type.at b/tests/cxx-type.at index 41ff5604..057a4eed 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, 2004 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 @@ -24,33 +24,38 @@ AT_BANNER([[C++ Type Syntax (GLR).]]) # and with RESOLVE1 and RESOLVE2 as annotations on the conflicted rule for # stmt. Then compile the result. m4_define([_AT_TEST_GLR_CXXTYPES], -[AT_DATA_GRAMMAR([types.y], +[ +AT_BISON_OPTION_PUSHDEFS([$1]) + +AT_DATA_GRAMMAR([types.y], [[/* Simplified C++ Type and Expression Grammar. */ $1 %{ #include - #define YYSTYPE const char* - #define YYLTYPE int + #define YYSTYPE char const * ]m4_bmatch([$2], [stmtMerge], [ static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1);])[ #define YYINITDEPTH 10 - int yyerror ( -#if YYPURE && YYLSP_NEEDED - YYLTYPE *yylocation, + static char *format (char const *, ...); + struct YYLTYPE; +#if YYPURE +# if YYLSP_NEEDED +# define LEX_PARAMETERS YYSTYPE *lvalp, struct YYLTYPE *llocp +# define ERROR_PARAMETERS struct YYLTYPE *llocp, char const *s +# else +# define LEX_PARAMETERS YYSTYPE *lvalp +# endif #endif - const char *s - ); - - #if YYPURE -]m4_bmatch([$1], [location], -[ int yylex (YYSTYPE *lvalp, YYLTYPE *llocp);], -[ int yylex (YYSTYPE *lvalp);])[ - #else - int yylex (void); - #endif - +#ifndef LEX_PARAMETERS +# define LEX_PARAMETERS void +#endif +#ifndef ERROR_PARAMETERS +# define ERROR_PARAMETERS char const *s +#endif + int yylex (LEX_PARAMETERS); + int yyerror (ERROR_PARAMETERS); %} %token TYPENAME ID @@ -63,30 +68,35 @@ $1 %% prog : - | prog stmt { printf ("\n"); } + | prog stmt { +]AT_LOCATION_IF([ + printf ("%d.%d-%d.%d: ", + @2.first_line, @2.first_column, + @2.last_line, @2.last_column);])[ + printf ("%s\n", ]$[2); + } ; -stmt : expr ';' $2 +stmt : expr ';' $2 { $$ = ]$[1; } | decl $3 - | error ';' - | '@' { YYACCEPT; } + | error ';' { $$ = ""; } + | '@' { YYACCEPT; } ; -expr : ID { printf ("%s ", $$); } - | TYPENAME '(' expr ')' - { printf ("%s ", ]$[1); } - | expr '+' expr { printf ("+ "); } - | expr '=' expr { printf ("= "); } +expr : ID + | TYPENAME '(' expr ')' { $$ = format ("(%s,%s)", ]$[3, ]$[1); } + | expr '+' expr { $$ = format ("+(%s,%s)", ]$[1, ]$[3); } + | expr '=' expr { $$ = format ("=(%s,%s)", ]$[1, ]$[3); } ; decl : TYPENAME declarator ';' - { printf ("%s ", ]$[1); } + { $$ = format ("(%s,%s)", ]$[1, ]$[2); } | TYPENAME declarator '=' expr ';' - { printf ("%s ", ]$[1); } + { $$ = format ("(%s,%s,%s)", ]$[1, ]$[2, ]$[4); } ; -declarator : ID { printf ("\"%s\" ", ]$[1); } - | '(' declarator ')' +declarator : ID + | '(' declarator ')' { $$ = ]$[2; } ; %% @@ -94,9 +104,10 @@ declarator : ID { printf ("\"%s\" ", ]$[1); } #include #include #include +#include int -main (int argc, char** argv) +main (int argc, char **argv) { if (argc != 2) abort (); @@ -105,23 +116,18 @@ main (int argc, char** argv) exit (yyparse ()); } -#if YYPURE -int -]m4_bmatch([$1], [location], -[yylex (YYSTYPE *lvalp, YYLTYPE *llocp)], -[yylex (YYSTYPE *lvalp)])[ -#else int -yylex () -#endif +yylex (LEX_PARAMETERS) { char buffer[256]; int c; unsigned int i; + static int lineNum = 1; + static int colNum = 0; #if YYPURE +# define yylloc (*llocp) # define yylval (*lvalp) -]m4_bmatch([$1], [location],[ (void) llocp;])[ #endif while (1) @@ -131,57 +137,87 @@ yylex () { case EOF: return 0; - case ' ': case '\t': case '\n': case '\f': + case '\t': + colNum = (colNum + 7) & ~7; + break; + case ' ': case '\f': + colNum += 1; + break; + case '\n': + lineNum += 1; + colNum = 0; break; default: - if (isalpha (c)) - { - i = 0; - - do - { - buffer[i++] = c; - if (i == sizeof buffer - 1) - abort (); - c = getchar (); - } - while (isalnum (c) || c == '_'); - - ungetc (c, stdin); - buffer[i++] = 0; - yylval = strcpy (malloc (i), buffer); - return isupper ((unsigned char) buffer[0]) ? TYPENAME : ID; - } - return c; + { + int tok; +#if YYLSP_NEEDED + yylloc.first_line = yylloc.last_line = lineNum; + yylloc.first_column = colNum; +#endif + if (isalpha (c)) + { + i = 0; + + do + { + buffer[i++] = c; + colNum += 1; + if (i == sizeof buffer - 1) + abort (); + c = getchar (); + } + while (isalnum (c) || c == '_'); + + ungetc (c, stdin); + buffer[i++] = 0; + tok = isupper ((unsigned char) buffer[0]) ? TYPENAME : ID; + yylval = strcpy (malloc (i), buffer); + } + else + { + colNum += 1; + tok = c; + yylval = ""; + } +#if YYLSP_NEEDED + yylloc.last_column = colNum-1; +#endif + return tok; + } } } } int -yyerror ( -#if YYPURE && YYLSP_NEEDED - YYLTYPE *yylocation, -#endif - const char *s - ) +yyerror (ERROR_PARAMETERS) { #if YYPURE && YYLSP_NEEDED - (void) *yylocation; + /* Pacify GCC by using llocp. */ + if (! llocp) + abort (); #endif fprintf (stderr, "%s\n", s); return 0; } + +static char * +format (char const *form, ...) +{ + char buffer[1024]; + va_list args; + va_start (args, form); + vsprintf (buffer, form, args); + va_end (args); + return strcpy (malloc (strlen (buffer) + 1), buffer); +} + ]] m4_bmatch([$2], [stmtMerge], [[static YYSTYPE stmtMerge (YYSTYPE x0, YYSTYPE x1) { - /* Use the arguments. */ - (void) x0; - (void) x1; - printf (" "); - return ""; + return format ("(%s,%s)", x0, x1); } ]]) ) @@ -214,30 +250,55 @@ This is total garbage, but it should be ignored. AT_CHECK([bison -o types.c types.y], 0, [], ignore) AT_COMPILE([types]) +AT_BISON_OPTION_POPDEFS ]) m4_define([_AT_RESOLVED_GLR_OUTPUT], -[[z q + -"x" T -"x" y T -x y = -x T y + -"x" T -"y" z q + T -y -z q + +[[+(z,q) +(T,x) +(T,x,y) +=(x,y) ++((x,T),y) +(T,x) +(T,y,+(z,q)) + ++(z,q) +]]) + +m4_define([_AT_RESOLVED_GLR_OUTPUT_WITH_LOC], +[[3.0-3.5: +(z,q) +5.0-5.3: (T,x) +7.0-7.7: (T,x,y) +9.0-9.5: =(x,y) +11.0-11.9: +((x,T),y) +13.0-13.5: (T,x) +15.0-15.13: (T,y,+(z,q)) +17.0-17.15: +19.0-19.5: +(z,q) ]]) m4_define([_AT_AMBIG_GLR_OUTPUT], -[[z q + -"x" T -"x" y T -x y = -x T y + -"x" T x T -"y" z q + T y T z q + = -y -z q + +[[+(z,q) +(T,x) +(T,x,y) +=(x,y) ++((x,T),y) +((T,x),(x,T)) +((T,y,+(z,q)),=((y,T),+(z,q))) + ++(z,q) +]]) + +m4_define([_AT_AMBIG_GLR_OUTPUT_WITH_LOC], +[[3.0-3.5: +(z,q) +5.0-5.3: (T,x) +7.0-7.7: (T,x,y) +9.0-9.5: =(x,y) +11.0-11.9: +((x,T),y) +13.0-13.5: ((T,x),(x,T)) +15.0-15.13: ((T,y,+(z,q)),=((y,T),+(z,q))) +17.0-17.15: +19.0-19.5: +(z,q) ]]) m4_define([_AT_GLR_STDERR], @@ -262,7 +323,7 @@ AT_CLEANUP AT_SETUP([GLR: Resolve ambiguity, impure, locations]) _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_RESOLVED_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Resolve ambiguity, pure, no locations]) @@ -276,7 +337,7 @@ AT_SETUP([GLR: Resolve ambiguity, pure, locations]) _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_RESOLVED_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Merge conflicting parses, impure, no locations]) @@ -290,7 +351,7 @@ AT_SETUP([GLR: Merge conflicting parses, impure, locations]) _AT_TEST_GLR_CXXTYPES([%locations], [%merge ], [%merge ]) AT_PARSER_CHECK([[./types test-input | sed 's/ *$//']], 0, - _AT_AMBIG_GLR_OUTPUT, _AT_GLR_STDERR) + _AT_AMBIG_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Merge conflicting parses, pure, no locations]) @@ -303,7 +364,7 @@ AT_SETUP([GLR: Merge conflicting parses, pure, locations]) _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_AMBIG_GLR_OUTPUT_WITH_LOC, _AT_GLR_STDERR) AT_CLEANUP AT_SETUP([GLR: Verbose messages, resolve ambiguity, impure, no locations])