Removed unnecessary test cases (most were for visual).

[mandoc.git] / argv.c

diff --git a/argv.c b/argv.c
index 26b65b57b5f90cfbf273cfa10e7d5b7fcfb448d7..a2d6260803baadb73037418efe626adc2547d8b8 100644 (file)
--- a/argv.c
+++ b/argv.c
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.12 2009/01/12 16:39:57 kristaps Exp $ */
+/* $Id: argv.c,v 1.17 2009/01/19 17:02:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -26,8 +26,10 @@
 #include "private.h"
 
 
+/* FIXME: .It called with -column and quoted arguments. */
+
 static int              lookup(int, const char *);
-static int              parse(struct mdoc *, int, int,
+static int              parse(struct mdoc *, int,
                                struct mdoc_arg *, int *, char *);
 static int              parse_single(struct mdoc *, int, 
                                struct mdoc_arg *, int *, char *);
@@ -46,11 +48,11 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
                return(ARGS_EOLN);
 
        if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED))
-               if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX_QUOTED))
+               if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX, "unexpected quoted parameter"))
                        return(ARGS_ERROR);
 
        if ('-' == buf[*pos]) 
-               if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX_ARGLIKE))
+               if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX, "argument-like parameter"))
                        return(ARGS_ERROR);
 
        if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) {
@@ -76,7 +78,8 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
 
        /* Parse routine for non-quoted string. */
 
-       if ('\"' != buf[*pos]) {
+       assert(*pos > 0);
+       if ('\"' != buf[*pos] || ! (ARGS_QUOTED & fl)) {
                *v = &buf[*pos];
 
                /* FIXME: UGLY tab-sep processing. */
@@ -96,9 +99,14 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
                                }
                                (*pos)++;
                        }
-               else
-                       while (buf[*pos] && ! isspace(buf[*pos]))
+               else {
+                       while (buf[*pos]) {
+                               if (isspace(buf[*pos]))
+                                       if ('\\' != buf[*pos - 1])
+                                               break;
                                (*pos)++;
+                       }
+               }
 
                if (0 == buf[*pos])
                        return(ARGS_WORD);
@@ -115,7 +123,7 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
                if (buf[*pos])
                        return(ARGS_WORD);
 
-               if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX_WS_EOLN))
+               if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_COMPAT, "whitespace at end-of-line"))
                        return(ARGS_ERROR);
 
                return(ARGS_WORD);
@@ -127,15 +135,13 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
         * error.  After, parse to the next word.  
         */
 
-       assert( ! (ARGS_TABSEP & fl));
-
        *v = &buf[++(*pos)];
 
        while (buf[*pos] && '\"' != buf[*pos])
                (*pos)++;
 
        if (0 == buf[*pos]) {
-               (void)mdoc_perr(mdoc, line, *pos, ERR_SYNTAX_UNQUOTE);
+               (void)mdoc_perr(mdoc, line, *pos, "unterminated quoted parameter");
                return(ARGS_ERROR);
        }
 
@@ -149,7 +155,7 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
        if (buf[*pos])
                return(ARGS_WORD);
 
-       if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX_WS_EOLN))
+       if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_COMPAT, "whitespace at end-of-line"))
                return(ARGS_ERROR);
 
        return(ARGS_WORD);
@@ -173,6 +179,8 @@ lookup(int tok, const char *argv)
                        return(MDOC_Ragged);
                else if (xstrcmp(argv, "unfilled"))
                        return(MDOC_Unfilled);
+               else if (xstrcmp(argv, "filled"))
+                       return(MDOC_Filled);
                else if (xstrcmp(argv, "literal"))
                        return(MDOC_Literal);
                else if (xstrcmp(argv, "file"))
@@ -336,7 +344,7 @@ postparse(struct mdoc *mdoc, int line, const struct mdoc_arg *v, int pos)
                        break;
                if (xstrcmp(v->value[0], "indent-two"))
                        break;
-               return(mdoc_perr(mdoc, line, pos, ERR_SYNTAX_ARGBAD));
+               return(mdoc_perr(mdoc, line, pos, "invalid offset value"));
        default:
                break;
        }
@@ -372,9 +380,10 @@ parse_multi(struct mdoc *mdoc, int line,
        if (0 < v->sz && v->sz < MDOC_LINEARG_MAX)
                return(1);
 
-       c = 0 == v->sz ? ERR_SYNTAX_ARGVAL : ERR_SYNTAX_ARGMANY;
        free(v->value);
-       return(mdoc_perr(mdoc, line, ppos, c));
+       return(mdoc_perr(mdoc, line, ppos, 0 == v->sz ?
+                               "argument requires a value" :
+                               "too many values to argument"));
 }
 
 
@@ -391,7 +400,7 @@ parse_single(struct mdoc *mdoc, int line,
        if (ARGS_ERROR == c)
                return(0);
        if (ARGS_EOLN == c)
-               return(mdoc_perr(mdoc, line, ppos, ERR_SYNTAX_ARGVAL));
+               return(mdoc_perr(mdoc, line, ppos,  "argument requires a value"));
 
        v->sz = 1;
        v->value = xcalloc(1, sizeof(char *));
@@ -401,7 +410,7 @@ parse_single(struct mdoc *mdoc, int line,
 
 
 static int
-parse(struct mdoc *mdoc, int line, int tok, 
+parse(struct mdoc *mdoc, int line, 
                struct mdoc_arg *v, int *pos, char *buf)
 {
 
@@ -448,14 +457,20 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
        v->line = line;
        v->pos = *pos;
 
-       while (buf[*pos] && ! isspace(buf[*pos]))
+       assert(*pos > 0);
+       while (buf[*pos]) {
+               if (isspace(buf[*pos])) 
+                       if ('\\' != buf[*pos - 1])
+                               break;
                (*pos)++;
+       }
 
        if (buf[*pos])
                buf[(*pos)++] = 0;
 
        if (MDOC_ARG_MAX == (v->arg = lookup(tok, argv))) {
-               (void)mdoc_pwarn(mdoc, line, i, WARN_SYNTAX_ARGLIKE);
+               if ( ! mdoc_pwarn(mdoc, line, i, WARN_SYNTAX, "argument-like parameter"))
+                       return(ARGV_ERROR);
                return(ARGV_WORD);
        }
 
@@ -465,7 +480,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
        /* FIXME: whitespace if no value. */
 
        ppos = *pos;
-       if ( ! parse(mdoc, line, tok, v, pos, buf))
+       if ( ! parse(mdoc, line, v, pos, buf))
                return(ARGV_ERROR);
        if ( ! postparse(mdoc, line, v, ppos))
                return(ARGV_ERROR);