X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/b37acfe18c54a04afb3093a145fe99668962889d..3eb82471faaf77cb1d0677d6bf7c0e65f432519e:/src/symlist.c?ds=sidebyside diff --git a/src/symlist.c b/src/symlist.c index e00814ed..299bfcbe 100644 --- a/src/symlist.c +++ b/src/symlist.c @@ -1,6 +1,6 @@ /* Lists of symbols for Bison - Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 2002, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of Bison, the GNU Compiler Compiler. @@ -31,19 +31,19 @@ `--------------------------------------*/ symbol_list * -symbol_list_new (symbol *sym, location loc) +symbol_list_sym_new (symbol *sym, location loc) { symbol_list *res = xmalloc (sizeof *res); - res->sym = sym; + res->content_type = SYMLIST_SYMBOL; + res->content.sym = sym; res->location = loc; res->midrule = NULL; 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; @@ -55,39 +55,90 @@ symbol_list_new (symbol *sym, location loc) } -/*------------------. -| Print this list. | -`------------------*/ +/*--------------------------------------------. +| Create a list containing TYPE_NAME at LOC. | +`--------------------------------------------*/ + +symbol_list * +symbol_list_type_new (uniqstr type_name, location loc) +{ + symbol_list *res = xmalloc (sizeof *res); + + res->content_type = SYMLIST_TYPE; + res->content.type_name = type_name; + res->location = loc; + res->next = NULL; + + return res; +} + + +/*----------------------------------------. +| Create a list containing a <*> at LOC. | +`----------------------------------------*/ + +symbol_list * +symbol_list_default_tagged_new (location loc) +{ + symbol_list *res = xmalloc (sizeof *res); + + res->content_type = SYMLIST_DEFAULT_TAGGED; + res->location = loc; + res->next = NULL; + + return res; +} + + +/*---------------------------------------. +| Create a list containing a <> at LOC. | +`---------------------------------------*/ + +symbol_list * +symbol_list_default_tagless_new (location loc) +{ + symbol_list *res = xmalloc (sizeof *res); + + res->content_type = SYMLIST_DEFAULT_TAGLESS; + res->location = loc; + res->next = NULL; + + return res; +} + + +/*-----------------------------------------------------------------------. +| Print this list, for which every content_type must be SYMLIST_SYMBOL. | +`-----------------------------------------------------------------------*/ void -symbol_list_print (const symbol_list *l, FILE *f) +symbol_list_syms_print (const symbol_list *l, FILE *f) { - for (/* Nothing. */; l && l->sym; l = l->next) + for (/* Nothing. */; l && l->content.sym; l = l->next) { - symbol_print (l->sym, f); - fprintf (stderr, l->used ? " used" : " unused"); - if (l && l->sym) + symbol_print (l->content.sym, f); + fprintf (stderr, l->action_props.is_value_used ? " used" : " unused"); + if (l && l->content.sym) fprintf (f, ", "); } } -/*---------------------------------. -| Prepend SYM at LOC to the LIST. | -`---------------------------------*/ +/*---------------------------. +| Prepend NODE to the LIST. | +`---------------------------*/ symbol_list * -symbol_list_prepend (symbol_list *list, symbol *sym, location loc) +symbol_list_prepend (symbol_list *list, symbol_list *node) { - symbol_list *res = symbol_list_new (sym, loc); - res->next = list; - return res; + node->next = list; + return node; } -/*-------------------------------------------------. -| Free the LIST, but not the symbols it contains. | -`-------------------------------------------------*/ +/*-----------------------------------------------. +| Free the LIST, but not the items it contains. | +`-----------------------------------------------*/ void symbol_list_free (symbol_list *list) @@ -104,15 +155,17 @@ int symbol_list_length (symbol_list const *l) { int res = 0; - for (/* Nothing. */; l && l->sym; l = l->next) + for (/* Nothing. */; + l && !(l->content_type == SYMLIST_SYMBOL && l->content.sym == NULL); + l = l->next) ++res; return res; } -/*--------------------------------. -| Get symbol N in symbol list L. | -`--------------------------------*/ +/*------------------------------. +| Get item N in symbol list L. | +`------------------------------*/ symbol_list * symbol_list_n_get (symbol_list *l, int n) @@ -125,7 +178,8 @@ symbol_list_n_get (symbol_list *l, int n) for (i = 0; i < n; ++i) { l = l->next; - if (l == NULL || l->sym == NULL) + if (l == NULL + || (l->content_type == SYMLIST_SYMBOL && l->content.sym == NULL)) return NULL; } @@ -147,18 +201,55 @@ symbol_list_n_type_name_get (symbol_list *l, location loc, int n) complain_at (loc, _("invalid $ value: $%d"), n); return NULL; } - return l->sym->type_name; + aver (l->content_type == SYMLIST_SYMBOL); + return l->content.sym->type_name; } -/*----------------------------------------. -| The symbol N in symbol list L is USED. | -`----------------------------------------*/ +void +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); + break; + case SYMLIST_TYPE: + semantic_type_destructor_set ( + semantic_type_get (node->content.type_name), &destructor); + break; + case SYMLIST_DEFAULT_TAGGED: + default_tagged_destructor_set (&destructor); + break; + case SYMLIST_DEFAULT_TAGLESS: + default_tagless_destructor_set (&destructor); + break; + } +} void -symbol_list_n_used_set (symbol_list *l, int n, bool used) +symbol_list_printer_set (symbol_list *node, char const *code, location loc) { - l = symbol_list_n_get (l, n); - if (l) - l->used = used; + 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); + break; + case SYMLIST_TYPE: + semantic_type_printer_set ( + semantic_type_get (node->content.type_name), &printer); + break; + case SYMLIST_DEFAULT_TAGGED: + default_tagged_printer_set (&printer); + break; + case SYMLIST_DEFAULT_TAGLESS: + default_tagless_printer_set (&printer); + break; + } }