Rename identifiers to avoid real and potential collisions.

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

diff --git a/tests/glr-regr1.at b/tests/glr-regr1.at
index 39b7b9a34fd17a07ceaaaef062358fb12ff73b9d..72aec7053d4d3cdcb6aa4526c29f5f414a4e6f0a 100644 (file)
--- a/tests/glr-regr1.at
+++ b/tests/glr-regr1.at
@@ -20,12 +20,12 @@ AT_BANNER([[GLR Regression Test #1.]])
 
 AT_SETUP([Badly Collapsed GLR States])
 
-AT_DATA([glr-regr1.y],
+AT_DATA_GRAMMAR([glr-regr1.y],
 [[/* Regression Test: Improper state compression */
 /* Reported by Scott McPeak */
 
 %{
-#include <stdio.h>    // fgetc, printf
+#include <stdio.h>
 
 #define YYSTYPE int
 static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1);
@@ -63,29 +63,28 @@ static YYSTYPE exprMerge (YYSTYPE x0, YYSTYPE x1)
 int
 main (void)
 {
-  yyparse();
-  return 0;
+  return yyparse ();
 }
 
 int
 yyerror (char const *msg)
 {
-  printf("%s\n", msg);
-  exit(4);
+  fprintf (stderr, "%s\n", msg);
+  exit (4);
 }
 
 
 int
 yylex (void)
 {
-  while (1) {
-    int ch = fgetc(stdin);
-    if (ch == EOF) {
-      return 0;   // bison's EOF
-    } else if (ch == 'B' || ch == 'P') {
-      return ch;
+  for (;;)
+    {
+      int ch = getchar ();
+      if (ch == EOF)
+       return 0;
+      else if (ch == 'B' || ch == 'P')
+       return ch;
     }
-  }
 }
 ]])