if (cur->op != op)
{
Eo_Op node_op = cur->op;
- ERR("Called with op %d ('%s') while expecting: %d ('%s'). This probaly means you called eo_*_super functions from a wrong place.",
+ ERR("Called with op %x ('%s') while expecting: %x ('%s'). This probaly means you called eo_*_super functions from a wrong place.",
op, _eo_op_id_name_get(op),
node_op, _eo_op_id_name_get(node_op));
return NULL;
{
if (op_desc->op_type == EO_OP_TYPE_CLASS)
{
- ERR("Tried calling a class op '%s' (%d) from a non-class context.", (op_desc) ? op_desc->name : NULL, op);
+ ERR("Tried calling a class op '%s' (%x) from a non-class context.", (op_desc) ? op_desc->name : NULL, op);
return EINA_FALSE;
}
else if ((op_type == EO_OP_TYPE_CONST) &&
(op_desc->op_type != EO_OP_TYPE_CONST))
{
- ERR("Tried calling non-const or non-existant op '%s' (%d) from a const (query) function.", (op_desc) ? op_desc->name : NULL, op);
+ ERR("Tried calling non-const or non-existant op '%s' (%x) from a const (query) function.", (op_desc) ? op_desc->name : NULL, op);
return EINA_FALSE;
}
}
{
if (op_desc->op_type != EO_OP_TYPE_CLASS)
{
- ERR("Tried calling an instant op '%s' (%d) from a class context.", (op_desc) ? op_desc->name : NULL, op);
+ ERR("Tried calling an instance op '%s' (%x) from a class context.", (op_desc) ? op_desc->name : NULL, op);
return EINA_FALSE;
}
}
itr = func_descs;
if (itr)
{
- for ( ; itr->op != 0 ; itr++)
+ for ( ; itr->op_type != EO_OP_TYPE_INVALID ; itr++)
{
const Eo_Op_Description *op_desc = _eo_op_id_desc_get(itr->op);
- if (EINA_LIKELY(op_desc && (itr->op_type == op_desc->op_type)))
+ if (EINA_UNLIKELY(!op_desc || (itr->op == EO_NOOP)))
+ {
+ ERR("Setting implementation for non-existent op %x for class '%s'. Func index: %d", itr->op, klass->desc->name, itr - func_descs);
+ }
+ else if (EINA_LIKELY(itr->op_type == op_desc->op_type))
{
_dich_func_set(klass, itr->op, itr->func);
}
else
{
- Eo_Op_Type desc_type = EO_OP_TYPE_REGULAR;
- const char *desc_name = NULL;
- if (op_desc)
- {
- desc_type = op_desc->op_type;
- desc_name = op_desc->name;
- }
-
- ERR("Set function's op type (%d) is different than the one in the op description (%d) for op '%s' in class '%s'.", itr->op_type, desc_type, desc_name, klass->desc->name);
+ ERR("Set function's op type (%x) is different than the one in the op description (%d) for op '%s' in class '%s'. Func index: %d",
+ itr->op_type,
+ (op_desc) ? op_desc->op_type : EO_OP_TYPE_REGULAR,
+ (op_desc) ? op_desc->name : NULL,
+ klass->desc->name,
+ itr - func_descs);
}
}
}
{
if (itr->name)
{
- ERR("Wrong order in Ops description for class '%s'. Expected %d and got %d", desc->name, i, itr->sub_op);
+ ERR("Wrong order in Ops description for class '%s'. Expected %x and got %x", desc->name, i, itr->sub_op);
}
else
{
- ERR("Found too few Ops description for class '%s'. Expected %d descriptions, but found %d.", desc->name, desc->ops.count, i);
+ ERR("Found too few Ops description for class '%s'. Expected %x descriptions, but found %x.", desc->name, desc->ops.count, i);
}
return EINA_FALSE;
}
{
if (--(obj->refcount) == 0)
{
+ if (obj->del)
+ {
+ ERR("Object %p already deleted.", obj);
+ return;
+ }
+
_eo_del_internal(obj);
#ifndef NDEBUG