=================================================================== RCS file: /cvs/mandoc/mdoc.c,v retrieving revision 1.230 retrieving revision 1.236 diff -u -p -r1.230 -r1.236 --- mandoc/mdoc.c 2014/11/28 01:05:43 1.230 +++ mandoc/mdoc.c 2015/02/05 00:14:13 1.236 @@ -1,4 +1,4 @@ -/* $Id: mdoc.c,v 1.230 2014/11/28 01:05:43 schwarze Exp $ */ +/* $Id: mdoc.c,v 1.236 2015/02/05 00:14:13 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze @@ -190,14 +190,14 @@ mdoc_alloc(struct roff *roff, struct mparse *parse, return(p); } -int +void mdoc_endparse(struct mdoc *mdoc) { - return(mdoc_macroend(mdoc)); + mdoc_macroend(mdoc); } -int +void mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) { struct mdoc_node *n; @@ -208,10 +208,9 @@ mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep) n->flags |= MDOC_LINE; node_append(mdoc, n); mdoc->next = MDOC_NEXT_SIBLING; - return(1); } -int +void mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp) { struct mdoc_node *n; @@ -220,7 +219,6 @@ mdoc_addspan(struct mdoc *mdoc, const struct tbl_span n->span = sp; node_append(mdoc, n); mdoc->next = MDOC_NEXT_SIBLING; - return(1); } /* @@ -250,7 +248,7 @@ mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int mdoc_ptext(mdoc, ln, buf, offs)); } -int +void mdoc_macro(MACRO_PROT_ARGS) { assert(tok < MDOC_MAX); @@ -260,7 +258,7 @@ mdoc_macro(MACRO_PROT_ARGS) mandoc_vmsg(MANDOCERR_DT_LATE, mdoc->parse, line, ppos, "Dt %s", buf + *pos); - return(1); + return; } } else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) { if (mdoc->meta.title == NULL) { @@ -273,8 +271,7 @@ mdoc_macro(MACRO_PROT_ARGS) mdoc->meta.vol = mandoc_strdup("LOCAL"); mdoc->flags |= MDOC_PBODY; } - - return((*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf)); + (*mdoc_macros[tok].fp)(mdoc, tok, line, ppos, pos, buf); } @@ -366,7 +363,6 @@ node_alloc(struct mdoc *mdoc, int line, int pos, p->sec = mdoc->lastsec; p->line = line; p->pos = pos; - p->lastline = line; p->tok = tok; p->type = type; @@ -383,7 +379,7 @@ node_alloc(struct mdoc *mdoc, int line, int pos, return(p); } -int +void mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) { struct mdoc_node *p; @@ -391,24 +387,22 @@ mdoc_tail_alloc(struct mdoc *mdoc, int line, int pos, p = node_alloc(mdoc, line, pos, tok, MDOC_TAIL); node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); } -int +struct mdoc_node * mdoc_head_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) { struct mdoc_node *p; assert(mdoc->first); assert(mdoc->last); - p = node_alloc(mdoc, line, pos, tok, MDOC_HEAD); node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); + return(p); } -int +struct mdoc_node * mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok) { struct mdoc_node *p; @@ -416,10 +410,10 @@ mdoc_body_alloc(struct mdoc *mdoc, int line, int pos, p = node_alloc(mdoc, line, pos, tok, MDOC_BODY); node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); + return(p); } -int +struct mdoc_node * mdoc_endbody_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_node *body, enum mdoc_endbody end) { @@ -431,10 +425,10 @@ mdoc_endbody_alloc(struct mdoc *mdoc, int line, int po p->end = end; node_append(mdoc, p); mdoc->next = MDOC_NEXT_SIBLING; - return(1); + return(p); } -int +struct mdoc_node * mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_arg *args) { @@ -462,10 +456,10 @@ mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, } node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); + return(p); } -int +void mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, enum mdoct tok, struct mdoc_arg *args) { @@ -485,10 +479,9 @@ mdoc_elem_alloc(struct mdoc *mdoc, int line, int pos, } node_append(mdoc, p); mdoc->next = MDOC_NEXT_CHILD; - return(1); } -int +void mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, const char *p) { struct mdoc_node *n; @@ -497,7 +490,6 @@ mdoc_word_alloc(struct mdoc *mdoc, int line, int pos, n->string = roff_strdup(mdoc->roff, p); node_append(mdoc, n); mdoc->next = MDOC_NEXT_SIBLING; - return(1); } void @@ -579,13 +571,12 @@ mdoc_node_delete(struct mdoc *mdoc, struct mdoc_node * mdoc_node_free(p); } -int +void mdoc_node_relink(struct mdoc *mdoc, struct mdoc_node *p) { mdoc_node_unlink(mdoc, p); node_append(mdoc, p); - return(1); } /* @@ -612,7 +603,8 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int LIST_column == n->norm->Bl.type) { /* `Bl' is open without any children. */ mdoc->flags |= MDOC_FREECOL; - return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); + mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); + return(1); } if (MDOC_It == n->tok && MDOC_BLOCK == n->type && @@ -621,7 +613,8 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int LIST_column == n->parent->norm->Bl.type) { /* `Bl' has block-level `It' children. */ mdoc->flags |= MDOC_FREECOL; - return(mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf)); + mdoc_macro(mdoc, MDOC_It, line, offs, &offs, buf); + return(1); } /* @@ -669,7 +662,7 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, line, (int)(ws-buf), NULL); - if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) { + if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) { mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse, line, (int)(c - buf), NULL); @@ -678,19 +671,15 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int * blank lines aren't allowed, but enough manuals assume this * behaviour that we want to work around it. */ - if ( ! mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL)) - return(0); - + mdoc_elem_alloc(mdoc, line, offs, MDOC_sp, NULL); mdoc->next = MDOC_NEXT_SIBLING; - mdoc_valid_post(mdoc); return(1); } - if ( ! mdoc_word_alloc(mdoc, line, offs, buf+offs)) - return(0); + mdoc_word_alloc(mdoc, line, offs, buf+offs); - if (MDOC_LITERAL & mdoc->flags) + if (mdoc->flags & MDOC_LITERAL) return(1); /* @@ -703,7 +692,6 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int if (mandoc_eos(buf+offs, (size_t)(end-buf-offs))) mdoc->last->flags |= MDOC_EOS; - return(1); } @@ -775,8 +763,10 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int * into macro processing. */ - if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) - return(mdoc_macro(mdoc, tok, ln, sv, &offs, buf)); + if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) { + mdoc_macro(mdoc, tok, ln, sv, &offs, buf); + return(1); + } n = mdoc->last; assert(mdoc->last); @@ -789,7 +779,8 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int if (MDOC_Bl == n->tok && MDOC_BODY == n->type && LIST_column == n->norm->Bl.type) { mdoc->flags |= MDOC_FREECOL; - return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)); + mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); + return(1); } /* @@ -803,13 +794,13 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int MDOC_Bl == n->parent->tok && LIST_column == n->parent->norm->Bl.type) { mdoc->flags |= MDOC_FREECOL; - return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf)); + mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf); + return(1); } /* Normal processing of a macro. */ - if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf)) - return(0); + mdoc_macro(mdoc, tok, ln, sv, &offs, buf); /* In quick mode (for mandocdb), abort after the NAME section. */