On syntax errors, report the token on which we choked.

* bison.s1 (yyparse): In the label yyerrlab, when YYERROR_VERBOSE,
add yychar in msg.

diff --git a/ChangeLog b/ChangeLog
index a1274aa..b0e4546 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2000-03-17  Akim Demaille  <akim@epita.fr>
 
+       On syntax errors, report the token on which we choked.
+
+       * bison.s1 (yyparse): In the label yyerrlab, when YYERROR_VERBOSE,
+       add yychar in msg.
+
+2000-03-17  Akim Demaille  <akim@epita.fr>
+
        * reader.c (copy_at): New function.
        (copy_guard): Use it.
        (copy_action): Use it.

diff --git a/pre-config b/pre-config
index 8ce69f6..dce7fc8 100755 (executable)
--- a/pre-config
+++ b/pre-config
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-aclocal && \
+aclocal -I m4 && \
 gettextize && \
 autoconf && \
 autoheader && \

diff --git a/src/bison.s1 b/src/bison.s1
index e71ac99..474e324 100644 (file)
--- a/src/bison.s1
+++ b/src/bison.s1
@@ -635,10 +635,14 @@ yyerrlab:   /* here on detecting error */
               x < (sizeof(yytname) / sizeof(char *)); x++)
            if (yycheck[x + yyn] == x)
              size += strlen(yytname[x]) + 15, count++;
-         msg = (char *) malloc(size + 15);
+         size += strlen ("parse error, unexpected `") + 1;
+         size += strlen (yytname[YYTRANSLATE (yychar)]);
+         msg = (char *) malloc (size);
          if (msg != 0)
            {
-             strcpy(msg, "parse error");
+             strcpy (msg, "parse error, unexpected `");
+             strcat (msg, yytname[YYTRANSLATE (yychar)]);
+             strcat (msg, "'");
 
              if (count < 5)
                {
@@ -647,21 +651,21 @@ yyerrlab:   /* here on detecting error */
                       x < (sizeof(yytname) / sizeof(char *)); x++)
                    if (yycheck[x + yyn] == x)
                      {
-                       strcat(msg, count == 0 ? ", expecting `" : " or `");
-                       strcat(msg, yytname[x]);
-                       strcat(msg, "'");
+                       strcat (msg, count == 0 ? ", expecting `" : " or `");
+                       strcat (msg, yytname[x]);
+                       strcat (msg, "'");
                        count++;
                      }
                }
-             yyerror(msg);
-             free(msg);
+             yyerror (msg);
+             free (msg);
            }
          else
            yyerror ("parse error; also virtual memory exceeded");
        }
       else
 #endif /* YYERROR_VERBOSE */
-       yyerror("parse error");
+       yyerror ("parse error");
     }
 
   goto yyerrlab1;

diff --git a/src/bison.simple b/src/bison.simple
index e71ac99..474e324 100644 (file)
--- a/src/bison.simple
+++ b/src/bison.simple
@@ -635,10 +635,14 @@ yyerrlab:   /* here on detecting error */
               x < (sizeof(yytname) / sizeof(char *)); x++)
            if (yycheck[x + yyn] == x)
              size += strlen(yytname[x]) + 15, count++;
-         msg = (char *) malloc(size + 15);
+         size += strlen ("parse error, unexpected `") + 1;
+         size += strlen (yytname[YYTRANSLATE (yychar)]);
+         msg = (char *) malloc (size);
          if (msg != 0)
            {
-             strcpy(msg, "parse error");
+             strcpy (msg, "parse error, unexpected `");
+             strcat (msg, yytname[YYTRANSLATE (yychar)]);
+             strcat (msg, "'");
 
              if (count < 5)
                {
@@ -647,21 +651,21 @@ yyerrlab:   /* here on detecting error */
                       x < (sizeof(yytname) / sizeof(char *)); x++)
                    if (yycheck[x + yyn] == x)
                      {
-                       strcat(msg, count == 0 ? ", expecting `" : " or `");
-                       strcat(msg, yytname[x]);
-                       strcat(msg, "'");
+                       strcat (msg, count == 0 ? ", expecting `" : " or `");
+                       strcat (msg, yytname[x]);
+                       strcat (msg, "'");
                        count++;
                      }
                }
-             yyerror(msg);
-             free(msg);
+             yyerror (msg);
+             free (msg);
            }
          else
            yyerror ("parse error; also virtual memory exceeded");
        }
       else
 #endif /* YYERROR_VERBOSE */
-       yyerror("parse error");
+       yyerror ("parse error");
     }
 
   goto yyerrlab1;