maint: run "make update-copyright"

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

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 23fda14adecd1c6539748313a589ea688e9a2586..dd24eb01757cf01b3264391735d4d883be27e895 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1,20 +1,19 @@
 # Checking GLR Parsing: Regression Tests           -*- Autotest -*-
 # Checking GLR Parsing: Regression Tests           -*- Autotest -*-

-# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002-2003, 2005-2007, 2009-2010 Free Software
+# Foundation, Inc.

 
 

-# This program is free software; you can redistribute it and/or modify
+# 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
 # it under the terms of the GNU General Public License as published by

-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#

 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.

-
+#

 # You should have received a copy of the GNU General Public License
 # You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.

 
 AT_BANNER([[GLR Regression Tests]])
 
 
 AT_BANNER([[GLR Regression Tests]])
 


@@ -30,6 +29,7 @@ AT_DATA_GRAMMAR([glr-regr1.y],
 
 %{
 #include <stdio.h>
 
 %{
 #include <stdio.h>

+#include <stdlib.h>

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


@@ -82,7 +82,10 @@ yylex (void)
 {
   for (;;)
     {
 {
   for (;;)
     {

-      int ch = getchar ();
+      int ch;
+      if (feof (stdin))
+       abort ();
+      ch = getchar ();

       if (ch == EOF)
        return 0;
       else if (ch == 'B' || ch == 'P')
       if (ch == EOF)
        return 0;
       else if (ch == 'B' || ch == 'P')


@@ -91,11 +94,11 @@ yylex (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr1.c glr-regr1.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr1.c glr-regr1.y]], 0, [],

 [glr-regr1.y: conflicts: 1 shift/reduce
 ])
 AT_COMPILE([glr-regr1])
 [glr-regr1.y: conflicts: 1 shift/reduce
 ])
 AT_COMPILE([glr-regr1])

-AT_CHECK([[echo BPBPB | ./glr-regr1]], 0,
+AT_PARSER_CHECK([[echo BPBPB | ./glr-regr1]], 0,

 [[E -> 'B'
 E -> 'B'
 E -> E 'P' E
 [[E -> 'B'
 E -> 'B'
 E -> E 'P' E


@@ -168,13 +171,15 @@ var_printer: 'v'
 
 %%
 
 
 %%
 

-FILE *input = NULL;
+FILE *input;

 
 int
 yylex (void)
 {
   char buf[50];
   char *s;
 
 int
 yylex (void)
 {
   char buf[50];
   char *s;

+  if (feof (stdin))
+    abort ();

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


@@ -207,18 +212,19 @@ main (int argc, char **argv)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr2a.c glr-regr2a.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr2a.c glr-regr2a.y]], 0, [],

 [glr-regr2a.y: conflicts: 2 shift/reduce
 ])
 AT_COMPILE([glr-regr2a])
 
 [glr-regr2a.y: conflicts: 2 shift/reduce
 ])
 AT_COMPILE([glr-regr2a])
 

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

 [[Variable: 'VARIABLE_1'
 ]], [])
 [[Variable: 'VARIABLE_1'
 ]], [])

-AT_CHECK([[echo s VARIABLE_1 , ANOTHER_VARIABLE_2 t e | ./glr-regr2a]], 0,
+AT_PARSER_CHECK([[echo s VARIABLE_1 , ANOTHER_VARIABLE_2 t e | ./glr-regr2a]],
+0,

 [[Varlist: 'VARIABLE_1,ANOTHER_VARIABLE_2'
 ]])
 [[Varlist: 'VARIABLE_1,ANOTHER_VARIABLE_2'
 ]])

-AT_CHECK([[echo s VARIABLE_3 t v x | ./glr-regr2a]], 0,
+AT_PARSER_CHECK([[echo s VARIABLE_3 t v x | ./glr-regr2a]], 0,

 [[Variable: 'VARIABLE_3'
 ]], [])
 
 [[Variable: 'VARIABLE_3'
 ]], [])
 


@@ -237,6 +243,7 @@ AT_DATA_GRAMMAR([glr-regr3.y],
 
 %{
 #include <stdio.h>
 
 %{
 #include <stdio.h>

+#include <stdlib.h>

 #include <stdarg.h>
 
 static int MergeRule (int x0, int x1);
 #include <stdarg.h>
 
 static int MergeRule (int x0, int x1);


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

+  if (feof (stdin))
+    abort ();

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


@@ -317,12 +326,13 @@ int main(int argc, char* argv[]) {
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr3.c glr-regr3.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr3.c glr-regr3.y]], 0, [],

 [glr-regr3.y: conflicts: 1 shift/reduce, 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr3])
 
 [glr-regr3.y: conflicts: 1 shift/reduce, 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr3])
 

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

 [[Result: 1c04
 ]], [])
 
 [[Result: 1c04
 ]], [])
 


@@ -350,6 +360,8 @@ AT_DATA_GRAMMAR([glr-regr4.y],
   static char *make_value (char const *, char const *);
   static void yyerror (char const *);
   static int yylex (void);
   static char *make_value (char const *, char const *);
   static void yyerror (char const *);
   static int yylex (void);

+  static char *ptrs[100];
+  static char **ptrs_next = ptrs;

 %}
 
 %%
 %}
 
 %%


@@ -375,21 +387,27 @@ B:  'a' { $$ = make_value ("B", "'a'");  } ;
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

-  static char const *input = "a";
-  return *input++;
+  static char const input[] = "a";
+  static size_t toknum;
+  if (! (toknum < sizeof input))
+    abort ();
+  return input[toknum++];

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

-  return yyparse ();
+  int status = yyparse ();
+  while (ptrs_next != ptrs)
+    free (*--ptrs_next);
+  return status;

 }
 
 static char *
 make_value (char const *parent, char const *child)
 {
   char const format[] = "%s <- %s";
 }
 
 static char *
 make_value (char const *parent, char const *child)
 {
   char const format[] = "%s <- %s";

-  char *value =
+  char *value = *ptrs_next++ =

     (char *) malloc (strlen (parent) + strlen (child) + sizeof format);
   sprintf (value, format, parent, child);
   return value;
     (char *) malloc (strlen (parent) + strlen (child) + sizeof format);
   sprintf (value, format, parent, child);
   return value;


@@ -399,7 +417,7 @@ static char *
 merge (YYSTYPE s1, YYSTYPE s2)
 {
   char const format[] = "merge{ %s and %s }";
 merge (YYSTYPE s1, YYSTYPE s2)
 {
   char const format[] = "merge{ %s and %s }";

-  char *value =
+  char *value = *ptrs_next++ =

     (char *) malloc (strlen (s1.ptr) + strlen (s2.ptr) + sizeof format);
   sprintf (value, format, s1.ptr, s2.ptr);
   return value;
     (char *) malloc (strlen (s1.ptr) + strlen (s2.ptr) + sizeof format);
   sprintf (value, format, s1.ptr, s2.ptr);
   return value;


@@ -412,12 +430,12 @@ yyerror (char const *msg)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr4.c glr-regr4.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr4.c glr-regr4.y]], 0, [],

 [glr-regr4.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr4])
 
 [glr-regr4.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr4])
 

-AT_CHECK([[./glr-regr4]], 0,
+AT_PARSER_CHECK([[./glr-regr4]], 0,

 [[merge{ S <- merge{ A <- A1 <- 'a' and A <- A2 <- 'a' } and S <- B <- 'a' }
 ]], [])
 
 [[merge{ S <- merge{ A <- A1 <- 'a' and A <- A2 <- 'a' } and S <- B <- 'a' }
 ]], [])
 


@@ -465,8 +483,11 @@ start:
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

-  static char const *input = "a";
-  return *input++;
+  static char const input[] = "a";
+  static size_t toknum;
+  if (! (toknum < sizeof input))
+    abort ();
+  return input[toknum++];

 }
 
 static void
 }
 
 static void


