X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/f6857bbf8c40df05d7c7324cf41ced6d1961ca89..4b7a4c1b1c8c18e9ad2517c117442b9b7d7e671a:/src/symlist.c?ds=sidebyside diff --git a/src/symlist.c b/src/symlist.c index c5c26272..74cbe8b6 100644 --- a/src/symlist.c +++ b/src/symlist.c @@ -1,23 +1,22 @@ /* Lists of symbols for Bison - Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2006, 2007, 2009 Free Software Foundation, + Inc. 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" @@ -37,7 +36,7 @@ symbol_list_sym_new (symbol *sym, location loc) res->content_type = SYMLIST_SYMBOL; res->content.sym = sym; - res->location = loc; + res->location = res->sym_loc = loc; res->midrule = NULL; res->midrule_parent_rule = NULL; @@ -49,6 +48,8 @@ symbol_list_sym_new (symbol *sym, location loc) res->dprec = 0; res->merger = 0; + res->named_ref = NULL; + res->next = NULL; return res; @@ -66,7 +67,8 @@ symbol_list_type_new (uniqstr type_name, location loc) res->content_type = SYMLIST_TYPE; res->content.type_name = type_name; - res->location = loc; + res->location = res->sym_loc = loc; + res->named_ref = NULL; res->next = NULL; return res; @@ -83,7 +85,8 @@ symbol_list_default_tagged_new (location loc) symbol_list *res = xmalloc (sizeof *res); res->content_type = SYMLIST_DEFAULT_TAGGED; - res->location = loc; + res->location = res->sym_loc = loc; + res->named_ref = NULL; res->next = NULL; return res; @@ -100,7 +103,8 @@ symbol_list_default_tagless_new (location loc) symbol_list *res = xmalloc (sizeof *res); res->content_type = SYMLIST_DEFAULT_TAGLESS; - res->location = loc; + res->location = res->sym_loc = loc; + res->named_ref = NULL; res->next = NULL; return res; @@ -143,7 +147,14 @@ symbol_list_prepend (symbol_list *list, symbol_list *node) void symbol_list_free (symbol_list *list) { - LIST_FREE (symbol_list, list); + symbol_list *node, *next; + for (node = list; node; node = next) + { + next = node->next; + if (node->named_ref) + named_ref_free (node->named_ref); + free (node); + } } @@ -205,29 +216,33 @@ symbol_list_n_type_name_get (symbol_list *l, location loc, int n) return l->content.sym->type_name; } +bool +symbol_list_null (symbol_list *node) +{ + return !node || + (node->content_type == SYMLIST_SYMBOL && !(node->content.sym)); +} void -symbol_list_destructor_set (symbol_list *node, char const *code, - 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); - code = destructor.code; switch (node->content_type) { case SYMLIST_SYMBOL: - symbol_destructor_set (node->content.sym, code, loc); + symbol_destructor_set (node->content.sym, &destructor); break; case SYMLIST_TYPE: semantic_type_destructor_set ( - semantic_type_get (node->content.type_name), code, loc); + semantic_type_get (node->content.type_name), &destructor); break; case SYMLIST_DEFAULT_TAGGED: - default_tagged_destructor_set (code, loc); + default_tagged_destructor_set (&destructor); break; case SYMLIST_DEFAULT_TAGLESS: - default_tagless_destructor_set (code, loc); + default_tagless_destructor_set (&destructor); break; } } @@ -238,21 +253,20 @@ 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); - code = printer.code; switch (node->content_type) { case SYMLIST_SYMBOL: - symbol_printer_set (node->content.sym, code, loc); + symbol_printer_set (node->content.sym, &printer); break; case SYMLIST_TYPE: semantic_type_printer_set ( - semantic_type_get (node->content.type_name), code, loc); + semantic_type_get (node->content.type_name), &printer); break; case SYMLIST_DEFAULT_TAGGED: - default_tagged_printer_set (code, loc); + default_tagged_printer_set (&printer); break; case SYMLIST_DEFAULT_TAGLESS: - default_tagless_printer_set (code, loc); + default_tagless_printer_set (&printer); break; } }