From f4a90dcde25452c95c3d1ac3cac9c904ceb25eba Mon Sep 17 00:00:00 2001 From: Felipe Magno de Almeida Date: Thu, 11 Aug 2016 16:24:15 -0300 Subject: [PATCH] eolian-cxx: Fix compilation break from changes in Eo nomenclature Rename of classes and function calls in generated code and C++ headers --- src/bindings/cxx/eo_cxx/eo_cxx_interop.hh | 4 ++-- src/bindings/cxx/eo_cxx/eo_event.hh | 18 +++++++------- src/bindings/cxx/eo_cxx/eo_ops.hh | 28 +++++++++++----------- .../eolian_cxx/grammar/base_class_definition.hpp | 4 ++-- src/lib/eolian_cxx/grammar/class_definition.hpp | 6 ++--- src/tests/eolian_cxx/complex_cxx.cc | 4 ++-- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh index 27b34c3..0d0aad8 100644 --- a/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh +++ b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh @@ -746,13 +746,13 @@ template struct is_callable() ())> : std::true_type {}; inline void do_eo_add(Eo*& object, efl::eo::concrete const& parent - , Eo_Class const* klass) + , Efl_Class const* klass) { object = ::_eo_add_internal_start(__FILE__, __LINE__, klass, parent._eo_ptr(), EINA_TRUE, EINA_FALSE); object = ::_eo_add_end(object, EINA_FALSE, EINA_FALSE); } template -void do_eo_add(Eo*& object, efl::eo::concrete const& parent, Eo_Class const* klass, F f) +void do_eo_add(Eo*& object, efl::eo::concrete const& parent, Efl_Class const* klass, F f) { object = ::_eo_add_internal_start(__FILE__, __LINE__, klass, parent._eo_ptr(), EINA_TRUE, EINA_FALSE); f(); diff --git a/src/bindings/cxx/eo_cxx/eo_event.hh b/src/bindings/cxx/eo_cxx/eo_event.hh index a66a043..8f49b00 100644 --- a/src/bindings/cxx/eo_cxx/eo_event.hh +++ b/src/bindings/cxx/eo_cxx/eo_event.hh @@ -16,7 +16,7 @@ namespace efl { namespace eolian { -typedef ::Eo_Callback_Priority callback_priority; + typedef ::Efl_Callback_Priority callback_priority; namespace callback_priorities { static const callback_priority before = -100; @@ -74,7 +74,7 @@ private: template struct _event_deleter { - _event_deleter(F* data, Eo* eo, ::Eo_Event_Cb cb, Eo_Event_Description const* description) + _event_deleter(F* data, Eo* eo, ::Efl_Event_Cb cb, Efl_Event_Description const* description) : _data(data), _eo( ::eo_ref(eo)), _cb(cb), _description(description) { } @@ -97,7 +97,7 @@ struct _event_deleter void operator()() const { - ::eo_event_callback_del(_eo, _description, _cb, _data); + ::efl_event_callback_del(_eo, _description, _cb, _data); ::ecore_main_loop_thread_safe_call_async(&_deleter_call, _data); } @@ -109,12 +109,12 @@ private: F* _data; Eo* _eo; - ::Eo_Event_Cb _cb; - Eo_Event_Description const* _description; + ::Efl_Event_Cb _cb; + Efl_Event_Description const* _description; }; template -signal_connection make_signal_connection(std::unique_ptr& data, Eo* eo, ::Eo_Event_Cb cb, Eo_Event_Description const* description) +signal_connection make_signal_connection(std::unique_ptr& data, Eo* eo, ::Efl_Event_Cb cb, Efl_Event_Description const* description) { signal_connection c(_event_deleter(data.get(), eo, cb, description)); data.release(); @@ -152,14 +152,14 @@ signal_connection event_add(Event event, Object object, F&& function) typedef typename std::remove_reference::type function_type; std::unique_ptr f(new function_type(std::forward(function))); - ::eo_event_callback_priority_add + ::efl_event_callback_priority_add (object._eo_ptr(), event.description(), 0 - , static_cast + , static_cast (&_detail::event_callback) , f.get()); return make_signal_connection (f, object._eo_ptr() - , static_cast + , static_cast (&_detail::event_callback) , event.description()); } diff --git a/src/bindings/cxx/eo_cxx/eo_ops.hh b/src/bindings/cxx/eo_cxx/eo_ops.hh index f4c2f1e..22438b9 100644 --- a/src/bindings/cxx/eo_cxx/eo_ops.hh +++ b/src/bindings/cxx/eo_cxx/eo_ops.hh @@ -46,88 +46,88 @@ ref_get(const Eo *obj) } inline Eina_Bool -isa(const Eo *obj, const Eo_Class *klass) +isa(const Eo *obj, const Efl_Class *klass) { return eo_isa(obj, klass); } inline Eo* -add(const Eo_Class *klass, Eo *parent = NULL) +add(const Efl_Class *klass, Eo *parent = NULL) { Eo *eo = eo_add_ref(klass, parent); return eo; } inline void -dbg_info_get(Eo *obj, Eo_Dbg_Info *info) +dbg_info_get(Eo *obj, Efl_Dbg_Info *info) { - eo_dbg_info_get(obj, info); + efl_dbg_info_get(obj, info); } inline void base_data_set(Eo *obj, const char *key, const void *data) { - eo_key_data_set(obj, key, data); + efl_key_data_set(obj, key, data); } inline void* base_data_get(const Eo *obj, const char *key) { void *data; - data = eo_key_data_get(obj, key); + data = efl_key_data_get(obj, key); return data; } inline void base_data_del(Eo *obj, const char *key) { - eo_key_data_set(obj, key, NULL); + efl_key_data_set(obj, key, NULL); } inline void parent_set(Eo *obj, Eo *parent) { - eo_parent_set(obj, parent); + efl_parent_set(obj, parent); } inline Eo* parent_get(const Eo *obj) { Eo *parent; - parent = eo_parent_get(obj); + parent = efl_parent_get(obj); return parent; } inline void event_freeze(Eo *obj) { - eo_event_freeze(obj); + efl_event_freeze(obj); } inline void event_thaw(Eo *obj) { - eo_event_thaw(obj); + efl_event_thaw(obj); } inline int event_freeze_get(const Eo *obj) { int count = -1; - count = eo_event_freeze_count_get(obj); + count = efl_event_freeze_count_get(obj); return count; } inline void wref_add(Eo *obj, Eo **wref) { - eo_wref_add(obj, wref); + efl_wref_add(obj, wref); } inline void wref_del(Eo *obj, Eo **wref) { - eo_wref_del(obj, wref); + efl_wref_del(obj, wref); } } } } diff --git a/src/lib/eolian_cxx/grammar/base_class_definition.hpp b/src/lib/eolian_cxx/grammar/base_class_definition.hpp index c5a22ca..bb5adde 100644 --- a/src/lib/eolian_cxx/grammar/base_class_definition.hpp +++ b/src/lib/eolian_cxx/grammar/base_class_definition.hpp @@ -36,7 +36,7 @@ struct base_class_definition_generator if(!as_generator(*(scope_tab << function_declaration)) .generate(sink, cls.functions, context)) return false; - // static Eo_Class const* _eo_class(); + // static Efl_Class const* _eo_class(); std::string suffix; switch(cls.type) { @@ -54,7 +54,7 @@ struct base_class_definition_generator if(!as_generator ( - scope_tab << "static Eo_Class const* _eo_class()\n" + scope_tab << "static Efl_Class const* _eo_class()\n" << scope_tab << "{\n" << scope_tab << scope_tab << "return " ).generate(sink, attributes::unused, context)) return false; diff --git a/src/lib/eolian_cxx/grammar/class_definition.hpp b/src/lib/eolian_cxx/grammar/class_definition.hpp index 8c451bc..9442e06 100644 --- a/src/lib/eolian_cxx/grammar/class_definition.hpp +++ b/src/lib/eolian_cxx/grammar/class_definition.hpp @@ -77,7 +77,7 @@ struct class_definition_generator if(!as_generator(*(scope_tab << function_declaration)) .generate(sink, cls.functions, context)) return false; - // static Eo_Class const* _eo_class(); + // static Efl_Class const* _eo_class(); std::string suffix; switch(cls.type) { @@ -95,7 +95,7 @@ struct class_definition_generator if(!as_generator ( - scope_tab << "static Eo_Class const* _eo_class()\n" + scope_tab << "static Efl_Class const* _eo_class()\n" << scope_tab << "{\n" << scope_tab << scope_tab << "return " ).generate(sink, attributes::unused, context)) return false; @@ -133,7 +133,7 @@ struct class_definition_generator *attribute_reorder<1, 2, 0, 1> ((scope_tab << "static struct " << string_replace(',', '_') << "_event\n" << scope_tab << "{\n" - << scope_tab << scope_tab << "static Eo_Event_Description const* description()\n" + << scope_tab << scope_tab << "static Efl_Event_Description const* description()\n" << scope_tab << scope_tab << "{ return " << string << "; }\n" << scope_tab << scope_tab << "typedef " << (attribute_conditional([] (eina::optional t) { return !!t; }) diff --git a/src/tests/eolian_cxx/complex_cxx.cc b/src/tests/eolian_cxx/complex_cxx.cc index 91f8017..de14cc3 100644 --- a/src/tests/eolian_cxx/complex_cxx.cc +++ b/src/tests/eolian_cxx/complex_cxx.cc @@ -37,7 +37,7 @@ struct test_param_type static_assert(std::is_same::value, "Wrong type"); }; -test_param_type> inclasscont; +test_param_type> inclasscont; test_param_type>> incontcont; test_param_type>const&> incontcontown; test_param_type>const&> incontowncontown; @@ -46,7 +46,7 @@ test_param_type> instringowncont; test_param_typeconst&> instringcontown; -test_param_type&> outclasscont; +test_param_type&> outclasscont; test_param_type>&> outcontcont; test_param_type>&> outcontcontown; test_param_type>&> outcontowncontown; -- 2.7.4