q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3f4c569341ab501b188f49c273bb961e0f1b75ee
commit 3f4c569341ab501b188f49c273bb961e0f1b75ee Author: Daniel Kolesa <d.kol...@osg.samsung.com> Date: Fri Jun 5 14:49:40 2015 +0100 eolian: don't emit an extra empty line in certain cases --- src/bin/eolian/docs_generator.c | 17 ++++++++++++----- src/tests/eolian/data/class_simple_ref_eo.h | 1 - src/tests/eolian/data/class_simple_ref_legacy.h | 1 - 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/bin/eolian/docs_generator.c b/src/bin/eolian/docs_generator.c index 7047585..6272d46 100644 --- a/src/bin/eolian/docs_generator.c +++ b/src/bin/eolian/docs_generator.c @@ -242,8 +242,11 @@ docs_generate_function(const Eolian_Function *fid, Eolian_Function_Type ftype, i indent, curl, buf, wbuf); eina_strbuf_append_char(buf, '\n'); - _indent_line(buf, indent); - eina_strbuf_append(buf, " *\n"); + if (desc || par || rdoc || pdoc) + { + _indent_line(buf, indent); + eina_strbuf_append(buf, " *\n"); + } if (desc) { @@ -275,7 +278,7 @@ docs_generate_function(const Eolian_Function *fid, Eolian_Function_Type ftype, i _append_section(desc, indent, curl + 3, buf, wbuf); eina_strbuf_append_char(buf, '\n'); } - if (par) + if (par || rdoc) { _indent_line(buf, indent); eina_strbuf_append(buf, " *\n"); @@ -334,13 +337,17 @@ docs_generate_function(const Eolian_Function *fid, Eolian_Function_Type ftype, i force_out = EINA_TRUE; } } + + if (!par && rdoc) + { + _indent_line(buf, indent); + eina_strbuf_append(buf, " *\n"); + } } eina_iterator_free(itr); if (rdoc) { - _indent_line(buf, indent); - eina_strbuf_append(buf, " *\n"); curl = _indent_line(buf, indent); eina_strbuf_append(buf, " * @return "); curl += sizeof(" * @return ") - 1; diff --git a/src/tests/eolian/data/class_simple_ref_eo.h b/src/tests/eolian/data/class_simple_ref_eo.h index 4cf1c6d..b430036 100644 --- a/src/tests/eolian/data/class_simple_ref_eo.h +++ b/src/tests/eolian/data/class_simple_ref_eo.h @@ -35,7 +35,6 @@ EOAPI Eina_Bool evas_obj_simple_a_set(int value); /** * @brief Common desc for a * - * * @return Value description */ EOAPI int evas_obj_simple_a_get(void); diff --git a/src/tests/eolian/data/class_simple_ref_legacy.h b/src/tests/eolian/data/class_simple_ref_legacy.h index 22c5b6b..29889f8 100644 --- a/src/tests/eolian/data/class_simple_ref_legacy.h +++ b/src/tests/eolian/data/class_simple_ref_legacy.h @@ -29,7 +29,6 @@ EAPI Eina_Bool evas_object_simple_a_set(Class_Simple *obj, int value); /** * @brief Common desc for a * - * * @return Value description */ EAPI int evas_object_simple_a_get(const Class_Simple *obj); --