q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d2702a4fad06b74e0d1daea83dc7e15dc9628a37
commit d2702a4fad06b74e0d1daea83dc7e15dc9628a37 Author: Daniel Kolesa <[email protected]> Date: Mon Sep 1 16:02:40 2014 +0100 eolian: remove @constructor syntax --- src/lib/eolian/Eolian.h | 10 ---------- src/lib/eolian/database_fill.c | 2 -- src/lib/eolian/database_function_api.c | 7 ------- src/lib/eolian/eo_definitions.h | 2 -- src/lib/eolian/eo_lexer.h | 6 +++--- src/lib/eolian/eo_parser.c | 15 ++------------- src/lib/eolian/eolian_database.h | 1 - 7 files changed, 5 insertions(+), 38 deletions(-) diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index c69870f..9cf640a 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h @@ -718,16 +718,6 @@ EAPI Eina_Bool eolian_function_is_legacy_only(const Eolian_Function *function_id EAPI Eina_Bool eolian_function_is_class(const Eolian_Function *function_id); /* - * @brief Get whether a function is constructing. - * - * @param[in] function_id Id of the function - * @return EINA_TRUE and EINA_FALSE respectively - * - * @ingroup Eolian - */ -EAPI Eina_Bool eolian_function_is_constructing(const Eolian_Function *function_id); - -/* * @brief Returns a parameter of a function pointed by its id. * * @param[in] function_id Id of the function diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c index 9f8a068..dbcade7 100644 --- a/src/lib/eolian/database_fill.c +++ b/src/lib/eolian/database_fill.c @@ -138,7 +138,6 @@ _db_fill_property(Eolian_Class *cl, Eo_Class_Def *kls, Eo_Property_Def *prop) foo_id->scope = prop->scope; foo_id->is_class = prop->is_class; - foo_id->is_constructing = prop->is_constructing; if (!_db_fill_params (prop->keys , &(foo_id->keys ))) goto failure; if (!_db_fill_params (prop->values, &(foo_id->params))) goto failure; @@ -197,7 +196,6 @@ _db_fill_method(Eolian_Class *cl, Eo_Class_Def *kls, Eo_Method_Def *meth) foo_id->get_legacy = eina_stringshare_ref(meth->legacy); foo_id->obj_is_const = meth->obj_const; foo_id->is_class = meth->is_class; - foo_id->is_constructing = meth->is_constructing; if (meth->only_legacy) foo_id->get_only_legacy = EINA_TRUE; diff --git a/src/lib/eolian/database_function_api.c b/src/lib/eolian/database_function_api.c index ecd1853..d467eaf 100644 --- a/src/lib/eolian/database_function_api.c +++ b/src/lib/eolian/database_function_api.c @@ -111,13 +111,6 @@ eolian_function_is_class(const Eolian_Function *fid) return fid->is_class; } -EAPI Eina_Bool -eolian_function_is_constructing(const Eolian_Function *fid) -{ - EINA_SAFETY_ON_NULL_RETURN_VAL(fid, EINA_FALSE); - return fid->is_constructing; -} - EAPI const Eolian_Function_Parameter * eolian_function_parameter_get_by_name(const Eolian_Function *fid, const char *param_name) { diff --git a/src/lib/eolian/eo_definitions.h b/src/lib/eolian/eo_definitions.h index 0ef9a71..533e0bd 100644 --- a/src/lib/eolian/eo_definitions.h +++ b/src/lib/eolian/eo_definitions.h @@ -64,7 +64,6 @@ typedef struct _Eo_Property_Def Eina_List *accessors; int scope; Eina_Bool is_class:1; - Eina_Bool is_constructing:1; } Eo_Property_Def; /* METHOD */ @@ -80,7 +79,6 @@ typedef struct _Eo_Method_Def Eina_Bool obj_const; int scope; Eina_Bool is_class:1; - Eina_Bool is_constructing:1; Eina_Bool only_legacy:1; } Eo_Method_Def; diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h index 92aa831..18b215e 100644 --- a/src/lib/eolian/eo_lexer.h +++ b/src/lib/eolian/eo_lexer.h @@ -28,9 +28,9 @@ enum Tokens KW(get), KW(implements), KW(interface), KW(keys), KW(legacy), \ KW(legacy_prefix), KW(methods), KW(mixin), KW(own), KW(params), \ KW(properties), KW(set), KW(type), KW(values), KW(var), KWAT(auto), \ - KWAT(class), KWAT(const), KWAT(constructor), KWAT(empty), KWAT(extern), \ - KWAT(free), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(out), \ - KWAT(private), KWAT(protected), KWAT(virtual), KWAT(warn_unused), \ + KWAT(class), KWAT(const), KWAT(empty), KWAT(extern), KWAT(free), \ + KWAT(in), KWAT(inout), KWAT(nonull), KWAT(out), KWAT(private), \ + KWAT(protected), KWAT(virtual), KWAT(warn_unused), \ \ KW(byte), KW(ubyte), KW(char), KW(short), KW(ushort), KW(int), KW(uint), \ KW(long), KW(ulong), KW(llong), KW(ullong), \ diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index 6ce69c6..370ae25 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -1296,8 +1296,7 @@ parse_property(Eo_Lexer *ls) Eo_Property_Def *prop = NULL; Eina_Bool has_get = EINA_FALSE, has_set = EINA_FALSE, has_keys = EINA_FALSE, has_values = EINA_FALSE, - has_protected = EINA_FALSE, has_class = EINA_FALSE, - has_constructor = EINA_FALSE; + has_protected = EINA_FALSE, has_class = EINA_FALSE; prop = calloc(1, sizeof(Eo_Property_Def)); prop->base.file = eina_stringshare_ref(ls->filename); prop->base.line = ls->line_number; @@ -1318,11 +1317,6 @@ parse_property(Eo_Lexer *ls) prop->is_class = EINA_TRUE; eo_lexer_get(ls); break; - case KW_at_constructor: - CASE_LOCK(ls, constructor, "constructor qualifier"); - eo_lexer_get(ls); - prop->is_constructing = EINA_TRUE; - break; default: goto body; } @@ -1378,7 +1372,7 @@ parse_method(Eo_Lexer *ls, Eina_Bool ctor) Eina_Bool has_const = EINA_FALSE, has_params = EINA_FALSE, has_return = EINA_FALSE, has_legacy = EINA_FALSE, has_protected = EINA_FALSE, has_class = EINA_FALSE, - has_constructor = EINA_FALSE, has_eo = EINA_FALSE; + has_eo = EINA_FALSE; meth = calloc(1, sizeof(Eo_Method_Def)); meth->base.file = eina_stringshare_ref(ls->filename); meth->base.line = ls->line_number; @@ -1423,11 +1417,6 @@ parse_method(Eo_Lexer *ls, Eina_Bool ctor) meth->is_class = EINA_TRUE; eo_lexer_get(ls); break; - case KW_at_constructor: - CASE_LOCK(ls, constructor, "constructor qualifier"); - meth->is_constructing = EINA_TRUE; - eo_lexer_get(ls); - break; default: goto body; } diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h index 82ecd84..ba4cb7b 100644 --- a/src/lib/eolian/eolian_database.h +++ b/src/lib/eolian/eolian_database.h @@ -111,7 +111,6 @@ struct _Eolian_Function Eina_Bool get_only_legacy: 1; Eina_Bool set_only_legacy: 1; Eina_Bool is_class :1; - Eina_Bool is_constructing :1; }; struct _Eolian_Function_Parameter --
