* src/parse-gram.y: Fix minor problems uncovered by lint.

(current_lhs, current_lhs_location): Now static.
(current_assoc): Remove unused variable.

diff --git a/ChangeLog b/ChangeLog
index 474cc80c28494cc634bad99b36b3993af248d9e9..5d03a68f8445fc4359c75d6a116d7ecd7201cbd8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2005-12-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * src/parse-gram.y: Fix minor problems uncovered by lint.
+       (current_lhs, current_lhs_location): Now static.
+       (current_assoc): Remove unused variable.
+
+       Cleanups so that Bison-generated parsers have less lint.
+       * data/c.m4 (b4_yydestruct_generate, b4_yysymprint_generate):
+       Prepend /*ARGSUSED*/, for lint's sake.
+       * data/glr.c (YYUSE): Properly parenthesize, and use an alternate
+       definition if 'lint' is defined.
+       (YYID): New macro (or function, if lint).
+       All uses of /*CONSTCOND*/0 replaced by YYID(0).
+       * data/yacc.c: Likewise.
+       * data/glr.c (yyuserAction, yyuserMerge, yy_reduce_print):
+       (yyrecoverSyntaxError): Prepend /*ARGSUSED*/.
+       * data/glr.cc (YYLLOC_DEFAULT): Omit /*CONSTCOND*/ since this code
+       is C++ only.
+       * data/lalr1.cc (YYUSE): Just use a cast, since this code is C++ only.
+       * data/yacc.c (YYSTACK_FREE) [defined YYSTACK_ALLOC]:
+       Use YYID(0) rather than 0, for lint.
+       (yystrlen): Rewrite to avoid lint warning about ptrdiff_t overflow.
+       (yysyntax_error): Rewrite to avoid lint warnings about parenthesization.
+

 2005-12-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        * tests/glr-regression.at
 2005-12-07  Paul Eggert  <eggert@cs.ucla.edu>
 
        * tests/glr-regression.at

diff --git a/src/parse-gram.y b/src/parse-gram.y
index 57e13de30ba205c4900d90974b79bcc741e185b5..bf6af663ba2ffc560232c617da98f7a6e0b28580 100644 (file)
--- a/src/parse-gram.y
+++ b/src/parse-gram.y
@@ -53,9 +53,8 @@ static void add_param (char const *, char *, location);
 
 static symbol_class current_class = unknown_sym;
 static uniqstr current_type = 0;
 
 static symbol_class current_class = unknown_sym;
 static uniqstr current_type = 0;

-symbol *current_lhs;
-location current_lhs_location;
-assoc current_assoc;
+static symbol *current_lhs;
+static location current_lhs_location;

 static int current_prec = 0;
 %}
 
 static int current_prec = 0;
 %}