summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2019-09-06 17:07:01 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2019-09-06 17:07:01 +0200
commit3b540fc9f93e63cd2d1d687ee1108542627628fd (patch)
tree17e0d185998de2f40d9898d0dfbaf86fad4893b0
parent4f4b58bf4c6c7638c4073ae092b0a870b95a199e (diff)
eolian: remove @owned keyword
-rw-r--r--src/lib/eolian/eo_lexer.h2
-rw-r--r--src/lib/eolian/eo_parser.c7
2 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 96e385952f..e95258d420 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -36,7 +36,7 @@ enum Tokens
36 KWAT(auto), KWAT(beta), KWAT(by_ref), KWAT(c_name), KWAT(const), \ 36 KWAT(auto), KWAT(beta), KWAT(by_ref), KWAT(c_name), KWAT(const), \
37 KWAT(empty), KWAT(extern), KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), \ 37 KWAT(empty), KWAT(extern), KWAT(free), KWAT(hot), KWAT(in), KWAT(inout), \
38 KWAT(move), KWAT(no_unused), KWAT(nullable), KWAT(optional), KWAT(out), \ 38 KWAT(move), KWAT(no_unused), KWAT(nullable), KWAT(optional), KWAT(out), \
39 KWAT(owned), KWAT(private), KWAT(property), KWAT(protected), KWAT(restart), \ 39 KWAT(private), KWAT(property), KWAT(protected), KWAT(restart), \
40 KWAT(pure_virtual), KWAT(static), \ 40 KWAT(pure_virtual), KWAT(static), \
41 \ 41 \
42 KWH(version), \ 42 KWH(version), \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index e010a3fc30..3786dcc198 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -525,7 +525,6 @@ parse_struct(Eo_Lexer *ls, const char *name, Eina_Bool is_extern,
525 fdef->by_ref = EINA_TRUE; 525 fdef->by_ref = EINA_TRUE;
526 eo_lexer_get(ls); 526 eo_lexer_get(ls);
527 break; 527 break;
528 case KW_at_owned:
529 case KW_at_move: 528 case KW_at_move:
530 CASE_LOCK(ls, owned, "owned qualifier"); 529 CASE_LOCK(ls, owned, "owned qualifier");
531 fdef->type->owned = fdef->move = EINA_TRUE; 530 fdef->type->owned = fdef->move = EINA_TRUE;
@@ -774,14 +773,14 @@ parse_type_void(Eo_Lexer *ls, Eina_Bool allow_ptr)
774 def->base_type = eo_lexer_type_release(ls, parse_type(ls, EINA_TRUE)); 773 def->base_type = eo_lexer_type_release(ls, parse_type(ls, EINA_TRUE));
775 /* view-only types are not allowed to own the contents */ 774 /* view-only types are not allowed to own the contents */
776 if (tpid == KW_array || tpid == KW_hash || tpid == KW_list || tpid == KW_future) 775 if (tpid == KW_array || tpid == KW_hash || tpid == KW_list || tpid == KW_future)
777 if ((def->base_type->owned = def->base_type->move = (ls->t.kw == KW_at_owned || ls->t.kw == KW_at_move))) 776 if ((def->base_type->owned = def->base_type->move = ls->t.kw == KW_at_move))
778 eo_lexer_get(ls); 777 eo_lexer_get(ls);
779 if (tpid == KW_hash) 778 if (tpid == KW_hash)
780 { 779 {
781 check_next(ls, ','); 780 check_next(ls, ',');
782 def->base_type->next_type = 781 def->base_type->next_type =
783 eo_lexer_type_release(ls, parse_type(ls, EINA_TRUE)); 782 eo_lexer_type_release(ls, parse_type(ls, EINA_TRUE));
784 if ((def->base_type->next_type->owned = def->base_type->next_type->move = (ls->t.kw == KW_at_owned || ls->t.kw == KW_at_move))) 783 if ((def->base_type->next_type->owned = def->base_type->next_type->move = ls->t.kw == KW_at_move))
785 eo_lexer_get(ls); 784 eo_lexer_get(ls);
786 } 785 }
787 check_match(ls, '>', '<', bline, bcol); 786 check_match(ls, '>', '<', bline, bcol);
@@ -1058,7 +1057,6 @@ parse_return(Eo_Lexer *ls, Eo_Ret_Def *ret, Eina_Bool allow_void,
1058 ret->no_unused = EINA_TRUE; 1057 ret->no_unused = EINA_TRUE;
1059 eo_lexer_get(ls); 1058 eo_lexer_get(ls);
1060 break; 1059 break;
1061 case KW_at_owned:
1062 case KW_at_move: 1060 case KW_at_move:
1063 CASE_LOCK(ls, owned, "owned qualifier"); 1061 CASE_LOCK(ls, owned, "owned qualifier");
1064 ret->owned = EINA_TRUE; 1062 ret->owned = EINA_TRUE;
@@ -1130,7 +1128,6 @@ parse_param(Eo_Lexer *ls, Eina_List **params, Eina_Bool allow_inout,
1130 par->optional = EINA_TRUE; 1128 par->optional = EINA_TRUE;
1131 eo_lexer_get(ls); 1129 eo_lexer_get(ls);
1132 break; 1130 break;
1133 case KW_at_owned:
1134 case KW_at_move: 1131 case KW_at_move:
1135 CASE_LOCK(ls, owned, "owned qualifier"); 1132 CASE_LOCK(ls, owned, "owned qualifier");
1136 par->type->owned = par->move = EINA_TRUE; 1133 par->type->owned = par->move = EINA_TRUE;