Removed unnecessary test cases (most were for visual).

[mandoc.git] / action.c

diff --git a/action.c b/action.c
index 1fdd513e9427bda9c2a021935e7ddc189840fbc1..f9bc34d47853c0d60f81c3f8d812943c6853a782 100644 (file)
--- a/action.c
+++ b/action.c
@@ -1,4 +1,4 @@
-/* $Id: action.c,v 1.10 2009/01/17 16:15:27 kristaps Exp $ */
+/* $Id: action.c,v 1.12 2009/01/19 17:02:58 kristaps Exp $ */

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


@@ -27,6 +27,7 @@ struct        actions {
        int     (*post)(struct mdoc *);
 };
 
        int     (*post)(struct mdoc *);
 };
 

+/* Per-macro action routines. */

 
 static int      post_sh(struct mdoc *);
 static int      post_os(struct mdoc *);
 
 static int      post_sh(struct mdoc *);
 static int      post_os(struct mdoc *);


@@ -34,6 +35,8 @@ static int     post_dt(struct mdoc *);
 static int      post_dd(struct mdoc *);
 static int      post_nm(struct mdoc *);
 
 static int      post_dd(struct mdoc *);
 static int      post_nm(struct mdoc *);
 

+/* Array of macro action routines. */
+

 const  struct actions mdoc_actions[MDOC_MAX] = {
        { NULL }, /* \" */
        { post_dd }, /* Dd */ 
 const  struct actions mdoc_actions[MDOC_MAX] = {
        { NULL }, /* \" */
        { post_dd }, /* Dd */ 


@@ -155,12 +158,12 @@ post_nm(struct mdoc *mdoc)
        if (mdoc->meta.name)
                return(1);
 
        if (mdoc->meta.name)
                return(1);
 

-       if ( ! xstrlcats(buf, mdoc->last->child, 64))
-               return(mdoc_err(mdoc, "macro parameters too long"));
+       if (xstrlcats(buf, mdoc->last->child, 64)) {
+               mdoc->meta.name = xstrdup(buf);
+               return(1);
+       }

 
 

-       mdoc->meta.name = xstrdup(buf);
-       mdoc_msg(mdoc, "parsed name: %s", mdoc->meta.name);
-       return(1);
+       return(mdoc_err(mdoc, "macro parameters too long"));

 }
 
 
 }
 
 


@@ -172,14 +175,14 @@ post_sh(struct mdoc *mdoc)
 
        if (MDOC_HEAD != mdoc->last->type)
                return(1);
 
        if (MDOC_HEAD != mdoc->last->type)
                return(1);

-       if ( ! xstrlcats(buf, mdoc->last->child, 64))
-               return(mdoc_err(mdoc, "macro parameters too long"));
-
-       if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
-               mdoc->sec_lastn = sec;
-       mdoc->sec_last = sec;
+       if (xstrlcats(buf, mdoc->last->child, 64)) {
+               if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
+                       mdoc->sec_lastn = sec;
+               mdoc->sec_last = sec;
+               return(1);
+       }

 
 

-       return(1);
+       return(mdoc_err(mdoc, "macro parameters too long"));

 }
 
 
 }
 
 


@@ -223,9 +226,6 @@ post_dt(struct mdoc *mdoc)
 
        if (NULL == mdoc->meta.title)
                mdoc->meta.title = xstrdup("untitled");
 
        if (NULL == mdoc->meta.title)
                mdoc->meta.title = xstrdup("untitled");

-
-       mdoc_msg(mdoc, "parsed title: %s", mdoc->meta.title);
-       /* TODO: print vol2a functions. */

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


@@ -243,7 +243,6 @@ post_os(struct mdoc *mdoc)
                return(mdoc_err(mdoc, "macro parameters too long")); 
 
        mdoc->meta.os = xstrdup(buf[0] ? buf : "local");
                return(mdoc_err(mdoc, "macro parameters too long")); 
 
        mdoc->meta.os = xstrdup(buf[0] ? buf : "local");

-       mdoc_msg(mdoc, "parsed operating system: %s", mdoc->meta.os);

        mdoc->sec_lastn = mdoc->sec_last = SEC_BODY;
        return(1);
 }
        mdoc->sec_lastn = mdoc->sec_last = SEC_BODY;
        return(1);
 }


@@ -270,7 +269,7 @@ post_dd(struct mdoc *mdoc)
                assert(MDOC_TEXT == n->type);
                p = n->data.text.string;
 
                assert(MDOC_TEXT == n->type);
                p = n->data.text.string;
 

-               if (xstrcmp(p, "$Mdocdate: January 17 2009 $")) {
+               if (xstrcmp(p, "$Mdocdate: January 19 2009 $")) {

                        mdoc->meta.date = time(NULL);
                        continue;
                } else if (xstrcmp(p, "$")) {
                        mdoc->meta.date = time(NULL);
                        continue;
                } else if (xstrcmp(p, "$")) {


@@ -285,19 +284,12 @@ post_dd(struct mdoc *mdoc)
                        return(mdoc_nerr(mdoc, n, "invalid parameter syntax"));
        }
 
                        return(mdoc_nerr(mdoc, n, "invalid parameter syntax"));
        }
 

-       if (mdoc->meta.date && NULL == n) {
-               mdoc_msg(mdoc, "parsed time: %u since epoch", 
-                               mdoc->meta.date);
+       if (mdoc->meta.date && NULL == n)

                return(1);
                return(1);

-       } else if (n)
+       else if (n)

                return(mdoc_err(mdoc, "invalid parameter syntax"));
                return(mdoc_err(mdoc, "invalid parameter syntax"));

-
-       if ((mdoc->meta.date = mdoc_atotime(date))) {
-               mdoc_msg(mdoc, "parsed time: %u since epoch", 
-                               mdoc->meta.date);
+       if ((mdoc->meta.date = mdoc_atotime(date)))

                return(1);
                return(1);

-       }
-

        return(mdoc_err(mdoc, "invalid parameter syntax"));
 }
 
        return(mdoc_err(mdoc, "invalid parameter syntax"));
 }
 


@@ -306,6 +298,10 @@ int
 mdoc_action_post(struct mdoc *mdoc)
 {
 
 mdoc_action_post(struct mdoc *mdoc)
 {
 

+       if (MDOC_ACTED & mdoc->last->flags)
+               return(1);
+       mdoc->last->flags |= MDOC_ACTED;
+

        if (MDOC_TEXT == mdoc->last->type)
                return(1);
        if (MDOC_ROOT == mdoc->last->type)
        if (MDOC_TEXT == mdoc->last->type)
                return(1);
        if (MDOC_ROOT == mdoc->last->type)