vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eolian-cxx: Update examples syntax and fix implementation accordingly.

This commit is contained in:
Savio Sena 2014-09-12 16:12:04 -03:00
parent b2d8a216f1
commit 1eb8967dee
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/examples/eolian_cxx/colourable.c
View File

@ -27,7 +27,7 @@ struct _Colourable_Data
typedef struct _Colourable_Data Colourable_Data; typedef struct _Colourable_Data Colourable_Data;
void void
_colourable_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED) _colourable_eo_base_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
{ {
if(!_colourable_impl_logdomain) if(!_colourable_impl_logdomain)
{ {
@ -39,7 +39,7 @@ _colourable_constructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
} }
void void
_colourable_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED) _colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
{ {
if(_colourable_impl_logdomain) if(_colourable_impl_logdomain)
{ {

9
src/examples/eolian_cxx/colourable.eo
View File

@ -4,10 +4,6 @@ class Colourable (Eo.Base)
legacy_prefix: legacy; legacy_prefix: legacy;
data: Colourable_Data; data: Colourable_Data;
methods { methods {
constructor {
/*@ Default constructor. */
legacy: null;
}
rgb_composite_constructor { rgb_composite_constructor {
/*@ Composite RGB Constructor. */ /*@ Composite RGB Constructor. */
legacy: null; legacy: null;
@ -59,8 +55,11 @@ class Colourable (Eo.Base)
} }
} }
} }
implements {
Eo.Base.constructor;
Eo.Base.destructor;
}
constructors { constructors {
.constructor;
.rgb_composite_constructor; .rgb_composite_constructor;
.rgb_24bits_constructor; .rgb_24bits_constructor;
} }

4
src/examples/eolian_cxx/colourable_cxx.cc
View File

@ -20,7 +20,7 @@ extern "C"
static efl::eina::log_domain domain("colourable"); static efl::eina::log_domain domain("colourable");
void void
_colourable_constructor(Eo *obj, Colourable_Data *self) _colourable_eo_base_constructor(Eo *obj, Colourable_Data *self)
{ {
EINA_CXX_DOM_LOG_DBG(domain) << __func__ << std::endl; EINA_CXX_DOM_LOG_DBG(domain) << __func__ << std::endl;
self->r = self->g = self->b = 0; self->r = self->g = self->b = 0;
@ -28,7 +28,7 @@ _colourable_constructor(Eo *obj, Colourable_Data *self)
} }
void void
_colourable_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED) _colourable_eo_base_destructor(Eo *obj, Colourable_Data *self EINA_UNUSED)
{ {
EINA_CXX_DOM_LOG_DBG(domain) << __func__ << std::endl; EINA_CXX_DOM_LOG_DBG(domain) << __func__ << std::endl;
eo_do_super(obj, MY_CLASS, eo_destructor()); eo_do_super(obj, MY_CLASS, eo_destructor());

3
src/examples/eolian_cxx/colourable_stub.h
View File

@ -13,7 +13,8 @@ struct _Colourable_Data
}; };
typedef struct _Colourable_Data Colourable_Data; typedef struct _Colourable_Data Colourable_Data;
void _colourable_constructor(Eo *obj, Colourable_Data *self); void _colourable_eo_base_constructor(Eo *obj, Colourable_Data *self);
void _colourable_eo_base_destructor(Eo *obj, Colourable_Data *self);
void _colourable_rgb_composite_constructor(Eo *obj, Colourable_Data *self, int r, int g, int b); void _colourable_rgb_composite_constructor(Eo *obj, Colourable_Data *self, int r, int g, int b);
void _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data *self, int rgb); void _colourable_rgb_24bits_constructor(Eo *obj, Colourable_Data *self, int rgb);
void _colourable_print_colour(Eo *obj, Colourable_Data *self); void _colourable_print_colour(Eo *obj, Colourable_Data *self);

12
src/examples/eolian_cxx/colourablesquare.eo
View File

@ -3,12 +3,6 @@ class ColourableSquare (Colourable)
legacy_prefix: legacy; legacy_prefix: legacy;
data: ColourableSquare_Data; data: ColourableSquare_Data;
properties { properties {
size_constructor {
legacy: null;
params {
@in int size;
}
}
size { size {
set { set {
/*@ Sets size. */ /*@ Sets size. */
@ -22,6 +16,12 @@ class ColourableSquare (Colourable)
} }
} }
methods { methods {
size_constructor {
legacy: null;
params {
@in int size;
}
}
size_print { /*@ Show the square. */ } size_print { /*@ Show the square. */ }
} }
constructors { constructors {