* tests/local.at (_AT_BISON_OPTION_PUSHDEFS): Do not use

local variables whose names begin with 'yy'.
* tests/calc.at (_AT_DATA_CALC_Y): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 49c6d26cf9e0fa2f7baff7ff14f19f9ea16dcf16..83e36b09beae27ab474182bcafbde10db7698d44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-09-21  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * tests/local.at (_AT_BISON_OPTION_PUSHDEFS): Do not use
+       local variables whose names begin with 'yy'.
+       * tests/calc.at (_AT_DATA_CALC_Y): Likewise.
+       Trivial changes from Joel E. Denny.
+
        * bootstrap (gnulib_modules): Remove alloca.  Bison doesn't need
        it itself.
        * src/main.c (main) [C_ALLOCA]: Don't flush alloca'ed memory; we

diff --git a/tests/calc.at b/tests/calc.at
index c09aac7f3669b933f4affaadfcb92dbf1dbc84b0..913a13ae916bb614d5df51248281ab02bfcf5224 100644 (file)
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -72,7 +72,7 @@ static int power (int base, int exponent);
 [/* yyerror receives the location if:
    - %location & %pure & %glr
    - %location & %pure & %yacc & %parse-param. */
-static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])
+static void yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ])
                      AT_PARAM_IF([semantic_value *result, int *count, ])
                      const char *s
                      );])[
@@ -145,7 +145,7 @@ yyparse (AT_PARAM_IF([semantic_value *result, int *count]))
 }
 ],
 [static void
-yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *yylloc, ])
+yyerror (AT_YYERROR_ARG_LOC_IF([YYLTYPE *llocp, ])
          AT_PARAM_IF([semantic_value *result, int *count, ])
          const char *s)
 {

diff --git a/tests/local.at b/tests/local.at
index 3c78dd00b978951847fb8dbb9bfe91886081bd47..4f065abcdae408f3330250c384814f40d7e280e6 100644 (file)
--- a/tests/local.at
+++ b/tests/local.at
@@ -79,14 +79,14 @@ m4_pushdef([AT_PURE_LEX_IF],
             [AT_LALR1_CC_IF([$1], [$2])])])
 
 AT_PURE_LEX_IF(
-[m4_pushdef([AT_LOC], [(*yylloc)])
- m4_pushdef([AT_VAL], [(*yylval)])
+[m4_pushdef([AT_LOC], [(*llocp)])
+ m4_pushdef([AT_VAL], [(*lvalp)])
  m4_pushdef([AT_LEX_FORMALS],
-            [YYSTYPE *yylval[]AT_LOCATION_IF([, YYLTYPE *yylloc])])
+            [YYSTYPE *lvalp[]AT_LOCATION_IF([, YYLTYPE *llocp])])
  m4_pushdef([AT_LEX_ARGS],
-            [yylval[]AT_LOCATION_IF([, yylloc])])
+            [lvalp[]AT_LOCATION_IF([, llocp])])
  m4_pushdef([AT_USE_LEX_ARGS],
-            [(void) yylval;AT_LOCATION_IF([(void) yylloc])])
+            [(void) lvalp;AT_LOCATION_IF([(void) llocp])])
  m4_pushdef([AT_LEX_PRE_FORMALS],
             [AT_LEX_FORMALS, ])
  m4_pushdef([AT_LEX_PRE_ARGS],