* tests/calc.at (_AT_DATA_CALC_Y): Also use %union.

In addition, put a comment in there, to replace...
* tests/regression.at (%union and C comments): Remove.

diff --git a/ChangeLog b/ChangeLog
index d9624264afde19142c724f53f5eb339c96724f9e..381981295967537f1bb9502aeb04f80c52835d10 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-29  Akim Demaille  <akim@epita.fr>
+
+       * tests/calc.at (_AT_DATA_CALC_Y): Also use %union.
+       In addition, put a comment in there, to replace...
+       * tests/regression.at (%union and C comments): Remove.
+
+       
 2001-12-29  Akim Demaille  <akim@epita.fr>
 
        * tests/regression.at (Web2c Actions): Blindly move the actual

diff --git a/tests/calc.at b/tests/calc.at
index db308dfdb699865fdda859874c2c480dd7c12a4b..d12fffc9c9a66e1f08940ea882e282873c214f1e 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -63,9 +63,16 @@ static void yyungetc (int c);
 extern void perror (const char *s);
 %}
 
+/* Also exercise %union. */
+%union
+{
+  int ival; /* A comment to exercise an old bug. */
+};
+
 /* Bison Declarations */
 %token CALC_EOF 0 "end of file"
-%token NUM "number"
+%token <ival> NUM "number"
+%type  <ival> exp
 
 %nonassoc '=' /* comparison           */
 %left '-' '+'
@@ -84,7 +91,7 @@ input:
 
 line:
   '\n'
-| exp '\n'
+| exp '\n' {}
 ;
 
 exp:
@@ -205,7 +212,7 @@ yylex (void)
   if (c == '.' || isdigit (c))
     {
       yyungetc (c);
-      yylval = read_signed_integer ();
+      yylval.ival = read_signed_integer ();
       return NUM;
     }
 

diff --git a/tests/regression.at b/tests/regression.at
index d6c2fca37d274f0110f54a31293509b7ea18986f..9d55cf64dc52ec81013ed6c841962307a31419d3 100644 (file)
--- a/tests/regression.at
+++ b/tests/regression.at
@@ -500,29 +500,6 @@ AT_CHECK([bison --defines input.y])
 AT_CLEANUP
 
 
-## --------------------------------------- ##
-## Duplicate '/' in C comments in %union   ##
-## --------------------------------------- ##
-
-
-AT_SETUP([%union and C comments])
-
-AT_DATA([input.y],
-[%union
-{
-  /* The int.  */      int   integer;
-  /* The string.  */   char *string ;
-}
-%%
-exp: {};
-])
-
-AT_CHECK([bison input.y -o input.c])
-AT_CHECK([fgrep '//*' input.c], [1], [])
-
-AT_CLEANUP
-
-
 ## ----------------- ##
 ## Invalid input 1.  ##
 ## ----------------- ##