summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-01-13 15:40:29 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-01-13 15:40:29 +0100
commit692ae7adb65d700c0387696a9fd789fe761ccfca (patch)
tree90b2117e6b9b76bf8a27c098db66a950ae679f87 /src
parenta70645e154950140c8d3883a5bc99d3d259ff32a (diff)
eolian: use consistent pure_virtual naming in API
Previously one API used just virtual (incorrect) and one used virtual_pure (which just sounds weird). So unify with a single name, pure_virtual, similar as in other lanugages. This does not change eo file syntax yet.
Diffstat (limited to 'src')
-rw-r--r--src/bin/eolian/sources.c6
-rw-r--r--src/bindings/luajit/eolian.lua12
-rw-r--r--src/lib/eolian/Eolian.h12
-rw-r--r--src/lib/eolian/database_fill.c16
-rw-r--r--src/lib/eolian/database_function_api.c8
-rw-r--r--src/lib/eolian/database_implement_api.c8
-rw-r--r--src/lib/eolian/eo_parser.c20
-rw-r--r--src/lib/eolian/eolian_database.h8
-rw-r--r--src/scripts/elua/apps/docgen/doctree.lua4
-rw-r--r--src/scripts/elua/apps/gendoc.lua6
-rw-r--r--src/tests/eolian/eolian_parsing.c22
11 files changed, 61 insertions, 61 deletions
diff --git a/src/bin/eolian/sources.c b/src/bin/eolian/sources.c
index 82f6412d73..aff1f4b432 100644
--- a/src/bin/eolian/sources.c
+++ b/src/bin/eolian/sources.c
@@ -272,7 +272,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
272 272
273 Eina_Bool impl_same_class = (eolian_implement_class_get(impl) == cl); 273 Eina_Bool impl_same_class = (eolian_implement_class_get(impl) == cl);
274 Eina_Bool impl_need = EINA_TRUE; 274 Eina_Bool impl_need = EINA_TRUE;
275 if (impl_same_class && eolian_function_is_virtual_pure(fid, ftype)) 275 if (impl_same_class && eolian_function_is_pure_virtual(fid, ftype))
276 impl_need = EINA_FALSE; 276 impl_need = EINA_FALSE;
277 277
278 Eina_Stringshare *rtpn = rtp ? eolian_type_c_type_get(rtp) 278 Eina_Stringshare *rtpn = rtp ? eolian_type_c_type_get(rtp)
@@ -502,7 +502,7 @@ _gen_opfunc(const Eolian_Function *fid, Eolian_Function_Type ftype,
502 eina_strbuf_append(buf, " EFL_OBJECT_OP_FUNC("); 502 eina_strbuf_append(buf, " EFL_OBJECT_OP_FUNC(");
503 eina_strbuf_append(buf, fnm); 503 eina_strbuf_append(buf, fnm);
504 eina_strbuf_append(buf, ", "); 504 eina_strbuf_append(buf, ", ");
505 if (!ocnamel && eolian_function_is_virtual_pure(fid, ftype)) 505 if (!ocnamel && eolian_function_is_pure_virtual(fid, ftype))
506 eina_strbuf_append(buf, "NULL),\n"); 506 eina_strbuf_append(buf, "NULL),\n");
507 else 507 else
508 { 508 {
@@ -840,7 +840,7 @@ _gen_proto(const Eolian_Class *cl, const Eolian_Function *fid,
840 const char *cnamel) 840 const char *cnamel)
841{ 841{
842 Eina_Bool impl_same_class = (eolian_implement_class_get(impl) == cl); 842 Eina_Bool impl_same_class = (eolian_implement_class_get(impl) == cl);
843 if (impl_same_class && eolian_function_is_virtual_pure(fid, ftype)) 843 if (impl_same_class && eolian_function_is_pure_virtual(fid, ftype))
844 return; 844 return;
845 845
846 char *ocnamel = NULL; 846 char *ocnamel = NULL;
diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index e9dc67639c..fb8be5720a 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -250,7 +250,7 @@ ffi.cdef [[
250 const Eolian_Function *eolian_class_function_get_by_name(const Eolian_Class *klass, const char *func_name, Eolian_Function_Type f_type); 250 const Eolian_Function *eolian_class_function_get_by_name(const Eolian_Class *klass, const char *func_name, Eolian_Function_Type f_type);
251 const char *eolian_function_legacy_get(const Eolian_Function *function_id, Eolian_Function_Type f_type); 251 const char *eolian_function_legacy_get(const Eolian_Function *function_id, Eolian_Function_Type f_type);
252 const Eolian_Documentation *eolian_function_documentation_get(const Eolian_Function *function_id, Eolian_Function_Type f_type); 252 const Eolian_Documentation *eolian_function_documentation_get(const Eolian_Function *function_id, Eolian_Function_Type f_type);
253 Eina_Bool eolian_function_is_virtual_pure(const Eolian_Function *function_id, Eolian_Function_Type f_type); 253 Eina_Bool eolian_function_is_pure_virtual(const Eolian_Function *function_id, Eolian_Function_Type f_type);
254 Eina_Bool eolian_function_is_auto(const Eolian_Function *function_id, Eolian_Function_Type f_type); 254 Eina_Bool eolian_function_is_auto(const Eolian_Function *function_id, Eolian_Function_Type f_type);
255 Eina_Bool eolian_function_is_empty(const Eolian_Function *function_id, Eolian_Function_Type f_type); 255 Eina_Bool eolian_function_is_empty(const Eolian_Function *function_id, Eolian_Function_Type f_type);
256 Eina_Bool eolian_function_is_legacy_only(const Eolian_Function *function_id, Eolian_Function_Type ftype); 256 Eina_Bool eolian_function_is_legacy_only(const Eolian_Function *function_id, Eolian_Function_Type ftype);
@@ -277,7 +277,7 @@ ffi.cdef [[
277 const Eolian_Function *eolian_implement_function_get(const Eolian_Implement *impl, Eolian_Function_Type *func_type); 277 const Eolian_Function *eolian_implement_function_get(const Eolian_Implement *impl, Eolian_Function_Type *func_type);
278 Eina_Bool eolian_implement_is_auto(const Eolian_Implement *impl, Eolian_Function_Type ftype); 278 Eina_Bool eolian_implement_is_auto(const Eolian_Implement *impl, Eolian_Function_Type ftype);
279 Eina_Bool eolian_implement_is_empty(const Eolian_Implement *impl, Eolian_Function_Type ftype); 279 Eina_Bool eolian_implement_is_empty(const Eolian_Implement *impl, Eolian_Function_Type ftype);
280 Eina_Bool eolian_implement_is_virtual(const Eolian_Implement *impl, Eolian_Function_Type ftype); 280 Eina_Bool eolian_implement_is_pure_virtual(const Eolian_Implement *impl, Eolian_Function_Type ftype);
281 Eina_Bool eolian_implement_is_prop_get(const Eolian_Implement *impl); 281 Eina_Bool eolian_implement_is_prop_get(const Eolian_Implement *impl);
282 Eina_Bool eolian_implement_is_prop_set(const Eolian_Implement *impl); 282 Eina_Bool eolian_implement_is_prop_set(const Eolian_Implement *impl);
283 Eina_Iterator *eolian_class_implements_get(const Eolian_Class *klass); 283 Eina_Iterator *eolian_class_implements_get(const Eolian_Class *klass);
@@ -783,8 +783,8 @@ M.Function = ffi.metatype("Eolian_Function", {
783 return v 783 return v
784 end, 784 end,
785 785
786 is_virtual_pure = function(self, ftype) 786 is_pure_virtual = function(self, ftype)
787 return eolian.eolian_function_is_virtual_pure(self, ftype) ~= 0 787 return eolian.eolian_function_is_pure_virtual(self, ftype) ~= 0
788 end, 788 end,
789 789
790 is_auto = function(self, ftype) 790 is_auto = function(self, ftype)
@@ -931,8 +931,8 @@ ffi.metatype("Eolian_Implement", {
931 return eolian.eolian_implement_is_empty(self, ftype) ~= 0 931 return eolian.eolian_implement_is_empty(self, ftype) ~= 0
932 end, 932 end,
933 933
934 is_virtual = function(self, ftype) 934 is_pure_virtual = function(self, ftype)
935 return eolian.eolian_implement_is_virtual(self, ftype) ~= 0 935 return eolian.eolian_implement_is_pure_virtual(self, ftype) ~= 0
936 end, 936 end,
937 937
938 is_prop_get = function(self) 938 is_prop_get = function(self)
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 7e687eebfe..b06efeee06 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -761,17 +761,17 @@ EAPI Eina_Stringshare *eolian_function_legacy_get(const Eolian_Function *functio
761EAPI const Eolian_Documentation *eolian_function_documentation_get(const Eolian_Function *function_id, Eolian_Function_Type f_type); 761EAPI const Eolian_Documentation *eolian_function_documentation_get(const Eolian_Function *function_id, Eolian_Function_Type f_type);
762 762
763/* 763/*
764 * @brief Indicates if a function is virtual pure. 764 * @brief Indicates if a function is pure virtual.
765 * 765 *
766 * @param[in] function_id Id of the function 766 * @param[in] function_id Id of the function
767 * @param[in] f_type The function type, for property get/set distinction. 767 * @param[in] f_type The function type, for property get/set distinction.
768 * @return EINA_TRUE if virtual pure, EINA_FALSE othrewise. 768 * @return EINA_TRUE if pure virtual, EINA_FALSE othrewise.
769 * 769 *
770 * Acceptable input types are METHOD, PROP_GET and PROP_SET. 770 * Acceptable input types are METHOD, PROP_GET and PROP_SET.
771 * 771 *
772 * @ingroup Eolian 772 * @ingroup Eolian
773 */ 773 */
774EAPI Eina_Bool eolian_function_is_virtual_pure(const Eolian_Function *function_id, Eolian_Function_Type f_type); 774EAPI Eina_Bool eolian_function_is_pure_virtual(const Eolian_Function *function_id, Eolian_Function_Type f_type);
775 775
776/* 776/*
777 * @brief Indicates if a function is auto. 777 * @brief Indicates if a function is auto.
@@ -1113,7 +1113,7 @@ EAPI Eina_Bool eolian_implement_is_auto(const Eolian_Implement *impl, Eolian_Fun
1113EAPI Eina_Bool eolian_implement_is_empty(const Eolian_Implement *impl, Eolian_Function_Type f_type); 1113EAPI Eina_Bool eolian_implement_is_empty(const Eolian_Implement *impl, Eolian_Function_Type f_type);
1114 1114
1115/* 1115/*
1116 * @brief Get whether an implement is tagged with @virtual. 1116 * @brief Get whether an implement is pure virtual.
1117 * 1117 *
1118 * @param[in] impl the handle of the implement 1118 * @param[in] impl the handle of the implement
1119 * @param[in] f_type The function type, for property get/set distinction. 1119 * @param[in] f_type The function type, for property get/set distinction.
@@ -1123,7 +1123,7 @@ EAPI Eina_Bool eolian_implement_is_empty(const Eolian_Implement *impl, Eolian_Fu
1123 * 1123 *
1124 * @ingroup Eolian 1124 * @ingroup Eolian
1125 */ 1125 */
1126EAPI Eina_Bool eolian_implement_is_virtual(const Eolian_Implement *impl, Eolian_Function_Type f_type); 1126EAPI Eina_Bool eolian_implement_is_pure_virtual(const Eolian_Implement *impl, Eolian_Function_Type f_type);
1127 1127
1128/* 1128/*
1129 * @brief Get whether an implement references a property getter. 1129 * @brief Get whether an implement references a property getter.
@@ -1152,7 +1152,7 @@ EAPI Eina_Bool eolian_implement_is_prop_set(const Eolian_Implement *impl);
1152 * @return the iterator 1152 * @return the iterator
1153 * 1153 *
1154 * Implements include fields specified in the "implements" section of your Eo 1154 * Implements include fields specified in the "implements" section of your Eo
1155 * file (i.e. overriding and virtual/auto/empty functions) and all other 1155 * file (i.e. overriding and pure virtual/auto/empty functions) and all other
1156 * methods/properties of your class (local only) that are not specified 1156 * methods/properties of your class (local only) that are not specified
1157 * within that section. 1157 * within that section.
1158 * 1158 *
diff --git a/src/lib/eolian/database_fill.c b/src/lib/eolian/database_fill.c
index 2f47145797..11d083e1f7 100644
--- a/src/lib/eolian/database_fill.c
+++ b/src/lib/eolian/database_fill.c
@@ -185,9 +185,9 @@ _db_build_implement(Eolian_Class *cl, Eolian_Function *foo_id)
185 185
186 if (foo_id->type == EOLIAN_PROPERTY) 186 if (foo_id->type == EOLIAN_PROPERTY)
187 { 187 {
188 if (foo_id->get_virtual_pure && !foo_id->get_impl) 188 if (foo_id->get_pure_virtual && !foo_id->get_impl)
189 { 189 {
190 impl->get_virtual = EINA_TRUE; 190 impl->get_pure_virtual = EINA_TRUE;
191 impl->is_prop_get = EINA_TRUE; 191 impl->is_prop_get = EINA_TRUE;
192 foo_id->get_impl = impl; 192 foo_id->get_impl = impl;
193 cl->implements = eina_list_append(cl->implements, impl); 193 cl->implements = eina_list_append(cl->implements, impl);
@@ -195,9 +195,9 @@ _db_build_implement(Eolian_Class *cl, Eolian_Function *foo_id)
195 _db_build_implement(cl, foo_id); 195 _db_build_implement(cl, foo_id);
196 return; 196 return;
197 } 197 }
198 else if (foo_id->set_virtual_pure && !foo_id->set_impl) 198 else if (foo_id->set_pure_virtual && !foo_id->set_impl)
199 { 199 {
200 impl->set_virtual = EINA_TRUE; 200 impl->set_pure_virtual = EINA_TRUE;
201 impl->is_prop_set = EINA_TRUE; 201 impl->is_prop_set = EINA_TRUE;
202 foo_id->set_impl = impl; 202 foo_id->set_impl = impl;
203 cl->implements = eina_list_append(cl->implements, impl); 203 cl->implements = eina_list_append(cl->implements, impl);
@@ -208,7 +208,7 @@ _db_build_implement(Eolian_Class *cl, Eolian_Function *foo_id)
208 if (foo_id->get_impl) 208 if (foo_id->get_impl)
209 { 209 {
210 impl->is_prop_set = EINA_TRUE; 210 impl->is_prop_set = EINA_TRUE;
211 impl->set_virtual = foo_id->set_virtual_pure; 211 impl->set_pure_virtual = foo_id->set_pure_virtual;
212 foo_id->set_impl = impl; 212 foo_id->set_impl = impl;
213 } 213 }
214 else if (foo_id->set_impl) 214 else if (foo_id->set_impl)
@@ -222,18 +222,18 @@ _db_build_implement(Eolian_Class *cl, Eolian_Function *foo_id)
222 else if (foo_id->type == EOLIAN_PROP_SET) 222 else if (foo_id->type == EOLIAN_PROP_SET)
223 { 223 {
224 impl->is_prop_set = EINA_TRUE; 224 impl->is_prop_set = EINA_TRUE;
225 impl->get_virtual = foo_id->get_virtual_pure; 225 impl->get_pure_virtual = foo_id->get_pure_virtual;
226 foo_id->set_impl = impl; 226 foo_id->set_impl = impl;
227 } 227 }
228 else if (foo_id->type == EOLIAN_PROP_GET) 228 else if (foo_id->type == EOLIAN_PROP_GET)
229 { 229 {
230 impl->is_prop_get = EINA_TRUE; 230 impl->is_prop_get = EINA_TRUE;
231 impl->get_virtual = foo_id->set_virtual_pure; 231 impl->get_pure_virtual = foo_id->set_pure_virtual;
232 foo_id->get_impl = impl; 232 foo_id->get_impl = impl;
233 } 233 }
234 else 234 else
235 { 235 {
236 impl->get_virtual = foo_id->get_virtual_pure; 236 impl->get_pure_virtual = foo_id->get_pure_virtual;
237 foo_id->get_impl = foo_id->set_impl = impl; 237 foo_id->get_impl = foo_id->set_impl = impl;
238 } 238 }
239 239
diff --git a/src/lib/eolian/database_function_api.c b/src/lib/eolian/database_function_api.c
index 6d7d347316..479141af35 100644
--- a/src/lib/eolian/database_function_api.c
+++ b/src/lib/eolian/database_function_api.c
@@ -197,7 +197,7 @@ eolian_function_documentation_get(const Eolian_Function *fid, Eolian_Function_Ty
197} 197}
198 198
199EAPI Eina_Bool 199EAPI Eina_Bool
200eolian_function_is_virtual_pure(const Eolian_Function *fid, Eolian_Function_Type ftype) 200eolian_function_is_pure_virtual(const Eolian_Function *fid, Eolian_Function_Type ftype)
201{ 201{
202 EINA_SAFETY_ON_NULL_RETURN_VAL(fid, EINA_FALSE); 202 EINA_SAFETY_ON_NULL_RETURN_VAL(fid, EINA_FALSE);
203 EINA_SAFETY_ON_FALSE_RETURN_VAL(ftype != EOLIAN_UNRESOLVED, EINA_FALSE); 203 EINA_SAFETY_ON_FALSE_RETURN_VAL(ftype != EOLIAN_UNRESOLVED, EINA_FALSE);
@@ -207,15 +207,15 @@ eolian_function_is_virtual_pure(const Eolian_Function *fid, Eolian_Function_Type
207 case EOLIAN_METHOD: 207 case EOLIAN_METHOD:
208 if (fid->type != EOLIAN_METHOD) 208 if (fid->type != EOLIAN_METHOD)
209 return EINA_FALSE; 209 return EINA_FALSE;
210 return fid->get_virtual_pure; 210 return fid->get_pure_virtual;
211 case EOLIAN_PROP_GET: 211 case EOLIAN_PROP_GET:
212 if ((fid->type != EOLIAN_PROP_GET) && (fid->type != EOLIAN_PROPERTY)) 212 if ((fid->type != EOLIAN_PROP_GET) && (fid->type != EOLIAN_PROPERTY))
213 return EINA_FALSE; 213 return EINA_FALSE;
214 return fid->get_virtual_pure; 214 return fid->get_pure_virtual;
215 case EOLIAN_PROP_SET: 215 case EOLIAN_PROP_SET:
216 if ((fid->type != EOLIAN_PROP_SET) && (fid->type != EOLIAN_PROPERTY)) 216 if ((fid->type != EOLIAN_PROP_SET) && (fid->type != EOLIAN_PROPERTY))
217 return EINA_FALSE; 217 return EINA_FALSE;
218 return fid->set_virtual_pure; 218 return fid->set_pure_virtual;
219 default: 219 default:
220 return EINA_FALSE; 220 return EINA_FALSE;
221 } 221 }
diff --git a/src/lib/eolian/database_implement_api.c b/src/lib/eolian/database_implement_api.c
index d97e5849d9..34e724d249 100644
--- a/src/lib/eolian/database_implement_api.c
+++ b/src/lib/eolian/database_implement_api.c
@@ -82,7 +82,7 @@ eolian_implement_is_empty(const Eolian_Implement *impl, Eolian_Function_Type fty
82} 82}
83 83
84EAPI Eina_Bool 84EAPI Eina_Bool
85eolian_implement_is_virtual(const Eolian_Implement *impl, Eolian_Function_Type ftype) 85eolian_implement_is_pure_virtual(const Eolian_Implement *impl, Eolian_Function_Type ftype)
86{ 86{
87 EINA_SAFETY_ON_NULL_RETURN_VAL(impl, EINA_FALSE); 87 EINA_SAFETY_ON_NULL_RETURN_VAL(impl, EINA_FALSE);
88 EINA_SAFETY_ON_FALSE_RETURN_VAL(ftype != EOLIAN_UNRESOLVED, EINA_FALSE); 88 EINA_SAFETY_ON_FALSE_RETURN_VAL(ftype != EOLIAN_UNRESOLVED, EINA_FALSE);
@@ -90,11 +90,11 @@ eolian_implement_is_virtual(const Eolian_Implement *impl, Eolian_Function_Type f
90 switch (ftype) 90 switch (ftype)
91 { 91 {
92 case EOLIAN_METHOD: 92 case EOLIAN_METHOD:
93 return impl->get_virtual && !impl->is_prop_get && !impl->is_prop_set; 93 return impl->get_pure_virtual && !impl->is_prop_get && !impl->is_prop_set;
94 case EOLIAN_PROP_GET: 94 case EOLIAN_PROP_GET:
95 return impl->get_virtual && impl->is_prop_get; 95 return impl->get_pure_virtual && impl->is_prop_get;
96 case EOLIAN_PROP_SET: 96 case EOLIAN_PROP_SET:
97 return impl->set_virtual && impl->is_prop_set; 97 return impl->set_pure_virtual && impl->is_prop_set;
98 default: 98 default:
99 return EINA_FALSE; 99 return EINA_FALSE;
100 } 100 }
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 417387724f..0cd748806f 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1166,7 +1166,7 @@ parse_accessor(Eo_Lexer *ls, Eolian_Function *prop)
1166 Eina_Bool has_return = EINA_FALSE, has_legacy = EINA_FALSE, 1166 Eina_Bool has_return = EINA_FALSE, has_legacy = EINA_FALSE,
1167 has_eo = EINA_FALSE, has_keys = EINA_FALSE, 1167 has_eo = EINA_FALSE, has_keys = EINA_FALSE,
1168 has_values = EINA_FALSE, has_protected = EINA_FALSE, 1168 has_values = EINA_FALSE, has_protected = EINA_FALSE,
1169 has_virtual_pure = EINA_FALSE; 1169 has_virtp = EINA_FALSE;
1170 Eina_Bool is_get = (ls->t.kw == KW_get); 1170 Eina_Bool is_get = (ls->t.kw == KW_get);
1171 if (is_get) 1171 if (is_get)
1172 { 1172 {
@@ -1190,9 +1190,9 @@ parse_accessor(Eo_Lexer *ls, Eolian_Function *prop)
1190 for (;;) switch (ls->t.kw) 1190 for (;;) switch (ls->t.kw)
1191 { 1191 {
1192 case KW_at_virtual_pure: 1192 case KW_at_virtual_pure:
1193 CASE_LOCK(ls, virtual_pure, "virtual_pure qualifier"); 1193 CASE_LOCK(ls, virtp, "virtual_pure qualifier");
1194 if (is_get) prop->get_virtual_pure = EINA_TRUE; 1194 if (is_get) prop->get_pure_virtual = EINA_TRUE;
1195 else prop->set_virtual_pure = EINA_TRUE; 1195 else prop->set_pure_virtual = EINA_TRUE;
1196 eo_lexer_get(ls); 1196 eo_lexer_get(ls);
1197 break; 1197 break;
1198 case KW_at_protected: 1198 case KW_at_protected:
@@ -1291,17 +1291,17 @@ end:
1291} 1291}
1292 1292
1293static void 1293static void
1294_func_virtual_set(Eo_Lexer *ls, Eolian_Function *foo_id, Eina_Bool virt) 1294_func_pure_virtual_set(Eo_Lexer *ls, Eolian_Function *foo_id, Eina_Bool virt)
1295{ 1295{
1296 if (ls->tmp.kls->type != EOLIAN_CLASS_INTERFACE && !virt) 1296 if (ls->tmp.kls->type != EOLIAN_CLASS_INTERFACE && !virt)
1297 return; 1297 return;
1298 1298
1299 if (foo_id->type == EOLIAN_PROP_GET || foo_id->type == EOLIAN_METHOD) 1299 if (foo_id->type == EOLIAN_PROP_GET || foo_id->type == EOLIAN_METHOD)
1300 foo_id->get_virtual_pure = EINA_TRUE; 1300 foo_id->get_pure_virtual = EINA_TRUE;
1301 else if (foo_id->type == EOLIAN_PROP_SET) 1301 else if (foo_id->type == EOLIAN_PROP_SET)
1302 foo_id->set_virtual_pure = EINA_TRUE; 1302 foo_id->set_pure_virtual = EINA_TRUE;
1303 else if (foo_id->type == EOLIAN_PROPERTY) 1303 else if (foo_id->type == EOLIAN_PROPERTY)
1304 foo_id->get_virtual_pure = foo_id->set_virtual_pure = EINA_TRUE; 1304 foo_id->get_pure_virtual = foo_id->set_pure_virtual = EINA_TRUE;
1305} 1305}
1306 1306
1307static void 1307static void
@@ -1387,7 +1387,7 @@ end:
1387 check_match(ls, '}', '{', line, col); 1387 check_match(ls, '}', '{', line, col);
1388 if (!has_get && !has_set) 1388 if (!has_get && !has_set)
1389 prop->type = EOLIAN_PROPERTY; 1389 prop->type = EOLIAN_PROPERTY;
1390 _func_virtual_set(ls, prop, has_virtp); 1390 _func_pure_virtual_set(ls, prop, has_virtp);
1391} 1391}
1392 1392
1393static void 1393static void
@@ -1487,7 +1487,7 @@ body:
1487 } 1487 }
1488end: 1488end:
1489 check_match(ls, '}', '{', line, col); 1489 check_match(ls, '}', '{', line, col);
1490 _func_virtual_set(ls, meth, has_virtp); 1490 _func_pure_virtual_set(ls, meth, has_virtp);
1491} 1491}
1492 1492
1493static void 1493static void
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 1d471a0ab3..eeace389d6 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -133,8 +133,8 @@ struct _Eolian_Function
133 Eolian_Documentation *get_return_doc; 133 Eolian_Documentation *get_return_doc;
134 Eolian_Documentation *set_return_doc; 134 Eolian_Documentation *set_return_doc;
135 Eina_Bool obj_is_const :1; /* True if the object has to be const. Useful for a few methods. */ 135 Eina_Bool obj_is_const :1; /* True if the object has to be const. Useful for a few methods. */
136 Eina_Bool get_virtual_pure :1; 136 Eina_Bool get_pure_virtual :1;
137 Eina_Bool set_virtual_pure :1; 137 Eina_Bool set_pure_virtual :1;
138 Eina_Bool get_auto :1; 138 Eina_Bool get_auto :1;
139 Eina_Bool set_auto :1; 139 Eina_Bool set_auto :1;
140 Eina_Bool get_empty :1; 140 Eina_Bool get_empty :1;
@@ -203,8 +203,8 @@ struct _Eolian_Implement
203 Eina_Stringshare *full_name; 203 Eina_Stringshare *full_name;
204 Eina_Bool is_prop_get :1; 204 Eina_Bool is_prop_get :1;
205 Eina_Bool is_prop_set :1; 205 Eina_Bool is_prop_set :1;
206 Eina_Bool get_virtual :1; 206 Eina_Bool get_pure_virtual :1;
207 Eina_Bool set_virtual :1; 207 Eina_Bool set_pure_virtual :1;
208 Eina_Bool get_auto: 1; 208 Eina_Bool get_auto: 1;
209 Eina_Bool set_auto: 1; 209 Eina_Bool set_auto: 1;
210 Eina_Bool get_empty: 1; 210 Eina_Bool get_empty: 1;
diff --git a/src/scripts/elua/apps/docgen/doctree.lua b/src/scripts/elua/apps/docgen/doctree.lua
index ed309bd43b..0bb9c75a06 100644
--- a/src/scripts/elua/apps/docgen/doctree.lua
+++ b/src/scripts/elua/apps/docgen/doctree.lua
@@ -321,8 +321,8 @@ M.Function = Node:clone {
321 return nil 321 return nil
322 end, 322 end,
323 323
324 is_virtual_pure = function(self, ft) 324 is_pure_virtual = function(self, ft)
325 return self.func:is_virtual_pure(ft) 325 return self.func:is_pure_virtual(ft)
326 end, 326 end,
327 327
328 is_auto = function(self, ft) 328 is_auto = function(self, ft)
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index dc1f726f57..de4ab262dc 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -175,7 +175,7 @@ end
175local gen_method_sig = function(fn, cl) 175local gen_method_sig = function(fn, cl)
176 local buf = {} 176 local buf = {}
177 gen_func_namesig(fn, cl, buf, false, false, false) 177 gen_func_namesig(fn, cl, buf, false, false, false)
178 if fn:is_virtual_pure(fn.METHOD) then 178 if fn:is_pure_virtual(fn.METHOD) then
179 buf[#buf + 1] = "@virtual_pure " 179 buf[#buf + 1] = "@virtual_pure "
180 end 180 end
181 buf[#buf + 1] = "{" 181 buf[#buf + 1] = "{"
@@ -229,8 +229,8 @@ local gen_prop_sig = function(fn, cl)
229 local isset = (fnt == fn.PROPERTY or fnt == fn.PROP_SET) 229 local isset = (fnt == fn.PROPERTY or fnt == fn.PROP_SET)
230 gen_func_namesig(fn, cl, buf, true, isget, isset) 230 gen_func_namesig(fn, cl, buf, true, isget, isset)
231 231
232 local gvirt = fn:is_virtual_pure(fn.PROP_GET) 232 local gvirt = fn:is_pure_virtual(fn.PROP_GET)
233 local svirt = fn:is_virtual_pure(fn.PROP_SET) 233 local svirt = fn:is_pure_virtual(fn.PROP_SET)
234 234
235 if (not isget or gvirt) and (not isset or svirt) then 235 if (not isget or gvirt) and (not isset or svirt) then
236 buf[#buf + 1] = "@virtual_pure " 236 buf[#buf + 1] = "@virtual_pure "
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index fc94534c67..889d5c9f52 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -89,7 +89,7 @@ START_TEST(eolian_namespaces)
89 89
90 /* Virtual regression */ 90 /* Virtual regression */
91 fail_if(!(fid = eolian_class_function_get_by_name(class112, "a", EOLIAN_UNRESOLVED))); 91 fail_if(!(fid = eolian_class_function_get_by_name(class112, "a", EOLIAN_UNRESOLVED)));
92 fail_if(!eolian_function_is_virtual_pure(fid, EOLIAN_PROP_SET)); 92 fail_if(!eolian_function_is_pure_virtual(fid, EOLIAN_PROP_SET));
93 93
94 eolian_shutdown(); 94 eolian_shutdown();
95} 95}
@@ -187,16 +187,16 @@ START_TEST(eolian_override)
187 187
188 /* Base ctor */ 188 /* Base ctor */
189 fail_if(!(fid = eolian_class_function_get_by_name(base, "constructor", EOLIAN_METHOD))); 189 fail_if(!(fid = eolian_class_function_get_by_name(base, "constructor", EOLIAN_METHOD)));
190 fail_if(!eolian_function_is_virtual_pure(fid, EOLIAN_METHOD)); 190 fail_if(!eolian_function_is_pure_virtual(fid, EOLIAN_METHOD));
191 191
192 /* Property */ 192 /* Property */
193 fail_if(!(fid = eolian_class_function_get_by_name(class, "a", EOLIAN_PROPERTY))); 193 fail_if(!(fid = eolian_class_function_get_by_name(class, "a", EOLIAN_PROPERTY)));
194 fail_if(!eolian_function_is_virtual_pure(fid, EOLIAN_PROP_SET)); 194 fail_if(!eolian_function_is_pure_virtual(fid, EOLIAN_PROP_SET));
195 fail_if(eolian_function_is_virtual_pure(fid, EOLIAN_PROP_GET)); 195 fail_if(eolian_function_is_pure_virtual(fid, EOLIAN_PROP_GET));
196 196
197 /* Method */ 197 /* Method */
198 fail_if(!(fid = eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD))); 198 fail_if(!(fid = eolian_class_function_get_by_name(class, "foo", EOLIAN_METHOD)));
199 fail_if(!eolian_function_is_virtual_pure(fid, EOLIAN_METHOD)); 199 fail_if(!eolian_function_is_pure_virtual(fid, EOLIAN_METHOD));
200 200
201 /* Implements */ 201 /* Implements */
202 fail_if(!(iter = eolian_class_implements_get(class))); 202 fail_if(!(iter = eolian_class_implements_get(class)));
@@ -204,7 +204,7 @@ START_TEST(eolian_override)
204 fail_if(!(eina_iterator_next(iter, (void**)&impl))); 204 fail_if(!(eina_iterator_next(iter, (void**)&impl)));
205 fail_if(eolian_implement_is_auto(impl, EOLIAN_METHOD)); 205 fail_if(eolian_implement_is_auto(impl, EOLIAN_METHOD));
206 fail_if(eolian_implement_is_empty(impl, EOLIAN_METHOD)); 206 fail_if(eolian_implement_is_empty(impl, EOLIAN_METHOD));
207 fail_if(eolian_implement_is_virtual(impl, EOLIAN_METHOD)); 207 fail_if(eolian_implement_is_pure_virtual(impl, EOLIAN_METHOD));
208 fail_if(!(impl_class = eolian_implement_class_get(impl))); 208 fail_if(!(impl_class = eolian_implement_class_get(impl)));
209 fail_if(!(impl_func = eolian_implement_function_get(impl, NULL))); 209 fail_if(!(impl_func = eolian_implement_function_get(impl, NULL)));
210 fail_if(impl_class != base); 210 fail_if(impl_class != base);
@@ -213,7 +213,7 @@ START_TEST(eolian_override)
213 fail_if(!(eina_iterator_next(iter, (void**)&impl))); 213 fail_if(!(eina_iterator_next(iter, (void**)&impl)));
214 fail_if(!eolian_implement_is_auto(impl, EOLIAN_PROP_SET)); 214 fail_if(!eolian_implement_is_auto(impl, EOLIAN_PROP_SET));
215 fail_if(eolian_implement_is_empty(impl, EOLIAN_PROP_SET)); 215 fail_if(eolian_implement_is_empty(impl, EOLIAN_PROP_SET));
216 fail_if(eolian_implement_is_virtual(impl, EOLIAN_PROP_SET)); 216 fail_if(eolian_implement_is_pure_virtual(impl, EOLIAN_PROP_SET));
217 fail_if(!(impl_class = eolian_implement_class_get(impl))); 217 fail_if(!(impl_class = eolian_implement_class_get(impl)));
218 fail_if(!(impl_func = eolian_implement_function_get(impl, NULL))); 218 fail_if(!(impl_func = eolian_implement_function_get(impl, NULL)));
219 fail_if(impl_class != class); 219 fail_if(impl_class != class);
@@ -222,20 +222,20 @@ START_TEST(eolian_override)
222 fail_if(eolian_function_is_auto(impl_func, EOLIAN_PROP_GET)); 222 fail_if(eolian_function_is_auto(impl_func, EOLIAN_PROP_GET));
223 fail_if(eolian_function_is_empty(impl_func, EOLIAN_PROP_SET)); 223 fail_if(eolian_function_is_empty(impl_func, EOLIAN_PROP_SET));
224 fail_if(eolian_function_is_empty(impl_func, EOLIAN_PROP_GET)); 224 fail_if(eolian_function_is_empty(impl_func, EOLIAN_PROP_GET));
225 fail_if(eolian_function_is_virtual_pure(impl_func, EOLIAN_PROP_SET)); 225 fail_if(eolian_function_is_pure_virtual(impl_func, EOLIAN_PROP_SET));
226 fail_if(eolian_function_is_virtual_pure(impl_func, EOLIAN_PROP_GET)); 226 fail_if(eolian_function_is_pure_virtual(impl_func, EOLIAN_PROP_GET));
227 227
228 fail_if(!(eina_iterator_next(iter, (void**)&impl))); 228 fail_if(!(eina_iterator_next(iter, (void**)&impl)));
229 fail_if(eolian_implement_is_auto(impl, EOLIAN_METHOD)); 229 fail_if(eolian_implement_is_auto(impl, EOLIAN_METHOD));
230 fail_if(!eolian_implement_is_empty(impl, EOLIAN_METHOD)); 230 fail_if(!eolian_implement_is_empty(impl, EOLIAN_METHOD));
231 fail_if(eolian_implement_is_virtual(impl, EOLIAN_METHOD)); 231 fail_if(eolian_implement_is_pure_virtual(impl, EOLIAN_METHOD));
232 fail_if(!(impl_class = eolian_implement_class_get(impl))); 232 fail_if(!(impl_class = eolian_implement_class_get(impl)));
233 fail_if(!(impl_func = eolian_implement_function_get(impl, NULL))); 233 fail_if(!(impl_func = eolian_implement_function_get(impl, NULL)));
234 fail_if(impl_class != class); 234 fail_if(impl_class != class);
235 fail_if(strcmp(eolian_function_name_get(impl_func), "bar")); 235 fail_if(strcmp(eolian_function_name_get(impl_func), "bar"));
236 fail_if(eolian_function_is_auto(impl_func, EOLIAN_METHOD)); 236 fail_if(eolian_function_is_auto(impl_func, EOLIAN_METHOD));
237 fail_if(!eolian_function_is_empty(impl_func, EOLIAN_METHOD)); 237 fail_if(!eolian_function_is_empty(impl_func, EOLIAN_METHOD));
238 fail_if(eolian_function_is_virtual_pure(impl_func, EOLIAN_METHOD)); 238 fail_if(eolian_function_is_pure_virtual(impl_func, EOLIAN_METHOD));
239 239
240 eina_iterator_free(iter); 240 eina_iterator_free(iter);
241 241