X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/d803322e27fd275ecf6daf141a39030c779758bc..dee049eb9173cee47928e34b528f1038492b4094:/tests/calc.at

diff --git a/tests/calc.at b/tests/calc.at
index 9bf1af9c..5fa17f44 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);
@@ -74,6 +73,8 @@ extern void perror (const char *s);
 %left NEG     /* negation--unary minus */
 %right '^'    /* exponentiation        */
 
+]$4[
+
 /* Grammar follows */
 %%
 input:
@@ -258,7 +259,7 @@ main (int argc, const char **argv)
 m4_define([AT_DATA_CALC_Y],
 [_AT_DATA_CALC_Y($[1], $[2], $[3],
                  [m4_bmatch([$1], [--yyerror-verbose],
-                            [[#define YYERROR_VERBOSE]])])])
+                            [[%error-verbose]])])])
 
 
 
@@ -366,22 +367,22 @@ _AT_CHECK_CALC([$1],
 # Some parse errors.
 _AT_CHECK_CALC_ERROR([$1], [+1], [8],
                      [1.0:1.1],
-                     [unexpected `'+''])
+                     [unexpected '+'])
 _AT_CHECK_CALC_ERROR([$1], [1//2], [17],
                      [1.2:1.3],
-                     [unexpected `'/'', expecting `NUM' or `'-'' or `'(''])
+                     [unexpected '/', expecting NUM or '-' or '('])
 _AT_CHECK_CALC_ERROR([$1], [error], [8],
                      [1.0:1.1],
-                     [unexpected `$undefined.'])
+                     [unexpected $undefined.])
 _AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [23],
                      [1.6:1.7],
-                     [unexpected `'=''])
+                     [unexpected '='])
 _AT_CHECK_CALC_ERROR([$1],
                      [
 +1],
                      [16],
                      [2.0:2.1],
-                     [unexpected `'+''])
+                     [unexpected '+'])
 
 AT_CLEANUP
 ])# AT_CHECK_CALC