tests: minor refactoring

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index b8074a0a1001c78a94edd525b4f6cf088ccb8f4c..9014acf2a99ab18a35f113f44ddd3e36532625a3 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,6 +1,6 @@
 /* Symbol table manager for Bison.
 
 /* Symbol table manager for Bison.
 

-   Copyright (C) 1984, 1989, 2000-2002, 2004-2012 Free Software
+   Copyright (C) 1984, 1989, 2000-2002, 2004-2013 Free Software

    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.
    Foundation, Inc.
 
    This file is part of Bison, the GNU Compiler Compiler.


@@ -55,7 +55,6 @@ static symbol *
 symbol_new (uniqstr tag, location loc)
 {
   symbol *res = xmalloc (sizeof *res);
 symbol_new (uniqstr tag, location loc)
 {
   symbol *res = xmalloc (sizeof *res);

-

   uniqstr_assert (tag);
 
   /* If the tag is not a string (starts with a double quote), check
   uniqstr_assert (tag);
 
   /* If the tag is not a string (starts with a double quote), check


@@ -68,8 +67,11 @@ symbol_new (uniqstr tag, location loc)
   res->location = loc;
 
   res->type_name = NULL;
   res->location = loc;
 
   res->type_name = NULL;

-  for (int i = 0; i < CODE_PROPS_SIZE; ++i)
-    code_props_none_init (&res->props[i]);
+  {
+    int i;
+    for (i = 0; i < CODE_PROPS_SIZE; ++i)
+      code_props_none_init (&res->props[i]);
+  }

 
   res->number = NUMBER_UNDEFINED;
   res->prec = 0;
 
   res->number = NUMBER_UNDEFINED;
   res->prec = 0;


@@ -111,10 +113,13 @@ semantic_type_new (uniqstr tag, const location *loc)
 
   uniqstr_assert (tag);
   res->tag = tag;
 
   uniqstr_assert (tag);
   res->tag = tag;

-  if (loc)
-    res->location = *loc;
-  for (int i = 0; i < CODE_PROPS_SIZE; ++i)
-    code_props_none_init (&res->props[i]);
+  res->location = loc ? *loc : empty_location;
+  res->status = undeclared;
+  {
+    int i;
+    for (i = 0; i < CODE_PROPS_SIZE; ++i)
+      code_props_none_init (&res->props[i]);
+  }

 
   return res;
 }
 
   return res;
 }


@@ -329,7 +334,7 @@ symbol_class_set (symbol *sym, symbol_class class, location loc, bool declaring)
   if (sym->class != unknown_sym && sym->class != class)
     {
       complain (&loc, complaint, _("symbol %s redefined"), sym->tag);
   if (sym->class != unknown_sym && sym->class != class)
     {
       complain (&loc, complaint, _("symbol %s redefined"), sym->tag);

-      // Don't report both "redefined" and "redeclared".
+      /* Don't report both "redefined" and "redeclared".  */

       warned = true;
     }
 
       warned = true;
     }
 


@@ -401,8 +406,11 @@ symbol_check_defined (symbol *sym)
       sym->number = nvars++;
     }
 
       sym->number = nvars++;
     }
 

-  for (int i = 0; i < 2; ++i)
-    symbol_code_props_get (sym, i)->is_used = true;
+  {
+    int i;
+    for (i = 0; i < 2; ++i)
+      symbol_code_props_get (sym, i)->is_used = true;
+  }

 
   /* Set the semantic type status associated to the current symbol to
      'declared' so that we could check semantic types unnecessary uses. */
 
   /* Set the semantic type status associated to the current symbol to
      'declared' so that we could check semantic types unnecessary uses. */


