Increase performance by stashing the list type in struct mdoc_node.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index 2ab3a0cab62f6a9cbd20572fd700c74ad9d6234c..1fb6372d5eeb68586460190e24d6c23d1420cb4b 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.117 2010/03/31 07:13:53 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.136 2010/05/17 22:11:42 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -26,65 +26,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

+#include <time.h>

 
 

+#include "mandoc.h"

 #include "libmdoc.h"
 #include "libmandoc.h"
 
 #include "libmdoc.h"
 #include "libmandoc.h"
 

-const  char *const __mdoc_merrnames[MERRMAX] = {                
-       "trailing whitespace", /* ETAILWS */
-       "unexpected quoted parameter", /* EQUOTPARM */
-       "unterminated quoted parameter", /* EQUOTTERM */
-       "argument parameter suggested", /* EARGVAL */
-       "macro disallowed in prologue", /* EBODYPROL */
-       "macro disallowed in body", /* EPROLBODY */
-       "text disallowed in prologue", /* ETEXTPROL */
-       "blank line disallowed", /* ENOBLANK */
-       "text parameter too long", /* ETOOLONG */
-       "invalid escape sequence", /* EESCAPE */
-       "invalid character", /* EPRINT */
-       "document has no body", /* ENODAT */
-       "document has no prologue", /* ENOPROLOGUE */
-       "expected line arguments", /* ELINE */
-       "invalid AT&T argument", /* EATT */
-       "default name not yet set", /* ENAME */
-       "missing list type", /* ELISTTYPE */
-       "missing display type", /* EDISPTYPE */
-       "too many display types", /* EMULTIDISP */
-       "too many list types", /* EMULTILIST */
-       "NAME section must be first", /* ESECNAME */
-       "badly-formed NAME section", /* ENAMESECINC */
-       "argument repeated", /* EARGREP */
-       "expected boolean parameter", /* EBOOL */
-       "inconsistent column syntax", /* ECOLMIS */
-       "nested display invalid", /* ENESTDISP */
-       "width argument missing", /* EMISSWIDTH */
-       "invalid section for this manual section", /* EWRONGMSEC */
-       "section out of conventional order", /* ESECOOO */
-       "section repeated", /* ESECREP */
-       "invalid standard argument", /* EBADSTAND */
-       "multi-line arguments discouraged", /* ENOMULTILINE */
-       "multi-line arguments suggested", /* EMULTILINE */
-       "line arguments discouraged", /* ENOLINE */
-       "prologue macro out of conventional order", /* EPROLOOO */
-       "prologue macro repeated", /* EPROLREP */
-       "invalid manual section", /* EBADMSEC */
-       "invalid section", /* EBADSEC */
-       "invalid font mode", /* EFONT */
-       "invalid date syntax", /* EBADDATE */
-       "invalid number format", /* ENUMFMT */
-       "superfluous width argument", /* ENOWIDTH */
-       "system: utsname error", /* EUTSNAME */
-       "obsolete macro", /* EOBS */
-       "end-of-line scope violation", /* EIMPBRK */
-       "empty macro ignored", /* EIGNE */
-       "unclosed explicit scope", /* EOPEN */
-       "unterminated quoted phrase", /* EQUOTPHR */
-       "closure macro without prior context", /* ENOCTX */
-       "no description found for library", /* ELIB */
-       "bad child for parent context", /* EBADCHILD */
-       "list arguments preceding type", /* ENOTYPE */
-};
-

 const  char *const __mdoc_macronames[MDOC_MAX] = {              
        "Ap",           "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",
 const  char *const __mdoc_macronames[MDOC_MAX] = {              
        "Ap",           "Dd",           "Dt",           "Os",
        "Sh",           "Ss",           "Pp",           "D1",


@@ -140,17 +87,20 @@ const      char *const __mdoc_argnames[MDOC_ARG_MAX] = {
 const  char * const *mdoc_macronames = __mdoc_macronames;
 const  char * const *mdoc_argnames = __mdoc_argnames;
 
 const  char * const *mdoc_macronames = __mdoc_macronames;
 const  char * const *mdoc_argnames = __mdoc_argnames;
 

+static void              mdoc_node_free(struct mdoc_node *);
+static void              mdoc_node_unlink(struct mdoc *, 
+                               struct mdoc_node *);

 static void              mdoc_free1(struct mdoc *);
 static void              mdoc_alloc1(struct mdoc *);
 static struct mdoc_node *node_alloc(struct mdoc *, int, int, 
                                enum mdoct, enum mdoc_type);
 static int               node_append(struct mdoc *, 
                                struct mdoc_node *);
 static void              mdoc_free1(struct mdoc *);
 static void              mdoc_alloc1(struct mdoc *);
 static struct mdoc_node *node_alloc(struct mdoc *, int, int, 
                                enum mdoct, enum mdoc_type);
 static int               node_append(struct mdoc *, 
                                struct mdoc_node *);

-static int               parsetext(struct mdoc *, int, char *);
-static int               parsemacro(struct mdoc *, int, char *);
-static int               macrowarn(struct mdoc *, int, const char *);
-static int               pstring(struct mdoc *, int, int, 
-                               const char *, size_t);
+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 *
 mdoc_node(const struct mdoc *m)
 
 const struct mdoc_node *
 mdoc_node(const struct mdoc *m)


@@ -176,7 +126,7 @@ mdoc_free1(struct mdoc *mdoc)
 {
 
        if (mdoc->first)
 {
 
        if (mdoc->first)

-               mdoc_node_freelist(mdoc->first);
+               mdoc_node_delete(mdoc, mdoc->first);

        if (mdoc->meta.title)
                free(mdoc->meta.title);
        if (mdoc->meta.os)
        if (mdoc->meta.title)
                free(mdoc->meta.title);
        if (mdoc->meta.os)


@@ -187,6 +137,8 @@ mdoc_free1(struct mdoc *mdoc)
                free(mdoc->meta.arch);
        if (mdoc->meta.vol)
                free(mdoc->meta.vol);
                free(mdoc->meta.arch);
        if (mdoc->meta.vol)
                free(mdoc->meta.vol);

+       if (mdoc->meta.msec)
+               free(mdoc->meta.msec);

 }
 
 
 }
 
 


@@ -239,15 +191,13 @@ 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(void *data, int pflags, const struct mdoc_cb *cb)
+mdoc_alloc(void *data, int pflags, mandocmsg msg)

 {
        struct mdoc     *p;
 
        p = mandoc_calloc(1, sizeof(struct mdoc));
 
 {
        struct mdoc     *p;
 
        p = mandoc_calloc(1, sizeof(struct mdoc));
 

-       if (cb)
-               memcpy(&p->cb, cb, sizeof(struct mdoc_cb));
-
+       p->msg = msg;

        p->data = data;
        p->pflags = pflags;
 
        p->data = data;
        p->pflags = pflags;
 


@@ -276,67 +226,34 @@ mdoc_endparse(struct mdoc *m)
 
 /*
  * Main parse routine.  Parses a single line -- really just hands off to
 
 /*
  * Main parse routine.  Parses a single line -- really just hands off to

- * the macro (parsemacro()) or text parser (parsetext()).
+ * the macro (mdoc_pmacro()) or text parser (mdoc_ptext()).

  */
 int
  */
 int

-mdoc_parseln(struct mdoc *m, int ln, char *buf)
+mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)

 {
 
        if (MDOC_HALT & m->flags)
                return(0);
 
 {
 
        if (MDOC_HALT & m->flags)
                return(0);
 

-       return('.' == *buf ? parsemacro(m, ln, buf) :
-                       parsetext(m, ln, buf));
-}
-
-
-int
-mdoc_verr(struct mdoc *mdoc, int ln, int pos, 
-               const char *fmt, ...)
-{
-       char             buf[256];
-       va_list          ap;
-
-       if (NULL == mdoc->cb.mdoc_err)
-               return(0);
-
-       va_start(ap, fmt);
-       (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
-       va_end(ap);
-
-       return((*mdoc->cb.mdoc_err)(mdoc->data, ln, pos, buf));
+       m->flags |= MDOC_NEWLINE;
+       return(('.' == buf[offs] || '\'' == buf[offs]) ? 
+                       mdoc_pmacro(m, ln, buf, offs) :
+                       mdoc_ptext(m, ln, buf, offs));

 }
 
 
 int
 }
 
 
 int

-mdoc_vwarn(struct mdoc *mdoc, int ln, int pos, const char *fmt, ...)
+mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t, 
+               int ln, int pos, const char *fmt, ...)

 {
        char             buf[256];
        va_list          ap;
 
 {
        char             buf[256];
        va_list          ap;
 

-       if (NULL == mdoc->cb.mdoc_warn)
-               return(0);
-

        va_start(ap, fmt);
        va_start(ap, fmt);

-       (void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap);
+       vsnprintf(buf, sizeof(buf) - 1, fmt, ap);

        va_end(ap);
 
        va_end(ap);
 

-       return((*mdoc->cb.mdoc_warn)(mdoc->data, ln, pos, buf));
-}
-
-
-int
-mdoc_err(struct mdoc *m, int line, int pos, int iserr, enum merr type)
-{
-       const char      *p;
-
-       p = __mdoc_merrnames[(int)type];
-       assert(p);
-
-       if (iserr)
-               return(mdoc_verr(m, line, pos, p));
-
-       return(mdoc_vwarn(m, line, pos, p));
+       return((*mdoc->msg)(t, mdoc->data, ln, pos, buf));

 }
 
 
 }
 
 


@@ -344,18 +261,30 @@ int
 mdoc_macro(struct mdoc *m, enum mdoct tok, 
                int ln, int pp, int *pos, char *buf)
 {
 mdoc_macro(struct mdoc *m, enum mdoct tok, 
                int ln, int pp, int *pos, char *buf)
 {

-

        assert(tok < MDOC_MAX);
        assert(tok < MDOC_MAX);

-       /*
-        * If we're in the prologue, deny "body" macros.  Similarly, if
-        * we're in the body, deny prologue calls.
-        */
+
+       /* If we're in the body, deny prologue calls. */
+

        if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
                        MDOC_PBODY & m->flags)
        if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
                        MDOC_PBODY & m->flags)

-               return(mdoc_perr(m, ln, pp, EPROLBODY));
+               return(mdoc_pmsg(m, ln, pp, MANDOCERR_BADBODY));
+
+       /* If we're in the prologue, deny "body" macros.  */
+

        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 

-                       ! (MDOC_PBODY & m->flags))
-               return(mdoc_perr(m, ln, pp, EBODYPROL));
+                       ! (MDOC_PBODY & m->flags)) {
+               if ( ! mdoc_pmsg(m, ln, pp, MANDOCERR_BADPROLOG))
+                       return(0);
+               if (NULL == m->meta.title)
+                       m->meta.title = mandoc_strdup("unknown");
+               if (NULL == m->meta.vol)
+                       m->meta.vol = mandoc_strdup("local");
+               if (NULL == m->meta.os)
+                       m->meta.os = mandoc_strdup("local");
+               if (0 == m->meta.date)
+                       m->meta.date = time(NULL);
+               m->flags |= MDOC_PBODY;
+       }

 
        return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
 }
 
        return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
 }


