mirror of
https://git.savannah.gnu.org/git/bison.git
synced 2026-03-11 05:13:04 +00:00
* 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.
This commit is contained in:
@@ -27,8 +27,8 @@
|
||||
typedef struct merger_list
|
||||
{
|
||||
struct merger_list* next;
|
||||
const char* name;
|
||||
const char* type;
|
||||
struniq_t name;
|
||||
struniq_t type;
|
||||
}
|
||||
merger_list;
|
||||
|
||||
@@ -76,7 +76,7 @@ void grammar_rule_end (location_t l);
|
||||
void grammar_midrule_action (void);
|
||||
void grammar_current_rule_prec_set (symbol_t *precsym, location_t l);
|
||||
void grammar_current_rule_dprec_set (int dprec, location_t l);
|
||||
void grammar_current_rule_merge_set (const char* name, location_t l);
|
||||
void grammar_current_rule_merge_set (struniq_t name, location_t l);
|
||||
|
||||
void grammar_current_rule_symbol_append (symbol_t *symbol, location_t l);
|
||||
void grammar_current_rule_action_append (const char *action, location_t l);
|
||||
|
||||
Reference in New Issue
Block a user