api.tokens.prefix -> api.token.prefix

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

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 67c6070730eff8449cfa7cbeff98c8c841f5407b..b376c1c05ea771bdadfa0beef1c4f033b478a07b 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -32,11 +32,12 @@ AT_DATA_GRAMMAR([glr-regr1.y],
 %{
 #include <stdio.h>
 #include <stdlib.h>
 %{
 #include <stdio.h>
 #include <stdlib.h>

+#include <assert.h>

 
 #define YYSTYPE int
 static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1);
 
 #define YYSTYPE int
 static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1);

-]AT_YYLEX_DECLARE[

 ]AT_YYERROR_DECLARE[
 ]AT_YYERROR_DECLARE[

+]AT_YYLEX_DECLARE[

 %}
 
 
 %}
 
 


@@ -80,21 +81,20 @@ yylex (void)
   for (;;)
     {
       int ch;
   for (;;)
     {
       int ch;

-      if (feof (stdin))
-        abort ();
+      assert (!feof (stdin));

       ch = getchar ();
       if (ch == EOF)
       ch = getchar ();
       if (ch == EOF)

-        return 0;
+       return 0;

       else if (ch == 'B' || ch == 'P')
       else if (ch == 'B' || ch == 'P')

-        return ch;
+       return ch;

     }
 }
 ]])
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr1.c glr-regr1.y]], 0, [],
     }
 }
 ]])
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr1.c glr-regr1.y]], 0, [],