@@ -482,12 +503,12 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr5.c glr-regr5.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr5.c glr-regr5.y]], 0, [],

 [glr-regr5.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr5])
 
 [glr-regr5.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr5])
 

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

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


@@ -527,8 +548,11 @@ start: 'a' | 'a' ;
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

-  static char const *input = "a";
-  return *input++;
+  static char const input[] = "a";
+  static size_t toknum;
+  if (! (toknum < sizeof input))
+    abort ();
+  return input[toknum++];

 }
 
 static void
 }
 
 static void


@@ -544,12 +568,12 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr6.c glr-regr6.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr6.c glr-regr6.y]], 0, [],

 [glr-regr6.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr6])
 
 [glr-regr6.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr6])
 

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

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


@@ -573,14 +597,19 @@ AT_DATA_GRAMMAR([glr-regr7.y],
   static void yyerror (char const *);
   static int yylex (void);
   #define YYSTACKEXPANDABLE 0
   static void yyerror (char const *);
   static int yylex (void);
   #define YYSTACKEXPANDABLE 0

+  typedef struct count_node {
+    int count;
+    struct count_node *prev;
+  } count_node;
+  static count_node *tail;

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

-%union { int *count; }
-%type <count> 'a'
+%union { count_node *node; }
+%type <node> 'a'

 
 %destructor {
 
 %destructor {

-  if ((*$$)++)
+  if ($$->count++)

     fprintf (stderr, "Destructor called on same value twice.\n");
 } 'a'
 
     fprintf (stderr, "Destructor called on same value twice.\n");
 } 'a'
 


@@ -599,13 +628,15 @@ stack2: 'a' ;
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

-  yylval.count = (int *) malloc (sizeof (int));
-  if (!yylval.count)
+  yylval.node = (count_node*) malloc (sizeof *yylval.node);
+  if (!yylval.node)

     {
       fprintf (stderr, "Test inconclusive.\n");
       exit (EXIT_FAILURE);
     }
     {
       fprintf (stderr, "Test inconclusive.\n");
       exit (EXIT_FAILURE);
     }

-  *yylval.count = 0;
+  yylval.node->count = 0;
+  yylval.node->prev = tail;
+  tail = yylval.node;

   return 'a';
 }
 
   return 'a';
 }
 


