diff options
Diffstat (limited to 'macro.c')
| -rw-r--r-- | macro.c | 277 |
1 files changed, 236 insertions, 41 deletions
@@ -26,15 +26,128 @@ #define _CC(p) ((const char **)p) -static int xstrlcat(char *, const char *, size_t); -static int xstrlcpy(char *, const char *, size_t); -static int xstrcmp(const char *, const char *); +static int scope_rewind_exp(struct mdoc *, int, int, int); static int append_text(struct mdoc *, int, int, int, char *[]); -static int append_scoped(struct mdoc *, int, - int, int, char *[]); +static int append_scoped(struct mdoc *, int, int, int, + const char *[], int, const struct mdoc_arg *); static int args_next(struct mdoc *, int, int *, char *, char **); +static int argv_next(struct mdoc *, int, + int *, char *, struct mdoc_arg *); +static int args_next_quoted(struct mdoc *, int, + int *, char *, char **); + + +static int +args_next_quoted(struct mdoc *mdoc, int tok, + int *pos, char *buf, char **v) +{ + + if (0 == buf[*pos]) + return(0); + + assert( ! isspace(buf[*pos])); + + if ('\"' != buf[*pos]) + return(args_next(mdoc, tok, pos, buf, v)); + + *v = &buf[++(*pos)]; + + while (buf[*pos] && '\"' != buf[*pos]) + (*pos)++; + + if (0 == buf[*pos]) { + (void)mdoc_err(mdoc, tok, *pos, ERR_SYNTAX_UNQUOTE); + return(-1); + } + + buf[(*pos)++] = 0; + if (0 == buf[*pos]) + return(1); + + while (buf[*pos] && isspace(buf[*pos])) + (*pos)++; + + if (0 == buf[*pos]) + if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_WS_EOLN)) + return(-1); + + return(1); +} + + +static int +scope_rewind_exp(struct mdoc *mdoc, int ppos, int tok, int dst) +{ + struct mdoc_node *n; + + /* LINTED */ + for (n = mdoc->last; 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)); + + mdoc_msg(mdoc, ppos, "scope: rewound `%s' to `%s'", + mdoc_macronames[tok], mdoc_macronames[dst]); + + return(1); +} + + +static int +argv_next(struct mdoc *mdoc, int tok, + int *pos, char *buf, struct mdoc_arg *v) +{ + char *argv; + int i, val; + + if (0 == buf[*pos]) + return(0); + + assert( ! isspace(buf[*pos])); + + if ('-' != buf[*pos]) { + (void)mdoc_err(mdoc, tok, *pos, ERR_SYNTAX_ARGS); + return(-1); + } + + i = *pos; + argv = &buf[++(*pos)]; + + while (buf[*pos] && ! isspace(buf[*pos])) + (*pos)++; + + if (buf[*pos]) + buf[(*pos)++] = 0; + + /* + * XXX This is a little bit ugly. The mdoc_argv structure + * points to a pointer array, which we allocate on-the-fly in + * this function. If there's any failure, we need to release + * this memory, which is done by the caller of this function + * with mdoc_argv_free. Ew. This should be simpler. + */ + + if (MDOC_ARG_MAX == (val = mdoc_argv_lookup(tok, argv))) { + (void)mdoc_err(mdoc, tok, i, ERR_SYNTAX_BADARG); + return(-1); + } + + while (buf[*pos] && isspace(buf[*pos])) + (*pos)++; + + if ( ! mdoc_argv_parse(mdoc, tok, val, v, pos, buf)) + return(-1); + + return(1); +} static int @@ -82,17 +195,18 @@ args_next(struct mdoc *mdoc, int tok, static int -append_scoped(struct mdoc *mdoc, int tok, - int pos, int sz, char *args[]) +append_scoped(struct mdoc *mdoc, int tok, int pos, + int sz, const char *args[], + int argc, const struct mdoc_arg *argv) { enum mdoc_sec sec; - if (0 == sz) - return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1)); - switch (tok) { /* ======= ADD MORE MACRO CHECKS BELOW. ======= */ case (MDOC_Sh): + 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)) @@ -105,17 +219,22 @@ append_scoped(struct mdoc *mdoc, int tok, 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; + + case (MDOC_Bl): break; + /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */ default: abort(); /* NOTREACHED */ } - assert(sz >= 0); - args[sz] = NULL; - mdoc_block_alloc(mdoc, pos, tok, 0, NULL); + 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); @@ -198,8 +317,10 @@ macro_text(MACRO_PROT_ARGS) return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); again: - lastarg = *pos; + + if (j == MDOC_LINEARG_MAX) + return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); c = args_next(mdoc, tok, pos, buf, &args[j]); if (-1 == c) @@ -262,10 +383,12 @@ macro_prologue_dtitle(MACRO_PROT_ARGS) again: lastarg = *pos; + + if (j == MDOC_LINEARG_MAX) + return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); c = args_next(mdoc, tok, pos, buf, &args[++j]); if (0 == c) { - mdoc->sec_lastn = mdoc->sec_last = SEC_BODY; /* FIXME */ if (mdoc->meta.title) return(1); if ( ! mdoc_warn(mdoc, tok, ppos, WARN_ARGS_GE1)) @@ -306,6 +429,44 @@ again: int +macro_prologue_os(MACRO_PROT_ARGS) +{ + int c, 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)); + + j = -1; + +again: + lastarg = *pos; + + if (j == MDOC_LINEARG_MAX) + return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); + c = args_next_quoted(mdoc, tok, pos, buf, &args[++j]); + + if (0 == c) { + mdoc->sec_lastn = mdoc->sec_last = SEC_BODY; + return(1); + } else if (-1 == c) + return(0); + + if ( ! xstrlcat(mdoc->meta.os, args[j], sizeof(mdoc->meta.os))) + return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGS)); + if ( ! xstrlcat(mdoc->meta.os, " ", sizeof(mdoc->meta.os))) + return(mdoc_err(mdoc, tok, lastarg, ERR_SYNTAX_ARGS)); + + goto again; + /* NOTREACHED */ +} + + +int macro_prologue_ddate(MACRO_PROT_ARGS) { int c, lastarg, j; @@ -322,9 +483,12 @@ macro_prologue_ddate(MACRO_PROT_ARGS) date[0] = 0; again: - lastarg = *pos; + + if (j == MDOC_LINEARG_MAX) + return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); c = args_next(mdoc, tok, pos, buf, &args[++j]); + if (0 == c) { if (mdoc->meta.date) return(1); @@ -360,6 +524,55 @@ again: int +macro_scoped_explicit(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)); + + /* + * 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. + */ + + switch (tok) { + case (MDOC_El): + return(scope_rewind_exp(mdoc, ppos, tok, MDOC_Bl)); + default: + break; + } + + assert(MDOC_EXPLICIT & mdoc_macros[tok].flags); + + lastarg = *pos; + + for (j = 0; j < MDOC_LINEARG_MAX; j++) { + lastarg = *pos; + c = argv_next(mdoc, tok, pos, buf, &argv[j]); + 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_scoped(mdoc, tok, ppos, 0, NULL, j, argv); + mdoc_argv_free(j, argv); + return(c); +} + + +int macro_scoped_implicit(MACRO_PROT_ARGS) { int t, c, lastarg, j; @@ -371,6 +584,8 @@ macro_scoped_implicit(MACRO_PROT_ARGS) if (SEC_PROLOGUE == mdoc->sec_lastn) return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + /* FIXME: put into scope_rewind_imp(). */ + /* LINTED */ for (n = mdoc->last; n; n = n->parent) { if (MDOC_BLOCK != n->type) @@ -393,14 +608,17 @@ macro_scoped_implicit(MACRO_PROT_ARGS) j = 0; again: - lastarg = *pos; + + if (j == MDOC_LINEARG_MAX) + return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY)); c = args_next(mdoc, tok, pos, buf, &args[j]); if (-1 == c) return(0); if (0 == c) - return(append_scoped(mdoc, tok, ppos, j, args)); + return(append_scoped(mdoc, tok, ppos, + j, _CC(args), 0, NULL)); /* Command found. */ @@ -416,26 +634,3 @@ again: /* NOTREACHED */ } - -static int -xstrcmp(const char *p1, const char *p2) -{ - - return(0 == strcmp(p1, p2)); -} - - -static int -xstrlcat(char *dst, const char *src, size_t sz) -{ - - return(strlcat(dst, src, sz) < sz); -} - - -static int -xstrlcpy(char *dst, const char *src, size_t sz) -{ - - return(strlcpy(dst, src, sz) < sz); -} |