Removed unnecessary test cases (most were for visual).

[mandoc.git] / argv.c

diff --git a/argv.c b/argv.c
index 69d2fa089af79856c5dee2519ecc48517bd33eaf..a2d6260803baadb73037418efe626adc2547d8b8 100644 (file)
--- a/argv.c
+++ b/argv.c
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.7 2009/01/05 16:11:14 kristaps Exp $ */
+/* $Id: argv.c,v 1.17 2009/01/19 17:02:58 kristaps Exp $ */

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


@@ -26,15 +26,21 @@
 #include "private.h"
 
 
 #include "private.h"
 
 

+/* FIXME: .It called with -column and quoted arguments. */
+

 static int              lookup(int, const char *);
 static int              lookup(int, const char *);

-static int              parse(struct mdoc *, int, 
+static int              parse(struct mdoc *, int,
+                               struct mdoc_arg *, int *, char *);
+static int              parse_single(struct mdoc *, int, 
+                               struct mdoc_arg *, int *, char *);
+static int              parse_multi(struct mdoc *, int, 

                                struct mdoc_arg *, int *, char *);
 static int              postparse(struct mdoc *, int, 
                                const struct mdoc_arg *, int);
 
 
 int
                                struct mdoc_arg *, int *, char *);
 static int              postparse(struct mdoc *, int, 
                                const struct mdoc_arg *, int);
 
 
 int

-mdoc_args(struct mdoc *mdoc, int tok, int *pos, char *buf, int fl, char **v)
+mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)

 {
        int              i;
 
 {
        int              i;
 


@@ -42,14 +48,18 @@ mdoc_args(struct mdoc *mdoc, int tok, int *pos, char *buf, int fl, char **v)
                return(ARGS_EOLN);
 
        if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED))
                return(ARGS_EOLN);
 
        if ('\"' == buf[*pos] && ! (fl & ARGS_QUOTED))

-               if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_QUOTED))
+               if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_SYNTAX, "unexpected quoted parameter"))

                        return(ARGS_ERROR);
 
        if ('-' == buf[*pos]) 
                        return(ARGS_ERROR);
 
        if ('-' == buf[*pos]) 

-               if ( ! mdoc_warn(mdoc, tok, *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])) {
                        return(ARGS_ERROR);
 
        if ((fl & ARGS_DELIM) && mdoc_iscdelim(buf[*pos])) {

+               /* 
+                * If ARGS_DELIM, return ARGS_PUNCT if only space-separated
+                * punctuation remains.  
+                */

                for (i = *pos; buf[i]; ) {
                        if ( ! mdoc_iscdelim(buf[i]))
                                break;
                for (i = *pos; buf[i]; ) {
                        if ( ! mdoc_iscdelim(buf[i]))
                                break;


@@ -66,30 +76,54 @@ mdoc_args(struct mdoc *mdoc, int tok, int *pos, char *buf, int fl, char **v)
                }
        }
 
                }
        }
 

-       /*
-        * Parse routine for non-quoted string.  
-        */
+       /* Parse routine for non-quoted string. */

 
 

