diff options
| author | Akim Demaille <akim@epita.fr> | 2002-11-12 08:05:59 +0000 |
|---|---|---|
| committer | Akim Demaille <akim@epita.fr> | 2002-11-12 08:05:59 +0000 |
| commit | 95612cfa608188fc323ed3f8560cc6aea953ff32 (patch) | |
| tree | 12a234c248b5a4e072d0926fbac4f982b6e9f2ba /src/complain.c | |
| parent | 3e6656f9ab66ae7e629f8e5d5b41810bf070f09d (diff) | |
| download | bison-95612cfa608188fc323ed3f8560cc6aea953ff32.tar.gz | |
* src/struniq.h, src/struniq.c (struniq_t): Is const.
(STRUNIQ_EQ, struniq_assert, struniq_assert_p): New.
Use struniq for symbols.
* src/symtab.h (symbol_t): The tag member is a struniq.
(symbol_type_set): Adjust.
* src/symtab.c (symbol_new): Takes a struniq.
(symbol_free): Don't free the tag member.
(hash_compare_symbol_t, hash_symbol_t): Rename as...
(hash_compare_symbol, hash_symbol): these.
Use the fact that tags as struniqs.
(symbol_get): Use struniq_new.
* src/symlist.h, src/symlist.c (symbol_list_n_type_name_get):
Returns a strniq.
* src/reader.h (merger_list, grammar_currentmerge_set): The name
and type members are struniqs.
* src/reader.c (get_merge_function)
(grammar_current_rule_merge_set): Adjust.
(TYPE, current_type): Are struniq.
Use struniq for file names.
* src/files.h, src/files.c (infile): Split into...
(grammar_file, current_file): these.
* src/scan-gram.c (YY_USER_INIT, handle_syncline): Adjust.
* src/reduce.c (reduce_print): Likewise.
* src/getargs.c (getargs): Likewise.
* src/complain.h, src/complain.c: Likewise.
* src/main.c (main): Call struniqs_new early enough to use it for
file names.
Don't free the input file name.
Diffstat (limited to 'src/complain.c')
| -rw-r--r-- | src/complain.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/complain.c b/src/complain.c index 7adff368..7d2f0c55 100644 --- a/src/complain.c +++ b/src/complain.c @@ -117,7 +117,7 @@ warn (const char *message, ...) va_list args; fflush (stdout); - fprintf (stderr, "%s: %s", infile ? infile : program_name, _("warning: ")); + fprintf (stderr, "%s: %s", current_file ? current_file : program_name, _("warning: ")); va_start (args, message); vfprintf (stderr, message, args); @@ -156,7 +156,7 @@ complain (const char *message, ...) va_list args; fflush (stdout); - fprintf (stderr, "%s: ", infile ? infile : program_name); + fprintf (stderr, "%s: ", current_file ? current_file : program_name); va_start (args, message); vfprintf (stderr, message, args); @@ -195,7 +195,7 @@ fatal (const char *message, ...) va_list args; fflush (stdout); - fprintf (stderr, "%s: ", infile ? infile : program_name); + fprintf (stderr, "%s: ", current_file ? current_file : program_name); fputs (_("fatal error: "), stderr); |