eolian: remove support for old event doc syntax

This commit is contained in:
Daniel Kolesa 2015-06-11 17:14:51 +01:00
parent 27237976ad
commit 950322fd12
8 changed files with 7 additions and 42 deletions

View File

@ -285,7 +285,6 @@ eo_header_generate(const Eolian_Class *class, Eina_Strbuf *buf)
EINA_ITERATOR_FOREACH(itr, event)
{
Eina_Stringshare *evname = eolian_event_c_name_get(event);
const char *evdesc = eolian_event_description_get(event);
const Eolian_Documentation *evdoc = eolian_event_documentation_get(event);
Eolian_Object_Scope scope = eolian_event_scope_get(event);
@ -316,14 +315,7 @@ eo_header_generate(const Eolian_Class *class, Eina_Strbuf *buf)
eina_strbuf_free(evdbuf);
}
else
{
if (!evdesc) evdesc = "No description";
eina_strbuf_reset(tmpbuf);
eina_strbuf_append(tmpbuf, evdesc);
eina_strbuf_replace_all(tmpbuf, "\n", "\n * ");
eina_strbuf_prepend(tmpbuf," * ");
eina_strbuf_append_printf(str_ev, "/**\n%s\n */\n", eina_strbuf_string_get(tmpbuf));
}
eina_strbuf_append(str_ev, "/**\n * No description\n */\n");
eina_strbuf_append_printf(str_ev, "#define %s (&(_%s))\n", evname, evname);
eina_strbuf_append_printf(str_extrn_ev, "EOAPI extern const Eo_Event_Description _%s;\n", evname);
@ -701,12 +693,9 @@ eo_source_beginning_generate(const Eolian_Class *class, Eina_Strbuf *buf)
EINA_ITERATOR_FOREACH(itr, event)
{
Eina_Stringshare *evname = eolian_event_c_name_get(event);
const char *evdesc = eolian_event_description_get(event);
if (!evdesc)
{
const Eolian_Documentation *doc = eolian_event_documentation_get(event);
if (doc) evdesc = eolian_documentation_summary_get(doc);
}
const char *evdesc = NULL;
const Eolian_Documentation *doc = eolian_event_documentation_get(event);
if (doc) evdesc = eolian_documentation_summary_get(doc);
char *evdesc_line1 = _source_desc_get(evdesc);
eina_strbuf_append_printf(tmpbuf,

View File

@ -361,7 +361,8 @@ event_create(Eolian_Class const& klass, const Eolian_Event *event_)
event.name = normalize_spaces(name_);
event.eo_name = safe_upper
(find_replace(class_full_name(klass), ".", "_") + "_EVENT_" + event.name);
event.comment = safe_str(eolian_event_description_get(event_));
/* FIXME: use doc api */
event.comment = safe_str("");
}
return event;
}

View File

@ -1339,16 +1339,6 @@ EAPI Eina_Stringshare *eolian_event_name_get(const Eolian_Event *event);
*/
EAPI const Eolian_Type *eolian_event_type_get(const Eolian_Event *event);
/*
* @brief Get the description of an event.
*
* @param[in] event the event handle
* @return the description or NULL
*
* @ingroup Eolian
*/
EAPI Eina_Stringshare *eolian_event_description_get(const Eolian_Event *event);
/*
* @brief Get the documentation of an event.
*

View File

@ -10,7 +10,6 @@ database_event_del(Eolian_Event *event)
{
if (!event) return;
if (event->name) eina_stringshare_del(event->name);
if (event->comment) eina_stringshare_del(event->comment);
database_type_del(event->type);
database_doc_del(event->doc);
free(event);

View File

@ -19,13 +19,6 @@ eolian_event_type_get(const Eolian_Event *event)
return event->type;
}
EAPI Eina_Stringshare *
eolian_event_description_get(const Eolian_Event *event)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(event, NULL);
return event->comment;
}
EAPI const Eolian_Documentation *
eolian_event_documentation_get(const Eolian_Event *event)
{

View File

@ -46,10 +46,9 @@ static void
_event_print(Eolian_Event *ev, int nb_spaces)
{
const Eolian_Type *type = eolian_event_type_get(ev);
const char *desc = eolian_event_description_get(ev);
printf("%*s <%s> <", nb_spaces + 5, "", eolian_event_name_get(ev));
if (type) database_type_print((Eolian_Type*)type);
printf("> <%s>\n", desc ? desc : "");
printf(">\n");
}
static Eina_Bool _function_print(const Eolian_Function *fid, int nb_spaces)

View File

@ -1583,11 +1583,6 @@ parse_event(Eo_Lexer *ls)
}
check(ls, ';');
eo_lexer_get(ls);
if (ls->t.token == TOK_COMMENT)
{
ev->comment = eina_stringshare_ref(ls->t.value.s);
eo_lexer_get(ls);
}
FILL_DOC(ls, ev, doc);
ev->klass = ls->tmp.kls;
}

View File

@ -209,7 +209,6 @@ struct _Eolian_Event
{
Eolian_Object base;
Eina_Stringshare *name;
Eina_Stringshare *comment;
Eolian_Documentation *doc;
Eolian_Type *type;
Eolian_Class *klass;