-[glr-regr1.y: conflicts: 1 shift/reduce
-])
+[[glr-regr1.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
+]])

 AT_COMPILE([glr-regr1])
 AT_PARSER_CHECK([[echo BPBPB | ./glr-regr1]], 0,
 [[E -> 'B'
 AT_COMPILE([glr-regr1])
 AT_PARSER_CHECK([[echo BPBPB | ./glr-regr1]], 0,
 [[E -> 'B'


@@ -128,8 +128,9 @@ AT_DATA_GRAMMAR([glr-regr2a.y],
   #include <stdio.h>
   #include <stdlib.h>
   #include <string.h>
   #include <stdio.h>
   #include <stdlib.h>
   #include <string.h>

-  ]AT_YYLEX_DECLARE[
+  #include <assert.h>

   ]AT_YYERROR_DECLARE[
   ]AT_YYERROR_DECLARE[

+  ]AT_YYLEX_DECLARE[

 %}
 
 %glr-parser
 %}
 
 %glr-parser


@@ -177,8 +178,7 @@ yylex (void)
 {
   char buf[50];
   char *s;
 {
   char buf[50];
   char *s;

-  if (feof (stdin))
-    abort ();
+  assert (!feof (stdin));

   switch (fscanf (input, " %1[a-z,]", buf))
   {
   case 1:
   switch (fscanf (input, " %1[a-z,]", buf))
   {
   case 1:


@@ -190,8 +190,7 @@ yylex (void)
   }
   if (fscanf (input, "%49s", buf) != 1)
     return 0;
   }
   if (fscanf (input, "%49s", buf) != 1)
     return 0;

-  if (sizeof buf - 1 <= strlen (buf))
-    abort ();
+  assert (strlen (buf) < sizeof buf - 1);

   s = (char *) malloc (strlen (buf) + 1);
   strcpy (s, buf);
   yylval = s;
   s = (char *) malloc (strlen (buf) + 1);
   strcpy (s, buf);
   yylval = s;


@@ -209,8 +208,8 @@ main (int argc, char **argv)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr2a.c glr-regr2a.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr2a.c glr-regr2a.y]], 0, [],

-[glr-regr2a.y: conflicts: 2 shift/reduce
-])
+[[glr-regr2a.y: warning: 2 shift/reduce conflicts [-Wconflicts-sr]
+]])

 AT_COMPILE([glr-regr2a])
 
 AT_PARSER_CHECK([[echo s VARIABLE_1 t v x q | ./glr-regr2a]], 0,
 AT_COMPILE([glr-regr2a])
 
 AT_PARSER_CHECK([[echo s VARIABLE_1 t v x q | ./glr-regr2a]], 0,


@@ -242,6 +241,7 @@ AT_DATA_GRAMMAR([glr-regr3.y],
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>

+#include <assert.h>

 
 static int MergeRule (int x0, int x1);
 ]AT_YYERROR_DECLARE[
 
 static int MergeRule (int x0, int x1);
 ]AT_YYERROR_DECLARE[


@@ -302,8 +302,7 @@ int T[] = { T1, T2, T3, T4 };
 int yylex (void)
 {
   char inp[3];
 int yylex (void)
 {
   char inp[3];

-  if (feof (stdin))
-    abort ();
+  assert (!feof (stdin));

   if (fscanf (input, "%2s", inp) == EOF)
     return 0;
   switch (inp[0])
   if (fscanf (input, "%2s", inp) == EOF)
     return 0;
   switch (inp[0])


@@ -326,8 +325,9 @@ main(int argc, char* argv[])
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr3.c glr-regr3.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr3.c glr-regr3.y]], 0, [],

-[glr-regr3.y: conflicts: 1 shift/reduce, 1 reduce/reduce
-])
+[[glr-regr3.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
+glr-regr3.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr3])
 
 AT_PARSER_CHECK([[echo p1 t4 o2 p1 p1 t1 o1 t2 p2 o1 t3 p2 p2 | ./glr-regr3]],
 AT_COMPILE([glr-regr3])
 
 AT_PARSER_CHECK([[echo p1 t4 o2 p1 p1 t1 o1 t2 p2 o1 t3 p2 p2 | ./glr-regr3]],


@@ -339,7 +339,7 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------------------------- ##
 
 
 ## ------------------------------------------------------------------------- ##

-## Duplicate representation of merged trees.  See                            ##
+## Duplicate representation of merged trees.  See                           ##

 ## <http://lists.gnu.org/archive/html/help-bison/2005-07/msg00013.html>.     ##
 ## ------------------------------------------------------------------------- ##
 
 ## <http://lists.gnu.org/archive/html/help-bison/2005-07/msg00013.html>.     ##
 ## ------------------------------------------------------------------------- ##
 


@@ -384,7 +384,7 @@ B:  'a' { $$ = make_value ("B", "'a'");  } ;
 
 %%
 ]AT_YYERROR_DEFINE[
 
 %%
 ]AT_YYERROR_DEFINE[

-]AT_YYLEX_DEFINE([a])[
+]AT_YYLEX_DEFINE(["a"])[

 
 int
 main (void)
 
 int
 main (void)


@@ -418,8 +418,8 @@ merge (YYSTYPE s1, YYSTYPE s2)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr4.c glr-regr4.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr4.c glr-regr4.y]], 0, [],

-[glr-regr4.y: conflicts: 1 reduce/reduce
-])
+[[glr-regr4.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr4])
 
 AT_PARSER_CHECK([[./glr-regr4]], 0,
 AT_COMPILE([glr-regr4])
 
 AT_PARSER_CHECK([[./glr-regr4]], 0,


@@ -430,7 +430,7 @@ AT_CLEANUP
 
 
 ## -------------------------------------------------------------------------- ##
 
 
 ## -------------------------------------------------------------------------- ##

-## User destructor for unresolved GLR semantic value.  See                    ##
+## User destructor for unresolved GLR semantic value.  See                   ##

 ## <http://lists.gnu.org/archive/html/bison-patches/2005-08/msg00016.html>.   ##
 ## -------------------------------------------------------------------------- ##
 
 ## <http://lists.gnu.org/archive/html/bison-patches/2005-08/msg00016.html>.   ##
 ## -------------------------------------------------------------------------- ##
 


@@ -467,7 +467,7 @@ start:
    ;
 
 %%
    ;
 
 %%

-]AT_YYLEX_DEFINE(a)[
+]AT_YYLEX_DEFINE(["a"])[

 ]AT_YYERROR_DEFINE[
 int
 main (void)
 ]AT_YYERROR_DEFINE[
 int
 main (void)


@@ -478,8 +478,8 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr5.c glr-regr5.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr5.c glr-regr5.y]], 0, [],

-[glr-regr5.y: conflicts: 1 reduce/reduce
-])
+[[glr-regr5.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr5])
 
 AT_PARSER_CHECK([[./glr-regr5]], 0, [],
 AT_COMPILE([glr-regr5])
 
 AT_PARSER_CHECK([[./glr-regr5]], 0, [],


@@ -490,7 +490,7 @@ AT_CLEANUP
 
 
 ## -------------------------------------------------------------------------- ##
 
 
 ## -------------------------------------------------------------------------- ##

-## User destructor after an error during a split parse.  See                  ##
+## User destructor after an error during a split parse.  See                 ##

 ## <http://lists.gnu.org/archive/html/bison-patches/2005-08/msg00029.html>.   ##
 ## -------------------------------------------------------------------------- ##
 
 ## <http://lists.gnu.org/archive/html/bison-patches/2005-08/msg00029.html>.   ##
 ## -------------------------------------------------------------------------- ##
 


@@ -519,18 +519,8 @@ AT_DATA_GRAMMAR([glr-regr6.y],
 start: 'a' | 'a' ;
 
 %%
 start: 'a' | 'a' ;
 
 %%

-
-static int
-yylex (void)
-{
-  static char const input[] = "a";
-  static size_t toknum;
-  if (! (toknum < sizeof input))
-    abort ();
-  return input[toknum++];
-}
-

 ]AT_YYERROR_DEFINE[
 ]AT_YYERROR_DEFINE[

+]AT_YYLEX_DEFINE(["a"])[

 int
 main (void)
 {
 int
 main (void)
 {


@@ -540,8 +530,8 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr6.c glr-regr6.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr6.c glr-regr6.y]], 0, [],

-[glr-regr6.y: conflicts: 1 reduce/reduce
-])
+[[glr-regr6.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr6])
 
 AT_PARSER_CHECK([[./glr-regr6]], 0,
 AT_COMPILE([glr-regr6])
 
 AT_PARSER_CHECK([[./glr-regr6]], 0,


@@ -554,7 +544,7 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------------------------- ##
 
 
 ## ------------------------------------------------------------------------- ##

-## Duplicated user destructor for lookahead.  See                            ##
+## Duplicated user destructor for lookahead.  See                           ##

 ## <http://lists.gnu.org/archive/html/bison-patches/2005-08/msg00035.html>.  ##
 ## ------------------------------------------------------------------------- ##
 
 ## <http://lists.gnu.org/archive/html/bison-patches/2005-08/msg00035.html>.  ##
 ## ------------------------------------------------------------------------- ##
 


@@ -629,8 +619,8 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr7.c glr-regr7.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr7.c glr-regr7.y]], 0, [],

-[glr-regr7.y: conflicts: 2 reduce/reduce
-])
+[[glr-regr7.y: warning: 2 reduce/reduce conflicts [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr7])
 
 AT_PARSER_CHECK([[./glr-regr7]], 2, [],
 AT_COMPILE([glr-regr7])
 
 AT_PARSER_CHECK([[./glr-regr7]], 2, [],


@@ -642,7 +632,7 @@ AT_CLEANUP
 
 ## ------------------------------------------------------------------------- ##
 ## Incorrect default location for empty right-hand sides.  Adapted from bug  ##
 
 ## ------------------------------------------------------------------------- ##
 ## Incorrect default location for empty right-hand sides.  Adapted from bug  ##

-## report by Claudia Hermann.                                                ##
+## report by Claudia Hermann.                                               ##

 ## See http://lists.gnu.org/archive/html/bug-bison/2005-10/msg00069.html and ##
 ## http://lists.gnu.org/archive/html/bug-bison/2005-10/msg00072.html         ##
 ## ------------------------------------------------------------------------- ##
 ## See http://lists.gnu.org/archive/html/bug-bison/2005-10/msg00069.html and ##
 ## http://lists.gnu.org/archive/html/bug-bison/2005-10/msg00072.html         ##
 ## ------------------------------------------------------------------------- ##


@@ -657,7 +647,6 @@ AT_DATA_GRAMMAR([glr-regr8.y],
   #include <stdlib.h>
   ]AT_YYERROR_DECLARE[
   ]AT_YYLEX_DECLARE[
   #include <stdlib.h>
   ]AT_YYERROR_DECLARE[
   ]AT_YYLEX_DECLARE[

-  ]AT_YYERROR_DECLARE[

 %}
 
 %token T_CONSTANT
 %}
 
 %token T_CONSTANT


@@ -669,25 +658,25 @@ AT_DATA_GRAMMAR([glr-regr8.y],
 %%
 
 
 %%
 
 

-PortClause      : T_PORT InterfaceDeclaration T_PORT
-                { printf("%d/%d - %d/%d - %d/%d\n",
-                         @1.first_column, @1.last_column,
-                         @2.first_column, @2.last_column,
-                         @3.first_column, @3.last_column); }
-        ;
+PortClause     : T_PORT InterfaceDeclaration T_PORT
+               { printf("%d/%d - %d/%d - %d/%d\n",
+                        @1.first_column, @1.last_column,
+                        @2.first_column, @2.last_column,
+                        @3.first_column, @3.last_column); }
+       ;

 
 

-InterfaceDeclaration    : OptConstantWord       %dprec 1
-        | OptSignalWord %dprec 2
-        ;
+InterfaceDeclaration   : OptConstantWord       %dprec 1
+       | OptSignalWord %dprec 2
+       ;

 
 

-OptConstantWord : /* empty */
-        | T_CONSTANT
-        ;
+OptConstantWord        : /* empty */
+       | T_CONSTANT
+       ;

 
 

-OptSignalWord   : /* empty */
-                { printf("empty: %d/%d\n", @$.first_column, @$.last_column); }
-        | T_SIGNAL
-        ;
+OptSignalWord  : /* empty */
+               { printf("empty: %d/%d\n", @$.first_column, @$.last_column); }
+       | T_SIGNAL
+       ;

 
 %%
 
 
 %%
 


@@ -724,8 +713,8 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr8.c glr-regr8.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr8.c glr-regr8.y]], 0, [],

-[glr-regr8.y: conflicts: 1 reduce/reduce
-])
+[[glr-regr8.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr8])
 
 AT_PARSER_CHECK([[./glr-regr8]], 0,
 AT_COMPILE([glr-regr8])
 
 AT_PARSER_CHECK([[./glr-regr8]], 0,


@@ -738,7 +727,7 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------------------------- ##
 
 
 ## ------------------------------------------------------------------------- ##

-## No users destructors if stack 0 deleted.  See                             ##
+## No users destructors if stack 0 deleted.  See                            ##

 ## <http://lists.gnu.org/archive/html/bison-patches/2005-09/msg00109.html>.  ##
 ## ------------------------------------------------------------------------- ##
 
 ## <http://lists.gnu.org/archive/html/bison-patches/2005-09/msg00109.html>.  ##
 ## ------------------------------------------------------------------------- ##
 


@@ -804,8 +793,8 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr9.c glr-regr9.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr9.c glr-regr9.y]], 0, [],

-[glr-regr9.y: conflicts: 1 reduce/reduce
-])
+[[glr-regr9.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr9])
 
 AT_PARSER_CHECK([[./glr-regr9]], 0, [],
 AT_COMPILE([glr-regr9])
 
 AT_PARSER_CHECK([[./glr-regr9]], 0, [],


@@ -816,7 +805,7 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------------------------- ##
 
 
 ## ------------------------------------------------------------------------- ##

-## Corrupted semantic options if user action cuts parse.                     ##
+## Corrupted semantic options if user action cuts parse.                    ##

 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Corrupted semantic options if user action cuts parse])
 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Corrupted semantic options if user action cuts parse])


@@ -845,16 +834,8 @@ start:
   ;
 
 %%
   ;
 
 %%

-

 ]AT_YYERROR_DEFINE[
 ]AT_YYERROR_DEFINE[

-static int
-yylex (void)
-{
-  static int called;
-  if (called++)
-    abort ();
-  return 0;
-}
+]AT_YYLEX_DEFINE[

 
 int
 main (void)
 
 int
 main (void)


@@ -868,8 +849,8 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr10.c glr-regr10.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr10.c glr-regr10.y]], 0, [],

