=================================================================== RCS file: /cvs/mandoc/Attic/validate.c,v retrieving revision 1.8 retrieving revision 1.32 diff -u -p -r1.8 -r1.32 --- mandoc/Attic/validate.c 2008/12/30 13:43:53 1.8 +++ mandoc/Attic/validate.c 2009/01/16 12:23:25 1.32 @@ -1,4 +1,4 @@ -/* $Id: validate.c,v 1.8 2008/12/30 13:43:53 kristaps Exp $ */ +/* $Id: validate.c,v 1.32 2009/01/16 12:23:25 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -17,1143 +17,684 @@ * PERFORMANCE OF THIS SOFTWARE. */ #include -#include #include -#include -#include -#ifdef __linux__ -#include -#endif #include "private.h" -/* FIXME: maxlineargs should be per LINE, no per TOKEN. */ -/* FIXME: prologue check should be in macro_call. */ -#define _CC(p) ((const char **)p) +typedef int (*v_pre)(struct mdoc *, struct mdoc_node *); +typedef int (*v_post)(struct mdoc *); -static int scope_rewind_exp(struct mdoc *, int, int, int); -static int scope_rewind_imp(struct mdoc *, int, int); -static int append_text(struct mdoc *, int, - int, int, char *[]); -static int append_const(struct mdoc *, int, int, int, char *[]); -static int append_constarg(struct mdoc *, int, int, - int, const struct mdoc_arg *); -static int append_scoped(struct mdoc *, int, int, int, - const char *[], int, const struct mdoc_arg *); -static int append_delims(struct mdoc *, int, int *, char *); +struct valids { + v_pre *pre; + v_post *post; +}; -static int -append_delims(struct mdoc *mdoc, int tok, int *pos, char *buf) -{ - int c, lastarg; - char *p; - if (0 == buf[*pos]) - return(1); +static int pre_display(struct mdoc *, struct mdoc_node *); +static int pre_bd(struct mdoc *, struct mdoc_node *); +static int pre_bl(struct mdoc *, struct mdoc_node *); +static int pre_it(struct mdoc *, struct mdoc_node *); +static int pre_prologue(struct mdoc *, struct mdoc_node *); +static int pre_prologue(struct mdoc *, struct mdoc_node *); +static int pre_prologue(struct mdoc *, struct mdoc_node *); - mdoc_msg(mdoc, *pos, "`%s' flushing punctuation", - mdoc_macronames[tok]); +static int headchild_err_ge1(struct mdoc *); +static int headchild_warn_ge1(struct mdoc *); +static int headchild_err_eq0(struct mdoc *); +static int elemchild_err_eq0(struct mdoc *); +static int elemchild_err_ge1(struct mdoc *); +static int elemchild_warn_eq0(struct mdoc *); +static int bodychild_warn_ge1(struct mdoc *); +static int bodychild_err_eq0(struct mdoc *); +static int elemchild_warn_ge1(struct mdoc *); +static int post_sh(struct mdoc *); +static int post_bl(struct mdoc *); +static int post_it(struct mdoc *); - for (;;) { - lastarg = *pos; - c = mdoc_args(mdoc, tok, pos, buf, 0, &p); - if (ARGS_ERROR == c) - return(0); - else if (ARGS_EOLN == c) - break; - assert(mdoc_isdelim(p)); - mdoc_word_alloc(mdoc, lastarg, p); - } +static v_pre pres_prologue[] = { pre_prologue, NULL }; +static v_pre pres_d1[] = { pre_display, NULL }; +static v_pre pres_bd[] = { pre_display, pre_bd, NULL }; +static v_pre pres_bl[] = { pre_bl, NULL }; +static v_pre pres_it[] = { pre_it, NULL }; - return(1); -} +static v_post posts_bd[] = { headchild_err_eq0, bodychild_warn_ge1, NULL }; +static v_post posts_text[] = { elemchild_err_ge1, NULL }; +static v_post posts_wtext[] = { elemchild_warn_ge1, NULL }; +static v_post posts_notext[] = { elemchild_err_eq0, NULL }; +static v_post posts_wline[] = { headchild_warn_ge1, bodychild_err_eq0, NULL }; +static v_post posts_sh[] = { headchild_err_ge1, bodychild_warn_ge1, post_sh, NULL }; +static v_post posts_bl[] = { headchild_err_eq0, bodychild_warn_ge1, post_bl, NULL }; +static v_post posts_it[] = { post_it, NULL }; +static v_post posts_ss[] = { headchild_err_ge1, NULL }; +static v_post posts_pp[] = { elemchild_warn_eq0, NULL }; +static v_post posts_d1[] = { headchild_err_ge1, NULL }; -static int -scope_rewind_imp(struct mdoc *mdoc, int ppos, int tok) -{ - struct mdoc_node *n; - int t; +const struct valids mdoc_valids[MDOC_MAX] = { + { NULL, NULL }, /* \" */ + { pres_prologue, posts_text }, /* Dd */ + { pres_prologue, NULL }, /* Dt */ + { pres_prologue, NULL }, /* Os */ + /* FIXME: preceding Pp. */ + /* FIXME: NAME section internal ordering. */ + /* FIXME: can only be a child of root. */ + { NULL, posts_sh }, /* Sh */ + /* FIXME: preceding Pp. */ + /* FIXME: can only be a child of Sh. */ + { NULL, posts_ss }, /* Ss */ + /* FIXME: proceeding... */ + { NULL, posts_pp }, /* Pp */ + { pres_d1, posts_d1 }, /* D1 */ + { pres_d1, posts_d1 }, /* Dl */ + /* FIXME: preceding Pp. */ + { pres_bd, posts_bd }, /* Bd */ + { NULL, NULL }, /* Ed */ + /* FIXME: preceding Pp. */ + { pres_bl, posts_bl }, /* Bl */ + { NULL, NULL }, /* El */ + { pres_it, posts_it }, /* It */ + { NULL, posts_text }, /* Ad */ + /* FIXME */ + { NULL, NULL }, /* An */ + { NULL, NULL }, /* Ar */ - n = mdoc->last ? mdoc->last->parent : NULL; + { NULL, posts_text }, /* Cd */ /* FIXME: section 4 only. */ + { NULL, NULL }, /* Cm */ + { NULL, posts_text }, /* Dv */ + { NULL, posts_text }, /* Er */ /* FIXME: section 2 only. */ + { NULL, posts_text }, /* Ev */ + { NULL, posts_notext }, /* Ex */ /* FIXME: sections 1,6,8 only. */ /* -std required */ + { NULL, posts_text }, /* Fa */ + { NULL, NULL }, /* Fd */ /* FIXME: SYNOPSIS section. */ + { NULL, NULL }, /* Fl */ + { NULL, posts_text }, /* Fn */ + { NULL, NULL }, /* Ft */ + { NULL, posts_text }, /* Ic */ + { NULL, posts_wtext }, /* In */ + { NULL, posts_text }, /* Li */ + { NULL, posts_wtext }, /* Nd */ + { NULL, NULL }, /* Nm */ /* FIXME: If name not set? */ + { NULL, posts_wline }, /* Op */ + { NULL, NULL }, /* Ot */ + { NULL, NULL }, /* Pa */ + { NULL, posts_notext }, /* Rv */ /* -std required */ + { NULL, posts_notext }, /* St */ /* arg required */ + { NULL, posts_text }, /* Va */ + { NULL, posts_text }, /* Vt */ + { NULL, NULL }, /* Xr */ /* FIXME */ + { NULL, posts_text }, /* %A */ + { NULL, posts_text }, /* %B */ + { NULL, posts_text }, /* %D */ + { NULL, posts_text }, /* %I */ + { NULL, posts_text }, /* %J */ + { NULL, posts_text }, /* %N */ + { NULL, posts_text }, /* %O */ + { NULL, posts_text }, /* %P */ + { NULL, posts_text }, /* %R */ + { NULL, posts_text }, /* %T */ + { NULL, posts_text }, /* %V */ + { NULL, NULL }, /* Ac */ + { NULL, NULL }, /* Ao */ + { NULL, posts_wline }, /* Aq */ + { NULL, NULL }, /* At */ /* FIXME */ + { NULL, NULL }, /* Bc */ + { NULL, NULL }, /* Bf */ + { NULL, NULL }, /* Bo */ + { NULL, posts_wline }, /* Bq */ + { NULL, NULL }, /* Bsx */ + { NULL, NULL }, /* Bx */ + { NULL, NULL }, /* Db */ /* FIXME: boolean */ + { NULL, NULL }, /* Dc */ + { NULL, NULL }, /* Do */ + { NULL, posts_wline }, /* Dq */ + { NULL, NULL }, /* Ec */ + { NULL, NULL }, /* Ef */ /* -symbolic, etc. */ + { NULL, posts_text }, /* Em */ + { NULL, NULL }, /* Eo */ + { NULL, NULL }, /* Fx */ + { NULL, posts_text }, /* Ms */ /* FIXME: which symbols? */ + { NULL, posts_notext }, /* No */ + { NULL, posts_notext }, /* Ns */ + { NULL, NULL }, /* Nx */ + { NULL, NULL }, /* Ox */ + { NULL, NULL }, /* Pc */ + { NULL, NULL }, /* Pf */ /* FIXME: 2 or more arguments */ + { NULL, NULL }, /* Po */ + { NULL, posts_wline }, /* Pq */ /* FIXME: ignore following Sh/Ss */ + { NULL, NULL }, /* Qc */ + { NULL, posts_wline }, /* Ql */ + { NULL, NULL }, /* Qo */ + { NULL, posts_wline }, /* Qq */ + { NULL, NULL }, /* Re */ + { NULL, NULL }, /* Rs */ + { NULL, NULL }, /* Sc */ + { NULL, NULL }, /* So */ + { NULL, posts_wline }, /* Sq */ + { NULL, NULL }, /* Sm */ /* FIXME: boolean */ + { NULL, posts_text }, /* Sx */ + { NULL, posts_text }, /* Sy */ + { NULL, posts_text }, /* Tn */ + { NULL, NULL }, /* Ux */ + { NULL, NULL }, /* Xc */ + { NULL, NULL }, /* Xo */ + { NULL, NULL }, /* Fo */ + { NULL, NULL }, /* Fc */ + { NULL, NULL }, /* Oo */ + { NULL, NULL }, /* Oc */ + { NULL, NULL }, /* Bk */ + { NULL, NULL }, /* Ek */ + { NULL, posts_notext }, /* Bt */ + { NULL, NULL }, /* Hf */ + { NULL, NULL }, /* Fr */ + { NULL, posts_notext }, /* Ud */ +}; - /* LINTED */ - for ( ; n; n = n->parent) { - if (MDOC_BLOCK != n->type) - continue; - if (tok == (t = n->data.block.tok)) - break; - if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags)) - continue; - return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); - } - if (n) { - mdoc->last = n; - mdoc_msg(mdoc, ppos, "scope: rewound implicit `%s'", - mdoc_macronames[tok]); - return(1); - } +static int +bodychild_err_eq0(struct mdoc *mdoc) +{ - mdoc_msg(mdoc, ppos, "scope: new implicit `%s'", - mdoc_macronames[tok]); - return(1); + if (MDOC_BODY != mdoc->last->type) + return(1); + if (NULL == mdoc->last->child) + return(1); + return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests no body children")); } static int -scope_rewind_exp(struct mdoc *mdoc, int ppos, int tok, int dst) +bodychild_warn_ge1(struct mdoc *mdoc) { - struct mdoc_node *n; - assert(mdoc->last); + if (MDOC_BODY != mdoc->last->type) + return(1); + if (mdoc->last->child) + return(1); + return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests one or more body children")); +} - /* LINTED */ - for (n = mdoc->last->parent; n; n = n->parent) { - if (MDOC_BLOCK != n->type) - continue; - if (dst == n->data.block.tok) - break; - return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK)); - } - if (NULL == (mdoc->last = n)) - return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX)); +static int +elemchild_warn_eq0(struct mdoc *mdoc) +{ - mdoc_msg(mdoc, ppos, "scope: rewound explicit `%s' to `%s'", - mdoc_macronames[tok], mdoc_macronames[dst]); - - return(1); + assert(MDOC_ELEM == mdoc->last->type); + if (NULL == mdoc->last->child) + return(1); + return(mdoc_pwarn(mdoc, mdoc->last->child->line, + mdoc->last->child->pos, WARN_SYNTAX, "macro suggests no parameters")); } static int -append_constarg(struct mdoc *mdoc, int tok, int pos, - int argc, const struct mdoc_arg *argv) +elemchild_warn_ge1(struct mdoc *mdoc) { - switch (tok) { - default: - break; - } - - mdoc_elem_alloc(mdoc, pos, tok, argc, argv, 0, NULL); - return(1); + assert(MDOC_ELEM == mdoc->last->type); + if (mdoc->last->child) + return(1); + return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests one or more parameters")); } -/* - * Append a node with implicit or explicit scoping ONLY. ALL macros - * with the implicit- or explicit-scope callback must be included here. - */ static int -append_scoped(struct mdoc *mdoc, int tok, int pos, - int sz, const char *args[], - int argc, const struct mdoc_arg *argv) +elemchild_err_eq0(struct mdoc *mdoc) { - enum mdoc_sec sec; - struct mdoc_node *node; - switch (tok) { - /* ======= ADD MORE MACRO CHECKS BELOW. ======= */ + assert(MDOC_ELEM == mdoc->last->type); + if (NULL == mdoc->last->child) + return(1); + return(mdoc_err(mdoc, "macro expects no parameters")); +} - case (MDOC_Sh): - /* - * Check rules for section ordering. We can have - * "known" sections (like NAME and so on) and "custom" - * sections, which are unknown. If we have a known - * section, we should fall within the conventional - * section order. - */ - if (0 == sz) - return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1)); - sec = mdoc_atosec((size_t)sz, _CC(args)); - if (SEC_CUSTOM != sec && sec < mdoc->sec_lastn) - if ( ! mdoc_warn(mdoc, tok, pos, WARN_SEC_OO)) - return(0); +static int +elemchild_err_ge1(struct mdoc *mdoc) +{ - if (SEC_BODY == mdoc->sec_last && SEC_NAME != sec) - return(mdoc_err(mdoc, tok, pos, ERR_SEC_NAME)); - if (SEC_CUSTOM != sec) - mdoc->sec_lastn = sec; - mdoc->sec_last = sec; - break; + assert(MDOC_ELEM == mdoc->last->type); + if (mdoc->last->child) + return(1); + return(mdoc_err(mdoc, "macro expects one or more parameters")); +} - case (MDOC_Ss): - if (0 != sz) - break; - return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1)); - - case (MDOC_Bd): - /* - * We can't be nested within any other block displays - * (or really any other kind of display, although Bd is - * the only multi-line one that will show up). - */ - assert(mdoc->last); - node = mdoc->last->parent; - /* LINTED */ - for ( ; node; node = node->parent) { - if (node->type != MDOC_BLOCK) - continue; - if (node->data.block.tok != MDOC_Bd) - continue; - break; - } - if (NULL == node) - break; - return(mdoc_err(mdoc, tok, pos, ERR_SCOPE_NONEST)); - case (MDOC_Bl): - break; +static int +headchild_err_eq0(struct mdoc *mdoc) +{ - /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */ - default: - abort(); - /* NOTREACHED */ - } - - mdoc_block_alloc(mdoc, pos, tok, (size_t)argc, argv); - mdoc_head_alloc(mdoc, pos, tok, (size_t)sz, _CC(args)); - mdoc_body_alloc(mdoc, pos, tok); - return(1); + if (MDOC_HEAD != mdoc->last->type) + return(1); + if (NULL == mdoc->last->child) + return(1); + return(mdoc_perr(mdoc, mdoc->last->child->line, + mdoc->last->child->pos, "macro expects no parameters")); } static int -append_const(struct mdoc *mdoc, int tok, - int pos, int sz, char *args[]) +headchild_warn_ge1(struct mdoc *mdoc) { - switch (tok) { - /* ======= ADD MORE MACRO CHECKS BELOW. ======= */ + if (MDOC_HEAD != mdoc->last->type) + return(1); + if (mdoc->last->child) + return(1); + return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests one or more parameters")); +} - /* FIXME: this is the ugliest part of this page. */ - case (MDOC_At): - /* This needs special handling. */ - if (0 == sz) - break; - else if (sz > 2) - return(mdoc_err(mdoc, tok, pos, ERR_ARGS_LE2)); - if (ATT_DEFAULT != mdoc_atoatt(args[0])) { - mdoc_elem_alloc(mdoc, pos, tok, 0, - NULL, 1, _CC(&args[0])); - } else { - mdoc_elem_alloc(mdoc, pos, tok, - 0, NULL, 0, NULL); - if (mdoc_isdelim(args[0])) - return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_NOPUNCT)); - mdoc_word_alloc(mdoc, pos, args[0]); - } +static int +headchild_err_ge1(struct mdoc *mdoc) +{ - if (1 == sz) - return(1); - if (mdoc_isdelim(args[1])) - return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_NOPUNCT)); - mdoc_word_alloc(mdoc, pos, args[1]); + if (MDOC_HEAD != mdoc->last->type) return(1); + if (mdoc->last->child) + return(1); + return(mdoc_err(mdoc, "macro expects one or more parameters")); +} - case (MDOC_Nd): - if (sz > 0) - break; - if ( ! mdoc_warn(mdoc, tok, pos, WARN_ARGS_GE1)) - return(0); - break; - - case (MDOC_Hf): - if (1 == sz) - break; - return(mdoc_err(mdoc, tok, pos, ERR_ARGS_EQ1)); - case (MDOC_Bx): - /* FALLTHROUGH */ - case (MDOC_Bsx): - /* FALLTHROUGH */ - case (MDOC_Os): - /* FALLTHROUGH */ - case (MDOC_Fx): - /* FALLTHROUGH */ - case (MDOC_Nx): - assert(sz <= 1); - break; +static int +pre_display(struct mdoc *mdoc, struct mdoc_node *node) +{ + struct mdoc_node *n; - case (MDOC_Ux): - assert(0 == sz); - break; + if (MDOC_BLOCK != node->type) + return(1); - case (MDOC_Bt): - /* FALLTHROUGH */ - case (MDOC_Ud): - if (0 == sz) - break; - return(mdoc_err(mdoc, tok, pos, ERR_ARGS_EQ0)); - - /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */ - default: - abort(); - /* NOTREACHED */ - } - - mdoc_elem_alloc(mdoc, pos, tok, 0, NULL, (size_t)sz, _CC(args)); - return(1); + assert(mdoc->last); + for (n = mdoc->last->parent; n; n = n->parent) + if (MDOC_BLOCK == n->type) + if (MDOC_Bd == n->tok) + break; + if (NULL == n) + return(1); + return(mdoc_nerr(mdoc, node, "displays may not be nested")); } static int -append_text(struct mdoc *mdoc, int tok, - int pos, int sz, char *args[]) +pre_bl(struct mdoc *mdoc, struct mdoc_node *node) { + int type, err; + struct mdoc_arg *argv; + size_t i, argc; - switch (tok) { - /* ======= ADD MORE MACRO CHECKS BELOW. ======= */ - case (MDOC_Pp): - if (0 == sz) - break; - if ( ! mdoc_warn(mdoc, tok, pos, WARN_ARGS_EQ0)) - return(0); - break; + if (MDOC_BLOCK != node->type) + return(1); + assert(MDOC_Bl == node->tok); - case (MDOC_Ft): - /* FALLTHROUGH */ - case (MDOC_Li): - /* FALLTHROUGH */ - case (MDOC_Ms): - /* FALLTHROUGH */ - case (MDOC_Pa): - /* FALLTHROUGH */ - case (MDOC_Tn): - if (0 < sz) - break; - if ( ! mdoc_warn(mdoc, tok, pos, WARN_ARGS_GE1)) - return(0); - break; + argv = NULL; + argc = node->data.block.argc; - case (MDOC_Ar): - /* FALLTHROUGH */ - case (MDOC_Cm): - /* FALLTHROUGH */ - case (MDOC_Fl): - /* These can have no arguments. */ - break; - - case (MDOC_Ad): - /* FALLTHROUGH */ - case (MDOC_Em): - /* FALLTHROUGH */ - case (MDOC_Er): - /* FALLTHROUGH */ - case (MDOC_Ev): - /* FALLTHROUGH */ - case (MDOC_Fa): - /* FALLTHROUGH */ - case (MDOC_Dv): - /* FALLTHROUGH */ - case (MDOC_Ic): - /* FALLTHROUGH */ - case (MDOC_Sy): - /* FALLTHROUGH */ - case (MDOC_Sx): - /* FALLTHROUGH */ - case (MDOC_Va): - /* FALLTHROUGH */ - case (MDOC_Vt): - if (0 < sz) + for (i = type = err = 0; i < argc; i++) { + argv = &node->data.block.argv[(int)i]; + assert(argv); + switch (argv->arg) { + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + /* FALLTHROUGH */ + case (MDOC_Item): + /* FALLTHROUGH */ + case (MDOC_Tag): + /* FALLTHROUGH */ + case (MDOC_Diag): + /* FALLTHROUGH */ + case (MDOC_Hang): + /* FALLTHROUGH */ + case (MDOC_Ohang): + /* FALLTHROUGH */ + case (MDOC_Inset): + /* FALLTHROUGH */ + case (MDOC_Column): + if (type) + err++; + type++; break; - return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1)); - /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */ - default: - abort(); - /* NOTREACHED */ + default: + break; + } } - - mdoc_elem_alloc(mdoc, pos, tok, 0, NULL, (size_t)sz, _CC(args)); - return(1); + if (0 == type) + return(mdoc_err(mdoc, "no list type specified")); + if (0 == err) + return(1); + assert(argv); + return(mdoc_perr(mdoc, argv->line, + argv->pos, "only one list type possible")); } -int -macro_text(MACRO_PROT_ARGS) +static int +pre_bd(struct mdoc *mdoc, struct mdoc_node *node) { - int lastarg, lastpunct, c, j; - char *args[MDOC_LINEARG_MAX]; + int type, err; + struct mdoc_arg *argv; + size_t i, argc; - if (SEC_PROLOGUE == mdoc->sec_lastn) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + if (MDOC_BLOCK != node->type) + return(1); + assert(MDOC_Bd == node->tok); - /* Token pre-processing. */ + argv = NULL; + argc = node->data.block.argc; - switch (tok) { - case (MDOC_Pp): - /* `.Pp' ignored when following `.Sh' or `.Ss'. */ - assert(mdoc->last); - if (MDOC_BODY != mdoc->last->type) - break; - switch (mdoc->last->data.body.tok) { - case (MDOC_Ss): + for (err = i = type = 0; 0 == err && i < argc; i++) { + argv = &node->data.block.argv[(int)i]; + assert(argv); + switch (argv->arg) { + case (MDOC_Ragged): /* FALLTHROUGH */ - case (MDOC_Sh): - if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_AFTER_BLK)) - return(0); - return(1); + case (MDOC_Unfilled): + /* FALLTHROUGH */ + case (MDOC_Filled): + /* FALLTHROUGH */ + case (MDOC_Literal): + /* FALLTHROUGH */ + case (MDOC_File): + if (type) + err++; + type++; + break; default: break; } - break; - default: - break; } - - /* Process line parameters. */ - - j = 0; - lastarg = ppos; - lastpunct = 0; - -again: - if (j == MDOC_LINEARG_MAX) - return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); - - /* - * Parse out the next argument, unquoted and unescaped. If - * we're a word (which may be punctuation followed eventually by - * a real word), then fall into checking for callables. If - * only punctuation remains and we're the first, then flush - * arguments, punctuation and exit; else, return to the caller. - */ - - lastarg = *pos; - - switch (mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &args[j])) { - case (ARGS_ERROR): - return(0); - case (ARGS_WORD): - break; - case (ARGS_PUNCT): - if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args)) - return(0); - if (ppos > 1) - return(1); - return(append_delims(mdoc, tok, pos, buf)); - case (ARGS_EOLN): - if (lastpunct) - return(1); - return(append_text(mdoc, tok, ppos, j, args)); - default: - abort(); - /* NOTREACHED */ - } - - /* - * Command found. First flush out arguments, then call the - * command. If we're the line macro when it exits, flush - * terminal punctuation. - */ - - if (MDOC_MAX != (c = mdoc_find(mdoc, args[j]))) { - if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args)) - return(0); - if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) - return(0); - if (ppos > 1) - return(1); - return(append_delims(mdoc, tok, pos, buf)); - } - - /* Word/non-term-punctuation found. */ - - if ( ! mdoc_isdelim(args[j])) { - /* Words are appended to the array of arguments. */ - j++; - lastpunct = 0; - goto again; - } - - /* - * For punctuation, flush all collected words, then flush - * punctuation, then start collecting again. Of course, this - * is non-terminal punctuation. - */ - - if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args)) - return(0); - - mdoc_word_alloc(mdoc, lastarg, args[j]); - j = 0; - lastpunct = 1; - - goto again; - /* NOTREACHED */ + if (0 == type) + return(mdoc_err(mdoc, "no display type specified")); + if (0 == err) + return(1); + assert(argv); + return(mdoc_perr(mdoc, argv->line, + argv->pos, "only one display type possible")); } -int -macro_prologue_dtitle(MACRO_PROT_ARGS) +static int +pre_it(struct mdoc *mdoc, struct mdoc_node *node) { - int lastarg, j; - char *args[MDOC_LINEARG_MAX]; - if (SEC_PROLOGUE != mdoc->sec_lastn) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE)); - if (0 == mdoc->meta.date) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO)); - if (mdoc->meta.title[0]) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP)); - - j = -1; - lastarg = ppos; - -again: - if (j == MDOC_LINEARG_MAX) - return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); - - lastarg = *pos; - - switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[++j])) { - case (ARGS_EOLN): - if (mdoc->meta.title) - return(1); - if ( ! mdoc_warn(mdoc, tok, ppos, WARN_ARGS_GE1)) - return(0); - (void)xstrlcpy(mdoc->meta.title, - "UNTITLED", META_TITLE_SZ); + if (MDOC_BLOCK != mdoc->last->type) return(1); - case (ARGS_ERROR): - return(0); - default: - break; - } + assert(MDOC_It == mdoc->last->tok); - if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn - (mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE)) - return(0); + if (MDOC_BODY != mdoc->last->parent->type) + return(mdoc_nerr(mdoc, node, "invalid macro parent `%s'", mdoc_macronames[mdoc->last->parent->tok])); + if (MDOC_Bl != mdoc->last->parent->tok) + return(mdoc_nerr(mdoc, node, "invalid macro parent `%s'", mdoc_macronames[mdoc->last->parent->tok])); - if (0 == j) { - if (xstrlcpy(mdoc->meta.title, args[0], META_TITLE_SZ)) - goto again; - return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM)); - - } else if (1 == j) { - mdoc->meta.msec = mdoc_atomsec(args[1]); - if (MSEC_DEFAULT != mdoc->meta.msec) - goto again; - return(mdoc_err(mdoc, tok, -1, ERR_SYNTAX_ARGFORM)); - - } else if (2 == j) { - mdoc->meta.vol = mdoc_atovol(args[2]); - if (VOL_DEFAULT != mdoc->meta.vol) - goto again; - mdoc->meta.arch = mdoc_atoarch(args[2]); - if (ARCH_DEFAULT != mdoc->meta.arch) - goto again; - return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM)); - } - - return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); + return(1); } -int -macro_prologue_os(MACRO_PROT_ARGS) +static int +pre_prologue(struct mdoc *mdoc, struct mdoc_node *node) { - int lastarg, j; - char *args[MDOC_LINEARG_MAX]; if (SEC_PROLOGUE != mdoc->sec_lastn) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE)); - if (0 == mdoc->meta.title[0]) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO)); - if (mdoc->meta.os[0]) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP)); + return(mdoc_nerr(mdoc, node, "macro may only be invoked in the prologue")); + assert(MDOC_ELEM == node->type); - j = -1; - lastarg = ppos; + /* Check for ordering. */ -again: - if (j == MDOC_LINEARG_MAX) - return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); - - lastarg = *pos; - - switch (mdoc_args(mdoc, tok, pos, buf, - ARGS_QUOTED, &args[++j])) { - case (ARGS_EOLN): - mdoc->sec_lastn = mdoc->sec_last = SEC_BODY; - return(1); - case (ARGS_ERROR): - return(0); + switch (node->tok) { + case (MDOC_Os): + if (mdoc->meta.title[0] && mdoc->meta.date) + break; + return(mdoc_nerr(mdoc, node, "prologue macro out-of-order")); + case (MDOC_Dt): + if (0 == mdoc->meta.title[0] && mdoc->meta.date) + break; + return(mdoc_nerr(mdoc, node, "prologue macro out-of-order")); + case (MDOC_Dd): + if (0 == mdoc->meta.title[0] && 0 == mdoc->meta.date) + break; + return(mdoc_nerr(mdoc, node, "prologue macro out-of-order")); default: - break; + abort(); + /* NOTREACHED */ } - - if ( ! xstrlcat(mdoc->meta.os, args[j], sizeof(mdoc->meta.os))) - return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM)); - if ( ! xstrlcat(mdoc->meta.os, " ", sizeof(mdoc->meta.os))) - return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM)); - goto again; - /* NOTREACHED */ -} + /* Check for repetition. */ - -int -macro_prologue_ddate(MACRO_PROT_ARGS) -{ - int lastarg, j; - char *args[MDOC_LINEARG_MAX], date[64]; - - if (SEC_PROLOGUE != mdoc->sec_lastn) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_NPROLOGUE)); - if (mdoc->meta.title[0]) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_OO)); - if (mdoc->meta.date) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE_REP)); - - j = -1; - date[0] = 0; - lastarg = ppos; - -again: - if (j == MDOC_LINEARG_MAX) - return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); - - lastarg = *pos; - switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[++j])) { - case (ARGS_EOLN): - if (mdoc->meta.date) + switch (node->tok) { + case (MDOC_Os): + if (0 == mdoc->meta.os[0]) return(1); - mdoc->meta.date = mdoc_atotime(date); - if (mdoc->meta.date) + break; + case (MDOC_Dd): + if (0 == mdoc->meta.date) return(1); - return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGFORM)); - case (ARGS_ERROR): - return(0); - default: break; + case (MDOC_Dt): + if (0 == mdoc->meta.title[0]) + return(1); + break; + default: + abort(); + /* NOTREACHED */ } - - if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn - (mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE)) - return(0); - - if (0 == j) { - if (xstrcmp("$Mdocdate: December 30 2008 $", args[j])) { - mdoc->meta.date = time(NULL); - goto again; - } else if (xstrcmp("$Mdocdate:", args[j])) - goto again; - } else if (4 == j) - if ( ! xstrcmp("$", args[j])) - goto again; - if ( ! xstrlcat(date, args[j], sizeof(date))) - return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM)); - if ( ! xstrlcat(date, " ", sizeof(date))) - return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGFORM)); - - goto again; - /* NOTREACHED */ + return(mdoc_nerr(mdoc, node, "prologue macro repeated")); } -int -macro_scoped_explicit(MACRO_PROT_ARGS) +/* Warn if `Bl' type-specific syntax isn't reflected in items. */ +static int +post_it(struct mdoc *mdoc) { - int c, lastarg, j; - struct mdoc_arg argv[MDOC_LINEARG_MAX]; + int type, sv; +#define TYPE_NONE (0) +#define TYPE_BODY (1) +#define TYPE_HEAD (2) + size_t i, argc; struct mdoc_node *n; - if (SEC_PROLOGUE == mdoc->sec_lastn) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + if (MDOC_BLOCK != mdoc->last->type) + return(1); - /* - * First close out the explicit scope. The `end' tags (such as - * `.El' to `.Bl' don't cause anything to happen: we merely - * readjust our last parse point. - */ + assert(MDOC_It == mdoc->last->tok); - switch (tok) { - case (MDOC_El): - return(scope_rewind_exp(mdoc, ppos, tok, MDOC_Bl)); - case (MDOC_Ed): - return(scope_rewind_exp(mdoc, ppos, tok, MDOC_Bd)); - default: - break; - } + n = mdoc->last->parent; + assert(n); + assert(MDOC_Bl == n->tok); - assert(MDOC_EXPLICIT & mdoc_macros[tok].flags); + n = n->parent; + assert(MDOC_BLOCK == n->type); + assert(MDOC_Bl == n->tok); - /* Token pre-processing. */ + argc = n->data.block.argc; + type = TYPE_NONE; + + /* Some types require block-head, some not. */ - switch (tok) { - case (MDOC_Bl): - /* FALLTHROUGH */ - case (MDOC_Bd): - /* `.Pp' ignored when preceding `.Bl' or `.Bd'. */ - assert(mdoc->last); - if (MDOC_ELEM != mdoc->last->type) + for (i = 0; TYPE_NONE == type && i < argc; i++) + switch (n->data.block.argv[(int)i].arg) { + case (MDOC_Tag): + /* FALLTHROUGH */ + case (MDOC_Diag): + /* FALLTHROUGH */ + case (MDOC_Hang): + /* FALLTHROUGH */ + case (MDOC_Ohang): + /* FALLTHROUGH */ + case (MDOC_Inset): + type = TYPE_HEAD; + sv = n->data.block.argv[(int)i].arg; break; - if (MDOC_Pp != mdoc->last->data.elem.tok) + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + /* FALLTHROUGH */ + case (MDOC_Item): + /* FALLTHROUGH */ + case (MDOC_Column): + type = TYPE_BODY; + sv = n->data.block.argv[(int)i].arg; break; - if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_BEFORE_BLK)) - return(0); - assert(mdoc->last->prev); - n = mdoc->last; - mdoc->last = mdoc->last->prev; - mdoc->last->next = NULL; - mdoc_node_free(n); - break; - default: - break; - } + default: + break; + } - lastarg = *pos; + assert(TYPE_NONE != type); - for (j = 0; j < MDOC_LINEARG_MAX; j++) { - lastarg = *pos; - c = mdoc_argv(mdoc, tok, &argv[j], pos, buf); - if (0 == c) - break; - else if (1 == c) - continue; + if (TYPE_HEAD == type) { + if (NULL == (n = mdoc->last->data.block.head)) { + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) + return(0); + } else if (NULL == n->child) + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) + return(0); - mdoc_argv_free(j, argv); - return(0); - } + if (NULL == (n = mdoc->last->data.block.body)) { + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) + return(0); + } else if (NULL == n->child) + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) + return(0); - if (MDOC_LINEARG_MAX == j) { - mdoc_argv_free(j, argv); - return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); + return(1); } - c = append_scoped(mdoc, tok, ppos, 0, NULL, j, argv); - mdoc_argv_free(j, argv); - return(c); -} + if (NULL == (n = mdoc->last->data.block.head)) { + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) + return(0); + } else if (NULL == n->child) + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests line parameters")) + return(0); - -/* - * Implicity-scoped macros, like `.Ss', have a scope that terminates - * with a subsequent call to the same macro. Implicit macros cannot - * break the scope of explicitly-scoped macros; however, they can break - * the scope of other implicit macros (so `.Sh' can break `.Ss'). This - * is ok with macros like `.It' because they exist only within an - * explicit context. - * - * These macros put line arguments (which it's allowed to have) into the - * HEAD section and open a BODY scope to be used until the macro scope - * closes. - */ -int -macro_scoped_implicit(MACRO_PROT_ARGS) -{ - int lastarg, j; - char *args[MDOC_LINEARG_MAX]; - struct mdoc_node *n; - - assert( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)); - - if (SEC_PROLOGUE == mdoc->sec_lastn) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); - - /* Token pre-processing. */ - - switch (tok) { - case (MDOC_Ss): - /* FALLTHROUGH */ - case (MDOC_Sh): - /* `.Pp' ignored when preceding `.Ss' or `.Sh'. */ - if (NULL == mdoc->last) - break; - if (MDOC_ELEM != mdoc->last->type) - break; - if (MDOC_Pp != mdoc->last->data.elem.tok) - break; - if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_BEFORE_BLK)) + if ((n = mdoc->last->data.block.body) && n->child) + if ( ! mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests body children")) return(0); - assert(mdoc->last->prev); - n = mdoc->last; - mdoc_msg(mdoc, ppos, "removing prior `Pp' macro"); - mdoc->last = mdoc->last->prev; - mdoc->last->next = NULL; - mdoc_node_free(n); - break; - default: - break; - } - /* Rewind our scope. */ + if (MDOC_Column != sv) + return(1); - if ( ! scope_rewind_imp(mdoc, ppos, tok)) - return(0); + /* Make sure the number of columns is sane. */ - j = 0; - lastarg = ppos; + sv = mdoc->last->parent->parent->data.block.argv->sz; + n = mdoc->last->data.block.head->child; - /* - * Process until we hit a line. Note that current implicit - * macros don't have any arguments, so we don't need to do any - * argument processing. - */ + for (i = 0; n; n = n->next) + i++; -again: - if (j == MDOC_LINEARG_MAX) - return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); + if (i == (size_t)sv) + return(1); + return(mdoc_err(mdoc, "expected %d list columns, have %d", sv, (int)i)); - lastarg = *pos; - - switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[j])) { - case (ARGS_ERROR): - return(0); - case (ARGS_EOLN): - return(append_scoped(mdoc, tok, ppos, j, _CC(args), 0, NULL)); - default: - break; - } - - if (MDOC_MAX != mdoc_find(mdoc, args[j])) - if ( ! mdoc_warn(mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE)) - return(0); - - j++; - goto again; - /* NOTREACHED */ +#undef TYPE_NONE +#undef TYPE_BODY +#undef TYPE_HEAD } -/* - * A line-scoped macro opens a scope for the contents of its line, which - * are placed under the HEAD node. Punctuation trailing the line is put - * as a sibling to the HEAD node, under the BLOCK node. - */ -int -macro_scoped_line(MACRO_PROT_ARGS) +/* Make sure that only `It' macros are our body-children. */ +static int +post_bl(struct mdoc *mdoc) { - int lastarg, c, j; - char *p; - struct mdoc_node *n; + struct mdoc_node *n; - if (SEC_PROLOGUE == mdoc->sec_lastn) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + if (MDOC_BODY != mdoc->last->type) + return(1); + assert(MDOC_Bl == mdoc->last->tok); - assert(1 == ppos); - - /* Token pre-processing. */ - - switch (tok) { - case (MDOC_D1): - /* FALLTHROUGH */ - case (MDOC_Dl): - /* These can't be nested in a display block. */ - assert(mdoc->last); - for (n = mdoc->last->parent ; n; n = n->parent) - if (MDOC_BLOCK != n->type) + for (n = mdoc->last->child; n; n = n->next) { + if (MDOC_BLOCK == n->type) + if (MDOC_It == n->tok) continue; - else if (MDOC_Bd == n->data.block.tok) - break; - if (NULL == n) - break; - return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NONEST)); - default: break; } - - /* - * All line-scoped macros have a HEAD and optionally a BODY - * section. We open our scope here; when we exit this function, - * we'll rewind our scope appropriately. - */ - - mdoc_block_alloc(mdoc, ppos, tok, 0, NULL); - mdoc_head_alloc(mdoc, ppos, tok, 0, NULL); - - /* Process line parameters. */ - - j = 0; - lastarg = ppos; - -again: - if (j == MDOC_LINEARG_MAX) - return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); - - lastarg = *pos; - c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p); - - switch (c) { - case (ARGS_ERROR): - return(0); - case (ARGS_WORD): - break; - case (ARGS_PUNCT): - if ( ! append_delims(mdoc, tok, pos, buf)) - return(0); - return(scope_rewind_imp(mdoc, ppos, tok)); - case (ARGS_EOLN): - return(scope_rewind_imp(mdoc, ppos, tok)); - default: - abort(); - /* NOTREACHED */ - } - - if (MDOC_MAX != (c = mdoc_find(mdoc, p))) { - if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) - return(0); - if ( ! append_delims(mdoc, tok, pos, buf)) - return(0); - return(scope_rewind_imp(mdoc, ppos, tok)); - } - - if (mdoc_isdelim(p)) - j = 0; - - mdoc_word_alloc(mdoc, lastarg, p); - goto again; - /* NOTREACHED */ + if (NULL == n) + return(1); + return(mdoc_nerr(mdoc, n, "invalid child of parent macro `Bl'")); } -/* - * Partial-line scope is identical to line scope (macro_scoped_line()) - * except that trailing punctuation is appended to the BLOCK, instead of - * contained within the HEAD. - */ -int -macro_scoped_pline(MACRO_PROT_ARGS) +/* Warn if conventional sections are out of order. */ +static int +post_sh(struct mdoc *mdoc) { - int lastarg, c, j; - char *p; + enum mdoc_sec sec; + int i; + struct mdoc_node *n; + char *args[MDOC_LINEARG_MAX]; - if (SEC_PROLOGUE == mdoc->sec_lastn) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + if (MDOC_HEAD != mdoc->last->type) + return(1); + + assert(MDOC_Sh == mdoc->last->tok); - /* Token pre-processing. */ + n = mdoc->last->child; + assert(n); - switch (tok) { - case (MDOC_Ql): - if ( ! mdoc_warn(mdoc, tok, ppos, WARN_COMPAT_TROFF)) - return(0); - break; - default: - break; + for (i = 0; n && i < MDOC_LINEARG_MAX; n = n->next, i++) { + assert(MDOC_TEXT == n->type); + assert(NULL == n->child); + assert(n->data.text.string); + args[i] = n->data.text.string; } - mdoc_block_alloc(mdoc, ppos, tok, 0, NULL); - mdoc_head_alloc(mdoc, ppos, tok, 0, NULL); + sec = mdoc_atosec((size_t)i, (const char **)args); + if (SEC_CUSTOM == sec) + return(1); + if (sec > mdoc->sec_lastn) + return(1); - /* Process line parameters. */ - - j = 0; - lastarg = ppos; - -again: - if (j == MDOC_LINEARG_MAX) - return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); - - lastarg = *pos; - c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p); - - switch (c) { - case (ARGS_ERROR): - return(0); - case (ARGS_WORD): - break; - case (ARGS_PUNCT): - if ( ! scope_rewind_imp(mdoc, ppos, tok)) - return(0); - if (ppos > 1) - return(1); - return(append_delims(mdoc, tok, pos, buf)); - case (ARGS_EOLN): - return(scope_rewind_imp(mdoc, ppos, tok)); - default: - abort(); - /* NOTREACHED */ - } - - if (MDOC_MAX != (c = mdoc_find(mdoc, p))) { - if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) - return(0); - if ( ! scope_rewind_imp(mdoc, ppos, tok)) - return(0); - if (ppos > 1) - return(1); - return(append_delims(mdoc, tok, pos, buf)); - } - - if (mdoc_isdelim(p)) - j = 0; - - mdoc_word_alloc(mdoc, lastarg, p); - goto again; - /* NOTREACHED */ + if (sec == mdoc->sec_lastn) + return(mdoc_warn(mdoc, WARN_SYNTAX, "section repeated")); + return(mdoc_warn(mdoc, WARN_SYNTAX, "section out of conventional order")); } -/* - * A delimited-constant macro is similar to a general text macro: the - * macro is followed by a 0 or 1 arguments (possibly-unspecified) then - * terminating punctuation, other words, or another callable macro. - */ int -macro_constant_delimited(MACRO_PROT_ARGS) +mdoc_valid_pre(struct mdoc *mdoc, struct mdoc_node *node) { - int lastarg, flushed, c, maxargs; - char *p; + v_pre *p; - if (SEC_PROLOGUE == mdoc->sec_lastn) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + /* TODO: character-escape checks. */ - /* Process line parameters. */ + if (MDOC_TEXT == node->type) + return(1); + assert(MDOC_ROOT != node->type); - lastarg = ppos; - flushed = 0; - - /* Token pre-processing. */ - - switch (tok) { - case (MDOC_Ux): - maxargs = 0; - break; - default: - maxargs = 1; - break; - } - -again: - lastarg = *pos; - - switch (mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p)) { - case (ARGS_ERROR): - return(0); - case (ARGS_WORD): - break; - case (ARGS_PUNCT): - if ( ! flushed && ! append_const(mdoc, tok, ppos, 0, &p)) + if (NULL == mdoc_valids[node->tok].pre) + return(1); + for (p = mdoc_valids[node->tok].pre; *p; p++) + if ( ! (*p)(mdoc, node)) return(0); - if (ppos > 1) - return(1); - return(append_delims(mdoc, tok, pos, buf)); - case (ARGS_EOLN): - if (flushed) - return(1); - return(append_const(mdoc, tok, ppos, 0, &p)); - default: - abort(); - /* NOTREACHED */ - } - - /* Accepts no arguments: flush out symbol and continue. */ - - if (0 == maxargs) { - if ( ! append_const(mdoc, tok, ppos, 0, &p)) - return(0); - flushed = 1; - } - - if (MDOC_MAX != (c = mdoc_find(mdoc, p))) { - if ( ! flushed && ! append_const(mdoc, tok, ppos, 0, &p)) - return(0); - if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf)) - return(0); - if (ppos > 1) - return(1); - return(append_delims(mdoc, tok, pos, buf)); - } - - /* - * We only accept one argument; subsequent tokens are considered - * as literal words (until a macro). - */ - - if ( ! flushed && ! mdoc_isdelim(p)) { - if ( ! append_const(mdoc, tok, ppos, 1, &p)) - return(0); - flushed = 1; - goto again; - } else if ( ! flushed) { - if ( ! append_const(mdoc, tok, ppos, 0, &p)) - return(0); - flushed = 1; - } - - mdoc_word_alloc(mdoc, lastarg, p); - goto again; - /* NOTREACHED */ + return(1); } int -macro_constant(MACRO_PROT_ARGS) +mdoc_valid_post(struct mdoc *mdoc) { - int lastarg, j; - char *args[MDOC_LINEARG_MAX]; + v_post *p; - if (SEC_PROLOGUE == mdoc->sec_lastn) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + if (MDOC_TEXT == mdoc->last->type) + return(1); + if (MDOC_ROOT == mdoc->last->type) + return(1); - j = 0; - lastarg = ppos; - -again: - if (j == MDOC_LINEARG_MAX) - return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); - - lastarg = *pos; - - switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[j])) { - case (ARGS_ERROR): - return(0); - case (ARGS_WORD): - break; - case (ARGS_EOLN): - return(append_const(mdoc, tok, ppos, j, args)); - default: - abort(); - /* NOTREACHED */ - } - - if (MDOC_MAX != mdoc_find(mdoc, args[j])) - if ( ! mdoc_warn(mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE)) + if (NULL == mdoc_valids[mdoc->last->tok].post) + return(1); + for (p = mdoc_valids[mdoc->last->tok].post; *p; p++) + if ( ! (*p)(mdoc)) return(0); - j++; - goto again; - /* NOTREACHED */ + return(1); } - -int -macro_constant_argv(MACRO_PROT_ARGS) -{ - int c, lastarg, j; - struct mdoc_arg argv[MDOC_LINEARG_MAX]; - - if (SEC_PROLOGUE == mdoc->sec_lastn) - return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); - - lastarg = *pos; - - for (j = 0; j < MDOC_LINEARG_MAX; j++) { - lastarg = *pos; - c = mdoc_argv(mdoc, tok, &argv[j], pos, buf); - if (0 == c) - break; - else if (1 == c) - continue; - - mdoc_argv_free(j, argv); - return(0); - } - - if (MDOC_LINEARG_MAX == j) { - mdoc_argv_free(j, argv); - return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); - } - - c = append_constarg(mdoc, tok, ppos, j, argv); - mdoc_argv_free(j, argv); - return(c); -}