Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_parse.c
Log Message:
edje_cc is getting even more picky. arguments may not be separated by commas any more.
simplified code a bit.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_parse.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- edje_cc_parse.c 23 Oct 2004 20:12:21 -0000 1.27
+++ edje_cc_parse.c 24 Oct 2004 01:10:04 -0000 1.28
@@ -350,10 +350,19 @@
line = 1;
while ((token = next_token(p, end, &p, &delim)) != NULL)
{
- if (delim)
+ /* if we are in param mode, the only delimiter
+ * we'll accept is the semicolon
+ */
+ if (do_params && delim && *token != ';')
{
- if ((!strcmp(token, ",")) || (!strcmp(token, ":"))) do_params = 1;
- else if (!strcmp(token, "}"))
+ fprintf(stderr, "%s: Error. parse error %s:%i. %c marker before ;
marker\n",
+ progname, file_in, line, *token);
+ exit(-1);
+ }
+ else if (delim)
+ {
+ if (*token == ',' || *token == ':') do_params = 1;
+ else if (*token == '}')
{
if (do_params)
{
@@ -364,7 +373,7 @@
else
stack_chop_top();
}
- else if (!strcmp(token, ";"))
+ else if (*token == ';')
{
if (do_params)
{
@@ -380,7 +389,7 @@
stack_chop_top();
}
}
- else if (!strcmp(token, "{"))
+ else if (*token == '{')
{
if (do_params)
{
-------------------------------------------------------
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
