X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/28e52c0d622b3017e14d2cf2e526238aa2cfd6ef..4654b0c0a8a355e7a8fcdf51b1a5eb6c485126f1:/src/symlist.c diff --git a/src/symlist.c b/src/symlist.c index 43ed86c8..6c6b57da 100644 --- a/src/symlist.c +++ b/src/symlist.c @@ -4,20 +4,18 @@ This file is part of Bison, the GNU Compiler Compiler. - Bison is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Bison is distributed in the hope that it will be useful, + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with Bison; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include #include "system.h" @@ -43,8 +41,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 +115,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 +205,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; } }