Enlightenment CVS committal
Author : dj2
Project : e17
Module : proto
Dir : e17/proto/edje_cc
Modified Files:
edje.l edje.y
Log Message:
images block should work
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.l,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje.l 8 Sep 2004 00:15:45 -0000 1.4
+++ edje.l 8 Sep 2004 00:32:56 -0000 1.5
@@ -58,6 +58,7 @@
color2 { KEYWORD_RETURN(COLOR2); }
color3 { KEYWORD_RETURN(COLOR3); }
color_class { KEYWORD_RETURN(COLOR_CLASS); }
+COMP { KEYWORD_RETURN(COMP); }
confine { KEYWORD_RETURN(CONFINE); }
data { KEYWORD_RETURN(DATA); }
description { KEYWORD_RETURN(DESCRIPTION); }
@@ -72,6 +73,7 @@
images { KEYWORD_RETURN(IMAGES); }
in { KEYWORD_RETURN(IN); }
item { KEYWORD_RETURN(ITEM); }
+LOSSY { KEYWORD_RETURN(LOSSY); }
max { KEYWORD_RETURN(MAX); }
min { KEYWORD_RETURN(MIN); }
mouse_events { KEYWORD_RETURN(MOUSE_EVENTS); }
@@ -83,6 +85,7 @@
parts { KEYWORD_RETURN(PARTS); }
program { KEYWORD_RETURN(PROGRAM); }
programs { KEYWORD_RETURN(PROGRAMS); }
+RAW { KEYWORD_RETURN(RAW); }
rel1 { KEYWORD_RETURN(REL1); }
rel2 { KEYWORD_RETURN(REL2); }
relative { KEYWORD_RETURN(RELATIVE); }
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.y,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- edje.y 8 Sep 2004 00:12:02 -0000 1.4
+++ edje.y 8 Sep 2004 00:32:56 -0000 1.5
@@ -25,10 +25,10 @@
%token REL1 REL2 RELATIVE REPEAT_EVENTS SCRIPT SIGNAL SIZE
%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
+%token OPEN_BRACE CLOSE_BRACE RAW COMP LOSSY
%token COLON QUOTE SEMICOLON
-%type <string> STRING
+%type <string> STRING lossless_type lossy_type
%type <val> FLOAT
%%
@@ -49,8 +49,27 @@
;
fonts: FONTS OPEN_BRACE statement CLOSE_BRACE
;
-images: IMAGES OPEN_BRACE statement CLOSE_BRACE
+images: IMAGES OPEN_BRACE image_statement CLOSE_BRACE
;
+
+image_statement: image
+ | image image_statement
+ ;
+
+image: IMAGE COLON QUOTE STRING QUOTE lossless_type SEMICOLON {
+ printf("got image '%s' of type %s\n", $4, $6);
+ }
+ | IMAGE COLON QUOTE STRING QUOTE lossy_type FLOAT SEMICOLON {
+ printf("got image '%s' of type %s (%f)\n", $4, $6, $7);
+ }
+ ;
+
+lossy_type: LOSSY { $$ = strdup("lossy"); }
+
+lossless_type: RAW { $$ = strdup("raw"); }
+ | COMP { $$ = strdup("comp"); }
+ ;
+
data: DATA OPEN_BRACE data_statement CLOSE_BRACE
;
-------------------------------------------------------
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