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

Eo: Drop doc field from ops and events. 

This hasn't been used for a while. Since we are going to break Eo a bit anyway
it's a good opportunity to drop this.

This may cause a slight performance issues with legacy events, such as
smart callbacks. This shouldn't really be a problem as we've migrated away from
them. If it does, we need to migrate the remaining parts. Only relevant
for callbacks that are added before the classes are created, which
shouldn't be possible except for smart, only for old evas callbacks.
This commit is contained in:
Tom Hacohen 2015-09-28 14:15:15 +01:00
parent 5f74afe4f7
commit 37f84b7e96
32 changed files with 184 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/eolian/common_funcs.c
View File

@ -155,20 +155,3 @@ _startline(char *str, char *pos)
return ret;
}
char*
_source_desc_get(const char *str)
{
Eina_Strbuf *part = eina_strbuf_new();
if (str)
{
const char *p = strchr(str, '\n');
size_t offs = (p) ? (size_t)(p - str) : strlen(str);
eina_strbuf_append_n(part, str, offs);
eina_strbuf_replace_all(part, "\\", "\\\\");
eina_strbuf_replace_all(part, "\"", "\\\"");
}
char *ret = eina_strbuf_string_steal(part);
eina_strbuf_free(part);
return ret;
}

2
src/bin/eolian/common_funcs.h
View File

@ -63,8 +63,6 @@ char *_nextline(char *str, unsigned int lines);
char *_startline(char *str, char *pos);
char *_source_desc_get(const char *str);
void _class_env_create(const Eolian_Class *class, const char *over_classname, _eolian_class_vars *env);
void _class_func_env_create(const Eolian_Class *class, const char *funcname, Eolian_Function_Type ftype EINA_UNUSED, _eolian_class_func_vars *env);

25
src/bin/eolian/eo_generator.c
View File

@ -586,7 +586,7 @@ eo_bind_func_generate(const Eolian_Class *class, const Eolian_Function *funcid,
static Eina_Bool
eo_op_desc_generate(const Eolian_Class *class, const Eolian_Function *fid, Eolian_Function_Type ftype,
const char *desc, Eina_Strbuf *buf)
Eina_Strbuf *buf)
{
_eolian_class_func_vars func_env;
const char *funcname = eolian_function_name_get(fid);
@ -603,12 +603,12 @@ eo_op_desc_generate(const Eolian_Class *class, const Eolian_Function *fid, Eolia
if (!is_virtual_pure)
{
Eolian_Function_Type ftype2 = (Eolian_Function_Type) eina_hash_find(_funcs_params_init, funcname);
eina_strbuf_append_printf(buf, "%s_%s_%s%s, \"%s\"),",
eina_strbuf_append_printf(buf, "%s_%s_%s%s),",
ftype == ftype2?"__eolian":"",
class_env.lower_classname, funcname, suffix, desc);
class_env.lower_classname, funcname, suffix);
}
else
eina_strbuf_append_printf(buf, "NULL, \"%s\"),", desc);
eina_strbuf_append_printf(buf, "NULL),");
return EINA_TRUE;
}
@ -625,16 +625,11 @@ eo_source_beginning_generate(const Eolian_Class *class, Eina_Strbuf *buf)
EINA_ITERATOR_FOREACH(itr, event)
{
Eina_Stringshare *evname = eolian_event_c_name_get(event);
const char *evdesc = NULL;
const Eolian_Documentation *doc = eolian_event_documentation_get(event);
if (doc) evdesc = eolian_documentation_summary_get(doc);
char *evdesc_line1 = _source_desc_get(evdesc);
eina_strbuf_append_printf(tmpbuf,
"EOAPI const Eo_Event_Description _%s =\n EO_EVENT_DESCRIPTION(\"%s\", \"%s\");\n",
evname, eolian_event_name_get(event), evdesc_line1);
"EOAPI const Eo_Event_Description _%s =\n EO_EVENT_DESCRIPTION(\"%s\");\n",
evname, eolian_event_name_get(event));
eina_stringshare_del(evname);
free(evdesc_line1);
}
eina_iterator_free(itr);
@ -652,14 +647,8 @@ _desc_generate(const Eolian_Class *class, const Eolian_Function *fid, Eolian_Fun
snprintf(tmpstr, sizeof(tmpstr), "%s%s", funcname, (ftype == EOLIAN_PROP_SET)
? "_set" : ((ftype == EOLIAN_PROP_GET) ? "_get" : ""));
const char *opdesc = NULL;
const Eolian_Documentation *doc = eolian_function_documentation_get(fid, ftype);
if (doc) opdesc = eolian_documentation_summary_get(doc);
char *desc = _source_desc_get(opdesc);
eo_op_desc_generate(class, fid, ftype, desc, tmpbuf);
eo_op_desc_generate(class, fid, ftype, tmpbuf);
eina_strbuf_append(str_op, eina_strbuf_string_get(tmpbuf));
free(desc);
}
static Eina_Bool

