X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=a35aa4477c3e46087f99107fb39d05b76fd4b423;hb=953a820405dfd857ff9f5e24f3b630b6103dad46;hp=d7aaab5ce6b7f771a9888ebfb1e095077ae71032;hpb=dcf63390bda3681f3df846ca3946647c53e34cab;p=cparser

diff --git a/type.c b/type.c
index d7aaab5..a35aa44 100644
--- a/type.c
+++ b/type.c
@@ -144,7 +144,7 @@ void init_types(void)
 
 	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;
 	}
 
@@ -193,9 +193,19 @@ void inc_type_visited(void)
 
 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);
+	int first = 1;
+	if (qualifiers & TYPE_QUALIFIER_CONST) {
+		fputs(" const" + first,    out);
+		first = 0;
+	}
+	if (qualifiers & TYPE_QUALIFIER_VOLATILE) {
+		fputs(" volatile" + first, out);
+		first = 0;
+	}
+	if (qualifiers & TYPE_QUALIFIER_RESTRICT) {
+		fputs(" restrict" + first, out);
+		first = 0;
+	}
 }
 
 /**
@@ -238,6 +248,8 @@ static
 void print_atomic_type(const atomic_type_t *type)
 {
 	print_type_qualifiers(type->base.qualifiers);
+	if (type->base.qualifiers != 0)
+		fputc(' ', out);
 	print_atomic_kinds(type->akind);
 }
 
@@ -249,8 +261,9 @@ void print_atomic_type(const atomic_type_t *type)
 static
 void print_complex_type(const complex_type_t *type)
 {
+	int empty = type->base.qualifiers == 0;
 	print_type_qualifiers(type->base.qualifiers);
-	fputs("_Complex ", out);
+	fputs(" _Complex " + empty, out);
 	print_atomic_kinds(type->akind);
 }
 
@@ -262,8 +275,9 @@ void print_complex_type(const complex_type_t *type)
 static
 void print_imaginary_type(const imaginary_type_t *type)
 {
+	int empty = type->base.qualifiers == 0;
 	print_type_qualifiers(type->base.qualifiers);
-	fputs("_Imaginary ", out);
+	fputs(" _Imaginary " + empty, out);
 	print_atomic_kinds(type->akind);
 }
 
@@ -276,11 +290,31 @@ void print_imaginary_type(const imaginary_type_t *type)
 static void print_function_type_pre(const function_type_t *type, bool top)
 {
 	print_type_qualifiers(type->base.qualifiers);
+	if (type->base.qualifiers != 0)
+		fputc(' ', out);
+
 
 	intern_print_type_pre(type->return_type, false);
 
-	/* don't emit braces if we're the toplevel type... */
-	if(!top)
+	switch (type->calling_convention) {
+	case CC_CDECL:
+		fputs("__cdecl ", out);
+		break;
+	case CC_STDCALL:
+		fputs("__stdcall ", out);
+		break;
+	case CC_FASTCALL:
+		fputs("__fastcall ", out);
+		break;
+	case CC_THISCALL:
+		fputs("__thiscall ", out);
+		break;
+	case CC_DEFAULT:
+		break;
+	}
+
+	/* don't emit parenthesis if we're the toplevel type... */
+	if (!top)
 		fputc('(', out);
 }
 
