eo: migrate constructors sections to constructing methods

diff --git a/src/examples/eolian_cxx/colourable.eo b/src/examples/eolian_cxx/colourable.eo
index 29b221e71e7ee2432bfcb41b7563f7e515d1ec06..342790c9b3b35be8691a27f6e5154640db361909 100644 (file)
--- a/src/examples/eolian_cxx/colourable.eo
+++ b/src/examples/eolian_cxx/colourable.eo
@@ -3,26 +3,27 @@ class Colourable (Eo.Base)
     /*@ Colourable class. */
     legacy_prefix: legacy;
     data: Colourable_Data;
-    constructors {
-        constructor {
+    methods {
+        constructor @constructor {
             /*@ Default constructor. */
+            legacy: null;
         }
-        rgb_composite_constructor {
+        rgb_composite_constructor @constructor {
             /*@ Composite RGB Constructor. */
+            legacy: null;
             params {
                 @in int r; /*@ The red component. */
                 @in int g; /*@ The green component. */
                 @in int b; /*@ The blue component. */
                }
         }
-        rgb_24bits_constructor {
+        rgb_24bits_constructor @constructor {
             /*@ RGB Constructor. */
+            legacy: null;
             params {
                 @in int rgb; /*@ 24-bit RGB Component. */
             }
         }
-    }
-    methods {
         print_colour { /*@ Print the RGB colour. */ }
         colour_mask {
             /*@ The masked RGB value. */

diff --git a/src/examples/eolian_cxx/colourablesquare.eo b/src/examples/eolian_cxx/colourablesquare.eo
index 0a7c1012b014a7116d130d48ec21abd19082f7cd..1d12862601c2cac566840baf4af5501d7aaec7f3 100644 (file)
--- a/src/examples/eolian_cxx/colourablesquare.eo
+++ b/src/examples/eolian_cxx/colourablesquare.eo
@@ -2,14 +2,13 @@ class ColourableSquare (Colourable)
 {
     legacy_prefix: legacy;
     data: ColourableSquare_Data;
-    constructors {
-       size_constructor {
+    properties {
+       size_constructor @constructor {
+           legacy: null;
            params {
               @in int size;
            }
        }
-    }
-    properties {
         size {
             set {
                 /*@ Sets size. */

diff --git a/src/lib/ecore/ecore_animator.eo b/src/lib/ecore/ecore_animator.eo
index e9a3999dda8c694d7014399d2fbed3a1a7571c36..a0f0cfe637e2b2b5da107c89d8509e9cb1e0cd5b 100644 (file)
--- a/src/lib/ecore/ecore_animator.eo
+++ b/src/lib/ecore/ecore_animator.eo
@@ -1,17 +1,19 @@
 class Ecore.Animator (Eo.Base)
 {
    eo_prefix: ecore_animator;
-   constructors {
-      timeline_constructor {
-         /*@ Contructor. */
+   methods {
+      timeline_constructor @constructor {
+         /*@ Constructor. */
+         legacy: null;
          params {
             @in double runtime;
             @in Ecore_Timeline_Cb func;
             @in const(void)* data;
          }
       }
-      constructor {
-         /*@ Contructor. */
+      constructor @constructor {
+         /*@ Constructor. */
+         legacy: null;
          params {
             @in Ecore_Task_Cb func;
             @in const(void)* data;

diff --git a/src/lib/ecore/ecore_idle_enterer.eo b/src/lib/ecore/ecore_idle_enterer.eo
index b7f2c1e477c2fe118b3573a40522fe2b796bb160..8250d50ad81b2abddb975c26b8a14aa51b439c74 100644 (file)
--- a/src/lib/ecore/ecore_idle_enterer.eo
+++ b/src/lib/ecore/ecore_idle_enterer.eo
@@ -1,16 +1,18 @@
 class Ecore.Idle.Enterer (Eo.Base)
 {
    eo_prefix: ecore_idle_enterer;
-   constructors {
-      before_constructor {
+   methods {
+      before_constructor @constructor {
          /*@ Contructor. Will insert the handler at the beginning of the list. */
+         legacy: null;
          params {
             @in Ecore_Task_Cb func;
             @in const(void)* data;
          }
       }
-      after_constructor {
+      after_constructor @constructor {
          /*@ Contructor. Will insert the handler at the end of the list. */
+         legacy: null;
          params {
             @in Ecore_Task_Cb func;
             @in const(void)* data;

diff --git a/src/lib/ecore/ecore_idle_exiter.eo b/src/lib/ecore/ecore_idle_exiter.eo
index c9eaf391697b1f644838700e34eb7a8fc252b2f1..711ece68c25d3e6096b6ad609ef04cd42304b44d 100644 (file)
--- a/src/lib/ecore/ecore_idle_exiter.eo
+++ b/src/lib/ecore/ecore_idle_exiter.eo
@@ -1,9 +1,10 @@
 class Ecore.Idle.Exiter (Eo.Base)
 {
    eo_prefix: ecore_idle_exiter;
-   constructors {
-      constructor {
-         /*@ Contructor. */
+   methods {
+      constructor @constructor {
+         /*@ Constructor. */
+         legacy: null;
          params {
             @in Ecore_Task_Cb func;
             @in const(void)* data;

diff --git a/src/lib/ecore/ecore_idler.eo b/src/lib/ecore/ecore_idler.eo
index 175cf1f5a6d8e900095e2791cfe19b1782a7d2c4..e071567a95e94a1874bfbdc763df64a547fd7065 100644 (file)
--- a/src/lib/ecore/ecore_idler.eo
+++ b/src/lib/ecore/ecore_idler.eo
@@ -1,9 +1,10 @@
 class Ecore.Idler (Eo.Base)
 {
    eo_prefix: ecore_idler;
-   constructors {
-      constructor {
-         /*@ Contructor. */
+   methods {
+      constructor @constructor {
+         /*@ Constructor. */
+         legacy: null;
          params {
             @in Ecore_Task_Cb func;
             @in const(void)* data;

diff --git a/src/lib/ecore/ecore_job.eo b/src/lib/ecore/ecore_job.eo
index 21ed646b1f6a02f862701cbf1e3ff0ab0c9911ce..fdd5cb2bac47bb545e0fa6550171805504fd7550 100644 (file)
--- a/src/lib/ecore/ecore_job.eo
+++ b/src/lib/ecore/ecore_job.eo
@@ -1,9 +1,10 @@
 class Ecore.Job (Eo.Base)
 {
    eo_prefix: ecore_job;
-   constructors {
-      constructor {
-         /*@ Contructor. */
+   methods {
+      constructor @constructor {
+         /*@ Constructor. */
+         legacy: null;
          params {
             @in Ecore_Cb func;
             @in const(void)* data;

diff --git a/src/lib/ecore/ecore_poller.eo b/src/lib/ecore/ecore_poller.eo
index b1e040f17019e23c10b3452a6ae954dbb00f6f51..4dcf71454e5b136b78cce6ee5eb43bd3d690d98a 100644 (file)
--- a/src/lib/ecore/ecore_poller.eo
+++ b/src/lib/ecore/ecore_poller.eo
@@ -1,8 +1,9 @@
 class Ecore.Poller (Eo.Base)
 {
-   constructors {
-      constructor {
-         /*@ Contructor with parameters for Ecore Poller. */
+   methods {
+      constructor @constructor {
+         /*@ Constructor with parameters for Ecore Poller. */
+         legacy: null;
          params {
             @in Ecore_Poller_Type type;
             @in int interval;

diff --git a/src/lib/ecore/ecore_timer.eo b/src/lib/ecore/ecore_timer.eo
index cc991bf831b0385d72ada1f34978d004d00b8ae3..f83290adce9f8a04b2f02c3afec4e97769f2b0c2 100644 (file)
--- a/src/lib/ecore/ecore_timer.eo
+++ b/src/lib/ecore/ecore_timer.eo
@@ -8,24 +8,6 @@ class Ecore.Timer (Eo.Base)
     *  guarantee exact timing, but try to work on a "best effort basis.
     */
    eo_prefix: ecore_obj_timer;
-   constructors {
-      loop_constructor {
-         /*@ Create a timer to call in a given time from now */
-         params {
-            @in double in; /*@ The time, in seconds, from now when to go off */
-            @in Ecore_Task_Cb func; /*@ The callback function to call when the timer goes off */
-            @in const(void)* data; /*@ A pointer to pass to the callback function as its data pointer */
-         }
-      }
-      constructor {
-         /*@ Create a timer to call in a given time from when the mainloop woke up from sleep */
-         params {
-            @in double in; /*@ The time, in seconds, from when the main loop woke up, to go off */
-            @in Ecore_Task_Cb func; /*@ The callback function to call when the timer goes off */
-            @in const(void)* data; /*@ A pointer to pass to the callback function as its data pointer */
-         }
-      }
-   }
    properties {
       interval {
          set {
@@ -48,6 +30,24 @@ class Ecore.Timer (Eo.Base)
       }
    }
    methods {
+      loop_constructor @constructor {
+         /*@ Create a timer to call in a given time from now */
+         legacy: null;
+         params {
+            @in double in; /*@ The time, in seconds, from now when to go off */
+            @in Ecore_Task_Cb func; /*@ The callback function to call when the timer goes off */
+            @in const(void)* data; /*@ A pointer to pass to the callback function as its data pointer */
+         }
+      }
+      constructor @constructor {
+         /*@ Create a timer to call in a given time from when the mainloop woke up from sleep */
+         legacy: null;
+         params {
+            @in double in; /*@ The time, in seconds, from when the main loop woke up, to go off */
+            @in Ecore_Task_Cb func; /*@ The callback function to call when the timer goes off */
+            @in const(void)* data; /*@ A pointer to pass to the callback function as its data pointer */
+         }
+      }
       reset {
          /*@ Reset a timer to its full interval. This effectively makes
           *  the timer start ticking off from zero now.

diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 2fdad27e3647fabb5291b5ecedf906940b688b65..562119e75a155edcb8244e81805a34b634879f76 100644 (file)
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -3,12 +3,6 @@ abstract Eo.Base ()
    eo_prefix: eo;
    legacy_prefix: null;
 
-   constructors {
-      constructor {
-         /*@ Call the object's constructor.
-Should not be used with #eo_do. Only use it with #eo_do_super. */
-      }
-   }
    properties {
       parent {
          set {
@@ -42,6 +36,11 @@ Return event freeze count. */
       }
    }
    methods {
+      constructor @constructor {
+         /*@ Call the object's constructor.
+Should not be used with #eo_do. Only use it with #eo_do_super. */
+         legacy: null;
+      }
       event_callback_forwarder_del {
          /*@ Remove an event callback forwarder for an event and an object. */
          params {

diff --git a/src/lib/evas/canvas/evas_3d_node.eo b/src/lib/evas/canvas/evas_3d_node.eo
index 96cae90b3f21a0a1bdfa867532c9907c3e34e7e3..b4c47035a8e6f04f33827d871e5ccd8bbbfceae8 100644 (file)
--- a/src/lib/evas/canvas/evas_3d_node.eo
+++ b/src/lib/evas/canvas/evas_3d_node.eo
@@ -2,15 +2,14 @@ class Evas_3D_Node (Evas_3D_Object, Evas.Common_Interface)
 {
    legacy_prefix: null;
    data: Evas_3D_Node_Data;
-   constructors {
-      constructor {
-         /*@ Contructor. */
+   methods {
+      constructor @constructor {
+         /*@ Constructor. */
+         legacy: null;
          params {
             @in Evas_3D_Node_Type type;
          }
       }
-   }
-   methods {
       type_get @const {
          /*
            Get the type of the given node.

diff --git a/src/tests/eolian/data/base.eo b/src/tests/eolian/data/base.eo
index f6e83d7ab6b3bdf1a92afc298c9e567836e8691f..948389a87ba3cf2218ec28a4fa23092f5c80c6bf 100644 (file)
--- a/src/tests/eolian/data/base.eo
+++ b/src/tests/eolian/data/base.eo
@@ -1,9 +1,7 @@
 class Base {
-   constructors {
-      constructor {
-      }
-   }
    methods {
+      constructor @constructor {
+      }
       destructor {
       }
    }

diff --git a/src/tests/eolian/data/ctor_dtor.eo b/src/tests/eolian/data/ctor_dtor.eo
index 047a6680b10ce828b5a75c65543716ed8c28c11c..9a1d031e77b0a5d435a6e8aa98428c68e1f3bb24 100644 (file)
--- a/src/tests/eolian/data/ctor_dtor.eo
+++ b/src/tests/eolian/data/ctor_dtor.eo
@@ -1,12 +1,12 @@
 class Ctor_Dtor (Base) {
-   constructors {
-      custom_constructor_1 {
+   methods {
+      custom_constructor_1 @constructor {
          params {
             @in int a;
             @in char b;
          }
       }
-      custom_constructor_2 {
+      custom_constructor_2 @constructor {
       }
    }
    implements {

diff --git a/src/tests/eolian/data/object_impl.eo b/src/tests/eolian/data/object_impl.eo
index 0eb08e056b2eb93cd4a7518c998d29347ef25c85..425002d6e67b1b0cc3b2a3e5b83d76dcbdaf5b62 100644 (file)
--- a/src/tests/eolian/data/object_impl.eo
+++ b/src/tests/eolian/data/object_impl.eo
@@ -1,14 +1,4 @@
 class Object_Impl (Base) {
-   constructors {
-      constructor_1 {
-         params {
-            @in int a;
-            @in char b;
-         }
-      }
-      constructor_2 {
-      }
-   }
    properties {
       a {
          set {
@@ -36,6 +26,14 @@ class Object_Impl (Base) {
       }
    }
    methods {
+      constructor_1 @constructor {
+         params {
+            @in int a;
+            @in char b;
+         }
+      }
+      constructor_2 @constructor {
+      }
       foo1 {
          /*@ comment foo */
          params {

diff --git a/src/tests/eolian_cxx/callback.eo b/src/tests/eolian_cxx/callback.eo
index f1825c99efc462b3472aab010bc722e491a9f664..24cfa729ff63e80b3686f2e78440c3ab2f154331 100644 (file)
--- a/src/tests/eolian_cxx/callback.eo
+++ b/src/tests/eolian_cxx/callback.eo
@@ -2,24 +2,22 @@ class Callback (Eo.Base)
 {
    legacy_prefix: null;
    data: Callback_Data;
-   constructors {
-      default_constructor {
+   methods {
+      default_constructor @constructor {
       }
-      constructor {
+      constructor @constructor {
          params {
             @in Ecore_Cb cb;
             @in void* data;
          }
       }
-      constructor2 {
+      constructor2 @constructor {
          params {
             @in Ecore_Cb cb;
             @in void* data;
             @in Ecore_Cb cb2;
          }
       }
-   }
-   methods {
       onecallback {
          params {
            @in Ecore_Cb cb;
@@ -37,5 +35,4 @@ class Callback (Eo.Base)
    events {
      call_on_add;
    }
-}
-       
\ No newline at end of file
+}
\ No newline at end of file