2
src/bindings/eo_cxx/eo_inherit_bindings.hh
View File

@ -138,13 +138,11 @@ Eo_Class const* create_class(eina::index_sequence<S...>)
);
op_descs[detail::operation_description_size<E...>::value].op = EO_NOOP;
op_descs[detail::operation_description_size<E...>::value].op_type = EO_OP_TYPE_REGULAR;
op_descs[detail::operation_description_size<E...>::value].doc = NULL;
op_descs[detail::operation_description_size<E...>::value+1].func = 0;
op_descs[detail::operation_description_size<E...>::value+1].api_func = 0;
op_descs[detail::operation_description_size<E...>::value+1].op = 0;
op_descs[detail::operation_description_size<E...>::value+1].op_type = EO_OP_TYPE_INVALID;
op_descs[detail::operation_description_size<E...>::value+1].doc = NULL;
typedef inherit<D, E...> inherit_type;
using namespace detail;

2
src/examples/eo/evas/evas_elw_button.c
View File

@ -11,7 +11,7 @@
EAPI Eo_Op ELW_BUTTON_BASE_ID = 0;
EAPI const Eo_Event_Description _EV_CLICKED =
EO_EVENT_DESCRIPTION("clicked", "Called when there was a click.");
EO_EVENT_DESCRIPTION("clicked");
typedef struct
{

4
src/lib/efl/interfaces/efl_interfaces_main.c
View File

@ -23,9 +23,9 @@
#include "interfaces/efl_gfx_filter.eo.c"
EAPI const Eo_Event_Description _EFL_GFX_CHANGED =
EO_EVENT_DESCRIPTION("Graphics changed", "The visual representation of the object changed");
EO_EVENT_DESCRIPTION("Graphics changed");
EAPI const Eo_Event_Description _EFL_GFX_PATH_CHANGED =
EO_EVENT_DESCRIPTION("Graphics path changed", "The path of a shape object changed");
EO_EVENT_DESCRIPTION("Graphics path changed");
#include "interfaces/efl_model_base.eo.c"

21
src/lib/eo/Eo.h
View File

@ -242,24 +242,22 @@ typedef unsigned int Eo_Op;
*/
/**
* @def EO_EVENT_DESCRIPTION(name, doc)
* @def EO_EVENT_DESCRIPTION(name)
* An helper macro to help populating #Eo_Event_Description
* @param name The name of the event.
* @param doc Additional doc for the event.
* @see Eo_Event_Description
*/
#define EO_EVENT_DESCRIPTION(name, doc) { name, doc, EINA_FALSE }
#define EO_EVENT_DESCRIPTION(name) { name, EINA_FALSE }
/**
* @def EO_HOT_EVENT_DESCRIPTION(name, doc)
* @def EO_HOT_EVENT_DESCRIPTION(name)
* An helper macro to help populating #Eo_Event_Description and make
* the event impossible to freeze.
* @param name The name of the event.
* @param doc Additional doc for the event.
* @see Eo_Event_Description
* @see EO_EVENT_DESCRIPTION
*/
#define EO_HOT_EVENT_DESCRIPTION(name, doc) { name, doc, EINA_TRUE }
#define EO_HOT_EVENT_DESCRIPTION(name) { name, EINA_TRUE }
@ -351,7 +349,6 @@ typedef struct _Eo_Op_Description
void *func; /**< The static function to call for the op. */
Eo_Op op; /**< The op. */
Eo_Op_Type op_type; /**< The type of the Op. */
const char *doc; /**< Explanation about the Op. */
} Eo_Op_Description;
/**
@ -540,11 +537,11 @@ EAPI extern Eo_Hook_Call eo_hook_call_post;
# define _EO_OP_API_ENTRY(a) a, #a
#endif
#define EO_OP_FUNC(_api, _private, _doc) { _EO_OP_API_ENTRY(_api), _private, EO_NOOP, EO_OP_TYPE_REGULAR, _doc }
#define EO_OP_CLASS_FUNC(_api, _private, _doc) { _EO_OP_API_ENTRY(_api), _private, EO_NOOP, EO_OP_TYPE_CLASS, _doc }
#define EO_OP_FUNC_OVERRIDE(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_OP_OVERRIDE, EO_OP_TYPE_REGULAR, NULL }
#define EO_OP_CLASS_FUNC_OVERRIDE(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_OP_OVERRIDE, EO_OP_TYPE_CLASS, NULL }
#define EO_OP_SENTINEL { _EO_OP_API_ENTRY(NULL), NULL, 0, EO_OP_TYPE_INVALID, NULL }
#define EO_OP_FUNC(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_NOOP, EO_OP_TYPE_REGULAR }
#define EO_OP_CLASS_FUNC(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_NOOP, EO_OP_TYPE_CLASS }
#define EO_OP_FUNC_OVERRIDE(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_OP_OVERRIDE, EO_OP_TYPE_REGULAR }
#define EO_OP_CLASS_FUNC_OVERRIDE(_api, _private) { _EO_OP_API_ENTRY(_api), _private, EO_OP_OVERRIDE, EO_OP_TYPE_CLASS }
#define EO_OP_SENTINEL { _EO_OP_API_ENTRY(NULL), NULL, 0, EO_OP_TYPE_INVALID }
// returns the OP id corresponding to the given api_func
EAPI Eo_Op _eo_api_op_id_get(const void *api_func, Eina_Bool is_main_loop, const char *file, int line);

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

@ -218,11 +218,33 @@ _eo_op_id_desc_get(Eo_Op op)
return NULL;
}
static const char *
_eo_op_desc_name_get(const Eo_Op_Description *desc)
{
static const char *fct_name = "unknown";
if (!desc)
{
return fct_name;
}
#ifndef _WIN32
# ifdef HAVE_DLADDR
static Dl_info info;
if (dladdr(desc->api_func, &info) != 0)
fct_name = info.dli_sname;
# endif
#else
fct_name = api_func; /* Same on windows */
#endif
return fct_name;
}
static const char *
_eo_op_id_name_get(Eo_Op op)
{
const Eo_Op_Description *desc = _eo_op_id_desc_get(op);
return (desc) ? desc->doc : NULL;
return _eo_op_desc_name_get(desc);
}
static inline const op_type_funcs *
@ -772,16 +794,7 @@ _eo_api_op_id_get(const void *api_func, Eina_Bool is_main_loop, const char *file
if (desc == NULL)
{
const char *fct_name = "unknown";
#ifndef _WIN32
# ifdef HAVE_DLADDR
Dl_info info;
if (dladdr(api_func, &info) != 0)
fct_name = info.dli_sname;
# endif
#else
fct_name = api_func; /* Same on windows */
#endif
const char *fct_name = _eo_op_desc_name_get(desc);
ERR("in %s:%d: unable to resolve %s api func '%s' %p in class '%s'.",
file, line, (class_ref ? "class" : "regular"),
fct_name, api_func, klass->desc->name);
@ -826,7 +839,7 @@ _eo_class_funcs_set(_Eo_Class *klass)
if(op_desc->api_func == NULL)
{
ERR("Class '%s': NULL API not allowed (%d NULL->%p '%s').",
klass->desc->name, op_desc->op, op_desc->func, op_desc->doc);
klass->desc->name, op_desc->op, op_desc->func, _eo_op_desc_name_get(op_desc));
return EINA_FALSE;
}
@ -835,7 +848,7 @@ _eo_class_funcs_set(_Eo_Class *klass)
if (op_desc->api_func == last_api_func)
{
ERR("Class '%s': API previously defined (%d %p->%p '%s').",
klass->desc->name, op_desc->op, op_desc->api_func, op_desc->func, op_desc->doc);
klass->desc->name, op_desc->op, op_desc->api_func, op_desc->func, _eo_op_desc_name_get(op_desc));
return EINA_FALSE;
}
op_desc->op = op_id;
@ -852,15 +865,14 @@ _eo_class_funcs_set(_Eo_Class *klass)
if (api_desc == NULL)
{
ERR("Class '%s': Can't find api func description in class hierarchy (%p->%p) (%s).",
klass->desc->name, op_desc->api_func, op_desc->func, op_desc->doc);
klass->desc->name, op_desc->api_func, op_desc->func, _eo_op_desc_name_get(op_desc));
return EINA_FALSE;
}
op_desc->op = api_desc->op;
op_desc->doc = api_desc->doc;
}
DBG(" %4d %p->%p '%s'", op_desc->op, op_desc->api_func, op_desc->func, op_desc->doc);
DBG(" %4d %p->%p '%s'", op_desc->op, op_desc->api_func, op_desc->func, _eo_op_desc_name_get(op_desc));
if (!_dich_func_set(klass, op_desc->op, op_desc->func))
return EINA_FALSE;

