X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/c85541913b99f841de090aacf626bb8f52f7f727..75ae8299840bbd854fa2474d38402bbb933c6511:/src/symlist.c diff --git a/src/symlist.c b/src/symlist.c index 2bbedb58..50915c18 100644 --- a/src/symlist.c +++ b/src/symlist.c @@ -1,6 +1,6 @@ /* Lists of symbols for Bison - Copyright (C) 2002, 2005-2007, 2009-2012 Free Software Foundation, + Copyright (C) 2002, 2005-2007, 2009-2013 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -36,18 +36,20 @@ symbol_list_sym_new (symbol *sym, location loc) res->content_type = SYMLIST_SYMBOL; res->content.sym = sym; res->location = res->sym_loc = loc; + res->named_ref = NULL; res->midrule = NULL; res->midrule_parent_rule = NULL; res->midrule_parent_rhs_index = 0; - code_props_none_init (&res->action_props); - + /* Members used for LHS only. */ res->ruleprec = NULL; + res->percent_empty_loc = empty_location; + code_props_none_init (&res->action_props); res->dprec = 0; + res->dprec_location = empty_location; res->merger = 0; - - res->named_ref = NULL; + res->merger_declaration_location = empty_location; res->next = NULL; @@ -85,12 +87,17 @@ symbol_list_type_new (uniqstr type_name, location loc) void symbol_list_syms_print (const symbol_list *l, FILE *f) { + char const *sep = ""; for (/* Nothing. */; l && l->content.sym; l = l->next) { + fputs (sep, f); + fputs (l->content_type == SYMLIST_SYMBOL ? "symbol: " + : l->content_type == SYMLIST_TYPE ? "type: " + : "invalid content_type: ", + f); symbol_print (l->content.sym, f); - fprintf (stderr, l->action_props.is_value_used ? " used" : " unused"); - if (l && l->content.sym) - fprintf (f, ", "); + fputs (l->action_props.is_value_used ? " used" : " unused", f); + sep = ", "; } } @@ -107,6 +114,23 @@ symbol_list_prepend (symbol_list *list, symbol_list *node) } +/*-------------------------. +| Append NODE to the LIST. | +`-------------------------*/ + +symbol_list * +symbol_list_append (symbol_list *list, symbol_list *node) +{ + if (!list) + return node; + symbol_list *next = list; + while (next->next) + next = next->next; + next->next = node; + return list; +} + + /*-----------------------------------------------. | Free the LIST, but not the items it contains. | `-----------------------------------------------*/ @@ -119,6 +143,8 @@ symbol_list_free (symbol_list *list) { next = node->next; named_ref_free (node->named_ref); + if (node->content_type == SYMLIST_TYPE) + free (node->content.sem_type); free (node); } } @@ -175,7 +201,7 @@ symbol_list_n_type_name_get (symbol_list *l, location loc, int n) l = symbol_list_n_get (l, n); if (!l) { - complain_at (loc, complaint, _("invalid $ value: $%d"), n); + complain (&loc, complaint, _("invalid $ value: $%d"), n); return NULL; } aver (l->content_type == SYMLIST_SYMBOL); @@ -195,18 +221,18 @@ symbol_list_code_props_set (symbol_list *node, code_props_type kind, { switch (node->content_type) { - case SYMLIST_SYMBOL: - symbol_code_props_set (node->content.sym, kind, cprops); - if (node->content.sym->status == undeclared) - node->content.sym->status = used; - break; - case SYMLIST_TYPE: - semantic_type_code_props_set - (semantic_type_get (node->content.sem_type->tag, - &node->content.sem_type->location), - kind, cprops); - if (node->content.sem_type->status == undeclared) - node->content.sem_type->status = used; - break; + case SYMLIST_SYMBOL: + symbol_code_props_set (node->content.sym, kind, cprops); + if (node->content.sym->status == undeclared) + node->content.sym->status = used; + break; + case SYMLIST_TYPE: + semantic_type_code_props_set + (semantic_type_get (node->content.sem_type->tag, + &node->content.sem_type->location), + kind, cprops); + if (node->content.sem_type->status == undeclared) + node->content.sem_type->status = used; + break; } }