* data/yacc.c: Guard the declaration of yytoknum also with

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index ec19d90375b930549b75e193a2ef85ffef0b46f5..8875f9cd1ad407071551dd455d19b5353bc50695 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -67,30 +67,17 @@ typedef int value_t;
 
 %}
 
 
 %}
 

-/* Exercise M4 quoting: '@:>@@:>@', 0.  */
-
-/* Also exercise %union. */
+/* Exercise %union. */

 %union
 {
 %union
 {

-  value_t ival; /* A comment to exercise an old bug. */
+  value_t ival;

 };
 
 };
 

-/* Exercise post-prologue dependency to %union.  */
-%{
-static void id (YYSTYPE *lval);
-
-/* Exercise quotes in declarations.  */
-char quote[] = "@:>@@:>@,";
-%}
-

 /* Bison Declarations */
 %token CALC_EOF 0 "end of file"
 %token <ival> NUM "number"
 %type  <ival> exp
 
 /* Bison Declarations */
 %token CALC_EOF 0 "end of file"
 %token <ival> NUM "number"
 %type  <ival> exp
 

-/* Exercise quotes in strings.  */
-%token FAKE "fake @>:@@>:@,"
-

 %nonassoc '=' /* comparison           */
 %left '-' '+'
 %left '*' '/'
 %nonassoc '=' /* comparison           */
 %left '-' '+'
 %left '*' '/'


@@ -107,15 +94,10 @@ input:
 ;
 
 line:
 ;
 
 line:

-  '\n'
-| exp '\n'
-  {
-    /* Exercise quotes in braces.  */
-    char tmp[] = "@>:@@:>@,";
-  }
+  '\n'      {}
+| exp '\n'  {}

 ;
 
 ;
 

-/* Exercise M4 quoting: '@:>@@:>@', 1.  */

 exp:
   NUM                { $$ = $1;             }
 | exp '=' exp
 exp:
   NUM                { $$ = $1;             }
 | exp '=' exp


@@ -137,7 +119,6 @@ exp:
 /* The input. */
 FILE *yyin;
 
 /* The input. */
 FILE *yyin;
 

-/* Exercise M4 quoting: '@:>@@:>@', 2.  */

 static void
 yyerror (const char *s)
 {
 static void
 yyerror (const char *s)
 {


@@ -259,11 +240,6 @@ power (int base, int exponent)
   return res;
 }
 
   return res;
 }
 

-void
-id (YYSTYPE* lval)
-{
-}
-

 int
 main (int argc, const char **argv)
 {
 int
 main (int argc, const char **argv)
 {


@@ -314,7 +290,7 @@ m4_define([_AT_CHECK_CALC],
 [AT_DATA([[input]],
 [[$2
 ]])
 [AT_DATA([[input]],
 [[$2
 ]])

-AT_CHECK([./calc input], 0, [], [stderr])dnl
+AT_PARSER_CHECK([./calc input], 0, [], [stderr])dnl

 AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
          [m4_bmatch([$1], [--debug],
                     [$3], [0])
 AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
          [m4_bmatch([$1], [--debug],
                     [$3], [0])


@@ -341,11 +317,11 @@ AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0,
 # of expected lines on stderr.
 m4_define([_AT_CHECK_CALC_ERROR],
 [m4_bmatch([$2], [^/],
 # of expected lines on stderr.
 m4_define([_AT_CHECK_CALC_ERROR],
 [m4_bmatch([$2], [^/],

-           [AT_CHECK([./calc $2], 0, [], [stderr])],
+           [AT_PARSER_CHECK([./calc $2], 0, [], [stderr])],

            [AT_DATA([[input]],
 [[$2
 ]])
            [AT_DATA([[input]],
 [[$2
 ]])

-AT_CHECK([./calc input], 0, [], [stderr])])
+AT_PARSER_CHECK([./calc input], 0, [], [stderr])])

 
 m4_bmatch([$1], [--debug],
 [AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, [$3
 
 m4_bmatch([$1], [--debug],
 [AT_CHECK([wc -l <stderr | sed 's/[[^0-9]]//g'], 0, [$3


@@ -396,7 +372,7 @@ AT_DATA_CALC_Y([$1])
 AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
          [0], [], [])
 
 AT_CHECK([bison calc.y -o calc.c m4_bpatsubst([$1], [--yyerror-verbose])],
          [0], [], [])
 

-AT_CHECK([$CC $CFLAGS $CPPFLAGS calc.c -o calc], 0, [], [ignore])
+AT_COMPILE([calc])

 
 # Test the priorities.
 _AT_CHECK_CALC([$1],
 
 # Test the priorities.
 _AT_CHECK_CALC([$1],


@@ -420,7 +396,7 @@ _AT_CHECK_CALC_ERROR([$1], [0 0], [11],
 _AT_CHECK_CALC_ERROR([$1], [1//2], [15],
                      [1.3-1.4: parse error, unexpected '/', expecting "number" or '-' or '('])
 _AT_CHECK_CALC_ERROR([$1], [error], [4],
 _AT_CHECK_CALC_ERROR([$1], [1//2], [15],
                      [1.3-1.4: parse error, unexpected '/', expecting "number" or '-' or '('])
 _AT_CHECK_CALC_ERROR([$1], [error], [4],

-                     [1.1-1.2: parse error, unexpected $undefined., expecting "number" or '-' or '\n' or '('])
+                     [1.1-1.2: parse error, unexpected $undefined, expecting "number" or '-' or '\n' or '('])

 _AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [22],
                      [1.7-1.8: parse error, unexpected '='])
 _AT_CHECK_CALC_ERROR([$1],
 _AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [22],
                      [1.7-1.8: parse error, unexpected '='])
 _AT_CHECK_CALC_ERROR([$1],


@@ -443,7 +419,7 @@ calc: error: 0 != 1])
 # Add a studid example demonstrating that Bison can further improve the
 # error message.  FIXME: Fix this ridiculous message.
 _AT_CHECK_CALC_ERROR([$1], [()], [21],
 # Add a studid example demonstrating that Bison can further improve the
 # error message.  FIXME: Fix this ridiculous message.
 _AT_CHECK_CALC_ERROR([$1], [()], [21],

-[1.2-1.3: parse error, unexpected ')', expecting error or "number" or '-' or '('])
+[1.2-1.3: parse error, unexpected ')', expecting "number" or '-' or '('])

 
 AT_CLEANUP
 ])# AT_CHECK_CALC
 
 AT_CLEANUP
 ])# AT_CHECK_CALC