Fix a TODO to the effect that `.if n \{\ foo .br \}' was failing due to

[mandoc.git] / roff.c

diff --git a/roff.c b/roff.c
index 89d7f466fcd94d470244a2a679050f556606dad4..35e0f883ef74eaa9ed41ab20c9eed25b2775b85f 100644 (file)
--- a/roff.c
+++ b/roff.c
@@ -1,4 +1,4 @@
-/*     $Id: roff.c,v 1.134 2011/04/13 16:26:11 kristaps Exp $ */
+/*     $Id: roff.c,v 1.139 2011/05/24 14:00:39 kristaps Exp $ */

 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * 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>
 #endif
 
 #include <assert.h>

-#include <errno.h>

 #include <ctype.h>
 #include <ctype.h>

-#include <limits.h>

 #include <stdlib.h>
 #include <string.h>
 #include <stdlib.h>
 #include <string.h>

-#include <stdio.h>

 
 #include "mandoc.h"
 #include "libroff.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 *);
                                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)
 
 /* See roff_hash_find() */
 #define        ROFF_HASH(p)    (p[0] - ASCII_LO)


@@ -593,27 +589,6 @@ roff_parse(struct roff *r, const char *buf, int *pos)
        return(t);
 }
 
        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)
 /* ARGSUSED */
 static enum rofferr
 roff_cblock(ROFF_ARGS)


@@ -829,8 +804,7 @@ roff_block_sub(ROFF_ARGS)
         * pulling it out of the hashtable.
         */
 
         * 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
 
        /*
         * Macros other than block-end are only significant


@@ -866,21 +840,34 @@ roff_cond_sub(ROFF_ARGS)
 {
        enum rofft       t;
        enum roffrule    rr;
 {
        enum rofft       t;
        enum roffrule    rr;

+       char            *ep;

 
        rr = r->last->rule;
 
        rr = r->last->rule;

+       roffnode_cleanscope(r);

 
 

-       /* 
-        * Clean out scope.  If we've closed ourselves, then don't
-        * continue. 
+       /*
+        * If the macro is unknown, first check if it contains a closing
+        * delimiter `\}'.  If it does, close out our scope and return
+        * the currently-scoped rule (ignore or continue).  Else, drop
+        * into the currently-scoped rule.

         */
 
         */
 

-       roffnode_cleanscope(r);
-

        if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) {
        if (ROFF_MAX == (t = roff_parse(r, *bufp, &pos))) {

-               if ('\\' == (*bufp)[pos] && '}' == (*bufp)[pos + 1])
-                       return(roff_ccond
-                               (r, ROFF_ccond, bufp, szp,
-                                ln, pos, pos + 2, offs));
+               /*
+                * Jump through hoops to detect a \}, because it could
+                * be (say) \\}, which is something completely
+                * different.
+                */
+               ep = &(*bufp)[pos];
+               for ( ; NULL != (ep = strchr(ep, '\\')); ep++) {
+                       ep++;
+                       if ('}' != *ep)
+                               continue;
+                       *--ep = '\0';
+                       roff_ccond(r, ROFF_ccond, bufp, szp, 
+                                       ln, pos, pos + 2, offs);
+                       break;
+               }

                return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
        }
 
                return(ROFFRULE_DENY == rr ? ROFF_IGN : ROFF_CONT);
        }
 


@@ -889,6 +876,7 @@ roff_cond_sub(ROFF_ARGS)
         * if they're either structurally required (such as loops and
         * conditionals) or a closing macro.
         */
         * if they're either structurally required (such as loops and
         * conditionals) or a closing macro.
         */

+

        if (ROFFRULE_DENY == rr)
                if ( ! (ROFFMAC_STRUCT & roffs[t].flags))
                        if (ROFF_ccond != t)
        if (ROFFRULE_DENY == rr)
                if ( ! (ROFFMAC_STRUCT & roffs[t].flags))
                        if (ROFF_ccond != t)


@@ -1091,6 +1079,7 @@ roff_nr(ROFF_ARGS)
 {
        const char      *key;
        char            *val;
 {
        const char      *key;
        char            *val;

+       int              iv;

        struct reg      *rg;
 
        val = *bufp + pos;
        struct reg      *rg;
 
        val = *bufp + pos;


@@ -1099,8 +1088,10 @@ roff_nr(ROFF_ARGS)
 
        if (0 == strcmp(key, "nS")) {
                rg[(int)REG_nS].set = 1;
 
        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);
        }
 
        return(ROFF_IGN);