X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc5f945db724984312da4c8d3905c1db7d168889..6604439f3437486f84c0e239f28b162662631127:/src/xbt/graphxml.l

diff --git a/src/xbt/graphxml.l b/src/xbt/graphxml.l
index 194efb8abb..606f0813b0 100644
--- a/src/xbt/graphxml.l
+++ b/src/xbt/graphxml.l
@@ -1,9 +1,9 @@
 /* Validating XML processor for graphxml.dtd.
- * Generated 2006/03/21 13:43:39.
+ * Generated 2006/04/22 01:36:55.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright © 1999-2005 Kristoffer Rose.  All rights reserved.
- * (Id: flexml.pl,v 1.47 2006/03/21 11:12:57 legranda Exp).
+ * (Id: flexml.pl,v 1.48 2006/03/21 13:09:12 mquinson Exp).
  * 
  * There are two, intertwined parts to this program, part A and part B.
  *
@@ -50,7 +50,7 @@
 const char rcs_graphxml_flexml_skeleton[] =
  "$" "Id: skel,v 1.28 2006/03/21 12:04:13 legranda Exp $";
 const char rcs_graphxml_flexml[] =
- "$" "Id: flexml.pl,v 1.47 2006/03/21 11:12:57 legranda Exp $";
+ "$" "Id: flexml.pl,v 1.48 2006/03/21 13:09:12 mquinson Exp $";
 
 /* ANSI headers. */
 #include <unistd.h>
@@ -66,15 +66,19 @@ const char rcs_graphxml_flexml[] =
 
 /* XML processor api. */
 /* FleXML-provided data. */
-const char* pcdata;
+const char* graphxml_pcdata;
 AT_graphxml_node_name A_graphxml_node_name;
 AT_graphxml_edge_source A_graphxml_edge_source;
-AT_graphxml_edge_isDirected A_graphxml_edge_isDirected;
+AT_graphxml_node_position_y A_graphxml_node_position_y;
+AT_graphxml_node_position_x A_graphxml_node_position_x;
+AT_graphxml_edge_data A_graphxml_edge_data;
 AT_graphxml_edge_target A_graphxml_edge_target;
+AT_graphxml_graph_isDirected A_graphxml_graph_isDirected;
 AT_graphxml_node_label A_graphxml_node_label;
+AT_graphxml_node_data A_graphxml_node_data;
 AT_graphxml_edge_label A_graphxml_edge_label;
-AT_graphxml_edge_name A_graphxml_edge_name;
 AT_graphxml_edge_length A_graphxml_edge_length;
+AT_graphxml_edge_name A_graphxml_edge_name;
 
 /* XML state. */
 #ifdef FLEX_DEBUG
@@ -103,7 +107,7 @@ static void cleanup(void);
 #define CLEANUP  cleanup()
 
 /* Text buffer stack handling. */
