X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/6b98e4b5636203b60c2a43ddaa988562616b4c69..397ec0734f0dc355714ec3bec96f3b0130b52211:/tests/regression.at?ds=inline diff --git a/tests/regression.at b/tests/regression.at index 3620200a..a9746bc8 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -29,7 +29,7 @@ AT_SETUP([Early token definitions]) # Found in GCJ: they expect the tokens to be defined before the user # prologue, so that they can use the token definitions in it. -AT_DATA([input.y], +AT_DATA_GRAMMAR([input.y], [[%{ void yyerror (const char *s); int yylex (void); @@ -50,8 +50,8 @@ exp: MY_TOKEN; %% ]]) -AT_CHECK([bison input.y -o input.c]) -AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -c]) +AT_CHECK([bison -o input.c input.y]) +AT_COMPILE([input.o], [-c input.c]) AT_CLEANUP @@ -72,9 +72,9 @@ exp: { tests = {{{{{{{{{{}}}}}}}}}}; }; %% ]]) -AT_CHECK([bison -v input.y -o input.c]) +AT_CHECK([bison -v -o input.c input.y]) -AT_CHECK([fgrep 'tests = {{{{{{{{{{}}}}}}}}}};' input.c], 0, [ignore]) +AT_CHECK([grep 'tests = {{{{{{{{{{}}}}}}}}}};' input.c], 0, [ignore]) AT_CLEANUP @@ -99,8 +99,8 @@ 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 +AT_CHECK([bison -v -o input.c input.y], 0, [], +[[input.y:6.8-14: warning: symbol `"<="' used more than once as a literal string ]]) AT_CLEANUP @@ -144,13 +144,13 @@ expr: }; ]]) -AT_CHECK([bison input.y -o input.c -v]) +AT_CHECK([bison -o input.c -v input.y]) # Check the contents of the report. AT_CHECK([cat input.output], [], [[Grammar - 0 $axiom: expr $ + 0 $accept: expr $end 1 @1: /* empty */ @@ -163,7 +163,7 @@ AT_CHECK([cat input.output], [], Terminals, with rules where they appear -$ (0) 0 +$end (0) 0 'a' (97) 2 'b' (98) 2 'c' (99) 4 @@ -172,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 @@ -184,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) - - $default reduce using rule 1 (@1) + 2 expr: 'a' . @1 'b' - @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 @@ -275,7 +266,7 @@ exp: ; %% ]]) -AT_CHECK([bison -v input.y -o input.c]) +AT_CHECK([bison -v -o input.c input.y]) AT_CLEANUP @@ -293,7 +284,7 @@ AT_DATA([input.y], ? default: 'a' } %& -%a +%a-does-not-exist %- %{ ]]) @@ -303,12 +294,11 @@ AT_CHECK([bison input.y], [1], [], 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:5.1-17: invalid directive: `%a-does-not-exist' 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 PROLOGUE, expecting ";" or "|" -input.y:5.2: symbol a is used, but is not defined as a token and has no rules +input.y:7.1-8.0: missing `%}' at end of file +input.y:7.1-8.0: syntax error, unexpected "%{...%}" ]]) AT_CLEANUP @@ -323,12 +313,12 @@ AT_CLEANUP AT_SETUP([Token definitions]) # Bison managed, when fed with `%token 'f' "f"' to #define 'f'! -AT_DATA([input.y], +AT_DATA_GRAMMAR([input.y], [%{ void yyerror (const char *s); int yylex (void); %} -[%token YYEOF 0 "end of file" +[%token MYEOF 0 "end of file" %token 'a' "a" %token b "b" %token c 'c' @@ -337,8 +327,35 @@ int yylex (void); exp: "a"; ]]) -AT_CHECK([bison input.y -o input.c]) -AT_CHECK([$CC $CFLAGS $CPPFLAGS input.c -c]) +AT_CHECK([bison -o input.c input.y]) +AT_COMPILE([input.o], [-c input.c]) +AT_CLEANUP + + + +## -------------------- ## +## Characters Escapes. ## +## -------------------- ## + + +AT_SETUP([Characters Escapes]) + +AT_DATA_GRAMMAR([input.y], +[%{ +void yyerror (const char *s); +int yylex (void); +%} +[%% +exp: + '\'' "\'" +| '\"' "\"" +| '"' "'" +; +]]) +# Pacify font-lock-mode: " + +AT_CHECK([bison -o input.c input.y]) +AT_COMPILE([input.o], [-c input.c]) AT_CLEANUP @@ -375,28 +392,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 - 0 $axiom: CONST_DEC_PART $ + + 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 @@ -406,47 +432,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 @@ -487,11 +559,13 @@ else: "else" statement; %% ]]) -AT_CHECK([bison -v input.y -o input.c]) +AT_CHECK([bison -v -o input.c input.y]) # 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, @@ -526,7 +600,7 @@ static const unsigned char yyprhs[] = { 0, 0, 3, 5, 6, 9, 14 }; -static const signed char yyrhs[] = +static const yysigned_char yyrhs[] = { 8, 0, -1, 9, -1, -1, 10, 11, -1, 3, 4, 5, 8, -1, 6, 8, -1 @@ -537,12 +611,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[] = { @@ -552,29 +626,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 yysigned_char yydefgoto[] = { -1, 2, 3, 4, 8 }; -static const short yypact[] = +static const yysigned_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 yysigned_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 yysigned_char yycheck[] = { 7, 3, 9, 4, 0, -1, 6, 5 };