enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

eolian: get rid of the PARSE_SECTION macro nonsense

This commit is contained in:
Daniel Kolesa 2014-11-21 13:59:42 +00:00
parent 72caa0013c
commit 423629f817
1 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/lib/eolian/eo_parser.c
View File

@ -9,14 +9,6 @@
eo_lexer_syntax_error(ls, "double " msg); \ eo_lexer_syntax_error(ls, "double " msg); \
has_##var = EINA_TRUE; has_##var = EINA_TRUE;
#define PARSE_SECTION \
int line, col; \
eo_lexer_get(ls); \
line = ls->line_number; \
col = ls->column; \
check_next(ls, '{'); \
while (ls->t.token != '}')
static void static void
error_expected(Eo_Lexer *ls, int token) error_expected(Eo_Lexer *ls, int token)
{ {
@ -1302,7 +1294,12 @@ static void
parse_params(Eo_Lexer *ls, Eina_List **params, Eina_Bool allow_inout, parse_params(Eo_Lexer *ls, Eina_List **params, Eina_Bool allow_inout,
Eina_Bool is_vals) Eina_Bool is_vals)
{ {
PARSE_SECTION parse_param(ls, params, allow_inout, is_vals); int line, col;
eo_lexer_get(ls);
line = ls->line_number, col = ls->column;
check_next(ls, '{');
while (ls->t.token != '}')
parse_param(ls, params, allow_inout, is_vals);
check_match(ls, '}', '{', line, col); check_match(ls, '}', '{', line, col);
} }
@ -1717,28 +1714,48 @@ parse_event(Eo_Lexer *ls)
static void static void
parse_methods(Eo_Lexer *ls) parse_methods(Eo_Lexer *ls)
{ {
PARSE_SECTION parse_method(ls, EINA_FALSE); int line, col;
eo_lexer_get(ls);
line = ls->line_number, col = ls->column;
check_next(ls, '{');
while (ls->t.token != '}')
parse_method(ls, EINA_FALSE);
check_match(ls, '}', '{', line, col); check_match(ls, '}', '{', line, col);
} }
static void static void
parse_properties(Eo_Lexer *ls) parse_properties(Eo_Lexer *ls)
{ {
PARSE_SECTION parse_property(ls); int line, col;
eo_lexer_get(ls);
line = ls->line_number, col = ls->column;
check_next(ls, '{');
while (ls->t.token != '}')
parse_property(ls);
check_match(ls, '}', '{', line, col); check_match(ls, '}', '{', line, col);
} }
static void static void
parse_implements(Eo_Lexer *ls, Eina_Bool iface) parse_implements(Eo_Lexer *ls, Eina_Bool iface)
{ {
PARSE_SECTION parse_implement(ls, iface); int line, col;
eo_lexer_get(ls);
line = ls->line_number, col = ls->column;
check_next(ls, '{');
while (ls->t.token != '}')
parse_implement(ls, iface);
check_match(ls, '}', '{', line, col); check_match(ls, '}', '{', line, col);
} }
static void static void
parse_constructors(Eo_Lexer *ls) parse_constructors(Eo_Lexer *ls)
{ {
PARSE_SECTION parse_constructor(ls); int line, col;
eo_lexer_get(ls);
line = ls->line_number, col = ls->column;
check_next(ls, '{');
while (ls->t.token != '}')
parse_constructor(ls);
check_match(ls, '}', '{', line, col); check_match(ls, '}', '{', line, col);
} }