Handle nested, recursive mathematical subexpressions. This is

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 168e4cea2663a5506edb317a2d3b4bfdd6ec4acd..f8b09f7af19d9a7eea8b2531cd19a6f14c9d6a05 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.160 2010/08/07 20:33:55 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.163 2010/08/20 01:02:07 schwarze Exp $ */

 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>


@@ -22,7 +22,6 @@
 #include <sys/types.h>
 
 #include <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>

-#include <ctype.h>

 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -99,8 +98,6 @@ static        int               node_append(struct mdoc *,
                                struct mdoc_node *);
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);
                                struct mdoc_node *);
 static int               mdoc_ptext(struct mdoc *, int, char *, int);
 static int               mdoc_pmacro(struct mdoc *, int, char *, int);

-static int               macrowarn(struct mdoc *, int, 
-                               const char *, int);

 
 
 const struct mdoc_node *
 
 
 const struct mdoc_node *


@@ -192,8 +189,7 @@ mdoc_free(struct mdoc *mdoc)
  * Allocate volatile and non-volatile parse resources.  
  */
 struct mdoc *
  * Allocate volatile and non-volatile parse resources.  
  */
 struct mdoc *

-mdoc_alloc(struct regset *regs, void *data, 
-               int pflags, mandocmsg msg)
+mdoc_alloc(struct regset *regs, void *data, mandocmsg msg)

 {
        struct mdoc     *p;
 
 {
        struct mdoc     *p;
 


@@ -201,7 +197,6 @@ mdoc_alloc(struct regset *regs, void *data,
 
        p->msg = msg;
        p->data = data;
 
        p->msg = msg;
        p->data = data;

-       p->pflags = pflags;

        p->regs = regs;
 
        mdoc_hash_init();
        p->regs = regs;
 
        mdoc_hash_init();


@@ -728,21 +723,6 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
 }
 
 
 }
 
 

-static int
-macrowarn(struct mdoc *m, int ln, const char *buf, int offs)
-{
-       int              rc;
-
-       rc = mdoc_vmsg(m, MANDOCERR_MACRO, ln, offs, 
-                       "unknown macro: %s%s", 
-                       buf, strlen(buf) > 3 ? "..." : "");
-
-       /* FIXME: logic should be in driver. */
-       /* FIXME: broken, will error out and not omit a message. */
-       return(MDOC_IGN_MACRO & m->pflags ? rc : 0);
-}
-
-

 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.
 /*
  * Parse a macro line, that is, a line beginning with the control
  * character.


@@ -777,37 +757,20 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
        sv = i;
 
        /* 
        sv = i;
 
        /* 

-        * Copy the first word into a nil-terminated buffer.  Stop
-        * copying when a tab, space, or eoln is encountered.
+        * Copy the first word into a nil-terminated buffer.
+        * Stop copying when a tab, space, or eoln is encountered.

         */
 
         */
 

-       for (j = 0; j < 4; j++, i++) {
-               if ('\0' == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i] || '\t' == buf[i])
-                       break;
-
-               /* Check for invalid characters. */
-               /* TODO: remove me, already done in main.c. */
-
-               if (isgraph((u_char)buf[i]))
-                       continue;
-               if ( ! mdoc_pmsg(m, ln, i, MANDOCERR_BADCHAR))
-                       return(0);
-               i--;
-       }
-
+       j = 0;
+       while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i])
+               mac[j++] = buf[i++];

        mac[j] = '\0';
 
        mac[j] = '\0';
 

-       if (j == 4 || j < 2) {
-               if ( ! macrowarn(m, ln, mac, sv))
-                       goto err;
-               return(1);
-       } 
-       
-       if (MDOC_MAX == (tok = mdoc_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac, sv))
-                       goto err;
+       tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
+       if (MDOC_MAX == tok) {
+               mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, 
+                   "unknown macro: %s%s", 
+                   buf, strlen(buf) > 3 ? "..." : "");

                return(1);
        }
 
                return(1);
        }