bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edje_cc: Fix shadow warning (global scope)

This commit is contained in:
Jean-Philippe Andre 2017-10-31 16:27:38 +09:00
parent ebe945c8d8
commit daa1547586
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/bin/edje/edje_cc_script.c
View File

@ -71,12 +71,12 @@ code_parse_internal(Code *code)
char *begin = code->shared; char *begin = code->shared;
char *end = begin + strlen(begin); char *end = begin + strlen(begin);
char *body; char *body;
Eina_Array *stack; Eina_Array *name_stack;
Eina_Bool is_args = EINA_FALSE; Eina_Bool is_args = EINA_FALSE;
Eina_Bool is_public = EINA_FALSE; Eina_Bool is_public = EINA_FALSE;
int depth = 0; int depth = 0;
stack = eina_array_new(4); name_stack = eina_array_new(4);
while ((token = next_token(&begin, end))) while ((token = next_token(&begin, end)))
{ {
@ -103,14 +103,14 @@ code_parse_internal(Code *code)
case TOKEN_TYPE_COLON: case TOKEN_TYPE_COLON:
if (!sym) if (!sym)
sym = mem_alloc(SZ(Code_Symbol)); sym = mem_alloc(SZ(Code_Symbol));
sym->tag = eina_array_pop(stack); sym->tag = eina_array_pop(name_stack);
break; break;
case TOKEN_TYPE_SEMICOLON: case TOKEN_TYPE_SEMICOLON:
if (eina_array_count(stack)) if (eina_array_count(name_stack))
{ {
if (!sym) if (!sym)
sym = mem_alloc(SZ(Code_Symbol)); sym = mem_alloc(SZ(Code_Symbol));
sym->name = eina_array_pop(stack); sym->name = eina_array_pop(name_stack);
sym->is_public = is_public; sym->is_public = is_public;
code->vars = eina_list_append(code->vars, sym); code->vars = eina_list_append(code->vars, sym);
sym = NULL; sym = NULL;
@ -120,7 +120,7 @@ code_parse_internal(Code *code)
case TOKEN_TYPE_COMMA: case TOKEN_TYPE_COMMA:
if (!sym) if (!sym)
sym = mem_alloc(SZ(Code_Symbol)); sym = mem_alloc(SZ(Code_Symbol));
sym->name = eina_array_pop(stack); sym->name = eina_array_pop(name_stack);
if (is_args) if (is_args)
func->args = eina_list_append(func->args, sym); func->args = eina_list_append(func->args, sym);
else else
@ -141,15 +141,15 @@ code_parse_internal(Code *code)
func = sym; func = sym;
sym = NULL; sym = NULL;
} }
func->name = eina_array_pop(stack); func->name = eina_array_pop(name_stack);
} }
else else
{ {
if (eina_array_count(stack)) if (eina_array_count(name_stack))
{ {
if (!sym) if (!sym)
sym = mem_alloc(SZ(Code_Symbol)); sym = mem_alloc(SZ(Code_Symbol));
sym->name = eina_array_pop(stack); sym->name = eina_array_pop(name_stack);
func->args = eina_list_append(func->args, sym); func->args = eina_list_append(func->args, sym);
} }
sym = func; sym = func;
@ -189,7 +189,7 @@ code_parse_internal(Code *code)
is_public = EINA_TRUE; is_public = EINA_TRUE;
break; break;
case TOKEN_TYPE_IDENTIFIER: case TOKEN_TYPE_IDENTIFIER:
eina_array_push(stack, token->str); eina_array_push(name_stack, token->str);
token->str = NULL; token->str = NULL;
break; break;
default: default:
@ -201,7 +201,7 @@ code_parse_internal(Code *code)
free(token); free(token);
} }
eina_array_free(stack); eina_array_free(name_stack);
} }
static Token * static Token *