-[glr-regr10.y: conflicts: 1 reduce/reduce
-])
+[[glr-regr10.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr10])
 
 AT_PARSER_CHECK([[./glr-regr10]], 0, [], [])
 AT_COMPILE([glr-regr10])
 
 AT_PARSER_CHECK([[./glr-regr10]], 0, [], [])


@@ -878,7 +859,7 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------------------------- ##
 
 
 ## ------------------------------------------------------------------------- ##

-## Undesirable destructors if user action cuts parse.                        ##
+## Undesirable destructors if user action cuts parse.                       ##

 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Undesirable destructors if user action cuts parse])
 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Undesirable destructors if user action cuts parse])


@@ -909,7 +890,7 @@ start:
 %%
 
 ]AT_YYERROR_DEFINE[
 %%
 
 ]AT_YYERROR_DEFINE[

-]AT_YYLEX_DEFINE([a])[
+]AT_YYLEX_DEFINE(["a"])[

 
 int
 main (void)
 
 int
 main (void)


@@ -926,8 +907,8 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr11.c glr-regr11.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr11.c glr-regr11.y]], 0, [],

-[glr-regr11.y: conflicts: 1 reduce/reduce
-])
+[[glr-regr11.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr11])
 
 AT_PARSER_CHECK([[./glr-regr11]], 0, [], [])
 AT_COMPILE([glr-regr11])
 
 AT_PARSER_CHECK([[./glr-regr11]], 0, [], [])


