style changes: untabify

[bison.git] / tests / regression.at

diff --git a/tests/regression.at b/tests/regression.at
index b6bff17cb0743128f82bc74360e74f54b48baba4..c08059e5e4226d958077821b9b41048ad90016e7 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -209,7 +209,7 @@ exp: '(' exp ')' | NUM ;
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([-v -o input.c input.y], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 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 [-Wother]

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -293,7 +293,7 @@ $@2 (9)
     on left: 3, on right: 4
 
 
     on left: 3, on right: 4
 
 

-state 0
+State 0

 
     0 $accept: . expr $end
 
 
     0 $accept: . expr $end
 


@@ -305,7 +305,7 @@ state 0
     $@2   go to state 3
 
 
     $@2   go to state 3
 
 

-state 1
+State 1

 
     2 expr: 'a' . $@1 'b'
 
 
     2 expr: 'a' . $@1 'b'
 


@@ -314,42 +314,42 @@ state 1
     $@1  go to state 4
 
 
     $@1  go to state 4
 
 

-state 2
+State 2

 
     0 $accept: expr . $end
 
     $end  shift, and go to state 5
 
 
 
     0 $accept: expr . $end
 
     $end  shift, and go to state 5
 
 

-state 3
+State 3

 
     4 expr: $@2 . 'c'
 
     'c'  shift, and go to state 6
 
 
 
     4 expr: $@2 . 'c'
 
     'c'  shift, and go to state 6
 
 

-state 4
+State 4

 
     2 expr: 'a' $@1 . 'b'
 
     'b'  shift, and go to state 7
 
 
 
     2 expr: 'a' $@1 . 'b'
 
     'b'  shift, and go to state 7
 
 

-state 5
+State 5

 
     0 $accept: expr $end .
 
     $default  accept
 
 
 
     0 $accept: expr $end .
 
     $default  accept
 
 

-state 6
+State 6

 
     4 expr: $@2 'c' .
 
     $default  reduce using rule 4 (expr)
 
 
 
     4 expr: $@2 'c' .
 
     $default  reduce using rule 4 (expr)
 
 

-state 7
+State 7

 
     2 expr: 'a' $@1 'b' .
 
 
     2 expr: 'a' $@1 'b' .
 


@@ -478,8 +478,16 @@ AT_BISON_OPTION_POPDEFS
 # C-string literal.  Also notice that unnecessary escaping, such as "\?", from
 # the user specification is eliminated.
 AT_BISON_CHECK([-o input.c input.y], [[0]], [[]],
 # C-string literal.  Also notice that unnecessary escaping, such as "\?", from
 # 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-14: warning: symbol SPECIAL redeclared [-Wother]
+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 [-Wother]
+]])
+AT_BISON_CHECK([-fcaret -o input.c input.y], [[0]], [[]],
+[[input.y:22.8-14: warning: symbol SPECIAL redeclared [-Wother]
+ %token SPECIAL "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!"
+        ^^^^^^^
+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 [-Wother]
+ %token SPECIAL "\\\'\?\"\a\b\f\n\r\t\v\001\201\x001\x000081??!"
+        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

 ]])
 AT_COMPILE([input])
 
 ]])
 AT_COMPILE([input])
 


@@ -538,7 +546,7 @@ AT_SETUP([Web2c Report])
 AT_KEYWORDS([report])
 
 AT_DATA([input.y],
 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
 \f
 
 %start CONST_DEC_PART
 \f


@@ -548,12 +556,12 @@ CONST_DEC_PART:
         ;
 
 CONST_DEC_LIST:
         ;
 
 CONST_DEC_LIST:

-         CONST_DEC
+          CONST_DEC

         | 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 ';'

         ;
 %%
 ]])
         ;
 %%
 ]])


@@ -598,7 +606,7 @@ $@1 (11)
     on left: 4, on right: 5
 
 
     on left: 4, on right: 5
 
 

-state 0
+State 0

 
     0 $accept: . CONST_DEC_PART $end
 
 
     0 $accept: . CONST_DEC_PART $end
 


@@ -610,14 +618,14 @@ state 0
     $@1             go to state 4
 
 
     $@1             go to state 4
 
 

-state 1
+State 1

 
     0 $accept: CONST_DEC_PART . $end
 
     $end  shift, and go to state 5
 
 
 
     0 $accept: CONST_DEC_PART . $end
 
     $end  shift, and go to state 5
 
 

-state 2
+State 2

 
     1 CONST_DEC_PART: CONST_DEC_LIST .
     3 CONST_DEC_LIST: CONST_DEC_LIST . CONST_DEC
 
     1 CONST_DEC_PART: CONST_DEC_LIST .
     3 CONST_DEC_LIST: CONST_DEC_LIST . CONST_DEC


@@ -629,56 +637,56 @@ state 2
     $@1        go to state 4
 
 
     $@1        go to state 4
 
 

