build: ship all the files, even if the C++ compiler is broken

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index e48c11e593804557ccc9d4f3ea1a9682ea4c2775..1c2372c12f05e7c75f7d79ea1daba4bb8e5766e1 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -153,13 +153,13 @@ symbol_print (symbol const *s, FILE *f)
 {
   if (s)
     {
 {
   if (s)
     {

-      fprintf (f, "\"%s\"", s->tag);
+      fputs (s->tag, f);

       SYMBOL_ATTR_PRINT (type_name);
       SYMBOL_CODE_PRINT (destructor);
       SYMBOL_CODE_PRINT (printer);
     }
   else
       SYMBOL_ATTR_PRINT (type_name);
       SYMBOL_CODE_PRINT (destructor);
       SYMBOL_CODE_PRINT (printer);
     }
   else

-    fprintf (f, "<NULL>");
+    fputs ("<NULL>", f);

 }
 
 #undef SYMBOL_ATTR_PRINT
 }
 
 #undef SYMBOL_ATTR_PRINT


@@ -243,9 +243,12 @@ symbol_type_set (symbol *sym, uniqstr type_name, location loc)
     {
       if (sym->type_name)
         symbol_redeclaration (sym, "%type", sym->type_location, loc);
     {
       if (sym->type_name)
         symbol_redeclaration (sym, "%type", sym->type_location, loc);

-      uniqstr_assert (type_name);
-      sym->type_name = type_name;
-      sym->type_location = loc;
+      else
+        {
+          uniqstr_assert (type_name);
+          sym->type_name = type_name;
+          sym->type_location = loc;
+        }

     }
 }
 
     }
 }
 


@@ -261,7 +264,8 @@ symbol_code_props_set (symbol *sym, code_props_type kind,
     symbol_redeclaration (sym, code_props_type_string (kind),
                           sym->props[kind].location,
                           code->location);
     symbol_redeclaration (sym, code_props_type_string (kind),
                           sym->props[kind].location,
                           code->location);

-  sym->props[kind] = *code;
+  else
+    sym->props[kind] = *code;

 }
 
 /*-----------------------------------------------------.
 }
 
 /*-----------------------------------------------------.


@@ -277,7 +281,8 @@ semantic_type_code_props_set (semantic_type *type,
     semantic_type_redeclaration (type, code_props_type_string (kind),
                                  type->props[kind].location,
                                  code->location);
     semantic_type_redeclaration (type, code_props_type_string (kind),
                                  type->props[kind].location,
                                  code->location);

-  type->props[kind] = *code;
+  else
+    type->props[kind] = *code;

 }
 
 /*---------------------------------------------------.
 }
 
 /*---------------------------------------------------.


@@ -321,12 +326,15 @@ symbol_precedence_set (symbol *sym, int prec, assoc a, location loc)
 {
   if (a != undef_assoc)
     {
 {
   if (a != undef_assoc)
     {

-      if (sym->prec != 0)
+      if (sym->prec)

         symbol_redeclaration (sym, assoc_to_string (a), sym->prec_location,
                               loc);
         symbol_redeclaration (sym, assoc_to_string (a), sym->prec_location,
                               loc);

-      sym->prec = prec;
-      sym->assoc = a;
-      sym->prec_location = loc;
+      else
+        {
+          sym->prec = prec;
+          sym->assoc = a;
+          sym->prec_location = loc;
+        }

     }
 
   /* Only terminals have a precedence. */
     }
 
   /* Only terminals have a precedence. */


@@ -360,7 +368,8 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
     {
       if (sym->status == declared && !warned)
         complain (&loc, Wother, _("symbol %s redeclared"), sym->tag);
     {
       if (sym->status == declared && !warned)
         complain (&loc, Wother, _("symbol %s redeclared"), sym->tag);

-      sym->status = declared;
+      else
+        sym->status = declared;

     }
 }
 
     }
 }
 


@@ -441,7 +450,7 @@ semantic_type_check_defined (semantic_type *sem_type)
   /* <*> and <> do not have to be "declared".  */
   if (sem_type->status == declared
       || !*sem_type->tag
   /* <*> and <> do not have to be "declared".  */
   if (sem_type->status == declared
       || !*sem_type->tag

-      || STREQ(sem_type->tag, "*"))
+      || STREQ (sem_type->tag, "*"))

     {
       int i;
       for (i = 0; i < 2; ++i)
     {
       int i;
       for (i = 0; i < 2; ++i)


@@ -615,8 +624,8 @@ symbol_translation (symbol *this)
           (this->user_token_number,
            symbols[token_translations[this->user_token_number]],
            this);
           (this->user_token_number,
            symbols[token_translations[this->user_token_number]],
            this);

-
-      token_translations[this->user_token_number] = this->number;
+      else
+        token_translations[this->user_token_number] = this->number;

     }
 
   return true;
     }
 
   return true;


