discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1d6b9d71e65ef61528b0f54be0535c75c703d60f
commit 1d6b9d71e65ef61528b0f54be0535c75c703d60f Author: Mike Blumenkrantz <[email protected]> Date: Fri May 9 12:26:22 2014 -0400 fix be9b27ac99dc4fcb49c340b8bdf4bfcbe4240e5f for edje_cc do_params is set when expecting parameters, not req_params --- src/bin/edje/edje_cc_parse.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c index d015c22..6c66530 100644 --- a/src/bin/edje/edje_cc_parse.c +++ b/src/bin/edje/edje_cc_parse.c @@ -62,7 +62,6 @@ static int had_quote = 0; static char file_buf[4096]; static int did_wildcard = 0; -static int req_params = 0; static int verbatim = 0; static int verbatim_line1 = 0; static int verbatim_line2 = 0; @@ -683,7 +682,7 @@ parse(char *data, off_t size) else if (*token == ',' || *token == ':') do_params = 1; else if (*token == '}') { - if (do_params || req_params) + if (do_params) { ERR("parse error %s:%i. } marker before ; marker", file_in, line - 1); @@ -705,7 +704,7 @@ parse(char *data, off_t size) { void *param; - req_params = do_params = 0; + do_params = 0; new_statement(); /* clear out params */ while ((param = eina_array_pop(¶ms))) @@ -715,7 +714,7 @@ parse(char *data, off_t size) } else { - if (req_params) + if (do_params) { ERR("parse error %s:%i. additional parameters required for '%s' statement", file_in, line - 1, (char*)eina_list_last_data_get(stack)); --