@@ -436,7 +365,10 @@ node_alloc(struct mdoc *m, int line, int pos,
        p->line = line;
        p->pos = pos;
        p->tok = tok;
        p->line = line;
        p->pos = pos;
        p->tok = tok;

-
+       p->type = type;
+       if (MDOC_NEWLINE & m->flags)
+               p->flags |= MDOC_LINE;
+       m->flags &= ~MDOC_NEWLINE;

        return(p);
 }
 
        return(p);
 }
 


@@ -517,13 +449,15 @@ mdoc_elem_alloc(struct mdoc *m, int line, int pos,
 }
 
 
 }
 
 

-static int
-pstring(struct mdoc *m, int line, int pos, const char *p, size_t len)
+int
+mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)

 {
        struct mdoc_node *n;
 {
        struct mdoc_node *n;

-       size_t            sv;
+       size_t            sv, len;
+
+       len = strlen(p);

 
 

-       n = node_alloc(m, line, pos, -1, MDOC_TEXT);
+       n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT);

        n->string = mandoc_malloc(len + 1);
        sv = strlcpy(n->string, p, len + 1);
 
        n->string = mandoc_malloc(len + 1);
        sv = strlcpy(n->string, p, len + 1);
 


@@ -532,25 +466,16 @@ pstring(struct mdoc *m, int line, int pos, const char *p, size_t len)
 
        if ( ! node_append(m, n))
                return(0);
 
        if ( ! node_append(m, n))
                return(0);

+

        m->next = MDOC_NEXT_SIBLING;
        return(1);
 }
 
 
        m->next = MDOC_NEXT_SIBLING;
        return(1);
 }
 
 