@@ -1057,27 +1066,40 @@ register_precedence (graphid first, graphid snd)
 }
 
 
 }
 
 

-/*--------------------------------------------------.
-| Print a warning for unused precedence relations.  |
-`--------------------------------------------------*/
+/*---------------------------------------.
+| Deep clear a linked / adjacency list). |
+`---------------------------------------*/

 
 

-void
-print_precedence_warnings (void)
+static void
+linkedlist_free (symgraphlink *node)
+{
+  if (node)
+    {
+      while (node->next)
+        {
+          symgraphlink *tmp = node->next;
+          free (node);
+          node = tmp;
+        }
+      free (node);
+    }
+}
+
+/*----------------------------------------------.
+| Clear and destroy association tracking table. |
+`----------------------------------------------*/
+
+static void
+assoc_free (void)

 {
   int i;
 {
   int i;

-  if (!prec_nodes)
-    init_prec_nodes ();

   for (i = 0; i < nsyms; ++i)
     {
   for (i = 0; i < nsyms; ++i)
     {

-      symbol *s = symbols[i];
-      if (s
-          && s->prec != 0
-          && !prec_nodes[i]->pred
-          && !prec_nodes[i]->succ
-          && s->assoc == precedence_assoc)
-        complain (&s->location, Wother,
-                  _("useless precedence for %s"), s->tag);
+      linkedlist_free (prec_nodes[i]->pred);
+      linkedlist_free (prec_nodes[i]->succ);
+      free (prec_nodes[i]);

     }
     }

+  free (prec_nodes);

 }
 
 /*---------------------------------------.
 }
 
 /*---------------------------------------.


@@ -1088,7 +1110,7 @@ static void
 init_assoc (void)
 {
   graphid i;
 init_assoc (void)
 {
   graphid i;

-  used_assoc = xcalloc(nsyms, sizeof(*used_assoc));
+  used_assoc = xcalloc (nsyms, sizeof *used_assoc);

   for (i = 0; i < nsyms; ++i)
     used_assoc[i] = false;
 }
   for (i = 0; i < nsyms; ++i)
     used_assoc[i] = false;
 }


@@ -1119,21 +1141,37 @@ register_assoc (graphid i, graphid j)
   used_assoc[j] = true;
 }
 
   used_assoc[j] = true;
 }
 

-/*------------------------------------------------------.
-| Print a warning for each unused symbol associativity. |
-`------------------------------------------------------*/
+/*--------------------------------------------------.
+| Print a warning for unused precedence relations.  |
+`--------------------------------------------------*/

 
 void
 
 void

-print_assoc_warnings (void)
+print_precedence_warnings (void)

 {
 {

-  graphid i;
+  int i;
+  if (!prec_nodes)
+    init_prec_nodes ();

   if (!used_assoc)
     init_assoc ();
   for (i = 0; i < nsyms; ++i)
     {
       symbol *s = symbols[i];
   if (!used_assoc)
     init_assoc ();
   for (i = 0; i < nsyms; ++i)
     {
       symbol *s = symbols[i];

-      if (is_assoc_useless (s))
-        complain (&s->location, Wother,
-                  _("useless associativity for %s"), s->tag);
+      if (s
+          && s->prec != 0
+          && !prec_nodes[i]->pred
+          && !prec_nodes[i]->succ)
+        {
+          if (is_assoc_useless (s))
+            complain (&s->prec_location, Wprecedence,
+                      _("useless precedence and associativity for %s"), s->tag);
+          else if (s->assoc == precedence_assoc)
+            complain (&s->prec_location, Wprecedence,
+                      _("useless precedence for %s"), s->tag);
+        }
+      else if (is_assoc_useless (s))
+        complain (&s->prec_location, Wprecedence,
+                  _("useless associativity for %s, use %%precedence"), s->tag);

     }
     }

+  free (used_assoc);
+  assoc_free ();

 }
 }