dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eolian/Lexer: support data type for events.

This commit is contained in:
Daniel Zaoui 2014-04-02 14:04:12 +03:00
parent 8e5234cf75
commit 0eb092d157
8 changed files with 1240 additions and 1194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/eolian/eo1_generator.c
View File

@ -286,7 +286,7 @@ eo1_header_generate(const char *classname, Eina_Strbuf *buf)
{
const char *evname = NULL;
const char *evdesc = NULL;
eolian_class_event_information_get(event, &evname, &evdesc);
eolian_class_event_information_get(event, &evname, NULL, &evdesc);
if (!evdesc) evdesc = "No description";
eina_strbuf_reset(tmpbuf);
@ -553,7 +553,7 @@ eo1_source_beginning_generate(const char *classname, Eina_Strbuf *buf)
const char *evdesc;
char *evdesc_line1;
eolian_class_event_information_get(event, &evname, &evdesc);
eolian_class_event_information_get(event, &evname, NULL, &evdesc);
evdesc_line1 = _source_desc_get(evdesc);
_template_fill(str_ev, "@#CLASS_EVENT_@#FUNC", classname, evname, EINA_TRUE);
eina_strbuf_replace_all(str_ev, ",", "_");
@ -810,7 +810,7 @@ eo1_source_end_generate(const char *classname, Eina_Strbuf *buf)
{
const char *evname;
eolian_class_event_information_get(event, &evname, NULL);
eolian_class_event_information_get(event, &evname, NULL, NULL);
_template_fill(tmpbuf, "@#CLASS_EVENT_@#FUNC", classname, evname, EINA_TRUE);
eina_strbuf_replace_all(tmpbuf, ",", "_");
eina_strbuf_append_printf(str_ev, "\n %s,", eina_strbuf_string_get(tmpbuf));

2
src/lib/eolian/Eolian.h
View File

@ -578,7 +578,7 @@ EAPI const Eina_List *eolian_class_events_list_get(const char *class_name);
*
* @ingroup Eolian
*/
EAPI Eina_Bool eolian_class_event_information_get(Eolian_Event event, const char **event_name, const char **event_desc);
EAPI Eina_Bool eolian_class_event_information_get(Eolian_Event event, const char **event_name, const char **event_type, const char **event_desc);
/*
* @brief Indicates if the class constructor has to invoke

2
src/lib/eolian/eo_definitions.c
View File

@ -95,6 +95,8 @@ eo_definitions_event_def_free(Eo_Event_Def *sgn)
{
if (sgn->name)
eina_stringshare_del(sgn->name);
if (sgn->type)
eina_stringshare_del(sgn->type);
if (sgn->comment)
eina_stringshare_del(sgn->comment);

1
src/lib/eolian/eo_definitions.h
View File

@ -94,6 +94,7 @@ typedef struct _eo_method_def
typedef struct _eo_event_def
{
const char *name;
const char *type;
const char *comment;
} Eo_Event_Def;

2394
src/lib/eolian/eo_lexer.c
View File

File diff suppressed because it is too large Load Diff

14
src/lib/eolian/eo_lexer.rl
View File

@ -828,6 +828,13 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p)
toknz->tmp.kls->events = eina_list_append(toknz->tmp.kls->events, toknz->tmp.event);
}
action end_event_type {
if (!toknz->tmp.event) ABORT(toknz, "No event!!!");
if (toknz->tmp.event->type != NULL)
ABORT(toknz, "event %s has already a type %s", toknz->tmp.event->name, toknz->tmp.event->type);
toknz->tmp.event->type = _eo_tokenizer_token_get(toknz, fpc-1);
}
action end_event_comment {
if (!toknz->tmp.event) ABORT(toknz, "No event!!!");
if (toknz->tmp.event->comment != NULL)
@ -951,7 +958,8 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p)
implements = 'implements' ignore* begin_def ignore* impl_it* end_def;
event_comment = ws* eo_comment %end_event_comment;
event_it = event %end_event_name ignore* end_statement event_comment? ignore*;
event_type = begin_list ws* alpha_u >save_fpc (alnum_u | '*' | ws )* ws* end_list %end_event_type;
event_it = event %end_event_name ws* event_type? ignore* end_statement event_comment? ignore*;
events = 'events' ignore* begin_def ignore* event_it* end_def;
constructors = 'constructors' ignore* begin_def;
@ -1184,7 +1192,7 @@ eo_tokenizer_dump(Eo_Tokenizer *toknz)
printf("\n");
printf(" events:\n");
EINA_LIST_FOREACH(kls->events, l, sgn)
printf(" %s (%s)\n", sgn->name, sgn->comment);
printf(" %s <%s> (%s)\n", sgn->name, sgn->type, sgn->comment);
EINA_LIST_FOREACH(kls->constructors, l, meth)
{
@ -1511,7 +1519,7 @@ eo_tokenizer_database_fill(const char *filename)
EINA_LIST_FOREACH(kls->events, l, event)
{
Eolian_Event ev = database_event_new(event->name, event->comment);
Eolian_Event ev = database_event_new(event->name, event->type, event->comment);
database_class_event_add(kls->name, ev);
}

13
src/lib/eolian/eolian_database.c
View File

@ -84,6 +84,7 @@ typedef struct
typedef struct
{
Eina_Stringshare *name;
Eina_Stringshare *type;
Eina_Stringshare *comment;
} _Event_Desc;
@ -983,12 +984,13 @@ eolian_function_object_is_const(Eolian_Function foo_id)
}
Eolian_Event
database_event_new(const char *event_name, const char *event_comment)
database_event_new(const char *event_name, const char *event_type, const char *event_comment)
{
if (!event_name) return NULL;
_Event_Desc *event_desc = calloc(1, sizeof(_Event_Desc));
if (!event_desc) return NULL;
event_desc->name = eina_stringshare_add(event_name);
if (event_type) event_desc->type = eina_stringshare_add(event_type);
event_desc->comment = eina_stringshare_add(event_comment);
return (Eolian_Event) event_desc;
}
@ -1020,11 +1022,12 @@ eolian_class_events_list_get(const char *class_name)
}
EAPI Eina_Bool
eolian_class_event_information_get(Eolian_Event event, const char **event_name, const char **event_comment)
eolian_class_event_information_get(Eolian_Event event, const char **event_name, const char **event_type, const char **event_comment)
{
_Event_Desc *_event_desc = (_Event_Desc *) event;
EINA_SAFETY_ON_NULL_RETURN_VAL(_event_desc, EINA_FALSE);
if (event_name) *event_name = _event_desc->name;
if (event_type) *event_type = _event_desc->type;
if (event_comment) *event_comment = _event_desc->comment;
return EINA_TRUE;
}
@ -1112,10 +1115,10 @@ _implements_print(Eolian_Implement impl, int nb_spaces)
static void
_event_print(Eolian_Event ev, int nb_spaces)
{
const char *name, *comment;
const char *name, *comment, *type;
eolian_class_event_information_get(ev, &name, &comment);
printf("%*s <%s> <%s>\n", nb_spaces + 5, "", name, comment);
eolian_class_event_information_get(ev, &name, &type, &comment);
printf("%*s <%s> <%s> <%s>\n", nb_spaces + 5, "", name, type, comment);
}
static Eina_Bool _function_print(const _Function_Id *fid, int nb_spaces)

2
src/lib/eolian/eolian_database.h
View File

@ -133,7 +133,7 @@ Eina_Bool
database_class_dtor_enable_set(const char *class_name, Eina_Bool enable);
Eolian_Event
database_event_new(const char *event_name, const char *event_desc);
database_event_new(const char *event_name, const char *event_type, const char *event_desc);
void
database_event_free(Eolian_Event event);