mdoc_atosec -> mdoc_str2sec (consistent with str2 being different from a2).

[mandoc.git] / mdoc_argv.c

diff --git a/mdoc_argv.c b/mdoc_argv.c
index da4b4b124da1cca446ae4a494b8758690b2fe8ce..96ccef17d884c6d6b72023784574ce9e12e586b4 100644 (file)
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_argv.c,v 1.38 2010/05/07 05:34:56 kristaps Exp $ */
+/*     $Id: mdoc_argv.c,v 1.45 2010/05/09 21:06:50 kristaps Exp $ */

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


@@ -45,7 +45,7 @@
 #define        MULTI_STEP       5
 
 static int              argv_a2arg(enum mdoct, const char *);
 #define        MULTI_STEP       5
 
 static int              argv_a2arg(enum mdoct, const char *);

-static enum margerr     args(struct mdoc *, int, int *, 
+static enum margserr    args(struct mdoc *, int, int *, 

                                char *, int, char **);
 static int              argv(struct mdoc *, int, 
                                struct mdoc_argv *, int *, char *);
                                char *, int, char **);
 static int              argv(struct mdoc *, int, 
                                struct mdoc_argv *, int *, char *);


@@ -217,7 +217,7 @@ static      int mdoc_argflags[MDOC_MAX] = {
  * [value0...], which may either have a single mandatory value, at least
  * one mandatory value, an optional single value, or no value.
  */
  * [value0...], which may either have a single mandatory value, at least
  * one mandatory value, an optional single value, or no value.
  */

-int
+enum margverr

 mdoc_argv(struct mdoc *m, int line, enum mdoct tok,
                struct mdoc_arg **v, int *pos, char *buf)
 {
 mdoc_argv(struct mdoc *m, int line, enum mdoct tok,
                struct mdoc_arg **v, int *pos, char *buf)
 {


@@ -325,7 +325,7 @@ mdoc_argn_free(struct mdoc_arg *p, int iarg)
 }
 
 
 }
 
 

-enum margerr
+enum margserr

 mdoc_zargs(struct mdoc *m, int line, int *pos, 
                char *buf, int flags, char **v)
 {
 mdoc_zargs(struct mdoc *m, int line, int *pos, 
                char *buf, int flags, char **v)
 {


@@ -334,7 +334,7 @@ mdoc_zargs(struct mdoc *m, int line, int *pos,
 }
 
 
 }
 
 

-enum margerr
+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)
 {


@@ -372,12 +372,13 @@ mdoc_args(struct mdoc *m, int line, int *pos,
 }
 
 
 }
 
 

-static enum margerr
+static enum margserr

 args(struct mdoc *m, int line, int *pos, 
                char *buf, int fl, char **v)
 {
        int               i;
        char             *p, *pp;
 args(struct mdoc *m, int line, int *pos, 
                char *buf, int fl, char **v)
 {
        int               i;
        char             *p, *pp;

+       enum margserr     rc;

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


@@ -397,13 +398,14 @@ args(struct mdoc *m, int line, int *pos,
        assert(*pos);
        assert(' ' != buf[*pos]);
 
        assert(*pos);
        assert(' ' != buf[*pos]);
 

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

                return(ARGS_EOLN);
 
        /* 
                return(ARGS_EOLN);
 
        /* 

-        * If the first character is a delimiter and we're to look for
-        * delimited strings, then pass down the buffer seeing if it
-        * follows the pattern of [[::delim::][ ]+]+.
+        * If the first character is a closing delimiter and we're to
+        * look for delimited strings, then pass down the buffer seeing
+        * if it follows the pattern of [[::delim::][ ]+]+.  Note that
+        * we ONLY care about closing delimiters.

         */
 
        if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos]) > 1) {
         */
 
        if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos]) > 1) {


@@ -411,14 +413,14 @@ args(struct mdoc *m, int line, int *pos,
                        if ( mdoc_iscdelim(buf[i]) < 2)
                                break;
                        i++;
                        if ( mdoc_iscdelim(buf[i]) < 2)
                                break;
                        i++;

-                       if (0 == buf[i] || ' ' != buf[i])
+                       if ('\0' == buf[i] || ' ' != buf[i])

                                break;
                        i++;
                        while (buf[i] && ' ' == buf[i])
                                i++;
                }
 
                                break;
                        i++;
                        while (buf[i] && ' ' == buf[i])
                                i++;
                }
 

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

                        *v = &buf[*pos];
                        if (' ' != buf[i - 1])
                                return(ARGS_PUNCT);
                        *v = &buf[*pos];
                        if (' ' != buf[i - 1])
                                return(ARGS_PUNCT);


