Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc.h edje_cc_handlers.c edje_cc_parse.c
Log Message:
edje_cc now checks the number of arguments for each statement
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- edje_cc.h 20 Oct 2004 16:48:58 -0000 1.21
+++ edje_cc.h 23 Oct 2004 20:12:20 -0000 1.22
@@ -112,6 +112,7 @@
int parse_bool(int n);
double parse_float(int n);
double parse_float_range(int n, double f, double t);
+void check_arg_count(int n);
int object_handler_num(void);
int statement_handler_num(void);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_handlers.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- edje_cc_handlers.c 22 Oct 2004 07:42:37 -0000 1.47
+++ edje_cc_handlers.c 23 Oct 2004 20:12:21 -0000 1.48
@@ -388,8 +388,13 @@
img->source_type = EDJE_IMAGE_SOURCE_TYPE_EXTERNAL;
img->source_param = 0;
}
- if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY) return;
- img->source_param = parse_int_range(2, 0, 100);
+ if (img->source_type != EDJE_IMAGE_SOURCE_TYPE_INLINE_LOSSY)
+ check_arg_count(2);
+ else
+ {
+ img->source_param = parse_int_range(2, 0, 100);
+ check_arg_count(3);
+ }
}
static void
@@ -397,6 +402,8 @@
{
Font *fn;
Edje_Font_Directory_Entry *fnt;
+
+ check_arg_count(2);
if (!edje_file->font_dir)
edje_file->font_dir = mem_alloc(SZ(Edje_Font_Directory));
@@ -435,6 +442,8 @@
st_data_item(void)
{
Edje_Data *di;
+
+ check_arg_count(2);
di = mem_alloc(SZ(Edje_Data));
di->key = parse_str(0);
@@ -472,6 +481,8 @@
st_collections_group_name(void)
{
Edje_Part_Collection_Directory_Entry *de;
+
+ check_arg_count(1);
de = evas_list_data(evas_list_last(edje_file->collection_dir->entries));
de->entry = parse_str(0);
@@ -481,6 +492,8 @@
st_collections_group_min(void)
{
Edje_Part_Collection *pc;
+
+ check_arg_count(2);
pc = evas_list_data(evas_list_last(edje_collections));
pc->prop.min.w = parse_int_range(0, 0, 0x7fffffff);
@@ -491,6 +504,8 @@
st_collections_group_max(void)
{
Edje_Part_Collection *pc;
+
+ check_arg_count(2);
pc = evas_list_data(evas_list_last(edje_collections));
pc->prop.max.w = parse_int_range(0, 0, 0x7fffffff);
@@ -533,6 +548,8 @@
{
Edje_Part_Collection *pc;
Edje_Data *di;
+
+ check_arg_count(2);
pc = evas_list_data(evas_list_last(edje_collections));
di = mem_alloc(SZ(Edje_Data));
@@ -563,6 +580,8 @@
{
Edje_Part_Collection *pc;
Edje_Part *ep;
+
+ check_arg_count(1);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -591,6 +610,8 @@
{
Edje_Part_Collection *pc;
Edje_Part *ep;
+
+ check_arg_count(1);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -608,6 +629,8 @@
{
Edje_Part_Collection *pc;
Edje_Part *ep;
+
+ check_arg_count(1);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -619,6 +642,8 @@
{
Edje_Part_Collection *pc;
Edje_Part *ep;
+
+ check_arg_count(1);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -630,6 +655,8 @@
{
Edje_Part_Collection *pc;
Edje_Part *ep;
+
+ check_arg_count(1);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -648,6 +675,8 @@
Edje_Part_Collection *pc;
Edje_Part *ep;
+ check_arg_count(3);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ep->dragable.x = parse_int_range(0, -1, 1);
@@ -661,6 +690,8 @@
Edje_Part_Collection *pc;
Edje_Part *ep;
+ check_arg_count(3);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ep->dragable.y = parse_int_range(0, -1, 1);
@@ -674,6 +705,8 @@
Edje_Part_Collection *pc;
Edje_Part *ep;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
{
@@ -757,6 +790,8 @@
char *parent_name, *state_name;
double parent_val, state_val;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -871,6 +906,8 @@
Edje_Part_Collection *pc;
Edje_Part *ep;
Edje_Part_Description *ed;
+
+ check_arg_count(2);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -886,6 +923,8 @@
Edje_Part_Collection *pc;
Edje_Part *ep;
Edje_Part_Description *ed;
+
+ check_arg_count(1);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -901,6 +940,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -916,6 +957,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -931,6 +974,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -946,6 +991,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -961,6 +1008,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -976,6 +1025,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -995,6 +1046,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1010,6 +1063,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1025,6 +1080,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1046,6 +1103,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1066,6 +1125,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1086,6 +1147,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1101,6 +1164,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1116,6 +1181,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1137,6 +1204,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1157,6 +1226,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1177,6 +1248,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1206,6 +1279,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1238,6 +1313,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(4);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1274,6 +1351,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1297,6 +1376,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1321,6 +1402,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1345,6 +1428,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1369,6 +1454,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1392,6 +1479,8 @@
Edje_Part_Collection *pc;
Edje_Part *ep;
Edje_Part_Description *ed;
+
+ check_arg_count(1);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1407,6 +1496,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(4);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1424,6 +1515,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(4);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1441,6 +1534,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(4);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ed = ep->default_desc;
@@ -1458,6 +1553,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1480,6 +1577,8 @@
Edje_Part_Collection *pc;
Edje_Part *ep;
Edje_Part_Description *ed;
+
+ check_arg_count(1);
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1504,6 +1603,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1527,6 +1628,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1549,6 +1652,8 @@
Edje_Part_Collection *pc;
Edje_Part *ep;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
ep->effect = parse_enum(0,
@@ -1570,6 +1675,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1594,6 +1701,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1618,6 +1727,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1642,6 +1753,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1671,6 +1784,8 @@
Edje_Part *ep;
Edje_Part_Description *ed;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->parts));
@@ -1713,6 +1828,8 @@
Edje_Part_Collection *pc;
Edje_Program *ep;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->programs));
ep->name = parse_str(0);
@@ -1740,6 +1857,8 @@
Edje_Part_Collection *pc;
Edje_Program *ep;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->programs));
ep->signal = parse_str(0);
@@ -1751,6 +1870,8 @@
Edje_Part_Collection *pc;
Edje_Program *ep;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->programs));
ep->source = parse_str(0);
@@ -1762,6 +1883,8 @@
Edje_Part_Collection *pc;
Edje_Program *ep;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->programs));
ep->in.from = parse_float_range(0, 0.0, 999999999.0);
@@ -1774,6 +1897,8 @@
Edje_Part_Collection *pc;
Edje_Program *ep;
+ check_arg_count(3);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->programs));
ep->action = parse_enum(0,
@@ -1818,6 +1943,8 @@
Edje_Part_Collection *pc;
Edje_Program *ep;
+ check_arg_count(2);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->programs));
ep->tween.mode = parse_enum(0,
@@ -1835,6 +1962,8 @@
Edje_Part_Collection *pc;
Edje_Program *ep;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->programs));
{
@@ -1871,6 +2000,8 @@
Edje_Part_Collection *pc;
Edje_Program *ep;
+ check_arg_count(1);
+
pc = evas_list_data(evas_list_last(edje_collections));
ep = evas_list_data(evas_list_last(pc->programs));
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_parse.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- edje_cc_parse.c 20 Oct 2004 16:48:58 -0000 1.26
+++ edje_cc_parse.c 23 Oct 2004 20:12:21 -0000 1.27
@@ -796,6 +796,19 @@
return i;
}
+void
+check_arg_count(int required_args)
+{
+ int num_args = evas_list_count (params);
+
+ if (num_args != required_args)
+ {
+ fprintf(stderr, "%s: Error. %s:%i got %i arguments, but expected %i\n",
+ progname, file_in, line, num_args, required_args);
+ exit(-1);
+ }
+}
+
/* simple expression parsing stuff */
/*
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
