X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b56471a6890db1598d1ed1877b5d01c6b9678243..760d7aa8fa77f020d5d369ef963c0a07096b0c95:/tests/calc.at diff --git a/tests/calc.at b/tests/calc.at index 34cac69d..c8ef428d 100644 --- a/tests/calc.at +++ b/tests/calc.at @@ -40,39 +40,76 @@ AT_DATA([calc.y], %{ #include -/* We don't need a perfect malloc for these tests. */ +/* We don't need perfect functions for these tests. */ #undef malloc +#undef memcmp +#undef realloc #include #if STDC_HEADERS # include # include -#else -char *strcat(char *dest, const char *src); #endif #include - -static int power (int base, int exponent); -static void yyerror (const char *s); -static int yylex (void); -static int yygetc (void); -static void yyungetc (int c); +#include extern void perror (const char *s); /* Exercise pre-prologue dependency to %union. */ typedef int value_t; +value_t global_result = 0; +int global_count = 0; + %} +%parse-param "value_t *result", "result" +%parse-param "int *count", "count" + /* Exercise %union. */ %union { value_t ival; }; +%{ +#if YYPURE +# define LOC (*yylloc) +# define VAL (*yylval) +#else +# define LOC (yylloc) +# define VAL (yylval) +#endif + +#if YYPURE +# if YYLSP_NEEDED +# define LEX_FORMALS YYSTYPE *yylval, YYLTYPE *yylloc +# define LEX_ARGS yylval, yylloc +# define USE_LEX_ARGS (void) yylval; (void) yylloc; +# else +# define LEX_FORMALS YYSTYPE *yylval +# define LEX_ARGS yylval +# define USE_LEX_ARGS (void) yylval +# endif +# define LEX_PRE_FORMALS LEX_FORMALS, +# define LEX_PRE_ARGS LEX_ARGS, +#else +# define LEX_FORMALS void +# define LEX_PRE_FORMALS +# define LEX_ARGS +# define LEX_PRE_ARGS +# define USE_LEX_ARGS +#endif + +static int power (int base, int exponent); +static void yyerror (const char *s); +static int yylex (LEX_FORMALS); +static int yygetc (LEX_FORMALS); +static void yyungetc (LEX_PRE_FORMALS int c); +%} + /* Bison Declarations */ -%token CALC_EOF 0 "end of file" +%token CALC_EOF 0 "end of input" %token NUM "number" %type exp @@ -88,12 +125,12 @@ typedef int value_t; %% input: line -| input line +| input line { ++*count; ++global_count; } ; line: - '\n' {} -| exp '\n' {} + '\n' +| exp '\n' { *result = global_result = $1; } ; exp: @@ -102,7 +139,7 @@ exp: { if ($1 != $3) fprintf (stderr, "calc: error: %d != %d\n", $1, $3); - $$ = $1 == $3; + $$ = $1; } | exp '+' exp { $$ = $1 + $3; } | exp '-' exp { $$ = $1 - $3; } @@ -122,8 +159,8 @@ yyerror (const char *s) { #if YYLSP_NEEDED fprintf (stderr, "%d.%d-%d.%d: ", - yylloc.first_line, yylloc.first_column, - yylloc.last_line, yylloc.last_column); + LOC.first_line, LOC.first_column, + LOC.last_line, LOC.last_column); #endif fprintf (stderr, "%s\n", s); } @@ -133,53 +170,56 @@ yyerror (const char *s) static YYLTYPE last_yylloc; #endif static int -yygetc (void) +yygetc (LEX_FORMALS) { int res = getc (yyin); + USE_LEX_ARGS; #if YYLSP_NEEDED - last_yylloc = yylloc; + last_yylloc = LOC; if (res == '\n') { - yylloc.last_line++; - yylloc.last_column = 1; + LOC.last_line++; + LOC.last_column = 1; } else - yylloc.last_column++; + LOC.last_column++; #endif return res; } static void -yyungetc (int c) +yyungetc (LEX_PRE_FORMALS int c) { + USE_LEX_ARGS; #if YYLSP_NEEDED /* Wrong when C == `\n'. */ - yylloc = last_yylloc; + LOC = last_yylloc; #endif ungetc (c, yyin); } static int -read_signed_integer (void) +read_signed_integer (LEX_FORMALS) { - int c = yygetc (); + int c = yygetc (LEX_ARGS); int sign = 1; int n = 0; + USE_LEX_ARGS; if (c == '-') { - c = yygetc (); + c = yygetc (LEX_ARGS); sign = -1; } while (isdigit (c)) { n = 10 * n + (c - '0'); - c = yygetc (); + c = yygetc (LEX_ARGS); } - yyungetc (c); + yyungetc (LEX_PRE_ARGS c); return sign * n; } @@ -193,29 +233,39 @@ read_signed_integer (void) `---------------------------------------------------------------*/ static int -yylex (void) +yylex (LEX_FORMALS) { + static int init = 1; int c; + if (init) + { + init = 0; +#if YYLSP_NEEDED + LOC.last_column = 1; + LOC.last_line = 1; +#endif + } + #if YYLSP_NEEDED - yylloc.first_column = yylloc.last_column; - yylloc.first_line = yylloc.last_line; + LOC.first_column = LOC.last_column; + LOC.first_line = LOC.last_line; #endif /* Skip white space. */ - while ((c = yygetc ()) == ' ' || c == '\t') + while ((c = yygetc (LEX_ARGS)) == ' ' || c == '\t') { #if YYLSP_NEEDED - yylloc.first_column = yylloc.last_column; - yylloc.first_line = yylloc.last_line; + LOC.first_column = LOC.last_column; + LOC.first_line = LOC.last_line; #endif } /* process numbers */ if (c == '.' || isdigit (c)) { - yyungetc (c); - yylval.ival = read_signed_integer (); + yyungetc (LEX_PRE_ARGS c); + VAL.ival = read_signed_integer (LEX_ARGS); return NUM; } @@ -241,6 +291,8 @@ power (int base, int exponent) int main (int argc, const char **argv) { + value_t result = 0; + int count = 0; yyin = NULL; if (argc == 2) @@ -257,11 +309,10 @@ main (int argc, const char **argv) #if YYDEBUG yydebug = 1; #endif -#if YYLSP_NEEDED - yylloc.last_column = 1; - yylloc.last_line = 1; -#endif - yyparse (); + yyparse (&result, &count); + assert (global_result == result); + assert (global_count == count); + return 0; } ]]) @@ -352,7 +403,7 @@ AT_DATA([[expout]], [$4 ]) # 3. If locations are not used, remove them. -m4_bmatch([$1], [--location], [], +m4_bmatch([$1], [%locations], [], [[sed 's/^[-0-9.]*: //' expout >at-expout mv at-expout expout]]) # 4. If error-verbose is not used, strip the`, unexpected....' part. @@ -394,7 +445,8 @@ _AT_CHECK_CALC([$1], 1 - (2 - 3) = 2 2^2^3 = 256 -(2^2)^3 = 64], [486]) +(2^2)^3 = 64], + [486]) # Some parse errors. _AT_CHECK_CALC_ERROR([$1], [0 0], [11], @@ -412,7 +464,7 @@ _AT_CHECK_CALC_ERROR([$1], [2.1-2.2: parse error, unexpected '+']) # Exercise error messages with EOF: work on an empty file. _AT_CHECK_CALC_ERROR([$1], [/dev/null], [4], - [1.1-1.2: parse error, unexpected "end of file", expecting "number" or '-' or '\n' or '(']) + [1.1-1.2: parse error, unexpected "end of input", expecting "number" or '-' or '\n' or '(']) # Exercise the error token: without it, we die at the first error, # hence be sure i. to have several errors, ii. to test the action @@ -422,11 +474,6 @@ _AT_CHECK_CALC_ERROR([$1], [(1 ++ 2) + (0 0) = 1], [82], 1.15-1.16: parse error, unexpected "number" calc: error: 0 != 1]) -# Add a studid example demonstrating that Bison can further improve the -# error message. FIXME: Fix this ridiculous message. -_AT_CHECK_CALC_ERROR([$1], [()], [21], -[1.2-1.3: parse error, unexpected ')', expecting "number" or '-' or '(']) - AT_CLEANUP ])# AT_CHECK_CALC @@ -449,18 +496,21 @@ m4_define([AT_CHECK_CALC_LALR], AT_CHECK_CALC_LALR() AT_CHECK_CALC_LALR([--defines]) -AT_CHECK_CALC_LALR([--locations]) +AT_CHECK_CALC_LALR([%locations]) AT_CHECK_CALC_LALR([--name-prefix=calc]) AT_CHECK_CALC_LALR([--verbose]) AT_CHECK_CALC_LALR([--yacc]) AT_CHECK_CALC_LALR([%error-verbose]) -AT_CHECK_CALC_LALR([%error-verbose --locations]) +AT_CHECK_CALC_LALR([%error-verbose %locations]) -AT_CHECK_CALC_LALR([%error-verbose --defines --locations --name-prefix=calc --verbose --yacc]) +AT_CHECK_CALC_LALR([%error-verbose %locations --defines --name-prefix=calc --verbose --yacc]) AT_CHECK_CALC_LALR([%debug]) -AT_CHECK_CALC_LALR([%error-verbose %debug --defines --locations --name-prefix=calc --verbose --yacc]) +AT_CHECK_CALC_LALR([%error-verbose %debug %locations --defines --name-prefix=calc --verbose --yacc]) + +# FIXME: Not ready yet. +# AT_CHECK_CALC_LALR([%pure-parser %error-verbose %debug %locations --defines --name-prefix=calc --verbose --yacc]) # ----------------------- # @@ -474,21 +524,23 @@ AT_BANNER([[Simple GLR Calculator.]]) # Start a testing chunk which compiles `calc' grammar with # BISON-OPTIONS and %glr-parser, and performs several tests over the parser. m4_define([AT_CHECK_CALC_GLR], -[AT_CHECK_CALC([%glr_parser] $@)]) +[AT_CHECK_CALC([%glr-parser] $@)]) AT_CHECK_CALC_GLR() AT_CHECK_CALC_GLR([--defines]) -AT_CHECK_CALC_GLR([--locations]) +AT_CHECK_CALC_GLR([%locations]) AT_CHECK_CALC_GLR([--name-prefix=calc]) AT_CHECK_CALC_GLR([--verbose]) AT_CHECK_CALC_GLR([--yacc]) AT_CHECK_CALC_GLR([%error-verbose]) -AT_CHECK_CALC_GLR([%error-verbose --locations]) +AT_CHECK_CALC_GLR([%error-verbose %locations]) -AT_CHECK_CALC_GLR([%error-verbose --defines --locations --name-prefix=calc --verbose --yacc]) +AT_CHECK_CALC_GLR([%error-verbose %locations --defines --name-prefix=calc --verbose --yacc]) AT_CHECK_CALC_GLR([%debug]) -AT_CHECK_CALC_GLR([%error-verbose %debug --defines --locations --name-prefix=calc --verbose --yacc]) +AT_CHECK_CALC_GLR([%error-verbose %debug %locations --defines --name-prefix=calc --verbose --yacc]) + +# AT_CHECK_CALC_GLR([%pure-parser %error-verbose %debug %locations --defines --name-prefix=calc --verbose --yacc])