Enlightenment CVS committal
Author : dj2
Project : e17
Module : proto
Dir : e17/proto/edje_cc
Modified Files:
edje.l edje.y
Added Files:
Etcher.h
Log Message:
- add programs block handling
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.l,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- edje.l 8 Sep 2004 01:27:26 -0000 1.8
+++ edje.l 8 Sep 2004 02:04:00 -0000 1.9
@@ -1,5 +1,6 @@
%{
#include <stdio.h>
+#include "Etcher.h"
#include "edje_cc.tab.h"
int yylex(void);
@@ -47,7 +48,9 @@
floating_constant
((({start_part}{fractional_constant}{exponent_part}?)|({start_part}[0-9]+{exponent_part}))[FfLl]?)|({start_part}[0-9][0-9]*)
%%
+ACCELERATE { KEYWORD_RETURN(ACCELERATE); }
action { KEYWORD_RETURN(ACTION); }
+ACTION_STOP { KEYWORD_RETURN(ACTION_STOP); }
after { KEYWORD_RETURN(AFTER); }
align { KEYWORD_RETURN(ALIGN); }
aspect { KEYWORD_RETURN(ASPECT); }
@@ -62,7 +65,11 @@
COMP { KEYWORD_RETURN(COMP); }
confine { KEYWORD_RETURN(CONFINE); }
data { KEYWORD_RETURN(DATA); }
+DECELERATE { KEYWORD_RETURN(DECELERATE); }
description { KEYWORD_RETURN(DESCRIPTION); }
+DRAG_VAL_PAGE { KEYWORD_RETURN(DRAG_VAL_PAGE); }
+DRAG_VAL_SET { KEYWORD_RETURN(DRAG_VAL_SET); }
+DRAG_VAL_STEP { KEYWORD_RETURN(DRAG_VAL_STEP); }
dragable { KEYWORD_RETURN(DRAGABLE); }
effect { KEYWORD_RETURN(EFFECT); }
fill { KEYWORD_RETURN(FILL); }
@@ -74,6 +81,7 @@
images { KEYWORD_RETURN(IMAGES); }
in { KEYWORD_RETURN(IN); }
item { KEYWORD_RETURN(ITEM); }
+LINEAR { KEYWORD_RETURN(LINEAR); }
LOSSY { KEYWORD_RETURN(LOSSY); }
max { KEYWORD_RETURN(MAX); }
min { KEYWORD_RETURN(MIN); }
@@ -93,10 +101,13 @@
repeat_events { KEYWORD_RETURN(REPEAT_EVENTS); }
script { KEYWORD_RETURN(SCRIPT); }
signal { KEYWORD_RETURN(SIGNAL); }
+SIGNAL_EMIT { KEYWORD_RETURN(SIGNAL_EMIT); }
+SINUSOIDAL { KEYWORD_RETURN(SINUSOIDAL); }
size { KEYWORD_RETURN(SIZE); }
smooth { KEYWORD_RETURN(SMOOTH); }
source { KEYWORD_RETURN(SOURCE); }
state { KEYWORD_RETURN(STATE); }
+STATE_SET { KEYWORD_RETURN(STATE_SET); }
step { KEYWORD_RETURN(STEP); }
target { KEYWORD_RETURN(TARGET); }
text { KEYWORD_RETURN(TEXT); }
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.y,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- edje.y 8 Sep 2004 01:23:03 -0000 1.7
+++ edje.y 8 Sep 2004 02:04:00 -0000 1.8
@@ -1,6 +1,7 @@
%{
#include <stdio.h>
#include <string.h>
+#include "Etcher.h"
#define YYDEBUG 1
@@ -9,11 +10,14 @@
extern int lnum;
extern int col;
+
%}
%union {
char *string;
float val;
+ Etcher_Program_Actions prog_actions;
+ Etcher_Transition_Types transition_type;
}
%token STRING FLOAT
@@ -26,14 +30,17 @@
%token SMOOTH SOURCE STATE STEP TARGET TEXT TEXT_CLASS TO
%token TO_X TO_Y TRANSITION TWEEN TYPE VISIBLE X Y
%token OPEN_BRACE CLOSE_BRACE RAW COMP LOSSY
-%token COLON QUOTE SEMICOLON
+%token COLON QUOTE SEMICOLON STATE_SET ACTION_STOP SIGNAL_EMIT
+%token DRAG_VAL_SET DRAG_VAL_STEP DRAG_VAL_PAGE LINEAR
+%token SINUSOIDAL ACCELERATE DECELERATE
-%type <string> STRING lossless_type lossy_type
+%type <string> STRING lossless_type lossy_type
%type <val> FLOAT
+%type <prog_actions> action_type
+%type <transition_type> transition_type
%%
-
edjes: /* blank */ |
images edjes |
fonts edjes |
@@ -93,6 +100,85 @@
}
;
+programs: PROGRAMS OPEN_BRACE program_statement CLOSE_BRACE
+ ;
+
+program_statement: program
+ | program program_statement
+ ;
+
+program: PROGRAM OPEN_BRACE program_body CLOSE_BRACE
+ ;
+
+program_body: /* blank */
+ | program_cmd
+ | program_cmd program_body
+ ;
+
+program_cmd: program_name
+ | program_signal
+ | program_source
+ | program_in
+ | program_action
+ | program_transition
+ | program_target
+ | program_after
+ ;
+
+program_name: NAME COLON STRING SEMICOLON {
+ printf("name: %s\n", $3);
+ }
+ ;
+
+program_signal: SIGNAL COLON STRING SEMICOLON {
+ printf("signal: %s\n", $3);
+ }
+ ;
+
+program_source: SOURCE COLON STRING SEMICOLON {
+ printf("source: %s\n", $3);
+ }
+ ;
+
+program_in: IN COLON FLOAT FLOAT SEMICOLON {
+ printf("in %f %f\n", $3, $4);
+ }
+ ;
+
+program_action: ACTION COLON action_type STRING FLOAT SEMICOLON {
+ printf("action %d %s %f\n", $3, $4, $5);
+ }
+ ;
+
+action_type: SIGNAL_EMIT { $$ = ETCHER_ACTION_SIGNAL_EMIT; }
+ | STATE_SET { $$ = ETCHER_ACTION_STATE_SET; }
+ | ACTION_STOP { $$ = ETCHER_ACTION_ACTION_STOP; }
+ | DRAG_VAL_SET { $$ = ETCHER_ACTION_DRAG_VAL_SET; }
+ | DRAG_VAL_STEP { $$ = ETCHER_ACTION_DRAG_VAL_STEP; }
+ | DRAG_VAL_PAGE { $$ = ETCHER_ACTION_DRAG_VAL_PAGE; }
+ ;
+
+program_transition: TRANSITION COLON transition_type FLOAT SEMICOLON {
+ printf("transition %d %f\n", $3, $4);
+ }
+ ;
+
+transition_type: LINEAR { $$ = ETCHER_TRANSITION_LINEAR; }
+ | SINUSOIDAL { $$ = ETCHER_TRANSITION_SINUSOIDAL; }
+ | ACCELERATE { $$ = ETCHER_TRANSITION_ACCELERATE; }
+ | DECELERATE { $$ = ETCHER_TRANSITION_DECELERATE; }
+ ;
+
+program_target: TARGET COLON STRING SEMICOLON {
+ printf("targeting %s\n", $3);
+ }
+ ;
+
+program_after: AFTER COLON STRING SEMICOLON {
+ printf("after %s\n", $3);
+ }
+ ;
+
statement: STRING
|
;
-------------------------------------------------------
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