@@ -936,7 +917,7 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------------------------- ##
 
 
 ## ------------------------------------------------------------------------- ##

-## Leaked semantic values if user action cuts parse.                         ##
+## Leaked semantic values if user action cuts parse.                        ##

 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Leaked semantic values if user action cuts parse])
 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Leaked semantic values if user action cuts parse])


@@ -954,6 +935,7 @@ AT_DATA_GRAMMAR([glr-regr12.y],
 
 %{
 # include <stdlib.h>
 
 %{
 # include <stdlib.h>

+# include <assert.h>

   static int merge (YYSTYPE, YYSTYPE);
   ]AT_YYERROR_DECLARE[
   ]AT_YYLEX_DECLARE[
   static int merge (YYSTYPE, YYSTYPE);
   ]AT_YYERROR_DECLARE[
   ]AT_YYLEX_DECLARE[


@@ -1017,17 +999,9 @@ merge (YYSTYPE s1, YYSTYPE s2)
 }
 
 ]AT_YYERROR_DEFINE[
 }
 
 ]AT_YYERROR_DEFINE[

-static int
-yylex (void)
-{
-  static int const input[] = { PARENT_RHS_AFTER, 0 };
-  static size_t toknum;
-  if (! (toknum < sizeof input / sizeof *input))
-    abort ();
-  if (input[toknum] == PARENT_RHS_AFTER)
-    parent_rhs_after_value = 1;
-  return input[toknum++];
-}
+]AT_YYLEX_DEFINE([{ PARENT_RHS_AFTER, 0 }],
+ [if (res == PARENT_RHS_AFTER)
+    parent_rhs_after_value = 1;])[

 
 int
 main (void)
 
 int
 main (void)


@@ -1054,8 +1028,9 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr12.c glr-regr12.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr12.c glr-regr12.y]], 0, [],

