Correctly catch `Vt' semicolon in mandoc-db.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 27213c3609ab224774e812e460284178ec4a5e50..915648b4309f7d2f8cab909ad06b793ae3eb1fcb 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,6 +1,6 @@
-/*     $Id: man_macro.c,v 1.45 2010/05/17 10:50:32 joerg Exp $ */
+/*     $Id: man_macro.c,v 1.62 2011/04/19 16:38:48 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


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

+#include "man.h"
+#include "mandoc.h"
+#include "libmandoc.h"

 #include "libman.h"
 
 enum   rew {
 #include "libman.h"
 
 enum   rew {


@@ -35,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);


@@ -42,8 +47,8 @@ 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 *, 
-                               struct man_node *, enum merr);
+static void             rew_warn(struct man *, 
+                               struct man_node *, enum mandocerr);

 
 const  struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, MAN_NSCOPED }, /* br */
 
 const  struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, MAN_NSCOPED }, /* br */


@@ -68,20 +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 }, /* 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, 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 */
        { 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 }, /* AT */

+       { in_line_eoln, 0 }, /* in */
+       { in_line_eoln, 0 }, /* ft */

 };
 
 const  struct man_macro * const man_macros = __man_macros;
 };
 
 const  struct man_macro * const man_macros = __man_macros;


@@ -90,48 +92,53 @@ 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
-rew_warn(struct man *m, struct man_node *n, enum merr er)
+static void
+rew_warn(struct man *m, struct man_node *n, enum mandocerr er)

 {
 
 {
 

-       if (er == WERRMAX || MAN_BLOCK != n->type)
-               return(1);
+       if (er == MANDOCERR_MAX || MAN_BLOCK != n->type)
+               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_nwarn(m, n, er));
+               return;
+
+       assert(er < MANDOCERR_FATAL);
+       man_nmsg(m, n, er);

 }
 
 
 /*
 }
 
 
 /*

- * Rewind scope.  If a code "er" != WERRMAX has been provided, it will
- * be used if an explicit block scope is being closed out.
+ * Rewind scope.  If a code "er" != MANDOCERR_MAX has been provided, it
+ * will be used if an explicit block scope is being closed out.

  */
 int
  */
 int

-man_unscope(struct man *m, const struct man_node *n, enum merr er)
+man_unscope(struct man *m, const struct man_node *to, 
+               enum mandocerr er)

 {
 {

+       struct man_node *n;

 
 

-       assert(n);
+       assert(to);

 
        /* LINTED */
 
        /* 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);
                if ( ! man_valid_post(m))
                        return(0);

-               if ( ! man_action_post(m))
-                       return(0);
-               m->last = m->last->parent;
+               m->last = n;

                assert(m->last);
        }
 
                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);

-       if ( ! man_action_post(m))
-               return(0);

 
        m->next = MAN_ROOT == m->last->type ? 
                MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
 
        m->next = MAN_ROOT == m->last->type ? 
                MAN_NEXT_CHILD : MAN_NEXT_SIBLING;


@@ -248,7 +255,7 @@ rew_scope(enum man_type type, struct man *m, enum mant tok)
         */
        assert(n);
 
         */
        assert(n);
 

-       return(man_unscope(m, n, WERRMAX));
+       return(man_unscope(m, n, MANDOCERR_MAX));

 }
 
 
 }
 
 


@@ -276,8 +283,7 @@ blk_close(MACRO_PROT_ARGS)
                        break;
 
        if (NULL == nn)
                        break;
 
        if (NULL == nn)

-               if ( ! man_pwarn(m, line, ppos, WNOSCOPE))
-                       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);


@@ -288,10 +294,11 @@ blk_close(MACRO_PROT_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */

 int
 blk_exp(MACRO_PROT_ARGS)
 {
 int
 blk_exp(MACRO_PROT_ARGS)
 {

-       int              w, la;
+       int              la;

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


@@ -312,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);
        }


@@ -339,10 +341,11 @@ blk_exp(MACRO_PROT_ARGS)
  * scopes, such as `SH' closing out an `SS', are defined in the rew
  * routines.
  */
  * scopes, such as `SH' closing out an `SS', are defined in the rew
  * routines.
  */

+/* ARGSUSED */

 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;
 


@@ -366,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);
        }


@@ -396,10 +394,11 @@ blk_imp(MACRO_PROT_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */

 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;
 


@@ -410,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);


@@ -452,8 +447,6 @@ in_line_eoln(MACRO_PROT_ARGS)
                        break;
                if ( ! man_valid_post(m))
                        return(0);
                        break;
                if ( ! man_valid_post(m))
                        return(0);

-               if ( ! man_action_post(m))
-                       return(0);

        }
 
        assert(m->last);
        }
 
        assert(m->last);


@@ -464,8 +457,6 @@ in_line_eoln(MACRO_PROT_ARGS)
 
        if (m->last->type != MAN_ROOT && ! man_valid_post(m))
                return(0);
 
        if (m->last->type != MAN_ROOT && ! man_valid_post(m))
                return(0);

-       if (m->last->type != MAN_ROOT && ! man_action_post(m))
-               return(0);

 
        m->next = MAN_ROOT == m->last->type ?
                MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
 
        m->next = MAN_ROOT == m->last->type ?
                MAN_NEXT_CHILD : MAN_NEXT_SIBLING;


@@ -478,6 +469,21 @@ int
 man_macroend(struct man *m)
 {
 
 man_macroend(struct man *m)
 {
 

-       return(man_unscope(m, m->first, WEXITSCOPE));
+       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);
+}