From cb3f8304e09c5647542a9822f396b300dd6a3f8b Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 13 Jan 2017 15:44:09 +0100 Subject: [PATCH] eolian: change eo file syntax @virtual_pure -> @pure_virtual --- src/lib/ecore_audio/ecore_audio.eo | 6 +- src/lib/ecore_audio/ecore_audio_in.eo | 6 +- src/lib/ecore_con/efl_net_server_fd.eo | 4 +- src/lib/ector/cairo/ector_renderer_cairo.eo | 2 +- src/lib/ector/ector_buffer.eo | 10 +-- src/lib/ector/ector_renderer.eo | 6 +- src/lib/ector/ector_surface.eo | 4 +- src/lib/ector/gl/ector_renderer_gl.eo | 2 +- .../ector/software/ector_renderer_software.eo | 2 +- src/lib/efl/interfaces/efl_io_closer.eo | 12 ++-- src/lib/efl/interfaces/efl_io_positioner.eo | 4 +- src/lib/efl/interfaces/efl_io_sizer.eo | 4 +- src/lib/efl/interfaces/efl_observer.eo | 2 +- .../elementary/elm_interface_atspi_action.eo | 10 +-- .../elementary/elm_interface_atspi_image.eo | 2 +- .../elm_interface_atspi_widget_action.eo | 2 +- src/lib/elementary/elm_web.eo | 72 +++++++++---------- src/lib/elementary/elm_widget.eo | 6 +- src/lib/eolian/eo_lexer.h | 2 +- src/lib/eolian/eo_parser.c | 12 ++-- .../evas/canvas/efl_canvas_filter_internal.eo | 6 +- src/lib/evas/canvas/efl_canvas_surface.eo | 2 +- src/lib/evas/canvas/efl_gfx_map.eo | 2 +- src/lib/evas/canvas/efl_input_event.eo | 12 ++-- src/lib/evas/canvas/efl_vg.eo | 2 +- src/lib/evas/canvas/evas_canvas3d_object.eo | 8 +-- src/scripts/elua/apps/gendoc.lua | 4 +- src/tests/eolian/data/base.eo | 2 +- src/tests/eolian/data/nmsp1_nmsp11_class2.eo | 2 +- src/tests/eolian/data/object_impl.eo | 4 +- src/tests/eolian/data/override.eo | 4 +- 31 files changed, 109 insertions(+), 109 deletions(-) diff --git a/src/lib/ecore_audio/ecore_audio.eo b/src/lib/ecore_audio/ecore_audio.eo index 74fd206434..ee5bb50afe 100644 --- a/src/lib/ecore_audio/ecore_audio.eo +++ b/src/lib/ecore_audio/ecore_audio.eo @@ -58,7 +58,7 @@ class Ecore.Audio (Efl.Object) volume: double; [[The volume]] } } - @property source @virtual_pure { + @property source @pure_virtual { [[Source of the object What sources are supported depends on the actual object. @@ -77,7 +77,7 @@ class Ecore.Audio (Efl.Object) source: string; [[The source to set to (i.e. file, URL, device)]] } } - @property format @virtual_pure { + @property format @pure_virtual { [[Format of the object.]] set { [[Set the format of the object @@ -102,7 +102,7 @@ class Ecore.Audio (Efl.Object) format: Ecore.Audio.Format; [[The audio format of the object]] } } - vio_set @virtual_pure { + vio_set @pure_virtual { [[Set the virtual IO functions @since 1.8 diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo index e288ad7007..be0aa8f6a5 100644 --- a/src/lib/ecore_audio/ecore_audio_in.eo +++ b/src/lib/ecore_audio/ecore_audio_in.eo @@ -44,7 +44,7 @@ class Ecore.Audio.In (Ecore.Audio) channels: int; [[The number of channels]] } } - @property preloaded @virtual_pure { + @property preloaded @pure_virtual { [[Preloaded state of the input @since 1.8 @@ -82,7 +82,7 @@ class Ecore.Audio.In (Ecore.Audio) @since 1.8 ]] - set @virtual_pure { + set @pure_virtual { } get { } @@ -134,7 +134,7 @@ class Ecore.Audio.In (Ecore.Audio) @in len: size; [[The amount of samples to read]] } } - seek @virtual_pure { + seek @pure_virtual { [[Seek within the input @since 1.8 diff --git a/src/lib/ecore_con/efl_net_server_fd.eo b/src/lib/ecore_con/efl_net_server_fd.eo index 6d9ef9e8d4..9c936623f8 100644 --- a/src/lib/ecore_con/efl_net_server_fd.eo +++ b/src/lib/ecore_con/efl_net_server_fd.eo @@ -121,7 +121,7 @@ class Efl.Net.Server.Fd (Efl.Loop.Fd, Efl.Net.Server) { ]] } - client_add @protected @virtual_pure { + client_add @protected @pure_virtual { [[Accept a new client, should emit "client,add". Remember to create the client object with a callback to @@ -140,7 +140,7 @@ class Efl.Net.Server.Fd (Efl.Loop.Fd, Efl.Net.Server) { } } - client_reject @protected @virtual_pure { + client_reject @protected @pure_virtual { [[Reject a new client, should emit "client,rejected". Must always close the client socket when it's done. diff --git a/src/lib/ector/cairo/ector_renderer_cairo.eo b/src/lib/ector/cairo/ector_renderer_cairo.eo index d3eb852932..75d4757464 100644 --- a/src/lib/ector/cairo/ector_renderer_cairo.eo +++ b/src/lib/ector/cairo/ector_renderer_cairo.eo @@ -2,7 +2,7 @@ abstract Ector.Renderer.Cairo (Ector.Renderer) { [[Ector cairo renderer abstract class]] methods { - fill @virtual_pure { + fill @pure_virtual { [[Fill operation]] return: bool; [[$true on success, $false otherwise]] params { diff --git a/src/lib/ector/ector_buffer.eo b/src/lib/ector/ector_buffer.eo index abe4ab7f13..0b8782ff68 100644 --- a/src/lib/ector/ector_buffer.eo +++ b/src/lib/ector/ector_buffer.eo @@ -43,7 +43,7 @@ mixin Ector.Buffer cspace: Efl.Gfx.Colorspace; [[Colorspace]] } } - map @virtual_pure { + map @pure_virtual { [[Map a region of this buffer for read or write access by the CPU, fetch data from the GPU if needed. This operation may be slow if cpu_readable_fast or cpu_writeable_fast are not true, or if the @@ -63,14 +63,14 @@ mixin Ector.Buffer } return: void_ptr @warn_unused; [[Pointer to the top-left pixel data. Returns $null in case of failure]] } - unmap @virtual_pure { + unmap @pure_virtual { [[Unmap a region of this buffer, and upload data to the GPU (if needed).]] params { @in data: void_ptr; [[Data pointer returned by a previous call to map]] @in length: uint; [[Must be the same as returned by map.]] } } - pixels_set @virtual_pure { + pixels_set @pure_virtual { [[Set the source pixels for this buffer, or allocate a new memory region]] params { @in pixels: void_ptr; [[If $null, allocates an empty buffer]] @@ -86,7 +86,7 @@ mixin Ector.Buffer } return: bool; [[True if pixels_set was successful]] } - span_get @virtual_pure { + span_get @pure_virtual { [[Get a single horizontal span of length w starting from (x,y) Call span_free() to release it. This function will try not to @@ -102,7 +102,7 @@ mixin Ector.Buffer } return: ptr(uint8); [[A temporary memory buffer containing the pixels requested.]] } - span_free @virtual_pure { + span_free @pure_virtual { [[Must be called as soon as possible after span_get]] params { data: ptr(uint8); [[Data to be freed]] diff --git a/src/lib/ector/ector_renderer.eo b/src/lib/ector/ector_renderer.eo index d742be1c98..af3775d14b 100644 --- a/src/lib/ector/ector_renderer.eo +++ b/src/lib/ector/ector_renderer.eo @@ -107,13 +107,13 @@ abstract Ector.Renderer (Efl.Object) return: uint; [[CRC value]] } } - bounds_get @virtual_pure { + bounds_get @pure_virtual { [[Retrieve the bounds of the renderer]] params { @out r: Eina.Rectangle; [[Bounds as @Eina.Rectangle]] } } - draw @virtual_pure { + draw @pure_virtual { [[Actual draw operation]] return: bool; [[$true on success, $false otherwise]] params { @@ -126,7 +126,7 @@ abstract Ector.Renderer (Efl.Object) [[Prepare for rendering]] return: bool; [[$true on success, $false otherwise]] } - done @virtual_pure { + done @pure_virtual { [[Done with rendering]] return: bool; [[$true on success, $false otherwise]] } diff --git a/src/lib/ector/ector_surface.eo b/src/lib/ector/ector_surface.eo index 228a2d130b..a13cf02142 100644 --- a/src/lib/ector/ector_surface.eo +++ b/src/lib/ector/ector_surface.eo @@ -7,14 +7,14 @@ mixin Ector.Surface (Ector.Buffer) methods { @property reference_point { [[This define where is (0,0) in pixels coordinate inside the surface]] - set @virtual_pure { + set @pure_virtual { } values { x: int; [[X coordinate for reference point]] y: int; [[Y coordinate for reference point]] } } - renderer_factory_new @virtual_pure { + renderer_factory_new @pure_virtual { [[Create a new renderer factory for the given type]] return: Efl.Object; [[Renderer factory object]] /* FIXME: Should be a more restricted type, only here for cyclic. */ params { diff --git a/src/lib/ector/gl/ector_renderer_gl.eo b/src/lib/ector/gl/ector_renderer_gl.eo index f310b7e40d..592b5952fc 100644 --- a/src/lib/ector/gl/ector_renderer_gl.eo +++ b/src/lib/ector/gl/ector_renderer_gl.eo @@ -4,7 +4,7 @@ abstract Ector.Renderer.GL (Ector.Renderer) { [[Ector GL renderer abstract class]] methods { - fill @virtual_pure { + fill @pure_virtual { [[Fill operation]] return: bool; [[$true on success, $false otherwise]] params { diff --git a/src/lib/ector/software/ector_renderer_software.eo b/src/lib/ector/software/ector_renderer_software.eo index 8fac492372..16772100a2 100644 --- a/src/lib/ector/software/ector_renderer_software.eo +++ b/src/lib/ector/software/ector_renderer_software.eo @@ -3,7 +3,7 @@ class Ector.Renderer.Software (Ector.Renderer) [[Ector software renderer class]] data: null; methods { - fill @virtual_pure { + fill @pure_virtual { [[Renderer fill operation]] return: bool; [[$true on success, $false otherwise]] } diff --git a/src/lib/efl/interfaces/efl_io_closer.eo b/src/lib/efl/interfaces/efl_io_closer.eo index 7ecfd7f948..f14c94401f 100644 --- a/src/lib/efl/interfaces/efl_io_closer.eo +++ b/src/lib/efl/interfaces/efl_io_closer.eo @@ -15,7 +15,7 @@ mixin Efl.Io.Closer { data: null; methods { - close @virtual_pure { + close @pure_virtual { [[Closes the Input/Output object. This operation will be executed immediately and may or @@ -32,7 +32,7 @@ mixin Efl.Io.Closer { @property closed { [[If true will notify object was closed.]] - get @virtual_pure { } + get @pure_virtual { } set { [[If true, calls close()]] return: bool; [[$true if could close, $false if already closed or errors.]] @@ -49,8 +49,8 @@ mixin Efl.Io.Closer { so they are not inherited by the processes (children or self) doing exec(). ]] - get @virtual_pure { } - set @virtual_pure { + get @pure_virtual { } + set @pure_virtual { [[If $true, will close on exec() call.]] return: bool; [[$true if could set, $false if not supported or failed.]] } @@ -65,8 +65,8 @@ mixin Efl.Io.Closer { If the object was deleted without close, this property will state whenever it should be closed or not. ]] - get @virtual_pure { } - set @virtual_pure { } + get @pure_virtual { } + set @pure_virtual { } values { close_on_destructor: bool; [[$true if close on destructor, $false otherwise]] } diff --git a/src/lib/efl/interfaces/efl_io_positioner.eo b/src/lib/efl/interfaces/efl_io_positioner.eo index b0e7d7e810..b344d784de 100644 --- a/src/lib/efl/interfaces/efl_io_positioner.eo +++ b/src/lib/efl/interfaces/efl_io_positioner.eo @@ -16,7 +16,7 @@ mixin Efl.Io.Positioner { data: null; methods { - seek @virtual_pure { + seek @pure_virtual { [[Seek in data]] params { @in offset: int64; [[Offset in byte relative to whence]] @@ -27,7 +27,7 @@ mixin Efl.Io.Positioner { @property position { [[Position property]] - get @virtual_pure { } + get @pure_virtual { } set { [[Try to set position object, relative to start of file. See @.seek()]] return: bool; [[$true if could reposition, $false if errors.]] diff --git a/src/lib/efl/interfaces/efl_io_sizer.eo b/src/lib/efl/interfaces/efl_io_sizer.eo index 1e378b8917..64a14f99ec 100644 --- a/src/lib/efl/interfaces/efl_io_sizer.eo +++ b/src/lib/efl/interfaces/efl_io_sizer.eo @@ -12,7 +12,7 @@ mixin Efl.Io.Sizer { data: null; methods { - resize @virtual_pure { + resize @pure_virtual { [[Resize object]] params { @in size: uint64; [[Object size]] @@ -22,7 +22,7 @@ mixin Efl.Io.Sizer { @property size { [[Size property]] - get @virtual_pure { } + get @pure_virtual { } set { [[Try to resize the object, check with get if the value was accepted or not.]] return: bool; [[$true if could resize, $false if errors.]] diff --git a/src/lib/efl/interfaces/efl_observer.eo b/src/lib/efl/interfaces/efl_observer.eo index f89bd3926d..c76503fac2 100644 --- a/src/lib/efl/interfaces/efl_observer.eo +++ b/src/lib/efl/interfaces/efl_observer.eo @@ -1,7 +1,7 @@ interface Efl.Observer { [[Efl observer interface]] methods { - update @virtual_pure { + update @pure_virtual { [[Update observer according to the changes of observable object. @since 1.19]] diff --git a/src/lib/elementary/elm_interface_atspi_action.eo b/src/lib/elementary/elm_interface_atspi_action.eo index d6c95e824e..86737001f5 100644 --- a/src/lib/elementary/elm_interface_atspi_action.eo +++ b/src/lib/elementary/elm_interface_atspi_action.eo @@ -4,7 +4,7 @@ mixin Elm.Interface.Atspi_Action () eo_prefix: elm_interface_atspi_action; data: null; methods { - @property name @protected @virtual_pure { + @property name @protected @pure_virtual { [[Gets action name for given id]] get { } @@ -26,7 +26,7 @@ mixin Elm.Interface.Atspi_Action () id: int; [[ID to get localized name for]] } } - @property description @protected @virtual_pure { + @property description @protected @pure_virtual { [[Action description for given id]] get { } @@ -42,20 +42,20 @@ mixin Elm.Interface.Atspi_Action () } @property actions @protected { [[Get list of available widget actions]] - get @virtual_pure { + get @pure_virtual { } values { actions: list; [[Contains statically allocated strings]] } } - action_do @protected @virtual_pure { + action_do @protected @pure_virtual { [[Performs action on given widget.]] params { @in id: int; [[ID for widget]] } return: bool; [[$true if action was performed, $false otherwise]] } - keybinding_get @protected @virtual_pure { + keybinding_get @protected @pure_virtual { [[Gets configured keybinding for specific action and widget.]] params { @in id: int; [[ID for widget]] diff --git a/src/lib/elementary/elm_interface_atspi_image.eo b/src/lib/elementary/elm_interface_atspi_image.eo index 675b71651c..a3e76498f5 100644 --- a/src/lib/elementary/elm_interface_atspi_image.eo +++ b/src/lib/elementary/elm_interface_atspi_image.eo @@ -6,7 +6,7 @@ mixin Elm.Interface.Atspi_Image () methods { @property extents @protected { [[Gets an image extents.]] - get @virtual_pure { + get @pure_virtual { } keys { screen_coords: bool; [[$true if we got the screen coordinates, $false otherwise]] diff --git a/src/lib/elementary/elm_interface_atspi_widget_action.eo b/src/lib/elementary/elm_interface_atspi_widget_action.eo index c5b6e53391..6919e4924a 100644 --- a/src/lib/elementary/elm_interface_atspi_widget_action.eo +++ b/src/lib/elementary/elm_interface_atspi_widget_action.eo @@ -8,7 +8,7 @@ mixin Elm.Interface.Atspi_Widget_Action (Elm.Interface.Atspi_Action) methods { @property elm_actions @protected { [[Elementary actions]] - get @virtual_pure { + get @pure_virtual { } values { actions: ptr(const(Elm_Atspi_Action)); [[NULL-terminated array of Elm_Atspi_Action]] diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo index 43e7d779b5..b1e37d3e0e 100644 --- a/src/lib/elementary/elm_web.eo +++ b/src/lib/elementary/elm_web.eo @@ -21,7 +21,7 @@ class Elm.Web (Elm.Widget) eo_prefix: elm_obj_web; event_prefix: elm_web; methods { - @property text_matches_highlight @virtual_pure { + @property text_matches_highlight @pure_virtual { set { [[Sets whether to highlight the matched marks. @@ -37,7 +37,7 @@ class Elm.Web (Elm.Widget) highlight: bool; [[Whether to highlight the marks or not.]] } } - @property useragent @virtual_pure { + @property useragent @pure_virtual { set { [[Change useragent of a elm_web object.]] } @@ -48,7 +48,7 @@ class Elm.Web (Elm.Widget) user_agent: string; [[String for useragent.]] } } - @property url @virtual_pure { + @property url @pure_virtual { set { [[Sets the URL for the web object. @@ -68,7 +68,7 @@ class Elm.Web (Elm.Widget) url: string; [[The URL to set.]] } } - @property bg_color @virtual_pure { + @property bg_color @pure_virtual { set { [[Sets the background color to be used by the web object. @@ -92,7 +92,7 @@ class Elm.Web (Elm.Widget) a: int; [[Alpha component.]] } } - @property inwin_mode @virtual_pure { + @property inwin_mode @pure_virtual { set { [[Sets the default dialogs to use an Inwin instead of a normal window. @@ -109,7 +109,7 @@ class Elm.Web (Elm.Widget) value: bool; [[$true if dialog will be opened as Inwin, $false otherwise]] } } - @property tab_propagate @virtual_pure { + @property tab_propagate @pure_virtual { set { [[Sets whether to use tab propagation. @@ -127,7 +127,7 @@ class Elm.Web (Elm.Widget) propagate: bool; [[Whether to propagate Tab keys to Elementary or not.]] } } - @property history_enabled @virtual_pure { + @property history_enabled @pure_virtual { set { [[Enables or disables the browsing history.]] } @@ -138,7 +138,7 @@ class Elm.Web (Elm.Widget) enable: bool; [[Whether to enable or disable the browsing history.]] } } - @property zoom_mode @virtual_pure { + @property zoom_mode @pure_virtual { set { [[Sets the zoom mode to use. @@ -165,7 +165,7 @@ class Elm.Web (Elm.Widget) mode: Elm.Web.Zoom_Mode; [[The mode to set.]] } } - @property zoom @virtual_pure { + @property zoom @pure_virtual { set { [[Sets the zoom level of the web object. @@ -191,7 +191,7 @@ class Elm.Web (Elm.Widget) } } @property console_message_hook { - set @virtual_pure { + set @pure_virtual { [[Sets the function to call when a console message is emitted from JS. @@ -206,7 +206,7 @@ class Elm.Web (Elm.Widget) } } @property window_create_hook { - set @virtual_pure { + set @pure_virtual { [[Sets the function to call when a new window is requested. This hook will be called when a request to create a new @@ -222,7 +222,7 @@ class Elm.Web (Elm.Widget) } } @property dialog_file_selector_hook { - set @virtual_pure { + set @pure_virtual { [[Sets the function to call when an file selector dialog. This hook will be called when a JavaScript file selector @@ -237,7 +237,7 @@ class Elm.Web (Elm.Widget) } } @property dialog_confirm_hook { - set @virtual_pure { + set @pure_virtual { [[Sets the function to call when an confirm dialog. This hook will be called when a JavaScript confirm dialog is @@ -251,7 +251,7 @@ class Elm.Web (Elm.Widget) } } @property popup_selected { - set @virtual_pure { + set @pure_virtual { [[Tells the web object which index in the currently open popup was selected. @@ -266,7 +266,7 @@ class Elm.Web (Elm.Widget) } } @property dialog_prompt_hook { - set @virtual_pure { + set @pure_virtual { [[Sets the function to call when an prompt dialog. This hook will be called when a JavaScript prompt dialog is @@ -280,7 +280,7 @@ class Elm.Web (Elm.Widget) } } @property dialog_alert_hook { - set @virtual_pure { + set @pure_virtual { [[Sets the function to call when an alert dialog. This hook will be called when a JavaScript alert dialog is @@ -294,13 +294,13 @@ class Elm.Web (Elm.Widget) } } @property forward_possible { - get @virtual_pure { + get @pure_virtual { [[Queries whether it's possible to go forward in history.]] return: bool; [[$true if it is possible to go forward, $false otherwise]] } } @property webkit_view { - get @virtual_pure { + get @pure_virtual { [[Get internal ewk_view object from web object. Elementary may not provide some low level features of EWebKit, @@ -315,13 +315,13 @@ class Elm.Web (Elm.Widget) } } @property back_possible { - get @virtual_pure { + get @pure_virtual { [[Queries whether it's possible to go back in history.]] return: bool; [[$true if it is possible to go back, $false otherwise]] } } @property load_progress { - get @virtual_pure { + get @pure_virtual { [[Get the overall loading progress of the page. Returns the estimated loading progress of the page, with a @@ -333,7 +333,7 @@ class Elm.Web (Elm.Widget) } } @property selection { - get @virtual_pure { + get @pure_virtual { [[Get a copy of the currently selected text. The string returned must be freed by the user when it's done @@ -345,7 +345,7 @@ class Elm.Web (Elm.Widget) } } @property title { - get @virtual_pure { + get @pure_virtual { [[Get the current title. The returned string must not be freed and is guaranteed to be @@ -357,7 +357,7 @@ class Elm.Web (Elm.Widget) ]] } } - navigate @virtual_pure { + navigate @pure_virtual { [[Jumps the given number of steps in the browsing history. The $steps value can be a negative integer to back in history, @@ -369,14 +369,14 @@ class Elm.Web (Elm.Widget) @in steps: int; [[The number of steps to jump.]] } } - back @virtual_pure { + back @pure_virtual { [[Goes back one step in the browsing history. This is equivalent to calling elm_web_object_navigate(obj, -1); ]] return: bool; [[$true on success, $false otherwise]] } - html_string_load @virtual_pure { + html_string_load @pure_virtual { [[Loads the specified $html string as the content of the web object. @@ -396,7 +396,7 @@ class Elm.Web (Elm.Widget) @in unreachable_url: string @optional; [[URL that could not be reached (optional).]] } } - text_search @const @virtual_pure { + text_search @const @pure_virtual { [[Searches the given string in a document.]] return: bool; [[$true if the given string was found, $false if not or failure.]] @@ -407,7 +407,7 @@ class Elm.Web (Elm.Widget) @in wrap: bool; [[If search should wrap at the end.]] } } - popup_destroy @virtual_pure { + popup_destroy @pure_virtual { [[Dismisses an open dropdown popup When the popup from a dropdown widget is to be dismissed, either @@ -419,7 +419,7 @@ class Elm.Web (Elm.Widget) return: bool; [[$true if the menu was successfully destroyed, or $false if there was no menu to destroy.]] } - region_show @virtual_pure { + region_show @pure_virtual { [[Shows the given region in the web object.]] params { @in x: int; [[The x coordinate of the region to show.]] @@ -428,7 +428,7 @@ class Elm.Web (Elm.Widget) @in h: int; [[The height of the region to show.]] } } - forward @virtual_pure { + forward @pure_virtual { [[Goes forward one step in the browsing history. This is equivalent to calling elm_web_object_navigate(obj, 1); @@ -438,7 +438,7 @@ class Elm.Web (Elm.Widget) ]] return: bool; [[$true on success, $false otherwise.]] } - text_matches_mark @virtual_pure { + text_matches_mark @pure_virtual { [[Marks matches of the given string in a document.]] return: uint; [[Number of matched $string.]] params { @@ -448,7 +448,7 @@ class Elm.Web (Elm.Widget) @in limit: uint; [[Maximum amount of matches, or zero to unlimited.]] } } - region_bring_in @virtual_pure { + region_bring_in @pure_virtual { [[Brings in the region to the visible area. Like @.region_show, but it animates the scrolling of the object @@ -461,7 +461,7 @@ class Elm.Web (Elm.Widget) @in h: int; [[The height of the region to show.]] } } - stop @virtual_pure { + stop @pure_virtual { [[Stops loading the current page. Cancels the loading of the current page in the web object. This @@ -470,7 +470,7 @@ class Elm.Web (Elm.Widget) ]] return: bool; [[$true if the cancel was successful, $false otherwise.]] } - navigate_possible_get @virtual_pure { + navigate_possible_get @pure_virtual { [[Queries whether it's possible to jump the given number of steps. The $steps value can be a negative integer to back in history, @@ -482,17 +482,17 @@ class Elm.Web (Elm.Widget) @in steps: int; [[The number of steps to check for.]] } } - reload_full @virtual_pure { + reload_full @pure_virtual { [[Requests a reload of the current document, avoiding any existing caches. ]] return: bool; [[$true on success, $false otherwise.]] } - text_matches_unmark_all @virtual_pure { + text_matches_unmark_all @pure_virtual { [[Clears all marked matches in the document.]] return: bool; [[$true on success, $false otherwise.]] } - reload @virtual_pure { + reload @pure_virtual { [[Requests a reload of the current document in the object.]] return: bool; [[$true on success, $false otherwise.]] } diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo index 1cd838edb7..006d8a6f20 100644 --- a/src/lib/elementary/elm_widget.eo +++ b/src/lib/elementary/elm_widget.eo @@ -375,7 +375,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter } @property parent_widget { [[Parent widget property]] - get @virtual_pure { + get @pure_virtual { return: Efl.Canvas.Object; [[Parent widget]] legacy: null; } @@ -576,7 +576,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter @in dir: Elm.Focus_Direction; [[Direction to move the focus.]] } } - focus_direction @virtual_pure { + focus_direction @pure_virtual { [['Virtual' function handling passing focus to sub-objects given a direction, in degrees.]] params { @in base: const(Efl.Canvas.Object); [[Base object]] @@ -717,7 +717,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, Elm.Inter focus_hide_handle { [[Handle hide focus]] } - focus_next @virtual_pure { + focus_next @pure_virtual { [['Virtual' function handling passing focus to sub-objects.]] params { @in dir: Elm.Focus_Direction; [[Focus direction]] diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h index 051852cb92..56ef7664b5 100644 --- a/src/lib/eolian/eo_lexer.h +++ b/src/lib/eolian/eo_lexer.h @@ -32,7 +32,7 @@ enum Tokens KWAT(c_only), KWAT(class), KWAT(const), KWAT(empty), KWAT(extern), \ KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(nullable), \ KWAT(optional), KWAT(out), KWAT(private), KWAT(property), \ - KWAT(protected), KWAT(restart), KWAT(virtual_pure), KWAT(warn_unused), \ + KWAT(protected), KWAT(restart), KWAT(pure_virtual), KWAT(warn_unused), \ \ KW(byte), KW(ubyte), KW(char), KW(short), KW(ushort), KW(int), KW(uint), \ KW(long), KW(ulong), KW(llong), KW(ullong), \ diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index 0cd748806f..eaa28b7359 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -1189,8 +1189,8 @@ parse_accessor(Eo_Lexer *ls, Eolian_Function *prop) eo_lexer_get(ls); for (;;) switch (ls->t.kw) { - case KW_at_virtual_pure: - CASE_LOCK(ls, virtp, "virtual_pure qualifier"); + case KW_at_pure_virtual: + CASE_LOCK(ls, virtp, "pure_virtual qualifier"); if (is_get) prop->get_pure_virtual = EINA_TRUE; else prop->set_pure_virtual = EINA_TRUE; eo_lexer_get(ls); @@ -1350,8 +1350,8 @@ parse_property(Eo_Lexer *ls) prop->is_beta = EINA_TRUE; eo_lexer_get(ls); break; - case KW_at_virtual_pure: - CASE_LOCK(ls, virtp, "virtual_pure qualifier"); + case KW_at_pure_virtual: + CASE_LOCK(ls, virtp, "pure_virtual qualifier"); eo_lexer_get(ls); break; default: @@ -1441,8 +1441,8 @@ parse_method(Eo_Lexer *ls) meth->is_beta = EINA_TRUE; eo_lexer_get(ls); break; - case KW_at_virtual_pure: - CASE_LOCK(ls, virtp, "virtual_pure qualifier"); + case KW_at_pure_virtual: + CASE_LOCK(ls, virtp, "pure_virtual qualifier"); eo_lexer_get(ls); break; default: diff --git a/src/lib/evas/canvas/efl_canvas_filter_internal.eo b/src/lib/evas/canvas/efl_canvas_filter_internal.eo index db83375db5..48bfd2685d 100644 --- a/src/lib/evas/canvas/efl_canvas_filter_internal.eo +++ b/src/lib/evas/canvas/efl_canvas_filter_internal.eo @@ -22,11 +22,11 @@ mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Efl.Object) val: bool; [[$true if filter is invalid, $false otherwise]] } } - filter_input_alpha @protected @virtual_pure { + filter_input_alpha @protected @pure_virtual { [[Called by Efl.Canvas.Filter.Internal to determine whether the input is alpha or rgba.]] return: bool; [[$true on success, $false otherwise]] } - filter_input_render @protected @virtual_pure { + filter_input_render @protected @pure_virtual { [[Called by Efl.Canvas.Filter.Internal when the parent class must render the input. ; ]] @@ -41,7 +41,7 @@ mixin Efl.Canvas.Filter.Internal (Efl.Gfx.Filter, Efl.Object) do_async: bool; [[$true when the operation should be done asynchronous, $false otherwise]] } } - filter_dirty @protected @virtual_pure { + filter_dirty @protected @pure_virtual { [[Called when the filter changes must trigger a redraw of the object. Virtual, to be implemented in the parent class. diff --git a/src/lib/evas/canvas/efl_canvas_surface.eo b/src/lib/evas/canvas/efl_canvas_surface.eo index 4cb2685cd7..18495c8fcb 100644 --- a/src/lib/evas/canvas/efl_canvas_surface.eo +++ b/src/lib/evas/canvas/efl_canvas_surface.eo @@ -15,7 +15,7 @@ mixin Efl.Canvas.Surface (Efl.Interface, Efl.Canvas.Image.Internal) Set to $null to detach this surface from the external buffer. ]] get {} - set @virtual_pure { + set @pure_virtual { [[Set the buffer. If this fails, this function returns $false, and the surface is left without any attached buffer. ]] diff --git a/src/lib/evas/canvas/efl_gfx_map.eo b/src/lib/evas/canvas/efl_gfx_map.eo index 542b4172a6..6c93d9eefd 100644 --- a/src/lib/evas/canvas/efl_gfx_map.eo +++ b/src/lib/evas/canvas/efl_gfx_map.eo @@ -28,7 +28,7 @@ mixin Efl.Gfx.Map (Efl.Interface, Efl.Object) ]] data: null; methods { - @property map_enable @virtual_pure { + @property map_enable @pure_virtual { [[Whether map transformation is enabled on this object. The default map enable state is off ($false). The other diff --git a/src/lib/evas/canvas/efl_input_event.eo b/src/lib/evas/canvas/efl_input_event.eo index f11e3526e3..420bf7ac77 100644 --- a/src/lib/evas/canvas/efl_input_event.eo +++ b/src/lib/evas/canvas/efl_input_event.eo @@ -13,7 +13,7 @@ mixin Efl.Input.Event eo_prefix: efl_input; data: null; methods { - @property timestamp @virtual_pure { + @property timestamp @pure_virtual { [[The time at which an event was generated. If the event is generated by a server (eg. X.org or Wayland), then @@ -27,20 +27,20 @@ mixin Efl.Input.Event ms: double; [[Time in milliseconds when the event happened.]] } } - reset @virtual_pure { + reset @pure_virtual { [[Resets the internal data to 0 or default values.]] } - dup @virtual_pure { + dup @pure_virtual { [[Creates a copy of this event.]] return: own(Efl.Input.Event); [[Event copy]] } - @property device @virtual_pure { + @property device @pure_virtual { [[Input device that originated this event.]] values { dev: Efl.Input.Device; [[Input device origin]] } } - @property event_flags @virtual_pure { + @property event_flags @pure_virtual { [[Extra flags for this event, may be changed by the user.]] values { flags: Efl.Input.Flags; [[Input event flags]] @@ -65,7 +65,7 @@ mixin Efl.Input.Event val: bool; [[$true if the event was not from real hardware, $false otherwise]] } } - instance_get @class @protected @virtual_pure { + instance_get @class @protected @pure_virtual { [[Get an instance of this input event]] params { @in owner: Efl.Object; [[Owner of this input event]] diff --git a/src/lib/evas/canvas/efl_vg.eo b/src/lib/evas/canvas/efl_vg.eo index 8c23bb7534..df69ae1aaf 100644 --- a/src/lib/evas/canvas/efl_vg.eo +++ b/src/lib/evas/canvas/efl_vg.eo @@ -82,7 +82,7 @@ abstract Efl.VG (Efl.Object, Efl.Gfx, Efl.Gfx.Stack) Evas_VG_Quality q; } } */ - bounds_get @virtual_pure { + bounds_get @pure_virtual { [[Give the bounding box in screen coordinate as being drawn. It will start as the control box until it is refined once the shape diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo b/src/lib/evas/canvas/evas_canvas3d_object.eo index 2287abe93c..abec916708 100644 --- a/src/lib/evas/canvas/evas_canvas3d_object.eo +++ b/src/lib/evas/canvas/evas_canvas3d_object.eo @@ -35,13 +35,13 @@ class Evas.Canvas3D.Object (Efl.Object) update { [[Update request for the object.]] } - update_notify @virtual_pure { + update_notify @pure_virtual { [[Pure virtual update_notify function. Update request for the object.]] } - change_notify @virtual_pure { + change_notify @pure_virtual { [[Pure virtual change_notify function. Update request for the object.]] @@ -50,14 +50,14 @@ class Evas.Canvas3D.Object (Efl.Object) @in ref: Evas.Canvas3D.Object; [[The Object that caused the change.]] } } - callback_register @virtual_pure { + callback_register @pure_virtual { [[Pure virtual register samrt callback function.]] params { @in event: string; [[Event type.]] @in data: const(void_ptr); [[User data.]] } } - callback_unregister @virtual_pure { + callback_unregister @pure_virtual { [[Pure virtual unregister smart callback function.]] params { @in event: string; [[Event type.]] diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua index de4ab262dc..dada2341c5 100644 --- a/src/scripts/elua/apps/gendoc.lua +++ b/src/scripts/elua/apps/gendoc.lua @@ -176,7 +176,7 @@ local gen_method_sig = function(fn, cl) local buf = {} gen_func_namesig(fn, cl, buf, false, false, false) if fn:is_pure_virtual(fn.METHOD) then - buf[#buf + 1] = "@virtual_pure " + buf[#buf + 1] = "@pure_virtual " end buf[#buf + 1] = "{" local params = fn:parameters_get() @@ -233,7 +233,7 @@ local gen_prop_sig = function(fn, cl) local svirt = fn:is_pure_virtual(fn.PROP_SET) if (not isget or gvirt) and (not isset or svirt) then - buf[#buf + 1] = "@virtual_pure " + buf[#buf + 1] = "@pure_virtual " end local gkeys = isget and fn:property_keys_get(fn.PROP_GET) or {} diff --git a/src/tests/eolian/data/base.eo b/src/tests/eolian/data/base.eo index 7fcd73e860..1576573406 100644 --- a/src/tests/eolian/data/base.eo +++ b/src/tests/eolian/data/base.eo @@ -7,7 +7,7 @@ class Base { c: float; } } - constructor @virtual_pure { + constructor @pure_virtual { } destructor { } diff --git a/src/tests/eolian/data/nmsp1_nmsp11_class2.eo b/src/tests/eolian/data/nmsp1_nmsp11_class2.eo index 27dd47cb06..13750e5f46 100644 --- a/src/tests/eolian/data/nmsp1_nmsp11_class2.eo +++ b/src/tests/eolian/data/nmsp1_nmsp11_class2.eo @@ -2,7 +2,7 @@ class nmsp1.nmsp11.class2 { methods { @property a { - set @virtual_pure { + set @pure_virtual { } } } diff --git a/src/tests/eolian/data/object_impl.eo b/src/tests/eolian/data/object_impl.eo index abf1820d43..97906ab3cc 100644 --- a/src/tests/eolian/data/object_impl.eo +++ b/src/tests/eolian/data/object_impl.eo @@ -19,7 +19,7 @@ class Object_Impl (Base) { @property b { set { } - get @virtual_pure { + get @pure_virtual { /* set as virtual pure - no implementation expected */ } values { @@ -50,7 +50,7 @@ class Object_Impl (Base) { @in b: string; } } - pure_foo3 @virtual_pure { + pure_foo3 @pure_virtual { /* set as virtual pure - no implementation expected */ } } diff --git a/src/tests/eolian/data/override.eo b/src/tests/eolian/data/override.eo index abf80b6be8..d6e2d56a40 100644 --- a/src/tests/eolian/data/override.eo +++ b/src/tests/eolian/data/override.eo @@ -1,7 +1,7 @@ class Override (Base) { methods { @property a { - set @virtual_pure { + set @pure_virtual { } get { } @@ -32,7 +32,7 @@ class Override (Base) { c: int(50); } } - foo @virtual_pure { + foo @pure_virtual { } bar { params {