Remove dead code.

* src/symtab.c (symbol_pack): Here because every symbol's number
is always defined by this time.
(cherry picked from commit f74d6d25914371ed894583a69f99d547f9f283bf)

diff --git a/ChangeLog b/ChangeLog
index baced0205e47230e99a5ed1c622b945c1642788b..f7d96f54ace82ae345744f54b482527ac149da99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-03  Joel E. Denny  <jdenny@clemson.edu>
+
+       Remove dead code.
+       * src/symtab.c (symbol_pack): Here because every symbol's number
+       is always defined by this time.
+
 2009-10-03  Alex Rozenman  <rozenman@gmail.com>
 
        Add additional space after periods in NEWS.

diff --git a/src/symtab.c b/src/symtab.c
index 7d18f92d4da0a12b180a7964c4f0dc3ed8f7034f..e694db481312895160cdae90695d73f6c01392be 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -514,31 +514,11 @@ symbol_check_alias_consistency_processor (void *this,
 static inline bool
 symbol_pack (symbol *this)
 {
+  aver (this->number != NUMBER_UNDEFINED);
   if (this->class == nterm_sym)
-    {
-      this->number += ntokens;
-    }
-  else if (this->alias)
-    {
-      /* This symbol and its alias are a single token defn.
-        Allocate a tokno, and assign to both check agreement of
-        prec and assoc fields and make both the same */
-      if (this->number == NUMBER_UNDEFINED)
-       {
-         if (this == endtoken || this->alias == endtoken)
-           this->number = this->alias->number = 0;
-         else
-           {
-             aver (this->alias->number != NUMBER_UNDEFINED);
-             this->number = this->alias->number;
-           }
-       }
-      /* Do not do processing below for USER_NUMBER_HAS_STRING_ALIASes.  */
-      if (this->user_token_number == USER_NUMBER_HAS_STRING_ALIAS)
-       return true;
-    }
-  else /* this->class == token_sym */
-    aver (this->number != NUMBER_UNDEFINED);
+    this->number += ntokens;
+  else if (this->user_token_number == USER_NUMBER_HAS_STRING_ALIAS)
+    return true;
 
   symbols[this->number] = this;
   return true;