diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-10-31 16:27:38 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-11-01 11:22:33 +0900 |
commit | daa15475865d0e77ef3aa0fb06b36226b7e7f11e (patch) | |
tree | 8c2988c1d9674b9194d01fe4ddf3fad309787e0f /src | |
parent | ebe945c8d878787df8ef68dcd93d12ec45e69404 (diff) |
edje_cc: Fix shadow warning (global scope)
Diffstat (limited to 'src')
-rw-r--r-- | src/bin/edje/edje_cc_script.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/bin/edje/edje_cc_script.c b/src/bin/edje/edje_cc_script.c index 60618f8af3..4e81fb3e53 100644 --- a/src/bin/edje/edje_cc_script.c +++ b/src/bin/edje/edje_cc_script.c | |||
@@ -71,12 +71,12 @@ code_parse_internal(Code *code) | |||
71 | char *begin = code->shared; | 71 | char *begin = code->shared; |
72 | char *end = begin + strlen(begin); | 72 | char *end = begin + strlen(begin); |
73 | char *body; | 73 | char *body; |
74 | Eina_Array *stack; | 74 | Eina_Array *name_stack; |
75 | Eina_Bool is_args = EINA_FALSE; | 75 | Eina_Bool is_args = EINA_FALSE; |
76 | Eina_Bool is_public = EINA_FALSE; | 76 | Eina_Bool is_public = EINA_FALSE; |
77 | int depth = 0; | 77 | int depth = 0; |
78 | 78 | ||
79 | stack = eina_array_new(4); | 79 | name_stack = eina_array_new(4); |
80 | 80 | ||
81 | while ((token = next_token(&begin, end))) | 81 | while ((token = next_token(&begin, end))) |
82 | { | 82 | { |
@@ -103,14 +103,14 @@ code_parse_internal(Code *code) | |||
103 | case TOKEN_TYPE_COLON: | 103 | case TOKEN_TYPE_COLON: |
104 | if (!sym) | 104 | if (!sym) |
105 | sym = mem_alloc(SZ(Code_Symbol)); | 105 | sym = mem_alloc(SZ(Code_Symbol)); |
106 | sym->tag = eina_array_pop(stack); | 106 | sym->tag = eina_array_pop(name_stack); |
107 | break; | 107 | break; |
108 | case TOKEN_TYPE_SEMICOLON: | 108 | case TOKEN_TYPE_SEMICOLON: |
109 | if (eina_array_count(stack)) | 109 | if (eina_array_count(name_stack)) |
110 | { | 110 | { |
111 | if (!sym) | 111 | if (!sym) |
112 | sym = mem_alloc(SZ(Code_Symbol)); | 112 | sym = mem_alloc(SZ(Code_Symbol)); |
113 | sym->name = eina_array_pop(stack); | 113 | sym->name = eina_array_pop(name_stack); |
114 | sym->is_public = is_public; | 114 | sym->is_public = is_public; |
115 | code->vars = eina_list_append(code->vars, sym); | 115 | code->vars = eina_list_append(code->vars, sym); |
116 | sym = NULL; | 116 | sym = NULL; |
@@ -120,7 +120,7 @@ code_parse_internal(Code *code) | |||
120 | case TOKEN_TYPE_COMMA: | 120 | case TOKEN_TYPE_COMMA: |
121 | if (!sym) | 121 | if (!sym) |
122 | sym = mem_alloc(SZ(Code_Symbol)); | 122 | sym = mem_alloc(SZ(Code_Symbol)); |
123 | sym->name = eina_array_pop(stack); | 123 | sym->name = eina_array_pop(name_stack); |
124 | if (is_args) | 124 | if (is_args) |
125 | func->args = eina_list_append(func->args, sym); | 125 | func->args = eina_list_append(func->args, sym); |
126 | else | 126 | else |
@@ -141,15 +141,15 @@ code_parse_internal(Code *code) | |||
141 | func = sym; | 141 | func = sym; |
142 | sym = NULL; | 142 | sym = NULL; |
143 | } | 143 | } |
144 | func->name = eina_array_pop(stack); | 144 | func->name = eina_array_pop(name_stack); |
145 | } | 145 | } |
146 | else | 146 | else |
147 | { | 147 | { |
148 | if (eina_array_count(stack)) | 148 | if (eina_array_count(name_stack)) |
149 | { | 149 | { |
150 | if (!sym) | 150 | if (!sym) |
151 | sym = mem_alloc(SZ(Code_Symbol)); | 151 | sym = mem_alloc(SZ(Code_Symbol)); |
152 | sym->name = eina_array_pop(stack); | 152 | sym->name = eina_array_pop(name_stack); |
153 | func->args = eina_list_append(func->args, sym); | 153 | func->args = eina_list_append(func->args, sym); |
154 | } | 154 | } |
155 | sym = func; | 155 | sym = func; |
@@ -189,7 +189,7 @@ code_parse_internal(Code *code) | |||
189 | is_public = EINA_TRUE; | 189 | is_public = EINA_TRUE; |
190 | break; | 190 | break; |
191 | case TOKEN_TYPE_IDENTIFIER: | 191 | case TOKEN_TYPE_IDENTIFIER: |
192 | eina_array_push(stack, token->str); | 192 | eina_array_push(name_stack, token->str); |
193 | token->str = NULL; | 193 | token->str = NULL; |
194 | break; | 194 | break; |
195 | default: | 195 | default: |
@@ -201,7 +201,7 @@ code_parse_internal(Code *code) | |||
201 | free(token); | 201 | free(token); |
202 | } | 202 | } |
203 | 203 | ||
204 | eina_array_free(stack); | 204 | eina_array_free(name_stack); |
205 | } | 205 | } |
206 | 206 | ||
207 | static Token * | 207 | static Token * |