summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-08-20 08:59:12 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-08-20 08:59:12 +0000
commitf24d1eb949107ccd1cf44312815cdf8e34915d21 (patch)
treee1ecb3b3440d1149adc6a15db0e70e3cac458c9c
parent02f0d5e5ebc3cf8a76fdff04f091fdf0e32ec7ec (diff)
downloadmandoc-f24d1eb949107ccd1cf44312815cdf8e34915d21.tar.gz
mandoc-f24d1eb949107ccd1cf44312815cdf8e34915d21.tar.zst
mandoc-f24d1eb949107ccd1cf44312815cdf8e34915d21.zip
Delimiter whitespace is correctly flagged (required some special handling).
-rw-r--r--libmdoc.h8
-rw-r--r--mdoc_argv.c26
-rw-r--r--mdoc_macro.c6
3 files changed, 23 insertions, 17 deletions
diff --git a/libmdoc.h b/libmdoc.h
index 3aa7402d..eca0f54d 100644
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -1,4 +1,4 @@
-/* $Id: libmdoc.h,v 1.24 2009/08/19 14:09:33 kristaps Exp $ */
+/* $Id: libmdoc.h,v 1.25 2009/08/20 08:59:12 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -171,14 +171,16 @@ void mdoc_argv_free(struct mdoc_arg *);
int mdoc_args(struct mdoc *, int,
int *, char *, int, char **);
int mdoc_zargs(struct mdoc *, int,
- int *, char *, char **);
+ int *, char *, int, char **);
+#define ARGS_DELIM (1 << 1)
+#define ARGS_TABSEP (1 << 2)
+#define ARGS_NOWARN (1 << 3)
#define ARGS_ERROR (-1)
#define ARGS_EOLN (0)
#define ARGS_WORD (1)
#define ARGS_PUNCT (2)
#define ARGS_QWORD (3)
#define ARGS_PHRASE (4)
-
int mdoc_macroend(struct mdoc *);
__END_DECLS
diff --git a/mdoc_argv.c b/mdoc_argv.c
index e1b4ad4e..1efed9c4 100644
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_argv.c,v 1.22 2009/08/19 14:44:35 kristaps Exp $ */
+/* $Id: mdoc_argv.c,v 1.23 2009/08/20 08:59:12 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -32,9 +32,6 @@
* There's no limit to the number or arguments that may be allocated.
*/
-#define ARGS_DELIM (1 << 1)
-#define ARGS_TABSEP (1 << 2)
-
#define ARGV_NONE (1 << 0)
#define ARGV_SINGLE (1 << 1)
#define ARGV_MULTI (1 << 2)
@@ -325,10 +322,11 @@ mdoc_argv_free(struct mdoc_arg *p)
int
-mdoc_zargs(struct mdoc *m, int line, int *pos, char *buf, char **v)
+mdoc_zargs(struct mdoc *m, int line, int *pos,
+ char *buf, int flags, char **v)
{
- return(args(m, line, pos, buf, 0, v));
+ return(args(m, line, pos, buf, flags, v));
}
@@ -401,10 +399,14 @@ args(struct mdoc *m, int line, int *pos,
i++;
}
- /* FIXME: warn about trailing whitespace. */
-
if (0 == buf[i]) {
*v = &buf[*pos];
+ if (' ' != buf[i - 1])
+ return(ARGS_PUNCT);
+ if (ARGS_NOWARN & fl)
+ return(ARGS_PUNCT);
+ if ( ! mdoc_pwarn(m, line, *pos, ETAILWS))
+ return(ARGS_ERROR);
return(ARGS_PUNCT);
}
}
@@ -448,7 +450,7 @@ args(struct mdoc *m, int line, int *pos,
p = strchr(*v, 0);
/* Whitespace check for eoln case... */
- if (0 == *p && ' ' == *(p - 1))
+ if (0 == *p && ' ' == *(p - 1) && ! (ARGS_NOWARN & fl))
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS))
return(ARGS_ERROR);
@@ -488,6 +490,8 @@ args(struct mdoc *m, int line, int *pos,
}
if (0 == buf[*pos]) {
+ if (ARGS_NOWARN & fl)
+ return(ARGS_QWORD);
if ( ! mdoc_pwarn(m, line, *pos, EQUOTTERM))
return(ARGS_ERROR);
return(ARGS_QWORD);
@@ -501,7 +505,7 @@ args(struct mdoc *m, int line, int *pos,
while (' ' == buf[*pos])
(*pos)++;
- if (0 == buf[*pos])
+ if (0 == buf[*pos] && ! (ARGS_NOWARN & fl))
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS))
return(ARGS_ERROR);
@@ -525,7 +529,7 @@ args(struct mdoc *m, int line, int *pos,
while (' ' == buf[*pos])
(*pos)++;
- if (0 == buf[*pos])
+ if (0 == buf[*pos] && ! (ARGS_NOWARN & fl))
if ( ! mdoc_pwarn(m, line, *pos, ETAILWS))
return(ARGS_ERROR);
diff --git a/mdoc_macro.c b/mdoc_macro.c
index e6daa86b..a0d739c7 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -1,4 +1,4 @@
-/* $Id: mdoc_macro.c,v 1.32 2009/08/19 14:09:33 kristaps Exp $ */
+/* $Id: mdoc_macro.c,v 1.33 2009/08/20 08:59:12 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
@@ -600,7 +600,7 @@ append_delims(struct mdoc *mdoc, int line, int *pos, char *buf)
for (;;) {
lastarg = *pos;
- c = mdoc_args(mdoc, line, pos, buf, 0, &p);
+ c = mdoc_zargs(mdoc, line, pos, buf, ARGS_NOWARN, &p);
assert(ARGS_PHRASE != c);
if (ARGS_ERROR == c)
@@ -1326,7 +1326,7 @@ phrase(struct mdoc *m, int line, int ppos, char *buf)
la = pos;
/* Note: no calling context! */
- w = mdoc_zargs(m, line, &pos, buf, &p);
+ w = mdoc_zargs(m, line, &pos, buf, 0, &p);
if (ARGS_ERROR == w)
return(0);