-int
-mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
-{
-
-       return(pstring(m, line, pos, p, strlen(p)));
-}
-
-

 void
 mdoc_node_free(struct mdoc_node *p)
 {
 
 void
 mdoc_node_free(struct mdoc_node *p)
 {
 

-       if (p->parent)
-               p->parent->nchild--;

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


@@ -559,16 +484,53 @@ mdoc_node_free(struct mdoc_node *p)
 }
 
 
 }
 
 

-void
-mdoc_node_freelist(struct mdoc_node *p)
+static void
+mdoc_node_unlink(struct mdoc *m, struct mdoc_node *n)

 {
 
 {
 

-       if (p->child)
-               mdoc_node_freelist(p->child);
-       if (p->next)
-               mdoc_node_freelist(p->next);
+       /* Adjust siblings. */
+
+       if (n->prev)
+               n->prev->next = n->next;
+       if (n->next)
+               n->next->prev = n->prev;

 
 

+       /* Adjust parent. */
+
+       if (n->parent) {
+               n->parent->nchild--;
+               if (n->parent->child == n)
+                       n->parent->child = n->prev ? n->prev : n->next;
+       }
+
+       /* Adjust parse point, if applicable. */
+
+       if (m && m->last == n) {
+               if (n->prev) {
+                       m->last = n->prev;
+                       m->next = MDOC_NEXT_SIBLING;
+               } else {
+                       m->last = n->parent;
+                       m->next = MDOC_NEXT_CHILD;
+               }
+       }
+
+       if (m && m->first == n)
+               m->first = NULL;
+}
+
+
+void
+mdoc_node_delete(struct mdoc *m, struct mdoc_node *p)
+{
+
+       while (p->child) {
+               assert(p->nchild);
+               mdoc_node_delete(m, p->child);
+       }

        assert(0 == p->nchild);
        assert(0 == p->nchild);

+
+       mdoc_node_unlink(m, p);

        mdoc_node_free(p);
 }
 
        mdoc_node_free(p);
 }
 