@@ -419,12 +427,13 @@ symbol_check_defined (symbol *sym)
 static inline bool
 semantic_type_check_defined (semantic_type *sem_type)
 {
 static inline bool
 semantic_type_check_defined (semantic_type *sem_type)
 {

-  // <*> and <> do not have to be "declared".
+  /* <*> and <> do not have to be "declared".  */

   if (sem_type->status == declared
       || !*sem_type->tag
       || STREQ(sem_type->tag, "*"))
     {
   if (sem_type->status == declared
       || !*sem_type->tag
       || STREQ(sem_type->tag, "*"))
     {

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

         if (sem_type->props[i].kind != CODE_PROPS_NONE
             && ! sem_type->props[i].is_used)
           complain (&sem_type->location, Wother,
         if (sem_type->props[i].kind != CODE_PROPS_NONE
             && ! sem_type->props[i].is_used)
           complain (&sem_type->location, Wother,


@@ -500,11 +509,14 @@ symbol_check_alias_consistency (symbol *this)
     }
 
 
     }
 
 

-  for (int i = 0; i < CODE_PROPS_SIZE; ++i)
-    if (str->props[i].code)
-      symbol_code_props_set (sym, i, &str->props[i]);
-    else if (sym->props[i].code)
-      symbol_code_props_set (str, i, &sym->props[i]);
+  {
+    int i;
+    for (i = 0; i < CODE_PROPS_SIZE; ++i)
+      if (str->props[i].code)
+        symbol_code_props_set (sym, i, &str->props[i]);
+      else if (sym->props[i].code)
+        symbol_code_props_set (str, i, &sym->props[i]);
+  }

 
   if (sym->prec || str->prec)
     {
 
   if (sym->prec || str->prec)
     {


@@ -801,6 +813,7 @@ symbols_free (void)
   hash_free (semantic_type_table);
   free (symbols);
   free (symbols_sorted);
   hash_free (semantic_type_table);
   free (symbols);
   free (symbols_sorted);

+  free (semantic_types_sorted);

 }
 
 
 }
 
 


@@ -823,19 +836,19 @@ symbols_cmp_qsort (void const *a, void const *b)
 
 static void
 symbols_do (Hash_processor processor, void *processor_data,
 
 static void
 symbols_do (Hash_processor processor, void *processor_data,

-            struct hash_table *table, symbol **sorted)
+            struct hash_table *table, symbol ***sorted)

 {
   size_t count = hash_get_n_entries (table);
 {
   size_t count = hash_get_n_entries (table);

-  if (!sorted)
+  if (!*sorted)

     {
     {

-      sorted = xnmalloc (count, sizeof *sorted);
-      hash_get_entries (table, (void**)sorted, count);
-      qsort (sorted, count, sizeof *sorted, symbols_cmp_qsort);
+      *sorted = xnmalloc (count, sizeof **sorted);
+      hash_get_entries (table, (void**)*sorted, count);
+      qsort (*sorted, count, sizeof **sorted, symbols_cmp_qsort);

     }
   {
     size_t i;
     for (i = 0; i < count; ++i)
     }
   {
     size_t i;
     for (i = 0; i < count; ++i)

-      processor (sorted[i], processor_data);
+      processor ((*sorted)[i], processor_data);

   }
 }
 
   }
 }
 


@@ -848,9 +861,9 @@ void
 symbols_check_defined (void)
 {
   symbols_do (symbol_check_defined_processor, NULL,
 symbols_check_defined (void)
 {
   symbols_do (symbol_check_defined_processor, NULL,

-              symbol_table, symbols_sorted);
+              symbol_table, &symbols_sorted);

   symbols_do (semantic_type_check_defined_processor, NULL,
   symbols_do (semantic_type_check_defined_processor, NULL,

-              semantic_type_table, semantic_types_sorted);
+              semantic_type_table, &semantic_types_sorted);

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


@@ -905,7 +918,7 @@ symbols_token_translations_init (void)
   for (i = 0; i < max_user_token_number + 1; i++)
     token_translations[i] = undeftoken->number;
   symbols_do (symbol_translation_processor, NULL,
   for (i = 0; i < max_user_token_number + 1; i++)
     token_translations[i] = undeftoken->number;
   symbols_do (symbol_translation_processor, NULL,

-              symbol_table, symbols_sorted);
+              symbol_table, &symbols_sorted);

 }
 
 
 }
 
 


@@ -918,10 +931,10 @@ void
 symbols_pack (void)
 {
   symbols_do (symbol_check_alias_consistency_processor, NULL,
 symbols_pack (void)
 {
   symbols_do (symbol_check_alias_consistency_processor, NULL,

-              symbol_table, symbols_sorted);
+              symbol_table, &symbols_sorted);

 
   symbols = xcalloc (nsyms, sizeof *symbols);
 
   symbols = xcalloc (nsyms, sizeof *symbols);

-  symbols_do (symbol_pack_processor, NULL, symbol_table, symbols_sorted);
+  symbols_do (symbol_pack_processor, NULL, symbol_table, &symbols_sorted);

 
   /* Aliases leave empty slots in symbols, so remove them.  */
   {
 
   /* Aliases leave empty slots in symbols, so remove them.  */
   {