version 1.148, 2010/06/26 16:07:08 |
version 1.151, 2010/06/27 16:36:22 |
Line 97 static struct mdoc_node *node_alloc(struct mdoc *, int |
|
Line 97 static struct mdoc_node *node_alloc(struct mdoc *, int |
|
enum mdoct, enum mdoc_type); |
enum mdoct, enum mdoc_type); |
static int node_append(struct mdoc *, |
static int node_append(struct mdoc *, |
struct mdoc_node *); |
struct mdoc_node *); |
static int mdoc_ptext(struct mdoc *, |
static int mdoc_ptext(struct mdoc *, int, char *, int); |
const struct regset *, |
static int mdoc_pmacro(struct mdoc *, int, char *, int); |
int, char *, int); |
|
static int mdoc_pmacro(struct mdoc *, |
|
const struct regset *, |
|
int, char *, int); |
|
static int macrowarn(struct mdoc *, int, |
static int macrowarn(struct mdoc *, int, |
const char *, int); |
const char *, int); |
|
|
Line 196 mdoc_free(struct mdoc *mdoc) |
|
Line 192 mdoc_free(struct mdoc *mdoc) |
|
* Allocate volatile and non-volatile parse resources. |
* Allocate volatile and non-volatile parse resources. |
*/ |
*/ |
struct mdoc * |
struct mdoc * |
mdoc_alloc(void *data, int pflags, mandocmsg msg) |
mdoc_alloc(struct regset *regs, void *data, |
|
int pflags, mandocmsg msg) |
{ |
{ |
struct mdoc *p; |
struct mdoc *p; |
|
|
Line 205 mdoc_alloc(void *data, int pflags, mandocmsg msg) |
|
Line 202 mdoc_alloc(void *data, int pflags, mandocmsg msg) |
|
p->msg = msg; |
p->msg = msg; |
p->data = data; |
p->data = data; |
p->pflags = pflags; |
p->pflags = pflags; |
|
p->regs = regs; |
|
|
mdoc_hash_init(); |
mdoc_hash_init(); |
mdoc_alloc1(p); |
mdoc_alloc1(p); |
Line 234 mdoc_endparse(struct mdoc *m) |
|
Line 232 mdoc_endparse(struct mdoc *m) |
|
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
* the macro (mdoc_pmacro()) or text parser (mdoc_ptext()). |
*/ |
*/ |
int |
int |
mdoc_parseln(struct mdoc *m, const struct regset *regs, |
mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs) |
int ln, char *buf, int offs) |
|
{ |
{ |
|
|
if (MDOC_HALT & m->flags) |
if (MDOC_HALT & m->flags) |
Line 243 mdoc_parseln(struct mdoc *m, const struct regset *regs |
|
Line 240 mdoc_parseln(struct mdoc *m, const struct regset *regs |
|
|
|
m->flags |= MDOC_NEWLINE; |
m->flags |= MDOC_NEWLINE; |
return(('.' == buf[offs] || '\'' == buf[offs]) ? |
return(('.' == buf[offs] || '\'' == buf[offs]) ? |
mdoc_pmacro(m, regs, ln, buf, offs) : |
mdoc_pmacro(m, ln, buf, offs) : |
mdoc_ptext(m, regs, ln, buf, offs)); |
mdoc_ptext(m, ln, buf, offs)); |
} |
} |
|
|
|
|
Line 291 mdoc_macro(MACRO_PROT_ARGS) |
|
Line 288 mdoc_macro(MACRO_PROT_ARGS) |
|
m->flags |= MDOC_PBODY; |
m->flags |= MDOC_PBODY; |
} |
} |
|
|
return((*mdoc_macros[tok].fp) |
return((*mdoc_macros[tok].fp)(m, tok, line, ppos, pos, buf)); |
(m, regs, tok, line, ppos, pos, buf)); |
|
} |
} |
|
|
|
|
Line 372 node_alloc(struct mdoc *m, int line, int pos, |
|
Line 368 node_alloc(struct mdoc *m, int line, int pos, |
|
p->pos = pos; |
p->pos = pos; |
p->tok = tok; |
p->tok = tok; |
p->type = type; |
p->type = type; |
|
|
|
/* Flag analysis. */ |
|
|
if (MDOC_NEWLINE & m->flags) |
if (MDOC_NEWLINE & m->flags) |
p->flags |= MDOC_LINE; |
p->flags |= MDOC_LINE; |
m->flags &= ~MDOC_NEWLINE; |
m->flags &= ~MDOC_NEWLINE; |
|
|
|
/* Section analysis. */ |
|
|
|
if (SEC_SYNOPSIS == p->sec) |
|
p->flags |= MDOC_SYNPRETTY; |
|
|
|
/* Register analysis. */ |
|
|
|
if (m->regs->regs[(int)REG_nS].set) { |
|
if (m->regs->regs[(int)REG_nS].v.u) |
|
p->flags |= MDOC_SYNPRETTY; |
|
else |
|
p->flags &= ~MDOC_SYNPRETTY; |
|
} |
|
|
return(p); |
return(p); |
} |
} |
|
|
Line 546 mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) |
|
Line 560 mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) |
|
* control character. |
* control character. |
*/ |
*/ |
static int |
static int |
mdoc_ptext(struct mdoc *m, const struct regset *regs, |
mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) |
int line, char *buf, int offs) |
|
{ |
{ |
char *c, *ws, *end; |
char *c, *ws, *end; |
struct mdoc_node *n; |
struct mdoc_node *n; |
Line 578 mdoc_ptext(struct mdoc *m, const struct regset *regs, |
|
Line 591 mdoc_ptext(struct mdoc *m, const struct regset *regs, |
|
LIST_column == n->data.Bl.type) { |
LIST_column == n->data.Bl.type) { |
/* `Bl' is open without any children. */ |
/* `Bl' is open without any children. */ |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, regs, MDOC_It, |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
line, offs, &offs, buf)); |
|
} |
} |
|
|
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
if (MDOC_It == n->tok && MDOC_BLOCK == n->type && |
Line 588 mdoc_ptext(struct mdoc *m, const struct regset *regs, |
|
Line 600 mdoc_ptext(struct mdoc *m, const struct regset *regs, |
|
LIST_column == n->parent->data.Bl.type) { |
LIST_column == n->parent->data.Bl.type) { |
/* `Bl' has block-level `It' children. */ |
/* `Bl' has block-level `It' children. */ |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
return(mdoc_macro(m, regs, MDOC_It, |
return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); |
line, offs, &offs, buf)); |
|
} |
} |
|
|
/* |
/* |
Line 699 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
Line 710 macrowarn(struct mdoc *m, int ln, const char *buf, int |
|
* character. |
* character. |
*/ |
*/ |
int |
int |
mdoc_pmacro(struct mdoc *m, const struct regset *regs, |
mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) |
int ln, char *buf, int offs) |
|
{ |
{ |
enum mdoct tok; |
enum mdoct tok; |
int i, j, sv; |
int i, j, sv; |
Line 779 mdoc_pmacro(struct mdoc *m, const struct regset *regs, |
|
Line 789 mdoc_pmacro(struct mdoc *m, const struct regset *regs, |
|
*/ |
*/ |
|
|
if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) { |
if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) { |
if ( ! mdoc_macro(m, regs, tok, ln, sv, &i, buf)) |
if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
Line 795 mdoc_pmacro(struct mdoc *m, const struct regset *regs, |
|
Line 805 mdoc_pmacro(struct mdoc *m, const struct regset *regs, |
|
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
if (MDOC_Bl == n->tok && MDOC_BODY == n->type && |
LIST_column == n->data.Bl.type) { |
LIST_column == n->data.Bl.type) { |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(m, regs, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
Line 811 mdoc_pmacro(struct mdoc *m, const struct regset *regs, |
|
Line 821 mdoc_pmacro(struct mdoc *m, const struct regset *regs, |
|
MDOC_Bl == n->parent->tok && |
MDOC_Bl == n->parent->tok && |
LIST_column == n->parent->data.Bl.type) { |
LIST_column == n->parent->data.Bl.type) { |
m->flags |= MDOC_FREECOL; |
m->flags |= MDOC_FREECOL; |
if ( ! mdoc_macro(m, regs, MDOC_It, ln, sv, &sv, buf)) |
if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
|
|
/* Normal processing of a macro. */ |
/* Normal processing of a macro. */ |
|
|
if ( ! mdoc_macro(m, regs, tok, ln, sv, &i, buf)) |
if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) |
goto err; |
goto err; |
|
|
return(1); |
return(1); |