version 1.172, 2010/12/24 14:00:40 |
version 1.177, 2011/01/03 11:27:33 |
Line 98 static int node_append(struct mdoc *, |
|
Line 98 static int node_append(struct mdoc *, |
|
struct mdoc_node *); |
struct mdoc_node *); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
|
static int mdoc_span_alloc(struct mdoc *, |
|
const struct tbl_span *); |
|
|
|
|
const struct mdoc_node * |
const struct mdoc_node * |
mdoc_node(const struct mdoc *m) |
mdoc_node(const struct mdoc *m) |
{ |
{ |
|
|
return(MDOC_HALT & m->flags ? NULL : m->first); |
assert( ! (MDOC_HALT & m->flags)); |
|
return(m->first); |
} |
} |
|
|
|
|
Line 112 const struct mdoc_meta * |
|
Line 115 const struct mdoc_meta * |
|
mdoc_meta(const struct mdoc *m) |
mdoc_meta(const struct mdoc *m) |
{ |
{ |
|
|
return(MDOC_HALT & m->flags ? NULL : &m->meta); |
assert( ! (MDOC_HALT & m->flags)); |
|
return(&m->meta); |
} |
} |
|
|
|
|
|
|
mdoc_endparse(struct mdoc *m) |
mdoc_endparse(struct mdoc *m) |
{ |
{ |
|
|
if (MDOC_HALT & m->flags) |
assert( ! (MDOC_HALT & m->flags)); |
return(0); |
if (mdoc_macroend(m)) |
else if (mdoc_macroend(m)) |
|
return(1); |
return(1); |
m->flags |= MDOC_HALT; |
m->flags |= MDOC_HALT; |
return(0); |
return(0); |
} |
} |
|
|
|
int |
|
mdoc_addspan(struct mdoc *m, const struct tbl_span *sp) |
|
{ |
|
|
|
assert( ! (MDOC_HALT & m->flags)); |
|
|
|
/* No text before an initial macro. */ |
|
|
|
if (SEC_NONE == m->lastnamed) { |
|
/* FIXME: grab from span. */ |
|
mdoc_pmsg(m, 0, 0, MANDOCERR_NOTEXT); |
|
return(1); |
|
} |
|
|
|
return(mdoc_span_alloc(m, sp)); |
|
} |
|
|
|
|
/* |
/* |
* Main parse routine. Parses a single line -- really just hands off to |
* Main parse routine. Parses a single line -- really just hands off to |
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
|
|
mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs) |
mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs) |
{ |
{ |
|
|
if (MDOC_HALT & m->flags) |
assert( ! (MDOC_HALT & m->flags)); |
return(0); |
|
|
|
m->flags |= MDOC_NEWLINE; |
m->flags |= MDOC_NEWLINE; |
|
|
Line 277 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 296 mdoc_macro(MACRO_PROT_ARGS) |
|
/* If we're in the body, deny prologue calls. */ |
/* If we're in the body, deny prologue calls. */ |
|
|
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
if (MDOC_PROLOGUE & mdoc_macros[tok].flags && |
MDOC_PBODY & m->flags) |
MDOC_PBODY & m->flags) { |
return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY)); |
mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY); |
|
return(1); |
|
} |
|
|
/* If we're in the prologue, deny "body" macros. */ |
/* If we're in the prologue, deny "body" macros. */ |
|
|
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && |
! (MDOC_PBODY & m->flags)) { |
! (MDOC_PBODY & m->flags)) { |
if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG)) |
mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG); |
return(0); |
|
if (NULL == m->meta.msec) |
if (NULL == m->meta.msec) |
m->meta.msec = mandoc_strdup("1"); |
m->meta.msec = mandoc_strdup("1"); |
if (NULL == m->meta.title) |
if (NULL == m->meta.title) |
Line 370 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
Line 390 node_append(struct mdoc *mdoc, struct mdoc_node *p) |
|
mdoc->last = p; |
mdoc->last = p; |
|
|
switch (p->type) { |
switch (p->type) { |
|
case (MDOC_TBL): |
|
/* FALLTHROUGH */ |
case (MDOC_TEXT): |
case (MDOC_TEXT): |
if ( ! mdoc_valid_post(mdoc)) |
if ( ! mdoc_valid_post(mdoc)) |
return(0); |
return(0); |
Line 484 mdoc_block_alloc(struct mdoc *m, int line, int pos, |
|
Line 506 mdoc_block_alloc(struct mdoc *m, int line, int pos, |
|
case (MDOC_Bf): |
case (MDOC_Bf): |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case (MDOC_Bl): |
case (MDOC_Bl): |
|
/* FALLTHROUGH */ |
|
case (MDOC_Rs): |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
break; |
break; |
default: |
default: |
Line 522 mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
|
Line 546 mdoc_elem_alloc(struct mdoc *m, int line, int pos, |
|
return(1); |
return(1); |
} |
} |
|
|
|
static int |
|
mdoc_span_alloc(struct mdoc *m, const struct tbl_span *sp) |
|
{ |
|
struct mdoc_node *n; |
|
|
|
/* FIXME: grab from tbl_span. */ |
|
n = node_alloc(m, 0, 0, MDOC_MAX, MDOC_TBL); |
|
n->span = sp; |
|
|
|
if ( ! node_append(m, n)) |
|
return(0); |
|
|
|
m->next = MDOC_NEXT_SIBLING; |
|
return(1); |
|
} |
|
|
|
|
int |
int |
mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p) |
mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p) |
{ |
{ |
Line 627 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 667 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
|
|
if ('\\' == buf[offs] && |
if ('\\' == buf[offs] && |
'.' == buf[offs + 1] && |
'.' == buf[offs + 1] && |
'"' == buf[offs + 2]) |
'"' == buf[offs + 2]) { |
return(mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT)); |
mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT); |
|
return(1); |
|
} |
|
|
/* No text before an initial macro. */ |
/* No text before an initial macro. */ |
|
|
if (SEC_NONE == m->lastnamed) |
if (SEC_NONE == m->lastnamed) { |
return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT)); |
mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT); |
|
return(1); |
|
} |
|
|
assert(m->last); |
assert(m->last); |
n = m->last; |
n = m->last; |
Line 708 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
Line 752 mdoc_ptext(struct mdoc *m, int line, char *buf, int of |
|
*end = '\0'; |
*end = '\0'; |
|
|
if (ws) |
if (ws) |
if ( ! mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE)) |
mdoc_pmsg(m, line, (int)(ws-buf), MANDOCERR_EOLNSPACE); |
return(0); |
|
|
|
if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) { |
if ('\0' == buf[offs] && ! (MDOC_LITERAL & m->flags)) { |
if ( ! mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN)) |
mdoc_pmsg(m, line, (int)(c-buf), MANDOCERR_NOBLANKLN); |
return(0); |
|
|
|
/* |
/* |
* Insert a `sp' in the case of a blank line. Technically, |
* Insert a `sp' in the case of a blank line. Technically, |
Line 813 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
Line 855 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int off |
|
*/ |
*/ |
|
|
if ('\0' == buf[i] && ' ' == buf[i - 1]) |
if ('\0' == buf[i] && ' ' == buf[i - 1]) |
if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE)) |
mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE); |
goto err; |
|
|
|
/* |
/* |
* If an initial macro or a list invocation, divert directly |
* If an initial macro or a list invocation, divert directly |