q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=71b217451dadb451a4a1696a3009be9629ab4b78
commit 71b217451dadb451a4a1696a3009be9629ab4b78 Author: Daniel Kolesa <[email protected]> Date: Tue Dec 27 19:37:15 2016 +0100 eolian: remove old property impl syntax and clean up parsing --- src/lib/eolian/eo_parser.c | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index 451e883..9ade9e6 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -1543,54 +1543,30 @@ parse_implement(Eo_Lexer *ls, Eina_Bool iface) if (!impl->is_auto && !impl->is_empty) goto fullclass; check_next(ls, '.'); - if ((ls->t.token != TOK_VALUE) || (ls->t.kw == KW_get || ls->t.kw == KW_set)) + if (ls->t.token != TOK_VALUE) eo_lexer_syntax_error(ls, "name expected"); impl->full_name = eina_stringshare_printf(".%s", ls->t.value.s); eo_lexer_get(ls); goto propbeg; } fullclass: - if ((ls->t.token != TOK_VALUE) || (ls->t.kw == KW_get || ls->t.kw == KW_set)) + if (ls->t.token != TOK_VALUE) eo_lexer_syntax_error(ls, "class name expected"); buf = push_strbuf(ls); eina_strbuf_append(buf, ls->t.value.s); eo_lexer_get(ls); check_next(ls, '.'); - if ((ls->t.token != TOK_VALUE) || (ls->t.kw == KW_get || ls->t.kw == KW_set)) + if (ls->t.token != TOK_VALUE) eo_lexer_syntax_error(ls, "name or constructor/destructor expected"); for (;;) { - switch (ls->t.kw) + if ((ls->t.kw == KW_constructor) || (ls->t.kw == KW_destructor)) { - case KW_constructor: - case KW_destructor: eina_strbuf_append_char(buf, '.'); eina_strbuf_append(buf, eo_lexer_keyword_str_get(ls->t.kw)); eo_lexer_get(ls); check_next(ls, ';'); goto end; - case KW_get: - if (getenv("EOLIAN_WARN_PROP_IMPLEMENTS")) - { - printf("eolian:%s:%d: old style getter implement syntax\n", - ls->filename, ls->line_number); - } - impl->is_prop_get = EINA_TRUE; - eo_lexer_get(ls); - check_next(ls, ';'); - goto end; - case KW_set: - if (getenv("EOLIAN_WARN_PROP_IMPLEMENTS")) - { - printf("eolian:%s:%d: old style setter implement syntax\n", - ls->filename, ls->line_number); - } - impl->is_prop_set = EINA_TRUE; - eo_lexer_get(ls); - check_next(ls, ';'); - goto end; - default: - break; } eina_strbuf_append_char(buf, '.'); check(ls, TOK_VALUE); --
