===================================================================
RCS file: /cvs/mandoc/Attic/man_hash.c,v
retrieving revision 1.15
retrieving revision 1.36
diff -u -p -r1.15 -r1.36
--- mandoc/Attic/man_hash.c	2009/09/23 11:53:45	1.15
+++ mandoc/Attic/man_hash.c	2017/04/24 23:06:18	1.36
@@ -1,6 +1,7 @@
-/*	$Id: man_hash.c,v 1.15 2009/09/23 11:53:45 kristaps Exp $ */
+/*	$Id: man_hash.c,v 1.36 2017/04/24 23:06:18 schwarze Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,64 +15,87 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "config.h"
+
 #include <sys/types.h>
 
 #include <assert.h>
+#include <ctype.h>
 #include <limits.h>
-#include <stdlib.h>
 #include <string.h>
 
+#include "mandoc.h"
+#include "roff.h"
+#include "man.h"
+#include "libmandoc.h"
 #include "libman.h"
 
-static	u_char		table[26 * 6];
+#define	HASH_DEPTH	 6
 
+#define	HASH_ROW(x) do { \
+		if (isupper((unsigned char)(x))) \
+			(x) -= 65; \
+		else \
+			(x) -= 97; \
+		(x) *= HASH_DEPTH; \
+	} while (/* CONSTCOND */ 0)
+
 /*
- * XXX - this hash has global scope, so if intended for use as a library
- * with multiple callers, it will need re-invocation protection.
+ * Lookup table is indexed first by lower-case first letter (plus one
+ * for the period, which is stored in the last row), then by lower or
+ * uppercase second letter.  Buckets correspond to the index of the
+ * macro (the integer value of the enum stored as a char to save a bit
+ * of space).
  */
+static	unsigned char	 table[26 * HASH_DEPTH];
+
+
 void
 man_hash_init(void)
 {
 	int		 i, j, x;
 
+	if (*table != '\0')
+		return;
+
 	memset(table, UCHAR_MAX, sizeof(table));
 
-	for (i = 0; i < MAN_MAX; i++) {
-		x = man_macronames[i][0];
-		assert((x >= 65 && x <= 90) ||
-				(x >= 97 && x <= 122));
+	for (i = 0; i < (int)(MAN_MAX - MAN_TH); i++) {
+		x = *roff_name[MAN_TH + i];
 
-		x -= (x <= 90) ? 65 : 97;
-		x *= 6;
+		assert(isalpha((unsigned char)x));
 
-		for (j = 0; j < 6; j++)
+		HASH_ROW(x);
+
+		for (j = 0; j < HASH_DEPTH; j++)
 			if (UCHAR_MAX == table[x + j]) {
-				table[x + j] = (u_char)i;
+				table[x + j] = (unsigned char)i;
 				break;
 			}
-		assert(j < 6);
+
+		assert(j < HASH_DEPTH);
 	}
 }
 
-int
+enum roff_tok
 man_hash_find(const char *tmp)
 {
-	int		 x, i, tok;
+	int		 x, y, i;
 
-	if (0 == (x = tmp[0]))
-		return(MAN_MAX);
-	if ( ! ((x >= 65 && x <= 90) || (x >= 97 && x <= 122)))
-		return(MAN_MAX);
+	if ('\0' == (x = tmp[0]))
+		return TOKEN_NONE;
+	if ( ! (isalpha((unsigned char)x)))
+		return TOKEN_NONE;
 
-	x -= (x <= 90) ? 65 : 97;
-	x *= 6;
+	HASH_ROW(x);
 
-	for (i = 0; i < 6; i++) {
-		if (UCHAR_MAX == (tok = table[x + i]))
-			return(MAN_MAX);
-		if (0 == strcmp(tmp, man_macronames[tok]))
-			return(tok);
+	for (i = 0; i < HASH_DEPTH; i++) {
+		if (UCHAR_MAX == (y = table[x + i]))
+			return TOKEN_NONE;
+
+		if (strcmp(tmp, roff_name[MAN_TH + y]) == 0)
+			return MAN_TH + y;
 	}
 
-	return(MAN_MAX);
+	return TOKEN_NONE;
 }