eolian: rename is_class api for functions to is_static

Still needs restriction to classes only etc to be done later.

Ref https://phab.enlightenment.org/T8118
Ref https://phab.enlightenment.org/T7675
This commit is contained in:
Daniel Kolesa 2019-08-16 16:32:13 +02:00
parent 8a8a833837
commit 2f147f2725
11 changed files with 32 additions and 32 deletions

View File

@ -570,7 +570,7 @@ eo_gen_docs_func_gen(const Eolian_State *state, const Eolian_Function *fid,
} }
} }
if (!eolian_function_is_class(fid)) if (!eolian_function_is_static(fid))
{ {
_indent_line(buf, indent); _indent_line(buf, indent);
eina_strbuf_append(buf, " * @param[in] obj The object.\n"); eina_strbuf_append(buf, " * @param[in] obj The object.\n");

View File

@ -129,13 +129,13 @@ _gen_func(const Eolian_State *state, const Eolian_Function *fid,
eina_stringshare_del(fcn); eina_stringshare_del(fcn);
Eina_Strbuf *flagbuf = NULL; Eina_Strbuf *flagbuf = NULL;
int nidx = !eolian_function_is_class(fid); int nidx = !eolian_function_is_static(fid);
eina_strbuf_append_char(buf, '('); eina_strbuf_append_char(buf, '(');
if (nidx) if (nidx)
{ {
if ((ftype == EOLIAN_PROP_GET) || eolian_function_object_is_const(fid) if ((ftype == EOLIAN_PROP_GET) || eolian_function_object_is_const(fid)
|| eolian_function_is_class(fid)) || eolian_function_is_static(fid))
{ {
eina_strbuf_append(buf, "const "); eina_strbuf_append(buf, "const ");
} }

View File

@ -570,7 +570,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
eina_strbuf_append(params, ", "); eina_strbuf_append(params, ", ");
eina_strbuf_append(params, prn); eina_strbuf_append(params, prn);
if (eina_strbuf_length_get(params_full) || !eolian_function_is_class(fid)) if (eina_strbuf_length_get(params_full) || !eolian_function_is_static(fid))
{ {
eina_strbuf_append(params_full, ", "); eina_strbuf_append(params_full, ", ");
eina_strbuf_append(params_full_imp, ", "); eina_strbuf_append(params_full_imp, ", ");
@ -660,7 +660,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
if (eina_strbuf_length_get(params)) if (eina_strbuf_length_get(params))
eina_strbuf_append(params, ", "); eina_strbuf_append(params, ", ");
if (eina_strbuf_length_get(params_full_imp) || !eolian_function_is_class(fid)) if (eina_strbuf_length_get(params_full_imp) || !eolian_function_is_static(fid))
eina_strbuf_append(params_full_imp, ", "); eina_strbuf_append(params_full_imp, ", ");
eina_strbuf_append(params_full_imp, ptn); eina_strbuf_append(params_full_imp, ptn);
if (!had_star) if (!had_star)
@ -671,7 +671,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
eina_strbuf_append(params_full_imp, " EINA_UNUSED"); eina_strbuf_append(params_full_imp, " EINA_UNUSED");
eina_strbuf_append(params, prn); eina_strbuf_append(params, prn);
if (eina_strbuf_length_get(params_full) || !eolian_function_is_class(fid)) if (eina_strbuf_length_get(params_full) || !eolian_function_is_static(fid))
eina_strbuf_append(params_full, ", "); eina_strbuf_append(params_full, ", ");
eina_strbuf_append(params_full, ptn); eina_strbuf_append(params_full, ptn);
if (!had_star) if (!had_star)
@ -729,7 +729,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
{ {
/* figure out the data type */ /* figure out the data type */
Eina_Stringshare *dt = NULL; Eina_Stringshare *dt = NULL;
if (eolian_function_is_class(fid)) if (eolian_function_is_static(fid))
dt = eina_stringshare_add("void"); dt = eina_stringshare_add("void");
else else
dt = eolian_class_c_data_type_get(cl); dt = eolian_class_c_data_type_get(cl);
@ -751,7 +751,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
eina_strbuf_append(buf, func_suffix); eina_strbuf_append(buf, func_suffix);
/* ([const ]Eo *obj, Data_Type *pd, impl_full_params); */ /* ([const ]Eo *obj, Data_Type *pd, impl_full_params); */
eina_strbuf_append_char(buf, '('); eina_strbuf_append_char(buf, '(');
if (!eolian_function_is_class(fid)) if (!eolian_function_is_static(fid))
{ {
if ((ftype == EOLIAN_PROP_GET) || eolian_function_object_is_const(fid)) if ((ftype == EOLIAN_PROP_GET) || eolian_function_object_is_const(fid))
eina_strbuf_append(buf, "const "); eina_strbuf_append(buf, "const ");
@ -760,7 +760,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
eina_strbuf_append(buf, " *pd"); eina_strbuf_append(buf, " *pd");
} }
eina_strbuf_append(buf, eina_strbuf_string_get(params_full_imp)); eina_strbuf_append(buf, eina_strbuf_string_get(params_full_imp));
if (eina_strbuf_length_get(params_full_imp) == 0 && eolian_function_is_class(fid)) if (eina_strbuf_length_get(params_full_imp) == 0 && eolian_function_is_static(fid))
eina_strbuf_append(buf, "void"); eina_strbuf_append(buf, "void");
eina_strbuf_append(buf, ");\n\n"); eina_strbuf_append(buf, ");\n\n");
} }
@ -832,7 +832,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
eina_stringshare_del(dt); eina_stringshare_del(dt);
} }
if (impl_same_class && !eolian_function_is_class(fid)) if (impl_same_class && !eolian_function_is_static(fid))
{ {
/* generate reflection implementation */ /* generate reflection implementation */
if (reflect_type) if (reflect_type)
@ -875,7 +875,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
if (has_params) if (has_params)
eina_strbuf_append_char(buf, 'V'); eina_strbuf_append_char(buf, 'V');
if ((ftype == EOLIAN_PROP_GET) || eolian_function_object_is_const(fid) if ((ftype == EOLIAN_PROP_GET) || eolian_function_object_is_const(fid)
|| eolian_function_is_class(fid)) || eolian_function_is_static(fid))
{ {
eina_strbuf_append(buf, "_CONST"); eina_strbuf_append(buf, "_CONST");
} }
@ -909,7 +909,7 @@ _gen_func(const Eolian_Class *cl, const Eolian_Function *fid,
eina_stringshare_del(eofn); eina_stringshare_del(eofn);
} }
if (impl_same_class && eolian_function_is_class(fid)) if (impl_same_class && eolian_function_is_static(fid))
_emit_class_function(buf, fid, rtp, params_full, ocnamel, func_suffix, params, eolian_function_full_c_name_get(fid, ftype)); _emit_class_function(buf, fid, rtp, params_full, ocnamel, func_suffix, params, eolian_function_full_c_name_get(fid, ftype));
free(cname); free(cname);
@ -1003,7 +1003,7 @@ _gen_initializer(const Eolian_Class *cl, Eina_Strbuf *buf, Eina_Hash *refh)
Eolian_Function_Type ftype; Eolian_Function_Type ftype;
const Eolian_Function *fid = eolian_implement_function_get(imp, &ftype); const Eolian_Function *fid = eolian_implement_function_get(imp, &ftype);
if (eolian_function_is_class(fid)) continue; if (eolian_function_is_static(fid)) continue;
if (!eina_strbuf_length_get(ops)) if (!eina_strbuf_length_get(ops))
eina_strbuf_append_printf(ops, " EFL_OPS_DEFINE(ops,\n"); eina_strbuf_append_printf(ops, " EFL_OPS_DEFINE(ops,\n");

View File

@ -366,7 +366,7 @@ ffi.cdef [[
const char *eolian_function_full_c_name_get(const Eolian_Function *function_id, Eolian_Function_Type ftype); const char *eolian_function_full_c_name_get(const Eolian_Function *function_id, Eolian_Function_Type ftype);
const Eolian_Function *eolian_class_function_by_name_get(const Eolian_Class *klass, const char *func_name, Eolian_Function_Type f_type); const Eolian_Function *eolian_class_function_by_name_get(const Eolian_Class *klass, const char *func_name, Eolian_Function_Type f_type);
const Eolian_Implement *eolian_function_implement_get(const Eolian_Function *function_id); const Eolian_Implement *eolian_function_implement_get(const Eolian_Function *function_id);
Eina_Bool eolian_function_is_class(const Eolian_Function *function_id); Eina_Bool eolian_function_is_static(const Eolian_Function *function_id);
Eina_Bool eolian_function_is_constructor(const Eolian_Function *function_id, const Eolian_Class *klass); Eina_Bool eolian_function_is_constructor(const Eolian_Function *function_id, const Eolian_Class *klass);
Eina_Bool eolian_function_is_function_pointer(const Eolian_Function *function_id); Eina_Bool eolian_function_is_function_pointer(const Eolian_Function *function_id);
Eina_Iterator *eolian_property_keys_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype); Eina_Iterator *eolian_property_keys_get(const Eolian_Function *foo_id, Eolian_Function_Type ftype);
@ -1201,8 +1201,8 @@ M.Function = ffi.metatype("Eolian_Function", {
return v return v
end, end,
is_class = function(self) is_static = function(self)
return eolian.eolian_function_is_class(self) ~= 0 return eolian.eolian_function_is_static(self) ~= 0
end, end,
is_constructor = function(self, klass) is_constructor = function(self, klass)

View File

@ -1741,14 +1741,14 @@ EAPI const Eolian_Function *eolian_class_function_by_name_get(const Eolian_Class
EAPI const Eolian_Implement *eolian_function_implement_get(const Eolian_Function *function_id); EAPI const Eolian_Implement *eolian_function_implement_get(const Eolian_Function *function_id);
/* /*
* @brief Get whether a function is a class method/property. * @brief Get whether a function is a static method/property.
* *
* @param[in] function_id Id of the function * @param[in] function_id Id of the function
* @return EINA_TRUE and EINA_FALSE respectively * @return EINA_TRUE and EINA_FALSE respectively
* *
* @ingroup Eolian * @ingroup Eolian
*/ */
EAPI Eina_Bool eolian_function_is_class(const Eolian_Function *function_id); EAPI Eina_Bool eolian_function_is_static(const Eolian_Function *function_id);
/* /*
* @brief Get whether a function is beta. * @brief Get whether a function is beta.

View File

@ -117,7 +117,7 @@ eolian_function_implement_get(const Eolian_Function *fid)
} }
EAPI Eina_Bool EAPI Eina_Bool
eolian_function_is_class(const Eolian_Function *fid) eolian_function_is_static(const Eolian_Function *fid)
{ {
EINA_SAFETY_ON_NULL_RETURN_VAL(fid, EINA_FALSE); EINA_SAFETY_ON_NULL_RETURN_VAL(fid, EINA_FALSE);
return fid->is_static; return fid->is_static;

View File

@ -811,7 +811,7 @@ struct function_def
} }
} }
is_protected = eolian_function_scope_get(function, type) == EOLIAN_SCOPE_PROTECTED; is_protected = eolian_function_scope_get(function, type) == EOLIAN_SCOPE_PROTECTED;
is_static = eolian_function_is_class(function); is_static = eolian_function_is_static(function);
Eolian_Implement const* implement = eolian_function_implement_get(function); Eolian_Implement const* implement = eolian_function_implement_get(function);
if (!implement) if (!implement)

View File

@ -865,8 +865,8 @@ class Function(Object):
return self.scope_get(Eolian_Function_Type.PROP_SET) return self.scope_get(Eolian_Function_Type.PROP_SET)
@cached_property @cached_property
def is_class(self): def is_static(self):
return bool(lib.eolian_function_is_class(self)) return bool(lib.eolian_function_is_static(self))
@cached_property @cached_property
def object_is_const(self): def object_is_const(self):

View File

@ -332,9 +332,9 @@ lib.eolian_function_full_c_name_get.restype = c_void_p # Stringshare TO BE FREE
lib.eolian_function_implement_get.argtypes = (c_void_p,) lib.eolian_function_implement_get.argtypes = (c_void_p,)
lib.eolian_function_implement_get.restype = c_void_p lib.eolian_function_implement_get.restype = c_void_p
# EAPI Eina_Bool eolian_function_is_class(const Eolian_Function *function_id); # EAPI Eina_Bool eolian_function_is_static(const Eolian_Function *function_id);
lib.eolian_function_is_class.argtypes = (c_void_p,) lib.eolian_function_is_static.argtypes = (c_void_p,)
lib.eolian_function_is_class.restype = c_bool lib.eolian_function_is_static.restype = c_bool
# EAPI Eina_Bool eolian_function_is_constructor(const Eolian_Function *function_id, const Eolian_Class *klass); # EAPI Eina_Bool eolian_function_is_constructor(const Eolian_Function *function_id, const Eolian_Class *klass);
lib.eolian_function_is_constructor.argtypes = (c_void_p,c_void_p,) lib.eolian_function_is_constructor.argtypes = (c_void_p,c_void_p,)

View File

@ -374,7 +374,7 @@ class TestEolianFunction(unittest.TestCase):
self.assertIsNone(f.method_return_type) # TODO correct ? self.assertIsNone(f.method_return_type) # TODO correct ?
self.assertIsNone(f.setter_return_type) # TODO correct ? self.assertIsNone(f.setter_return_type) # TODO correct ?
self.assertIsNone(f.getter_return_type) # TODO correct ? self.assertIsNone(f.getter_return_type) # TODO correct ?
self.assertFalse(f.is_class) self.assertFalse(f.is_static)
self.assertFalse(f.is_beta) self.assertFalse(f.is_beta)
self.assertFalse(f.is_constructor(cls)) self.assertFalse(f.is_constructor(cls))
# # #assert f.is_function_pointer == False # TODO broken somehow # # #assert f.is_function_pointer == False # TODO broken somehow

View File

@ -1005,22 +1005,22 @@ EFL_START_TEST(eolian_class_funcs)
/* Class properties */ /* Class properties */
fail_if(eolian_class_function_by_name_get(class, "a", EOLIAN_PROPERTY)); fail_if(eolian_class_function_by_name_get(class, "a", EOLIAN_PROPERTY));
fail_if(!(fid = eolian_class_function_by_name_get(class, "a", EOLIAN_PROP_GET))); fail_if(!(fid = eolian_class_function_by_name_get(class, "a", EOLIAN_PROP_GET)));
fail_if(!eolian_function_is_class(fid)); fail_if(!eolian_function_is_static(fid));
fail_if(!(fid = eolian_class_function_by_name_get(class, "b", EOLIAN_PROP_GET))); fail_if(!(fid = eolian_class_function_by_name_get(class, "b", EOLIAN_PROP_GET)));
fail_if(eolian_function_is_class(fid)); fail_if(eolian_function_is_static(fid));
/* Class methods */ /* Class methods */
fail_if(!(fid = eolian_class_function_by_name_get(class, "foo", EOLIAN_METHOD))); fail_if(!(fid = eolian_class_function_by_name_get(class, "foo", EOLIAN_METHOD)));
fail_if(!eolian_function_is_class(fid)); fail_if(!eolian_function_is_static(fid));
fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PUBLIC); fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PUBLIC);
fail_if(!(fid = eolian_class_function_by_name_get(class, "bar", EOLIAN_METHOD))); fail_if(!(fid = eolian_class_function_by_name_get(class, "bar", EOLIAN_METHOD)));
fail_if(eolian_function_is_class(fid)); fail_if(eolian_function_is_static(fid));
fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PUBLIC); fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PUBLIC);
fail_if(!(fid = eolian_class_function_by_name_get(class, "baz", EOLIAN_METHOD))); fail_if(!(fid = eolian_class_function_by_name_get(class, "baz", EOLIAN_METHOD)));
fail_if(!eolian_function_is_class(fid)); fail_if(!eolian_function_is_static(fid));
fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PROTECTED); fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PROTECTED);
fail_if(!(fid = eolian_class_function_by_name_get(class, "bah", EOLIAN_METHOD))); fail_if(!(fid = eolian_class_function_by_name_get(class, "bah", EOLIAN_METHOD)));
fail_if(eolian_function_is_class(fid)); fail_if(eolian_function_is_static(fid));
fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PROTECTED); fail_if(eolian_function_scope_get(fid, EOLIAN_METHOD) != EOLIAN_SCOPE_PROTECTED);
eolian_state_free(eos); eolian_state_free(eos);