@@ -618,16 +649,23 @@ yyerror (char const *msg)
 int
 main (void)
 {
 int
 main (void)
 {

-  return yyparse ();
+  int status = yyparse ();
+  while (tail)
+    {
+      count_node *prev = tail->prev;
+      free (tail);
+      tail = prev;
+    }
+  return status;

 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr7.c glr-regr7.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr7.c glr-regr7.y]], 0, [],

 [glr-regr7.y: conflicts: 2 reduce/reduce
 ])
 AT_COMPILE([glr-regr7])
 
 [glr-regr7.y: conflicts: 2 reduce/reduce
 ])
 AT_COMPILE([glr-regr7])
 

-AT_CHECK([[./glr-regr7]], 2, [],
+AT_PARSER_CHECK([[./glr-regr7]], 2, [],

 [memory exhausted
 ])
 
 [memory exhausted
 ])
 


@@ -697,6 +735,8 @@ int yylex (void)
   lexIndex += 1;
   switch (lexIndex)
     {
   lexIndex += 1;
   switch (lexIndex)
     {

+    default:
+      abort ();

     case 1:
       yylloc.first_column = 1;
       yylloc.last_column = 9;
     case 1:
       yylloc.first_column = 1;
       yylloc.last_column = 9;


@@ -705,7 +745,7 @@ int yylex (void)
       yylloc.first_column = 13;
       yylloc.last_column = 17;
       return T_PORT;
       yylloc.first_column = 13;
       yylloc.last_column = 17;
       return T_PORT;

-    default:
+    case 3:

       return 0;
     }
 }
       return 0;
     }
 }


@@ -718,12 +758,12 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr8.c glr-regr8.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr8.c glr-regr8.y]], 0, [],

 [glr-regr8.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr8])
 
 [glr-regr8.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr8])
 

-AT_CHECK([[./glr-regr8]], 0,
+AT_PARSER_CHECK([[./glr-regr8]], 0,

 [empty: 9/9
 1/9 - 9/9 - 13/17
 ],
 [empty: 9/9
 1/9 - 9/9 - 13/17
 ],


@@ -801,12 +841,12 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr9.c glr-regr9.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr9.c glr-regr9.y]], 0, [],

 [glr-regr9.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr9])
 
 [glr-regr9.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr9])
 

-AT_CHECK([[./glr-regr9]], 0, [],
+AT_PARSER_CHECK([[./glr-regr9]], 0, [],

 [memory exhausted
 ])
 
 [memory exhausted
 ])
 


@@ -822,6 +862,7 @@ AT_SETUP([Corrupted semantic options if user action cuts parse])
 AT_DATA_GRAMMAR([glr-regr10.y],
 [[
 %{
 AT_DATA_GRAMMAR([glr-regr10.y],
 [[
 %{

+# include <stdlib.h>

 # include <stdio.h>
   static void yyerror (char const *);
   static int yylex (void);
 # include <stdio.h>
   static void yyerror (char const *);
   static int yylex (void);


@@ -851,6 +892,9 @@ yyerror (char const *msg)
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

+  static int called;
+  if (called++)
+    abort ();

   return 0;
 }
 
   return 0;
 }
 


@@ -864,12 +908,12 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr10.c glr-regr10.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr10.c glr-regr10.y]], 0, [],

 [glr-regr10.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr10])
 
 [glr-regr10.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr10])
 

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

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -913,8 +957,11 @@ yyerror (char const *msg)
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

-  static char const *input = "a";
-  return *input++;
+  static char const input[] = "a";
+  static size_t toknum;
+  if (! (toknum < sizeof input))
+    abort ();
+  return input[toknum++];

 }
 
 int
 }
 
 int