@@ -453,20 +455,27 @@ args(struct mdoc *m, int line, int *pos,
                                break;
                }
 
                                break;
                }
 

+               /* By default, assume a phrase. */
+               rc = ARGS_PHRASE;
+

                /* 
                 * Adjust new-buffer position to be beyond delimiter
                 * mark (e.g., Ta -> end + 2).
                 */
                if (p && pp) {
                        *pos += pp < p ? 2 : 1;
                /* 
                 * Adjust new-buffer position to be beyond delimiter
                 * mark (e.g., Ta -> end + 2).
                 */
                if (p && pp) {
                        *pos += pp < p ? 2 : 1;

+                       rc = pp < p ? ARGS_PHRASE : ARGS_PPHRASE;

                        p = pp < p ? pp : p;
                } else if (p && ! pp) {
                        p = pp < p ? pp : p;
                } else if (p && ! pp) {

+                       rc = ARGS_PPHRASE;

                        *pos += 1;
                } else if (pp && ! p) {
                        p = pp;
                        *pos += 2;
                        *pos += 1;
                } else if (pp && ! p) {
                        p = pp;
                        *pos += 2;

-               } else
+               } else {
+                       rc = ARGS_PEND;

                        p = strchr(*v, 0);
                        p = strchr(*v, 0);

+               }

 
                /* Whitespace check for eoln case... */
                if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl))
 
                /* Whitespace check for eoln case... */
                if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl))


@@ -488,7 +497,7 @@ args(struct mdoc *m, int line, int *pos,
                for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++)
                        /* Skip ahead. */ ;
 
                for (pp = &buf[*pos]; ' ' == *pp; pp++, (*pos)++)
                        /* Skip ahead. */ ;
 

-               return(ARGS_PHRASE);
+               return(rc);

        } 
 
        /* 
        } 
 
        /* 


@@ -660,16 +669,16 @@ static int
 argv_multi(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {
 argv_multi(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {

-       int              c;
+       enum margserr    ac;

        char            *p;
 
        for (v->sz = 0; ; v->sz++) {
                if ('-' == buf[*pos])
                        break;
        char            *p;
 
        for (v->sz = 0; ; v->sz++) {
                if ('-' == buf[*pos])
                        break;

-               c = args(m, line, pos, buf, 0, &p);
-               if (ARGS_ERROR == c)
+               ac = args(m, line, pos, buf, 0, &p);
+               if (ARGS_ERROR == ac)

                        return(0);
                        return(0);

-               else if (ARGS_EOLN == c)
+               else if (ARGS_EOLN == ac)

                        break;
 
                if (0 == v->sz % MULTI_STEP)
                        break;
 
                if (0 == v->sz % MULTI_STEP)


@@ -687,16 +696,16 @@ static int
 argv_opt_single(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {
 argv_opt_single(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {

-       int              c;
+       enum margserr    ac;

        char            *p;
 
        if ('-' == buf[*pos])
                return(1);
 
        char            *p;
 
        if ('-' == buf[*pos])
                return(1);
 

-       c = args(m, line, pos, buf, 0, &p);
-       if (ARGS_ERROR == c)
+       ac = args(m, line, pos, buf, 0, &p);
+       if (ARGS_ERROR == ac)

                return(0);
                return(0);

-       if (ARGS_EOLN == c)
+       if (ARGS_EOLN == ac)

                return(1);
 
        v->sz = 1;
                return(1);
 
        v->sz = 1;


@@ -714,15 +723,16 @@ static int
 argv_single(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {
 argv_single(struct mdoc *m, int line, 
                struct mdoc_argv *v, int *pos, char *buf)
 {

-       int              c, ppos;
+       int              ppos;
+       enum margserr    ac;

        char            *p;
 
        ppos = *pos;
 
        char            *p;
 
        ppos = *pos;
 

-       c = args(m, line, pos, buf, 0, &p);
-       if (ARGS_ERROR == c)
+       ac = args(m, line, pos, buf, 0, &p);
+       if (ARGS_ERROR == ac)

                return(0);
                return(0);

-       if (ARGS_EOLN == c)
+       if (ARGS_EOLN == ac)

                return(mdoc_perr(m, line, ppos, EARGVAL));
 
        v->sz = 1;
                return(mdoc_perr(m, line, ppos, EARGVAL));
 
        v->sz = 1;