From 1aa3b1536f672dd2daa67e160d895cca40b344b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Fri, 26 Jul 2013 17:14:52 +0200 Subject: [PATCH] eo2: add virtual func support --- src/lib/eo/Eo.h | 2 ++ src/lib/eo/eo.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 2e6729b..dbcd42d 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -659,10 +659,12 @@ typedef struct _Eo2_Op_Call_Data // OP ID of an overriding function #define EO2_OP_OVERRIDE ((Eo_Op) -1) +#define EO2_OP_VIRTUAL ((Eo_Op) -2) #define EO2_OP_FUNC(_private, _api, _doc) {_private, _api, EO_NOOP, EO_OP_TYPE_REGULAR, _doc} #define EO2_OP_CLASS_FUNC(_private, _api, _doc) {_private, _api, EO_NOOP, EO_OP_TYPE_CLASS, _doc} #define EO2_OP_FUNC_OVERRIDE(_private, _api) {_private, _api, EO2_OP_OVERRIDE, EO_OP_TYPE_REGULAR, NULL} +#define EO2_OP_FUNC_VIRTUAL(_api, _doc) {NULL, _api, EO2_OP_VIRTUAL, EO_OP_TYPE_REGULAR, _doc} #define EO2_OP_SENTINEL { NULL, NULL, 0, EO_OP_TYPE_INVALID, NULL} // returns the OP id corresponding to the given api_func diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index 9837856..65ead71 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -382,9 +382,17 @@ eo2_call_resolve_internal(const Eo_Class *klass_id, Eo_Op op, Eo2_Op_Call_Data * else klass = fptr->cur_klass; - func = _eo_kls_itr_func_get(klass, op); + if (!klass) + return EINA_FALSE; + + func = _dich_func_get(klass, op); if (EINA_LIKELY(func != NULL)) { + if (func->func == NULL) + { + ERR("you called a pure virtual func"); + return EINA_FALSE; + } call->obj_id = fptr->obj_id; call->func = func->func; @@ -496,6 +504,11 @@ eo2_class_funcs_set(Eo_Class *klass_id) op_desc->op = op_id; op_id++; } + else if (op_desc->op == EO2_OP_VIRTUAL) + { + op_desc->op = op_id; + op_id++; + } else if (op_desc->op == EO2_OP_OVERRIDE) { if (klass->parent == NULL) -- 2.7.4