1
src/lib/eo/eo_base.eo
View File

@ -6,7 +6,6 @@ type @extern Eo.Event_Cb: __builtin_event_cb;
struct Eo.Event_Description {
[[This struct holds the description of a specific event.]]
name: const(char) *; [[name of the event.]]
doc: const(char) *; [[Explanation about the event.]]
unfreezable: bool; [[Eina_True if the event cannot be frozen.]]
}

17
src/lib/eo/eo_base_class.c
View File

@ -401,7 +401,6 @@ _wref_destruct(Eo_Base_Data *pd)
/* XXX: Legacy support, remove when legacy is dead. */
static Eina_Hash *_legacy_events_hash = NULL;
static const char *_legacy_event_desc = "Dynamically generated legacy event";
EAPI const Eo_Event_Description *
eo_base_legacy_only_event_description_get(const char *_event_name)
@ -412,7 +411,6 @@ eo_base_legacy_only_event_description_get(const char *_event_name)
{
event_desc = calloc(1, sizeof(Eo_Event_Description));
event_desc->name = event_name;
event_desc->doc = _legacy_event_desc;
eina_hash_add(_legacy_events_hash, event_name, event_desc);
}
else
@ -643,22 +641,13 @@ _cb_desc_match(const Eo_Event_Description *a, const Eo_Event_Description *b)
if (!a)
return EINA_FALSE;
/* If either is legacy, fallback to string comparison. */
if ((a->doc == _legacy_event_desc) || (b->doc == _legacy_event_desc))
if (a == b)
{
/* Take stringshare shortcut if both are legacy */
if (a->doc == b->doc)
{
return (a->name == b->name);
}
else
{
return !strcmp(a->name, b->name);
}
return EINA_TRUE;
}
else
{
return (a == b);
return !strcmp(a->name, b->name);
}
}

