q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6d93dc4cbf4847d33a921a939b3d8b7f65fffa89
commit 6d93dc4cbf4847d33a921a939b3d8b7f65fffa89 Author: Daniel Kolesa <[email protected]> Date: Thu Sep 26 16:39:56 2019 +0200 eolian: rename event_prefix to event_c_prefix for consistency --- src/bindings/luajit/eolian.lua | 6 +++--- src/lib/ecore_audio/ecore_audio_in.eo | 2 +- src/lib/ecore_audio/ecore_audio_out_pulse.eo | 2 +- src/lib/ecore_audio/ecore_audio_out_wasapi.eo | 2 +- src/lib/edje/efl_canvas_layout.eo | 2 +- src/lib/edje/efl_layout_calc.eo | 2 +- src/lib/efl/interfaces/efl_container.eo | 2 +- src/lib/efl/interfaces/efl_gfx_hint.eo | 2 +- src/lib/efl/interfaces/efl_gfx_stack.eo | 2 +- src/lib/efl/interfaces/efl_ui_container_selectable.eo | 2 +- src/lib/efl/interfaces/efl_ui_draggable.eo | 2 +- src/lib/efl/interfaces/efl_ui_scrollable.eo | 2 +- src/lib/efl/interfaces/efl_ui_text_selectable.eo | 2 +- src/lib/efl/interfaces/efl_ui_zoom.eo | 2 +- src/lib/elementary/efl_ui_animation_view.eo | 2 +- src/lib/elementary/efl_ui_image.eo | 2 +- src/lib/elementary/efl_ui_item_clickable.eo | 2 +- src/lib/elementary/efl_ui_panes.eo | 2 +- src/lib/elementary/efl_ui_scroll_manager.eo | 2 +- src/lib/elementary/efl_ui_selectable.eo | 2 +- src/lib/elementary/efl_ui_widget.eo | 2 +- src/lib/elementary/efl_ui_widget_scrollable_content.eo | 2 +- src/lib/eolian/Eolian.h | 4 ++-- src/lib/eolian/database_class_api.c | 2 +- src/lib/eolian/eo_lexer.h | 2 +- src/lib/eolian/eo_parser.c | 6 +++--- src/lib/evas/canvas/efl_input_clickable.eo | 2 +- src/lib/evas/canvas/efl_input_interface.eo | 2 +- src/lib/evas/gesture/efl_gesture_events.eo | 2 +- src/scripts/pyolian/eolian.py | 4 ++-- src/scripts/pyolian/eolian_lib.py | 6 +++--- src/scripts/pyolian/test_eolian.py | 2 +- src/tests/eolian/data/events.eo | 2 +- src/tests/eolian/eolian_parsing.c | 2 +- 34 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua index 1c2f6e38b4..bcb71d7678 100644 --- a/src/bindings/luajit/eolian.lua +++ b/src/bindings/luajit/eolian.lua @@ -340,7 +340,7 @@ ffi.cdef [[ Eolian_Class_Type eolian_class_type_get(const Eolian_Class *klass); const Eolian_Documentation *eolian_class_documentation_get(const Eolian_Class *klass); const char *eolian_class_c_prefix_get(const Eolian_Class *klass); - const char *eolian_class_event_prefix_get(const Eolian_Class *klass); + const char *eolian_class_event_c_prefix_get(const Eolian_Class *klass); const char *eolian_class_data_type_get(const Eolian_Class *klass); const Eolian_Class *eolian_class_parent_get(const Eolian_Class *klass); Eina_Iterator *eolian_class_requires_get(const Eolian_Class *klass); @@ -1445,8 +1445,8 @@ M.Class = ffi.metatype("Eolian_Class", { return ffi.string(v) end, - event_prefix_get = function(self) - local v = eolian.eolian_class_event_prefix_get(self) + event_c_prefix_get = function(self) + local v = eolian.eolian_class_event_c_prefix_get(self) if v == nil then return self:c_prefix_get() end diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo index f8c1fdbebb..d65ffba0f8 100644 --- a/src/lib/ecore_audio/ecore_audio_in.eo +++ b/src/lib/ecore_audio/ecore_audio_in.eo @@ -2,7 +2,7 @@ class @beta Ecore.Audio.In extends Ecore.Audio { [[Ecore Audio input object.]] c_prefix: ecore_audio_obj_in; - event_prefix: ecore_audio_in; + event_c_prefix: ecore_audio_in; data: Ecore_Audio_Input; methods { @property speed { diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo index d065d2d776..c794375a3b 100644 --- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo +++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo @@ -2,7 +2,7 @@ class @beta Ecore.Audio.Out.Pulse extends Ecore.Audio.Out { [[Ecore audio ouput for PulseAudio.]] c_prefix: ecore_audio_obj_out_pulse; - event_prefix: ecore_audio_out_pulse; + event_c_prefix: ecore_audio_out_pulse; implements { Efl.Object.constructor; Efl.Object.destructor; diff --git a/src/lib/ecore_audio/ecore_audio_out_wasapi.eo b/src/lib/ecore_audio/ecore_audio_out_wasapi.eo index 2f19880b20..8b560be63d 100644 --- a/src/lib/ecore_audio/ecore_audio_out_wasapi.eo +++ b/src/lib/ecore_audio/ecore_audio_out_wasapi.eo @@ -2,7 +2,7 @@ class @beta Ecore.Audio.Out.Wasapi extends Ecore.Audio.Out { [[Ecore audio ouput for WasapiAudio.]] c_prefix: ecore_audio_obj_out_wasapi; - event_prefix: ecore_audio_out_wasapi; + event_c_prefix: ecore_audio_out_wasapi; implements { Efl.Object.constructor; Efl.Object.destructor; diff --git a/src/lib/edje/efl_canvas_layout.eo b/src/lib/edje/efl_canvas_layout.eo index f037f31c44..bed3439d36 100644 --- a/src/lib/edje/efl_canvas_layout.eo +++ b/src/lib/edje/efl_canvas_layout.eo @@ -7,7 +7,7 @@ class @beta Efl.Canvas.Layout extends Efl.Canvas.Group implements Efl.File, Efl. Efl.Gfx.Size_Class { [[Edje object class]] - event_prefix: efl_layout; + event_c_prefix: efl_layout; data: Edje; methods { @property animation { diff --git a/src/lib/edje/efl_layout_calc.eo b/src/lib/edje/efl_layout_calc.eo index c022dca900..0417629b0e 100644 --- a/src/lib/edje/efl_layout_calc.eo +++ b/src/lib/edje/efl_layout_calc.eo @@ -10,7 +10,7 @@ interface Efl.Layout.Calc @since 1.22 ]] - event_prefix: efl_layout; + event_c_prefix: efl_layout; methods { @property calc_auto_update_hints { [[Whether this object updates its size hints automatically. diff --git a/src/lib/efl/interfaces/efl_container.eo b/src/lib/efl/interfaces/efl_container.eo index 992e9f98d8..58f4c18757 100644 --- a/src/lib/efl/interfaces/efl_container.eo +++ b/src/lib/efl/interfaces/efl_container.eo @@ -8,7 +8,7 @@ interface Efl.Container @since 1.22 ]] c_prefix: efl_content; - event_prefix: efl_container; + event_c_prefix: efl_container; methods { content_iterate { [[Begin iterating over this object's contents.]] diff --git a/src/lib/efl/interfaces/efl_gfx_hint.eo b/src/lib/efl/interfaces/efl_gfx_hint.eo index 14ff815ebb..5906b2523f 100644 --- a/src/lib/efl/interfaces/efl_gfx_hint.eo +++ b/src/lib/efl/interfaces/efl_gfx_hint.eo @@ -21,7 +21,7 @@ interface Efl.Gfx.Hint @since 1.22 ]] - event_prefix: efl_gfx_entity; + event_c_prefix: efl_gfx_entity; methods { @property hint_aspect { [[Defines the aspect ratio to respect when scaling this object. diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo b/src/lib/efl/interfaces/efl_gfx_stack.eo index 7eddb016f5..30df73a388 100644 --- a/src/lib/efl/interfaces/efl_gfx_stack.eo +++ b/src/lib/efl/interfaces/efl_gfx_stack.eo @@ -7,7 +7,7 @@ interface Efl.Gfx.Stack @since 1.22 ]] - event_prefix: efl_gfx_entity; + event_c_prefix: efl_gfx_entity; methods { @property layer { [[The layer of its canvas that the given object will be part of. diff --git a/src/lib/efl/interfaces/efl_ui_container_selectable.eo b/src/lib/efl/interfaces/efl_ui_container_selectable.eo index 0d7fda5409..84a0d07972 100644 --- a/src/lib/efl/interfaces/efl_ui_container_selectable.eo +++ b/src/lib/efl/interfaces/efl_ui_container_selectable.eo @@ -1,7 +1,7 @@ interface @beta Efl.Ui.Container_Selectable { [[Temporare interface, this is here until collection_view lands]] - event_prefix: efl_ui; + event_c_prefix: efl_ui; events { /* FIXME: Called with multiple types of event_info! */ item,selected: Efl.Object; [[Called when selected]] diff --git a/src/lib/efl/interfaces/efl_ui_draggable.eo b/src/lib/efl/interfaces/efl_ui_draggable.eo index 3cd939667b..91c74202ad 100644 --- a/src/lib/efl/interfaces/efl_ui_draggable.eo +++ b/src/lib/efl/interfaces/efl_ui_draggable.eo @@ -2,7 +2,7 @@ interface @beta Efl.Ui.Draggable { [[Efl UI draggable interface]] - event_prefix: efl_ui; + event_c_prefix: efl_ui; methods { @property drag_target { [[Control whether the object's content is changed by drag and drop. diff --git a/src/lib/efl/interfaces/efl_ui_scrollable.eo b/src/lib/efl/interfaces/efl_ui_scrollable.eo index 8baf832fa8..1201d26bb0 100644 --- a/src/lib/efl/interfaces/efl_ui_scrollable.eo +++ b/src/lib/efl/interfaces/efl_ui_scrollable.eo @@ -4,7 +4,7 @@ import efl_ui_layout_orientable; interface Efl.Ui.Scrollable { [[Efl UI scrollable interface]] - event_prefix: efl_ui; + event_c_prefix: efl_ui; methods { @property content_pos { [[The content position]] diff --git a/src/lib/efl/interfaces/efl_ui_text_selectable.eo b/src/lib/efl/interfaces/efl_ui_text_selectable.eo index b5ad3bd67b..13dda60d9e 100644 --- a/src/lib/efl/interfaces/efl_ui_text_selectable.eo +++ b/src/lib/efl/interfaces/efl_ui_text_selectable.eo @@ -1,7 +1,7 @@ interface @beta Efl.Ui.Text_Selectable { [[Efl UI text selectable interface]] - event_prefix: efl_ui; + event_c_prefix: efl_ui; events { selection,paste: void; [[Called when selection is pasted]] selection,copy: void; [[Called when selection is copied]] diff --git a/src/lib/efl/interfaces/efl_ui_zoom.eo b/src/lib/efl/interfaces/efl_ui_zoom.eo index ab8d1007b8..a2f4d1f3c8 100644 --- a/src/lib/efl/interfaces/efl_ui_zoom.eo +++ b/src/lib/efl/interfaces/efl_ui_zoom.eo @@ -11,7 +11,7 @@ enum @beta Efl.Ui.Zoom_Mode interface @beta Efl.Ui.Zoom { [[Efl UI zoom interface]] - event_prefix: efl_ui; + event_c_prefix: efl_ui; c_prefix: efl_ui; methods { diff --git a/src/lib/elementary/efl_ui_animation_view.eo b/src/lib/elementary/efl_ui_animation_view.eo index 4cd02b9478..474bd76a9f 100644 --- a/src/lib/elementary/efl_ui_animation_view.eo +++ b/src/lib/elementary/efl_ui_animation_view.eo @@ -24,7 +24,7 @@ class @beta Efl.Ui.Animation_View extends Efl.Ui.Widget implements Efl.Gfx.View, @Efl.Ui.Animation_View currently only supports the animation information contained in JSON (known as Lottie file as well) and EET files. ]] - event_prefix: efl_ui_animation_view; + event_c_prefix: efl_ui_animation_view; methods { @property auto_play { [[Animation will be started automatically when it's possible. diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo index f4a8dbcb32..84cdb35f98 100644 --- a/src/lib/elementary/efl_ui_image.eo +++ b/src/lib/elementary/efl_ui_image.eo @@ -28,7 +28,7 @@ class Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Input.Clickable, Efl.Ui. When loading images from a file, the @Efl.File.key property can be used to access different streams. For example, when accessing Evas image caches. ]] - event_prefix: efl_ui_image; + event_c_prefix: efl_ui_image; methods { @property icon { [[The image name, using icon standards names. diff --git a/src/lib/elementary/efl_ui_item_clickable.eo b/src/lib/elementary/efl_ui_item_clickable.eo index fbe680a208..db73d79d88 100644 --- a/src/lib/elementary/efl_ui_item_clickable.eo +++ b/src/lib/elementary/efl_ui_item_clickable.eo @@ -15,7 +15,7 @@ struct Efl.Ui.Item_Clickable_Pressed { interface Efl.Ui.Item_Clickable { [[Shared sets of events between @Efl.Ui.Collection and @Efl.Ui.Collection_View.]] - event_prefix: efl_ui; + event_c_prefix: efl_ui; events { item,pressed : Efl.Ui.Item_Clickable_Pressed; [[A $pressed event occurred over an item.]] item,unpressed : Efl.Ui.Item_Clickable_Pressed; [[An $unpressed event occurred over an item.]] diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo index a4661189fc..00d13530df 100644 --- a/src/lib/elementary/efl_ui_panes.eo +++ b/src/lib/elementary/efl_ui_panes.eo @@ -2,7 +2,7 @@ class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Layout_Ori Efl.Input.Clickable { [[Elementary panes class]] - event_prefix: elm_panes; + event_c_prefix: elm_panes; methods { @property split_ratio { [[Set the split ratio between panes widget first and second parts. diff --git a/src/lib/elementary/efl_ui_scroll_manager.eo b/src/lib/elementary/efl_ui_scroll_manager.eo index 63a0e7107c..2a05083be5 100644 --- a/src/lib/elementary/efl_ui_scroll_manager.eo +++ b/src/lib/elementary/efl_ui_scroll_manager.eo @@ -4,7 +4,7 @@ class @beta Efl.Ui.Scroll.Manager extends Efl.Object implements Efl.Ui.Scrollbar { [[Efl ui scroll manager class]] - event_prefix: efl_ui; + event_c_prefix: efl_ui; c_prefix: efl_ui_scroll_manager; methods { @property pan @protected { diff --git a/src/lib/elementary/efl_ui_selectable.eo b/src/lib/elementary/efl_ui_selectable.eo index fe9468e594..f06cb04b81 100644 --- a/src/lib/elementary/efl_ui_selectable.eo +++ b/src/lib/elementary/efl_ui_selectable.eo @@ -4,7 +4,7 @@ interface Efl.Ui.Selectable { An object implementing this interface can be selected. When the selected property of this object changes, the @[Efl.Ui.Selectable.selected,changed] event is emitted. ]] - event_prefix: efl_ui; + event_c_prefix: efl_ui; methods { @property selected { [[The selected state of this object diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo index 2848ef0db5..ff6f94ffe3 100644 --- a/src/lib/elementary/efl_ui_widget.eo +++ b/src/lib/elementary/efl_ui_widget.eo @@ -25,7 +25,7 @@ abstract Efl.Ui.Widget extends Efl.Canvas.Group implements Efl.Access.Object, implements section. @since 1.22 ]] - event_prefix: efl_ui_widget; + event_c_prefix: efl_ui_widget; data: Efl_Ui_Widget_Data; methods { @property cursor @beta { diff --git a/src/lib/elementary/efl_ui_widget_scrollable_content.eo b/src/lib/elementary/efl_ui_widget_scrollable_content.eo index 2b0c24b22a..90bed2176d 100644 --- a/src/lib/elementary/efl_ui_widget_scrollable_content.eo +++ b/src/lib/elementary/efl_ui_widget_scrollable_content.eo @@ -15,7 +15,7 @@ mixin @beta Efl.Ui.Widget_Scrollable_Content requires Efl.Object @since 1.23 ]] c_prefix: efl_ui_widget; - event_prefix: efl_ui_widget_scrollable_content; + event_c_prefix: efl_ui_widget_scrollable_content; data: Efl_Ui_Widget_Scrollable_Content_Data; methods { @property scrollable_content_did_group_calc @protected @beta { diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index 311ea9016a..4594f4b181 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h @@ -1510,14 +1510,14 @@ EAPI const Eolian_Documentation *eolian_class_documentation_get(const Eolian_Cla EAPI Eina_Stringshare* eolian_class_c_prefix_get(const Eolian_Class *klass); /* - * @brief Returns the event prefix of a class + * @brief Returns the C event prefix of a class * * @param[in] klass the class * @return the event prefix * * @ingroup Eolian */ -EAPI Eina_Stringshare* eolian_class_event_prefix_get(const Eolian_Class *klass); +EAPI Eina_Stringshare* eolian_class_event_c_prefix_get(const Eolian_Class *klass); /* * @brief Returns the data type of a class diff --git a/src/lib/eolian/database_class_api.c b/src/lib/eolian/database_class_api.c index 74cff1b06b..943f561d5e 100644 --- a/src/lib/eolian/database_class_api.c +++ b/src/lib/eolian/database_class_api.c @@ -28,7 +28,7 @@ eolian_class_c_prefix_get(const Eolian_Class *cl) } EAPI Eina_Stringshare* -eolian_class_event_prefix_get(const Eolian_Class *cl) +eolian_class_event_c_prefix_get(const Eolian_Class *cl) { EINA_SAFETY_ON_NULL_RETURN_VAL(cl, NULL); return cl->ev_prefix; diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h index e7f61a7a21..697f94685f 100644 --- a/src/lib/eolian/eo_lexer.h +++ b/src/lib/eolian/eo_lexer.h @@ -28,7 +28,7 @@ enum Tokens #define KEYWORDS KW(class), KW(const), KW(enum), KW(return), KW(struct), \ \ KW(abstract), KW(c_prefix), KW(composites), KW(constructor), KW(constructors), \ - KW(data), KW(destructor), KW(error), KW(event_prefix), KW(events), KW(extends), \ + KW(data), KW(destructor), KW(error), KW(event_c_prefix), KW(events), KW(extends), \ KW(free), KW(get), KW(implements), KW(import), KW(interface), \ KW(keys), KW(legacy), KW(methods), KW(mixin), KW(params), \ KW(parse), KW(parts), KW(ptr), KW(set), KW(type), KW(values), KW(requires), \ diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index a721e73b37..519841a7ab 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -2013,7 +2013,7 @@ static void parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type) { Eina_Bool has_c_prefix = EINA_FALSE, - has_event_prefix = EINA_FALSE, + has_event_c_prefix = EINA_FALSE, has_data = EINA_FALSE, has_methods = EINA_FALSE, has_parts = EINA_FALSE, @@ -2036,8 +2036,8 @@ parse_class_body(Eo_Lexer *ls, Eolian_Class_Type type) eo_lexer_get(ls); check_next(ls, ';'); break; - case KW_event_prefix: - CASE_LOCK(ls, event_prefix, "event prefix definition") + case KW_event_c_prefix: + CASE_LOCK(ls, event_c_prefix, "event prefix definition") eo_lexer_get(ls); check_next(ls, ':'); _validate_pfx(ls); diff --git a/src/lib/evas/canvas/efl_input_clickable.eo b/src/lib/evas/canvas/efl_input_clickable.eo index a108035fb3..3167ffe290 100644 --- a/src/lib/evas/canvas/efl_input_clickable.eo +++ b/src/lib/evas/canvas/efl_input_clickable.eo @@ -7,7 +7,7 @@ struct Efl.Input.Clickable_Clicked { mixin Efl.Input.Clickable { [[Efl input clickable interface]] - event_prefix: efl_input; + event_c_prefix: efl_input; methods { press @protected { [[Change internal states that a button got pressed. diff --git a/src/lib/evas/canvas/efl_input_interface.eo b/src/lib/evas/canvas/efl_input_interface.eo index b899d064e5..fde39c1b39 100644 --- a/src/lib/evas/canvas/efl_input_interface.eo +++ b/src/lib/evas/canvas/efl_input_interface.eo @@ -20,7 +20,7 @@ interface Efl.Input.Interface down...up,down...up,down...up (not down...up or down...down...down...up). ]] c_prefix: efl_input; - event_prefix: efl; + event_c_prefix: efl; methods { @property seat_event_filter @beta { [[Whether input events from a given seat are enabled. diff --git a/src/lib/evas/gesture/efl_gesture_events.eo b/src/lib/evas/gesture/efl_gesture_events.eo index da67ccc9d2..d80c0bbb77 100644 --- a/src/lib/evas/gesture/efl_gesture_events.eo +++ b/src/lib/evas/gesture/efl_gesture_events.eo @@ -1,6 +1,6 @@ interface @beta Efl.Gesture.Events { - event_prefix: efl; + event_c_prefix: efl; events { gesture,tap: Efl.Canvas.Gesture_Tap; [[Emitted when a Tap gesture has been detected. A Tap gesture consists of a touch of the screen (or click of the mouse) quickly followed by diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py index 04d2dcb8a9..e18fbf6899 100644 --- a/src/scripts/pyolian/eolian.py +++ b/src/scripts/pyolian/eolian.py @@ -648,8 +648,8 @@ class Class(Object): return _str_to_py(lib.eolian_class_c_prefix_get(self)) @cached_property - def event_prefix(self): - return _str_to_py(lib.eolian_class_event_prefix_get(self)) + def event_c_prefix(self): + return _str_to_py(lib.eolian_class_event_c_prefix_get(self)) @cached_property def documentation(self): diff --git a/src/scripts/pyolian/eolian_lib.py b/src/scripts/pyolian/eolian_lib.py index 36e0341b80..09f88c3783 100644 --- a/src/scripts/pyolian/eolian_lib.py +++ b/src/scripts/pyolian/eolian_lib.py @@ -238,9 +238,9 @@ lib.eolian_class_documentation_get.restype = c_void_p lib.eolian_class_c_prefix_get.argtypes = (c_void_p,) lib.eolian_class_c_prefix_get.restype = c_char_p -# EAPI Eina_Stringshare* eolian_class_event_prefix_get(const Eolian_Class *klass); -lib.eolian_class_event_prefix_get.argtypes = (c_void_p,) -lib.eolian_class_event_prefix_get.restype = c_char_p +# EAPI Eina_Stringshare* eolian_class_event_c_prefix_get(const Eolian_Class *klass); +lib.eolian_class_event_c_prefix_get.argtypes = (c_void_p,) +lib.eolian_class_event_c_prefix_get.restype = c_char_p # EAPI Eina_Stringshare *eolian_class_data_type_get(const Eolian_Class *klass); lib.eolian_class_data_type_get.argtypes = (c_void_p,) diff --git a/src/scripts/pyolian/test_eolian.py b/src/scripts/pyolian/test_eolian.py index 01e916b4b4..2a45c57829 100755 --- a/src/scripts/pyolian/test_eolian.py +++ b/src/scripts/pyolian/test_eolian.py @@ -334,7 +334,7 @@ class TestEolianClass(unittest.TestCase): self.assertEqual(cls.type, eolian.Eolian_Class_Type.REGULAR) self.assertIsInstance(cls.documentation, eolian.Documentation) self.assertIsNone(cls.c_prefix) # TODO fin a class with a value - self.assertIsNone(cls.event_prefix) # TODO same as above + self.assertIsNone(cls.event_c_prefix) # TODO same as above self.assertIsNone(cls.data_type) # TODO same as above self.assertEqual(cls.parent.name, 'Efl.Loop_Consumer') self.assertEqual([c.name for c in cls.extensions], []) diff --git a/src/tests/eolian/data/events.eo b/src/tests/eolian/data/events.eo index a7aa2ef264..95b6a8f43c 100644 --- a/src/tests/eolian/data/events.eo +++ b/src/tests/eolian/data/events.eo @@ -3,7 +3,7 @@ struct Evas_Event_Clicked_Double_Info { } class Events { - event_prefix: totally_not_events; + event_c_prefix: totally_not_events; events { clicked @beta: void; [[Comment for clicked]] clicked,double: Evas_Event_Clicked_Double_Info; /* No comment */ diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c index 2e61fb97b2..fac90f4d9a 100644 --- a/src/tests/eolian/eolian_parsing.c +++ b/src/tests/eolian/eolian_parsing.c @@ -113,7 +113,7 @@ EFL_START_TEST(eolian_events) /* Class */ fail_if(!(class = eolian_unit_class_by_name_get(unit, "Events"))); - fail_if(strcmp(eolian_class_event_prefix_get(class), "totally_not_events")); + fail_if(strcmp(eolian_class_event_c_prefix_get(class), "totally_not_events")); /* Events */ fail_if(!(iter = eolian_class_events_get(class))); --
