Enlightenment CVS committal
Author : leviathan
Project : e17
Module : libs/engrave
Dir : e17/libs/engrave/src/lib
Modified Files:
engrave.l engrave.y engrave_enums.h engrave_out.c
Log Message:
add action: SCRIPT back
it may be superfluous, but edje_cc does not fail to compile it, so engrave
should parse it too
===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave.l,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- engrave.l 2 Aug 2007 13:44:35 -0000 1.19
+++ engrave.l 9 Nov 2007 09:15:19 -0000 1.20
@@ -111,6 +111,7 @@
DRAG_VAL_PAGE { KEYWORD_RETURN(DRAG_VAL_PAGE); }
DRAG_VAL_SET { KEYWORD_RETURN(DRAG_VAL_SET); }
DRAG_VAL_STEP { KEYWORD_RETURN(DRAG_VAL_STEP); }
+SCRIPT { KEYWORD_RETURN(ACTION_SCRIPT); }
dragable { KEYWORD_RETURN(DRAGABLE); }
effect { KEYWORD_RETURN(EFFECT); }
fill { KEYWORD_RETURN(FILL); }
===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave.y,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- engrave.y 3 Nov 2007 12:13:22 -0000 1.32
+++ engrave.y 9 Nov 2007 09:15:19 -0000 1.33
@@ -41,7 +41,7 @@
%token REL1 REL2 RELATIVE REPEAT_EVENTS SCRIPT SIGNAL SIZE GRADREL1 GRADREL2
%token SMOOTH SOURCE STATE STEP TARGET TEXT TEXT_CLASS TEXT_SOURCE TO
%token TO_X TO_Y TRANSITION TWEEN TYPE VISIBLE X Y
-%token OPEN_BRACE CLOSE_BRACE RAW COMP LOSSY
+%token OPEN_BRACE CLOSE_BRACE RAW COMP LOSSY ACTION_SCRIPT
%token STYLES STYLE SBASE TAG ELIPSIS PRECISE_IS_INSIDE
%token COLON QUOTE SEMICOLON STATE_SET ACTION_STOP SIGNAL_EMIT
%token DRAG_VAL_SET DRAG_VAL_STEP DRAG_VAL_PAGE LINEAR
@@ -326,6 +326,7 @@
| DRAG_VAL_SET { $$ = ENGRAVE_ACTION_DRAG_VAL_SET; }
| DRAG_VAL_STEP { $$ = ENGRAVE_ACTION_DRAG_VAL_STEP; }
| DRAG_VAL_PAGE { $$ = ENGRAVE_ACTION_DRAG_VAL_PAGE; }
+ | ACTION_SCRIPT { $$ = ENGRAVE_ACTION_SCRIPT; }
;
program_transition: TRANSITION COLON transition_type exp SEMICOLON {
===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_enums.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- engrave_enums.h 2 Aug 2007 13:44:35 -0000 1.9
+++ engrave_enums.h 9 Nov 2007 09:15:19 -0000 1.10
@@ -82,6 +82,7 @@
ENGRAVE_ACTION_DRAG_VAL_SET, /**< Set the drag value of a given part */
ENGRAVE_ACTION_DRAG_VAL_STEP, /**< Set the drag step of a given part */
ENGRAVE_ACTION_DRAG_VAL_PAGE, /**< Set the drag page of a given part */
+ ENGRAVE_ACTION_SCRIPT, /**< Set the cript action of a given part */
ENGRAVE_ACTION_NUM
};
===================================================================
RCS file: /cvs/e/e17/libs/engrave/src/lib/engrave_out.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- engrave_out.c 9 Nov 2007 06:01:53 -0000 1.46
+++ engrave_out.c 9 Nov 2007 09:15:19 -0000 1.47
@@ -59,7 +59,8 @@
"SIGNAL_EMIT",
"DRAG_VAL_SET",
"DRAG_VAL_STEP",
- "DRAG_VAL_PAGE"
+ "DRAG_VAL_PAGE",
+ "SCRIPT"
};
static char *_transition_string[ENGRAVE_TRANSITION_NUM] = {
@@ -394,6 +395,10 @@
case ENGRAVE_ACTION_SIGNAL_EMIT:
engrave_out_data(out, "action", "%s \"%s\" \"%s\"",
_action_string[action], state, state2);
+ break;
+
+ case ENGRAVE_ACTION_SCRIPT:
+ engrave_out_data(out, "action", "%s", _action_string[action]);
break;
case ENGRAVE_ACTION_NUM:
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
