version 1.24, 2009/01/08 15:05:50 |
version 1.28, 2009/01/12 16:39:57 |
Line 97 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 97 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ macro_close_explicit, 0 }, /* Ed */ |
{ macro_close_explicit, 0 }, /* Ed */ |
{ macro_scoped, MDOC_EXPLICIT }, /* Bl */ |
{ macro_scoped, MDOC_EXPLICIT }, /* Bl */ |
{ macro_close_explicit, 0 }, /* El */ |
{ macro_close_explicit, 0 }, /* El */ |
{ macro_scoped, MDOC_NESTED | MDOC_PARSED }, /* It */ |
{ macro_scoped, MDOC_NESTED | MDOC_PARSED | MDOC_TABSEP}, /* It */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ macro_constant, MDOC_PARSED }, /* An */ |
{ macro_constant, MDOC_PARSED }, /* An */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
{ macro_text, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
Line 243 mdoc_alloc(void *data, const struct mdoc_cb *cb) |
|
Line 243 mdoc_alloc(void *data, const struct mdoc_cb *cb) |
|
p->data = data; |
p->data = data; |
(void)memcpy(&p->cb, cb, sizeof(struct mdoc_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(); |
p->htab = mdoc_tokhash_alloc(); |
|
|
return(p); |
return(p); |
} |
} |
|
|
Line 277 mdoc_parseln(struct mdoc *mdoc, int line, char *buf) |
|
Line 283 mdoc_parseln(struct mdoc *mdoc, int line, char *buf) |
|
|
|
if ('.' != *buf) { |
if ('.' != *buf) { |
if (SEC_PROLOGUE != mdoc->sec_lastn) { |
if (SEC_PROLOGUE != mdoc->sec_lastn) { |
mdoc_word_alloc(mdoc, line, 0, buf); |
if ( ! mdoc_word_alloc(mdoc, line, 0, buf)) |
|
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
Line 386 mdoc_macro(struct mdoc *mdoc, int tok, |
|
Line 393 mdoc_macro(struct mdoc *mdoc, int tok, |
|
static int |
static int |
mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p) |
mdoc_node_append(struct mdoc *mdoc, struct mdoc_node *p) |
{ |
{ |
const char *nn, *on, *nt, *ot, *act; |
const char *on, *ot, *act; |
|
|
switch (p->type) { |
assert(mdoc->last); |
case (MDOC_TEXT): |
assert(mdoc->first); |
nn = p->data.text.string; |
assert(MDOC_ROOT != p->type); |
nt = "text"; |
|
break; |
|
case (MDOC_BODY): |
|
nn = mdoc_macronames[p->data.body.tok]; |
|
nt = "body"; |
|
break; |
|
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; |
|
case (MDOC_TAIL): |
|
nn = mdoc_macronames[p->data.tail.tok]; |
|
nt = "tail"; |
|
break; |
|
case (MDOC_BLOCK): |
|
nn = mdoc_macronames[p->data.block.tok]; |
|
nt = "block"; |
|
break; |
|
default: |
|
abort(); |
|
/* NOTREACHED */ |
|
} |
|
|
|
if (NULL == mdoc->first) { |
if (MDOC_TEXT == mdoc->last->type) |
assert(NULL == mdoc->last); |
on = "<text>"; |
if ( ! mdoc_valid_pre(mdoc, p)) |
else if (MDOC_ROOT == mdoc->last->type) |
return(0); |
on = "<root>"; |
if ( ! mdoc_action_pre(mdoc, p)) |
else |
return(0); |
on = mdoc_macronames[mdoc->last->tok]; |
mdoc->first = p; |
|
mdoc->last = p; |
|
mdoc_msg(mdoc, "parse: root %s `%s'", nt, nn); |
|
return(1); |
|
} |
|
|
|
|
/* FIXME: put this into util.c. */ |
switch (mdoc->last->type) { |
switch (mdoc->last->type) { |
case (MDOC_TEXT): |
case (MDOC_TEXT): |
on = "<text>"; |
|
ot = "text"; |
ot = "text"; |
break; |
break; |
case (MDOC_BODY): |
case (MDOC_BODY): |
on = mdoc_macronames[mdoc->last->data.body.tok]; |
|
ot = "body"; |
ot = "body"; |
break; |
break; |
case (MDOC_ELEM): |
case (MDOC_ELEM): |
on = mdoc_macronames[mdoc->last->data.elem.tok]; |
|
ot = "elem"; |
ot = "elem"; |
break; |
break; |
case (MDOC_HEAD): |
case (MDOC_HEAD): |
on = mdoc_macronames[mdoc->last->data.head.tok]; |
|
ot = "head"; |
ot = "head"; |
break; |
break; |
case (MDOC_TAIL): |
case (MDOC_TAIL): |
on = mdoc_macronames[mdoc->last->data.tail.tok]; |
|
ot = "tail"; |
ot = "tail"; |
break; |
break; |
case (MDOC_BLOCK): |
case (MDOC_BLOCK): |
on = mdoc_macronames[mdoc->last->data.block.tok]; |
|
ot = "block"; |
ot = "block"; |
break; |
break; |
|
case (MDOC_ROOT): |
|
ot = "root"; |
|
break; |
default: |
default: |
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
Line 481 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * |
|
Line 455 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * |
|
return(0); |
return(0); |
if ( ! mdoc_action_pre(mdoc, p)) |
if ( ! mdoc_action_pre(mdoc, p)) |
return(0); |
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->last = p; |
mdoc_msg(mdoc, "parse: %s of %s `%s'", act, ot, on); |
mdoc_msg(mdoc, "parse: %s of %s `%s'", act, ot, on); |
return(1); |
return(1); |
Line 500 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 492 mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, |
|
p->line = line; |
p->line = line; |
p->pos = pos; |
p->pos = pos; |
p->type = MDOC_TAIL; |
p->type = MDOC_TAIL; |
p->data.tail.tok = tok; |
p->tok = tok; |
|
|
return(mdoc_node_append(mdoc, p)); |
return(mdoc_node_append(mdoc, p)); |
} |
} |
Line 519 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 511 mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, |
|
p->line = line; |
p->line = line; |
p->pos = pos; |
p->pos = pos; |
p->type = MDOC_HEAD; |
p->type = MDOC_HEAD; |
p->data.head.tok = tok; |
p->tok = tok; |
|
|
return(mdoc_node_append(mdoc, p)); |
return(mdoc_node_append(mdoc, p)); |
} |
} |
Line 538 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 530 mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, |
|
p->line = line; |
p->line = line; |
p->pos = pos; |
p->pos = pos; |
p->type = MDOC_BODY; |
p->type = MDOC_BODY; |
p->data.body.tok = tok; |
p->tok = tok; |
|
|
return(mdoc_node_append(mdoc, p)); |
return(mdoc_node_append(mdoc, p)); |
} |
} |
|
|
|
|
int |
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, |
mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
int tok, size_t argsz, const struct mdoc_arg *args) |
int tok, size_t argsz, const struct mdoc_arg *args) |
{ |
{ |
Line 555 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 560 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
p->pos = pos; |
p->pos = pos; |
p->line = line; |
p->line = line; |
p->type = MDOC_BLOCK; |
p->type = MDOC_BLOCK; |
p->data.block.tok = tok; |
p->tok = tok; |
p->data.block.argc = argsz; |
p->data.block.argc = argsz; |
p->data.block.argv = argdup(argsz, args); |
p->data.block.argv = argdup(argsz, args); |
|
|
Line 574 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 579 mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, |
|
p->line = line; |
p->line = line; |
p->pos = pos; |
p->pos = pos; |
p->type = MDOC_ELEM; |
p->type = MDOC_ELEM; |
p->data.elem.tok = tok; |
p->tok = tok; |
p->data.elem.argc = argsz; |
p->data.elem.argc = argsz; |
p->data.elem.argv = argdup(argsz, args); |
p->data.elem.argv = argdup(argsz, args); |
|
|
Line 693 argcpy(struct mdoc_arg *dst, const struct mdoc_arg *sr |
|
Line 698 argcpy(struct mdoc_arg *dst, const struct mdoc_arg *sr |
|
{ |
{ |
int i; |
int i; |
|
|
|
dst->line = src->line; |
|
dst->pos = src->pos; |
dst->arg = src->arg; |
dst->arg = src->arg; |
if (0 == (dst->sz = src->sz)) |
if (0 == (dst->sz = src->sz)) |
return; |
return; |