@@ -930,12 +977,12 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr11.c glr-regr11.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr11.c glr-regr11.y]], 0, [],

 [glr-regr11.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr11])
 
 [glr-regr11.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr11])
 

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

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -1030,10 +1077,12 @@ static int
 yylex (void)
 {
   static int const input[] = { PARENT_RHS_AFTER, 0 };
 yylex (void)
 {
   static int const input[] = { PARENT_RHS_AFTER, 0 };

-  static const int *inputp = input;
-  if (*inputp == PARENT_RHS_AFTER)
+  static size_t toknum;
+  if (! (toknum < sizeof input / sizeof *input))
+    abort ();
+  if (input[toknum] == PARENT_RHS_AFTER)

     parent_rhs_after_value = 1;
     parent_rhs_after_value = 1;

-  return *inputp++;
+  return input[toknum++];

 }
 
 int
 }
 
 int


@@ -1059,12 +1108,12 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr12.c glr-regr12.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr12.c glr-regr12.y]], 0, [],

 [glr-regr12.y: conflicts: 1 shift/reduce, 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr12])
 
 [glr-regr12.y: conflicts: 1 shift/reduce, 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr12])
 

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

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -1149,12 +1198,14 @@ yyerror (char const *msg)
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

-  static char const *input = "ab";
-  static int i = 0;
+  static char const input[] = "ab";
+  static size_t toknum;
+  if (! (toknum < sizeof input))
+    abort ();

   yylloc.first_line = yylloc.last_line = 1;
   yylloc.first_line = yylloc.last_line = 1;

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

 }
 
 static void
 }
 
 static void


@@ -1186,10 +1237,10 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr13.c glr-regr13.y]], 0, [], [])
+AT_BISON_CHECK([[-o glr-regr13.c glr-regr13.y]], 0, [], [])

 AT_COMPILE([glr-regr13])
 
 AT_COMPILE([glr-regr13])
 

-AT_CHECK([[./glr-regr13]], 0,
+AT_PARSER_CHECK([[./glr-regr13]], 0,

 [defstate_init <- empty string:
   yychar=YYEMPTY
 nondefstate <- empty string:
 [defstate_init <- empty string:
   yychar=YYEMPTY
 nondefstate <- empty string:


@@ -1235,6 +1286,7 @@ AT_DATA_GRAMMAR([glr-regr14.y],
 %union { char value; }
 
 %{
 %union { char value; }
 
 %{

+  #include <stdlib.h>

   #include <stdio.h>
   static void yyerror (char const *);
   static int yylex (void);
   #include <stdio.h>
   static void yyerror (char const *);
   static int yylex (void);


@@ -1355,12 +1407,14 @@ yyerror (char const *msg)
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

-  static char const *input = "abcdddd";
-  static int i = 0;
+  static char const input[] = "abcdddd";
+  static size_t toknum;
+  if (! (toknum < sizeof input))
+    abort ();

   yylloc.first_line = yylloc.last_line = 1;
   yylloc.first_line = yylloc.last_line = 1;

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

 }
 
 static void
 }
 
 static void


@@ -1399,12 +1453,12 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr14.c glr-regr14.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr14.c glr-regr14.y]], 0, [],

 [glr-regr14.y: conflicts: 3 reduce/reduce
 ])
 AT_COMPILE([glr-regr14])
 
 [glr-regr14.y: conflicts: 3 reduce/reduce
 ])
 AT_COMPILE([glr-regr14])
 

-AT_CHECK([[./glr-regr14]], 0,
+AT_PARSER_CHECK([[./glr-regr14]], 0,

 [conflict <- empty string:
   yychar='a', yylval='A', yylloc=(1,1),(1,1)
 defstate_look <- empty string:
 [conflict <- empty string:
   yychar='a', yylval='A', yylloc=(1,1),(1,1)
 defstate_look <- empty string:


@@ -1484,6 +1538,9 @@ yyerror (char const *msg)
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

+  static int called;
+  if (called++)
+    abort ();

   return 0;
 }
 
   return 0;
 }
 


@@ -1500,12 +1557,12 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr15.c glr-regr15.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr15.c glr-regr15.y]], 0, [],

 [glr-regr15.y: conflicts: 2 reduce/reduce
 ])
 AT_COMPILE([glr-regr15])
 
 [glr-regr15.y: conflicts: 2 reduce/reduce
 ])
 AT_COMPILE([glr-regr15])
 

