style: space changes in the tests

[bison.git] / tests / glr-regression.at

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index a8809ebf80f56c9f08e08b9dd64d4ec32b6a40a2..9eb429c77908db9363404a4f840bb300c68074f0 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -326,7 +326,7 @@ int yylex (void)
 }
 
 int
 }
 
 int

-main(int argc, char* argv[])
+main (int argc, char* argv[])

 {
   int res;
   input = stdin;
 {
   int res;
   input = stdin;


@@ -488,11 +488,7 @@ start:
 %%
 ]AT_YYLEX_DEFINE(["a"])[
 ]AT_YYERROR_DEFINE[
 %%
 ]AT_YYLEX_DEFINE(["a"])[
 ]AT_YYERROR_DEFINE[

-int
-main (void)
-{
-  return yyparse () != 1;
-}
+]AT_MAIN_DEFINE[

 ]])
 AT_BISON_OPTION_POPDEFS
 
 ]])
 AT_BISON_OPTION_POPDEFS
 


@@ -501,7 +497,7 @@ AT_BISON_CHECK([[-o glr-regr5.c glr-regr5.y]], 0, [],
 ]])
 AT_COMPILE([glr-regr5])
 
 ]])
 AT_COMPILE([glr-regr5])
 

-AT_PARSER_CHECK([[./glr-regr5]], 0, [],
+AT_PARSER_CHECK([[./glr-regr5]], 1, [],

 [syntax is ambiguous
 ])
 
 [syntax is ambiguous
 ])
 


@@ -540,11 +536,7 @@ start: 'a' | 'a' ;
 %%
 ]AT_YYERROR_DEFINE[
 ]AT_YYLEX_DEFINE(["a"])[
 %%
 ]AT_YYERROR_DEFINE[
 ]AT_YYLEX_DEFINE(["a"])[

-int
-main (void)
-{
-  return yyparse () != 1;
-}
+]AT_MAIN_DEFINE[

 ]])
 AT_BISON_OPTION_POPDEFS
 
 ]])
 AT_BISON_OPTION_POPDEFS
 


@@ -553,7 +545,7 @@ AT_BISON_CHECK([[-o glr-regr6.c glr-regr6.y]], 0, [],
 ]])
 AT_COMPILE([glr-regr6])
 
 ]])
 AT_COMPILE([glr-regr6])
 

-AT_PARSER_CHECK([[./glr-regr6]], 0,
+AT_PARSER_CHECK([[./glr-regr6]], 1,

 [Destructor called.
 ],
 [syntax is ambiguous
 [Destructor called.
 ],
 [syntax is ambiguous


@@ -722,12 +714,7 @@ int yylex (void)
     }
 }
 
     }
 }
 

-int
-main (void)
-{
-  yyparse();
-  return 0;
-}
+]AT_MAIN_DEFINE[

 ]])
 AT_BISON_OPTION_POPDEFS
 
 ]])
 AT_BISON_OPTION_POPDEFS
 


@@ -1028,17 +1015,17 @@ main (void)
   int exit_status = yyparse ();
   if (parent_rhs_before_value)
     {
   int exit_status = yyparse ();
   if (parent_rhs_before_value)
     {

-      fprintf (stderr, "`parent_rhs_before' destructor not called.\n");
+      fprintf (stderr, "'parent_rhs_before' destructor not called.\n");

       exit_status = 1;
     }
   if (merged_value)
     {
       exit_status = 1;
     }
   if (merged_value)
     {

-      fprintf (stderr, "`merged' destructor not called.\n");
+      fprintf (stderr, "'merged' destructor not called.\n");

       exit_status = 1;
     }
   if (parent_rhs_after_value)
     {
       exit_status = 1;
     }
   if (parent_rhs_after_value)
     {

-      fprintf (stderr, "`PARENT_RHS_AFTER' destructor not called.\n");
+      fprintf (stderr, "'PARENT_RHS_AFTER' destructor not called.\n");

       exit_status = 1;
     }
   return exit_status;
       exit_status = 1;
     }
   return exit_status;


@@ -1462,7 +1449,7 @@ main (void)
   int exit_status = yyparse () != 1;
   if (parent_rhs_before_value)
     {
   int exit_status = yyparse () != 1;
   if (parent_rhs_before_value)
     {

-      fprintf (stderr, "`parent_rhs_before' destructor not called.\n");
+      fprintf (stderr, "'parent_rhs_before' destructor not called.\n");

       exit_status = 1;
     }
   return exit_status;
       exit_status = 1;
     }
   return exit_status;


@@ -1600,11 +1587,7 @@ yylex (YYSTYPE *lvalp, YYLTYPE *llocp)
   return input[toknum++];
 }
 
   return input[toknum++];
 }
 

