From 6862fa801b9b2b40670772351e78a73ac9533c88 Mon Sep 17 00:00:00 2001 From: Yossi Kantor Date: Thu, 13 Mar 2014 16:40:34 +0200 Subject: [PATCH] Eolian/Generator: Improved event generation Line breaks in source files and extern definitions of events in header files. --- src/bin/eolian/eo1_generator.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bin/eolian/eo1_generator.c b/src/bin/eolian/eo1_generator.c index a50a8fde29..675ab13444 100644 --- a/src/bin/eolian/eo1_generator.c +++ b/src/bin/eolian/eo1_generator.c @@ -83,7 +83,7 @@ enum\n\ @#EOPREFIX_SUB_ID_LAST\n\ };\n\ \n\ -#define @#EOPREFIX_ID(sub_id) (@#EOPREFIX_BASE_ID + sub_id)\n\ +#define @#EOPREFIX_ID(sub_id) (@#EOPREFIX_BASE_ID + sub_id)\n\n\ "; static const char @@ -264,6 +264,7 @@ eo1_header_generate(const char *classname, Eina_Strbuf *buf) Eina_Strbuf *str_subid = eina_strbuf_new(); Eina_Strbuf *str_ev = eina_strbuf_new(); + Eina_Strbuf *str_extrn_ev = eina_strbuf_new(); Eina_Strbuf *tmpbuf = eina_strbuf_new(); Eolian_Event event; @@ -284,6 +285,7 @@ eo1_header_generate(const char *classname, Eina_Strbuf *buf) eina_strbuf_replace_all(tmpbuf, ",", "_"); const char* s = eina_strbuf_string_get(tmpbuf); eina_strbuf_append_printf(str_ev, "#define %s (&(_%s))\n", s, s); + eina_strbuf_append_printf(str_extrn_ev, "EAPI extern const Eo_Event_Description _%s;\n", s); } int i; @@ -316,6 +318,7 @@ eo1_header_generate(const char *classname, Eina_Strbuf *buf) } eina_strbuf_replace_all(str_hdr, "@#list_subid", eina_strbuf_string_get(str_subid)); + eina_strbuf_append(str_hdr, eina_strbuf_string_get(str_extrn_ev)); eina_strbuf_append(str_hdr, eina_strbuf_string_get(str_ev)); eina_strbuf_append(buf, eina_strbuf_string_get(str_hdr)); @@ -323,6 +326,7 @@ eo1_header_generate(const char *classname, Eina_Strbuf *buf) free(tmpstr); eina_strbuf_free(str_subid); eina_strbuf_free(str_ev); + eina_strbuf_free(str_extrn_ev); eina_strbuf_free(tmpbuf); eina_strbuf_free(str_hdr); @@ -525,7 +529,7 @@ eo1_source_beginning_generate(const char *classname, Eina_Strbuf *buf) eina_strbuf_replace_all(str_ev, ",", "_"); eina_strbuf_append_printf(tmpbuf, - "EAPI const Eo_Event_Description _%s = EO_EVENT_DESCRIPTION(\"%s\", \"%s\");\n", + "EAPI const Eo_Event_Description _%s =\n EO_EVENT_DESCRIPTION(\"%s\", \"%s\");\n", eina_strbuf_string_get(str_ev), evname, evdesc_line1); free(evdesc_line1); }