eolian: rename eolian_event_c_name_get

This is for consistency with the new eolian_class_c_macro_get
as well as for better clarity, as c_name_get is already provided
by Object and refers to something else.
This commit is contained in:
Daniel Kolesa 2019-05-16 15:57:39 +02:00
parent b3a870c7bb
commit e5c9f5e76f
10 changed files with 17 additions and 17 deletions

View File

@ -248,7 +248,7 @@ events:
itr = eolian_class_events_get(cl); itr = eolian_class_events_get(cl);
EINA_ITERATOR_FOREACH(itr, ev) EINA_ITERATOR_FOREACH(itr, ev)
{ {
Eina_Stringshare *evn = eolian_event_c_name_get(ev); Eina_Stringshare *evn = eolian_event_c_macro_get(ev);
Eolian_Object_Scope evs = eolian_event_scope_get(ev); Eolian_Object_Scope evs = eolian_event_scope_get(ev);
if (evs == EOLIAN_SCOPE_PRIVATE) if (evs == EOLIAN_SCOPE_PRIVATE)

View File

@ -1054,7 +1054,7 @@ eo_gen_source_gen(const Eolian_Class *cl, Eina_Strbuf *buf)
Eolian_Event *ev; Eolian_Event *ev;
EINA_ITERATOR_FOREACH(itr, ev) EINA_ITERATOR_FOREACH(itr, ev)
{ {
Eina_Stringshare *evn = eolian_event_c_name_get(ev); Eina_Stringshare *evn = eolian_event_c_macro_get(ev);
eina_strbuf_append(buf, "EWAPI const Efl_Event_Description _"); eina_strbuf_append(buf, "EWAPI const Efl_Event_Description _");
eina_strbuf_append(buf, evn); eina_strbuf_append(buf, evn);
eina_strbuf_append(buf, " =\n EFL_EVENT_DESCRIPTION"); eina_strbuf_append(buf, " =\n EFL_EVENT_DESCRIPTION");

View File

@ -1041,7 +1041,7 @@ int main(int argc, char** argv)
{ {
auto tp = eolian_event_type_get(&*first); auto tp = eolian_event_type_get(&*first);
ss << " {\n"; ss << " {\n";
ss << " static efl::eo::js::event_information ev_info{&constructor_from_eo, " << eolian_event_c_name_get(&*first); ss << " static efl::eo::js::event_information ev_info{&constructor_from_eo, " << eolian_event_c_macro_get(&*first);
ss << ", &efl::eo::js::event_callback<"; ss << ", &efl::eo::js::event_callback<";
ss << (tp ? _eolian_type_cpp_type_named_get(tp, class_name, need_name_getter) : "void"); ss << (tp ? _eolian_type_cpp_type_named_get(tp, class_name, need_name_getter) : "void");
ss << ">, \"" << type_class_name(tp) << "\"};\n"; ss << ">, \"" << type_class_name(tp) << "\"};\n";

View File

@ -401,7 +401,7 @@ ffi.cdef [[
Eina_Bool eolian_event_is_hot(const Eolian_Event *event); Eina_Bool eolian_event_is_hot(const Eolian_Event *event);
Eina_Bool eolian_event_is_restart(const Eolian_Event *event); Eina_Bool eolian_event_is_restart(const Eolian_Event *event);
Eina_Iterator *eolian_class_parts_get(const Eolian_Class *klass); Eina_Iterator *eolian_class_parts_get(const Eolian_Class *klass);
const char *eolian_event_c_name_get(const Eolian_Event *event); const char *eolian_event_c_macro_get(const Eolian_Event *event);
const Eolian_Class *eolian_part_class_get(const Eolian_Part *part); const Eolian_Class *eolian_part_class_get(const Eolian_Part *part);
const Eolian_Documentation *eolian_part_documentation_get(const Eolian_Part *part); const Eolian_Documentation *eolian_part_documentation_get(const Eolian_Part *part);
const Eolian_Event *eolian_class_event_by_name_get(const Eolian_Class *klass, const char *event_name); const Eolian_Event *eolian_class_event_by_name_get(const Eolian_Class *klass, const char *event_name);
@ -1375,8 +1375,8 @@ ffi.metatype("Eolian_Event", {
return tonumber(eolian.eolian_event_scope_get(self)) return tonumber(eolian.eolian_event_scope_get(self))
end, end,
c_name_get = function(self) c_macro_get = function(self)
local v = eolian.eolian_event_c_name_get(self) local v = eolian.eolian_event_c_macro_get(self)
if v == nil then return nil end if v == nil then return nil end
return ffi_stringshare(v) return ffi_stringshare(v)
end, end,

View File

@ -2214,16 +2214,16 @@ EAPI Eina_Bool eolian_event_is_restart(const Eolian_Event *event);
EAPI Eina_Iterator *eolian_class_parts_get(const Eolian_Class *klass); EAPI Eina_Iterator *eolian_class_parts_get(const Eolian_Class *klass);
/* /*
* @brief Returns the C name of an event * @brief Returns the C macro name used to refer to an event
* *
* @param[in] event the event handle * @param[in] event the event handle
* @return the event C name * @return the event C macro
* *
* You're responsible for deleting the stringshare. * You're responsible for deleting the stringshare.
* *
* @ingroup Eolian * @ingroup Eolian
*/ */
EAPI Eina_Stringshare *eolian_event_c_name_get(const Eolian_Event *event); EAPI Eina_Stringshare *eolian_event_c_macro_get(const Eolian_Event *event);
/* /*
* @brief A helper function to get the name of a part. * @brief A helper function to get the name of a part.

View File

@ -50,7 +50,7 @@ eolian_event_is_restart(const Eolian_Event *event)
} }
EAPI Eina_Stringshare * EAPI Eina_Stringshare *
eolian_event_c_name_get(const Eolian_Event *event) eolian_event_c_macro_get(const Eolian_Event *event)
{ {
char buf[512]; char buf[512];
char *tmp = buf; char *tmp = buf;

View File

@ -1059,7 +1059,7 @@ struct event_def
: klass(cls, {attributes::qualifier_info::is_none, std::string()}) : klass(cls, {attributes::qualifier_info::is_none, std::string()})
, type( ::eolian_event_type_get(event) ? eina::optional<type_def>{{::eolian_event_type_get(event), unit, EOLIAN_C_TYPE_DEFAULT}} : eina::optional<type_def>{}) , type( ::eolian_event_type_get(event) ? eina::optional<type_def>{{::eolian_event_type_get(event), unit, EOLIAN_C_TYPE_DEFAULT}} : eina::optional<type_def>{})
, name( ::eolian_event_name_get(event)) , name( ::eolian_event_name_get(event))
, c_name( ::eolian_event_c_name_get(event)) , c_name( ::eolian_event_c_macro_get(event))
, beta( ::eolian_event_is_beta(event)) , beta( ::eolian_event_is_beta(event))
, protect( ::eolian_event_scope_get(event) == EOLIAN_SCOPE_PROTECTED) , protect( ::eolian_event_scope_get(event) == EOLIAN_SCOPE_PROTECTED)
, documentation( ::eolian_event_documentation_get(event)) {} , documentation( ::eolian_event_documentation_get(event)) {}

View File

@ -794,8 +794,8 @@ class Event(Object):
return "<eolian.Event '{0.name}', c_name='{0.c_name}'>".format(self) return "<eolian.Event '{0.name}', c_name='{0.c_name}'>".format(self)
@cached_property @cached_property
def c_name(self): def c_macro(self):
s = lib.eolian_event_c_name_get(self) s = lib.eolian_event_c_macro_get(self)
ret = _str_to_py(s) ret = _str_to_py(s)
lib.eina_stringshare_del(c_void_p(s)) lib.eina_stringshare_del(c_void_p(s))
return ret return ret

View File

@ -461,9 +461,9 @@ lib.eolian_constructor_is_optional.restype = c_bool
### Eolian_Event ############################################################ ### Eolian_Event ############################################################
# EAPI Eina_Stringshare *eolian_event_c_name_get(const Eolian_Event *event); # EAPI Eina_Stringshare *eolian_event_c_macro_get(const Eolian_Event *event);
lib.eolian_event_c_name_get.argtypes = (c_void_p,) lib.eolian_event_c_macro_get.argtypes = (c_void_p,)
lib.eolian_event_c_name_get.restype = c_void_p # Stringshare TO BE FREED lib.eolian_event_c_macro_get.restype = c_void_p # Stringshare TO BE FREED
# EAPI const Eolian_Type *eolian_event_type_get(const Eolian_Event *event); # EAPI const Eolian_Type *eolian_event_type_get(const Eolian_Event *event);
lib.eolian_event_type_get.argtypes = (c_void_p,) lib.eolian_event_type_get.argtypes = (c_void_p,)

View File

@ -413,7 +413,7 @@ class TestEolianEvent(unittest.TestCase):
ev = cls.event_by_name_get('tick') ev = cls.event_by_name_get('tick')
self.assertIsInstance(ev, eolian.Event) self.assertIsInstance(ev, eolian.Event)
self.assertEqual(ev.name, 'tick') self.assertEqual(ev.name, 'tick')
self.assertEqual(ev.c_name, 'EFL_LOOP_TIMER_EVENT_TIMER_TICK') self.assertEqual(ev.c_macro, 'EFL_LOOP_TIMER_EVENT_TIMER_TICK')
self.assertIsNone(ev.type) # TODO is this correct self.assertIsNone(ev.type) # TODO is this correct
self.assertIsInstance(ev.documentation, eolian.Documentation) self.assertIsInstance(ev.documentation, eolian.Documentation)
self.assertEqual(ev.scope, eolian.Eolian_Object_Scope.PUBLIC) self.assertEqual(ev.scope, eolian.Eolian_Object_Scope.PUBLIC)