Fix enum/int mixing.

[mandoc.git] / mdoc_argv.c

diff --git a/mdoc_argv.c b/mdoc_argv.c
index c7ca2e64b9773d05a38fe167ec8db0fb091fe6e6..3a36e4e9abc044314cf6fbd0a5fff81a528e20c2 100644 (file)
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_argv.c,v 1.49 2010/05/17 22:11:42 kristaps Exp $ */
+/*     $Id: mdoc_argv.c,v 1.60 2010/09/13 20:15:43 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>

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


@@ -45,7 +45,7 @@
 
 #define        MULTI_STEP       5
 
 
 #define        MULTI_STEP       5
 

-static int              argv_a2arg(enum mdoct, const char *);
+static enum mdocargt    argv_a2arg(enum mdoct, const char *);

 static enum margserr    args(struct mdoc *, int, int *, 
                                char *, int, char **);
 static int              argv(struct mdoc *, int, 
 static enum margserr    args(struct mdoc *, int, int *, 
                                char *, int, char **);
 static int              argv(struct mdoc *, int, 


@@ -95,7 +95,7 @@ static        int mdoc_argflags[MDOC_MAX] = {
        0, /* Os */
        0, /* Sh */
        0, /* Ss */ 
        0, /* Os */
        0, /* Sh */
        0, /* Ss */ 

-       ARGS_DELIM, /* Pp */ 
+       0, /* Pp */ 

        ARGS_DELIM, /* D1 */
        ARGS_DELIM, /* Dl */
        0, /* Bd */
        ARGS_DELIM, /* D1 */
        ARGS_DELIM, /* Dl */
        0, /* Bd */


@@ -196,7 +196,7 @@ static      int mdoc_argflags[MDOC_MAX] = {
        0, /* Fr */
        0, /* Ud */
        0, /* Lb */
        0, /* Fr */
        0, /* Ud */
        0, /* Lb */

-       ARGS_DELIM, /* Lp */
+       0, /* Lp */

        ARGS_DELIM, /* Lk */
        ARGS_DELIM, /* Mt */
        ARGS_DELIM, /* Brq */
        ARGS_DELIM, /* Lk */
        ARGS_DELIM, /* Mt */
        ARGS_DELIM, /* Brq */


@@ -210,6 +210,7 @@ static      int mdoc_argflags[MDOC_MAX] = {
        0, /* br */
        0, /* sp */
        0, /* %U */
        0, /* br */
        0, /* sp */
        0, /* %U */

+       0, /* Ta */

 };
 
 
 };
 
 


