mdoc_action.c is no more. Attic it and remove it from the Makefile.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index afe80b481aa65d2bb206bbc7d6c3b43b7a5370d4..930d20719c324afa50d3cd1be9fcbf0f46559c67 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc.c,v 1.161 2010/08/07 20:57:33 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.166 2010/11/30 13:04:14 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -98,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);
-static int               macrowarn(struct mdoc *, int, 
-                               const char *, int);
 
 
 const struct mdoc_node *
@@ -191,8 +189,7 @@ mdoc_free(struct mdoc *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;
 
@@ -200,7 +197,6 @@ mdoc_alloc(struct regset *regs, void *data,
 
        p->msg = msg;
        p->data = data;
-       p->pflags = pflags;
        p->regs = regs;
 
        mdoc_hash_init();
@@ -332,8 +328,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
 
        if ( ! mdoc_valid_pre(mdoc, p))
                return(0);
-       if ( ! mdoc_action_pre(mdoc, p))
-               return(0);
 
        switch (p->type) {
        case (MDOC_HEAD):
@@ -360,8 +354,6 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
        case (MDOC_TEXT):
                if ( ! mdoc_valid_post(mdoc))
                        return(0);
-               if ( ! mdoc_action_post(mdoc))
-                       return(0);
                break;
        default:
                break;
@@ -695,11 +687,11 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
                        return(0);
 
                /*
-                * Insert a `Pp' in the case of a blank line.  Technically,
+                * Insert a `sp' 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))
+               if ( ! mdoc_elem_alloc(m, line, offs, MDOC_sp, NULL))
                        return(0);
 
                m->next = MDOC_NEXT_SIBLING;
@@ -727,21 +719,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.
@@ -776,27 +753,20 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
        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;
-
+       j = 0;
+       while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i])
+               mac[j++] = buf[i++];
        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);
        }