Merge remote-tracking branch 'origin/maint'

[bison.git] / src / symlist.c

diff --git a/src/symlist.c b/src/symlist.c
index 48828315304f0bc99bf4ae5828938f2de24b4277..196db4c855f29fa3b0803bef823158a67054d298 100644 (file)
--- a/src/symlist.c
+++ b/src/symlist.c
@@ -24,7 +24,6 @@
 #include "complain.h"
 #include "symlist.h"
 
-
 /*--------------------------------------.
 | Create a list containing SYM at LOC.  |
 `--------------------------------------*/
@@ -79,42 +78,6 @@ symbol_list_type_new (uniqstr type_name, location loc)
 }
 
 
-/*----------------------------------------.
-| 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;
-}
-
-
-/*---------------------------------------.
-| 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.  |
 `-----------------------------------------------------------------------*/
@@ -212,7 +175,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, _("invalid $ value: $%d"), n);
+      complain (&loc, complaint, _("invalid $ value: $%d"), n);
       return NULL;
     }
   aver (l->content_type == SYMLIST_SYMBOL);
@@ -228,31 +191,22 @@ symbol_list_null (symbol_list *node)
 
 void
 symbol_list_code_props_set (symbol_list *node, code_props_type kind,
-                            location loc, char const *code)
+                            code_props const *cprops)
 {
-  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;
+    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;
     }
 }