If conflict resolution makes states unreachable, remove those states,

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

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index 9e3cec79df4c4dd413862bc548faa12d235ac5b6..178d72bc2d5fe75b8c059da837c2addaa0107391 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -1,5 +1,5 @@
 # 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, 2006, 2007 Free Software Foundation, Inc.

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


@@ -30,6 +30,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 +83,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')


@@ -95,7 +99,7 @@ AT_CHECK([[bison -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 +172,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];


@@ -212,13 +218,14 @@ AT_CHECK([[bison -o glr-regr2a.c glr-regr2a.y]], 0, [],
 ])
 AT_COMPILE([glr-regr2a])
 
 ])
 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 +244,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 +307,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])


@@ -322,7 +332,8 @@ AT_CHECK([[bison -o glr-regr3.c glr-regr3.y]], 0, [],
 ])
 AT_COMPILE([glr-regr3])
 
 ])
 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 +361,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 +388,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 +418,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;


@@ -417,7 +436,7 @@ AT_CHECK([[bison -o glr-regr4.c glr-regr4.y]], 0, [],
 ])
 AT_COMPILE([glr-regr4])
 
 ])
 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 +484,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


@@ -487,7 +509,7 @@ AT_CHECK([[bison -o glr-regr5.c glr-regr5.y]], 0, [],
 ])
 AT_COMPILE([glr-regr5])
 
 ])
 AT_COMPILE([glr-regr5])
 

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

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


@@ -527,8 +549,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


@@ -549,7 +574,7 @@ AT_CHECK([[bison -o glr-regr6.c glr-regr6.y]], 0, [],
 ])
 AT_COMPILE([glr-regr6])
 
 ])
 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 +598,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 +629,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,7 +650,14 @@ 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;

 }
 ]])
 
 }
 ]])
 


@@ -627,7 +666,7 @@ AT_CHECK([[bison -o glr-regr7.c glr-regr7.y]], 0, [],
 ])
 AT_COMPILE([glr-regr7])
 
 ])
 AT_COMPILE([glr-regr7])
 

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

 [memory exhausted
 ])
 
 [memory exhausted
 ])
 


@@ -697,6 +736,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 +746,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;
     }
 }


@@ -723,7 +764,7 @@ AT_CHECK([[bison -o glr-regr8.c glr-regr8.y]], 0, [],
 ])
 AT_COMPILE([glr-regr8])
 
 ])
 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
 ],


@@ -806,7 +847,7 @@ AT_CHECK([[bison -o glr-regr9.c glr-regr9.y]], 0, [],
 ])
 AT_COMPILE([glr-regr9])
 
 ])
 AT_COMPILE([glr-regr9])
 

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

 [memory exhausted
 ])
 
 [memory exhausted
 ])
 


@@ -822,6 +863,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 +893,9 @@ yyerror (char const *msg)
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

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

   return 0;
 }
 
   return 0;
 }
 


@@ -869,7 +914,7 @@ AT_CHECK([[bison -o glr-regr10.c glr-regr10.y]], 0, [],
 ])
 AT_COMPILE([glr-regr10])
 
 ])
 AT_COMPILE([glr-regr10])
 

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

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -913,8 +958,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


@@ -935,7 +983,7 @@ AT_CHECK([[bison -o glr-regr11.c glr-regr11.y]], 0, [],
 ])
 AT_COMPILE([glr-regr11])
 
 ])
 AT_COMPILE([glr-regr11])
 

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

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -1030,10 +1078,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


@@ -1064,7 +1114,7 @@ AT_CHECK([[bison -o glr-regr12.c glr-regr12.y]], 0, [],
 ])
 AT_COMPILE([glr-regr12])
 
 ])
 AT_COMPILE([glr-regr12])
 

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

 
 AT_CLEANUP
 
 
 AT_CLEANUP
 


@@ -1090,7 +1140,7 @@ AT_DATA_GRAMMAR([glr-regr13.y],
   #include <stdio.h>
   static void yyerror (char const *);
   static int yylex (void);
   #include <stdio.h>
   static void yyerror (char const *);
   static int yylex (void);

-  static void print_look_ahead (char const *);
+  static void print_lookahead (char const *);

   #define USE(value)
 %}
 
   #define USE(value)
 %}
 


