Moved mdoc_a2st() out of mdoc.h -> libmdoc.h (replacement in mdoc_action.c).

[mandoc.git] / mdoc_action.c

diff --git a/mdoc_action.c b/mdoc_action.c
index ca6a76d31b1686bf86a5a7042f7ff662eec34dcc..30a758528667e6d9214b9b44d695c7d57acaca8b 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_action.c,v 1.20 2009/06/25 08:42:06 kristaps Exp $ */
+/*     $Id: mdoc_action.c,v 1.26 2009/07/12 20:30:35 kristaps Exp $ */

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


@@ -24,19 +24,6 @@
 
 #include "libmdoc.h"
 
 
 #include "libmdoc.h"
 

-enum   mwarn {
-       WBADSEC,
-       WNOWIDTH,
-       WBADDATE
-};
-
-enum   merr {
-       ETOOLONG,
-       EMALLOC,
-       EUTSNAME,
-       ENUMFMT
-};
-

 #define        PRE_ARGS  struct mdoc *m, const struct mdoc_node *n
 #define        POST_ARGS struct mdoc *m
 
 #define        PRE_ARGS  struct mdoc *m, const struct mdoc_node *n
 #define        POST_ARGS struct mdoc *m
 


@@ -45,16 +32,12 @@ struct      actions {
        int     (*post)(POST_ARGS);
 };
 
        int     (*post)(POST_ARGS);
 };
 

-static int       pwarn(struct mdoc *, int, int, enum mwarn);
-static int       perr(struct mdoc *, int, int, enum merr);
-static int       concat(struct mdoc *, const struct mdoc_node *, 
-                       char *, size_t);
-

 static int       post_ar(POST_ARGS);
 static int       post_ar(POST_ARGS);

+static int       post_at(POST_ARGS);

 static int       post_bl(POST_ARGS);
 static int       post_bl_head(POST_ARGS);
 static int       post_bl(POST_ARGS);
 static int       post_bl_head(POST_ARGS);

-static int       post_bl_width(POST_ARGS);

 static int       post_bl_tagwidth(POST_ARGS);
 static int       post_bl_tagwidth(POST_ARGS);

+static int       post_bl_width(POST_ARGS);

 static int       post_dd(POST_ARGS);
 static int       post_display(POST_ARGS);
 static int       post_dt(POST_ARGS);
 static int       post_dd(POST_ARGS);
 static int       post_display(POST_ARGS);
 static int       post_dt(POST_ARGS);


@@ -63,15 +46,12 @@ static      int       post_nm(POST_ARGS);
 static int       post_os(POST_ARGS);
 static int       post_prol(POST_ARGS);
 static int       post_sh(POST_ARGS);
 static int       post_os(POST_ARGS);
 static int       post_prol(POST_ARGS);
 static int       post_sh(POST_ARGS);

+static int       post_st(POST_ARGS);

 static int       post_std(POST_ARGS);
 
 static int       pre_bd(PRE_ARGS);
 static int       pre_dl(PRE_ARGS);
 
 static int       post_std(POST_ARGS);
 
 static int       pre_bd(PRE_ARGS);
 static int       pre_dl(PRE_ARGS);
 

-#define        vwarn(m, t) pwarn((m), (m)->last->line, (m)->last->pos, (t))
-#define        verr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t))
-#define        nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t))
-

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


@@ -110,7 +90,7 @@ const        struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ot */
        { NULL, NULL }, /* Pa */
        { NULL, post_std }, /* Rv */
        { NULL, NULL }, /* Ot */
        { NULL, NULL }, /* Pa */
        { NULL, post_std }, /* Rv */

-       { NULL, NULL }, /* St */
+       { NULL, post_st }, /* St */

        { NULL, NULL }, /* Va */
        { NULL, NULL }, /* Vt */ 
        { NULL, NULL }, /* Xr */
        { NULL, NULL }, /* Va */
        { NULL, NULL }, /* Vt */ 
        { NULL, NULL }, /* Xr */


@@ -128,7 +108,7 @@ const       struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* Ac */
        { NULL, NULL }, /* Ao */
        { NULL, NULL }, /* Aq */
        { NULL, NULL }, /* Ac */
        { NULL, NULL }, /* Ao */
        { NULL, NULL }, /* Aq */

