Fixed delimiter end-of-line parsing.

[mandoc.git] / argv.c

diff --git a/argv.c b/argv.c
index 5564d8678b8fe9a3ae7f0690f180e987407f2df5..8ad5d662ff223b4d3e4b395cbfdcd3be45bec86c 100644 (file)
--- a/argv.c
+++ b/argv.c
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.26 2009/01/22 14:56:21 kristaps Exp $ */
+/* $Id: argv.c,v 1.34 2009/02/28 12:16:02 kristaps Exp $ */

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


@@ -26,17 +26,16 @@
 #include "private.h"
 
 /*
 #include "private.h"
 
 /*

- * Parse arguments and parameters of macros.  Arguments follow the
- * syntax of `-arg [val [valN...]]', while parameters are free-form text
- * following arguments (if any).  This file must correctly handle the
- * strange punctuation rules dictated by groff.
+ * Routines to parse arguments of macros.  Arguments follow the syntax
+ * of `-arg [val [valN...]]'.  Arguments come in all types:  quoted
+ * arguments, multiple arguments per value, no-value arguments, etc.

  */
 
 #define        ARGS_QUOTED     (1 << 0)
 #define        ARGS_DELIM      (1 << 1)
 #define        ARGS_TABSEP     (1 << 2)
 
  */
 
 #define        ARGS_QUOTED     (1 << 0)
 #define        ARGS_DELIM      (1 << 1)
 #define        ARGS_TABSEP     (1 << 2)
 

-static int              lookup(int, const char *);
+static int              argv_a2arg(int, const char *);

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


@@ -45,8 +44,6 @@ static        int              argv_single(struct mdoc *, int,
                                struct mdoc_arg *, int *, char *);
 static int              argv_multi(struct mdoc *, int, 
                                struct mdoc_arg *, int *, char *);
                                struct mdoc_arg *, int *, char *);
 static int              argv_multi(struct mdoc *, int, 
                                struct mdoc_arg *, int *, char *);

-static int              postargv(struct mdoc *, int, 
-                               const struct mdoc_arg *, int);

 static int              pwarn(struct mdoc *, int, int, int);
 static int              perr(struct mdoc *, int, int, int);
 
 static int              pwarn(struct mdoc *, int, int, int);
 static int              perr(struct mdoc *, int, int, int);
 


@@ -60,9 +57,8 @@ static        int              perr(struct mdoc *, int, int, int);
 /* Error messages. */
 
 #define        EQUOTTERM       (0)
 /* Error messages. */
 
 #define        EQUOTTERM       (0)

