Regenerate.

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

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index a2d3ce762d18c84bf9390a5db0296e95bf827d20..1971649d063f5d2af7ce8c7f38376cf34c7e542b 100644 (file)
--- a/tests/glr-regression.at
+++ b/tests/glr-regression.at
@@ -121,8 +121,6 @@ AT_DATA_GRAMMAR([glr-regr2a.y],
 
 %{
   #define YYSTYPE char const *
 
 %{
   #define YYSTYPE char const *

-  #define yyfalse 0
-  #define yytrue 1

 
   #include <ctype.h>
   #include <stdio.h>
 
   #include <ctype.h>
   #include <stdio.h>


@@ -168,14 +166,14 @@ var_printer: 'v'
 
 %%
 
 
 %%
 

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

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

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

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


@@ -183,7 +181,7 @@ yylex (void)
   default:
     break;
   }
   default:
     break;
   }

-  if (fscanf (yyin, "%49s", buf) != 1)
+  if (fscanf (input, "%49s", buf) != 1)

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


@@ -201,8 +199,8 @@ yyerror (char const *s)
 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {

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

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


@@ -290,7 +288,7 @@ static void yyerror(char const * s) {
   fprintf(stderr,"error: %s\n",s);
 }
 
   fprintf(stderr,"error: %s\n",s);
 }
 

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

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


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

-  if (fscanf (yyin, "%2s", inp) == EOF)
+  if (fscanf (input, "%2s", inp) == EOF)

     return 0;
   switch (inp[0])
     {
     return 0;
   switch (inp[0])
     {


@@ -311,8 +309,8 @@ int yylex (void)
 }
 
 int main(int argc, char* argv[]) {
 }
 
 int main(int argc, char* argv[]) {

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

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


@@ -338,7 +336,8 @@ AT_CLEANUP
 AT_SETUP([Duplicate representation of merged trees])
 
 AT_DATA_GRAMMAR([glr-regr4.y],
 AT_SETUP([Duplicate representation of merged trees])
 
 AT_DATA_GRAMMAR([glr-regr4.y],

-[[%union { char *ptr; }
+[[
+%union { char *ptr; }

 %type <ptr> S A A1 A2 B
 %glr-parser
 
 %type <ptr> S A A1 A2 B
 %glr-parser
 


@@ -347,7 +346,7 @@ AT_DATA_GRAMMAR([glr-regr4.y],
   #include <stdlib.h>
   #include <string.h>
   static char *merge (YYSTYPE, YYSTYPE);
   #include <stdlib.h>
   #include <string.h>
   static char *merge (YYSTYPE, YYSTYPE);

-  static char *make_value (char *, char *);
+  static char *make_value (char const *, char const *);

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


@@ -386,10 +385,11 @@ main (void)
 }
 
 static char *
 }
 
 static char *

-make_value (char *parent, char *child)
+make_value (char const *parent, char const *child)

 {
   char const format[] = "%s <- %s";
 {
   char const format[] = "%s <- %s";

-  char *value = malloc (strlen (parent) + strlen (child) + sizeof format);
+  char *value =
+    (char *) malloc (strlen (parent) + strlen (child) + sizeof format);

   sprintf (value, format, parent, child);
   return value;
 }
   sprintf (value, format, parent, child);
   return value;
 }


@@ -398,7 +398,8 @@ 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 = malloc (strlen (s1.ptr) + strlen (s2.ptr) + sizeof format);
+  char *value =
+    (char *) malloc (strlen (s1.ptr) + strlen (s2.ptr) + sizeof format);

   sprintf (value, format, s1.ptr, s2.ptr);
   return value;
 }
   sprintf (value, format, s1.ptr, s2.ptr);
   return value;
 }


@@ -406,7 +407,7 @@ merge (YYSTYPE s1, YYSTYPE s2)
 static void
 yyerror (char const *msg)
 {
 static void
 yyerror (char const *msg)
 {

-  printf ("%s\n", msg);
+  fprintf (stderr, "%s\n", msg);

 }
 ]])
 
 }
 ]])
 