-       if ('\"' != buf[*pos]) {
+       assert(*pos > 0);
+       if ('\"' != buf[*pos] || ! (ARGS_QUOTED & fl)) {

                *v = &buf[*pos];
 
                *v = &buf[*pos];
 

-               while (buf[*pos] && ! isspace(buf[*pos]))
-                       (*pos)++;
+               /* FIXME: UGLY tab-sep processing. */
+
+               if (ARGS_TABSEP & fl)
+                       while (buf[*pos]) {
+                               if ('\t' == buf[*pos])
+                                       break;
+                               if ('T' == buf[*pos]) {
+                                       (*pos)++;
+                                       if (0 == buf[*pos])
+                                               break;
+                                       if ('a' == buf[*pos]) {
+                                               buf[*pos - 1] = 0;
+                                               break;
+                                       }
+                               }
+                               (*pos)++;
+                       }
+               else {
+                       while (buf[*pos]) {
+                               if (isspace(buf[*pos]))
+                                       if ('\\' != buf[*pos - 1])
+                                               break;
+                               (*pos)++;
+                       }
+               }

 
                if (0 == buf[*pos])
                        return(ARGS_WORD);
 
                buf[(*pos)++] = 0;
 
                if (0 == buf[*pos])
                        return(ARGS_WORD);
 
                buf[(*pos)++] = 0;

+

                if (0 == buf[*pos])
                        return(ARGS_WORD);
 
                if (0 == buf[*pos])
                        return(ARGS_WORD);
 

-               while (buf[*pos] && isspace(buf[*pos]))
-                       (*pos)++;
+               if ( ! (ARGS_TABSEP & fl))
+                       while (buf[*pos] && isspace(buf[*pos]))
+                               (*pos)++;

 
                if (buf[*pos])
                        return(ARGS_WORD);
 
 
                if (buf[*pos])
                        return(ARGS_WORD);
 

-               if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_WS_EOLN))
+               if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_COMPAT, "whitespace at end-of-line"))

                        return(ARGS_ERROR);
 
                return(ARGS_WORD);
                        return(ARGS_ERROR);
 
                return(ARGS_WORD);


@@ -107,7 +141,7 @@ mdoc_args(struct mdoc *mdoc, int tok, int *pos, char *buf, int fl, char **v)
                (*pos)++;
 
        if (0 == buf[*pos]) {
                (*pos)++;
 
        if (0 == buf[*pos]) {

-               (void)mdoc_err(mdoc, tok, *pos, ERR_SYNTAX_UNQUOTE);
+               (void)mdoc_perr(mdoc, line, *pos, "unterminated quoted parameter");

                return(ARGS_ERROR);
        }
 
                return(ARGS_ERROR);
        }
 


@@ -121,7 +155,7 @@ mdoc_args(struct mdoc *mdoc, int tok, int *pos, char *buf, int fl, char **v)
        if (buf[*pos])
                return(ARGS_WORD);
 
        if (buf[*pos])
                return(ARGS_WORD);
 

-       if ( ! mdoc_warn(mdoc, tok, *pos, WARN_SYNTAX_WS_EOLN))
+       if ( ! mdoc_pwarn(mdoc, line, *pos, WARN_COMPAT, "whitespace at end-of-line"))

                return(ARGS_ERROR);
 
        return(ARGS_WORD);
                return(ARGS_ERROR);
 
        return(ARGS_WORD);


