X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/965537bc543191a048b6afb2404c878f06ab877f..a2ea208d82fdd67257d16e11b93ab17a8c48d452:/tests/regression.at diff --git a/tests/regression.at b/tests/regression.at index 1c5ccbbf..80a0ba5c 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -252,13 +252,13 @@ AT_CHECK([cat input.output], [], 0 $accept: expr $end - 1 @1: /* empty */ + 1 $@1: /* empty */ - 2 expr: 'a' @1 'b' + 2 expr: 'a' $@1 'b' - 3 @2: /* empty */ + 3 $@2: /* empty */ - 4 expr: @2 'c' + 4 expr: $@2 'c' Terminals, with rules where they appear @@ -276,9 +276,9 @@ $accept (6) on left: 0 expr (7) on left: 2 4, on right: 0 -@1 (8) +$@1 (8) on left: 1, on right: 2 -@2 (9) +$@2 (9) on left: 3, on right: 4 @@ -288,19 +288,19 @@ state 0 'a' shift, and go to state 1 - $default reduce using rule 3 (@2) + $default reduce using rule 3 ($@2) expr go to state 2 - @2 go to state 3 + $@2 go to state 3 state 1 - 2 expr: 'a' . @1 'b' + 2 expr: 'a' . $@1 'b' - $default reduce using rule 1 (@1) + $default reduce using rule 1 ($@1) - @1 go to state 4 + $@1 go to state 4 state 2 @@ -312,14 +312,14 @@ state 2 state 3 - 4 expr: @2 . 'c' + 4 expr: $@2 . 'c' 'c' shift, and go to state 6 state 4 - 2 expr: 'a' @1 . 'b' + 2 expr: 'a' $@1 . 'b' 'b' shift, and go to state 7 @@ -333,14 +333,14 @@ state 5 state 6 - 4 expr: @2 'c' . + 4 expr: $@2 'c' . $default reduce using rule 4 (expr) state 7 - 2 expr: 'a' @1 'b' . + 2 expr: 'a' $@1 'b' . $default reduce using rule 2 (expr) ]]) @@ -434,6 +434,7 @@ AT_SETUP([Token definitions]) # Bison managed, when fed with `%token 'f' "f"' to #define 'f'! AT_DATA_GRAMMAR([input.y], [%{ +#include #include void yyerror (const char *s); int yylex (void); @@ -457,6 +458,9 @@ yyerror (char const *s) int yylex (void) { + static int called; + if (called++) + abort (); return SPECIAL; } @@ -489,9 +493,7 @@ AT_DATA_GRAMMAR([input.y], void yyerror (const char *s); int yylex (void); %} -[%token QUOTES "\"" -%token TICK "'" -%% +[%% exp: '\'' "\'" | '\"' "\"" @@ -551,9 +553,9 @@ AT_CHECK([cat input.output], 0, 2 CONST_DEC_LIST: CONST_DEC 3 | CONST_DEC_LIST CONST_DEC - 4 @1: /* empty */ + 4 $@1: /* empty */ - 5 CONST_DEC: @1 undef_id_tok '=' const_id_tok ';' + 5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok ';' Terminals, with rules where they appear @@ -576,7 +578,7 @@ CONST_DEC_LIST (9) on left: 2 3, on right: 1 3 CONST_DEC (10) on left: 5, on right: 2 3 -@1 (11) +$@1 (11) on left: 4, on right: 5 @@ -584,12 +586,12 @@ state 0 0 $accept: . CONST_DEC_PART $end - $default reduce using rule 4 (@1) + $default reduce using rule 4 ($@1) CONST_DEC_PART go to state 1 CONST_DEC_LIST go to state 2 CONST_DEC go to state 3 - @1 go to state 4 + $@1 go to state 4 state 1 @@ -604,11 +606,11 @@ state 2 1 CONST_DEC_PART: CONST_DEC_LIST . 3 CONST_DEC_LIST: CONST_DEC_LIST . CONST_DEC - undef_id_tok reduce using rule 4 (@1) + undef_id_tok reduce using rule 4 ($@1) $default reduce using rule 1 (CONST_DEC_PART) CONST_DEC go to state 6 - @1 go to state 4 + $@1 go to state 4 state 3 @@ -620,7 +622,7 @@ state 3 state 4 - 5 CONST_DEC: @1 . undef_id_tok '=' const_id_tok ';' + 5 CONST_DEC: $@1 . undef_id_tok '=' const_id_tok ';' undef_id_tok shift, and go to state 7 @@ -641,28 +643,28 @@ state 6 state 7 - 5 CONST_DEC: @1 undef_id_tok . '=' const_id_tok ';' + 5 CONST_DEC: $@1 undef_id_tok . '=' const_id_tok ';' '=' shift, and go to state 8 state 8 - 5 CONST_DEC: @1 undef_id_tok '=' . const_id_tok ';' + 5 CONST_DEC: $@1 undef_id_tok '=' . const_id_tok ';' const_id_tok shift, and go to state 9 state 9 - 5 CONST_DEC: @1 undef_id_tok '=' const_id_tok . ';' + 5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok . ';' ';' shift, and go to state 10 state 10 - 5 CONST_DEC: @1 undef_id_tok '=' const_id_tok ';' . + 5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok ';' . $default reduce using rule 5 (CONST_DEC) ]]) @@ -702,10 +704,6 @@ statement: struct_stat; struct_stat: /* empty. */ | if else; if: "if" "const" "then" statement; else: "else" statement; -%token IF "if"; -%token CONST "const"; -%token THEN "then"; -%token ELSE "else"; %% ]]) @@ -828,7 +826,8 @@ m4_define([_AT_DATA_DANCER_Y], [%{ static int yylex (AT_LALR1_CC_IF([int *], [void])); AT_LALR1_CC_IF([], -[#include +[#include +#include static void yyerror (const char *);]) %} $1 @@ -887,7 +886,9 @@ int yyparse () { yy::parser parser; - parser.set_debug_level (!!YYDEBUG); +#if YYDEBUG + parser.set_debug_level (YYDEBUG); +#endif return parser.parse (); } ], @@ -900,12 +901,14 @@ yyerror (const char *s) static int yylex (AT_LALR1_CC_IF([int *lval], [void])) [{ - static int toknum = 0; - static int tokens[] = + static int const tokens[] = { ':', -1 }; + static size_t toknum; ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC. */])[ + if (! (toknum < sizeof tokens / sizeof *tokens)) + abort (); return tokens[toknum++]; }] @@ -956,6 +959,7 @@ m4_define([_AT_DATA_EXPECT2_Y], static int yylex (AT_LALR1_CC_IF([int *], [void])); AT_LALR1_CC_IF([], [#include +#include static void yyerror (const char *);]) %} $1 @@ -997,12 +1001,14 @@ yyerror (const char *s) static int yylex (AT_LALR1_CC_IF([int *lval], [void])) [{ - static int toknum = 0; - static int tokens[] = + static int const tokens[] = { 1000, '+', '+', -1 }; + static size_t toknum; ]AT_LALR1_CC_IF([*lval = 0; /* Pacify GCC. */])[ + if (! (toknum < sizeof tokens / sizeof *tokens)) + abort (); return tokens[toknum++]; }] @@ -1100,7 +1106,7 @@ AT_PARSER_CHECK([./input], 0, ]], [[Starting parse Entering state 0 -Reducing stack by rule 1 (line 22): +Reducing stack by rule 1 (line 20): -> $$ = nterm start () Stack now 0 Entering state 1 @@ -1126,7 +1132,7 @@ AT_SETUP([String alias declared after use]) # Bison once incorrectly asserted that the symbol number for either a token or # its alias was the highest symbol number so far at the point of the alias # declaration. That was true unless the declaration appeared after their first -# uses. +# uses and other tokens appeared in between. AT_DATA([input.y], [[%% @@ -1137,25 +1143,3 @@ start: 'a' "A" 'b'; AT_CHECK([bison -t -o input.c input.y]) AT_CLEANUP - - - -## --------------------------- ## -## Undeclared string literal. ## -## --------------------------- ## - -AT_SETUP([Undeclared string literal]) - -# Bison once allowed a string literal to be used in the grammar without any -# declaration assigning it as an alias of another token. - -AT_DATA([input.y], -[[%% -start: "abc"; -]]) - -AT_CHECK([bison -t -o input.c input.y], [1], [], -[[input.y:2.8-12: "abc" undeclared -]]) - -AT_CLEANUP