1
src/lib/eolian_cxx/grammar/inheritance_base_generator.hh
View File

@ -49,7 +49,6 @@ operator<<(std::ostream& out, inheritance_operation const& x)
<< func.impl << ");" << endl
<< tab(1) << "ops[i].op = EO_OP_OVERRIDE;" << endl
<< tab(1) << "ops[i].op_type = EO_OP_TYPE_REGULAR;" << endl // XXX class ops
<< tab(1) << "ops[i].doc = NULL;" << endl
<< tab(1) << "++i;" << endl
<< scope_guard_tail(x._cls, func)
<< endl;

24
src/lib/evas/canvas/evas_callbacks.c
View File

@ -8,32 +8,30 @@ EVAS_MEMPOOL(_mp_pc);
extern Eina_Hash* signals_hash_table;
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_PRE =
EO_EVENT_DESCRIPTION("Render Pre", "Called just before rendering starts on the canvas target @since 1.2");
EO_EVENT_DESCRIPTION("Render Pre");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_POST =
EO_EVENT_DESCRIPTION("Render Post", "Called just after rendering stops on the canvas target @since 1.2");
EO_EVENT_DESCRIPTION("Render Post");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_AXIS_UPDATE =
EO_EVENT_DESCRIPTION("Axis Update", "Device axis value changed");
EO_EVENT_DESCRIPTION("Axis Update");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_IN =
EO_HOT_EVENT_DESCRIPTION("Canvas Focus In", "Canvas got focus as a whole");
EO_HOT_EVENT_DESCRIPTION("Canvas Focus In");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_FOCUS_OUT =
EO_HOT_EVENT_DESCRIPTION("Canvas Focus Out", "Canvas lost focus as a whole");
EO_HOT_EVENT_DESCRIPTION("Canvas Focus Out");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_PRE =
EO_HOT_EVENT_DESCRIPTION("Render Flush Pre", "Called just before rendering is updated on the canvas target");
EO_HOT_EVENT_DESCRIPTION("Render Flush Pre");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_RENDER_FLUSH_POST =
EO_HOT_EVENT_DESCRIPTION("Render Flush Post", "Called just after rendering is updated on the canvas target");
EO_HOT_EVENT_DESCRIPTION("Render Flush Post");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_IN =
EO_HOT_EVENT_DESCRIPTION("Canvas Object Focus In", "Canvas object got focus");
EO_HOT_EVENT_DESCRIPTION("Canvas Object Focus In");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_OBJECT_FOCUS_OUT =
EO_HOT_EVENT_DESCRIPTION("Canvas Object Focus Out", "Canvas object lost focus");
EO_HOT_EVENT_DESCRIPTION("Canvas Object Focus Out");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_DEVICE_CHANGED =
EO_HOT_EVENT_DESCRIPTION("Device changed",
"Devices added, removed or changed to the canvas");
EO_HOT_EVENT_DESCRIPTION("Device changed");
EAPI const Eo_Event_Description _EVAS_CANVAS_EVENT_VIEWPORT_RESIZE =
EO_HOT_EVENT_DESCRIPTION("Canvas viewport resize",
"Canvas viewport is resized");
EO_HOT_EVENT_DESCRIPTION("Canvas viewport resize");
/**
* Evas events descriptions for Eo.
*/

4
src/lib/evas/canvas/evas_canvas3d_node_callback.h
View File

@ -18,8 +18,8 @@ typedef enum _Evas_Canvas3D_Node_Private_Callback_Type
const Eo_Event_Description evas_canvas3d_node_private_event_desc[] =
{
{"clicked,private", "private event clicked", EINA_FALSE},
{"collision,private", "private event collision", EINA_FALSE}
EO_EVENT_DESCRIPTION("clicked,private"),
EO_EVENT_DESCRIPTION("collision,private")
};
/*Private callbacks */

2
src/tests/eo/access/access_inherit.c
View File

