=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.3 retrieving revision 1.13 diff -u -p -r1.3 -r1.13 --- mandoc/mdoc.c 2008/12/17 17:18:38 1.3 +++ mandoc/mdoc.c 2009/01/01 20:40:16 1.13 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.3 2008/12/17 17:18:38 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.13 2009/01/01 20:40:16 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -84,99 +84,99 @@ const char *const __mdoc_argnames[MDOC_ARG_MAX] = { const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { NULL, 0 }, /* \" */ - { macro_prologue_ddate, 0 }, /* Dd */ - { macro_prologue_dtitle, 0 }, /* Dt */ - { NULL, 0 }, /* Os */ - { macro_scoped_implicit, 0 }, /* Sh */ - { macro_scoped_implicit, 0 }, /* Ss */ - { NULL, 0 }, /* Pp */ - { NULL, 0 }, /* D1 */ - { NULL, 0 }, /* Dl */ - { NULL, 0 }, /* Bd */ - { NULL, 0 }, /* Ed */ - { NULL, 0 }, /* Bl */ - { NULL, 0 }, /* El */ + { NULL, MDOC_PROLOGUE }, /* Dd */ + { NULL, MDOC_PROLOGUE }, /* Dt */ + { NULL, MDOC_PROLOGUE }, /* Os */ + { macro_scoped, 0 }, /* Sh */ + { macro_scoped, 0 }, /* Ss */ + { macro_text, 0 }, /* Pp */ + { macro_scoped_line, 0 }, /* D1 */ + { macro_scoped_line, 0 }, /* Dl */ + { macro_scoped, MDOC_EXPLICIT }, /* Bd */ + { macro_close_explicit, 0 }, /* Ed */ + { macro_scoped, MDOC_EXPLICIT }, /* Bl */ + { macro_close_explicit, 0 }, /* El */ { NULL, 0 }, /* It */ { macro_text, MDOC_CALLABLE }, /* Ad */ { NULL, 0 }, /* An */ { macro_text, MDOC_CALLABLE }, /* Ar */ - { NULL, 0 }, /* Cd */ + { macro_constant, MDOC_QUOTABLE }, /* Cd */ { macro_text, MDOC_CALLABLE }, /* Cm */ { macro_text, MDOC_CALLABLE }, /* Dv */ { macro_text, MDOC_CALLABLE }, /* Er */ { macro_text, MDOC_CALLABLE }, /* Ev */ - { NULL, 0 }, /* Ex */ + { macro_constant, 0 }, /* Ex */ { macro_text, MDOC_CALLABLE }, /* Fa */ - { NULL, 0 }, /* Fd */ + { macro_constant, 0 }, /* Fd */ { macro_text, MDOC_CALLABLE }, /* Fl */ - { NULL, 0 }, /* Fn */ + { macro_text, MDOC_CALLABLE | MDOC_QUOTABLE }, /* Fn */ { macro_text, 0 }, /* Ft */ { macro_text, MDOC_CALLABLE }, /* Ic */ - { NULL, 0 }, /* In */ + { macro_constant, 0 }, /* In */ { macro_text, MDOC_CALLABLE }, /* Li */ - { NULL, 0 }, /* Nd */ + { macro_constant, 0 }, /* Nd */ { NULL, 0 }, /* Nm */ - { NULL, 0 }, /* Op */ - { NULL, 0 }, /* Ot */ + { macro_scoped_line, MDOC_CALLABLE }, /* Op */ + { macro_obsolete, 0 }, /* Ot */ { macro_text, MDOC_CALLABLE }, /* Pa */ - { NULL, 0 }, /* Rv */ - { NULL, 0 }, /* St */ + { macro_constant, 0 }, /* Rv */ + { macro_constant, 0 }, /* St */ { macro_text, MDOC_CALLABLE }, /* Va */ { macro_text, MDOC_CALLABLE }, /* Vt */ - { NULL, 0 }, /* Xr */ - { NULL, 0 }, /* %A */ - { NULL, 0 }, /* %B */ - { NULL, 0 }, /* %D */ - { NULL, 0 }, /* %I */ - { NULL, 0 }, /* %J */ - { NULL, 0 }, /* %N */ - { NULL, 0 }, /* %O */ - { NULL, 0 }, /* %P */ - { NULL, 0 }, /* %R */ - { NULL, 0 }, /* %T */ - { NULL, 0 }, /* %V */ + { macro_text, MDOC_CALLABLE }, /* Xr */ + { macro_constant, MDOC_QUOTABLE }, /* %A */ + { macro_constant, MDOC_QUOTABLE }, /* %B */ + { macro_constant, MDOC_QUOTABLE }, /* %D */ + { macro_constant, MDOC_QUOTABLE }, /* %I */ + { macro_constant, MDOC_QUOTABLE }, /* %J */ + { macro_constant, MDOC_QUOTABLE }, /* %N */ + { macro_constant, MDOC_QUOTABLE }, /* %O */ + { macro_constant, MDOC_QUOTABLE }, /* %P */ + { macro_constant, MDOC_QUOTABLE }, /* %R */ + { macro_constant, MDOC_QUOTABLE }, /* %T */ + { macro_constant, MDOC_QUOTABLE }, /* %V */ { NULL, 0 }, /* Ac */ { NULL, 0 }, /* Ao */ - { NULL, 0 }, /* Aq */ - { NULL, 0 }, /* At */ + { macro_scoped_line, MDOC_CALLABLE }, /* Aq */ + { macro_constant, 0 }, /* At */ { NULL, 0 }, /* Bc */ { NULL, 0 }, /* Bf */ { NULL, 0 }, /* Bo */ - { NULL, 0 }, /* Bq */ - { NULL, 0 }, /* Bsx */ - { NULL, 0 }, /* Bx */ - { NULL, 0 }, /* Db */ + { macro_scoped_line, MDOC_CALLABLE }, /* Bq */ + { macro_constant_delimited, 0 }, /* Bsx */ + { macro_constant_delimited, 0 }, /* Bx */ + { macro_constant, 0 }, /* Db */ { NULL, 0 }, /* Dc */ { NULL, 0 }, /* Do */ - { NULL, 0 }, /* Dq */ + { macro_scoped_line, MDOC_CALLABLE }, /* Dq */ { NULL, 0 }, /* Ec */ { NULL, 0 }, /* Ef */ { macro_text, MDOC_CALLABLE }, /* Em */ { NULL, 0 }, /* Eo */ - { NULL, 0 }, /* Fx */ + { macro_constant_delimited, 0 }, /* Fx */ { macro_text, 0 }, /* Ms */ - { NULL, 0 }, /* No */ - { NULL, 0 }, /* Ns */ - { NULL, 0 }, /* Nx */ - { NULL, 0 }, /* Ox */ + { macro_constant_delimited, MDOC_CALLABLE }, /* No */ + { macro_constant_delimited, MDOC_CALLABLE }, /* Ns */ + { macro_constant_delimited, 0 }, /* Nx */ + { macro_constant_delimited, 0 }, /* Ox */ { NULL, 0 }, /* Pc */ { NULL, 0 }, /* Pf */ { NULL, 0 }, /* Po */ - { NULL, 0 }, /* Pq */ + { macro_scoped_line, MDOC_CALLABLE }, /* Pq */ { NULL, 0 }, /* Qc */ - { NULL, 0 }, /* Ql */ + { macro_scoped_line, MDOC_CALLABLE }, /* Ql */ { NULL, 0 }, /* Qo */ - { NULL, 0 }, /* Qq */ - { NULL, 0 }, /* Re */ - { NULL, 0 }, /* Rs */ + { macro_scoped_line, MDOC_CALLABLE }, /* Qq */ + { macro_scoped, MDOC_EXPLICIT }, /* Re */ + { macro_scoped, MDOC_EXPLICIT }, /* Rs */ { NULL, 0 }, /* Sc */ { NULL, 0 }, /* So */ - { NULL, 0 }, /* Sq */ - { NULL, 0 }, /* Sm */ - { NULL, 0 }, /* Sx */ - { NULL, 0 }, /* Sy */ + { macro_scoped_line, MDOC_CALLABLE }, /* Sq */ + { macro_constant, 0 }, /* Sm */ + { macro_text, MDOC_CALLABLE }, /* Sx */ + { macro_text, MDOC_CALLABLE }, /* Sy */ { macro_text, MDOC_CALLABLE }, /* Tn */ - { NULL, 0 }, /* Ux */ + { macro_constant_delimited, 0 }, /* Ux */ { NULL, 0 }, /* Xc */ { NULL, 0 }, /* Xo */ { NULL, 0 }, /* Fo */ @@ -185,10 +185,10 @@ const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { NULL, 0 }, /* Oc */ { NULL, 0 }, /* Bk */ { NULL, 0 }, /* Ek */ - { NULL, 0 }, /* Bt */ - { NULL, 0 }, /* Hf */ - { NULL, 0 }, /* Fr */ - { NULL, 0 }, /* Ud */ + { macro_constant, 0 }, /* Bt */ + { macro_constant, 0 }, /* Hf */ + { macro_obsolete, 0 }, /* Fr */ + { macro_constant, 0 }, /* Ud */ }; const char * const *mdoc_macronames = __mdoc_macronames; @@ -196,9 +196,6 @@ const char * const *mdoc_argnames = __mdoc_argnames; const struct mdoc_macro * const mdoc_macros = __mdoc_macros; -static void *xcalloc(size_t, size_t); -static char *xstrdup(const char *); - static struct mdoc_arg *argdup(size_t, const struct mdoc_arg *); static void argfree(size_t, struct mdoc_arg *); static void argcpy(struct mdoc_arg *, @@ -228,7 +225,7 @@ mdoc_free(struct mdoc *mdoc) if (mdoc->first) mdoc_node_freelist(mdoc->first); if (mdoc->htab) - mdoc_hash_free(mdoc->htab); + mdoc_tokhash_free(mdoc->htab); free(mdoc); } @@ -244,42 +241,21 @@ mdoc_alloc(void *data, const struct mdoc_cb *cb) p->data = data; (void)memcpy(&p->cb, cb, sizeof(struct mdoc_cb)); - p->htab = mdoc_hash_alloc(); + p->htab = mdoc_tokhash_alloc(); return(p); } -static void * -xcalloc(size_t num, size_t sz) -{ - void *p; - - if (NULL == (p = calloc(num, sz))) - err(EXIT_FAILURE, "calloc"); - return(p); -} - - -static char * -xstrdup(const char *p) -{ - char *pp; - - if (NULL == (pp = strdup(p))) - err(EXIT_FAILURE, "strdup"); - return(pp); -} - - int mdoc_parseln(struct mdoc *mdoc, char *buf) { int c, i; char tmp[5]; - if ('.' != *buf) { - /* TODO. */ - return(1); + if ('.' != *buf) { + mdoc_word_alloc(mdoc, 0, buf); + mdoc->next = MDOC_NEXT_SIBLING; + return(1); } if (buf[1] && '\\' == buf[1]) @@ -351,6 +327,13 @@ int mdoc_macro(struct mdoc *mdoc, int tok, int ppos, int *pos, char *buf) { + if (MDOC_PROLOGUE & mdoc_macros[tok].flags && + SEC_PROLOGUE == mdoc->sec_lastn) + return(macro_prologue(mdoc, tok, ppos, pos, buf)); + + if (SEC_PROLOGUE == mdoc->sec_lastn) + return(mdoc_err(mdoc, tok, ppos, ERR_SEC_PROLOGUE)); + if (NULL == (mdoc_macros[tok].fp)) { (void)mdoc_err(mdoc, tok, ppos, ERR_MACRO_NOTSUP); return(0); @@ -372,7 +355,7 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md switch (p->type) { case (MDOC_TEXT): - nn = ""; + nn = p->data.text.string; nt = "text"; break; case (MDOC_BODY): @@ -430,70 +413,42 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md /* NOTREACHED */ } - switch (p->type) { - case (MDOC_BODY): - switch (mdoc->last->type) { - case (MDOC_BLOCK): - p->parent = mdoc->last; - mdoc->last->child = p; - act = "child"; - break; - case (MDOC_HEAD): - p->parent = mdoc->last->parent; - mdoc->last->next = p; - act = "sibling"; - break; - default: - abort(); - /* NOTREACHED */ - } + switch (mdoc->next) { + case (MDOC_NEXT_SIBLING): + mdoc->last->next = p; + p->prev = mdoc->last; + p->parent = mdoc->last->parent; + act = "sibling"; break; - case (MDOC_HEAD): - assert(mdoc->last->type == MDOC_BLOCK); - p->parent = mdoc->last; + case (MDOC_NEXT_CHILD): mdoc->last->child = p; + p->parent = mdoc->last; act = "child"; break; default: - switch (mdoc->last->type) { - case (MDOC_BODY): - /* FALLTHROUGH */ - case (MDOC_HEAD): - p->parent = mdoc->last->parent; - mdoc->last->child = p; - act = "child"; - break; - default: - p->parent = mdoc->last->parent; - mdoc->last->next = p; - act = "sibling"; - break; - } - break; + abort(); + /* NOTREACHED */ } - mdoc_msg(mdoc, pos, "parse: %s `%s' %s %s `%s'", + mdoc_msg(mdoc, pos, "parse: %s `%s' %s of %s `%s'", nt, nn, act, ot, on); + mdoc->last = p; } void -mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok, - size_t paramsz, const char **params) +mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok) { struct mdoc_node *p; assert(mdoc->first); assert(mdoc->last); - assert(mdoc->last->type == MDOC_BLOCK); - assert(mdoc->last->data.block.tok == tok); p = xcalloc(1, sizeof(struct mdoc_node)); + p->type = MDOC_HEAD; p->data.head.tok = tok; - p->data.head.sz = paramsz; - p->data.head.args = paramdup(paramsz, params); mdoc_node_append(mdoc, pos, p); } @@ -506,12 +461,6 @@ mdoc_body_alloc(struct mdoc *mdoc, int pos, int tok) assert(mdoc->first); assert(mdoc->last); - assert((mdoc->last->type == MDOC_BLOCK) || - (mdoc->last->type == MDOC_HEAD)); - if (mdoc->last->type == MDOC_BLOCK) - assert(mdoc->last->data.block.tok == tok); - else - assert(mdoc->last->data.head.tok == tok); p = xcalloc(1, sizeof(struct mdoc_node)); @@ -618,14 +567,6 @@ mdoc_text_free(struct mdoc_text *p) } -static void -mdoc_head_free(struct mdoc_head *p) -{ - - paramfree(p->sz, p->args); -} - - void mdoc_node_free(struct mdoc_node *p) { @@ -640,9 +581,6 @@ mdoc_node_free(struct mdoc_node *p) case (MDOC_BLOCK): mdoc_block_free(&p->data.block); break; - case (MDOC_HEAD): - mdoc_head_free(&p->data.head); - break; default: break; } @@ -668,7 +606,7 @@ int mdoc_find(const struct mdoc *mdoc, const char *key) { - return(mdoc_hash_find(mdoc->htab, key)); + return(mdoc_tokhash_find(mdoc->htab, key)); }