tests: AT_YYERROR_DEFINE: prepare for list of ints.

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

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 9e68a0f70fea94796aadd24168bdc2ee414896ad..f06417793aebe3542697fe0539d387841c5a4f11 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1,6 +1,6 @@
 # Checking GLR Parsing: Regression Tests           -*- Autotest -*-
 
 # Checking GLR Parsing: Regression Tests           -*- Autotest -*-
 

-# Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software
+# Copyright (C) 2002-2003, 2005-2007, 2009-2012 Free Software

 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify


@@ -24,6 +24,7 @@ AT_BANNER([[GLR Regression Tests]])
 
 AT_SETUP([Badly Collapsed GLR States])
 
 
 AT_SETUP([Badly Collapsed GLR States])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr1.y],
 [[/* Regression Test: Improper state compression */
 /* Reported by Scott McPeak */
 AT_DATA_GRAMMAR([glr-regr1.y],
 [[/* Regression Test: Improper state compression */
 /* Reported by Scott McPeak */


@@ -31,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);

-int yylex (void);
-void yyerror (char const *msg);
+]AT_YYERROR_DECLARE[
+]AT_YYLEX_DECLARE[

 %}
 
 
 %}
 
 


@@ -71,12 +73,7 @@ main (void)
   return yyparse ();
 }
 
   return yyparse ();
 }
 

