X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=type.c;h=f9d76c117677ec6e9ce0793eb201314bb50bc10d;hb=2f4d5b48891698c9c271382559f5e0380f5431b4;hp=c6c0801e5a1c42cd3db29a98033bb814bac960e5;hpb=4aeae1b9325a9ea33361198efd19bae4b834b091;p=cparser

diff --git a/type.c b/type.c
index c6c0801..f9d76c1 100644
--- a/type.c
+++ b/type.c
@@ -10,10 +10,9 @@ static struct obstack   _type_obst;
 struct obstack         *type_obst = &_type_obst;
 static FILE            *out;
 static int              type_visited = 0;
-static bool             print_compound_entries;
 
-static void intern_print_type_pre(type_t *type);
-static void intern_print_type_post(type_t *type);
+static void intern_print_type_pre(type_t *type, bool top);
+static void intern_print_type_post(type_t *type, bool top);
 
 void init_types(void)
 {
@@ -30,17 +29,12 @@ void type_set_output(FILE *stream)
 	out = stream;
 }
 
-void set_print_compound_entries(bool enabled)
-{
-	print_compound_entries = enabled;
-}
-
 void inc_type_visited(void)
 {
 	type_visited++;
 }
 
-void print_type_qualifiers(unsigned qualifiers)
+void print_type_qualifiers(type_qualifiers_t qualifiers)
 {
 	if(qualifiers & TYPE_QUALIFIER_CONST)    fputs("const ",    out);
 	if(qualifiers & TYPE_QUALIFIER_VOLATILE) fputs("volatile ", out);
@@ -48,12 +42,12 @@ void print_type_qualifiers(unsigned qualifiers)
 }
 
 static
