vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eo: Split object checking from class checking and simplify. 

The check there was wrong for objects anyway, and was ultra conservative
for classes.
This commit is contained in:
Tom Hacohen 2015-10-15 12:56:15 +01:00
parent f7196513d0
commit f7f7fc69cf
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/lib/eo/eo.c
View File

@ -142,18 +142,25 @@ _dich_func_clean_all(_Eo_Class *klass)
/* END OF DICH */
#ifdef HAVE_EO_ID
# define _EO_ID_GET(Id) ((Eo_Id) (Id))
#else
# define _EO_ID_GET(Id) ((Eo_Id) ((Id) ? ((Eo_Header *) (Id))->id : 0))
#endif
static inline Eina_Bool
_eo_is_a_obj(const Eo *eo_id)
{
Eo_Id oid = (Eo_Id) _EO_ID_GET(eo_id);
return !!(oid & MASK_OBJ_TAG);
}
static inline Eina_Bool
_eo_is_a_class(const Eo *eo_id)
{
Eo_Id oid;
#ifdef HAVE_EO_ID
oid = (Eo_Id) eo_id;
#else
/* fortunately EO_OBJ_POINTER_RETURN* will handle NULL eo_id */
if (!eo_id) return EINA_FALSE;
oid = ((Eo_Header *) eo_id)->id;
#endif
return (!(oid & MASK_OBJ_TAG) && (oid & MASK_CLASS_TAG));
Eo_Id oid = (Eo_Id) _EO_ID_GET(eo_id);
return !!(oid & MASK_CLASS_TAG);
}
static inline _Eo_Class *
@ -430,20 +437,20 @@ static inline Eina_Bool
_eo_do_internal(const Eo *eo_id, const Eo_Class *cur_klass_id,
Eina_Bool is_super, Eo_Stack_Frame *fptr)
{
fptr->is_obj = !_eo_is_a_class(eo_id);
fptr->is_obj = _eo_is_a_obj(eo_id);
/* If we are already in the same object context, we inherit info from it. */
if (!fptr->is_obj)
{
EO_CLASS_POINTER_RETURN_VAL(eo_id, _klass, EINA_FALSE);
fptr->o.kls = _klass;
}
else
if (fptr->is_obj)
{
EO_OBJ_POINTER_RETURN_VAL(eo_id, _obj, EINA_FALSE);
fptr->o.obj = _obj;
_eo_ref(_obj);
}
else
{
EO_CLASS_POINTER_RETURN_VAL(eo_id, _klass, EINA_FALSE);
fptr->o.kls = _klass;
}
if (is_super)
{
@ -986,7 +993,7 @@ eo_class_name_get(const Eo_Class *eo_id)
EO_CLASS_POINTER_RETURN_VAL(eo_id, _klass, NULL);
klass = _klass;
}
else
else
{
EO_OBJ_POINTER_RETURN_VAL(eo_id, obj, NULL);
klass = obj->klass;