tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=f46afbcbdf1380e93c4e1e092b8f06b4c743e6db

commit f46afbcbdf1380e93c4e1e092b8f06b4c743e6db
Merge: 0ceca70 f1b1c53
Author: Tom Hacohen <t...@stosb.com>
Date:   Thu Mar 3 10:05:38 2016 +0000

    Eo: Migrate to the new syntax (Eo4) and adjust the EFL
    
    This is a merge commit for all of the relevant changes.
    
    The syntax is described in: https://phab.enlightenment.org/w/eo/
    
    Summary:
    eo_do(obj, a_set(1)) -> a_set(obj, 1)
    eo_do_super(obj, CLASS, a_set(1)) -> a_set(eo_super(obj, CLASS), 1)
    
    eo_do_*_ret() set of functions are no longer needed.
    
    This is the first step, the next step would be to also fix up eo_add()
    which currently still uses the old syntax and is not 100% portable.

 src/Makefile.am                                    |   1 -
 src/benchmarks/eo/class_simple.c                   |   2 +-
 src/benchmarks/eo/eo_bench_callbacks.c             |   6 +-
 src/benchmarks/eo/eo_bench_eo_do.c                 |  12 +-
 src/bin/eolian/eo_generator.c                      |  24 +-
 src/bin/eolian/impl_generator.c                    |   6 +-
 src/bin/eolian/legacy_generator.c                  |  12 +-
 src/examples/ecore/ecore_audio_custom.c            |  14 +-
 src/examples/ecore/ecore_audio_playback.c          |  82 ++--
 src/examples/ecore/ecore_audio_to_ogg.c            |  14 +-
 src/examples/ecore/ecore_idler_example.c           |   2 +-
 src/examples/ecore/ecore_poller_example.c          |  11 +-
 src/examples/edje/edje-text.c                      |   6 +-
 src/examples/eldbus/dbusmodel.c                    |  26 +-
 src/examples/emotion/emotion_basic_example.c       |   4 +-
 src/examples/emotion/emotion_border_example.c      |   5 +-
 src/examples/emotion/emotion_generic_example.c     |  10 +-
 .../emotion/emotion_generic_subtitle_example.c     |   4 +-
 src/examples/emotion/emotion_signals_example.c     |  10 +-
 src/examples/eo/.gitignore                         |   2 -
 src/examples/eo/Makefile.am                        | 103 ----
 src/examples/eo/Makefile.examples                  |  42 --
 src/examples/eo/evas/evas_elw_box.c                |  74 ---
 src/examples/eo/evas/evas_elw_box.h                |  25 -
 src/examples/eo/evas/evas_elw_boxedbutton.c        |  57 ---
 src/examples/eo/evas/evas_elw_boxedbutton.h        |   9 -
 src/examples/eo/evas/evas_elw_button.c             | 115 -----
 src/examples/eo/evas/evas_elw_button.h             |  29 --
 src/examples/eo/evas/evas_elw_win.c                |  74 ---
 src/examples/eo/evas/evas_elw_win.h                |   9 -
 src/examples/eo/evas/evas_evas_obj.c               | 146 ------
 src/examples/eo/evas/evas_evas_obj.h               |  90 ----
 src/examples/eo/evas/evas_test.c                   |  66 ---
 src/examples/eo/isa/eo_isa_complex.c               |  21 -
 src/examples/eo/isa/eo_isa_complex.h               |  10 -
 src/examples/eo/isa/eo_isa_interface.c             |  28 --
 src/examples/eo/isa/eo_isa_interface.h             |  16 -
 src/examples/eo/isa/eo_isa_main.c                  |  36 --
 src/examples/eo/isa/eo_isa_mixin.c                 |  39 --
 src/examples/eo/isa/eo_isa_mixin.h                 |  16 -
 src/examples/eo/isa/eo_isa_simple.c                |  59 ---
 src/examples/eo/isa/eo_isa_simple.h                |  25 -
 src/examples/eo/simple/simple_interface.c          |  28 --
 src/examples/eo/simple/simple_interface.h          |  16 -
 src/examples/eo/simple/simple_main.c               |  31 --
 src/examples/eo/simple/simple_mixin.c              |  39 --
 src/examples/eo/simple/simple_mixin.h              |  16 -
 src/examples/eo/simple/simple_simple.c             |  59 ---
 src/examples/eo/simple/simple_simple.h             |  25 -
 src/examples/eolian_cxx/colourable.c               |   6 +-
 src/examples/eolian_cxx/colourablesquare.c         |   2 +-
 src/examples/evas/evas-3d-aabb.c                   | 157 +++---
 src/examples/evas/evas-3d-blending.c               | 128 ++---
 src/examples/evas/evas-3d-colorpick.c              | 156 +++---
 src/examples/evas/evas-3d-cube-rotate.c            |  91 ++--
 src/examples/evas/evas-3d-cube.c                   | 123 ++---
 src/examples/evas/evas-3d-cube2.c                  | 150 +++---
 src/examples/evas/evas-3d-eet.c                    | 136 +++---
 src/examples/evas/evas-3d-fog.c                    | 127 +++--
 src/examples/evas/evas-3d-frustum.c                | 229 ++++-----
 src/examples/evas/evas-3d-hull.c                   | 242 ++++-----
 src/examples/evas/evas-3d-md2.c                    | 120 ++---
 src/examples/evas/evas-3d-mmap-set.c               | 137 +++---
 src/examples/evas/evas-3d-obj.c                    | 129 ++---
 src/examples/evas/evas-3d-parallax-occlusion.c     | 186 +++----
 src/examples/evas/evas-3d-pick.c                   |  97 ++--
 src/examples/evas/evas-3d-ply.c                    | 132 ++---
 src/examples/evas/evas-3d-proxy.c                  | 131 ++---
 src/examples/evas/evas-3d-shadows.c                | 470 ++++++++----------
 src/examples/evas/evas-object-manipulation-eo.c    |  75 +--
 src/examples/evas/evas-vg-simple.c                 |  46 +-
 src/examples/evas/shooter/evas-3d-shooter-header.c |  95 ++--
 src/examples/evas/shooter/evas-3d-shooter-macros.h | 109 ++---
 src/examples/evas/shooter/evas-3d-shooter.c        | 539 ++++++++-------------
 src/lib/ecore/ecore_anim.c                         |  18 +-
 src/lib/ecore/ecore_exe.c                          |  12 +-
 src/lib/ecore/ecore_exe_posix.c                    |   2 +-
 src/lib/ecore/ecore_exe_win32.c                    |   4 +-
 src/lib/ecore/ecore_idle_enterer.c                 |  12 +-
 src/lib/ecore/ecore_idle_exiter.c                  |  10 +-
 src/lib/ecore/ecore_idler.c                        |  10 +-
 src/lib/ecore/ecore_job.c                          |  10 +-
 src/lib/ecore/ecore_poller.c                       |  13 +-
 src/lib/ecore/ecore_timer.c                        |  24 +-
 src/lib/ecore_audio/ecore_audio_obj.c              |   2 +-
 src/lib/ecore_audio/ecore_audio_obj_in.c           |  22 +-
 src/lib/ecore_audio/ecore_audio_obj_in_sndfile.c   |   2 +-
 src/lib/ecore_audio/ecore_audio_obj_in_tone.c      |   6 +-
 src/lib/ecore_audio/ecore_audio_obj_out.c          |  10 +-
 .../ecore_audio/ecore_audio_obj_out_core_audio.c   |  20 +-
 src/lib/ecore_audio/ecore_audio_obj_out_pulse.c    |  46 +-
 src/lib/ecore_audio/ecore_audio_obj_out_sndfile.c  |  16 +-
 src/lib/ecore_con/ecore_con.c                      |  90 ++--
 src/lib/ecore_con/ecore_con_eet.c                  |  40 +-
 src/lib/ecore_con/ecore_con_legacy.c               |   4 +-
 src/lib/ecore_con/ecore_con_url.c                  |  23 +-
 src/lib/ecore_evas/ecore_evas.c                    |   4 +-
 src/lib/ector/cairo/ector_cairo_private.h          |   2 +-
 src/lib/ector/cairo/ector_cairo_software_surface.c |  13 +-
 src/lib/ector/cairo/ector_cairo_surface.c          |  13 +-
 src/lib/ector/cairo/ector_renderer_cairo_base.c    |   6 +-
 .../cairo/ector_renderer_cairo_gradient_linear.c   |  14 +-
 .../cairo/ector_renderer_cairo_gradient_radial.c   |  14 +-
 src/lib/ector/cairo/ector_renderer_cairo_shape.c   |  34 +-
 src/lib/ector/ector_private.h                      |   2 +-
 src/lib/ector/ector_renderer_generic_base.c        |   6 +-
 src/lib/ector/ector_renderer_generic_buffer.c      |   2 +-
 src/lib/ector/gl/ector_gl_surface.c                |  15 +-
 src/lib/ector/gl/ector_renderer_gl_base.c          |   5 +-
 .../ector/gl/ector_renderer_gl_gradient_linear.c   |  11 +-
 .../ector/gl/ector_renderer_gl_gradient_radial.c   |  11 +-
 src/lib/ector/gl/ector_renderer_gl_shape.c         |  21 +-
 .../software/ector_renderer_software_buffer.c      |   4 +-
 .../ector_renderer_software_gradient_linear.c      |  10 +-
 .../ector_renderer_software_gradient_radial.c      |  10 +-
 .../ector/software/ector_renderer_software_shape.c |  28 +-
 src/lib/ector/software/ector_software_buffer.c     |   6 +-
 src/lib/ector/software/ector_software_rasterizer.c |   4 +-
 src/lib/ector/software/ector_software_surface.c    |  16 +-
 src/lib/edje/edje_calc.c                           | 333 +++++--------
 src/lib/edje/edje_callbacks.c                      |   8 +-
 src/lib/edje/edje_edit.c                           |   8 +-
 src/lib/edje/edje_load.c                           |  36 +-
 src/lib/edje/edje_multisense.c                     |  24 +-
 src/lib/edje/edje_program.c                        |   8 +-
 src/lib/edje/edje_smart.c                          |  32 +-
 src/lib/edje/edje_text.c                           | 126 ++---
 src/lib/edje/edje_util.c                           |   5 +-
 src/lib/efl/interfaces/efl_gfx_shape.c             |  80 ++-
 src/lib/efl/interfaces/efl_model_common.c          |   8 +-
 src/lib/eio/eio_model.c                            |  24 +-
 src/lib/eldbus/eldbus_model_arguments.c            |  10 +-
 src/lib/eldbus/eldbus_model_connection.c           |   9 +-
 src/lib/eldbus/eldbus_model_method.c               |   6 +-
 src/lib/eldbus/eldbus_model_object.c               |   9 +-
 src/lib/eldbus/eldbus_model_proxy.c                |  16 +-
 src/lib/eldbus/eldbus_model_signal.c               |  10 +-
 src/lib/emotion/emotion_smart.c                    |  98 ++--
 src/lib/eo/Eo.h                                    | 136 ++----
 src/lib/eo/eo.c                                    | 422 ++++------------
 src/lib/eo/eo_base_class.c                         |  29 +-
 src/lib/eo/eo_private.h                            |   7 +-
 src/lib/eo/eo_ptr_indirection.x                    |  21 +-
 src/lib/evas/Evas_Legacy.h                         |   9 +-
 src/lib/evas/canvas/evas_callbacks.c               |  26 +-
 src/lib/evas/canvas/evas_canvas3d_camera.c         |  16 +-
 src/lib/evas/canvas/evas_canvas3d_light.c          |  32 +-
 src/lib/evas/canvas/evas_canvas3d_material.c       |  14 +-
 src/lib/evas/canvas/evas_canvas3d_mesh.c           |  48 +-
 src/lib/evas/canvas/evas_canvas3d_node.c           | 147 +++---
 src/lib/evas/canvas/evas_canvas3d_object.c         |  16 +-
 src/lib/evas/canvas/evas_canvas3d_primitive.c      |   6 +-
 src/lib/evas/canvas/evas_canvas3d_scene.c          |  41 +-
 src/lib/evas/canvas/evas_canvas3d_texture.c        |  42 +-
 src/lib/evas/canvas/evas_clip.c                    |  12 +-
 src/lib/evas/canvas/evas_data.c                    |   7 +-
 src/lib/evas/canvas/evas_events.c                  |  14 +-
 src/lib/evas/canvas/evas_filter_mixin.c            |  30 +-
 src/lib/evas/canvas/evas_focus.c                   |   2 +-
 src/lib/evas/canvas/evas_layer.c                   |   6 +-
 src/lib/evas/canvas/evas_main.c                    |   4 +-
 src/lib/evas/canvas/evas_object_box.c              |  61 ++-
 src/lib/evas/canvas/evas_object_grid.c             |   4 +-
 src/lib/evas/canvas/evas_object_image.c            |  63 ++-
 src/lib/evas/canvas/evas_object_line.c             |   2 +-
 src/lib/evas/canvas/evas_object_main.c             | 105 ++--
 src/lib/evas/canvas/evas_object_polygon.c          |   4 +-
 src/lib/evas/canvas/evas_object_rectangle.c        |   2 +-
 src/lib/evas/canvas/evas_object_smart.c            |  36 +-
 src/lib/evas/canvas/evas_object_smart_clipped.c    |   6 +-
 src/lib/evas/canvas/evas_object_table.c            |  14 +-
 src/lib/evas/canvas/evas_object_text.c             |  53 +-
 src/lib/evas/canvas/evas_object_textblock.c        |  29 +-
 src/lib/evas/canvas/evas_object_textgrid.c         |  20 +-
 src/lib/evas/canvas/evas_object_vg.c               |   8 +-
 src/lib/evas/canvas/evas_out.c                     |  12 +-
 src/lib/evas/canvas/evas_render.c                  |   8 +-
 src/lib/evas/canvas/evas_stack.c                   |  16 +-
 src/lib/evas/canvas/evas_vg_container.c            |  16 +-
 src/lib/evas/canvas/evas_vg_gradient.c             |  19 +-
 src/lib/evas/canvas/evas_vg_gradient_linear.c      |  42 +-
 src/lib/evas/canvas/evas_vg_gradient_radial.c      |  52 +-
 src/lib/evas/canvas/evas_vg_node.c                 |  67 ++-
 src/lib/evas/canvas/evas_vg_private.h              |   2 +-
 src/lib/evas/canvas/evas_vg_root_node.c            |  11 +-
 src/lib/evas/canvas/evas_vg_shape.c                | 167 +++----
 src/lib/evas/canvas/render2/evas_render2.c         |   6 +-
 src/lib/evas/canvas/render2/evas_render2_old.c     |   6 +-
 .../evas/common3d/primitives/primitive_common.c    |  30 +-
 .../evas/common3d/primitives/primitive_common.h    |  26 +-
 .../save_load/evas_model_load_save_common.c        |  24 +-
 src/lib/evas/filters/evas_filter.c                 |   2 +-
 src/lib/evas/filters/evas_filter_blend.c           |   8 +-
 src/lib/evas/filters/evas_filter_blur.c            |   8 +-
 src/lib/evas/filters/evas_filter_bump.c            |  12 +-
 src/lib/evas/filters/evas_filter_curve.c           |   8 +-
 src/lib/evas/filters/evas_filter_displace.c        |  12 +-
 src/lib/evas/filters/evas_filter_fill.c            |   2 +-
 src/lib/evas/filters/evas_filter_mask.c            |  24 +-
 src/lib/evas/filters/evas_filter_parser.c          |  27 +-
 src/lib/evas/filters/evas_filter_private.h         |   4 +-
 src/lib/evas/filters/evas_filter_transform.c       |   4 +-
 src/lib/evas/filters/evas_filter_utils.c           |   4 +-
 src/modules/ethumb/emotion/emotion.c               |  24 +-
 .../evas/engines/gl_common/evas_gl_preload.c       |   8 +-
 .../gl_generic/evas_ector_gl_image_buffer.c        |  14 +-
 .../gl_generic/evas_ector_gl_rgbaimage_buffer.c    |  14 +-
 src/modules/evas/engines/gl_generic/evas_engine.c  |  26 +-
 .../software_generic/evas_ector_software_buffer.c  |  14 +-
 .../evas/engines/software_generic/evas_engine.c    |  26 +-
 .../evas/model_loaders/eet/evas_model_load_eet.c   |  71 +--
 .../evas/model_loaders/md2/evas_model_load_md2.c   |  42 +-
 .../evas/model_loaders/obj/evas_model_load_obj.c   |  33 +-
 src/tests/ecore/ecore_test_animator.c              |   4 +-
 src/tests/ecore/ecore_test_ecore_audio.c           | 222 ++++-----
 src/tests/edje/edje_test_edje.c                    |  21 +-
 src/tests/eina_cxx/simple.c                        |   2 +-
 src/tests/eio/eio_model_test_file.c                |  26 +-
 src/tests/eio/eio_model_test_monitor_add.c         |  26 +-
 src/tests/eldbus/eldbus_test_eldbus_model.c        |  58 +--
 .../eldbus/eldbus_test_eldbus_model_connection.c   |  30 +-
 src/tests/eldbus/eldbus_test_eldbus_model_method.c |  31 +-
 src/tests/eldbus/eldbus_test_eldbus_model_object.c |  30 +-
 src/tests/eldbus/eldbus_test_eldbus_model_proxy.c  |  24 +-
 src/tests/eldbus/eldbus_test_eldbus_model_signal.c |  29 +-
 .../eldbus_test_fake_server_eldbus_model_proxy.c   |  35 +-
 src/tests/emotion/emotion_test_main-eo.c           | 150 +++---
 src/tests/eo/access/access_inherit.h               |   2 +-
 src/tests/eo/access/access_main.c                  |   3 +-
 src/tests/eo/access/access_simple.c                |   2 +-
 src/tests/eo/access/access_simple.h                |   2 +-
 src/tests/eo/children/children_main.c              |   8 +-
 .../eo/composite_objects/composite_objects_comp.c  |  15 +-
 .../eo/composite_objects/composite_objects_main.c  |  35 +-
 .../composite_objects/composite_objects_simple.c   |   2 +-
 .../composite_objects/composite_objects_simple.h   | 132 ++---
 src/tests/eo/constructors/constructors_main.c      |  16 +-
 src/tests/eo/constructors/constructors_mixin.c     |   7 +-
 src/tests/eo/constructors/constructors_mixin.h     |   2 +-
 src/tests/eo/constructors/constructors_simple.c    |   6 +-
 src/tests/eo/constructors/constructors_simple.h    |   8 +-
 src/tests/eo/constructors/constructors_simple2.c   |   2 +-
 src/tests/eo/constructors/constructors_simple6.c   |   2 +-
 src/tests/eo/constructors/constructors_simple7.c   |   2 +-
 .../function_overrides_inherit2.c                  |  12 +-
 .../function_overrides_inherit2.h                  |   4 +-
 .../function_overrides_inherit3.c                  |   2 +-
 .../function_overrides/function_overrides_main.c   |  27 +-
 .../function_overrides/function_overrides_simple.c |   8 +-
 .../function_overrides/function_overrides_simple.h |   8 +-
 src/tests/eo/interface/interface_interface.h       |   2 +-
 src/tests/eo/interface/interface_interface2.h      |   2 +-
 src/tests/eo/interface/interface_main.c            |  13 +-
 src/tests/eo/interface/interface_simple.c          |   6 +-
 src/tests/eo/interface/interface_simple.h          |   8 +-
 src/tests/eo/mixin/mixin_inherit.c                 |   2 +-
 src/tests/eo/mixin/mixin_main.c                    |  13 +-
 src/tests/eo/mixin/mixin_mixin.c                   |   7 +-
 src/tests/eo/mixin/mixin_mixin.h                   |   2 +-
 src/tests/eo/mixin/mixin_mixin2.c                  |   9 +-
 src/tests/eo/mixin/mixin_mixin3.c                  |   9 +-
 src/tests/eo/mixin/mixin_simple.h                  |   8 +-
 src/tests/eo/signals/signals_main.c                | 108 ++---
 src/tests/eo/signals/signals_simple.c              |  14 +-
 src/tests/eo/signals/signals_simple.h              |   2 +-
 src/tests/eo/suite/eo_test_call_errors.c           |   6 +-
 .../eo/suite/eo_test_class_behaviour_errors.c      |   2 +-
 src/tests/eo/suite/eo_test_class_simple.c          |   8 +-
 src/tests/eo/suite/eo_test_class_simple.h          |  16 +-
 src/tests/eo/suite/eo_test_general.c               | 213 ++++----
 src/tests/eo/suite/eo_test_threaded_calls.c        |   5 +-
 src/tests/eo/suite/eo_test_value.c                 |   2 +-
 src/tests/eolian/data/class_simple_ref.c           |   2 +-
 src/tests/eolian/data/class_simple_ref_eo.h        |  10 +-
 src/tests/eolian/data/docs_ref.h                   |   6 +-
 src/tests/eolian/data/object_impl_add_ref.c        |   2 +-
 src/tests/eolian/data/object_impl_ref.c            |   2 +-
 src/tests/eolian/data/override_ref.c               |   8 +-
 src/tests/eolian/data/struct_ref.c                 |   4 +-
 src/tests/eolian/data/typedef_ref.c                |   2 +-
 src/tests/eolian_cxx/a.c                           |   2 +-
 src/tests/eolian_cxx/b.c                           |   2 +-
 src/tests/eolian_cxx/c.c                           |   2 +-
 src/tests/eolian_cxx/callback.c                    |   2 +-
 src/tests/eolian_cxx/d.c                           |   2 +-
 src/tests/eolian_cxx/generic.c                     |   2 +-
 src/tests/eolian_cxx/simple.c                      |   2 +-
 .../eolian_js_test_constructor_method_impl.c       |   8 +-
 .../eolian_js/eolian_js_test_test_object_impl.c    |  12 +-
 src/tests/evas/evas_test_filters.c                 |  24 +-
 src/tests/evas/evas_test_mesh.c                    |  12 +-
 291 files changed, 4028 insertions(+), 6781 deletions(-)

-- 


Reply via email to