From 8c2af5cff7e3260ed4b254a6118303bf59b27923 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 19 Dec 2012 14:07:23 +0900
Subject: [PATCH] Add more convenience functions.

Cleans up obj_types_assignable a little.
---
 tools/qfcc/include/class.h |  2 ++
 tools/qfcc/source/class.c  | 50 ++++++++++++++++++++++++++------------
 2 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/tools/qfcc/include/class.h b/tools/qfcc/include/class.h
index ad4afb5a7..4b609c5d7 100644
--- a/tools/qfcc/include/class.h
+++ b/tools/qfcc/include/class.h
@@ -109,6 +109,8 @@ struct symbol_s;
 
 int obj_is_id (const struct type_s *type);
 int obj_is_class (const struct type_s *type);
+int obj_is_Class (const struct type_s *type);
+int obj_is_classptr (const struct type_s *type);
 int obj_types_assignable (const struct type_s *dst, const struct type_s *src);
 
 class_t *extract_class (class_type_t *class_type);
diff --git a/tools/qfcc/source/class.c b/tools/qfcc/source/class.c
index b97aee701..419984960 100644
--- a/tools/qfcc/source/class.c
+++ b/tools/qfcc/source/class.c
@@ -198,28 +198,48 @@ obj_is_class (const type_t *type)
 	return 0;
 }
 
+int
+obj_is_Class (const type_t *type)
+{
+	if (type == &type_Class)
+		return 1;
+	// type may be a qualified Class, in which case it will be a pointer to
+	// a qualified obj_class struct
+	if (type->type != ev_pointer)
+		return 0;
+	if (!is_struct (type->t.fldptr.type))
+		return 0;
+	// if the the symtabs match, then type is Class in disguise
+	if (type->t.fldptr.type->t.symtab == type_obj_class.t.symtab)
+		return 1;
+	return 0;
+}
+
+int
+obj_is_classptr (const type_t *type)
+{
+	// easy cases first :)
+	if (obj_is_id (type) || obj_is_Class (type))
+		return 1;
+	if (type->type != ev_pointer)
+		return 0;
+	type = type->t.fldptr.type;
+	if (obj_is_class (type))
+		return 1;
+	return 0;
+}
+
 int
 obj_types_assignable (const type_t *dst, const type_t *src)
 {
 	class_t    *dst_class, *src_class;
 
-	if (obj_is_id (dst)
-		&& (obj_is_id (src)
-			|| obj_is_class (src->t.fldptr.type)
-			|| src == &type_Class)) {
-		return 1;
-	}
-	if (obj_is_id (src)
-		&& (obj_is_id (dst)
-			|| obj_is_class (dst->t.fldptr.type)
-			|| dst == &type_Class)) {
-		return 1;
-	}
-
-	if (!obj_is_class (dst->t.fldptr.type)
-		|| !obj_is_class (src->t.fldptr.type))
+	if (!obj_is_classptr (dst) || !obj_is_classptr (src))
 		return -1;
 
+	if (obj_is_id (dst) || obj_is_id (src))
+		return 1;
+
 	// check dst is a base class of src
 	dst_class = dst->t.fldptr.type->t.class;
 	src_class = src->t.fldptr.type->t.class;