@@ -226,7 +227,7 @@ mdoc_argv(struct mdoc *m, int line, enum mdoct tok,
        struct mdoc_argv tmp;
        struct mdoc_arg  *arg;
 
        struct mdoc_argv tmp;
        struct mdoc_arg  *arg;
 

-       if (0 == buf[*pos])
+       if ('\0' == buf[*pos])

                return(ARGV_EOLN);
 
        assert(' ' != buf[*pos]);
                return(ARGV_EOLN);
 
        assert(' ' != buf[*pos]);


@@ -247,10 +248,10 @@ mdoc_argv(struct mdoc *m, int line, enum mdoct tok,
 
        /* XXX - save zeroed byte, if not an argument. */
 
 
        /* XXX - save zeroed byte, if not an argument. */
 

-       sv = 0;
+       sv = '\0';

        if (buf[*pos]) {
                sv = buf[*pos];
        if (buf[*pos]) {
                sv = buf[*pos];

-               buf[(*pos)++] = 0;
+               buf[(*pos)++] = '\0';

        }
 
        (void)memset(&tmp, 0, sizeof(struct mdoc_argv));
        }
 
        (void)memset(&tmp, 0, sizeof(struct mdoc_argv));


@@ -312,9 +313,11 @@ mdoc_argv_free(struct mdoc_arg *p)
 void
 mdoc_argn_free(struct mdoc_arg *p, int iarg)
 {
 void
 mdoc_argn_free(struct mdoc_arg *p, int iarg)
 {

-       struct mdoc_argv *arg = &p->argv[iarg];
+       struct mdoc_argv *arg;

        int               j;
 
        int               j;
 

+       arg = &p->argv[iarg];
+

        if (arg->sz && arg->value) {
                for (j = (int)arg->sz - 1; j >= 0; j--) 
                        free(arg->value[j]);
        if (arg->sz && arg->value) {
                for (j = (int)arg->sz - 1; j >= 0; j--) 
                        free(arg->value[j]);


@@ -339,7 +342,7 @@ enum margserr
 mdoc_args(struct mdoc *m, int line, int *pos, 
                char *buf, enum mdoct tok, char **v)
 {
 mdoc_args(struct mdoc *m, int line, int *pos, 
                char *buf, enum mdoct tok, char **v)
 {

-       int               fl, c, i;
+       int               fl;

        struct mdoc_node *n;
 
        fl = mdoc_argflags[tok];
        struct mdoc_node *n;
 
        fl = mdoc_argflags[tok];


@@ -347,26 +350,21 @@ mdoc_args(struct mdoc *m, int line, int *pos,
        if (MDOC_It != tok)
                return(args(m, line, pos, buf, fl, v));
 
        if (MDOC_It != tok)
                return(args(m, line, pos, buf, fl, v));
 

-       /* 
-        * The `It' macro is a special case, as it acquires parameters from its
-        * parent `Bl' context, specifically, we're concerned with -column.
+       /*
+        * We know that we're in an `It', so it's reasonable to expect
+        * us to be sitting in a `Bl'.  Someday this may not be the case
+        * (if we allow random `It's sitting out there), so provide a
+        * safe fall-back into the default behaviour.

         */
 
        for (n = m->last; n; n = n->parent)
         */
 
        for (n = m->last; n; n = n->parent)

-               if (MDOC_BLOCK == n->type && MDOC_Bl == n->tok)
+               if (MDOC_Bl == n->tok)

                        break;
 
                        break;
 

-       assert(n);
-       c = (int)(n->args ? n->args->argc : 0);
-       assert(c > 0);
-
-       /* LINTED */
-       for (i = 0; i < c; i++) {
-               if (MDOC_Column != n->args->argv[i].arg) 
-                       continue;
+       assert(n->data.Bl);
+       if (n && LIST_column == n->data.Bl->type) {

                fl |= ARGS_TABSEP;
                fl &= ~ARGS_DELIM;
                fl |= ARGS_TABSEP;
                fl &= ~ARGS_DELIM;

-               break;

        }
 
        return(args(m, line, pos, buf, fl, v));
        }
 
        return(args(m, line, pos, buf, fl, v));


@@ -377,9 +375,10 @@ static enum margserr
 args(struct mdoc *m, int line, int *pos, 
                char *buf, int fl, char **v)
 {
 args(struct mdoc *m, int line, int *pos, 
                char *buf, int fl, char **v)
 {

-       int               i;
-       char             *p, *pp;
-       enum margserr     rc;
+       int              i;
+       char            *p, *pp;
+       enum margserr    rc;
+       enum mdelim      d;

 
        /*
         * Parse out the terms (like `val' in `.Xx -arg val' or simply
 
        /*
         * Parse out the terms (like `val' in `.Xx -arg val' or simply


@@ -396,7 +395,6 @@ args(struct mdoc *m, int line, int *pos,
         *   phrases like in `Bl -column'.
         */
 
         *   phrases like in `Bl -column'.
         */
 

-       assert(*pos);

        assert(' ' != buf[*pos]);
 
        if ('\0' == buf[*pos]) {
        assert(' ' != buf[*pos]);
 
        if ('\0' == buf[*pos]) {


@@ -424,7 +422,7 @@ args(struct mdoc *m, int line, int *pos,
 
        if ((fl & ARGS_DELIM) && DELIM_CLOSE == mdoc_iscdelim(buf[*pos])) {
                for (i = *pos; buf[i]; ) {
 
        if ((fl & ARGS_DELIM) && DELIM_CLOSE == mdoc_iscdelim(buf[*pos])) {
                for (i = *pos; buf[i]; ) {

-                       enum mdelim d = mdoc_iscdelim(buf[i]);
+                       d = mdoc_iscdelim(buf[i]);

                        if (DELIM_NONE == d || DELIM_OPEN == d)
                                break;
                        i++;
                        if (DELIM_NONE == d || DELIM_OPEN == d)
                                break;
                        i++;


@@ -437,7 +435,7 @@ args(struct mdoc *m, int line, int *pos,
 
                if ('\0' == buf[i]) {
                        *v = &buf[*pos];
 
                if ('\0' == buf[i]) {
                        *v = &buf[*pos];

-                       if (' ' != buf[i - 1])
+                       if (i && ' ' != buf[i - 1])

                                return(ARGS_PUNCT);
                        if (ARGS_NOWARN & fl)
                                return(ARGS_PUNCT);
                                return(ARGS_PUNCT);
                        if (ARGS_NOWARN & fl)
                                return(ARGS_PUNCT);


@@ -468,7 +466,7 @@ args(struct mdoc *m, int line, int *pos,
                                        break;
                                if (pp > *v && ' ' != *(pp - 1))
                                        continue;
                                        break;
                                if (pp > *v && ' ' != *(pp - 1))
                                        continue;

-                               if (' ' == *(pp + 2) || 0 == *(pp + 2))
+                               if (' ' == *(pp + 2) || '\0' == *(pp + 2))

                                        break;
                        }
 
                                        break;
                        }
 


@@ -495,7 +493,7 @@ args(struct mdoc *m, int line, int *pos,
                }
 
                /* Whitespace check for eoln case... */
                }
 
                /* Whitespace check for eoln case... */

-               if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl))
+               if ('\0' == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl))

                        if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
                                return(ARGS_ERROR);
 
                        if ( ! mdoc_pmsg(m, line, *pos, MANDOCERR_EOLNSPACE))
                                return(ARGS_ERROR);
 


@@ -568,7 +566,7 @@ args(struct mdoc *m, int line, int *pos,
         */
 
        for ( ; buf[*pos]; (*pos)++)
         */
 
        for ( ; buf[*pos]; (*pos)++)

-               if (' ' == buf[*pos] && '\\' != buf[*pos - 1])
+               if (*pos && ' ' == buf[*pos] && '\\' != buf[*pos - 1])

                        break;
 
        if ('\0' == buf[*pos])
                        break;
 
        if ('\0' == buf[*pos])


@@ -587,7 +585,7 @@ args(struct mdoc *m, int line, int *pos,
 }
 
 
 }
 
 

-static int
+static enum mdocargt

 argv_a2arg(enum mdoct tok, const char *p)
 {
 
 argv_a2arg(enum mdoct tok, const char *p)
 {