q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=4b427d6c1616e2261b476810b9f95b03f0ab2ca1
commit 4b427d6c1616e2261b476810b9f95b03f0ab2ca1 Author: Daniel Kolesa <[email protected]> Date: Thu Jul 10 15:40:58 2014 +0100 eolian: remove redundant enum --- src/lib/eolian/eo_definitions.h | 13 ++----------- src/lib/eolian/eo_parser.c | 14 +++++++------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/src/lib/eolian/eo_definitions.h b/src/lib/eolian/eo_definitions.h index ec1878c..b6b487f 100644 --- a/src/lib/eolian/eo_definitions.h +++ b/src/lib/eolian/eo_definitions.h @@ -18,17 +18,9 @@ typedef struct _Eo_Ret_Def /* PARAM */ -typedef enum _Param_Way -{ - PARAM_IN, - PARAM_OUT, - PARAM_INOUT, - PARAM_WAY_LAST -} Param_Way; - typedef struct _Eo_Param_Def { - Param_Way way; + Eolian_Parameter_Dir way; Eolian_Type *type; Eina_Stringshare *name; Eina_Stringshare *comment; @@ -40,8 +32,7 @@ typedef struct _Eo_Param_Def typedef enum _Eo_Accessor_Type { SETTER, - GETTER, - ACCESSOR_TYPE_LAST + GETTER } Eo_Accessor_Type; typedef struct _Eo_Accessor_Param diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index fb64b92..8960729 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -436,23 +436,23 @@ parse_param(Eo_Lexer *ls, Eina_Bool allow_inout) { if (ls->t.kw == KW_at_in) { - par->way = PARAM_IN; + par->way = EOLIAN_IN_PARAM; eo_lexer_get(ls); } else if (ls->t.kw == KW_at_out) { - par->way = PARAM_OUT; + par->way = EOLIAN_OUT_PARAM; eo_lexer_get(ls); } else if (ls->t.kw == KW_at_inout) { - par->way = PARAM_INOUT; + par->way = EOLIAN_INOUT_PARAM; eo_lexer_get(ls); } else - par->way = PARAM_IN; + par->way = EOLIAN_IN_PARAM; } - if (par->way == PARAM_OUT) + if (par->way == EOLIAN_OUT_PARAM) par->type = parse_type_void(ls); else par->type = parse_type(ls); @@ -1054,8 +1054,8 @@ parse_chunk(Eo_Lexer *ls, Eina_Bool eot) parse_unit(ls, eot); } -static char *_accessor_type_str[ACCESSOR_TYPE_LAST] = { "setter", "getter" }; -static char * _param_way_str[ PARAM_WAY_LAST] = { "IN", "OUT", "INOUT" }; +static char *_accessor_type_str[2] = { "setter", "getter" }; +static char * _param_way_str[3] = { "IN", "OUT", "INOUT" }; static void _dump_class(Eo_Class_Def *kls) --
