Regen.

[bison.git] / tests / calc.at

diff --git a/tests/calc.at b/tests/calc.at
index ecd4c67380249880ad98ff1e73ba537b40eb977f..3b2e13781b059fe78d50e7890a62a1bc256658f1 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -1,5 +1,5 @@
 # Checking the output filenames.                         -*- Autotest -*-
-# Copyright 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -67,6 +67,8 @@ typedef int value_t;
 
 %}
 
+/* Exercise M4 quoting: '@:>@@:>@', 0.  */
+
 /* Also exercise %union. */
 %union
 {
@@ -76,6 +78,9 @@ typedef int value_t;
 /* Exercise post-prologue dependency to %union.  */
 %{
 static void id (YYSTYPE *lval);
+
+/* Exercise quotes in declarations.  */
+char quote[] = "@:>@@:>@,";
 %}
 
 /* Bison Declarations */
@@ -83,6 +88,9 @@ static void id (YYSTYPE *lval);
 %token <ival> NUM "number"
 %type  <ival> exp
 
+/* Exercise quotes in strings.  */
+%token FAKE "fake @>:@@>:@,"
+
 %nonassoc '=' /* comparison           */
 %left '-' '+'
 %left '*' '/'
@@ -100,9 +108,14 @@ input:
 
 line:
   '\n'
-| exp '\n' {}
+| exp '\n'
+  {
+    /* Exercise quotes in braces.  */
+    char tmp[] = "@>:@@:>@,";
+  }
 ;
 
+/* Exercise M4 quoting: '@:>@@:>@', 1.  */
 exp:
   NUM                { $$ = $1;             }
 | exp '=' exp
@@ -124,6 +137,7 @@ exp:
 /* The input. */
 FILE *yyin;
 
+/* Exercise M4 quoting: '@:>@@:>@', 2.  */
 static void
 yyerror (const char *s)
 {
@@ -340,7 +354,16 @@ m4_bmatch([$1], [--debug],
 # Normalize the observed and expected error messages, depending upon the
 # options.
 # 1. Remove the traces from observed.
-egrep -v '^((Start|Enter|Read|Reduc|Shift)ing|state|Error:|Next|Discarding) ' stderr >at-stderr
+sed '/^Starting/d
+/^Entering/d
+/^Reading/d
+/^Reducing/d
+/^Shifting/d
+/^state/d
+/^Error:/d
+/^Next/d
+/^Discarding/d
+/^yydestructor:/d' stderr >at-stderr
 mv at-stderr stderr
 # 2. Create the reference error message.
 AT_DATA([[expout]],
@@ -392,18 +415,18 @@ _AT_CHECK_CALC([$1],
 (2^2)^3 = 64], [486])
 
 # Some parse errors.
-_AT_CHECK_CALC_ERROR([$1], [0 0], [10],
+_AT_CHECK_CALC_ERROR([$1], [0 0], [12],
                      [1.3-1.4: parse error, unexpected "number"])
-_AT_CHECK_CALC_ERROR([$1], [1//2], [13],
+_AT_CHECK_CALC_ERROR([$1], [1//2], [17],
                      [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 '('])
-_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [19],
+_AT_CHECK_CALC_ERROR([$1], [1 = 2 = 3], [25],
                      [1.7-1.8: parse error, unexpected '='])
 _AT_CHECK_CALC_ERROR([$1],
                      [
 +1],
-                     [13],
+                     [15],
                      [2.1-2.2: parse error, unexpected '+'])
 # Exercise error messages with EOF: work on an empty file.
 _AT_CHECK_CALC_ERROR([$1],
@@ -416,7 +439,7 @@ _AT_CHECK_CALC_ERROR([$1],
 # associated to `error'.
 _AT_CHECK_CALC_ERROR([$1],
                      [(1 ++ 2) + (0 0) = 1],
-                     [76],
+                     [91],
 [1.5-1.6: parse error, unexpected '+', expecting "number" or '-' or '('
 1.15-1.16: parse error, unexpected "number"
 calc: error: 0 != 1])