X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/c951a3baf41ca0fd6820e85f468a6d6f4a07a2f9..3cd681acae540f380510bee14cd2ef802fbf4706:/validate.c?ds=sidebyside

diff --git a/validate.c b/validate.c
index 7b109965..ea91d92f 100644
--- a/validate.c
+++ b/validate.c
@@ -1,4 +1,4 @@
-/* $Id: validate.c,v 1.59 2009/02/25 11:37:05 kristaps Exp $ */
+/* $Id: validate.c,v 1.63 2009/02/27 09:39:40 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -52,7 +52,7 @@ static	int	check_msec(PRE_ARGS, int, enum mdoc_msec *);
 static	int	check_stdarg(PRE_ARGS);
 
 static	int	check_text(struct mdoc *, 
-			size_t, size_t, const char *);
+			int, int, const char *);
 
 static	int	err_child_lt(struct mdoc *, const char *, int);
 static	int	warn_child_lt(struct mdoc *, const char *, int);
@@ -278,7 +278,8 @@ mdoc_valid_pre(struct mdoc *mdoc,
 {
 	v_pre		*p;
 	struct mdoc_arg	*argv;
-	size_t		 argc, i, j, line, pos;
+	size_t		 argc;
+	int		 line, pos, i, j;
 	const char	*tp;
 
 	if (MDOC_TEXT == node->type) {
@@ -296,10 +297,10 @@ mdoc_valid_pre(struct mdoc *mdoc,
 			node->data.block.argc :
 			node->data.elem.argc;
 
-		for (i = 0; i < argc; i++) {
+		for (i = 0; i < (int)argc; i++) {
 			if (0 == argv[i].sz)
 				continue;
-			for (j = 0; j < argv[i].sz; j++) {
+			for (j = 0; j < (int)argv[i].sz; j++) {
 				tp = argv[i].value[j];
 				line = argv[i].line;
 				pos = argv[i].pos;
@@ -476,18 +477,20 @@ check_msec(PRE_ARGS, int sz, enum mdoc_msec *msecs)
 
 
 static int
-check_text(struct mdoc *mdoc, size_t line, size_t pos, const char *p)
+check_text(struct mdoc *mdoc, int line, int pos, const char *p)
 {
 	size_t		 c;
 
+	/* XXX - indicate deprecated escapes \*(xx and \*x. */
+
 	for ( ; *p; p++) {
-		if ( ! isprint(*p) && '\t' != *p)
+		if ( ! isprint((int)*p) && '\t' != *p)
 			return(mdoc_perr(mdoc, line, pos,
 					"invalid characters"));
 		if ('\\' != *p)
 			continue;
 		if ((c = mdoc_isescape(p))) {
-			p += (c - 1);
+			p += (int)c - 1;
 			continue;
 		}
 		return(mdoc_perr(mdoc, line, pos,
@@ -540,7 +543,7 @@ pre_display(PRE_ARGS)
 static int
 pre_bl(PRE_ARGS)
 {
-	int		 type, err, i;
+	int		 type, i, width, offset;
 	struct mdoc_arg	*argv;
 	size_t		 argc;
 
@@ -551,8 +554,10 @@ pre_bl(PRE_ARGS)
 
 	/* Make sure that only one type of list is specified.  */
 
+	type = offset = width = -1;
+
 	/* LINTED */
-	for (i = 0, type = err = 0; i < (int)argc; i++) {
+	for (i = 0; i < (int)argc; i++) {
 		argv = &n->data.block.argv[i];
 
 		switch (argv->arg) {
@@ -577,18 +582,60 @@ pre_bl(PRE_ARGS)
 		case (MDOC_Inset):
 			/* FALLTHROUGH */
 		case (MDOC_Column):
-			if (0 == type++)
+			if (-1 == type) {
+				type = argv->arg;
 				break;
+			}
 			return(mdoc_perr(mdoc, argv->line, argv->pos, 
 					"multiple types specified"));
+		case (MDOC_Width):
+			if (-1 == width) {
+				width = argv->arg;
+				break;
+			}
+			return(mdoc_perr(mdoc, argv->line, argv->pos, 
+					"multiple -%s arguments",
+					mdoc_argnames[MDOC_Width]));
+		case (MDOC_Offset):
+			if (-1 == offset) {
+				offset = argv->arg;
+				break;
+			}
+			return(mdoc_perr(mdoc, argv->line, argv->pos, 
+					"multiple -%s arguments",
+					mdoc_argnames[MDOC_Offset]));
 		default:
 			break;
 		}
 	}
 
-	if (type)
-		return(1);
-	return(mdoc_err(mdoc, "no type specified"));
+	if (-1 == type)
+		return(mdoc_err(mdoc, "no type specified"));
+
+	switch (type) {
+	case (MDOC_Column):
+		/* FALLTHROUGH */
+	case (MDOC_Diag):
+		/* FALLTHROUGH */
+	case (MDOC_Inset):
+		/* FALLTHROUGH */
+	case (MDOC_Item):
+		if (-1 == width)
+			break;
+		return(mdoc_nwarn(mdoc, n, WARN_SYNTAX,
+				"superfluous -%s argument",
+				mdoc_argnames[MDOC_Width]));
+	case (MDOC_Tag):
+		if (-1 != width)
+			break;
+		return(mdoc_nwarn(mdoc, n, WARN_SYNTAX,
+				"suggest -%s argument",
+				mdoc_argnames[MDOC_Width]));
+	default:
+		break;
+	}
+
+	return(1);
 }
 
 
@@ -659,7 +706,6 @@ static int
 pre_it(PRE_ARGS)
 {
 
-	/* TODO: -width attribute must be specified for -tag. */
 	/* TODO: children too big for -width? */
 
 	if (MDOC_BLOCK != n->type)