q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=af2bcfa9d1f46fc7ef99b0f5f4dc9851dcf52612
commit af2bcfa9d1f46fc7ef99b0f5f4dc9851dcf52612 Author: Daniel Kolesa <[email protected]> Date: Thu Jun 4 15:41:52 2015 +0100 eolian: double newline ends summary, not single This allows you to split the summary on multiple lines if necessary (for example to satisfy line limit) @fix --- src/lib/eolian/eo_lexer.c | 12 +++++++++--- src/tests/eolian/data/docs.eo | 1 + src/tests/eolian/eolian_parsing.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c index 1f612f1..02df2fa 100644 --- a/src/lib/eolian/eo_lexer.c +++ b/src/lib/eolian/eo_lexer.c @@ -275,9 +275,15 @@ read_doc(Eo_Lexer *ls, Eo_Token *tok, int line, int column) } if (is_newline(ls->current)) { - while (is_newline(ls->current)) - next_line_ws(ls); - break; + next_line_ws(ls); + if (is_newline(ls->current)) + { + while (is_newline(ls->current)) + next_line_ws(ls); + break; + } + else + eina_strbuf_append_char(ls->buff, ' '); } else { diff --git a/src/tests/eolian/data/docs.eo b/src/tests/eolian/data/docs.eo index c219ced..eb89c92 100644 --- a/src/tests/eolian/data/docs.eo +++ b/src/tests/eolian/data/docs.eo @@ -1,5 +1,6 @@ struct Foo { [[This is struct Foo. + It does stuff. This is a longer description for struct Foo. diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c index 8b8503b..8ffc936 100644 --- a/src/tests/eolian/eolian_parsing.c +++ b/src/tests/eolian/eolian_parsing.c @@ -1150,7 +1150,7 @@ START_TEST(eolian_docs) fail_if(!(type = eolian_type_struct_get_by_name("Foo"))); fail_if(!(doc = eolian_type_documentation_get(type))); fail_if(strcmp(eolian_documentation_summary_get(doc), - "This is struct Foo.")); + "This is struct Foo. It does stuff.")); fail_if(strcmp(eolian_documentation_description_get(doc), "This is a longer description for struct Foo.\n\n" "This is another paragraph.")); --
