diff options
author | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-06-26 16:07:08 +0000 |
---|---|---|
committer | Kristaps Dzonsons <kristaps@bsd.lv> | 2010-06-26 16:07:08 +0000 |
commit | c5cf90497acc3621015972b85b9c079b43601342 (patch) | |
tree | 746bb9279cdca11169c3263e138d6798d88c4be5 /mdoc.c | |
parent | 8ee307fc9980fbb248f1ed3b9c0da115e8c79440 (diff) | |
download | mandoc-c5cf90497acc3621015972b85b9c079b43601342.tar.gz |
Mechanical diff allowing the const struct regset to propogate through
libman and libmdoc.
Diffstat (limited to 'mdoc.c')
-rw-r--r-- | mdoc.c | 42 |
1 files changed, 25 insertions, 17 deletions
@@ -97,8 +97,12 @@ static struct mdoc_node *node_alloc(struct mdoc *, int, int, enum mdoct, enum mdoc_type); static int node_append(struct mdoc *, struct mdoc_node *); -static int mdoc_ptext(struct mdoc *, int, char *, int); -static int mdoc_pmacro(struct mdoc *, int, char *, int); +static int mdoc_ptext(struct mdoc *, + const struct regset *, + int, char *, int); +static int mdoc_pmacro(struct mdoc *, + const struct regset *, + int, char *, int); static int macrowarn(struct mdoc *, int, const char *, int); @@ -239,8 +243,8 @@ mdoc_parseln(struct mdoc *m, const struct regset *regs, m->flags |= MDOC_NEWLINE; return(('.' == buf[offs] || '\'' == buf[offs]) ? - mdoc_pmacro(m, ln, buf, offs) : - mdoc_ptext(m, ln, buf, offs)); + mdoc_pmacro(m, regs, ln, buf, offs) : + mdoc_ptext(m, regs, ln, buf, offs)); } @@ -260,8 +264,7 @@ mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t, int -mdoc_macro(struct mdoc *m, enum mdoct tok, - int ln, int pp, int *pos, char *buf) +mdoc_macro(MACRO_PROT_ARGS) { assert(tok < MDOC_MAX); @@ -269,13 +272,13 @@ mdoc_macro(struct mdoc *m, enum mdoct tok, if (MDOC_PROLOGUE & mdoc_macros[tok].flags && MDOC_PBODY & m->flags) - return(mdoc_pmsg(m, ln, pp, MANDOCERR_BADBODY)); + return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY)); /* If we're in the prologue, deny "body" macros. */ if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && ! (MDOC_PBODY & m->flags)) { - if ( ! mdoc_pmsg(m, ln, pp, MANDOCERR_BADPROLOG)) + if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG)) return(0); if (NULL == m->meta.title) m->meta.title = mandoc_strdup("UNKNOWN"); @@ -288,7 +291,8 @@ mdoc_macro(struct mdoc *m, enum mdoct tok, m->flags |= MDOC_PBODY; } - return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf)); + return((*mdoc_macros[tok].fp) + (m, regs, tok, line, ppos, pos, buf)); } @@ -542,7 +546,8 @@ mdoc_node_delete(struct mdoc *m, struct mdoc_node *p) * control character. */ static int -mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) +mdoc_ptext(struct mdoc *m, const struct regset *regs, + int line, char *buf, int offs) { char *c, *ws, *end; struct mdoc_node *n; @@ -573,7 +578,8 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) LIST_column == n->data.Bl.type) { /* `Bl' is open without any children. */ m->flags |= MDOC_FREECOL; - return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); + return(mdoc_macro(m, regs, MDOC_It, + line, offs, &offs, buf)); } if (MDOC_It == n->tok && MDOC_BLOCK == n->type && @@ -582,7 +588,8 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs) LIST_column == n->parent->data.Bl.type) { /* `Bl' has block-level `It' children. */ m->flags |= MDOC_FREECOL; - return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf)); + return(mdoc_macro(m, regs, MDOC_It, + line, offs, &offs, buf)); } /* @@ -692,7 +699,8 @@ macrowarn(struct mdoc *m, int ln, const char *buf, int offs) * character. */ int -mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) +mdoc_pmacro(struct mdoc *m, const struct regset *regs, + int ln, char *buf, int offs) { enum mdoct tok; int i, j, sv; @@ -771,7 +779,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) */ if (NULL == m->last || MDOC_It == tok || MDOC_El == tok) { - if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) + if ( ! mdoc_macro(m, regs, tok, ln, sv, &i, buf)) goto err; return(1); } @@ -787,7 +795,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) if (MDOC_Bl == n->tok && MDOC_BODY == n->type && LIST_column == n->data.Bl.type) { m->flags |= MDOC_FREECOL; - if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) + if ( ! mdoc_macro(m, regs, MDOC_It, ln, sv, &sv, buf)) goto err; return(1); } @@ -803,14 +811,14 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs) MDOC_Bl == n->parent->tok && LIST_column == n->parent->data.Bl.type) { m->flags |= MDOC_FREECOL; - if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) + if ( ! mdoc_macro(m, regs, MDOC_It, ln, sv, &sv, buf)) goto err; return(1); } /* Normal processing of a macro. */ - if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) + if ( ! mdoc_macro(m, regs, tok, ln, sv, &i, buf)) goto err; return(1); |