typo; noticed by jmc@ some time ago

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index dcf403581d2aeeee651d574e47e3d364b7a4000c..f9905d49ecbdcdf6d0e5a99974316b6daf0cdd2f 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.218 2014/07/06 19:09:00 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.224 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,9 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <sys/types.h>
 
@@ -104,7 +102,6 @@ const struct mdoc_node *
 mdoc_node(const struct mdoc *mdoc)
 {
 
-       assert( ! (MDOC_HALT & mdoc->flags));
        return(mdoc->first);
 }
 
@@ -112,7 +109,6 @@ const struct mdoc_meta *
 mdoc_meta(const struct mdoc *mdoc)
 {
 
-       assert( ! (MDOC_HALT & mdoc->flags));
        return(&mdoc->meta);
 }
 
@@ -125,20 +121,13 @@ mdoc_free1(struct mdoc *mdoc)
 
        if (mdoc->first)
                mdoc_node_delete(mdoc, mdoc->first);
-       if (mdoc->meta.title)
-               free(mdoc->meta.title);
-       if (mdoc->meta.os)
-               free(mdoc->meta.os);
-       if (mdoc->meta.name)
-               free(mdoc->meta.name);
-       if (mdoc->meta.arch)
-               free(mdoc->meta.arch);
-       if (mdoc->meta.vol)
-               free(mdoc->meta.vol);
-       if (mdoc->meta.msec)
-               free(mdoc->meta.msec);
-       if (mdoc->meta.date)
-               free(mdoc->meta.date);
+       free(mdoc->meta.msec);
+       free(mdoc->meta.vol);
+       free(mdoc->meta.arch);
+       free(mdoc->meta.date);
+       free(mdoc->meta.title);
+       free(mdoc->meta.os);
+       free(mdoc->meta.name);
 }
 
 /*
@@ -189,7 +178,7 @@ mdoc_free(struct mdoc *mdoc)
  */
 struct mdoc *
 mdoc_alloc(struct roff *roff, struct mparse *parse,
-       char *defos, int quick)
+       const char *defos, int quick)
 {
        struct mdoc     *p;
 
@@ -205,19 +194,11 @@ mdoc_alloc(struct roff *roff, struct mparse *parse,
        return(p);
 }
 
-/*
- * Climb back up the parse tree, validating open scopes.  Mostly calls
- * through to macro_end() in macro.c.
- */
 int
 mdoc_endparse(struct mdoc *mdoc)
 {
 
-       assert( ! (MDOC_HALT & mdoc->flags));
-       if (mdoc_macroend(mdoc))
-               return(1);
-       mdoc->flags |= MDOC_HALT;
-       return(0);
+       return(mdoc_macroend(mdoc));
 }
 
 int
@@ -225,15 +206,6 @@ mdoc_addeqn(struct mdoc *mdoc, const struct eqn *ep)
 {
        struct mdoc_node *n;
 
-       assert( ! (MDOC_HALT & mdoc->flags));
-
-       /* No text before an initial macro. */
-
-       if (SEC_NONE == mdoc->lastnamed) {
-               mdoc_pmsg(mdoc, ep->ln, ep->pos, MANDOCERR_NOTEXT);
-               return(1);
-       }
-
        n = node_alloc(mdoc, ep->ln, ep->pos, MDOC_MAX, MDOC_EQN);
        n->eqn = ep;
 
@@ -249,15 +221,6 @@ mdoc_addspan(struct mdoc *mdoc, const struct tbl_span *sp)
 {
        struct mdoc_node *n;
 
-       assert( ! (MDOC_HALT & mdoc->flags));
-
-       /* No text before an initial macro. */
-
-       if (SEC_NONE == mdoc->lastnamed) {
-               mdoc_pmsg(mdoc, sp->line, 0, MANDOCERR_NOTEXT);
-               return(1);
-       }
-
        n = node_alloc(mdoc, sp->line, 0, MDOC_MAX, MDOC_TBL);
        n->span = sp;
 
@@ -276,8 +239,6 @@ int
 mdoc_parseln(struct mdoc *mdoc, int ln, char *buf, int offs)
 {
 
-       assert( ! (MDOC_HALT & mdoc->flags));
-
        mdoc->flags |= MDOC_NEWLINE;
 
        /*
@@ -301,32 +262,22 @@ mdoc_macro(MACRO_PROT_ARGS)
 {
        assert(tok < MDOC_MAX);
 
-       /* If we're in the body, deny prologue calls. */
-
-       if (MDOC_PROLOGUE & mdoc_macros[tok].flags &&
-           MDOC_PBODY & mdoc->flags) {
-               mandoc_vmsg(MANDOCERR_PROLOG_ONLY, mdoc->parse,
-                   line, ppos, "%s", mdoc_macronames[tok]);
-               return(1);
-       }
-
-       /* If we're in the prologue, deny "body" macros.  */
-
-       if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&
-            ! (MDOC_PBODY & mdoc->flags)) {
-               mandoc_vmsg(MANDOCERR_PROLOG_BAD, mdoc->parse,
-                   line, ppos, "%s", mdoc_macronames[tok]);
-               if (NULL == mdoc->meta.msec)
-                       mdoc->meta.msec = mandoc_strdup("1");
-               if (NULL == mdoc->meta.title)
-                       mdoc->meta.title = mandoc_strdup("UNKNOWN");
+       if (mdoc->flags & MDOC_PBODY) {
+               if (tok == MDOC_Dt) {
+                       mandoc_vmsg(MANDOCERR_DT_LATE,
+                           mdoc->parse, line, ppos,
+                           "Dt %s", buf + *pos);
+                       return(1);
+               }
+       } else if ( ! (mdoc_macros[tok].flags & MDOC_PROLOGUE)) {
+               if (mdoc->meta.title == NULL) {
+                       mandoc_vmsg(MANDOCERR_DT_NOTITLE,
+                           mdoc->parse, line, ppos, "%s %s",
+                           mdoc_macronames[tok], buf + *pos);
+                       mdoc->meta.title = mandoc_strdup("UNTITLED");
+               }
                if (NULL == mdoc->meta.vol)
                        mdoc->meta.vol = mandoc_strdup("LOCAL");
-               if (NULL == mdoc->meta.os)
-                       mdoc->meta.os = mandoc_strdup("LOCAL");
-               if (NULL == mdoc->meta.date)
-                       mdoc->meta.date = mandoc_normdate
-                               (mdoc->parse, NULL, line, ppos);
                mdoc->flags |= MDOC_PBODY;
        }
 
@@ -722,13 +673,6 @@ mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int offs)
        char             *c, *ws, *end;
        struct mdoc_node *n;
 
-       /* No text before an initial macro. */
-
-       if (SEC_NONE == mdoc->lastnamed) {
-               mdoc_pmsg(mdoc, line, offs, MANDOCERR_NOTEXT);
-               return(1);
-       }
-
        assert(mdoc->last);
        n = mdoc->last;
 
@@ -875,8 +819,8 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
        tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
 
        if (MDOC_MAX == tok) {
-               mandoc_vmsg(MANDOCERR_MACRO, mdoc->parse,
-                   ln, sv, "%s", buf + sv - 1);
+               mandoc_msg(MANDOCERR_MACRO, mdoc->parse,
+                   ln, sv, buf + sv - 1);
                return(1);
        }
 
@@ -904,11 +848,8 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
         * into macro processing.
         */
 
-       if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok) {
-               if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf))
-                       goto err;
-               return(1);
-       }
+       if (NULL == mdoc->last || MDOC_It == tok || MDOC_El == tok)
+               return(mdoc_macro(mdoc, tok, ln, sv, &offs, buf));
 
        n = mdoc->last;
        assert(mdoc->last);
@@ -921,9 +862,7 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
            LIST_column == n->norm->Bl.type) {
                mdoc->flags |= MDOC_FREECOL;
-               if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf))
-                       goto err;
-               return(1);
+               return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf));
        }
 
        /*
@@ -937,15 +876,13 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
            MDOC_Bl == n->parent->tok &&
            LIST_column == n->parent->norm->Bl.type) {
                mdoc->flags |= MDOC_FREECOL;
-               if ( ! mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf))
-                       goto err;
-               return(1);
+               return(mdoc_macro(mdoc, MDOC_It, ln, sv, &sv, buf));
        }
 
        /* Normal processing of a macro. */
 
        if ( ! mdoc_macro(mdoc, tok, ln, sv, &offs, buf))
-               goto err;
+               return(0);
 
        /* In quick mode (for mandocdb), abort after the NAME section. */
 
@@ -954,11 +891,6 @@ mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int offs)
                return(2);
 
        return(1);
-
-err:   /* Error out. */
-
-       mdoc->flags |= MDOC_HALT;
-       return(0);
 }
 
 enum mdelim