-[glr-regr12.y: conflicts: 1 shift/reduce, 1 reduce/reduce
-])
+[[glr-regr12.y: warning: 1 shift/reduce conflict [-Wconflicts-sr]
+glr-regr12.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr12])
 
 AT_PARSER_CHECK([[./glr-regr12]], 0, [], [])
 AT_COMPILE([glr-regr12])
 
 AT_PARSER_CHECK([[./glr-regr12]], 0, [], [])


@@ -1064,7 +1039,7 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------------------------- ##
 
 
 ## ------------------------------------------------------------------------- ##

-## Incorrect lookahead during deterministic GLR.  See                        ##
+## Incorrect lookahead during deterministic GLR.  See                       ##

 ## <http://lists.gnu.org/archive/html/help-bison/2005-07/msg00017.html> and  ##
 ## <http://lists.gnu.org/archive/html/bison-patches/2006-01/msg00060.html>.  ##
 ## ------------------------------------------------------------------------- ##
 ## <http://lists.gnu.org/archive/html/help-bison/2005-07/msg00017.html> and  ##
 ## <http://lists.gnu.org/archive/html/bison-patches/2006-01/msg00060.html>.  ##
 ## ------------------------------------------------------------------------- ##


@@ -1083,6 +1058,7 @@ AT_DATA_GRAMMAR([glr-regr13.y],
 
 %{
   #include <stdio.h>
 
 %{
   #include <stdio.h>

+  #include <assert.h>

   ]AT_YYERROR_DECLARE[
   ]AT_YYLEX_DECLARE[
   static void print_lookahead (char const *);
   ]AT_YYERROR_DECLARE[
   ]AT_YYLEX_DECLARE[
   static void print_lookahead (char const *);


@@ -1136,18 +1112,8 @@ change_lookahead:
 %%
 
 ]AT_YYERROR_DEFINE[
 %%
 
 ]AT_YYERROR_DEFINE[

-static int
-yylex (void)
-{
-  static char const input[] = "ab";
-  static size_t toknum;
-  if (! (toknum < sizeof input))
-    abort ();
-  yylloc.first_line = yylloc.last_line = 1;
-  yylloc.first_column = yylloc.last_column = toknum + 1;
-  yylval.value = input[toknum] + 'A' - 'a';
-  return input[toknum++];
-}
+]AT_YYLEX_DEFINE(["ab"],
+                 [yylval.value = res + 'A' - 'a'])[

 
 static void
 print_lookahead (char const *reduction)
 
 static void
 print_lookahead (char const *reduction)


@@ -1161,10 +1127,10 @@ print_lookahead (char const *reduction)
     {
       printf ("'%c', yylval='", yychar);
       if (yylval.value > ' ')
     {
       printf ("'%c', yylval='", yychar);
       if (yylval.value > ' ')

-        printf ("%c", yylval.value);
+       printf ("%c", yylval.value);

       printf ("', yylloc=(%d,%d),(%d,%d)",
       printf ("', yylloc=(%d,%d),(%d,%d)",

-              yylloc.first_line, yylloc.first_column,
-              yylloc.last_line, yylloc.last_column);
+             yylloc.first_line, yylloc.first_column,
+             yylloc.last_line, yylloc.last_column);

     }
   printf ("\n");
 }
     }
   printf ("\n");
 }


@@ -1199,7 +1165,7 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------------------------- ##
 
 
 ## ------------------------------------------------------------------------- ##

-## Incorrect lookahead during nondeterministic GLR.                          ##
+## Incorrect lookahead during nondeterministic GLR.                         ##

 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Incorrect lookahead during nondeterministic GLR])
 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Incorrect lookahead during nondeterministic GLR])


