-/* $Id: macro.c,v 1.13 2008/12/30 13:43:53 kristaps Exp $ */
+/* $Id: macro.c,v 1.72 2009/03/16 22:19:19 kristaps Exp $ */
/*
* Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
*
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#ifdef __linux__
-#include <time.h>
-#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)
+/*
+ * 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.
+ */
-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 *);
+/* FIXME: .Fl, .Ar, .Cd handling of `|'. */
+
+enum mwarn {
+ WMACPARM,
+ WOBS
+};
+
+enum merr {
+ EOPEN,
+ EQUOT,
+ ENOCTX,
+ ENOPARMS
+};
+
+#define REWIND_REWIND (1 << 0)
+#define REWIND_NOHALT (1 << 1)
+#define REWIND_HALT (1 << 2)
+
+static int obsolete(MACRO_PROT_ARGS);
+static int blk_part_exp(MACRO_PROT_ARGS);
+static int in_line_eoln(MACRO_PROT_ARGS);
+static int in_line_argn(MACRO_PROT_ARGS);
+static int in_line(MACRO_PROT_ARGS);
+static int blk_full(MACRO_PROT_ARGS);
+static int blk_exp_close(MACRO_PROT_ARGS);
+static int blk_part_imp(MACRO_PROT_ARGS);
+
+static int phrase(struct mdoc *, int, int, char *);
+static int rew_dohalt(int, enum mdoc_type,
+ const struct mdoc_node *);
+static int rew_alt(int);
+static int rew_dobreak(int, const struct mdoc_node *);
+static int rew_elem(struct mdoc *, int);
+static int rew_impblock(struct mdoc *, int, int, int);
+static int rew_expblock(struct mdoc *, int, int, int);
+static int rew_subblock(enum mdoc_type,
+ struct mdoc *, int, int, int);
+static int rew_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, enum mwarn);
+static int perr(struct mdoc *, int, int, enum merr);
+static int swarn(struct mdoc *, enum mdoc_type, int, int,
+ const struct mdoc_node *);
+
+#define nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t))
+
+/* Central table of library: who gets parsed how. */
+
+const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
+ { NULL, 0 }, /* \" */
+ { in_line_eoln, MDOC_PROLOGUE }, /* Dd */
+ { in_line_eoln, MDOC_PROLOGUE }, /* Dt */
+ { in_line_eoln, MDOC_PROLOGUE }, /* Os */
+ { blk_full, 0 }, /* Sh */
+ { blk_full, 0 }, /* Ss */
+ { in_line, 0 }, /* Pp */
+ { blk_part_imp, MDOC_PARSED }, /* D1 */
+ { blk_part_imp, MDOC_PARSED }, /* Dl */
+ { blk_full, MDOC_EXPLICIT }, /* Bd */
+ { blk_exp_close, MDOC_EXPLICIT }, /* Ed */
+ { blk_full, MDOC_EXPLICIT }, /* Bl */
+ { blk_exp_close, MDOC_EXPLICIT }, /* El */
+ { blk_full, MDOC_PARSED }, /* It */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */
+ { in_line, MDOC_PARSED }, /* An */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
+ { in_line_eoln, MDOC_CALLABLE }, /* Cd */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Er */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ev */
+ { in_line_eoln, 0 }, /* Ex */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fa */
+ { in_line_eoln, 0 }, /* Fd */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */
+ { in_line, MDOC_PARSED }, /* Ft */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */
+ { in_line_eoln, 0 }, /* In */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */
+ { in_line_eoln, 0 }, /* Nd */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */
+ { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */
+ { obsolete, 0 }, /* Ot */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */
+ { in_line_eoln, 0 }, /* Rv */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* St */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Va */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Vt */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Xr */
+ { in_line_eoln, 0 }, /* %A */
+ { in_line_eoln, 0 }, /* %B */
+ { in_line_eoln, 0 }, /* %D */
+ { in_line_eoln, 0 }, /* %I */
+ { in_line_eoln, 0 }, /* %J */
+ { in_line_eoln, 0 }, /* %N */
+ { in_line_eoln, 0 }, /* %O */
+ { in_line_eoln, 0 }, /* %P */
+ { in_line_eoln, 0 }, /* %R */
+ { in_line_eoln, 0 }, /* %T */
+ { in_line_eoln, 0 }, /* %V */
+ { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ac */
+ { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ao */
+ { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* At */
+ { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Bc */
+ { blk_full, MDOC_EXPLICIT }, /* Bf */
+ { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bo */
+ { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Bsx */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Bx */
+ { in_line_eoln, 0 }, /* Db */
+ { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Dc */
+ { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Do */
+ { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Dq */
+ { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ec */
+ { blk_exp_close, MDOC_EXPLICIT }, /* Ef */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Em */
+ { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */
+ { in_line, MDOC_PARSED }, /* Ms */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* No */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ox */
+ { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */
+ { in_line_argn, MDOC_PARSED | MDOC_IGNDELIM }, /* Pf */
+ { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */
+ { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Pq */
+ { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Qc */
+ { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Ql */
+ { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Qo */
+ { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Qq */
+ { blk_exp_close, MDOC_EXPLICIT }, /* Re */
+ { blk_full, MDOC_EXPLICIT }, /* Rs */
+ { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Sc */
+ { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* So */
+ { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Sq */
+ { in_line_eoln, 0 }, /* Sm */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ux */
+ { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */
+ { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */
+ { blk_full, MDOC_EXPLICIT | MDOC_CALLABLE }, /* Fo */
+ { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Fc */
+ { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Oo */
+ { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Oc */
+ { blk_full, MDOC_EXPLICIT }, /* Bk */
+ { blk_exp_close, MDOC_EXPLICIT }, /* Ek */
+ { in_line_eoln, 0 }, /* Bt */
+ { in_line_eoln, 0 }, /* Hf */
+ { obsolete, 0 }, /* Fr */
+ { in_line_eoln, 0 }, /* Ud */
+ { in_line_eoln, 0 }, /* Lb */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ap */
+ { in_line, 0 }, /* Lp */
+ { in_line, MDOC_PARSED }, /* Lk */
+ { in_line, MDOC_PARSED }, /* Mt */
+ { blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */
+ { blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bro */
+ { blk_exp_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Brc */
+ { in_line_eoln, 0 }, /* %C */
+ { obsolete, 0 }, /* Es */
+ { obsolete, 0 }, /* En */
+};
+
+const struct mdoc_macro * const mdoc_macros = __mdoc_macros;
static int
-append_delims(struct mdoc *mdoc, int tok, int *pos, char *buf)
+perr(struct mdoc *mdoc, int line, int pos, enum merr type)
{
- int c, lastarg;
char *p;
- if (0 == buf[*pos])
- return(1);
-
- mdoc_msg(mdoc, *pos, "`%s' flushing punctuation",
- mdoc_macronames[tok]);
-
- 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);
+ p = NULL;
+ switch (type) {
+ case (EOPEN):
+ p = "explicit scope still open on exit";
+ break;
+ case (EQUOT):
+ p = "unterminated quotation";
+ break;
+ case (ENOCTX):
+ p = "closure has no prior context";
+ break;
+ case (ENOPARMS):
+ p = "unexpect line arguments";
+ break;
}
-
- return(1);
+ assert(p);
+ return(mdoc_perr(mdoc, line, pos, p));
}
static int
-scope_rewind_imp(struct mdoc *mdoc, int ppos, int tok)
+pwarn(struct mdoc *mdoc, int line, int pos, enum mwarn type)
{
- struct mdoc_node *n;
- int t;
-
- n = mdoc->last ? mdoc->last->parent : NULL;
+ char *p;
- /* 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));
+ p = NULL;
+ switch (type) {
+ case (WMACPARM):
+ p = "macro-like parameter";
+ break;
+ case (WOBS):
+ p = "macro marked obsolete";
+ break;
}
-
- if (n) {
- mdoc->last = n;
- mdoc_msg(mdoc, ppos, "scope: rewound implicit `%s'",
- mdoc_macronames[tok]);
- return(1);
- }
-
- mdoc_msg(mdoc, ppos, "scope: new implicit `%s'",
- mdoc_macronames[tok]);
- return(1);
+ assert(p);
+ return(mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX, p));
}
static int
-scope_rewind_exp(struct mdoc *mdoc, int ppos, int tok, int dst)
+swarn(struct mdoc *mdoc, enum mdoc_type type,
+ int line, int pos, const struct mdoc_node *p)
{
- struct mdoc_node *n;
+ const char *n, *t, *tt;
- assert(mdoc->last);
+ n = t = "<root>";
+ tt = "block";
- /* 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));
+ switch (type) {
+ case (MDOC_BODY):
+ tt = "multi-line";
+ break;
+ case (MDOC_HEAD):
+ tt = "line";
+ break;
+ default:
+ break;
}
- if (NULL == (mdoc->last = n))
- return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX));
-
- mdoc_msg(mdoc, ppos, "scope: rewound explicit `%s' to `%s'",
- mdoc_macronames[tok], mdoc_macronames[dst]);
-
- return(1);
-}
-
-
-static int
-append_constarg(struct mdoc *mdoc, int tok, int pos,
- int argc, const struct mdoc_arg *argv)
-{
-
- switch (tok) {
+ 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;
}
- mdoc_elem_alloc(mdoc, pos, tok, argc, argv, 0, NULL);
- return(1);
+ 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));
}
/*
- * Append a node with implicit or explicit scoping ONLY. ALL macros
- * with the implicit- or explicit-scope callback must be included here.
+ * 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.
*/
-static int
-append_scoped(struct mdoc *mdoc, int tok, int pos,
- int sz, const char *args[],
- int argc, const struct mdoc_arg *argv)
+int
+macro_end(struct mdoc *mdoc)
{
- enum mdoc_sec sec;
- struct mdoc_node *node;
-
- 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));
-
- 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);
+ struct mdoc_node *n;
- 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->first);
+ assert(mdoc->last);
- 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));
+ /* Scan for open explicit scopes. */
- case (MDOC_Bl):
- break;
+ n = MDOC_VALID & mdoc->last->flags ?
+ mdoc->last->parent : mdoc->last;
- /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */
- default:
- abort();
- /* NOTREACHED */
+ for ( ; n; n = n->parent) {
+ if (MDOC_BLOCK != n->type)
+ continue;
+ if ( ! (MDOC_EXPLICIT & mdoc_macros[n->tok].flags))
+ continue;
+ return(nerr(mdoc, n, EOPEN));
}
- 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);
+ return(rew_last(mdoc, mdoc->first));
}
-
static int
-append_const(struct mdoc *mdoc, int tok,
- int pos, int sz, char *args[])
+lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
{
+ int res;
+
+ res = mdoc_tokhash_find(mdoc->htab, p);
+ if (MDOC_PARSED & mdoc_macros[from].flags)
+ return(res);
+ if (MDOC_MAX == res)
+ return(res);
+ if ( ! pwarn(mdoc, line, pos, WMACPARM))
+ return(-1);
+ return(MDOC_MAX);
+}
- 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]);
- }
+static int
+rew_last(struct mdoc *mdoc, struct mdoc_node *to)
+{
- 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);
+ assert(to);
+ mdoc->next = MDOC_NEXT_SIBLING;
- case (MDOC_Nd):
- if (sz > 0)
- break;
- if ( ! mdoc_warn(mdoc, tok, pos, WARN_ARGS_GE1))
+ /* LINTED */
+ while (mdoc->last != to) {
+ if ( ! mdoc_valid_post(mdoc))
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;
+ if ( ! mdoc_action_post(mdoc))
+ return(0);
+ mdoc->last = mdoc->last->parent;
+ assert(mdoc->last);
+ }
- case (MDOC_Ux):
- assert(0 == sz);
- break;
+ if ( ! mdoc_valid_post(mdoc))
+ return(0);
+ return(mdoc_action_post(mdoc));
+}
- 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. ======= */
+static int
+rew_alt(int tok)
+{
+ switch (tok) {
+ case (MDOC_Ac):
+ return(MDOC_Ao);
+ case (MDOC_Bc):
+ return(MDOC_Bo);
+ case (MDOC_Brc):
+ return(MDOC_Bro);
+ case (MDOC_Dc):
+ return(MDOC_Do);
+ case (MDOC_Ec):
+ return(MDOC_Eo);
+ case (MDOC_Ed):
+ return(MDOC_Bd);
+ case (MDOC_Ef):
+ return(MDOC_Bf);
+ case (MDOC_Ek):
+ return(MDOC_Bk);
+ case (MDOC_El):
+ return(MDOC_Bl);
+ case (MDOC_Fc):
+ return(MDOC_Fo);
+ case (MDOC_Oc):
+ return(MDOC_Oo);
+ case (MDOC_Pc):
+ return(MDOC_Po);
+ case (MDOC_Qc):
+ return(MDOC_Qo);
+ case (MDOC_Re):
+ return(MDOC_Rs);
+ case (MDOC_Sc):
+ return(MDOC_So);
+ case (MDOC_Xc):
+ return(MDOC_Xo);
default:
- abort();
- /* NOTREACHED */
+ break;
}
-
- mdoc_elem_alloc(mdoc, pos, tok, 0, NULL, (size_t)sz, _CC(args));
- return(1);
+ abort();
+ /* NOTREACHED */
}
static int
-append_text(struct mdoc *mdoc, int tok,
- int pos, int sz, char *args[])
+rew_dohalt(int tok, enum mdoc_type type, const struct mdoc_node *p)
{
- 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_ROOT == p->type)
+ return(REWIND_HALT);
+ if (MDOC_VALID & p->flags)
+ return(REWIND_NOHALT);
- case (MDOC_Ft):
+ switch (tok) {
+ /* One-liner implicit-scope. */
+ case (MDOC_Aq):
/* FALLTHROUGH */
- case (MDOC_Li):
+ case (MDOC_Bq):
/* FALLTHROUGH */
- case (MDOC_Ms):
+ case (MDOC_Brq):
/* FALLTHROUGH */
- case (MDOC_Pa):
+ case (MDOC_D1):
/* FALLTHROUGH */
- case (MDOC_Tn):
- if (0 < sz)
- break;
- if ( ! mdoc_warn(mdoc, tok, pos, WARN_ARGS_GE1))
- return(0);
+ case (MDOC_Dl):
+ /* FALLTHROUGH */
+ case (MDOC_Dq):
+ /* FALLTHROUGH */
+ case (MDOC_Op):
+ /* FALLTHROUGH */
+ case (MDOC_Pq):
+ /* FALLTHROUGH */
+ case (MDOC_Ql):
+ /* FALLTHROUGH */
+ case (MDOC_Qq):
+ /* FALLTHROUGH */
+ case (MDOC_Sq):
+ assert(MDOC_HEAD != type);
+ assert(MDOC_TAIL != type);
+ if (type == p->type && tok == p->tok)
+ return(REWIND_REWIND);
break;
- case (MDOC_Ar):
+ /* Multi-line implicit-scope. */
+ case (MDOC_It):
+ assert(MDOC_TAIL != type);
+ if (type == p->type && tok == p->tok)
+ return(REWIND_REWIND);
+ if (MDOC_BODY == p->type && MDOC_Bl == p->tok)
+ return(REWIND_HALT);
+ break;
+ case (MDOC_Sh):
+ if (type == p->type && tok == p->tok)
+ return(REWIND_REWIND);
+ break;
+ case (MDOC_Ss):
+ assert(MDOC_TAIL != type);
+ if (type == p->type && tok == p->tok)
+ return(REWIND_REWIND);
+ if (MDOC_BODY == p->type && MDOC_Sh == p->tok)
+ return(REWIND_HALT);
+ break;
+
+ /* Multi-line explicit scope start. */
+ case (MDOC_Ao):
+ /* FALLTHROUGH */
+ case (MDOC_Bd):
+ /* FALLTHROUGH */
+ case (MDOC_Bf):
+ /* FALLTHROUGH */
+ case (MDOC_Bk):
+ /* FALLTHROUGH */
+ case (MDOC_Bl):
+ /* FALLTHROUGH */
+ case (MDOC_Bo):
+ /* FALLTHROUGH */
+ case (MDOC_Bro):
+ /* FALLTHROUGH */
+ case (MDOC_Do):
+ /* FALLTHROUGH */
+ case (MDOC_Eo):
+ /* FALLTHROUGH */
+ case (MDOC_Fo):
+ /* FALLTHROUGH */
+ case (MDOC_Oo):
+ /* FALLTHROUGH */
+ case (MDOC_Po):
/* FALLTHROUGH */
- case (MDOC_Cm):
+ case (MDOC_Qo):
/* FALLTHROUGH */
- case (MDOC_Fl):
- /* These can have no arguments. */
+ case (MDOC_Rs):
+ /* FALLTHROUGH */
+ case (MDOC_So):
+ /* FALLTHROUGH */
+ case (MDOC_Xo):
+ if (type == p->type && tok == p->tok)
+ return(REWIND_REWIND);
break;
- case (MDOC_Ad):
+ /* Multi-line explicit scope close. */
+ case (MDOC_Ac):
+ /* FALLTHROUGH */
+ case (MDOC_Bc):
/* FALLTHROUGH */
- case (MDOC_Em):
+ case (MDOC_Brc):
/* FALLTHROUGH */
- case (MDOC_Er):
+ case (MDOC_Dc):
/* FALLTHROUGH */
- case (MDOC_Ev):
+ case (MDOC_Ec):
/* FALLTHROUGH */
- case (MDOC_Fa):
+ case (MDOC_Ed):
/* FALLTHROUGH */
- case (MDOC_Dv):
+ case (MDOC_Ek):
/* FALLTHROUGH */
- case (MDOC_Ic):
+ case (MDOC_El):
/* FALLTHROUGH */
- case (MDOC_Sy):
+ case (MDOC_Fc):
/* FALLTHROUGH */
- case (MDOC_Sx):
+ case (MDOC_Ef):
/* FALLTHROUGH */
- case (MDOC_Va):
+ case (MDOC_Oc):
/* FALLTHROUGH */
- case (MDOC_Vt):
- if (0 < sz)
- break;
- return(mdoc_err(mdoc, tok, pos, ERR_ARGS_GE1));
- /* ======= ADD MORE MACRO CHECKS ABOVE. ======= */
+ case (MDOC_Pc):
+ /* FALLTHROUGH */
+ case (MDOC_Qc):
+ /* FALLTHROUGH */
+ case (MDOC_Re):
+ /* FALLTHROUGH */
+ case (MDOC_Sc):
+ /* FALLTHROUGH */
+ case (MDOC_Xc):
+ if (type == p->type && rew_alt(tok) == p->tok)
+ return(REWIND_REWIND);
+ break;
default:
abort();
/* NOTREACHED */
}
- mdoc_elem_alloc(mdoc, pos, tok, 0, NULL, (size_t)sz, _CC(args));
- return(1);
+ return(REWIND_NOHALT);
}
-int
-macro_text(MACRO_PROT_ARGS)
+static int
+rew_dobreak(int tok, const struct mdoc_node *p)
{
- int lastarg, lastpunct, c, j;
- char *args[MDOC_LINEARG_MAX];
-
- if (SEC_PROLOGUE == mdoc->sec_lastn)
- return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
- /* Token pre-processing. */
+ assert(MDOC_ROOT != p->type);
+ if (MDOC_ELEM == p->type)
+ return(1);
+ if (MDOC_TEXT == p->type)
+ return(1);
+ if (MDOC_VALID & p->flags)
+ return(1);
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):
- /* FALLTHROUGH */
- case (MDOC_Sh):
- if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_AFTER_BLK))
- return(0);
+ /* Implicit rules. */
+ case (MDOC_It):
+ return(MDOC_It == p->tok);
+ case (MDOC_Ss):
+ return(MDOC_Ss == p->tok);
+ case (MDOC_Sh):
+ if (MDOC_Ss == p->tok)
+ return(1);
+ return(MDOC_Sh == p->tok);
+
+ /* Extra scope rules. */
+ case (MDOC_El):
+ if (MDOC_It == p->tok)
return(1);
- default:
- break;
- }
break;
default:
break;
}
- /* Process line parameters. */
+ if (MDOC_EXPLICIT & mdoc_macros[tok].flags)
+ return(p->tok == rew_alt(tok));
+ else if (MDOC_BLOCK == p->type)
+ return(1);
- j = 0;
- lastarg = ppos;
- lastpunct = 0;
+ return(tok == p->tok);
+}
-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.
- */
+static int
+rew_elem(struct mdoc *mdoc, int tok)
+{
+ struct mdoc_node *n;
- lastarg = *pos;
+ n = mdoc->last;
+ if (MDOC_ELEM != n->type)
+ n = n->parent;
+ assert(MDOC_ELEM == n->type);
+ assert(tok == n->tok);
- 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 */
- }
+ return(rew_last(mdoc, n));
+}
- /*
- * 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)
+static int
+rew_subblock(enum mdoc_type type, struct mdoc *mdoc,
+ int tok, int line, int ppos)
+{
+ struct mdoc_node *n;
+ int c;
+
+ /* LINTED */
+ for (n = mdoc->last; n; n = n->parent) {
+ c = rew_dohalt(tok, type, n);
+ if (REWIND_HALT == c)
return(1);
- return(append_delims(mdoc, tok, pos, buf));
+ if (REWIND_REWIND == c)
+ break;
+ else if (rew_dobreak(tok, n))
+ continue;
+ if ( ! swarn(mdoc, type, line, ppos, n))
+ return(0);
}
- /* Word/non-term-punctuation found. */
+ assert(n);
+ return(rew_last(mdoc, n));
+}
- if ( ! mdoc_isdelim(args[j])) {
- /* Words are appended to the array of arguments. */
- j++;
- lastpunct = 0;
- goto again;
+
+static int
+rew_expblock(struct mdoc *mdoc, int tok, int line, int ppos)
+{
+ struct mdoc_node *n;
+ int c;
+
+ /* LINTED */
+ for (n = mdoc->last; n; n = n->parent) {
+ c = rew_dohalt(tok, MDOC_BLOCK, n);
+ if (REWIND_HALT == c)
+ return(perr(mdoc, line, ppos, ENOCTX));
+ if (REWIND_REWIND == c)
+ break;
+ else if (rew_dobreak(tok, n))
+ continue;
+ if ( ! swarn(mdoc, MDOC_BLOCK, line, ppos, n))
+ return(0);
}
- /*
- * For punctuation, flush all collected words, then flush
- * punctuation, then start collecting again. Of course, this
- * is non-terminal punctuation.
- */
+ assert(n);
+ return(rew_last(mdoc, n));
+}
- if ( ! lastpunct && ! append_text(mdoc, tok, ppos, j, args))
- return(0);
- mdoc_word_alloc(mdoc, lastarg, args[j]);
- j = 0;
- lastpunct = 1;
+static int
+rew_impblock(struct mdoc *mdoc, int tok, int line, int ppos)
+{
+ struct mdoc_node *n;
+ int c;
- goto again;
- /* NOTREACHED */
+ /* LINTED */
+ for (n = mdoc->last; n; n = n->parent) {
+ c = rew_dohalt(tok, MDOC_BLOCK, n);
+ if (REWIND_HALT == c)
+ return(1);
+ else if (REWIND_REWIND == c)
+ break;
+ else if (rew_dobreak(tok, n))
+ continue;
+ if ( ! swarn(mdoc, MDOC_BLOCK, line, ppos, n))
+ return(0);
+ }
+
+ assert(n);
+ return(rew_last(mdoc, n));
}
-int
-macro_prologue_dtitle(MACRO_PROT_ARGS)
+static int
+append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
{
- int lastarg, j;
- char *args[MDOC_LINEARG_MAX];
+ int c, lastarg;
+ char *p;
- 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));
+ if (0 == buf[*pos])
+ return(1);
- j = -1;
- lastarg = ppos;
+ 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)
+ break;
+ assert(mdoc_isdelim(p));
+ if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+ return(0);
+ mdoc->next = MDOC_NEXT_SIBLING;
+ }
-again:
- if (j == MDOC_LINEARG_MAX)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ return(1);
+}
- 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);
- return(1);
- case (ARGS_ERROR):
- return(0);
+/*
+ * Close out block partial/full explicit.
+ */
+static int
+blk_exp_close(MACRO_PROT_ARGS)
+{
+ int j, c, lastarg, maxargs, flushed;
+ char *p;
+
+ switch (tok) {
+ case (MDOC_Ec):
+ maxargs = 1;
+ break;
default:
+ maxargs = 0;
break;
}
- if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn
- (mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
+ if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
+ if (0 == buf[*pos]) {
+ if ( ! rew_subblock(MDOC_BODY, mdoc,
+ tok, line, ppos))
+ return(0);
+ return(rew_expblock(mdoc, tok, line, ppos));
+ }
+ return(perr(mdoc, line, ppos, ENOPARMS));
+ }
+
+ if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos))
return(0);
- 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));
+ if (maxargs > 0) {
+ if ( ! mdoc_tail_alloc(mdoc, line,
+ ppos, rew_alt(tok)))
+ return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
}
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
-}
-
+ for (lastarg = ppos, flushed = j = 0; ; j++) {
+ lastarg = *pos;
-int
-macro_prologue_os(MACRO_PROT_ARGS)
-{
- int lastarg, j;
- char *args[MDOC_LINEARG_MAX];
+ if (j == maxargs && ! flushed) {
+ if ( ! rew_expblock(mdoc, tok, line, ppos))
+ return(0);
+ flushed = 1;
+ }
- 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));
+ c = mdoc_args(mdoc, line, pos, buf, tok, &p);
- j = -1;
- lastarg = ppos;
+ if (ARGS_ERROR == c)
+ return(0);
+ if (ARGS_PUNCT == c)
+ break;
+ if (ARGS_EOLN == c)
+ break;
-again:
- if (j == MDOC_LINEARG_MAX)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+ return(0);
+ else if (MDOC_MAX != c) {
+ if ( ! flushed) {
+ if ( ! rew_expblock(mdoc, tok,
+ line, ppos))
+ return(0);
+ flushed = 1;
+ }
+ if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+ return(0);
+ break;
+ }
- lastarg = *pos;
+ if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+ return(0);
+ mdoc->next = MDOC_NEXT_SIBLING;
+ }
- 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):
+ if ( ! flushed && ! rew_expblock(mdoc, tok, line, ppos))
return(0);
- default:
- break;
- }
-
- 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 */
+ if (ppos > 1)
+ return(1);
+ return(append_delims(mdoc, line, pos, buf));
}
-int
-macro_prologue_ddate(MACRO_PROT_ARGS)
+/*
+ * In-line macros where reserved words cause scope close-reopen.
+ */
+static int
+in_line(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;
+ int la, lastpunct, c, w;
+ struct mdoc_arg *arg;
+ char *p;
-again:
- if (j == MDOC_LINEARG_MAX)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ for (la = ppos, arg = NULL;; ) {
+ la = *pos;
+ c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
- lastarg = *pos;
- switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[++j])) {
- case (ARGS_EOLN):
- if (mdoc->meta.date)
- return(1);
- mdoc->meta.date = mdoc_atotime(date);
- if (mdoc->meta.date)
- return(1);
- return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGFORM));
- case (ARGS_ERROR):
+ if (ARGV_WORD == c) {
+ *pos = la;
+ break;
+ }
+
+ if (ARGV_EOLN == c)
+ break;
+ if (ARGV_ARG == c)
+ continue;
+
+ mdoc_argv_free(arg);
return(0);
- default:
- break;
}
-
- if (MDOC_MAX != mdoc_find(mdoc, args[j]) && ! mdoc_warn
- (mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
+
+ if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
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 */
-}
+ mdoc->next = MDOC_NEXT_CHILD;
+ for (lastpunct = 0;; ) {
+ la = *pos;
+ w = mdoc_args(mdoc, line, pos, buf, tok, &p);
-int
-macro_scoped_explicit(MACRO_PROT_ARGS)
-{
- int c, lastarg, j;
- struct mdoc_arg argv[MDOC_LINEARG_MAX];
- struct mdoc_node *n;
+ if (ARGS_ERROR == w)
+ return(0);
+ if (ARGS_EOLN == w)
+ break;
+ if (ARGS_PUNCT == w)
+ break;
- if (SEC_PROLOGUE == mdoc->sec_lastn)
- return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+ /* Quoted words shouldn't be looked-up. */
- /*
- * 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.
- */
+ c = ARGS_QWORD == w ? MDOC_MAX :
+ lookup(mdoc, line, la, tok, p);
- 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;
+ /* MDOC_MAX (not a macro) or -1 (error). */
+
+ if (MDOC_MAX != c && -1 != c) {
+ if (0 == lastpunct && ! rew_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, line, pos, buf));
+ } else if (-1 == c)
+ return(0);
+
+ /* Non-quote-enclosed punctuation. */
+
+ if (ARGS_QWORD != w && mdoc_isdelim(p)) {
+ if (0 == lastpunct && ! rew_elem(mdoc, tok))
+ return(0);
+ lastpunct = 1;
+ } else if (lastpunct) {
+ c = mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+
+ if (0 == c)
+ return(0);
+
+ mdoc->next = MDOC_NEXT_CHILD;
+ lastpunct = 0;
+ }
+
+ if ( ! mdoc_word_alloc(mdoc, line, la, p))
+ return(0);
+ mdoc->next = MDOC_NEXT_SIBLING;
}
- assert(MDOC_EXPLICIT & mdoc_macros[tok].flags);
+ if (0 == lastpunct && ! rew_elem(mdoc, tok))
+ return(0);
+ if (ppos > 1)
+ return(1);
+ return(append_delims(mdoc, line, pos, buf));
+}
- /* Token pre-processing. */
- 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)
- break;
- if (MDOC_Pp != mdoc->last->data.elem.tok)
- break;
- if ( ! mdoc_warn(mdoc, tok, ppos, WARN_IGN_BEFORE_BLK))
+/*
+ * Block full-explicit and full-implicit.
+ */
+static int
+blk_full(MACRO_PROT_ARGS)
+{
+ int c, lastarg, reopen;
+ struct mdoc_arg *arg;
+ char *p;
+
+ if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
+ if ( ! rew_subblock(MDOC_BODY, mdoc,
+ tok, line, ppos))
+ return(0);
+ if ( ! rew_impblock(mdoc, tok, line, ppos))
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;
}
- lastarg = *pos;
-
- for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+ for (arg = NULL;; ) {
lastarg = *pos;
- c = mdoc_argv(mdoc, tok, &argv[j], pos, buf);
- if (0 == c)
+ c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
+
+ if (ARGV_WORD == c) {
+ *pos = lastarg;
+ break;
+ }
+
+ if (ARGV_EOLN == c)
break;
- else if (1 == c)
+ if (ARGV_ARG == c)
continue;
- mdoc_argv_free(j, argv);
+ mdoc_argv_free(arg);
return(0);
}
- if (MDOC_LINEARG_MAX == j) {
- mdoc_argv_free(j, argv);
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, arg))
+ return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
+
+ if (0 == buf[*pos]) {
+ if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+ return(0);
+ if ( ! rew_subblock(MDOC_HEAD, mdoc,
+ tok, line, ppos))
+ return(0);
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+ return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
+ return(1);
}
- c = append_scoped(mdoc, tok, ppos, 0, NULL, j, argv);
- mdoc_argv_free(j, argv);
- return(c);
-}
+ if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+ return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
+ for (reopen = 0;; ) {
+ lastarg = *pos;
+ c = mdoc_args(mdoc, line, pos, buf, tok, &p);
-/*
- * 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;
+ if (ARGS_ERROR == c)
+ return(0);
+ if (ARGS_EOLN == c)
+ break;
+ if (ARGS_PHRASE == c) {
+ if (reopen && ! mdoc_head_alloc
+ (mdoc, line, ppos, tok))
+ return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
+ /*
+ * Phrases are self-contained macro phrases used
+ * in the columnar output of a macro. They need
+ * special handling.
+ */
+ if ( ! phrase(mdoc, line, lastarg, buf))
+ return(0);
+ if ( ! rew_subblock(MDOC_HEAD, mdoc,
+ tok, line, ppos))
+ return(0);
- assert( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags));
+ reopen = 1;
+ continue;
+ }
- if (SEC_PROLOGUE == mdoc->sec_lastn)
- return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+ if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+ return(0);
- /* Token pre-processing. */
+ if (MDOC_MAX == c) {
+ if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+ return(0);
+ mdoc->next = MDOC_NEXT_SIBLING;
+ continue;
+ }
- 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 ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
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;
}
+
+ if (1 == ppos && ! append_delims(mdoc, line, pos, buf))
+ return(0);
+ if ( ! rew_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+ return(0);
- /* Rewind our scope. */
-
- if ( ! scope_rewind_imp(mdoc, ppos, tok))
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
- j = 0;
- lastarg = ppos;
+ return(1);
+}
- /*
- * 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.
- */
-again:
- if (j == MDOC_LINEARG_MAX)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+/*
+ * Block partial-imnplicit scope.
+ */
+static int
+blk_part_imp(MACRO_PROT_ARGS)
+{
+ int lastarg, c;
+ char *p;
- lastarg = *pos;
+ if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL))
+ return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
- switch (mdoc_args(mdoc, tok, pos, buf, 0, &args[j])) {
- case (ARGS_ERROR):
+ if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
return(0);
- case (ARGS_EOLN):
- return(append_scoped(mdoc, tok, ppos, j, _CC(args), 0, NULL));
- default:
+ 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;; ) {
+ lastarg = *pos;
+ c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+ assert(ARGS_PHRASE != c);
+
+ if (ARGS_ERROR == c)
+ return(0);
+ if (ARGS_PUNCT == c)
+ break;
+ if (ARGS_EOLN == c)
+ break;
+
+ if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+ return(0);
+ else if (MDOC_MAX == c) {
+ if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+ return(0);
+ mdoc->next = MDOC_NEXT_SIBLING;
+ continue;
+ }
+
+ if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+ return(0);
break;
}
- if (MDOC_MAX != mdoc_find(mdoc, args[j]))
- if ( ! mdoc_warn(mdoc, tok, lastarg, WARN_SYNTAX_MACLIKE))
+ if (1 == ppos) {
+ if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos))
return(0);
-
- j++;
- goto again;
- /* NOTREACHED */
+ if ( ! append_delims(mdoc, line, pos, buf))
+ return(0);
+ } else if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos))
+ return(0);
+ return(rew_impblock(mdoc, tok, line, ppos));
}
/*
- * 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.
+ * Block partial-explicit macros.
*/
-int
-macro_scoped_line(MACRO_PROT_ARGS)
+static int
+blk_part_exp(MACRO_PROT_ARGS)
{
- int lastarg, c, j;
- char *p;
- struct mdoc_node *n;
+ int lastarg, flushed, j, c, maxargs;
+ char *p;
- if (SEC_PROLOGUE == mdoc->sec_lastn)
- return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+ lastarg = ppos;
+ flushed = 0;
- assert(1 == ppos);
-
- /* Token pre-processing. */
+ /*
+ * Number of arguments (head arguments). Only `Eo' has these,
+ */
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)
- continue;
- else if (MDOC_Bd == n->data.block.tok)
- break;
- if (NULL == n)
- break;
- return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NONEST));
+ case (MDOC_Eo):
+ maxargs = 1;
+ break;
default:
+ maxargs = 0;
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.
- */
+ if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL))
+ return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
- mdoc_block_alloc(mdoc, ppos, tok, 0, NULL);
- mdoc_head_alloc(mdoc, ppos, tok, 0, NULL);
+ if (0 == maxargs) {
+ if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+ return(0);
+ if ( ! rew_subblock(MDOC_HEAD, mdoc,
+ tok, line, ppos))
+ return(0);
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+ return(0);
+ flushed = 1;
+ } else if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+ return(0);
- /* Process line parameters. */
+ mdoc->next = MDOC_NEXT_CHILD;
- j = 0;
- lastarg = ppos;
+ for (j = 0; ; j++) {
+ lastarg = *pos;
+ if (j == maxargs && ! flushed) {
+ if ( ! rew_subblock(MDOC_HEAD, mdoc,
+ tok, line, ppos))
+ return(0);
+ flushed = 1;
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+ return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
+ }
-again:
- if (j == MDOC_LINEARG_MAX)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+ assert(ARGS_PHRASE != c);
- lastarg = *pos;
- c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+ if (ARGS_ERROR == c)
+ return(0);
+ if (ARGS_PUNCT == c)
+ break;
+ if (ARGS_EOLN == c)
+ break;
- switch (c) {
- case (ARGS_ERROR):
- return(0);
- case (ARGS_WORD):
- break;
- case (ARGS_PUNCT):
- if ( ! append_delims(mdoc, tok, pos, buf))
+ if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
return(0);
- return(scope_rewind_imp(mdoc, ppos, tok));
- case (ARGS_EOLN):
- return(scope_rewind_imp(mdoc, ppos, tok));
- default:
- abort();
- /* NOTREACHED */
+ else if (MDOC_MAX != c) {
+ if ( ! flushed) {
+ if ( ! rew_subblock(MDOC_HEAD, mdoc,
+ tok, line, ppos))
+ return(0);
+ flushed = 1;
+ if ( ! mdoc_body_alloc(mdoc, line,
+ ppos, tok))
+ return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
+ }
+ if ( ! mdoc_macro(mdoc, c, line, lastarg,
+ pos, buf))
+ return(0);
+ break;
+ }
+
+ if ( ! flushed && mdoc_isdelim(p)) {
+ if ( ! rew_subblock(MDOC_HEAD, mdoc,
+ tok, line, ppos))
+ return(0);
+ flushed = 1;
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+ return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
+ }
+
+ if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+ return(0);
+ mdoc->next = MDOC_NEXT_SIBLING;
}
- if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
- if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+ if ( ! flushed) {
+ if ( ! rew_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
return(0);
- if ( ! append_delims(mdoc, tok, pos, buf))
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
return(0);
- return(scope_rewind_imp(mdoc, ppos, tok));
+ mdoc->next = MDOC_NEXT_CHILD;
}
- if (mdoc_isdelim(p))
- j = 0;
-
- mdoc_word_alloc(mdoc, lastarg, p);
- goto again;
- /* NOTREACHED */
+ if (ppos > 1)
+ return(1);
+ return(append_delims(mdoc, line, pos, buf));
}
-/*
- * 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.
+/*
+ * In-line macros where reserved words signal closure of the macro.
+ * Macros also have a fixed number of arguments.
*/
-int
-macro_scoped_pline(MACRO_PROT_ARGS)
+static int
+in_line_argn(MACRO_PROT_ARGS)
{
- int lastarg, c, j;
- char *p;
-
- if (SEC_PROLOGUE == mdoc->sec_lastn)
- return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+ int lastarg, flushed, j, c, maxargs;
+ struct mdoc_arg *arg;
+ char *p;
- /* Token pre-processing. */
+
+ /*
+ * Fixed maximum arguments per macro. Some of these have none
+ * and close as soon as the invocation is parsed.
+ */
switch (tok) {
- case (MDOC_Ql):
- if ( ! mdoc_warn(mdoc, tok, ppos, WARN_COMPAT_TROFF))
- return(0);
+ case (MDOC_Ap):
+ /* FALLTHROUGH */
+ case (MDOC_No):
+ /* FALLTHROUGH */
+ case (MDOC_Ns):
+ /* FALLTHROUGH */
+ case (MDOC_Ux):
+ maxargs = 0;
break;
default:
+ maxargs = 1;
break;
}
- mdoc_block_alloc(mdoc, ppos, tok, 0, NULL);
- mdoc_head_alloc(mdoc, ppos, tok, 0, NULL);
-
- /* Process line parameters. */
+ for (lastarg = ppos, arg = NULL;; ) {
+ lastarg = *pos;
+ c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
- j = 0;
- lastarg = ppos;
+ if (ARGV_WORD == c) {
+ *pos = lastarg;
+ break;
+ }
-again:
- if (j == MDOC_LINEARG_MAX)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ if (ARGV_EOLN == c)
+ break;
+ if (ARGV_ARG == c)
+ continue;
- lastarg = *pos;
- c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+ mdoc_argv_free(arg);
+ return(0);
+ }
- switch (c) {
- case (ARGS_ERROR):
+ if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
return(0);
- case (ARGS_WORD):
- break;
- case (ARGS_PUNCT):
- if ( ! scope_rewind_imp(mdoc, ppos, tok))
+ mdoc->next = MDOC_NEXT_CHILD;
+
+ for (flushed = j = 0; ; j++) {
+ lastarg = *pos;
+
+ if (j == maxargs && ! flushed) {
+ if ( ! rew_elem(mdoc, tok))
+ return(0);
+ flushed = 1;
+ }
+
+ c = mdoc_args(mdoc, line, pos, buf, tok, &p);
+
+ if (ARGS_ERROR == c)
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 (ARGS_PUNCT == c)
+ break;
+ if (ARGS_EOLN == c)
+ break;
- if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
- if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+ if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
return(0);
- if ( ! scope_rewind_imp(mdoc, ppos, tok))
+ else if (MDOC_MAX != c) {
+ if ( ! flushed && ! rew_elem(mdoc, tok))
+ return(0);
+ flushed = 1;
+ if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+ return(0);
+ break;
+ }
+
+ if ( ! (MDOC_IGNDELIM & mdoc_macros[tok].flags) &&
+ ! flushed && mdoc_isdelim(p)) {
+ if ( ! rew_elem(mdoc, tok))
+ return(0);
+ flushed = 1;
+ }
+
+ if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
return(0);
- if (ppos > 1)
- return(1);
- return(append_delims(mdoc, tok, pos, buf));
+ mdoc->next = MDOC_NEXT_SIBLING;
}
- if (mdoc_isdelim(p))
- j = 0;
+ if ( ! flushed && ! rew_elem(mdoc, tok))
+ return(0);
- mdoc_word_alloc(mdoc, lastarg, p);
- goto again;
- /* NOTREACHED */
+ if (ppos > 1)
+ return(1);
+ return(append_delims(mdoc, line, pos, buf));
}
/*
- * 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.
+ * In-line macro that spans an entire line. May be callable, but has no
+ * subsequent parsed arguments.
*/
-int
-macro_constant_delimited(MACRO_PROT_ARGS)
+static int
+in_line_eoln(MACRO_PROT_ARGS)
{
- int lastarg, flushed, c, maxargs;
+ int c, w, la;
+ struct mdoc_arg *arg;
char *p;
- if (SEC_PROLOGUE == mdoc->sec_lastn)
- return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+ assert( ! (MDOC_PARSED & mdoc_macros[tok].flags));
- /* Process line parameters. */
+ arg = NULL;
- lastarg = ppos;
- flushed = 0;
+ for (;;) {
+ la = *pos;
+ c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
- /* Token pre-processing. */
+ if (ARGV_WORD == c) {
+ *pos = la;
+ break;
+ }
+ if (ARGV_EOLN == c)
+ break;
+ if (ARGV_ARG == c)
+ continue;
- switch (tok) {
- case (MDOC_Ux):
- maxargs = 0;
- break;
- default:
- maxargs = 1;
- break;
+ mdoc_argv_free(arg);
+ return(0);
}
-again:
- lastarg = *pos;
-
- switch (mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p)) {
- case (ARGS_ERROR):
+ if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
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. */
+ mdoc->next = MDOC_NEXT_CHILD;
- if (0 == maxargs) {
- if ( ! append_const(mdoc, tok, ppos, 0, &p))
- return(0);
- flushed = 1;
- }
+ for (;;) {
+ la = *pos;
+ w = mdoc_args(mdoc, line, pos, buf, tok, &p);
- if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
- if ( ! flushed && ! append_const(mdoc, tok, ppos, 0, &p))
+ if (ARGS_ERROR == w)
return(0);
- if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
- return(0);
- if (ppos > 1)
- return(1);
- return(append_delims(mdoc, tok, pos, buf));
- }
+ if (ARGS_EOLN == w)
+ break;
- /*
- * We only accept one argument; subsequent tokens are considered
- * as literal words (until a macro).
- */
+ c = ARGS_QWORD == w ? MDOC_MAX :
+ lookup(mdoc, line, la, tok, p);
- if ( ! flushed && ! mdoc_isdelim(p)) {
- if ( ! append_const(mdoc, tok, ppos, 1, &p))
+ if (MDOC_MAX != c && -1 != c) {
+ if ( ! rew_elem(mdoc, tok))
+ return(0);
+ return(mdoc_macro(mdoc, c, line, la, pos, buf));
+ } else if (-1 == c)
return(0);
- flushed = 1;
- goto again;
- } else if ( ! flushed) {
- if ( ! append_const(mdoc, tok, ppos, 0, &p))
+
+ if ( ! mdoc_word_alloc(mdoc, line, la, p))
return(0);
- flushed = 1;
+ mdoc->next = MDOC_NEXT_SIBLING;
}
- mdoc_word_alloc(mdoc, lastarg, p);
- goto again;
- /* NOTREACHED */
+ return(rew_elem(mdoc, tok));
}
-int
-macro_constant(MACRO_PROT_ARGS)
+/* ARGSUSED */
+static int
+obsolete(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;
+ return(pwarn(mdoc, line, ppos, WOBS));
+}
- 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);
+static int
+phrase(struct mdoc *mdoc, int line, int ppos, char *buf)
+{
+ int i, la, c, quoted;
- j++;
- goto again;
- /* NOTREACHED */
-}
+ /*
+ * Parse over words in a phrase. We have to handle this
+ * specially because we assume no calling context -- in normal
+ * circumstances, we switch argument parsing based on whether
+ * the parent macro accepts quotes, tabs, etc. Here, anything
+ * goes.
+ */
+ for (i = ppos; buf[i]; ) {
+ assert(' ' != buf[i]);
+ la = i;
+ quoted = 0;
-int
-macro_constant_argv(MACRO_PROT_ARGS)
-{
- int c, lastarg, j;
- struct mdoc_arg argv[MDOC_LINEARG_MAX];
+ /*
+ * Read to next token. If quoted (check not escaped),
+ * scan ahead to next unescaped quote. If not quoted or
+ * escape-quoted, then scan ahead to next space.
+ */
- if (SEC_PROLOGUE == mdoc->sec_lastn)
- return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
+ if ((i && '\"' == buf[i] && '\\' != buf[i - 1]) ||
+ (0 == i && '\"' == buf[i])) {
+ for (la = ++i; buf[i]; i++)
+ if ('\"' != buf[i])
+ continue;
+ else if ('\\' != buf[i - 1])
+ break;
+ if (0 == buf[i])
+ return(perr(mdoc, line, la, EQUOT));
+ quoted = 1;
+ } else
+ for ( ; buf[i]; i++)
+ if (i && ' ' == buf[i]) {
+ if ('\\' != buf[i - 1])
+ break;
+ } else if (' ' == buf[i])
+ break;
+
+ /* If not end-of-line, terminate argument. */
+
+ if (buf[i])
+ buf[i++] = 0;
+
+ /* Read to next argument. */
+
+ for ( ; buf[i] && ' ' == buf[i]; i++)
+ /* Spin. */ ;
+
+ /*
+ * If we're a non-quoted string, try to look up the
+ * value as a macro and execute it, if found.
+ */
- lastarg = *pos;
+ c = quoted ? MDOC_MAX :
+ mdoc_tokhash_find(mdoc->htab, &buf[la]);
- 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 (MDOC_MAX != c) {
+ if ( ! mdoc_macro(mdoc, c, line, la, &i, buf))
+ return(0);
+ return(append_delims(mdoc, line, &i, buf));
+ }
- mdoc_argv_free(j, argv);
- return(0);
- }
+ /* A regular word or quoted string. */
- if (MDOC_LINEARG_MAX == j) {
- mdoc_argv_free(j, argv);
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ if ( ! mdoc_word_alloc(mdoc, line, la, &buf[la]))
+ return(0);
+ mdoc->next = MDOC_NEXT_SIBLING;
}
- c = append_constarg(mdoc, tok, ppos, j, argv);
- mdoc_argv_free(j, argv);
- return(c);
+ return(1);
}
git.ckatri.com / mandoc.git / blobdiff