@ -19,7 +19,7 @@ _prot_print(Eo *obj, void *class_data EINA_UNUSED)
EAPI EO_VOID_FUNC_BODY(inherit_prot_print);
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(inherit_prot_print, _prot_print, "Print protected var x1."),
EO_OP_FUNC(inherit_prot_print, _prot_print),
EO_OP_SENTINEL
};

4
src/tests/eo/access/access_simple.c
View File

@ -13,7 +13,7 @@ typedef struct
} Private_Data;
EAPI const Eo_Event_Description _EV_A_CHANGED =
EO_EVENT_DESCRIPTION("a,changed", "Called when a has changed.");
EO_EVENT_DESCRIPTION("a,changed");
#define MY_CLASS SIMPLE_CLASS
@ -33,7 +33,7 @@ _a_set(Eo *obj, void *class_data, int a)
EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(simple_a_set, _a_set, "Set property A"),
EO_OP_FUNC(simple_a_set, _a_set),
EO_OP_SENTINEL
};

134
src/tests/eo/composite_objects/composite_objects_simple.c
View File

@ -6,7 +6,7 @@
#include "composite_objects_simple.h"
EAPI const Eo_Event_Description _EV_A_CHANGED =
EO_EVENT_DESCRIPTION("a,changed", "Called when a has changed.");
EO_EVENT_DESCRIPTION("a,changed");
#define MY_CLASS SIMPLE_CLASS
@ -100,72 +100,72 @@ EAPI EO_VOID_FUNC_BODYV(simple_a_get32, EO_FUNC_CALL(a), int a);
* This is needed in order to properly test some edge cases (see commit message
* for more info). */
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(simple_a_set1, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set2, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set3, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set4, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set5, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set6, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set7, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set8, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set9, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set10, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set11, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set12, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set13, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set14, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set15, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set16, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set17, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set18, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set19, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set20, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set21, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set22, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set23, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set24, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set25, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set26, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set27, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set28, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set29, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set30, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set31, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_set32, _a_set, "Littering the ids"),
EO_OP_FUNC(simple_a_get1, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get2, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get3, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get4, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get5, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get6, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get7, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get8, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get9, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get10, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get11, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get12, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get13, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get14, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get15, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get16, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get17, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get18, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get19, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get20, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get21, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get22, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get23, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get24, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get25, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get26, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get27, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get28, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get29, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get30, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get31, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_get32, _a_get, "Littering the ids"),
EO_OP_FUNC(simple_a_set, _a_set, "Set property A"),
EO_OP_FUNC(simple_a_get, _a_get, "Get property A"),
EO_OP_FUNC(simple_a_set1, _a_set),
EO_OP_FUNC(simple_a_set2, _a_set),
EO_OP_FUNC(simple_a_set3, _a_set),
EO_OP_FUNC(simple_a_set4, _a_set),
EO_OP_FUNC(simple_a_set5, _a_set),
EO_OP_FUNC(simple_a_set6, _a_set),
EO_OP_FUNC(simple_a_set7, _a_set),
EO_OP_FUNC(simple_a_set8, _a_set),
EO_OP_FUNC(simple_a_set9, _a_set),
EO_OP_FUNC(simple_a_set10, _a_set),
EO_OP_FUNC(simple_a_set11, _a_set),
EO_OP_FUNC(simple_a_set12, _a_set),
EO_OP_FUNC(simple_a_set13, _a_set),
EO_OP_FUNC(simple_a_set14, _a_set),
EO_OP_FUNC(simple_a_set15, _a_set),
EO_OP_FUNC(simple_a_set16, _a_set),
EO_OP_FUNC(simple_a_set17, _a_set),
EO_OP_FUNC(simple_a_set18, _a_set),
EO_OP_FUNC(simple_a_set19, _a_set),
EO_OP_FUNC(simple_a_set20, _a_set),
EO_OP_FUNC(simple_a_set21, _a_set),
EO_OP_FUNC(simple_a_set22, _a_set),
EO_OP_FUNC(simple_a_set23, _a_set),
EO_OP_FUNC(simple_a_set24, _a_set),
EO_OP_FUNC(simple_a_set25, _a_set),
EO_OP_FUNC(simple_a_set26, _a_set),
EO_OP_FUNC(simple_a_set27, _a_set),
EO_OP_FUNC(simple_a_set28, _a_set),
EO_OP_FUNC(simple_a_set29, _a_set),
EO_OP_FUNC(simple_a_set30, _a_set),
EO_OP_FUNC(simple_a_set31, _a_set),
EO_OP_FUNC(simple_a_set32, _a_set),
EO_OP_FUNC(simple_a_get1, _a_get),
EO_OP_FUNC(simple_a_get2, _a_get),
EO_OP_FUNC(simple_a_get3, _a_get),
EO_OP_FUNC(simple_a_get4, _a_get),
EO_OP_FUNC(simple_a_get5, _a_get),
EO_OP_FUNC(simple_a_get6, _a_get),
EO_OP_FUNC(simple_a_get7, _a_get),
EO_OP_FUNC(simple_a_get8, _a_get),
EO_OP_FUNC(simple_a_get9, _a_get),
EO_OP_FUNC(simple_a_get10, _a_get),
EO_OP_FUNC(simple_a_get11, _a_get),
EO_OP_FUNC(simple_a_get12, _a_get),
EO_OP_FUNC(simple_a_get13, _a_get),
EO_OP_FUNC(simple_a_get14, _a_get),
EO_OP_FUNC(simple_a_get15, _a_get),
EO_OP_FUNC(simple_a_get16, _a_get),
EO_OP_FUNC(simple_a_get17, _a_get),
EO_OP_FUNC(simple_a_get18, _a_get),
EO_OP_FUNC(simple_a_get19, _a_get),
EO_OP_FUNC(simple_a_get20, _a_get),
EO_OP_FUNC(simple_a_get21, _a_get),
EO_OP_FUNC(simple_a_get22, _a_get),
EO_OP_FUNC(simple_a_get23, _a_get),
EO_OP_FUNC(simple_a_get24, _a_get),
EO_OP_FUNC(simple_a_get25, _a_get),
EO_OP_FUNC(simple_a_get26, _a_get),
EO_OP_FUNC(simple_a_get27, _a_get),
EO_OP_FUNC(simple_a_get28, _a_get),
EO_OP_FUNC(simple_a_get29, _a_get),
EO_OP_FUNC(simple_a_get30, _a_get),
EO_OP_FUNC(simple_a_get31, _a_get),
EO_OP_FUNC(simple_a_get32, _a_get),
EO_OP_FUNC(simple_a_set, _a_set),
EO_OP_FUNC(simple_a_get, _a_get),
EO_OP_SENTINEL
};

