=================================================================== RCS file: /cvs/mandoc/Attic/macro.c,v retrieving revision 1.9 retrieving revision 1.13 diff -u -p -r1.9 -r1.13 --- mandoc/Attic/macro.c 2008/12/28 23:07:04 1.9 +++ mandoc/Attic/macro.c 2008/12/30 13:43:53 1.13 @@ -1,4 +1,4 @@ -/* $Id: macro.c,v 1.9 2008/12/28 23:07:04 kristaps Exp $ */ +/* $Id: macro.c,v 1.13 2008/12/30 13:43:53 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -21,15 +21,24 @@ #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) 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 *); @@ -121,6 +130,25 @@ scope_rewind_exp(struct mdoc *mdoc, int ppos, int tok, static int +append_constarg(struct mdoc *mdoc, int tok, int pos, + int argc, const struct mdoc_arg *argv) +{ + + switch (tok) { + default: + break; + } + + mdoc_elem_alloc(mdoc, pos, tok, argc, argv, 0, NULL); + return(1); +} + + +/* + * 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) @@ -130,7 +158,15 @@ append_scoped(struct mdoc *mdoc, int tok, int pos, switch (tok) { /* ======= ADD MORE MACRO CHECKS BELOW. ======= */ + 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)); @@ -141,18 +177,22 @@ append_scoped(struct mdoc *mdoc, int tok, int pos, 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; case (MDOC_Ss): - if (0 == sz) - return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1)); - break; + 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 */ @@ -161,9 +201,11 @@ append_scoped(struct mdoc *mdoc, int tok, int pos, continue; if (node->data.block.tok != MDOC_Bd) continue; - return(mdoc_err(mdoc, tok, pos, ERR_SCOPE_NONEST)); + break; } - break; + if (NULL == node) + break; + return(mdoc_err(mdoc, tok, pos, ERR_SCOPE_NONEST)); case (MDOC_Bl): break; @@ -182,13 +224,90 @@ append_scoped(struct mdoc *mdoc, int tok, int pos, static int -append_text(struct mdoc *mdoc, int tok, +append_const(struct mdoc *mdoc, int tok, int pos, int sz, char *args[]) { - assert(sz >= 0); - args[sz] = NULL; + switch (tok) { + /* ======= ADD MORE MACRO CHECKS BELOW. ======= */ + /* 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]); + } + + 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]); + return(1); + + 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; + + case (MDOC_Ux): + assert(0 == sz); + break; + + 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); +} + + +static int +append_text(struct mdoc *mdoc, int tok, + int pos, int sz, char *args[]) +{ + switch (tok) { /* ======= ADD MORE MACRO CHECKS BELOW. ======= */ case (MDOC_Pp): @@ -235,6 +354,10 @@ append_text(struct mdoc *mdoc, int tok, /* FALLTHROUGH */ case (MDOC_Ic): /* FALLTHROUGH */ + case (MDOC_Sy): + /* FALLTHROUGH */ + case (MDOC_Sx): + /* FALLTHROUGH */ case (MDOC_Va): /* FALLTHROUGH */ case (MDOC_Vt): @@ -256,7 +379,7 @@ int macro_text(MACRO_PROT_ARGS) { int lastarg, lastpunct, c, j; - char *args[MDOC_LINEARG_MAX], *p; + char *args[MDOC_LINEARG_MAX]; if (SEC_PROLOGUE == mdoc->sec_lastn) return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); @@ -355,11 +478,10 @@ again: * is non-terminal punctuation. */ - p = args[j]; if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args)) return(0); - mdoc_word_alloc(mdoc, lastarg, p); + mdoc_word_alloc(mdoc, lastarg, args[j]); j = 0; lastpunct = 1; @@ -518,7 +640,7 @@ again: return(0); if (0 == j) { - if (xstrcmp("$Mdocdate: December 28 2008 $", args[j])) { + if (xstrcmp("$Mdocdate: December 30 2008 $", args[j])) { mdoc->meta.date = time(NULL); goto again; } else if (xstrcmp("$Mdocdate:", args[j])) @@ -869,3 +991,169 @@ again: /* NOTREACHED */ } + +/* + * 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) +{ + int lastarg, flushed, c, maxargs; + char *p; + + if (SEC_PROLOGUE == mdoc->sec_lastn) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + + /* Process line parameters. */ + + 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)) + 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 */ +} + + +int +macro_constant(MACRO_PROT_ARGS) +{ + int lastarg, j; + char *args[MDOC_LINEARG_MAX]; + + if (SEC_PROLOGUE == mdoc->sec_lastn) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + + 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)) + return(0); + + j++; + goto again; + /* NOTREACHED */ +} + + +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); +}