forked from enlightenment/efl
Eolian/Lexer: rename signals to events.
This commit is contained in:
parent
a934780714
commit
8de58b9757
|
@ -24,7 +24,7 @@ _@#class_class_constructor(Eo_Class *klass)\n\
|
|||
EO_OP_FUNC_SENTINEL\n\
|
||||
};\n\
|
||||
eo_class_funcs_set(klass, func_desc);\n\
|
||||
_user_@#class_class_constructor(klass);\n\
|
||||
_@#class_class_constructor(klass);\n\
|
||||
}\n\
|
||||
\n\
|
||||
static const Eo_Op_Description @#class_op_desc[] = {@#list_op\n\
|
||||
|
|
|
@ -73,7 +73,7 @@ eo_definitions_method_def_free(Eo_Method_Def *meth)
|
|||
}
|
||||
|
||||
void
|
||||
eo_definitions_signal_def_free(Eo_Signal_Def *sgn)
|
||||
eo_definitions_event_def_free(Eo_Event_Def *sgn)
|
||||
{
|
||||
if (sgn->name)
|
||||
eina_stringshare_del(sgn->name);
|
||||
|
@ -123,7 +123,7 @@ eo_definitions_class_def_free(Eo_Class_Def *kls)
|
|||
Eina_List *l;
|
||||
Eo_Property_Def *prop;
|
||||
Eo_Method_Def *meth;
|
||||
Eo_Signal_Def *sgn;
|
||||
Eo_Event_Def *sgn;
|
||||
Eo_Implement_Def *impl;
|
||||
|
||||
if (kls->name)
|
||||
|
@ -151,8 +151,8 @@ eo_definitions_class_def_free(Eo_Class_Def *kls)
|
|||
EINA_LIST_FREE(kls->methods, meth)
|
||||
eo_definitions_method_def_free(meth);
|
||||
|
||||
EINA_LIST_FREE(kls->signals, sgn)
|
||||
eo_definitions_signal_def_free(sgn);
|
||||
EINA_LIST_FREE(kls->events, sgn)
|
||||
eo_definitions_event_def_free(sgn);
|
||||
|
||||
if (kls->dflt_ctor) eo_definitions_dfltctor_def_free(kls->dflt_ctor);
|
||||
if (kls->dflt_dtor) eo_definitions_dfltdtor_def_free(kls->dflt_dtor);
|
||||
|
|
|
@ -84,11 +84,11 @@ typedef struct _eo_method_def
|
|||
|
||||
/* SIGNAL */
|
||||
|
||||
typedef struct _eo_signal_def
|
||||
typedef struct _eo_event_def
|
||||
{
|
||||
const char *name;
|
||||
const char *comment;
|
||||
} Eo_Signal_Def;
|
||||
} Eo_Event_Def;
|
||||
|
||||
/* DEFAULT CONSTRUCTOR */
|
||||
|
||||
|
@ -139,7 +139,7 @@ typedef struct _eo_class_def
|
|||
const char *legacy_prefix;
|
||||
Eina_List *inherits;
|
||||
Eina_List *implements;
|
||||
Eina_List *signals;
|
||||
Eina_List *events;
|
||||
Eina_List *constructors;
|
||||
Eina_List *destructors;
|
||||
Eina_List *properties;
|
||||
|
@ -160,7 +160,7 @@ void eo_definitions_method_def_free(Eo_Method_Def *prop);
|
|||
|
||||
void eo_definitions_class_def_free(Eo_Class_Def *kls);
|
||||
|
||||
void eo_definitions_signal_def_free(Eo_Signal_Def *sgn);
|
||||
void eo_definitions_event_def_free(Eo_Event_Def *sgn);
|
||||
|
||||
void eo_definitions_dfltctor_def_free(Eo_DfltCtor_Def *ctor);
|
||||
void eo_definitions_dfltdtor_def_free(Eo_DfltDtor_Def *dtor);
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -41,7 +41,7 @@ typedef struct _eo_tokenizer
|
|||
Eo_Accessor_Def *accessor;
|
||||
Eo_Accessor_Param *accessor_param;
|
||||
Eina_List *str_items;
|
||||
Eo_Signal_Def *signal;
|
||||
Eo_Event_Def *event;
|
||||
Eo_Implement_Def *impl;
|
||||
Eo_Implement_Legacy_Param_Def *impl_leg_param;
|
||||
} tmp;
|
||||
|
|
|
@ -243,11 +243,11 @@ _eo_tokenizer_accessor_get(Eo_Tokenizer *toknz, Eo_Accessor_Type type)
|
|||
return accessor;
|
||||
}
|
||||
|
||||
static Eo_Signal_Def*
|
||||
_eo_tokenizer_signal_get(Eo_Tokenizer *toknz, char *p)
|
||||
static Eo_Event_Def*
|
||||
_eo_tokenizer_event_get(Eo_Tokenizer *toknz, char *p)
|
||||
{
|
||||
Eo_Signal_Def *sgn = calloc(1, sizeof(Eo_Signal_Def));
|
||||
if (sgn == NULL) ABORT(toknz, "calloc Eo_Signal_Def failure");
|
||||
Eo_Event_Def *sgn = calloc(1, sizeof(Eo_Event_Def));
|
||||
if (sgn == NULL) ABORT(toknz, "calloc Eo_Event_Def failure");
|
||||
|
||||
sgn->name = _eo_tokenizer_token_get(toknz, p);
|
||||
|
||||
|
@ -345,7 +345,7 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p)
|
|||
alnum_u = alnum | '_';
|
||||
alpha_u = alpha | '_';
|
||||
ident = alpha+ >save_fpc (alnum | '_' )+;
|
||||
signal = alpha+ >save_fpc (alnum | '_' | ',' )+;
|
||||
event = alpha+ >save_fpc (alnum | '_' | ',' )+;
|
||||
class_meth = alpha+ >save_fpc (alnum | '_' | '::' )+;
|
||||
|
||||
eo_comment = "/*@" ignore* alnum_u >save_fpc ( any | cr @inc_line )* :>> "*/";
|
||||
|
@ -688,7 +688,7 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p)
|
|||
action end_implements {
|
||||
}
|
||||
|
||||
action end_signals {
|
||||
action end_events {
|
||||
}
|
||||
|
||||
action begin_constructors {
|
||||
|
@ -726,16 +726,16 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p)
|
|||
fgoto main;
|
||||
}
|
||||
|
||||
action end_signal_name {
|
||||
toknz->tmp.signal = _eo_tokenizer_signal_get(toknz, fpc);
|
||||
toknz->tmp.kls->signals = eina_list_append(toknz->tmp.kls->signals, toknz->tmp.signal);
|
||||
action end_event_name {
|
||||
toknz->tmp.event = _eo_tokenizer_event_get(toknz, fpc);
|
||||
toknz->tmp.kls->events = eina_list_append(toknz->tmp.kls->events, toknz->tmp.event);
|
||||
}
|
||||
|
||||
action end_signal_comment {
|
||||
if (toknz->tmp.signal->comment != NULL)
|
||||
ABORT(toknz, "signal %s has already a comment", toknz->tmp.signal->name);
|
||||
toknz->tmp.signal->comment = _eo_tokenizer_token_get(toknz, fpc-2);
|
||||
toknz->tmp.signal = NULL;
|
||||
action end_event_comment {
|
||||
if (toknz->tmp.event->comment != NULL)
|
||||
ABORT(toknz, "event %s has already a comment", toknz->tmp.event->name);
|
||||
toknz->tmp.event->comment = _eo_tokenizer_token_get(toknz, fpc-2);
|
||||
toknz->tmp.event = NULL;
|
||||
}
|
||||
|
||||
action end_dflt_ctor_def {
|
||||
|
@ -851,9 +851,9 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p)
|
|||
# implements { ... }
|
||||
implements = 'implements' ignore* begin_def ignore* impl_it* end_def;
|
||||
|
||||
signal_comment = ws* eo_comment %end_signal_comment;
|
||||
signal_it = signal %end_signal_name ignore* end_statement signal_comment? ignore*;
|
||||
signals = 'signals' ignore* begin_def ignore* signal_it* end_def;
|
||||
event_comment = ws* eo_comment %end_event_comment;
|
||||
event_it = event %end_event_name ignore* end_statement event_comment? ignore*;
|
||||
events = 'events' ignore* begin_def ignore* event_it* end_def;
|
||||
|
||||
dflt_ctor_comment = ws* eo_comment %end_dflt_ctor_comment;
|
||||
dflt_ctor = 'constructor' >save_fpc %end_dflt_ctor_def ignore* end_statement dflt_ctor_comment? ignore*;
|
||||
|
@ -873,7 +873,7 @@ _eo_tokenizer_implement_get(Eo_Tokenizer *toknz, char *p)
|
|||
legacy_prefix;
|
||||
inherits => end_inherits;
|
||||
implements => end_implements;
|
||||
signals => end_signals;
|
||||
events => end_events;
|
||||
dflt_ctor;
|
||||
dflt_dtor;
|
||||
constructors => begin_constructors;
|
||||
|
@ -1034,7 +1034,7 @@ eo_tokenizer_dump(Eo_Tokenizer *toknz)
|
|||
Eo_Method_Def *meth;
|
||||
Eo_Param_Def *param;
|
||||
Eo_Accessor_Def *accessor;
|
||||
Eo_Signal_Def *sgn;
|
||||
Eo_Event_Def *sgn;
|
||||
/* Eo_Ret_Def *ret; */
|
||||
|
||||
EINA_LIST_FOREACH(toknz->classes, k, kls)
|
||||
|
@ -1049,8 +1049,8 @@ eo_tokenizer_dump(Eo_Tokenizer *toknz)
|
|||
EINA_LIST_FOREACH(kls->implements, l, s)
|
||||
printf(" %s", s);
|
||||
printf("\n");
|
||||
printf(" signals:\n");
|
||||
EINA_LIST_FOREACH(kls->signals, l, sgn)
|
||||
printf(" events:\n");
|
||||
EINA_LIST_FOREACH(kls->events, l, sgn)
|
||||
printf(" %s (%s)\n", sgn->name, sgn->comment);
|
||||
|
||||
EINA_LIST_FOREACH(kls->constructors, l, meth)
|
||||
|
@ -1125,7 +1125,7 @@ eo_tokenizer_database_fill(const char *filename)
|
|||
Eo_Method_Def *meth;
|
||||
Eo_Param_Def *param;
|
||||
Eo_Accessor_Def *accessor;
|
||||
Eo_Signal_Def *signal;
|
||||
Eo_Event_Def *event;
|
||||
Eo_Implement_Def *impl;
|
||||
/* Eo_Ret_Def *ret; */
|
||||
|
||||
|
@ -1289,9 +1289,9 @@ eo_tokenizer_database_fill(const char *filename)
|
|||
database_class_implement_add(kls->name, impl_desc);
|
||||
}
|
||||
|
||||
EINA_LIST_FOREACH(kls->signals, l, signal)
|
||||
EINA_LIST_FOREACH(kls->events, l, event)
|
||||
{
|
||||
Eolian_Event ev = database_event_new(signal->name, signal->comment);
|
||||
Eolian_Event ev = database_event_new(event->name, event->comment);
|
||||
database_class_event_add(kls->name, ev);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue