Some release notes (this isn't signalling an impending release; I just

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 02018389db70169eaba2435ce28bd1250974db03..e36138c830978084b07ca3c02da3fd34d205e149 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.133 2011/04/13 10:01:27 kristaps Exp $ */
+/*     $Id: roff.c,v 1.138 2011/05/14 16:06:08 kristaps Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,12 +20,9 @@
 #endif
 
 #include <assert.h>
-#include <errno.h>
 #include <ctype.h>
-#include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 #include "mandoc.h"
 #include "libroff.h"
@@ -206,7 +203,6 @@ static      void             roffnode_push(struct roff *, enum rofft,
                                const char *, int, int);
 static void             roffnode_pop(struct roff *);
 static enum rofft       roff_parse(struct roff *, const char *, int *);
-static int              roff_parse_nat(const char *, unsigned int *);
 
 /* See roff_hash_find() */
 #define        ROFF_HASH(p)    (p[0] - ASCII_LO)
@@ -277,10 +273,6 @@ roffnode_pop(struct roff *r)
        assert(r->last);
        p = r->last; 
 
-       if (ROFF_el == p->tok)
-               if (r->rstackpos > -1)
-                       r->rstackpos--;
-
        r->last = r->last->parent;
        free(p->name);
        free(p->end);
@@ -597,27 +589,6 @@ roff_parse(struct roff *r, const char *buf, int *pos)
        return(t);
 }
 
-
-static int
-roff_parse_nat(const char *buf, unsigned int *res)
-{
-       char            *ep;
-       long             lval;
-
-       errno = 0;
-       lval = strtol(buf, &ep, 10);
-       if (buf[0] == '\0' || *ep != '\0')
-               return(0);
-       if ((errno == ERANGE && 
-                       (lval == LONG_MAX || lval == LONG_MIN)) ||
-                       (lval > INT_MAX || lval < 0))
-               return(0);
-
-       *res = (unsigned int)lval;
-       return(1);
-}
-
-
 /* ARGSUSED */
 static enum rofferr
 roff_cblock(ROFF_ARGS)
@@ -833,8 +804,7 @@ roff_block_sub(ROFF_ARGS)
         * pulling it out of the hashtable.
         */
 
-       if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos)))
-               return(ROFF_IGN);
+       t = roff_parse(r, *bufp, &pos);
 
        /*
         * Macros other than block-end are only significant
@@ -976,29 +946,20 @@ roff_cond(ROFF_ARGS)
        int              sv;
        enum roffrule    rule;
 
-       /* Stack overflow! */
-
-       if (ROFF_ie == tok && r->rstackpos == RSTACK_MAX - 1) {
-               mandoc_msg(MANDOCERR_MEM, r->parse, ln, ppos, NULL);
-               return(ROFF_ERR);
-       }
-
-       /* First, evaluate the conditional. */
+       /* 
+        * An `.el' has no conditional body: it will consume the value
+        * of the current rstack entry set in prior `ie' calls or
+        * defaults to DENY.  
+        *
+        * If we're not an `el', however, then evaluate the conditional.
+        */
 
-       if (ROFF_el == tok) {
-               /* 
-                * An `.el' will get the value of the current rstack
-                * entry set in prior `ie' calls or defaults to DENY.
-                */
-               if (r->rstackpos < 0)
-                       rule = ROFFRULE_DENY;
-               else
-                       rule = r->rstack[r->rstackpos];
-       } else
-               rule = roff_evalcond(*bufp, &pos);
+       rule = ROFF_el == tok ?
+               (r->rstackpos < 0 ? 
+                ROFFRULE_DENY : r->rstack[r->rstackpos--]) :
+               roff_evalcond(*bufp, &pos);
 
        sv = pos;
-
        while (' ' == (*bufp)[pos])
                pos++;
 
@@ -1018,16 +979,20 @@ roff_cond(ROFF_ARGS)
 
        r->last->rule = rule;
 
+       /*
+        * An if-else will put the NEGATION of the current evaluated
+        * conditional into the stack of rules.
+        */
+
        if (ROFF_ie == tok) {
-               /*
-                * An if-else will put the NEGATION of the current
-                * evaluated conditional into the stack.
-                */
-               r->rstackpos++;
-               if (ROFFRULE_DENY == r->last->rule)
-                       r->rstack[r->rstackpos] = ROFFRULE_ALLOW;
-               else
-                       r->rstack[r->rstackpos] = ROFFRULE_DENY;
+               if (r->rstackpos == RSTACK_MAX - 1) {
+                       mandoc_msg(MANDOCERR_MEM, 
+                               r->parse, ln, ppos, NULL);
+                       return(ROFF_ERR);
+               }
+               r->rstack[++r->rstackpos] = 
+                       ROFFRULE_DENY == r->last->rule ?
+                       ROFFRULE_ALLOW : ROFFRULE_DENY;
        }
 
        /* If the parent has false as its rule, then so do we. */
@@ -1100,6 +1065,7 @@ roff_nr(ROFF_ARGS)
 {
        const char      *key;
        char            *val;
+       int              iv;
        struct reg      *rg;
 
        val = *bufp + pos;
@@ -1108,8 +1074,10 @@ roff_nr(ROFF_ARGS)
 
        if (0 == strcmp(key, "nS")) {
                rg[(int)REG_nS].set = 1;
-               if ( ! roff_parse_nat(val, &rg[(int)REG_nS].v.u))
-                       rg[(int)REG_nS].v.u = 0;
+               if ((iv = mandoc_strntou(val, strlen(val), 10)) >= 0)
+                       rg[REG_nS].v.u = (unsigned)iv;
+               else
+                       rg[(int)REG_nS].v.u = 0u;
        }
 
        return(ROFF_IGN);