/*
* This file is part of cparser.
- * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
*/
#include <config.h>
return names[mod];
}
-static void warn_invalid_length_modifier(const source_position_t *pos,
+static void warn_invalid_length_modifier(const position_t *pos,
const format_length_modifier_t mod,
const utf32 conversion)
{
return nt > nf ? nt : nf;
}
- if (fmt_expr->kind != EXPR_STRING_LITERAL
- && fmt_expr->kind != EXPR_WIDE_STRING_LITERAL)
+ if (fmt_expr->kind != EXPR_STRING_LITERAL)
return -1;
- const char *string = fmt_expr->literal.value.begin;
- size_t size = fmt_expr->literal.value.size;
+ const char *string = fmt_expr->string_literal.value.begin;
+ size_t size = fmt_expr->string_literal.value.size;
const char *c = string;
- const source_position_t *pos = &fmt_expr->base.source_position;
+ const position_t *pos = &fmt_expr->base.pos;
unsigned num_fmt = 0;
unsigned num_args = 0;
char fmt;
continue;
fmt = *(++c);
- if (fmt == '\0') {
- warningf(WARN_FORMAT, pos, "dangling %% in format string");
- break;
- }
if (fmt == '%')
continue;
break;
}
+ if (fmt == '\0') {
+ warningf(WARN_FORMAT, pos, "dangling %% in format string");
+ break;
+ }
type_t *expected_type;
type_qualifiers_t expected_qual = TYPE_QUALIFIER_NONE;
}
}
if (is_type_valid(arg_skip)) {
- source_position_t const *const apos = &arg->expression->base.source_position;
- char const *const mod = get_length_modifier_name(fmt_mod);
- warningf(WARN_FORMAT, apos, "argument type '%T' does not match conversion specifier '%%%s%c' at position %u", arg_type, mod, (char)fmt, num_fmt);
+ position_t const *const apos = &arg->expression->base.pos;
+ char const *const mod = get_length_modifier_name(fmt_mod);
+ warningf(WARN_FORMAT, apos, "conversion '%%%s%c' at position %u specifies type '%T' but the argument has type '%T'", mod, (char)fmt, num_fmt, expected_type, arg_type);
}
}
next_arg:
for (; arg != NULL; arg = arg->next)
++num_args;
if (num_args > (size_t)num_fmt) {
- source_position_t const *const pos = &fmt_expr->base.source_position;
+ position_t const *const pos = &fmt_expr->base.pos;
warningf(WARN_FORMAT, pos, "%u argument%s but only %u format specifier%s", num_args, num_args != 1 ? "s" : "", num_fmt, num_fmt != 1 ? "s" : "");
}
}
fmt_expr = fmt_expr->unary.value;
}
- if (fmt_expr->kind != EXPR_STRING_LITERAL
- && fmt_expr->kind != EXPR_WIDE_STRING_LITERAL)
+ if (fmt_expr->kind != EXPR_STRING_LITERAL)
return;
- const char *string = fmt_expr->literal.value.begin;
- size_t size = fmt_expr->literal.value.size;
+ const char *string = fmt_expr->string_literal.value.begin;
+ size_t size = fmt_expr->string_literal.value.size;
const char *c = string;
/* find the real args */
for (; idx < spec->arg_idx && arg != NULL; ++idx)
arg = arg->next;
- const source_position_t *pos = &fmt_expr->base.source_position;
+ const position_t *pos = &fmt_expr->base.pos;
unsigned num_fmt = 0;
char fmt;
for (fmt = *c; fmt != '\0'; fmt = *(++c)) {
}
error_arg_type:
if (is_type_valid(arg_skip)) {
- source_position_t const *const apos = &arg->expression->base.source_position;
- char const *const mod = get_length_modifier_name(fmt_mod);
- warningf(WARN_FORMAT, apos, "argument type '%T' does not match conversion specifier '%%%s%c' at position %u", arg_type, mod, (char)fmt, num_fmt);
+ position_t const *const apos = &arg->expression->base.pos;
+ char const *const mod = get_length_modifier_name(fmt_mod);
+ warningf(WARN_FORMAT, apos, "conversion '%%%s%c' at position %u specifies type '%T*' but the argument has type '%T'", mod, (char)fmt, num_fmt, expected_type, arg_type);
}
}
next_arg: