q66 pushed a commit to branch master.

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

commit ed0988a22d9439934a5213f4fa96cb7db76c71e3
Author: Daniel Kolesa <d.kol...@osg.samsung.com>
Date:   Thu May 7 16:36:45 2015 +0100

    eolian: change all EFL .eo files to use new syntax for properties
---
 src/examples/eolian_cxx/colourable.eo              |  6 +-
 src/examples/eolian_cxx/colourablesquare.eo        |  6 +-
 src/lib/ecore/ecore_exe.eo                         |  7 +--
 src/lib/ecore/ecore_mainloop.eo                    |  6 +-
 src/lib/ecore/ecore_poller.eo                      |  4 +-
 src/lib/ecore/ecore_timer.eo                       |  8 +--
 src/lib/ecore_audio/ecore_audio.eo                 | 14 ++---
 src/lib/ecore_audio/ecore_audio_in.eo              | 20 +++---
 src/lib/ecore_con/ecore_con_base.eo                | 16 +++--
 src/lib/ecore_con/ecore_con_client.eo              |  4 +-
 src/lib/ecore_con/ecore_con_server.eo              | 10 +--
 src/lib/ecore_con/ecore_con_url.eo                 |  4 +-
 src/lib/ector/cairo/ector_cairo_surface.eo         |  6 +-
 src/lib/ector/ector_generic_surface.eo             |  8 +--
 src/lib/ector/ector_renderer_generic_base.eo       | 16 +++--
 src/lib/ector/ector_renderer_generic_shape.eo      |  8 +--
 src/lib/ector/software/ector_software_surface.eo   |  6 +-
 src/lib/edje/edje_object.eo                        | 46 +++++++-------
 src/lib/efl/interfaces/efl_control.eo              |  6 +-
 src/lib/efl/interfaces/efl_file.eo                 | 10 ++-
 src/lib/efl/interfaces/efl_gfx_base.eo             | 12 ++--
 src/lib/efl/interfaces/efl_gfx_fill.eo             |  6 +-
 src/lib/efl/interfaces/efl_gfx_gradient_base.eo    |  6 +-
 src/lib/efl/interfaces/efl_gfx_gradient_linear.eo  |  6 +-
 src/lib/efl/interfaces/efl_gfx_gradient_radial.eo  |  8 +--
 src/lib/efl/interfaces/efl_gfx_shape.eo            | 26 ++++----
 src/lib/efl/interfaces/efl_gfx_stack.eo            | 10 ++-
 src/lib/efl/interfaces/efl_gfx_view.eo             |  4 +-
 src/lib/efl/interfaces/efl_image.eo                | 10 +--
 src/lib/efl/interfaces/efl_model_base.eo           | 14 ++---
 src/lib/efl/interfaces/efl_player.eo               | 18 +++---
 src/lib/efl/interfaces/efl_text.eo                 |  4 +-
 src/lib/efl/interfaces/efl_text_properties.eo      |  6 +-
 src/lib/emotion/emotion_object.eo                  |  6 +-
 src/lib/eo/eo_base.eo                              | 12 ++--
 src/lib/evas/canvas/efl_vg_base.eo                 | 10 ++-
 src/lib/evas/canvas/efl_vg_shape.eo                |  8 +--
 src/lib/evas/canvas/evas_3d_light.eo               | 13 ++--
 src/lib/evas/canvas/evas_3d_material.eo            |  8 +--
 src/lib/evas/canvas/evas_3d_mesh.eo                | 21 +++----
 src/lib/evas/canvas/evas_3d_node.eo                | 17 +++--
 src/lib/evas/canvas/evas_3d_scene.eo               |  6 +-
 src/lib/evas/canvas/evas_3d_texture.eo             |  8 +--
 src/lib/evas/canvas/evas_box.eo                    | 10 ++-
 src/lib/evas/canvas/evas_canvas.eo                 | 53 ++++++++--------
 src/lib/evas/canvas/evas_common_interface.eo       |  4 +-
 src/lib/evas/canvas/evas_grid.eo                   | 10 ++-
 src/lib/evas/canvas/evas_image.eo                  | 72 +++++++++++-----------
 src/lib/evas/canvas/evas_line.eo                   |  4 +-
 src/lib/evas/canvas/evas_object.eo                 | 62 +++++++++----------
 src/lib/evas/canvas/evas_object_smart.eo           | 16 +++--
 src/lib/evas/canvas/evas_out.eo                    |  6 +-
 src/lib/evas/canvas/evas_table.eo                  | 18 +++---
 src/lib/evas/canvas/evas_text.eo                   | 40 ++++++------
 src/lib/evas/canvas/evas_textblock.eo              | 28 ++++-----
 src/lib/evas/canvas/evas_textgrid.eo               | 10 ++-
 src/lib/evas/canvas/evas_vg.eo                     |  4 +-
 .../gl_generic/ector_cairo_software_surface.eo     |  4 +-
 .../ector_cairo_software_surface.eo                |  4 +-
 src/tests/eolian/data/base.eo                      |  6 +-
 src/tests/eolian/data/class_funcs.eo               |  8 +--
 src/tests/eolian/data/class_simple.eo              |  8 +--
 src/tests/eolian/data/complex_type.eo              |  6 +-
 src/tests/eolian/data/consts.eo                    |  6 +-
 src/tests/eolian/data/nmsp1_nmsp11_class2.eo       |  4 +-
 src/tests/eolian/data/object_impl.eo               |  8 +--
 src/tests/eolian/data/object_impl_add.eo           |  4 +-
 src/tests/eolian/data/override.eo                  | 10 ++-
 src/tests/eolian/data/scope.eo                     | 10 ++-
 src/tests/eolian_cxx/generic.eo                    |  8 +--
 70 files changed, 393 insertions(+), 480 deletions(-)

diff --git a/src/examples/eolian_cxx/colourable.eo 
b/src/examples/eolian_cxx/colourable.eo
index 3693818..b50bf3c 100644
--- a/src/examples/eolian_cxx/colourable.eo
+++ b/src/examples/eolian_cxx/colourable.eo
@@ -19,9 +19,7 @@ class Colourable (Eo.Base)
             }
             return: int; /*@ The RGB colour. */
         }
-    }
-    properties {
-        colour {
+        @property colour {
             set {
                 /*@ Sets a 24-bit RGB colour. */
             }
@@ -32,7 +30,7 @@ class Colourable (Eo.Base)
                 int rgb; /*@ The RGB colour value. */
             }
         }
-        composite_colour {
+        @property composite_colour {
             set {
                 /*@ Sets a composite RGB colour. */
             }
diff --git a/src/examples/eolian_cxx/colourablesquare.eo 
b/src/examples/eolian_cxx/colourablesquare.eo
index 1ee4e47..87e3a26 100644
--- a/src/examples/eolian_cxx/colourablesquare.eo
+++ b/src/examples/eolian_cxx/colourablesquare.eo
@@ -2,8 +2,8 @@ class ColourableSquare (Colourable)
 {
     legacy_prefix: legacy;
     data: ColourableSquare_Data;
-    properties {
-        size {
+    methods {
+        @property size {
             set {
                 /*@ Sets size. */
             }
@@ -14,8 +14,6 @@ class ColourableSquare (Colourable)
                 int size; /*@ The size. */
             }
         }
-    }
-    methods {
       size_constructor {
            legacy: null;
            params {
diff --git a/src/lib/ecore/ecore_exe.eo b/src/lib/ecore/ecore_exe.eo
index 618595d..376f29e 100644
--- a/src/lib/ecore/ecore_exe.eo
+++ b/src/lib/ecore/ecore_exe.eo
@@ -1,8 +1,8 @@
 class Ecore.Exe (Eo.Base, Efl.Control)
 {
    eo_prefix: ecore_obj_exe;
-   properties {
-        command {
+   methods {
+        @property command {
              /*@ Control the command that's executed. FIXME: May need a 
split/rename. */
              set {
                   legacy: null;
@@ -16,9 +16,6 @@ class Ecore.Exe (Eo.Base, Efl.Control)
              }
         }
    }
-   methods {
-
-   }
    implements {
         Eo.Base.destructor;
         Eo.Base.finalize;
diff --git a/src/lib/ecore/ecore_mainloop.eo b/src/lib/ecore/ecore_mainloop.eo
index 3f9bf28..706d227 100644
--- a/src/lib/ecore/ecore_mainloop.eo
+++ b/src/lib/ecore/ecore_mainloop.eo
@@ -2,8 +2,8 @@ class Ecore_Mainloop (Eo.Base)
 {
    legacy_prefix: null;
    data: null;
-   properties {
-      select_func {
+   methods {
+      @property select_func {
          set {
          }
          get {
@@ -12,8 +12,6 @@ class Ecore_Mainloop (Eo.Base)
             Ecore_Select_Function select_func;
          }
       }
-   }
-   methods {
       iterate {
       }
       iterate_may_block {
diff --git a/src/lib/ecore/ecore_poller.eo b/src/lib/ecore/ecore_poller.eo
index 696ca58..9f578b9 100644
--- a/src/lib/ecore/ecore_poller.eo
+++ b/src/lib/ecore/ecore_poller.eo
@@ -11,9 +11,7 @@ class Ecore.Poller (Eo.Base)
             @in const(void)* data;
          }
       }
-   }
-   properties {
-      interval {
+      @property interval {
          set {
             /*@
             @brief Changes the polling interval rate of @p poller.
diff --git a/src/lib/ecore/ecore_timer.eo b/src/lib/ecore/ecore_timer.eo
index dac06f5..db9cd82 100644
--- a/src/lib/ecore/ecore_timer.eo
+++ b/src/lib/ecore/ecore_timer.eo
@@ -8,8 +8,8 @@ class Ecore.Timer (Eo.Base)
     *  guarantee exact timing, but try to work on a "best effort basis.
     */
    eo_prefix: ecore_obj_timer;
-   properties {
-      interval {
+   methods {
+      @property interval {
          set {
             /*@ Change the interval the timer ticks off. If set during
              * a timer call, this will affect the next interval.
@@ -22,14 +22,12 @@ class Ecore.Timer (Eo.Base)
             double in(-1); /*@ The new interval in seconds */
          }
       }
-      pending {
+      @property pending {
          get {
             /*@ Get the pending time regarding a timer. */
             return: double;
          }
       }
-   }
-   methods {
       loop_constructor {
          /*@ Create a timer to call in a given time from now */
          legacy: null;
diff --git a/src/lib/ecore_audio/ecore_audio.eo 
b/src/lib/ecore_audio/ecore_audio.eo
index 1b61691..d40f85d 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -3,8 +3,8 @@ class Ecore_Audio (Eo.Base)
    legacy_prefix: null;
    eo_prefix: ecore_audio_obj;
    data: Ecore_Audio_Object;
-   properties {
-      name {
+   methods {
+      @property name {
          set {
             /*@
             Set the name of the object
@@ -21,7 +21,7 @@ class Ecore_Audio (Eo.Base)
             const(char)* name; 
          }
       }
-      paused {
+      @property paused {
          set {
             /*@
             Set the pause state of the object
@@ -38,7 +38,7 @@ class Ecore_Audio (Eo.Base)
             bool paused; /*ret EINA_TRUE if object is paused, EINA_FALSE if 
not*/
          }
       }
-      volume {
+      @property volume {
          set {
             /*@
             Set the volume of the object
@@ -55,7 +55,7 @@ class Ecore_Audio (Eo.Base)
             double volume; /*The volume*/
          }
       }
-      source {
+      @property source {
          set {
             /*@
             Set the source of the object
@@ -76,7 +76,7 @@ class Ecore_Audio (Eo.Base)
             const(char)* source; /*The source to set to (i.e. file, URL, 
device)*/
          }
       }
-      format {
+      @property format {
          set {
             /*@
             Set the format of the object
@@ -100,8 +100,6 @@ class Ecore_Audio (Eo.Base)
             Ecore_Audio_Format format; /*The format of the object*/
          }
       }
-   }
-   methods {
       vio_set {
          /*@
          Set the virtual IO functions
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo 
b/src/lib/ecore_audio/ecore_audio_in.eo
index 5115771..4c9abaa 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -3,8 +3,8 @@ class Ecore_Audio_In (Ecore_Audio)
    legacy_prefix: null;
    eo_prefix: ecore_audio_obj_in;
    data: Ecore_Audio_Input;
-      properties {
-      speed {
+   methods {
+      @property speed {
          set {
             /*@
             Set the playback speed of the input.
@@ -21,7 +21,7 @@ class Ecore_Audio_In (Ecore_Audio)
             double speed; /*The speed, 1.0 is the default*/
          }
       }
-      samplerate {
+      @property samplerate {
          set {
             /*@
             Set the sample-rate of the input
@@ -38,7 +38,7 @@ class Ecore_Audio_In (Ecore_Audio)
             int samplerate; /*The samplerate in Hz*/
          }
       }
-      channels {
+      @property channels {
          set {
             /*@
             Set the amount of channels the input has
@@ -55,7 +55,7 @@ class Ecore_Audio_In (Ecore_Audio)
             int channels; /*The number of channels*/
          }
       }
-      preloaded {
+      @property preloaded {
          set {
             /*@
             Set the preloaded state of the input
@@ -72,7 +72,7 @@ class Ecore_Audio_In (Ecore_Audio)
             bool preloaded; /*EINA_TRUE if the input should be cached, 
EINA_FALSE otherwise*/
          }
       }
-      looped {
+      @property looped {
          set {
             /*@
             Set the looped state of the input
@@ -93,7 +93,7 @@ class Ecore_Audio_In (Ecore_Audio)
             bool looped; /*EINA_TRUE if the input should be looped, EINA_FALSE 
otherwise*/
          }
       }
-      length {
+      @property length {
          set {
             /*@
             Set the length of the input
@@ -113,7 +113,7 @@ class Ecore_Audio_In (Ecore_Audio)
             double length; /*The length of the input in seconds*/
          }
       }
-      output {
+      @property output {
          get {
             /*@
             Get the output that this input is attached to
@@ -124,7 +124,7 @@ class Ecore_Audio_In (Ecore_Audio)
             Eo *output; /*The output*/
          }
       }
-      remaining {
+      @property remaining {
          get {
             /*@
             Get the remaining time of the input
@@ -135,8 +135,6 @@ class Ecore_Audio_In (Ecore_Audio)
             double remaining; /*The amount of time in seconds left to play*/
          }
       }
-   }
-   methods {
       read {
          /*@
          Read from the input
diff --git a/src/lib/ecore_con/ecore_con_base.eo 
b/src/lib/ecore_con/ecore_con_base.eo
index b56252f..ff277b8 100644
--- a/src/lib/ecore_con/ecore_con_base.eo
+++ b/src/lib/ecore_con/ecore_con_base.eo
@@ -2,8 +2,8 @@ abstract Ecore.Con.Base (Eo.Base) {
    legacy_prefix: ecore_con;
    eo_prefix: ecore_con_obj;
    data: null;
-   properties {
-      ip {
+   methods {
+      @property ip {
          /**
           * Control the IP address of a server that has been connected to.
           *
@@ -20,7 +20,7 @@ abstract Ecore.Con.Base (Eo.Base) {
             const(char)* ip; /*@ The IP address */
          }
       }
-      uptime {
+      @property uptime {
          /*@
           * @brief Check how long the object has been connected
           *
@@ -33,7 +33,7 @@ abstract Ecore.Con.Base (Eo.Base) {
             double uptime; /*@ The total time, in seconds, that the object has 
been connected. */
          }
       }
-      port {
+      @property port {
          /*@
           * @brief Return the port that the obj is connected to
           *
@@ -48,7 +48,7 @@ abstract Ecore.Con.Base (Eo.Base) {
             int port; /*@ The The port that obj is connected to, or -1 on 
error. */
          }
       }
-      fd {
+      @property fd {
          /*@
           * Get the fd that the server is connected to
           *
@@ -65,7 +65,7 @@ abstract Ecore.Con.Base (Eo.Base) {
             int fd; /*@ The fd, or -1 on failure. */
          }
       }
-      connected {
+      @property connected {
          /*@
           * Returns whether the client is still connected
           */
@@ -76,7 +76,7 @@ abstract Ecore.Con.Base (Eo.Base) {
             bool connected; /*@ Returns True if connected, False otherwise. */
          }
       }
-      timeout {
+      @property timeout {
          /*@
           * Control the default time after which an inactive client will be 
disconnected
           *
@@ -99,8 +99,6 @@ abstract Ecore.Con.Base (Eo.Base) {
             double timeout; /*@ The timeout, in seconds, to disconnect after. 
*/
          }
       }
-   }
-   methods {
       flush {
          /*@
           * Flushes all pending data to the given server.
diff --git a/src/lib/ecore_con/ecore_con_client.eo 
b/src/lib/ecore_con/ecore_con_client.eo
index dd4e290..4c545fc 100644
--- a/src/lib/ecore_con/ecore_con_client.eo
+++ b/src/lib/ecore_con/ecore_con_client.eo
@@ -1,7 +1,7 @@
 class Ecore.Con.Client (Ecore.Con.Base) {
    eo_prefix: ecore_con_client_obj;
-   properties {
-      server {
+   methods {
+      @property server {
          /*@
           * Controls the server representing the socket the client has
           * connected to.
diff --git a/src/lib/ecore_con/ecore_con_server.eo 
b/src/lib/ecore_con/ecore_con_server.eo
index 8f14bb3..6eea939 100644
--- a/src/lib/ecore_con/ecore_con_server.eo
+++ b/src/lib/ecore_con/ecore_con_server.eo
@@ -1,7 +1,7 @@
 class Ecore.Con.Server (Ecore.Con.Base) {
    eo_prefix: ecore_con_server_obj;
-   properties {
-      name {
+   methods {
+      @property name {
          /*@
           * Retrieves the name of server.
           *
@@ -16,7 +16,7 @@ class Ecore.Con.Server (Ecore.Con.Base) {
             const(char) *name; /*@ The name of the server. */
          }
       }
-      client_limit {
+      @property client_limit {
          /*@
           * Sets a limit on the number of clients that can be handled 
concurrently
           * by the given server, and a policy on what to do if excess clients 
try to
@@ -39,7 +39,7 @@ class Ecore.Con.Server (Ecore.Con.Base) {
          }
       }
       /* FIXME: Should this return an iterator? */
-      clients {
+      @property clients {
          /*@
           * Retrieves the current list of clients.
           *
@@ -54,7 +54,7 @@ class Ecore.Con.Server (Ecore.Con.Base) {
             const(list<const(Ecore.Con.Client) *>) *clients; /*@ The list of 
clients on this server. */
          }
       }
-      connection_type {
+      @property connection_type {
         get {
             legacy: null;
         }
diff --git a/src/lib/ecore_con/ecore_con_url.eo 
b/src/lib/ecore_con/ecore_con_url.eo
index 743e5f2..d5d21aa 100644
--- a/src/lib/ecore_con/ecore_con_url.eo
+++ b/src/lib/ecore_con/ecore_con_url.eo
@@ -1,7 +1,7 @@
 class Ecore.Con.Url (Eo.Base) {
    eo_prefix: ecore_con_url_obj;
-   properties {
-      url {
+   methods {
+      @property url {
          /**
           * Controls the URL to send the request to.
           */
diff --git a/src/lib/ector/cairo/ector_cairo_surface.eo 
b/src/lib/ector/cairo/ector_cairo_surface.eo
index 298c681..1b96b62 100644
--- a/src/lib/ector/cairo/ector_cairo_surface.eo
+++ b/src/lib/ector/cairo/ector_cairo_surface.eo
@@ -2,8 +2,8 @@ class Ector.Cairo.Surface (Ector.Generic.Surface)
 {
    eo_prefix: ector_cairo_surface;
    legacy_prefix: null;
-   properties {
-      context {
+   methods {
+      @property context {
          set {
         }
         get {
@@ -12,8 +12,6 @@ class Ector.Cairo.Surface (Ector.Generic.Surface)
            cairo_t *ctx;
         }
       }
-   }
-   methods {
       symbol_get {
          return: void * @warn_unused;
          params {
diff --git a/src/lib/ector/ector_generic_surface.eo 
b/src/lib/ector/ector_generic_surface.eo
index 5415079..44a1078 100644
--- a/src/lib/ector/ector_generic_surface.eo
+++ b/src/lib/ector/ector_generic_surface.eo
@@ -1,8 +1,8 @@
 abstract Ector.Generic.Surface (Eo.Base)
 {
    eo_prefix: ector_surface;
-   properties {
-      size {
+   methods {
+      @property size {
          set {
             /*@ Changes the size of the given Evas object. */
          }
@@ -14,7 +14,7 @@ abstract Ector.Generic.Surface (Eo.Base)
             int h; /*@ in */
          }
       }
-      reference_point {
+      @property reference_point {
          set {
            /*@ This define where is (0,0) in pixels coordinate inside the 
surface */
         }
@@ -23,8 +23,6 @@ abstract Ector.Generic.Surface (Eo.Base)
            int y;
         }
       }
-   }
-   methods {
       renderer_factory_new {
          return: Ector_Renderer *;
         params {
diff --git a/src/lib/ector/ector_renderer_generic_base.eo 
b/src/lib/ector/ector_renderer_generic_base.eo
index 2e42fea..1f58317 100644
--- a/src/lib/ector/ector_renderer_generic_base.eo
+++ b/src/lib/ector/ector_renderer_generic_base.eo
@@ -2,8 +2,8 @@ abstract Ector.Renderer.Generic.Base (Eo.Base)
 {
    eo_prefix: ector_renderer;
    legacy_prefix: null;
-   properties {
-      transformation {
+   methods {
+      @property transformation {
          set {
         }
         get {
@@ -12,7 +12,7 @@ abstract Ector.Renderer.Generic.Base (Eo.Base)
            const(Eina_Matrix3) *m;
         }
       }
-      origin {
+      @property origin {
          set {
         }
         get {
@@ -22,7 +22,7 @@ abstract Ector.Renderer.Generic.Base (Eo.Base)
            double y;
         }
       }
-      visibility {
+      @property visibility {
          set {
             /*@ Makes the given Ector renderer visible or invisible. */
         }
@@ -33,7 +33,7 @@ abstract Ector.Renderer.Generic.Base (Eo.Base)
            bool v; /*@ @c EINA_TRUE if to make the object visible, @c 
EINA_FALSE otherwise */
         }
       }
-      color {
+      @property color {
          set {
             /*@
             Sets the general/main color of the given Ector renderer to the 
given
@@ -65,7 +65,7 @@ abstract Ector.Renderer.Generic.Base (Eo.Base)
             int a; /*@ The alpha component of the given color. */
         }
       }
-      mask {
+      @property mask {
          set {
         }
         get {
@@ -74,7 +74,7 @@ abstract Ector.Renderer.Generic.Base (Eo.Base)
            Ector_Renderer *r;
         }
       }
-      quality {
+      @property quality {
          set {
         }
         get {
@@ -83,8 +83,6 @@ abstract Ector.Renderer.Generic.Base (Eo.Base)
            Ector_Quality q;
         }
       }
-   }
-   methods {
       bounds_get {
         params {
            @out Eina_Rectangle r;
diff --git a/src/lib/ector/ector_renderer_generic_shape.eo 
b/src/lib/ector/ector_renderer_generic_shape.eo
index 2205b79..a9aa555 100644
--- a/src/lib/ector/ector_renderer_generic_shape.eo
+++ b/src/lib/ector/ector_renderer_generic_shape.eo
@@ -2,8 +2,8 @@ mixin Ector.Renderer.Generic.Shape (Efl.Gfx.Shape)
 {
    eo_prefix: ector_renderer_shape;
    legacy_prefix: null;
-   properties {
-      fill {
+   methods {
+      @property fill {
          set {
         }
         get {
@@ -12,7 +12,7 @@ mixin Ector.Renderer.Generic.Shape (Efl.Gfx.Shape)
            const(Ector_Renderer) *r;
         }
       }
-      stroke_fill {
+      @property stroke_fill {
          set {
         }
         get {
@@ -21,7 +21,7 @@ mixin Ector.Renderer.Generic.Shape (Efl.Gfx.Shape)
            const(Ector_Renderer) *r;
         }
       }
-      stroke_marker {
+      @property stroke_marker {
          set {
         }
         get {
diff --git a/src/lib/ector/software/ector_software_surface.eo 
b/src/lib/ector/software/ector_software_surface.eo
index 3ed863c..043c910 100644
--- a/src/lib/ector/software/ector_software_surface.eo
+++ b/src/lib/ector/software/ector_software_surface.eo
@@ -2,8 +2,8 @@ class Ector.Software.Surface (Ector.Generic.Surface)
 {
    eo_prefix: ector_software_surface;
    legacy_prefix: null;
-   properties {
-      context {
+   methods {
+      @property context {
          set {
         }
         get {
@@ -12,7 +12,7 @@ class Ector.Software.Surface (Ector.Generic.Surface)
            Software_Rasterizer *ctx;
         }
       }
-      surface {
+      @property surface {
          set {
         }
         get {
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 2653d72..b266264 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -3,8 +3,8 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
    legacy_prefix: edje_object;
    eo_prefix: edje_obj;
    data: Edje;
-   properties {
-      update_hints {
+   methods {
+      @property update_hints {
          set {
             /*@
             @brief Edje will automatically update the size hints on itself.
@@ -24,7 +24,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             bool update; /*@ Whether or not update the size hints. */
          }
       }
-      mirrored {
+      @property mirrored {
          set {
             /*@
             @brief Set the RTL orientation for this object.
@@ -44,7 +44,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             bool rtl; /*@ new value of flag EINA_TRUE/EINA_FALSE */
          }
       }
-      animation {
+      @property animation {
          set {
             /*@
             @brief Set the object's animation state.
@@ -72,7 +72,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             @c EINA_FALSE to stops. */
          }
       }
-      play {
+      @property play {
          set {
             /*@
             @brief Set the Edje object to playing or paused states.
@@ -101,7 +101,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             @c EINA_FALSE to paused). */
          }
       }
-      perspective {
+      @property perspective {
          set {
             /*@
             Set the given perspective object on this Edje object.
@@ -133,7 +133,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             Edje_Perspective *ps @const_get; /*@ The perspective object that 
will be used. */
          }
       }
-      scale {
+      @property scale {
          set {
             /*@
             @brief Set the scaling factor for a given Edje object.
@@ -167,7 +167,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             meaning individual scaling @b not set) */
          }
       }
-      base_scale {
+      @property base_scale {
          get {
             /*@
             @brief Get a given Edje object's base_scale factor.
@@ -182,7 +182,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             that means the edc file is made based on scale 1.0. */
          }
       }
-      text_change_cb {
+      @property text_change_cb {
          set {
             /*@
             @brief Set the object text callback.
@@ -194,7 +194,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             void *data; /*@ The data associated to the callback function. */
          }
       }
-      part_text_cursor_begin {
+      @property part_text_cursor_begin {
          set {
             /*@
             @brief Moves the cursor to the beginning of the text part
@@ -205,7 +205,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             Edje_Cursor cur; /*@ the edje cursor to work on */
          }
       }
-      part_text_cursor_line_end {
+      @property part_text_cursor_line_end {
          set {
             /*@
             @brief Move the cursor to the end of the line.
@@ -216,7 +216,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             Edje_Cursor cur; /*@ the edje cursor to work on */
          }
       }
-      text_class {
+      @property text_class {
          set {
             /*@
             @brief Sets Edje text class.
@@ -232,7 +232,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             Evas_Font_Size size; /*@ Font Size */
          }
       }
-      part_text_cursor_coord {
+      @property part_text_cursor_coord {
          set {
             /*@
             Position the given cursor to a X,Y position.
@@ -249,7 +249,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             Evas_Coord y; /*@ Y Coordinate. */
          }
       }
-      part_text_cursor_end {
+      @property part_text_cursor_end {
          set {
             /*@
             @brief Moves the cursor to the end of the text part.
@@ -260,7 +260,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             Edje_Cursor cur; /*@ the edje cursor to work on */
          }
       }
-      part_text_escaped {
+      @property part_text_escaped {
          set {
             /*@
             @brief Sets the text for an object part, but converts HTML escapes 
to UTF8
@@ -279,7 +279,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             const(char)* text; /*@ The text string */
          }
       }
-      item_provider {
+      @property item_provider {
          set {
             /*@
             @brief Set the function that provides item objects for named items 
in an edje entry text
@@ -292,7 +292,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             void *data; /*@ The data pointer to pass to the @p func callback */
          }
       }
-      part_text_cursor_line_begin {
+      @property part_text_cursor_line_begin {
          set {
             /*@
             @brief Move the cursor to the beginning of the line.
@@ -303,7 +303,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             Edje_Cursor cur; /*@ the edje cursor to work on */
          }
       }
-      message_handler {
+      @property message_handler {
          set {
             /*@
             @brief Set an Edje message handler function for a given Edje 
object.
@@ -323,7 +323,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             void *data; /*@ Auxiliary data to be passed to @p func */
          }
       }
-      size_min {
+      @property size_min {
          get {
             /*@
             @brief Get the minimum size specified -- as an EDC property -- for 
a
@@ -361,7 +361,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             Evas_Coord minh; /*@ Pointer to a variable where to store the 
minimum height */
          }
       }
-      access_part_list {
+      @property access_part_list {
          get {
             /*@
             @brief Retrieve a list all accessibility part names
@@ -371,7 +371,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             return: list<const(char)*> *;
          }
       }
-      load_error {
+      @property load_error {
          get {
             /*@
             @brief Gets the (last) file loading error for a given Edje object
@@ -397,7 +397,7 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             return: Edje_Load_Error;
          }
       }
-      size_max {
+      @property size_max {
          get {
             /*@
             @brief Get the maximum size specified -- as an EDC property -- for 
a
@@ -436,8 +436,6 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
             Evas_Coord maxh; /*@ Pointer to a variable where to store the 
maximum height */
          }
       }
-   }
-   methods {
       part_table_clear {
          /*@
          @brief Removes all object from the table.
diff --git a/src/lib/efl/interfaces/efl_control.eo 
b/src/lib/efl/interfaces/efl_control.eo
index f983e7d..19e6e29 100644
--- a/src/lib/efl/interfaces/efl_control.eo
+++ b/src/lib/efl/interfaces/efl_control.eo
@@ -2,8 +2,8 @@
 
 interface Efl.Control {
    legacy_prefix: null;
-   properties {
-        priority {
+   methods {
+        @property priority {
              /*@ Control the priority of the object. */
              set {
              }
@@ -13,7 +13,7 @@ interface Efl.Control {
                   int priority; /*@ The priority of the object */
              }
         }
-        suspend {
+        @property suspend {
              /*@ Controls whether the object is suspended or not. */
              set {
              }
diff --git a/src/lib/efl/interfaces/efl_file.eo 
b/src/lib/efl/interfaces/efl_file.eo
index f2736b5..56b8ff4 100644
--- a/src/lib/efl/interfaces/efl_file.eo
+++ b/src/lib/efl/interfaces/efl_file.eo
@@ -1,7 +1,7 @@
 interface Efl.File {
    legacy_prefix: null;
-   properties {
-      mmap {
+   methods {
+      @property mmap {
          set {
             /*@
             Set the source mmaped file from where an image object must fetch 
the real
@@ -32,7 +32,7 @@ interface Efl.File {
             NULL, otherwise. */
          }
       }
-      file {
+      @property file {
          set {
             /*@
             Set the source file from where an image object must fetch the real
@@ -78,7 +78,7 @@ interface Efl.File {
             NULL, otherwise. */
          }
       }
-      async {
+      @property async {
          set {
             /*@
             If true, file open will happen asynchronously allowing for better
@@ -98,8 +98,6 @@ interface Efl.File {
             bool async; /*@ Flag for asynchronous open. */
          }
       }
-   }
-   methods {
       save @const {
          /*@
          Save the given image object's contents to an (image) file.
diff --git a/src/lib/efl/interfaces/efl_gfx_base.eo 
b/src/lib/efl/interfaces/efl_gfx_base.eo
index df9369c..e3d7026 100644
--- a/src/lib/efl/interfaces/efl_gfx_base.eo
+++ b/src/lib/efl/interfaces/efl_gfx_base.eo
@@ -1,8 +1,8 @@
 interface Efl.Gfx.Base {
    legacy_prefix: null;
    eo_prefix: efl_gfx;
-   properties {
-      position {
+   methods {
+      @property position {
          set {
             /*@ Move the given Evas object to the given location inside its 
canvas' viewport. */
          }
@@ -14,7 +14,7 @@ interface Efl.Gfx.Base {
             int y; /*@ in */
          }
       }
-      size {
+      @property size {
          set {
             /*@ Changes the size of the given Evas object. */
          }
@@ -26,7 +26,7 @@ interface Efl.Gfx.Base {
             int h; /*@ in */
          }
       }
-      color {
+      @property color {
          set {
             /*@
             Sets the general/main color of the given Evas object to the given
@@ -74,7 +74,7 @@ interface Efl.Gfx.Base {
             int a; /*@ The alpha component of the given color. */
          }
       }
-      color_part {
+      @property color_part {
          set {
             /*@
             Sets a specifc color of the given Efl.Gfx.Base object to the given
@@ -119,7 +119,7 @@ interface Efl.Gfx.Base {
             int a; /*@ The alpha component of the given color. */
          }
       }
-      visible {
+      @property visible {
          set {
             /*@ Makes the given Evas object visible or invisible. */
          }
diff --git a/src/lib/efl/interfaces/efl_gfx_fill.eo 
b/src/lib/efl/interfaces/efl_gfx_fill.eo
index 1ce4dd8..ab5cb5e 100644
--- a/src/lib/efl/interfaces/efl_gfx_fill.eo
+++ b/src/lib/efl/interfaces/efl_gfx_fill.eo
@@ -1,7 +1,7 @@
 interface Efl.Gfx.Fill {
    legacy_prefix: null;
-   properties {
-      fill_spread {
+   methods {
+      @property fill_spread {
          set {
             /*@
             Sets the tiling mode for the given evas image object's fill.
@@ -18,7 +18,7 @@ interface Efl.Gfx.Fill {
             Efl_Gfx_Fill_Spread spread; /*@ One of EVAS_TEXTURE_REFLECT, 
EVAS_TEXTURE_REPEAT, */
          }
       }
-      fill {
+      @property fill {
          set {
             /*@
             Set how to fill an image object's drawing rectangle given the
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_base.eo 
b/src/lib/efl/interfaces/efl_gfx_gradient_base.eo
index b50d7bc..a7a4b8a 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient_base.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient_base.eo
@@ -2,8 +2,8 @@ interface Efl.Gfx.Gradient.Base
 {
    eo_prefix: efl_gfx_gradient;
    legacy_prefix: null;
-   properties {
-      stop {
+   methods {
+      @property stop {
          set {
             /*@
               Set the list of color stops for the gradient
@@ -19,7 +19,7 @@ interface Efl.Gfx.Gradient.Base
             uint length; /*@ length of the list */
          }
       }
-      spread {
+      @property spread {
          set {
             /*@
               Specifies the spread method that should be used for this 
gradient.
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo 
b/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
index 0d9299f..4f23164 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient_linear.eo
@@ -1,8 +1,8 @@
 interface Efl.Gfx.Gradient.Linear (Efl.Gfx.Gradient.Base)
 {
    legacy_prefix: null;
-   properties {
-      start {
+   methods {
+      @property start {
          set {
             /*@
               Sets the start point of this linear gradient.
@@ -18,7 +18,7 @@ interface Efl.Gfx.Gradient.Linear (Efl.Gfx.Gradient.Base)
             double y; /*@ y co-ordinate of start point */
          }
       }
-      end {
+      @property end {
          set {
             /*@
               Sets the end point of this linear gradient.
diff --git a/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo 
b/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
index b9eeb72..b092f98 100644
--- a/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
+++ b/src/lib/efl/interfaces/efl_gfx_gradient_radial.eo
@@ -1,8 +1,8 @@
 interface Efl.Gfx.Gradient.Radial (Efl.Gfx.Gradient.Base)
 {
    legacy_prefix: null;
-   properties {
-      center {
+   methods {
+      @property center {
          set {
             /*@
               Sets the center of this radial gradient.
@@ -18,7 +18,7 @@ interface Efl.Gfx.Gradient.Radial (Efl.Gfx.Gradient.Base)
             double y; /*@ y co-ordinate of center point */
          }
       }
-      radius {
+      @property radius {
          set {
             /*@
               Sets the center radius of this radial gradient.
@@ -33,7 +33,7 @@ interface Efl.Gfx.Gradient.Radial (Efl.Gfx.Gradient.Base)
             double r; /*@ center radius */
          }
       }
-      focal {
+      @property focal {
          set {
             /*@
               Sets the focal point of this radial gradient.
diff --git a/src/lib/efl/interfaces/efl_gfx_shape.eo 
b/src/lib/efl/interfaces/efl_gfx_shape.eo
index 37d0abd..454fa3b 100644
--- a/src/lib/efl/interfaces/efl_gfx_shape.eo
+++ b/src/lib/efl/interfaces/efl_gfx_shape.eo
@@ -1,8 +1,8 @@
 mixin Efl.Gfx.Shape
 {
    legacy_prefix: null;
-   properties {
-      stroke_scale {
+   methods {
+      @property stroke_scale {
          set {
             /*@
               Sets the stroke scale to be used for stroking the path.
@@ -20,7 +20,7 @@ mixin Efl.Gfx.Shape
             double s; /*@ stroke scale value */
          }
       }
-      stroke_color {
+      @property stroke_color {
          set {
             /*@
               Sets the color to be used for stroking the path.
@@ -40,7 +40,7 @@ mixin Efl.Gfx.Shape
             int a; /*@ The alpha component of the given color. */
          }
       }
-      stroke_width {
+      @property stroke_width {
          set {
             /*@
               Sets the stroke width to be used for stroking the path.
@@ -57,7 +57,7 @@ mixin Efl.Gfx.Shape
             double w; /*@ stroke width to be used */
          }
       }
-      stroke_location {
+      @property stroke_location {
          set {
             /*@
               Not Implemented
@@ -72,7 +72,7 @@ mixin Efl.Gfx.Shape
             double centered; /*@  */
          }
       }
-      stroke_dash {
+      @property stroke_dash {
          set {
             /*@
               Not Implemented
@@ -88,7 +88,7 @@ mixin Efl.Gfx.Shape
             uint length; /*@  */
          }
       }
-      stroke_cap {
+      @property stroke_cap {
          set {
             /*@
               Sets the cap style to be used for stroking the path.
@@ -109,7 +109,7 @@ mixin Efl.Gfx.Shape
             Efl_Gfx_Cap c; /*@ cap style to use , default is EFL_GFX_CAP_BUTT 
*/
          }
       }
-      stroke_join {
+      @property stroke_join {
          set {
             /*@
               Sets the join style to be used for stroking the path.
@@ -131,7 +131,7 @@ mixin Efl.Gfx.Shape
                               EFL_GFX_JOIN_MITER */
          }
       }
-      path {
+      @property path {
          set {
             /*@
               Set the list of commands and points to be used to create the
@@ -153,7 +153,7 @@ mixin Efl.Gfx.Shape
             const(double) *points; /*@ point list */
          }
       }
-      path_length {
+      @property path_length {
         get {
         }
         values {
@@ -161,7 +161,7 @@ mixin Efl.Gfx.Shape
           uint points;
         }
       }
-      current {
+      @property current {
         get {
         }
         values {
@@ -169,7 +169,7 @@ mixin Efl.Gfx.Shape
           double y;
         }
       }
-      current_ctrl {
+      @property current_ctrl {
         get {
         }
         values {
@@ -177,8 +177,6 @@ mixin Efl.Gfx.Shape
           double y;
         }
       }
-   }
-   methods {
       dup {
           /*@
             Copy the shape data from the object specified .
diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo 
b/src/lib/efl/interfaces/efl_gfx_stack.eo
index a104d0d..54a00cd 100644
--- a/src/lib/efl/interfaces/efl_gfx_stack.eo
+++ b/src/lib/efl/interfaces/efl_gfx_stack.eo
@@ -1,7 +1,7 @@
 interface Efl.Gfx.Stack {
    legacy_prefix: null;
-   properties {
-      layer {
+   methods {
+      @property layer {
          set {
             /*@
             Sets the layer of its canvas that the given object will be part of.
@@ -34,7 +34,7 @@ interface Efl.Gfx.Stack {
             Must be between #EVAS_LAYER_MIN and #EVAS_LAYER_MAX. */
          }
       }
-      below {
+      @property below {
          get {
             /*@
             Get the Evas object stacked right below @p obj
@@ -51,7 +51,7 @@ interface Efl.Gfx.Stack {
             return: Efl_Gfx_Stack * @warn_unused;
          }
       }
-      above {
+      @property above {
          get {
             /*@
             Get the Evas object stacked right above @p obj
@@ -68,8 +68,6 @@ interface Efl.Gfx.Stack {
             return: Efl_Gfx_Stack * @warn_unused;
          }
       }
-   }
-   methods {
       stack_below {
          /*@
          Stack @p obj immediately below @p below
diff --git a/src/lib/efl/interfaces/efl_gfx_view.eo 
b/src/lib/efl/interfaces/efl_gfx_view.eo
index 9d609d5..b515ff9 100644
--- a/src/lib/efl/interfaces/efl_gfx_view.eo
+++ b/src/lib/efl/interfaces/efl_gfx_view.eo
@@ -1,7 +1,7 @@
 interface Efl.Gfx.View {
    legacy_prefix: null;
-   properties {
-      size {
+   methods {
+      @property size {
          set {
             /*@
             Sets the size of the given image object.
diff --git a/src/lib/efl/interfaces/efl_image.eo 
b/src/lib/efl/interfaces/efl_image.eo
index 9586c89..797af8b 100644
--- a/src/lib/efl/interfaces/efl_image.eo
+++ b/src/lib/efl/interfaces/efl_image.eo
@@ -1,7 +1,7 @@
 interface Efl.Image {
    legacy_prefix: null;
-   properties {
-      animated {
+   methods {
+      @property animated {
          get {
             /*@
               Check if an image  can be animated (have multiple frames)
@@ -13,7 +13,7 @@ interface Efl.Image {
               bool is_animated; /*@ If it's animated or not. */
          }
       }
-      load_size {
+      @property load_size {
          set {
             /*@
               Set the loading size of an image. The image will be loaded into 
memory as if it was
@@ -28,7 +28,7 @@ interface Efl.Image {
             int h; /*@ The new height of the image's load size. */
          }
       }
-      smooth_scale {
+      @property smooth_scale {
          set {
             /*@
             Sets whether to use high-quality image scaling algorithm on the
@@ -52,7 +52,7 @@ interface Efl.Image {
             bool smooth_scale; /*@ Whether to use smooth scale or not. */
          }
       }
-      ratio {
+      @property ratio {
          get {
             /*@
               The native ration of the image object
diff --git a/src/lib/efl/interfaces/efl_model_base.eo 
b/src/lib/efl/interfaces/efl_model_base.eo
index 75e280e..9604fb3 100644
--- a/src/lib/efl/interfaces/efl_model_base.eo
+++ b/src/lib/efl/interfaces/efl_model_base.eo
@@ -26,8 +26,8 @@ interface Efl.Model.Base ()
 {
    legacy_prefix: null;
    eo_prefix: efl_model;
-      properties {
-         load_status {
+      methods {
+         @property load_status {
             get {
             /*@
              Get a load emodel current status.
@@ -44,7 +44,7 @@ interface Efl.Model.Base ()
              return: Efl_Model_Load_Status;
             }
          }
-         properties {
+         @property properties {
             get {
                 /*@
                 Get properties from model.
@@ -65,7 +65,7 @@ interface Efl.Model.Base ()
                const(array<const(char*)>*) properties; /*@ array of current 
properties */
             }
         }
-         property {
+         @property property {
             set {
                 /*@
                 Set a property value of a given property name.
@@ -114,7 +114,7 @@ interface Efl.Model.Base ()
                const(Eina_Value)* value; /*@ New value */
             }
          }
-         children_slice {
+         @property children_slice {
             get {
                /*@
                Get children slice OR full range.
@@ -178,7 +178,7 @@ interface Efl.Model.Base ()
                 accessor<list*>* children_accessor;
             }
          }
-         children_count {
+         @property children_count {
              get {
                 /*@
                 Get children count.
@@ -202,8 +202,6 @@ interface Efl.Model.Base ()
                 unsigned children_count;
             }
          }
-      }
-      methods {
          load {
             /*@
               Load emodel.
diff --git a/src/lib/efl/interfaces/efl_player.eo 
b/src/lib/efl/interfaces/efl_player.eo
index b1fab48..7e2d5a2 100644
--- a/src/lib/efl/interfaces/efl_player.eo
+++ b/src/lib/efl/interfaces/efl_player.eo
@@ -1,7 +1,7 @@
 interface Efl.Player {
    legacy_prefix: null;
-   properties {
-        play {
+   methods {
+        @property play {
              set {
                   /*@
                    * @brief Set play/pause state of the media file.
@@ -19,7 +19,7 @@ interface Efl.Player {
                   bool play; /*@ true if playing, false otherwise. */
              }
         }
-        position {
+        @property position {
              set {
                   /*@
                    * @brief Set the position in the media file.
@@ -47,7 +47,7 @@ interface Efl.Player {
                   double second; /*@ The position (in seconds). */
              }
         }
-        progress {
+        @property progress {
              get {
                   /*@
                    * @brief Get how much of the file has been played.
@@ -60,7 +60,7 @@ interface Efl.Player {
                   double progress; /*@ The progress within the [0, 1] range. */
              }
         }
-        play_speed {
+        @property play_speed {
              /**
               * @brief Control the play speed of the media file.
               *
@@ -76,7 +76,7 @@ interface Efl.Player {
                   double speed; /*@ The play speed in the [0, infinity) range. 
*/
              }
         }
-        audio_volume {
+        @property audio_volume {
              /**
               * @brief Control the audio volume.
               *
@@ -93,7 +93,7 @@ interface Efl.Player {
                   double volume; /*@ The volume level */
              }
         }
-        audio_mute {
+        @property audio_mute {
              /**
               * @brief This property controls the audio mute state.
               */
@@ -105,7 +105,7 @@ interface Efl.Player {
                   bool mute; /*@ The mute state. True or false. */
              }
         }
-        length {
+        @property length {
              /**
               * @brief Get the length of play for the media file.
               *
@@ -117,7 +117,7 @@ interface Efl.Player {
                   double length; /*@ The length of the stream in seconds. */
              }
         }
-        seekable {
+        @property seekable {
              /**
               * @brief Get whether the media file is seekable.
               */
diff --git a/src/lib/efl/interfaces/efl_text.eo 
b/src/lib/efl/interfaces/efl_text.eo
index d5da14b..fd9bf8d 100644
--- a/src/lib/efl/interfaces/efl_text.eo
+++ b/src/lib/efl/interfaces/efl_text.eo
@@ -1,7 +1,7 @@
 interface Efl.Text {
    legacy_prefix: null;
-   properties {
-      text {
+   methods {
+      @property text {
          set {
             /*@
             Sets the text string to be displayed by the given text object.
diff --git a/src/lib/efl/interfaces/efl_text_properties.eo 
b/src/lib/efl/interfaces/efl_text_properties.eo
index fb4f945..40c7761 100644
--- a/src/lib/efl/interfaces/efl_text_properties.eo
+++ b/src/lib/efl/interfaces/efl_text_properties.eo
@@ -2,8 +2,8 @@ type Efl_Font_Size: int;
 
 interface Efl.Text_Properties {
    legacy_prefix: null;
-   properties {
-      font {
+   methods {
+      @property font {
          set {
             /*@
             Set the font family or filename, and size on a given text object.
@@ -33,7 +33,7 @@ interface Efl.Text_Properties {
             Efl_Font_Size size; /*@ The font size, in points. */
          }
       }
-      font_source {
+      @property font_source {
          set {
             /*@
             Set the font (source) file to be used on a given text object.
diff --git a/src/lib/emotion/emotion_object.eo 
b/src/lib/emotion/emotion_object.eo
index 9749d11..d2a90fa 100644
--- a/src/lib/emotion/emotion_object.eo
+++ b/src/lib/emotion/emotion_object.eo
@@ -1,7 +1,7 @@
 class Emotion.Object (Evas.Object_Smart, Efl.File, Efl.Player, Efl.Image) {
    eo_prefix: emotion_obj;
-   properties {
-        option {
+   methods {
+        @property option {
              set {
                   /**
                    * @brief Set the specified option for the current module.
@@ -23,7 +23,7 @@ class Emotion.Object (Evas.Object_Smart, Efl.File, 
Efl.Player, Efl.Image) {
                   const(char) *val; /*@ The value of the option. Currently 
only supports "off" (?!?!?!) */
              }
         }
-        engine {
+        @property engine {
              set {
                   /**
                    * @brief Initializes an emotion object with the specified 
module.
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 47bdc13..11b84da 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -3,8 +3,8 @@ abstract Eo.Base ()
    eo_prefix: eo;
    legacy_prefix: null;
 
-   properties {
-      parent {
+   methods {
+      @property parent {
          set {
             /*@ Set the parent of an object
 Parents keep references to their children so in order to delete objects that 
have parents you need to set parent to NULL or use eo_del() that does that for 
you (and also unrefs the object). */
@@ -16,7 +16,7 @@ Parents keep references to their children so in order to 
delete objects that hav
             Eo* parent; /*@ the new parent */
          }
       }
-      event_global_freeze_count @class {
+      @property event_global_freeze_count @class {
          get {
             /*@ return freeze events of object.
 Return event freeze count. */
@@ -25,7 +25,7 @@ Return event freeze count. */
             int fcount; /*@ The event freeze count of the object */
          }
       }
-      event_freeze_count {
+      @property event_freeze_count {
          get {
             /*@ return freeze events of object.
 Return event freeze count. */
@@ -34,7 +34,7 @@ Return event freeze count. */
             int fcount; /*@ The event freeze count of the object */
          }
       }
-      finalized {
+      @property finalized {
          /*@ True if the object is already finalized, false otherwise. */
          get {
          }
@@ -42,8 +42,6 @@ Return event freeze count. */
             bool finalized;
          }
       }
-   }
-   methods {
       constructor {
          /*@ Call the object's constructor.
 Should not be used with #eo_do. Only use it with #eo_do_super. */
diff --git a/src/lib/evas/canvas/efl_vg_base.eo 
b/src/lib/evas/canvas/efl_vg_base.eo
index ebd0dce..52cf3c8 100644
--- a/src/lib/evas/canvas/efl_vg_base.eo
+++ b/src/lib/evas/canvas/efl_vg_base.eo
@@ -2,8 +2,8 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
 {
    eo_prefix: efl_vg;
    legacy_prefix: evas_vg_node;
-   properties {
-      transformation {
+   methods {
+      @property transformation {
          set {
             /*@
              Sets the transformation matrix to be used for this node object.
@@ -20,7 +20,7 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
             const(Eina_Matrix3) *m; /*@ transformation matrix */
          }
       }
-      origin {
+      @property origin {
          set {
             /*@
              Sets the origin position of this node object. This origin position
@@ -39,7 +39,7 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
             double y; /* @origin y position */
          }
       }
-      mask {
+      @property mask {
          set {
         }
         get {
@@ -57,8 +57,6 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
            Evas_VG_Quality q;
         }
       } */
-   }
-   methods {
       bounds_get {
          /*@
           Give the bounding box in screen coordinate as being drawn.
diff --git a/src/lib/evas/canvas/efl_vg_shape.eo 
b/src/lib/evas/canvas/efl_vg_shape.eo
index ee43e83..0106a0c 100644
--- a/src/lib/evas/canvas/efl_vg_shape.eo
+++ b/src/lib/evas/canvas/efl_vg_shape.eo
@@ -1,8 +1,8 @@
 class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape)
 {
    legacy_prefix: evas_vg_shape;
-   properties {
-      fill {
+   methods {
+      @property fill {
          set {
         }
         get {
@@ -11,7 +11,7 @@ class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape)
            Efl_VG *f;
         }
       }
-      stroke_fill {
+      @property stroke_fill {
          set {
         }
         get {
@@ -20,7 +20,7 @@ class Efl.VG.Shape (Efl.VG.Base, Efl.Gfx.Shape)
            Efl_VG *f;
         }
       }
-      stroke_marker {
+      @property stroke_marker {
          set {
         }
         get {
diff --git a/src/lib/evas/canvas/evas_3d_light.eo 
b/src/lib/evas/canvas/evas_3d_light.eo
index 7cd71fd..6c6432f 100644
--- a/src/lib/evas/canvas/evas_3d_light.eo
+++ b/src/lib/evas/canvas/evas_3d_light.eo
@@ -3,8 +3,8 @@ class Evas_3D_Light (Evas_3D_Object, Evas.Common_Interface)
    legacy_prefix: null;
    data: Evas_3D_Light_Data;
 
-   properties {
-      directional {
+   methods {
+      @property directional {
          set {
             /*@
               Set the directional flag of the given light.
@@ -34,7 +34,7 @@ class Evas_3D_Light (Evas_3D_Object, Evas.Common_Interface)
          }
       }
 
-      spot_exponent {
+      @property spot_exponent {
          set {
             /*@
               Set the spot exponent of the given light.
@@ -65,7 +65,7 @@ class Evas_3D_Light (Evas_3D_Object, Evas.Common_Interface)
          }
       }
 
-      spot_cutoff {
+      @property spot_cutoff {
          set {
             /*@
               Set the spot cutoff angle of the given light.
@@ -92,7 +92,7 @@ class Evas_3D_Light (Evas_3D_Object, Evas.Common_Interface)
          }
       }
 
-      attenuation_enable {
+      @property attenuation_enable {
          set {
             /*@
               Set the attenuation enable flag of the given light.
@@ -117,8 +117,7 @@ class Evas_3D_Light (Evas_3D_Object, Evas.Common_Interface)
             bool enable; /*@ Whether to enable attenuation (@c EINA_TRUE), or 
not (@c EINA_FALSE)..*/
          }
       }
-   }
-   methods {
+
       ambient_set {
          /*@
            Set the ambient color of the given light.
diff --git a/src/lib/evas/canvas/evas_3d_material.eo 
b/src/lib/evas/canvas/evas_3d_material.eo
index 5e6c9a0..8227ea4 100644
--- a/src/lib/evas/canvas/evas_3d_material.eo
+++ b/src/lib/evas/canvas/evas_3d_material.eo
@@ -48,10 +48,8 @@ class Evas_3D_Material (Evas_3D_Object, 
Evas.Common_Interface)
             @out Evas_Real a; /*@ Pointer to receive alpha component of the 
color. */
          }
       }
-   }
 
-   properties {
-      enable {
+      @property enable {
          set {
             /*
               Set the material attribute enable flag of the given material.
@@ -83,7 +81,7 @@ class Evas_3D_Material (Evas_3D_Object, Evas.Common_Interface)
          }
       }
 
-      shininess {
+      @property shininess {
          set {
             /*
               Set the shininess of the given material.
@@ -113,7 +111,7 @@ class Evas_3D_Material (Evas_3D_Object, 
Evas.Common_Interface)
          }
       }
 
-      texture {
+      @property texture {
          set {
             /*@
               Set the texture of the given material.
diff --git a/src/lib/evas/canvas/evas_3d_mesh.eo 
b/src/lib/evas/canvas/evas_3d_mesh.eo
index e3e691d..7cc8b97 100644
--- a/src/lib/evas/canvas/evas_3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_3d_mesh.eo
@@ -291,9 +291,8 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, 
Efl.File)
             @out Evas_3D_Blend_Func dfactor; /*@ Pointer to receive 
destination blendin factors key.*/
          }
       }
-   }
-   properties {
-      shade_mode {
+
+      @property shade_mode {
          set {
             /**
              * Set the shade mode of the given mesh.
@@ -316,7 +315,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, 
Efl.File)
             Evas_3D_Shade_Mode mode; /*@ The shade mode.*/
          }
       }
-      color_pick_enable {
+      @property color_pick_enable {
         set {
             /**
              * Set posibility color picking.
@@ -337,7 +336,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, 
Efl.File)
             Eina_Bool enabled; /*@ Posibility flag */
          }
       }
-      vertex_count {
+      @property vertex_count {
         set {
               /**
                * Set the vertex count of the given mesh.
@@ -364,7 +363,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, 
Efl.File)
             uint count; /*@ Vertex count.*/
          }
       }
-      fog_enable {
+      @property fog_enable {
         set {
             /**
              * Enable or disable fog effect for given mesh.
@@ -388,7 +387,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, 
Efl.File)
          }
       }
  
-      alpha_test_enable {
+      @property alpha_test_enable {
         set {
             /**
              * Get the enable status of alpha test for given mesh
@@ -412,7 +411,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, 
Efl.File)
          }
       }
 
-      alpha_func {
+      @property alpha_func {
         set {
             /*
              * The alpha test discards fragments depending on the outcome of a 
comparison
@@ -437,7 +436,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, 
Efl.File)
         }
       }
 
-      blending_enable {
+      @property blending_enable {
         set {
             /**
              * Enable or disable blending for given mesh.
@@ -461,7 +460,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, 
Efl.File)
          }
       }
 
-      frame_material {
+      @property frame_material {
          set {
             /**
               Set the material of the key frame of the given mesh.
@@ -489,7 +488,7 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas.Common_Interface, 
Efl.File)
          }
       }
 
-      vertex_assembly {
+      @property vertex_assembly {
          set {
             /*
               Set the vertex assembly of the given mesh.
diff --git a/src/lib/evas/canvas/evas_3d_node.eo 
b/src/lib/evas/canvas/evas_3d_node.eo
index 4ecb261..19291d2 100644
--- a/src/lib/evas/canvas/evas_3d_node.eo
+++ b/src/lib/evas/canvas/evas_3d_node.eo
@@ -367,11 +367,8 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
             @in Evas_Real *r;
          }
       }
-   }
-
-   properties {
 
-      position_inherit {
+      @property position_inherit {
          set {
             /*
               Set the position inheritance flag of the given node.
@@ -403,7 +400,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
          }
       }
 
-      orientation_inherit {
+      @property orientation_inherit {
          set {
             /*
               Set the orientation inheritance flag of the given node.
@@ -436,7 +433,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
          }
       }
 
-      scale_inherit {
+      @property scale_inherit {
          set {
             /*
               Set the scale inheritance flag of the given node.
@@ -468,7 +465,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
          }
       }
 
-      camera {
+      @property camera {
          set {
             /*
               Set a camera to the given node.
@@ -501,7 +498,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
          }
       }
 
-      light {
+      @property light {
          set {
             /*
               Set the light of the given node.
@@ -534,7 +531,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
          }
       }
 
-      mesh_frame {
+      @property mesh_frame {
          set {
             /*
               Set the animation frame number of the given node for the given 
mesh.
@@ -577,7 +574,7 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
          }
       }
 
-      billboard_target {
+      @property billboard_target {
          set {
             /*
               Set behavior of node like billboard object.
diff --git a/src/lib/evas/canvas/evas_3d_scene.eo 
b/src/lib/evas/canvas/evas_3d_scene.eo
index bb25f90..f7816fe 100644
--- a/src/lib/evas/canvas/evas_3d_scene.eo
+++ b/src/lib/evas/canvas/evas_3d_scene.eo
@@ -157,10 +157,8 @@ class Evas_3D_Scene (Evas_3D_Object, Evas.Common_Interface)
             @in bool color_pick;  /*@ Posibility flag */
          }
       }
-   }
-   properties {
 
-      root_node {
+      @property root_node {
          set {
             /*
               Set the root node of a scene.
@@ -182,7 +180,7 @@ class Evas_3D_Scene (Evas_3D_Object, Evas.Common_Interface)
          }
       }
 
-      camera_node {
+      @property camera_node {
          set {
             /*
               Set the camera node of a scene.
diff --git a/src/lib/evas/canvas/evas_3d_texture.eo 
b/src/lib/evas/canvas/evas_3d_texture.eo
index 39efb61..7175649 100644
--- a/src/lib/evas/canvas/evas_3d_texture.eo
+++ b/src/lib/evas/canvas/evas_3d_texture.eo
@@ -2,8 +2,8 @@ class Evas_3D_Texture (Evas_3D_Object, Evas.Common_Interface)
 {
    legacy_prefix: null;
    data : Evas_3D_Texture_Data;
-   properties {
-      source_visible {
+   methods {
+      @property source_visible {
          set {
             /*
               Set the visibility flag of the source evas object of the given 
texture.
@@ -31,7 +31,7 @@ class Evas_3D_Texture (Evas_3D_Object, Evas.Common_Interface)
             bool visible; /*@ @c EINA_TRUE for visible, @c EINA_FALSE for 
invisible.*/
          }
       }
-      atlas_enable {
+      @property atlas_enable {
          set {
             /*
               Set enable flag to generation texture unit with support atlas.
@@ -54,8 +54,6 @@ class Evas_3D_Texture (Evas_3D_Object, Evas.Common_Interface)
             bool use_atlas; /*@ @c EINA_TRUE for enable, @c EINA_FALSE for 
disable.*/
          }
       }
-   }
-   methods {
       data_set {
          /*
            Set the data of the given texture.
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index fb56a44..332b843 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -3,8 +3,8 @@ class Evas.Box (Evas.Smart_Clipped)
    legacy_prefix: evas_object_box;
    eo_prefix: evas_obj_box;
    data: Evas_Object_Box_Data;
-   properties {
-      align {
+   methods {
+      @property align {
          set {
             /*@
             Set the alignment of the whole bounding box of contents, for a
@@ -33,7 +33,7 @@ class Evas.Box (Evas.Smart_Clipped)
             double vertical; /*@ the vertical alignment, in pixels */
          }
       }
-      padding {
+      @property padding {
          set {
             /*@
             Set the (space) padding between cells set for a given box object.
@@ -53,7 +53,7 @@ class Evas.Box (Evas.Smart_Clipped)
             Evas_Coord vertical; /*@ the vertical padding, in pixels */
          }
       }
-      layout {
+      @property layout {
          set {
             /*@
             Set a new layouting function to a given box object
@@ -82,8 +82,6 @@ class Evas.Box (Evas.Smart_Clipped)
             Eina.Free_Cb free_data; /*@ Function to free @p data, if need be. 
*/
          }
       }
-   }
-   methods {
       layout_horizontal {
          /*@
          Layout function which sets the box @a o to a (basic) horizontal box
diff --git a/src/lib/evas/canvas/evas_canvas.eo 
b/src/lib/evas/canvas/evas_canvas.eo
index 6ce459e..77bcc18 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -2,8 +2,8 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
 {
    legacy_prefix: evas;
    data: Evas_Public_Data;
-   properties {
-      output_framespace {
+   methods {
+      @property output_framespace {
          set {
             /*@
             Sets the output framespace size of the render engine of the given 
evas.
@@ -31,7 +31,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             Evas_Coord h; /*@ The height in output units, usually pixels. */
          }
       }
-      output_viewport {
+      @property output_viewport {
          set {
             /*@
             Sets the output viewport of the given evas in evas units.
@@ -71,7 +71,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             Evas_Coord h; /*@ The height of the viewport.  Must be greater 
than 0. */
          }
       }
-      image_cache {
+      @property image_cache {
          set {
             /*@
             Set the image cache.
@@ -88,7 +88,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             int size; /*@ The cache size. */
          }
       }
-      event_default_flags {
+      @property event_default_flags {
          set {
             /*@
             Set the default set of flags an event begins with
@@ -114,7 +114,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             Evas_Event_Flags flags; /*@ The default flags to use */
          }
       }
-      output_method {
+      @property output_method {
          set {
             /*@
             Sets the output engine for the given evas.
@@ -139,7 +139,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             int render_method; /*@ The numeric engine value to use. */
          }
       }
-      font_cache {
+      @property font_cache {
          set {
             /*@
             Changes the size of font cache of the given evas.
@@ -158,7 +158,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             int size; /*@ The size, in bytes. */
          }
       }
-      output_size {
+      @property output_size {
          set {
             /*@
             Sets the output size of the render engine of the given evas.
@@ -189,7 +189,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             int h; /*@ The height in output units, usually pixels. */
          }
       }
-      data_attach {
+      @property data_attach {
          set {
             /*@
             Attaches a specific pointer to the evas for fetching later
@@ -207,7 +207,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             void *data; /*@ The pointer to attach */
          }
       }
-      font_hinting {
+      @property font_hinting {
          set {
             /*@
             Changes the font hinting for the given evas.
@@ -227,7 +227,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             Evas_Font_Hinting_Flags hinting; /*@ The hinting to use, one of 
#EVAS_FONT_HINTING_NONE, */
          }
       }
-      engine_info {
+      @property engine_info {
          set {
             /*@
             Applies the engine settings for the given evas from the given @c
@@ -265,7 +265,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             Evas_Engine_Info *info; /*@ The pointer to the Engine Info to use 
*/
          }
       }
-      focus {
+      @property focus {
          get {
             /*@
             Retrieve the object that currently has focus.
@@ -305,7 +305,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             return: Evas_Object * @warn_unused;
          }
       }
-      object_top {
+      @property object_top {
          get {
             /*@
             Get the highest (stacked) Evas object on the canvas @p e.
@@ -328,7 +328,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             return: Evas_Object * @warn_unused;
          }
       }
-      key_lock {
+      @property key_lock {
          get {
             /*@
             Returns a handle to the list of lock keys registered in the canvas
@@ -346,7 +346,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             return: const(Evas_Lock)* @warn_unused;
          }
       }
-      pointer_canvas_xy {
+      @property pointer_canvas_xy {
          get {
             /*@
             This function returns the current known pointer co-ordinates
@@ -371,7 +371,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             @ingroup Evas_Pointer_Group */
          }
       }
-      event_down_count {
+      @property event_down_count {
          get {
             /*@
             Get the number of mouse or multi presses currently active
@@ -383,7 +383,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             return: int;
          }
       }
-      smart_objects_calculate_count {
+      @property smart_objects_calculate_count {
          get {
             /*@
             This gets the internal counter that counts the number of smart 
calculations
@@ -401,7 +401,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             return: int;
          }
       }
-      focus_state {
+      @property focus_state {
          get {
             /*@
             Get the focus state known by the given evas
@@ -411,7 +411,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             return: bool;
          }
       }
-      changed {
+      @property changed {
          get {
             /*@
             Get the changed marker for the canvas
@@ -423,7 +423,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             return: bool;
          }
       }
-      pointer_output_xy {
+      @property pointer_output_xy {
          get {
             /*@
             This function returns the current known pointer co-ordinates
@@ -448,7 +448,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             @ingroup Evas_Pointer_Group */
          }
       }
-      pointer_inside {
+      @property pointer_inside {
          get {
             /*@
             Returns whether the mouse pointer is logically inside the canvas
@@ -479,7 +479,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             return: bool @warn_unused;
          }
       }
-      image_max_size {
+      @property image_max_size {
          get {
             /*@
             Get the maximum image size evas can possibly handle
@@ -498,7 +498,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             int maxh; /*@ Pointer to hold the return value in pixels of the 
maximum height */
          }
       }
-      object_bottom {
+      @property object_bottom {
          get {
             /*@
             Get the lowest (stacked) Evas object on the canvas @p e.
@@ -520,7 +520,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             return: Evas_Object * @warn_unused;
          }
       }
-      key_modifier {
+      @property key_modifier {
          get {
             /*@
             Returns a handle to the list of modifier keys registered in the
@@ -538,7 +538,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             return: const(Evas_Modifier)* @warn_unused;
          }
       }
-      pointer_button_down_mask {
+      @property pointer_button_down_mask {
          get {
             /*@
             Returns a bitmask with the mouse buttons currently pressed, set to 
1
@@ -578,8 +578,7 @@ class Evas.Canvas (Eo.Base, Evas.Common_Interface)
             return: int @warn_unused;
          }
       }
-   }
-   methods {
+
       tree_objects_at_xy_get {
          /*@
          Retrieve a list of Evas objects lying over a given position in
diff --git a/src/lib/evas/canvas/evas_common_interface.eo 
b/src/lib/evas/canvas/evas_common_interface.eo
index f804b63..38b9b9f 100644
--- a/src/lib/evas/canvas/evas_common_interface.eo
+++ b/src/lib/evas/canvas/evas_common_interface.eo
@@ -1,8 +1,8 @@
 interface Evas.Common_Interface ()
 {
    eo_prefix: evas_common;
-   properties {
-      evas {
+   methods {
+      @property evas {
          get {
             /*@ No description supplied by the EAPI. */
             legacy: evas_object_evas_get;
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index 393b533..844af37 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -2,8 +2,8 @@ class Evas.Grid (Evas.Smart_Clipped)
 {
    legacy_prefix: evas_object_grid;
    eo_prefix: evas_obj_grid;
-   properties {
-      mirrored {
+   methods {
+      @property mirrored {
          set {
             /*@
             Sets the mirrored mode of the grid. In mirrored mode the grid 
items go
@@ -24,7 +24,7 @@ class Evas.Grid (Evas.Smart_Clipped)
             bool mirrored; /*@ the mirrored mode to set */
          }
       }
-      size {
+      @property size {
          set {
             /*@
             Set the virtual resolution for the grid
@@ -43,7 +43,7 @@ class Evas.Grid (Evas.Smart_Clipped)
             int h; /*@ The virtual vertical size (resolution) in integer units 
*/
          }
       }
-      children {
+      @property children {
          get {
             /*@
             Get the list of children for the grid.
@@ -56,8 +56,6 @@ class Evas.Grid (Evas.Smart_Clipped)
             return: free(own(list<Evas.Object *> *), eina_list_free) 
@warn_unused;
          }
       }
-   }
-   methods {
       accessor_new @const {
          /*@
          Get an accessor to get random access to the list of children for the 
grid.
diff --git a/src/lib/evas/canvas/evas_image.eo 
b/src/lib/evas/canvas/evas_image.eo
index e6783b1..ed96777 100644
--- a/src/lib/evas/canvas/evas_image.eo
+++ b/src/lib/evas/canvas/evas_image.eo
@@ -2,8 +2,8 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
 {
    legacy_prefix: evas_object_image;
    eo_prefix: evas_obj_image;
-   properties {
-      load_dpi {
+   methods {
+      @property load_dpi {
          set {
             /*@
             Set the DPI resolution of an image object's source image.
@@ -28,7 +28,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
          }
       }
 
-      source_clip {
+      @property source_clip {
          set {
             /*@
             Clip the proxy object with the source object's clipper.
@@ -53,7 +53,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             (@c EINA_TRUE) or not (@c EINA_FALSE) */
          }
       }
-      source {
+      @property source {
          set {
             /*@
             Set the source object on an image object to used as a @b proxy.
@@ -91,7 +91,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             Evas_Object *src; /*@ Source object to use for the proxy. */
          }
       }
-      filled {
+      @property filled {
          set {
             /*@
             Set whether the image object's fill property should track the
@@ -120,7 +120,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             object size or @c EINA_FALSE, otherwise. */
          }
       }
-      content_hint {
+      @property content_hint {
          set {
             /*@
             Set the content hint setting of a given image object of the canvas.
@@ -151,7 +151,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             #Evas_Image_Content_Hint ones. */
          }
       }
-      load_region {
+      @property load_region {
          set {
             /*@
             Inform a given image object to load a selective region of its
@@ -183,7 +183,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             int h; /*@ Height of the region to be loaded. */
          }
       }
-      alpha {
+      @property alpha {
          set {
             /*@
             Enable or disable alpha channel usage on the given image object.
@@ -214,7 +214,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             or not (@c EINA_FALSE). */
          }
       }
-      border {
+      @property border {
          set {
             /*@
             Set the dimensions for an image object's border, a region which @b
@@ -269,7 +269,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             int b; /*@ The border's bottom width. */
          }
       }
-      border_scale {
+      @property border_scale {
          set {
             /*@
             Sets the scaling factor (multiplier) for the borders of an image
@@ -292,7 +292,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             double scale; /*@ The scale factor (default is @c 1.0 - i.e. no 
scaling) */
          }
       }
-      pixels_dirty {
+      @property pixels_dirty {
          set {
             /*@
             Mark whether the given image object is dirty and needs to request 
its pixels.
@@ -313,7 +313,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             bool dirty; /*@ Whether the image is dirty. */
          }
       }
-      video_surface {
+      @property video_surface {
          set {
             /*@
             Set the video surface linked to a given image of the canvas
@@ -334,7 +334,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             @since 1.1 */
          }
       }
-      video_surface_caps {
+      @property video_surface_caps {
          set {
             /*@ Set the video surface capabilities to a given image of the 
canvas */
          }
@@ -345,7 +345,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             uint caps; /*@ in */
          }
       }
-      load_orientation {
+      @property load_orientation {
          set {
             /*@
             Define if the orientation information in the image file should be 
honored.
@@ -362,7 +362,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             bool enable; /*@ @c EINA_TRUE means that it should honor the 
orientation information */
          }
       }
-      border_center_fill {
+      @property border_center_fill {
          set {
             /*@
             Sets @b how the center part of the given image object (not the
@@ -393,7 +393,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             #Evas_Border_Fill_Mode). */
          }
       }
-      source_visible {
+      @property source_visible {
          set {
             /*@
             Set the source object to be visible or not.
@@ -435,7 +435,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             otherwise. */
          }
       }
-      native_surface {
+      @property native_surface {
          set {
             /*@
             Set the native surface of a given image of the canvas
@@ -456,7 +456,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             Evas_Native_Surface *surf/* @const_get*/ @nonull; /*@ The new 
native surface. */
          }
       }
-      load_scale_down {
+      @property load_scale_down {
          set {
             /*@
             Set the scale down factor of a given image object's source image,
@@ -478,7 +478,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             int scale_down; /*@ The scale down factor. */
          }
       }
-      scale_hint {
+      @property scale_hint {
          set {
             /*@
             Set the scale hint of a given image of the canvas.
@@ -506,7 +506,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             #Evas_Image_Scale_Hint. */
          }
       }
-      source_events {
+      @property source_events {
          set {
             /*@
             Set whether an Evas object is to source events.
@@ -542,7 +542,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             (@c EINA_FALSE) */
          }
       }
-      colorspace {
+      @property colorspace {
          set {
             /*@
             Set the colorspace of a given image of the canvas.
@@ -561,7 +561,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             Evas_Colorspace cspace; /*@ The new color space. */
          }
       }
-      pixels_get_callback {
+      @property pixels_get_callback {
          set {
             /*@
             Set the callback function to get pixels from a canvas' image.
@@ -574,7 +574,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             void *data; /*@ The data pointer to be passed to @a func. */
          }
       }
-      data_copy {
+      @property data_copy {
          set {
             /*@
             Replaces the raw image data of the given image object.
@@ -599,7 +599,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             void *data; /*@ The raw data to replace. */
          }
       }
-      animated_frame {
+      @property animated_frame {
          set {
             /*@
             Set the frame to current frame of an image object
@@ -619,7 +619,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             int frame_index; /*@ The index of current frame */
          }
       }
-      region_support {
+      @property region_support {
          get {
             /*@
             Get the support state of a given image
@@ -631,7 +631,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             return: bool @warn_unused;
          }
       }
-      load_error {
+      @property load_error {
          get {
             /*@
             Retrieves a number representing any error that occurred during the
@@ -643,7 +643,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             return: Evas_Load_Error @warn_unused;
          }
       }
-      animated_frame_count {
+      @property animated_frame_count {
          get {
             /*@
             Get the total number of frames of the image object.
@@ -662,7 +662,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             return: int;
          }
       }
-      stride {
+      @property stride {
          get {
             /*@
             Retrieves the row stride of the given image object.
@@ -674,7 +674,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             return: int @warn_unused;
          }
       }
-      animated_loop_type {
+      @property animated_loop_type {
          get {
             /*@
             Get the kind of looping the image object does.
@@ -700,7 +700,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             return: Evas_Image_Animated_Loop_Hint;
          }
       }
-      animated_loop_count {
+      @property animated_loop_count {
          get {
             /*@
             Get the number times the animation of the object loops.
@@ -725,7 +725,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
          }
       }
 
-      scene {
+      @property scene {
          set {
             /*@
             Set the 3D scene of a given image of the canvas.
@@ -752,7 +752,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             Evas_3D_Scene *scene; /*@ 3D scene on an image object. */
          }
       }
-      filter_program {
+      @property filter_program {
          set {
             /*@ Set an Evas filter program on this Text Object.
 
@@ -781,7 +781,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
               */
          }
       }
-      filter_source {
+      @property filter_source {
          set {
             /*@ Bind an object to use as a mask or texture with Evas Filters.
 
@@ -794,7 +794,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             Eo* eobj; /*@ Eo object to use through proxy rendering */
          }
       }
-      filter_padding {
+      @property filter_padding {
          get {
             /*@ Get the value of the extra padding set when a filter is used. 
*/
             return: bool; /*@ Returns false if the filter is invalid and 
padding is 0 */
@@ -807,7 +807,7 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             int b; /*@ Bottom padding in pixels */
          }
       }
-      orient {
+      @property orient {
          set {
             /*@
             Set the image orientation.
@@ -835,8 +835,6 @@ class Evas.Image (Evas.Object, Efl.File, Efl.Image, 
Efl.Gfx.Fill, Efl.Gfx.View)
             Default is #EVAS_IMAGE_ORIENT_NONE. */
          }
       }
-   }
-   methods {
       preload_begin {
          /*@ Begin preloading an image object's image data in the background */
          legacy: null;
diff --git a/src/lib/evas/canvas/evas_line.eo b/src/lib/evas/canvas/evas_line.eo
index 308defa..5289cc4 100644
--- a/src/lib/evas/canvas/evas_line.eo
+++ b/src/lib/evas/canvas/evas_line.eo
@@ -2,8 +2,8 @@ class Evas.Line (Evas.Object)
 {
    legacy_prefix: evas_object_line;
    eo_prefix: evas_obj_line;
-   properties {
-      xy {
+   methods {
+      @property xy {
          set {
             /*@
             @since 1.8
diff --git a/src/lib/evas/canvas/evas_object.eo 
b/src/lib/evas/canvas/evas_object.eo
index 51b9369..04a515a 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -2,8 +2,8 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
 {
    eo_prefix: evas_obj;
    data: Evas_Object_Protected_Data;
-   properties {
-      size_hint_max {
+   methods {
+      @property size_hint_max {
          set {
             /*@
             Sets the hints for an object's maximum size.
@@ -46,7 +46,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             Evas_Coord h; /*@ Integer to use as the maximum height hint. */
          }
       }
-      size_hint_request {
+      @property size_hint_request {
          set {
             /*@
             Sets the hints for an object's optimum size.
@@ -80,7 +80,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             Evas_Coord h; /*@ Integer to use as the preferred height hint. */
          }
       }
-      type {
+      @property type {
          set {
             /*@ Sets the type of the given Evas object. */
             legacy: null;
@@ -117,7 +117,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             const(char)* type; /*@ in */
          }
       }
-      size_hint_min {
+      @property size_hint_min {
          set {
             /*@
             Sets the hints for an object's minimum size.
@@ -160,7 +160,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             Evas_Coord h; /*@ Integer to use as the minimum height hint. */
          }
       }
-      pointer_mode {
+      @property pointer_mode {
          set {
             /*@
             Set pointer behavior.
@@ -190,7 +190,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             Evas_Object_Pointer_Mode pointer_mode; /*@ desired behavior. */
          }
       }
-      render_op {
+      @property render_op {
          set {
             /*@
             Sets the render_op to be used for rendering the Evas object.
@@ -206,7 +206,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             Evas_Render_Op render_op; /*@ one of the Evas_Render_Op values. */
          }
       }
-      freeze_events {
+      @property freeze_events {
          set {
             /*@
             Set whether an Evas object is to freeze (discard) events.
@@ -247,7 +247,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             (@c EINA_FALSE) */
          }
       }
-      map {
+      @property map {
          set {
             /*@
             Set current object transformation map.
@@ -311,7 +311,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             const(Evas_Map)* map; /*@ new map to use */
          }
       }
-      size_hint_aspect {
+      @property size_hint_aspect {
          set {
             /*@
             Sets the hints for an object's aspect ratio.
@@ -381,7 +381,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             Evas_Coord h; /*@ Integer to use as aspect height ratio term. */
          }
       }
-      clip {
+      @property clip {
          set {
             /*@
             Clip one object to another.
@@ -457,7 +457,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             Evas_Object *clip @nonull; /*@ The object to clip @p obj by */
          }
       }
-      size_hint_padding {
+      @property size_hint_padding {
          set {
             /*@
             Sets the hints for an object's padding space.
@@ -506,7 +506,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             Evas_Coord b; /*@ Integer to specify bottom padding. */
          }
       }
-      repeat_events {
+      @property repeat_events {
          set {
             /*@
             Set whether an Evas object is to repeat events.
@@ -547,7 +547,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             (@c EINA_FALSE) */
          }
       }
-      size_hint_weight {
+      @property size_hint_weight {
          set {
             /*@
             Sets the hints for an object's weight.
@@ -603,7 +603,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             double y; /*@ Nonnegative double value to use as vertical weight 
hint. */
          }
       }
-      name {
+      @property name {
          set {
             /*@
             Sets the name of the given Evas object to the given name.
@@ -636,7 +636,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             const(char)* name; /*@ The given name. */
          }
       }
-      scale {
+      @property scale {
          set {
             /*@
             Sets the scaling factor for an Evas object. Does not affect all
@@ -668,7 +668,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             default size. */
          }
       }
-      static_clip {
+      @property static_clip {
          set {
             /*@
             Set a hint flag on the given Evas object that it's used as a 
"static
@@ -699,7 +699,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             clipper, @c EINA_FALSE otherwise. */
          }
       }
-      focus {
+      @property focus {
          set {
             /*@
             Sets or unsets a given object as the currently focused one on its
@@ -749,7 +749,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             to take away the focus from it. */
          }
       }
-      is_frame_object {
+      @property is_frame_object {
          set {
             /*@             @since 1.2 */
          }
@@ -760,7 +760,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             bool is_frame; /*@ in */
          }
       }
-      map_enable {
+      @property map_enable {
          set {
             /*@
             Enable or disable the map that is set.
@@ -787,7 +787,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             bool enabled; /*@ enabled state */
          }
       }
-      precise_is_inside {
+      @property precise_is_inside {
          set {
             /*@
             Set whether to use precise (usually expensive) point collision
@@ -828,7 +828,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             not. The default value is false. */
          }
       }
-      size_hint_align {
+      @property size_hint_align {
          set {
             /*@
             Sets the hints for an object's alignment.
@@ -893,7 +893,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             special value #EVAS_HINT_FILL, to use as vertical alignment hint. 
*/
          }
       }
-      propagate_events {
+      @property propagate_events {
          set {
             /*@
             Set whether events on a smart object's member should get propagated
@@ -930,7 +930,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             (@c EINA_FALSE) */
          }
       }
-      pass_events {
+      @property pass_events {
          set {
             /*@
             Set whether an Evas object is to pass (ignore) events.
@@ -971,7 +971,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             (@c EINA_FALSE) */
          }
       }
-      anti_alias {
+      @property anti_alias {
          set {
             /*@
             Sets whether or not the given Evas object is to be drawn 
anti-aliased.
@@ -988,7 +988,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             bool anti_alias; /*@ (@c EINA_TRUE) if the object is to be 
anti_aliased, (@c EINA_FALSE) otherwise. */
          }
       }
-      smart_data {
+      @property smart_data {
          get {
             /*@
             Retrieve user data stored on a given smart object.
@@ -1003,7 +1003,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             return: void * @warn_unused;
          }
       }
-      smart_clipped_clipper {
+      @property smart_clipped_clipper {
          get {
             /*@
             Get the clipper object for the given clipped smart object.
@@ -1017,7 +1017,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             return: Evas_Object * @warn_unused;
          }
       }
-      clipees {
+      @property clipees {
          get {
             /*@
             Return a list of objects currently clipped by @p obj.
@@ -1059,7 +1059,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             return: const(list<Evas.Object*>)* @warn_unused;
          }
       }
-      smart_parent {
+      @property smart_parent {
          get {
             /*@
             Gets the parent smart object of a given Evas object, if it has one.
@@ -1071,7 +1071,7 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             return: Evas_Object * @warn_unused;
          }
       }
-      size_hint_display_mode {
+      @property size_hint_display_mode {
          get {
             /*@
             Retrieves the hints for an object's display mode
@@ -1092,8 +1092,6 @@ abstract Evas.Object (Eo.Base, Evas.Common_Interface, 
Efl.Gfx.Base, Efl.Gfx.Stac
             Evas_Display_Mode dispmode; /*@ display mode hint */
          }
       }
-   }
-   methods {
       clipees_has @const {
          /*@
          Test if any object is clipped by @p obj.
diff --git a/src/lib/evas/canvas/evas_object_smart.eo 
b/src/lib/evas/canvas/evas_object_smart.eo
index 6ca9a15..26153fd 100644
--- a/src/lib/evas/canvas/evas_object_smart.eo
+++ b/src/lib/evas/canvas/evas_object_smart.eo
@@ -2,8 +2,8 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
 {
    eo_prefix: evas_obj_smart;
    data: Evas_Smart_Data;
-   properties {
-      need_recalculate {
+   methods {
+      @property need_recalculate {
          set {
             /*@
             Set or unset the flag signalling that a given smart object needs to
@@ -49,7 +49,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
             (@c EINA_FALSE) the flag. */
          }
       }
-      clip {
+      @property clip {
          set {
             /*@ No description supplied by the EAPI. */
             legacy: null;
@@ -58,7 +58,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
             Evas_Object *clip;
          }
       }
-      color {
+      @property color {
          set {
             /*@ No description supplied by the EAPI. */
             legacy: null;
@@ -70,7 +70,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
             int a;
          }
       }
-      data {
+      @property data {
          set {
             /*@
             Store a pointer to user data for a given smart object.
@@ -86,7 +86,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
             void *data; /*@ A pointer to user data */
          }
       }
-      members {
+      @property members {
          get {
             /*@
             Retrieves the list of the member objects of a given Evas smart
@@ -105,7 +105,7 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
             return: list<Evas.Object*> * @warn_unused;
          }
       }
-      smart {
+      @property smart {
          get {
             /*@
             Get the #Evas_Smart from which @p obj smart object was created.
@@ -116,8 +116,6 @@ class Evas.Object_Smart (Evas.Object, Evas.Signal_Interface)
             return: Evas_Smart * @warn_unused;
          }
       }
-   }
-   methods {
       show {
          /*@ No description supplied by the EAPI. */
          legacy: null;
diff --git a/src/lib/evas/canvas/evas_out.eo b/src/lib/evas/canvas/evas_out.eo
index 7ff58ea..ff4e08e 100644
--- a/src/lib/evas/canvas/evas_out.eo
+++ b/src/lib/evas/canvas/evas_out.eo
@@ -2,8 +2,8 @@ class Evas.Out (Eo.Base)
 {
    eo_prefix: evas_out;
    legacy_prefix: evas_output;
-   properties {
-      view {
+   methods {
+      @property view {
          set {
             /*@ Sets the viewport region of the canvas that the output 
displays This sets both the viewport region in the canvas that displays on the 
given output, but also the viewport size will match the output resolution 1:1. 
*/
          }
@@ -17,7 +17,7 @@ class Evas.Out (Eo.Base)
             Evas_Coord h;
          }
       }
-      engine_info {
+      @property engine_info {
          set {
             /*@ Sets the engine specific output parameters for a given output. 
*/
             return: bool;
diff --git a/src/lib/evas/canvas/evas_table.eo 
b/src/lib/evas/canvas/evas_table.eo
index 6af1482..18ed8a1 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -2,8 +2,8 @@ class Evas.Table (Evas.Smart_Clipped)
 {
    legacy_prefix: evas_object_table;
    eo_prefix: evas_obj_table;
-   properties {
-      homogeneous {
+   methods {
+      @property homogeneous {
          set {
             /*@
             @brief Set how this table should layout children.
@@ -57,7 +57,7 @@ class Evas.Table (Evas.Smart_Clipped)
             Evas_Object_Table_Homogeneous_Mode homogeneous;
          }
       }
-      align {
+      @property align {
          set {
             /*@
             Set the alignment of the whole bounding box of contents. */
@@ -71,7 +71,7 @@ class Evas.Table (Evas.Smart_Clipped)
             double vertical;
          }
       }
-      padding {
+      @property padding {
          set {
             /*@
             Set padding between cells. */
@@ -85,7 +85,7 @@ class Evas.Table (Evas.Smart_Clipped)
             Evas_Coord vertical;
          }
       }
-      mirrored {
+      @property mirrored {
          set {
             /*@
             Sets the mirrored mode of the table. In mirrored mode the table 
items go
@@ -106,7 +106,7 @@ class Evas.Table (Evas.Smart_Clipped)
             bool mirrored; /*@ the mirrored mode to set */
          }
       }
-      col_row_size {
+      @property col_row_size {
          get {
             /*@
             Get the number of columns and rows this table takes.
@@ -121,7 +121,7 @@ class Evas.Table (Evas.Smart_Clipped)
             int rows;
          }
       }
-      children {
+      @property children {
          get {
             /*@
             Get the list of children for the table.
@@ -133,7 +133,7 @@ class Evas.Table (Evas.Smart_Clipped)
             return: free(own(list<Evas.Object *> *), eina_list_free) 
@warn_unused;
          }
       }
-      child {
+      @property child {
          get {
             /*@
             Get the child of the table at the given coordinates
@@ -148,8 +148,6 @@ class Evas.Table (Evas.Smart_Clipped)
             Evas_Object *child;
          }
       }
-   }
-   methods {
       clear {
          /*@
          Faster way to remove all child objects from a table object. */
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 520db77..a762933 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -2,8 +2,8 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties)
 {
    legacy_prefix: evas_object_text;
    eo_prefix: evas_obj_text;
-   properties {
-      shadow_color {
+   methods {
+      @property shadow_color {
          set {
             /*@
             Sets the shadow color for the given text object.
@@ -40,7 +40,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties)
             int a; /*@ The alpha component of the given color. */
          }
       }
-      ellipsis {
+      @property ellipsis {
          set {
             /*@
             @brief Sets the ellipsis that should be used for the text object.
@@ -66,7 +66,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties)
             double ellipsis(-1); /*@ the ellipsis. */
          }
       }
-      bidi_delimiters {
+      @property bidi_delimiters {
          set {
             /*@
             @brief Sets the BiDi delimiters used in the textblock.
@@ -92,7 +92,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties)
             const(char)* delim; /*@ A null terminated string of delimiters, 
e.g ",|". */
          }
       }
-      outline_color {
+      @property outline_color {
          set {
             /*@
             Sets the outline color for the given text object.
@@ -122,7 +122,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties)
             int a; /*@ The alpha component of the given color. */
          }
       }
-      glow2_color {
+      @property glow2_color {
          set {
             /*@
             Sets the 'glow 2' color for the given text object.
@@ -150,7 +150,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties)
             int a; /*@ The alpha component of the given color. */
          }
       }
-      style {
+      @property style {
          set {
             /*@
             Sets the style to apply on the given text object.
@@ -187,7 +187,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties)
             Evas_Text_Style_Type style; /*@ a style type. */
          }
       }
-      glow_color {
+      @property glow_color {
          set {
             /*@
             Sets the glow color for the given text object.
@@ -219,7 +219,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties)
             int a; /*@ The alpha component of the given color. */
          }
       }
-      filter_program {
+      @property filter_program {
          set {
             /*@ Set an Evas filter program on this Text Object.
 
@@ -242,7 +242,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties)
               to the standard text effect */
          }
       }
-      filter_source {
+      @property filter_source {
          set {
             /*@ Bind an object to use as a mask or texture with Evas Filters.
 
@@ -260,12 +260,12 @@ class Evas.Text (Evas.Object, Efl.Text, 
Efl.Text_Properties)
             Eo* eobj; /*@ Eo object to use through proxy rendering */
          }
       }
-      max_descent {
+      @property max_descent {
          get {
             return: Evas_Coord;
          }
       }
-      style_pad {
+      @property style_pad {
          get {
             /*@
             Gets the text style pad of a text object. */
@@ -277,7 +277,7 @@ class Evas.Text (Evas.Object, Efl.Text, Efl.Text_Properties)
             int b; /*@ The bottom pad (or @c NULL). */
          }
       }
-      direction {
+      @property direction {
          get {
             /*@
             Retrieves the direction of the text currently being displayed in 
the
@@ -286,38 +286,36 @@ class Evas.Text (Evas.Object, Efl.Text, 
Efl.Text_Properties)
             return: Evas_BiDi_Direction;
          }
       }
-      ascent {
+      @property ascent {
          get {
             return: Evas_Coord;
          }
       }
-      horiz_advance {
+      @property horiz_advance {
          get {
             return: Evas_Coord;
          }
       }
-      inset {
+      @property inset {
          get {
             return: Evas_Coord;
          }
       }
-      max_ascent {
+      @property max_ascent {
          get {
             return: Evas_Coord;
          }
       }
-      vert_advance {
+      @property vert_advance {
          get {
             return: Evas_Coord;
          }
       }
-      descent {
+      @property descent {
          get {
             return: Evas_Coord;
          }
       }
-   }
-   methods {
       last_up_to_pos @const {
          /*@ Returns the logical position of the last char in the text up to 
the pos given. this is NOT the position of the last char because of the 
possibility of RTL in the text. */
          return: int(-1);
diff --git a/src/lib/evas/canvas/evas_textblock.eo 
b/src/lib/evas/canvas/evas_textblock.eo
index 399df7c..28578c0 100644
--- a/src/lib/evas/canvas/evas_textblock.eo
+++ b/src/lib/evas/canvas/evas_textblock.eo
@@ -2,8 +2,8 @@ class Evas.Textblock (Evas.Object)
 {
    legacy_prefix: evas_object_textblock;
    eo_prefix: evas_obj_textblock;
-   properties {
-      text_markup {
+   methods {
+      @property text_markup {
          set {
             /*@
             Sets the tetxblock's text to the markup text.
@@ -22,7 +22,7 @@ class Evas.Textblock (Evas.Object)
             const(char)* text; /*@ the markup text to use. */
          }
       }
-      valign {
+      @property valign {
          set {
             /*@
             @brief Sets the vertical alignment of text within the textblock 
object
@@ -45,7 +45,7 @@ class Evas.Textblock (Evas.Object)
             double align; /*@ A value between @c 0.0 and @c 1.0. */
          }
       }
-      bidi_delimiters {
+      @property bidi_delimiters {
          set {
             /*@
             @brief Sets the BiDi delimiters used in the textblock.
@@ -72,7 +72,7 @@ class Evas.Textblock (Evas.Object)
             const(char)* delim; /*@ A null terminated string of delimiters, 
e.g ",|". */
          }
       }
-      replace_char {
+      @property replace_char {
          set {
             /*@
             @brief Set the "replacement character" to use for the given 
textblock object. */
@@ -81,7 +81,7 @@ class Evas.Textblock (Evas.Object)
             const(char)* ch; /*@ The charset name. */
          }
       }
-      legacy_newline {
+      @property legacy_newline {
          set {
             /*@
             @brief Sets newline mode. When true, newline character will behave
@@ -101,7 +101,7 @@ class Evas.Textblock (Evas.Object)
             bool mode; /*@ @c EINA_TRUE for legacy mode, @c EINA_FALSE 
otherwise. */
          }
       }
-      style {
+      @property style {
          set {
             /*@
             Set the objects style to ts.
@@ -116,7 +116,7 @@ class Evas.Textblock (Evas.Object)
             const(Evas_Textblock_Style)* ts; /*@ the style to set. */
          }
       }
-      node_format_first {
+      @property node_format_first {
          get {
             /*@ Returns the first format node. */
             legacy: evas_textblock_node_format_first_get;
@@ -125,7 +125,7 @@ class Evas.Textblock (Evas.Object)
             const(Evas_Object_Textblock_Node_Format)* format;
          }
       }
-      size_formatted {
+      @property size_formatted {
          get {
             /*@
             Get the formatted width and height. This calculates the actual 
size after restricting
@@ -150,7 +150,7 @@ class Evas.Textblock (Evas.Object)
             Evas_Coord h; /*@ the height of the object */
          }
       }
-      node_format_last {
+      @property node_format_last {
          get {
             /*@ Returns the last format node. */
             legacy: evas_textblock_node_format_last_get;
@@ -159,7 +159,7 @@ class Evas.Textblock (Evas.Object)
             const(Evas_Object_Textblock_Node_Format)* format;
          }
       }
-      cursor {
+      @property cursor {
          get {
             /*@
             Return the object's main cursor.
@@ -168,7 +168,7 @@ class Evas.Textblock (Evas.Object)
             return: Evas_Textblock_Cursor *;
          }
       }
-      size_native {
+      @property size_native {
          get {
             /*@
             Get the native width and height. This calculates the actual size 
without taking account
@@ -191,7 +191,7 @@ class Evas.Textblock (Evas.Object)
             Evas_Coord h; /*@ the height returned */
          }
       }
-      style_insets {
+      @property style_insets {
          get {
             /*@ No description supplied by the EAPI. */
          }
@@ -202,8 +202,6 @@ class Evas.Textblock (Evas.Object)
             Evas_Coord b;
          }
       }
-   }
-   methods {
       line_number_geometry_get @const {
          /*@
          Get the geometry of a line number.
diff --git a/src/lib/evas/canvas/evas_textgrid.eo 
b/src/lib/evas/canvas/evas_textgrid.eo
index f910db6..5cba40a 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -2,8 +2,8 @@ class Evas.Textgrid (Evas.Object, Efl.Text_Properties)
 {
    legacy_prefix: evas_object_textgrid;
    eo_prefix: evas_obj_textgrid;
-   properties {
-      supported_font_styles {
+   methods {
+      @property supported_font_styles {
          set {
             /*@
             This function is not implemented yet, do not use. */
@@ -17,7 +17,7 @@ class Evas.Textgrid (Evas.Object, Efl.Text_Properties)
             Evas_Textgrid_Font_Style styles;
          }
       }
-      size {
+      @property size {
          set {
             /*@
             @brief Set the size of the textgrid object.
@@ -45,7 +45,7 @@ class Evas.Textgrid (Evas.Object, Efl.Text_Properties)
             int h; /*@ The number of rows (height in cells) of the grid. */
          }
       }
-      cell_size {
+      @property cell_size {
          get {
             /*@
             @brief Retrieve the size of a cell of the given textgrid object in 
pixels.
@@ -68,8 +68,6 @@ class Evas.Textgrid (Evas.Object, Efl.Text_Properties)
             pixels of a cell. */
          }
       }
-   }
-   methods {
       update_add {
          /*@
          @brief Indicate for evas that part of a textgrid region (cells) has 
been updated.
diff --git a/src/lib/evas/canvas/evas_vg.eo b/src/lib/evas/canvas/evas_vg.eo
index 8c6d352..eb8f837 100644
--- a/src/lib/evas/canvas/evas_vg.eo
+++ b/src/lib/evas/canvas/evas_vg.eo
@@ -2,8 +2,8 @@ class Evas.VG (Evas.Object, Efl.Gfx.Fill, Efl.Gfx.View)
 {
    legacy_prefix: evas_object_vg;
    eo_prefix: evas_obj_vg;
-   properties {
-      root_node {
+   methods {
+      @property root_node {
          get {
             /*@
               Get the root node of the evas_object_vg.
diff --git 
a/src/modules/evas/engines/gl_generic/ector_cairo_software_surface.eo 
b/src/modules/evas/engines/gl_generic/ector_cairo_software_surface.eo
index d5070ab..6ec9456 100644
--- a/src/modules/evas/engines/gl_generic/ector_cairo_software_surface.eo
+++ b/src/modules/evas/engines/gl_generic/ector_cairo_software_surface.eo
@@ -2,8 +2,8 @@ class Ector.Cairo_Software.Surface (Ector.Cairo.Surface)
 {
    eo_prefix: ector_cairo_software_surface;
    legacy_prefix: null;
-   properties {
-      surface {
+   methods {
+      @property surface {
          set {
         }
         get {
diff --git 
a/src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo 
b/src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo
index d5070ab..6ec9456 100644
--- a/src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo
+++ b/src/modules/evas/engines/software_generic/ector_cairo_software_surface.eo
@@ -2,8 +2,8 @@ class Ector.Cairo_Software.Surface (Ector.Cairo.Surface)
 {
    eo_prefix: ector_cairo_software_surface;
    legacy_prefix: null;
-   properties {
-      surface {
+   methods {
+      @property surface {
          set {
         }
         get {
diff --git a/src/tests/eolian/data/base.eo b/src/tests/eolian/data/base.eo
index 3b701b5..59e32a7 100644
--- a/src/tests/eolian/data/base.eo
+++ b/src/tests/eolian/data/base.eo
@@ -1,14 +1,12 @@
 class Base {
-   properties {
-      z {
+   methods {
+      @property z {
            values {
                 int a;
                 char b;
                 float c;
            }
       }
-   }
-   methods {
       constructor {
       }
       destructor {
diff --git a/src/tests/eolian/data/class_funcs.eo 
b/src/tests/eolian/data/class_funcs.eo
index b65c197..300e110 100644
--- a/src/tests/eolian/data/class_funcs.eo
+++ b/src/tests/eolian/data/class_funcs.eo
@@ -1,15 +1,13 @@
 class Class_Funcs {
-   properties {
-      a @class {
+   methods {
+      @property a @class {
          get {
          }
       }
-      b {
+      @property b {
          get {
          }
       }
-   }
-   methods {
       foo @class {
       }
       bar {
diff --git a/src/tests/eolian/data/class_simple.eo 
b/src/tests/eolian/data/class_simple.eo
index 29d95b7..d4b4fc8 100644
--- a/src/tests/eolian/data/class_simple.eo
+++ b/src/tests/eolian/data/class_simple.eo
@@ -3,8 +3,8 @@ class Class_Simple {
    legacy_prefix: evas_object_simple;
    eo_prefix: evas_obj_simple;
    data: Evas_Simple_Data;
-   properties {
-      a {
+   methods {
+      @property a {
          /*@ Common desc for a */
          set {
             /*@
@@ -17,13 +17,11 @@ class Class_Simple {
             int value (100); /*@ Value description */
          }
       }
-      b @c_only {
+      @property b @c_only {
         set {
            eo: null;
         }
       }
-   }
-   methods {
       foo {
          /*@ comment foo */
          params {
diff --git a/src/tests/eolian/data/complex_type.eo 
b/src/tests/eolian/data/complex_type.eo
index 03f1ee9..bedd4d8 100644
--- a/src/tests/eolian/data/complex_type.eo
+++ b/src/tests/eolian/data/complex_type.eo
@@ -1,6 +1,6 @@
 class Complex_Type {
-   properties {
-      a {
+   methods {
+      @property a {
          set {
             return: own(list<array<own(Eo**)>*>*);
          }
@@ -10,8 +10,6 @@ class Complex_Type {
             own(list<int>*) value;
          }
       }
-   }
-   methods {
       foo {
          params {
             own(char*) buf;
diff --git a/src/tests/eolian/data/consts.eo b/src/tests/eolian/data/consts.eo
index 9227738..443f72b 100644
--- a/src/tests/eolian/data/consts.eo
+++ b/src/tests/eolian/data/consts.eo
@@ -1,6 +1,6 @@
 class Consts {
-   properties {
-      a {
+   methods {
+      @property a {
          set {
             return: bool (true); /*@ comment for property set return */
          }
@@ -11,8 +11,6 @@ class Consts {
             char *buffer @const_get;
          }
       }
-   }
-   methods {
       foo @const {
          /*@ comment foo */
          params {
diff --git a/src/tests/eolian/data/nmsp1_nmsp11_class2.eo 
b/src/tests/eolian/data/nmsp1_nmsp11_class2.eo
index 84f6325..78c3414 100644
--- a/src/tests/eolian/data/nmsp1_nmsp11_class2.eo
+++ b/src/tests/eolian/data/nmsp1_nmsp11_class2.eo
@@ -1,7 +1,7 @@
 class nmsp1.nmsp11.class2
 {
-   properties {
-      a {
+   methods {
+      @property a {
          set {
          }
       }
diff --git a/src/tests/eolian/data/object_impl.eo 
b/src/tests/eolian/data/object_impl.eo
index 4aa7b43..597cc05 100644
--- a/src/tests/eolian/data/object_impl.eo
+++ b/src/tests/eolian/data/object_impl.eo
@@ -1,6 +1,6 @@
 class Object_Impl (Base) {
-   properties {
-      a {
+   methods {
+      @property a {
          set {
             return: bool (false);
          }
@@ -13,7 +13,7 @@ class Object_Impl (Base) {
             own(list<int>*) value @const_set;
          }
       }
-      b {
+      @property b {
          set {
          }
          get {
@@ -23,8 +23,6 @@ class Object_Impl (Base) {
             own(list<int>*) value;
          }
       }
-   }
-   methods {
       constructor_1 {
          params {
             @in int a;
diff --git a/src/tests/eolian/data/object_impl_add.eo 
b/src/tests/eolian/data/object_impl_add.eo
index 1851d4a..266c916 100644
--- a/src/tests/eolian/data/object_impl_add.eo
+++ b/src/tests/eolian/data/object_impl_add.eo
@@ -1,8 +1,8 @@
 class Object_Impl_Add (Base) {
    data: Object_Impl_Data;
 
-   properties {
-      c {
+   methods {
+      @property c {
          set {
          }
          get {
diff --git a/src/tests/eolian/data/override.eo 
b/src/tests/eolian/data/override.eo
index 4eb3477..7d04f10 100644
--- a/src/tests/eolian/data/override.eo
+++ b/src/tests/eolian/data/override.eo
@@ -1,12 +1,12 @@
 class Override (Base) {
-   properties {
-      a {
+   methods {
+      @property a {
          set {
          }
          get {
          }
       }
-      b {
+      @property b {
          set {
          }
          get {
@@ -20,7 +20,7 @@ class Override (Base) {
               int c;
          }
       }
-      c {
+      @property c {
          set {
          }
          get {
@@ -32,8 +32,6 @@ class Override (Base) {
               int c(50);
          }
       }
-   }
-   methods {
       foo {
       }
       bar {
diff --git a/src/tests/eolian/data/scope.eo b/src/tests/eolian/data/scope.eo
index 8fe360e..726b1bc 100644
--- a/src/tests/eolian/data/scope.eo
+++ b/src/tests/eolian/data/scope.eo
@@ -1,19 +1,17 @@
 class Scope {
-   properties {
-      a @protected {
+   methods {
+      @property a @protected {
          get {
          }
       }
-      b {
+      @property b {
          get {
          }
       }
-      c {
+      @property c {
          get {
          }
       }
-   }
-   methods {
       foo {
       }
       bar @protected {
diff --git a/src/tests/eolian_cxx/generic.eo b/src/tests/eolian_cxx/generic.eo
index af21c02..74f0fdc 100644
--- a/src/tests/eolian_cxx/generic.eo
+++ b/src/tests/eolian_cxx/generic.eo
@@ -2,23 +2,21 @@ class Generic (Eo.Base)
 {
    legacy_prefix: null;
    data: Generic_Data;
-   properties {
-      req_ctor_a_value {
+   methods {
+      @property req_ctor_a_value {
          get {
          }
          values {
             int value;
          }
       }
-      opt_ctor_a_value {
+      @property opt_ctor_a_value {
          get {
          }
          values {
             int value;
          }
       }
-   }
-   methods {
       required_ctor_a {
          params {
             @in int value;

-- 


Reply via email to