Regenerate.

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

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index df27f0a948a737475fb367f06c339b7cdcc0cedb..91768a19ebf2ba2d92c8363ba1aee543df01e189 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -34,7 +34,7 @@ AT_DATA_GRAMMAR([glr-regr1.y],
 #define YYSTYPE int
 static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1);
 int yylex (void);
 #define YYSTYPE int
 static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1);
 int yylex (void);

-int yyerror (char const *msg);
+void yyerror (char const *msg);

 %}
 
 
 %}
 
 


@@ -70,11 +70,10 @@ main (void)
   return yyparse ();
 }
 
   return yyparse ();
 }
 

-int
+void

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

-  exit (4);

 }
 
 
 }
 
 


@@ -156,10 +155,11 @@ var_list:
     { $$ = $1; }
   | var ',' var_list
     {
     { $$ = $1; }
   | var ',' var_list
     {

-      $$ = malloc (strlen ($1) + 1 + strlen ($3) + 1);
-      strcpy ($$, $1);
-      strcat ($$, ",");
-      strcat ($$, $3);
+      char *s = (char *) malloc (strlen ($1) + 1 + strlen ($3) + 1);
+      strcpy (s, $1);
+      strcat (s, ",");
+      strcat (s, $3);
+      $$ = s;

     }
   ;
 
     }
   ;
 


@@ -174,6 +174,7 @@ int
 yylex (void)
 {
   char buf[50];
 yylex (void)
 {
   char buf[50];

+  char *s;

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


@@ -183,11 +184,12 @@ yylex (void)
     break;
   }
   if (fscanf (yyin, "%49s", buf) != 1)
     break;
   }
   if (fscanf (yyin, "%49s", buf) != 1)

-    abort ();
+    return 0;

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

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

   return 'V';
 }
 
   return 'V';
 }
 


@@ -200,7 +202,7 @@ int
 main (int argc, char **argv)
 {
   yyin = stdin;
 main (int argc, char **argv)
 {
   yyin = stdin;

-  if (argc == 2 && !(yyin = fopen (argv[1], "r"))) return 1;
+  if (argc == 2 && !(yyin = fopen (argv[1], "r"))) return 3;

   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])


@@ -310,7 +312,7 @@ int yylex (void)
 
 int main(int argc, char* argv[]) {
   yyin = stdin;
 
 int main(int argc, char* argv[]) {
   yyin = stdin;

-  if (argc == 2 && !(yyin = fopen (argv[1], "r"))) return 1;
+  if (argc == 2 && !(yyin = fopen (argv[1], "r"))) return 3;

   return yyparse ();
 }
 ]])
   return yyparse ();
 }
 ]])


@@ -325,3 +327,96 @@ AT_CHECK([[echo p1 t4 o2 p1 p1 t1 o1 t2 p2 o1 t3 p2 p2 | ./glr-regr3]], 0,
 ]], [])
 
 AT_CLEANUP
 ]], [])
 
 AT_CLEANUP

+
+
+## ---------------------------------------------------------------------- ##
+## Duplicate representation of merged trees                               ##
+## Thanks to Joel E. Denny for this test; see                             ##
+## <http://lists.gnu.org/archive/html/help-bison/2005-07/msg00013.html>.  ##
+## ---------------------------------------------------------------------- ##
+
+AT_SETUP([Duplicate representation of merged trees])
+
+AT_DATA_GRAMMAR([glr-regr4.y],
+[[%union { char *ptr; }
+%type <ptr> S A A1 A2 B
+%glr-parser
+
+%{
+  #include <stdio.h>
+  #include <stdlib.h>
+  #include <string.h>
+  static char *merge (YYSTYPE, YYSTYPE);
+  static char *make_value (char *, char *);
+  static void yyerror (char const *);
+  static int yylex (void);
+%}
+
+%%
+
+tree: S { printf ("%s\n", $1); } ;
+
+S:
+  A   %merge<merge> { $$ = make_value ("S", $1); }
+  | B %merge<merge> { $$ = make_value ("S", $1); }
+  ;
+
+A:
+  A1   %merge<merge> { $$ = make_value ("A", $1); }
+  | A2 %merge<merge> { $$ = make_value ("A", $1); }
+  ;
+
+A1: 'a' { $$ = make_value ("A1", "'a'"); } ;
+A2: 'a' { $$ = make_value ("A2", "'a'"); } ;
+B:  'a' { $$ = make_value ("B", "'a'");  } ;
+
+%%
+
+static int
+yylex (void)
+{
+  static char const *input = "a";
+  return *input++;
+}
+
+int
+main (void)
+{
+  return yyparse ();
+}
+
+static char *
+make_value (char *parent, char *child)
+{
+  char const format[] = "%s <- %s";
+  char *value = malloc (strlen (parent) + strlen (child) + sizeof format);
+  sprintf (value, format, parent, child);
+  return value;
+}
+
+static char *
+merge (YYSTYPE s1, YYSTYPE s2)
+{
+  char const format[] = "merge{ %s and %s }";
+  char *value = malloc (strlen (s1.ptr) + strlen (s2.ptr) + sizeof format);
+  sprintf (value, format, s1.ptr, s2.ptr);
+  return value;
+}
+
+static void
+yyerror (char const *msg)
+{
+  printf ("%s\n", msg);
+}
+]])
+
+AT_CHECK([[bison -o glr-regr4.c glr-regr4.y]], 0, [],
+[glr-regr4.y: conflicts: 1 reduce/reduce
+])
+AT_COMPILE([glr-regr4])
+
+AT_CHECK([[./glr-regr4]], 0,
+[[merge{ S <- merge{ A <- A1 <- 'a' and A <- A2 <- 'a' } and S <- B <- 'a' }
+]], [])
+
+AT_CLEANUP