@@ -578,88 +540,100 @@ mdoc_node_freelist(struct mdoc_node *p)
  * control character.
  */
 static int
  * control character.
  */
 static int

-parsetext(struct mdoc *m, int line, char *buf)
+mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)

 {
 {

-       int              i, j;
-       char             sv;
+       int              i;

 
 

-       if (SEC_NONE == m->lastnamed)
-               return(mdoc_perr(m, line, 0, ETEXTPROL));
-       
-       /*
-        * If in literal mode, then pass the buffer directly to the
-        * back-end, as it should be preserved as a single term.
-        */
+       /* Ignore bogus comments. */

 
 

-       if (MDOC_LITERAL & m->flags)
-               return(mdoc_word_alloc(m, line, 0, buf));
+       if ('\\' == buf[offs] && 
+                       '.' == buf[offs + 1] && 
+                       '"' == buf[offs + 2])
+               return(mdoc_pmsg(m, line, offs, MANDOCERR_BADCOMMENT));

 
 

-       /* Disallow blank/white-space lines in non-literal mode. */
+       /* No text before an initial macro. */

 
 

-       for (i = 0; ' ' == buf[i]; i++)
-               /* Skip leading whitespace. */ ;
+       if (SEC_NONE == m->lastnamed)
+               return(mdoc_pmsg(m, line, offs, MANDOCERR_NOTEXT));

 
 

-       if ('\0' == buf[i])
-               return(mdoc_perr(m, line, 0, ENOBLANK));
+       /* Literal just gets pulled in as-is. */
+       
+       if (MDOC_LITERAL & m->flags)
+               return(mdoc_word_alloc(m, line, offs, buf + offs));

 
 

-       /*
-        * Break apart a free-form line into tokens.  Spaces are
-        * stripped out of the input.
-        */
+       /* Check for a blank line, which may also consist of spaces. */

 
 

-       for (j = i; buf[i]; i++) {
-               if (' ' != buf[i])
-                       continue;
+       for (i = offs; ' ' == buf[i]; i++)
+               /* Skip to first non-space. */ ;

 
 

-               /* Escaped whitespace. */
-               if (i && ' ' == buf[i] && '\\' == buf[i - 1])
-                       continue;
-
-               sv = buf[i];
-               buf[i++] = '\0';
+       if ('\0' == buf[i]) {
+               if ( ! mdoc_pmsg(m, line, offs, MANDOCERR_NOBLANKLN))
+                       return(0);

 
 

-               if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
+               /*
+                * Insert a `Pp' in the case of a blank line.  Technically,
+                * blank lines aren't allowed, but enough manuals assume this
+                * behaviour that we want to work around it.
+                */
+               if ( ! mdoc_elem_alloc(m, line, offs, MDOC_Pp, NULL))

                        return(0);
 
                        return(0);
 

-               /* Trailing whitespace?  Check at overwritten byte. */
+               m->next = MDOC_NEXT_SIBLING;
+               return(1);
+       }

 
 

-               if (' ' == sv && '\0' == buf[i])
-                       if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
-                               return(0);
+       /* 
+        * Warn if the last un-escaped character is whitespace. Then
+        * strip away the remaining spaces (tabs stay!).   
+        */

 
 

-               for ( ; ' ' == buf[i]; i++)
-                       /* Skip trailing whitespace. */ ;
+       i = (int)strlen(buf);
+       assert(i);

 
 

-               j = i;
+       if (' ' == buf[i - 1] || '\t' == buf[i - 1]) {
+               if (i > 1 && '\\' != buf[i - 2])
+                       if ( ! mdoc_pmsg(m, line, i - 1, MANDOCERR_EOLNSPACE))
+                               return(0);

 
 

-               /* Trailing whitespace? */
+               for (--i; i && ' ' == buf[i]; i--)
+                       /* Spin back to non-space. */ ;

 
 

-               if (' ' == buf[i - 1] && '\0' == buf[i])
-                       if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
-                               return(0);
+               /* Jump ahead of escaped whitespace. */
+               i += '\\' == buf[i] ? 2 : 1;

 
 

-               if ('\0' == buf[i])
-                       break;
+               buf[i] = '\0';

        }
 
        }
 

-       if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
+       /* Allocate the whole word. */
+
+       if ( ! mdoc_word_alloc(m, line, offs, buf + offs))

                return(0);
 
                return(0);
 

-       m->next = MDOC_NEXT_SIBLING;
+       /*
+        * End-of-sentence check.  If the last character is an unescaped
+        * EOS character, then flag the node as being the end of a
+        * sentence.  The front-end will know how to interpret this.
+        */
+
+       assert(i);
+       if (mandoc_eos(buf, (size_t)i))
+               m->last->flags |= MDOC_EOS;
+

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

-

 static int
 static int

-macrowarn(struct mdoc *m, int ln, const char *buf)
+macrowarn(struct mdoc *m, int ln, const char *buf, int offs)

 {
 {

-       if ( ! (MDOC_IGN_MACRO & m->pflags))
-               return(mdoc_verr(m, ln, 0, 
-                               "unknown macro: %s%s", 
-                               buf, strlen(buf) > 3 ? "..." : ""));
-       return(mdoc_vwarn(m, ln, 0, "unknown macro: %s%s",
-                               buf, strlen(buf) > 3 ? "..." : ""));
+       int              rc;
+
+       rc = mdoc_vmsg(m, MANDOCERR_MACRO, ln, offs, 
+                       "unknown macro: %s%s", 
+                       buf, strlen(buf) > 3 ? "..." : "");
+
+       /* FIXME: logic should be in driver. */
+       return(MDOC_IGN_MACRO & m->pflags ? rc : 0);

 }
 
 
 }
 
 


@@ -668,17 +642,20 @@ macrowarn(struct mdoc *m, int ln, const char *buf)
  * character.
  */
 int
  * character.
  */
 int

-parsemacro(struct mdoc *m, int ln, char *buf)
+mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)

 {
 {

-       int               i, j, c;
-       char              mac[5];
+       enum mdoct      tok;
+       int             i, j, sv;
+       char            mac[5];

 
        /* Empty lines are ignored. */
 
 
        /* Empty lines are ignored. */
 

-       if ('\0' == buf[1])
+       offs++;
+
+       if ('\0' == buf[offs])

                return(1);
 
                return(1);
 

-       i = 1;
+       i = offs;

 
        /* Accept whitespace after the initial control char. */
 
 
        /* Accept whitespace after the initial control char. */
 


@@ -690,6 +667,8 @@ parsemacro(struct mdoc *m, int ln, char *buf)
                        return(1);
        }
 
                        return(1);
        }
 

+       sv = i;
+

        /* Copy the first word into a nil-terminated buffer. */
 
        for (j = 0; j < 4; j++, i++) {
        /* Copy the first word into a nil-terminated buffer. */
 
        for (j = 0; j < 4; j++, i++) {


@@ -702,19 +681,21 @@ parsemacro(struct mdoc *m, int ln, char *buf)
 
                if (isgraph((u_char)buf[i]))
                        continue;
 
                if (isgraph((u_char)buf[i]))
                        continue;

-               return(mdoc_perr(m, ln, i, EPRINT));
+               if ( ! mdoc_pmsg(m, ln, i, MANDOCERR_BADCHAR))
+                       return(0);
+               i--;

        }
 
        }
 

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

 
        if (j == 4 || j < 2) {
 
        if (j == 4 || j < 2) {

-               if ( ! macrowarn(m, ln, mac))
+               if ( ! macrowarn(m, ln, mac, sv))

                        goto err;
                return(1);
        } 
        
                        goto err;
                return(1);
        } 
        

-       if (MDOC_MAX == (c = mdoc_hash_find(mac))) {
-               if ( ! macrowarn(m, ln, mac))
+       if (MDOC_MAX == (tok = mdoc_hash_find(mac))) {
+               if ( ! macrowarn(m, ln, mac, sv))

                        goto err;
                return(1);
        }
                        goto err;
                return(1);
        }


@@ -724,17 +705,20 @@ parsemacro(struct mdoc *m, int ln, char *buf)
        while (buf[i] && ' ' == buf[i])
                i++;
 
        while (buf[i] && ' ' == buf[i])
                i++;
 

-       /* Trailing whitespace? */
+       /* 
+        * Trailing whitespace.  Note that tabs are allowed to be passed
+        * into the parser as "text", so we only warn about spaces here.
+        */

 
        if ('\0' == buf[i] && ' ' == buf[i - 1])
 
        if ('\0' == buf[i] && ' ' == buf[i - 1])

-               if ( ! mdoc_pwarn(m, ln, i - 1, ETAILWS))
+               if ( ! mdoc_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE))

                        goto err;
 
        /* 
         * Begin recursive parse sequence.  Since we're at the start of
         * the line, we don't need to do callable/parseable checks.
         */
                        goto err;
 
        /* 
         * Begin recursive parse sequence.  Since we're at the start of
         * the line, we don't need to do callable/parseable checks.
         */

-       if ( ! mdoc_macro(m, c, ln, 1, &i, buf)) 
+       if ( ! mdoc_macro(m, tok, ln, sv, &i, buf)) 

                goto err;
 
        return(1);
                goto err;
 
        return(1);