atomic_type_properties_t *props = atomic_type_properties;
- if(char_is_signed) {
+ if (char_is_signed) {
props[ATOMIC_TYPE_CHAR].flags |= ATOMIC_TYPE_FLAG_SIGNED;
}
/* TODO: backend specific, need a way to query the backend for this.
* The following are good settings for x86 */
- props[ATOMIC_TYPE_FLOAT].alignment = 4;
- props[ATOMIC_TYPE_DOUBLE].alignment = 4;
- props[ATOMIC_TYPE_LONGLONG].alignment = 4;
- props[ATOMIC_TYPE_ULONGLONG].alignment = 4;
+ props[ATOMIC_TYPE_FLOAT].alignment = 4;
+ props[ATOMIC_TYPE_DOUBLE].alignment = 4;
+ props[ATOMIC_TYPE_LONG_DOUBLE].alignment = 4;
+ props[ATOMIC_TYPE_LONGLONG].alignment = 4;
+ props[ATOMIC_TYPE_ULONGLONG].alignment = 4;
props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UINT];
}
void print_type_qualifiers(type_qualifiers_t qualifiers)
{
- if(qualifiers & TYPE_QUALIFIER_CONST) fputs("const ", out);
- if(qualifiers & TYPE_QUALIFIER_VOLATILE) fputs("volatile ", out);
- if(qualifiers & TYPE_QUALIFIER_RESTRICT) fputs("restrict ", out);
+ if (qualifiers & TYPE_QUALIFIER_CONST) fputs("const ", out);
+ if (qualifiers & TYPE_QUALIFIER_VOLATILE) fputs("volatile ", out);
+ if (qualifiers & TYPE_QUALIFIER_RESTRICT) fputs("restrict ", out);
}
/**
intern_print_type_pre(type->return_type, false);
/* don't emit braces if we're the toplevel type... */
- if(!top)
+ if (!top)
fputc('(', out);
}
{
intern_print_type_post(type->return_type, false);
/* don't emit braces if we're the toplevel type... */
- if(!top)
+ if (!top)
fputc(')', out);
fputc('(', out);
- int first = 1;
- if(scope == NULL) {
+ bool first = true;
+ if (scope == NULL) {
function_parameter_t *parameter = type->parameters;
for( ; parameter != NULL; parameter = parameter->next) {
- if(first) {
- first = 0;
+ if (first) {
+ first = false;
} else {
fputs(", ", out);
}
} else {
declaration_t *parameter = scope->declarations;
for( ; parameter != NULL; parameter = parameter->next) {
- if(first) {
- first = 0;
+ if (first) {
+ first = false;
} else {
fputs(", ", out);
}
¶meter->scope);
}
}
- if(type->variadic) {
- if(first) {
- first = 0;
+ if (type->variadic) {
+ if (first) {
+ first = false;
} else {
fputs(", ", out);
}
fputs("...", out);
}
- if(first && !type->unspecified_parameters) {
+ if (first && !type->unspecified_parameters) {
fputs("void", out);
}
fputc(')', out);
static void print_array_type_post(const array_type_t *type)
{
fputc('[', out);
- if(type->is_static) {
+ if (type->is_static) {
fputs("static ", out);
}
print_type_qualifiers(type->base.qualifiers);
- if(type->size_expression != NULL
+ if (type->size_expression != NULL
&& (print_implicit_array_size || !type->has_implicit_size)) {
print_expression(type->size_expression);
}
print_indent();
fprintf(out, "%s", entry->symbol->string);
- if(entry->init.initializer != NULL) {
+ if (entry->init.initializer != NULL) {
fprintf(out, " = ");
/* skip the implicit cast */
expression_t *expression = entry->init.enum_value;
- if(expression->kind == EXPR_UNARY_CAST_IMPLICIT) {
+ if (expression->kind == EXPR_UNARY_CAST_IMPLICIT) {
expression = expression->unary.value;
}
print_expression(expression);
declaration_t *declaration = type->declaration;
symbol_t *symbol = declaration->symbol;
- if(symbol != NULL) {
+ if (symbol != NULL) {
fputs(symbol->string, out);
} else {
print_enum_definition(declaration);
{
print_type_qualifiers(type->base.qualifiers);
- if(type->base.kind == TYPE_COMPOUND_STRUCT) {
+ if (type->base.kind == TYPE_COMPOUND_STRUCT) {
fputs("struct ", out);
} else {
assert(type->base.kind == TYPE_COMPOUND_UNION);
declaration_t *declaration = type->declaration;
symbol_t *symbol = declaration->symbol;
- if(symbol != NULL) {
+ if (symbol != NULL) {
fputs(symbol->string, out);
} else {
print_compound_definition(declaration);
static void print_typeof_type_pre(const typeof_type_t *const type)
{
fputs("typeof(", out);
- if(type->expression != NULL) {
+ if (type->expression != NULL) {
assert(type->typeof_type == NULL);
print_expression(type->expression);
} else {
void print_type_ext(const type_t *const type, const symbol_t *symbol,
const scope_t *scope)
{
- if(type == NULL) {
+ if (type == NULL) {
fputs("nil type", out);
return;
}
intern_print_type_pre(type, true);
- if(symbol != NULL) {
+ if (symbol != NULL) {
fputc(' ', out);
fputs(symbol->string, out);
}
- if(type->kind == TYPE_FUNCTION) {
+ if (type->kind == TYPE_FUNCTION) {
print_function_type_post(&type->function, scope, true);
} else {
intern_print_type_post(type, true);
*/
type_t *get_unqualified_type(type_t *type)
{
- if(type->base.qualifiers == TYPE_QUALIFIER_NONE)
+ if (type->base.qualifiers == TYPE_QUALIFIER_NONE)
return type;
type_t *unqualified_type = duplicate_type(type);
unqualified_type->base.qualifiers = TYPE_QUALIFIER_NONE;
type_t *result = typehash_insert(unqualified_type);
- if(result != unqualified_type) {
+ if (result != unqualified_type) {
obstack_free(type_obst, unqualified_type);
}
{
assert(!is_typeref(type));
- if(type->kind == TYPE_ENUM)
+ if (type->kind == TYPE_ENUM)
+ return true;
+ if (type->kind == TYPE_BITFIELD)
return true;
- if(type->kind != TYPE_ATOMIC)
+ if (type->kind != TYPE_ATOMIC)
return false;
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_INTEGER);
{
assert(!is_typeref(type));
- if(type->kind != TYPE_ATOMIC)
+ if (type->kind != TYPE_ATOMIC)
return false;
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_FLOAT);
assert(!is_typeref(type));
/* enum types are int for now */
- if(type->kind == TYPE_ENUM)
+ if (type->kind == TYPE_ENUM)
return true;
+ if (type->kind == TYPE_BITFIELD)
+ return is_type_signed(type->bitfield.base_type);
- if(type->kind != TYPE_ATOMIC)
+ if (type->kind != TYPE_ATOMIC)
return false;
return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_SIGNED);
}
}
+bool is_type_real(const type_t *type)
+{
+ /* 6.2.5.17 */
+ return is_type_integer(type)
+ || (type->kind == TYPE_ATOMIC && is_type_float(type));
+}
+
/**
* Returns true if the given type represents a scalar type.
*
case TYPE_COMPOUND_UNION: {
const compound_type_t *compound_type = &type->compound;
declaration_t *declaration = compound_type->declaration;
- return !declaration->init.is_defined;
+ return !declaration->init.complete;
}
case TYPE_ENUM: {
const enum_type_t *enum_type = &type->enumt;
declaration_t *declaration = enum_type->declaration;
- return !declaration->init.is_defined;
+ return !declaration->init.complete;
}
- case TYPE_BITFIELD:
- case TYPE_FUNCTION:
- return true;
case TYPE_ARRAY:
- return type->array.size_expression == NULL;
+ return type->array.size_expression == NULL
+ && !type->array.size_constant;
case TYPE_ATOMIC:
return type->atomic.akind == ATOMIC_TYPE_VOID;
case TYPE_IMAGINARY:
return type->imaginary.akind == ATOMIC_TYPE_VOID;
+ case TYPE_BITFIELD:
+ case TYPE_FUNCTION:
case TYPE_POINTER:
case TYPE_BUILTIN:
case TYPE_ERROR:
panic("invalid type found");
}
+bool is_type_object(const type_t *type)
+{
+ return !is_type_function(type) && !is_type_incomplete(type);
+}
+
/**
* Check if two function types are compatible.
*/
return false;
/* can parameters be compared? */
- if(func1->unspecified_parameters || func2->unspecified_parameters)
+ if (func1->unspecified_parameters || func2->unspecified_parameters)
return true;
- if(func1->variadic != func2->variadic)
+ if (func1->variadic != func2->variadic)
return false;
/* TODO: handling of unspecified parameters not correct yet */
/* all argument types must be compatible */
function_parameter_t *parameter1 = func1->parameters;
function_parameter_t *parameter2 = func2->parameters;
- for( ; parameter1 != NULL && parameter2 != NULL;
+ for ( ; parameter1 != NULL && parameter2 != NULL;
parameter1 = parameter1->next, parameter2 = parameter2->next) {
type_t *parameter1_type = skip_typeref(parameter1->type);
type_t *parameter2_type = skip_typeref(parameter2->type);
parameter1_type = get_unqualified_type(parameter1_type);
parameter2_type = get_unqualified_type(parameter2_type);
- if(!types_compatible(parameter1_type, parameter2_type))
+ if (!types_compatible(parameter1_type, parameter2_type))
return false;
}
/* same number of arguments? */
- if(parameter1 != NULL || parameter2 != NULL)
+ if (parameter1 != NULL || parameter2 != NULL)
return false;
return true;
{
type_t *element_type1 = skip_typeref(array1->element_type);
type_t *element_type2 = skip_typeref(array2->element_type);
- if(!types_compatible(element_type1, element_type2))
+ if (!types_compatible(element_type1, element_type2))
return false;
- if(!array1->size_constant || !array2->size_constant)
+ if (!array1->size_constant || !array2->size_constant)
return true;
return array1->size == array2->size;
assert(!is_typeref(type2));
/* shortcut: the same type is always compatible */
- if(type1 == type2)
+ if (type1 == type2)
return true;
- if(type1->base.qualifiers != type2->base.qualifiers)
+ if (type1->base.qualifiers != type2->base.qualifiers)
return false;
- if(type1->kind != type2->kind)
+ if (type1->kind != type2->kind)
return false;
switch(type1->kind) {
return false;
}
-/**
- * Check if two pointer types are compatible.
- */
-bool pointers_compatible(const type_t *type1, const type_t *type2)
-{
- assert(!is_typeref(type1));
- assert(!is_typeref(type2));
-
- assert(type1->kind == TYPE_POINTER);
- assert(type2->kind == TYPE_POINTER);
- (void) type1;
- (void) type2;
- /* TODO */
- return true;
-}
-
/**
* Skip all typerefs and return the underlying type.
*/
type_t *skip_typeref(type_t *type)
{
- unsigned qualifiers = TYPE_QUALIFIER_NONE;
+ type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE;
+ type_modifiers_t modifiers = TYPE_MODIFIER_NONE;
while(true) {
switch(type->kind) {
return type;
case TYPE_TYPEDEF: {
qualifiers |= type->base.qualifiers;
+ modifiers |= type->base.modifiers;
const typedef_type_t *typedef_type = &type->typedeft;
- if(typedef_type->resolved_type != NULL) {
+ if (typedef_type->resolved_type != NULL) {
type = typedef_type->resolved_type;
break;
}
}
case TYPE_TYPEOF: {
const typeof_type_t *typeof_type = &type->typeoft;
- if(typeof_type->typeof_type != NULL) {
+ if (typeof_type->typeof_type != NULL) {
type = typeof_type->typeof_type;
} else {
type = typeof_type->expression->base.type;
break;
}
- if (qualifiers != TYPE_QUALIFIER_NONE) {
- type_t *const copy = duplicate_type(type);
- copy->base.qualifiers |= qualifiers;
+ if (qualifiers != TYPE_QUALIFIER_NONE || modifiers != TYPE_MODIFIER_NONE) {
+ type_t *const copy = duplicate_type(type);
+
+ /* for const with typedefed array type the element type has to be
+ * adjusted */
+ if (is_type_array(copy)) {
+ type_t *element_type = copy->array.element_type;
+ element_type = duplicate_type(element_type);
+ element_type->base.qualifiers |= qualifiers;
+ element_type->base.modifiers |= modifiers;
+ copy->array.element_type = element_type;
+ } else {
+ copy->base.qualifiers |= qualifiers;
+ copy->base.modifiers |= modifiers;
+ }
type = typehash_insert(copy);
if (type != copy) {
atomic_type_kind_t get_intptr_kind(void)
{
- if(machine_size <= 32)
+ if (machine_size <= 32)
return ATOMIC_TYPE_INT;
- else if(machine_size <= 64)
+ else if (machine_size <= 64)
return ATOMIC_TYPE_LONG;
else
return ATOMIC_TYPE_LONGLONG;
atomic_type_kind_t get_uintptr_kind(void)
{
- if(machine_size <= 32)
+ if (machine_size <= 32)
return ATOMIC_TYPE_UINT;
- else if(machine_size <= 64)
+ else if (machine_size <= 64)
return ATOMIC_TYPE_ULONG;
else
return ATOMIC_TYPE_ULONGLONG;
assert(size < 32);
atomic_type_kind_t kind = kinds[size];
- if(kind == ATOMIC_TYPE_INVALID) {
+ if (kind == ATOMIC_TYPE_INVALID) {
static const atomic_type_kind_t possible_kinds[] = {
ATOMIC_TYPE_SCHAR,
ATOMIC_TYPE_SHORT,
ATOMIC_TYPE_LONGLONG
};
for(unsigned i = 0; i < sizeof(possible_kinds)/sizeof(possible_kinds[0]); ++i) {
- if(get_atomic_type_size(possible_kinds[i]) == size) {
+ if (get_atomic_type_size(possible_kinds[i]) == size) {
kind = possible_kinds[i];
break;
}
assert(size < 32);
atomic_type_kind_t kind = kinds[size];
- if(kind == ATOMIC_TYPE_INVALID) {
+ if (kind == ATOMIC_TYPE_INVALID) {
static const atomic_type_kind_t possible_kinds[] = {
ATOMIC_TYPE_UCHAR,
ATOMIC_TYPE_USHORT,
ATOMIC_TYPE_ULONGLONG
};
for(unsigned i = 0; i < sizeof(possible_kinds)/sizeof(possible_kinds[0]); ++i) {
- if(get_atomic_type_size(possible_kinds[i]) == size) {
+ if (get_atomic_type_size(possible_kinds[i]) == size) {
kind = possible_kinds[i];
break;
}
static type_t *identify_new_type(type_t *type)
{
type_t *result = typehash_insert(type);
- if(result != type) {
+ if (result != type) {
obstack_free(type_obst, type);
}
return result;
projects / cparser / blobdiff