diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2017-04-24 23:06:17 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2017-04-24 23:06:17 +0000 |
| commit | 3690be6ec251dbce20a23ecadfcebabd645f874d (patch) | |
| tree | 5a3b8871e3ed91a8f886f916529e2e83addd34b3 /mdoc_state.c | |
| parent | af17862b1d7e4ad39b12a7e6df025e553d1c1dbe (diff) | |
| download | mandoc-3690be6ec251dbce20a23ecadfcebabd645f874d.tar.gz mandoc-3690be6ec251dbce20a23ecadfcebabd645f874d.tar.zst mandoc-3690be6ec251dbce20a23ecadfcebabd645f874d.zip | |
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_state.c')
| -rw-r--r-- | mdoc_state.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mdoc_state.c b/mdoc_state.c index 4e376ef0..c3d23197 100644 --- a/mdoc_state.c +++ b/mdoc_state.c @@ -1,6 +1,6 @@ -/* $Id: mdoc_state.c,v 1.4 2017/01/10 13:47:00 schwarze Exp $ */ +/* $Id: mdoc_state.c,v 1.5 2017/04/24 23:06:18 schwarze Exp $ */ /* - * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2014, 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 @@ -35,8 +35,7 @@ static void state_dl(STATE_ARGS); static void state_sh(STATE_ARGS); static void state_sm(STATE_ARGS); -static const state_handler state_handlers[MDOC_MAX] = { - NULL, /* Ap */ +static const state_handler __state_handlers[MDOC_MAX - MDOC_Dd] = { NULL, /* Dd */ NULL, /* Dt */ NULL, /* Os */ @@ -52,6 +51,7 @@ static const state_handler state_handlers[MDOC_MAX] = { NULL, /* It */ NULL, /* Ad */ NULL, /* An */ + NULL, /* Ap */ NULL, /* Ar */ NULL, /* Cd */ NULL, /* Cm */ @@ -160,6 +160,7 @@ static const state_handler state_handlers[MDOC_MAX] = { NULL, /* Ta */ NULL, /* ll */ }; +static const state_handler *const state_handlers = __state_handlers - MDOC_Dd; void |