Revert IGNPAR to a warning after clue-stick applied by schwarze@:

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index d55b1120f0c2eb91d54a5dc7f3f93bc255cc7091..a2cd83f1b4ab7b9fc3900a78ee5c7589353b7d62 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.162 2010/08/08 14:51:32 schwarze Exp $ */
+/*     $Id: mdoc.c,v 1.171 2010/12/22 11:15:16 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -98,8 +98,6 @@ static        int               node_append(struct mdoc *,
                                struct mdoc_node *);
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);
-static int               macrowarn(struct mdoc *, int, 
-                               const char *, int);
 
 
 const struct mdoc_node *
@@ -191,8 +189,7 @@ mdoc_free(struct mdoc *mdoc)
  * Allocate volatile and non-volatile parse resources.  
  */
 struct mdoc *
-mdoc_alloc(struct regset *regs, void *data, 
-               int pflags, mandocmsg msg)
+mdoc_alloc(struct regset *regs, void *data, mandocmsg msg)
 {
        struct mdoc     *p;
 
@@ -200,7 +197,6 @@ mdoc_alloc(struct regset *regs, void *data,
 
        p->msg = msg;
        p->data = data;
-       p->pflags = pflags;
        p->regs = regs;
 
        mdoc_hash_init();
@@ -290,6 +286,8 @@ mdoc_macro(MACRO_PROT_ARGS)
                        ! (MDOC_PBODY & m->flags)) {
                if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG))
                        return(0);
+               if (NULL == m->meta.msec)
+                       m->meta.msec = mandoc_strdup("1");
                if (NULL == m->meta.title)
                        m->meta.title = mandoc_strdup("UNKNOWN");
                if (NULL == m->meta.vol)
@@ -332,8 +330,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
        if ( ! mdoc_valid_pre(mdoc, p))
                return(0);
-       if ( ! mdoc_action_pre(mdoc, p))
-               return(0);
 
        switch (p->type) {
        case (MDOC_HEAD):
@@ -360,8 +356,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        case (MDOC_TEXT):
                if ( ! mdoc_valid_post(mdoc))
                        return(0);
-               if ( ! mdoc_action_post(mdoc))
-                       return(0);
                break;
        default:
                break;
@@ -517,21 +511,8 @@ static void
 mdoc_node_free(struct mdoc_node *p)
 {
 
-       /*
-        * XXX: if these end up being problematic in terms of memory
-        * management and dereferencing freed blocks, then make them
-        * into reference-counted double-pointers.
-        */
-
-       if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)
-               if (p->data.Bd)
-                       free(p->data.Bd);
-       if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)
-               if (p->data.Bl)
-                       free(p->data.Bl);
-       if (MDOC_Bf == p->tok && MDOC_HEAD == p->type)
-               if (p->data.Bf)
-                       free(p->data.Bf);
+       if (p->norm && 0 == --(p->norm->refcnt))
+               free(p->norm);
 
        if (p->string)
                free(p->string);
@@ -558,6 +539,8 @@ mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)
                n->parent->nchild--;
                if (n->parent->child == n)
                        n->parent->child = n->prev ? n->prev : n->next;
+               if (n->parent->last == n)
+                       n->parent->last = n->prev ? n->prev : NULL;
        }
 
        /* Adjust parse point, if applicable. */
@@ -625,7 +608,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-                       LIST_column == n->data.Bl->type) {
+                       LIST_column == n->norm->d.Bl.type) {
                /* `Bl' is open without any children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -634,7 +617,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->data.Bl->type) {
+                       LIST_column == n->parent->norm->d.Bl.type) {
                /* `Bl' has block-level `It' children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
@@ -695,11 +678,11 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
                        return(0);
 
                /*
-                * Insert a `Pp' in the case of a blank line.  Technically,
+                * Insert a `sp' in the case of a blank line.  Technically,
                 * blank lines aren't allowed, but enough manuals assume this
                 * behaviour that we want to work around it.
                 */
-               if ( ! mdoc_elem_alloc(m, line, offs, MDOC_Pp, NULL))
+               if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL))
                        return(0);
 
                m->next = MDOC_NEXT_SIBLING;
@@ -727,21 +710,6 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
 }
 
 
-static int
-macrowarn(struct mdoc *m, int ln, const char *buf, int offs)
-{
-       int              rc;
-
-       rc = mdoc_vmsg(m, MANDOCERR_MACRO, ln, offs, 
-                       "unknown macro: %s%s", 
-                       buf, strlen(buf) > 3 ? "..." : "");
-
-       /* FIXME: logic should be in driver. */
-       /* FIXME: broken, will error out and not omit a message. */
-       return(MDOC_IGN_MACRO & m->pflags ? rc : 0);
-}
-
-
 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.
@@ -785,15 +753,9 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
                mac[j++] = buf[i++];
        mac[j] = '\0';
 
-       if (j == 4 || j < 2) {
-               if ( ! macrowarn(m, ln, mac, sv))
-                       goto err;
-               return(1);
-       } 
-       
-       if (MDOC_MAX == (tok = mdoc_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac, sv))
-                       goto err;
+       tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
+       if (MDOC_MAX == tok) {
+               mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1);
                return(1);
        }
 
@@ -836,7 +798,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
-                       LIST_column == n->data.Bl->type) {
+                       LIST_column == n->norm->d.Bl.type) {
                m->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf))
                        goto err;
@@ -852,7 +814,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&
-                       LIST_column == n->parent->data.Bl->type) {
+                       LIST_column == n->parent->norm->d.Bl.type) {
                m->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
                        goto err;