enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

Avoid doing math inside strings (quoted text), so I'm now enable to have part.description.text.text starting with "(". 

Patch originally by rephorm.
Tested and minor changes by barbieri.


SVN revision: 30768
This commit is contained in:
Gustavo Sverzut Barbieri 2007-07-11 15:33:03 +00:00
parent 36867e14a2
commit 0e45d25776
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
legacy/edje/src/bin/edje_cc_parse.c
View File

@ -7,7 +7,6 @@
static void new_object(void);
static void new_statement(void);
static char *perform_math (char *input);
static void preprocess_params (void);
static int isdelim(char c);
static char *next_token(char *p, char *end, char **new_p, int *delim);
static char *stack_id(void);
@ -120,30 +119,6 @@ new_statement(void)
free(id);
}
static void
preprocess_params (void)
{
Evas_List *l;
/* a formula will never be spread across multiple params */
for (l = params; l; l = l->next) {
char *data = l->data;
char *replace = NULL;
/* if the token begins with a opening parens, the user wants us
* to do some math :)
*/
if (*data == '(')
{
replace = perform_math (data);
free (l->data);
l->data = replace;
}
}
}
static char *
perform_math (char *input)
{
@ -364,6 +339,14 @@ next_token(char *p, char *end, char **new_p, int *delim)
p++;
}
}
else if (tok && *tok == '(')
{
char *tmp;
tmp = tok;
tok = perform_math(tok);
free(tmp);
}
return tok;
}
@ -452,7 +435,6 @@ parse(char *data, off_t size)
if (do_params)
{
do_params = 0;
preprocess_params ();
new_statement();
/* clear out params */
while (params)