Future/bison
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/bison.git synced 2026-03-18 08:43:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

maint: be compilable with GCC 4.0

Browse Source 
The "shadows a global declaration" warning in GCC 4.0 was a bit
annoying.  It does not like that a type name be used in a prototype of
a function (not the implementation, just the declaration):

  In file included from src/LR0.c:38:
  src/reader.h:56: warning: declaration of 'named_ref' shadows a
                            global declaration
  src/named-ref.h:35: warning: shadowed declaration is here

It does not like either when a global variable name is used in a
prototype.  Flex 2.5.37 generates this prototype:

  void gram_set_debug (int debug_flag  );

* src/getargs.h, src/getargs.c (debug_flag): Rename as...
(debug): this.
Adjust dependencies.
* src/reader.h: Don't use "named_ref" as a formal argument name.
This commit is contained in:
Akim Demaille
2012-10-26 14:16:29 +02:00
parent 54dccdb2ca
commit e0992e5458
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/getargs.c
View File

@@ -49,7 +49,7 @@
#include "quote.h" #include "quote.h"
#include "uniqstr.h" #include "uniqstr.h"
bool debug_flag; bool debug;
bool defines_flag; bool defines_flag;
bool graph_flag; bool graph_flag;
bool xml_flag; bool xml_flag;
@@ -664,7 +664,7 @@ getargs (int argc, char *argv[])
break; break;
case 't': case 't':
debug_flag = true; debug = true;
break; break;
case 'v': case 'v':

2
src/getargs.h
View File

@@ -34,7 +34,7 @@ extern int skeleton_prio;
/* for -I */ /* for -I */
extern char const *include; extern char const *include;
extern bool debug_flag; /* for -t */ extern bool debug; /* for -t */
extern bool defines_flag; /* for -d */ extern bool defines_flag; /* for -d */
extern bool graph_flag; /* for -g */ extern bool graph_flag; /* for -g */
extern bool xml_flag; /* for -x */ extern bool xml_flag; /* for -x */

2
src/output.c
View File

@@ -628,7 +628,7 @@ prepare (void)
use_push_for_pull_flag = true; use_push_for_pull_flag = true;
/* Flags. */ /* Flags. */
MUSCLE_INSERT_BOOL ("debug_flag", debug_flag); MUSCLE_INSERT_BOOL ("debug_flag", debug);
MUSCLE_INSERT_BOOL ("defines_flag", defines_flag); MUSCLE_INSERT_BOOL ("defines_flag", defines_flag);
MUSCLE_INSERT_BOOL ("error_verbose_flag", error_verbose); MUSCLE_INSERT_BOOL ("error_verbose_flag", error_verbose);
MUSCLE_INSERT_BOOL ("glr_flag", glr_parser); MUSCLE_INSERT_BOOL ("glr_flag", glr_parser);

2
src/parse-gram.y
View File

@@ -252,7 +252,7 @@ prologue_declaration:
plain_code.code, @1); plain_code.code, @1);
code_scanner_last_string_free (); code_scanner_last_string_free ();
} }
| "%debug" { debug_flag = true; } | "%debug" { debug = true; }
| "%define" variable content.opt | "%define" variable content.opt
{ {
muscle_percent_define_insert ($2, @2, $3, muscle_percent_define_insert ($2, @2, $3,

4
src/reader.h
View File

@@ -51,9 +51,9 @@ void grammar_current_rule_prec_set (symbol *precsym, location loc);
void grammar_current_rule_dprec_set (int dprec, location loc); void grammar_current_rule_dprec_set (int dprec, location loc);
void grammar_current_rule_merge_set (uniqstr name, location loc); void grammar_current_rule_merge_set (uniqstr name, location loc);
void grammar_current_rule_symbol_append (symbol *sym, location loc, void grammar_current_rule_symbol_append (symbol *sym, location loc,
named_ref *named_ref); named_ref *nref);
void grammar_current_rule_action_append (const char *action, location loc, void grammar_current_rule_action_append (const char *action, location loc,
named_ref *named_ref); named_ref *nref);
void reader (void); void reader (void);
void free_merger_functions (void); void free_merger_functions (void);