-int
-main (void)
-{
-  return yyparse () != 1;
-}
+]AT_MAIN_DEFINE[

 ]])
 AT_BISON_OPTION_POPDEFS
 
 ]])
 AT_BISON_OPTION_POPDEFS
 


@@ -1613,7 +1596,7 @@ AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [],
 ]])
 AT_COMPILE([glr-regr17])
 
 ]])
 AT_COMPILE([glr-regr17])
 

-AT_PARSER_CHECK([[./glr-regr17]], 0, [],
+AT_PARSER_CHECK([[./glr-regr17]], 1, [],

 [1.1-2.2: syntax is ambiguous
 ])
 
 [1.1-2.2: syntax is ambiguous
 ])
 


@@ -1655,19 +1638,15 @@ sym3: %merge<merge> { $$ = 0; } ;
 %%
 ]AT_YYERROR_DEFINE[
 ]AT_YYLEX_DEFINE[
 %%
 ]AT_YYERROR_DEFINE[
 ]AT_YYLEX_DEFINE[

-int
-main (void)
-{
-  return yyparse ();
-}
+]AT_MAIN_DEFINE[

 ]])
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr18.c glr-regr18.y]], 1, [],
 ]])
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr18.c glr-regr18.y]], 1, [],

-[[glr-regr18.y:26.18-24: error: result type clash on merge function 'merge': <type2> != <type1>
-glr-regr18.y:25.18-24:     previous declaration
-glr-regr18.y:27.13-19: error: result type clash on merge function 'merge': <type3> != <type2>
-glr-regr18.y:26.18-24:     previous declaration
+[[glr-regr18.y:28.18-24: error: result type clash on merge function 'merge': <type2> != <type1>
+glr-regr18.y:27.18-24:     previous declaration
+glr-regr18.y:29.13-19: error: result type clash on merge function 'merge': <type3> != <type2>
+glr-regr18.y:28.18-24:     previous declaration

 ]])
 
 AT_CLEANUP
 ]])
 
 AT_CLEANUP


@@ -1679,7 +1658,7 @@ AT_CLEANUP
 
 AT_SETUP([Ambiguity reports])
 
 
 AT_SETUP([Ambiguity reports])
 

-AT_BISON_OPTION_PUSHDEFS
+AT_BISON_OPTION_PUSHDEFS([%debug])

 AT_DATA_GRAMMAR([input.y],
 [[
 %{
 AT_DATA_GRAMMAR([input.y],
 [[
 %{


@@ -1702,12 +1681,7 @@ d: /* nada.  */;
 %%
 ]AT_YYLEX_DEFINE(["abc"])[
 ]AT_YYERROR_DEFINE[
 %%
 ]AT_YYLEX_DEFINE(["abc"])[
 ]AT_YYERROR_DEFINE[

-int
-main (void)
-{
-  yydebug = 1;
-  return !!yyparse ();
-}
+]AT_MAIN_DEFINE[

 ]])
 AT_BISON_OPTION_POPDEFS
 
 ]])
 AT_BISON_OPTION_POPDEFS
 


@@ -1716,7 +1690,7 @@ AT_BISON_CHECK([[-o input.c input.y]], 0, [],
 ]])
 AT_COMPILE([input])
 
 ]])
 AT_COMPILE([input])
 

-AT_PARSER_CHECK([[./input]], 1, [],
+AT_PARSER_CHECK([[./input --debug]], 1, [],

 [Starting parse
 Entering state 0
 Reading a token: Next token is token 'a' ()
 [Starting parse
 Entering state 0
 Reading a token: Next token is token 'a' ()


@@ -1725,14 +1699,14 @@ Entering state 1
 Reading a token: Next token is token 'b' ()
 Shifting token 'b' ()
 Entering state 3
 Reading a token: Next token is token 'b' ()
 Shifting token 'b' ()
 Entering state 3

-Reducing stack 0 by rule 3 (line 25):
+Reducing stack 0 by rule 3 (line 27):

    $1 = token 'b' ()
 -> $$ = nterm b ()
 Entering state 4
 Reading a token: Next token is token 'c' ()
 Shifting token 'c' ()
 Entering state 6
    $1 = token 'b' ()
 -> $$ = nterm b ()
 Entering state 4
 Reading a token: Next token is token 'c' ()
 Shifting token 'c' ()
 Entering state 6

-Reducing stack 0 by rule 4 (line 26):
+Reducing stack 0 by rule 4 (line 28):

 -> $$ = nterm d ()
 Entering state 7
 Reading a token: Now at end of input.
 -> $$ = nterm d ()
 Entering state 7
 Reading a token: Now at end of input.