Enlightenment CVS committal
Author : dj2
Project : e17
Module : proto
Dir : e17/proto/edje_cc
Modified Files:
edje.l edje.y
Log Message:
- more actions
- remove script stuff for now
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.l,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- edje.l 8 Sep 2004 05:34:54 -0000 1.17
+++ edje.l 8 Sep 2004 06:22:49 -0000 1.18
@@ -9,7 +9,7 @@
int col = 0;
static int comment = 0, cpp_comment = 0;
static int script_level = 0;
- static char *script;
+ static char *script = NULL;
#define COMMENT_START() BEGIN(SC_COMMENT); comment++;
@@ -29,10 +29,10 @@
#define SCRIPT_PIECE() if (script == NULL) { \
script =
strdup(yytext); \
- } else { \
+ /*} else { \
realloc(script,
strlen(script) + yyleng + 1); \
strncat(script,
yytext, yyleng); \
- }
+ */}
#define SCRIPT_NEW_LINE() lnum ++; SCRIPT_PIECE();
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.y,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- edje.y 8 Sep 2004 05:55:06 -0000 1.16
+++ edje.y 8 Sep 2004 06:22:49 -0000 1.17
@@ -159,6 +159,12 @@
program_action: ACTION COLON action_type STRING FLOAT SEMICOLON {
printf("action %d %s %f\n", $3, $4, $5);
}
+ | ACTION COLON action_type STRING STRING SEMICOLON {
+ printf("action %d %s %s\n", $3, $4, $5);
+ }
+ | ACTION COLON action_type FLOAT FLOAT SEMICOLON {
+ printf("action %d %f %f\n", $3, $4, $5);
+ }
| ACTION COLON action_type SEMICOLON {
printf("action %d\n", $3);
}
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