-void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[

 
 int
 yylex (void)
 
 int
 yylex (void)


@@ -84,8 +81,7 @@ yylex (void)
   for (;;)
     {
       int ch;
   for (;;)
     {
       int ch;

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

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


@@ -94,6 +90,7 @@ yylex (void)
     }
 }
 ]])
     }
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr1.c glr-regr1.y]], 0, [],
 [glr-regr1.y: conflicts: 1 shift/reduce
 
 AT_BISON_CHECK([[-o glr-regr1.c glr-regr1.y]], 0, [],
 [glr-regr1.y: conflicts: 1 shift/reduce


@@ -119,6 +116,7 @@ AT_CLEANUP
 
 AT_SETUP([Improper handling of embedded actions and dollar(-N) in GLR parsers])
 
 
 AT_SETUP([Improper handling of embedded actions and dollar(-N) in GLR parsers])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr2a.y],
 [[/* Regression Test: Improper handling of embedded actions and $-N  */
 /* Reported by S. Eken */
 AT_DATA_GRAMMAR([glr-regr2a.y],
 [[/* Regression Test: Improper handling of embedded actions and $-N  */
 /* Reported by S. Eken */


@@ -130,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>

-  int yylex (void);
-  void yyerror (char const *);
+  #include <assert.h>
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[

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


@@ -171,7 +170,7 @@ var_printer: 'v'
    { printf ("Variable: '%s'\n", $-1); }
 
 %%
    { printf ("Variable: '%s'\n", $-1); }
 
 %%

-
+]AT_YYERROR_DEFINE[

 FILE *input;
 
 int
 FILE *input;
 
 int


@@ -179,9 +178,9 @@ yylex (void)
 {
   char buf[50];
   char *s;
 {
   char buf[50];
   char *s;

-  if (feof (stdin))
-    abort ();
-  switch (fscanf (input, " %1[a-z,]", buf)) {
+  assert (!feof (stdin));
+  switch (fscanf (input, " %1[a-z,]", buf))
+  {

   case 1:
     return buf[0];
   case EOF:
   case 1:
     return buf[0];
   case EOF:


@@ -191,19 +190,13 @@ 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;
   return 'V';
 }
 
   s = (char *) malloc (strlen (buf) + 1);
   strcpy (s, buf);
   yylval = s;
   return 'V';
 }
 

-void
-yyerror (char const *s)
-{ printf ("%s\n", s);
-}
-

 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {


@@ -212,6 +205,7 @@ main (int argc, char **argv)
   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr2a.c glr-regr2a.y]], 0, [],
 [glr-regr2a.y: conflicts: 2 shift/reduce
 
 AT_BISON_CHECK([[-o glr-regr2a.c glr-regr2a.y]], 0, [],
 [glr-regr2a.y: conflicts: 2 shift/reduce


@@ -238,6 +232,7 @@ AT_CLEANUP
 
 AT_SETUP([Improper merging of GLR delayed action sets])
 
 
 AT_SETUP([Improper merging of GLR delayed action sets])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr3.y],
 [[/* Regression Test: Improper merging of GLR delayed action sets.  */
 /* Reported by M. Rosien */
 AT_DATA_GRAMMAR([glr-regr3.y],
 [[/* Regression Test: Improper merging of GLR delayed action sets.  */
 /* Reported by M. Rosien */


@@ -246,10 +241,11 @@ 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);
 
 static int MergeRule (int x0, int x1);

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

 
 #define RULE(x) (1 << (x))
 
 
 #define RULE(x) (1 << (x))
 


@@ -290,15 +286,14 @@ NT6 : P1 NT1 O1 T3 P2  { $$ = RULE(11) | $2; } %merge<MergeRule>
 
 %%
 
 
 %%
 

-static int MergeRule (int x0, int x1) {
+static int
+MergeRule (int x0, int x1)
+{

   return x0 | x1;
 }
   return x0 | x1;
 }

+]AT_YYERROR_DEFINE[

 
 

-static void yyerror(char const * s) {
-  fprintf(stderr,"error: %s\n",s);
-}
-
-FILE *input = NULL;
+FILE *input = YY_NULL;

 
 int P[] = { P1, P2 };
 int O[] = { O1, O2 };
 
 int P[] = { P1, P2 };
 int O[] = { O1, O2 };


@@ -307,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])


@@ -320,12 +314,15 @@ int yylex (void)
   return BAD_CHAR;
 }
 
   return BAD_CHAR;
 }
 

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

   input = stdin;
   if (argc == 2 && !(input = fopen (argv[1], "r"))) return 3;
   return yyparse ();
 }
 ]])
   input = stdin;
   if (argc == 2 && !(input = fopen (argv[1], "r"))) return 3;
   return yyparse ();
 }
 ]])

+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
 
 AT_BISON_CHECK([[-o glr-regr3.c glr-regr3.y]], 0, [],
 [glr-regr3.y: conflicts: 1 shift/reduce, 1 reduce/reduce


@@ -347,6 +344,7 @@ AT_CLEANUP
 
 AT_SETUP([Duplicate representation of merged trees])
 
 
 AT_SETUP([Duplicate representation of merged trees])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr4.y],
 [[
 %union { char *ptr; }
 AT_DATA_GRAMMAR([glr-regr4.y],
 [[
 %union { char *ptr; }


@@ -359,8 +357,8 @@ AT_DATA_GRAMMAR([glr-regr4.y],
   #include <string.h>
   static char *merge (YYSTYPE, YYSTYPE);
   static char *make_value (char const *, char const *);
   #include <string.h>
   static char *merge (YYSTYPE, YYSTYPE);
   static char *make_value (char const *, char const *);

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

   static char *ptrs[100];
   static char **ptrs_next = ptrs;
 %}
   static char *ptrs[100];
   static char **ptrs_next = ptrs;
 %}


@@ -384,16 +382,8 @@ A2: 'a' { $$ = make_value ("A2", "'a'"); } ;
 B:  'a' { $$ = make_value ("B", "'a'");  } ;
 
 %%
 B:  'a' { $$ = make_value ("B", "'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_YYLEX_DEFINE(["a"])[

 
 int
 main (void)
 
 int
 main (void)


@@ -423,13 +413,8 @@ merge (YYSTYPE s1, YYSTYPE s2)
   sprintf (value, format, s1.ptr, s2.ptr);
   return value;
 }
   sprintf (value, format, s1.ptr, s2.ptr);
   return value;
 }

-
-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}

 ]])
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr4.c glr-regr4.y]], 0, [],
 [glr-regr4.y: conflicts: 1 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr4.c glr-regr4.y]], 0, [],
 [glr-regr4.y: conflicts: 1 reduce/reduce


@@ -450,13 +435,14 @@ AT_CLEANUP
 
 AT_SETUP([User destructor for unresolved GLR semantic value])
 
 
 AT_SETUP([User destructor for unresolved GLR semantic value])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr5.y],
 [[
 %{
   #include <stdio.h>
   #include <stdlib.h>
 AT_DATA_GRAMMAR([glr-regr5.y],
 [[
 %{
   #include <stdio.h>
   #include <stdlib.h>

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

   enum { MAGIC_VALUE = -1057808125 }; /* originally chosen at random */
 %}
 
   enum { MAGIC_VALUE = -1057808125 }; /* originally chosen at random */
 %}
 


@@ -480,29 +466,15 @@ start:
    ;
 
 %%
    ;
 
 %%

-
-static int
-yylex (void)
-{
-  static char const input[] = "a";
-  static size_t toknum;
-  if (! (toknum < sizeof input))
-    abort ();
-  return input[toknum++];
-}
-
-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYLEX_DEFINE(["a"])[
+]AT_YYERROR_DEFINE[

 int
 main (void)
 {
   return yyparse () != 1;
 }
 ]])
 int
 main (void)
 {
   return yyparse () != 1;
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr5.c glr-regr5.y]], 0, [],
 [glr-regr5.y: conflicts: 1 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr5.c glr-regr5.y]], 0, [],
 [glr-regr5.y: conflicts: 1 reduce/reduce


@@ -523,13 +495,14 @@ AT_CLEANUP
 
 AT_SETUP([User destructor after an error during a split parse])
 
 
 AT_SETUP([User destructor after an error during a split parse])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr6.y],
 [[
 %{
   #include <stdio.h>
   #include <stdlib.h>
 AT_DATA_GRAMMAR([glr-regr6.y],
 [[
 %{
   #include <stdio.h>
   #include <stdlib.h>

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

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


@@ -545,29 +518,15 @@ 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++];
-}
-
-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE(["a"])[

 int
 main (void)
 {
   return yyparse () != 1;
 }
 ]])
 int
 main (void)
 {
   return yyparse () != 1;
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr6.c glr-regr6.y]], 0, [],
 [glr-regr6.y: conflicts: 1 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr6.c glr-regr6.y]], 0, [],
 [glr-regr6.y: conflicts: 1 reduce/reduce


@@ -590,13 +549,14 @@ AT_CLEANUP
 
 AT_SETUP([Duplicated user destructor for lookahead])
 
 
 AT_SETUP([Duplicated user destructor for lookahead])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr7.y],
 [[
 %{
   #include <stdio.h>
   #include <stdlib.h>
 AT_DATA_GRAMMAR([glr-regr7.y],
 [[
 %{
   #include <stdio.h>
   #include <stdlib.h>

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

   #define YYSTACKEXPANDABLE 0
   typedef struct count_node {
     int count;
   #define YYSTACKEXPANDABLE 0
   typedef struct count_node {
     int count;


@@ -641,12 +601,7 @@ yylex (void)
   return 'a';
 }
 
   return 'a';
 }
 

-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[

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


@@ -660,6 +615,7 @@ main (void)
   return status;
 }
 ]])
   return status;
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr7.c glr-regr7.y]], 0, [],
 [glr-regr7.y: conflicts: 2 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr7.c glr-regr7.y]], 0, [],
 [glr-regr7.y: conflicts: 2 reduce/reduce


@@ -682,14 +638,14 @@ AT_CLEANUP
 
 AT_SETUP([Incorrectly initialized location for empty right-hand side in GLR])
 
 
 AT_SETUP([Incorrectly initialized location for empty right-hand side in GLR])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr8.y],
 [[
 %{
   #include <stdio.h>
   #include <stdlib.h>
 AT_DATA_GRAMMAR([glr-regr8.y],
 [[
 %{
   #include <stdio.h>
   #include <stdlib.h>

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

 %}
 
 %token T_CONSTANT
 %}
 
 %token T_CONSTANT


@@ -723,12 +679,7 @@ OptSignalWord      : /* empty */
 
 %%
 
 
 %%
 

-void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[

 static int lexIndex;
 
 int yylex (void)
 static int lexIndex;
 
 int yylex (void)


@@ -758,6 +709,7 @@ main (void)
   return 0;
 }
 ]])
   return 0;
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr8.c glr-regr8.y]], 0, [],
 [glr-regr8.y: conflicts: 1 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr8.c glr-regr8.y]], 0, [],
 [glr-regr8.y: conflicts: 1 reduce/reduce


@@ -780,13 +732,14 @@ AT_CLEANUP
 
 AT_SETUP([No users destructors if stack 0 deleted])
 
 
 AT_SETUP([No users destructors if stack 0 deleted])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr9.y],
 [[
 %{
 # include <stdio.h>
 # include <stdlib.h>
 AT_DATA_GRAMMAR([glr-regr9.y],
 [[
 %{
 # include <stdio.h>
 # include <stdlib.h>

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

 # define YYSTACKEXPANDABLE 0
   static int tokens = 0;
   static int destructors = 0;
 # define YYSTACKEXPANDABLE 0
   static int tokens = 0;
   static int destructors = 0;


@@ -822,12 +775,7 @@ yylex (void)
   return 'a';
 }
 
   return 'a';
 }
 

-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[

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


@@ -841,6 +789,7 @@ main (void)
   return !exit_status;
 }
 ]])
   return !exit_status;
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr9.c glr-regr9.y]], 0, [],
 [glr-regr9.y: conflicts: 1 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr9.c glr-regr9.y]], 0, [],
 [glr-regr9.y: conflicts: 1 reduce/reduce


@@ -860,13 +809,14 @@ AT_CLEANUP
 
 AT_SETUP([Corrupted semantic options if user action cuts parse])
 
 
 AT_SETUP([Corrupted semantic options if user action cuts parse])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr10.y],
 [[
 %{
 # include <stdlib.h>
 # include <stdio.h>
 AT_DATA_GRAMMAR([glr-regr10.y],
 [[
 %{
 # include <stdlib.h>
 # include <stdio.h>

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

   #define GARBAGE_SIZE 50
   static char garbage[GARBAGE_SIZE];
 %}
   #define GARBAGE_SIZE 50
   static char garbage[GARBAGE_SIZE];
 %}


@@ -883,21 +833,8 @@ start:
   ;
 
 %%
   ;
 
 %%

-
-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
-static int
-yylex (void)
-{
-  static int called;
-  if (called++)
-    abort ();
-  return 0;
-}
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE[

 
 int
 main (void)
 
 int
 main (void)


@@ -908,6 +845,7 @@ main (void)
   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr10.c glr-regr10.y]], 0, [],
 [glr-regr10.y: conflicts: 1 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr10.c glr-regr10.y]], 0, [],
 [glr-regr10.y: conflicts: 1 reduce/reduce


@@ -925,12 +863,13 @@ AT_CLEANUP
 
 AT_SETUP([Undesirable destructors if user action cuts parse])
 
 
 AT_SETUP([Undesirable destructors if user action cuts parse])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr11.y],
 [[
 %{
 # include <stdlib.h>
 AT_DATA_GRAMMAR([glr-regr11.y],
 [[
 %{
 # include <stdlib.h>

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

   static int destructors = 0;
 # define USE(val)
 %}
   static int destructors = 0;
 # define USE(val)
 %}


@@ -949,21 +888,8 @@ start:
 
 %%
 
 
 %%
 

-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
-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_YYLEX_DEFINE(["a"])[

 
 int
 main (void)
 
 int
 main (void)


@@ -977,6 +903,7 @@ main (void)
   return exit_status;
 }
 ]])
   return exit_status;
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr11.c glr-regr11.y]], 0, [],
 [glr-regr11.y: conflicts: 1 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr11.c glr-regr11.y]], 0, [],
 [glr-regr11.y: conflicts: 1 reduce/reduce


@@ -994,6 +921,7 @@ AT_CLEANUP
 
 AT_SETUP([Leaked semantic values if user action cuts parse])
 
 
 AT_SETUP([Leaked semantic values if user action cuts parse])
 

+AT_BISON_OPTION_PUSHDEFS

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


@@ -1006,9 +934,10 @@ AT_DATA_GRAMMAR([glr-regr12.y],
 
 %{
 # include <stdlib.h>
 
 %{
 # include <stdlib.h>

+# include <assert.h>

   static int merge (YYSTYPE, YYSTYPE);
   static int merge (YYSTYPE, YYSTYPE);

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

   static int parent_rhs_before_value = 0;
   static int merged_value = 0;
   static int parent_rhs_after_value = 0;
   static int parent_rhs_before_value = 0;
   static int merged_value = 0;
   static int parent_rhs_after_value = 0;


@@ -1068,19 +997,13 @@ merge (YYSTYPE s1, YYSTYPE s2)
   return dummy;
 }
 
   return dummy;
 }
 

-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[

 static int
 yylex (void)
 {
   static int const input[] = { PARENT_RHS_AFTER, 0 };
   static size_t toknum;
 static int
 yylex (void)
 {
   static int const input[] = { PARENT_RHS_AFTER, 0 };
   static size_t toknum;

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

   if (input[toknum] == PARENT_RHS_AFTER)
     parent_rhs_after_value = 1;
   return input[toknum++];
   if (input[toknum] == PARENT_RHS_AFTER)
     parent_rhs_after_value = 1;
   return input[toknum++];


@@ -1108,6 +1031,7 @@ main (void)
   return exit_status;
 }
 ]])
   return exit_status;
 }
 ]])

+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
 
 AT_BISON_CHECK([[-o glr-regr12.c glr-regr12.y]], 0, [],
 [glr-regr12.y: conflicts: 1 shift/reduce, 1 reduce/reduce


@@ -1127,6 +1051,7 @@ AT_CLEANUP
 
 AT_SETUP([Incorrect lookahead during deterministic GLR])
 
 
 AT_SETUP([Incorrect lookahead during deterministic GLR])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr13.y],
 [[
 /* Tests:
 AT_DATA_GRAMMAR([glr-regr13.y],
 [[
 /* Tests:


@@ -1138,8 +1063,9 @@ AT_DATA_GRAMMAR([glr-regr13.y],
 
 %{
   #include <stdio.h>
 
 %{
   #include <stdio.h>

-  static void yyerror (char const *);
-  static int yylex (void);
+  #include <assert.h>
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[

   static void print_lookahead (char const *);
   #define USE(value)
 %}
   static void print_lookahead (char const *);
   #define USE(value)
 %}


@@ -1190,19 +1116,13 @@ change_lookahead:
 
 %%
 
 
 %%
 

-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[

 static int
 yylex (void)
 {
   static char const input[] = "ab";
   static size_t toknum;
 static int
 yylex (void)
 {
   static char const input[] = "ab";
   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';


@@ -1237,6 +1157,7 @@ main (void)
   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr13.c glr-regr13.y]], 0, [], [])
 AT_COMPILE([glr-regr13])
 
 AT_BISON_CHECK([[-o glr-regr13.c glr-regr13.y]], 0, [], [])
 AT_COMPILE([glr-regr13])


@@ -1263,6 +1184,7 @@ AT_CLEANUP
 
 AT_SETUP([Incorrect lookahead during nondeterministic GLR])
 
 
 AT_SETUP([Incorrect lookahead during nondeterministic GLR])
 

+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr14.y],
 [[
 /* Tests:
 AT_DATA_GRAMMAR([glr-regr14.y],
 [[
 /* Tests:


@@ -1289,8 +1211,9 @@ AT_DATA_GRAMMAR([glr-regr14.y],
 %{
   #include <stdlib.h>
   #include <stdio.h>
 %{
   #include <stdlib.h>
   #include <stdio.h>

-  static void yyerror (char const *);
-  static int yylex (void);
+  #include <assert.h>
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[

   static void print_lookahead (char const *);
   static char merge (union YYSTYPE, union YYSTYPE);
   #define USE(value)
   static void print_lookahead (char const *);
   static char merge (union YYSTYPE, union YYSTYPE);
   #define USE(value)


@@ -1399,19 +1322,13 @@ no_look:
 
 %%
 
 
 %%
 

-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[

 static int
 yylex (void)
 {
   static char const input[] = "abcdddd";
   static size_t toknum;
 static int
 yylex (void)
 {
   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';


@@ -1453,6 +1370,7 @@ main (void)
   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr14.c glr-regr14.y]], 0, [],
 [glr-regr14.y: conflicts: 3 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr14.c glr-regr14.y]], 0, [],
 [glr-regr14.y: conflicts: 3 reduce/reduce


@@ -1483,6 +1401,7 @@ AT_CLEANUP
 
 AT_SETUP([Leaked semantic values when reporting ambiguity])
 
 
 AT_SETUP([Leaked semantic values when reporting ambiguity])
 

+AT_BISON_OPTION_PUSHDEFS

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


@@ -1490,8 +1409,8 @@ AT_DATA_GRAMMAR([glr-regr15.y],
 
 %{
 # include <stdlib.h>
 
 %{
 # include <stdlib.h>

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

   static int parent_rhs_before_value = 0;
 # define USE(val)
 %}
   static int parent_rhs_before_value = 0;
 # define USE(val)
 %}


@@ -1529,21 +1448,8 @@ ambiguity1: ;
 ambiguity2: ;
 
 %%
 ambiguity2: ;
 
 %%

-
-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
-static int
-yylex (void)
-{
-  static int called;
-  if (called++)
-    abort ();
-  return 0;
-}
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE[

 
 int
 main (void)
 
 int
 main (void)


@@ -1557,6 +1463,7 @@ main (void)
   return exit_status;
 }
 ]])
   return exit_status;
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr15.c glr-regr15.y]], 0, [],
 [glr-regr15.y: conflicts: 2 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr15.c glr-regr15.y]], 0, [],
 [glr-regr15.y: conflicts: 2 reduce/reduce


@@ -1575,6 +1482,8 @@ AT_CLEANUP
 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Leaked lookahead after nondeterministic parse syntax error])
 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Leaked lookahead after nondeterministic parse syntax error])

+
+AT_BISON_OPTION_PUSHDEFS

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


@@ -1582,8 +1491,9 @@ AT_DATA_GRAMMAR([glr-regr16.y],
 
 %{
 # include <stdlib.h>
 
 %{
 # include <stdlib.h>

-  static void yyerror (char const *);
-  static int yylex (void);
+# include <assert.h>
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[

   static int lookahead_value = 0;
 # define USE(val)
 %}
   static int lookahead_value = 0;
 # define USE(val)
 %}


@@ -1596,19 +1506,13 @@ alt2: ;
 
 %%
 
 
 %%
 

-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
+]AT_YYERROR_DEFINE[

 static int
 yylex (void)
 {
   static char const input[] = "ab";
   static size_t toknum;
 static int
 yylex (void)
 {
   static char const input[] = "ab";
   static size_t toknum;

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

   if (input[toknum] == 'b')
     lookahead_value = 1;
   return input[toknum++];
   if (input[toknum] == 'b')
     lookahead_value = 1;
   return input[toknum++];


@@ -1626,6 +1530,7 @@ main (void)
   return exit_status;
 }
 ]])
   return exit_status;
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr16.c glr-regr16.y]], 0, [],
 [glr-regr16.y: conflicts: 1 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr16.c glr-regr16.y]], 0, [],
 [glr-regr16.y: conflicts: 1 reduce/reduce


@@ -1644,6 +1549,9 @@ AT_CLEANUP
 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Uninitialized location when reporting ambiguity])
 ## ------------------------------------------------------------------------- ##
 
 AT_SETUP([Uninitialized location when reporting ambiguity])

+
+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


@@ -1654,8 +1562,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 {


@@ -1685,21 +1593,15 @@ empty1: ;
 empty2: ;
 
 %%
 empty2: ;
 
 %%

+# include <assert.h>

 
 

-static void
-yyerror (YYLTYPE *locp, char const *msg)
-{
-  fprintf (stderr, "Error at %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;


@@ -1713,6 +1615,7 @@ main (void)
   return yyparse () != 1;
 }
 ]])
   return yyparse () != 1;
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [],
 [glr-regr17.y: conflicts: 3 reduce/reduce
 
 AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [],
 [glr-regr17.y: conflicts: 3 reduce/reduce


@@ -1720,7 +1623,7 @@ AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [],
 AT_COMPILE([glr-regr17])
 
 AT_PARSER_CHECK([[./glr-regr17]], 0, [],
 AT_COMPILE([glr-regr17])
 
 AT_PARSER_CHECK([[./glr-regr17]], 0, [],

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

 ])
 
 AT_CLEANUP
 ])
 
 AT_CLEANUP


@@ -1731,13 +1634,15 @@ AT_CLEANUP
 ## -------------------------------------------------------------##
 
 AT_SETUP([Missed %merge type warnings when LHS type is declared later])
 ## -------------------------------------------------------------##
 
 AT_SETUP([Missed %merge type warnings when LHS type is declared later])

+
+AT_BISON_OPTION_PUSHDEFS

 AT_DATA_GRAMMAR([glr-regr18.y],
 [[%glr-parser
 
 %{
   #include <stdlib.h>
 AT_DATA_GRAMMAR([glr-regr18.y],
 [[%glr-parser
 
 %{
   #include <stdlib.h>

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

 %}
 
 %union {
 %}
 
 %union {


@@ -1757,34 +1662,125 @@ sym3: %merge<merge> { $$ = 0; } ;
 %type <type3> sym3;
 
 %%
 %type <type3> sym3;
 
 %%

-
-static void
-yyerror (char const *msg)
-{
-  fprintf (stderr, "%s\n", msg);
-}
-
-static int
-yylex ()
-{
-  static int called;
-  if (called++)
-    abort ();
-  return 0;
-}
-
+]AT_YYERROR_DEFINE[
+]AT_YYLEX_DEFINE[

 int
 main (void)
 {
   return yyparse ();
 }
 ]])
 int
 main (void)
 {
   return yyparse ();
 }
 ]])

+AT_BISON_OPTION_POPDEFS

 
 AT_BISON_CHECK([[-o glr-regr18.c glr-regr18.y]], 1, [],
 
 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:26.18-24: result type clash on merge function 'merge': <type2> != <type1>

 glr-regr18.y:25.18-24: previous declaration
 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:27.13-19: result type clash on merge function 'merge': <type3> != <type2>

 glr-regr18.y:26.18-24: previous declaration
 ])
 
 AT_CLEANUP
 glr-regr18.y:26.18-24: previous declaration
 ])
 
 AT_CLEANUP

+
+
+## ------------------- ##
+## Ambiguity reports.  ##
+## ------------------- ##
+
+AT_SETUP([Ambiguity reports])
+
+AT_BISON_OPTION_PUSHDEFS
+AT_DATA_GRAMMAR([input.y],
+[[
+%{
+  #include <stdio.h>
+  #include <stdlib.h>
+  ]AT_YYERROR_DECLARE[
+  ]AT_YYLEX_DECLARE[
+%}
+
+%debug
+%glr-parser
+
+%%
+start:
+  'a' b 'c' d
+| 'a' b 'c' d
+;
+b: 'b';
+d: /* nada.  */;
+%%
+]AT_YYLEX_DEFINE(["abc"])[
+]AT_YYERROR_DEFINE[
+int
+main (void)
+{
+  yydebug = 1;
+  return !!yyparse ();
+}
+]])
+AT_BISON_OPTION_POPDEFS
+
+AT_BISON_CHECK([[-o input.c input.y]], 0, [],
+[input.y: conflicts: 1 reduce/reduce
+])
+AT_COMPILE([input])
+
+AT_PARSER_CHECK([[./input]], 1, [],
+[Starting parse
+Entering state 0
+Reading a token: Next token is token 'a' ()
+Shifting token 'a' ()
+Entering state 1
+Reading a token: Next token is token 'b' ()
+Shifting token 'b' ()
+Entering state 3
+Reducing stack 0 by rule 3 (line 25):
+   $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):
+-> $$ = nterm d ()
+Entering state 7
+Reading a token: Now at end of input.
+Stack 0 Entering state 7
+Now at end of input.
+Splitting off stack 1 from 0.
+Reduced stack 1 by rule #2; action deferred.  Now in state 2.
+Stack 1 Entering state 2
+Now at end of input.
+Reduced stack 0 by rule #1; action deferred.  Now in state 2.
+Merging stack 0 into stack 1.
+Stack 1 Entering state 2
+Now at end of input.
+Removing dead stacks.
+Rename stack 1 -> 0.
+On stack 0, shifting token $end ()
+Stack 0 now in state #5
+Ambiguity detected.
+Option 1,
+  start -> <Rule 1, tokens 1 .. 3>
+    'a' <tokens 1 .. 1>
+    b <tokens 2 .. 2>
+    'c' <tokens 3 .. 3>
+    d <empty>
+
+Option 2,
+  start -> <Rule 2, tokens 1 .. 3>
+    'a' <tokens 1 .. 1>
+    b <tokens 2 .. 2>
+    'c' <tokens 3 .. 3>
+    d <empty>
+
+syntax is ambiguous
+Cleanup: popping token $end ()
+Cleanup: popping unresolved nterm start ()
+Cleanup: popping nterm d ()
+Cleanup: popping token 'c' ()
+Cleanup: popping nterm b ()
+Cleanup: popping token 'a' ()
+])
+
+AT_CLEANUP