2
src/tests/eo/constructors/constructors_mixin.c
View File

@ -37,7 +37,7 @@ _destructor(Eo *obj, void *class_data EINA_UNUSED)
EAPI EO_VOID_FUNC_BODYV(mixin_add_and_print, EO_FUNC_CALL(x), int x);
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(mixin_add_and_print, _add_and_print_set, "Add A + B + param and print it"),
EO_OP_FUNC(mixin_add_and_print, _add_and_print_set),
EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
EO_OP_SENTINEL

8
src/tests/eo/constructors/constructors_simple.c
View File

@ -89,10 +89,10 @@ static Eo_Op_Description op_descs[] = {
EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
EO_OP_FUNC_OVERRIDE(eo_finalize, _finalize),
EO_OP_FUNC(simple_a_set, _a_set, "Set property a"),
EO_OP_FUNC(simple_a_get, _a_get, "Get property a"),
EO_OP_FUNC(simple_b_set, _b_set, "Set property b"),
EO_OP_FUNC(simple_b_get, _b_get, "Get property b"),
EO_OP_FUNC(simple_a_set, _a_set),
EO_OP_FUNC(simple_a_get, _a_get),
EO_OP_FUNC(simple_b_set, _b_set),
EO_OP_FUNC(simple_b_get, _b_get),
EO_OP_SENTINEL
};

4
src/tests/eo/function_overrides/function_overrides_inherit2.c
View File

@ -60,8 +60,8 @@ EAPI EO_FUNC_BODY(inherit2_print, Eina_Bool, EINA_FALSE);
EAPI EO_FUNC_BODY(inherit2_print2, Eina_Bool, EINA_FALSE);
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(inherit2_print, _print, "Print hey"),
EO_OP_FUNC(inherit2_print2, _print2, "Print hey2"),
EO_OP_FUNC(inherit2_print, _print),
EO_OP_FUNC(inherit2_print2, _print2),
EO_OP_CLASS_FUNC_OVERRIDE(simple_class_print, _class_print),
EO_OP_FUNC_OVERRIDE(simple_a_set, _a_set),
EO_OP_SENTINEL

8
src/tests/eo/function_overrides/function_overrides_simple.c
View File

@ -57,10 +57,10 @@ EAPI EO_FUNC_BODY(simple_class_print, Eina_Bool, EINA_FALSE);
EAPI EO_FUNC_BODY(simple_class_print2, Eina_Bool, EINA_FALSE);
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(simple_a_set, _a_set, "Set property A"),
EO_OP_FUNC(simple_a_print, _a_print, "Print property A"),
EO_OP_FUNC(simple_class_print, _class_print, "Print class name."),
EO_OP_FUNC(simple_class_print2, _class_print2, "Print2 class name."),
EO_OP_FUNC(simple_a_set, _a_set),
EO_OP_FUNC(simple_a_print, _a_print),
EO_OP_FUNC(simple_class_print, _class_print),
EO_OP_FUNC(simple_class_print2, _class_print2),
EO_OP_SENTINEL
};

2
src/tests/eo/interface/interface_interface.c
View File

