summaryrefslogtreecommitdiff
path: root/legacy/edje
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2004-10-06 05:25:03 +0000
committerCarsten Haitzler <raster@rasterman.com>2004-10-06 05:25:03 +0000
commitcd39a020b24cf90d7fd5c7ce507581551021ad22 (patch)
tree8ab2c46748e5f06923daaf79e52ed7a1bd89d0a0 /legacy/edje
parent3d5d362ba38508e5c868f6021154e6c23c424c13 (diff)
1. note all the /* dup */ entries in edje_cc_handlers.c - we now are lenient
and allow image, font, images{} fonts {} programs{} program{} and scropt{} sections in many mroe places... SVN revision: 11764
Diffstat (limited to 'legacy/edje')
-rw-r--r--legacy/edje/src/bin/edje_cc_handlers.c308
-rw-r--r--legacy/edje/src/bin/edje_cc_out.c36
-rw-r--r--legacy/edje/src/bin/edje_cc_parse.c10
3 files changed, 228 insertions, 126 deletions
diff --git a/legacy/edje/src/bin/edje_cc_handlers.c b/legacy/edje/src/bin/edje_cc_handlers.c
index de97dbacf3..7989c12919 100644
--- a/legacy/edje/src/bin/edje_cc_handlers.c
+++ b/legacy/edje/src/bin/edje_cc_handlers.c
@@ -1,12 +1,7 @@
1#include "edje_cc.h" 1#include "edje_cc.h"
2 2
3static void ob_images(void);
4
5static void ob_images_image(void);
6static void st_images_image(void); 3static void st_images_image(void);
7 4
8static void ob_fonts(void);
9
10static void st_fonts_font(void); 5static void st_fonts_font(void);
11 6
12static void st_data_item(void); 7static void st_data_item(void);
@@ -71,8 +66,6 @@ static void st_collections_group_parts_part_description_text_fit(void);
71static void st_collections_group_parts_part_description_text_min(void); 66static void st_collections_group_parts_part_description_text_min(void);
72static void st_collections_group_parts_part_description_text_align(void); 67static void st_collections_group_parts_part_description_text_align(void);
73 68
74static void ob_collections_group_programs(void);
75
76static void ob_collections_group_programs_program(void); 69static void ob_collections_group_programs_program(void);
77static void st_collections_group_programs_program_name(void); 70static void st_collections_group_programs_program_name(void);
78static void st_collections_group_programs_program_signal(void); 71static void st_collections_group_programs_program_signal(void);
@@ -92,10 +85,22 @@ New_Statement_Handler statement_handlers[] =
92 {"images.image", st_images_image}, 85 {"images.image", st_images_image},
93 {"fonts.font", st_fonts_font}, 86 {"fonts.font", st_fonts_font},
94 {"data.item", st_data_item}, 87 {"data.item", st_data_item},
88 {"collections.image", st_images_image}, /* dup */
89 {"collections.images.image", st_images_image}, /* dup */
90 {"collections.font", st_fonts_font}, /* dup */
91 {"collections.fonts.font", st_fonts_font}, /* dup */
95 {"collections.group.name", st_collections_group_name}, 92 {"collections.group.name", st_collections_group_name},
96 {"collections.group.min", st_collections_group_min}, 93 {"collections.group.min", st_collections_group_min},
97 {"collections.group.max", st_collections_group_max}, 94 {"collections.group.max", st_collections_group_max},
98 {"collections.group.data.item", st_collections_group_data_item}, 95 {"collections.group.data.item", st_collections_group_data_item},
96 {"collections.group.image", st_images_image}, /* dup */
97 {"collections.group.images.image", st_images_image}, /* dup */
98 {"collections.group.font", st_fonts_font}, /* dup */
99 {"collections.group.fonts.font", st_fonts_font}, /* dup */
100 {"collections.group.parts.image", st_images_image}, /* dup */
101 {"collections.group.parts.images.image", st_images_image}, /* dup */
102 {"collections.group.parts.font", st_fonts_font}, /* dup */
103 {"collections.group.parts.fonts.font", st_fonts_font}, /* dup */
99 {"collections.group.parts.part.name", st_collections_group_parts_part_name}, 104 {"collections.group.parts.part.name", st_collections_group_parts_part_name},
100 {"collections.group.parts.part.type", st_collections_group_parts_part_type}, 105 {"collections.group.parts.part.type", st_collections_group_parts_part_type},
101 {"collections.group.parts.part.effect", st_collections_group_parts_part_effect}, 106 {"collections.group.parts.part.effect", st_collections_group_parts_part_effect},
@@ -105,6 +110,10 @@ New_Statement_Handler statement_handlers[] =
105 {"collections.group.parts.part.dragable.x", st_collections_group_parts_part_dragable_x}, 110 {"collections.group.parts.part.dragable.x", st_collections_group_parts_part_dragable_x},
106 {"collections.group.parts.part.dragable.y", st_collections_group_parts_part_dragable_y}, 111 {"collections.group.parts.part.dragable.y", st_collections_group_parts_part_dragable_y},
107 {"collections.group.parts.part.dragable.confine", st_collections_group_parts_part_dragable_confine}, 112 {"collections.group.parts.part.dragable.confine", st_collections_group_parts_part_dragable_confine},
113 {"collections.group.parts.part.image", st_images_image}, /* dup */
114 {"collections.group.parts.part.images.image", st_images_image}, /* dup */
115 {"collections.group.parts.part.font", st_fonts_font}, /* dup */
116 {"collections.group.parts.part.fonts.font", st_fonts_font}, /* dup */
108 {"collections.group.parts.part.description.state", st_collections_group_parts_part_description_state}, 117 {"collections.group.parts.part.description.state", st_collections_group_parts_part_description_state},
109 {"collections.group.parts.part.description.visible", st_collections_group_parts_part_description_visible}, 118 {"collections.group.parts.part.description.visible", st_collections_group_parts_part_description_visible},
110 {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align}, 119 {"collections.group.parts.part.description.align", st_collections_group_parts_part_description_align},
@@ -125,6 +134,8 @@ New_Statement_Handler statement_handlers[] =
125 {"collections.group.parts.part.description.rel2.to_y", st_collections_group_parts_part_description_rel2_to_y}, 134 {"collections.group.parts.part.description.rel2.to_y", st_collections_group_parts_part_description_rel2_to_y},
126 {"collections.group.parts.part.description.image.normal", st_collections_group_parts_part_description_image_normal}, 135 {"collections.group.parts.part.description.image.normal", st_collections_group_parts_part_description_image_normal},
127 {"collections.group.parts.part.description.image.tween", st_collections_group_parts_part_description_image_tween}, 136 {"collections.group.parts.part.description.image.tween", st_collections_group_parts_part_description_image_tween},
137 {"collections.group.parts.part.description.image.image", st_images_image}, /* dup */
138 {"collections.group.parts.part.description.image.images.image", st_images_image}, /* dup */
128 {"collections.group.parts.part.description.border", st_collections_group_parts_part_description_border}, 139 {"collections.group.parts.part.description.border", st_collections_group_parts_part_description_border},
129 {"collections.group.parts.part.description.fill.smooth", st_collections_group_parts_part_description_fill_smooth}, 140 {"collections.group.parts.part.description.fill.smooth", st_collections_group_parts_part_description_fill_smooth},
130 {"collections.group.parts.part.description.fill.origin.relative", st_collections_group_parts_part_description_fill_origin_relative}, 141 {"collections.group.parts.part.description.fill.origin.relative", st_collections_group_parts_part_description_fill_origin_relative},
@@ -142,6 +153,79 @@ New_Statement_Handler statement_handlers[] =
142 {"collections.group.parts.part.description.text.fit", st_collections_group_parts_part_description_text_fit}, 153 {"collections.group.parts.part.description.text.fit", st_collections_group_parts_part_description_text_fit},
143 {"collections.group.parts.part.description.text.min", st_collections_group_parts_part_description_text_min}, 154 {"collections.group.parts.part.description.text.min", st_collections_group_parts_part_description_text_min},
144 {"collections.group.parts.part.description.text.align", st_collections_group_parts_part_description_text_align}, 155 {"collections.group.parts.part.description.text.align", st_collections_group_parts_part_description_text_align},
156 {"collections.group.parts.part.description.text.font", st_fonts_font}, /* dup */
157 {"collections.group.parts.part.description.text.fonts.font", st_fonts_font}, /* dup */
158 {"collections.group.parts.part.description.images.image", st_images_image}, /* dup */
159 {"collections.group.parts.part.description.font", st_fonts_font}, /* dup */
160 {"collections.group.parts.part.description.fonts.font", st_fonts_font}, /* dup */
161 {"collections.group.parts.part.description.programs.image", st_images_image}, /* dup */
162 {"collections.group.parts.part.description.programs.images.image", st_images_image}, /* dup */
163 {"collections.group.parts.part.description.programs.font", st_fonts_font}, /* dup */
164 {"collections.group.parts.part.description.programs.fonts.font", st_fonts_font}, /* dup */
165 {"collections.group.parts.part.description.programs.program.name", st_collections_group_programs_program_name}, /* dup */
166 {"collections.group.parts.part.description.programs.program.signal", st_collections_group_programs_program_signal}, /* dup */
167 {"collections.group.parts.part.description.programs.program.source", st_collections_group_programs_program_source}, /* dup */
168 {"collections.group.parts.part.description.programs.program.in", st_collections_group_programs_program_in}, /* dup */
169 {"collections.group.parts.part.description.programs.program.action", st_collections_group_programs_program_action}, /* dup */
170 {"collections.group.parts.part.description.programs.program.transition", st_collections_group_programs_program_transition}, /* dup */
171 {"collections.group.parts.part.description.programs.program.target", st_collections_group_programs_program_target}, /* dup */
172 {"collections.group.parts.part.description.programs.program.after", st_collections_group_programs_program_after}, /* dup */
173 {"collections.group.parts.part.description.program.name", st_collections_group_programs_program_name}, /* dup */
174 {"collections.group.parts.part.description.program.signal", st_collections_group_programs_program_signal}, /* dup */
175 {"collections.group.parts.part.description.program.source", st_collections_group_programs_program_source}, /* dup */
176 {"collections.group.parts.part.description.program.in", st_collections_group_programs_program_in}, /* dup */
177 {"collections.group.parts.part.description.program.action", st_collections_group_programs_program_action}, /* dup */
178 {"collections.group.parts.part.description.program.transition", st_collections_group_programs_program_transition}, /* dup */
179 {"collections.group.parts.part.description.program.target", st_collections_group_programs_program_target}, /* dup */
180 {"collections.group.parts.part.description.program.after", st_collections_group_programs_program_after}, /* dup */
181 {"collections.group.parts.part.programs.image", st_images_image}, /* dup */
182 {"collections.group.parts.part.programs.images.image", st_images_image}, /* dup */
183 {"collections.group.parts.part.programs.font", st_fonts_font}, /* dup */
184 {"collections.group.parts.part.programs.fonts.font", st_fonts_font}, /* dup */
185 {"collections.group.parts.part.programs.program.name", st_collections_group_programs_program_name}, /* dup */
186 {"collections.group.parts.part.programs.program.signal", st_collections_group_programs_program_signal}, /* dup */
187 {"collections.group.parts.part.programs.program.source", st_collections_group_programs_program_source}, /* dup */
188 {"collections.group.parts.part.programs.program.in", st_collections_group_programs_program_in}, /* dup */
189 {"collections.group.parts.part.programs.program.action", st_collections_group_programs_program_action}, /* dup */
190 {"collections.group.parts.part.programs.program.transition", st_collections_group_programs_program_transition}, /* dup */
191 {"collections.group.parts.part.programs.program.target", st_collections_group_programs_program_target}, /* dup */
192 {"collections.group.parts.part.programs.program.after", st_collections_group_programs_program_after}, /* dup */
193 {"collections.group.parts.part.program.name", st_collections_group_programs_program_name}, /* dup */
194 {"collections.group.parts.part.program.signal", st_collections_group_programs_program_signal}, /* dup */
195 {"collections.group.parts.part.program.source", st_collections_group_programs_program_source}, /* dup */
196 {"collections.group.parts.part.program.in", st_collections_group_programs_program_in}, /* dup */
197 {"collections.group.parts.part.program.action", st_collections_group_programs_program_action}, /* dup */
198 {"collections.group.parts.part.program.transition", st_collections_group_programs_program_transition}, /* dup */
199 {"collections.group.parts.part.program.target", st_collections_group_programs_program_target}, /* dup */
200 {"collections.group.parts.part.program.after", st_collections_group_programs_program_after}, /* dup */
201 {"collections.group.parts.programs.image", st_images_image}, /* dup */
202 {"collections.group.parts.programs.images.image", st_images_image}, /* dup */
203 {"collections.group.parts.programs.font", st_fonts_font}, /* dup */
204 {"collections.group.parts.programs.fonts.font", st_fonts_font}, /* dup */
205 {"collections.group.parts.programs.program.name", st_collections_group_programs_program_name}, /* dup */
206 {"collections.group.parts.programs.program.signal", st_collections_group_programs_program_signal}, /* dup */
207 {"collections.group.parts.programs.program.source", st_collections_group_programs_program_source}, /* dup */
208 {"collections.group.parts.programs.program.in", st_collections_group_programs_program_in}, /* dup */
209 {"collections.group.parts.programs.program.action", st_collections_group_programs_program_action}, /* dup */
210 {"collections.group.parts.programs.program.transition", st_collections_group_programs_program_transition}, /* dup */
211 {"collections.group.parts.programs.program.target", st_collections_group_programs_program_target}, /* dup */
212 {"collections.group.parts.programs.program.after", st_collections_group_programs_program_after},
213 {"collections.group.parts.program.name", st_collections_group_programs_program_name}, /* dup */
214 {"collections.group.parts.program.signal", st_collections_group_programs_program_signal}, /* dup */
215 {"collections.group.parts.program.source", st_collections_group_programs_program_source}, /* dup */
216 {"collections.group.parts.program.in", st_collections_group_programs_program_in}, /* dup */
217 {"collections.group.parts.program.action", st_collections_group_programs_program_action}, /* dup */
218 {"collections.group.parts.program.transition", st_collections_group_programs_program_transition}, /* dup */
219 {"collections.group.parts.program.target", st_collections_group_programs_program_target}, /* dup */
220 {"collections.group.parts.program.after", st_collections_group_programs_program_after}, /* dup */
221 {"collections.group.program.name", st_collections_group_programs_program_name}, /* dup */
222 {"collections.group.program.signal", st_collections_group_programs_program_signal}, /* dup */
223 {"collections.group.program.source", st_collections_group_programs_program_source}, /* dup */
224 {"collections.group.program.in", st_collections_group_programs_program_in}, /* dup */
225 {"collections.group.program.action", st_collections_group_programs_program_action}, /* dup */
226 {"collections.group.program.transition", st_collections_group_programs_program_transition}, /* dup */
227 {"collections.group.program.target", st_collections_group_programs_program_target}, /* dup */
228 {"collections.group.program.after", st_collections_group_programs_program_after}, /* dup */
145 {"collections.group.programs.program.name", st_collections_group_programs_program_name}, 229 {"collections.group.programs.program.name", st_collections_group_programs_program_name},
146 {"collections.group.programs.program.signal", st_collections_group_programs_program_signal}, 230 {"collections.group.programs.program.signal", st_collections_group_programs_program_signal},
147 {"collections.group.programs.program.source", st_collections_group_programs_program_source}, 231 {"collections.group.programs.program.source", st_collections_group_programs_program_source},
@@ -149,93 +233,77 @@ New_Statement_Handler statement_handlers[] =
149 {"collections.group.programs.program.action", st_collections_group_programs_program_action}, 233 {"collections.group.programs.program.action", st_collections_group_programs_program_action},
150 {"collections.group.programs.program.transition", st_collections_group_programs_program_transition}, 234 {"collections.group.programs.program.transition", st_collections_group_programs_program_transition},
151 {"collections.group.programs.program.target", st_collections_group_programs_program_target}, 235 {"collections.group.programs.program.target", st_collections_group_programs_program_target},
152 {"collections.group.programs.program.after", st_collections_group_programs_program_after} 236 {"collections.group.programs.program.after", st_collections_group_programs_program_after},
237 {"collections.group.programs.image", st_images_image}, /* dup */
238 {"collections.group.programs.images.image", st_images_image}, /* dup */
239 {"collections.group.programs.font", st_fonts_font}, /* dup */
240 {"collections.group.programs.fonts.font", st_fonts_font} /* dup */
153}; 241};
154 242
155New_Object_Handler object_handlers[] = 243New_Object_Handler object_handlers[] =
156{ 244{
157 {"images", ob_images}, 245 {"images", NULL},
158 {"images.image", ob_images_image}, 246 {"fonts", NULL},
159 {"fonts", ob_fonts},
160 {"fonts.font", NULL},
161 {"data", NULL}, 247 {"data", NULL},
162 {"data.item", NULL},
163 {"collections", ob_collections}, 248 {"collections", ob_collections},
249 {"collections.images", NULL}, /* dup */
250 {"collections.fonts", NULL}, /* dup */
164 {"collections.group", ob_collections_group}, 251 {"collections.group", ob_collections_group},
165 {"collections.group.name", NULL},
166 {"collections.group.min", NULL},
167 {"collections.group.max", NULL},
168 {"collections.group.data", NULL}, 252 {"collections.group.data", NULL},
169 {"collections.group.data.item", NULL},
170 {"collections.group.script", ob_collections_group_script}, 253 {"collections.group.script", ob_collections_group_script},
254 {"collections.group.images", NULL}, /* dup */
255 {"collections.group.fonts", NULL}, /* dup */
171 {"collections.group.parts", NULL}, 256 {"collections.group.parts", NULL},
257 {"collections.group.parts.images", NULL}, /* dup */
258 {"collections.group.parts.fonts", NULL}, /* dup */
172 {"collections.group.parts.part", ob_collections_group_parts_part}, 259 {"collections.group.parts.part", ob_collections_group_parts_part},
173 {"collections.group.parts.part.name", NULL},
174 {"collections.group.parts.part.type", NULL},
175 {"collections.group.parts.part.effect", NULL},
176 {"collections.group.parts.part.mouse_events", NULL},
177 {"collections.group.parts.part.repeat_events", NULL},
178 {"collections.group.parts.part.clip_to", NULL},
179 {"collections.group.parts.part.dragable", NULL}, 260 {"collections.group.parts.part.dragable", NULL},
180 {"collections.group.parts.part.dragable.x", NULL}, 261 {"collections.group.parts.part.images", NULL}, /* dup */
181 {"collections.group.parts.part.dragable.y", NULL}, 262 {"collections.group.parts.part.fonts", NULL}, /* dup */
182 {"collections.group.parts.part.dragable.confine", NULL},
183 {"collections.group.parts.part.description", ob_collections_group_parts_part_description}, 263 {"collections.group.parts.part.description", ob_collections_group_parts_part_description},
184 {"collections.group.parts.part.description.state", NULL},
185 {"collections.group.parts.part.description.visible", NULL},
186 {"collections.group.parts.part.description.align", NULL},
187 {"collections.group.parts.part.description.min", NULL},
188 {"collections.group.parts.part.description.max", NULL},
189 {"collections.group.parts.part.description.step", NULL},
190 {"collections.group.parts.part.description.aspect", NULL},
191 {"collections.group.parts.part.description.aspect_preference", NULL},
192 {"collections.group.parts.part.description.rel1", NULL}, 264 {"collections.group.parts.part.description.rel1", NULL},
193 {"collections.group.parts.part.description.rel1.relative", NULL},
194 {"collections.group.parts.part.description.rel1.offset", NULL},
195 {"collections.group.parts.part.description.rel1.to", NULL},
196 {"collections.group.parts.part.description.rel1.to_x", NULL},
197 {"collections.group.parts.part.description.rel1.to_y", NULL},
198 {"collections.group.parts.part.description.rel2", NULL}, 265 {"collections.group.parts.part.description.rel2", NULL},
199 {"collections.group.parts.part.description.rel2.relative", NULL}, 266 {"collections.group.parts.part.description.image", NULL}, /* dup */
200 {"collections.group.parts.part.description.rel2.offset", NULL}, 267 {"collections.group.parts.part.description.image.images", NULL}, /* dup */
201 {"collections.group.parts.part.description.rel2.to", NULL},
202 {"collections.group.parts.part.description.rel2.to_x", NULL},
203 {"collections.group.parts.part.description.rel2.to_y", NULL},
204 {"collections.group.parts.part.description.image", NULL},
205 {"collections.group.parts.part.description.image.normal", NULL},
206 {"collections.group.parts.part.description.image.tween", NULL},
207 {"collections.group.parts.part.description.border", NULL},
208 {"collections.group.parts.part.description.fill", NULL}, 268 {"collections.group.parts.part.description.fill", NULL},
209 {"collections.group.parts.part.description.fill.smooth", NULL},
210 {"collections.group.parts.part.description.fill.origin", NULL}, 269 {"collections.group.parts.part.description.fill.origin", NULL},
211 {"collections.group.parts.part.description.fill.origin.relative", NULL},
212 {"collections.group.parts.part.description.fill.origin.offset", NULL},
213 {"collections.group.parts.part.description.fill.size", NULL}, 270 {"collections.group.parts.part.description.fill.size", NULL},
214 {"collections.group.parts.part.description.fill.size.relative", NULL},
215 {"collections.group.parts.part.description.fill.size.offset", NULL},
216 {"collections.group.parts.part.description.color_class", NULL},
217 {"collections.group.parts.part.description.color", NULL},
218 {"collections.group.parts.part.description.color2", NULL},
219 {"collections.group.parts.part.description.color3", NULL},
220 {"collections.group.parts.part.description.text", NULL}, 271 {"collections.group.parts.part.description.text", NULL},
221 {"collections.group.parts.part.description.text.text", NULL}, 272 {"collections.group.parts.part.description.text.fonts", NULL}, /* dup */
222 {"collections.group.parts.part.description.text.text_class", NULL}, 273 {"collections.group.parts.part.description.images", NULL}, /* dup */
223 {"collections.group.parts.part.description.text.font", NULL}, 274 {"collections.group.parts.part.description.fonts", NULL}, /* dup */
224 {"collections.group.parts.part.description.text.size", NULL}, 275 {"collections.group.parts.part.description.program", ob_collections_group_programs_program}, /* dup */
225 {"collections.group.parts.part.description.text.fit", NULL}, 276 {"collections.group.parts.part.description.program.script", ob_collections_group_programs_program_script}, /* dup */
226 {"collections.group.parts.part.description.text.min", NULL}, 277 {"collections.group.parts.part.description.programs", NULL}, /* dup */
227 {"collections.group.parts.part.description.text.align", NULL}, 278 {"collections.group.parts.part.description.programs.images", NULL}, /* dup */
228 {"collections.group.programs", ob_collections_group_programs}, 279 {"collections.group.parts.part.description.programs.fonts", NULL}, /* dup */
280 {"collections.group.parts.part.description.programs.program", ob_collections_group_programs_program}, /* dup */
281 {"collections.group.parts.part.description.programs.program.script", ob_collections_group_programs_program_script}, /* dup */
282 {"collections.group.parts.part.description.script", ob_collections_group_script}, /* dup */
283 {"collections.group.parts.part.program", ob_collections_group_programs_program}, /* dup */
284 {"collections.group.parts.part.program.script", ob_collections_group_programs_program_script}, /* dup */
285 {"collections.group.parts.part.programs", NULL}, /* dup */
286 {"collections.group.parts.part.programs.images", NULL}, /* dup */
287 {"collections.group.parts.part.programs.fonts", NULL}, /* dup */
288 {"collections.group.parts.part.programs.program", ob_collections_group_programs_program}, /* dup */
289 {"collections.group.parts.part.programs.program.script", ob_collections_group_programs_program_script}, /* dup */
290 {"collections.group.parts.part.script", ob_collections_group_script}, /* dup */
291 {"collections.group.parts.program", ob_collections_group_programs_program}, /* dup */
292 {"collections.group.parts.program.script", ob_collections_group_programs_program_script}, /* dup */
293 {"collections.group.parts.programs", NULL}, /* dup */
294 {"collections.group.parts.programs.images", NULL}, /* dup */
295 {"collections.group.parts.programs.fonts", NULL}, /* dup */
296 {"collections.group.parts.programs.program", ob_collections_group_programs_program}, /* dup */
297 {"collections.group.parts.programs.program.script", ob_collections_group_programs_program_script}, /* dup */
298 {"collections.group.parts.script", ob_collections_group_script}, /* dup */
299 {"collections.group.program", ob_collections_group_programs_program}, /* dup */
300 {"collections.group.program.script", ob_collections_group_programs_program_script}, /* dup */
301 {"collections.group.programs", NULL},
302 {"collections.group.programs.images", NULL}, /* dup */
303 {"collections.group.programs.fonts", NULL}, /* dup */
229 {"collections.group.programs.program", ob_collections_group_programs_program}, 304 {"collections.group.programs.program", ob_collections_group_programs_program},
230 {"collections.group.programs.program.name", NULL}, 305 {"collections.group.programs.program.script", ob_collections_group_programs_program_script},
231 {"collections.group.programs.program.signal", NULL}, 306 {"collections.group.programs.script", ob_collections_group_script} /* dup */
232 {"collections.group.programs.program.source", NULL},
233 {"collections.group.programs.program.in", NULL},
234 {"collections.group.programs.program.action", NULL},
235 {"collections.group.programs.program.transition", NULL},
236 {"collections.group.programs.program.target", NULL},
237 {"collections.group.programs.program.after", NULL},
238 {"collections.group.programs.program.script", ob_collections_group_programs_program_script}
239}; 307};
240 308
241/*****/ 309/*****/
@@ -255,30 +323,32 @@ statement_handler_num(void)
255/*****/ 323/*****/
256 324
257static void 325static void
258ob_images(void)
259{
260 if (!edje_file->image_dir)
261 edje_file->image_dir = mem_alloc(SZ(Edje_Image_Directory));
262}
263
264static void
265ob_images_image(void)
266{
267 Edje_Image_Directory_Entry *img;
268
269 img = mem_alloc(SZ(Edje_Image_Directory_Entry));
270 edje_file->image_dir->entries = evas_list_append(edje_file->image_dir->entries, img);
271 img->id = evas_list_count(edje_file->image_dir->entries) - 1;
272}
273
274static void
275st_images_image(void) 326st_images_image(void)
276{ 327{
277 Edje_Image_Directory_Entry *img; 328 Edje_Image_Directory_Entry *img;
278 int v; 329 int v;
279 330
280 img = evas_list_data(evas_list_last(edje_file->image_dir->entries)); 331 if (!edje_file->image_dir)
332 edje_file->image_dir = mem_alloc(SZ(Edje_Image_Directory));
333 img = mem_alloc(SZ(Edje_Image_Directory_Entry));
281 img->entry = parse_str(0); 334 img->entry = parse_str(0);
335 {
336 Evas_List *l;
337
338 for (l = edje_file->image_dir->entries; l; l = l->next)
339 {
340 Edje_Image_Directory_Entry *limg;
341
342 limg = l->data;
343 if (!strcmp(limg->entry, img->entry))
344 {
345 free(img->entry);
346 free(img);
347 return;
348 }
349 }
350 }
351 img->id = evas_list_count(edje_file->image_dir->entries) - 1;
282 v = parse_enum(1, 352 v = parse_enum(1,
283 "RAW", 0, 353 "RAW", 0,
284 "COMP", 1, 354 "COMP", 1,
@@ -305,36 +375,48 @@ st_images_image(void)
305 img->source_type = EDJE_IMAGE_SOURCE_TYPE_EXTERNAL; 375 img->source_type = EDJE_IMAGE_SOURCE_TYPE_EXTERNAL;
306 img->source_param = 0; 376 img->source_param = 0;
307 } 377 }
378 edje_file->image_dir->entries = evas_list_append(edje_file->image_dir->entries, img);
308 if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY) return; 379 if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY) return;
309 img->source_param = parse_int_range(2, 0, 100); 380 img->source_param = parse_int_range(2, 0, 100);
310} 381}
311 382
312static void 383static void
313ob_fonts(void)
314{
315 if (!edje_file->font_dir)
316 edje_file->font_dir = mem_alloc(SZ(Edje_Font_Directory));
317}
318
319static void
320st_fonts_font(void) 384st_fonts_font(void)
321{ 385{
322 Font *fn; 386 Font *fn;
323 Edje_Font_Directory_Entry *fnt; 387 Edje_Font_Directory_Entry *fnt;
324 388
389 if (!edje_file->font_dir)
390 edje_file->font_dir = mem_alloc(SZ(Edje_Font_Directory));
391
325 fn = mem_alloc(SZ(Font)); 392 fn = mem_alloc(SZ(Font));
326 fn->file = parse_str(0); 393 fn->file = parse_str(0);
327 fn->name = parse_str(1); 394 fn->name = parse_str(1);
395 {
396 Evas_List *l;
397
398 for (l = fonts; l; l = l->next)
399 {
400 Font *lfn;
401
402 lfn = l->data;
403 if (!strcmp(lfn->name, fn->name))
404 {
405 free(fn->file);
406 free(fn->name);
407 free(fn);
408 return;
409 }
410 }
411 }
328 fonts = evas_list_append(fonts, fn); 412 fonts = evas_list_append(fonts, fn);
329 413
330 if (edje_file->font_dir) 414 if (edje_file->font_dir)
331 { 415 {
332 fnt = mem_alloc(SZ(Edje_Font_Directory_Entry)); 416 fnt = mem_alloc(SZ(Edje_Font_Directory_Entry));
333 edje_file->font_dir->entries = evas_list_append(edje_file->font_dir->entries, fnt);
334 fnt->entry = mem_strdup(fn->name); 417 fnt->entry = mem_strdup(fn->name);
418 edje_file->font_dir->entries = evas_list_append(edje_file->font_dir->entries, fnt);
335 } 419 }
336 else
337 fprintf(stderr, "%s: Error. parse error %s:%i. Trying to a font outside of a fonts block?\n", progname, file_in, line);
338} 420}
339 421
340static void 422static void
@@ -1259,12 +1341,6 @@ st_collections_group_parts_part_description_text_align(void)
1259 ed->text.align.y = parse_float_range(1, 0.0, 1.0); 1341 ed->text.align.y = parse_float_range(1, 0.0, 1.0);
1260} 1342}
1261 1343
1262
1263static void
1264ob_collections_group_programs(void)
1265{
1266}
1267
1268static void 1344static void
1269ob_collections_group_programs_program(void) 1345ob_collections_group_programs_program(void)
1270{ 1346{
@@ -1288,6 +1364,22 @@ st_collections_group_programs_program_name(void)
1288 pc = evas_list_data(evas_list_last(edje_collections)); 1364 pc = evas_list_data(evas_list_last(edje_collections));
1289 ep = evas_list_data(evas_list_last(pc->programs)); 1365 ep = evas_list_data(evas_list_last(pc->programs));
1290 ep->name = parse_str(0); 1366 ep->name = parse_str(0);
1367 {
1368 Evas_List *l;
1369
1370 for (l = pc->programs; l; l = l->next)
1371 {
1372 Edje_Program *lep;
1373
1374 lep = l->data;
1375 if ((lep != ep) && (!strcmp(lep->name, ep->name)))
1376 {
1377 fprintf(stderr, "%s: Error. parse error %s:%i. There is already a program of the name %s\n",
1378 progname, file_in, line, ep->name);
1379 exit(-1);
1380 }
1381 }
1382 }
1291} 1383}
1292 1384
1293static void 1385static void
diff --git a/legacy/edje/src/bin/edje_cc_out.c b/legacy/edje/src/bin/edje_cc_out.c
index fc3ecfe7d8..5b2a3abde2 100644
--- a/legacy/edje/src/bin/edje_cc_out.c
+++ b/legacy/edje/src/bin/edje_cc_out.c
@@ -696,7 +696,7 @@ data_process_lookups(void)
696 } 696 }
697 if (!l) 697 if (!l)
698 { 698 {
699 fprintf(stderr, "%s: Error. unable find part name %s\n", 699 fprintf(stderr, "%s: Error. unable to find part name %s\n",
700 progname, pl->name); 700 progname, pl->name);
701 exit(-1); 701 exit(-1);
702 } 702 }
@@ -724,7 +724,7 @@ data_process_lookups(void)
724 } 724 }
725 if (!l) 725 if (!l)
726 { 726 {
727 fprintf(stderr, "%s: Error. unable find program name %s\n", 727 fprintf(stderr, "%s: Error. unable to find program name %s\n",
728 progname, pl->name); 728 progname, pl->name);
729 exit(-1); 729 exit(-1);
730 } 730 }
@@ -740,25 +740,25 @@ data_process_lookups(void)
740 il = image_lookups->data; 740 il = image_lookups->data;
741 741
742 if (!edje_file->image_dir) 742 if (!edje_file->image_dir)
743 l = NULL; 743 l = NULL;
744 else 744 else
745 { 745 {
746 for (l = edje_file->image_dir->entries; l; l = l->next) 746 for (l = edje_file->image_dir->entries; l; l = l->next)
747 { 747 {
748 Edje_Image_Directory_Entry *de; 748 Edje_Image_Directory_Entry *de;
749 749
750 de = l->data; 750 de = l->data;
751 if ((de->entry) && (!strcmp(de->entry, il->name))) 751 if ((de->entry) && (!strcmp(de->entry, il->name)))
752 { 752 {
753 *(il->dest) = de->id; 753 *(il->dest) = de->id;
754 break; 754 break;
755 } 755 }
756 } 756 }
757 } 757 }
758 758
759 if (!l) 759 if (!l)
760 { 760 {
761 fprintf(stderr, "%s: Error. unable find image name %s\n", 761 fprintf(stderr, "%s: Error. unable to find image name %s\n",
762 progname, il->name); 762 progname, il->name);
763 exit(-1); 763 exit(-1);
764 } 764 }
diff --git a/legacy/edje/src/bin/edje_cc_parse.c b/legacy/edje/src/bin/edje_cc_parse.c
index 02d45d4ac5..dadab4fbc2 100644
--- a/legacy/edje/src/bin/edje_cc_parse.c
+++ b/legacy/edje/src/bin/edje_cc_parse.c
@@ -64,6 +64,16 @@ new_object(void)
64 } 64 }
65 if (!handled) 65 if (!handled)
66 { 66 {
67 for (i = 0; i < statement_handler_num(); i++)
68 {
69 if (!strcmp(statement_handlers[i].type, id))
70 {
71 return;
72 }
73 }
74 }
75 if (!handled)
76 {
67 fprintf(stderr, "%s: Error. %s:%i unhandled keyword %s\n", 77 fprintf(stderr, "%s: Error. %s:%i unhandled keyword %s\n",
68 progname, file_in, line, 78 progname, file_in, line,
69 (char *)evas_list_data(evas_list_last(stack))); 79 (char *)evas_list_data(evas_list_last(stack)));