@@ -422,16 +423,17 @@ AT_CHECK([[./glr-regr4]], 0,
 AT_CLEANUP
 
 
 AT_CLEANUP
 
 

-## ---------------------------------------------------------------------- ##
-## User destructor for unresolved GLR semantic value                      ##
-## Thanks to Joel E. Denny for this test; see                             ##
-## <http://lists.gnu.org/archive/html/help-bison/2005-07/msg00013.html>.  ##
-## ---------------------------------------------------------------------- ##
+## ------------------------------------------------------------------------- ##
+## User destructor for unresolved GLR semantic value                         ##
+## Thanks to Joel E. Denny for this test; see                                ##
+## <http://lists.gnu.org/archive/html/bison-patches/2005-08/msg00016.html>.  ##
+## ------------------------------------------------------------------------- ##

 
 AT_SETUP([User destructor for unresolved GLR semantic value])
 
 AT_DATA_GRAMMAR([glr-regr5.y],
 
 AT_SETUP([User destructor for unresolved GLR semantic value])
 
 AT_DATA_GRAMMAR([glr-regr5.y],

-[[%{
+[[
+%{

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


@@ -470,7 +472,7 @@ yylex (void)
 static void
 yyerror (char const *msg)
 {
 static void
 yyerror (char const *msg)
 {

-  printf ("%s\n", msg);
+  fprintf (stderr, "%s\n", msg);

 }
 
 int
 }
 
 int


@@ -485,8 +487,152 @@ 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_CHECK([[./glr-regr5]], 0, [],

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

+
+
+## ------------------------------------------------------------------------- ##
+## User destructor after an error during a split parse                       ##
+## Thanks to Joel E. Denny for this test; see                                ##
+## <http://lists.gnu.org/archive/html/bison-patches/2005-08/msg00029.html>.  ##
+## ------------------------------------------------------------------------- ##
+
+AT_SETUP([User destructor after an error during a split parse])
+
+AT_DATA_GRAMMAR([glr-regr6.y],
+[[
+%{
+  #include <stdio.h>
+  #include <stdlib.h>
+  static void yyerror (char const *);
+  static int yylex (void);
+%}
+
+%glr-parser
+%union { int value; }
+%type <value> 'a'
+
+%destructor {
+  printf ("Destructor called.\n");
+} 'a'
+
+%%
+
+start: 'a' | 'a' ;
+
+%%
+
+static int
+yylex (void)
+{
+  static char const *input = "a";
+  return *input++;
+}
+
+static void
+yyerror (char const *msg)
+{
+  fprintf (stderr, "%s\n", msg);
+}
+
+int
+main (void)
+{
+  return yyparse () != 1;
+}
+]])
+
+AT_CHECK([[bison -o glr-regr6.c glr-regr6.y]], 0, [],
+[glr-regr6.y: conflicts: 1 reduce/reduce
+])
+AT_COMPILE([glr-regr6])
+
+AT_CHECK([[./glr-regr6]], 0,
+[Destructor called.
+],
+[syntax is ambiguous
+])
+
+AT_CLEANUP
+
+
+## ------------------------------------------------------------------------- ##
+## Duplicated user destructor for lookahead                                  ##
+## Thanks to Joel E. Denny for this test; see                                ##
+## <http://lists.gnu.org/archive/html/bison-patches/2005-08/msg00035.html>.  ##
+## ------------------------------------------------------------------------- ##
+
+AT_SETUP([Duplicated user destructor for lookahead])
+
+AT_DATA_GRAMMAR([glr-regr7.y],
+[[
+%{
+  #include <stdio.h>
+  #include <stdlib.h>
+  static void yyerror (char const *);
+  static int yylex (void);
+  #define YYSTACKEXPANDABLE 0
+%}
+
+%glr-parser
+%union { int *count; }
+%type <count> 'a'
+
+%destructor {
+  if ((*$$)++)
+    fprintf (stderr, "Destructor called on same value twice.\n");
+} 'a'
+
+%%
+
+start:
+    stack1 start
+  | stack2 start
+  | /* empty */
+  ;
+stack1: 'a' ;
+stack2: 'a' ;
+
+%%
+
+static int
+yylex (void)
+{
+  yylval.count = (int *) malloc (sizeof (int));
+  if (!yylval.count)
+    {
+      fprintf (stderr, "Test inconclusive.\n");
+      exit (EXIT_FAILURE);
+    }
+  *yylval.count = 0;
+  return 'a';
+}
+
+static void
+yyerror (char const *msg)
+{
+  fprintf (stderr, "%s\n", msg);
+}
+
+int
+main (void)
+{
+  return yyparse ();
+}
+]])
+
+AT_CHECK([[bison -o glr-regr7.c glr-regr7.y]], 0, [],
+[glr-regr7.y: conflicts: 2 reduce/reduce
+])
+AT_COMPILE([glr-regr7])
+
+AT_CHECK([[./glr-regr7]], 2, [],
+[memory exhausted
+])
+
+AT_XFAIL_IF(:)
+
+AT_CLEANUP