-void print_atomic_type(const type_t *type)
+void print_atomic_type(const atomic_type_t *type)
 {
-	print_type_qualifiers(type->qualifiers);
+	print_type_qualifiers(type->type.qualifiers);
 
 	const char *s;
-	switch(type->v.atomic_type.atype) {
+	switch(type->atype) {
 	case ATOMIC_TYPE_INVALID:     s = "INVALIDATOMIC";      break;
 	case ATOMIC_TYPE_VOID:        s = "void";               break;
 	case ATOMIC_TYPE_BOOL:        s = "_Bool";              break;
@@ -76,28 +70,30 @@ void print_atomic_type(const type_t *type)
 	fputs(s, out);
 }
 
-static void print_function_type_pre(const type_t *type)
+static void print_function_type_pre(const function_type_t *type, bool top)
 {
-	print_type_qualifiers(type->qualifiers);
+	print_type_qualifiers(type->type.qualifiers);
 
-	intern_print_type_pre(type->v.function_type.result_type);
+	intern_print_type_pre(type->return_type, false);
 
-	/* TODO: don't emit braces if we're the toplevel type... */
-	fputc('(', out);
+	/* don't emit braces if we're the toplevel type... */
+	if(!top)
+		fputc('(', out);
 }
 
-static void print_function_type_post(const type_t *type,
-                                     const context_t *context)
+static void print_function_type_post(const function_type_t *type,
+                                     const context_t *context, bool top)
 {
-	/* TODO: don't emit braces if we're the toplevel type... */
-	intern_print_type_post(type->v.function_type.result_type);
-	fputc(')', out);
+	intern_print_type_post(type->return_type, false);
+	/* don't emit braces if we're the toplevel type... */
+	if(!top)
+		fputc(')', out);
 
 	fputc('(', out);
 
 	int                 first     = 1;
 	if(context == NULL) {
-		function_parameter_t *parameter = type->v.function_type.parameters;
+		function_parameter_t *parameter = type->parameters;
 		for( ; parameter != NULL; parameter = parameter->next) {
 			if(first) {
 				first = 0;
@@ -118,7 +114,7 @@ static void print_function_type_post(const type_t *type,
 			               &parameter->context);
 		}
 	}
-	if(type->v.function_type.variadic) {
+	if(type->variadic) {
 		if(first) {
 			first = 0;
 		} else {
@@ -126,41 +122,41 @@ static void print_function_type_post(const type_t *type,
 		}
 		fputs("...", out);
 	}
-	if(first && !type->v.function_type.unspecified_parameters) {
+	if(first && !type->unspecified_parameters) {
 		fputs("void", out);
 	}
 	fputc(')', out);
 }
 
-static void print_pointer_type_pre(const type_t *type)
+static void print_pointer_type_pre(const pointer_type_t *type)
 {
-	intern_print_type_pre(type->v.pointer_type.points_to);
+	intern_print_type_pre(type->points_to, false);
 	fputs("*", out);
-	print_type_qualifiers(type->qualifiers);
+	print_type_qualifiers(type->type.qualifiers);
 }
 
-static void print_pointer_type_post(const type_t *type)
+static void print_pointer_type_post(const pointer_type_t *type)
 {
-	intern_print_type_post(type->v.pointer_type.points_to);
+	intern_print_type_post(type->points_to, false);
 }
 
-static void print_array_type_pre(const type_t *type)
+static void print_array_type_pre(const array_type_t *type)
 {
-	intern_print_type_pre(type->v.array_type.element_type);
+	intern_print_type_pre(type->element_type, false);
 }
 
-static void print_array_type_post(const type_t *type)
+static void print_array_type_post(const array_type_t *type)
 {
 	fputc('[', out);
-	if(type->v.array_type.is_static) {
+	if(type->is_static) {
 		fputs("static ", out);
 	}
-	print_type_qualifiers(type->qualifiers);
-	if(type->v.array_type.size != NULL) {
-		print_expression(type->v.array_type.size);
+	print_type_qualifiers(type->type.qualifiers);
+	if(type->size != NULL) {
+		print_expression(type->size);
 	}
 	fputc(']', out);
-	intern_print_type_post(type->v.array_type.element_type);
+	intern_print_type_post(type->element_type, false);
 }
 
 void print_enum_definition(const declaration_t *declaration)
@@ -187,12 +183,12 @@ void print_enum_definition(const declaration_t *declaration)
 	fputs("}", out);
 }
 
-static void print_type_enum(const type_t *type)
+static void print_type_enum(const enum_type_t *type)
 {
-	print_type_qualifiers(type->qualifiers);
+	print_type_qualifiers(type->type.qualifiers);
 	fputs("enum ", out);
 
-	declaration_t *declaration = type->v.enum_type.declaration;
+	declaration_t *declaration = type->declaration;
 	symbol_t      *symbol      = declaration->symbol;
 	if(symbol != NULL) {
 		fputs(symbol->string, out);
@@ -218,18 +214,18 @@ void print_compound_definition(const declaration_t *declaration)
 	fputs("}", out);
 }
 
-static void print_compound_type(const type_t *type)
+static void print_compound_type(const compound_type_t *type)
 {
-	print_type_qualifiers(type->qualifiers);
+	print_type_qualifiers(type->type.qualifiers);
 
-	if(type->type == TYPE_COMPOUND_STRUCT) {
+	if(type->type.type == TYPE_COMPOUND_STRUCT) {
 		fputs("struct ", out);
 	} else {
-		assert(type->type == TYPE_COMPOUND_UNION);
+		assert(type->type.type == TYPE_COMPOUND_UNION);
 		fputs("union ", out);
 	}
 
-	declaration_t *declaration = type->v.compound_type.declaration;
+	declaration_t *declaration = type->declaration;
 	symbol_t      *symbol      = declaration->symbol;
 	if(symbol != NULL) {
 		fputs(symbol->string, out);
@@ -238,72 +234,72 @@ static void print_compound_type(const type_t *type)
 	}
 }
 
-static void print_typedef_type_pre(type_t *type)
+static void print_typedef_type_pre(typedef_type_t *type)
 {
-	fputs(type->v.typedef_type.declaration->symbol->string, out);
+	fputs(type->declaration->symbol->string, out);
 }
 
-static void print_typeof_type_pre(type_t *type)
+static void print_typeof_type_pre(typeof_type_t *type)
 {
 	fputs("typeof(", out);
-	if(type->v.typeof_type.expression != NULL) {
-		assert(type->v.typeof_type.typeof_type == NULL);
-		print_expression(type->v.typeof_type.expression);
+	if(type->expression != NULL) {
+		assert(type->typeof_type == NULL);
+		print_expression(type->expression);
 	} else {
-		print_type(type->v.typeof_type.typeof_type);
+		print_type(type->typeof_type);
 	}
 	fputc(')', out);
 }
 
-static void intern_print_type_pre(type_t *type)
+static void intern_print_type_pre(type_t *type, bool top)
 {
 	switch(type->type) {
 	case TYPE_INVALID:
 		fputs("invalid", out);
 		return;
 	case TYPE_ENUM:
-		print_type_enum(type);
+		print_type_enum(&type->enumt);
 		return;
 	case TYPE_ATOMIC:
-		print_atomic_type(type);
+		print_atomic_type(&type->atomic);
 		return;
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION:
-		print_compound_type(type);
+		print_compound_type(&type->compound);
 		return;
 	case TYPE_BUILTIN:
-		fputs(type->v.builtin_type.symbol->string, out);
+		fputs(type->builtin.symbol->string, out);
 		return;
 	case TYPE_FUNCTION:
-		print_function_type_pre(type);
+		print_function_type_pre(&type->function, top);
 		return;
 	case TYPE_POINTER:
-		print_pointer_type_pre(type);
+		print_pointer_type_pre(&type->pointer);
 		return;
 	case TYPE_ARRAY:
-		print_array_type_pre(type);
+		print_array_type_pre(&type->array);
 		return;
 	case TYPE_TYPEDEF:
-		print_typedef_type_pre(type);
+		print_typedef_type_pre(&type->typedeft);
 		return;
 	case TYPE_TYPEOF:
-		print_typeof_type_pre(type);
+		print_typeof_type_pre(&type->typeoft);
 		return;
 	}
 	fputs("unknown", out);
 }
 
-static void intern_print_type_post(type_t *type)
+static void intern_print_type_post(type_t *type, bool top)
 {
 	switch(type->type) {
 	case TYPE_FUNCTION:
-		print_function_type_post(type, NULL);
+		print_function_type_post(&type->function, NULL, top);
 		return;
 	case TYPE_POINTER:
-		print_pointer_type_post(type);
+		print_pointer_type_post(&type->pointer);
 		return;
 	case TYPE_ARRAY:
-		print_array_type_post(type);
+		print_array_type_post(&type->array);
 		return;
 	case TYPE_INVALID:
 	case TYPE_ATOMIC:
@@ -330,16 +326,64 @@ void print_type_ext(type_t *type, const symbol_t *symbol,
 		return;
 	}
 
-	intern_print_type_pre(type);
+	intern_print_type_pre(type, true);
 	if(symbol != NULL) {
 		fputc(' ', out);
 		fputs(symbol->string, out);
 	}
 	if(type->type == TYPE_FUNCTION) {
-		print_function_type_post(type, context);
+		print_function_type_post(&type->function, context, true);
 	} else {
-		intern_print_type_post(type);
+		intern_print_type_post(type, true);
+	}
+}
+
+static size_t get_type_size(type_t *type)
+{
+	switch(type->type) {
+	case TYPE_ATOMIC:          return sizeof(atomic_type_t);
+	case TYPE_COMPOUND_STRUCT:
+	case TYPE_COMPOUND_UNION:  return sizeof(compound_type_t);
+	case TYPE_ENUM:            return sizeof(enum_type_t);
+	case TYPE_FUNCTION:        return sizeof(function_type_t);
+	case TYPE_POINTER:         return sizeof(pointer_type_t);
+	case TYPE_ARRAY:           return sizeof(array_type_t);
+	case TYPE_BUILTIN:         return sizeof(builtin_type_t);
+	case TYPE_TYPEDEF:         return sizeof(typedef_type_t);
+	case TYPE_TYPEOF:          return sizeof(typeof_type_t);
+	case TYPE_INVALID:         panic("invalid type found");
+	}
+	panic("unknown type found");
+}
+
+/**
+ * duplicates a type
+ * note that this does not produce a deep copy!
+ */
+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);
+
+	return copy;
+}
+
+type_t *get_unqualified_type(type_t *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) {
+		obstack_free(type_obst, unqualified_type);
 	}
+
+	return result;
 }
 
 bool type_valid(const type_t *type)
@@ -349,13 +393,15 @@ bool type_valid(const type_t *type)
 
 bool is_type_integer(const type_t *type)
 {
+	assert(!is_typeref(type));
+
 	if(type->type == TYPE_ENUM)
 		return true;
 
 	if(type->type != TYPE_ATOMIC)
 		return false;
 
-	switch(type->v.atomic_type.atype) {
+	switch(type->atomic.atype) {
 	case ATOMIC_TYPE_BOOL:
 	case ATOMIC_TYPE_CHAR:
 	case ATOMIC_TYPE_SCHAR:
@@ -376,10 +422,12 @@ bool is_type_integer(const type_t *type)
 
 bool is_type_floating(const type_t *type)
 {
+	assert(!is_typeref(type));
+
 	if(type->type != TYPE_ATOMIC)
 		return false;
 
-	switch(type->v.atomic_type.atype) {
+	switch(type->atomic.atype) {
 	case ATOMIC_TYPE_FLOAT:
 	case ATOMIC_TYPE_DOUBLE:
 	case ATOMIC_TYPE_LONG_DOUBLE:
@@ -399,6 +447,8 @@ bool is_type_floating(const type_t *type)
 
 bool is_type_signed(const type_t *type)
 {
+	assert(!is_typeref(type));
+
 	/* enum types are int for now */
 	if(type->type == TYPE_ENUM)
 		return true;
@@ -406,7 +456,7 @@ bool is_type_signed(const type_t *type)
 	if(type->type != TYPE_ATOMIC)
 		return false;
 
-	switch(type->v.atomic_type.atype) {
+	switch(type->atomic.atype) {
 	case ATOMIC_TYPE_CHAR:
 	case ATOMIC_TYPE_SCHAR:
 	case ATOMIC_TYPE_SHORT:
@@ -434,8 +484,9 @@ bool is_type_signed(const type_t *type)
 	case ATOMIC_TYPE_ULONGLONG:
 		return false;
 
-	case ATOMIC_TYPE_INVALID:
 	case ATOMIC_TYPE_VOID:
+	case ATOMIC_TYPE_INVALID:
+	case ATOMIC_TYPE_LAST:
 		return false;
 	}
 
@@ -445,42 +496,52 @@ bool is_type_signed(const type_t *type)
 
 bool is_type_arithmetic(const type_t *type)
 {
+	assert(!is_typeref(type));
+
 	if(is_type_integer(type) || is_type_floating(type))
-		return 1;
+		return true;
 
-	return 0;
+	return false;
 }
 
 bool is_type_scalar(const type_t *type)
 {
-	if(type->type == TYPE_POINTER)
-		return 1;
+	assert(!is_typeref(type));
+
+	switch (type->type) {
+		case TYPE_POINTER: return true;
+		case TYPE_BUILTIN: return is_type_scalar(type->builtin.real_type);
+		default:           break;
+	}
 
 	return is_type_arithmetic(type);
 }
 
 bool is_type_incomplete(const type_t *type)
 {
+	assert(!is_typeref(type));
+
 	switch(type->type) {
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION: {
-		declaration_t *declaration = type->v.compound_type.declaration;
+		const compound_type_t *compound_type = &type->compound;
+		declaration_t         *declaration   = compound_type->declaration;
 		return !declaration->init.is_defined;
 	}
 	case TYPE_FUNCTION:
 		return true;
 
 	case TYPE_ARRAY:
-		return type->v.array_type.size == NULL;
+		return type->array.size == NULL;
 
 	case TYPE_ATOMIC:
 	case TYPE_POINTER:
 	case TYPE_ENUM:
+	case TYPE_BUILTIN:
 		return false;
 
 	case TYPE_TYPEDEF:
 	case TYPE_TYPEOF:
-	case TYPE_BUILTIN:
 		panic("is_type_incomplete called without typerefs skipped");
 	case TYPE_INVALID:
 		break;
@@ -489,67 +550,136 @@ bool is_type_incomplete(const type_t *type)
 	panic("invalid type found");
 }
 
+static bool function_types_compatible(const function_type_t *func1,
+                                      const function_type_t *func2)
+{
+	if(!types_compatible(func1->return_type, func2->return_type))
+		return false;
+
+	/* can parameters be compared? */
+	if(func1->unspecified_parameters || func2->unspecified_parameters)
+		return true;
+
+	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;
+			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))
+			return false;
+	}
+	/* same number of arguments? */
+	if(parameter1 != NULL || parameter2 != NULL)
+		return false;
+
+	return true;
+}
+
+static bool array_types_compatible(const array_type_t *array1,
+                                   const array_type_t *array2)
+{
+	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))
+		return false;
+
+	if(array1->size != NULL && array2->size != NULL) {
+		/* TODO: check if size expression evaulate to the same value
+		 * if they are constant */
+	}
+
+	return true;
+}
+
 bool types_compatible(const type_t *type1, const type_t *type2)
 {
-	/* TODO: really incomplete */
+	assert(!is_typeref(type1));
+	assert(!is_typeref(type2));
+
+	/* shortcut: the same type is always compatible */
 	if(type1 == type2)
 		return true;
 
-	if(type1->type == TYPE_ATOMIC && type2->type == TYPE_ATOMIC)
-		return type1->v.atomic_type.atype == type2->v.atomic_type.atype;
+	if(type1->base.qualifiers != type2->base.qualifiers)
+		return false;
+	if(type1->type != type2->type)
+		return false;
+
+	switch(type1->type) {
+	case TYPE_FUNCTION:
+		return function_types_compatible(&type1->function, &type2->function);
+	case TYPE_ATOMIC:
+		return type1->atomic.atype == type2->atomic.atype;
+	case TYPE_ARRAY:
+		return array_types_compatible(&type1->array, &type2->array);
+	case TYPE_POINTER:
+		return types_compatible(type1->pointer.points_to,
+		                        type2->pointer.points_to);
+	case TYPE_COMPOUND_STRUCT:
+	case TYPE_COMPOUND_UNION:
+	case TYPE_ENUM:
+	case TYPE_BUILTIN:
+		/* TODO: not implemented */
+		break;
+
+	case TYPE_INVALID:
+		panic("invalid type found in compatible types");
+	case TYPE_TYPEDEF:
+	case TYPE_TYPEOF:
+		panic("typerefs not skipped in compatible types?!?");
+	}
 
+	/* TODO: incomplete */
 	return false;
 }
 
 bool pointers_compatible(const type_t *type1, const type_t *type2)
 {
+	assert(!is_typeref(type1));
+	assert(!is_typeref(type2));
+
 	assert(type1->type == TYPE_POINTER);
 	assert(type2->type == TYPE_POINTER);
-#if 0
-	return types_compatible(type1->v.pointer_type.points_to,
-	                        type2->v.pointer_type.points_to);
-#endif
+	/* TODO */
 	return true;
 }
 
-/**
- * duplicates a type
- * note that this does not produce a deep copy!
- */
-static type_t *duplicate_type(type_t *type)
-{
-	type_t *copy = obstack_alloc(type_obst, sizeof(*copy));
-	memcpy(copy, type, sizeof(*copy));
-
-	(void) duplicate_type;
-
-	return type;
-}
-
 type_t *skip_typeref(type_t *type)
 {
-	unsigned qualifiers = type->qualifiers;
+	unsigned qualifiers = type->base.qualifiers;
 
 	while(1) {
 		switch(type->type) {
-		case TYPE_TYPEDEF:
-			qualifiers |= type->qualifiers;
-			if(type->v.typedef_type.resolved_type != NULL) {
-				type = type->v.typedef_type.resolved_type;
+		case TYPE_TYPEDEF: {
+			qualifiers |= type->base.qualifiers;
+			const typedef_type_t *typedef_type = &type->typedeft;
+			if(typedef_type->resolved_type != NULL) {
+				type = typedef_type->resolved_type;
 				break;
 			}
-			type = type->v.typedef_type.declaration->type;
+			type = typedef_type->declaration->type;
 			continue;
-		case TYPE_TYPEOF:
-			if(type->v.typeof_type.typeof_type != NULL) {
-				type = type->v.typeof_type.typeof_type;
+		}
+		case TYPE_TYPEOF: {
+			const typeof_type_t *typeof_type = &type->typeoft;
+			if(typeof_type->typeof_type != NULL) {
+				type = typeof_type->typeof_type;
 			} else {
-				type = type->v.typeof_type.expression->datatype;
+				type = typeof_type->expression->base.datatype;
 			}
 			continue;
-		case TYPE_BUILTIN:
-			type = type->v.builtin_type.real_type;
-			continue;
+		}
 		default:
 			break;
 		}
@@ -570,26 +700,28 @@ static type_t *identify_new_type(type_t *type)
 	return result;
 }
 
-type_t *make_atomic_type(atomic_type_type_t type, type_qualifiers_t qualifiers)
+type_t *make_atomic_type(atomic_type_type_t atype, type_qualifiers_t qualifiers)
 {
-	type_t *atomic_type = obstack_alloc(type_obst, sizeof(atomic_type[0]));
-	memset(atomic_type, 0, sizeof(atomic_type[0]));
-	atomic_type->type                = TYPE_ATOMIC;
-	atomic_type->qualifiers          = qualifiers;
-	atomic_type->v.atomic_type.atype = type;
+	type_t *type = obstack_alloc(type_obst, sizeof(atomic_type_t));
+	memset(type, 0, sizeof(atomic_type_t));
+
+	type->type            = TYPE_ATOMIC;
+	type->base.qualifiers = qualifiers;
+	type->atomic.atype    = atype;
 
-	return identify_new_type(atomic_type);
+	return identify_new_type(type);
 }
 
 type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers)
 {
-	type_t *pointer_type = obstack_alloc(type_obst, sizeof(pointer_type[0]));
-	memset(pointer_type, 0, sizeof(pointer_type[0]));
-	pointer_type->type                     = TYPE_POINTER;
-	pointer_type->qualifiers               = qualifiers;
-	pointer_type->v.pointer_type.points_to = points_to;
+	type_t *type = obstack_alloc(type_obst, sizeof(pointer_type_t));
+	memset(type, 0, sizeof(pointer_type_t));
+
+	type->type              = TYPE_POINTER;
+	type->base.qualifiers   = qualifiers;
+	type->pointer.points_to = points_to;
 
-	return identify_new_type(pointer_type);
+	return identify_new_type(type);
 }
 
 static __attribute__((unused))