summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel E. Denny <jdenny@clemson.edu>2009-10-03 11:53:05 -0400
committerJoel E. Denny <jdenny@clemson.edu>2009-10-04 13:21:07 -0400
commit4c6b13f37ed71ba9b77ba544144f8cd07a7d7124 (patch)
tree7abee58ef9b94732975459641fcd74c92a480e39
parentf840c05ad4d8cfc5889f5744deb0073cca5b469a (diff)
downloadbison-4c6b13f37ed71ba9b77ba544144f8cd07a7d7124.tar.gz
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)
-rw-r--r--ChangeLog6
-rw-r--r--src/symtab.c28
2 files changed, 10 insertions, 24 deletions
diff --git a/ChangeLog b/ChangeLog
index baced020..f7d96f54 100644
--- 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 7d18f92d..e694db48 100644
--- 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;