X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=format_check.c;h=eb162af65892a663b1373f8ddac700d73423d6ee;hb=4e7388340b9736320d2cff17cf26c9ee15af255e;hp=2e85c0bddde9a7d3a06c4d12a84eeb2190c43c9c;hpb=b059877708b2c34e6926702cac65f0c0b54683e8;p=cparser

diff --git a/format_check.c b/format_check.c
index 2e85c0b..eb162af 100644
--- a/format_check.c
+++ b/format_check.c
@@ -145,17 +145,15 @@ static bool atend(vchar_t *self) {
 /**
  * Check printf-style format.
  */
-static void check_format_arguments(const call_argument_t *arg, unsigned idx_fmt, unsigned idx_param)
+static void check_format_arguments(const call_argument_t *arg, unsigned idx_fmt,
+		unsigned idx_param)
 {
-	const call_argument_t *fmt_arg;
-	unsigned idx = 0;
-
 	/* find format arg */
-	for(idx = 0; idx < idx_fmt; ++idx)
+	unsigned idx = 0;
+	for (; idx < idx_fmt; ++idx)
 		arg = arg->next;
-	fmt_arg = arg;
 
-	const expression_t *fmt_expr = fmt_arg->expression;
+	const expression_t *fmt_expr = arg->expression;
 	if (fmt_expr->kind == EXPR_UNARY_CAST_IMPLICIT) {
 		fmt_expr = fmt_expr->unary.value;
 	}
@@ -177,11 +175,12 @@ static void check_format_arguments(const call_argument_t *arg, unsigned idx_fmt,
 		return;
 	}
 	/* find the real args */
-	for(; idx < idx_fmt; ++idx)
+	for(; idx < idx_param; ++idx)
 		arg = arg->next;
 
 	const source_position_t *pos = &fmt_expr->base.source_position;
-	unsigned fmt = vchar.first(&vchar);
+	unsigned fmt     = vchar.first(&vchar);
+	unsigned num_fmt = 0;
 	for (; fmt != '\0'; fmt = vchar.next(&vchar)) {
 		if (fmt != '%')
 			continue;
@@ -190,6 +189,8 @@ static void check_format_arguments(const call_argument_t *arg, unsigned idx_fmt,
 		if (fmt == '%')
 			continue;
 
+		++num_fmt;
+
 		format_flags_t fmt_flags = FMT_FLAG_NONE;
 		if (fmt == '0') {
 			fmt = vchar.next(&vchar);
@@ -222,14 +223,14 @@ static void check_format_arguments(const call_argument_t *arg, unsigned idx_fmt,
 
 					case ' ':
 						if (fmt_flags & FMT_FLAG_PLUS) {
-							warningf(pos, "' ' is overridden by prior '+' in conversion specification");
+							warningf(pos, "' ' is overridden by prior '+' in conversion specification %u", num_fmt);
 						}
 						flag = FMT_FLAG_SPACE;
 						break;
 
 					case '+':
 						if (fmt_flags & FMT_FLAG_SPACE) {
-							warningf(pos, "'+' overrides prior ' ' in conversion specification");
+							warningf(pos, "'+' overrides prior ' ' in conversion specification %u", num_fmt);
 						}
 						flag = FMT_FLAG_PLUS;
 						break;
@@ -237,7 +238,7 @@ static void check_format_arguments(const call_argument_t *arg, unsigned idx_fmt,
 					default: goto break_fmt_flags;
 				}
 				if (fmt_flags & flag) {
-					warningf(pos, "repeated flag '%c' in conversion specification", (char)fmt);
+					warningf(pos, "repeated flag '%c' in conversion specification %u", (char)fmt, num_fmt);
 				}
 				fmt_flags |= flag;
 				fmt = vchar.next(&vchar);
@@ -246,13 +247,14 @@ break_fmt_flags:
 
 			/* minimum field width */
 			if (fmt == '*') {
+				fmt = vchar.next(&vchar);
 				if (arg == NULL) {
-					warningf(pos, "missing argument for '*' field width in conversion specification");
+					warningf(pos, "missing argument for '*' field width in conversion specification %u", num_fmt);
 					return;
 				}
 				const type_t *const arg_type = arg->expression->base.type;
 				if (arg_type != type_int) {
-					warningf(pos, "argument for '*' field width in conversion specification is not an 'int', but an '%T'", arg_type);
+					warningf(pos, "argument for '*' field width in conversion specification %u is not an 'int', but an '%T'", num_fmt, arg_type);
 				}
 				arg = arg->next;
 			} else {
@@ -266,13 +268,14 @@ break_fmt_flags:
 		if (fmt == '.') {
 			fmt = vchar.next(&vchar);
 			if (fmt == '*') {
+				fmt = vchar.next(&vchar);
 				if (arg == NULL) {
-					warningf(pos, "missing argument for '*' precision in conversion specification");
+					warningf(pos, "missing argument for '*' precision in conversion specification %u", num_fmt);
 					return;
 				}
 				const type_t *const arg_type = arg->expression->base.type;
 				if (arg_type != type_int) {
-					warningf(pos, "argument for '*' precision in conversion specification is not an 'int', but an '%T'", arg_type);
+					warningf(pos, "argument for '*' precision in conversion specification %u is not an 'int', but an '%T'", num_fmt, arg_type);
 				}
 				arg = arg->next;
 			} else {
@@ -355,7 +358,7 @@ break_fmt_flags:
 			break;
 		}
 
-		const type_t      *expected_type;
+		type_t            *expected_type;
 		type_qualifiers_t  expected_qual = TYPE_QUALIFIER_NONE;
 		format_flags_t     allowed_flags;
 		switch (fmt) {
@@ -386,7 +389,6 @@ break_fmt_flags:
 			case 'x':
 				allowed_flags = FMT_FLAG_MINUS | FMT_FLAG_HASH | FMT_FLAG_ZERO;
 				goto eval_fmt_mod_unsigned;
-				break;
 
 			case 'u':
 				allowed_flags = FMT_FLAG_MINUS | FMT_FLAG_ZERO;
@@ -460,7 +462,7 @@ eval_fmt_mod_unsigned:
 				}
 				expected_type = type_wchar_t_ptr;
 				expected_qual = TYPE_QUALIFIER_CONST;
-				allowed_flags = FMT_FLAG_NONE;
+				allowed_flags = FMT_FLAG_MINUS;
 				break;
 
 			case 's':
@@ -474,7 +476,7 @@ eval_fmt_mod_unsigned:
 						goto next_arg;
 				}
 				expected_qual = TYPE_QUALIFIER_CONST;
-				allowed_flags = FMT_FLAG_NONE;
+				allowed_flags = FMT_FLAG_MINUS;
 				break;
 
 			case 'p':
@@ -505,13 +507,23 @@ eval_fmt_mod_unsigned:
 				break;
 
 			default:
-				warningf(pos, "encountered unknown conversion specifier '%%%C'", (wint_t)fmt);
+				warningf(pos, "encountered unknown conversion specifier '%%%C' at position %u", (wint_t)fmt, num_fmt);
 				goto next_arg;
 		}
 
-		if ((fmt_flags & ~allowed_flags) != 0) {
-			/* TODO better warning message text */
-			warningf(pos, "invalid format flags in conversion specification");
+		format_flags_t wrong_flags = fmt_flags & ~allowed_flags;
+		if (wrong_flags != 0) {
+			char wrong[8];
+			int idx = 0;
+			if (wrong_flags & FMT_FLAG_HASH)  wrong[idx++] = '#';
+			if (wrong_flags & FMT_FLAG_ZERO)  wrong[idx++] = '0';
+			if (wrong_flags & FMT_FLAG_MINUS) wrong[idx++] = '-';
+			if (wrong_flags & FMT_FLAG_SPACE) wrong[idx++] = ' ';
+			if (wrong_flags & FMT_FLAG_PLUS)  wrong[idx++] = '+';
+			if (wrong_flags & FMT_FLAG_TICK)  wrong[idx++] = '\'';
+			wrong[idx] = '\0';
+
+			warningf(pos, "invalid format flags \"%s\" in conversion specification %%%c at position", wrong, fmt, num_fmt);
 		}
 
 		if (arg == NULL) {
@@ -520,11 +532,12 @@ eval_fmt_mod_unsigned:
 		}
 
 		{	/* create a scope here to prevent warning about the jump to next_arg */
-			type_t *const arg_type = arg->expression->base.type;
-			if (is_type_pointer(expected_type)) {
-				type_t *const arg_skip = skip_typeref(arg_type);
+			type_t *const arg_type           = arg->expression->base.type;
+			type_t *const arg_skip           = skip_typeref(arg_type);
+			type_t *const expected_type_skip = skip_typeref(expected_type);
+			if (is_type_pointer(expected_type_skip)) {
 				if (is_type_pointer(arg_skip)) {
-					type_t *const exp_to = skip_typeref(expected_type->pointer.points_to);
+					type_t *const exp_to = skip_typeref(expected_type_skip->pointer.points_to);
 					type_t *const arg_to = skip_typeref(arg_skip->pointer.points_to);
 					if ((arg_to->base.qualifiers & ~expected_qual) == 0 &&
 						get_unqualified_type(arg_to) == exp_to) {
@@ -532,14 +545,14 @@ eval_fmt_mod_unsigned:
 					}
 				}
 			} else {
-				if (get_unqualified_type(skip_typeref(arg_type)) == expected_type) {
+				if (get_unqualified_type(arg_skip) == expected_type_skip) {
 					goto next_arg;
 				}
 			}
-			if (is_type_valid(arg_type)) {
+			if (is_type_valid(arg_skip)) {
 				warningf(pos,
-					"argument type '%T' does not match conversion specifier '%%%s%c'",
-					arg_type, get_length_modifier_name(fmt_mod), (char)fmt);
+					"argument type '%T' does not match conversion specifier '%%%s%c' at position",
+					arg_type, get_length_modifier_name(fmt_mod), (char)fmt, num_fmt);
 			}
 		}
 next_arg:
@@ -549,7 +562,14 @@ next_arg:
 		warningf(pos, "format string contains NUL");
 	}
 	if (arg != NULL) {
-		warningf(pos, "too many arguments for format string");
+		unsigned num_args = num_fmt;
+		while (arg != NULL) {
+			++num_args;
+			arg = arg->next;
+		}
+		warningf(pos, "%u argument%s but only %u format string%s",
+			num_args, num_args != 1 ? "s" : "",
+			num_fmt, num_fmt != 1 ? "s" : "");
 	}
 }