Handle nested, recursive mathematical subexpressions. This is

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 038e0fbdf868d87d59300e5891d26d84bf3a9156..f8b09f7af19d9a7eea8b2531cd19a6f14c9d6a05 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc.c,v 1.155 2010/07/01 23:01:47 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.163 2010/08/20 01:02:07 schwarze Exp $ */

 /*
 /*

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

  *
  * 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


@@ -21,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>


@@ -29,7 +29,6 @@
 #include <time.h>
 
 #include "mandoc.h"
 #include <time.h>
 
 #include "mandoc.h"

-#include "regs.h"

 #include "libmdoc.h"
 #include "libmandoc.h"
 
 #include "libmdoc.h"
 #include "libmandoc.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();


@@ -518,12 +513,21 @@ static void
 mdoc_node_free(struct mdoc_node *p)
 {
 
 mdoc_node_free(struct mdoc_node *p)
 {
 

+       /*
+        * XXX: if these end up being problematic in terms of memory
+        * management and dereferencing freed blocks, then make them
+        * into reference-counted double-pointers.
+        */
+

        if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)
                if (p->data.Bd)
                        free(p->data.Bd);
        if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)
                if (p->data.Bl)
                        free(p->data.Bl);
        if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)
                if (p->data.Bd)
                        free(p->data.Bd);
        if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)
                if (p->data.Bl)
                        free(p->data.Bl);

+       if (MDOC_Bf == p->tok && MDOC_HEAD == p->type)
+               if (p->data.Bf)
+                       free(p->data.Bf);

 
        if (p->string)
                free(p->string);
 
        if (p->string)
                free(p->string);


@@ -712,28 +716,13 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
 
        assert(buf < end);
 
 
        assert(buf < end);
 

-       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
+       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0))

                m->last->flags |= MDOC_EOS;
 
        return(1);
 }
 
 
                m->last->flags |= MDOC_EOS;
 
        return(1);
 }
 
 

-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.


@@ -755,11 +744,11 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 
        i = offs;
 
 
        i = offs;
 

-       /* Accept whitespace after the initial control char. */
+       /* Accept tabs/whitespace after the initial control char. */

 
 

-       if (' ' == buf[i]) {
+       if (' ' == buf[i] || '\t' == buf[i]) {

                i++;
                i++;

-               while (buf[i] && ' ' == buf[i])
+               while (buf[i] && (' ' == buf[i] || '\t' == buf[i]))

                        i++;
                if ('\0' == buf[i])
                        return(1);
                        i++;
                if ('\0' == buf[i])
                        return(1);


@@ -767,38 +756,30 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 
        sv = i;
 
 
        sv = i;
 

-       /* Copy the first word into a nil-terminated buffer. */
-
-       for (j = 0; j < 4; j++, i++) {
-               if ('\0' == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i])
-                       break;
-
-               /* Check for invalid characters. */
-
-               if (isgraph((u_char)buf[i]))
-                       continue;
-               if ( ! mdoc_pmsg(m, ln, i, MANDOCERR_BADCHAR))
-                       return(0);
-               i--;
-       }
+       /* 
+        * Copy the first word into a nil-terminated buffer.
+        * Stop copying when a tab, space, or eoln is encountered.
+        */

 
 

+       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);
        }
 

-       /* The macro is sane.  Jump to the next word. */
+       /* Disregard the first trailing tab, if applicable. */
+
+       if ('\t' == buf[i])
+               i++;
+
+       /* Jump to the next non-whitespace word. */

 
        while (buf[i] && ' ' == buf[i])
                i++;
 
        while (buf[i] && ' ' == buf[i])
                i++;