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

eolian: simplify the parser a bit (unify 3 funcs into one)

This commit is contained in:
Daniel Kolesa 2014-06-20 11:33:25 +01:00
parent 71c1482827
commit ded5623c86
1 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,7 +412,7 @@ end:
} }
static void static void
parse_keys(Eo_Lexer *ls) parse_params(Eo_Lexer *ls, Eina_Bool allow_inout)
{ {
int line; int line;
eo_lexer_get(ls); eo_lexer_get(ls);
@ -420,23 +420,7 @@ parse_keys(Eo_Lexer *ls)
check_next(ls, '{'); check_next(ls, '{');
while (ls->t.token != '}') while (ls->t.token != '}')
{ {
parse_param(ls, EINA_FALSE); parse_param(ls, allow_inout);
ls->tmp.params = eina_list_append(ls->tmp.params, ls->tmp.param);
ls->tmp.param = NULL;
}
check_match(ls, '}', '{', line);
}
static void
parse_values(Eo_Lexer *ls)
{
int line;
eo_lexer_get(ls);
line = ls->line_number;
check_next(ls, '{');
while (ls->t.token != '}')
{
parse_param(ls, EINA_FALSE);
ls->tmp.params = eina_list_append(ls->tmp.params, ls->tmp.param); ls->tmp.params = eina_list_append(ls->tmp.params, ls->tmp.param);
ls->tmp.param = NULL; ls->tmp.param = NULL;
} }
@ -487,7 +471,7 @@ parse_property(Eo_Lexer *ls)
if (has_keys) if (has_keys)
eo_lexer_syntax_error(ls, "double keys definition"); eo_lexer_syntax_error(ls, "double keys definition");
has_keys = EINA_TRUE; has_keys = EINA_TRUE;
parse_keys(ls); parse_params(ls, EINA_FALSE);
prop->keys = ls->tmp.params; prop->keys = ls->tmp.params;
ls->tmp.params = NULL; ls->tmp.params = NULL;
break; break;
@ -495,7 +479,7 @@ parse_property(Eo_Lexer *ls)
if (has_values) if (has_values)
eo_lexer_syntax_error(ls, "double values definition"); eo_lexer_syntax_error(ls, "double values definition");
has_values = EINA_TRUE; has_values = EINA_TRUE;
parse_values(ls); parse_params(ls, EINA_FALSE);
prop->values = ls->tmp.params; prop->values = ls->tmp.params;
ls->tmp.params = NULL; ls->tmp.params = NULL;
break; break;
@ -507,22 +491,6 @@ end:
check_match(ls, '}', '{', line); check_match(ls, '}', '{', line);
} }
static void
parse_params(Eo_Lexer *ls)
{
int line;
eo_lexer_get(ls);
line = ls->line_number;
check_next(ls, '{');
while (ls->t.token != '}')
{
parse_param(ls, EINA_TRUE);
ls->tmp.params = eina_list_append(ls->tmp.params, ls->tmp.param);
ls->tmp.param = NULL;
}
check_match(ls, '}', '{', line);
}
static void static void
parse_method(Eo_Lexer *ls, Eina_Bool ctor) parse_method(Eo_Lexer *ls, Eina_Bool ctor)
{ {
@ -591,7 +559,7 @@ parse_method(Eo_Lexer *ls, Eina_Bool ctor)
if (has_params) if (has_params)
eo_lexer_syntax_error(ls, "double params definition"); eo_lexer_syntax_error(ls, "double params definition");
has_params = EINA_TRUE; has_params = EINA_TRUE;
parse_params(ls); parse_params(ls, EINA_TRUE);
meth->params = ls->tmp.params; meth->params = ls->tmp.params;
ls->tmp.params = NULL; ls->tmp.params = NULL;
break; break;