X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/378f4bd846c4312ddeb11f151382226e30050d3c..ccdc1577ef7fb32a5e30cb655337e7cd42b98987:/src/symlist.c
diff --git a/src/symlist.c b/src/symlist.c
index a277f36e..1fbc5cbb 100644
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,23 +1,22 @@
/* Lists of symbols for Bison
- Copyright (C) 2002, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2005-2007, 2009-2012 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,70 +24,139 @@
#include "complain.h"
#include "symlist.h"
-
/*--------------------------------------.
| Create a list containing SYM at LOC. |
`--------------------------------------*/
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->location = loc;
+ res->content_type = SYMLIST_SYMBOL;
+ res->content.sym = sym;
+ res->location = res->sym_loc = 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;
res->merger = 0;
+ res->named_ref = NULL;
+
+ res->next = NULL;
+
+ return res;
+}
+
+
+/*--------------------------------------------.
+| 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.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->location = res->sym_loc = loc;
+ res->named_ref = NULL;
+ 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 = res->sym_loc = loc;
+ res->named_ref = NULL;
res->next = NULL;
return res;
}
-/*------------------.
-| Print this list. |
-`------------------*/
+/*---------------------------------------.
+| 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 = res->sym_loc = loc;
+ res->named_ref = NULL;
+ 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)
- fprintf (f, ", ");
+ 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)
{
- LIST_FREE (symbol_list, list);
+ symbol_list *node, *next;
+ for (node = list; node; node = next)
+ {
+ next = node->next;
+ named_ref_free (node->named_ref);
+ free (node);
+ }
}
@@ -96,19 +164,21 @@ symbol_list_free (symbol_list *list)
| Return its length. |
`--------------------*/
-unsigned int
-symbol_list_length (const symbol_list *l)
+int
+symbol_list_length (symbol_list const *l)
{
int res = 0;
- for (/* Nothing. */; l; 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)
@@ -121,8 +191,9 @@ symbol_list_n_get (symbol_list *l, int n)
for (i = 0; i < n; ++i)
{
l = l->next;
- if (l == NULL || l->sym == NULL)
- return NULL;
+ if (l == NULL
+ || (l->content_type == SYMLIST_SYMBOL && l->content.sym == NULL))
+ return NULL;
}
return l;
@@ -140,21 +211,47 @@ 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_at (loc, complaint, _("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. |
-`----------------------------------------*/
+bool
+symbol_list_null (symbol_list *node)
+{
+ return !node ||
+ (node->content_type == SYMLIST_SYMBOL && !(node->content.sym));
+}
void
-symbol_list_n_used_set (symbol_list *l, int n, bool used)
+symbol_list_code_props_set (symbol_list *node, code_props_type kind,
+ location loc, char const *code)
{
- l = symbol_list_n_get (l, n);
- if (l)
- l->used = used;
+ code_props cprops;
+ code_props_symbol_action_init (&cprops, code, loc);
+ code_props_translate_code (&cprops);
+ 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_DEFAULT_TAGGED:
+ default_tagged_code_props_set (kind, &cprops);
+ break;
+ case SYMLIST_DEFAULT_TAGLESS:
+ default_tagless_code_props_set (kind, &cprops);
+ break;
+ }
}