@@ -293,18 +327,16 @@ static void print_function_type_pre(const function_type_t *type, bool top)
 static void print_function_type_post(const function_type_t *type,
                                      const scope_t *scope, bool top)
 {
-	intern_print_type_post(type->return_type, false);
-	/* don't emit braces if we're the toplevel type... */
-	if(!top)
+	/* don't emit parenthesis if we're the toplevel type... */
+	if (!top)
 		fputc(')', out);
 
 	fputc('(', out);
-
 	bool first = true;
-	if(scope == NULL) {
+	if (scope == NULL) {
 		function_parameter_t *parameter = type->parameters;
 		for( ; parameter != NULL; parameter = parameter->next) {
-			if(first) {
+			if (first) {
 				first = false;
 			} else {
 				fputs(", ", out);
@@ -314,7 +346,7 @@ static void print_function_type_post(const function_type_t *type,
 	} else {
 		declaration_t *parameter = scope->declarations;
 		for( ; parameter != NULL; parameter = parameter->next) {
-			if(first) {
+			if (first) {
 				first = false;
 			} else {
 				fputs(", ", out);
@@ -323,18 +355,20 @@ static void print_function_type_post(const function_type_t *type,
 			               &parameter->scope);
 		}
 	}
-	if(type->variadic) {
-		if(first) {
+	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);
+
+	intern_print_type_post(type->return_type, false);
 }
 
 /**
@@ -347,6 +381,8 @@ static void print_pointer_type_pre(const pointer_type_t *type)
 	intern_print_type_pre(type->points_to, false);
 	fputs("*", out);
 	print_type_qualifiers(type->base.qualifiers);
+	if (type->base.qualifiers != 0)
+		fputc(' ', out);
 }
 
 /**
@@ -377,11 +413,13 @@ static void print_array_type_pre(const array_type_t *type)
 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->base.qualifiers != 0)
+		fputc(' ', out);
+	if (type->size_expression != NULL
 			&& (print_implicit_array_size || !type->has_implicit_size)) {
 		print_expression(type->size_expression);
 	}
@@ -397,7 +435,7 @@ static void print_array_type_post(const array_type_t *type)
 static void print_bitfield_type_post(const bitfield_type_t *type)
 {
 	fputs(" : ", out);
-	print_expression(type->size);
+	print_expression(type->size_expression);
 	intern_print_type_post(type->base_type, false);
 }
 
@@ -418,12 +456,12 @@ void print_enum_definition(const declaration_t *declaration)
 
 		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);
@@ -443,12 +481,13 @@ void print_enum_definition(const declaration_t *declaration)
  */
 static void print_type_enum(const enum_type_t *type)
 {
+	int empty = type->base.qualifiers == 0;
 	print_type_qualifiers(type->base.qualifiers);
-	fputs("enum ", out);
+	fputs(" enum " + empty, out);
 
 	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);
@@ -484,18 +523,19 @@ void print_compound_definition(const declaration_t *declaration)
  */
 static void print_compound_type(const compound_type_t *type)
 {
+	int empty = type->base.qualifiers == 0;
 	print_type_qualifiers(type->base.qualifiers);
 
-	if(type->base.kind == TYPE_COMPOUND_STRUCT) {
-		fputs("struct ", out);
+	if (type->base.kind == TYPE_COMPOUND_STRUCT) {
+		fputs(" struct " + empty, out);
 	} else {
 		assert(type->base.kind == TYPE_COMPOUND_UNION);
-		fputs("union ", out);
+		fputs(" union " + empty, out);
 	}
 
 	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);
@@ -510,6 +550,8 @@ static void print_compound_type(const compound_type_t *type)
 static void print_typedef_type_pre(const typedef_type_t *const type)
 {
 	print_type_qualifiers(type->base.qualifiers);
+	if (type->base.qualifiers != 0)
+		fputc(' ', out);
 	fputs(type->declaration->symbol->string, out);
 }
 
@@ -521,7 +563,7 @@ static void print_typedef_type_pre(const typedef_type_t *const type)
 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 {
@@ -541,6 +583,7 @@ static void intern_print_type_pre(const type_t *const type, const bool top)
 	switch(type->kind) {
 	case TYPE_ERROR:
 		fputs("<error>", out);
+		return;
 	case TYPE_INVALID:
 		fputs("<invalid>", out);
 		return;
@@ -634,17 +677,17 @@ void print_type(const type_t *const type)
 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);
@@ -704,20 +747,54 @@ type_t *duplicate_type(const type_t *type)
  */
 type_t *get_unqualified_type(type_t *type)
 {
-	if(type->base.qualifiers == TYPE_QUALIFIER_NONE)
+	assert(!is_typeref(type));
+
+	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);
 	}
 
 	return result;
 }
 
+type_t *get_qualified_type(type_t *orig_type, type_qualifiers_t const qual)
+{
+	type_t *type = skip_typeref(orig_type);
+
+	type_t *copy;
+	if (is_type_array(type)) {
+		/* For array types the element type has to be adjusted */
+		type_t *element_type      = type->array.element_type;
+		type_t *qual_element_type = get_qualified_type(element_type, qual);
+
+		if (qual_element_type == element_type)
+			return orig_type;
+
+		copy                     = duplicate_type(type);
+		copy->array.element_type = qual_element_type;
+	} else if (is_type_valid(type)) {
+		if ((type->base.qualifiers & qual) == qual)
+			return orig_type;
+
+		copy                   = duplicate_type(type);
+		copy->base.qualifiers |= qual;
+	} else {
+		return type;
+	}
+
+	type = typehash_insert(copy);
+	if (type != copy)
+		obstack_free(type_obst, copy);
+
+	return type;
+}
+
 /**
  * Check if a type is valid.
  *
@@ -746,17 +823,29 @@ bool is_type_integer(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	if(type->kind == TYPE_ENUM)
+	if (type->kind == TYPE_ENUM)
 		return true;
-	if(type->kind == TYPE_BITFIELD)
+	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);
 }
 
+/**
+ * Returns true if the given type is an enum type.
+ *
+ * @param type  The type to check.
+ * @return True if type is an enum type.
+ */
+bool is_type_enum(const type_t *type)
+{
+	assert(!is_typeref(type));
+	return type->kind == TYPE_ENUM;
+}
+
 /**
  * Returns true if the given type is an floating point type.
  *
@@ -767,12 +856,28 @@ bool is_type_float(const type_t *type)
 {
 	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);
 }
 
+/**
+ * Returns true if the given type is an complex type.
+ *
+ * @param type  The type to check.
+ * @return True if type is a complex type.
+ */
+bool is_type_complex(const type_t *type)
+{
+	assert(!is_typeref(type));
+
+	if (type->kind != TYPE_ATOMIC)
+		return false;
+
+	return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_COMPLEX);
+}
+
 /**
  * Returns true if the given type is a signed type.
  *
@@ -784,12 +889,12 @@ bool is_type_signed(const type_t *type)
 	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)
+	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);
@@ -820,11 +925,16 @@ bool is_type_arithmetic(const type_t *type)
 	}
 }
 
+/**
+ * Returns true if the given type is an integer or float type.
+ *
+ * @param type  The type to check.
+ * @return True if type is an integer or float type.
+ */
 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));
+	/* 6.2.5 (17) */
+	return is_type_integer(type) || is_type_float(type);
 }
 
 /**
@@ -915,6 +1025,9 @@ static bool function_types_compatible(const function_type_t *func1,
 	if (!types_compatible(ret1, ret2))
 		return false;
 
+	if (func1->calling_convention != func2->calling_convention)
+		return false;
+
 	/* can parameters be compared? */
 	if (func1->unspecified_parameters || func2->unspecified_parameters)
 		return true;
@@ -953,10 +1066,10 @@ static bool array_types_compatible(const array_type_t *array1,
 {
 	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;
@@ -971,15 +1084,18 @@ bool types_compatible(const type_t *type1, const type_t *type2)
 	assert(!is_typeref(type2));
 
 	/* shortcut: the same type is always compatible */
-	if(type1 == type2)
+	if (type1 == type2)
+		return true;
+
+	if (!is_type_valid(type1) || !is_type_valid(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) {
+	switch (type1->kind) {
 	case TYPE_FUNCTION:
 		return function_types_compatible(&type1->function, &type2->function);
 	case TYPE_ATOMIC:
@@ -1023,37 +1139,23 @@ bool types_compatible(const type_t *type1, const type_t *type2)
 	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) {
+	while (true) {
+		switch (type->kind) {
 		case TYPE_ERROR:
 			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;
 			}
@@ -1062,7 +1164,7 @@ type_t *skip_typeref(type_t *type)
 		}
 		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;
@@ -1075,9 +1177,21 @@ type_t *skip_typeref(type_t *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) {
@@ -1108,9 +1222,9 @@ unsigned get_atomic_type_flags(atomic_type_kind_t kind)
 
 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;
@@ -1118,9 +1232,9 @@ atomic_type_kind_t get_intptr_kind(void)
 
 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;
@@ -1134,7 +1248,7 @@ atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) {
 
 	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,
@@ -1143,7 +1257,7 @@ atomic_type_kind_t find_signed_int_atomic_type_kind_for_size(unsigned size) {
 			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;
 			}
@@ -1161,7 +1275,7 @@ atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
 
 	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,
@@ -1170,7 +1284,7 @@ atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
 			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;
 			}
@@ -1187,7 +1301,7 @@ atomic_type_kind_t find_unsigned_int_atomic_type_kind_for_size(unsigned size) {
 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;
@@ -1205,8 +1319,9 @@ type_t *make_atomic_type(atomic_type_kind_t akind, type_qualifiers_t qualifiers)
 	memset(type, 0, sizeof(atomic_type_t));
 
 	type->kind            = TYPE_ATOMIC;
-	type->base.qualifiers = qualifiers;
+	type->base.size       = get_atomic_type_size(akind);
 	type->base.alignment  = get_atomic_type_alignment(akind);
+	type->base.qualifiers = qualifiers;
 	type->atomic.akind    = akind;
 
 	return identify_new_type(type);