=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.10 retrieving revision 1.18 diff -u -p -r1.10 -r1.18 --- mandoc/mdoc.c 2008/12/29 19:25:29 1.10 +++ mandoc/mdoc.c 2009/01/05 17:57:08 1.18 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.10 2008/12/29 19:25:29 kristaps Exp $ */ +/* $Id: mdoc.c,v 1.18 2009/01/05 17:57:08 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -80,114 +80,115 @@ const char *const __mdoc_argnames[MDOC_ARG_MAX] = { "xsh5", "xns5", "xns5.2d2.0", "xcurses4.2", "susv2", "susv3", "svid4", "filled", "words", + "emphasis", "symbolic", }; const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { { NULL, 0 }, /* \" */ - { macro_prologue_ddate, 0 }, /* Dd */ - { macro_prologue_dtitle, 0 }, /* Dt */ - { macro_prologue_os, 0 }, /* Os */ - { macro_scoped_implicit, 0 }, /* Sh */ - { macro_scoped_implicit, 0 }, /* Ss */ + { macro_prologue, MDOC_PROLOGUE }, /* Dd */ + { macro_prologue, MDOC_PROLOGUE }, /* Dt */ + { macro_prologue, 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_explicit, MDOC_EXPLICIT }, /* Bd */ - { macro_scoped_explicit, 0 }, /* Ed */ - { macro_scoped_explicit, MDOC_EXPLICIT }, /* Bl */ - { macro_scoped_explicit, 0 }, /* El */ - { NULL, 0 }, /* It */ + { macro_scoped, MDOC_EXPLICIT }, /* Bd */ + { macro_close_explicit, 0 }, /* Ed */ + { macro_scoped, MDOC_EXPLICIT }, /* Bl */ + { macro_close_explicit, 0 }, /* El */ + { macro_scoped, MDOC_NESTED }, /* It */ { macro_text, MDOC_CALLABLE }, /* Ad */ - { NULL, 0 }, /* An */ + { macro_constant, 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_text, MDOC_CALLABLE }, /* Fa */ - { NULL, 0 }, /* Fd */ + { macro_constant, 0 }, /* Ex */ + { macro_text, MDOC_CALLABLE | MDOC_QUOTABLE }, /* Fa */ + { 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 */ { macro_constant, 0 }, /* Nd */ - { NULL, 0 }, /* Nm */ - { NULL, 0 }, /* Op */ - { NULL, 0 }, /* Ot */ + { macro_text, MDOC_CALLABLE }, /* Nm */ + { 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 */ - { NULL, 0 }, /* Ac */ - { NULL, 0 }, /* Ao */ - { macro_scoped_pline, MDOC_CALLABLE }, /* Aq */ + { 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 */ + { macro_close_explicit, MDOC_CALLABLE }, /* Ac */ + { macro_constant_scoped, MDOC_CALLABLE }, /* Ao */ + { macro_scoped_line, MDOC_CALLABLE }, /* Aq */ { macro_constant, 0 }, /* At */ - { NULL, 0 }, /* Bc */ - { NULL, 0 }, /* Bf */ - { NULL, 0 }, /* Bo */ - { macro_scoped_pline, MDOC_CALLABLE }, /* Bq */ + { macro_close_explicit, MDOC_CALLABLE }, /* Bc */ + { macro_scoped, MDOC_EXPLICIT }, /* Bf */ + { macro_constant_scoped, MDOC_CALLABLE }, /* Bo */ + { macro_scoped_line, MDOC_CALLABLE }, /* Bq */ { macro_constant_delimited, 0 }, /* Bsx */ { macro_constant_delimited, 0 }, /* Bx */ - { NULL, 0 }, /* Db */ - { NULL, 0 }, /* Dc */ - { NULL, 0 }, /* Do */ - { macro_scoped_pline, MDOC_CALLABLE }, /* Dq */ - { NULL, 0 }, /* Ec */ - { NULL, 0 }, /* Ef */ + { macro_constant, 0 }, /* Db */ + { macro_close_explicit, MDOC_CALLABLE }, /* Dc */ + { macro_constant_scoped, MDOC_CALLABLE }, /* Do */ + { macro_scoped_line, MDOC_CALLABLE }, /* Dq */ + { macro_close_explicit, MDOC_CALLABLE }, /* Ec */ + { macro_close_explicit, 0 }, /* Ef */ { macro_text, MDOC_CALLABLE }, /* Em */ - { NULL, 0 }, /* Eo */ + { macro_constant_scoped, MDOC_CALLABLE }, /* Eo */ { macro_constant_delimited, 0 }, /* Fx */ { macro_text, 0 }, /* Ms */ - { NULL, 0 }, /* No */ - { NULL, 0 }, /* Ns */ + { 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 */ - { macro_scoped_pline, MDOC_CALLABLE }, /* Pq */ - { NULL, 0 }, /* Qc */ - { macro_scoped_pline, MDOC_CALLABLE }, /* Ql */ - { NULL, 0 }, /* Qo */ - { macro_scoped_pline, MDOC_CALLABLE }, /* Qq */ - { NULL, 0 }, /* Re */ - { NULL, 0 }, /* Rs */ - { NULL, 0 }, /* Sc */ - { NULL, 0 }, /* So */ - { macro_scoped_pline, MDOC_CALLABLE }, /* Sq */ - { NULL, 0 }, /* Sm */ + { macro_close_explicit, MDOC_CALLABLE }, /* Pc */ + { macro_constant, 0 }, /* Pf */ + { macro_constant_scoped, MDOC_CALLABLE }, /* Po */ + { macro_scoped_line, MDOC_CALLABLE }, /* Pq */ + { macro_close_explicit, MDOC_CALLABLE }, /* Qc */ + { macro_scoped_line, MDOC_CALLABLE }, /* Ql */ + { macro_constant_scoped, MDOC_CALLABLE }, /* Qo */ + { macro_scoped_line, MDOC_CALLABLE }, /* Qq */ + { macro_close_explicit, 0 }, /* Re */ + { macro_scoped, MDOC_EXPLICIT }, /* Rs */ + { macro_close_explicit, MDOC_CALLABLE }, /* Sc */ + { macro_constant_scoped, MDOC_CALLABLE }, /* So */ + { 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 */ { macro_constant_delimited, 0 }, /* Ux */ - { NULL, 0 }, /* Xc */ - { NULL, 0 }, /* Xo */ - { NULL, 0 }, /* Fo */ - { NULL, 0 }, /* Fc */ - { NULL, 0 }, /* Oo */ - { NULL, 0 }, /* Oc */ - { NULL, 0 }, /* Bk */ - { NULL, 0 }, /* Ek */ + { macro_close_explicit, MDOC_CALLABLE }, /* Xc */ + { macro_constant_scoped, MDOC_CALLABLE }, /* Xo */ + { macro_scoped, MDOC_EXPLICIT }, /* Fo */ /* XXX - supposed to be (but isn't) callable. */ + { macro_close_explicit, 0 }, /* Fc */ /* XXX - supposed to be (but isn't) callable. */ + { macro_constant_scoped, MDOC_CALLABLE }, /* Oo */ + { macro_close_explicit, MDOC_CALLABLE }, /* Oc */ + { macro_scoped, MDOC_EXPLICIT }, /* Bk */ + { macro_close_explicit, 0 }, /* Ek */ { macro_constant, 0 }, /* Bt */ { macro_constant, 0 }, /* Hf */ - { NULL, 0 }, /* Fr */ + { macro_obsolete, 0 }, /* Fr */ { macro_constant, 0 }, /* Ud */ }; @@ -200,8 +201,6 @@ static struct mdoc_arg *argdup(size_t, const struct m static void argfree(size_t, struct mdoc_arg *); static void argcpy(struct mdoc_arg *, const struct mdoc_arg *); -static char **paramdup(size_t, const char **); -static void paramfree(size_t, char **); static void mdoc_node_freelist(struct mdoc_node *); static void mdoc_node_append(struct mdoc *, int, @@ -253,7 +252,10 @@ mdoc_parseln(struct mdoc *mdoc, char *buf) char tmp[5]; if ('.' != *buf) { + if (SEC_PROLOGUE == mdoc->sec_lastn) + return(mdoc_err(mdoc, -1, 0, ERR_SYNTAX_NOTEXT)); mdoc_word_alloc(mdoc, 0, buf); + mdoc->next = MDOC_NEXT_SIBLING; return(1); } @@ -326,6 +328,10 @@ 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(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); @@ -336,8 +342,6 @@ mdoc_macro(struct mdoc *mdoc, int tok, int ppos, int * return(0); } - /*mdoc_msg(mdoc, ppos, "calling `%s'", mdoc_macronames[tok]);*/ - return((*mdoc_macros[tok].fp)(mdoc, tok, ppos, pos, buf)); } @@ -364,6 +368,10 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md nn = mdoc_macronames[p->data.head.tok]; nt = "head"; break; + case (MDOC_TAIL): + nn = mdoc_macronames[p->data.tail.tok]; + nt = "tail"; + break; case (MDOC_BLOCK): nn = mdoc_macronames[p->data.block.tok]; nt = "block"; @@ -398,6 +406,10 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md on = mdoc_macronames[mdoc->last->data.head.tok]; ot = "head"; break; + case (MDOC_TAIL): + on = mdoc_macronames[mdoc->last->data.tail.tok]; + ot = "tail"; + break; case (MDOC_BLOCK): on = mdoc_macronames[mdoc->last->data.block.tok]; ot = "block"; @@ -407,63 +419,59 @@ mdoc_node_append(struct mdoc *mdoc, int pos, struct md /* NOTREACHED */ } - switch (p->type) { - case (MDOC_BODY): - p->parent = mdoc->last->parent; + 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; - mdoc->last->child = p; - act = "child"; - break; - default: - p->parent = mdoc->last->parent; - p->prev = mdoc->last; - 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; } -/* FIXME: deprecate paramsz, params. */ void -mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok, - size_t paramsz, const char **params) +mdoc_tail_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_TAIL; + p->data.tail.tok = tok; + + mdoc_node_append(mdoc, pos, p); +} + + +void +mdoc_head_alloc(struct mdoc *mdoc, int pos, int tok) +{ + struct mdoc_node *p; + + assert(mdoc->first); + assert(mdoc->last); + + 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); } @@ -476,12 +484,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)); @@ -511,16 +513,13 @@ mdoc_block_alloc(struct mdoc *mdoc, int pos, int tok, void mdoc_elem_alloc(struct mdoc *mdoc, int pos, int tok, - size_t argsz, const struct mdoc_arg *args, - size_t paramsz, const char **params) + size_t argsz, const struct mdoc_arg *args) { struct mdoc_node *p; p = xcalloc(1, sizeof(struct mdoc_node)); p->type = MDOC_ELEM; p->data.elem.tok = tok; - p->data.elem.sz = paramsz; - p->data.elem.args = paramdup(paramsz, params); p->data.elem.argc = argsz; p->data.elem.argv = argdup(argsz, args); @@ -566,7 +565,6 @@ static void mdoc_elem_free(struct mdoc_elem *p) { - paramfree(p->sz, p->args); argfree(p->argc, p->argv); } @@ -588,14 +586,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) { @@ -610,9 +600,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; } @@ -672,35 +659,3 @@ argdup(size_t argsz, const struct mdoc_arg *args) return(pp); } - -static void -paramfree(size_t sz, char **p) -{ - int i; - - if (0 == sz) - return; - - assert(p); - /* LINTED */ - for (i = 0; i < (int)sz; i++) - free(p[i]); - free(p); -} - - -static char ** -paramdup(size_t sz, const char **p) -{ - char **pp; - int i; - - if (0 == sz) - return(NULL); - - pp = xcalloc(sz, sizeof(char *)); - for (i = 0; i < (int)sz; i++) - pp[i] = xstrdup(p[i]); - - return(pp); -}