-/* $Id: macro.c,v 1.51 2009/02/23 12:45:19 kristaps Exp $ */
+/* $Id: macro.c,v 1.58 2009/03/08 11:41:22 kristaps Exp $ */
/*
* Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
*
#define ENOCTX (1)
#define ENOPARMS (2)
-#define EARGVLIM (3)
/* Central table of library: who gets parsed how. */
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */
/* XXX - .Fo supposed to be (but isn't) callable. */
{ macro_scoped, MDOC_EXPLICIT }, /* Fo */
- /* XXX - .Fc supposed to be (but isn't) callable. */
- { macro_scoped_close, MDOC_EXPLICIT }, /* Fc */
+ { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Fc */
{ macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Oo */
{ macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Oc */
{ macro_scoped, MDOC_EXPLICIT }, /* Bk */
{ macro_constant, 0 }, /* Hf */
{ macro_obsolete, 0 }, /* Fr */
{ macro_constant, 0 }, /* Ud */
+ { macro_constant, 0 }, /* Lb */
};
const struct mdoc_macro * const mdoc_macros = __mdoc_macros;
c = mdoc_perr(mdoc, line, pos,
"macro doesn't expect parameters");
break;
- case (EARGVLIM):
- c = mdoc_perr(mdoc, line, pos,
- "argument hard-limit %d reached",
- MDOC_LINEARG_MAX);
- break;
default:
abort();
/* NOTREACHED */
{
int res;
- res = mdoc_find(mdoc, p);
+ res = mdoc_tokhash_find(mdoc->htab, p);
if (MDOC_PARSED & mdoc_macros[from].flags)
return(res);
if (MDOC_MAX == res)
break;
else if (rewind_dobreak(tok, n))
continue;
- return(mdoc_perr(mdoc, line, ppos, "scope breaks prior %s", mdoc_node2a(n)));
+ return(mdoc_perr(mdoc, line, ppos,
+ "scope breaks %s", MDOC_ROOT == n->type ?
+ "<root>" : mdoc_macronames[n->tok]));
}
assert(n);
else if (rewind_dobreak(tok, n))
continue;
return(mdoc_perr(mdoc, line, ppos,
- "scope breaks prior %s",
- mdoc_node2a(n)));
+ "scope breaks %s", MDOC_ROOT == n->type ?
+ "<root>" : mdoc_macronames[n->tok]));
}
assert(n);
else if (rewind_dobreak(tok, n))
continue;
return(mdoc_perr(mdoc, line, ppos,
- "scope breaks prior %s",
- mdoc_node2a(n)));
+ "scope breaks %s", MDOC_ROOT == n->type ?
+ "<root>" : mdoc_macronames[n->tok]));
}
assert(n);
static int
macro_text(MACRO_PROT_ARGS)
{
- int la, lastpunct, c, w, argc;
- struct mdoc_arg argv[MDOC_LINEARG_MAX];
+ int la, lastpunct, c, w;
+ struct mdoc_arg *arg;
char *p;
la = ppos;
lastpunct = 0;
+ arg = NULL;
- for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+ for (;;) {
la = *pos;
- c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+ c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
if (ARGV_EOLN == c)
break;
if (ARGV_WORD == c) {
break;
} else if (ARGV_ARG == c)
continue;
-
- mdoc_argv_free(argc, argv);
+ mdoc_argv_free(arg);
return(0);
}
- if (MDOC_LINEARG_MAX == argc) {
- mdoc_argv_free(argc - 1, argv);
- return(perr(mdoc, line, ppos, EARGVLIM));
- }
-
- c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
-
- if (0 == c) {
- mdoc_argv_free(argc, argv);
+ if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
return(0);
- }
mdoc->next = MDOC_NEXT_CHILD;
w = mdoc_args(mdoc, line, pos, buf, tok, &p);
assert(ARGS_PHRASE != c);
- if (ARGS_ERROR == w) {
- mdoc_argv_free(argc, argv);
+ if (ARGS_ERROR == w)
return(0);
- }
-
if (ARGS_EOLN == w)
break;
if (ARGS_PUNCT == w)
lookup(mdoc, line, la, tok, p);
if (MDOC_MAX != c && -1 != c) {
- if (0 == lastpunct && ! rewind_elem(mdoc, tok)) {
- mdoc_argv_free(argc, argv);
+ if (0 == lastpunct && ! rewind_elem(mdoc, tok))
return(0);
- }
- mdoc_argv_free(argc, argv);
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) {
- mdoc_argv_free(argc, argv);
+ } else if (-1 == c)
return(0);
- }
+
+ /* FIXME: .Fl and .Ar handling of `|'. */
if (ARGS_QWORD != w && mdoc_isdelim(p)) {
- if (0 == lastpunct && ! rewind_elem(mdoc, tok)) {
- mdoc_argv_free(argc, argv);
+ if (0 == lastpunct && ! rewind_elem(mdoc, tok))
return(0);
- }
lastpunct = 1;
} else if (lastpunct) {
- c = mdoc_elem_alloc(mdoc, line,
- ppos, tok, argc, argv);
- if (0 == c) {
- mdoc_argv_free(argc, argv);
+ c = mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
+
+ if (0 == c)
return(0);
- }
+
mdoc->next = MDOC_NEXT_CHILD;
lastpunct = 0;
}
mdoc->next = MDOC_NEXT_SIBLING;
}
- mdoc_argv_free(argc, argv);
-
if (0 == lastpunct && ! rewind_elem(mdoc, tok))
return(0);
if (ppos > 1)
static int
macro_scoped(MACRO_PROT_ARGS)
{
- int c, lastarg, argc;
- struct mdoc_arg argv[MDOC_LINEARG_MAX];
+ int c, lastarg;
+ struct mdoc_arg *arg;
char *p;
assert ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
}
/* Parse arguments. */
+
+ arg = NULL;
- for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+ for (;;) {
lastarg = *pos;
- c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+ c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
if (ARGV_EOLN == c)
break;
if (ARGV_WORD == c) {
break;
} else if (ARGV_ARG == c)
continue;
- mdoc_argv_free(argc, argv);
+ mdoc_argv_free(arg);
return(0);
}
- if (MDOC_LINEARG_MAX == argc) {
- mdoc_argv_free(argc - 1, argv);
- return(perr(mdoc, line, ppos, EARGVLIM));
- }
-
- c = mdoc_block_alloc(mdoc, line, ppos,
- tok, (size_t)argc, argv);
- mdoc_argv_free(argc, argv);
-
- if (0 == c)
+ if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, arg))
return(0);
mdoc->next = MDOC_NEXT_CHILD;
if (ARGS_ERROR == c)
return(0);
- if (ARGS_PUNCT == c)
- break;
if (ARGS_EOLN == c)
break;
-
if (ARGS_PHRASE == c) {
/*
if ( ! mdoc_phrase(mdoc, line, lastarg, buf))
break;
}
- if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
- return(0);
if (1 == ppos && ! append_delims(mdoc, line, pos, buf))
return(0);
+ if ( ! rewind_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+ return(0);
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
return(0);
int lastarg, c;
char *p;
- if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+ if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL))
return(0);
mdoc->next = MDOC_NEXT_CHILD;
break;
}
- if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, 0, NULL))
+ if ( ! mdoc_block_alloc(mdoc, line, ppos, tok, NULL))
return(0);
mdoc->next = MDOC_NEXT_CHILD;
static int
macro_constant_delimited(MACRO_PROT_ARGS)
{
- int lastarg, flushed, j, c, maxargs, argc,
- igndelim;
- struct mdoc_arg argv[MDOC_LINEARG_MAX];
+ int lastarg, flushed, j, c, maxargs,
+ igndelim, ignargs;
+ struct mdoc_arg *arg;
char *p;
lastarg = ppos;
flushed = 0;
+
+ /*
+ * Maximum arguments per macro. Some of these have none and
+ * exit as soon as they're parsed.
+ */
switch (tok) {
case (MDOC_No):
case (MDOC_Ns):
/* FALLTHROUGH */
case (MDOC_Ux):
- /* FALLTHROUGH */
- case (MDOC_St):
maxargs = 0;
break;
default:
break;
}
+ /*
+ * Whether to ignore delimiter characters. `Pf' accepts its
+ * first token as a parameter no matter what it looks like (if
+ * it's text).
+ */
+
switch (tok) {
case (MDOC_Pf):
igndelim = 1;
break;
}
- for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
- lastarg = *pos;
- c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
- if (ARGV_EOLN == c)
- break;
- if (ARGV_WORD == c) {
- *pos = lastarg;
- break;
- } else if (ARGV_ARG == c)
- continue;
- mdoc_argv_free(argc, argv);
- return(0);
- }
+ /*
+ * Whether to ignore arguments: `St', for example, handles its
+ * argument-like parameters as regular parameters.
+ */
- if (MDOC_LINEARG_MAX == argc) {
- mdoc_argv_free(argc - 1, argv);
- return(perr(mdoc, line, ppos, EARGVLIM));
+ switch (tok) {
+ case (MDOC_St):
+ ignargs = 1;
+ break;
+ default:
+ ignargs = 0;
+ break;
}
- c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
- mdoc_argv_free(argc, argv);
+ arg = NULL;
+
+ if ( ! ignargs)
+ for (;;) {
+ lastarg = *pos;
+ c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
+ if (ARGV_EOLN == c)
+ break;
+ if (ARGV_WORD == c) {
+ *pos = lastarg;
+ break;
+ } else if (ARGV_ARG == c)
+ continue;
+ mdoc_argv_free(arg);
+ return(0);
+ }
- if (0 == c)
+ if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
return(0);
mdoc->next = MDOC_NEXT_CHILD;
static int
macro_constant(MACRO_PROT_ARGS)
{
- int c, w, la, argc;
- struct mdoc_arg argv[MDOC_LINEARG_MAX];
+ int c, w, la;
+ struct mdoc_arg *arg;
char *p;
assert( ! (MDOC_CALLABLE & mdoc_macros[tok].flags));
- for (argc = 0; argc < MDOC_LINEARG_MAX; argc++) {
+ arg = NULL;
+
+ for (;;) {
la = *pos;
- c = mdoc_argv(mdoc, line, tok, &argv[argc], pos, buf);
+ c = mdoc_argv(mdoc, line, tok, &arg, pos, buf);
if (ARGV_EOLN == c)
break;
if (ARGV_WORD == c) {
break;
} else if (ARGV_ARG == c)
continue;
-
- mdoc_argv_free(argc, argv);
+ mdoc_argv_free(arg);
return(0);
}
- if (MDOC_LINEARG_MAX == argc) {
- mdoc_argv_free(argc - 1, argv);
- return(perr(mdoc, line, ppos, EARGVLIM));
- }
-
- c = mdoc_elem_alloc(mdoc, line, ppos, tok, argc, argv);
- mdoc_argv_free(argc, argv);
-
- if (0 == c)
+ if ( ! mdoc_elem_alloc(mdoc, line, ppos, tok, arg))
return(0);
mdoc->next = MDOC_NEXT_CHILD;
git.ckatri.com / mandoc.git / blobdiff