Removed unnecessary test cases (most were for visual).

[mandoc.git] / argv.c

diff --git a/argv.c b/argv.c
index 5c944a58a30caafcd4ed348b9d2b15b969185803..a2d6260803baadb73037418efe626adc2547d8b8 100644 (file)
--- a/argv.c
+++ b/argv.c
@@ -1,4 +1,4 @@
-/* $Id: argv.c,v 1.15 2009/01/16 12:23:25 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>
  *


@@ -29,7 +29,7 @@
 /* FIXME: .It called with -column and quoted arguments. */
 
 static int              lookup(int, const char *);
 /* 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 *);
                                struct mdoc_arg *, int *, char *);
 static int              parse_single(struct mdoc *, int, 
                                struct mdoc_arg *, int *, char *);


@@ -78,7 +78,8 @@ mdoc_args(struct mdoc *mdoc, int line, 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];
 
                /* FIXME: UGLY tab-sep processing. */
                *v = &buf[*pos];
 
                /* FIXME: UGLY tab-sep processing. */


@@ -98,9 +99,14 @@ mdoc_args(struct mdoc *mdoc, int line, int *pos, char *buf, int fl, char **v)
                                }
                                (*pos)++;
                        }
                                }
                                (*pos)++;
                        }

-               else
-                       while (buf[*pos] && ! isspace(buf[*pos]))
+               else {
+                       while (buf[*pos]) {
+                               if (isspace(buf[*pos]))
+                                       if ('\\' != buf[*pos - 1])
+                                               break;

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

+                       }
+               }

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


@@ -404,7 +410,7 @@ parse_single(struct mdoc *mdoc, int line,
 
 
 static int
 
 
 static int

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

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


@@ -451,8 +457,13 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
        v->line = line;
        v->pos = *pos;
 
        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)++;
                (*pos)++;

+       }

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


@@ -469,7 +480,7 @@ mdoc_argv(struct mdoc *mdoc, int line, int tok,
        /* FIXME: whitespace if no value. */
 
        ppos = *pos;
        /* 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);
                return(ARGV_ERROR);
        if ( ! postparse(mdoc, line, v, ppos))
                return(ARGV_ERROR);