version 1.26, 2009/01/12 10:31:53 |
version 1.27, 2009/01/12 12:52:21 |
Line 399 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * |
|
Line 399 mdoc_node_append(struct mdoc *mdoc, struct mdoc_node * |
|
assert(mdoc->first); |
assert(mdoc->first); |
assert(MDOC_ROOT != p->type); |
assert(MDOC_ROOT != p->type); |
|
|
|
if (MDOC_TEXT == mdoc->last->type) |
|
on = "<text>"; |
|
else if (MDOC_ROOT == mdoc->last->type) |
|
on = "<root>"; |
|
else |
|
on = mdoc_macronames[mdoc->last->tok]; |
|
|
|
/* 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): |
case (MDOC_ROOT): |
on = "root"; |
|
ot = "root"; |
ot = "root"; |
break; |
break; |
default: |
default: |
Line 454 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 473 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 492 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 511 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)); |
} |
} |
Line 541 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 560 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); |
|
|