From 3690be6ec251dbce20a23ecadfcebabd645f874d Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 24 Apr 2017 23:06:17 +0000 Subject: 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[]. --- man_hash.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'man_hash.c') diff --git a/man_hash.c b/man_hash.c index bb7b4665..00e1304f 100644 --- a/man_hash.c +++ b/man_hash.c @@ -1,7 +1,7 @@ -/* $Id: man_hash.c,v 1.35 2016/07/15 18:03:45 schwarze Exp $ */ +/* $Id: man_hash.c,v 1.36 2017/04/24 23:06:18 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons - * Copyright (c) 2015 Ingo Schwarze + * Copyright (c) 2015, 2017 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -60,8 +60,8 @@ man_hash_init(void) memset(table, UCHAR_MAX, sizeof(table)); - for (i = 0; i < (int)MAN_MAX; i++) { - x = man_macronames[i][0]; + for (i = 0; i < (int)(MAN_MAX - MAN_TH); i++) { + x = *roff_name[MAN_TH + i]; assert(isalpha((unsigned char)x)); @@ -77,11 +77,10 @@ man_hash_init(void) } } -int +enum roff_tok man_hash_find(const char *tmp) { int x, y, i; - int tok; if ('\0' == (x = tmp[0])) return TOKEN_NONE; @@ -94,9 +93,8 @@ man_hash_find(const char *tmp) if (UCHAR_MAX == (y = table[x + i])) return TOKEN_NONE; - tok = y; - if (0 == strcmp(tmp, man_macronames[tok])) - return tok; + if (strcmp(tmp, roff_name[MAN_TH + y]) == 0) + return MAN_TH + y; } return TOKEN_NONE; -- cgit v1.2.3-56-ge451