@ -11,7 +11,7 @@
EO_FUNC_BODY(interface_ab_sum_get, int, 0);
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(interface_ab_sum_get, NULL, "Get the sum of a and b."),
EO_OP_FUNC(interface_ab_sum_get, NULL),
EO_OP_SENTINEL
};

2
src/tests/eo/interface/interface_interface2.c
View File

@ -12,7 +12,7 @@
EO_FUNC_BODY(interface2_ab_sum_get2, int, 0);
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(interface2_ab_sum_get2, NULL, "Print the sum of a and b."),
EO_OP_FUNC(interface2_ab_sum_get2, NULL),
EO_OP_SENTINEL
};

8
src/tests/eo/interface/interface_simple.c
View File

@ -55,10 +55,10 @@ _ab_sum_get2(Eo *obj, void *class_data EINA_UNUSED)
}
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(simple_a_set, _a_set, "Set property a"),
EO_OP_FUNC(simple_a_get, _a_get, "Get property a"),
EO_OP_FUNC(simple_b_set, _b_set, "Set property b"),
EO_OP_FUNC(simple_b_get, _b_get, "Get property b"),
EO_OP_FUNC(simple_a_set, _a_set),
EO_OP_FUNC(simple_a_get, _a_get),
EO_OP_FUNC(simple_b_set, _b_set),
EO_OP_FUNC(simple_b_get, _b_get),
EO_OP_FUNC_OVERRIDE(interface_ab_sum_get, _ab_sum_get),
EO_OP_FUNC_OVERRIDE(interface2_ab_sum_get2, _ab_sum_get2),
EO_OP_SENTINEL

2
src/tests/eo/mixin/mixin_mixin.c
View File

@ -34,7 +34,7 @@ EAPI EO_FUNC_BODY(mixin_ab_sum_get, int, 0);
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
EO_OP_FUNC(mixin_ab_sum_get, _ab_sum_get, "Get the sum of a and b."),
EO_OP_FUNC(mixin_ab_sum_get, _ab_sum_get),
EO_OP_SENTINEL
};

8
src/tests/eo/mixin/mixin_simple.c
View File

@ -38,10 +38,10 @@ _GET_SET_FUNC(a)
_GET_SET_FUNC(b)
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(simple_a_set, _a_set, "Set property a"),
EO_OP_FUNC(simple_a_get, _a_get, "Get property a"),
EO_OP_FUNC(simple_b_set, _b_set, "Set property b"),
EO_OP_FUNC(simple_b_get, _b_get, "Get property b"),
EO_OP_FUNC(simple_a_set, _a_set),
EO_OP_FUNC(simple_a_get, _a_get),
EO_OP_FUNC(simple_b_set, _b_set),
EO_OP_FUNC(simple_b_get, _b_get),
EO_OP_SENTINEL
};

4
src/tests/eo/signals/signals_simple.c
View File

@ -12,7 +12,7 @@ typedef struct
} Private_Data;
EAPI const Eo_Event_Description _EV_A_CHANGED =
EO_EVENT_DESCRIPTION("a,changed", "Called when a has changed.");
EO_EVENT_DESCRIPTION("a,changed");
#define MY_CLASS SIMPLE_CLASS
@ -77,7 +77,7 @@ EAPI EO_VOID_FUNC_BODYV(simple_a_set, EO_FUNC_CALL(a), int a);
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
EO_OP_FUNC(simple_a_set, _a_set, "Set property a"),
EO_OP_FUNC(simple_a_set, _a_set),
EO_OP_SENTINEL
};

6
src/tests/eo/suite/eo_test_class_errors.c
View File

@ -217,7 +217,7 @@ START_TEST(eo_null_api)
const Eo_Class *klass;
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(NULL, _null_fct, "NULL API function"),
EO_OP_FUNC(NULL, _null_fct),
EO_OP_SENTINEL
};
static Eo_Class_Description class_desc = {
@ -283,8 +283,8 @@ START_TEST(eo_api_redefined)
const Eo_Class *klass;
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(null_fct, _null_fct, "API function"),
EO_OP_FUNC(null_fct, NULL, "Redefining API function"),
EO_OP_FUNC(null_fct, _null_fct),
EO_OP_FUNC(null_fct, NULL),
EO_OP_SENTINEL
};
static Eo_Class_Description class_desc = {

16
src/tests/eo/suite/eo_test_class_simple.c
View File

@ -8,7 +8,7 @@
#define MY_CLASS SIMPLE_CLASS
EAPI const Eo_Event_Description _EV_A_CHANGED =
EO_EVENT_DESCRIPTION("a,changed", "Called when a has changed.");
EO_EVENT_DESCRIPTION("a,changed");
static void
_a_set(Eo *obj EINA_UNUSED, void *class_data, int a)
@ -87,13 +87,13 @@ EO_VOID_FUNC_BODY(simple_no_implementation);
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC_OVERRIDE(eo_dbg_info_get, _dbg_info_get),
EO_OP_FUNC(simple_a_set, _a_set, "Set property a"),
EO_OP_FUNC(simple_a_get, _a_get, "Get property a"),
EO_OP_FUNC(simple_a_print, _a_print, "Print property a"),
EO_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print, "Print property a"),
EO_OP_FUNC(simple_recursive, _recursive, "Recursive function"),
EO_OP_FUNC(simple_part_get, _part_get, "Part getter"),
EO_OP_FUNC(simple_pure_virtual, NULL, "Pure Virtual function"),
EO_OP_FUNC(simple_a_set, _a_set),
EO_OP_FUNC(simple_a_get, _a_get),
EO_OP_FUNC(simple_a_print, _a_print),
EO_OP_CLASS_FUNC(simple_class_hi_print, _class_hi_print),
EO_OP_FUNC(simple_recursive, _recursive),
EO_OP_FUNC(simple_part_get, _part_get),
EO_OP_FUNC(simple_pure_virtual, NULL),
EO_OP_SENTINEL
};

