Enlightenment CVS committal

Author  : dj2
Project : e17
Module  : proto

Dir     : e17/proto/edje_cc


Modified Files:
        Etcher.h edje.y etcher_out.c etcher_parse.c 


Log Message:
handle item: "foo" 1;

===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/Etcher.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Etcher.h    9 Sep 2004 13:55:55 -0000       1.9
+++ Etcher.h    12 Sep 2004 13:40:43 -0000      1.10
@@ -96,6 +96,7 @@
 {
   char *key;
   char *value;
+  int int_value;
 };
 
 struct _Etcher_Image
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/edje.y,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- edje.y      11 Sep 2004 02:37:16 -0000      1.26
+++ edje.y      12 Sep 2004 13:40:43 -0000      1.27
@@ -118,14 +118,27 @@
        | item data_statement
        ;
 
-item: ITEM  COLON STRING STRING SEMICOLON {
+item: ITEM COLON STRING STRING SEMICOLON {
                 switch (section)
                 {
                   case BASE:
-                    etcher_parse_data($3, $4);
+                    etcher_parse_data($3, $4, 0);
                     break;
                   case GROUP:
-                    etcher_parse_group_data($3, $4);
+                    etcher_parse_group_data($3, $4, 0);
+                    break;
+                  default:
+                    break;
+                }
+       }
+       | ITEM COLON STRING exp SEMICOLON {
+                switch (section)
+                {
+                  case BASE:
+                    etcher_parse_data($3, NULL, (int)$4);
+                    break;
+                  case GROUP:
+                    etcher_parse_group_data($3, NULL, (int)$4);
                     break;
                   default:
                     break;
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/etcher_out.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etcher_out.c        10 Sep 2004 20:44:41 -0000      1.5
+++ etcher_out.c        12 Sep 2004 13:40:43 -0000      1.6
@@ -158,8 +158,12 @@
     Etcher_Data *data = l->data;
     if (data)
     {
+      if (data->value)
         etcher_out_data(out, "item", "\"%s\" \"%s\"",
                 data->key, data->value);
+      else
+        etcher_out_data(out, "item", "\"%s\" %d",
+                data->key, data->int_value);
     }
   }
   etcher_out_end(out);
@@ -202,8 +206,13 @@
       Etcher_Data *data = l->data;
       if (data)
       {
+        if (data->value)
           etcher_out_data(out, "item", "\"%s\" \"%s\"",
-                  data->key, data->value);
+                    data->key, data->value);
+        else
+          etcher_out_data(out, "item", "\"%s\" %d",
+                    data->key, data->int_value);
+               
       }
     }
     etcher_out_end(out);
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/edje_cc/etcher_parse.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etcher_parse.c      9 Sep 2004 16:03:56 -0000       1.5
+++ etcher_parse.c      12 Sep 2004 13:40:43 -0000      1.6
@@ -38,13 +38,19 @@
 }
 
 void
-etcher_parse_data(char *key, char *value)
+etcher_parse_data(char *key, char *value, int val)
 {
   Etcher_Data *data;
 
   data = (Etcher_Data *)calloc(1, sizeof(Etcher_Data));
   data->key = (char *)strdup(key);
-  data->value = (char *)strdup(value);
+
+  if (value)
+    data->value = (char *)strdup(value);
+  else {
+    data->value = NULL;
+       data->int_value = val;
+  }
 
   etcher_file->data = evas_list_append(etcher_file->data, data);
   return;
@@ -65,7 +71,7 @@
 }
 
 void
-etcher_parse_group_data(char *key, char *value)
+etcher_parse_group_data(char *key, char *value, int val)
 {
   Etcher_Group *group;
   Etcher_Data *data;
@@ -74,7 +80,13 @@
 
   data = (Etcher_Data *)calloc(1, sizeof(Etcher_Data));
   data->key = (char *)strdup(key);
-  data->value = (char *)strdup(value);
+
+  if (value)
+    data->value = (char *)strdup(value);
+  else {
+    data->value = NULL;
+       data->int_value = val;
+  }
 
   etcher_file->data = evas_list_append(etcher_file->data, data);
 




-------------------------------------------------------
This SF.Net email is sponsored by: YOU BE THE JUDGE. Be one of 170
Project Admins to receive an Apple iPod Mini FREE for your judgement on
who ports your project to Linux PPC the best. Sponsored by IBM. 
Deadline: Sept. 13. Go here: http://sf.net/ppc_contest.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to