q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a6e5caba10228d2fd63f7ffe6715b582bc49814a
commit a6e5caba10228d2fd63f7ffe6715b582bc49814a Author: Daniel Kolesa <[email protected]> Date: Fri Sep 22 18:08:36 2017 +0200 eolian: remove leftover code --- src/lib/eolian/database_expr_api.c | 2 +- src/lib/eolian/database_type.c | 13 +++++-------- src/lib/eolian/database_validate.c | 2 +- src/lib/eolian/eo_parser.c | 39 +++++++++++++++++++------------------- src/lib/eolian/eolian_database.h | 2 +- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/src/lib/eolian/database_expr_api.c b/src/lib/eolian/database_expr_api.c index 50a0afab44..9e8e1f61fd 100644 --- a/src/lib/eolian/database_expr_api.c +++ b/src/lib/eolian/database_expr_api.c @@ -29,7 +29,7 @@ _eval_type(const Eolian_Unit *unit, const Eolian_Expression *expr, return database_expr_eval(unit, expr, EOLIAN_MASK_NULL); case EOLIAN_TYPE_REGULAR: { - if (database_type_is_ownable(type, EINA_FALSE)) + if (database_type_is_ownable(type)) return database_expr_eval(unit, expr, EOLIAN_MASK_NULL); int kw = eo_lexer_keyword_str_to_id(type->name); if (!kw || kw < KW_byte || kw >= KW_void) diff --git a/src/lib/eolian/database_type.c b/src/lib/eolian/database_type.c index dda298fbe2..1afbbac14a 100644 --- a/src/lib/eolian/database_type.c +++ b/src/lib/eolian/database_type.c @@ -80,17 +80,14 @@ static const Eina_Bool _ownable_types[] = { }; Eina_Bool -database_type_is_ownable(const Eolian_Type *tp, Eina_Bool term) +database_type_is_ownable(const Eolian_Type *tp) { if (tp->is_ptr) return EINA_TRUE; if (tp->type == EOLIAN_TYPE_REGULAR) { - int kwid = eo_lexer_keyword_str_to_id(tp->name); - /* don't include bool, it only has 2 values so it's useless */ - if (term && (kwid >= KW_byte && kwid < KW_bool)) - return EINA_TRUE; - const char *ct = eo_lexer_get_c_type(kwid); + int kw = eo_lexer_keyword_str_to_id(tp->name); + const char *ct = eo_lexer_get_c_type(kw); if (!ct) { const Eolian_Typedecl *tpp = eolian_type_typedecl_get(tp); @@ -99,7 +96,7 @@ database_type_is_ownable(const Eolian_Type *tp, Eina_Bool term) if (tpp->type == EOLIAN_TYPEDECL_FUNCTION_POINTER) return EINA_TRUE; if (tpp->type == EOLIAN_TYPEDECL_ALIAS) - return database_type_is_ownable(tpp->base_type, term); + return database_type_is_ownable(tpp->base_type); return EINA_FALSE; } return (ct[strlen(ct) - 1] == '*'); @@ -124,7 +121,7 @@ database_type_to_str(const Eolian_Type *tp, Eina_Strbuf *buf, const char *name, || tp->type == EOLIAN_TYPE_CLASS || tp->type == EOLIAN_TYPE_VOID) && tp->is_const - && ((ctype != EOLIAN_C_TYPE_RETURN) || database_type_is_ownable(tp, EINA_FALSE))) + && ((ctype != EOLIAN_C_TYPE_RETURN) || database_type_is_ownable(tp))) { eina_strbuf_append(buf, "const "); } diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c index 0a296224da..7ef27acdd3 100644 --- a/src/lib/eolian/database_validate.c +++ b/src/lib/eolian/database_validate.c @@ -149,7 +149,7 @@ _validate_type(Eolian_Type *tp) { char buf[256]; - if (tp->owned && !database_type_is_ownable(tp, EINA_FALSE)) + if (tp->owned && !database_type_is_ownable(tp)) { snprintf(buf, sizeof(buf), "type '%s' is not ownable", tp->full_name); return _type_error(tp, buf); diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index a3bdc8c41c..a1e27134bf 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -455,15 +455,14 @@ parse_expr(Eo_Lexer *ls) return parse_expr_bin(ls, 1); } -static Eolian_Type *parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, - Eina_Bool allow_sarray); +static Eolian_Type *parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref); static Eolian_Type * -parse_type(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray) +parse_type(Eo_Lexer *ls, Eina_Bool allow_ref) { Eolian_Type *ret; eo_lexer_context_push(ls); - ret = parse_type_void(ls, allow_ref, allow_sarray); + ret = parse_type_void(ls, allow_ref); if (ret->type == EOLIAN_TYPE_VOID) { eo_lexer_context_restore(ls); @@ -512,7 +511,7 @@ parse_struct(Eo_Lexer *ls, const char *name, Eina_Bool is_extern, def->field_list = eina_list_append(def->field_list, fdef); eo_lexer_get(ls); check_next(ls, ':'); - tp = parse_type(ls, EINA_TRUE, EINA_TRUE); + tp = parse_type(ls, EINA_TRUE); FILL_BASE(fdef->base, ls, fline, fcol); fdef->type = tp; fdef->name = eina_stringshare_ref(fname); @@ -687,7 +686,7 @@ _parse_dep(Eo_Lexer *ls, const char *fname, const char *name) } static Eolian_Type * -parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray) +parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref) { Eolian_Type *def; Eina_Strbuf *buf; @@ -701,7 +700,7 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray) pline = ls->line_number; pcol = ls->column; check_next(ls, '('); - def = parse_type_void(ls, allow_ref, EINA_FALSE); + def = parse_type_void(ls, allow_ref); FILL_BASE(def->base, ls, line, col); def->is_const = EINA_TRUE; check_match(ls, ')', '(', pline, pcol); @@ -714,7 +713,7 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray) pline = ls->line_number; pcol = ls->column; check_next(ls, '('); - def = parse_type_void(ls, EINA_FALSE, EINA_FALSE); + def = parse_type_void(ls, EINA_FALSE); FILL_BASE(def->base, ls, line, col); def->is_ptr = EINA_TRUE; check_match(ls, ')', '(', pline, pcol); @@ -727,7 +726,7 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray) pline = ls->line_number; pcolumn = ls->column; check_next(ls, '('); - def = parse_type_void(ls, allow_ref, EINA_FALSE); + def = parse_type_void(ls, allow_ref); check_next(ls, ','); check(ls, TOK_VALUE); def->freefunc = eina_stringshare_ref(ls->t.value.s); @@ -766,23 +765,23 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ref, Eina_Bool allow_sarray) int bline = ls->line_number, bcol = ls->column; check_next(ls, '<'); if (tpid == KW_future) - def->base_type = parse_type_void(ls, EINA_FALSE, EINA_FALSE); + def->base_type = parse_type_void(ls, EINA_FALSE); else - def->base_type = parse_type(ls, EINA_FALSE, EINA_FALSE); + def->base_type = parse_type(ls, EINA_FALSE); pop_type(ls); if ((def->base_type->owned = (ls->t.kw == KW_at_owned))) eo_lexer_get(ls); if (tpid == KW_hash) { check_next(ls, ','); - def->base_type->next_type = parse_type(ls, EINA_FALSE, EINA_FALSE); + def->base_type->next_type = parse_type(ls, EINA_FALSE); pop_type(ls); if ((def->base_type->next_type->owned = (ls->t.kw == KW_at_owned))) eo_lexer_get(ls); } else if((tpid == KW_future) && test_next(ls, ',')) { - def->base_type->next_type = parse_type_void(ls, EINA_FALSE, EINA_FALSE); + def->base_type->next_type = parse_type_void(ls, EINA_FALSE); pop_type(ls); } check_match(ls, '>', '<', bline, bcol); @@ -852,7 +851,7 @@ parse_typedef(Eo_Lexer *ls) } eo_lexer_context_pop(ls); check_next(ls, ':'); - def->base_type = parse_type(ls, EINA_FALSE, EINA_FALSE); + def->base_type = parse_type(ls, EINA_FALSE); pop_type(ls); check_next(ls, ';'); FILL_DOC(ls, def, doc); @@ -888,7 +887,7 @@ parse_variable(Eo_Lexer *ls, Eina_Bool global) } eo_lexer_context_pop(ls); check_next(ls, ':'); - def->base_type = parse_type(ls, EINA_FALSE, EINA_FALSE); + def->base_type = parse_type(ls, EINA_FALSE); pop_type(ls); /* constants are required to have a value */ if (!global) @@ -924,9 +923,9 @@ parse_return(Eo_Lexer *ls, Eo_Ret_Def *ret, Eina_Bool allow_void, eo_lexer_get(ls); check_next(ls, ':'); if (allow_void) - ret->type = parse_type_void(ls, EINA_TRUE, EINA_FALSE); + ret->type = parse_type_void(ls, EINA_TRUE); else - ret->type = parse_type(ls, EINA_TRUE, EINA_FALSE); + ret->type = parse_type(ls, EINA_TRUE); ret->doc = NULL; ret->default_ret_val = NULL; ret->warn_unused = EINA_FALSE; @@ -992,9 +991,9 @@ parse_param(Eo_Lexer *ls, Eina_List **params, Eina_Bool allow_inout, eo_lexer_get(ls); check_next(ls, ':'); if (par->param_dir == EOLIAN_OUT_PARAM || par->param_dir == EOLIAN_INOUT_PARAM) - par->type = parse_type_void(ls, EINA_TRUE, EINA_FALSE); + par->type = parse_type_void(ls, EINA_TRUE); else - par->type = parse_type(ls, EINA_TRUE, EINA_FALSE); + par->type = parse_type(ls, EINA_TRUE); pop_type(ls); if ((is_vals || (par->param_dir == EOLIAN_OUT_PARAM)) && (ls->t.token == '(')) { @@ -1752,7 +1751,7 @@ end: if (ls->t.token == ':') { eo_lexer_get(ls); - ev->type = parse_type(ls, EINA_TRUE, EINA_FALSE); + ev->type = parse_type(ls, EINA_TRUE); ev->type->owned = has_owned; pop_type(ls); } diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h index 1a165a42e8..9858db4c31 100644 --- a/src/lib/eolian/eolian_database.h +++ b/src/lib/eolian/eolian_database.h @@ -313,7 +313,7 @@ void database_typedecl_del(Eolian_Typedecl *tp); void database_type_to_str(const Eolian_Type *tp, Eina_Strbuf *buf, const char *name, Eolian_C_Type_Type ctype); void database_typedecl_to_str(const Eolian_Unit *src, const Eolian_Typedecl *tp, Eina_Strbuf *buf); -Eina_Bool database_type_is_ownable(const Eolian_Type *tp, Eina_Bool term); +Eina_Bool database_type_is_ownable(const Eolian_Type *tp); /* expressions */ --
