summaryrefslogtreecommitdiff
path: root/src/lib/eolian
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2019-08-16 16:27:00 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2019-08-16 16:27:00 +0200
commit8a8a833837f7217aea0a33f4f7afbb6edfb103c4 (patch)
tree3aa8c36b1a2ad17f6d3b0917a0359597e13cc1e8 /src/lib/eolian
parent491a9a5bf842d151b1e2138a4b2f1b9d17f7b085 (diff)
eolian: rename @class on methods to @static
Ref https://phab.enlightenment.org/T8118 Ref https://phab.enlightenment.org/T7675
Diffstat (limited to 'src/lib/eolian')
-rw-r--r--src/lib/eolian/database_function_api.c2
-rw-r--r--src/lib/eolian/eo_lexer.h4
-rw-r--r--src/lib/eolian/eo_parser.c8
-rw-r--r--src/lib/eolian/eolian_database.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/eolian/database_function_api.c b/src/lib/eolian/database_function_api.c
index 123b99b..910f2b8 100644
--- a/src/lib/eolian/database_function_api.c
+++ b/src/lib/eolian/database_function_api.c
@@ -120,7 +120,7 @@ EAPI Eina_Bool
120eolian_function_is_class(const Eolian_Function *fid) 120eolian_function_is_class(const Eolian_Function *fid)
121{ 121{
122 EINA_SAFETY_ON_NULL_RETURN_VAL(fid, EINA_FALSE); 122 EINA_SAFETY_ON_NULL_RETURN_VAL(fid, EINA_FALSE);
123 return fid->is_class; 123 return fid->is_static;
124} 124}
125 125
126EAPI Eina_Bool 126EAPI Eina_Bool
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index c70b1c9..805589e 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -33,11 +33,11 @@ enum Tokens
33 KW(keys), KW(legacy), KW(methods), KW(mixin), KW(params), \ 33 KW(keys), KW(legacy), KW(methods), KW(mixin), KW(params), \
34 KW(parse), KW(parts), KW(ptr), KW(set), KW(type), KW(values), KW(var), KW(requires), \ 34 KW(parse), KW(parts), KW(ptr), KW(set), KW(type), KW(values), KW(var), KW(requires), \
35 \ 35 \
36 KWAT(auto), KWAT(beta), KWAT(c_name), KWAT(class), KWAT(const), KWAT(cref), \ 36 KWAT(auto), KWAT(beta), KWAT(c_name), KWAT(const), KWAT(cref), \
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(no_unused), KWAT(nullable), KWAT(optional), KWAT(out), KWAT(owned), \ 38 KWAT(no_unused), KWAT(nullable), KWAT(optional), KWAT(out), KWAT(owned), \
39 KWAT(private), KWAT(property), KWAT(protected), KWAT(restart), \ 39 KWAT(private), KWAT(property), KWAT(protected), KWAT(restart), \
40 KWAT(pure_virtual), \ 40 KWAT(pure_virtual), KWAT(static), \
41 \ 41 \
42 KWH(version), \ 42 KWH(version), \
43 \ 43 \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index da606f9..cf8a25b 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1318,9 +1318,9 @@ parse_property(Eo_Lexer *ls)
1318 prop->get_scope = prop->set_scope = EOLIAN_SCOPE_PROTECTED; 1318 prop->get_scope = prop->set_scope = EOLIAN_SCOPE_PROTECTED;
1319 eo_lexer_get(ls); 1319 eo_lexer_get(ls);
1320 break; 1320 break;
1321 case KW_at_class: 1321 case KW_at_static:
1322 CASE_LOCK(ls, class, "class qualifier"); 1322 CASE_LOCK(ls, class, "class qualifier");
1323 prop->is_class = EINA_TRUE; 1323 prop->is_static = EINA_TRUE;
1324 eo_lexer_get(ls); 1324 eo_lexer_get(ls);
1325 break; 1325 break;
1326 case KW_at_beta: 1326 case KW_at_beta:
@@ -1514,9 +1514,9 @@ parse_method(Eo_Lexer *ls)
1514 meth->obj_is_const = EINA_TRUE; 1514 meth->obj_is_const = EINA_TRUE;
1515 eo_lexer_get(ls); 1515 eo_lexer_get(ls);
1516 break; 1516 break;
1517 case KW_at_class: 1517 case KW_at_static:
1518 CASE_LOCK(ls, class, "class qualifier"); 1518 CASE_LOCK(ls, class, "class qualifier");
1519 meth->is_class = EINA_TRUE; 1519 meth->is_static = EINA_TRUE;
1520 eo_lexer_get(ls); 1520 eo_lexer_get(ls);
1521 break; 1521 break;
1522 case KW_at_beta: 1522 case KW_at_beta:
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 4c08874..1e26e24 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -230,7 +230,7 @@ struct _Eolian_Function
230 Eina_Bool obj_is_const :1; /* True if the object has to be const. Useful for a few methods. */ 230 Eina_Bool obj_is_const :1; /* True if the object has to be const. Useful for a few methods. */
231 Eina_Bool get_return_no_unused :1; /* also used for methods */ 231 Eina_Bool get_return_no_unused :1; /* also used for methods */
232 Eina_Bool set_return_no_unused :1; 232 Eina_Bool set_return_no_unused :1;
233 Eina_Bool is_class :1; 233 Eina_Bool is_static :1;
234 Eina_List *ctor_of; 234 Eina_List *ctor_of;
235 Eolian_Class *klass; 235 Eolian_Class *klass;
236}; 236};