Correctly catch `Vt' semicolon in mandoc-db.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index dbc4b4b032b6e15e4d255009b44b93a4bb32090f..915648b4309f7d2f8cab909ad06b793ae3eb1fcb 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.55 2011/01/12 16:55:22 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>
  *
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -23,7 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

+#include "man.h"

 #include "mandoc.h"
 #include "mandoc.h"

+#include "libmandoc.h"

 #include "libman.h"
 
 enum   rew {
 #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              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);
 
 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 *);
                                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] = {
                                struct man_node *, enum mandocerr);
 
 const  struct man_macro __man_macros[MAN_MAX] = {


@@ -88,17 +92,19 @@ const       struct man_macro * const man_macros = __man_macros;
 /*
  * Warn when "n" is an explicit non-roff macro.
  */
 /*
  * 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)
 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)
        if (MAN_VALID & n->flags)

-               return(1);
+               return;

        if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
        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);

 }
 
 
 }
 
 


@@ -123,16 +129,14 @@ man_unscope(struct man *m, const struct man_node *to,
                 * out to be lost.
                 */
                n = m->last->parent;
                 * out to be lost.
                 */
                n = m->last->parent;

-               if ( ! rew_warn(m, m->last, er))
-                       return(0);
+               rew_warn(m, m->last, er);

                if ( ! man_valid_post(m))
                        return(0);
                m->last = n;
                assert(m->last);
        }
 
                if ( ! man_valid_post(m))
                        return(0);
                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);
 
        if ( ! man_valid_post(m))
                return(0);
 


@@ -279,8 +283,7 @@ blk_close(MACRO_PROT_ARGS)
                        break;
 
        if (NULL == nn)
                        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);
 
        if ( ! rew_scope(MAN_BODY, m, ntok))
                return(0);


@@ -295,7 +298,7 @@ blk_close(MACRO_PROT_ARGS)
 int
 blk_exp(MACRO_PROT_ARGS)
 {
 int
 blk_exp(MACRO_PROT_ARGS)
 {

-       int              w, la;
+       int              la;

        char            *p;
 
        /* 
        char            *p;
 
        /* 


@@ -316,13 +319,8 @@ blk_exp(MACRO_PROT_ARGS)
 
        for (;;) {
                la = *pos;
 
        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;
                        break;

-

                if ( ! man_word_alloc(m, line, la, p))
                        return(0);
        }
                if ( ! man_word_alloc(m, line, la, p))
                        return(0);
        }


@@ -347,7 +345,7 @@ blk_exp(MACRO_PROT_ARGS)
 int
 blk_imp(MACRO_PROT_ARGS)
 {
 int
 blk_imp(MACRO_PROT_ARGS)
 {

-       int              w, la;
+       int              la;

        char            *p;
        struct man_node *n;
 
        char            *p;
        struct man_node *n;
 


@@ -371,13 +369,8 @@ blk_imp(MACRO_PROT_ARGS)
 
        for (;;) {
                la = *pos;
 
        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;
                        break;

-

                if ( ! man_word_alloc(m, line, la, p))
                        return(0);
        }
                if ( ! man_word_alloc(m, line, la, p))
                        return(0);
        }


@@ -405,7 +398,7 @@ blk_imp(MACRO_PROT_ARGS)
 int
 in_line_eoln(MACRO_PROT_ARGS)
 {
 int
 in_line_eoln(MACRO_PROT_ARGS)
 {

-       int              w, la;
+       int              la;

        char            *p;
        struct man_node *n;
 
        char            *p;
        struct man_node *n;
 


@@ -416,11 +409,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 
        for (;;) {
                la = *pos;
 
        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);
                        break;
                if ( ! man_word_alloc(m, line, la, p))
                        return(0);


@@ -483,3 +472,18 @@ man_macroend(struct man *m)
        return(man_unscope(m, m->first, MANDOCERR_SCOPEEXIT));
 }
 
        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);
+}