X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/28e52c0d622b3017e14d2cf2e526238aa2cfd6ef..c1d19e10c32844d17122b473840752003521d21b:/src/symlist.c?ds=sidebyside diff --git a/src/symlist.c b/src/symlist.c index 43ed86c8..299bfcbe 100644 --- a/src/symlist.c +++ b/src/symlist.c @@ -43,8 +43,7 @@ symbol_list_sym_new (symbol *sym, location loc) res->midrule_parent_rule = NULL; res->midrule_parent_rhs_index = 0; - res->action = NULL; - res->used = false; + code_props_none_init (&res->action_props); res->ruleprec = NULL; res->dprec = 0; @@ -118,7 +117,7 @@ symbol_list_syms_print (const symbol_list *l, FILE *f) for (/* Nothing. */; l && l->content.sym; l = l->next) { symbol_print (l->content.sym, f); - fprintf (stderr, l->used ? " used" : " unused"); + fprintf (stderr, l->action_props.is_value_used ? " used" : " unused"); if (l && l->content.sym) fprintf (f, ", "); } @@ -208,44 +207,49 @@ symbol_list_n_type_name_get (symbol_list *l, location loc, int n) void -symbol_list_destructor_set (symbol_list *node, const char *destructor, - location loc) +symbol_list_destructor_set (symbol_list *node, char const *code, location loc) { + code_props destructor; + code_props_symbol_action_init (&destructor, code, loc); + code_props_translate_code (&destructor); switch (node->content_type) { case SYMLIST_SYMBOL: - symbol_destructor_set (node->content.sym, destructor, loc); + symbol_destructor_set (node->content.sym, &destructor); break; case SYMLIST_TYPE: semantic_type_destructor_set ( - semantic_type_get (node->content.type_name), destructor, loc); + semantic_type_get (node->content.type_name), &destructor); break; case SYMLIST_DEFAULT_TAGGED: - default_tagged_destructor_set (destructor, loc); + default_tagged_destructor_set (&destructor); break; case SYMLIST_DEFAULT_TAGLESS: - default_tagless_destructor_set (destructor, loc); + default_tagless_destructor_set (&destructor); break; } } void -symbol_list_printer_set (symbol_list *node, const char *printer, location loc) +symbol_list_printer_set (symbol_list *node, char const *code, location loc) { + code_props printer; + code_props_symbol_action_init (&printer, code, loc); + code_props_translate_code (&printer); switch (node->content_type) { case SYMLIST_SYMBOL: - symbol_printer_set (node->content.sym, printer, loc); + symbol_printer_set (node->content.sym, &printer); break; case SYMLIST_TYPE: semantic_type_printer_set ( - semantic_type_get (node->content.type_name), printer, loc); + semantic_type_get (node->content.type_name), &printer); break; case SYMLIST_DEFAULT_TAGGED: - default_tagged_printer_set (printer, loc); + default_tagged_printer_set (&printer); break; case SYMLIST_DEFAULT_TAGLESS: - default_tagless_printer_set (printer, loc); + default_tagless_printer_set (&printer); break; } }