-/* $Id: mdoc.c,v 1.13 2009/01/01 20:40:16 kristaps Exp $ */
+/* $Id: mdoc.c,v 1.39 2009/01/20 12:51:28 kristaps Exp $ */
/*
* Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
*
"xsh5", "xns5", "xns5.2d2.0",
"xcurses4.2", "susv2", "susv3",
"svid4", "filled", "words",
+ "emphasis", "symbolic",
};
const struct mdoc_macro __mdoc_macros[MDOC_MAX] = {
{ NULL, 0 }, /* \" */
- { NULL, MDOC_PROLOGUE }, /* Dd */
- { NULL, MDOC_PROLOGUE }, /* Dt */
- { NULL, MDOC_PROLOGUE }, /* Os */
+ { macro_constant, MDOC_PROLOGUE }, /* Dd */
+ { macro_constant, MDOC_PROLOGUE }, /* Dt */
+ { macro_constant, MDOC_PROLOGUE }, /* Os */
{ macro_scoped, 0 }, /* Sh */
{ macro_scoped, 0 }, /* Ss */
{ macro_text, 0 }, /* Pp */
- { macro_scoped_line, 0 }, /* D1 */
- { macro_scoped_line, 0 }, /* Dl */
+ { macro_scoped_line, MDOC_PARSED }, /* D1 */
+ { macro_scoped_line, MDOC_PARSED }, /* Dl */
{ macro_scoped, MDOC_EXPLICIT }, /* Bd */
- { macro_close_explicit, 0 }, /* Ed */
+ { macro_scoped_close, MDOC_EXPLICIT }, /* Ed */
{ macro_scoped, MDOC_EXPLICIT }, /* Bl */
- { macro_close_explicit, 0 }, /* El */
- { NULL, 0 }, /* It */
- { macro_text, MDOC_CALLABLE }, /* Ad */
- { NULL, 0 }, /* An */
- { macro_text, MDOC_CALLABLE }, /* Ar */
+ { macro_scoped_close, MDOC_EXPLICIT }, /* El */
+ { macro_scoped, MDOC_PARSED | MDOC_TABSEP}, /* It */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */
+ { macro_text, MDOC_PARSED }, /* An */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
{ macro_constant, MDOC_QUOTABLE }, /* Cd */
- { macro_text, MDOC_CALLABLE }, /* Cm */
- { macro_text, MDOC_CALLABLE }, /* Dv */
- { macro_text, MDOC_CALLABLE }, /* Er */
- { macro_text, MDOC_CALLABLE }, /* Ev */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Er */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ev */
{ macro_constant, 0 }, /* Ex */
- { macro_text, MDOC_CALLABLE }, /* Fa */
+ { macro_text, MDOC_CALLABLE | MDOC_QUOTABLE | MDOC_PARSED }, /* Fa */
{ macro_constant, 0 }, /* Fd */
- { macro_text, MDOC_CALLABLE }, /* Fl */
- { macro_text, MDOC_CALLABLE | MDOC_QUOTABLE }, /* Fn */
- { macro_text, 0 }, /* Ft */
- { macro_text, MDOC_CALLABLE }, /* Ic */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */
+ { macro_text, MDOC_CALLABLE | MDOC_QUOTABLE | MDOC_PARSED }, /* Fn */
+ { macro_text, MDOC_PARSED | MDOC_QUOTABLE }, /* Ft */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */
{ macro_constant, 0 }, /* In */
- { macro_text, MDOC_CALLABLE }, /* Li */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Li */
{ macro_constant, 0 }, /* Nd */
- { NULL, 0 }, /* Nm */
- { macro_scoped_line, MDOC_CALLABLE }, /* Op */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */
+ { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Op */
{ macro_obsolete, 0 }, /* Ot */
- { macro_text, MDOC_CALLABLE }, /* Pa */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Pa */
{ macro_constant, 0 }, /* Rv */
- { macro_constant, 0 }, /* St */
- { macro_text, MDOC_CALLABLE }, /* Va */
- { macro_text, MDOC_CALLABLE }, /* Vt */
- { macro_text, MDOC_CALLABLE }, /* Xr */
+ /* XXX - .St supposed to be (but isn't) callable. */
+ { macro_constant_delimited, MDOC_PARSED }, /* St */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Va */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Vt */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Xr */
{ macro_constant, MDOC_QUOTABLE }, /* %A */
{ macro_constant, MDOC_QUOTABLE }, /* %B */
{ macro_constant, MDOC_QUOTABLE }, /* %D */
{ macro_constant, MDOC_QUOTABLE }, /* %R */
{ macro_constant, MDOC_QUOTABLE }, /* %T */
{ macro_constant, MDOC_QUOTABLE }, /* %V */
- { NULL, 0 }, /* Ac */
- { NULL, 0 }, /* Ao */
- { macro_scoped_line, MDOC_CALLABLE }, /* Aq */
- { macro_constant, 0 }, /* At */
- { NULL, 0 }, /* Bc */
- { NULL, 0 }, /* Bf */
- { NULL, 0 }, /* Bo */
- { macro_scoped_line, MDOC_CALLABLE }, /* Bq */
- { macro_constant_delimited, 0 }, /* Bsx */
- { macro_constant_delimited, 0 }, /* Bx */
+ { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ac */
+ { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Ao */
+ { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Aq */
+ { macro_constant_delimited, 0 }, /* At */
+ { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Bc */
+ { macro_scoped, MDOC_EXPLICIT }, /* Bf */
+ { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Bo */
+ { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Bq */
+ { macro_constant_delimited, MDOC_PARSED }, /* Bsx */
+ { macro_constant_delimited, MDOC_PARSED }, /* Bx */
{ macro_constant, 0 }, /* Db */
- { NULL, 0 }, /* Dc */
- { NULL, 0 }, /* Do */
- { macro_scoped_line, MDOC_CALLABLE }, /* Dq */
- { NULL, 0 }, /* Ec */
- { NULL, 0 }, /* Ef */
- { macro_text, MDOC_CALLABLE }, /* Em */
- { NULL, 0 }, /* Eo */
- { macro_constant_delimited, 0 }, /* Fx */
- { macro_text, 0 }, /* Ms */
- { macro_constant_delimited, MDOC_CALLABLE }, /* No */
- { macro_constant_delimited, MDOC_CALLABLE }, /* Ns */
- { macro_constant_delimited, 0 }, /* Nx */
- { macro_constant_delimited, 0 }, /* Ox */
- { NULL, 0 }, /* Pc */
- { NULL, 0 }, /* Pf */
- { NULL, 0 }, /* Po */
- { macro_scoped_line, MDOC_CALLABLE }, /* Pq */
- { NULL, 0 }, /* Qc */
- { macro_scoped_line, MDOC_CALLABLE }, /* Ql */
- { NULL, 0 }, /* Qo */
- { macro_scoped_line, MDOC_CALLABLE }, /* Qq */
- { macro_scoped, MDOC_EXPLICIT }, /* Re */
+ { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Dc */
+ { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Do */
+ { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dq */
+ { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Ec */
+ { macro_scoped_close, MDOC_EXPLICIT }, /* Ef */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Em */
+ { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */
+ { macro_constant_delimited, MDOC_PARSED }, /* Fx */
+ { macro_text, MDOC_PARSED }, /* Ms */
+ { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* No */
+ { macro_constant_delimited, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */
+ { macro_constant_delimited, MDOC_PARSED }, /* Nx */
+ { macro_constant_delimited, MDOC_PARSED }, /* Ox */
+ { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Pc */
+ { macro_constant_delimited, MDOC_PARSED }, /* Pf */
+ { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Po */
+ { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Pq */
+ { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Qc */
+ { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ql */
+ { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Qo */
+ { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Qq */
+ { macro_scoped_close, MDOC_EXPLICIT }, /* Re */
{ macro_scoped, MDOC_EXPLICIT }, /* Rs */
- { NULL, 0 }, /* Sc */
- { NULL, 0 }, /* So */
- { macro_scoped_line, MDOC_CALLABLE }, /* Sq */
+ { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Sc */
+ { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* So */
+ { macro_scoped_line, MDOC_CALLABLE | MDOC_PARSED }, /* Sq */
{ macro_constant, 0 }, /* Sm */
- { macro_text, MDOC_CALLABLE }, /* Sx */
- { macro_text, MDOC_CALLABLE }, /* Sy */
- { macro_text, MDOC_CALLABLE }, /* Tn */
- { macro_constant_delimited, 0 }, /* Ux */
- { NULL, 0 }, /* Xc */
- { NULL, 0 }, /* Xo */
- { NULL, 0 }, /* Fo */
- { NULL, 0 }, /* Fc */
- { NULL, 0 }, /* Oo */
- { NULL, 0 }, /* Oc */
- { NULL, 0 }, /* Bk */
- { NULL, 0 }, /* Ek */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sx */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Sy */
+ { macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Tn */
+ { macro_constant_delimited, MDOC_PARSED }, /* Ux */
+ { macro_scoped_close, MDOC_EXPLICIT | MDOC_CALLABLE | MDOC_PARSED }, /* Xc */
+ { macro_constant_scoped, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Xo */
+ /* XXX - .Fo supposed to be (but isn't) callable. */
+ { macro_scoped, MDOC_EXPLICIT | MDOC_PARSED }, /* Fo */
+ /* XXX - .Fc supposed to be (but isn't) callable. */
+ { macro_scoped_close, MDOC_EXPLICIT | 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_scoped_close, MDOC_EXPLICIT }, /* Ek */
{ macro_constant, 0 }, /* Bt */
{ macro_constant, 0 }, /* Hf */
{ macro_obsolete, 0 }, /* Fr */
static void argfree(size_t, struct mdoc_arg *);
static void argcpy(struct mdoc_arg *,
const struct mdoc_arg *);
-static char **paramdup(size_t, const char **);
-static void paramfree(size_t, char **);
-static void mdoc_node_freelist(struct mdoc_node *);
-static void mdoc_node_append(struct mdoc *, int,
+static int mdoc_node_append(struct mdoc *,
struct mdoc_node *);
static void mdoc_elem_free(struct mdoc_elem *);
static void mdoc_text_free(struct mdoc_text *);
const struct mdoc_node *
-mdoc_result(struct mdoc *mdoc)
+mdoc_node(struct mdoc *mdoc)
{
return(mdoc->first);
}
+const struct mdoc_meta *
+mdoc_meta(struct mdoc *mdoc)
+{
+
+ return(&mdoc->meta);
+}
+
+
void
mdoc_free(struct mdoc *mdoc)
{
mdoc_node_freelist(mdoc->first);
if (mdoc->htab)
mdoc_tokhash_free(mdoc->htab);
-
+ if (mdoc->meta.title)
+ free(mdoc->meta.title);
+ if (mdoc->meta.os)
+ free(mdoc->meta.os);
+ if (mdoc->meta.name)
+ free(mdoc->meta.name);
+
free(mdoc);
}
p = xcalloc(1, sizeof(struct mdoc));
p->data = data;
- (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
+ if (cb)
+ (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
+
+ p->last = xcalloc(1, sizeof(struct mdoc_node));
+ p->last->type = MDOC_ROOT;
+ p->first = p->last;
+ p->next = MDOC_NEXT_CHILD;
p->htab = mdoc_tokhash_alloc();
+
return(p);
}
int
-mdoc_parseln(struct mdoc *mdoc, char *buf)
+mdoc_endparse(struct mdoc *mdoc)
+{
+
+ if (MDOC_HALT & mdoc->flags)
+ return(0);
+ if (NULL == mdoc->first)
+ return(1);
+
+ assert(mdoc->last);
+ if ( ! macro_end(mdoc)) {
+ mdoc->flags |= MDOC_HALT;
+ return(0);
+ }
+ return(1);
+}
+
+
+int
+mdoc_parseln(struct mdoc *mdoc, int line, char *buf)
{
int c, i;
char tmp[5];
+ if (MDOC_HALT & mdoc->flags)
+ return(0);
+
+ mdoc->linetok = 0;
+
if ('.' != *buf) {
- mdoc_word_alloc(mdoc, 0, buf);
+ if ( ! (MDOC_BODYPARSE & mdoc->flags))
+ return(mdoc_perr(mdoc, line, 0, "text disallowed"));
+ if ( ! mdoc_word_alloc(mdoc, line, 0, buf))
+ return(0);
mdoc->next = MDOC_NEXT_SIBLING;
return(1);
}
while (buf[i] && ! isspace(buf[i]) && i < (int)sizeof(tmp))
i++;
- if (i == (int)sizeof(tmp))
- return(mdoc_err(mdoc, -1, 1, ERR_MACRO_NOTSUP));
- else if (i <= 2)
- return(mdoc_err(mdoc, -1, 1, ERR_MACRO_NOTSUP));
+ if (i == (int)sizeof(tmp)) {
+ mdoc->flags |= MDOC_HALT;
+ return(mdoc_perr(mdoc, line, 1, "unknown macro"));
+ } else if (i <= 2) {
+ mdoc->flags |= MDOC_HALT;
+ return(mdoc_perr(mdoc, line, 1, "unknown macro"));
+ }
i--;
(void)memcpy(tmp, buf + 1, (size_t)i);
tmp[i++] = 0;
- if (MDOC_MAX == (c = mdoc_find(mdoc, tmp)))
- return(mdoc_err(mdoc, c, 1, ERR_MACRO_NOTSUP));
+ if (MDOC_MAX == (c = mdoc_find(mdoc, tmp))) {
+ mdoc->flags |= MDOC_HALT;
+ return(mdoc_perr(mdoc, line, 1, "unknown macro"));
+ }
while (buf[i] && isspace(buf[i]))
i++;
- return(mdoc_macro(mdoc, c, 1, &i, buf));
+ if ( ! mdoc_macro(mdoc, c, line, 1, &i, buf)) {
+ mdoc->flags |= MDOC_HALT;
+ return(0);
+ }
+ return(1);
}
void
-mdoc_msg(struct mdoc *mdoc, int pos, const char *fmt, ...)
+mdoc_vmsg(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...)
{
- va_list ap;
- char buf[256];
+ char buf[256];
+ va_list ap;
if (NULL == mdoc->cb.mdoc_msg)
return;
va_start(ap, fmt);
- (void)vsnprintf(buf, sizeof(buf), fmt, ap);
+ (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
va_end(ap);
-
- (*mdoc->cb.mdoc_msg)(mdoc->data, pos, buf);
+ (*mdoc->cb.mdoc_msg)(mdoc->data, ln, pos, buf);
}
int
-mdoc_err(struct mdoc *mdoc, int tok, int pos, enum mdoc_err type)
+mdoc_verr(struct mdoc *mdoc, int ln, int pos,
+ const char *fmt, ...)
{
+ char buf[256];
+ va_list ap;
if (NULL == mdoc->cb.mdoc_err)
return(0);
- return((*mdoc->cb.mdoc_err)(mdoc->data, tok, pos, type));
+
+ va_start(ap, fmt);
+ (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+ va_end(ap);
+ return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf));
}
int
-mdoc_warn(struct mdoc *mdoc, int tok, int pos, enum mdoc_warn type)
+mdoc_vwarn(struct mdoc *mdoc, int ln, int pos,
+ enum mdoc_warn type, const char *fmt, ...)
{
+ char buf[256];
+ va_list ap;
if (NULL == mdoc->cb.mdoc_warn)
return(0);
- return((*mdoc->cb.mdoc_warn)(mdoc->data, tok, pos, type));
+
+ va_start(ap, fmt);
+ (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+ va_end(ap);
+ return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, type, buf));
}
int
-mdoc_macro(struct mdoc *mdoc, int tok, int ppos, int *pos, char *buf)
+mdoc_macro(struct mdoc *mdoc, int tok,
+ int ln, int ppos, int *pos, char *buf)
{
- if (MDOC_PROLOGUE & mdoc_macros[tok].flags &&
- SEC_PROLOGUE == mdoc->sec_lastn)
- return(macro_prologue(mdoc, tok, ppos, pos, buf));
-
- if (SEC_PROLOGUE == mdoc->sec_lastn)
- return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE));
-
- if (NULL == (mdoc_macros[tok].fp)) {
- (void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTSUP);
- return(0);
- }
-
- if (1 != ppos && ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
- (void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTCALL);
- return(0);
- }
+ assert(mdoc_macros[tok].fp);
- return((*mdoc_macros[tok].fp)(mdoc, tok, ppos, pos, buf));
+ if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&
+ ! (MDOC_BODYPARSE & mdoc->flags))
+ return(mdoc_perr(mdoc, ln, ppos, "macro disallowed: not in document body"));
+ if (1 != ppos && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
+ return(mdoc_perr(mdoc, ln, ppos, "macro not callable"));
+ return((*mdoc_macros[tok].fp)(mdoc, tok, ln, ppos, pos, buf));
}
-static void
-mdoc_node_append(struct mdoc *mdoc, int pos, struct mdoc_node *p)
+static int
+mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p)
{
- const char *nn, *on, *nt, *ot, *act;
+ const char *nn, *nt, *on, *ot, *act;
+
+ assert(mdoc->last);
+ assert(mdoc->first);
+ assert(MDOC_ROOT != p->type);
+
+ /* See if we exceed the suggest line-max. */
switch (p->type) {
case (MDOC_TEXT):
- nn = p->data.text.string;
- nt = "text";
- break;
- case (MDOC_BODY):
- nn = mdoc_macronames[p->data.body.tok];
- nt = "body";
- break;
+ /* FALLTHROUGH */
case (MDOC_ELEM):
- nn = mdoc_macronames[p->data.elem.tok];
- nt = "elem";
- break;
- case (MDOC_HEAD):
- nn = mdoc_macronames[p->data.head.tok];
- nt = "head";
- break;
+ /* FALLTHROUGH */
case (MDOC_BLOCK):
- nn = mdoc_macronames[p->data.block.tok];
- nt = "block";
+ mdoc->linetok++;
break;
default:
- abort();
- /* NOTREACHED */
+ break;
}
- if (NULL == mdoc->first) {
- assert(NULL == mdoc->last);
- mdoc->first = p;
- mdoc->last = p;
- mdoc_msg(mdoc, pos, "parse: root %s `%s'", nt, nn);
- return;
- }
+ if (mdoc->linetok > MDOC_LINEARG_SOFTMAX)
+ if ( ! mdoc_nwarn(mdoc, p, WARN_COMPAT,
+ "suggested %d tokens per line exceeded (has %d)",
+ MDOC_LINEARG_SOFTMAX, mdoc->linetok))
+ return(0);
- switch (mdoc->last->type) {
- case (MDOC_TEXT):
+ if (MDOC_TEXT == mdoc->last->type)
on = "<text>";
- ot = "text";
- break;
- case (MDOC_BODY):
- on = mdoc_macronames[mdoc->last->data.body.tok];
- ot = "body";
- break;
- case (MDOC_ELEM):
- on = mdoc_macronames[mdoc->last->data.elem.tok];
- ot = "elem";
- break;
- case (MDOC_HEAD):
- on = mdoc_macronames[mdoc->last->data.head.tok];
- ot = "head";
- break;
- case (MDOC_BLOCK):
- on = mdoc_macronames[mdoc->last->data.block.tok];
- ot = "block";
- break;
- default:
- abort();
- /* NOTREACHED */
- }
+ else if (MDOC_ROOT == mdoc->last->type)
+ on = "<root>";
+ else
+ on = mdoc_macronames[mdoc->last->tok];
+
+ if (MDOC_TEXT == p->type)
+ nn = "<text>";
+ else if (MDOC_ROOT == p->type)
+ nn = "<root>";
+ else
+ nn = mdoc_macronames[p->tok];
+
+ ot = mdoc_type2a(mdoc->last->type);
+ nt = mdoc_type2a(p->type);
switch (mdoc->next) {
case (MDOC_NEXT_SIBLING):
/* NOTREACHED */
}
- mdoc_msg(mdoc, pos, "parse: %s `%s' %s of %s `%s'",
- nt, nn, act, ot, on);
+ if ( ! mdoc_valid_pre(mdoc, p))
+ return(0);
+
+ switch (p->type) {
+ case (MDOC_HEAD):
+ assert(MDOC_BLOCK == p->parent->type);
+ p->parent->data.block.head = p;
+ break;
+ case (MDOC_TAIL):
+ assert(MDOC_BLOCK == p->parent->type);
+ p->parent->data.block.tail = p;
+ break;
+ case (MDOC_BODY):
+ assert(MDOC_BLOCK == p->parent->type);
+ p->parent->data.block.body = p;
+ break;
+ default:
+ break;
+ }
mdoc->last = p;
+ mdoc_msg(mdoc, "parse: %s `%s' %s of %s `%s'",
+ nt, nn, act, ot, on);
+ return(1);
}
-void
-mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok)
+int
+mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, int tok)
+{
+ struct mdoc_node *p;
+
+ assert(mdoc->first);
+ assert(mdoc->last);
+
+ p = xcalloc(1, sizeof(struct mdoc_node));
+
+ p->line = line;
+ p->pos = pos;
+ p->type = MDOC_TAIL;
+ p->tok = tok;
+
+ return(mdoc_node_append(mdoc, p));
+}
+
+
+int
+mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, int tok)
{
struct mdoc_node *p;
p = xcalloc(1, sizeof(struct mdoc_node));
+ p->line = line;
+ p->pos = pos;
p->type = MDOC_HEAD;
- p->data.head.tok = tok;
+ p->tok = tok;
- mdoc_node_append(mdoc, pos, p);
+ return(mdoc_node_append(mdoc, p));
}
-void
-mdoc_body_alloc(struct mdoc *mdoc, int pos, int tok)
+int
+mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, int tok)
{
struct mdoc_node *p;
p = xcalloc(1, sizeof(struct mdoc_node));
+ p->line = line;
+ p->pos = pos;
p->type = MDOC_BODY;
- p->data.body.tok = tok;
+ p->tok = tok;
- mdoc_node_append(mdoc, pos, p);
+ return(mdoc_node_append(mdoc, p));
}
-void
-mdoc_block_alloc(struct mdoc *mdoc, int pos, int tok,
- size_t argsz, const struct mdoc_arg *args)
+int
+mdoc_root_alloc(struct mdoc *mdoc)
+{
+ struct mdoc_node *p;
+
+ p = xcalloc(1, sizeof(struct mdoc_node));
+
+ p->type = MDOC_ROOT;
+
+ return(mdoc_node_append(mdoc, p));
+}
+
+
+int
+mdoc_block_alloc(struct mdoc *mdoc, int line, int pos,
+ int tok, size_t argsz, const struct mdoc_arg *args)
{
struct mdoc_node *p;
p = xcalloc(1, sizeof(struct mdoc_node));
+ p->pos = pos;
+ p->line = line;
p->type = MDOC_BLOCK;
- p->data.block.tok = tok;
+ p->tok = tok;
p->data.block.argc = argsz;
p->data.block.argv = argdup(argsz, args);
- mdoc_node_append(mdoc, pos, p);
+ return(mdoc_node_append(mdoc, p));
}
-void
-mdoc_elem_alloc(struct mdoc *mdoc, int pos, int tok,
- size_t argsz, const struct mdoc_arg *args,
- size_t paramsz, const char **params)
+int
+mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos,
+ int tok, size_t argsz, const struct mdoc_arg *args)
{
struct mdoc_node *p;
p = xcalloc(1, sizeof(struct mdoc_node));
+
+ p->line = line;
+ p->pos = pos;
p->type = MDOC_ELEM;
- p->data.elem.tok = tok;
- p->data.elem.sz = paramsz;
- p->data.elem.args = paramdup(paramsz, params);
+ p->tok = tok;
p->data.elem.argc = argsz;
p->data.elem.argv = argdup(argsz, args);
- mdoc_node_append(mdoc, pos, p);
+ return(mdoc_node_append(mdoc, p));
}
-void
-mdoc_word_alloc(struct mdoc *mdoc, int pos, const char *word)
+int
+mdoc_word_alloc(struct mdoc *mdoc,
+ int line, int pos, const char *word)
{
struct mdoc_node *p;
p = xcalloc(1, sizeof(struct mdoc_node));
+ p->line = line;
+ p->pos = pos;
p->type = MDOC_TEXT;
p->data.text.string = xstrdup(word);
- mdoc_node_append(mdoc, pos, p);
+ return(mdoc_node_append(mdoc, p));
}
/* LINTED */
for (j = 0; j < (int)p[i].sz; j++)
free(p[i].value[j]);
+ free(p[i].value);
}
free(p);
}
mdoc_elem_free(struct mdoc_elem *p)
{
- paramfree(p->sz, p->args);
argfree(p->argc, p->argv);
}
}
-static void
+void
mdoc_node_freelist(struct mdoc_node *p)
{
{
int i;
+ dst->line = src->line;
+ dst->pos = src->pos;
dst->arg = src->arg;
if (0 == (dst->sz = src->sz))
return;
}
-static void
-paramfree(size_t sz, char **p)
+/* FIXME: deprecate. */
+char *
+mdoc_node2a(struct mdoc_node *node)
{
- int i;
-
- if (0 == sz)
- return;
-
- assert(p);
- /* LINTED */
- for (i = 0; i < (int)sz; i++)
- free(p[i]);
- free(p);
+ static char buf[64];
+
+ assert(node);
+
+ buf[0] = 0;
+ (void)xstrlcat(buf, mdoc_type2a(node->type), 64);
+ if (MDOC_ROOT == node->type)
+ return(buf);
+ (void)xstrlcat(buf, " `", 64);
+ if (MDOC_TEXT == node->type)
+ (void)xstrlcat(buf, node->data.text.string, 64);
+ else
+ (void)xstrlcat(buf, mdoc_macronames[node->tok], 64);
+ (void)xstrlcat(buf, "'", 64);
+
+ return(buf);
}
-static char **
-paramdup(size_t sz, const char **p)
-{
- char **pp;
- int i;
-
- if (0 == sz)
- return(NULL);
-
- pp = xcalloc(sz, sizeof(char *));
- for (i = 0; i < (int)sz; i++)
- pp[i] = xstrdup(p[i]);
-
- return(pp);
-}
git.ckatri.com / mandoc.git / blobdiff