@@ -69,6 +69,8 @@ typedef struct Interface
#define INTERFACE(obj) OBJECT_CHECK(Interface, obj, TYPE_INTERFACE)
+static Type type_interface;
+
static GHashTable *type_table_get(void)
{
static GHashTable *type_table;
@@ -374,11 +376,9 @@ void object_delete(Object *obj)
g_free(obj);
}
-static Type type_interface;
-
-static bool object_is_type(Object *obj, TypeImpl *target_type)
+static bool type_is_ancestor(TypeImpl *type, TypeImpl *target_type)
{
- TypeImpl *type = obj->class->type;
+ assert(target_type);
/* Check if typename is a direct ancestor of type */
while (type) {
@@ -392,21 +392,28 @@ static bool object_is_type(Object *obj, TypeImpl *target_type)
return false;
}
+static bool object_is_type(Object *obj, TypeImpl *target_type)
+{
+ return !target_type || type_is_ancestor(obj->class->type, target_type);
+}
+
Object *object_dynamic_cast(Object *obj, const char *typename)
{
TypeImpl *target_type = type_get_by_name(typename);
GSList *i;
- /* Check if typename is a direct ancestor */
- if (object_is_type(obj, target_type)) {
+ /* Check if typename is a direct ancestor. Special-case TYPE_OBJECT,
+ * we want to go back from interfaces to the parent.
+ */
+ if (target_type && object_is_type(obj, target_type)) {
return obj;
}
/* Check if obj is an interface and its containing object is a direct
* ancestor of typename. In principle we could do this test at the very
* beginning of object_dynamic_cast, avoiding a second call to
* object_is_type. However, casting between interfaces is relatively
- * rare, and object_is_type(obj, TYPE_INTERFACE) would fail almost always.
+ * rare, and object_is_type(obj, type_interface) would fail almost always.
*
* Perhaps we could add a magic value to the object header for increased
* (run-time) type safety and to speed up tests like this one. If we ever
@@ -420,6 +427,10 @@ Object *object_dynamic_cast(Object *obj, const char *typename)
}
}
+ if (!target_type) {
+ return obj;
+ }
+
/* Check if obj has an interface of typename */
for (i = obj->interfaces; i; i = i->next) {
Interface *iface = i->data;
@@ -873,8 +884,8 @@ static void object_set_link_property(Object *obj, Visitor *v, void *opaque,
if (strcmp(path, "") != 0) {
Object *target;
- target_type = g_strdup(&type[5]);
- *strchr(target_type, '>') = 0;
+ /* Go from link<FOO> to FOO. */
+ target_type = g_strndup(&type[5], strlen(type) - 6);
target = object_resolve_path_type(path, target_type, &ambiguous);
if (ambiguous) {