@@ -1231,6 +1197,7 @@ AT_DATA_GRAMMAR([glr-regr14.y],
 %{
   #include <stdlib.h>
   #include <stdio.h>
 %{
   #include <stdlib.h>
   #include <stdio.h>

+  #include <assert.h>

   ]AT_YYERROR_DECLARE[
   ]AT_YYLEX_DECLARE[
   static void print_lookahead (char const *);
   ]AT_YYERROR_DECLARE[
   ]AT_YYLEX_DECLARE[
   static void print_lookahead (char const *);


@@ -1260,7 +1227,7 @@ merge:
   | conflict defstate_look 'a' nonconflict2 'b' defstate_shift %dprec 2 {
     USE ($3); USE ($5);
     print_lookahead ("merge <- conflict defstate_look 'a' nonconflict2 'b'"
   | conflict defstate_look 'a' nonconflict2 'b' defstate_shift %dprec 2 {
     USE ($3); USE ($5);
     print_lookahead ("merge <- conflict defstate_look 'a' nonconflict2 'b'"

-                      " defstate_shift");
+                     " defstate_shift");

   }
   ;
 
   }
   ;
 


@@ -1307,7 +1274,7 @@ alt1:
     USE ($1);
     if (yychar != 'd' && yychar != YYEOF)
       {
     USE ($1);
     if (yychar != 'd' && yychar != YYEOF)
       {

-        fprintf (stderr, "Incorrect lookahead during stack explosion.\n");
+       fprintf (stderr, "Incorrect lookahead during stack explosion.\n");

       }
   }
   ;
       }
   }
   ;


@@ -1316,7 +1283,7 @@ alt2:
     USE ($1);
     if (yychar != 'd' && yychar != YYEOF)
       {
     USE ($1);
     if (yychar != 'd' && yychar != YYEOF)
       {

-        fprintf (stderr, "Incorrect lookahead during stack explosion.\n");
+       fprintf (stderr, "Incorrect lookahead during stack explosion.\n");

       }
   }
   ;
       }
   }
   ;


@@ -1325,7 +1292,7 @@ alt3:
     USE ($1);
     if (yychar != 'd' && yychar != YYEOF)
       {
     USE ($1);
     if (yychar != 'd' && yychar != YYEOF)
       {

-        fprintf (stderr, "Incorrect lookahead during stack explosion.\n");
+       fprintf (stderr, "Incorrect lookahead during stack explosion.\n");

       }
   }
   ;
       }
   }
   ;


@@ -1333,8 +1300,8 @@ no_look:
   {
     if (yychar != YYEMPTY)
       {
   {
     if (yychar != YYEMPTY)
       {

-        fprintf (stderr,
-                 "Found lookahead where shouldn't during stack explosion.\n");
+       fprintf (stderr,
+                "Found lookahead where shouldn't during stack explosion.\n");

       }
   }
   ;
       }
   }
   ;


@@ -1347,8 +1314,7 @@ yylex (void)
 {
   static char const input[] = "abcdddd";
   static size_t toknum;
 {
   static char const input[] = "abcdddd";
   static size_t toknum;

-  if (! (toknum < sizeof input))
-    abort ();
+  assert (toknum < sizeof input);

   yylloc.first_line = yylloc.last_line = 1;
   yylloc.first_column = yylloc.last_column = toknum + 1;
   yylval.value = input[toknum] + 'A' - 'a';
   yylloc.first_line = yylloc.last_line = 1;
   yylloc.first_column = yylloc.last_column = toknum + 1;
   yylval.value = input[toknum] + 'A' - 'a';


@@ -1367,10 +1333,10 @@ print_lookahead (char const *reduction)
     {
       printf ("'%c', yylval='", yychar);
       if (yylval.value > ' ')
     {
       printf ("'%c', yylval='", yychar);
       if (yylval.value > ' ')

-        printf ("%c", yylval.value);
+       printf ("%c", yylval.value);

       printf ("', yylloc=(%d,%d),(%d,%d)",
       printf ("', yylloc=(%d,%d),(%d,%d)",

-              yylloc.first_line, yylloc.first_column,
-              yylloc.last_line, yylloc.last_column);
+             yylloc.first_line, yylloc.first_column,
+             yylloc.last_line, yylloc.last_column);

     }
   printf ("\n");
 }
     }
   printf ("\n");
 }


