summaryrefslogtreecommitdiffstats
path: root/mdoc_hash.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2017-04-24 23:06:17 +0000
committerIngo Schwarze <schwarze@openbsd.org>2017-04-24 23:06:17 +0000
commit34d4ee2337055c6ee3b2c34dbcb0c4a24a7413d1 (patch)
treece7efbe6ee6a0cdedc8ecc4d031b69b5516a73c1 /mdoc_hash.c
parentb6c38ba54b141f508c5d22eb714a3e7c79a6c33c (diff)
downloadmandoc-34d4ee2337055c6ee3b2c34dbcb0c4a24a7413d1.tar.gz
Continue parser unification:
* Make enum rofft an internal interface as enum roff_tok in "roff.h". * Represent mdoc and man macros in enum roff_tok. * Make TOKEN_NONE a proper enum value and use it throughout. * Put the prologue macros first in the macro tables. * Unify mdoc_macroname[] and man_macroname[] into roff_name[].
Diffstat (limited to 'mdoc_hash.c')
-rw-r--r--mdoc_hash.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mdoc_hash.c b/mdoc_hash.c
index d6453911..37ac4425 100644
--- a/mdoc_hash.c
+++ b/mdoc_hash.c
@@ -1,7 +1,7 @@
/* $Id$ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * 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
@@ -46,8 +46,8 @@ mdoc_hash_init(void)
memset(table, UCHAR_MAX, sizeof(table));
- for (i = 0; i < (int)MDOC_MAX; i++) {
- p = mdoc_macronames[i];
+ for (i = 0; i < (int)(MDOC_MAX - MDOC_Dd); i++) {
+ p = roff_name[MDOC_Dd + i];
if (isalpha((unsigned char)p[1]))
major = 12 * (tolower((unsigned char)p[1]) - 97);
@@ -64,7 +64,7 @@ mdoc_hash_init(void)
}
}
-int
+enum roff_tok
mdoc_hash_find(const char *p)
{
int major, i, j;
@@ -87,8 +87,8 @@ mdoc_hash_find(const char *p)
for (j = 0; j < 12; j++) {
if (UCHAR_MAX == (i = table[major + j]))
break;
- if (0 == strcmp(p, mdoc_macronames[i]))
- return i;
+ if (strcmp(p, roff_name[MDOC_Dd + i]) == 0)
+ return MDOC_Dd + i;
}
return TOKEN_NONE;