X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=type.c;h=2725265c9b3c6d3c5b84fd826898615a9fa8c8b1;hb=1e7458bc3eba2e714c913fa35aa397d54ed99a42;hp=8e428912431991bbf9b7b20ec430cd40016645f7;hpb=b07bbf7e0ccdec72dece3551d1f009ded67cd30b;p=cparser

diff --git a/type.c b/type.c
index 8e42891..2725265 100644
--- a/type.c
+++ b/type.c
@@ -11,8 +11,8 @@ struct obstack         *type_obst = &_type_obst;
 static FILE            *out;
 static int              type_visited = 0;
 
-static void intern_print_type_pre(type_t *type);
-static void intern_print_type_post(type_t *type);
+static void intern_print_type_pre(const type_t *type, bool top);
+static void intern_print_type_post(const type_t *type, bool top);
 
 void init_types(void)
 {
@@ -47,7 +47,7 @@ void print_atomic_type(const atomic_type_t *type)
 	print_type_qualifiers(type->type.qualifiers);
 
 	const char *s;
-	switch(type->atype) {
+	switch(type->akind) {
 	case ATOMIC_TYPE_INVALID:     s = "INVALIDATOMIC";      break;
 	case ATOMIC_TYPE_VOID:        s = "void";               break;
 	case ATOMIC_TYPE_BOOL:        s = "_Bool";              break;
@@ -70,22 +70,24 @@ void print_atomic_type(const atomic_type_t *type)
 	fputs(s, out);
 }
 
-static void print_function_type_pre(const function_type_t *type)
+static void print_function_type_pre(const function_type_t *type, bool top)
 {
 	print_type_qualifiers(type->type.qualifiers);
 
-	intern_print_type_pre(type->return_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 function_type_t *type,
-                                     const context_t *context)
+                                     const context_t *context, bool top)
 {
-	/* TODO: don't emit braces if we're the toplevel type... */
-	intern_print_type_post(type->return_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);
 
@@ -128,19 +130,19 @@ static void print_function_type_post(const function_type_t *type,
 
 static void print_pointer_type_pre(const pointer_type_t *type)
 {
-	intern_print_type_pre(type->points_to);
+	intern_print_type_pre(type->points_to, false);
 	fputs("*", out);
 	print_type_qualifiers(type->type.qualifiers);
 }
 
 static void print_pointer_type_post(const pointer_type_t *type)
 {
-	intern_print_type_post(type->points_to);
+	intern_print_type_post(type->points_to, false);
 }
 
 static void print_array_type_pre(const array_type_t *type)
 {
-	intern_print_type_pre(type->element_type);
+	intern_print_type_pre(type->element_type, false);
 }
 
 static void print_array_type_post(const array_type_t *type)
@@ -154,7 +156,14 @@ static void print_array_type_post(const array_type_t *type)
 		print_expression(type->size);
 	}
 	fputc(']', out);
-	intern_print_type_post(type->element_type);
+	intern_print_type_post(type->element_type, false);
+}
+
+static void print_bitfield_type_post(const bitfield_type_t *type)
+{
+	fputs(" : ", out);
+	print_expression(type->size);
+	intern_print_type_post(type->base, false);
 }
 
 void print_enum_definition(const declaration_t *declaration)
@@ -216,10 +225,10 @@ static void print_compound_type(const compound_type_t *type)
 {
 	print_type_qualifiers(type->type.qualifiers);
 
-	if(type->type.type == TYPE_COMPOUND_STRUCT) {
+	if(type->type.kind == TYPE_COMPOUND_STRUCT) {
 		fputs("struct ", out);
 	} else {
-		assert(type->type.type == TYPE_COMPOUND_UNION);
+		assert(type->type.kind == TYPE_COMPOUND_UNION);
 		fputs("union ", out);
 	}
 
@@ -232,12 +241,13 @@ static void print_compound_type(const compound_type_t *type)
 	}
 }
 
-static void print_typedef_type_pre(typedef_type_t *type)
+static void print_typedef_type_pre(const typedef_type_t *const type)
 {
+	print_type_qualifiers(type->type.qualifiers);
 	fputs(type->declaration->symbol->string, out);
 }
 
-static void print_typeof_type_pre(typeof_type_t *type)
+static void print_typeof_type_pre(const typeof_type_t *const type)
 {
 	fputs("typeof(", out);
 	if(type->expression != NULL) {
@@ -249,11 +259,13 @@ static void print_typeof_type_pre(typeof_type_t *type)
 	fputc(')', out);
 }
 
-static void intern_print_type_pre(type_t *type)
+static void intern_print_type_pre(const type_t *const type, const bool top)
 {
-	switch(type->type) {
+	switch(type->kind) {
+	case TYPE_ERROR:
+		fputs("<error>", out);
 	case TYPE_INVALID:
-		fputs("invalid", out);
+		fputs("<invalid>", out);
 		return;
 	case TYPE_ENUM:
 		print_type_enum(&type->enumt);
@@ -269,11 +281,14 @@ static void intern_print_type_pre(type_t *type)
 		fputs(type->builtin.symbol->string, out);
 		return;
 	case TYPE_FUNCTION:
-		print_function_type_pre(&type->function);
+		print_function_type_pre(&type->function, top);
 		return;
 	case TYPE_POINTER:
 		print_pointer_type_pre(&type->pointer);
 		return;
+	case TYPE_BITFIELD:
+		intern_print_type_pre(type->bitfield.base, top);
+		return;
 	case TYPE_ARRAY:
 		print_array_type_pre(&type->array);
 		return;
@@ -287,11 +302,11 @@ static void intern_print_type_pre(type_t *type)
 	fputs("unknown", out);
 }
 
-static void intern_print_type_post(type_t *type)
+static void intern_print_type_post(const type_t *const type, const bool top)
 {
-	switch(type->type) {
+	switch(type->kind) {
 	case TYPE_FUNCTION:
-		print_function_type_post(&type->function, NULL);
+		print_function_type_post(&type->function, NULL, top);
 		return;
 	case TYPE_POINTER:
 		print_pointer_type_post(&type->pointer);
@@ -299,6 +314,10 @@ static void intern_print_type_post(type_t *type)
 	case TYPE_ARRAY:
 		print_array_type_post(&type->array);
 		return;
+	case TYPE_BITFIELD:
+		print_bitfield_type_post(&type->bitfield);
+		return;
+	case TYPE_ERROR:
 	case TYPE_INVALID:
 	case TYPE_ATOMIC:
 	case TYPE_ENUM:
@@ -311,12 +330,12 @@ static void intern_print_type_post(type_t *type)
 	}
 }
 
-void print_type(type_t *type)
+void print_type(const type_t *const type)
 {
 	print_type_ext(type, NULL, NULL);
 }
 
-void print_type_ext(type_t *type, const symbol_t *symbol,
+void print_type_ext(const type_t *const type, const symbol_t *symbol,
                     const context_t *context)
 {
 	if(type == NULL) {
@@ -324,21 +343,21 @@ 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((const function_type_t*) type, context);
+	if(type->kind == TYPE_FUNCTION) {
+		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) {
+	switch(type->kind) {
 	case TYPE_ATOMIC:          return sizeof(atomic_type_t);
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION:  return sizeof(compound_type_t);
@@ -349,6 +368,8 @@ static size_t get_type_size(type_t *type)
 	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_BITFIELD:        return sizeof(bitfield_type_t);
+	case TYPE_ERROR:           panic("error type found");
 	case TYPE_INVALID:         panic("invalid type found");
 	}
 	panic("unknown type found");
@@ -386,20 +407,20 @@ type_t *get_unqualified_type(type_t *type)
 
 bool type_valid(const type_t *type)
 {
-	return type->type != TYPE_INVALID;
+	return type->kind != TYPE_INVALID;
 }
 
 bool is_type_integer(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	if(type->type == TYPE_ENUM)
+	if(type->kind == TYPE_ENUM)
 		return true;
 
-	if(type->type != TYPE_ATOMIC)
+	if(type->kind != TYPE_ATOMIC)
 		return false;
 
-	switch(type->atomic.atype) {
+	switch(type->atomic.akind) {
 	case ATOMIC_TYPE_BOOL:
 	case ATOMIC_TYPE_CHAR:
 	case ATOMIC_TYPE_SCHAR:
@@ -422,10 +443,10 @@ bool is_type_floating(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	if(type->type != TYPE_ATOMIC)
+	if(type->kind != TYPE_ATOMIC)
 		return false;
 
-	switch(type->atomic.atype) {
+	switch(type->atomic.akind) {
 	case ATOMIC_TYPE_FLOAT:
 	case ATOMIC_TYPE_DOUBLE:
 	case ATOMIC_TYPE_LONG_DOUBLE:
@@ -448,13 +469,13 @@ bool is_type_signed(const type_t *type)
 	assert(!is_typeref(type));
 
 	/* enum types are int for now */
-	if(type->type == TYPE_ENUM)
+	if(type->kind == TYPE_ENUM)
 		return true;
 
-	if(type->type != TYPE_ATOMIC)
+	if(type->kind != TYPE_ATOMIC)
 		return false;
 
-	switch(type->atomic.atype) {
+	switch(type->atomic.akind) {
 	case ATOMIC_TYPE_CHAR:
 	case ATOMIC_TYPE_SCHAR:
 	case ATOMIC_TYPE_SHORT:
@@ -482,8 +503,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;
 	}
 
@@ -495,6 +517,9 @@ bool is_type_arithmetic(const type_t *type)
 {
 	assert(!is_typeref(type));
 
+	if(type->kind == TYPE_BITFIELD)
+		return true;
+
 	if(is_type_integer(type) || is_type_floating(type))
 		return true;
 
@@ -505,26 +530,35 @@ bool is_type_scalar(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	switch (type->type) {
+	switch (type->kind) {
 		case TYPE_POINTER: return true;
 		case TYPE_BUILTIN: return is_type_scalar(type->builtin.real_type);
-		default:           break;
+		default:            break;
 	}
 
 	return is_type_arithmetic(type);
 }
 
+/**
+ * Check if a given type is incomplete
+ */
 bool is_type_incomplete(const type_t *type)
 {
 	assert(!is_typeref(type));
 
-	switch(type->type) {
+	switch(type->kind) {
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION: {
 		const compound_type_t *compound_type = &type->compound;
 		declaration_t         *declaration   = compound_type->declaration;
 		return !declaration->init.is_defined;
 	}
+	case TYPE_ENUM: {
+		const enum_type_t *enum_type   = &type->enumt;
+		declaration_t     *declaration = enum_type->declaration;
+		return !declaration->init.is_defined;
+	}
+	case TYPE_BITFIELD:
 	case TYPE_FUNCTION:
 		return true;
 
@@ -532,9 +566,11 @@ bool is_type_incomplete(const type_t *type)
 		return type->array.size == NULL;
 
 	case TYPE_ATOMIC:
+		return type->atomic.akind == ATOMIC_TYPE_VOID;
+
 	case TYPE_POINTER:
-	case TYPE_ENUM:
 	case TYPE_BUILTIN:
+	case TYPE_ERROR:
 		return false;
 
 	case TYPE_TYPEDEF:
@@ -550,7 +586,9 @@ bool is_type_incomplete(const type_t *type)
 static bool function_types_compatible(const function_type_t *func1,
                                       const function_type_t *func2)
 {
-	if(!types_compatible(func1->return_type, func2->return_type))
+	const type_t* const ret1 = skip_typeref(func1->return_type);
+	const type_t* const ret2 = skip_typeref(func2->return_type);
+	if (!types_compatible(ret1, ret2))
 		return false;
 
 	/* can parameters be compared? */
@@ -592,7 +630,7 @@ static bool array_types_compatible(const array_type_t *array1,
 		return false;
 
 	if(array1->size != NULL && array2->size != NULL) {
-		/* TODO: check if size expression evaulate to the same value
+		/* TODO: check if size expression evaluate to the same value
 		 * if they are constant */
 	}
 
@@ -610,19 +648,23 @@ bool types_compatible(const type_t *type1, const type_t *type2)
 
 	if(type1->base.qualifiers != type2->base.qualifiers)
 		return false;
-	if(type1->type != type2->type)
+	if(type1->kind != type2->kind)
 		return false;
 
-	switch(type1->type) {
+	switch(type1->kind) {
 	case TYPE_FUNCTION:
 		return function_types_compatible(&type1->function, &type2->function);
 	case TYPE_ATOMIC:
-		return type1->atomic.atype == type2->atomic.atype;
+		return type1->atomic.akind == type2->atomic.akind;
 	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_POINTER: {
+		const type_t *const to1 = skip_typeref(type1->pointer.points_to);
+		const type_t *const to2 = skip_typeref(type2->pointer.points_to);
+		return types_compatible(to1, to2);
+	}
+
 	case TYPE_COMPOUND_STRUCT:
 	case TYPE_COMPOUND_UNION:
 	case TYPE_ENUM:
@@ -630,6 +672,14 @@ bool types_compatible(const type_t *type1, const type_t *type2)
 		/* TODO: not implemented */
 		break;
 
+	case TYPE_BITFIELD:
+		/* not sure if this makes sense or is even needed, implement it if you
+		 * really need it! */
+		panic("type compatibility check for bitfield type");
+
+	case TYPE_ERROR:
+		/* Hmm, the error type should be compatible to all other types */
+		return true;
 	case TYPE_INVALID:
 		panic("invalid type found in compatible types");
 	case TYPE_TYPEDEF:
@@ -646,18 +696,23 @@ 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);
+	assert(type1->kind == TYPE_POINTER);
+	assert(type2->kind == TYPE_POINTER);
 	/* TODO */
 	return true;
 }
 
+/**
+ * Skip all typerefs and return the underlying type.
+ */
 type_t *skip_typeref(type_t *type)
 {
-	unsigned qualifiers = type->base.qualifiers;
+	unsigned qualifiers = TYPE_QUALIFIER_NONE;
 
-	while(1) {
-		switch(type->type) {
+	while(true) {
+		switch(type->kind) {
+		case TYPE_ERROR:
+			return type;
 		case TYPE_TYPEDEF: {
 			qualifiers |= type->base.qualifiers;
 			const typedef_type_t *typedef_type = &type->typedeft;
@@ -683,6 +738,16 @@ type_t *skip_typeref(type_t *type)
 		break;
 	}
 
+	if (qualifiers != TYPE_QUALIFIER_NONE) {
+		type_t *const copy     = duplicate_type(type);
+		copy->base.qualifiers |= qualifiers;
+
+		type = typehash_insert(copy);
+		if (type != copy) {
+			obstack_free(type_obst, copy);
+		}
+	}
+
 	return type;
 }
 
@@ -697,14 +762,14 @@ static type_t *identify_new_type(type_t *type)
 	return result;
 }
 
-type_t *make_atomic_type(atomic_type_type_t atype, type_qualifiers_t qualifiers)
+type_t *make_atomic_type(atomic_type_kind_t atype, type_qualifiers_t qualifiers)
 {
 	type_t *type = obstack_alloc(type_obst, sizeof(atomic_type_t));
 	memset(type, 0, sizeof(atomic_type_t));
 
-	type->type            = TYPE_ATOMIC;
+	type->kind            = TYPE_ATOMIC;
 	type->base.qualifiers = qualifiers;
-	type->atomic.atype    = atype;
+	type->atomic.akind    = atype;
 
 	return identify_new_type(type);
 }
@@ -714,7 +779,7 @@ type_t *make_pointer_type(type_t *points_to, type_qualifiers_t qualifiers)
 	type_t *type = obstack_alloc(type_obst, sizeof(pointer_type_t));
 	memset(type, 0, sizeof(pointer_type_t));
 
-	type->type              = TYPE_POINTER;
+	type->kind              = TYPE_POINTER;
 	type->base.qualifiers   = qualifiers;
 	type->pointer.points_to = points_to;