-char bufferstack[FLEXML_BUFFERSTACKSIZE];
+static char bufferstack[FLEXML_BUFFERSTACKSIZE];
 static char* limit = bufferstack + FLEXML_BUFFERSTACKSIZE;
 typedef struct BufferLast_s {
   struct BufferLast_s *old; char* saved; char new1[1];
@@ -288,16 +292,25 @@ const char* *graphxml_statenames=NULL;
 
  /* <!-- Small DTD for xbt graphs. -->  */
 
+ /*     isDirected (true|false) "true"
+  * >  */
+
 <ROOT_graphxml_graph>"<graph"{s} {
+  A_graphxml_graph_isDirected = A_graphxml_graph_isDirected_true;
   ENTER(AL_graphxml_graph);
   }
 
 <AL_graphxml_graph>{
+ "isDirected"{Eq}"'true'" |
+ "isDirected"{Eq}"\"true\"" A_graphxml_graph_isDirected = A_graphxml_graph_isDirected_true;
+ "isDirected"{Eq}"'false'" |
+ "isDirected"{Eq}"\"false\"" A_graphxml_graph_isDirected = A_graphxml_graph_isDirected_false;
+
  ">" {
-  LEAVE; STag_graphxml_graph();pcdata = NULL; ENTER(S_graphxml_graph);
+  LEAVE; STag_graphxml_graph();graphxml_pcdata = NULL; ENTER(S_graphxml_graph);
  }
  "/>" {
-  LEAVE; STag_graphxml_graph(); pcdata = NULL; ETag_graphxml_graph();
+  LEAVE; STag_graphxml_graph(); graphxml_pcdata = NULL; ETag_graphxml_graph();
   switch (YY_START) {
    case ROOT_graphxml_graph: SET(EPILOG); break;
   }
@@ -322,11 +335,17 @@ const char* *graphxml_statenames=NULL;
 
  /*     label           CDATA                ""
   *     name            CDATA                #REQUIRED
+  *     data            CDATA                ""
+  *     position_x	    CDATA		 "-1.0"
+  *     position_y	    CDATA		 "-1.0"
   * >  */
 
 <ROOT_graphxml_node,S_graphxml_graph_2,S_graphxml_graph_3,S_graphxml_graph>"<node"{s} {
   A_graphxml_node_label = NULL;
   A_graphxml_node_name = NULL;
+  A_graphxml_node_data = NULL;
+  A_graphxml_node_position_x = "-1.0";
+  A_graphxml_node_position_y = "-1.0";
   ENTER(AL_graphxml_node);
   }
 
@@ -337,13 +356,22 @@ const char* *graphxml_statenames=NULL;
  "name"{Eq}\' ENTER(VALUE1); BUFFERSET(A_graphxml_node_name);
  "name"{Eq}\" ENTER(VALUE2); BUFFERSET(A_graphxml_node_name);
 
+ "data"{Eq}\' ENTER(VALUE1); BUFFERSET(A_graphxml_node_data);
+ "data"{Eq}\" ENTER(VALUE2); BUFFERSET(A_graphxml_node_data);
+
+ "position_x"{Eq}\' ENTER(VALUE1); BUFFERSET(A_graphxml_node_position_x);
+ "position_x"{Eq}\" ENTER(VALUE2); BUFFERSET(A_graphxml_node_position_x);
+
+ "position_y"{Eq}\' ENTER(VALUE1); BUFFERSET(A_graphxml_node_position_y);
+ "position_y"{Eq}\" ENTER(VALUE2); BUFFERSET(A_graphxml_node_position_y);
+
  ">" {
   if (!A_graphxml_node_name) FAIL("Required attribute `name' not set for `node' element.");
-  LEAVE; STag_graphxml_node();pcdata = NULL; ENTER(E_graphxml_node);
+  LEAVE; STag_graphxml_node();graphxml_pcdata = NULL; ENTER(E_graphxml_node);
  }
  "/>" {
   if (!A_graphxml_node_name) FAIL("Required attribute `name' not set for `node' element.");
-  LEAVE; STag_graphxml_node(); pcdata = NULL; ETag_graphxml_node();
+  LEAVE; STag_graphxml_node(); graphxml_pcdata = NULL; ETag_graphxml_node();
   switch (YY_START) {
    case S_graphxml_graph_2: case S_graphxml_graph_3: case S_graphxml_graph: SET(S_graphxml_graph_3); break;
    case ROOT_graphxml_node: SET(EPILOG); break;
@@ -369,11 +397,11 @@ const char* *graphxml_statenames=NULL;
 }
 
  /*     label           CDATA                ""
-  *     name       CDATA        #IMPLIED
-  *     source     CDATA        #REQUIRED
-  *     target     CDATA        #REQUIRED
-  *     length     CDATA        "0.0"
-  *     isDirected (true|false) "true"
+  *     name            CDATA               #IMPLIED
+  *     source          CDATA               #REQUIRED
+  *     target          CDATA               #REQUIRED
+  *     length          CDATA               "-1.0"
+  *     data            CDATA               ""
   * >  */
 
 <ROOT_graphxml_edge,S_graphxml_graph_1,S_graphxml_graph_3,S_graphxml_graph_5,S_graphxml_graph_4,S_graphxml_graph>"<edge"{s} {
@@ -381,8 +409,8 @@ const char* *graphxml_statenames=NULL;
   A_graphxml_edge_name = NULL;
   A_graphxml_edge_source = NULL;
   A_graphxml_edge_target = NULL;
-  A_graphxml_edge_length = "0.0";
-  A_graphxml_edge_isDirected = A_graphxml_edge_isDirected_true;
+  A_graphxml_edge_length = "-1.0";
+  A_graphxml_edge_data = NULL;
   ENTER(AL_graphxml_edge);
   }
 
@@ -402,20 +430,18 @@ const char* *graphxml_statenames=NULL;
  "length"{Eq}\' ENTER(VALUE1); BUFFERSET(A_graphxml_edge_length);
  "length"{Eq}\" ENTER(VALUE2); BUFFERSET(A_graphxml_edge_length);
 
- "isDirected"{Eq}"'true'" |
- "isDirected"{Eq}"\"true\"" A_graphxml_edge_isDirected = A_graphxml_edge_isDirected_true;
- "isDirected"{Eq}"'false'" |
- "isDirected"{Eq}"\"false\"" A_graphxml_edge_isDirected = A_graphxml_edge_isDirected_false;
+ "data"{Eq}\' ENTER(VALUE1); BUFFERSET(A_graphxml_edge_data);
+ "data"{Eq}\" ENTER(VALUE2); BUFFERSET(A_graphxml_edge_data);
 
  ">" {
   if (!A_graphxml_edge_source) FAIL("Required attribute `source' not set for `edge' element.");
   if (!A_graphxml_edge_target) FAIL("Required attribute `target' not set for `edge' element.");
-  LEAVE; STag_graphxml_edge();pcdata = NULL; ENTER(E_graphxml_edge);
+  LEAVE; STag_graphxml_edge();graphxml_pcdata = NULL; ENTER(E_graphxml_edge);
  }
  "/>" {
   if (!A_graphxml_edge_source) FAIL("Required attribute `source' not set for `edge' element.");
   if (!A_graphxml_edge_target) FAIL("Required attribute `target' not set for `edge' element.");
-  LEAVE; STag_graphxml_edge(); pcdata = NULL; ETag_graphxml_edge();
+  LEAVE; STag_graphxml_edge(); graphxml_pcdata = NULL; ETag_graphxml_edge();
   switch (YY_START) {
    case S_graphxml_graph_1: case S_graphxml_graph_3: case S_graphxml_graph_5: case S_graphxml_graph_4: case S_graphxml_graph: SET(S_graphxml_graph_5); break;
    case ROOT_graphxml_edge: SET(EPILOG); break;