/* -*-c-*-
*
- * $Id: atom.c,v 1.1 2001/01/20 11:50:16 mdw Exp $
+ * $Id$
*
* Atom management
*
* (c) 2000 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of the mLib utilities library.
*
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
- *
+ *
* mLib 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 Library General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Library General Public
* License along with mLib; if not, write to the Free
* Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* 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>
#include "atom.h"
#include "hash.h"
#include "sym.h"
+#include "unihash.h"
/*----- Static variables --------------------------------------------------*/
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.
*
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
a = x_alloc(t->t.t.a, sizeof(atom) + sz);
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.len = sz - 1;
+ a->b.b.hash = UNIHASH(&unihash_global, buf, sz);
a->f = ATOMF_GENSYM;
a->b.b.next = t->g;
t->g = &a->b.b;