=================================================================== RCS file: /cvs/mandoc/Attic/macro.c,v retrieving revision 1.39 retrieving revision 1.59 diff -u -p -r1.39 -r1.59 --- mandoc/Attic/macro.c 2009/01/16 14:04:26 1.39 +++ mandoc/Attic/macro.c 2009/03/08 18:02:36 1.59 @@ -1,4 +1,4 @@ -/* $Id: macro.c,v 1.39 2009/01/16 14:04:26 kristaps Exp $ */ +/* $Id: macro.c,v 1.59 2009/03/08 18:02:36 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -25,82 +25,293 @@ #include #endif +/* + * This has scanning/parsing routines, each of which extract a macro and + * its arguments and parameters, then know how to progress to the next + * macro. + */ + #include "private.h" -/* FIXME: maxlineargs should be per LINE, no per TOKEN. */ +static int macro_obsolete(MACRO_PROT_ARGS); +static int macro_constant(MACRO_PROT_ARGS); +static int macro_constant_scoped(MACRO_PROT_ARGS); +static int macro_constant_delimited(MACRO_PROT_ARGS); +static int macro_text(MACRO_PROT_ARGS); +static int macro_scoped(MACRO_PROT_ARGS); +static int macro_scoped_close(MACRO_PROT_ARGS); +static int macro_scoped_line(MACRO_PROT_ARGS); -static int rewind_alt(int); -static int rewind_dohalt(int, enum mdoc_type, - const struct mdoc_node *); #define REWIND_REWIND (1 << 0) #define REWIND_NOHALT (1 << 1) #define REWIND_HALT (1 << 2) -static int rewind_dobreak(int, enum mdoc_type, - const struct mdoc_node *); - +static int rewind_dohalt(int, enum mdoc_type, + const struct mdoc_node *); +static int rewind_alt(int); +static int rewind_dobreak(int, const struct mdoc_node *); static int rewind_elem(struct mdoc *, int); static int rewind_impblock(struct mdoc *, int, int, int); static int rewind_expblock(struct mdoc *, int, int, int); -static int rewind_subblock(enum mdoc_type, struct mdoc *, int); -static int rewind_last(int, int, - struct mdoc *, struct mdoc_node *); -static int append_delims(struct mdoc *, - int, int, int *, char *); +static int rewind_subblock(enum mdoc_type, + struct mdoc *, int, int, int); +static int rewind_last(struct mdoc *, struct mdoc_node *); +static int append_delims(struct mdoc *, int, int *, char *); static int lookup(struct mdoc *, int, int, int, const char *); +static int pwarn(struct mdoc *, int, int, int); +static int perr(struct mdoc *, int, int, int); +static int scopewarn(struct mdoc *, enum mdoc_type, int, int, + const struct mdoc_node *); +#define WMACPARM (1) +#define WOBS (2) +#define ENOCTX (1) +#define ENOPARMS (2) + +/* Central table of library: who gets parsed how. */ + +const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { + { NULL, 0 }, /* \" */ + { macro_constant, MDOC_PROLOGUE }, /* Dd */ + { macro_constant, MDOC_PROLOGUE }, /* Dt */ + { macro_constant, MDOC_PROLOGUE }, /* Os */ + { macro_scoped, 0 }, /* Sh */ + { macro_scoped, 0 }, /* Ss */ + { macro_text, 0 }, /* Pp */ + { macro_scoped_line, MDOC_PARSED }, /* D1 */ + { macro_scoped_line, MDOC_PARSED }, /* Dl */ + { macro_scoped, MDOC_EXPLICIT }, /* Bd */ + { macro_scoped_close, MDOC_EXPLICIT }, /* Ed */ + { macro_scoped, MDOC_EXPLICIT }, /* Bl */ + { macro_scoped_close, MDOC_EXPLICIT }, /* El */ + { macro_scoped, MDOC_PARSED }, /* It */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ + { macro_text, MDOC_PARSED }, /* An */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ + { macro_constant, 0 }, /* Cd */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Er */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ev */ + { macro_constant, 0 }, /* Ex */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Fa */ + { macro_constant, 0 }, /* Fd */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */ + { macro_text, MDOC_PARSED }, /* Ft */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */ + { macro_constant, 0 }, /* In */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Li */ + { macro_constant, 0 }, /* Nd */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Op */ + { macro_obsolete, 0 }, /* Ot */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */ + { macro_constant, 0 }, /* Rv */ + /* XXX - .St supposed to be (but isn't) callable. */ + { macro_constant_delimited, MDOC_PARSED }, /* St */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Va */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Vt */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Xr */ + { macro_constant, 0 }, /* %A */ + { macro_constant, 0 }, /* %B */ + { macro_constant, 0 }, /* %D */ + { macro_constant, 0 }, /* %I */ + { macro_constant, 0 }, /* %J */ + { macro_constant, 0 }, /* %N */ + { macro_constant, 0 }, /* %O */ + { macro_constant, 0 }, /* %P */ + { macro_constant, 0 }, /* %R */ + { macro_constant, 0 }, /* %T */ + { macro_constant, 0 }, /* %V */ + { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ac */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ao */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */ + { macro_constant_delimited, 0 }, /* At */ + { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Bc */ + { macro_scoped, MDOC_EXPLICIT }, /* Bf */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bo */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */ + { macro_constant_delimited, MDOC_PARSED }, /* Bsx */ + { macro_constant_delimited, MDOC_PARSED }, /* Bx */ + { macro_constant, 0 }, /* Db */ + { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Dc */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Do */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dq */ + { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ec */ + { macro_scoped_close, MDOC_EXPLICIT }, /* Ef */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ + { macro_constant_delimited, MDOC_PARSED }, /* Fx */ + { macro_text, MDOC_PARSED }, /* Ms */ + { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* No */ + { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */ + { macro_constant_delimited, MDOC_PARSED }, /* Nx */ + { macro_constant_delimited, MDOC_PARSED }, /* Ox */ + { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */ + { macro_constant_delimited, MDOC_PARSED }, /* Pf */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pq */ + { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Qc */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ql */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Qo */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Qq */ + { macro_scoped_close, MDOC_EXPLICIT }, /* Re */ + { macro_scoped, MDOC_EXPLICIT }, /* Rs */ + { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Sc */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* So */ + { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Sq */ + { macro_constant, 0 }, /* Sm */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */ + { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */ + { macro_constant_delimited, MDOC_PARSED }, /* Ux */ + { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */ + /* XXX - .Fo supposed to be (but isn't) callable. */ + { macro_scoped, MDOC_EXPLICIT }, /* Fo */ + { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Fc */ + { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Oo */ + { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Oc */ + { macro_scoped, MDOC_EXPLICIT }, /* Bk */ + { macro_scoped_close, MDOC_EXPLICIT }, /* Ek */ + { macro_constant, 0 }, /* Bt */ + { macro_constant, 0 }, /* Hf */ + { macro_obsolete, 0 }, /* Fr */ + { macro_constant, 0 }, /* Ud */ + { macro_constant, 0 }, /* Lb */ +}; + +const struct mdoc_macro * const mdoc_macros = __mdoc_macros; + + static int +perr(struct mdoc *mdoc, int line, int pos, int type) +{ + int c; + + switch (type) { + case (ENOCTX): + c = mdoc_perr(mdoc, line, pos, + "closing macro has no prior context"); + break; + case (ENOPARMS): + c = mdoc_perr(mdoc, line, pos, + "macro doesn't expect parameters"); + break; + default: + abort(); + /* NOTREACHED */ + } + return(c); +} + +static int +pwarn(struct mdoc *mdoc, int line, int pos, int type) +{ + int c; + + switch (type) { + case (WMACPARM): + c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, + "macro-like parameter"); + break; + case (WOBS): + c = mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, + "macro is marked obsolete"); + break; + default: + abort(); + /* NOTREACHED */ + } + return(c); +} + + +static int +scopewarn(struct mdoc *mdoc, enum mdoc_type type, + int line, int pos, const struct mdoc_node *p) +{ + const char *n, *t, *tt; + + n = t = ""; + tt = "block"; + + switch (p->type) { + case (MDOC_BODY): + tt = "multi-line"; + break; + case (MDOC_HEAD): + tt = "line"; + break; + default: + break; + } + + switch (p->type) { + case (MDOC_BLOCK): + n = mdoc_macronames[p->tok]; + t = "block"; + break; + case (MDOC_BODY): + n = mdoc_macronames[p->tok]; + t = "multi-line"; + break; + case (MDOC_HEAD): + n = mdoc_macronames[p->tok]; + t = "line"; + break; + default: + break; + } + + if ( ! (MDOC_IGN_SCOPE & mdoc->pflags)) + return(mdoc_perr(mdoc, line, pos, + "%s scope breaks %s scope of %s", + tt, t, n)); + return(mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, + "%s scope breaks %s scope of %s", + tt, t, n)); +} + + +static int lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p) { int res; - res = mdoc_find(mdoc, p); + res = mdoc_tokhash_find(mdoc->htab, p); if (MDOC_PARSED & mdoc_macros[from].flags) return(res); if (MDOC_MAX == res) return(res); - - if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, "macro-like parameter")) + if ( ! pwarn(mdoc, line, pos, WMACPARM)) return(-1); return(MDOC_MAX); } static int -rewind_last(int tok, int type, struct mdoc *mdoc, struct mdoc_node *to) +rewind_last(struct mdoc *mdoc, struct mdoc_node *to) { assert(to); mdoc->next = MDOC_NEXT_SIBLING; - if (mdoc->last == to) { + + /* LINTED */ + while (mdoc->last != to) { if ( ! mdoc_valid_post(mdoc)) return(0); if ( ! mdoc_action_post(mdoc)) return(0); - mdoc_msg(mdoc, "rewound %s %s to %s %s", - mdoc_type2a(type), - mdoc_macronames[tok], - mdoc_type2a(mdoc->last->type), - mdoc_macronames[mdoc->last->tok]); - return(1); - } - - do { mdoc->last = mdoc->last->parent; assert(mdoc->last); - if ( ! mdoc_valid_post(mdoc)) - return(0); - if ( ! mdoc_action_post(mdoc)) - return(0); - mdoc_msg(mdoc, "rewound %s %s to %s %s", - mdoc_type2a(type), - mdoc_macronames[tok], - mdoc_type2a(mdoc->last->type), - mdoc_macronames[mdoc->last->tok]); - } while (mdoc->last != to); + } - return(1); + if ( ! mdoc_valid_post(mdoc)) + return(0); + return(mdoc_action_post(mdoc)); } @@ -152,10 +363,8 @@ rewind_dohalt(int tok, enum mdoc_type type, const stru if (MDOC_ROOT == p->type) return(REWIND_HALT); - if (MDOC_TEXT == p->type) + if (MDOC_VALID & p->flags) return(REWIND_NOHALT); - if (MDOC_ELEM == p->type) - return(REWIND_NOHALT); switch (tok) { /* One-liner implicit-scope. */ @@ -178,7 +387,7 @@ rewind_dohalt(int tok, enum mdoc_type type, const stru case (MDOC_Qq): /* FALLTHROUGH */ case (MDOC_Sq): - assert(MDOC_BODY != type); + assert(MDOC_HEAD != type); assert(MDOC_TAIL != type); if (type == p->type && tok == p->tok) return(REWIND_REWIND); @@ -281,7 +490,7 @@ rewind_dohalt(int tok, enum mdoc_type type, const stru static int -rewind_dobreak(int tok, enum mdoc_type type, const struct mdoc_node *p) +rewind_dobreak(int tok, const struct mdoc_node *p) { assert(MDOC_ROOT != p->type); @@ -289,6 +498,8 @@ rewind_dobreak(int tok, enum mdoc_type type, const str return(1); if (MDOC_TEXT == p->type) return(1); + if (MDOC_VALID & p->flags) + return(1); switch (tok) { /* Implicit rules. */ @@ -330,36 +541,32 @@ rewind_elem(struct mdoc *mdoc, int tok) assert(MDOC_ELEM == n->type); assert(tok == n->tok); - return(rewind_last(tok, MDOC_ELEM, mdoc, n)); + return(rewind_last(mdoc, n)); } static int -rewind_subblock(enum mdoc_type type, struct mdoc *mdoc, int tok) +rewind_subblock(enum mdoc_type type, struct mdoc *mdoc, + int tok, int line, int ppos) { struct mdoc_node *n; int c; - c = rewind_dohalt(tok, type, mdoc->last); - if (REWIND_HALT == c) - return(1); - if (REWIND_REWIND == c) - return(rewind_last(tok, type, mdoc, mdoc->last)); - /* LINTED */ - for (n = mdoc->last->parent; n; n = n->parent) { + for (n = mdoc->last; n; n = n->parent) { c = rewind_dohalt(tok, type, n); if (REWIND_HALT == c) return(1); if (REWIND_REWIND == c) break; - else if (rewind_dobreak(tok, type, n)) + else if (rewind_dobreak(tok, n)) continue; - return(mdoc_nerr(mdoc, n, "body scope broken")); + if ( ! scopewarn(mdoc, type, line, ppos, n)) + return(0); } assert(n); - return(rewind_last(tok, type, mdoc, n)); + return(rewind_last(mdoc, n)); } @@ -369,26 +576,21 @@ rewind_expblock(struct mdoc *mdoc, int tok, int line, struct mdoc_node *n; int c; - c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last); - if (REWIND_HALT == c) - return(mdoc_perr(mdoc, line, ppos, "closing macro has no context")); - if (REWIND_REWIND == c) - return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last)); - /* LINTED */ - for (n = mdoc->last->parent; n; n = n->parent) { + for (n = mdoc->last; n; n = n->parent) { c = rewind_dohalt(tok, MDOC_BLOCK, n); if (REWIND_HALT == c) - return(mdoc_perr(mdoc, line, ppos, "closing macro has no context")); + return(perr(mdoc, line, ppos, ENOCTX)); if (REWIND_REWIND == c) break; - else if (rewind_dobreak(tok, MDOC_BLOCK, n)) + else if (rewind_dobreak(tok, n)) continue; - return(mdoc_nerr(mdoc, n, "block scope broken")); + if ( ! scopewarn(mdoc, MDOC_BLOCK, line, ppos, n)) + return(0); } assert(n); - return(rewind_last(tok, MDOC_BLOCK, mdoc, n)); + return(rewind_last(mdoc, n)); } @@ -398,32 +600,26 @@ rewind_impblock(struct mdoc *mdoc, int tok, int line, struct mdoc_node *n; int c; - c = rewind_dohalt(tok, MDOC_BLOCK, mdoc->last); - if (REWIND_HALT == c) - return(1); - if (REWIND_REWIND == c) - return(rewind_last(tok, MDOC_BLOCK, mdoc, mdoc->last)); - /* LINTED */ - for (n = mdoc->last->parent; n; n = n->parent) { + for (n = mdoc->last; n; n = n->parent) { c = rewind_dohalt(tok, MDOC_BLOCK, n); if (REWIND_HALT == c) return(1); else if (REWIND_REWIND == c) break; - else if (rewind_dobreak(tok, MDOC_BLOCK, n)) + else if (rewind_dobreak(tok, n)) continue; - return(mdoc_nerr(mdoc, n, "block scope broken")); + if ( ! scopewarn(mdoc, MDOC_BLOCK, line, ppos, n)) + return(0); } assert(n); - return(rewind_last(tok, MDOC_BLOCK, mdoc, n)); + return(rewind_last(mdoc, n)); } static int -append_delims(struct mdoc *mdoc, int tok, - int line, int *pos, char *buf) +append_delims(struct mdoc *mdoc, int line, int *pos, char *buf) { int c, lastarg; char *p; @@ -434,6 +630,8 @@ append_delims(struct mdoc *mdoc, int tok, for (;;) { lastarg = *pos; c = mdoc_args(mdoc, line, pos, buf, 0, &p); + assert(ARGS_PHRASE != c); + if (ARGS_ERROR == c) return(0); else if (ARGS_EOLN == c) @@ -448,8 +646,11 @@ append_delims(struct mdoc *mdoc, int tok, } -/* ARGSUSED */ -int +/* + * Close out an explicit scope. This optionally parses a TAIL type with + * a set number of TEXT children. + */ +static int macro_scoped_close(MACRO_PROT_ARGS) { int tt, j, c, lastarg, maxargs, flushed; @@ -466,19 +667,20 @@ macro_scoped_close(MACRO_PROT_ARGS) tt = rewind_alt(tok); - mdoc_msg(mdoc, "parse-quiet: %s closing %s", + mdoc_msg(mdoc, "parse: %s closing %s", mdoc_macronames[tok], mdoc_macronames[tt]); if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) { if (0 == buf[*pos]) { - if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) + if ( ! rewind_subblock(MDOC_BODY, mdoc, + tok, line, ppos)) return(0); return(rewind_expblock(mdoc, tok, line, ppos)); } - return(mdoc_perr(mdoc, line, ppos, "macro expects no parameters")); + return(perr(mdoc, line, ppos, ENOPARMS)); } - if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) + if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos)) return(0); lastarg = ppos; @@ -490,7 +692,7 @@ macro_scoped_close(MACRO_PROT_ARGS) mdoc->next = MDOC_NEXT_CHILD; } - for (j = 0; j < MDOC_LINEARG_MAX; j++) { + for (j = 0; /* No sentinel. */; j++) { lastarg = *pos; if (j == maxargs && ! flushed) { @@ -499,7 +701,9 @@ macro_scoped_close(MACRO_PROT_ARGS) flushed = 1; } - c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p); + c = mdoc_args(mdoc, line, pos, buf, tok, &p); + assert(ARGS_PHRASE != c); + if (ARGS_ERROR == c) return(0); if (ARGS_PUNCT == c) @@ -511,7 +715,8 @@ macro_scoped_close(MACRO_PROT_ARGS) return(0); else if (MDOC_MAX != c) { if ( ! flushed) { - if ( ! rewind_expblock(mdoc, tok, line, ppos)) + if ( ! rewind_expblock(mdoc, tok, + line, ppos)) return(0); flushed = 1; } @@ -525,41 +730,53 @@ macro_scoped_close(MACRO_PROT_ARGS) mdoc->next = MDOC_NEXT_SIBLING; } - if (MDOC_LINEARG_MAX == j) - return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - if ( ! flushed && ! rewind_expblock(mdoc, tok, line, ppos)) return(0); if (ppos > 1) return(1); - return(append_delims(mdoc, tok, line, pos, buf)); + return(append_delims(mdoc, line, pos, buf)); } /* - * A general text domain macro. When invoked, this opens a scope that - * accepts words until either end-of-line, only-punctuation, or a - * callable macro. If the word is punctuation (not only-punctuation), - * then the scope is closed out, the punctuation appended, then the - * scope opened again. If any terminating conditions are met, the scope - * is closed out. If this is the first macro in the line and - * only-punctuation remains, this punctuation is flushed. + * A general text macro. This is a complex case because of punctuation. + * If a text macro is followed by words, then punctuation, the macro is + * "stopped" and "reopened" following the punctuation. Thus, the + * following arises: + * + * .Fl a ; b + * + * ELEMENT (.Fl) + * TEXT (`a') + * TEXT (`;') + * ELEMENT (.Fl) + * TEXT (`b') + * + * This must handle the following situations: + * + * .Fl Ar b ; ; + * + * ELEMENT (.Fl) + * ELEMENT (.Ar) + * TEXT (`b') + * TEXT (`;') + * TEXT (`;') */ -int +static int macro_text(MACRO_PROT_ARGS) { - int la, lastpunct, c, sz, fl, argc; - struct mdoc_arg argv[MDOC_LINEARG_MAX]; + int la, lastpunct, c, w; + struct mdoc_arg *arg; char *p; la = ppos; lastpunct = 0; + arg = NULL; - for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { + for (;;) { la = *pos; - - c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); + c = mdoc_argv(mdoc, line, tok, &arg, pos, buf); if (ARGV_EOLN == c) break; if (ARGV_WORD == c) { @@ -567,73 +784,55 @@ macro_text(MACRO_PROT_ARGS) break; } else if (ARGV_ARG == c) continue; - - mdoc_argv_free(argc, argv); + mdoc_argv_free(arg); return(0); } - if (MDOC_LINEARG_MAX == argc) { - mdoc_argv_free(argc, argv); - return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - } - - c = mdoc_elem_alloc(mdoc, line, la, tok, argc, argv); - - if (0 == c) { - mdoc_argv_free(argc, argv); + if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) return(0); - } mdoc->next = MDOC_NEXT_CHILD; - fl = ARGS_DELIM; - if (MDOC_QUOTABLE & mdoc_macros[tok].flags) - fl |= ARGS_QUOTED; - - for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) { + lastpunct = 0; + for (;;) { la = *pos; + w = mdoc_args(mdoc, line, pos, buf, tok, &p); + assert(ARGS_PHRASE != c); - c = mdoc_args(mdoc, line, pos, buf, fl, &p); - if (ARGS_ERROR == c) { - mdoc_argv_free(argc, argv); + if (ARGS_ERROR == w) return(0); - } - - if (ARGS_EOLN == c) + if (ARGS_EOLN == w) break; - if (ARGS_PUNCT == c) + if (ARGS_PUNCT == w) break; - if (-1 == (c = lookup(mdoc, line, la, tok, p))) - return(0); - else if (MDOC_MAX != c) { - if (0 == lastpunct && ! rewind_elem(mdoc, tok)) { - mdoc_argv_free(argc, argv); - return(0); - } - mdoc_argv_free(argc, argv); + c = ARGS_QWORD == w ? MDOC_MAX : + lookup(mdoc, line, la, tok, p); + if (MDOC_MAX != c && -1 != c) { + if (0 == lastpunct && ! rewind_elem(mdoc, tok)) + return(0); c = mdoc_macro(mdoc, c, line, la, pos, buf); if (0 == c) return(0); if (ppos > 1) return(1); - return(append_delims(mdoc, tok, line, pos, buf)); - } + return(append_delims(mdoc, line, pos, buf)); + } else if (-1 == c) + return(0); - if (mdoc_isdelim(p)) { - if (0 == lastpunct && ! rewind_elem(mdoc, tok)) { - mdoc_argv_free(argc, argv); + /* FIXME: .Fl and .Ar handling of `|'. */ + + if (ARGS_QWORD != w && mdoc_isdelim(p)) { + if (0 == lastpunct && ! rewind_elem(mdoc, tok)) return(0); - } lastpunct = 1; } else if (lastpunct) { - c = mdoc_elem_alloc(mdoc, line, - la, tok, argc, argv); - if (0 == c) { - mdoc_argv_free(argc, argv); + c = mdoc_elem_alloc(mdoc, line, ppos, tok, arg); + + if (0 == c) return(0); - } + mdoc->next = MDOC_NEXT_CHILD; lastpunct = 0; } @@ -643,41 +842,63 @@ macro_text(MACRO_PROT_ARGS) mdoc->next = MDOC_NEXT_SIBLING; } - mdoc_argv_free(argc, argv); - - if (sz == MDOC_LINEARG_MAX) - return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - if (0 == lastpunct && ! rewind_elem(mdoc, tok)) return(0); if (ppos > 1) return(1); - return(append_delims(mdoc, tok, line, pos, buf)); + return(append_delims(mdoc, line, pos, buf)); } /* - * Implicit- or explicit-end multi-line scoped macro. + * Handle explicit-scope (having a different closure token) and implicit + * scope (closing out prior scopes when re-invoked) macros. These + * constitute the BLOCK type and usually span multiple lines. These + * always have HEAD and sometimes have BODY types. In the multi-line + * case: + * + * .Bd -ragged + * Text. + * .Fl macro + * Another. + * .Ed + * + * BLOCK (.Bd) + * HEAD + * BODY + * TEXT (`Text.') + * ELEMENT (.Fl) + * TEXT (`macro') + * TEXT (`Another.') + * + * Note that the `.It' macro, possibly the most difficult (as it has + * embedded scope, etc.) is handled by this routine. */ -int +static int macro_scoped(MACRO_PROT_ARGS) { - int c, lastarg, argc, j, fl; - struct mdoc_arg argv[MDOC_LINEARG_MAX]; + int c, lastarg; + struct mdoc_arg *arg; char *p; assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)); + /* First rewind extant implicit scope. */ + if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) { - if ( ! rewind_subblock(MDOC_BODY, mdoc, tok)) + if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos)) return(0); if ( ! rewind_impblock(mdoc, tok, line, ppos)) return(0); } - for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { + /* Parse arguments. */ + + arg = NULL; + + for (;;) { lastarg = *pos; - c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); + c = mdoc_argv(mdoc, line, tok, &arg, pos, buf); if (ARGV_EOLN == c) break; if (ARGV_WORD == c) { @@ -685,20 +906,11 @@ macro_scoped(MACRO_PROT_ARGS) break; } else if (ARGV_ARG == c) continue; - mdoc_argv_free(argc, argv); + mdoc_argv_free(arg); return(0); } - if (MDOC_LINEARG_MAX == argc) { - mdoc_argv_free(argc, argv); - return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - } - - c = mdoc_block_alloc(mdoc, line, ppos, - tok, (size_t)argc, argv); - mdoc_argv_free(argc, argv); - - if (0 == c) + if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, arg)) return(0); mdoc->next = MDOC_NEXT_CHILD; @@ -706,7 +918,8 @@ macro_scoped(MACRO_PROT_ARGS) if (0 == buf[*pos]) { if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) return(0); - if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, + tok, line, ppos)) return(0); if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) return(0); @@ -718,24 +931,29 @@ macro_scoped(MACRO_PROT_ARGS) return(0); mdoc->next = MDOC_NEXT_CHILD; - fl = ARGS_DELIM; - if (MDOC_TABSEP & mdoc_macros[tok].flags) - fl |= ARGS_TABSEP; - - for (j = 0; j < MDOC_LINEARG_MAX; j++) { + for (;;) { lastarg = *pos; - c = mdoc_args(mdoc, line, pos, buf, fl, &p); - + c = mdoc_args(mdoc, line, pos, buf, tok, &p); + if (ARGS_ERROR == c) return(0); - if (ARGS_PUNCT == c) - break; if (ARGS_EOLN == c) break; + if (ARGS_PHRASE == c) { + /* + if ( ! mdoc_phrase(mdoc, line, lastarg, buf)) + return(0); + */ + continue; + } + + /* FIXME: if .It -column, the lookup must be for a + * sub-line component. BLAH. */ if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) return(0); - else if (MDOC_MAX == c) { + + if (MDOC_MAX == c) { if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) return(0); mdoc->next = MDOC_NEXT_SIBLING; @@ -746,13 +964,10 @@ macro_scoped(MACRO_PROT_ARGS) return(0); break; } - - if (j == MDOC_LINEARG_MAX) - return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - - if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) + + if (1 == ppos && ! append_delims(mdoc, line, pos, buf)) return(0); - if (1 == ppos && ! append_delims(mdoc, tok, line, pos, buf)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos)) return(0); if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) @@ -764,29 +979,48 @@ macro_scoped(MACRO_PROT_ARGS) /* - * When scoped to a line, a macro encompasses all of the contents. This - * differs from constants or text macros, where a new macro will - * terminate the existing context. + * This handles a case of implicitly-scoped macro (BLOCK) limited to a + * single line. Instead of being closed out by a subsequent call to + * another macro, the scope is closed at the end of line. These don't + * have BODY or TAIL types. Notice that the punctuation falls outside + * of the HEAD type. + * + * .Qq a Fl b Ar d ; ; + * + * BLOCK (Qq) + * HEAD + * TEXT (`a') + * ELEMENT (.Fl) + * TEXT (`b') + * ELEMENT (.Ar) + * TEXT (`d') + * TEXT (`;') + * TEXT (`;') */ -int +static int macro_scoped_line(MACRO_PROT_ARGS) { - int lastarg, c, j; + int lastarg, c; char *p; - if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL)) + if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL)) return(0); mdoc->next = MDOC_NEXT_CHILD; if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) return(0); + mdoc->next = MDOC_NEXT_SIBLING; + if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) + return(0); mdoc->next = MDOC_NEXT_CHILD; /* XXX - no known argument macros. */ - for (lastarg = ppos, j = 0; j < MDOC_LINEARG_MAX; j++) { + lastarg = ppos; + for (;;) { lastarg = *pos; - c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p); + c = mdoc_args(mdoc, line, pos, buf, tok, &p); + assert(ARGS_PHRASE != c); if (ARGS_ERROR == c) return(0); @@ -809,25 +1043,33 @@ macro_scoped_line(MACRO_PROT_ARGS) break; } - if (j == MDOC_LINEARG_MAX) - return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - if (1 == ppos) { - if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) + if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos)) return(0); - if ( ! append_delims(mdoc, tok, line, pos, buf)) + if ( ! append_delims(mdoc, line, pos, buf)) return(0); - } else if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) + } else if ( ! rewind_subblock(MDOC_BODY, mdoc, tok, line, ppos)) return(0); return(rewind_impblock(mdoc, tok, line, ppos)); } /* - * Constant-scope macros accept a fixed number of arguments and behave - * like constant macros except that they're scoped across lines. + * A constant-scoped macro is like a simple-scoped macro (mdoc_scoped) + * except that it doesn't handle implicit scopes and explicit ones have + * a fixed number of TEXT children to the BODY. + * + * .Fl a So b Sc ; + * + * ELEMENT (.Fl) + * TEXT (`a') + * BLOCK (.So) + * HEAD + * BODY + * TEXT (`b') + * TEXT (';') */ -int +static int macro_constant_scoped(MACRO_PROT_ARGS) { int lastarg, flushed, j, c, maxargs; @@ -845,14 +1087,14 @@ macro_constant_scoped(MACRO_PROT_ARGS) break; } - if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL)) + if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL)) return(0); mdoc->next = MDOC_NEXT_CHILD; if (0 == maxargs) { if ( ! mdoc_head_alloc(mdoc, line, ppos, tok)) return(0); - if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos)) return(0); if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) return(0); @@ -862,11 +1104,11 @@ macro_constant_scoped(MACRO_PROT_ARGS) mdoc->next = MDOC_NEXT_CHILD; - for (j = 0; j < MDOC_LINEARG_MAX; j++) { + for (j = 0; /* No sentinel. */; j++) { lastarg = *pos; if (j == maxargs && ! flushed) { - if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos)) return(0); flushed = 1; if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) @@ -874,7 +1116,9 @@ macro_constant_scoped(MACRO_PROT_ARGS) mdoc->next = MDOC_NEXT_CHILD; } - c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p); + c = mdoc_args(mdoc, line, pos, buf, tok, &p); + assert(ARGS_PHRASE != c); + if (ARGS_ERROR == c) return(0); if (ARGS_PUNCT == c) @@ -886,20 +1130,24 @@ macro_constant_scoped(MACRO_PROT_ARGS) return(0); else if (MDOC_MAX != c) { if ( ! flushed) { - if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, + tok, line, ppos)) return(0); flushed = 1; - if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) + if ( ! mdoc_body_alloc(mdoc, line, + ppos, tok)) return(0); mdoc->next = MDOC_NEXT_CHILD; } - if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf)) + if ( ! mdoc_macro(mdoc, c, line, lastarg, + pos, buf)) return(0); break; } if ( ! flushed && mdoc_isdelim(p)) { - if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, + tok, line, ppos)) return(0); flushed = 1; if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) @@ -912,11 +1160,8 @@ macro_constant_scoped(MACRO_PROT_ARGS) mdoc->next = MDOC_NEXT_SIBLING; } - if (MDOC_LINEARG_MAX == j) - return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - if ( ! flushed) { - if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok)) + if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos)) return(0); if ( ! mdoc_body_alloc(mdoc, line, ppos, tok)) return(0); @@ -925,36 +1170,45 @@ macro_constant_scoped(MACRO_PROT_ARGS) if (ppos > 1) return(1); - return(append_delims(mdoc, tok, line, pos, buf)); + return(append_delims(mdoc, line, pos, buf)); } /* - * Delimited macros are like text macros except that, should punctuation - * be encountered, the macro isn't re-started with remaining tokens - * (it's only emitted once). Delimited macros can have a maximum number - * of arguments. + * A delimited constant is very similar to the macros parsed by + * macro_text except that, in the event of punctuation, the macro isn't + * "re-opened" as it is in macro_text. Also, these macros have a fixed + * number of parameters. + * + * .Fl a No b + * + * ELEMENT (.Fl) + * TEXT (`a') + * ELEMENT (.No) + * TEXT (`b') */ -int +static int macro_constant_delimited(MACRO_PROT_ARGS) { - int lastarg, flushed, j, c, maxargs, argc; - struct mdoc_arg argv[MDOC_LINEARG_MAX]; + int lastarg, flushed, j, c, maxargs, + igndelim, ignargs; + struct mdoc_arg *arg; char *p; lastarg = ppos; flushed = 0; + + /* + * Maximum arguments per macro. Some of these have none and + * exit as soon as they're parsed. + */ switch (tok) { case (MDOC_No): /* FALLTHROUGH */ case (MDOC_Ns): /* FALLTHROUGH */ - case (MDOC_Pf): - /* FALLTHROUGH */ case (MDOC_Ux): - /* FALLTHROUGH */ - case (MDOC_St): maxargs = 0; break; default: @@ -962,29 +1216,58 @@ macro_constant_delimited(MACRO_PROT_ARGS) break; } - for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { - lastarg = *pos; - c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); - if (ARGV_EOLN == c) - break; - if (ARGV_WORD == c) { - *pos = lastarg; - break; - } else if (ARGV_ARG == c) - continue; - mdoc_argv_free(argc, argv); - return(0); + /* + * Whether to ignore delimiter characters. `Pf' accepts its + * first token as a parameter no matter what it looks like (if + * it's text). + */ + + switch (tok) { + case (MDOC_Pf): + igndelim = 1; + break; + default: + igndelim = 0; + break; } - c = mdoc_elem_alloc(mdoc, line, lastarg, tok, argc, argv); - mdoc_argv_free(argc, argv); + /* + * Whether to ignore arguments: `St', for example, handles its + * argument-like parameters as regular parameters. + */ - if (0 == c) + switch (tok) { + case (MDOC_St): + ignargs = 1; + break; + default: + ignargs = 0; + break; + } + + arg = NULL; + + if ( ! ignargs) + for (;;) { + lastarg = *pos; + c = mdoc_argv(mdoc, line, tok, &arg, pos, buf); + if (ARGV_EOLN == c) + break; + if (ARGV_WORD == c) { + *pos = lastarg; + break; + } else if (ARGV_ARG == c) + continue; + mdoc_argv_free(arg); + return(0); + } + + if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) return(0); mdoc->next = MDOC_NEXT_CHILD; - for (j = 0; j < MDOC_LINEARG_MAX; j++) { + for (j = 0; /* No sentinel. */; j++) { lastarg = *pos; if (j == maxargs && ! flushed) { @@ -993,7 +1276,9 @@ macro_constant_delimited(MACRO_PROT_ARGS) flushed = 1; } - c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p); + c = mdoc_args(mdoc, line, pos, buf, tok, &p); + assert(ARGS_PHRASE != c); + if (ARGS_ERROR == c) return(0); if (ARGS_PUNCT == c) @@ -1012,7 +1297,7 @@ macro_constant_delimited(MACRO_PROT_ARGS) break; } - if ( ! flushed && mdoc_isdelim(p)) { + if ( ! flushed && mdoc_isdelim(p) && ! igndelim) { if ( ! rewind_elem(mdoc, tok)) return(0); flushed = 1; @@ -1023,103 +1308,113 @@ macro_constant_delimited(MACRO_PROT_ARGS) mdoc->next = MDOC_NEXT_SIBLING; } - if (MDOC_LINEARG_MAX == j) - return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - - if ( ! flushed && rewind_elem(mdoc, tok)) + if ( ! flushed && ! rewind_elem(mdoc, tok)) return(0); if (ppos > 1) return(1); - return(append_delims(mdoc, tok, line, pos, buf)); + return(append_delims(mdoc, line, pos, buf)); } /* - * Constant macros span an entire line: they constitute a macro and all - * of its arguments and child data. + * A constant macro is the simplest classification. It spans an entire + * line. */ -int +static int macro_constant(MACRO_PROT_ARGS) { - int c, lastarg, argc, sz, fl; - struct mdoc_arg argv[MDOC_LINEARG_MAX]; - char *p; + int c, w, la; + struct mdoc_arg *arg; + char *p; - fl = 0; - if (MDOC_QUOTABLE & mdoc_macros[tok].flags) - fl = ARGS_QUOTED; + assert( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)); - for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) { - lastarg = *pos; - c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf); + arg = NULL; + + for (;;) { + la = *pos; + c = mdoc_argv(mdoc, line, tok, &arg, pos, buf); if (ARGV_EOLN == c) break; if (ARGV_WORD == c) { - *pos = lastarg; + *pos = la; break; } else if (ARGV_ARG == c) continue; - - mdoc_argv_free(argc, argv); + mdoc_argv_free(arg); return(0); } - c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv); - mdoc_argv_free(argc, argv); - - if (0 == c) + if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg)) return(0); mdoc->next = MDOC_NEXT_CHILD; - if (MDOC_LINEARG_MAX == argc) - return(mdoc_perr(mdoc, line, ppos, "too many arguments")); + for (;;) { + la = *pos; + w = mdoc_args(mdoc, line, pos, buf, tok, &p); + assert(ARGS_PHRASE != c); - for (sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) { - lastarg = *pos; - c = mdoc_args(mdoc, line, pos, buf, fl, &p); - if (ARGS_ERROR == c) + if (ARGS_ERROR == w) return(0); - if (ARGS_EOLN == c) + if (ARGS_EOLN == w) break; - if (-1 == (c = lookup(mdoc, line, lastarg, tok, p))) - return(0); - else if (MDOC_MAX != c) { + c = ARGS_QWORD == w ? MDOC_MAX : + lookup(mdoc, line, la, tok, p); + + if (MDOC_MAX != c && -1 != c) { if ( ! rewind_elem(mdoc, tok)) return(0); - return(mdoc_macro(mdoc, c, line, - lastarg, pos, buf)); - } + return(mdoc_macro(mdoc, c, line, la, pos, buf)); + } else if (-1 == c) + return(0); - if ( ! mdoc_word_alloc(mdoc, line, lastarg, p)) + if ( ! mdoc_word_alloc(mdoc, line, la, p)) return(0); mdoc->next = MDOC_NEXT_SIBLING; } - if (MDOC_LINEARG_MAX == sz + argc) - return(mdoc_perr(mdoc, line, ppos, "too many arguments")); - return(rewind_elem(mdoc, tok)); } /* ARGSUSED */ -int +static int macro_obsolete(MACRO_PROT_ARGS) { - return(mdoc_pwarn(mdoc, line, ppos, WARN_SYNTAX, "macro is obsolete")); + return(pwarn(mdoc, line, ppos, WOBS)); } +/* + * This is called at the end of parsing. It must traverse up the tree, + * closing out open [implicit] scopes. Obviously, open explicit scopes + * are errors. + */ int macro_end(struct mdoc *mdoc) { + struct mdoc_node *n; assert(mdoc->first); assert(mdoc->last); - return(rewind_last(mdoc->last->tok, mdoc->last->type, - mdoc, mdoc->first)); + + /* Scan for open explicit scopes. */ + + n = MDOC_VALID & mdoc->last->flags ? + mdoc->last->parent : mdoc->last; + + for ( ; n; n = n->parent) { + if (MDOC_BLOCK != n->type) + continue; + if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags)) + continue; + return(mdoc_nerr(mdoc, n, + "macro scope still open on exit")); + } + + return(rewind_last(mdoc, mdoc->first)); }