X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3ebecc240d845191154734074e64dc9d15cb1daa..75ae8299840bbd854fa2474d38402bbb933c6511:/src/symlist.c?ds=sidebyside
diff --git a/src/symlist.c b/src/symlist.c
index 40dc5132..50915c18 100644
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,23 +1,22 @@
/* Lists of symbols for Bison
- Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005-2007, 2009-2013 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"
@@ -25,7 +24,6 @@
#include "complain.h"
#include "symlist.h"
-
/*--------------------------------------.
| Create a list containing SYM at LOC. |
`--------------------------------------*/
@@ -37,18 +35,21 @@ 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->named_ref = NULL;
res->midrule = NULL;
res->midrule_parent_rule = NULL;
res->midrule_parent_rhs_index = 0;
- res->action = NULL;
- res->used = false;
-
+ /* 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->merger_declaration_location = empty_location;
res->next = NULL;
@@ -66,42 +67,13 @@ 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.sem_type = xmalloc (sizeof (semantic_type));
+ res->content.sem_type->tag = type_name;
+ res->content.sem_type->location = loc;
+ res->content.sem_type->status = undeclared;
- res->content_type = SYMLIST_DEFAULT_TAGLESS;
- res->location = loc;
+ res->location = res->sym_loc = loc;
+ res->named_ref = NULL;
res->next = NULL;
return res;
@@ -115,12 +87,17 @@ symbol_list_default_tagless_new (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->used ? " used" : " unused");
- if (l && l->content.sym)
- fprintf (f, ", ");
+ fputs (l->action_props.is_value_used ? " used" : " unused", f);
+ sep = ", ";
}
}
@@ -137,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. |
`-----------------------------------------------*/
@@ -144,7 +138,15 @@ 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;
+ named_ref_free (node->named_ref);
+ if (node->content_type == SYMLIST_TYPE)
+ free (node->content.sem_type);
+ free (node);
+ }
}
@@ -181,7 +183,7 @@ symbol_list_n_get (symbol_list *l, int n)
l = l->next;
if (l == NULL
|| (l->content_type == SYMLIST_SYMBOL && l->content.sym == NULL))
- return NULL;
+ return NULL;
}
return l;
@@ -199,65 +201,38 @@ 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, _("invalid $ value: $%d"), n);
+ complain (&loc, complaint, _("invalid $ value: $%d"), n);
return NULL;
}
aver (l->content_type == SYMLIST_SYMBOL);
return l->content.sym->type_name;
}
-
-/*--------------------------------------.
-| The item N in symbol list L is USED. |
-`--------------------------------------*/
-
-void
-symbol_list_n_used_set (symbol_list *l, int n, bool used)
-{
- l = symbol_list_n_get (l, n);
- if (l)
- l->used = used;
-}
-
-void
-symbol_list_destructor_set (symbol_list *node, const char *destructor,
- location loc)
+bool
+symbol_list_null (symbol_list *node)
{
- switch (node->content_type)
- {
- case SYMLIST_SYMBOL:
- symbol_destructor_set (node->content.sym, destructor, loc);
- break;
- case SYMLIST_TYPE:
- semantic_type_destructor_set (
- semantic_type_get (node->content.type_name), destructor, loc);
- break;
- case SYMLIST_DEFAULT_TAGGED:
- default_tagged_destructor_set (destructor, loc);
- break;
- case SYMLIST_DEFAULT_TAGLESS:
- default_tagless_destructor_set (destructor, loc);
- break;
- }
+ return !node ||
+ (node->content_type == SYMLIST_SYMBOL && !(node->content.sym));
}
void
-symbol_list_printer_set (symbol_list *node, const char *printer, location loc)
+symbol_list_code_props_set (symbol_list *node, code_props_type kind,
+ code_props const *cprops)
{
switch (node->content_type)
{
- case SYMLIST_SYMBOL:
- symbol_printer_set (node->content.sym, printer, loc);
- break;
- case SYMLIST_TYPE:
- semantic_type_printer_set (
- semantic_type_get (node->content.type_name), printer, loc);
- break;
- case SYMLIST_DEFAULT_TAGGED:
- default_tagged_printer_set (printer, loc);
- break;
- case SYMLIST_DEFAULT_TAGLESS:
- default_tagless_printer_set (printer, loc);
- 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;
}
}