X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/69078d4b3bf695e94ea0c0a61740e524f829f50e..3d38c03a861993c3c8e3c05dd76a3881601e10c2:/tests/regression.at diff --git a/tests/regression.at b/tests/regression.at index 1adce973..5895fd06 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -51,7 +51,7 @@ exp: MY_TOKEN; ]]) AT_CHECK([bison input.y -o input.c]) -AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -c]) +AT_COMPILE([input.o], [-c input.c]) AT_CLEANUP @@ -100,7 +100,7 @@ exp: '(' exp ')' | NUM ; ]]) AT_CHECK([bison -v input.y -o input.c], 0, [], -[[input.y:6: warning: symbol `"<="' used more than once as a literal string +[[input.y:6.8-14: warning: symbol `"<="' used more than once as a literal string ]]) AT_CLEANUP @@ -112,6 +112,8 @@ AT_CLEANUP AT_SETUP([Rule Line Numbers]) +AT_KEYWORDS([report]) + AT_DATA([input.y], [[%% expr: @@ -148,17 +150,20 @@ AT_CHECK([bison input.y -o input.c -v]) AT_CHECK([cat input.output], [], [[Grammar - Number, Line, Rule - 0 2 $axiom -> expr $ - 1 2 @1 -> /* empty */ - 2 2 expr -> 'a' @1 'b' - 3 15 @2 -> /* empty */ - 4 15 expr -> @2 'c' + 0 $accept: expr $end + + 1 @1: /* empty */ + + 2 expr: 'a' @1 'b' + + 3 @2: /* empty */ + + 4 expr: @2 'c' Terminals, with rules where they appear -$ (0) 0 +$end (0) 0 'a' (97) 2 'b' (98) 2 'c' (99) 4 @@ -167,7 +172,7 @@ error (256) Nonterminals, with rules where they appear -$axiom (6) +$accept (6) on left: 0 expr (7) on left: 2 4, on right: 0 @@ -179,74 +184,65 @@ expr (7) state 0 - $axiom -> . expr $ (rule 0) - - 'a' shift, and go to state 1 + 0 $accept: . expr $end - $default reduce using rule 3 (@2) + 'a' shift, and go to state 1 - expr go to state 2 - @2 go to state 3 + $default reduce using rule 3 (@2) + expr go to state 2 + @2 go to state 3 state 1 - expr -> 'a' . @1 'b' (rule 2) + 2 expr: 'a' . @1 'b' - $default reduce using rule 1 (@1) - - @1 go to state 4 + $default reduce using rule 1 (@1) + @1 go to state 4 state 2 - $axiom -> expr . $ (rule 0) - - $ shift, and go to state 5 + 0 $accept: expr . $end + $end shift, and go to state 5 state 3 - expr -> @2 . 'c' (rule 4) - - 'c' shift, and go to state 6 + 4 expr: @2 . 'c' + 'c' shift, and go to state 6 state 4 - expr -> 'a' @1 . 'b' (rule 2) - - 'b' shift, and go to state 7 + 2 expr: 'a' @1 . 'b' + 'b' shift, and go to state 7 state 5 - $axiom -> expr $ . (rule 0) + 0 $accept: expr $end . - $default accept + $default accept state 6 - expr -> @2 'c' . (rule 4) - - $default reduce using rule 4 (expr) + 4 expr: @2 'c' . + $default reduce using rule 4 (expr) state 7 - expr -> 'a' @1 'b' . (rule 2) - - $default reduce using rule 2 (expr) - - + 2 expr: 'a' @1 'b' . + $default reduce using rule 2 (expr) ]]) AT_CLEANUP @@ -287,40 +283,22 @@ AT_DATA([input.y], [[%% ? default: 'a' } -%{ %& %a %- +%{ ]]) AT_CHECK([bison input.y], [1], [], -[[input.y:2: invalid input: `?' -input.y:3: invalid input: `}' -input.y:4: invalid input: `%{' -input.y:5: invalid input: `%&' -input.y:6: invalid input: `%a' -input.y:7: invalid input: `%-' -]]) - -AT_CLEANUP - - - -## -------------------- ## -## Invalid %directive. ## -## -------------------- ## - - -AT_SETUP([Invalid %directive]) - -AT_DATA([input.y], -[[%invalid -]]) - -AT_CHECK([bison input.y], [1], [], -[[input.y:1: unrecognized: %invalid -input.y:1: Skipping to next % -input.y:2: fatal error: no input grammar +[[input.y:2.1: invalid character: `?' +input.y:3.14: invalid character: `}' +input.y:4.1: invalid character: `%' +input.y:4.2: invalid character: `&' +input.y:5.1: invalid character: `%' +input.y:6.1: invalid character: `%' +input.y:6.2: invalid character: `-' +input.y:7.1-8.0: unexpected end of file in a prologue +input.y:7.1-8.0: parse error, unexpected "%{...}%", expecting ";" or "|" ]]) AT_CLEANUP @@ -340,19 +318,17 @@ AT_DATA([input.y], void yyerror (const char *s); int yylex (void); %} -[%token "end of file" +[%token YYEOF 0 "end of file" %token 'a' "a" -%token "b" 'b' -%token "c" c -%token d "d" -%token e 'e' -%token 'f' e +%token b "b" +%token c 'c' +%token 'd' d %% exp: "a"; ]]) AT_CHECK([bison input.y -o input.c]) -AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -c]) +AT_COMPILE([input.o], [-c input.c]) AT_CLEANUP @@ -368,6 +344,8 @@ AT_CLEANUP AT_SETUP([Web2c Report]) +AT_KEYWORDS([report]) + AT_DATA([input.y], [[%token undef_id_tok const_id_tok @@ -387,29 +365,37 @@ CONST_DEC: { } undef_id_tok '=' const_id_tok ';' ; %% - ]]) AT_CHECK([bison -v input.y]) - -AT_CHECK([sed -n 's/ *$//;/^$/!p' input.output], 0, +AT_CHECK([cat input.output], 0, [[Grammar - Number, Line, Rule - 0 6 $axiom -> CONST_DEC_PART $ - 1 6 CONST_DEC_PART -> CONST_DEC_LIST - 2 10 CONST_DEC_LIST -> CONST_DEC - 3 12 CONST_DEC_LIST -> CONST_DEC_LIST CONST_DEC - 4 15 @1 -> /* empty */ - 5 15 CONST_DEC -> @1 undef_id_tok '=' const_id_tok ';' + + 0 $accept: CONST_DEC_PART $end + + 1 CONST_DEC_PART: CONST_DEC_LIST + + 2 CONST_DEC_LIST: CONST_DEC + 3 | CONST_DEC_LIST CONST_DEC + + 4 @1: /* empty */ + + 5 CONST_DEC: @1 undef_id_tok '=' const_id_tok ';' + + Terminals, with rules where they appear -$ (0) 0 + +$end (0) 0 ';' (59) 5 '=' (61) 5 error (256) undef_id_tok (258) 5 const_id_tok (259) 5 + + Nonterminals, with rules where they appear -$axiom (7) + +$accept (7) on left: 0 CONST_DEC_PART (8) on left: 1, on right: 0 @@ -419,47 +405,93 @@ CONST_DEC (10) on left: 5, on right: 2 3 @1 (11) on left: 4, on right: 5 + + state 0 - $axiom -> . CONST_DEC_PART $ (rule 0) - $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 + + 0 $accept: . CONST_DEC_PART $end + + $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 + + state 1 - $axiom -> CONST_DEC_PART . $ (rule 0) - $ shift, and go to state 5 + + 0 $accept: CONST_DEC_PART . $end + + $end shift, and go to state 5 + + state 2 - CONST_DEC_PART -> CONST_DEC_LIST . (rule 1) - CONST_DEC_LIST -> CONST_DEC_LIST . CONST_DEC (rule 3) - 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 CONST_DEC_PART: CONST_DEC_LIST . + 3 CONST_DEC_LIST: CONST_DEC_LIST . CONST_DEC + + 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 + + state 3 - CONST_DEC_LIST -> CONST_DEC . (rule 2) - $default reduce using rule 2 (CONST_DEC_LIST) + + 2 CONST_DEC_LIST: CONST_DEC . + + $default reduce using rule 2 (CONST_DEC_LIST) + + state 4 - CONST_DEC -> @1 . undef_id_tok '=' const_id_tok ';' (rule 5) - undef_id_tok shift, and go to state 7 + + 5 CONST_DEC: @1 . undef_id_tok '=' const_id_tok ';' + + undef_id_tok shift, and go to state 7 + + state 5 - $axiom -> CONST_DEC_PART $ . (rule 0) - $default accept + + 0 $accept: CONST_DEC_PART $end . + + $default accept + + state 6 - CONST_DEC_LIST -> CONST_DEC_LIST CONST_DEC . (rule 3) - $default reduce using rule 3 (CONST_DEC_LIST) + + 3 CONST_DEC_LIST: CONST_DEC_LIST CONST_DEC . + + $default reduce using rule 3 (CONST_DEC_LIST) + + state 7 - CONST_DEC -> @1 undef_id_tok . '=' const_id_tok ';' (rule 5) - '=' shift, and go to state 8 + + 5 CONST_DEC: @1 undef_id_tok . '=' const_id_tok ';' + + '=' shift, and go to state 8 + + state 8 - CONST_DEC -> @1 undef_id_tok '=' . const_id_tok ';' (rule 5) - const_id_tok shift, and go to state 9 + + 5 CONST_DEC: @1 undef_id_tok '=' . const_id_tok ';' + + const_id_tok shift, and go to state 9 + + state 9 - CONST_DEC -> @1 undef_id_tok '=' const_id_tok . ';' (rule 5) - ';' shift, and go to state 10 + + 5 CONST_DEC: @1 undef_id_tok '=' const_id_tok . ';' + + ';' shift, and go to state 10 + + state 10 - CONST_DEC -> @1 undef_id_tok '=' const_id_tok ';' . (rule 5) - $default reduce using rule 5 (CONST_DEC) + + 5 CONST_DEC: @1 undef_id_tok '=' const_id_tok ';' . + + $default reduce using rule 5 (CONST_DEC) ]]) AT_CLEANUP @@ -489,6 +521,8 @@ AT_CLEANUP AT_SETUP([Web2c Actions]) +AT_KEYWORDS([report]) + AT_DATA([input.y], [[%% statement: struct_stat; @@ -502,7 +536,9 @@ AT_CHECK([bison -v input.y -o input.c]) # Check only the tables. We don't use --no-parser, because it is # still to be implemented in the experimental branch of Bison. -AT_CHECK([[sed -n 's/ *$//;/^static const.*\[\] =/,/^}/p' input.c]], 0, +[sed -n 's/ *$//;/^static const.*\[\] =/,/^}/p' input.c >tables.c] + +AT_CHECK([[cat tables.c]], 0, [[static const unsigned char yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -548,12 +584,12 @@ static const unsigned char yyrline[] = }; static const char *const yytname[] = { - "$", "error", "$undefined.", "\"if\"", "\"const\"", "\"then\"", - "\"else\"", "$axiom", "statement", "struct_stat", "if", "else", 0 + "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"", + "\"else\"", "$accept", "statement", "struct_stat", "if", "else", 0 }; -static const short yytoknum[] = +static const unsigned short yytoknum[] = { - 0, 256, 257, 258, 259, 260, 261, -1 + 0, 256, 257, 258, 259, 260, 261 }; static const unsigned char yyr1[] = { @@ -563,29 +599,29 @@ static const unsigned char yyr2[] = { 0, 2, 1, 0, 2, 4, 2 }; -static const short yydefact[] = +static const unsigned char yydefact[] = { - 3, 0, 0, 2, 0, 0, 0, 3, 4, 3, + 3, 0, 0, 2, 0, 0, 1, 3, 4, 3, 6, 5 }; -static const short yydefgoto[] = +static const signed char yydefgoto[] = { -1, 2, 3, 4, 8 }; -static const short yypact[] = +static const signed char yypact[] = { - -2, -1, 4,-32768, 0, 2,-32768, -2,-32768, -2, - -32768,-32768 + -2, -1, 4, -8, 0, 2, -8, -2, -8, -2, + -8, -8 }; -static const short yypgoto[] = +static const signed char yypgoto[] = { - -32768, -7,-32768,-32768,-32768 + -8, -7, -8, -8, -8 }; -static const short yytable[] = +static const unsigned char yytable[] = { 10, 1, 11, 5, 6, 0, 7, 9 }; -static const short yycheck[] = +static const signed char yycheck[] = { 7, 3, 9, 4, 0, -1, 6, 5 };