q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3f1d29f1ec7a94eddb7cd72cd7758a8d468d81d3
commit 3f1d29f1ec7a94eddb7cd72cd7758a8d468d81d3
Author: Daniel Kolesa <d.kol...@osg.samsung.com>
Date: Thu Sep 3 15:35:53 2015 +0100
eolian: remove support for old style docs completely
---
src/bin/eolian/eo_generator.c | 81 ++----------------------
src/bin/eolian/legacy_generator.c | 64 +------------------
src/bin/eolian_cxx/convert_comments.cc | 17 +++--
src/lib/eolian/Eolian.h | 45 -------------
src/lib/eolian/database_class.c | 1 -
src/lib/eolian/database_class_api.c | 7 --
src/lib/eolian/database_function.c | 5 --
src/lib/eolian/database_function_api.c | 23 -------
src/lib/eolian/database_function_parameter.c | 1 -
src/lib/eolian/database_function_parameter_api.c | 7 --
src/lib/eolian/eo_parser.c | 5 --
src/lib/eolian/eolian_database.h | 7 --
src/tests/eolian/data/class_simple_ref_eo.h | 8 ---
src/tests/eolian/data/class_simple_ref_legacy.h | 10 ---
src/tests/eolian/data/typedef.eo | 2 +-
src/tests/eolian/data/typedef_ref.c | 5 --
16 files changed, 17 insertions(+), 271 deletions(-)
diff --git a/src/bin/eolian/eo_generator.c b/src/bin/eolian/eo_generator.c
index 20a058d..a07bdfc 100644
--- a/src/bin/eolian/eo_generator.c
+++ b/src/bin/eolian/eo_generator.c
@@ -59,26 +59,10 @@ EAPI const Eo_Class *@#klasstype_get(void) EINA_CONST;\n\
\n\
";
-static const char
-tmpl_eo_funcdef_doxygen[] = "\
-/**\n\
-@#desc\n\
-@#list_desc_param\
- */\n";
-
-static const char
-tmpl_eo_pardesc[] =" * @param[%s] %s %s\n";
-
-#if 0
-static const char
-tmpl_eo_retdesc[] =" * @return %s\n";
-#endif
-
static Eina_Bool
eo_fundef_generate(const Eolian_Class *class, const Eolian_Function *func,
Eolian_Function_Type ftype, Eina_Strbuf *functext)
{
_eolian_class_func_vars func_env;
- const char *str_dir[] = {"in", "out", "inout"};
Eina_Iterator *itr;
void *data, *data2;
char *tmpstr = malloc(0x1FF);
@@ -109,16 +93,7 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
Eina_Bool hasnewdocs = eolian_function_documentation_get(func,
EOLIAN_UNRESOLVED) ||
eolian_function_documentation_get(func, ftype);
-
- if (!hasnewdocs)
- {
- /* it will still try to generate, but it'll have nothing to replace
- * this is ugly, but i CBA to find a better way (it wouldn't make a
- * difference anyway) and it'll be removed asap (when docs are
replaced)
- */
- eina_strbuf_append(str_func, tmpl_eo_funcdef_doxygen);
- }
- else
+ if (hasnewdocs)
{
Eina_Strbuf *dbuf = docs_generate_function(func, ftype, 0, EINA_FALSE);
eina_strbuf_append(str_func, eina_strbuf_string_get(dbuf));
@@ -133,27 +108,6 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
eina_strbuf_append_printf(str_func, "#endif\n");
eina_strbuf_append_printf(str_func, "\n");
- Eina_Strbuf *linedesc = eina_strbuf_new();
- const char *common_desc = eolian_function_description_get(func,
EOLIAN_UNRESOLVED);
- const char *specific_desc = (ftype == EOLIAN_PROP_SET || ftype ==
EOLIAN_PROP_GET) ?
- eolian_function_description_get(func, ftype) : NULL;
- if (!common_desc && !specific_desc) eina_strbuf_append(linedesc, "No
description supplied.");
- if (common_desc) eina_strbuf_append_printf(linedesc, "%s\n", common_desc);
- if (specific_desc) eina_strbuf_append(linedesc, specific_desc);
- if (eina_strbuf_length_get(linedesc))
- {
- eina_strbuf_replace_all(linedesc, "\n", "\n * ");
- eina_strbuf_replace_all(linedesc, " * \n", " *\n");
- eina_strbuf_prepend(linedesc, " * ");
- }
- else
- {
- eina_strbuf_append(linedesc, " *");
- }
-
- eina_strbuf_replace_all(str_func, "@#desc",
eina_strbuf_string_get(linedesc));
- eina_strbuf_free(linedesc);
-
Eina_Strbuf *str_par = eina_strbuf_new();
Eina_Strbuf *str_pardesc = eina_strbuf_new();
@@ -164,11 +118,6 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
const Eolian_Type *ptypet = eolian_parameter_type_get(param);
const char *pname = eolian_parameter_name_get(param);
const char *ptype = eolian_type_c_type_get(ptypet);
- const char *pdesc = eolian_parameter_description_get(param);
-
- if (!eina_strbuf_length_get(str_pardesc))
- eina_strbuf_append(str_pardesc, " *\n");
- eina_strbuf_append_printf(str_pardesc, tmpl_eo_pardesc, "in", pname,
pdesc?pdesc:"No description supplied.");
if (eina_strbuf_length_get(str_par)) eina_strbuf_append(str_par, ", ");
eina_strbuf_append_printf(str_par, "%s %s", ptype, pname);
@@ -185,7 +134,6 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
const Eolian_Type *ptypet = eolian_parameter_type_get(param);
const char *pname = eolian_parameter_name_get(param);
const char *ptype = eolian_type_c_type_get(ptypet);
- const char *pdesc = eolian_parameter_description_get(param);
Eina_Bool add_star = EINA_FALSE;
Eolian_Parameter_Dir pdir = eolian_parameter_direction_get(param);
@@ -197,12 +145,6 @@ eo_fundef_generate(const Eolian_Class *class, const
Eolian_Function *func, Eolia
if (ftype == EOLIAN_UNRESOLVED || ftype == EOLIAN_METHOD)
add_star = (pdir == EOLIAN_OUT_PARAM || pdir == EOLIAN_INOUT_PARAM);
Eina_Bool had_star = !!strchr(ptype, '*');
- const char *dir_str = str_dir[(int)pdir];
-
- if (!eina_strbuf_length_get(str_pardesc))
- eina_strbuf_append(str_pardesc, " *\n");
- eina_strbuf_append_printf(str_pardesc, tmpl_eo_pardesc, dir_str,
pname, pdesc?pdesc:"No description supplied.");
-
if (eina_strbuf_length_get(str_par)) eina_strbuf_append(str_par,
", ");
eina_strbuf_append_printf(str_par, "%s%s%s%s",
ptype, had_star?"":" ", add_star?"*":"", pname);
@@ -245,7 +187,6 @@ eo_header_generate(const Eolian_Class *class, Eina_Strbuf
*buf)
char *tmpstr = malloc(0x1FF);
Eina_Strbuf * str_hdr = eina_strbuf_new();
- const char *desc = eolian_class_description_get(class);
const Eolian_Documentation *doc = eolian_class_documentation_get(class);
_class_env_create(class, NULL, &class_env);
@@ -259,17 +200,6 @@ eo_header_generate(const Eolian_Class *class, Eina_Strbuf
*buf)
eina_strbuf_free(cdoc);
}
}
- else if (desc)
- {
- Eina_Strbuf *linedesc = eina_strbuf_new();
- eina_strbuf_append(linedesc, "/**\n");
- eina_strbuf_append(linedesc, desc);
- eina_strbuf_replace_all(linedesc, "\n", "\n * ");
- eina_strbuf_append(linedesc, "\n */\n");
- eina_strbuf_replace_all(linedesc, " * \n", " *\n"); /* Remove trailing
whitespaces */
- eina_strbuf_append(buf, eina_strbuf_string_get(linedesc));
- eina_strbuf_free(linedesc);
- }
_template_fill(str_hdr, tmpl_eo_obj_header, class, NULL, NULL, EINA_TRUE);
@@ -722,12 +652,9 @@ _desc_generate(const Eolian_Class *class, const
Eolian_Function *fid, Eolian_Fun
snprintf(tmpstr, sizeof(tmpstr), "%s%s", funcname, (ftype ==
EOLIAN_PROP_SET)
? "_set" : ((ftype == EOLIAN_PROP_GET) ? "_get" : ""));
- const char *opdesc = eolian_function_description_get(fid, ftype);
- if (!opdesc)
- {
- const Eolian_Documentation *doc =
eolian_function_documentation_get(fid, ftype);
- if (doc) opdesc = eolian_documentation_summary_get(doc);
- }
+ const char *opdesc = NULL;
+ const Eolian_Documentation *doc = eolian_function_documentation_get(fid,
ftype);
+ if (doc) opdesc = eolian_documentation_summary_get(doc);
char *desc = _source_desc_get(opdesc);
eo_op_desc_generate(class, fid, ftype, desc, tmpbuf);
diff --git a/src/bin/eolian/legacy_generator.c
b/src/bin/eolian/legacy_generator.c
index 1a0f0a9..18b4506 100644
--- a/src/bin/eolian/legacy_generator.c
+++ b/src/bin/eolian/legacy_generator.c
@@ -14,13 +14,6 @@
static _eolian_class_vars class_env;
static const char
-tmpl_eapi_funcdef_doxygen[] = "\n\
-/**\n\
-@#desc\n\
-@#list_desc_param\
- */\n";
-
-static const char
tmpl_eapi_funcdef[] = "EAPI @#type_return%s(@#params)@#flags;\n";
/*@#CLASS_CHECK(obj) @#check_ret;\n\*/
@@ -62,7 +55,6 @@ _eapi_decl_func_generate(const Eolian_Class *class, const
Eolian_Function *funci
Eina_Strbuf *fbody = eina_strbuf_new();
Eina_Strbuf *fparam = eina_strbuf_new();
- Eina_Strbuf *descparam = eina_strbuf_new();
_class_func_env_create(class, funcname, ftype, &func_env);
rettypet = eolian_function_return_type_get(funcid, ftype);
@@ -86,16 +78,7 @@ _eapi_decl_func_generate(const Eolian_Class *class, const
Eolian_Function *funci
Eina_Bool hasnewdocs = eolian_function_documentation_get(funcid,
EOLIAN_UNRESOLVED) ||
eolian_function_documentation_get(funcid, ftype);
-
- if (!hasnewdocs)
- {
- /* it will still try to generate, but it'll have nothing to replace
- * this is ugly, but i CBA to find a better way (it wouldn't make a
- * difference anyway) and it'll be removed asap (when docs are
replaced)
- */
- eina_strbuf_append(fbody, tmpl_eapi_funcdef_doxygen);
- }
- else
+ if (hasnewdocs)
{
Eina_Strbuf *dbuf = docs_generate_function(funcid, ftype, 0,
EINA_TRUE);
eina_strbuf_append_char(fbody, '\n');
@@ -112,26 +95,6 @@ _eapi_decl_func_generate(const Eolian_Class *class, const
Eolian_Function *funci
eina_strbuf_append(fparam, "const ");
eina_strbuf_append_printf(fparam, "%s *obj", class_env.full_classname);
}
- Eina_Strbuf *linedesc = eina_strbuf_new();
- const char *common_desc = eolian_function_description_get(funcid,
EOLIAN_UNRESOLVED);
- const char *specific_desc = (ftype == EOLIAN_PROP_SET || ftype ==
EOLIAN_PROP_GET) ?
- eolian_function_description_get(funcid, ftype) : NULL;
- if (!common_desc && !specific_desc) eina_strbuf_append(linedesc, "No
description supplied.");
- if (common_desc) eina_strbuf_append_printf(linedesc, "%s\n", common_desc);
- if (specific_desc) eina_strbuf_append(linedesc, specific_desc);
- if (eina_strbuf_length_get(linedesc))
- {
- eina_strbuf_replace_all(linedesc, "\n", "\n * ");
- eina_strbuf_replace_all(linedesc, " * \n", " *\n");
- eina_strbuf_prepend(linedesc," * ");
- }
- else
- {
- eina_strbuf_append(linedesc," *");
- }
-
- eina_strbuf_replace_all(fbody, "@#desc", eina_strbuf_string_get(linedesc));
- eina_strbuf_free(linedesc);
itr = eolian_property_keys_get(funcid, ftype);
EINA_ITERATOR_FOREACH(itr, data)
@@ -140,14 +103,11 @@ _eapi_decl_func_generate(const Eolian_Class *class, const
Eolian_Function *funci
const Eolian_Type *ptypet = eolian_parameter_type_get(param);
const char *pname = eolian_parameter_name_get(param);
const char *ptype = eolian_type_c_type_get(ptypet);
- const char *pdesc = eolian_parameter_description_get(param);
leg_param_idx++;
if (eina_strbuf_length_get(fparam)) eina_strbuf_append(fparam, ", ");
eina_strbuf_append_printf(fparam, "%s %s", ptype, pname);
eina_stringshare_del(ptype);
- if (!eina_strbuf_length_get(descparam))
- eina_strbuf_append(descparam, " *\n");
- eina_strbuf_append_printf(descparam, " * @param[in] %s %s\n", pname,
pdesc?pdesc:"No description supplied.");
+
if (eolian_parameter_is_nonull((Eolian_Function_Parameter*)data))
{
if (!flags)
@@ -169,9 +129,7 @@ _eapi_decl_func_generate(const Eolian_Class *class, const
Eolian_Function *funci
const Eolian_Type *ptypet = eolian_parameter_type_get(param);
const char *pname = eolian_parameter_name_get(param);
const char *ptype = eolian_type_c_type_get(ptypet);
- const char *pdesc = eolian_parameter_description_get(param);
Eolian_Parameter_Dir pdir = eolian_parameter_direction_get(param);
- const char *str_dir[] = {"in", "out", "inout"};
Eina_Bool had_star = !!strchr(ptype, '*');
if (ftype == EOLIAN_UNRESOLVED || ftype == EOLIAN_METHOD) add_star
= (pdir == EOLIAN_OUT_PARAM || pdir == EOLIAN_INOUT_PARAM);
if (ftype == EOLIAN_PROP_GET) pdir = EOLIAN_OUT_PARAM;
@@ -181,10 +139,6 @@ _eapi_decl_func_generate(const Eolian_Class *class, const
Eolian_Function *funci
eina_strbuf_append_printf(fparam, "%s%s%s%s",
ptype, had_star?"":" ", add_star?"*":"", pname);
eina_stringshare_del(ptype);
- const char *dir_str = str_dir[(int)pdir];
- if (!eina_strbuf_length_get(descparam))
- eina_strbuf_append(descparam, " *\n");
- eina_strbuf_append_printf(descparam, " * @param[%s] %s %s\n",
dir_str, pname, pdesc?pdesc:"No description supplied.");
if (eolian_parameter_is_nonull((Eolian_Function_Parameter*)data))
{
if (!flags)
@@ -204,7 +158,6 @@ _eapi_decl_func_generate(const Eolian_Class *class, const
Eolian_Function *funci
if (rettypet) rettype = eolian_type_c_type_get(rettypet);
eina_strbuf_replace_all(fbody, "@#params", eina_strbuf_string_get(fparam));
- eina_strbuf_replace_all(fbody, "@#list_desc_param",
eina_strbuf_string_get(descparam));
eina_strbuf_reset(fparam);
eina_strbuf_append_printf(fparam, "%s%s",
rettype ? rettype : "void",
@@ -227,7 +180,6 @@ end:
eina_strbuf_free(flags);
eina_strbuf_free(fbody);
eina_strbuf_free(fparam);
- eina_strbuf_free(descparam);
}
static void
@@ -383,7 +335,6 @@ legacy_header_generate(const Eolian_Class *class,
Eina_Strbuf *buf)
{
_class_env_create(class, NULL, &class_env);
- const char *desc = eolian_class_description_get(class);
const Eolian_Documentation *doc = eolian_class_documentation_get(class);
if (doc)
{
@@ -395,17 +346,6 @@ legacy_header_generate(const Eolian_Class *class,
Eina_Strbuf *buf)
eina_strbuf_free(cdoc);
}
}
- else if (desc)
- {
- Eina_Strbuf *linedesc = eina_strbuf_new();
- eina_strbuf_append(linedesc, "/**\n");
- eina_strbuf_append(linedesc, desc);
- eina_strbuf_replace_all(linedesc, "\n", "\n * ");
- eina_strbuf_append(linedesc, "\n */\n");
- eina_strbuf_replace_all(linedesc, " * \n", " *\n"); /* Remove trailing
whitespaces */
- eina_strbuf_append(buf, eina_strbuf_string_get(linedesc));
- eina_strbuf_free(linedesc);
- }
Eina_Iterator *itr = eolian_class_implements_get(class);
if (itr)
diff --git a/src/bin/eolian_cxx/convert_comments.cc
b/src/bin/eolian_cxx/convert_comments.cc
index 381786e..94fed90 100644
--- a/src/bin/eolian_cxx/convert_comments.cc
+++ b/src/bin/eolian_cxx/convert_comments.cc
@@ -8,7 +8,6 @@ static std::string
_comment_parameter(Eolian_Function_Parameter *param)
{
Eolian_Parameter_Dir direction = eolian_parameter_direction_get(param);
- Eina_Stringshare *description = eolian_parameter_description_get(param);
std::string doc = "@param";
if (direction == EOLIAN_IN_PARAM) doc += " ";
@@ -18,7 +17,8 @@ _comment_parameter(Eolian_Function_Parameter *param)
doc += safe_str(::eolian_parameter_name_get(param));
doc += " ";
- doc += safe_str(description);
+ /* FIXME */
+ doc += safe_str(NULL);
return doc;
}
@@ -38,10 +38,11 @@ _comment_parameters_list(Eina_Iterator *params)
}
static std::string
-_comment_brief_and_params(Eolian_Function const& function,
Eolian_Function_Type ftype)
+_comment_brief_and_params(Eolian_Function const& function,
Eolian_Function_Type)
{
std::string doc = "";
- std::string func = safe_str(::eolian_function_description_get(&function,
ftype));
+ /* FIXME */
+ std::string func = safe_str(NULL);
if (func != "")
{
doc += "@brief " + func + "\n\n";
@@ -64,7 +65,8 @@ _comment_return(Eolian_Function const& function,
std::string doc = "";
std::string ret = safe_str(rettypes);
if (rettypes) eina_stringshare_del(rettypes);
- std::string comment =
safe_str(::eolian_function_return_comment_get(&function, rettype));
+ /* FIXME */
+ std::string comment = safe_str(NULL);
if (ret != "void" && ret != "" && comment != "")
{
doc = "@return " + comment;
@@ -73,9 +75,10 @@ _comment_return(Eolian_Function const& function,
}
std::string
-convert_comments_class(Eolian_Class const& klass)
+convert_comments_class(Eolian_Class const&)
{
- return safe_str(::eolian_class_description_get(&klass));
+ /* FIXME */
+ return safe_str(NULL);
}
std::string
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index 36f7a74..9f47a98 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -543,16 +543,6 @@ EAPI Eolian_Class_Type eolian_class_type_get(const
Eolian_Class *klass);
EAPI Eina_Iterator *eolian_all_classes_get(void);
/*
- * @brief Returns the description of a class.
- *
- * @param[in] klass the class
- * @return the description of a class
- *
- * @ingroup Eolian
- */
-EAPI Eina_Stringshare *eolian_class_description_get(const Eolian_Class *klass);
-
-/*
* @brief Returns the documentation of a class.
*
* @param[in] klass the class
@@ -689,17 +679,6 @@ EAPI const Eolian_Function
*eolian_class_function_get_by_name(const Eolian_Class
EAPI Eina_Stringshare *eolian_function_legacy_get(const Eolian_Function
*function_id, Eolian_Function_Type f_type);
/*
- * @brief Returns a description for a function.
- *
- * @param[in] function_id Id of the function
- * @param[in] f_type The function type, for property get/set distinction.
- * @return the description or NULL.
- *
- * @ingroup Eolian
- */
-EAPI Eina_Stringshare *eolian_function_description_get(const Eolian_Function
*function_id, Eolian_Function_Type f_type);
-
-/*
* @brief Returns a documentation for a function.
*
* @param[in] function_id Id of the function
@@ -868,16 +847,6 @@ EAPI const Eolian_Expression
*eolian_parameter_default_value_get(const Eolian_Fu
EAPI Eina_Stringshare *eolian_parameter_name_get(const
Eolian_Function_Parameter *param);
/*
- * @brief Get description of a parameter
- *
- * @param[in] param_desc parameter handle
- * @return the description of the parameter or NULL
- *
- * @ingroup Eolian
- */
-EAPI Eina_Stringshare *eolian_parameter_description_get(const
Eolian_Function_Parameter *param);
-
-/*
* @brief Get documentation of a parameter
*
* @param[in] param_desc parameter handle
@@ -948,20 +917,6 @@ EAPI const Eolian_Expression *
eolian_function_return_default_value_get(const Eolian_Function *foo_id,
Eolian_Function_Type ftype);
/*
- * @brief Get the return comment of a function.
- *
- * @param[in] function_id id of the function
- * @param[in] ftype type of the function
- * @return the return comment of the function
- *
- * The type of the function is needed because a given function can represent a
- * property, that can be set and get functions.
- *
- * @ingroup Eolian
- */
-EAPI Eina_Stringshare *eolian_function_return_comment_get(const
Eolian_Function *foo_id, Eolian_Function_Type ftype);
-
-/*
* @brief Get the return docs of a function.
*
* @param[in] function_id id of the function
diff --git a/src/lib/eolian/database_class.c b/src/lib/eolian/database_class.c
index 8250c0d..28a1791 100644
--- a/src/lib/eolian/database_class.c
+++ b/src/lib/eolian/database_class.c
@@ -33,7 +33,6 @@ database_class_del(Eolian_Class *cl)
if (cl->name) eina_stringshare_del(cl->name);
if (cl->full_name) eina_stringshare_del(cl->full_name);
- if (cl->description) eina_stringshare_del(cl->description);
if (cl->legacy_prefix) eina_stringshare_del(cl->legacy_prefix);
if (cl->eo_prefix) eina_stringshare_del(cl->eo_prefix);
if (cl->data_type) eina_stringshare_del(cl->data_type);
diff --git a/src/lib/eolian/database_class_api.c
b/src/lib/eolian/database_class_api.c
index ae74977..946246d 100644
--- a/src/lib/eolian/database_class_api.c
+++ b/src/lib/eolian/database_class_api.c
@@ -63,13 +63,6 @@ eolian_all_classes_get(void)
return (_classes ? eina_hash_iterator_data_new(_classes) : NULL);
}
-EAPI Eina_Stringshare *
-eolian_class_description_get(const Eolian_Class *cl)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(cl, NULL);
- return cl->description;
-}
-
EAPI const Eolian_Documentation *
eolian_class_documentation_get(const Eolian_Class *cl)
{
diff --git a/src/lib/eolian/database_function.c
b/src/lib/eolian/database_function.c
index ff3590d..454c511 100644
--- a/src/lib/eolian/database_function.c
+++ b/src/lib/eolian/database_function.c
@@ -27,11 +27,6 @@ database_function_del(Eolian_Function *fid)
database_expr_del(fid->set_ret_val);
if (fid->get_legacy) eina_stringshare_del(fid->get_legacy);
if (fid->set_legacy) eina_stringshare_del(fid->set_legacy);
- if (fid->get_description) eina_stringshare_del(fid->get_description);
- if (fid->set_description) eina_stringshare_del(fid->set_description);
- if (fid->common_description) eina_stringshare_del(fid->common_description);
- if (fid->get_return_comment) eina_stringshare_del(fid->get_return_comment);
- if (fid->set_return_comment) eina_stringshare_del(fid->set_return_comment);
database_doc_del(fid->common_doc);
database_doc_del(fid->get_doc);
database_doc_del(fid->set_doc);
diff --git a/src/lib/eolian/database_function_api.c
b/src/lib/eolian/database_function_api.c
index 3c23156..31bc862 100644
--- a/src/lib/eolian/database_function_api.c
+++ b/src/lib/eolian/database_function_api.c
@@ -133,18 +133,6 @@ eolian_function_legacy_get(const Eolian_Function *fid,
Eolian_Function_Type ftyp
}
}
-EAPI Eina_Stringshare *
-eolian_function_description_get(const Eolian_Function *fid,
Eolian_Function_Type ftype)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(fid, NULL);
- switch (ftype)
- {
- case EOLIAN_PROP_GET: return fid->get_description; break;
- case EOLIAN_PROP_SET: return fid->set_description; break;
- default: return fid->common_description;
- }
-}
-
EAPI const Eolian_Documentation *
eolian_function_documentation_get(const Eolian_Function *fid,
Eolian_Function_Type ftype)
{
@@ -294,17 +282,6 @@ eolian_function_return_default_value_get(const
Eolian_Function *fid, Eolian_Func
}
}
-EAPI Eina_Stringshare *
-eolian_function_return_comment_get(const Eolian_Function *fid,
Eolian_Function_Type ftype)
-{
- switch (ftype)
- {
- case EOLIAN_PROP_SET: return fid->set_return_comment; break;
- case EOLIAN_UNRESOLVED: case EOLIAN_METHOD: case EOLIAN_PROPERTY: case
EOLIAN_PROP_GET: return fid->get_return_comment; break;
- default: return NULL;
- }
-}
-
EAPI const Eolian_Documentation *
eolian_function_return_documentation_get(const Eolian_Function *fid,
Eolian_Function_Type ftype)
{
diff --git a/src/lib/eolian/database_function_parameter.c
b/src/lib/eolian/database_function_parameter.c
index 75f0835..7347eb7 100644
--- a/src/lib/eolian/database_function_parameter.c
+++ b/src/lib/eolian/database_function_parameter.c
@@ -12,7 +12,6 @@ database_parameter_del(Eolian_Function_Parameter *pdesc)
eina_stringshare_del(pdesc->name);
database_type_del(pdesc->type);
- eina_stringshare_del(pdesc->description);
database_doc_del(pdesc->doc);
free(pdesc);
}
diff --git a/src/lib/eolian/database_function_parameter_api.c
b/src/lib/eolian/database_function_parameter_api.c
index 6c9a8d7..4835d09 100644
--- a/src/lib/eolian/database_function_parameter_api.c
+++ b/src/lib/eolian/database_function_parameter_api.c
@@ -33,13 +33,6 @@ eolian_parameter_name_get(const Eolian_Function_Parameter
*param)
return param->name;
}
-EAPI Eina_Stringshare *
-eolian_parameter_description_get(const Eolian_Function_Parameter *param)
-{
- EINA_SAFETY_ON_NULL_RETURN_VAL(param, NULL);
- return param->description;
-}
-
EAPI const Eolian_Documentation *
eolian_parameter_documentation_get(const Eolian_Function_Parameter *param)
{
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index e065797..53dbe32 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -923,7 +923,6 @@ parse_variable(Eo_Lexer *ls, Eina_Bool global)
typedef struct _Eo_Ret_Def
{
Eolian_Type *type;
- Eina_Stringshare *comment;
Eolian_Documentation *doc;
Eolian_Expression *default_ret_val;
Eina_Bool warn_unused:1;
@@ -938,7 +937,6 @@ parse_return(Eo_Lexer *ls, Eo_Ret_Def *ret, Eina_Bool
allow_void)
ret->type = parse_type_void(ls);
else
ret->type = parse_type(ls);
- ret->comment = NULL;
ret->doc = NULL;
ret->default_ret_val = NULL;
ret->warn_unused = EINA_FALSE;
@@ -1110,7 +1108,6 @@ parse_accessor(Eo_Lexer *ls, Eolian_Function *prop)
if (is_get)
{
prop->get_ret_type = ret.type;
- prop->get_return_comment = ret.comment;
prop->get_return_doc = ret.doc;
prop->get_ret_val = ret.default_ret_val;
prop->get_return_warn_unused = ret.warn_unused;
@@ -1118,7 +1115,6 @@ parse_accessor(Eo_Lexer *ls, Eolian_Function *prop)
else
{
prop->set_ret_type = ret.type;
- prop->set_return_comment = ret.comment;
prop->set_return_doc = ret.doc;
prop->set_ret_val = ret.default_ret_val;
prop->set_return_warn_unused = ret.warn_unused;
@@ -1316,7 +1312,6 @@ body:
pop_type(ls);
if (ret.default_ret_val) pop_expr(ls);
meth->get_ret_type = ret.type;
- meth->get_return_comment = ret.comment;
meth->get_return_doc = ret.doc;
meth->get_ret_val = ret.default_ret_val;
meth->get_return_warn_unused = ret.warn_unused;
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index 02b8bb1..40a5f62 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -82,7 +82,6 @@ struct _Eolian_Class
Eina_List *namespaces; /* List Eina_Stringshare * */
Eina_Stringshare *name;
Eolian_Class_Type type;
- Eina_Stringshare *description;
Eolian_Documentation *doc;
Eina_Stringshare *legacy_prefix;
Eina_Stringshare *eo_prefix;
@@ -123,11 +122,6 @@ struct _Eolian_Function
Eolian_Implement *set_impl;
Eina_Stringshare *get_legacy;
Eina_Stringshare *set_legacy;
- Eina_Stringshare *common_description;
- Eina_Stringshare *get_description;
- Eina_Stringshare *set_description;
- Eina_Stringshare *get_return_comment;
- Eina_Stringshare *set_return_comment;
Eolian_Documentation *common_doc;
Eolian_Documentation *get_doc;
Eolian_Documentation *set_doc;
@@ -157,7 +151,6 @@ struct _Eolian_Function_Parameter
Eina_Stringshare *name;
Eolian_Type *type;
Eolian_Expression *value;
- Eina_Stringshare *description;
Eolian_Documentation *doc;
Eolian_Parameter_Dir param_dir;
Eina_Bool nonull :1; /* True if this argument cannot be NULL - deprecated */
diff --git a/src/tests/eolian/data/class_simple_ref_eo.h
b/src/tests/eolian/data/class_simple_ref_eo.h
index 3ac3049..6a0dac1 100644
--- a/src/tests/eolian/data/class_simple_ref_eo.h
+++ b/src/tests/eolian/data/class_simple_ref_eo.h
@@ -47,9 +47,6 @@ EOAPI Eina_Bool evas_obj_simple_a_set(int value);
EOAPI int evas_obj_simple_a_get(void);
#endif
-/**
- * No description supplied.
- */
EOAPI void evas_obj_simple_b_set(void);
#ifdef CLASS_SIMPLE_BETA
@@ -66,11 +63,6 @@ EOAPI void evas_obj_simple_b_set(void);
EOAPI char * evas_obj_simple_foo(int a, char *b, double *c);
#endif
-/**
- * No description supplied.
- *
- * @param[in] x No description supplied.
- */
EOAPI int evas_obj_simple_bar(int x);
diff --git a/src/tests/eolian/data/class_simple_ref_legacy.h
b/src/tests/eolian/data/class_simple_ref_legacy.h
index 1c11281..8fd6345 100644
--- a/src/tests/eolian/data/class_simple_ref_legacy.h
+++ b/src/tests/eolian/data/class_simple_ref_legacy.h
@@ -39,10 +39,6 @@ EAPI Eina_Bool evas_object_simple_a_set(Class_Simple *obj,
int value);
* @ingroup Class_Simple
*/
EAPI int evas_object_simple_a_get(const Class_Simple *obj);
-
-/**
- * No description supplied.
- */
EAPI void evas_object_simple_b_set(Class_Simple *obj);
/**
@@ -56,12 +52,6 @@ EAPI void evas_object_simple_b_set(Class_Simple *obj);
* @ingroup Class_Simple
*/
EAPI char *evas_object_simple_foo(Class_Simple *obj, int a, char *b, double
*c);
-
-/**
- * No description supplied.
- *
- * @param[in] x No description supplied.
- */
EAPI int evas_object_simple_bar(Class_Simple *obj, int x);
#endif
diff --git a/src/tests/eolian/data/typedef.eo b/src/tests/eolian/data/typedef.eo
index 71bebb8..2df00c0 100644
--- a/src/tests/eolian/data/typedef.eo
+++ b/src/tests/eolian/data/typedef.eo
@@ -28,7 +28,7 @@ class Typedef {
params {
idx: int;
}
- return: own(char*); [[comment for method return]]
+ return: own(char*);
}
}
}
diff --git a/src/tests/eolian/data/typedef_ref.c
b/src/tests/eolian/data/typedef_ref.c
index 6749991..9ab6954 100644
--- a/src/tests/eolian/data/typedef_ref.c
+++ b/src/tests/eolian/data/typedef_ref.c
@@ -37,11 +37,6 @@ typedef enum
EAPI const Eo_Class *typedef_class_get(void) EINA_CONST;
-/**
- * No description supplied.
- *
- * @param[in] idx No description supplied.
- */
EOAPI char * typedef_foo(int idx);
--
