enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

eobj: wrapped all the kls_itr calls into functions. 

SVN revision: 70006
This commit is contained in:
Tom Hacohen 2012-04-11 07:05:30 +00:00
parent e1d070a9db
commit 4e471e9186
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
legacy/eobj/lib/eobj.c
View File

@ -207,12 +207,33 @@ dich_func_clean_all(Eobj_Class *klass)
/* END OF DICH */ /* END OF DICH */
static void static inline void
_eobj_kls_itr_init(Eobj *obj) _eobj_kls_itr_init(Eobj *obj)
{ {
obj->kls_itr = obj->klass->mro; obj->kls_itr = obj->klass->mro;
} }
static inline void
_eobj_kls_itr_end(Eobj *obj)
{
/*pop*/
}
static inline const Eobj_Class *
_eobj_kls_itr_next(Eobj *obj)
{
if (*obj->kls_itr)
return *++(obj->kls_itr);
else
return NULL;
}
static inline Eina_Bool
_eobj_kls_itr_reached_end(const Eobj *obj)
{
return !(*obj->kls_itr && *(obj->kls_itr + 1));
}
/* FIXME: Decide if it should be fast, and if so, add a mapping. /* FIXME: Decide if it should be fast, and if so, add a mapping.
* Otherwise, this is very slow. But since it's only for debugging... */ * Otherwise, this is very slow. But since it's only for debugging... */
static const Eobj_Op_Description * static const Eobj_Op_Description *
@ -340,6 +361,7 @@ eobj_do_internal(Eobj *obj, ...)
va_start(p_list, obj); va_start(p_list, obj);
_eobj_kls_itr_init(obj); _eobj_kls_itr_init(obj);
ret = _eobj_ops_internal(obj, eobj_class_get(obj), &p_list); ret = _eobj_ops_internal(obj, eobj_class_get(obj), &p_list);
_eobj_kls_itr_end(obj);
va_end(p_list); va_end(p_list);
return ret; return ret;
} }
@ -347,7 +369,9 @@ eobj_do_internal(Eobj *obj, ...)
EAPI Eina_Bool EAPI Eina_Bool
eobj_super_do(Eobj *obj, Eobj_Op op, ...) eobj_super_do(Eobj *obj, Eobj_Op op, ...)
{ {
const Eobj_Class *obj_klass = *++(obj->kls_itr); const Eobj_Class *obj_klass = _eobj_kls_itr_next(obj);
if (!obj_klass) return EINA_TRUE;
Eina_Bool ret = EINA_TRUE; Eina_Bool ret = EINA_TRUE;
va_list p_list; va_list p_list;
va_start(p_list, op); va_start(p_list, op);
@ -664,11 +688,12 @@ eobj_add(const Eobj_Class *klass, Eobj *parent)
goto fail; goto fail;
} }
if (*obj->kls_itr && *(obj->kls_itr + 1)) if (!_eobj_kls_itr_reached_end(obj))
{ {
ERR("Type '%s' - Not all of the object constructors have been executed.", klass->desc->name); ERR("Type '%s' - Not all of the object constructors have been executed.", klass->desc->name);
goto fail; goto fail;
} }
_eobj_kls_itr_end(obj);
return obj; return obj;
@ -697,10 +722,11 @@ eobj_unref(Eobj *obj)
ERR("Type '%s' - One of the object destructors have failed.", klass->desc->name); ERR("Type '%s' - One of the object destructors have failed.", klass->desc->name);
} }
if (*obj->kls_itr && *(obj->kls_itr + 1)) if (!_eobj_kls_itr_reached_end(obj))
{ {
ERR("Type '%s' - Not all of the object destructors have been executed.", klass->desc->name); ERR("Type '%s' - Not all of the object destructors have been executed.", klass->desc->name);
} }
_eobj_kls_itr_end(obj);
/*FIXME: add eobj_class_unref(klass) ? - just to clear the caches. */ /*FIXME: add eobj_class_unref(klass) ? - just to clear the caches. */
Eina_List *itr, *itr_n; Eina_List *itr, *itr_n;
@ -788,15 +814,13 @@ eobj_class_destructor(Eobj *obj, const Eobj_Class *klass)
EAPI void EAPI void
eobj_constructor_super(Eobj *obj) eobj_constructor_super(Eobj *obj)
{ {
if (*obj->kls_itr) eobj_class_constructor(obj, _eobj_kls_itr_next(obj));
eobj_class_constructor(obj, *++(obj->kls_itr));
} }
EAPI void EAPI void
eobj_destructor_super(Eobj *obj) eobj_destructor_super(Eobj *obj)
{ {
if (*obj->kls_itr) eobj_class_destructor(obj, _eobj_kls_itr_next(obj));
eobj_class_destructor(obj, *++(obj->kls_itr));
} }
EAPI void * EAPI void *