X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/dafdc66ff0a0344c390d0f5612e9b469d6855e00..75ae8299840bbd854fa2474d38402bbb933c6511:/src/symlist.c?ds=sidebyside
diff --git a/src/symlist.c b/src/symlist.c
index bdb965d3..50915c18 100644
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -1,66 +1,152 @@
/* Lists of symbols for Bison
- Copyright (C) 2002 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
+#include
#include "system.h"
-#include "symlist.h"
+#include "complain.h"
+#include "symlist.h"
-/*----------------------------------------------.
-| Create a list containing SYMBOL at LOCATION. |
-`----------------------------------------------*/
+/*--------------------------------------.
+| Create a list containing SYM at LOC. |
+`--------------------------------------*/
-symbol_list_t *
-symbol_list_new (symbol_t *sym, location_t location)
+symbol_list *
+symbol_list_sym_new (symbol *sym, location loc)
{
- symbol_list_t *res = XMALLOC (symbol_list_t, 1);
- res->next = NULL;
- res->sym = sym;
- res->location = location;
- res->action = NULL;
+ symbol_list *res = xmalloc (sizeof *res);
+
+ 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;
+
+ /* 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;
+
return res;
}
-/*-----------------------------------------.
-| Prepend SYMBOL at LOCATION to the LIST. |
-`-----------------------------------------*/
+/*--------------------------------------------.
+| Create a list containing TYPE_NAME at LOC. |
+`--------------------------------------------*/
-symbol_list_t *
-symbol_list_prepend (symbol_list_t *list,
- symbol_t *symbol, location_t location)
+symbol_list *
+symbol_list_type_new (uniqstr type_name, location loc)
{
- symbol_list_t *res = symbol_list_new (symbol, location);
- res->next = list;
+ 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;
}
-/*-------------------------------------------------.
-| Free the LIST, but not the symbols it contains. |
-`-------------------------------------------------*/
+/*-----------------------------------------------------------------------.
+| Print this list, for which every content_type must be SYMLIST_SYMBOL. |
+`-----------------------------------------------------------------------*/
void
-symbol_list_free (symbol_list_t *list)
+symbol_list_syms_print (const symbol_list *l, FILE *f)
{
- LIST_FREE (symbol_list_t, list);
+ 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);
+ fputs (l->action_props.is_value_used ? " used" : " unused", f);
+ sep = ", ";
+ }
+}
+
+
+/*---------------------------.
+| Prepend NODE to the LIST. |
+`---------------------------*/
+
+symbol_list *
+symbol_list_prepend (symbol_list *list, symbol_list *node)
+{
+ node->next = list;
+ return 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. |
+`-----------------------------------------------*/
+
+void
+symbol_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);
+ }
}
@@ -68,46 +154,85 @@ symbol_list_free (symbol_list_t *list)
| Return its length. |
`--------------------*/
-unsigned int
-symbol_list_length (symbol_list_t *list)
+int
+symbol_list_length (symbol_list const *l)
{
int res = 0;
- for (/* Nothing. */; list; list = list->next)
+ for (/* Nothing. */;
+ l && !(l->content_type == SYMLIST_SYMBOL && l->content.sym == NULL);
+ l = l->next)
++res;
return res;
}
-/*--------------------------------------------------------------.
-| Get the data type (alternative in the union) of the value for |
-| symbol N in rule RULE. |
-`--------------------------------------------------------------*/
+/*------------------------------.
+| Get item N in symbol list L. |
+`------------------------------*/
-char *
-symbol_list_n_type_name_get (symbol_list_t *rule, location_t location, int n)
+symbol_list *
+symbol_list_n_get (symbol_list *l, int n)
{
int i;
- symbol_list_t *rp;
if (n < 0)
+ return NULL;
+
+ for (i = 0; i < n; ++i)
{
- complain_at (location, _("invalid $ value"));
- return NULL;
+ l = l->next;
+ if (l == NULL
+ || (l->content_type == SYMLIST_SYMBOL && l->content.sym == NULL))
+ return NULL;
}
- rp = rule;
- i = 0;
+ return l;
+}
+
- while (i < n)
+/*--------------------------------------------------------------.
+| Get the data type (alternative in the union) of the value for |
+| symbol N in symbol list L. |
+`--------------------------------------------------------------*/
+
+uniqstr
+symbol_list_n_type_name_get (symbol_list *l, location loc, int n)
+{
+ l = symbol_list_n_get (l, n);
+ if (!l)
{
- rp = rp->next;
- if (rp == NULL || rp->sym == NULL)
- {
- complain_at (location, _("invalid $ value"));
- return NULL;
- }
- ++i;
+ complain (&loc, complaint, _("invalid $ value: $%d"), n);
+ return NULL;
}
+ aver (l->content_type == SYMLIST_SYMBOL);
+ return l->content.sym->type_name;
+}
- return rp->sym->type_name;
+bool
+symbol_list_null (symbol_list *node)
+{
+ return !node ||
+ (node->content_type == SYMLIST_SYMBOL && !(node->content.sym));
+}
+
+void
+symbol_list_code_props_set (symbol_list *node, code_props_type kind,
+ code_props const *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;
+ }
}