q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e9f4890747dd617e7af2c1cc995b5882ad58da71
commit e9f4890747dd617e7af2c1cc995b5882ad58da71
Author: Daniel Kolesa <d.kol...@samsung.com>
Date: Fri Jun 20 10:45:55 2014 +0100
eolian: fix end-of-file checking, move namespaces from :: to .
---
src/lib/ecore/ecore_animator.eo | 8 ++--
src/lib/ecore/ecore_idle_enterer.eo | 4 +-
src/lib/ecore/ecore_idle_exiter.eo | 4 +-
src/lib/ecore/ecore_idler.eo | 4 +-
src/lib/ecore/ecore_job.eo | 4 +-
src/lib/ecore/ecore_poll.eo | 4 +-
src/lib/ecore/ecore_timer.eo | 10 ++---
src/lib/ecore_audio/ecore_audio.eo | 12 +++---
src/lib/ecore_audio/ecore_audio_in.eo | 14 +++----
src/lib/ecore_audio/ecore_audio_in_sndfile.eo | 18 ++++-----
src/lib/ecore_audio/ecore_audio_in_tone.eo | 12 +++---
src/lib/ecore_audio/ecore_audio_out.eo | 6 +--
src/lib/ecore_audio/ecore_audio_out_pulse.eo | 10 ++---
src/lib/ecore_audio/ecore_audio_out_sndfile.eo | 14 +++----
src/lib/edje/edje.eo | 24 ++++++------
src/lib/edje/edje_edit.eo | 8 ++--
src/lib/eo/eo_base.eo | 4 +-
src/lib/eolian/eo_lexer.c | 54 ++++++++++++++------------
src/lib/eolian/eo_lexer.h | 3 +-
src/lib/eolian/eo_parser.c | 44 ++++++++++-----------
src/lib/eolian/eolian_database.c | 18 ++++-----
src/lib/evas/canvas/evas.eo | 10 ++---
src/lib/evas/canvas/evas_3d_camera.eo | 8 ++--
src/lib/evas/canvas/evas_3d_light.eo | 8 ++--
src/lib/evas/canvas/evas_3d_material.eo | 8 ++--
src/lib/evas/canvas/evas_3d_mesh.eo | 8 ++--
src/lib/evas/canvas/evas_3d_node.eo | 8 ++--
src/lib/evas/canvas/evas_3d_object.eo | 8 ++--
src/lib/evas/canvas/evas_3d_scene.eo | 8 ++--
src/lib/evas/canvas/evas_3d_texture.eo | 8 ++--
src/lib/evas/canvas/evas_box.eo | 34 ++++++++--------
src/lib/evas/canvas/evas_common_interface.eo | 2 +-
src/lib/evas/canvas/evas_grid.eo | 2 +-
src/lib/evas/canvas/evas_image.eo | 6 +--
src/lib/evas/canvas/evas_line.eo | 2 +-
src/lib/evas/canvas/evas_object.eo | 14 +++----
src/lib/evas/canvas/evas_object_smart.eo | 16 ++++----
src/lib/evas/canvas/evas_out.eo | 4 +-
src/lib/evas/canvas/evas_polygon.eo | 4 +-
src/lib/evas/canvas/evas_rectangle.eo | 2 +-
src/lib/evas/canvas/evas_signal_interface.eo | 4 +-
src/lib/evas/canvas/evas_smart_clipped.eo | 22 +++++------
src/lib/evas/canvas/evas_table.eo | 12 +++---
src/lib/evas/canvas/evas_text.eo | 8 ++--
src/lib/evas/canvas/evas_textblock.eo | 6 +--
src/lib/evas/canvas/evas_textgrid.eo | 6 +--
src/tests/eolian/data/base.eo | 2 +-
src/tests/eolian/data/class_simple.eo | 2 +-
src/tests/eolian/data/ctor_dtor.eo | 8 ++--
src/tests/eolian/data/namespace.eo | 14 +++----
src/tests/eolian/data/object_impl.eo | 12 +++---
src/tests/eolian/data/override.eo | 6 +--
52 files changed, 273 insertions(+), 268 deletions(-)
diff --git a/src/lib/ecore/ecore_animator.eo b/src/lib/ecore/ecore_animator.eo
index 37301f9..98cc077 100644
--- a/src/lib/ecore/ecore_animator.eo
+++ b/src/lib/ecore/ecore_animator.eo
@@ -19,9 +19,9 @@ class Ecore_Animator (Eo_Base)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Eo_Base::event_freeze;
- Eo_Base::event_thaw;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Eo_Base.event_freeze;
+ Eo_Base.event_thaw;
}
}
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_idle_enterer.eo
b/src/lib/ecore/ecore_idle_enterer.eo
index 538965b..f015a19 100644
--- a/src/lib/ecore/ecore_idle_enterer.eo
+++ b/src/lib/ecore/ecore_idle_enterer.eo
@@ -18,7 +18,7 @@ class Ecore_Idle_Enterer (Eo_Base)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
}
}
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_idle_exiter.eo
b/src/lib/ecore/ecore_idle_exiter.eo
index eefe4a0..cac3ccb 100644
--- a/src/lib/ecore/ecore_idle_exiter.eo
+++ b/src/lib/ecore/ecore_idle_exiter.eo
@@ -11,7 +11,7 @@ class Ecore_Idle_Exiter (Eo_Base)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
}
}
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_idler.eo b/src/lib/ecore/ecore_idler.eo
index 567ed7a..b9a7769 100644
--- a/src/lib/ecore/ecore_idler.eo
+++ b/src/lib/ecore/ecore_idler.eo
@@ -11,7 +11,7 @@ class Ecore_Idler (Eo_Base)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
}
}
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_job.eo b/src/lib/ecore/ecore_job.eo
index 381ae10..85cc169 100644
--- a/src/lib/ecore/ecore_job.eo
+++ b/src/lib/ecore/ecore_job.eo
@@ -11,7 +11,7 @@ class Ecore_Job (Eo_Base)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
}
}
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_poll.eo b/src/lib/ecore/ecore_poll.eo
index 3c1de10..577f910 100644
--- a/src/lib/ecore/ecore_poll.eo
+++ b/src/lib/ecore/ecore_poll.eo
@@ -38,7 +38,7 @@ class Ecore_Poller (Eo_Base)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
}
}
\ No newline at end of file
diff --git a/src/lib/ecore/ecore_timer.eo b/src/lib/ecore/ecore_timer.eo
index 82993ef..31039dc 100644
--- a/src/lib/ecore/ecore_timer.eo
+++ b/src/lib/ecore/ecore_timer.eo
@@ -58,10 +58,10 @@ class Ecore_Timer (Eo_Base)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Eo_Base::event_freeze;
- Eo_Base::event_freeze_count::get;
- Eo_Base::event_thaw;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Eo_Base.event_freeze;
+ Eo_Base.event_freeze_count.get;
+ Eo_Base.event_thaw;
}
}
diff --git a/src/lib/ecore_audio/ecore_audio.eo
b/src/lib/ecore_audio/ecore_audio.eo
index ace7e80..6480a27 100644
--- a/src/lib/ecore_audio/ecore_audio.eo
+++ b/src/lib/ecore_audio/ecore_audio.eo
@@ -115,11 +115,11 @@ class Ecore_Audio (Eo_Base)
}
}
implements {
- Eo_Base::constructor;
- virtual::source::get;
- virtual::source::set;
- virtual::format::get;
- virtual::format::set;
- virtual::vio_set;
+ Eo_Base.constructor;
+ virtual.source.get;
+ virtual.source.set;
+ virtual.format.get;
+ virtual.format.set;
+ virtual.vio_set;
}
}
diff --git a/src/lib/ecore_audio/ecore_audio_in.eo
b/src/lib/ecore_audio/ecore_audio_in.eo
index 5347c3f..f5fe573 100644
--- a/src/lib/ecore_audio/ecore_audio_in.eo
+++ b/src/lib/ecore_audio/ecore_audio_in.eo
@@ -173,13 +173,13 @@ class Ecore_Audio_In (Ecore_Audio)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Ecore_Audio::vio_set;
- virtual::preloaded::get;
- virtual::preloaded::set;
- virtual::seek;
- virtual::length::set;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Ecore_Audio.vio_set;
+ virtual.preloaded.get;
+ virtual.preloaded.set;
+ virtual.seek;
+ virtual.length.set;
}
events {
in,looped; /*@ Called when an input has looped. */
diff --git a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
index 296a3e3..db337b9 100644
--- a/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_sndfile.eo
@@ -2,14 +2,14 @@ class Ecore_Audio_In_Sndfile (Ecore_Audio_In)
{
eo_prefix: ecore_audio_obj_in_sndfile;
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Ecore_Audio::source::set;
- Ecore_Audio::source::get;
- Ecore_Audio::format::set;
- Ecore_Audio::format::get;
- Ecore_Audio::vio_set;
- Ecore_Audio_In::seek;
- Ecore_Audio_In::read_internal;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Ecore_Audio.source.set;
+ Ecore_Audio.source.get;
+ Ecore_Audio.format.set;
+ Ecore_Audio.format.get;
+ Ecore_Audio.vio_set;
+ Ecore_Audio_In.seek;
+ Ecore_Audio_In.read_internal;
}
}
\ No newline at end of file
diff --git a/src/lib/ecore_audio/ecore_audio_in_tone.eo
b/src/lib/ecore_audio/ecore_audio_in_tone.eo
index d097051..496aef2 100644
--- a/src/lib/ecore_audio/ecore_audio_in_tone.eo
+++ b/src/lib/ecore_audio/ecore_audio_in_tone.eo
@@ -2,11 +2,11 @@ class Ecore_Audio_In_Tone (Ecore_Audio_In)
{
eo_prefix: ecore_audio_obj_in_tone;
implements {
- Eo_Base::constructor;
- Eo_Base::key_data_set;
- Eo_Base::key_data_get;
- Ecore_Audio_In::length::set;
- Ecore_Audio_In::seek;
- Ecore_Audio_In::read_internal;
+ Eo_Base.constructor;
+ Eo_Base.key_data_set;
+ Eo_Base.key_data_get;
+ Ecore_Audio_In.length.set;
+ Ecore_Audio_In.seek;
+ Ecore_Audio_In.read_internal;
}
}
diff --git a/src/lib/ecore_audio/ecore_audio_out.eo
b/src/lib/ecore_audio/ecore_audio_out.eo
index 843309a..bfb8045 100644
--- a/src/lib/ecore_audio/ecore_audio_out.eo
+++ b/src/lib/ecore_audio/ecore_audio_out.eo
@@ -33,8 +33,8 @@ class Ecore_Audio_Out (Ecore_Audio)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Ecore_Audio::vio_set;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Ecore_Audio.vio_set;
}
}
diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo
b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
index 8c4b886..a542d61 100644
--- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo
@@ -2,11 +2,11 @@ class Ecore_Audio_Out_Pulse (Ecore_Audio_Out)
{
eo_prefix: ecore_audio_obj_out_pulse;
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Ecore_Audio::volume::set;
- Ecore_Audio_Out::input_attach;
- Ecore_Audio_Out::input_detach;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Ecore_Audio.volume.set;
+ Ecore_Audio_Out.input_attach;
+ Ecore_Audio_Out.input_detach;
}
events {
context,ready; /*@ Called when the output is ready for playback. */
diff --git a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
index 2164949..9e7553d 100644
--- a/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
+++ b/src/lib/ecore_audio/ecore_audio_out_sndfile.eo
@@ -2,12 +2,12 @@ class Ecore_Audio_Out_Sndfile (Ecore_Audio_Out)
{
eo_prefix: ecore_audio_obj_out_sndfile;
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Ecore_Audio::source::get;
- Ecore_Audio::source::set;
- Ecore_Audio::format::get;
- Ecore_Audio::format::set;
- Ecore_Audio_Out::input_attach;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Ecore_Audio.source.get;
+ Ecore_Audio.source.set;
+ Ecore_Audio.format.get;
+ Ecore_Audio.format.set;
+ Ecore_Audio_Out.input_attach;
}
}
\ No newline at end of file
diff --git a/src/lib/edje/edje.eo b/src/lib/edje/edje.eo
index 733e99d..efa56ba 100644
--- a/src/lib/edje/edje.eo
+++ b/src/lib/edje/edje.eo
@@ -1957,7 +1957,7 @@ class Edje (Evas_Smart_Clipped)
@in const Edje_External_Param *param; /*@ the parameter details,
including its name, type and
actual value. This pointer should be valid, and the
parameter must exist in
- #Edje_External_Type::parameters_info, with the exact type,
+ #Edje_External_Type.parameters_info, with the exact type,
otherwise the operation will fail and @c EINA_FALSE will be
returned. */
}
@@ -1988,7 +1988,7 @@ class Edje (Evas_Smart_Clipped)
@out Edje_External_Param param; /*@ the parameter details. It is
used as both input and
output variable. This pointer should be valid, and the
parameter must exist in
- #Edje_External_Type::parameters_info, with the exact type,
+ #Edje_External_Type.parameters_info, with the exact type,
otherwise the operation will fail and @c EINA_FALSE will be
returned. */
}
@@ -2493,15 +2493,15 @@ class Edje (Evas_Smart_Clipped)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Eo_Base::dbg_info_get;
- Evas_Object_Smart::hide;
- Evas_Object_Smart::calculate;
- Evas_Object_Smart::show;
- Evas_Object_Smart::move;
- Evas_Object_Smart::add;
- Evas_Object_Smart::del;
- Evas_Object_Smart::resize;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Eo_Base.dbg_info_get;
+ Evas_Object_Smart.hide;
+ Evas_Object_Smart.calculate;
+ Evas_Object_Smart.show;
+ Evas_Object_Smart.move;
+ Evas_Object_Smart.add;
+ Evas_Object_Smart.del;
+ Evas_Object_Smart.resize;
}
}
diff --git a/src/lib/edje/edje_edit.eo b/src/lib/edje/edje_edit.eo
index 403d30e..8dcdde0 100644
--- a/src/lib/edje/edje_edit.eo
+++ b/src/lib/edje/edje_edit.eo
@@ -2,9 +2,9 @@ class Edje_Edit (Edje)
{
data: Edje_Edit;
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Evas_Object_Smart::del;
- Edje::file::set;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Evas_Object_Smart.del;
+ Edje.file.set;
}
}
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 28cdbec..88b7e53 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -168,8 +168,8 @@ callbacks of the same priority are called in reverse order
of creation. */
}
}
implements {
- class::constructor;
- class::destructor;
+ class.constructor;
+ class.destructor;
}
events {
callback,add; /*@ A callback was added. */
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index e52a639..bb6ffab 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -8,14 +8,20 @@
int _eo_lexer_log_dom = -1;
-#define next_char(ls) (ls->current = *(ls->stream++))
+static void next_char(Eo_Lexer *ls)
+{
+ if (ls->stream == ls->stream_end)
+ ls->current = '\0';
+ else
+ ls->current = *(ls->stream++);
+}
#define KW(x) #x
#define KWAT(x) "@" #x
static const char * const tokens[] =
{
- "::", "<comment>", "<eof>", "<value>",
+ "<comment>", "<eof>", "<value>",
KEYWORDS
};
@@ -41,9 +47,9 @@ init_hash(void)
unsigned int i;
if (keyword_map) return;
keyword_map = eina_hash_string_superfast_new(NULL);
- for (i = 4; i < (sizeof(tokens) / sizeof(const char*)); ++i)
+ for (i = 3; i < (sizeof(tokens) / sizeof(const char*)); ++i)
{
- eina_hash_add(keyword_map, tokens[i], (void*)(size_t)(i - 3));
+ eina_hash_add(keyword_map, tokens[i], (void*)(size_t)(i - 2));
}
}
@@ -72,12 +78,14 @@ txt_token(Eo_Lexer *ls, int token, char *buf)
void eo_lexer_lex_error (Eo_Lexer *ls, const char *msg, int token);
void eo_lexer_syntax_error(Eo_Lexer *ls, const char *msg);
+#define is_newline(c) ((c) == '\n' || (c) == '\r')
+
static void next_line(Eo_Lexer *ls)
{
int old = ls->current;
- assert(strchr("\r\n", ls->current));
+ assert(is_newline(ls->current));
next_char(ls);
- if (strchr("\r\n", ls->current) && ls->current != old)
+ if (is_newline(ls->current) && ls->current != old)
next_char(ls);
if (++ls->line_number >= INT_MAX)
eo_lexer_syntax_error(ls, "chunk has too many lines");
@@ -87,7 +95,7 @@ static void next_line(Eo_Lexer *ls)
static void next_line_ws(Eo_Lexer *ls)
{
next_line(ls);
- while (isspace(ls->current) && !strchr("\r\n", ls->current))
+ while (isspace(ls->current) && !is_newline(ls->current))
next_char(ls);
}
@@ -96,7 +104,7 @@ read_long_comment(Eo_Lexer *ls, const char **value)
{
eina_strbuf_reset(ls->buff);
- if (strchr("\r\n", ls->current))
+ if (is_newline(ls->current))
next_line_ws(ls);
for (;;)
@@ -113,7 +121,7 @@ read_long_comment(Eo_Lexer *ls, const char **value)
}
eina_strbuf_append_char(ls->buff, '*');
}
- else if (strchr("\r\n", ls->current))
+ else if (is_newline(ls->current))
{
eina_strbuf_append_char(ls->buff, '\n');
next_line_ws(ls);
@@ -140,13 +148,6 @@ lex(Eo_Lexer *ls, const char **value, int *kwid, const
char *chars)
case '\r':
next_line(ls);
continue;
- case ':':
- {
- next_char(ls);
- if (ls->current != ':') return ':';
- next_char(ls);
- return TOK_DBCOLON;
- }
case '/':
{
next_char(ls);
@@ -163,7 +164,7 @@ lex(Eo_Lexer *ls, const char **value, int *kwid, const char
*chars)
continue;
}
else if (ls->current != '/') return '/';
- while (ls->current && !strchr("\r\n", ls->current))
+ while (ls->current && !is_newline(ls->current))
next_char(ls);
continue;
}
@@ -173,22 +174,24 @@ lex(Eo_Lexer *ls, const char **value, int *kwid, const
char *chars)
{
if (isspace(ls->current))
{
- assert(!strchr("\r\n", ls->current));
+ assert(!is_newline(ls->current));
next_char(ls);
continue;
}
- if (isalnum(ls->current) || ls->current == '@'
- || strchr(chars, ls->current))
+ if (ls->current && (isalnum(ls->current)
+ || ls->current == '@'
+ || strchr(chars, ls->current)))
{
Eina_Bool at_kw = (ls->current == '@');
const char *str;
eina_strbuf_reset(ls->buff);
do
- {
- eina_strbuf_append_char(ls->buff, ls->current);
- next_char(ls);
- } while (isalnum( ls->current)
- || strchr(chars, ls->current));
+ {
+ eina_strbuf_append_char(ls->buff, ls->current);
+ next_char(ls);
+ }
+ while (ls->current && (isalnum(ls->current)
+ || strchr(chars, ls->current)));
str = eina_strbuf_string_get(ls->buff);
*kwid = (int)(uintptr_t)eina_hash_find(keyword_map,
str);
@@ -263,6 +266,7 @@ eo_lexer_set_input(Eo_Lexer *ls, const char *source)
ls->buff = eina_strbuf_new();
ls->handle = f;
ls->stream = eina_file_map_all(f, EINA_FILE_RANDOM);
+ ls->stream_end = ls->stream + eina_file_size_get(f);
ls->source = eina_stringshare_add(source);
ls->line_number = 1;
next_char(ls);
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index eabf3b0..189c645 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -11,7 +11,7 @@
enum Tokens
{
- TOK_DBCOLON = START_CUSTOM, TOK_COMMENT, TOK_EOF, TOK_VALUE
+ TOK_COMMENT = START_CUSTOM, TOK_EOF, TOK_VALUE
};
#define KEYWORDS KW(class), KW(const), KW(private), KW(protected), \
@@ -51,6 +51,7 @@ typedef struct _Eo_Lexer
Eina_File *handle;
const char *source;
const char *stream;
+ const char *stream_end;
jmp_buf err_jmp;
Eina_List *classes;
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 716a314..35813d6 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -100,9 +100,9 @@ parse_name(Eo_Lexer *ls, Eina_Strbuf *buf)
{
eina_strbuf_append(buf, ls->t.value);
eo_lexer_get(ls);
- if (ls->t.token != TOK_DBCOLON) break;
+ if (ls->t.token != '.') break;
eo_lexer_get(ls);
- eina_strbuf_append(buf, "::");
+ eina_strbuf_append(buf, ".");
check(ls, TOK_VALUE);
}
return buf;
@@ -613,9 +613,9 @@ parse_implement(Eo_Lexer *ls)
ls->tmp.impl = impl;
if (ls->t.kw == KW_class)
{
- eina_strbuf_append(buf, "class::");
+ eina_strbuf_append(buf, "class.");
eo_lexer_get(ls);
- check_next(ls, TOK_DBCOLON);
+ check_next(ls, '.');
if (ls->t.kw == KW_destructor)
{
eina_strbuf_append(buf, "destructor");
@@ -633,25 +633,25 @@ parse_implement(Eo_Lexer *ls)
}
else if (ls->t.kw == KW_virtual)
{
- eina_strbuf_append(buf, "virtual::");
+ eina_strbuf_append(buf, "virtual.");
eo_lexer_get(ls);
- check_next(ls, TOK_DBCOLON);
+ check_next(ls, '.');
if ((ls->t.token != TOK_VALUE) || (ls->t.kw == KW_get || ls->t.kw ==
KW_set))
eo_lexer_syntax_error(ls, "name expected");
eina_strbuf_append(buf, ls->t.value);
eo_lexer_get(ls);
- if (ls->t.token == TOK_DBCOLON)
+ if (ls->t.token == '.')
{
eo_lexer_get(ls);
if (ls->t.kw == KW_set)
{
- eina_strbuf_append(buf, "::set");
+ eina_strbuf_append(buf, ".set");
eo_lexer_get(ls);
}
else
{
check_kw_next(ls, KW_get);
- eina_strbuf_append(buf, "::get");
+ eina_strbuf_append(buf, ".get");
}
}
check_next(ls, ';');
@@ -663,8 +663,8 @@ parse_implement(Eo_Lexer *ls)
eo_lexer_syntax_error(ls, "class name expected");
eina_strbuf_append(buf, ls->t.value);
eo_lexer_get(ls);
- check_next(ls, TOK_DBCOLON);
- eina_strbuf_append(buf, "::");
+ check_next(ls, '.');
+ eina_strbuf_append(buf, ".");
if ((ls->t.token != TOK_VALUE) || (ls->t.kw == KW_get || ls->t.kw ==
KW_set))
eo_lexer_syntax_error(ls, "name or constructor/destructor expected");
for (;;)
@@ -693,8 +693,8 @@ parse_implement(Eo_Lexer *ls)
check(ls, TOK_VALUE);
eina_strbuf_append(buf, ls->t.value);
eo_lexer_get(ls);
- if (ls->t.token != TOK_DBCOLON) break;
- eina_strbuf_append(buf, "::");
+ if (ls->t.token != '.') break;
+ eina_strbuf_append(buf, ".");
eo_lexer_get(ls);
}
end:
@@ -1294,29 +1294,29 @@ eo_parser_database_fill(const char *filename)
EINA_LIST_FOREACH(kls->implements, l, impl)
{
const char *impl_name = impl->meth_name;
- if (!strcmp(impl_name, "class::constructor"))
+ if (!strcmp(impl_name, "class.constructor"))
{
database_class_ctor_enable_set(class, EINA_TRUE);
continue;
}
- if (!strcmp(impl_name, "class::destructor"))
+ if (!strcmp(impl_name, "class.destructor"))
{
database_class_dtor_enable_set(class, EINA_TRUE);
continue;
}
- if (!strncmp(impl_name, "virtual::", 9))
+ if (!strncmp(impl_name, "virtual.", 8))
{
char *virtual_name = strdup(impl_name);
- char *func = strstr(virtual_name, "::");
+ char *func = strchr(virtual_name, '.');
if (func) *func = '\0';
- func += 2;
+ func += 1;
Eolian_Function_Type ftype = EOLIAN_UNRESOLVED;
- char *type_as_str = strstr(func, "::");
+ char *type_as_str = strchr(func, '.');
if (type_as_str)
{
*type_as_str = '\0';
- if (!strcmp(type_as_str+2, "set")) ftype =
EOLIAN_PROP_SET;
- else if (!strcmp(type_as_str+2, "get")) ftype =
EOLIAN_PROP_GET;
+ if (!strcmp(type_as_str+1, "set")) ftype =
EOLIAN_PROP_SET;
+ else if (!strcmp(type_as_str+1, "get")) ftype =
EOLIAN_PROP_GET;
}
/* Search the function into the existing functions of the
current class */
Eolian_Function foo_id = eolian_class_function_find_by_name(
@@ -1324,7 +1324,7 @@ eo_parser_database_fill(const char *filename)
free(virtual_name);
if (!foo_id)
{
- ERR("Error - %s not known in class %s", impl_name + 9,
eolian_class_name_get(class));
+ ERR("Error - %s not known in class %s", impl_name + 8,
eolian_class_name_get(class));
eo_lexer_free(ls);
return EINA_FALSE;
}
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 4572156..e2facec 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -237,12 +237,12 @@ database_class_add(const char *class_name,
Eolian_Class_Type type)
cl->type = type;
do
{
- colon = strstr(colon, "::");
+ colon = strchr(colon, '.');
if (colon)
{
*colon = '\0';
cl->namespaces = eina_list_append(cl->namespaces,
eina_stringshare_add(name));
- colon += 2;
+ colon += 1;
name = colon;
}
}
@@ -318,7 +318,7 @@ Eina_Bool database_class_name_validate(const char
*class_name, Eolian_Class *cla
if (class) *class = NULL;
do
{
- colon = strstr(colon, "::");
+ colon = strchr(colon, '.');
if (colon) *colon = '\0';
candidate = eolian_class_find_by_name(name);
if (candidate)
@@ -333,7 +333,7 @@ Eina_Bool database_class_name_validate(const char
*class_name, Eolian_Class *cla
}
found_class = candidate;
}
- if (colon) *colon++ = ':';
+ if (colon) *colon++ = '.';
}
while(colon);
if (class) *class = found_class;
@@ -582,14 +582,14 @@ eolian_implement_information_get(const Eolian_Implement
impl, Eolian_Class *clas
const char *class_name = ((_Class_Desc *)class)->full_name;
if (class_out) *class_out = class;
- char *func_name = strdup(_impl->full_name + strlen(class_name) + 2);
- char *colon = strstr(func_name, "::");
+ char *func_name = strdup(_impl->full_name + strlen(class_name) + 1);
+ char *colon = strchr(func_name, '.');
Eolian_Function_Type type = EOLIAN_UNRESOLVED;
if (colon)
{
*colon = '\0';
- if (!strcmp(colon+2, "set")) type = EOLIAN_PROP_SET;
- else if (!strcmp(colon+2, "get")) type = EOLIAN_PROP_GET;
+ if (!strcmp(colon+1, "set")) type = EOLIAN_PROP_SET;
+ else if (!strcmp(colon+1, "get")) type = EOLIAN_PROP_GET;
}
Eolian_Function fid = eolian_class_function_find_by_name(class, func_name,
type);
@@ -1395,7 +1395,7 @@ _eolian_class_to_filename(const char *filename)
char *ret;
Eina_Strbuf *strbuf = eina_strbuf_new();
eina_strbuf_append(strbuf, filename);
- eina_strbuf_replace_all(strbuf, "::", "_");
+ eina_strbuf_replace_all(strbuf, ".", "_");
ret = eina_strbuf_string_steal(strbuf);
eina_strbuf_free(strbuf);
diff --git a/src/lib/evas/canvas/evas.eo b/src/lib/evas/canvas/evas.eo
index 12a105c..85a6496 100644
--- a/src/lib/evas/canvas/evas.eo
+++ b/src/lib/evas/canvas/evas.eo
@@ -341,7 +341,7 @@ class Evas (Eo_Base, Evas_Common_Interface)
@see evas_key_lock_off
@see evas_key_lock_is_set
- @return An ::Evas_Lock handle to query Evas' keys subsystem with
+ @return An .Evas_Lock handle to query Evas' keys subsystem with
evas_key_lock_is_set(), or @c NULL on error. */
return const Evas_Lock * @warn_unused;
}
@@ -521,7 +521,7 @@ class Evas (Eo_Base, Evas_Common_Interface)
@see evas_key_modifier_off
@see evas_key_modifier_is_set
- @return An ::Evas_Modifier handle to query Evas' keys subsystem
+ @return An .Evas_Modifier handle to query Evas' keys subsystem
with evas_key_modifier_is_set(), or @c NULL on error. */
return const Evas_Modifier * @warn_unused;
}
@@ -1772,9 +1772,9 @@ class Evas (Eo_Base, Evas_Common_Interface)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Evas_Common_Interface::evas::get;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Evas_Common_Interface.evas.get;
}
}
diff --git a/src/lib/evas/canvas/evas_3d_camera.eo
b/src/lib/evas/canvas/evas_3d_camera.eo
index 24a6fe4..1f01050 100644
--- a/src/lib/evas/canvas/evas_3d_camera.eo
+++ b/src/lib/evas/canvas/evas_3d_camera.eo
@@ -100,10 +100,10 @@ class Evas_3D_Camera (Evas_3D_Object,
Evas_Common_Interface)
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Evas_3D_Object::update_notify;
- Evas_3D_Object::change_notify;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Evas_3D_Object.update_notify;
+ Evas_3D_Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_3d_light.eo
b/src/lib/evas/canvas/evas_3d_light.eo
index 5618a18..1eaa682 100644
--- a/src/lib/evas/canvas/evas_3d_light.eo
+++ b/src/lib/evas/canvas/evas_3d_light.eo
@@ -256,10 +256,10 @@ class Evas_3D_Light (Evas_3D_Object,
Evas_Common_Interface)
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Evas_3D_Object::update_notify;
- Evas_3D_Object::change_notify;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Evas_3D_Object.update_notify;
+ Evas_3D_Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_3d_material.eo
b/src/lib/evas/canvas/evas_3d_material.eo
index 590ab96..232cc31 100644
--- a/src/lib/evas/canvas/evas_3d_material.eo
+++ b/src/lib/evas/canvas/evas_3d_material.eo
@@ -148,10 +148,10 @@ class Evas_3D_Material (Evas_3D_Object,
Evas_Common_Interface)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Evas_3D_Object::update_notify;
- Evas_3D_Object::change_notify;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Evas_3D_Object.update_notify;
+ Evas_3D_Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_3d_mesh.eo
b/src/lib/evas/canvas/evas_3d_mesh.eo
index 342ce3d..7dd57bf 100644
--- a/src/lib/evas/canvas/evas_3d_mesh.eo
+++ b/src/lib/evas/canvas/evas_3d_mesh.eo
@@ -396,10 +396,10 @@ class Evas_3D_Mesh (Evas_3D_Object, Evas_Common_Interface)
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Evas_3D_Object::update_notify;
- Evas_3D_Object::change_notify;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Evas_3D_Object.update_notify;
+ Evas_3D_Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_3d_node.eo
b/src/lib/evas/canvas/evas_3d_node.eo
index 5abc1fc..7ec7e68 100644
--- a/src/lib/evas/canvas/evas_3d_node.eo
+++ b/src/lib/evas/canvas/evas_3d_node.eo
@@ -585,9 +585,9 @@ class Evas_3D_Node (Evas_3D_Object, Evas_Common_Interface)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Evas_3D_Object::update_notify;
- Evas_3D_Object::change_notify;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Evas_3D_Object.update_notify;
+ Evas_3D_Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_3d_object.eo
b/src/lib/evas/canvas/evas_3d_object.eo
index 4a12f28..4a2d30b 100644
--- a/src/lib/evas/canvas/evas_3d_object.eo
+++ b/src/lib/evas/canvas/evas_3d_object.eo
@@ -65,10 +65,10 @@ class Evas_3D_Object (Eo_Base, Evas_Common_Interface)
}
implements {
- Eo_Base::constructor;
- Evas_Common_Interface::evas::get;
- virtual::update_notify;
- virtual::change_notify;
+ Eo_Base.constructor;
+ Evas_Common_Interface.evas.get;
+ virtual.update_notify;
+ virtual.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_3d_scene.eo
b/src/lib/evas/canvas/evas_3d_scene.eo
index f1d37e5..05f5dd9 100644
--- a/src/lib/evas/canvas/evas_3d_scene.eo
+++ b/src/lib/evas/canvas/evas_3d_scene.eo
@@ -165,10 +165,10 @@ class Evas_3D_Scene (Evas_3D_Object,
Evas_Common_Interface)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Evas_3D_Object::update_notify;
- Evas_3D_Object::change_notify;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Evas_3D_Object.update_notify;
+ Evas_3D_Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_3d_texture.eo
b/src/lib/evas/canvas/evas_3d_texture.eo
index c9d6162..756007d 100644
--- a/src/lib/evas/canvas/evas_3d_texture.eo
+++ b/src/lib/evas/canvas/evas_3d_texture.eo
@@ -191,10 +191,10 @@ class Evas_3D_Texture (Evas_3D_Object,
Evas_Common_Interface)
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Evas_3D_Object::update_notify;
- Evas_3D_Object::change_notify;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Evas_3D_Object.update_notify;
+ Evas_3D_Object.change_notify;
}
}
diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo
index 45f3a8f..2017915 100644
--- a/src/lib/evas/canvas/evas_box.eo
+++ b/src/lib/evas/canvas/evas_box.eo
@@ -242,7 +242,7 @@ class Evas_Box (Evas_Smart_Clipped)
depend on the layout set to it.
@note This call will trigger the box's
- _Evas_Object_Box_Api::insert_after smart function. */
+ _Evas_Object_Box_Api.insert_after smart function. */
return Evas_Object_Box_Option *;
params {
@@ -306,7 +306,7 @@ class Evas_Box (Evas_Smart_Clipped)
an item in the end of the box's list of children will appear on its
right.
- @note This call will trigger the box's _Evas_Object_Box_Api::append
+ @note This call will trigger the box's _Evas_Object_Box_Api.append
smart function. */
return Evas_Object_Box_Option *;
@@ -326,7 +326,7 @@ class Evas_Box (Evas_Smart_Clipped)
users which have @b subclassed it, setting custom box items options
(see #Evas_Object_Box_Option) on it, would benefit from this
function. They'd have to implement it and set it to be the
- _Evas_Object_Box_Api::property_id_get smart class function of the
+ _Evas_Object_Box_Api.property_id_get smart class function of the
box, which is originally set to @c NULL. */
const;
@@ -351,7 +351,7 @@ class Evas_Box (Evas_Smart_Clipped)
on its left.
@note This call will trigger the box's
- _Evas_Object_Box_Api::prepend smart function. */
+ _Evas_Object_Box_Api.prepend smart function. */
return Evas_Object_Box_Option *;
params {
@@ -425,7 +425,7 @@ class Evas_Box (Evas_Smart_Clipped)
given @p o's internal list of elements.
@note This call will trigger the box's
- _Evas_Object_Box_Api::remove_at smart function. */
+ _Evas_Object_Box_Api.remove_at smart function. */
return Eina_Bool;
params {
@@ -482,7 +482,7 @@ class Evas_Box (Evas_Smart_Clipped)
depend on the layout set to it.
@note This call will trigger the box's
- _Evas_Object_Box_Api::insert_before smart function. */
+ _Evas_Object_Box_Api.insert_before smart function. */
return Evas_Object_Box_Option *;
params {
@@ -501,7 +501,7 @@ class Evas_Box (Evas_Smart_Clipped)
users which have @b subclassed it, setting custom box items options
(see #Evas_Object_Box_Option) on it, would benefit from this
function. They'd have to implement it and set it to be the
- _Evas_Object_Box_Api::property_name_get smart class function of the
+ _Evas_Object_Box_Api.property_name_get smart class function of the
box, which is originally set to @c NULL. */
const;
@@ -606,7 +606,7 @@ class Evas_Box (Evas_Smart_Clipped)
depend on the layout set to it.
@note This call will trigger the box's
- _Evas_Object_Box_Api::insert_at smart function. */
+ _Evas_Object_Box_Api.insert_at smart function. */
return Evas_Object_Box_Option *;
params {
@@ -631,11 +631,11 @@ class Evas_Box (Evas_Smart_Clipped)
On removal, you'll get an unparented object again, just as it was
before you inserted it in the box. The
- _Evas_Object_Box_Api::option_free box smart callback will be called
+ _Evas_Object_Box_Api.option_free box smart callback will be called
automatically for you and, also, the @c "child,removed" smart event
will take place.
- @note This call will trigger the box's _Evas_Object_Box_Api::remove
+ @note This call will trigger the box's _Evas_Object_Box_Api.remove
smart function. */
return Eina_Bool;
@@ -725,13 +725,13 @@ class Evas_Box (Evas_Smart_Clipped)
}
}
implements {
- class::constructor;
- Eo_Base::constructor;
- Evas_Object::smart_data::get;
- Evas_Object_Smart::calculate;
- Evas_Object_Smart::add;
- Evas_Object_Smart::del;
- Evas_Object_Smart::resize;
+ class.constructor;
+ Eo_Base.constructor;
+ Evas_Object.smart_data.get;
+ Evas_Object_Smart.calculate;
+ Evas_Object_Smart.add;
+ Evas_Object_Smart.del;
+ Evas_Object_Smart.resize;
}
events {
child,added;
diff --git a/src/lib/evas/canvas/evas_common_interface.eo
b/src/lib/evas/canvas/evas_common_interface.eo
index 8a221b8..a71b618 100644
--- a/src/lib/evas/canvas/evas_common_interface.eo
+++ b/src/lib/evas/canvas/evas_common_interface.eo
@@ -14,6 +14,6 @@ interface Evas_Common_Interface ()
}
}
implements {
- virtual::evas::get;
+ virtual.evas.get;
}
}
\ No newline at end of file
diff --git a/src/lib/evas/canvas/evas_grid.eo b/src/lib/evas/canvas/evas_grid.eo
index e573f36..507cc3c 100644
--- a/src/lib/evas/canvas/evas_grid.eo
+++ b/src/lib/evas/canvas/evas_grid.eo
@@ -150,6 +150,6 @@ class Evas_Grid (Evas_Smart_Clipped)
}
}
implements {
- Eo_Base::constructor;
+ Eo_Base.constructor;
}
}
diff --git a/src/lib/evas/canvas/evas_image.eo
b/src/lib/evas/canvas/evas_image.eo
index 1a1d5ec..a3513e2 100644
--- a/src/lib/evas/canvas/evas_image.eo
+++ b/src/lib/evas/canvas/evas_image.eo
@@ -1244,8 +1244,8 @@ class Evas_Image (Evas_Object)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Eo_Base::dbg_info_get;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Eo_Base.dbg_info_get;
}
}
diff --git a/src/lib/evas/canvas/evas_line.eo b/src/lib/evas/canvas/evas_line.eo
index aa99a09..77482dd 100644
--- a/src/lib/evas/canvas/evas_line.eo
+++ b/src/lib/evas/canvas/evas_line.eo
@@ -24,7 +24,7 @@ class Evas_Line (Evas_Object)
}
}
implements {
- Eo_Base::constructor;
+ Eo_Base.constructor;
}
}
diff --git a/src/lib/evas/canvas/evas_object.eo
b/src/lib/evas/canvas/evas_object.eo
index 948f35a..b8ec811 100644
--- a/src/lib/evas/canvas/evas_object.eo
+++ b/src/lib/evas/canvas/evas_object.eo
@@ -475,7 +475,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
This function returns the object clipping @p obj. If @p obj is
not being clipped at all, @c NULL is returned. The object @p obj
- must be a valid ::Evas_Object.
+ must be a valid .Evas_Object.
See also evas_object_clip_set(), evas_object_clip_unset() and
evas_object_clipees_get().
@@ -1158,7 +1158,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
returned, so it should not be used anymore after that point. Any
use of the list after this may have undefined results, possibly
leading to crashes. The object @p obj must be a valid
- ::Evas_Object.
+ .Evas_Object.
See also evas_object_clip_set(), evas_object_clip_unset() and
evas_object_clip_get().
@@ -1466,7 +1466,7 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
This function disables clipping for the object @p obj, if it was
already clipped, i.e., its visibility and color get detached from
the previous clipper. If it wasn't, this has no effect. The object
- @p obj must be a valid ::Evas_Object.
+ @p obj must be a valid .Evas_Object.
See also evas_object_clip_set() (for an example),
evas_object_clipees_get() and evas_object_clip_get(). */
@@ -1511,10 +1511,10 @@ abstract Evas_Object (Eo_Base, Evas_Common_Interface)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Eo_Base::dbg_info_get;
- Evas_Common_Interface::evas::get;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Eo_Base.dbg_info_get;
+ Evas_Common_Interface.evas.get;
}
}
diff --git a/src/lib/evas/canvas/evas_object_smart.eo
b/src/lib/evas/canvas/evas_object_smart.eo
index d594f0b..3d60891 100644
--- a/src/lib/evas/canvas/evas_object_smart.eo
+++ b/src/lib/evas/canvas/evas_object_smart.eo
@@ -147,7 +147,7 @@ class Evas_Object_Smart (Evas_Object, Evas_Signal_Interface)
@note Becase @p descriptions must be @c NULL terminated, and
because a @c NULL name makes little sense, too,
- Evas_Smart_Cb_Description::name must @b not be @c NULL.
+ Evas_Smart_Cb_Description.name must @b not be @c NULL.
@note While instance callbacks descriptions are possible, they are
@b not recommended. Use @b class callbacks descriptions
@@ -173,7 +173,7 @@ class Evas_Object_Smart (Evas_Object, Evas_Signal_Interface)
This call searches for registered callback descriptions for both
instance and class of the given smart object. These arrays will be
- sorted by Evas_Smart_Cb_Description::name and also @c NULL
+ sorted by Evas_Smart_Cb_Description.name and also @c NULL
terminated, so both @a class_count and @a instance_count can be
ignored, if the caller wishes so. The terminator @c NULL is not
counted in these values.
@@ -351,11 +351,11 @@ class Evas_Object_Smart (Evas_Object,
Evas_Signal_Interface)
}
}
implements {
- class::constructor;
- class::destructor;
- Eo_Base::constructor;
- Evas_Object::smart_type_check_ptr;
- Evas_Object::smart_type_check;
- Evas_Object::smart_data::get;
+ class.constructor;
+ class.destructor;
+ Eo_Base.constructor;
+ Evas_Object.smart_type_check_ptr;
+ Evas_Object.smart_type_check;
+ Evas_Object.smart_data.get;
}
}
diff --git a/src/lib/evas/canvas/evas_out.eo b/src/lib/evas/canvas/evas_out.eo
index 1b777ef..a1e6d8f 100644
--- a/src/lib/evas/canvas/evas_out.eo
+++ b/src/lib/evas/canvas/evas_out.eo
@@ -31,8 +31,8 @@ class Evas_Out (Eo_Base)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
}
}
\ No newline at end of file
diff --git a/src/lib/evas/canvas/evas_polygon.eo
b/src/lib/evas/canvas/evas_polygon.eo
index 4a35704..d841857 100644
--- a/src/lib/evas/canvas/evas_polygon.eo
+++ b/src/lib/evas/canvas/evas_polygon.eo
@@ -18,8 +18,8 @@ class Evas_Polygon (Evas_Object)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
}
}
diff --git a/src/lib/evas/canvas/evas_rectangle.eo
b/src/lib/evas/canvas/evas_rectangle.eo
index 4453686..3999b85 100644
--- a/src/lib/evas/canvas/evas_rectangle.eo
+++ b/src/lib/evas/canvas/evas_rectangle.eo
@@ -3,6 +3,6 @@ class Evas_Rectangle (Evas_Object)
legacy_prefix: evas_object_rectangle;
eo_prefix: evas_obj_rectangle;
implements {
- Eo_Base::constructor;
+ Eo_Base.constructor;
}
}
diff --git a/src/lib/evas/canvas/evas_signal_interface.eo
b/src/lib/evas/canvas/evas_signal_interface.eo
index f15ea3a..ed385f1 100644
--- a/src/lib/evas/canvas/evas_signal_interface.eo
+++ b/src/lib/evas/canvas/evas_signal_interface.eo
@@ -2,7 +2,7 @@ interface Evas_Signal_Interface ()
{
data: null;
implements {
- class::constructor;
- class::destructor;
+ class.constructor;
+ class.destructor;
}
}
diff --git a/src/lib/evas/canvas/evas_smart_clipped.eo
b/src/lib/evas/canvas/evas_smart_clipped.eo
index 625a347..51a5349 100644
--- a/src/lib/evas/canvas/evas_smart_clipped.eo
+++ b/src/lib/evas/canvas/evas_smart_clipped.eo
@@ -5,16 +5,16 @@ class Evas_Smart_Clipped (Evas_Object_Smart)
data: Evas_Object_Smart_Clipped_Data;
implements {
- Eo_Base::constructor;
- Evas_Object_Smart::hide;
- Evas_Object_Smart::clip::set;
- Evas_Object_Smart::clip_unset;
- Evas_Object_Smart::show;
- Evas_Object_Smart::color::set;
- Evas_Object_Smart::move;
- Evas_Object_Smart::member_del;
- Evas_Object_Smart::add;
- Evas_Object_Smart::del;
- Evas_Object_Smart::member_add;
+ Eo_Base.constructor;
+ Evas_Object_Smart.hide;
+ Evas_Object_Smart.clip.set;
+ Evas_Object_Smart.clip_unset;
+ Evas_Object_Smart.show;
+ Evas_Object_Smart.color.set;
+ Evas_Object_Smart.move;
+ Evas_Object_Smart.member_del;
+ Evas_Object_Smart.add;
+ Evas_Object_Smart.del;
+ Evas_Object_Smart.member_add;
}
}
diff --git a/src/lib/evas/canvas/evas_table.eo
b/src/lib/evas/canvas/evas_table.eo
index b28b5ec..dd5dc4f 100644
--- a/src/lib/evas/canvas/evas_table.eo
+++ b/src/lib/evas/canvas/evas_table.eo
@@ -239,11 +239,11 @@ class Evas_Table (Evas_Smart_Clipped)
}
}
implements {
- class::constructor;
- Eo_Base::constructor;
- Evas_Object_Smart::add;
- Evas_Object_Smart::del;
- Evas_Object_Smart::calculate;
- Evas_Object_Smart::resize;
+ class.constructor;
+ Eo_Base.constructor;
+ Evas_Object_Smart.add;
+ Evas_Object_Smart.del;
+ Evas_Object_Smart.calculate;
+ Evas_Object_Smart.resize;
}
}
diff --git a/src/lib/evas/canvas/evas_text.eo b/src/lib/evas/canvas/evas_text.eo
index 3103d93..4356ae8 100644
--- a/src/lib/evas/canvas/evas_text.eo
+++ b/src/lib/evas/canvas/evas_text.eo
@@ -439,9 +439,9 @@ class Evas_Text (Evas_Object)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Eo_Base::dbg_info_get;
- Evas_Object::size::set;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Eo_Base.dbg_info_get;
+ Evas_Object.size.set;
}
}
diff --git a/src/lib/evas/canvas/evas_textblock.eo
b/src/lib/evas/canvas/evas_textblock.eo
index 96abedf..e464512 100644
--- a/src/lib/evas/canvas/evas_textblock.eo
+++ b/src/lib/evas/canvas/evas_textblock.eo
@@ -304,8 +304,8 @@ class Evas_Textblock (Evas_Object)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Eo_Base::dbg_info_get;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Eo_Base.dbg_info_get;
}
}
diff --git a/src/lib/evas/canvas/evas_textgrid.eo
b/src/lib/evas/canvas/evas_textgrid.eo
index 9a75bae..f2ca8e4 100644
--- a/src/lib/evas/canvas/evas_textgrid.eo
+++ b/src/lib/evas/canvas/evas_textgrid.eo
@@ -276,9 +276,9 @@ class Evas_Textgrid (Evas_Object)
}
}
implements {
- Eo_Base::constructor;
- Eo_Base::destructor;
- Eo_Base::dbg_info_get;
+ Eo_Base.constructor;
+ Eo_Base.destructor;
+ Eo_Base.dbg_info_get;
}
}
diff --git a/src/tests/eolian/data/base.eo b/src/tests/eolian/data/base.eo
index ca5d2aa..f6e83d7 100644
--- a/src/tests/eolian/data/base.eo
+++ b/src/tests/eolian/data/base.eo
@@ -8,6 +8,6 @@ class Base {
}
}
implements {
- virtual::constructor;
+ virtual.constructor;
}
}
diff --git a/src/tests/eolian/data/class_simple.eo
b/src/tests/eolian/data/class_simple.eo
index a694a67..843e745 100644
--- a/src/tests/eolian/data/class_simple.eo
+++ b/src/tests/eolian/data/class_simple.eo
@@ -7,7 +7,7 @@ class Simple {
a {
set {
/*@
- comment a::set */
+ comment a.set */
return Eina_Bool (EINA_TRUE); /*@ comment for property set return
*/
}
get {
diff --git a/src/tests/eolian/data/ctor_dtor.eo
b/src/tests/eolian/data/ctor_dtor.eo
index b0b1fea..047a668 100644
--- a/src/tests/eolian/data/ctor_dtor.eo
+++ b/src/tests/eolian/data/ctor_dtor.eo
@@ -10,9 +10,9 @@ class Ctor_Dtor (Base) {
}
}
implements {
- class::constructor;
- class::destructor;
- Base::constructor;
- Base::destructor;
+ class.constructor;
+ class.destructor;
+ Base.constructor;
+ Base.destructor;
}
}
diff --git a/src/tests/eolian/data/namespace.eo
b/src/tests/eolian/data/namespace.eo
index f71d5b2..a5f0b96 100644
--- a/src/tests/eolian/data/namespace.eo
+++ b/src/tests/eolian/data/namespace.eo
@@ -1,4 +1,4 @@
-class nmsp1::nmsp11::class2
+class nmsp1.nmsp11.class2
{
properties {
a {
@@ -7,11 +7,11 @@ class nmsp1::nmsp11::class2
}
}
implements {
- virtual::a::set;
+ virtual.a.set;
}
}
-class nmsp2::class1
+class nmsp2.class1
{
}
@@ -23,11 +23,11 @@ class no_nmsp
}
}
-class nmsp1::class1 (nmsp1::nmsp11::class2, nmsp2::class1, no_nmsp)
+class nmsp1.class1 (nmsp1.nmsp11.class2, nmsp2.class1, no_nmsp)
{
implements {
- nmsp1::nmsp11::class2::a::set;
- nmsp1::bad_class::a::set;
- no_nmsp::foo;
+ nmsp1.nmsp11.class2.a.set;
+ nmsp1.bad_class.a.set;
+ no_nmsp.foo;
}
}
diff --git a/src/tests/eolian/data/object_impl.eo
b/src/tests/eolian/data/object_impl.eo
index d250c85..2bedbfd 100644
--- a/src/tests/eolian/data/object_impl.eo
+++ b/src/tests/eolian/data/object_impl.eo
@@ -58,11 +58,11 @@ class Object (Base) {
}
}
implements {
- class::constructor;
- class::destructor;
- Base::constructor;
- Base::destructor;
- virtual::pure_foo3;
- virtual::b::get;
+ class.constructor;
+ class.destructor;
+ Base.constructor;
+ Base.destructor;
+ virtual.pure_foo3;
+ virtual.b.get;
}
}
diff --git a/src/tests/eolian/data/override.eo
b/src/tests/eolian/data/override.eo
index c0107b0..de54316 100644
--- a/src/tests/eolian/data/override.eo
+++ b/src/tests/eolian/data/override.eo
@@ -12,8 +12,8 @@ class Simple (Base) {
}
}
implements {
- Base::constructor;
- virtual::a::set;
- virtual::foo;
+ Base.constructor;
+ virtual.a.set;
+ virtual.foo;
}
}
--
