X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=68880a27aced4c0a609cb2cf8fc1217e0ffaee2a;hb=11839325c556fdf4b749c536bb0966bb0565c4d7;hp=76e9241e5ef0b069a65675e9938b5f4cd3528a76;hpb=93b256acc783d281b7eb29184591a76c8e83e62a;p=cparser

diff --git a/type.c b/type.c
index 76e9241..68880a2 100644
--- a/type.c
+++ b/type.c
@@ -40,7 +40,6 @@ void inc_type_visited(void)
 	type_visited++;
 }
 
-static
 void print_type_qualifiers(unsigned qualifiers)
 {
 	if(qualifiers & TYPE_QUALIFIER_CONST)    fputs("const ",    out);
@@ -133,8 +132,7 @@ static void print_function_type_post(const function_type_t *type,
 	fputc(')', out);
 }
 
-static
-void print_pointer_type_pre(const pointer_type_t *type)
+static void print_pointer_type_pre(const pointer_type_t *type)
 {
 	intern_print_type_pre(type->points_to);
 	fputs("*", out);
@@ -146,6 +144,11 @@ static void print_pointer_type_post(const pointer_type_t *type)
 	intern_print_type_post(type->points_to);
 }
 
+static void print_array_type_pre(const array_type_t *type)
+{
+	intern_print_type_pre(type->element_type);
+}
+
 static void print_array_type_post(const array_type_t *type)
 {
 	fputc('[', out);
@@ -157,6 +160,7 @@ static void print_array_type_post(const array_type_t *type)
 		print_expression(type->size);
 	}
 	fputc(']', out);
+	intern_print_type_post(type->element_type);
 }
 
 void print_enum_definition(const declaration_t *declaration)
@@ -173,7 +177,7 @@ void print_enum_definition(const declaration_t *declaration)
 		fprintf(out, "%s", entry->symbol->string);
 		if(entry->init.initializer != NULL) {
 			fprintf(out, " = ");
-			print_initializer(entry->init.initializer);
+			print_expression(entry->init.enum_value);
 		}
 		fprintf(out, ",\n");
 	}
@@ -277,6 +281,7 @@ static void intern_print_type_pre(type_t *type)
 		print_pointer_type_pre((pointer_type_t*) type);
 		return;
 	case TYPE_ARRAY:
+		print_array_type_pre((array_type_t*) type);
 		return;
 	case TYPE_TYPEDEF:
 		print_typedef_type_pre((typedef_type_t*) type);
@@ -384,8 +389,6 @@ bool is_type_floating(const type_t *type)
 	case ATOMIC_TYPE_FLOAT_COMPLEX:
 	case ATOMIC_TYPE_DOUBLE_COMPLEX:
 	case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX:
-#endif
-#ifdef PROVIDE_IMAGINARY
 	case ATOMIC_TYPE_FLOAT_IMAGINARY:
 	case ATOMIC_TYPE_DOUBLE_IMAGINARY:
 	case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY:
@@ -420,8 +423,6 @@ bool is_type_signed(const type_t *type)
 	case ATOMIC_TYPE_FLOAT_COMPLEX:
 	case ATOMIC_TYPE_DOUBLE_COMPLEX:
 	case ATOMIC_TYPE_LONG_DOUBLE_COMPLEX:
-#endif
-#ifdef PROVIDE_IMAGINARY
 	case ATOMIC_TYPE_FLOAT_IMAGINARY:
 	case ATOMIC_TYPE_DOUBLE_IMAGINARY:
 	case ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY:
@@ -461,19 +462,117 @@ bool is_type_scalar(const type_t *type)
 	return is_type_arithmetic(type);
 }
 
+bool is_type_incomplete(const type_t *type)
+{
+	switch(type->type) {
+	case TYPE_COMPOUND_STRUCT:
+	case TYPE_COMPOUND_UNION: {
+		const compound_type_t *compound_type
+			= (const compound_type_t*) type;
+		declaration_t *declaration = compound_type->declaration;
+		return !declaration->init.is_defined;
+	}
+	case TYPE_FUNCTION:
+		return true;
+
+	case TYPE_ARRAY: {
+		const array_type_t *array_type = (const array_type_t*) type;
+
+		return array_type->size == NULL;
+	}
+
+	case TYPE_ATOMIC:
+	case TYPE_POINTER:
+	case TYPE_ENUM:
+		return false;
+
+	case TYPE_TYPEDEF:
+	case TYPE_TYPEOF:
+	case TYPE_BUILTIN:
+		panic("is_type_incomplete called without typerefs skipped");
+	case TYPE_INVALID:
+		break;
+	}
+
+	panic("invalid type found");
+}
+
+bool types_compatible(const type_t *type1, const type_t *type2)
+{
+	/* TODO: really incomplete */
+	if(type1 == type2)
+		return true;
+
+	if(type1->type == TYPE_ATOMIC && type2->type == TYPE_ATOMIC) {
+		const atomic_type_t *atomic1 = (const atomic_type_t*) type1;
+		const atomic_type_t *atomic2 = (const atomic_type_t*) type2;
+
+		return atomic1->atype == atomic2->atype;
+	}
+
+	return false;
+}
+
 bool pointers_compatible(const type_t *type1, const type_t *type2)
 {
 	assert(type1->type == TYPE_POINTER);
 	assert(type2->type == TYPE_POINTER);
+#if 0
+	pointer_type_t *pointer_type1 = (pointer_type_t*) type1;
+	pointer_type_t *pointer_type2 = (pointer_type_t*) type2;
+	return types_compatible(pointer_type1->points_to,
+	                        pointer_type2->points_to);
+#endif
 	return true;
 }
 
+static size_t get_type_size(type_t *type)
+{
+	switch(type->type) {
+	case TYPE_ATOMIC:          return sizeof(atomic_type_t); break;
+	case TYPE_COMPOUND_STRUCT:
+	case TYPE_COMPOUND_UNION:  return sizeof(compound_type_t); break;
+	case TYPE_ENUM:            return sizeof(enum_type_t); break;
+	case TYPE_FUNCTION:        return sizeof(function_type_t); break;
+	case TYPE_POINTER:         return sizeof(pointer_type_t); break;
+	case TYPE_ARRAY:           return sizeof(array_type_t); break;
+	case TYPE_BUILTIN:         return sizeof(builtin_type_t); break;
+	case TYPE_TYPEDEF:         return sizeof(typedef_type_t); break;
+	case TYPE_TYPEOF:          return sizeof(typeof_type_t); break;
+	case TYPE_INVALID:         panic("invalid type found"); break;
+	}
+	panic("unknown type found");
+}
+
+/**
+ * duplicates a type
+ * note that this does not produce a deep copy!
+ */
+static type_t *duplicate_type(type_t *type)
+{
+	size_t size = get_type_size(type);
+
+	type_t *copy = obstack_alloc(type_obst, size);
+	memcpy(copy, type, size);
+
+	(void) duplicate_type;
+
+	return type;
+}
+
 type_t *skip_typeref(type_t *type)
 {
+	unsigned qualifiers = type->qualifiers;
+
 	while(1) {
 		switch(type->type) {
 		case TYPE_TYPEDEF: {
+			qualifiers |= type->qualifiers;
 			const typedef_type_t *typedef_type = (const typedef_type_t*) type;
+			if(typedef_type->resolved_type != NULL) {
+				type = typedef_type->resolved_type;
+				break;
+			}
 			type = typedef_type->declaration->type;
 			continue;
 		}