4
src/tests/eo/suite/eo_test_general.c
View File

@ -722,8 +722,8 @@ EO_FUNC_BODY(multi_a_print, Eina_Bool, EINA_FALSE);
EO_FUNC_BODY(multi_class_hi_print, Eina_Bool, EINA_FALSE);
static Eo_Op_Description _multi_do_op_descs[] = {
EO_OP_FUNC(multi_a_print, _a_print, "Print property a"),
EO_OP_FUNC(multi_class_hi_print, _class_hi_print, "Print Hi"),
EO_OP_FUNC(multi_a_print, _a_print),
EO_OP_FUNC(multi_class_hi_print, _class_hi_print),
EO_OP_SENTINEL
};

6
src/tests/eo/suite/eo_test_threaded_calls.c
View File

@ -60,9 +60,9 @@ _constructor(Eo *obj, void *class_data EINA_UNUSED, int v)
}
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC(thread_test_constructor, _constructor, "Constructor."),
EO_OP_FUNC(thread_test_v_get, _v_get, "Get property v."),
EO_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack, "Swap call stack frames if it is not thread safe."),
EO_OP_FUNC(thread_test_constructor, _constructor),
EO_OP_FUNC(thread_test_v_get, _v_get),
EO_OP_FUNC(thread_test_try_swap_stack, _try_swap_stack),
EO_OP_SENTINEL
};

6
src/tests/eolian/data/class_simple_ref.c
View File

@ -26,9 +26,9 @@ int _class_simple_bar(Eo *obj, Evas_Simple_Data *pd, int x);
EOAPI EO_FUNC_BODYV(evas_obj_simple_bar, int, 0, EO_FUNC_CALL(x), int x);
static Eo_Op_Description _class_simple_op_desc[] = {
EO_OP_FUNC(evas_obj_simple_a_set, _class_simple_a_set, "comment a.set"),
EO_OP_FUNC(evas_obj_simple_a_get, _class_simple_a_get, ""),
EO_OP_FUNC(evas_obj_simple_foo, __eolian_class_simple_foo, "comment foo"),
EO_OP_FUNC(evas_obj_simple_a_set, _class_simple_a_set),
EO_OP_FUNC(evas_obj_simple_a_get, _class_simple_a_get),
EO_OP_FUNC(evas_obj_simple_foo, __eolian_class_simple_foo),
EO_OP_SENTINEL
};

16
src/tests/eolian/data/override_ref.c
View File

@ -57,14 +57,14 @@ static Eo_Op_Description _override_op_desc[] = {
EO_OP_FUNC_OVERRIDE(base_constructor, _override_base_constructor),
EO_OP_FUNC_OVERRIDE(base_z_get, __eolian_override_base_z_get),
EO_OP_FUNC_OVERRIDE(base_z_set, __eolian_override_base_z_set),
EO_OP_FUNC(override_a_set, NULL, ""),
EO_OP_FUNC(override_foo, NULL, ""),
EO_OP_FUNC(override_b_set, __eolian_override_b_set, ""),
EO_OP_FUNC(override_bar, __eolian_override_bar, ""),
EO_OP_FUNC(override_c_get, __eolian_override_c_get, ""),
EO_OP_FUNC(override_a_get, _override_a_get, ""),
EO_OP_FUNC(override_b_get, _override_b_get, ""),
EO_OP_FUNC(override_c_set, _override_c_set, ""),
EO_OP_FUNC(override_a_set, NULL),
EO_OP_FUNC(override_foo, NULL),
EO_OP_FUNC(override_b_set, __eolian_override_b_set),
EO_OP_FUNC(override_bar, __eolian_override_bar),
EO_OP_FUNC(override_c_get, __eolian_override_c_get),
EO_OP_FUNC(override_a_get, _override_a_get),
EO_OP_FUNC(override_b_get, _override_b_get),
EO_OP_FUNC(override_c_set, _override_c_set),
EO_OP_SENTINEL
};