parser: use %empty

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index e48c11e593804557ccc9d4f3ea1a9682ea4c2775..b132e07bcd2b71ccfc61a3443760cc00587dc3b1 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -153,13 +153,13 @@ symbol_print (symbol const *s, FILE *f)
 {
   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
-    fprintf (f, "<NULL>");
+    fputs ("<NULL>", f);
 }
 
 #undef SYMBOL_ATTR_PRINT
@@ -1057,27 +1057,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;
-  if (!prec_nodes)
-    init_prec_nodes ();
   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);
 }
 
 /*---------------------------------------.
@@ -1119,21 +1132,37 @@ register_assoc (graphid i, graphid j)
   used_assoc[j] = true;
 }
 
-/*------------------------------------------------------.
-| Print a warning for each unused symbol associativity. |
-`------------------------------------------------------*/
+/*--------------------------------------------------.
+| Print a warning for unused precedence relations.  |
+`--------------------------------------------------*/
 
 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 (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->location, Wprecedence,
+                      _("useless precedence and associativity for %s"), s->tag);
+          else if (s->assoc == precedence_assoc)
+            complain (&s->location, Wprecedence,
+                      _("useless precedence for %s"), s->tag);
+        }
+      else if (is_assoc_useless (s))
+        complain (&s->location, Wprecedence,
+                  _("useless associativity for %s, use %%precedence"), s->tag);
     }
+  free (used_assoc);
+  assoc_free ();
 }