-/* $Id: macro.c,v 1.23 2009/01/05 17:57:08 kristaps Exp $ */
+/* $Id: macro.c,v 1.30 2009/01/09 14:45:44 kristaps Exp $ */
/*
* Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
*
/* FIXME: maxlineargs should be per LINE, no per TOKEN. */
-static int rewind_elem(struct mdoc *, int, int);
-static int rewind_impblock(struct mdoc *, int, int);
-static int rewind_expblock(struct mdoc *, int, int, int);
-static int rewind_head(struct mdoc *, int, int);
-static int rewind_body(struct mdoc *, int, int, int);
-static int append_delims(struct mdoc *, int, int *, char *);
+static int rewind_elem(struct mdoc *, int);
+static int rewind_impblock(struct mdoc *, int);
+static int rewind_expblock(struct mdoc *, int);
+static int rewind_head(struct mdoc *, int);
+static int rewind_body(struct mdoc *, int);
+static int rewind_last(struct mdoc *, struct mdoc_node *);
+static int append_delims(struct mdoc *,
+ int, int, int *, char *);
+static int lookup(struct mdoc *, int, int, int, const char *);
static int
-rewind_elem(struct mdoc *mdoc, int ppos, int tok)
+lookup(struct mdoc *mdoc, int line, int pos, int from, const char *p)
+{
+ int res;
+
+ res = mdoc_find(mdoc, p);
+ if (MDOC_PARSED & mdoc_macros[from].flags)
+ return(res);
+ if (MDOC_MAX == res)
+ return(res);
+
+ if ( ! mdoc_pwarn(mdoc, line, pos, WARN_SYNTAX_MACLIKE))
+ return(-1);
+ return(MDOC_MAX);
+}
+
+
+static int
+rewind_last(struct mdoc *mdoc, struct mdoc_node *to)
+{
+
+ assert(to);
+ mdoc->next = MDOC_NEXT_SIBLING;
+ if (mdoc->last == to) {
+ if ( ! mdoc_valid_post(mdoc))
+ return(0);
+ if ( ! mdoc_action_post(mdoc))
+ return(0);
+ 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);
+ } while (mdoc->last != to);
+
+ return(1);
+}
+
+
+static int
+rewind_elem(struct mdoc *mdoc, int tok)
{
struct mdoc_node *n;
assert(MDOC_ELEM == n->type);
assert(tok == n->data.elem.tok);
- mdoc->last = n;
- mdoc->next = MDOC_NEXT_SIBLING;
- if ( ! mdoc_valid_post(mdoc, tok, ppos))
- return(0);
- return(mdoc_action(mdoc, tok, ppos));
+ return(rewind_last(mdoc, n));
}
static int
-rewind_body(struct mdoc *mdoc, int ppos, int tok, int tt)
+rewind_body(struct mdoc *mdoc, int tok)
{
struct mdoc_node *n;
+ int t;
+
+ assert(mdoc->last);
/* LINTED */
for (n = mdoc->last; n; n = n->parent) {
if (MDOC_BODY != n->type)
continue;
- if (tt == n->data.head.tok)
+ if (tok == (t = n->data.head.tok))
break;
- if ( ! (MDOC_EXPLICIT & mdoc_macros[tt].flags))
+ if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
continue;
- return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+ return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
}
- mdoc->last = n ? n : mdoc->last;
- mdoc->next = MDOC_NEXT_SIBLING;
- /* XXX - no validation, we do this only for blocks/elements. */
- return(1);
+ assert(n);
+ return(rewind_last(mdoc, n));
}
static int
-rewind_head(struct mdoc *mdoc, int ppos, int tok)
+rewind_head(struct mdoc *mdoc, int tok)
{
struct mdoc_node *n;
int t;
+ assert(mdoc->last);
+
/* LINTED */
for (n = mdoc->last; n; n = n->parent) {
if (MDOC_HEAD != n->type)
break;
if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
continue;
- return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+ return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
}
- mdoc->last = n ? n : mdoc->last;
- mdoc->next = MDOC_NEXT_SIBLING;
- /* XXX - no validation, we do this only for blocks/elements. */
- return(1);
+ assert(n);
+ return(rewind_last(mdoc, n));
}
static int
-rewind_expblock(struct mdoc *mdoc, int ppos, int tok, int tt)
+rewind_expblock(struct mdoc *mdoc, int tok)
{
struct mdoc_node *n;
int t;
assert(mdoc->last);
/* LINTED */
- for (n = mdoc->last->parent; n; n = n->parent) {
- if (MDOC_BLOCK != n->type)
+ for (n = mdoc->last; n; n = n->parent) {
+ if (MDOC_BLOCK != n->type)
continue;
- if (tt == (t = n->data.block.tok))
+ if (tok == (t = n->data.block.tok))
break;
if (MDOC_NESTED & mdoc_macros[t].flags)
continue;
- return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+ return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
}
- if (NULL == (mdoc->last = n))
- return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_NOCTX));
-
- mdoc->next = MDOC_NEXT_SIBLING;
- if ( ! mdoc_valid_post(mdoc, tok, ppos))
- return(0);
- return(mdoc_action(mdoc, tok, ppos));
+ assert(n);
+ return(rewind_last(mdoc, n));
}
static int
-rewind_impblock(struct mdoc *mdoc, int ppos, int tok)
+rewind_impblock(struct mdoc *mdoc, int tok)
{
- struct mdoc_node *n;
int t;
+ struct mdoc_node *n;
n = mdoc->last ? mdoc->last->parent : NULL;
break;
if ( ! (MDOC_EXPLICIT & mdoc_macros[t].flags))
continue;
- if (MDOC_NESTED & mdoc_macros[tok].flags)
+ if (MDOC_NESTED & mdoc_macros[t].flags)
return(1);
- return(mdoc_err(mdoc, tok, ppos, ERR_SCOPE_BREAK));
+ return(mdoc_verr(mdoc, n, ERR_SCOPE_BREAK));
}
if (NULL == n)
return(1);
-
- mdoc->next = MDOC_NEXT_SIBLING;
- mdoc->last = n;
- if ( ! mdoc_valid_post(mdoc, tok, ppos))
- return(0);
- return(mdoc_action(mdoc, tok, ppos));
+ return(rewind_last(mdoc, n));
}
static int
-append_delims(struct mdoc *mdoc, int tok, int *pos, char *buf)
+append_delims(struct mdoc *mdoc, int tok,
+ int line, int *pos, char *buf)
{
int c, lastarg;
char *p;
for (;;) {
lastarg = *pos;
- c = mdoc_args(mdoc, tok, pos, buf, 0, &p);
+ c = mdoc_args(mdoc, line, 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);
+ if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+ return(0);
mdoc->next = MDOC_NEXT_SIBLING;
}
int
macro_close_explicit(MACRO_PROT_ARGS)
{
- int tt, j, c, lastarg, maxargs, flushed;
+ int tt, j, c, lastarg, maxargs, flushed;
char *p;
switch (tok) {
}
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
- if ( ! rewind_expblock(mdoc, ppos, tok, tt))
- return(0);
- if (0 != buf[*pos])
- return(mdoc_err(mdoc, tok, *pos, ERR_ARGS_EQ0));
- return(1);
+ if (buf[*pos])
+ return(rewind_expblock(mdoc, tt));
+ return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_EQ0));
}
- if ( ! rewind_body(mdoc, ppos, tok, tt))
+ if ( ! rewind_body(mdoc, tt))
return(0);
lastarg = ppos;
flushed = 0;
if (maxargs > 0) {
- mdoc_tail_alloc(mdoc, ppos, tt);
+ if ( ! mdoc_tail_alloc(mdoc, line, ppos, tt))
+ return(0);
mdoc->next = MDOC_NEXT_CHILD;
}
lastarg = *pos;
if (j == maxargs && ! flushed) {
- if ( ! rewind_expblock(mdoc, ppos, tok, tt))
+ if ( ! rewind_expblock(mdoc, tt))
return(0);
flushed = 1;
}
- c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+ c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
if (ARGS_ERROR == c)
return(0);
if (ARGS_PUNCT == c)
if (ARGS_EOLN == c)
break;
- if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
+ if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+ return(0);
+ else if (MDOC_MAX != c) {
if ( ! flushed) {
- if ( ! rewind_expblock(mdoc, ppos, tok, tt))
+ if ( ! rewind_expblock(mdoc, tt))
return(0);
flushed = 1;
}
- if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+ if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
return(0);
break;
- }
+ }
- mdoc_word_alloc(mdoc, lastarg, p);
+ if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+ return(0);
mdoc->next = MDOC_NEXT_SIBLING;
}
if (MDOC_LINEARG_MAX == j)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
- if ( ! flushed)
- if ( ! rewind_expblock(mdoc, ppos, tok, tt))
- return(0);
+ if ( ! flushed && ! rewind_expblock(mdoc, tt))
+ return(0);
if (ppos > 1)
return(1);
- return(append_delims(mdoc, tok, pos, buf));
+ return(append_delims(mdoc, tok, line, pos, buf));
}
int
macro_text(MACRO_PROT_ARGS)
{
- int lastarg, lastpunct, c, sz, fl, argc;
+ int la, lastpunct, c, sz, fl, argc;
struct mdoc_arg argv[MDOC_LINEARG_MAX];
char *p;
- lastarg = ppos;
+ la = ppos;
lastpunct = 0;
for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
- lastarg = *pos;
+ la = *pos;
- c = mdoc_argv(mdoc, tok, &argv[argc], pos, buf);
+ c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
if (ARGV_EOLN == c || ARGV_WORD == c)
break;
else if (ARGV_ARG == c)
return(0);
}
- if ( ! mdoc_valid_pre(mdoc, tok, ppos, argc, argv)) {
+ if (MDOC_LINEARG_MAX == argc) {
+ mdoc_argv_free(argc, argv);
+ return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
+ }
+
+ c = mdoc_elem_alloc(mdoc, line, la, tok, argc, argv);
+
+ if (0 == c) {
mdoc_argv_free(argc, argv);
return(0);
}
+ mdoc->next = MDOC_NEXT_CHILD;
+
fl = ARGS_DELIM;
if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
fl |= ARGS_QUOTED;
- mdoc_elem_alloc(mdoc, lastarg, tok, argc, argv);
- mdoc->next = MDOC_NEXT_CHILD;
-
for (lastpunct = sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
- lastarg = *pos;
+ la = *pos;
if (lastpunct) {
- mdoc_elem_alloc(mdoc, lastarg, tok, argc, argv);
+ c = mdoc_elem_alloc(mdoc, line,
+ la, tok, argc, argv);
+ if (0 == c) {
+ mdoc_argv_free(argc, argv);
+ return(0);
+ }
mdoc->next = MDOC_NEXT_CHILD;
lastpunct = 0;
}
- c = mdoc_args(mdoc, tok, pos, buf, fl, &p);
+ c = mdoc_args(mdoc, line, pos, buf, fl, &p);
if (ARGS_ERROR == c) {
mdoc_argv_free(argc, argv);
return(0);
if (ARGS_PUNCT == c)
break;
- if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
- if ( ! rewind_elem(mdoc, ppos, tok)) {
+ if (-1 == (c = lookup(mdoc, line, la, tok, p)))
+ return(0);
+ else if (MDOC_MAX != c) {
+ if ( ! rewind_elem(mdoc, tok)) {
mdoc_argv_free(argc, argv);
return(0);
}
mdoc_argv_free(argc, argv);
- if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+
+ c = mdoc_macro(mdoc, c, line, la, pos, buf);
+ if (0 == c)
return(0);
if (ppos > 1)
return(1);
- return(append_delims(mdoc, tok, pos, buf));
+ return(append_delims(mdoc, tok, line, pos, buf));
}
if (mdoc_isdelim(p)) {
- if ( ! rewind_elem(mdoc, ppos, tok)) {
+ if ( ! rewind_elem(mdoc, tok)) {
mdoc_argv_free(argc, argv);
return(0);
}
lastpunct = 1;
}
- mdoc_word_alloc(mdoc, lastarg, p);
+ if ( ! mdoc_word_alloc(mdoc, line, la, p))
+ return(0);
mdoc->next = MDOC_NEXT_SIBLING;
}
mdoc_argv_free(argc, argv);
if (sz == MDOC_LINEARG_MAX)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
- if ( ! rewind_elem(mdoc, ppos, tok))
+ if ( ! rewind_elem(mdoc, tok))
return(0);
if (ppos > 1)
return(1);
- return(append_delims(mdoc, tok, pos, buf));
+ return(append_delims(mdoc, tok, line, pos, buf));
}
/*
- * Multi-line-scoped macro.
+ * Implicit- or explicit-end multi-line scoped macro.
*/
int
macro_scoped(MACRO_PROT_ARGS)
{
- int c, lastarg, argc;
+ int c, lastarg, argc, j;
struct mdoc_arg argv[MDOC_LINEARG_MAX];
+ char *p;
assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags))
- if ( ! rewind_impblock(mdoc, ppos, tok))
+ if ( ! rewind_impblock(mdoc, tok))
return(0);
- lastarg = ppos;
-
for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
lastarg = *pos;
- c = mdoc_argv(mdoc, tok, &argv[argc], pos, buf);
+ c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
if (ARGV_EOLN == c || ARGV_WORD == c)
break;
else if (ARGV_ARG == c)
return(0);
}
- if ( ! mdoc_valid_pre(mdoc, tok, ppos, argc, argv)) {
+ if (MDOC_LINEARG_MAX == argc) {
mdoc_argv_free(argc, argv);
- return(0);
+ return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
}
- mdoc_block_alloc(mdoc, ppos, tok, (size_t)argc, argv);
- mdoc->next = MDOC_NEXT_CHILD;
-
+ c = mdoc_block_alloc(mdoc, line, ppos,
+ tok, (size_t)argc, argv);
mdoc_argv_free(argc, argv);
- /* XXX - Assumes header isn't parsed! */
+ if (0 == c)
+ return(0);
- if (0 != buf[*pos]) {
- mdoc_head_alloc(mdoc, ppos, tok);
+ mdoc->next = MDOC_NEXT_CHILD;
+
+ if (0 == buf[*pos]) {
+ if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+ return(0);
+ if ( ! rewind_head(mdoc, tok))
+ return(0);
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+ return(0);
mdoc->next = MDOC_NEXT_CHILD;
+ return(1);
+ }
- mdoc_word_alloc(mdoc, lastarg, &buf[*pos]);
- mdoc->next = MDOC_NEXT_SIBLING;
+ if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+ return(0);
+ mdoc->next = MDOC_NEXT_CHILD;
- if ( ! rewind_head(mdoc, ppos, tok))
+ for (j = 0; j < MDOC_LINEARG_MAX; j++) {
+ lastarg = *pos;
+ c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
+
+ 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;
+ }
- while (buf[*pos])
- (*pos)++;
+ if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
+ return(0);
+ break;
}
- mdoc_body_alloc(mdoc, ppos, tok);
+ if (j == MDOC_LINEARG_MAX)
+ return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
+
+ if ( ! rewind_head(mdoc, tok))
+ return(0);
+ if (1 == ppos && ! append_delims(mdoc, tok, line, pos, buf))
+ return(0);
+
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+ return(0);
mdoc->next = MDOC_NEXT_CHILD;
return(1);
int lastarg, c, j;
char *p;
- mdoc_block_alloc(mdoc, ppos, tok, 0, NULL);
+ if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+ return(0);
mdoc->next = MDOC_NEXT_CHILD;
- mdoc_head_alloc(mdoc, ppos, tok);
+ if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+ return(0);
mdoc->next = MDOC_NEXT_CHILD;
/* XXX - no known argument macros. */
- if ( ! mdoc_valid_pre(mdoc, tok, ppos, 0, NULL))
- return(0);
-
- /* Process line parameters. */
-
for (lastarg = ppos, j = 0; j < MDOC_LINEARG_MAX; j++) {
lastarg = *pos;
- c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+ c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
if (ARGS_ERROR == c)
return(0);
if (ARGS_EOLN == c)
break;
- if (MDOC_MAX == (c = mdoc_find(mdoc, p))) {
- mdoc_word_alloc(mdoc, lastarg, p);
+ 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, lastarg, pos, buf))
+ if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
return(0);
break;
}
if (j == MDOC_LINEARG_MAX)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
if (1 == ppos) {
- if ( ! rewind_head(mdoc, ppos, tok))
+ if ( ! rewind_head(mdoc, tok))
return(0);
- if ( ! append_delims(mdoc, tok, pos, buf))
+ if ( ! append_delims(mdoc, tok, line, pos, buf))
return(0);
}
- return(rewind_impblock(mdoc, ppos, tok));
+ return(rewind_impblock(mdoc, tok));
}
+/*
+ * Constant-scope macros accept a fixed number of arguments and behave
+ * like constant macros except that they're scoped across lines.
+ */
int
macro_constant_scoped(MACRO_PROT_ARGS)
{
break;
}
- if ( ! mdoc_valid_pre(mdoc, tok, ppos, 0, NULL))
- return(0);
-
- mdoc_block_alloc(mdoc, ppos, tok, 0, NULL);
+ if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+ return(0);
mdoc->next = MDOC_NEXT_CHILD;
if (0 == maxargs) {
- mdoc_body_alloc(mdoc, ppos, tok);
+ if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+ return(0);
+ if ( ! rewind_head(mdoc, tok))
+ return(0);
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+ return(0);
flushed = 1;
- } else
- mdoc_head_alloc(mdoc, ppos, tok);
+ } else if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
+ return(0);
mdoc->next = MDOC_NEXT_CHILD;
lastarg = *pos;
if (j == maxargs && ! flushed) {
- if ( ! rewind_head(mdoc, ppos, tok))
+ if ( ! rewind_head(mdoc, tok))
return(0);
flushed = 1;
- mdoc_body_alloc(mdoc, ppos, tok);
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+ return(0);
mdoc->next = MDOC_NEXT_CHILD;
}
- c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+ c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
if (ARGS_ERROR == c)
return(0);
if (ARGS_PUNCT == c)
if (ARGS_EOLN == c)
break;
- if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
+ if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+ return(0);
+ else if (MDOC_MAX != c) {
if ( ! flushed) {
- if ( ! rewind_head(mdoc, ppos, tok))
+ if ( ! rewind_head(mdoc, tok))
return(0);
flushed = 1;
- mdoc_body_alloc(mdoc, ppos, tok);
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+ return(0);
mdoc->next = MDOC_NEXT_CHILD;
}
- if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+ if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
return(0);
break;
}
if ( ! flushed && mdoc_isdelim(p)) {
- if ( ! rewind_head(mdoc, ppos, tok))
+ if ( ! rewind_head(mdoc, tok))
return(0);
flushed = 1;
- mdoc_body_alloc(mdoc, ppos, tok);
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+ return(0);
mdoc->next = MDOC_NEXT_CHILD;
}
- mdoc_word_alloc(mdoc, lastarg, p);
+ if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+ return(0);
mdoc->next = MDOC_NEXT_SIBLING;
}
if (MDOC_LINEARG_MAX == j)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
if ( ! flushed) {
- if ( ! rewind_head(mdoc, ppos, tok))
+ if ( ! rewind_head(mdoc, tok))
+ return(0);
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
return(0);
- mdoc_body_alloc(mdoc, ppos, tok);
mdoc->next = MDOC_NEXT_CHILD;
}
if (ppos > 1)
return(1);
- return(append_delims(mdoc, tok, pos, buf));
+ return(append_delims(mdoc, tok, line, pos, buf));
}
int
macro_constant_delimited(MACRO_PROT_ARGS)
{
- int lastarg, flushed, j, c, maxargs;
+ int lastarg, flushed, j, c, maxargs, argc;
+ struct mdoc_arg argv[MDOC_LINEARG_MAX];
char *p;
lastarg = ppos;
case (MDOC_Ns):
/* FALLTHROUGH */
case (MDOC_Ux):
+ /* FALLTHROUGH */
+ case (MDOC_St):
maxargs = 0;
break;
default:
break;
}
- mdoc_elem_alloc(mdoc, lastarg, tok, 0, NULL);
+ for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+ lastarg = *pos;
+ c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+ if (ARGV_EOLN == c || ARGV_WORD == c)
+ break;
+ else if (ARGV_ARG == c)
+ continue;
+ mdoc_argv_free(argc, argv);
+ return(0);
+ }
+
+ c = mdoc_elem_alloc(mdoc, line, lastarg, tok, argc, argv);
+ mdoc_argv_free(argc, argv);
+
+ if (0 == c)
+ return(0);
+
mdoc->next = MDOC_NEXT_CHILD;
for (j = 0; j < MDOC_LINEARG_MAX; j++) {
lastarg = *pos;
if (j == maxargs && ! flushed) {
- if ( ! rewind_elem(mdoc, ppos, tok))
+ if ( ! rewind_elem(mdoc, tok))
return(0);
flushed = 1;
}
- c = mdoc_args(mdoc, tok, pos, buf, ARGS_DELIM, &p);
+ c = mdoc_args(mdoc, line, pos, buf, ARGS_DELIM, &p);
if (ARGS_ERROR == c)
return(0);
if (ARGS_PUNCT == c)
if (ARGS_EOLN == c)
break;
- if (MDOC_MAX != (c = mdoc_find(mdoc, p))) {
- if ( ! flushed && ! rewind_elem(mdoc, ppos, tok))
+ if (-1 == (c = lookup(mdoc, line, lastarg, tok, p)))
+ return(0);
+ else if (MDOC_MAX != c) {
+ if ( ! flushed && ! rewind_elem(mdoc, tok))
return(0);
flushed = 1;
- if ( ! mdoc_macro(mdoc, c, lastarg, pos, buf))
+ if ( ! mdoc_macro(mdoc, c, line, lastarg, pos, buf))
return(0);
break;
}
if ( ! flushed && mdoc_isdelim(p)) {
- if ( ! rewind_elem(mdoc, ppos, tok))
+ if ( ! rewind_elem(mdoc, tok))
return(0);
flushed = 1;
}
- mdoc_word_alloc(mdoc, lastarg, p);
+ if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+ return(0);
mdoc->next = MDOC_NEXT_SIBLING;
}
if (MDOC_LINEARG_MAX == j)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
- if ( ! flushed && rewind_elem(mdoc, ppos, tok))
+ if ( ! flushed && rewind_elem(mdoc, tok))
return(0);
if (ppos > 1)
return(1);
- return(append_delims(mdoc, tok, pos, buf));
+ return(append_delims(mdoc, tok, line, pos, buf));
}
struct mdoc_arg argv[MDOC_LINEARG_MAX];
char *p;
+ /* FIXME: parsing macros! */
+
fl = 0;
if (MDOC_QUOTABLE & mdoc_macros[tok].flags)
fl = ARGS_QUOTED;
for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
lastarg = *pos;
- c = mdoc_argv(mdoc, tok, &argv[argc], pos, buf);
+ c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
if (ARGV_EOLN == c)
break;
else if (ARGV_ARG == c)
return(0);
}
- if (MDOC_LINEARG_MAX == argc) {
- mdoc_argv_free(argc, argv);
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
- }
+ c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
+ mdoc_argv_free(argc, argv);
+
+ if (0 == c)
+ return(0);
- mdoc_elem_alloc(mdoc, ppos, tok, argc, argv);
mdoc->next = MDOC_NEXT_CHILD;
- mdoc_argv_free(argc, argv);
+ if (MDOC_LINEARG_MAX == argc)
+ return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
for (sz = 0; sz + argc < MDOC_LINEARG_MAX; sz++) {
lastarg = *pos;
- c = mdoc_args(mdoc, tok, pos, buf, fl, &p);
+ c = mdoc_args(mdoc, line, pos, buf, fl, &p);
if (ARGS_ERROR == c)
return(0);
if (ARGS_EOLN == c)
break;
- mdoc_word_alloc(mdoc, lastarg, p);
+ if ( ! mdoc_word_alloc(mdoc, line, lastarg, p))
+ return(0);
mdoc->next = MDOC_NEXT_SIBLING;
}
if (MDOC_LINEARG_MAX == sz + argc)
- return(mdoc_err(mdoc, tok, lastarg, ERR_ARGS_MANY));
+ return(mdoc_perr(mdoc, line, ppos, ERR_ARGS_MANY));
- return(rewind_elem(mdoc, ppos, tok));
+ return(rewind_elem(mdoc, tok));
}
macro_obsolete(MACRO_PROT_ARGS)
{
- return(mdoc_warn(mdoc, tok, ppos, WARN_IGN_OBSOLETE));
+ return(mdoc_pwarn(mdoc, line, ppos, WARN_IGN_OBSOLETE));
+}
+
+
+int
+macro_end(struct mdoc *mdoc)
+{
+
+ assert(mdoc->first);
+ assert(mdoc->last);
+ return(rewind_last(mdoc, mdoc->first));
}
git.ckatri.com / mandoc.git / blobdiff