forked from enlightenment/efl
eolian: consume private/protected modifier on events
This commit is contained in:
parent
1cb8318991
commit
a57c729b10
|
@ -21,8 +21,7 @@ enum Tokens
|
||||||
|
|
||||||
/* all keywords in eolian, they can still be used as names (they're TOK_VALUE)
|
/* all keywords in eolian, they can still be used as names (they're TOK_VALUE)
|
||||||
* they just fill in the "kw" field of the token */
|
* they just fill in the "kw" field of the token */
|
||||||
#define KEYWORDS KW(class), KW(const), KW(private), KW(return), KW(struct), \
|
#define KEYWORDS KW(class), KW(const), KW(return), KW(struct), KW(virtual), \
|
||||||
KW(virtual), \
|
|
||||||
\
|
\
|
||||||
KW(abstract), KW(constructor), KW(constructors), KW(data), \
|
KW(abstract), KW(constructor), KW(constructors), KW(data), \
|
||||||
KW(destructor), KW(eo_prefix), KW(events), KW(func), KW(get), \
|
KW(destructor), KW(eo_prefix), KW(events), KW(func), KW(get), \
|
||||||
|
@ -30,7 +29,7 @@ enum Tokens
|
||||||
KW(methods), KW(mixin), KW(own), KW(params), KW(properties), KW(set), \
|
KW(methods), KW(mixin), KW(own), KW(params), KW(properties), KW(set), \
|
||||||
KW(type), KW(values), KWAT(class), KWAT(const), KWAT(constructor), \
|
KW(type), KW(values), KWAT(class), KWAT(const), KWAT(constructor), \
|
||||||
KWAT(extern), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(out), \
|
KWAT(extern), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(out), \
|
||||||
KWAT(protected), KWAT(warn_unused), \
|
KWAT(private), KWAT(protected), KWAT(warn_unused), \
|
||||||
\
|
\
|
||||||
KW(byte), KW(ubyte), KW(char), KW(short), KW(ushort), KW(int), KW(uint), \
|
KW(byte), KW(ubyte), KW(char), KW(short), KW(ushort), KW(int), KW(uint), \
|
||||||
KW(long), KW(ulong), KW(llong), KW(ullong), \
|
KW(long), KW(ulong), KW(llong), KW(ullong), \
|
||||||
|
|
|
@ -1283,11 +1283,6 @@ parse_event(Eo_Lexer *ls)
|
||||||
ev->base.column = ls->column;
|
ev->base.column = ls->column;
|
||||||
Eina_Strbuf *buf = push_strbuf(ls);
|
Eina_Strbuf *buf = push_strbuf(ls);
|
||||||
ls->tmp.event = ev;
|
ls->tmp.event = ev;
|
||||||
/* code path not in use yet
|
|
||||||
if (ls->t.kw == KW_private)
|
|
||||||
{
|
|
||||||
eo_lexer_get(ls);
|
|
||||||
}*/
|
|
||||||
check(ls, TOK_VALUE);
|
check(ls, TOK_VALUE);
|
||||||
eina_strbuf_append(buf, ls->t.value.s);
|
eina_strbuf_append(buf, ls->t.value.s);
|
||||||
eo_lexer_get(ls);
|
eo_lexer_get(ls);
|
||||||
|
@ -1301,6 +1296,8 @@ parse_event(Eo_Lexer *ls)
|
||||||
}
|
}
|
||||||
ev->name = eina_stringshare_add(eina_strbuf_string_get(buf));
|
ev->name = eina_stringshare_add(eina_strbuf_string_get(buf));
|
||||||
pop_strbuf(ls);
|
pop_strbuf(ls);
|
||||||
|
if (ls->t.kw == KW_at_private || ls->t.kw == KW_at_protected)
|
||||||
|
eo_lexer_get(ls);
|
||||||
if (ls->t.token == ':')
|
if (ls->t.token == ':')
|
||||||
{
|
{
|
||||||
eo_lexer_get(ls);
|
eo_lexer_get(ls);
|
||||||
|
|
Loading…
Reference in New Issue