Use lib/hash for the symbol table.

[bison.git] / src / lex.c

diff --git a/src/lex.c b/src/lex.c
index 489fdf9c3b62cdec7b11f41f46c441f85f6d06ff..cb7b2127d5426bfb955268ef9516d8077ee24b91 100644 (file)
--- a/src/lex.c
+++ b/src/lex.c
@@ -364,9 +364,13 @@ lex (void)
        obstack_1grow (&token_obstack, '\0');
        token_buffer = obstack_finish (&token_obstack);
        symval = getsym (token_buffer);
-       symval->class = token_sym;
-       if (symval->user_token_number == SUNDEF)
-         symval->user_token_number = code;
+       if (symval->number == -1)
+         {
+           symval->number = ntokens++;
+           symval->class = token_sym;
+           if (symval->user_token_number == SUNDEF)
+             symval->user_token_number = code;
+         }
        return tok_identifier;
       }
 
@@ -388,7 +392,11 @@ lex (void)
        token_buffer = obstack_finish (&token_obstack);
 
        symval = getsym (token_buffer);
-       symval->class = token_sym;
+       if (symval->number == -1)
+         {
+           symval->number = ntokens++;
+           symval->class = token_sym;
+         }
 
        return tok_identifier;
       }
@@ -485,44 +493,40 @@ parse_percent_token (void)
   obstack_1grow (&token_obstack, '%');
   obstack_1grow (&token_obstack, c);
 
-  switch (c)
+  if (!isalpha (c))
     {
-    case '%':
+      obstack_1grow (&token_obstack, '\0');
       token_buffer = obstack_finish (&token_obstack);
-      return tok_two_percents;
 
-    case '{':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_percent_left_curly;
+      switch (c)
+       {
+       case '%':
+         return tok_two_percents;
 
-      /* The following guys are here for backward compatibility with
-        very ancient Yacc versions.  The paper of Johnson mentions
-        them (as ancient :).  */
-    case '<':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_left;
+       case '{':
+         return tok_percent_left_curly;
 
-    case '>':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_right;
+         /* The following guys are here for backward compatibility with
+            very ancient Yacc versions.  The paper of Johnson mentions
+            them (as ancient :).  */
+       case '<':
+         return tok_left;
 
-    case '2':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_nonassoc;
+       case '>':
+         return tok_right;
 
-    case '0':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_token;
+       case '2':
+         return tok_nonassoc;
 
-    case '=':
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_prec;
-    }
+       case '0':
+         return tok_token;
 
-  if (!isalpha (c))
-    {
-      token_buffer = obstack_finish (&token_obstack);
-      return tok_illegal;
+       case '=':
+         return tok_prec;
+
+       default:
+         return tok_illegal;
+       }
     }
 
   while (c = getc (finput), isalpha (c) || c == '_' || c == '-')