X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/eb8c66bbda06f71d107e2780503f2de9ba814ddd..3e75a2c92b12766add442d00a86d5ec1c67ce560:/tests/regression.at diff --git a/tests/regression.at b/tests/regression.at index 68a41319..41a2939d 100644 --- a/tests/regression.at +++ b/tests/regression.at @@ -1,6 +1,6 @@ # Bison Regressions. -*- Autotest -*- -# Copyright (C) 2001-2011 Free Software Foundation, Inc. +# Copyright (C) 2001-2012 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -162,7 +162,7 @@ AT_CLEANUP AT_SETUP([Braces parsing]) AT_DATA([input.y], -[[/* Bison used to swallow the character after `}'. */ +[[/* Bison used to swallow the character after '}'. */ %% exp: { tests = {{{{{{{{{{}}}}}}}}}}; }; @@ -184,7 +184,7 @@ AT_CLEANUP AT_SETUP([Duplicate string]) AT_DATA([input.y], -[[/* `Bison -v' used to dump core when two tokens are defined with the same +[[/* 'Bison -v' used to dump core when two tokens are defined with the same string, as LE and GE below. */ %token NUM @@ -197,7 +197,7 @@ exp: '(' exp ')' | NUM ; ]]) AT_BISON_CHECK([-v -o input.c input.y], 0, [], -[[input.y:6.8-14: 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 @@ -387,14 +387,14 @@ default: 'a' } ]]) AT_BISON_CHECK([input.y], [1], [], -[[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-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: missing `%}' at end of file +[[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-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: missing '%}' at end of file input.y:7.1-8.0: syntax error, unexpected %{...%} ]]) @@ -428,7 +428,7 @@ AT_CLEANUP AT_SETUP([Token definitions]) -# Bison managed, when fed with `%token 'f' "f"' to #define 'f'! +# Bison managed, when fed with '%token 'f' "f"' to #define 'f'! AT_DATA_GRAMMAR([input.y], [%{ #include @@ -475,7 +475,7 @@ main (void) # the user specification is eliminated. AT_BISON_CHECK([-o input.c input.y], [[0]], [[]], [[input.y:22.8-14: warning: symbol SPECIAL redeclared -input.y:22.8-63: warning: symbol `"\\'?\"\a\b\f\n\r\t\v\001\201\001\201??!"' used more than once as a literal string +input.y:22.8-63: warning: symbol "\\'?\"\a\b\f\n\r\t\v\001\201\001\201??!" used more than once as a literal string ]]) AT_COMPILE([input]) @@ -524,7 +524,7 @@ AT_CLEANUP # The generation of the reduction was once wrong in Bison, and made it # miss some reductions. In the following test case, the reduction on -# `undef_id_tok' in state 1 was missing. This is stripped down from +# 'undef_id_tok' in state 1 was missing. This is stripped down from # the actual web2c.y. AT_SETUP([Web2c Report]) @@ -532,7 +532,7 @@ AT_SETUP([Web2c Report]) AT_KEYWORDS([report]) AT_DATA([input.y], -[[%token undef_id_tok const_id_tok +[[%token undef_id_tok const_id_tok %start CONST_DEC_PART @@ -542,12 +542,12 @@ CONST_DEC_PART: ; CONST_DEC_LIST: - CONST_DEC + CONST_DEC | CONST_DEC_LIST CONST_DEC ; CONST_DEC: - { } undef_id_tok '=' const_id_tok ';' + { } undef_id_tok '=' const_id_tok ';' ; %% ]]) @@ -686,7 +686,7 @@ AT_CLEANUP ## Web2c Actions. ## ## --------------- ## -# The generation of the mapping `state -> action' was once wrong in +# The generation of the mapping 'state -> action' was once wrong in # extremely specific situations. web2c.y exhibits this situation. # Below is a stripped version of the grammar. It looks like one can # simplify it further, but just don't: it is tuned to exhibit a bug, @@ -753,15 +753,6 @@ AT_CHECK([[cat tables.c]], 0, 2, 2, 2, 2, 2, 2, 1, 2, 3, 4, 5, 6 }; -static const yytype_uint8 yyprhs[] = -{ - 0, 0, 3, 5, 6, 9, 14 -}; -static const yytype_int8 yyrhs[] = -{ - 8, 0, -1, 9, -1, -1, 10, 11, -1, 3, - 4, 5, 8, -1, 6, 8, -1 -}; static const yytype_uint8 yyrline[] = { 0, 2, 2, 3, 3, 4, 5 @@ -769,38 +760,30 @@ static const yytype_uint8 yyrline[] = static const char *const yytname[] = { "$end", "error", "$undefined", "\"if\"", "\"const\"", "\"then\"", - "\"else\"", "$accept", "statement", "struct_stat", "if", "else", 0 + "\"else\"", "$accept", "statement", "struct_stat", "if", "else", YY_NULL }; static const yytype_uint16 yytoknum[] = { 0, 256, 257, 258, 259, 260, 261 }; -static const yytype_uint8 yyr1[] = -{ - 0, 7, 8, 9, 9, 10, 11 -}; -static const yytype_uint8 yyr2[] = +static const yytype_int8 yypact[] = { - 0, 2, 1, 0, 2, 4, 2 + -2, -1, 4, -8, 0, 2, -8, -2, -8, -2, + -8, -8 }; static const yytype_uint8 yydefact[] = { 3, 0, 0, 2, 0, 0, 1, 3, 4, 3, 6, 5 }; -static const yytype_int8 yydefgoto[] = -{ - -1, 2, 3, 4, 8 -}; -static const yytype_int8 yypact[] = -{ - -2, -1, 4, -8, 0, 2, -8, -2, -8, -2, - -8, -8 -}; static const yytype_int8 yypgoto[] = { -8, -7, -8, -8, -8 }; +static const yytype_int8 yydefgoto[] = +{ + -1, 2, 3, 4, 8 +}; static const yytype_uint8 yytable[] = { 10, 1, 11, 5, 6, 0, 7, 9 @@ -814,6 +797,14 @@ static const yytype_uint8 yystos[] = 0, 3, 8, 9, 10, 4, 0, 6, 11, 5, 8, 8 }; +static const yytype_uint8 yyr1[] = +{ + 0, 7, 8, 9, 9, 10, 11 +}; +static const yytype_uint8 yyr2[] = +{ + 0, 2, 1, 0, 2, 4, 2 +}; ]]) AT_CLEANUP @@ -834,7 +825,7 @@ m4_define([_AT_DATA_DANCER_Y], [AT_DATA_GRAMMAR([dancer.y], [%{ static int yylex (AT_LALR1_CC_IF([int *], [void])); -AT_LALR1_CC_IF([], +AT_LALR1_CC_IF([#include ], [#include #include static void yyerror (const char *);]) @@ -886,7 +877,7 @@ member: STRING AT_LALR1_CC_IF( [/* A C++ error reporting function. */ void -yy::parser::error (const location&, const std::string& m) +yy::parser::error (const std::string& m) { std::cerr << m << std::endl; } @@ -962,7 +953,7 @@ m4_define([_AT_DATA_EXPECT2_Y], [AT_DATA_GRAMMAR([expect2.y], [%{ static int yylex (AT_LALR1_CC_IF([int *], [void])); -AT_LALR1_CC_IF([], +AT_LALR1_CC_IF([#include ], [#include #include static void yyerror (const char *);]) @@ -985,7 +976,7 @@ t: A | B; AT_LALR1_CC_IF( [/* A C++ error reporting function. */ void -yy::parser::error (const location&, const std::string& m) +yy::parser::error (const std::string& m) { std::cerr << m << std::endl; } @@ -1071,7 +1062,7 @@ static int yylex (void); start: { printf ("Bison would once convert this action to a midrule because of the" - " subsequent braced code.\n"); + " subsequent braced code.\n"); } ; @@ -1157,7 +1148,7 @@ AT_SETUP([[Extra lookahead sets in report]]) # state's one item that (1) is associated with the same rule as the reduction # and (2) has its dot at the end of its RHS. Previously, Bison also # erroneously printed the lookahead set next to all of the state's other items -# associated with the same rule. This bug affected only the `.output' file and +# associated with the same rule. This bug affected only the '.output' file and # not the generated parser source code. AT_DATA([[input.y]], @@ -1205,12 +1196,15 @@ AT_DATA_GRAMMAR([input.y], %} %error-verbose +%right END 0 %left TK1 1 TK2 2 "tok alias" 3 %% -start: TK1 sr_conflict "tok alias" ; - +start: + TK1 sr_conflict "tok alias" + | start %prec END + ; sr_conflict: TK2 | TK2 "tok alias" @@ -1240,7 +1234,8 @@ main (void) ]]) AT_BISON_CHECK([[-o input.c input.y]], [[0]],, -[[input.y:24.5-19: warning: rule useless in parser due to conflicts: sr_conflict: TK2 "tok alias" +[[input.y:23.5-19: warning: rule useless in parser due to conflicts: start: start +input.y:27.5-19: warning: rule useless in parser due to conflicts: sr_conflict: TK2 "tok alias" ]]) AT_COMPILE([[input]]) AT_PARSER_CHECK([[./input]]) @@ -1258,24 +1253,25 @@ AT_CLEANUP AT_SETUP([[parse-gram.y: LALR = IELR]]) -# Avoid differences in synclines by telling bison that the output files -# have the same name. +# Avoid tests/bison's dark magic by processing a local copy of the +# grammar. Avoid differences in synclines by telling bison that the +# output files have the same name. [cp $abs_top_srcdir/src/parse-gram.y input.y] AT_BISON_CHECK([[-o input.c -Dlr.type=lalr input.y]]) -[mv input.c lalr.c] +[mv input.c expout] AT_BISON_CHECK([[-o input.c -Dlr.type=ielr input.y]]) [mv input.c ielr.c] -AT_CHECK([[diff -u lalr.c ielr.c]]) +AT_CHECK([[cat ielr.c]], [[0]], [[expout]]) AT_CLEANUP -## --------------------------------------- ## -## %error-verbose and YYSTACK_USE_ALLOCA. ## -## --------------------------------------- ## +## -------------------------------------------- ## +## parse.error=verbose and YYSTACK_USE_ALLOCA. ## +## -------------------------------------------- ## -AT_SETUP([[%error-verbose and YYSTACK_USE_ALLOCA]]) +AT_SETUP([[parse.error=verbose and YYSTACK_USE_ALLOCA]]) AT_DATA_GRAMMAR([input.y], [[%code { @@ -1285,7 +1281,7 @@ AT_DATA_GRAMMAR([input.y], #define YYSTACK_USE_ALLOCA 1 } -%error-verbose +%define parse.error verbose %% @@ -1351,9 +1347,9 @@ AT_CLEANUP -## ------------------------- ## -## %error-verbose overflow. ## -## ------------------------- ## +## ------------------------------ ## +## parse.error=verbose overflow. ## +## ------------------------------ ## # Imagine the case where YYSTACK_ALLOC_MAXIMUM = YYSIZE_MAXIMUM and an # invocation of yysyntax_error has caused yymsg_alloc to grow to exactly @@ -1363,7 +1359,7 @@ AT_CLEANUP # size calculation would return YYSIZE_MAXIMUM to yyparse. Then, # yyparse would invoke yyerror using the old contents of yymsg. -AT_SETUP([[%error-verbose overflow]]) +AT_SETUP([[parse.error=verbose overflow]]) AT_DATA_GRAMMAR([input.y], [[%code { @@ -1388,7 +1384,7 @@ AT_DATA_GRAMMAR([input.y], #define YYMAXDEPTH 100 } -%error-verbose +%define parse.error verbose %% @@ -1498,7 +1494,7 @@ AT_DATA_GRAMMAR([input.y], } ]$1[ -%error-verbose +%define parse.error verbose %token 'c' %%