-state 3
+State 3

 
     2 CONST_DEC_LIST: CONST_DEC .
 
     $default  reduce using rule 2 (CONST_DEC_LIST)
 
 
 
     2 CONST_DEC_LIST: CONST_DEC .
 
     $default  reduce using rule 2 (CONST_DEC_LIST)
 
 

-state 4
+State 4

 
     5 CONST_DEC: $@1 . undef_id_tok '=' const_id_tok ';'
 
     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
+State 5

 
     0 $accept: CONST_DEC_PART $end .
 
     $default  accept
 
 
 
     0 $accept: CONST_DEC_PART $end .
 
     $default  accept
 
 

-state 6
+State 6

 
     3 CONST_DEC_LIST: CONST_DEC_LIST CONST_DEC .
 
     $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
+State 7

 
     5 CONST_DEC: $@1 undef_id_tok . '=' const_id_tok ';'
 
     '='  shift, and go to state 8
 
 
 
     5 CONST_DEC: $@1 undef_id_tok . '=' const_id_tok ';'
 
     '='  shift, and go to state 8
 
 

-state 8
+State 8

 
     5 CONST_DEC: $@1 undef_id_tok '=' . const_id_tok ';'
 
     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
+State 9

 
     5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok . ';'
 
     ';'  shift, and go to state 10
 
 
 
     5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok . ';'
 
     ';'  shift, and go to state 10
 
 

-state 10
+State 10

 
     5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok ';' .
 
 
     5 CONST_DEC: $@1 undef_id_tok '=' const_id_tok ';' .
 


@@ -759,15 +767,6 @@ AT_CHECK([[cat tables.c]], 0,
        2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
        5,     6
 };
        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
 static const yytype_uint8 yyrline[] =
 {
        0,     2,     2,     3,     3,     4,     5


@@ -781,32 +780,24 @@ static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261
 };
 {
        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_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 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
 static const yytype_uint8 yytable[] =
 {
       10,     1,    11,     5,     6,     0,     7,     9


@@ -820,6 +811,14 @@ static const yytype_uint8 yystos[] =
        0,     3,     8,     9,    10,     4,     0,     6,    11,     5,
        8,     8
 };
        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
 ]])
 
 AT_CLEANUP


