Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : proto

Dir     : e17/proto/edje_cc


Modified Files:
        edje.l edje.y 


Log Message:
collections, groups and cpp comments

===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.l,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- edje.l      8 Sep 2004 02:21:09 -0000       1.11
+++ edje.l      8 Sep 2004 02:42:29 -0000       1.12
@@ -130,6 +130,8 @@
 \"                 { KEYWORD_RETURN(QUOTE); }
 [ \t]+              { WHITE_SPACE(); }
 \n                  { NEW_LINE(); }
+
+\/\/                           { CPP_COMMENT(); }
 #                   { CPP_COMMENT(); }
 
 .                   { CHAR_RETURN(); }
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.y,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- edje.y      8 Sep 2004 02:21:09 -0000       1.11
+++ edje.y      8 Sep 2004 02:42:29 -0000       1.12
@@ -52,7 +52,7 @@
            yyclearin;
        }
        ;
-collections:  COLLECTIONS OPEN_BRACE group CLOSE_BRACE
+collections:  COLLECTIONS OPEN_BRACE collection_statement CLOSE_BRACE
        ;
 
 fonts:  FONTS OPEN_BRACE font_statement CLOSE_BRACE
@@ -115,7 +115,7 @@
        | program_cmd program_body
        ;
 
-program_cmd: program_name
+program_cmd: name
        | program_signal
        | program_source
        | program_in
@@ -125,7 +125,7 @@
        | program_after
        ;
 
-program_name: NAME COLON STRING SEMICOLON {
+name: NAME COLON STRING SEMICOLON {
                printf("name: %s\n", $3);
        }
        ;
@@ -179,10 +179,39 @@
        }
        ;
 
-statement: STRING 
-       |
+collection_statement: group
+       | group collection_statement
        ;
-group:  statement
+
+group: GROUP OPEN_BRACE group_preamble group_body CLOSE_BRACE
+       ;
+
+group_body: data
+       | script
+       | parts
+       | programs
+       ;
+
+script:
+       ;
+
+group_preamble: group_preamble_entry
+       | group_preamble_entry group_preamble
+       ;
+
+group_preamble_entry: name
+       | min
+       | max
+       ;
+
+min: MIN COLON FLOAT FLOAT SEMICOLON {
+               printf("min %f %f\n", $3, $4);
+       }
+       ;
+
+max: MAX COLON FLOAT FLOAT SEMICOLON {
+               printf("max %f %f\n", $3, $4);
+       }
        ;
 
 %%




-------------------------------------------------------
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

Reply via email to