Correctly catch `Vt' semicolon in mandoc-db.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index e866d81db359dade9e788449d3e9852fb907c1d7..915648b4309f7d2f8cab909ad06b793ae3eb1fcb 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.51 2010/11/30 15:36:28 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.62 2011/04/19 16:38:48 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -23,7 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "man.h"
 #include "mandoc.h"
+#include "libmandoc.h"
 #include "libman.h"
 
 enum   rew {
@@ -36,6 +38,8 @@ static        int              blk_close(MACRO_PROT_ARGS);
 static int              blk_exp(MACRO_PROT_ARGS);
 static int              blk_imp(MACRO_PROT_ARGS);
 static int              in_line_eoln(MACRO_PROT_ARGS);
+static int              man_args(struct man *, int, 
+                               int *, char *, char **);
 
 static int              rew_scope(enum man_type, 
                                struct man *, enum mant);
@@ -43,7 +47,7 @@ static        enum rew         rew_dohalt(enum mant, enum man_type,
                                const struct man_node *);
 static enum rew         rew_block(enum mant, enum man_type, 
                                const struct man_node *);
-static int              rew_warn(struct man *, 
+static void             rew_warn(struct man *, 
                                struct man_node *, enum mandocerr);
 
 const  struct man_macro __man_macros[MAN_MAX] = {
@@ -69,21 +73,17 @@ const       struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, 0 }, /* IR */
        { in_line_eoln, 0 }, /* RI */
        { in_line_eoln, MAN_NSCOPED }, /* na */
-       { in_line_eoln, 0 }, /* i */
        { in_line_eoln, MAN_NSCOPED }, /* sp */
        { in_line_eoln, 0 }, /* nf */
        { in_line_eoln, 0 }, /* fi */
-       { in_line_eoln, 0 }, /* r */
        { blk_close, 0 }, /* RE */
        { blk_exp, MAN_EXPLICIT }, /* RS */
        { in_line_eoln, 0 }, /* DT */
        { in_line_eoln, 0 }, /* UC */
        { in_line_eoln, 0 }, /* PD */
-       { in_line_eoln, MAN_NSCOPED }, /* Sp */
-       { in_line_eoln, 0 }, /* Vb */
-       { in_line_eoln, 0 }, /* Ve */
        { in_line_eoln, 0 }, /* AT */
        { in_line_eoln, 0 }, /* in */
+       { in_line_eoln, 0 }, /* ft */
 };
 
 const  struct man_macro * const man_macros = __man_macros;
@@ -92,17 +92,19 @@ const       struct man_macro * const man_macros = __man_macros;
 /*
  * Warn when "n" is an explicit non-roff macro.
  */
-static int
+static void
 rew_warn(struct man *m, struct man_node *n, enum mandocerr er)
 {
 
        if (er == MANDOCERR_MAX || MAN_BLOCK != n->type)
-               return(1);
+               return;
        if (MAN_VALID & n->flags)
-               return(1);
+               return;
        if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
-               return(1);
-       return(man_nmsg(m, n, er));
+               return;
+
+       assert(er < MANDOCERR_FATAL);
+       man_nmsg(m, n, er);
 }
 
 
@@ -111,24 +113,30 @@ rew_warn(struct man *m, struct man_node *n, enum mandocerr er)
  * will be used if an explicit block scope is being closed out.
  */
 int
-man_unscope(struct man *m, const struct man_node *n, 
+man_unscope(struct man *m, const struct man_node *to, 
                enum mandocerr er)
 {
+       struct man_node *n;
 
-       assert(n);
+       assert(to);
 
        /* LINTED */
-       while (m->last != n) {
-               if ( ! rew_warn(m, m->last, er))
-                       return(0);
+       while (m->last != to) {
+               /*
+                * Save the parent here, because we may delete the
+                * m->last node in the post-validation phase and reset
+                * it to m->last->parent, causing a step in the closing
+                * out to be lost.
+                */
+               n = m->last->parent;
+               rew_warn(m, m->last, er);
                if ( ! man_valid_post(m))
                        return(0);
-               m->last = m->last->parent;
+               m->last = n;
                assert(m->last);
        }
 
-       if ( ! rew_warn(m, m->last, er))
-               return(0);
+       rew_warn(m, m->last, er);
        if ( ! man_valid_post(m))
                return(0);
 
@@ -275,8 +283,7 @@ blk_close(MACRO_PROT_ARGS)
                        break;
 
        if (NULL == nn)
-               if ( ! man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE))
-                       return(0);
+               man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE);
 
        if ( ! rew_scope(MAN_BODY, m, ntok))
                return(0);
@@ -291,7 +298,7 @@ blk_close(MACRO_PROT_ARGS)
 int
 blk_exp(MACRO_PROT_ARGS)
 {
-       int              w, la;
+       int              la;
        char            *p;
 
        /* 
@@ -312,13 +319,8 @@ blk_exp(MACRO_PROT_ARGS)
 
        for (;;) {
                la = *pos;
-               w = man_args(m, line, pos, buf, &p);
-
-               if (-1 == w)
-                       return(0);
-               if (0 == w)
+               if ( ! man_args(m, line, pos, buf, &p))
                        break;
-
                if ( ! man_word_alloc(m, line, la, p))
                        return(0);
        }
@@ -343,7 +345,7 @@ blk_exp(MACRO_PROT_ARGS)
 int
 blk_imp(MACRO_PROT_ARGS)
 {
-       int              w, la;
+       int              la;
        char            *p;
        struct man_node *n;
 
@@ -367,13 +369,8 @@ blk_imp(MACRO_PROT_ARGS)
 
        for (;;) {
                la = *pos;
-               w = man_args(m, line, pos, buf, &p);
-
-               if (-1 == w)
-                       return(0);
-               if (0 == w)
+               if ( ! man_args(m, line, pos, buf, &p))
                        break;
-
                if ( ! man_word_alloc(m, line, la, p))
                        return(0);
        }
@@ -401,7 +398,7 @@ blk_imp(MACRO_PROT_ARGS)
 int
 in_line_eoln(MACRO_PROT_ARGS)
 {
-       int              w, la;
+       int              la;
        char            *p;
        struct man_node *n;
 
@@ -412,11 +409,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 
        for (;;) {
                la = *pos;
-               w = man_args(m, line, pos, buf, &p);
-
-               if (-1 == w)
-                       return(0);
-               if (0 == w)
+               if ( ! man_args(m, line, pos, buf, &p))
                        break;
                if ( ! man_word_alloc(m, line, la, p))
                        return(0);
@@ -479,3 +472,18 @@ man_macroend(struct man *m)
        return(man_unscope(m, m->first, MANDOCERR_SCOPEEXIT));
 }
 
+static int
+man_args(struct man *m, int line, int *pos, char *buf, char **v)
+{
+       char     *start;
+
+       assert(*pos);
+       *v = start = buf + *pos;
+       assert(' ' != *start);
+
+       if ('\0' == *start)
+               return(0);
+
+       *v = mandoc_getarg(m->parse, v, line, pos);
+       return(1);
+}