-AT_CHECK([[./glr-regr15]], 0, [],
+AT_PARSER_CHECK([[./glr-regr15]], 0, [],

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


@@ -1547,10 +1604,13 @@ yyerror (char const *msg)
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

-  static char const *input = "ab";
-  if (*input == 'b')
+  static char const input[] = "ab";
+  static size_t toknum;
+  if (! (toknum < sizeof input))
+    abort ();
+  if (input[toknum] == 'b')

     lookahead_value = 1;
     lookahead_value = 1;

-  return *input++;
+  return input[toknum++];

 }
 
 int
 }
 
 int


@@ -1566,12 +1626,12 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr16.c glr-regr16.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr16.c glr-regr16.y]], 0, [],

 [glr-regr16.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr16])
 
 [glr-regr16.y: conflicts: 1 reduce/reduce
 ])
 AT_COMPILE([glr-regr16])
 

-AT_CHECK([[./glr-regr16]], 0, [],
+AT_PARSER_CHECK([[./glr-regr16]], 0, [],

 [syntax error
 ])
 
 [syntax error
 ])
 


@@ -1587,7 +1647,7 @@ AT_DATA_GRAMMAR([glr-regr17.y],
 [[
 %glr-parser
 %locations
 [[
 %glr-parser
 %locations

-%pure-parser
+%define api.pure

 %error-verbose
 
 %union { int dummy; }
 %error-verbose
 
 %union { int dummy; }


@@ -1636,12 +1696,14 @@ static int
 yylex (YYSTYPE *lvalp, YYLTYPE *llocp)
 {
   static char const input[] = "ab";
 yylex (YYSTYPE *lvalp, YYLTYPE *llocp)
 {
   static char const input[] = "ab";

-  static char const *inputp = input;
+  static size_t toknum;
+  if (! (toknum < sizeof input))
+    abort ();

   lvalp->dummy = 0;
   llocp->first_line = llocp->last_line = 2;
   lvalp->dummy = 0;
   llocp->first_line = llocp->last_line = 2;

-  llocp->first_column = inputp - input + 1;
+  llocp->first_column = toknum + 1;

   llocp->last_column = llocp->first_column + 1;
   llocp->last_column = llocp->first_column + 1;

-  return *inputp++;
+  return input[toknum++];

 }
 
 int
 }
 
 int


@@ -1651,12 +1713,12 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr17.c glr-regr17.y]], 0, [],
+AT_BISON_CHECK([[-o glr-regr17.c glr-regr17.y]], 0, [],

 [glr-regr17.y: conflicts: 3 reduce/reduce
 ])
 AT_COMPILE([glr-regr17])
 
 [glr-regr17.y: conflicts: 3 reduce/reduce
 ])
 AT_COMPILE([glr-regr17])
 

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

 [Error at 1.1-2.3: syntax is ambiguous.
 ])
 
 [Error at 1.1-2.3: syntax is ambiguous.
 ])
 


@@ -1672,6 +1734,7 @@ AT_DATA_GRAMMAR([glr-regr18.y],
 [[%glr-parser
 
 %{
 [[%glr-parser
 
 %{

+  #include <stdlib.h>

   static void yyerror (char const *);
   static int yylex ();
 %}
   static void yyerror (char const *);
   static int yylex ();
 %}


@@ -1703,6 +1766,9 @@ yyerror (char const *msg)
 static int
 yylex ()
 {
 static int
 yylex ()
 {

+  static int called;
+  if (called++)
+    abort ();

   return 0;
 }
 
   return 0;
 }
 


@@ -1713,11 +1779,11 @@ main (void)
 }
 ]])
 
 }
 ]])
 

-AT_CHECK([[bison -o glr-regr18.c glr-regr18.y]], 0, [],
-[glr-regr18.y:27.18-24: warning: result type clash on merge function `merge': <type2> != <type1>
-glr-regr18.y:26.18-24: warning: previous declaration
-glr-regr18.y:28.13-19: warning: result type clash on merge function `merge': <type3> != <type2>
-glr-regr18.y:27.18-24: warning: previous declaration
+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

 ])
 
 AT_CLEANUP
 ])
 
 AT_CLEANUP