Add a couple more standard macros. Fix the header.

[mLib] / atom.c

diff --git a/atom.c b/atom.c
index 66e9b570613851d6d21922a7aa807a465dd050f1..0d74478a962cc6ad9e7c4e06c289641a9f37980c 100644 (file)
--- a/atom.c
+++ b/atom.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: atom.c,v 1.1 2001/01/20 11:50:16 mdw Exp $
+ * $Id: atom.c,v 1.5 2004/04/08 01:36:11 mdw Exp $
  *
  * Atom management
  *
@@ -27,14 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: atom.c,v $
- * Revision 1.1  2001/01/20 11:50:16  mdw
- * Implementation of atom tables (for example, as found in X11).
- *
- */
-
 /*----- Header files ------------------------------------------------------*/
 
 #include <stdio.h>
@@ -44,6 +36,7 @@
 #include "atom.h"
 #include "hash.h"
 #include "sym.h"
+#include "unihash.h"
 
 /*----- Static variables --------------------------------------------------*/
 
@@ -101,10 +94,11 @@ void atom_destroytable(atom_table *t)
   sym_destroy(&t->t);
 }
 
-/* --- @atom_intern@ --- *
+/* --- @atom_intern@, @atom_nintern@ --- *
  *
  * Arguments:  @atom_table *t@ = pointer to an atom table
  *             @const char *p@ = pointer to the string to intern
+ *             @size_t n@ = size of the string (for @atom_nintern)
  *
  * Returns:    A pointer to the atom block for the given symbol string.
  *
@@ -124,6 +118,18 @@ atom *atom_intern(atom_table *t, const char *p)
   return (a);
 }
 
+atom *atom_nintern(atom_table *t, const char *p, size_t n)
+{
+  atom *a;
+  unsigned f;
+
+  ATOM_RESOLVE(t);
+  a = sym_find(&t->t, p, n, sizeof(atom), &f);
+  if (!f)
+    a->f = 0;
+  return (a);
+}
+
 /* --- @atom_gensym@ --- *
  *
  * Arguments:  @atom_table *t@ = pointer to a symbol table
@@ -148,7 +154,7 @@ atom *atom_gensym(atom_table *t)
   a->b.name = (char *)(a + 1);
   memcpy(a->b.name, buf, sz);
   a->b.len = sz;
-  CRC32(a->b.b.hash, 0, buf, sz);
+  a->b.b.hash = UNIHASH(&unihash_global, buf, sz);
   a->f = ATOMF_GENSYM;
   a->b.b.next = t->g;
   t->g = &a->b.b;