int curl = 0;
- const char *group = eolian_class_full_name_get(eolian_function_class_get(fid));
+ const char *group = eolian_class_name_get(eolian_function_class_get(fid));
const Eolian_Implement *fimp = eolian_function_implement_get(fid);
if (doc)
{
Eina_Strbuf *cdoc = eo_gen_docs_full_gen(src, doc,
- eolian_class_full_name_get(cl), 0, EINA_FALSE);
+ eolian_class_name_get(cl), 0, EINA_FALSE);
if (cdoc)
{
eina_strbuf_append(buf, eina_strbuf_string_get(cdoc));
"Efl_Event_Description _%s;\n\n", evn);
Eina_Strbuf *evdbuf = eo_gen_docs_event_gen(src, ev,
- eolian_class_full_name_get(cl));
+ eolian_class_name_get(cl));
eina_strbuf_append(buf, eina_strbuf_string_get(evdbuf));
eina_strbuf_append_char(buf, '\n');
eina_strbuf_free(evdbuf);
char **cnameu, char **cnamel)
{
char *cn = NULL, *cnu = NULL, *cnl = NULL;
- cn = eo_gen_c_full_name_get(eolian_class_full_name_get(cl));
+ cn = eo_gen_c_full_name_get(eolian_class_name_get(cl));
if (!cn)
abort();
if (cname)
eina_strbuf_append(buf, cnamel);
eina_strbuf_append(buf, "_class_desc = {\n"
" EO_VERSION,\n");
- eina_strbuf_append_printf(buf, " \"%s\",\n", eolian_class_full_name_get(cl));
+ eina_strbuf_append_printf(buf, " \"%s\",\n", eolian_class_name_get(cl));
switch (eolian_class_type_get(cl))
{
const Eolian_Class *cl = eolian_state_class_by_file_get(eos, eof);
if (!cl)
return NULL;
- char *clfn = eo_gen_c_full_name_get(eolian_class_full_name_get(cl));
+ char *clfn = eo_gen_c_full_name_get(eolian_class_name_get(cl));
if (!clfn)
return NULL;
Eina_Strbuf *ret = eina_strbuf_new();
!generate(klass, opts, cpp_types_header))
{
EINA_CXX_DOM_LOG_ERR(eolian_cxx::domain)
- << "Error generating: " << ::eolian_class_name_get(klass)
+ << "Error generating: " << ::eolian_class_short_name_get(klass)
<< std::endl;
assert(false && "error generating class");
}
inline std::string name(Eolian_Class const* klass)
{
- return ::eolian_class_name_get(klass);
+ return ::eolian_class_short_name_get(klass);
}
inline std::string full_name(Eolian_Class const* klass)
{
- return ::eolian_class_full_name_get(klass);
+ return ::eolian_class_name_get(klass);
}
inline std::string full_name_transformed(Eolian_Class const* klass)
Eolian_Class const* klass = ::eolian_type_class_get(tp);
if (klass)
{
- Eina_Stringshare* klass_name = ::eolian_class_full_name_get(klass);
+ Eina_Stringshare* klass_name = ::eolian_class_name_get(klass);
if (!klass_name)
throw std::runtime_error("Could not get Eo class name");
_function_belongs_to(const Eolian_Function *function, std::string klass)
{
const Eolian_Class *cl = eolian_function_class_get(function);
- const std::string name = cl ? eolian_class_full_name_get(cl) : "";
+ const std::string name = cl ? eolian_class_name_get(cl) : "";
return name.find(klass) == 0;
}
else
{
EINA_CXX_DOM_LOG_ERR(eolian::js::domain) << "Duplicate member function found in class: " <<
- eolian_class_full_name_get(klass) << ": '" << member_name << "'";
+ eolian_class_name_get(klass) << ": '" << member_name << "'";
}
}
catch(eolian::js::incomplete_complex_type_error const& e)
*/
typedef struct _Eolian_Unit Eolian_Unit;
+#ifdef __cplusplus
+#define EOLIAN_CAST(type, expr) reinterpret_cast<const type *>(expr)
+#else
+#define EOLIAN_CAST(type, expr) ((const type *)expr)
+#endif
+
+#define EOLIAN_OBJECT(expr) EOLIAN_CAST(Eolian_Object, expr)
+
typedef enum
{
EOLIAN_OBJECT_UNKNOWN = 0,
*
* @ingroup Eolian
*/
-EAPI Eina_Stringshare *eolian_class_full_name_get(const Eolian_Class *klass);
+static inline const char *
+eolian_class_name_get(const Eolian_Class *klass)
+{
+ return eolian_object_name_get(EOLIAN_OBJECT(klass));
+}
/*
* @brief Returns the name of the given class.
*
* @ingroup Eolian
*/
-EAPI Eina_Stringshare *eolian_class_name_get(const Eolian_Class *klass);
+static inline const char *
+eolian_class_short_name_get(const Eolian_Class *klass)
+{
+ return eolian_object_short_name_get(EOLIAN_OBJECT(klass));
+}
/*
* @brief Returns an iterator to the namespaces of the given class.
*
* @ingroup Eolian
*/
-EAPI Eina_Iterator *eolian_class_namespaces_get(const Eolian_Class *klass);
+static inline Eina_Iterator *
+eolian_class_namespaces_get(const Eolian_Class *klass)
+{
+ return eolian_object_namespaces_get(EOLIAN_OBJECT(klass));
+}
/*
* @brief Returns the class type of the given class
#include "eolian_database.h"
#include "eolian_priv.h"
-EAPI Eina_Stringshare *
-eolian_class_full_name_get(const Eolian_Class *cl)
-{
- return cl ? cl->base.name : NULL;
-}
-
-EAPI Eina_Stringshare *
-eolian_class_name_get(const Eolian_Class *cl)
-{
- return eolian_object_short_name_get((const Eolian_Object *)cl);
-}
-
-EAPI Eina_Iterator *
-eolian_class_namespaces_get(const Eolian_Class *cl)
-{
- return eolian_object_namespaces_get((const Eolian_Object *)cl);
-}
-
EAPI Eolian_Class_Type
eolian_class_type_get(const Eolian_Class *cl)
{
: namespaces(namespaces), eolian_name(eolian_name), base_qualifier(base_qualifier)
, type(type) {}
klass_name(Eolian_Class const* klass, qualifier_def base_qualifier)
- : eolian_name( ::eolian_class_name_get(klass))
+ : eolian_name( ::eolian_class_short_name_get(klass))
, base_qualifier(base_qualifier)
{
for(efl::eina::iterator<const char> namespace_iterator ( ::eolian_class_namespaces_get(klass))
{
this->namespaces.push_back(&*namespace_iterator);
}
- cxx_name = eolian_name = eolian_class_name_get(klass);
+ cxx_name = eolian_name = eolian_class_short_name_get(klass);
filename = eolian_object_file_get((const Eolian_Object *)klass);
for(efl::eina::iterator<Eolian_Function const> eolian_functions ( ::eolian_class_functions_get(klass, EOLIAN_PROPERTY))
, functions_last; eolian_functions != functions_last; ++eolian_functions)
fail_if(!(class_no = eolian_unit_class_by_name_get(unit, "no_nmsp")));
/* Check names and namespaces*/
- fail_if(strcmp(eolian_class_name_get(class11), "class1"));
+ fail_if(strcmp(eolian_class_short_name_get(class11), "class1"));
fail_if(!(iter = eolian_class_namespaces_get(class11)));
fail_if(!(eina_iterator_next(iter, (void**)&val1)));
fail_if(eina_iterator_next(iter, &dummy));
fail_if(strcmp(val1, "nmsp1"));
eina_iterator_free(iter);
- fail_if(strcmp(eolian_class_name_get(class112), "class2"));
+ fail_if(strcmp(eolian_class_short_name_get(class112), "class2"));
fail_if(!(iter = eolian_class_namespaces_get(class112)));
fail_if(!(eina_iterator_next(iter, (void**)&val1)));
fail_if(!(eina_iterator_next(iter, (void**)&val2)));
fail_if(strcmp(val2, "nmsp11"));
eina_iterator_free(iter);
- fail_if(strcmp(eolian_class_name_get(class21), "class1"));
+ fail_if(strcmp(eolian_class_short_name_get(class21), "class1"));
fail_if(!(iter = eolian_class_namespaces_get(class21)));
fail_if(!(eina_iterator_next(iter, (void**)&val1)));
fail_if(eina_iterator_next(iter, &dummy));
fail_if(strcmp(val1, "nmsp2"));
eina_iterator_free(iter);
- fail_if(strcmp(eolian_class_name_get(class_no), "no_nmsp"));
+ fail_if(strcmp(eolian_class_short_name_get(class_no), "no_nmsp"));
fail_if(eolian_class_namespaces_get(class_no));
/* Inherits */
ck_assert_str_eq(pattern, eolian_documentation_summary_get(doc));
fail_if(!(klass = eolian_part_class_get(part)));
- ck_assert_str_eq(part_classes[i], eolian_class_name_get(klass));
+ ck_assert_str_eq(part_classes[i], eolian_class_short_name_get(klass));
i++;
}
eina_iterator_free(iter);