-#define        EOFFSET         (1)
-#define        EARGVAL         (2)
-#define        EARGMANY        (3)
+#define        EARGVAL         (1)
+#define        EARGMANY        (2)

 
 static int mdoc_argflags[MDOC_MAX] = {
        0, /* \" */
 
 static int mdoc_argflags[MDOC_MAX] = {
        0, /* \" */


@@ -78,7 +74,7 @@ static        int mdoc_argflags[MDOC_MAX] = {
        0, /* Ed */
        0, /* Bl */
        0, /* El */
        0, /* Ed */
        0, /* Bl */
        0, /* El */

-       ARGS_DELIM, /* It */
+       0, /* It */

        ARGS_DELIM, /* Ad */ 
        ARGS_DELIM, /* An */
        ARGS_DELIM, /* Ar */
        ARGS_DELIM, /* Ad */ 
        ARGS_DELIM, /* An */
        ARGS_DELIM, /* Ar */


@@ -184,10 +180,6 @@ perr(struct mdoc *mdoc, int line, int pos, int code)
                c = mdoc_perr(mdoc, line, pos, 
                                "unterminated quoted parameter");
                break;
                c = mdoc_perr(mdoc, line, pos, 
                                "unterminated quoted parameter");
                break;

-       case (EOFFSET):
-               c = mdoc_perr(mdoc, line, pos, 
-                               "invalid value for offset argument");
-               break;

        case (EARGVAL):
                c = mdoc_perr(mdoc, line, pos, 
                                "argument requires a value");
        case (EARGVAL):
                c = mdoc_perr(mdoc, line, pos, 
                                "argument requires a value");


@@ -275,7 +267,7 @@ static int
 args(struct mdoc *mdoc, int line, 
                int *pos, char *buf, int fl, char **v)
 {
 args(struct mdoc *mdoc, int line, 
                int *pos, char *buf, int fl, char **v)
 {

-       int               i, c;
+       int               i;

        char             *p, *pp;
 
        assert(*pos > 0);
        char             *p, *pp;
 
        assert(*pos > 0);


@@ -298,14 +290,15 @@ args(struct mdoc *mdoc, int line,
         */
 
        if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) {
         */
 
        if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) {

-               for (i = *pos; (c = buf[i]); ) {
-                       if ( ! mdoc_iscdelim(c))
+               for (i = *pos; buf[i]; ) {
+                       if ( ! mdoc_iscdelim(buf[i]))

                                break;
                        i++;
                                break;
                        i++;

-                       if (0 == buf[i] || ! isspace(c))
+                       /* There must be at least one space... */
+                       if (0 == buf[i] || ! isspace((int)buf[i]))

                                break;
                        i++;
                                break;
                        i++;

-                       while (buf[i] && isspace(c))
+                       while (buf[i] && isspace((int)buf[i]))

                                i++;
                }
                if (0 == buf[i]) {
                                i++;
                }
                if (0 == buf[i]) {


@@ -383,7 +376,7 @@ args(struct mdoc *mdoc, int line,
                                        p++;
                                if (0 != *p)
                                        *(p - 1) = 0;
                                        p++;
                                if (0 != *p)
                                        *(p - 1) = 0;

-                               *pos += p - *v;
+                               *pos += (int)(p - *v);

                        } 
 
                        if (p && 0 == *p)
                        } 
 
                        if (p && 0 == *p)


@@ -404,7 +397,7 @@ args(struct mdoc *mdoc, int line,
                        if (p > *v && ' ' == *(p - 1))
                                if ( ! pwarn(mdoc, line, *pos, WTAILWS))
                                        return(0);
                        if (p > *v && ' ' == *(p - 1))
                                if ( ! pwarn(mdoc, line, *pos, WTAILWS))
                                        return(0);

-                       *pos += p - *v;
+                       *pos += (int)(p - *v);

 
                        return(ARGS_WORD);
                } 
 
                        return(ARGS_WORD);
                } 


@@ -412,8 +405,8 @@ args(struct mdoc *mdoc, int line,
                /* Do non-tabsep look-ahead here. */
                
                if ( ! (ARGS_TABSEP & fl))
                /* Do non-tabsep look-ahead here. */
                
                if ( ! (ARGS_TABSEP & fl))

-                       while ((c = buf[*pos])) {
-                               if (isspace(c))
+                       while (buf[*pos]) {
+                               if (isspace((int)buf[*pos]))

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


@@ -474,7 +467,7 @@ args(struct mdoc *mdoc, int line,
 
 
 static int
 
 
 static int

-lookup(int tok, const char *argv)
+argv_a2arg(int tok, const char *argv)

 {
 
        switch (tok) {
 {
 
        switch (tok) {


@@ -637,33 +630,6 @@ lookup(int tok, const char *argv)
 }
 
 
 }
 
 

-static int
-postargv(struct mdoc *mdoc, int line, const struct mdoc_arg *v, int pos)
-{
-
-       switch (v->arg) {
-       case (MDOC_Offset):
-               assert(v->value);
-               assert(v->value[0]);
-               if (xstrcmp(v->value[0], "left"))
-                       break;
-               if (xstrcmp(v->value[0], "right"))
-                       break;
-               if (xstrcmp(v->value[0], "center"))
-                       break;
-               if (xstrcmp(v->value[0], "indent"))
-                       break;
-               if (xstrcmp(v->value[0], "indent-two"))
-                       break;
-               return(perr(mdoc, line, pos, EOFFSET));
-       default:
-               break;
-       }
-
-       return(1);
-}
-
-

 static int
 argv_multi(struct mdoc *mdoc, int line, 
                struct mdoc_arg *v, int *pos, char *buf)
 static int
 argv_multi(struct mdoc *mdoc, int line, 
                struct mdoc_arg *v, int *pos, char *buf)


@@ -685,7 +651,7 @@ argv_multi(struct mdoc *mdoc, int line,
                        return(0);
                } else if (ARGS_EOLN == c)
                        break;
                        return(0);
                } else if (ARGS_EOLN == c)
                        break;

-               v->value[v->sz] = p;
+               v->value[(int)v->sz] = p;

        }
 
        if (0 < v->sz && v->sz < MDOC_LINEARG_MAX)
        }
 
        if (0 < v->sz && v->sz < MDOC_LINEARG_MAX)


@@ -750,7 +716,7 @@ int
 mdoc_argv(struct mdoc *mdoc, int line, int tok,
                struct mdoc_arg *v, int *pos, char *buf)
 {
 mdoc_argv(struct mdoc *mdoc, int line, int tok,
                struct mdoc_arg *v, int *pos, char *buf)
 {

-       int              i, ppos;
+       int              i;

        char            *p;
 
        (void)memset(v, 0, sizeof(struct mdoc_arg));
        char            *p;
 
        (void)memset(v, 0, sizeof(struct mdoc_arg));


@@ -782,7 +748,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
        if (buf[*pos])
                buf[(*pos)++] = 0;
 
        if (buf[*pos])
                buf[(*pos)++] = 0;
 

-       if (MDOC_ARG_MAX == (v->arg = lookup(tok, p))) {
+       if (MDOC_ARG_MAX == (v->arg = argv_a2arg(tok, p))) {

                if ( ! pwarn(mdoc, line, i, WARGVPARM))
                        return(ARGV_ERROR);
                return(ARGV_WORD);
                if ( ! pwarn(mdoc, line, i, WARGVPARM))
                        return(ARGV_ERROR);
                return(ARGV_WORD);


@@ -793,11 +759,8 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
 
        /* FIXME: whitespace if no value. */
 
 
        /* FIXME: whitespace if no value. */
 

-       ppos = *pos;

        if ( ! argv(mdoc, line, v, pos, buf))
                return(ARGV_ERROR);
        if ( ! argv(mdoc, line, v, pos, buf))
                return(ARGV_ERROR);

-       if ( ! postargv(mdoc, line, v, ppos))
-               return(ARGV_ERROR);

 
        return(ARGV_ARG);
 }
 
        return(ARGV_ARG);
 }