===================================================================
RCS file: /cvs/mandoc/Attic/hash.c,v
retrieving revision 1.2
retrieving revision 1.8
diff -u -p -r1.2 -r1.8
--- mandoc/Attic/hash.c	2008/12/15 02:23:12	1.2
+++ mandoc/Attic/hash.c	2009/03/08 20:29:45	1.8
@@ -1,4 +1,4 @@
-/* $Id: hash.c,v 1.2 2008/12/15 02:23:12 kristaps Exp $ */
+/* $Id: hash.c,v 1.8 2009/03/08 20:29:45 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -25,9 +25,14 @@
 
 #include "private.h"
 
+/*
+ * Routines for the perfect-hash hashtable used by the parser to look up
+ * tokens by their string-ified names (`.Fl' -> MDOC_Fl).  The
+ * allocation penalty for this is 27 * 26 * sizeof(ptr). 
+ */
 
 void
-mdoc_hash_free(void *htab)
+mdoc_tokhash_free(void *htab)
 {
 
 	free(htab);
@@ -35,7 +40,7 @@ mdoc_hash_free(void *htab)
 
 
 void *
-mdoc_hash_alloc(void)
+mdoc_tokhash_alloc(void)
 {
 	int		  i, major, minor, ind;
 	const void	**htab;
@@ -80,7 +85,7 @@ mdoc_hash_alloc(void)
 
 
 int
-mdoc_hash_find(const void *arg, const char *tmp)
+mdoc_tokhash_find(const void *arg, const char *tmp)
 {
 	int		  major, minor, ind, slot;
 	const void	**htab;
@@ -90,6 +95,8 @@ mdoc_hash_find(const void *arg, const char *tmp)
 
 	if (0 == tmp[0] || 0 == tmp[1])
 		return(MDOC_MAX);
+	if (tmp[2] && tmp[3])
+		return(MDOC_MAX);
 
 	if ( ! (tmp[0] == 37 || (tmp[0] >= 65 && tmp[0] <= 90)))
 		return(MDOC_MAX);
@@ -112,6 +119,8 @@ mdoc_hash_find(const void *arg, const char *tmp)
 		minor = tmp[1] - 97;
 
 	ind = (major * 27) + minor;
+	if (ind < 0 || ind >= (27 * 26))
+		return(MDOC_MAX);
 
 	if (NULL == htab[ind])
 		return(MDOC_MAX);
@@ -121,8 +130,10 @@ mdoc_hash_find(const void *arg, const char *tmp)
 	assert(0 == (size_t)slot % sizeof(struct mdoc_macro));
 	slot /= sizeof(struct mdoc_macro);
 
-	if (0 != strcmp(mdoc_macronames[slot], tmp))
-		return(MDOC_MAX);
-	return(slot);
+	if (0 == tmp[2])
+		return(slot);
+
+	assert(0 == tmp[3]);
+	return(tmp[2] == mdoc_macronames[slot][2] ? slot : MDOC_MAX);
 }