* doc/bison.texinfo (Debugging): Split into...

[bison.git] / src / symtab.c

diff --git a/src/symtab.c b/src/symtab.c
index 451c518f339475f9a4e60c21941f2e8ff89af639..c255a8f3c00df8be16fd8d2ea258ec01a46840d3 100644 (file)
--- a/src/symtab.c
+++ b/src/symtab.c
@@ -1,145 +1,152 @@
 /* Symbol table manager for Bison,
 /* Symbol table manager for Bison,

-   Copyright (C) 1984, 1989 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 2000, 2001, 2002 Free Software Foundation, Inc.

 
 

-This file is part of Bison, the GNU Compiler Compiler.
+   This file is part of Bison, the GNU Compiler Compiler.

 
 

-Bison is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+   Bison is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.

 
 

-Bison is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   Bison is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License
-along with Bison; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with Bison; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 
 
 #include "system.h"
 
 
 #include "system.h"

-#include "alloc.h"
+#include "hash.h"

 #include "symtab.h"
 #include "gram.h"
 
 #include "symtab.h"
 #include "gram.h"
 

+/*---------------------------------.
+| Create a new symbol, named TAG.  |
+`---------------------------------*/

 
 

-bucket *firstsymbol;
-static bucket *lastsymbol;
-static bucket **symtab;
-
-static int
-hash (const char *key)
+static symbol_t *
+symbol_new (const char *tag)

 {
 {

-  register const char *cp;
-  register int k;
+  symbol_t *res = XMALLOC (symbol_t, 1);
+
+  res->tag = xstrdup (tag);
+  res->type_name = NULL;
+  res->number = NUMBER_UNDEFINED;
+  res->prec = 0;
+  res->assoc = right_assoc;
+  res->user_token_number = USER_NUMBER_UNDEFINED;
+  res->alias = NULL;
+  res->class = unknown_sym;

 
 

-  cp = key;
-  k = 0;
-  while (*cp)
-    k = ((k << 1) ^ (*cp++)) & 0x3fff;
+  nsyms++;

 
 

-  return k % TABSIZE;
+  return res;

 }
 
 
 }
 
 

+/*------------.
+| Free THIS.  |
+`------------*/

 
 

-static char *
-copys (const char *s)
+static void
+symbol_free (symbol_t *this)

 {
 {

-  register int i;
-  register const char *cp;
-  register char *result;
+#if 0
+  /* This causes crashes because one string can appear more
+     than once.  */
+  XFREE (this->type_name);
+#endif
+  XFREE (this->tag);
+  XFREE (this);
+}

 
 

-  i = 1;
-  for (cp = s; *cp; cp++)
-    i++;

 
 

-  result = xmalloc((unsigned int)i);
-  strcpy(result, s);
-  return result;
-}

 
 

+/*----------------------.
+| A symbol_t hash table.  |
+`----------------------*/

 
 

-void
-tabinit (void)
+/* Initial capacity of symbols hash table.  */
+#define HT_INITIAL_CAPACITY 257
+
+static struct hash_table *symbol_table = NULL;
+
+static bool
+hash_compare_symbol_t (const symbol_t *m1, const symbol_t *m2)

 {
 {

-/*   register int i; JF unused */
+  return strcmp (m1->tag, m2->tag) ? FALSE : TRUE;
+}

 
 

-  symtab = NEW2(TABSIZE, bucket *);
+static unsigned int
+hash_symbol_t (const symbol_t *m, unsigned int tablesize)
+{
+  return hash_string (m->tag, tablesize);
+}

 
 

-  firstsymbol = NULL;
-  lastsymbol = NULL;
+
+/*-------------------------------.
+| Create the symbol_t hash table.  |
+`-------------------------------*/
+
+void
+symbols_new (void)
+{
+  symbol_table = hash_initialize (HT_INITIAL_CAPACITY,
+                                 NULL,
+                                 (Hash_hasher) hash_symbol_t,
+                                 (Hash_comparator) hash_compare_symbol_t,
+                                 (Hash_data_freer) symbol_free);

 }
 
 
 }
 
 

-bucket *
+/*----------------------------------------------------------------.
+| Find the symbol named KEY, and return it.  If it does not exist |
+| yet, create it.                                                 |
+`----------------------------------------------------------------*/
+
+symbol_t *

 getsym (const char *key)
 {
 getsym (const char *key)
 {

-  register int hashval;
-  register bucket *bp;
-  register int found;
+  symbol_t probe;
+  symbol_t *entry;

 
 

-  hashval = hash(key);
-  bp = symtab[hashval];
+  (const char *) probe.tag = key;
+  entry = hash_lookup (symbol_table, &probe);

 
 

-  found = 0;
-  while (bp != NULL && found == 0)
+  if (!entry)

     {
     {

-      if (strcmp(key, bp->tag) == 0)
-       found = 1;
-      else
-       bp = bp->link;
+      /* First insertion in the hash. */
+      entry = symbol_new (key);
+      hash_insert (symbol_table, entry);

     }
     }

+  return entry;
+}

 
 

-  if (found == 0)
-    {
-      nsyms++;
-
-      bp = NEW(bucket);
-      bp->link = symtab[hashval];
-      bp->next = NULL;
-      bp->tag = copys(key);
-      bp->class = SUNKNOWN;
-
-      if (firstsymbol == NULL)
-       {
-         firstsymbol = bp;
-         lastsymbol = bp;
-       }
-      else
-       {
-         lastsymbol->next = bp;
-         lastsymbol = bp;
-       }
-
-      symtab[hashval] = bp;
-    }

 
 

-  return bp;
+/*-------------------.
+| Free the symbols.  |
+`-------------------*/
+
+void
+symbols_free (void)
+{
+  hash_free (symbol_table);

 }
 
 
 }
 
 

+/*---------------------------------------------------------------.
+| Look for undefined symbols, report an error, and consider them |
+| terminals.                                                     |
+`---------------------------------------------------------------*/
+

 void
 void

-free_symtab (void)
+symbols_do (symbol_processor processor, void *processor_data)

 {
 {

-  register int i;
-  register bucket *bp,*bptmp;/* JF don't use ptr after free */
-
-  for (i = 0; i < TABSIZE; i++)
-    {
-      bp = symtab[i];
-      while (bp)
-       {
-         bptmp = bp->link;
-#if 0 /* This causes crashes because one string can appear more than once.  */
-         if (bp->type_name)
-           FREE(bp->type_name);
-#endif
-         FREE(bp);
-         bp = bptmp;
-       }
-    }
-  FREE(symtab);
+  hash_do_for_each (symbol_table,
+                   (Hash_processor) processor,
+                   processor_data);

 }
 }