-       { NULL, NULL }, /* At */ 
+       { NULL, post_at }, /* At */ 

        { NULL, NULL }, /* Bc */
        { NULL, NULL }, /* Bf */ 
        { NULL, NULL }, /* Bo */
        { NULL, NULL }, /* Bc */
        { NULL, NULL }, /* Bf */ 
        { NULL, NULL }, /* Bo */


@@ -193,9 +173,11 @@ const      struct actions mdoc_actions[MDOC_MAX] = {
        { NULL, NULL }, /* %Q */
 };
 
        { NULL, NULL }, /* %Q */
 };
 

+static int       concat(struct mdoc *, const struct mdoc_node *, 
+                       char *, size_t);

 
 #ifdef __linux__
 
 #ifdef __linux__

-extern size_t  strlcat(char *, const char *, size_t);
+extern size_t    strlcat(char *, const char *, size_t);

 #endif
 
 
 #endif
 
 


@@ -249,67 +231,17 @@ concat(struct mdoc *m, const struct mdoc_node *n,
        for ( ; n; n = n->next) {
                assert(MDOC_TEXT == n->type);
                if (strlcat(buf, n->string, sz) >= sz)
        for ( ; n; n = n->next) {
                assert(MDOC_TEXT == n->type);
                if (strlcat(buf, n->string, sz) >= sz)

-                       return(nerr(m, n, ETOOLONG));
+                       return(mdoc_nerr(m, n, ETOOLONG));

                if (NULL == n->next)
                        continue;
                if (strlcat(buf, " ", sz) >= sz)
                if (NULL == n->next)
                        continue;
                if (strlcat(buf, " ", sz) >= sz)

-                       return(nerr(m, n, ETOOLONG));
+                       return(mdoc_nerr(m, n, ETOOLONG));

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

-static int
-perr(struct mdoc *m, int line, int pos, enum merr type)
-{
-       char            *p;
-
-       p = NULL;
-       switch (type) {
-       case (ENUMFMT):
-               p = "bad number format";
-               break;
-       case (ETOOLONG):
-               p = "argument text too long";
-               break;
-       case (EUTSNAME):
-               p = "utsname";
-               break;
-       case (EMALLOC):
-               p = "memory exhausted";
-               break;
-       }
-       assert(p);
-       return(mdoc_perr(m, line, pos, p));
-}
-
-
-static int
-pwarn(struct mdoc *m, int line, int pos, enum mwarn type)
-{
-       char            *p;
-       int              c;
-
-       p = NULL;
-       c = WARN_SYNTAX;
-       switch (type) {
-       case (WBADSEC):
-               p = "inappropriate document section in manual section";
-               c = WARN_COMPAT;
-               break;
-       case (WNOWIDTH):
-               p = "cannot determine default width";
-               break;
-       case (WBADDATE):
-               p = "malformed date syntax";
-               break;
-       }
-       assert(p);
-       return(mdoc_pwarn(m, line, pos, c, p));
-}
-
-

 static int
 post_std(POST_ARGS)
 {
 static int
 post_std(POST_ARGS)
 {


@@ -328,12 +260,12 @@ post_std(POST_ARGS)
 
        m->last->args->argv[0].value = calloc(1, sizeof(char *));
        if (NULL == m->last->args->argv[0].value)
 
        m->last->args->argv[0].value = calloc(1, sizeof(char *));
        if (NULL == m->last->args->argv[0].value)

-               return(verr(m, EMALLOC));
+               return(mdoc_nerr(m, m->last, EMALLOC));

 
        m->last->args->argv[0].sz = 1;
        m->last->args->argv[0].value[0] = strdup(m->meta.name);
        if (NULL == m->last->args->argv[0].value[0])
 
        m->last->args->argv[0].sz = 1;
        m->last->args->argv[0].value[0] = strdup(m->meta.name);
        if (NULL == m->last->args->argv[0].value[0])

-               return(verr(m, EMALLOC));
+               return(mdoc_nerr(m, m->last, EMALLOC));

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


@@ -352,8 +284,53 @@ post_nm(POST_ARGS)
                return(0);
 
        if (NULL == (m->meta.name = strdup(buf)))
                return(0);
 
        if (NULL == (m->meta.name = strdup(buf)))

-               return(verr(m, EMALLOC));
+               return(mdoc_nerr(m, m->last, EMALLOC));
+
+       return(1);
+}
+
+
+static int
+post_st(POST_ARGS)
+{
+       const char      *p;
+
+       assert(MDOC_TEXT == m->last->child->type);
+       p = mdoc_a2st(m->last->child->string);
+       assert(p);
+       free(m->last->child->string);
+       m->last->child->string = strdup(p);
+       if (NULL == m->last->child->string)
+               return(mdoc_nerr(m, m->last, EMALLOC));
+       return(1);
+}

 
 

+
+static int
+post_at(POST_ARGS)
+{
+       struct mdoc_node *n;
+       const char       *p;
+
+       if (m->last->child) {
+               assert(MDOC_TEXT == m->last->child->type);
+               p = mdoc_a2att(m->last->child->string);
+               assert(p);
+               free(m->last->child->string);
+               m->last->child->string = strdup(p);
+               if (NULL == m->last->child->string)
+                       return(mdoc_nerr(m, m->last, EMALLOC));
+               return(1);
+       }
+
+       n = m->last;
+       m->next = MDOC_NEXT_CHILD;
+
+       if ( ! mdoc_word_alloc(m, n->line, n->pos, "AT&T UNIX"))
+               return(0);
+
+       m->last = n;
+       m->next = MDOC_NEXT_SIBLING;

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


@@ -391,7 +368,7 @@ post_sh(POST_ARGS)
                case (9):
                        break;
                default:
                case (9):
                        break;
                default:

-                       return(vwarn(m, WBADSEC));
+                       return(mdoc_nwarn(m, m->last, EBADSEC));

                }
                break;
        default:
                }
                break;
        default:


@@ -425,9 +402,9 @@ post_dt(POST_ARGS)
 
        if (NULL == (n = m->last->child)) {
                if (NULL == (m->meta.title = strdup("unknown")))
 
        if (NULL == (n = m->last->child)) {
                if (NULL == (m->meta.title = strdup("unknown")))

-                       return(verr(m, EMALLOC));
+                       return(mdoc_nerr(m, m->last, EMALLOC));

                if (NULL == (m->meta.vol = strdup("local")))
                if (NULL == (m->meta.vol = strdup("local")))

-                       return(verr(m, EMALLOC));
+                       return(mdoc_nerr(m, m->last, EMALLOC));

                return(post_prol(m));
        }
 
                return(post_prol(m));
        }
 


@@ -436,11 +413,11 @@ post_dt(POST_ARGS)
         */
 
        if (NULL == (m->meta.title = strdup(n->string)))
         */
 
        if (NULL == (m->meta.title = strdup(n->string)))

-               return(verr(m, EMALLOC));
+               return(mdoc_nerr(m, m->last, EMALLOC));

 
        if (NULL == (n = n->next)) {
                if (NULL == (m->meta.vol = strdup("local")))
 
        if (NULL == (n = n->next)) {
                if (NULL == (m->meta.vol = strdup("local")))

-                       return(verr(m, EMALLOC));
+                       return(mdoc_nerr(m, m->last, EMALLOC));

                return(post_prol(m));
        }
 
                return(post_prol(m));
        }
 


@@ -454,13 +431,13 @@ post_dt(POST_ARGS)
        cp = mdoc_a2msec(n->string);
        if (cp) {
                if (NULL == (m->meta.vol = strdup(cp)))
        cp = mdoc_a2msec(n->string);
        if (cp) {
                if (NULL == (m->meta.vol = strdup(cp)))

-                       return(verr(m, EMALLOC));
+                       return(mdoc_nerr(m, m->last, EMALLOC));

                errno = 0;
                lval = strtol(n->string, &ep, 10);
                if (n->string[0] != '\0' && *ep == '\0')
                        m->meta.msec = (int)lval;
        } else if (NULL == (m->meta.vol = strdup(n->string)))
                errno = 0;
                lval = strtol(n->string, &ep, 10);
                if (n->string[0] != '\0' && *ep == '\0')
                        m->meta.msec = (int)lval;
        } else if (NULL == (m->meta.vol = strdup(n->string)))

-               return(verr(m, EMALLOC));
+               return(mdoc_nerr(m, m->last, EMALLOC));

 
        if (NULL == (n = n->next))
                return(post_prol(m));
 
        if (NULL == (n = n->next))
                return(post_prol(m));


@@ -476,16 +453,16 @@ post_dt(POST_ARGS)
        if (cp) {
                free(m->meta.vol);
                if (NULL == (m->meta.vol = strdup(cp)))
        if (cp) {
                free(m->meta.vol);
                if (NULL == (m->meta.vol = strdup(cp)))

-                       return(verr(m, EMALLOC));
+                       return(mdoc_nerr(m, m->last, EMALLOC));

                n = n->next;
        } else {
                cp = mdoc_a2arch(n->string);
                if (NULL == cp) {
                        free(m->meta.vol);
                        if (NULL == (m->meta.vol = strdup(n->string)))
                n = n->next;
        } else {
                cp = mdoc_a2arch(n->string);
                if (NULL == cp) {
                        free(m->meta.vol);
                        if (NULL == (m->meta.vol = strdup(n->string)))

-                               return(verr(m, EMALLOC));
+                               return(mdoc_nerr(m, m->last, EMALLOC));

                } else if (NULL == (m->meta.arch = strdup(cp)))
                } else if (NULL == (m->meta.arch = strdup(cp)))

-                       return(verr(m, EMALLOC));
+                       return(mdoc_nerr(m, m->last, EMALLOC));

        }       
 
        /* Ignore any subsequent parameters... */
        }       
 
        /* Ignore any subsequent parameters... */


@@ -509,17 +486,17 @@ post_os(POST_ARGS)
 
        if (0 == buf[0]) {
                if (-1 == uname(&utsname))
 
        if (0 == buf[0]) {
                if (-1 == uname(&utsname))

-                       return(verr(m, EUTSNAME));
+                       return(mdoc_nerr(m, m->last, EUTSNAME));

                if (strlcat(buf, utsname.sysname, 64) >= 64)
                if (strlcat(buf, utsname.sysname, 64) >= 64)

-                       return(verr(m, ETOOLONG));
+                       return(mdoc_nerr(m, m->last, ETOOLONG));

                if (strlcat(buf, " ", 64) >= 64)
                if (strlcat(buf, " ", 64) >= 64)

-                       return(verr(m, ETOOLONG));
+                       return(mdoc_nerr(m, m->last, ETOOLONG));

                if (strlcat(buf, utsname.release, 64) >= 64)
                if (strlcat(buf, utsname.release, 64) >= 64)

-                       return(verr(m, ETOOLONG));
+                       return(mdoc_nerr(m, m->last, ETOOLONG));

        }
 
        if (NULL == (m->meta.os = strdup(buf)))
        }
 
        if (NULL == (m->meta.os = strdup(buf)))

-               return(verr(m, EMALLOC));
+               return(mdoc_nerr(m, m->last, EMALLOC));

 
        m->flags |= MDOC_PBODY;
        return(post_prol(m));
 
        m->flags |= MDOC_PBODY;
        return(post_prol(m));


@@ -554,14 +531,14 @@ post_bl_tagwidth(struct mdoc *m)
        if (n) {
                if (MDOC_TEXT != n->type) {
                        if (0 == (sz = (int)mdoc_macro2len(n->tok)))
        if (n) {
                if (MDOC_TEXT != n->type) {
                        if (0 == (sz = (int)mdoc_macro2len(n->tok)))

-                               if ( ! vwarn(m, WNOWIDTH))
+                               if ( ! mdoc_nwarn(m, m->last, ENOWIDTH))

                                        return(0);
                } else
                        sz = (int)strlen(n->string) + 1;
        } 
 
        if (-1 == snprintf(buf, sizeof(buf), "%dn", sz))
                                        return(0);
                } else
                        sz = (int)strlen(n->string) + 1;
        } 
 
        if (-1 == snprintf(buf, sizeof(buf), "%dn", sz))

-               return(verr(m, ENUMFMT));
+               return(mdoc_nerr(m, m->last, ENUMFMT));

 
        /*
         * We have to dynamically add this to the macro's argument list.
 
        /*
         * We have to dynamically add this to the macro's argument list.


@@ -576,7 +553,7 @@ post_bl_tagwidth(struct mdoc *m)
                        n->args->argc * sizeof(struct mdoc_argv));
 
        if (NULL == n->args->argv)
                        n->args->argc * sizeof(struct mdoc_argv));
 
        if (NULL == n->args->argv)

-               return(verr(m, EMALLOC));
+               return(mdoc_nerr(m, m->last, EMALLOC));

 
        n->args->argv[sz].arg = MDOC_Width;
        n->args->argv[sz].line = m->last->line;
 
        n->args->argv[sz].arg = MDOC_Width;
        n->args->argv[sz].line = m->last->line;


@@ -585,9 +562,9 @@ post_bl_tagwidth(struct mdoc *m)
        n->args->argv[sz].value = calloc(1, sizeof(char *));
 
        if (NULL == n->args->argv[sz].value)
        n->args->argv[sz].value = calloc(1, sizeof(char *));
 
        if (NULL == n->args->argv[sz].value)

-               return(verr(m, EMALLOC));
+               return(mdoc_nerr(m, m->last, EMALLOC));

        if (NULL == (n->args->argv[sz].value[0] = strdup(buf)))
        if (NULL == (n->args->argv[sz].value[0] = strdup(buf)))

-               return(verr(m, EMALLOC));
+               return(mdoc_nerr(m, m->last, EMALLOC));

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


@@ -622,17 +599,17 @@ post_bl_width(struct mdoc *m)
        else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p)))
                return(1);
        else if (0 == (width = mdoc_macro2len(tok))) 
        else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p)))
                return(1);
        else if (0 == (width = mdoc_macro2len(tok))) 

-               return(vwarn(m, WNOWIDTH));
+               return(mdoc_nwarn(m, m->last, ENOWIDTH));

 
        /* The value already exists: free and reallocate it. */
 
        if (-1 == snprintf(buf, sizeof(buf), "%zun", width))
 
        /* The value already exists: free and reallocate it. */
 
        if (-1 == snprintf(buf, sizeof(buf), "%zun", width))

-               return(verr(m, ENUMFMT));
+               return(mdoc_nerr(m, m->last, ENUMFMT));

 
        free(m->last->args->argv[i].value[0]);
        m->last->args->argv[i].value[0] = strdup(buf);
        if (NULL == m->last->args->argv[i].value[0])
 
        free(m->last->args->argv[i].value[0]);
        m->last->args->argv[i].value[0] = strdup(buf);
        if (NULL == m->last->args->argv[i].value[0])

-               return(verr(m, EMALLOC));
+               return(mdoc_nerr(m, m->last, EMALLOC));

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


@@ -734,9 +711,9 @@ post_lk(POST_ARGS)
        
        n = m->last;
        m->next = MDOC_NEXT_CHILD;
        
        n = m->last;
        m->next = MDOC_NEXT_CHILD;

-       /* FIXME: this isn't documented anywhere! */
-       if ( ! mdoc_word_alloc(m, m->last->line,
-                               m->last->pos, "~"))
+
+       /* XXX: this isn't documented anywhere! */
+       if ( ! mdoc_word_alloc(m, m->last->line, m->last->pos, "~"))

                return(0);
 
        m->last = n;
                return(0);
 
        m->last = n;


@@ -755,12 +732,10 @@ post_ar(POST_ARGS)
        
        n = m->last;
        m->next = MDOC_NEXT_CHILD;
        
        n = m->last;
        m->next = MDOC_NEXT_CHILD;

-       if ( ! mdoc_word_alloc(m, m->last->line,
-                               m->last->pos, "file"))
+       if ( ! mdoc_word_alloc(m, m->last->line, m->last->pos, "file"))

                return(0);
        m->next = MDOC_NEXT_SIBLING;
                return(0);
        m->next = MDOC_NEXT_SIBLING;

-       if ( ! mdoc_word_alloc(m, m->last->line, 
-                               m->last->pos, "..."))
+       if ( ! mdoc_word_alloc(m, m->last->line, m->last->pos, "..."))

                return(0);
 
        m->last = n;
                return(0);
 
        m->last = n;


@@ -779,7 +754,7 @@ post_dd(POST_ARGS)
                return(0);
 
        if (0 == (m->meta.date = mdoc_atotime(buf))) {
                return(0);
 
        if (0 == (m->meta.date = mdoc_atotime(buf))) {

-               if ( ! vwarn(m, WBADDATE))
+               if ( ! mdoc_nwarn(m, m->last, EBADDATE))

                        return(0);
                m->meta.date = time(NULL);
        }
                        return(0);
                m->meta.date = time(NULL);
        }