Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : proto

Dir     : e17/proto/edje_cc


Modified Files:
        edje.l edje.y 


Log Message:
- better string handling
- font handling

===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.l,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje.l      8 Sep 2004 00:41:44 -0000       1.6
+++ edje.l      8 Sep 2004 01:23:03 -0000       1.7
@@ -26,8 +26,11 @@
     #define VAL_RETURN(x)   col += yyleng; \
                             if (!comment) return (x);
 
-    #define STRING_RETURN() yylval.string = (char *)malloc(yyleng + 1); \
-                            strcpy(yylval.string, yytext); \
+    #define STRING_RETURN() yylval.string = (char *)malloc(yyleng - 1); \
+                            { \
+                                char *c = yytext; \
+                                strncpy(yylval.string, ++c, yyleng - 2); \
+                            } \
                             VAL_RETURN(STRING);
 
     #define FLOAT_RETURN()  yylval.val = atof(yytext); \
@@ -43,8 +46,6 @@
 fractional_constant ([0-9]*"."[0-9]+)|([0-9]+".")
 floating_constant 
((({start_part}{fractional_constant}{exponent_part}?)|({start_part}[0-9]+{exponent_part}))[FfLl]?)|({start_part}[0-9][0-9]*)
 
-string [a-zA-Z_][a-zA-Z_0-9.]*
-
 %%
 action                         { KEYWORD_RETURN(ACTION); }
 after                          { KEYWORD_RETURN(AFTER); }
@@ -109,7 +110,7 @@
 visible                                { KEYWORD_RETURN(VISIBLE); }
 x                                      { KEYWORD_RETURN(X); }
 y                                      { KEYWORD_RETURN(Y); }
-{string}            { STRING_RETURN(); }
+\"[^\"]*\"            { STRING_RETURN(); }
 {floating_constant} { FLOAT_RETURN(); }
 \}                  { KEYWORD_RETURN(CLOSE_BRACE); }
 \{                  { KEYWORD_RETURN(OPEN_BRACE); }
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.y,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- edje.y      8 Sep 2004 00:41:44 -0000       1.6
+++ edje.y      8 Sep 2004 01:23:03 -0000       1.7
@@ -55,8 +55,8 @@
        | font font_statement
        ;
 
-font: FONT COLON QUOTE STRING QUOTE QUOTE STRING QUOTE SEMICOLON {
-               printf("got font '%s' named (%s)\n", $4, $7);
+font: FONT COLON STRING STRING SEMICOLON {
+               printf("got font '%s' named (%s)\n", $3, $4);
        }
        ;
 
@@ -67,11 +67,11 @@
        | image image_statement
        ;
 
-image: IMAGE COLON QUOTE STRING QUOTE lossless_type SEMICOLON {
-               printf("got image '%s' of type %s\n", $4, $6);
+image: IMAGE COLON STRING lossless_type SEMICOLON {
+               printf("got image '%s' of type %s\n", $3, $4);
        }
-       | IMAGE COLON QUOTE STRING QUOTE lossy_type FLOAT SEMICOLON {
-               printf("got image '%s' of type %s (%f)\n", $4, $6, $7);
+       | IMAGE COLON STRING lossy_type FLOAT SEMICOLON {
+               printf("got image '%s' of type %s (%f)\n", $3, $4, $5);
        }
        ;
 
@@ -88,8 +88,8 @@
        | item data_statement
        ;
 
-item: ITEM COLON QUOTE STRING QUOTE QUOTE STRING QUOTE SEMICOLON {
-               printf("got item %s :: %s\n", $4, $7);
+item: ITEM COLON STRING STRING SEMICOLON {
+               printf("got item %s :: %s\n", $3, $4);
        }
        ;
 
@@ -98,6 +98,7 @@
        ;
 group:  statement 
        ;
+
 %%
 
 void yyerror(const char *str) {




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