@@ -133,15 +167,6 @@ lookup(int tok, const char *argv)
 {
 
        switch (tok) {
 {
 
        switch (tok) {

-       case (MDOC_Bf):
-               if (xstrcmp(argv, "emphasis"))
-                       return(MDOC_Emphasis);
-               else if (xstrcmp(argv, "literal"))
-                       return(MDOC_Literal);
-               else if (xstrcmp(argv, "symbolic"))
-                       return(MDOC_Symbolic);
-               break;
-

        case (MDOC_An):
                if (xstrcmp(argv, "split"))
                        return(MDOC_Split);
        case (MDOC_An):
                if (xstrcmp(argv, "split"))
                        return(MDOC_Split);


@@ -154,6 +179,8 @@ lookup(int tok, const char *argv)
                        return(MDOC_Ragged);
                else if (xstrcmp(argv, "unfilled"))
                        return(MDOC_Unfilled);
                        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"))
                else if (xstrcmp(argv, "literal"))
                        return(MDOC_Literal);
                else if (xstrcmp(argv, "file"))


@@ -162,6 +189,15 @@ lookup(int tok, const char *argv)
                        return(MDOC_Offset);
                break;
 
                        return(MDOC_Offset);
                break;
 

+       case (MDOC_Bf):
+               if (xstrcmp(argv, "emphasis"))
+                       return(MDOC_Emphasis);
+               else if (xstrcmp(argv, "literal"))
+                       return(MDOC_Literal);
+               else if (xstrcmp(argv, "symbolic"))
+                       return(MDOC_Symbolic);
+               break;
+

        case (MDOC_Bk):
                if (xstrcmp(argv, "words"))
                        return(MDOC_Words);
        case (MDOC_Bk):
                if (xstrcmp(argv, "words"))
                        return(MDOC_Words);


@@ -283,8 +319,7 @@ lookup(int tok, const char *argv)
                break;
 
        default:
                break;
 
        default:

-               abort();
-               /* NOTREACHED */
+               break;

        }
 
        return(MDOC_ARG_MAX);
        }
 
        return(MDOC_ARG_MAX);


@@ -292,7 +327,7 @@ lookup(int tok, const char *argv)
 
 
 static int
 
 
 static int

-postparse(struct mdoc *mdoc, int tok, const struct mdoc_arg *v, int pos)
+postparse(struct mdoc *mdoc, int line, const struct mdoc_arg *v, int pos)

 {
 
        switch (v->arg) {
 {
 
        switch (v->arg) {


@@ -309,7 +344,7 @@ postparse(struct mdoc *mdoc, int tok, const struct mdoc_arg *v, int pos)
                        break;
                if (xstrcmp(v->value[0], "indent-two"))
                        break;
                        break;
                if (xstrcmp(v->value[0], "indent-two"))
                        break;

-               return(mdoc_err(mdoc, tok, pos, ERR_SYNTAX_ARGBAD));
+               return(mdoc_perr(mdoc, line, pos, "invalid offset value"));

        default:
                break;
        }
        default:
                break;
        }


@@ -319,63 +354,79 @@ postparse(struct mdoc *mdoc, int tok, const struct mdoc_arg *v, int pos)
 
 
 static int
 
 
 static int

-parse(struct mdoc *mdoc, int tok, 
+parse_multi(struct mdoc *mdoc, int line, 

                struct mdoc_arg *v, int *pos, char *buf)
 {
                struct mdoc_arg *v, int *pos, char *buf)
 {

+       int              c, ppos;

        char            *p;
        char            *p;

-       int              c, ppos, i;
+
+       v->sz = 0;
+       v->value = xcalloc(MDOC_LINEARG_MAX, sizeof(char *));

 
        ppos = *pos;
 
 
        ppos = *pos;
 

+       for (v->sz = 0; v->sz < MDOC_LINEARG_MAX; v->sz++) {
+               if ('-' == buf[*pos])
+                       break;
+               c = mdoc_args(mdoc, line, pos, buf, ARGS_QUOTED, &p);
+               if (ARGS_ERROR == c) {
+                       free(v->value);
+                       return(0);
+               } else if (ARGS_EOLN == c)
+                       break;
+               v->value[v->sz] = p;
+       }
+
+       if (0 < v->sz && v->sz < MDOC_LINEARG_MAX)
+               return(1);
+
+       free(v->value);
+       return(mdoc_perr(mdoc, line, ppos, 0 == v->sz ?
+                               "argument requires a value" :
+                               "too many values to argument"));
+}
+
+
+static int
+parse_single(struct mdoc *mdoc, int line, 
+               struct mdoc_arg *v, int *pos, char *buf)
+{
+       int              c, ppos;
+       char            *p;
+
+       ppos = *pos;
+
+       c = mdoc_args(mdoc, line, pos, buf, ARGS_QUOTED, &p);
+       if (ARGS_ERROR == c)
+               return(0);
+       if (ARGS_EOLN == c)
+               return(mdoc_perr(mdoc, line, ppos,  "argument requires a value"));
+
+       v->sz = 1;
+       v->value = xcalloc(1, sizeof(char *));
+       v->value[0] = p;
+       return(1);
+}
+
+
+static int
+parse(struct mdoc *mdoc, int line, 
+               struct mdoc_arg *v, int *pos, char *buf)
+{
+
+       v->sz = 0;
+       v->value = NULL;
+

        switch (v->arg) {
        case(MDOC_Std):
                /* FALLTHROUGH */
        case(MDOC_Width):
                /* FALLTHROUGH */
        case(MDOC_Offset):
        switch (v->arg) {
        case(MDOC_Std):
                /* FALLTHROUGH */
        case(MDOC_Width):
                /* FALLTHROUGH */
        case(MDOC_Offset):

-               /*
-                * This has a single value for an argument.
-                */
-               c = mdoc_args(mdoc, tok, pos, buf, ARGS_QUOTED, &p);
-               if (ARGS_ERROR == c)
-                       return(0);
-               else if (ARGS_EOLN == c)
-                       return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGVAL));
-                       
-               v->sz = 1;
-               v->value = xcalloc(1, sizeof(char *));
-               v->value[0] = p;
-               break;
-
+               return(parse_single(mdoc, line, v, pos, buf));

        case(MDOC_Column):
        case(MDOC_Column):

-               /*
-                * This has several value for a single argument.  We
-                * pre-allocate a pointer array and don't let it exceed
-                * this size.
-                */
-               v->sz = 0;
-               v->value = xcalloc(MDOC_LINEARG_MAX, sizeof(char *));
-               for (i = 0; i < MDOC_LINEARG_MAX; i++) {
-                       c = mdoc_args(mdoc, tok, pos, buf, ARGS_QUOTED, &p);
-                       if (ARGS_ERROR == c) {
-                               free(v->value);
-                               return(0);
-                       } else if (ARGS_EOLN == c)
-                               break;
-                       v->value[i] = p;
-               }
-               if (0 == i) {
-                       free(v->value);
-                       return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGVAL));
-               } else if (MDOC_LINEARG_MAX == i)
-                       return(mdoc_err(mdoc, tok, ppos, ERR_SYNTAX_ARGMANY));
-
-               v->sz = i;
-               break;
-
+               return(parse_multi(mdoc, line, v, pos, buf));

        default:
        default:

-               v->sz = 0;
-               v->value = NULL;

                break;
        }
 
                break;
        }
 


@@ -384,7 +435,7 @@ parse(struct mdoc *mdoc, int tok,
 
 
 int
 
 
 int

-mdoc_argv(struct mdoc *mdoc, int tok, 
+mdoc_argv(struct mdoc *mdoc, int line, int tok,

                struct mdoc_arg *v, int *pos, char *buf)
 {
        int              i, ppos;
                struct mdoc_arg *v, int *pos, char *buf)
 {
        int              i, ppos;


@@ -403,15 +454,24 @@ mdoc_argv(struct mdoc *mdoc, int tok,
        i = *pos;
        argv = &buf[++(*pos)];
 
        i = *pos;
        argv = &buf[++(*pos)];
 

-       while (buf[*pos] && ! isspace(buf[*pos]))
+       v->line = line;
+       v->pos = *pos;
+
+       assert(*pos > 0);
+       while (buf[*pos]) {
+               if (isspace(buf[*pos])) 
+                       if ('\\' != buf[*pos - 1])
+                               break;

                (*pos)++;
                (*pos)++;

+       }

 
        if (buf[*pos])
                buf[(*pos)++] = 0;
 
        if (MDOC_ARG_MAX == (v->arg = lookup(tok, argv))) {
 
        if (buf[*pos])
                buf[(*pos)++] = 0;
 
        if (MDOC_ARG_MAX == (v->arg = lookup(tok, argv))) {

-               (void)mdoc_err(mdoc, tok, i, ERR_SYNTAX_ARG);
-               return(ARGV_ERROR);
+               if ( ! mdoc_pwarn(mdoc, line, i, WARN_SYNTAX, "argument-like parameter"))
+                       return(ARGV_ERROR);
+               return(ARGV_WORD);

        }
 
        while (buf[*pos] && isspace(buf[*pos]))
        }
 
        while (buf[*pos] && isspace(buf[*pos]))


@@ -420,9 +480,9 @@ mdoc_argv(struct mdoc *mdoc, int tok,
        /* FIXME: whitespace if no value. */
 
        ppos = *pos;
        /* FIXME: whitespace if no value. */
 
        ppos = *pos;

-       if ( ! parse(mdoc, tok, v, pos, buf))
+       if ( ! parse(mdoc, line, v, pos, buf))

                return(ARGV_ERROR);
                return(ARGV_ERROR);

-       if ( ! postparse(mdoc, tok, v, ppos))
+       if ( ! postparse(mdoc, line, v, ppos))

                return(ARGV_ERROR);
 
        return(ARGV_ARG);
                return(ARGV_ERROR);
 
        return(ARGV_ARG);