@@ -939,11 +938,11 @@ AT_CHECK_DANCER([%skeleton "lalr1.cc"])
 # --------------------------------
 m4_define([_AT_DATA_EXPECT2_Y],
 [AT_DATA_GRAMMAR([expect2.y],
 # --------------------------------
 m4_define([_AT_DATA_EXPECT2_Y],
 [AT_DATA_GRAMMAR([expect2.y],

-[[%{
-static int yylex (]AT_LALR1_CC_IF([int *], [void]));
-AT_LALR1_CC_IF([],
-[[#include <stdio.h>
-#include <stdlib.h>
+[%{
+static int yylex (AT_LALR1_CC_IF([int *], [void]));
+AT_LALR1_CC_IF([[#include <cstdlib>]],
+[[#include <stdlib.h>
+#include <stdio.h>

 ]AT_YYERROR_DECLARE])[
 %}
 $1
 ]AT_YYERROR_DECLARE])[
 %}
 $1


@@ -1038,7 +1037,7 @@ AT_DATA_GRAMMAR([input.y],
 start:
   {
     printf ("Bison would once convert this action to a midrule because of the"
 start:
   {
     printf ("Bison would once convert this action to a midrule because of the"

-           " subsequent braced code.\n");
+            " subsequent braced code.\n");

   }
   ;
 
   }
   ;
 


@@ -1125,8 +1124,8 @@ a: 'a' ;
 ]])
 
 AT_BISON_CHECK([[--report=all input.y]])
 ]])
 
 AT_BISON_CHECK([[--report=all input.y]])

-AT_CHECK([[sed -n '/^state 1$/,/^state 2$/p' input.output]], [[0]],
-[[state 1
+AT_CHECK([[sed -n '/^State 1$/,/^State 2$/p' input.output]], [[0]],
+[[State 1

 
     2 start: 'a' . a 'a'
     3 a: . 'a'
 
     2 start: 'a' . a 'a'
     3 a: . 'a'


@@ -1139,7 +1138,7 @@ AT_CHECK([[sed -n '/^state 1$/,/^state 2$/p' input.output]], [[0]],
     a  go to state 5
 
 
     a  go to state 5
 
 

-state 2
+State 2

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1191,8 +1190,8 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o input.c input.y]], [[0]],,
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o input.c input.y]], [[0]],,

-[[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"
+[[input.y:23.5-19: warning: rule useless in parser due to conflicts: start: start [-Wother]
+input.y:27.5-19: warning: rule useless in parser due to conflicts: sr_conflict: TK2 "tok alias" [-Wother]

 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]])
 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input]])


@@ -1210,8 +1209,9 @@ AT_CLEANUP
 
 AT_SETUP([[parse-gram.y: LALR = IELR]])
 
 
 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]
 [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]


@@ -1225,11 +1225,11 @@ 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_BISON_OPTION_PUSHDEFS
 AT_DATA_GRAMMAR([input.y],
 
 AT_BISON_OPTION_PUSHDEFS
 AT_DATA_GRAMMAR([input.y],


@@ -1240,7 +1240,7 @@ AT_DATA_GRAMMAR([input.y],
   #define YYSTACK_USE_ALLOCA 1
 }
 
   #define YYSTACK_USE_ALLOCA 1
 }
 

-%error-verbose
+%define parse.error verbose

 
 %%
 
 
 %%
 


@@ -1273,9 +1273,9 @@ syntax_error:
 %%
 
 ]AT_YYERROR_DEFINE[
 %%
 
 ]AT_YYERROR_DEFINE[

-/* Induce two syntax error messages (which requires full error
-   recovery by shifting 3 tokens) in order to detect any loss of the
-   reallocated buffer.  */
+  /* Induce two syntax error messages (which requires full error
+     recovery by shifting 3 tokens) in order to detect any loss of the
+     reallocated buffer.  */

 ]AT_YYLEX_DEFINE(["abc"])[
 int
 main (void)
 ]AT_YYLEX_DEFINE(["abc"])[
 int
 main (void)


@@ -1296,9 +1296,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
 
 # Imagine the case where YYSTACK_ALLOC_MAXIMUM = YYSIZE_MAXIMUM and an
 # invocation of yysyntax_error has caused yymsg_alloc to grow to exactly


@@ -1308,7 +1308,8 @@ AT_CLEANUP
 # size calculation would return YYSIZE_MAXIMUM to yyparse.  Then,
 # yyparse would invoke yyerror using the old contents of yymsg.
 
 # 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_BISON_OPTION_PUSHDEFS
 AT_DATA_GRAMMAR([input.y],
 [[%code {
 AT_BISON_OPTION_PUSHDEFS
 AT_DATA_GRAMMAR([input.y],
 [[%code {


@@ -1333,7 +1334,7 @@ AT_DATA_GRAMMAR([input.y],
   #define YYMAXDEPTH 100
 }
 
   #define YYMAXDEPTH 100
 }
 

-%error-verbose
+%define parse.error verbose

 
 %%
 
 
 %%
 


@@ -1381,8 +1382,8 @@ syntax_error2:
 %%
 
 ]AT_YYERROR_DEFINE[
 %%
 
 ]AT_YYERROR_DEFINE[

-/* Induce two syntax error messages (which requires full error
-   recovery by shifting 3 tokens).  */
+  /* Induce two syntax error messages (which requires full error
+     recovery by shifting 3 tokens).  */

 ]AT_YYLEX_DEFINE(["abc"])[
 int
 main (void)
 ]AT_YYLEX_DEFINE(["abc"])[
 int
 main (void)


@@ -1432,7 +1433,7 @@ AT_DATA_GRAMMAR([input.y],
 }
 
 ]$1[
 }
 
 ]$1[

-%error-verbose
+%define parse.error verbose

 %token 'c'
 
 %%
 %token 'c'
 
 %%


@@ -1468,7 +1469,7 @@ main (void)
 AT_BISON_CHECK([[-Dparse.lac=full -Dparse.lac.es-capacity-initial=1 \
                  -Dparse.lac.memory-trace=full \
                  -t -o input.c input.y]], [[0]], [],
 AT_BISON_CHECK([[-Dparse.lac=full -Dparse.lac.es-capacity-initial=1 \
                  -Dparse.lac.memory-trace=full \
                  -t -o input.c input.y]], [[0]], [],

-[[input.y: conflicts: 21 shift/reduce
+[[input.y: warning: 21 shift/reduce conflicts [-Wconflicts-sr]

 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input > stdout.txt 2> stderr.txt]], [[1]])
 ]])
 AT_COMPILE([[input]])
 AT_PARSER_CHECK([[./input > stdout.txt 2> stderr.txt]], [[1]])


@@ -1544,7 +1545,7 @@ main (void)
 
 AT_BISON_CHECK([[-Dparse.lac=full -Dparse.lac.es-capacity-initial=1 \
                  -t -o input.c input.y]], [[0]], [],
 
 AT_BISON_CHECK([[-Dparse.lac=full -Dparse.lac.es-capacity-initial=1 \
                  -t -o input.c input.y]], [[0]], [],

-[[input.y: conflicts: 8 shift/reduce
+[[input.y: warning: 8 shift/reduce conflicts [-Wconflicts-sr]

 ]])
 AT_COMPILE([[input]])
 AT_BISON_OPTION_POPDEFS
 ]])
 AT_COMPILE([[input]])
 AT_BISON_OPTION_POPDEFS


@@ -1645,7 +1646,7 @@ main (void)
 ]])
 
 AT_FULL_COMPILE([input])
 ]])
 
 AT_FULL_COMPILE([input])

-AT_CHECK([./input], 0, [[x: 1, y: 2
+AT_PARSER_CHECK([./input], 0, [[x: 1, y: 2

 ]])
 AT_BISON_OPTION_POPDEFS
 
 ]])
 AT_BISON_OPTION_POPDEFS