#include <stdbool.h>
#include "diagnostic.h"
+#include "format_check.h"
#include "parser.h"
#include "lexer.h"
#include "token_t.h"
return res;
}
-static size_t get_statement_struct_size(statement_type_t type)
+static size_t get_statement_struct_size(statement_kind_t kind)
{
static const size_t sizes[] = {
[STATEMENT_COMPOUND] = sizeof(compound_statement_t),
[STATEMENT_FOR] = sizeof(for_statement_t),
[STATEMENT_ASM] = sizeof(asm_statement_t)
};
- assert(type <= sizeof(sizes) / sizeof(sizes[0]));
- assert(sizes[type] != 0);
- return sizes[type];
+ assert(kind <= sizeof(sizes) / sizeof(sizes[0]));
+ assert(sizes[kind] != 0);
+ return sizes[kind];
}
-static statement_t *allocate_statement_zero(statement_type_t type)
+static statement_t *allocate_statement_zero(statement_kind_t kind)
{
- size_t size = get_statement_struct_size(type);
+ size_t size = get_statement_struct_size(kind);
statement_t *res = allocate_ast_zero(size);
- res->base.type = type;
+ res->base.kind = kind;
return res;
}
-static size_t get_expression_struct_size(expression_type_t type)
+static size_t get_expression_struct_size(expression_kind_t type)
{
static const size_t sizes[] = {
[EXPR_INVALID] = sizeof(expression_base_t),
return sizes[type];
}
-static expression_t *allocate_expression_zero(expression_type_t type)
+static expression_t *allocate_expression_zero(expression_kind_t kind)
{
- size_t size = get_expression_struct_size(type);
+ size_t size = get_expression_struct_size(kind);
expression_t *res = allocate_ast_zero(size);
- res->base.type = type;
+ res->base.kind = kind;
return res;
}
-static size_t get_type_struct_size(type_type_t type)
+static size_t get_type_struct_size(type_kind_t kind)
{
static const size_t sizes[] = {
[TYPE_ATOMIC] = sizeof(atomic_type_t),
[TYPE_TYPEOF] = sizeof(typeof_type_t),
};
assert(sizeof(sizes) / sizeof(sizes[0]) == (int) TYPE_TYPEOF + 1);
- assert(type <= TYPE_TYPEOF);
- assert(sizes[type] != 0);
- return sizes[type];
+ assert(kind <= TYPE_TYPEOF);
+ assert(sizes[kind] != 0);
+ return sizes[kind];
}
-static type_t *allocate_type_zero(type_type_t type)
+static type_t *allocate_type_zero(type_kind_t kind)
{
- size_t size = get_type_struct_size(type);
+ size_t size = get_type_struct_size(kind);
type_t *res = obstack_alloc(type_obst, size);
memset(res, 0, size);
- res->base.type = type;
+ res->base.kind = kind;
return res;
}
-static size_t get_initializer_size(initializer_type_t type)
+static size_t get_initializer_size(initializer_kind_t kind)
{
static const size_t sizes[] = {
[INITIALIZER_VALUE] = sizeof(initializer_value_t),
[INITIALIZER_WIDE_STRING] = sizeof(initializer_wide_string_t),
[INITIALIZER_LIST] = sizeof(initializer_list_t)
};
- assert(type < sizeof(sizes) / sizeof(*sizes));
- assert(sizes[type] != 0);
- return sizes[type];
+ assert(kind < sizeof(sizes) / sizeof(*sizes));
+ assert(sizes[kind] != 0);
+ return sizes[kind];
}
-static initializer_t *allocate_initializer(initializer_type_t type)
+static initializer_t *allocate_initializer(initializer_kind_t kind)
{
- initializer_t *result = allocate_ast_zero(get_initializer_size(type));
- result->type = type;
+ initializer_t *result = allocate_ast_zero(get_initializer_size(kind));
+ result->kind = kind;
return result;
}
assert(!is_typeref(type));
/* The C-standard allows promoting to int or unsigned int (see § 7.2.2
* and esp. footnote 108). However we can't fold constants (yet), so we
- * can't decide wether unsigned int is possible, while int always works.
+ * can't decide whether unsigned int is possible, while int always works.
* (unsigned int would be preferable when possible... for stuff like
* struct { enum { ... } bla : 4; } ) */
- if(type->type == TYPE_ENUM)
+ if(type->kind == TYPE_ENUM)
return ATOMIC_TYPE_INT;
- assert(type->type == TYPE_ATOMIC);
+ assert(type->kind == TYPE_ATOMIC);
const atomic_type_t *atomic_type = &type->atomic;
atomic_type_type_t atype = atomic_type->atype;
return atype;
static bool is_null_pointer_constant(const expression_t *expression)
{
/* skip void* cast */
- if(expression->type == EXPR_UNARY_CAST
- || expression->type == EXPR_UNARY_CAST_IMPLICIT) {
+ if(expression->kind == EXPR_UNARY_CAST
+ || expression->kind == EXPR_UNARY_CAST_IMPLICIT) {
expression = expression->unary.value;
}
/* TODO: not correct yet, should be any constant integer expression
* which evaluates to 0 */
- if (expression->type != EXPR_CONST)
+ if (expression->kind != EXPR_CONST)
return false;
type_t *const type = skip_typeref(expression->base.datatype);
if(source_type == dest_type)
return expression;
- switch (dest_type->type) {
+ switch (dest_type->kind) {
case TYPE_ENUM:
/* TODO warning for implicitly converting to enum */
case TYPE_ATOMIC:
- if (source_type->type != TYPE_ATOMIC &&
- source_type->type != TYPE_ENUM) {
+ if (source_type->kind != TYPE_ATOMIC &&
+ source_type->kind != TYPE_ENUM) {
panic("casting of non-atomic types not implemented yet");
}
return create_cast_expression(expression, dest_type);
case TYPE_POINTER:
- switch (source_type->type) {
+ switch (source_type->kind) {
case TYPE_ATOMIC:
if (is_null_pointer_constant(expression)) {
return create_cast_expression(expression, dest_type);
/* § 6.7.8.14/15 char array may be initialized by string literals */
type_t *const expr_type = expression->base.datatype;
- if (is_type_array(type) && expr_type->type == TYPE_POINTER) {
+ if (is_type_array(type) && expr_type->kind == TYPE_POINTER) {
array_type_t *const array_type = &type->array;
type_t *const element_type = skip_typeref(array_type->element_type);
- if (element_type->type == TYPE_ATOMIC) {
- switch (expression->type) {
+ if (element_type->kind == TYPE_ATOMIC) {
+ switch (expression->kind) {
case EXPR_STRING_LITERAL:
if (element_type->atomic.atype == ATOMIC_TYPE_CHAR) {
return initializer_from_string(array_type,
initializer_list_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size);
- init->initializer.type = INITIALIZER_LIST;
+ init->initializer.kind = INITIALIZER_LIST;
init->len = len;
memcpy(init->initializers, elems, elems_size);
DEL_ARR_F(elems);
initializer_t *initializer = parse_initializer(type);
- /* § 6.7.5 (22) array intializers for arrays with unknown size determine
+ /* § 6.7.5 (22) array initializers for arrays with unknown size determine
* the array type size */
if(type != NULL && is_type_array(type) && initializer != NULL) {
array_type_t *array_type = &type->array;
cnst->base.datatype = type_size_t;
- switch (initializer->type) {
+ switch (initializer->kind) {
case INITIALIZER_LIST: {
initializer_list_t *const list = &initializer->list;
cnst->conste.v.int_value = list->len;
}
type_t *type = declaration->type;
- switch (type->type) {
+ switch (type->kind) {
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION: {
const compound_type_t *compound_type = &type->compound;
type_t *orig_type = declaration->type;
type_t *type = skip_typeref(orig_type);
- if(type->type != TYPE_FUNCTION && declaration->is_inline) {
+ if(type->kind != TYPE_FUNCTION && declaration->is_inline) {
parser_print_warning_prefix_pos(declaration->source_position);
fprintf(stderr, "variable '%s' declared 'inline'\n",
declaration->symbol->string);
/* note that we don't skip typerefs: the standard doesn't allow them here
* (so we can't use is_type_function here) */
- if(type->type != TYPE_FUNCTION) {
+ if(type->kind != TYPE_FUNCTION) {
parser_print_error_prefix();
fprintf(stderr, "declarator '");
print_type_ext(type, ndeclaration->symbol, NULL);
if(expression->base.datatype == NULL)
return NULL;
- switch(expression->type) {
+ switch(expression->kind) {
case EXPR_REFERENCE: {
const reference_expression_t *ref = &expression->reference;
return ref->declaration->type;
return NULL;
}
- assert(statement->type == STATEMENT_COMPOUND);
+ assert(statement->kind == STATEMENT_COMPOUND);
compound_statement_t *compound_statement = &statement->compound;
/* find last statement and use it's type */
last_statement = iter;
}
- if(last_statement->type == STATEMENT_EXPRESSION) {
+ if(last_statement->kind == STATEMENT_EXPRESSION) {
const expression_statement_t *expression_statement
= &last_statement->expression;
expression->base.datatype
string_literal_expression_t *expression
= allocate_ast_zero(sizeof(expression[0]));
- expression->expression.type = EXPR_FUNCTION;
+ expression->expression.kind = EXPR_FUNCTION;
expression->expression.datatype = type_string;
expression->value = current_function->symbol->string;
string_literal_expression_t *expression
= allocate_ast_zero(sizeof(expression[0]));
- expression->expression.type = EXPR_PRETTY_FUNCTION;
+ expression->expression.kind = EXPR_PRETTY_FUNCTION;
expression->expression.datatype = type_string;
expression->value = current_function->symbol->string;
expression->va_starte.ap = parse_assignment_expression();
expect(',');
expression_t *const expr = parse_assignment_expression();
- if (expr->type == EXPR_REFERENCE) {
+ if (expr->kind == EXPR_REFERENCE) {
declaration_t *const decl = expr->reference.declaration;
if (decl->parent_context == ¤t_function->context &&
decl->next == NULL) {
return expression;
}
+static expression_t *parse_assume(void) {
+ eat(T_assume);
+
+ expression_t *expression
+ = allocate_expression_zero(EXPR_UNARY_ASSUME);
+
+ expect('(');
+ expression->unary.value = parse_expression();
+ expect(')');
+
+ expression->base.datatype = type_void;
+ return expression;
+}
+
static expression_t *parse_primary_expression(void)
{
switch(token.type) {
case T___builtin_islessgreater:
case T___builtin_isunordered:
return parse_compare_builtin();
+ case T_assume:
+ return parse_assume();
case '(':
return parse_brace_expression();
array_access_expression_t *array_access
= allocate_ast_zero(sizeof(array_access[0]));
- array_access->expression.type = EXPR_ARRAY_ACCESS;
+ array_access->expression.kind = EXPR_ARRAY_ACCESS;
type_t *type_left = left->base.datatype;
type_t *type_inside = inside->base.datatype;
sizeof_expression_t *sizeof_expression
= allocate_ast_zero(sizeof(sizeof_expression[0]));
- sizeof_expression->expression.type = EXPR_SIZEOF;
+ sizeof_expression->expression.kind = EXPR_SIZEOF;
sizeof_expression->expression.datatype = type_size_t;
if(token.type == '(' && is_declaration_specifier(look_ahead(1), true)) {
type_t *type_left = type;
if(is_pointer) {
- if(type->type != TYPE_POINTER) {
+ if(type->kind != TYPE_POINTER) {
parser_print_error_prefix();
fprintf(stderr, "left hand side of '->' is not a pointer, but ");
print_type_quoted(orig_type);
}
type_left = skip_typeref(type_left);
- if(type_left->type != TYPE_COMPOUND_STRUCT
- && type_left->type != TYPE_COMPOUND_UNION) {
+ if(type_left->kind != TYPE_COMPOUND_STRUCT
+ && type_left->kind != TYPE_COMPOUND_UNION) {
parser_print_error_prefix();
fprintf(stderr, "request for member '%s' in something not a struct or "
"union, but ", symbol->string);
argument->expression
= create_implicit_cast(argument->expression, type);
}
+
+ check_format(&result->call);
}
+ } else {
+ check_format(&result->call);
}
}
{
if(!is_type_compound(type1))
return false;
- if(type1->type != type2->type)
+ if(type1->kind != type2->kind)
return false;
const compound_type_t *compound1 = &type1->compound;
return;
type_t *type = skip_typeref(orig_type);
- if(!is_type_arithmetic(type) && type->type != TYPE_POINTER) {
+ if(!is_type_arithmetic(type) && type->kind != TYPE_POINTER) {
/* TODO: improve error message */
parser_print_error_prefix();
fprintf(stderr, "operation needs an arithmetic or pointer type\n");
if(orig_type == NULL)
return;
- if(value->type == EXPR_REFERENCE) {
+ if(value->kind == EXPR_REFERENCE) {
reference_expression_t *reference = (reference_expression_t*) value;
declaration_t *declaration = reference->declaration;
if(declaration != NULL) {
left = parser->infix_parser(parser->infix_precedence, left);
assert(left != NULL);
- assert(left->type != EXPR_UNKNOWN);
+ assert(left->kind != EXPR_UNKNOWN);
left->base.source_position = source_position;
}
label_statement_t *label_statement = allocate_ast_zero(sizeof(label[0]));
- label_statement->statement.type = STATEMENT_LABEL;
+ label_statement->statement.kind = STATEMENT_LABEL;
label_statement->statement.source_position = token.source_position;
label_statement->label = label;
eat(T_if);
if_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.type = STATEMENT_IF;
+ statement->statement.kind = STATEMENT_IF;
statement->statement.source_position = token.source_position;
expect('(');
eat(T_switch);
switch_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.type = STATEMENT_SWITCH;
+ statement->statement.kind = STATEMENT_SWITCH;
statement->statement.source_position = token.source_position;
expect('(');
eat(T_while);
while_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.type = STATEMENT_WHILE;
+ statement->statement.kind = STATEMENT_WHILE;
statement->statement.source_position = token.source_position;
expect('(');
eat(T_do);
do_while_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.type = STATEMENT_DO_WHILE;
+ statement->statement.kind = STATEMENT_DO_WHILE;
statement->statement.source_position = token.source_position;
statement->body = parse_statement();
eat(T_for);
for_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.type = STATEMENT_FOR;
+ statement->statement.kind = STATEMENT_FOR;
statement->statement.source_position = token.source_position;
expect('(');
goto_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.type = STATEMENT_GOTO;
+ statement->statement.kind = STATEMENT_GOTO;
statement->statement.source_position = token.source_position;
statement->label = label;
expect(';');
statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_CONTINUE;
+ statement->kind = STATEMENT_CONTINUE;
statement->base.source_position = token.source_position;
return statement;
expect(';');
statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->type = STATEMENT_BREAK;
+ statement->kind = STATEMENT_BREAK;
statement->base.source_position = token.source_position;
return statement;
return_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.type = STATEMENT_RETURN;
+ statement->statement.kind = STATEMENT_RETURN;
statement->statement.source_position = token.source_position;
assert(is_type_function(current_function->type));
{
compound_statement_t *compound_statement
= allocate_ast_zero(sizeof(compound_statement[0]));
- compound_statement->statement.type = STATEMENT_COMPOUND;
+ compound_statement->statement.kind = STATEMENT_COMPOUND;
compound_statement->statement.source_position = token.source_position;
eat('{');
projects / cparser / blobdiff