@@ -1104,32 +1154,32 @@ AT_DATA_GRAMMAR([glr-regr13.y],
 start:
   defstate_init defstate_shift 'b' change_lookahead 'a' {
     USE ($3);
 start:
   defstate_init defstate_shift 'b' change_lookahead 'a' {
     USE ($3);

-    print_look_ahead ("start <- defstate_init defstate_shift 'b'");
+    print_lookahead ("start <- defstate_init defstate_shift 'b'");

   }
   ;
 defstate_init:
   {
   }
   ;
 defstate_init:
   {

-    print_look_ahead ("defstate_init <- empty string");
+    print_lookahead ("defstate_init <- empty string");

   }
   ;
 defstate_shift:
   nondefstate defstate_look 'a' {
     USE ($3);
   }
   ;
 defstate_shift:
   nondefstate defstate_look 'a' {
     USE ($3);

-    print_look_ahead ("defstate_shift <- nondefstate defstate_look 'a'");
+    print_lookahead ("defstate_shift <- nondefstate defstate_look 'a'");

   }
   ;
 defstate_look:
   {
   }
   ;
 defstate_look:
   {

-    print_look_ahead ("defstate_look <- empty string");
+    print_lookahead ("defstate_look <- empty string");

   }
   ;
 nondefstate:
   {
   }
   ;
 nondefstate:
   {

-    print_look_ahead ("nondefstate <- empty string");
+    print_lookahead ("nondefstate <- empty string");

   }
   | 'b' {
     USE ($1);
   }
   | 'b' {
     USE ($1);

-    print_look_ahead ("nondefstate <- 'b'");
+    print_lookahead ("nondefstate <- 'b'");

   }
   ;
 change_lookahead:
   }
   ;
 change_lookahead:


@@ -1149,16 +1199,18 @@ 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

-print_look_ahead (char const *reduction)
+print_lookahead (char const *reduction)

 {
   printf ("%s:\n  yychar=", reduction);
   if (yychar == YYEMPTY)
 {
   printf ("%s:\n  yychar=", reduction);
   if (yychar == YYEMPTY)


@@ -1189,7 +1241,7 @@ main (void)
 AT_CHECK([[bison -o glr-regr13.c glr-regr13.y]], 0, [], [])
 AT_COMPILE([glr-regr13])
 
 AT_CHECK([[bison -o glr-regr13.c glr-regr13.y]], 0, [], [])
 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,10 +1287,11 @@ 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);

-  static void print_look_ahead (char const *);
+  static void print_lookahead (char const *);

   static char merge (union YYSTYPE, union YYSTYPE);
   #define USE(value)
 %}
   static char merge (union YYSTYPE, union YYSTYPE);
   #define USE(value)
 %}


@@ -1252,7 +1305,7 @@ AT_DATA_GRAMMAR([glr-regr14.y],
 start:
   merge 'c' stack_explosion {
     USE ($2); USE ($3);
 start:
   merge 'c' stack_explosion {
     USE ($2); USE ($3);

-    print_look_ahead ("start <- merge 'c' stack_explosion");
+    print_lookahead ("start <- merge 'c' stack_explosion");

   }
   ;
 
   }
   ;
 


@@ -1260,44 +1313,44 @@ start:
 merge:
   nonconflict1 'a' 'b' nonconflict2 %dprec 1 {
     USE ($2); USE ($3);
 merge:
   nonconflict1 'a' 'b' nonconflict2 %dprec 1 {
     USE ($2); USE ($3);

-    print_look_ahead ("merge <- nonconflict1 'a' 'b' nonconflict2");
+    print_lookahead ("merge <- nonconflict1 'a' 'b' nonconflict2");

   }
   | conflict defstate_look 'a' nonconflict2 'b' defstate_shift %dprec 2 {
     USE ($3); USE ($5);
   }
   | conflict defstate_look 'a' nonconflict2 'b' defstate_shift %dprec 2 {
     USE ($3); USE ($5);

-    print_look_ahead ("merge <- conflict defstate_look 'a' nonconflict2 'b'"
+    print_lookahead ("merge <- conflict defstate_look 'a' nonconflict2 'b'"

                      " defstate_shift");
   }
   ;
 
 nonconflict1:
   {
                      " defstate_shift");
   }
   ;
 
 nonconflict1:
   {

-    print_look_ahead ("nonconflict1 <- empty string");
+    print_lookahead ("nonconflict1 <- empty string");

   }
   ;
 nonconflict2:
   {
   }
   ;
 nonconflict2:
   {

-    print_look_ahead ("nonconflict2 <- empty string");
+    print_lookahead ("nonconflict2 <- empty string");

   }
   | 'a' {
     USE ($1);
   }
   | 'a' {
     USE ($1);

-    print_look_ahead ("nonconflict2 <- 'a'");
+    print_lookahead ("nonconflict2 <- 'a'");

   }
   ;
 conflict:
   {
   }
   ;
 conflict:
   {

-    print_look_ahead ("conflict <- empty string");
+    print_lookahead ("conflict <- empty string");

   }
   ;
 defstate_look:
   {
   }
   ;
 defstate_look:
   {

-    print_look_ahead ("defstate_look <- empty string");
+    print_lookahead ("defstate_look <- empty string");

   }
   ;
 
 /* yychar != YYEMPTY but lookahead need is yyfalse.  */
 defstate_shift:
   {
   }
   ;
 
 /* yychar != YYEMPTY but lookahead need is yyfalse.  */
 defstate_shift:
   {

-    print_look_ahead ("defstate_shift <- empty string");
+    print_lookahead ("defstate_shift <- empty string");

   }
   ;
 
   }
   ;
 


@@ -1355,16 +1408,18 @@ 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

-print_look_ahead (char const *reduction)
+print_lookahead (char const *reduction)

 {
   printf ("%s:\n  yychar=", reduction);
   if (yychar == YYEMPTY)
 {
   printf ("%s:\n  yychar=", reduction);
   if (yychar == YYEMPTY)


@@ -1404,7 +1459,7 @@ AT_CHECK([[bison -o glr-regr14.c glr-regr14.y]], 0, [],
 ])
 AT_COMPILE([glr-regr14])
 
 ])
 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 +1539,9 @@ yyerror (char const *msg)
 static int
 yylex (void)
 {
 static int
 yylex (void)
 {

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

   return 0;
 }
 
   return 0;
 }
 


@@ -1505,7 +1563,7 @@ AT_CHECK([[bison -o glr-regr15.c glr-regr15.y]], 0, [],
 ])
 AT_COMPILE([glr-regr15])
 
 ])
 AT_COMPILE([glr-regr15])
 

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

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


@@ -1547,10 +1605,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


@@ -1571,7 +1632,7 @@ AT_CHECK([[bison -o glr-regr16.c glr-regr16.y]], 0, [],
 ])
 AT_COMPILE([glr-regr16])
 
 ])
 AT_COMPILE([glr-regr16])
 

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

 [syntax error
 ])
 
 [syntax error
 ])
 


@@ -1636,12 +1697,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


@@ -1656,8 +1719,72 @@ AT_CHECK([[bison -o glr-regr17.c glr-regr17.y]], 0, [],
 ])
 AT_COMPILE([glr-regr17])
 
 ])
 AT_COMPILE([glr-regr17])
 

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

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

+
+
+## -------------------------------------------------------------##
+## Missed %merge type warnings when LHS type is declared later. ##
+## -------------------------------------------------------------##
+
+AT_SETUP([Missed %merge type warnings when LHS type is declared later])
+AT_DATA_GRAMMAR([glr-regr18.y],
+[[%glr-parser
+
+%{
+  #include <stdlib.h>
+  static void yyerror (char const *);
+  static int yylex ();
+%}
+
+%union {
+  int type1;
+  int type2;
+  int type3;
+}
+
+%%
+
+sym1: sym2 %merge<merge> { $$ = $1; } ;
+sym2: sym3 %merge<merge> { $$ = $1; } ;
+sym3: %merge<merge> { $$ = 0; } ;
+
+%type <type1> sym1;
+%type <type2> sym2;
+%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;
+}
+
+int
+main (void)
+{
+  return yyparse ();
+}
+]])
+
+AT_CHECK([[bison -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