@@ -1393,8 +1359,8 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr14.c glr-regr14.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr14.c glr-regr14.y]], 0, [],

-[glr-regr14.y: conflicts: 3 reduce/reduce
-])
+[[glr-regr14.y: warning: 3 reduce/reduce conflicts [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr14])
 
 AT_PARSER_CHECK([[./glr-regr14]], 0,
 AT_COMPILE([glr-regr14])
 
 AT_PARSER_CHECK([[./glr-regr14]], 0,


@@ -1416,7 +1382,7 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------------------------- ##
 
 
 ## ------------------------------------------------------------------------- ##

-## Leaked semantic values when reporting ambiguity.                          ##
+## Leaked semantic values when reporting ambiguity.                         ##

 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Leaked semantic values when reporting ambiguity])
 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Leaked semantic values when reporting ambiguity])


@@ -1468,16 +1434,8 @@ ambiguity1: ;
 ambiguity2: ;
 
 %%
 ambiguity2: ;
 
 %%

-

 ]AT_YYERROR_DEFINE[
 ]AT_YYERROR_DEFINE[

-static int
-yylex (void)
-{
-  static int called;
-  if (called++)
-    abort ();
-  return 0;
-}
+]AT_YYLEX_DEFINE[

 
 int
 main (void)
 
 int
 main (void)


@@ -1494,8 +1452,8 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr15.c glr-regr15.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr15.c glr-regr15.y]], 0, [],

-[glr-regr15.y: conflicts: 2 reduce/reduce
-])
+[[glr-regr15.y: warning: 2 reduce/reduce conflicts [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr15])
 
 AT_PARSER_CHECK([[./glr-regr15]], 0, [],
 AT_COMPILE([glr-regr15])
 
 AT_PARSER_CHECK([[./glr-regr15]], 0, [],


@@ -1506,7 +1464,7 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------------------------- ##
 
 
 ## ------------------------------------------------------------------------- ##

-## Leaked lookahead after nondeterministic parse syntax error.               ##
+## Leaked lookahead after nondeterministic parse syntax error.              ##

 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Leaked lookahead after nondeterministic parse syntax error])
 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Leaked lookahead after nondeterministic parse syntax error])


@@ -1519,6 +1477,7 @@ AT_DATA_GRAMMAR([glr-regr16.y],
 
 %{
 # include <stdlib.h>
 
 %{
 # include <stdlib.h>

+# include <assert.h>

   ]AT_YYERROR_DECLARE[
   ]AT_YYLEX_DECLARE[
   static int lookahead_value = 0;
   ]AT_YYERROR_DECLARE[
   ]AT_YYLEX_DECLARE[
   static int lookahead_value = 0;


@@ -1534,17 +1493,9 @@ alt2: ;
 %%
 
 ]AT_YYERROR_DEFINE[
 %%
 
 ]AT_YYERROR_DEFINE[

-static int
-yylex (void)
-{
-  static char const input[] = "ab";
-  static size_t toknum;
-  if (! (toknum < sizeof input))
-    abort ();
-  if (input[toknum] == 'b')
-    lookahead_value = 1;
-  return input[toknum++];
-}
+]AT_YYLEX_DEFINE(["ab"],
+  [if (res == 'b')
+    lookahead_value = 1])[

 
 int
 main (void)
 
 int
 main (void)


@@ -1561,8 +1512,8 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr16.c glr-regr16.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr16.c glr-regr16.y]], 0, [],

-[glr-regr16.y: conflicts: 1 reduce/reduce
-])
+[[glr-regr16.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr16])
 
 AT_PARSER_CHECK([[./glr-regr16]], 0, [],
 AT_COMPILE([glr-regr16])
 
 AT_PARSER_CHECK([[./glr-regr16]], 0, [],


@@ -1573,12 +1524,13 @@ AT_CLEANUP
 
 
 ## ------------------------------------------------------------------------- ##
 
 
 ## ------------------------------------------------------------------------- ##

-## Uninitialized location when reporting ambiguity.                          ##
+## Uninitialized location when reporting ambiguity.                         ##

 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Uninitialized location when reporting ambiguity])
 
 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Uninitialized location when reporting ambiguity])
 

