X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/610ab194c896d82708bc4c227115fd9832df6305..a9b8959efaa9aae4e2daf959d371765ac057e7f0:/tests/regression.at diff --git a/tests/regression.at b/tests/regression.at index f6d8f102..76170124 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -67,7 +67,7 @@ AT_CHECK([cat input.output], [], Grammar Number, Line, Rule - 0 4 $axiom -> exp $ + 0 3 $axiom -> exp $ 1 3 exp -> exp OP exp 2 3 exp -> NUM @@ -171,7 +171,7 @@ AT_CHECK([cat input.output], [], Grammar Number, Line, Rule - 0 5 $axiom -> exp $ + 0 4 $axiom -> exp $ 1 4 exp -> exp OP exp 2 4 exp -> NUM @@ -296,7 +296,7 @@ AT_CHECK([cat input.output], [], [[Grammar Number, Line, Rule - 0 28 $axiom -> expr $ + 0 2 $axiom -> expr $ 1 2 @1 -> /* empty */ 2 2 expr -> 'a' @1 'b' 3 15 @2 -> /* empty */ @@ -478,51 +478,6 @@ AT_CLEANUP -## ---------------------- ## -## %union and --defines. ## -## ---------------------- ## - - -AT_SETUP([%union and --defines]) - -AT_DATA([input.y], -[%union -{ - int integer; - char *string ; -} -%% -exp: {}; -]) - -AT_CHECK([bison --defines input.y]) - -AT_CLEANUP - - -## --------------------------------------- ## -## Duplicate '/' in C comments in %union ## -## --------------------------------------- ## - - -AT_SETUP([%union and C comments]) - -AT_DATA([input.y], -[%union -{ - /* The int. */ int integer; - /* The string. */ char *string ; -} -%% -exp: {}; -]) - -AT_CHECK([bison input.y -o input.c]) -AT_CHECK([fgrep '//*' input.c], [1], []) - -AT_CLEANUP - - ## ----------------- ## ## Invalid input 1. ## ## ----------------- ## @@ -584,37 +539,6 @@ AT_CLEANUP -## --------------------- ## -## Invalid CPP headers. ## -## --------------------- ## - -# AT_TEST_CPP_GUARD_H([INPUT-FILE-BASE) -# ------------------------------------- -m4_define([AT_TEST_CPP_GUARD_H], -[AT_SETUP([Invalid CPP guards: $1]) - -# Possibly create inner directories. -dirname=`AS_DIRNAME([$1])` -AS_MKDIR_P([$dirname]) - -AT_DATA([$1.y], -[%% -dummy: -]) - -AT_CHECK([bison --defines=$1.h $1.y]) - -# CPP should be happy with it. -AT_CHECK([$CC -E $1.h], 0, [ignore]) - -AT_CLEANUP -]) - -AT_TEST_CPP_GUARD_H([input/input]) -AT_TEST_CPP_GUARD_H([9foo]) - - - ## -------------- ## ## Web2c Report. ## ## -------------- ## @@ -653,65 +577,70 @@ AT_CHECK([bison -v input.y]) AT_CHECK([sed -n 's/ *$//;/^$/!p' 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 ';' Terminals, with rules where they appear -$ (0) +$ (0) 0 ';' (59) 5 '=' (61) 5 error (256) undef_id_tok (257) 5 const_id_tok (258) 5 Nonterminals, with rules where they appear -CONST_DEC_PART (7) - on left: 1 -CONST_DEC_LIST (8) +$axiom (7) + on left: 0 +CONST_DEC_PART (8) + on left: 1, on right: 0 +CONST_DEC_LIST (9) on left: 2 3, on right: 1 3 -CONST_DEC (9) +CONST_DEC (10) on left: 5, on right: 2 3 -@1 (10) +@1 (11) on left: 4, on right: 5 state 0 $default reduce using rule 4 (@1) - CONST_DEC_PART go to state 9 - CONST_DEC_LIST go to state 1 - CONST_DEC go to state 2 - @1 go to state 3 + 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 +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 4 - @1 go to state 3 -state 2 + 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) -state 3 - CONST_DEC -> @1 . undef_id_tok '=' const_id_tok ';' (rule 5) - undef_id_tok shift, and go to state 5 state 4 + CONST_DEC -> @1 . undef_id_tok '=' const_id_tok ';' (rule 5) + undef_id_tok shift, and go to state 7 +state 5 + $axiom -> CONST_DEC_PART $ . (rule 0) + $default accept +state 6 CONST_DEC_LIST -> CONST_DEC_LIST CONST_DEC . (rule 3) $default reduce using rule 3 (CONST_DEC_LIST) -state 5 +state 7 CONST_DEC -> @1 undef_id_tok . '=' const_id_tok ';' (rule 5) - '=' shift, and go to state 6 -state 6 + '=' 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 7 -state 7 + 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 8 -state 8 + ';' 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) -state 9 - $ shift, and go to state 10 -state 10 - $default accept ]]) AT_CLEANUP @@ -787,21 +716,21 @@ AT_CHECK([[sed -n 's/ *$//;/^static const.*\[\] =/,/^}/p' input.c]], 0, }; static const short yyprhs[] = { - 0, 0, 2, 3, 6, 11 + 0, 0, 3, 5, 6, 9, 14 }; static const short yyrhs[] = { - 8, 0, 0, 9, 10, 0, 3, 4, 5, 7, - 0, 6, 7, 0 + 8, 0, -1, 9, -1, -1, 10, 11, -1, 3, + 4, 5, 8, -1, 6, 8, -1 }; static const short yyrline[] = { - 0, 2, 3, 3, 4, 5 + 0, 2, 2, 3, 3, 4, 5 }; static const char *const yytname[] = { "$", "error", "$undefined.", "\"if\"", "\"const\"", "\"then\"", - "\"else\"", "statement", "struct_stat", "if", "else", NULL + "\"else\"", "$axiom", "statement", "struct_stat", "if", "else", NULL }; static const short yytoknum[] = { @@ -809,37 +738,37 @@ static const short yytoknum[] = }; static const short yyr1[] = { - 0, 7, 8, 8, 9, 10 + 0, 7, 8, 9, 9, 10, 11 }; static const short yyr2[] = { - 0, 1, 0, 2, 4, 2 + 0, 2, 1, 0, 2, 4, 2 }; static const short yydefact[] = { - 2, 0, 1, 0, 0, 2, 3, 2, 5, 4, - 0, 0 + 3, 0, 0, 2, 0, 0, 0, 3, 4, 3, + 6, 5 }; static const short yydefgoto[] = { - 8, 2, 3, 6 + -1, 2, 3, 4, 8 }; static const short yypact[] = { - -2, -1,-32768, -4, 1, -2,-32768, -2,-32768,-32768, - 4,-32768 + -2, -1, 4,-32768, 0, 2,-32768, -2,-32768, -2, + -32768,-32768 }; static const short yypgoto[] = { - 0,-32768,-32768,-32768 + -32768, -7,-32768,-32768,-32768 }; static const short yytable[] = { - 10, 1, 5, 4, 11, 0, 7, 9 + 10, 1, 11, 5, 6, 0, 7, 9 }; static const short yycheck[] = { - 0, 3, 6, 4, 0, -1, 5, 7 + 7, 3, 9, 4, 0, -1, 6, 5 }; ]])