OpenBSD src/sbin was used as a tool to hunt bugs in mandoc.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 012d4163b536feeb14bbda882736fad4d1282250..d7b15131e14e6ef10e641aa3bf60beabb9f72610 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,6 +1,6 @@
-/*     $Id: man_macro.c,v 1.43 2010/05/15 20:51:40 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.50 2010/07/31 23:52:58 schwarze 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,7 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

+#include "mandoc.h"

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


@@ -32,7 +33,6 @@ enum  rew {
 };
 
 static int              blk_close(MACRO_PROT_ARGS);
 };
 
 static int              blk_close(MACRO_PROT_ARGS);

-static int              blk_dotted(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);


@@ -44,7 +44,7 @@ static        enum rew         rew_dohalt(enum mant, enum man_type,
 static enum rew         rew_block(enum mant, enum man_type, 
                                const struct man_node *);
 static int              rew_warn(struct man *, 
 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);
+                               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 */


@@ -82,11 +82,8 @@ const        struct man_macro __man_macros[MAN_MAX] = {
        { in_line_eoln, MAN_NSCOPED }, /* Sp */
        { in_line_eoln, 0 }, /* Vb */
        { in_line_eoln, 0 }, /* Ve */
        { in_line_eoln, MAN_NSCOPED }, /* Sp */
        { in_line_eoln, 0 }, /* Vb */
        { in_line_eoln, 0 }, /* Ve */

-       { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* de */
-       { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* dei */
-       { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* am */
-       { blk_exp, MAN_EXPLICIT | MAN_NOCLOSE}, /* ami */
-       { blk_dotted, 0 }, /* . */
+       { in_line_eoln, 0 }, /* AT */
+       { in_line_eoln, 0 }, /* in */

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


@@ -96,27 +93,26 @@ const       struct man_macro * const man_macros = __man_macros;
  * Warn when "n" is an explicit non-roff macro.
  */
 static int
  * Warn when "n" is an explicit non-roff macro.
  */
 static int

-rew_warn(struct man *m, struct man_node *n, enum merr er)
+rew_warn(struct man *m, struct man_node *n, enum mandocerr er)

 {
 
 {
 

-       if (er == WERRMAX || MAN_BLOCK != n->type)
+       if (er == MANDOCERR_MAX || MAN_BLOCK != n->type)

                return(1);
        if (MAN_VALID & n->flags)
                return(1);
        if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
                return(1);
                return(1);
        if (MAN_VALID & n->flags)
                return(1);
        if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags))
                return(1);

-       if (MAN_NOCLOSE & man_macros[n->tok].flags)
-               return(1);
-       return(man_nwarn(m, n, er));
+       return(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 *n, 
+               enum mandocerr er)

 {
 
        assert(n);
 {
 
        assert(n);


@@ -186,24 +182,6 @@ rew_dohalt(enum mant tok, enum man_type type, const struct man_node *n)
        if (type == n->type && tok == n->tok)
                return(REW_REWIND);
 
        if (type == n->type && tok == n->tok)
                return(REW_REWIND);
 

-       /*
-        * If we're a roff macro, then we can close out anything that
-        * stands between us and our parent context.
-        */
-       if (MAN_NOCLOSE & man_macros[tok].flags)
-               return(REW_NOHALT);
-
-       /* 
-        * Don't clobber roff macros: this is a bit complicated.  If the
-        * current macro is a roff macro, halt immediately and don't
-        * rewind.  If it's not, and the parent is, then close out the
-        * current scope and halt at the parent.
-        */
-       if (MAN_NOCLOSE & man_macros[n->tok].flags)
-               return(REW_HALT);
-       if (MAN_NOCLOSE & man_macros[n->parent->tok].flags)
-               return(REW_REWIND);
-

        /* 
         * Next follow the implicit scope-smashings as defined by man.7:
         * section, sub-section, etc.
        /* 
         * Next follow the implicit scope-smashings as defined by man.7:
         * section, sub-section, etc.


@@ -272,55 +250,8 @@ rew_scope(enum man_type type, struct man *m, enum mant tok)
         * instruction that's mowing over explicit scopes.
         */
        assert(n);
         * instruction that's mowing over explicit scopes.
         */
        assert(n);

-       if (MAN_NOCLOSE & man_macros[tok].flags)
-               return(man_unscope(m, n, WROFFSCOPE));
-
-       return(man_unscope(m, n, WERRMAX));
-}
-
-
-/*
- * Closure for dotted macros (de, dei, am, ami, ign).  This must handle
- * any of these as the parent node, so it needs special handling.
- * Beyond this, it's the same as blk_close().
- */
-/* ARGSUSED */
-int
-blk_dotted(MACRO_PROT_ARGS)
-{
-       enum mant        ntok;
-       struct man_node *nn;
-
-       /* Check for any of the following parents... */
-
-       for (nn = m->last->parent; nn; nn = nn->parent)
-               if (nn->tok == MAN_de || nn->tok == MAN_dei ||
-                               nn->tok == MAN_am ||
-                               nn->tok == MAN_ami) {
-                       ntok = nn->tok;
-                       break;
-               }

 
 

-       if (NULL == nn) {
-               if ( ! man_pwarn(m, line, ppos, WNOSCOPE))
-                       return(0);
-               return(1);
-       }
-
-       if ( ! rew_scope(MAN_BODY, m, ntok))
-               return(0);
-       if ( ! rew_scope(MAN_BLOCK, m, ntok))
-               return(0);
-
-       /*
-        * Restore flags set when we got here and also stipulate that we
-        * don't post-process the line when exiting the macro op
-        * function in man_pmacro().  See blk_exp().
-        */
-
-       m->flags = m->svflags | MAN_ILINE;
-       m->next = m->svnext;
-       return(1);
+       return(man_unscope(m, n, MANDOCERR_MAX));

 }
 
 
 }
 
 


@@ -348,7 +279,7 @@ blk_close(MACRO_PROT_ARGS)
                        break;
 
        if (NULL == nn)
                        break;
 
        if (NULL == nn)

-               if ( ! man_pwarn(m, line, ppos, WNOSCOPE))
+               if ( ! man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE))

                        return(0);
 
        if ( ! rew_scope(MAN_BODY, m, ntok))
                        return(0);
 
        if ( ! rew_scope(MAN_BODY, m, ntok))


@@ -360,6 +291,7 @@ blk_close(MACRO_PROT_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */

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


@@ -372,23 +304,10 @@ blk_exp(MACRO_PROT_ARGS)
         * anywhere.
         */
 
         * anywhere.
         */
 

-       if ( ! (MAN_NOCLOSE & man_macros[tok].flags)) {
-               if ( ! rew_scope(MAN_BODY, m, tok))
-                       return(0);
-               if ( ! rew_scope(MAN_BLOCK, m, tok))
-                       return(0);
-       } else {
-               /*
-                * Save our state and next-scope indicator; we restore
-                * it when exiting from the roff instruction block.  See
-                * blk_dotted().
-                */
-               m->svflags = m->flags;
-               m->svnext = m->next;
-               
-               /* Make sure we drop any line modes. */
-               m->flags = 0;
-       }
+       if ( ! rew_scope(MAN_BODY, m, tok))
+               return(0);
+       if ( ! rew_scope(MAN_BLOCK, m, tok))
+               return(0);

 
        if ( ! man_block_alloc(m, line, ppos, tok))
                return(0);
 
        if ( ! man_block_alloc(m, line, ppos, tok))
                return(0);


@@ -424,6 +343,7 @@ 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)
 {


@@ -481,6 +401,7 @@ blk_imp(MACRO_PROT_ARGS)
 }
 
 
 }
 
 

+/* ARGSUSED */

 int
 in_line_eoln(MACRO_PROT_ARGS)
 {
 int
 in_line_eoln(MACRO_PROT_ARGS)
 {


@@ -563,6 +484,6 @@ 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));

 }
 
 }