-AT_BISON_OPTION_PUSHDEFS
+AT_BISON_OPTION_PUSHDEFS([%glr-parser %locations %define api.pure])
+

 AT_DATA_GRAMMAR([glr-regr17.y],
 [[
 %glr-parser
 AT_DATA_GRAMMAR([glr-regr17.y],
 [[
 %glr-parser


@@ -1589,8 +1541,8 @@ AT_DATA_GRAMMAR([glr-regr17.y],
 %union { int dummy; }
 
 %{
 %union { int dummy; }
 
 %{

-  static void yyerror (YYLTYPE *, char const *);
-  static int yylex (YYSTYPE *, YYLTYPE *);
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[

 %}
 
 %initial-action {
 %}
 
 %initial-action {


@@ -1620,21 +1572,15 @@ empty1: ;
 empty2: ;
 
 %%
 empty2: ;
 
 %%

+# include <assert.h>

 
 

-static void
-yyerror (YYLTYPE *locp, char const *msg)
-{
-  fprintf (stderr, "%d.%d-%d.%d: %s.\n", locp->first_line,
-           locp->first_column, locp->last_line, locp->last_column, msg);
-}
-
+]AT_YYERROR_DEFINE[

 static int
 yylex (YYSTYPE *lvalp, YYLTYPE *llocp)
 {
   static char const input[] = "ab";
   static size_t toknum;
 static int
 yylex (YYSTYPE *lvalp, YYLTYPE *llocp)
 {
   static char const input[] = "ab";
   static size_t toknum;

-  if (! (toknum < sizeof input))
-    abort ();
+  assert (toknum < sizeof input);

   lvalp->dummy = 0;
   llocp->first_line = llocp->last_line = 2;
   llocp->first_column = toknum + 1;
   lvalp->dummy = 0;
   llocp->first_line = llocp->last_line = 2;
   llocp->first_column = toknum + 1;


@@ -1651,12 +1597,12 @@ main (void)
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [],
 AT_BISON_OPTION_POPDEFS
 
 AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [],

-[glr-regr17.y: conflicts: 3 reduce/reduce
-])
+[[glr-regr17.y: warning: 3 reduce/reduce conflicts [-Wconflicts-rr]
+]])

 AT_COMPILE([glr-regr17])
 
 AT_PARSER_CHECK([[./glr-regr17]], 0, [],
 AT_COMPILE([glr-regr17])
 
 AT_PARSER_CHECK([[./glr-regr17]], 0, [],

-[1.1-2.3: syntax is ambiguous.
+[1.1-2.2: syntax is ambiguous

 ])
 
 AT_CLEANUP
 ])
 
 AT_CLEANUP


@@ -1675,7 +1621,7 @@ AT_DATA_GRAMMAR([glr-regr18.y],
 %{
   #include <stdlib.h>
   ]AT_YYERROR_DECLARE[
 %{
   #include <stdlib.h>
   ]AT_YYERROR_DECLARE[

-  static int yylex ();
+  ]AT_YYLEX_DECLARE[

 %}
 
 %union {
 %}
 
 %union {


@@ -1695,9 +1641,8 @@ sym3: %merge<merge> { $$ = 0; } ;
 %type <type3> sym3;
 
 %%
 %type <type3> sym3;
 
 %%

-

 ]AT_YYERROR_DEFINE[
 ]AT_YYERROR_DEFINE[

-]AT_YYLEX_DEFINE()[
+]AT_YYLEX_DEFINE[

 int
 main (void)
 {
 int
 main (void)
 {


@@ -1707,11 +1652,11 @@ main (void)
 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: result type clash on merge function 'merge': <type2> != <type1>
-glr-regr18.y:25.18-24: previous declaration
-glr-regr18.y:27.13-19: result type clash on merge function 'merge': <type3> != <type2>
-glr-regr18.y:26.18-24: previous declaration
-])
+[[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
+]])

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -1743,7 +1688,7 @@ start:
 b: 'b';
 d: /* nada.  */;
 %%
 b: 'b';
 d: /* nada.  */;
 %%

-]AT_YYLEX_DEFINE([abc])[
+]AT_YYLEX_DEFINE(["abc"])[

 ]AT_YYERROR_DEFINE[
 int
 main (void)
 ]AT_YYERROR_DEFINE[
 int
 main (void)


@@ -1755,8 +1700,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: conflicts: 1 reduce/reduce
-])
+[[input.y: warning: 1 reduce/reduce conflict [-Wconflicts-rr]
+]])

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