X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3c1a79b31401393d6b67c9373d0a8a4b3cb980fa..a9b8959efaa9aae4e2daf959d371765ac057e7f0:/tests/calc.at

diff --git a/tests/calc.at b/tests/calc.at
index ba5293f5..90241b35 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -53,7 +53,6 @@ AT_DATA([calc.y],
 char *strcat(char *dest, const char *src);
 #endif
 #include <ctype.h>
-]$4[
 
 static int power (int base, int exponent);
 static void yyerror (const char *s);
@@ -64,8 +63,16 @@ static void yyungetc (int c);
 extern void perror (const char *s);
 %}
 
-/* BISON Declarations */
-%token NUM
+/* Also exercise %union. */
+%union
+{
+  int ival; /* A comment to exercise an old bug. */
+};
+
+/* Bison Declarations */
+%token CALC_EOF 0 "end of file"
+%token <ival> NUM "number"
+%type  <ival> exp
 
 %nonassoc '=' /* comparison	       */
 %left '-' '+'
@@ -73,16 +80,18 @@ extern void perror (const char *s);
 %left NEG     /* negation--unary minus */
 %right '^'    /* exponentiation        */
 
+]$4[
+
 /* Grammar follows */
 %%
 input:
-  /* empty string */
+  line
 | input line
 ;
 
 line:
   '\n'
-| exp '\n'
+| exp '\n' {}
 ;
 
 exp:
@@ -116,11 +125,16 @@ yyerror (const char *s)
   fprintf (stderr, "%s\n", s);
 }
 
+
+#if YYLSP_NEEDED
+static YYLTYPE last_yylloc;
+#endif
 static int
 yygetc (void)
 {
   int res = getc (yyin);
 #if YYLSP_NEEDED
+  last_yylloc = yylloc;
   if (res == '\n')
     {
       yylloc.last_line++;
@@ -138,7 +152,7 @@ yyungetc (int c)
 {
 #if YYLSP_NEEDED
   /* Wrong when C == `\n'. */
-  yylloc.last_column--;
+  yylloc = last_yylloc;
 #endif
   ungetc (c, yyin);
 }
@@ -198,13 +212,13 @@ yylex (void)
   if (c == '.' || isdigit (c))
     {
       yyungetc (c);
-      yylval = read_signed_integer ();
+      yylval.ival = read_signed_integer ();
       return NUM;
     }
 
   /* Return end-of-file.  */
   if (c == EOF)
-    return 0;
+    return CALC_EOF;
 
   /* Return single chars. */
   return c;
@@ -256,8 +270,8 @@ main (int argc, const char **argv)
 # Produce `calc.y'.
 m4_define([AT_DATA_CALC_Y],
 [_AT_DATA_CALC_Y($[1], $[2], $[3],
-                 [m4_match([$1], [--yyerror-verbose],
-                           [[#define YYERROR_VERBOSE 1]])])])
+                 [m4_bmatch([$1], [--yyerror-verbose],
+                            [[%error-verbose]])])])
 
 
 
@@ -284,6 +298,9 @@ AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
 # ------------------------------------------------------------
 # Run `calc' on INPUT, and expect a `parse error' message.
 #
+# If INPUT starts with a slash, it is used as absolute input file name,
+# otherwise as contents.
+#
 # If BISON-OPTIONS contains `--location', then make sure the ERROR-LOCATION
 # is correctly output on stderr.
 #
@@ -294,11 +311,12 @@ AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
 # If BISON-OPTIONS contains `--debug', then NUM-STDERR-LINES is the number
 # of expected lines on stderr.
 m4_define([_AT_CHECK_CALC_ERROR],
-[AT_DATA([[input]],
+[m4_bmatch([$2], [^/],
+           [AT_CHECK([calc $2], 0, [], [stderr])],
+           [AT_DATA([[input]],
 [[$2
 ]])
-
-AT_CHECK([calc input], 0, [], [stderr])
+AT_CHECK([calc input], 0, [], [stderr])])
 
 
 AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
@@ -333,12 +351,7 @@ AT_DATA_CALC_Y([$1])
 AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
          [0], [], [])
 
-# Some compilers issue warnings we don't want to hear about.
-# Maybe some day we will have proper Autoconf macros to disable these
-# warnings, but this place is not the right one for that.
-# So let's keep only GCC warnings, which we know are sane.
-AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [stderr])
-AT_CHECK([test "$GCC" = yes && cat stderr])
+AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [ignore])
 
 # Test the priorities.
 _AT_CHECK_CALC([$1],
@@ -354,29 +367,35 @@ _AT_CHECK_CALC([$1],
 1 - (2 - 3) = 2
 
 2^2^3 = 256
-(2^2)^3 = 64], [491])
+(2^2)^3 = 64], [486])
 
 # Some parse errors.
-_AT_CHECK_CALC_ERROR([$1], [+1], [8],
-                     [1.0:1.1],
-                     [unexpected `'+''])
-_AT_CHECK_CALC_ERROR([$1], [1//2], [17],
+_AT_CHECK_CALC_ERROR([$1], [0 0], [10],
                      [1.2:1.3],
-                     [unexpected `'/'', expecting `NUM' or `'-'' or `'(''])
-_AT_CHECK_CALC_ERROR([$1], [error], [8],
+                     [unexpected "number"])
+_AT_CHECK_CALC_ERROR([$1], [1//2], [13],
+                     [1.2:1.3],
+                     [unexpected '/', expecting "number" or '-' or '('])
+_AT_CHECK_CALC_ERROR([$1], [error], [4],
                      [1.0:1.1],
-                     [unexpected `$undefined.'])
-_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [23],
+                     [unexpected $undefined., expecting "number" or '-' or '\n' or '('])
+_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [19],
                      [1.6:1.7],
-                     [unexpected `'=''])
+                     [unexpected '='])
 _AT_CHECK_CALC_ERROR([$1],
                      [
 +1],
-                     [16],
+                     [13],
                      [2.0:2.1],
-                     [unexpected `'+''])
+                     [unexpected '+'])
+# Exercise error messages with EOF: work on an empty file.
+_AT_CHECK_CALC_ERROR([$1],
+                     [/dev/null],
+                     [4],
+                     [1.0:1.1],
+                     [unexpected "end of file", expecting "number" or '-' or '\n' or '('])
 
-AT_CLEANUP(calc calc.c calc.h calc.output)
+AT_CLEANUP
 ])# AT_CHECK_CALC