=================================================================== RCS file: /cvs/mandoc/man.c,v retrieving revision 1.6 retrieving revision 1.17 diff -u -p -r1.6 -r1.17 --- mandoc/man.c 2009/03/25 16:07:36 1.6 +++ mandoc/man.c 2009/04/12 19:30:45 1.17 @@ -1,4 +1,4 @@ -/* $Id: man.c,v 1.6 2009/03/25 16:07:36 kristaps Exp $ */ +/* $Id: man.c,v 1.17 2009/04/12 19:30:45 kristaps Exp $ */ /* * Copyright (c) 2008, 2009 Kristaps Dzonsons * @@ -18,7 +18,6 @@ */ #include #include -#include #include #include #include @@ -31,18 +30,20 @@ const char *const __man_macronames[MAN_MAX] = { "TP", "LP", "PP", "P", "IP", "HP", "SM", "SB", "BI", "IB", "BR", "RB", - "R", "B", "I", "IR" + "R", "B", "I", "IR", + "RI", "br", "na", "i" }; const char * const *man_macronames = __man_macronames; -static struct man_node *man_node_alloc(int, int, enum man_type); +static struct man_node *man_node_alloc(int, int, + enum man_type, int); static int man_node_append(struct man *, struct man_node *); static int man_ptext(struct man *, int, char *); static int man_pmacro(struct man *, int, char *); static void man_free1(struct man *); -static void man_alloc1(struct man *); +static int man_alloc1(struct man *); const struct man_node * @@ -61,12 +62,12 @@ man_meta(const struct man *m) } -void +int man_reset(struct man *man) { man_free1(man); - man_alloc1(man); + return(man_alloc1(man)); } @@ -83,21 +84,26 @@ man_free(struct man *man) struct man * -man_alloc(void *data, const struct man_cb *cb) +man_alloc(void *data, int pflags, const struct man_cb *cb) { struct man *p; - p = calloc(1, sizeof(struct man)); - if (NULL == p) - err(1, "calloc"); + if (NULL == (p = calloc(1, sizeof(struct man)))) + return(NULL); - man_alloc1(p); + if ( ! man_alloc1(p)) { + free(p); + return(NULL); + } - if (cb) - (void)memcpy(&p->cb, cb, sizeof(struct man_cb)); - - p->htab = man_hash_alloc(); p->data = data; + p->pflags = pflags; + (void)memcpy(&p->cb, cb, sizeof(struct man_cb)); + + if (NULL == (p->htab = man_hash_alloc())) { + free(p); + return(NULL); + } return(p); } @@ -140,7 +146,7 @@ man_free1(struct man *man) } -static void +static int man_alloc1(struct man *m) { @@ -148,10 +154,11 @@ man_alloc1(struct man *m) m->flags = 0; m->last = calloc(1, sizeof(struct man_node)); if (NULL == m->last) - err(1, "calloc"); + return(0); m->first = m->last; m->last->type = MAN_ROOT; m->next = MAN_NEXT_CHILD; + return(1); } @@ -196,16 +203,18 @@ man_node_append(struct man *man, struct man_node *p) static struct man_node * -man_node_alloc(int line, int pos, enum man_type type) +man_node_alloc(int line, int pos, enum man_type type, int tok) { struct man_node *p; - if (NULL == (p = calloc(1, sizeof(struct man_node)))) - err(1, "malloc"); + p = calloc(1, sizeof(struct man_node)); + if (NULL == p) + return(NULL); + p->line = line; p->pos = pos; p->type = type; - + p->tok = tok; return(p); } @@ -215,9 +224,9 @@ man_elem_alloc(struct man *man, int line, int pos, int { struct man_node *p; - p = man_node_alloc(line, pos, MAN_ELEM); - p->tok = tok; - + p = man_node_alloc(line, pos, MAN_ELEM, tok); + if (NULL == p) + return(0); return(man_node_append(man, p)); } @@ -228,10 +237,11 @@ man_word_alloc(struct man *man, { struct man_node *p; - p = man_node_alloc(line, pos, MAN_TEXT); + p = man_node_alloc(line, pos, MAN_TEXT, -1); + if (NULL == p) + return(0); if (NULL == (p->string = strdup(word))) - err(1, "strdup"); - + return(0); return(man_node_append(man, p)); } @@ -266,6 +276,25 @@ man_ptext(struct man *m, int line, char *buf) if ( ! man_word_alloc(m, line, 0, buf)) return(0); m->next = MAN_NEXT_SIBLING; + + /* + * If this is one of the zany NLINE macros that consumes the + * next line of input as being influenced, then close out the + * existing macro "scope" and continue processing. + */ + + if ( ! (MAN_NLINE & m->flags)) + return(1); + + m->flags &= ~MAN_NLINE; + m->last = m->last->parent; + + assert(MAN_ROOT != m->last->type); + if ( ! man_valid_post(m)) + return(0); + if ( ! man_action_post(m)) + return(0); + return(1); } @@ -273,47 +302,67 @@ man_ptext(struct man *m, int line, char *buf) int man_pmacro(struct man *m, int ln, char *buf) { - int i, c; + int i, j, c, ppos, fl; char mac[5]; + struct man_node *n; /* Comments and empties are quickly ignored. */ + n = m->last; + fl = MAN_NLINE & m->flags; + if (0 == buf[1]) - return(1); + goto out; - if (' ' == buf[1]) { - i = 2; + i = 1; + + if (' ' == buf[i]) { + i++; while (buf[i] && ' ' == buf[i]) i++; if (0 == buf[i]) - return(1); - warnx("invalid syntax"); - return(0); + goto out; } - if (buf[1] && '\\' == buf[1]) - if (buf[2] && '\"' == buf[2]) - return(1); + ppos = i; + if (buf[i] && '\\' == buf[i]) + if (buf[i + 1] && '\"' == buf[i + 1]) + goto out; + /* Copy the first word into a nil-terminated buffer. */ - for (i = 1; i < 5; i++) { - if (0 == (mac[i - 1] = buf[i])) + for (j = 0; j < 4; j++, i++) { + if (0 == (mac[j] = buf[i])) break; else if (' ' == buf[i]) break; } - mac[i - 1] = 0; + mac[j] = 0; - if (i == 5 || i <= 1) { - warnx("unknown macro: %s", mac); - goto err; - } + if (j == 4 || j < 1) { + if ( ! (MAN_IGN_MACRO & m->pflags)) { + (void)man_verr(m, ln, ppos, + "ill-formed macro: %s", mac); + goto err; + } + if ( ! man_vwarn(m, ln, ppos, + "ill-formed macro: %s", mac)) + goto err; + return(1); + } if (MAN_MAX == (c = man_hash_find(m->htab, mac))) { - warnx("unknown macro: %s", mac); - goto err; + if ( ! (MAN_IGN_MACRO & m->pflags)) { + (void)man_verr(m, ln, ppos, + "unknown macro: %s", mac); + goto err; + } + if ( ! man_vwarn(m, ln, ppos, + "unknown macro: %s", mac)) + goto err; + return(1); } /* The macro is sane. Jump to the next word. */ @@ -323,8 +372,30 @@ man_pmacro(struct man *m, int ln, char *buf) /* Begin recursive parse sequence. */ - if ( ! man_macro(m, c, ln, 1, &i, buf)) + if ( ! man_macro(m, c, ln, ppos, &i, buf)) goto err; + +out: + if (fl) { + /* + * A NLINE macro has been immediately followed with + * another. Close out the preceding macro's scope, and + * continue. + */ + assert(MAN_ROOT != m->last->type); + assert(m->last->parent); + assert(MAN_ROOT != m->last->parent->type); + + if (n != m->last) + m->last = m->last->parent; + + if ( ! man_valid_post(m)) + return(0); + if ( ! man_action_post(m)) + return(0); + m->next = MAN_NEXT_SIBLING; + m->flags &= ~MAN_NLINE; + } return(1);