X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5e6f62f2f10547c6552d3eb4003c44d66f172686..ac8c5689f8897977863452e89ffadb05dffafd0f:/tests/glr-regression.at

diff --git a/tests/glr-regression.at b/tests/glr-regression.at
index fd822a18..4ac981c0 100644
--- 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);
-int yyerror (char const *msg);
+void yyerror (char const *msg);
 %}
 
 
@@ -70,11 +70,10 @@ main (void)
   return yyparse ();
 }
 
-int
+void
 yyerror (char const *msg)
 {
   fprintf (stderr, "%s\n", msg);
-  exit (4);
 }
 
 
@@ -156,10 +155,11 @@ 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];
+  char *s;
   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)
-    abort ();
+    return 0;
   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';
 }
 
@@ -200,7 +202,7 @@ 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 ();
 }
 ]])
@@ -239,6 +241,7 @@ AT_DATA_GRAMMAR([glr-regr3.y],
 
 static int MergeRule (int x0, int x1);
 static void yyerror(char const * s);
+int yylex (void);
 
 #define RULE(x) (1 << (x))
 
@@ -298,7 +301,7 @@ int yylex (void)
   char inp[3];
   if (fscanf (yyin, "%2s", inp) == EOF)
     return 0;
-  switch (inp[0]) 
+  switch (inp[0])
     {
     case 'p': return P[inp[1] - '1'];
     case 't': return T[inp[1] - '1'];
@@ -309,7 +312,7 @@ int yylex (void)
 
 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 ();
 }
 ]])