=================================================================== RCS file: /cvs/mandoc/Attic/validate.c,v retrieving revision 1.39 retrieving revision 1.44 diff -u -p -r1.39 -r1.44 --- mandoc/Attic/validate.c 2009/01/19 17:02:59 1.39 +++ mandoc/Attic/validate.c 2009/01/20 13:44:05 1.44 @@ -1,4 +1,4 @@ -/* $Id: validate.c,v 1.39 2009/01/19 17:02:59 kristaps Exp $ */ +/* $Id: validate.c,v 1.44 2009/01/20 13:44:05 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -21,13 +21,20 @@ #include "private.h" +/* + * Pre- and post-validate macros as they're parsed. Pre-validation + * occurs when the macro has been detected and its arguments parsed. + * Post-validation occurs when all child macros have also been parsed. + * In the ELEMENT case, this is simply the parameters of the macro; in + * the BLOCK case, this is the HEAD, BODY, TAIL and so on. + */ + typedef int (*v_pre)(struct mdoc *, struct mdoc_node *); typedef int (*v_post)(struct mdoc *); /* FIXME: some sections should only occur in specific msecs. */ /* FIXME: ignoring Pp. */ /* FIXME: math symbols. */ -/* FIXME: make sure prologue is complete. */ /* FIXME: valid character-escape checks. */ /* FIXME: make sure required sections are included (NAME, ...). */ @@ -44,11 +51,11 @@ static int pre_check_msecs(struct mdoc *, struct mdoc_ int, enum mdoc_msec *); static int pre_check_stdarg(struct mdoc *, struct mdoc_node *); static int post_check_children_count(struct mdoc *); -static int post_check_children_lt(struct mdoc *, int); -static int post_check_children_gt(struct mdoc *, int); -static int post_check_children_wgt(struct mdoc *, int); -static int post_check_children_eq(struct mdoc *, int); -static int post_check_children_weq(struct mdoc *, int); +static int post_check_children_lt(struct mdoc *, const char *, int); +static int post_check_children_gt(struct mdoc *, const char *, int); +static int post_check_children_wgt(struct mdoc *, const char *, int); +static int post_check_children_eq(struct mdoc *, const char *, int); +static int post_check_children_weq(struct mdoc *, const char *, int); /* Specific pre-child-parse routines. */ @@ -71,7 +78,7 @@ static int pre_prologue(struct mdoc *, struct mdoc_nod /* Specific post-child-parse routines. */ static int herr_ge1(struct mdoc *); -static int hwarn_ge1(struct mdoc *); +static int herr_le1(struct mdoc *); static int herr_eq0(struct mdoc *); static int eerr_eq0(struct mdoc *); static int eerr_le1(struct mdoc *); @@ -81,7 +88,6 @@ static int eerr_ge1(struct mdoc *); static int ewarn_eq0(struct mdoc *); static int ewarn_eq1(struct mdoc *); static int bwarn_ge1(struct mdoc *); -static int berr_eq0(struct mdoc *); static int ewarn_ge1(struct mdoc *); static int ebool(struct mdoc *); static int post_sh(struct mdoc *); @@ -92,6 +98,7 @@ static int post_an(struct mdoc *); static int post_at(struct mdoc *); static int post_xr(struct mdoc *); static int post_nm(struct mdoc *); +static int post_bf(struct mdoc *); static int post_root(struct mdoc *); /* Collections of pre-child-parse routines. */ @@ -117,19 +124,19 @@ static v_post posts_bd[] = { herr_eq0, bwarn_ge1, NULL static v_post posts_text[] = { eerr_ge1, NULL }; static v_post posts_wtext[] = { ewarn_ge1, NULL }; static v_post posts_notext[] = { eerr_eq0, NULL }; -static v_post posts_wline[] = { hwarn_ge1, berr_eq0, NULL }; +static v_post posts_wline[] = { bwarn_ge1, herr_eq0, NULL }; static v_post posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL }; static v_post posts_bl[] = { herr_eq0, bwarn_ge1, post_bl, NULL }; static v_post posts_it[] = { post_it, NULL }; static v_post posts_in[] = { ewarn_eq1, NULL }; static v_post posts_ss[] = { herr_ge1, NULL }; static v_post posts_pp[] = { ewarn_eq0, NULL }; -static v_post posts_d1[] = { herr_ge1, NULL }; static v_post posts_ex[] = { eerr_le1, post_ex, NULL }; static v_post posts_an[] = { post_an, NULL }; static v_post posts_at[] = { post_at, NULL }; static v_post posts_xr[] = { eerr_ge1, eerr_le2, post_xr, NULL }; static v_post posts_nm[] = { post_nm, NULL }; +static v_post posts_bf[] = { herr_le1, post_bf, NULL }; /* Per-macro pre- and post-child-check routine collections. */ @@ -142,8 +149,8 @@ const struct valids mdoc_valids[MDOC_MAX] = { { pres_sh, posts_sh }, /* Sh */ { pres_ss, posts_ss }, /* Ss */ { NULL, posts_pp }, /* Pp */ - { pres_d1, posts_d1 }, /* D1 */ - { pres_d1, posts_d1 }, /* Dl */ + { pres_d1, posts_wline }, /* D1 */ + { pres_d1, posts_wline }, /* Dl */ { pres_bd, posts_bd }, /* Bd */ { NULL, NULL }, /* Ed */ { pres_bl, posts_bl }, /* Bl */ @@ -193,7 +200,7 @@ const struct valids mdoc_valids[MDOC_MAX] = { { NULL, posts_wline }, /* Aq */ { NULL, posts_at }, /* At */ { NULL, NULL }, /* Bc */ - { NULL, NULL }, /* Bf */ /* FIXME */ + { NULL, posts_bf }, /* Bf */ { NULL, NULL }, /* Bo */ { NULL, posts_wline }, /* Bq */ { NULL, NULL }, /* Bsx */ @@ -258,62 +265,62 @@ post_check_children_count(struct mdoc *mdoc) static int -post_check_children_wgt(struct mdoc *mdoc, int sz) +post_check_children_wgt(struct mdoc *mdoc, const char *p, int sz) { int i; if ((i = post_check_children_count(mdoc)) > sz) return(1); return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests more " - "than %d parameters (has %d)", sz, i)); + "than %d %s (has %d)", sz, p, i)); } static int -post_check_children_gt(struct mdoc *mdoc, int sz) +post_check_children_gt(struct mdoc *mdoc, const char *p, int sz) { int i; if ((i = post_check_children_count(mdoc)) > sz) return(1); return(mdoc_err(mdoc, "macro requires more than %d " - "parameters (has %d)", sz, i)); + "%s (has %d)", sz, p, i)); } static int -post_check_children_weq(struct mdoc *mdoc, int sz) +post_check_children_weq(struct mdoc *mdoc, const char *p, int sz) { int i; if ((i = post_check_children_count(mdoc)) == sz) return(1); return(mdoc_warn(mdoc, WARN_SYNTAX, "macro suggests %d " - "parameters (has %d)", sz, i)); + "%s (has %d)", sz, p, i)); } static int -post_check_children_eq(struct mdoc *mdoc, int sz) +post_check_children_eq(struct mdoc *mdoc, const char *p, int sz) { int i; if ((i = post_check_children_count(mdoc)) == sz) return(1); - return(mdoc_err(mdoc, "macro requires %d parameters " - "(have %d)", sz, i)); + return(mdoc_err(mdoc, "macro requires %d %s " + "(have %d)", sz, p, i)); } static int -post_check_children_lt(struct mdoc *mdoc, int sz) +post_check_children_lt(struct mdoc *mdoc, const char *p, int sz) { int i; if ((i = post_check_children_count(mdoc)) < sz) return(1); return(mdoc_err(mdoc, "macro requires less than %d " - "parameters (have %d)", sz, i)); + "%s (have %d)", sz, p, i)); } @@ -362,22 +369,12 @@ pre_check_parent(struct mdoc *mdoc, struct mdoc_node * static int -berr_eq0(struct mdoc *mdoc) -{ - - if (MDOC_BODY != mdoc->last->type) - return(1); - return(post_check_children_eq(mdoc, 0)); -} - - -static int bwarn_ge1(struct mdoc *mdoc) { if (MDOC_BODY != mdoc->last->type) return(1); - return(post_check_children_wgt(mdoc, 0)); + return(post_check_children_wgt(mdoc, "body children", 0)); } @@ -386,7 +383,7 @@ ewarn_eq1(struct mdoc *mdoc) { assert(MDOC_ELEM == mdoc->last->type); - return(post_check_children_weq(mdoc, 1)); + return(post_check_children_weq(mdoc, "parameters", 1)); } @@ -395,7 +392,7 @@ ewarn_eq0(struct mdoc *mdoc) { assert(MDOC_ELEM == mdoc->last->type); - return(post_check_children_weq(mdoc, 0)); + return(post_check_children_weq(mdoc, "parameters", 0)); } @@ -404,7 +401,7 @@ ewarn_ge1(struct mdoc *mdoc) { assert(MDOC_ELEM == mdoc->last->type); - return(post_check_children_wgt(mdoc, 0)); + return(post_check_children_wgt(mdoc, "parameters", 0)); } @@ -413,7 +410,7 @@ eerr_eq1(struct mdoc *mdoc) { assert(MDOC_ELEM == mdoc->last->type); - return(post_check_children_eq(mdoc, 1)); + return(post_check_children_eq(mdoc, "parameters", 1)); } @@ -422,7 +419,7 @@ eerr_le2(struct mdoc *mdoc) { assert(MDOC_ELEM == mdoc->last->type); - return(post_check_children_lt(mdoc, 3)); + return(post_check_children_lt(mdoc, "parameters", 3)); } @@ -431,7 +428,7 @@ eerr_le1(struct mdoc *mdoc) { assert(MDOC_ELEM == mdoc->last->type); - return(post_check_children_lt(mdoc, 2)); + return(post_check_children_lt(mdoc, "parameters", 2)); } @@ -440,7 +437,7 @@ eerr_eq0(struct mdoc *mdoc) { assert(MDOC_ELEM == mdoc->last->type); - return(post_check_children_eq(mdoc, 0)); + return(post_check_children_eq(mdoc, "parameters", 0)); } @@ -449,7 +446,7 @@ eerr_ge1(struct mdoc *mdoc) { assert(MDOC_ELEM == mdoc->last->type); - return(post_check_children_gt(mdoc, 0)); + return(post_check_children_gt(mdoc, "parameters", 0)); } @@ -459,17 +456,16 @@ herr_eq0(struct mdoc *mdoc) if (MDOC_HEAD != mdoc->last->type) return(1); - return(post_check_children_eq(mdoc, 0)); + return(post_check_children_eq(mdoc, "parameters", 0)); } static int -hwarn_ge1(struct mdoc *mdoc) +herr_le1(struct mdoc *mdoc) { - if (MDOC_HEAD != mdoc->last->type) return(1); - return(post_check_children_wgt(mdoc, 0)); + return(post_check_children_lt(mdoc, "parameters", 2)); } @@ -479,7 +475,7 @@ herr_ge1(struct mdoc *mdoc) if (MDOC_HEAD != mdoc->last->type) return(1); - return(post_check_children_gt(mdoc, 0)); + return(post_check_children_gt(mdoc, "parameters", 0)); } @@ -763,6 +759,40 @@ pre_prologue(struct mdoc *mdoc, struct mdoc_node *node } return(mdoc_nerr(mdoc, node, "prologue macro repeated")); +} + + +static int +post_bf(struct mdoc *mdoc) +{ + char *p; + struct mdoc_node *head; + + if (MDOC_BLOCK != mdoc->last->type) + return(1); + assert(MDOC_Bf == mdoc->last->tok); + head = mdoc->last->data.block.head; + assert(head); + + if (0 == mdoc->last->data.block.argc) { + if (head->child) { + assert(MDOC_TEXT == head->child->type); + p = head->child->data.text.string; + if (xstrcmp(p, "Em")) + return(1); + else if (xstrcmp(p, "Li")) + return(1); + else if (xstrcmp(p, "Sm")) + return(1); + return(mdoc_nerr(mdoc, head->child, "invalid font mode")); + } + return(mdoc_err(mdoc, "macro expects an argument or parameter")); + } + if (head->child) + return(mdoc_err(mdoc, "macro expects an argument or parameter")); + if (1 == mdoc->last->data.block.argc) + return(1); + return(mdoc_err(mdoc, "macro expects an argument or parameter")); }