Regenerate all flexml parsers with 1.9.6-4

[simgrid.git] / src / xbt / graphxml.c

diff --git a/src/xbt/graphxml.c b/src/xbt/graphxml.c
index 71b4db0..3a9aa36 100644 (file)
--- a/src/xbt/graphxml.c
+++ b/src/xbt/graphxml.c
@@ -52,7 +52,7 @@
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,

- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types. 

  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
  */
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1


@@ -69,7 +69,7 @@ typedef uint32_t flex_uint32_t;
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
 typedef int flex_int32_t;

-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t; 

 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
 


@@ -111,15 +111,15 @@ typedef unsigned int flex_uint32_t;
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 

-#else  /* ! __cplusplus */
+#else  /* ! __cplusplus */

 
 /* C99 requires __STDC__ to be defined as 1. */
 #if defined (__STDC__)
 
 #define YY_USE_CONST
 
 
 /* C99 requires __STDC__ to be defined as 1. */
 #if defined (__STDC__)
 
 #define YY_USE_CONST
 

-#endif  /* defined (__STDC__) */
-#endif  /* ! __cplusplus */
+#endif /* defined (__STDC__) */
+#endif /* ! __cplusplus */

 
 #ifdef YY_USE_CONST
 #define yyconst const
 
 #ifdef YY_USE_CONST
 #define yyconst const


@@ -195,14 +195,14 @@ extern FILE *xbt_graph_parse_in, *xbt_graph_parse_out;
 
     /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
      *       access to the local variable yy_act. Since yyless() is a macro, it would break
 
     /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
      *       access to the local variable yy_act. Since yyless() is a macro, it would break

-     *       existing scanners that call yyless() from OUTSIDE xbt_graph_parse_lex.
+     *       existing scanners that call yyless() from OUTSIDE xbt_graph_parse_lex. 

      *       One obvious solution it to make yy_act a global. I tried that, and saw
      *       a 5% performance hit in a non-xbt_graph_parse_lineno scanner, because yy_act is
      *       One obvious solution it to make yy_act a global. I tried that, and saw
      *       a 5% performance hit in a non-xbt_graph_parse_lineno scanner, because yy_act is

-     *       normally declared as a register variable-- so it is not worth it.
+     *       normally declared as a variable-- so it is not worth it.

      */
     #define  YY_LESS_LINENO(n) \
             do { \
      */
     #define  YY_LESS_LINENO(n) \
             do { \

-                int yyl;\
+                unsigned int yyl;\

                 for ( yyl = n; yyl < xbt_graph_parse_leng; ++yyl )\
                     if ( xbt_graph_parse_text[yyl] == '\n' )\
                         --xbt_graph_parse_lineno;\
                 for ( yyl = n; yyl < xbt_graph_parse_leng; ++yyl )\
                     if ( xbt_graph_parse_text[yyl] == '\n' )\
                         --xbt_graph_parse_lineno;\


@@ -214,86 +214,86 @@ extern FILE *xbt_graph_parse_in, *xbt_graph_parse_out;
                     if ( *p == '\n' )\
                         --xbt_graph_parse_lineno;\
             }while(0)
                     if ( *p == '\n' )\
                         --xbt_graph_parse_lineno;\
             }while(0)

-
+    

 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \

-  do \
-    { \
-    /* Undo effects of setting up xbt_graph_parse_text. */ \
+       do \
+               { \
+               /* Undo effects of setting up xbt_graph_parse_text. */ \

         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\

-    *yy_cp = (yy_hold_char); \
-    YY_RESTORE_YY_MORE_OFFSET \
-    (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-    YY_DO_BEFORE_ACTION; /* set up xbt_graph_parse_text again */ \
-    } \
-  while ( 0 )
+               *yy_cp = (yy_hold_char); \
+               YY_RESTORE_YY_MORE_OFFSET \
+               (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+               YY_DO_BEFORE_ACTION; /* set up xbt_graph_parse_text again */ \
+               } \
+       while ( 0 )

 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state

-  {
-  FILE *yy_input_file;
-
-  char *yy_ch_buf;    /* input buffer */
-  char *yy_buf_pos;    /* current position in input buffer */
-
-  /* Size of input buffer in bytes, not including room for EOB
-   * characters.
-   */
-  yy_size_t yy_buf_size;
-
-  /* Number of characters read into yy_ch_buf, not including EOB
-   * characters.
-   */
-  yy_size_t yy_n_chars;
-
-  /* Whether we "own" the buffer - i.e., we know we created it,
-   * and can realloc() it to grow it, and should free() it to
-   * delete it.
-   */
-  int yy_is_our_buffer;
-
-  /* Whether this is an "interactive" input source; if so, and
-   * if we're using stdio for input, then we want to use getc()
-   * instead of fread(), to make sure we stop fetching input after
-   * each newline.
-   */
-  int yy_is_interactive;
-
-  /* Whether we're considered to be at the beginning of a line.
-   * If so, '^' rules will be active on the next match, otherwise
-   * not.
-   */
-  int yy_at_bol;
+       {
+       FILE *yy_input_file;
+
+       char *yy_ch_buf;                /* input buffer */
+       char *yy_buf_pos;               /* current position in input buffer */
+
+       /* Size of input buffer in bytes, not including room for EOB
+        * characters.
+        */
+       yy_size_t yy_buf_size;
+
+       /* Number of characters read into yy_ch_buf, not including EOB
+        * characters.
+        */
+       yy_size_t yy_n_chars;
+
+       /* Whether we "own" the buffer - i.e., we know we created it,
+        * and can realloc() it to grow it, and should free() it to
+        * delete it.
+        */
+       int yy_is_our_buffer;
+
+       /* Whether this is an "interactive" input source; if so, and
+        * if we're using stdio for input, then we want to use getc()
+        * instead of fread(), to make sure we stop fetching input after
+        * each newline.
+        */
+       int yy_is_interactive;
+
+       /* Whether we're considered to be at the beginning of a line.
+        * If so, '^' rules will be active on the next match, otherwise
+        * not.
+        */
+       int yy_at_bol;

 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */

+    
+       /* Whether to try to fill the input buffer when we reach the
+        * end of it.
+        */
+       int yy_fill_buffer;

 
 

-  /* Whether to try to fill the input buffer when we reach the
-   * end of it.
-   */
-  int yy_fill_buffer;
-
-  int yy_buffer_status;
+       int yy_buffer_status;

 
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1
 
 #define YY_BUFFER_NEW 0
 #define YY_BUFFER_NORMAL 1

-  /* When an EOF's been seen but there's still some text to process
-   * then we mark the buffer as YY_EOF_PENDING, to indicate that we
-   * shouldn't try reading from the input source any more.  We might
-   * still have a bunch of tokens to match, though, because of
-   * possible backing-up.
-   *
-   * When we actually see the EOF, we change the status to "new"
-   * (via xbt_graph_parse_restart()), so that the user can continue scanning by
-   * just pointing xbt_graph_parse_in at a new input file.
-   */
+       /* When an EOF's been seen but there's still some text to process
+        * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+        * shouldn't try reading from the input source any more.  We might
+        * still have a bunch of tokens to match, though, because of
+        * possible backing-up.
+        *
+        * When we actually see the EOF, we change the status to "new"
+        * (via xbt_graph_parse_restart()), so that the user can continue scanning by
+        * just pointing xbt_graph_parse_in at a new input file.
+        */

 #define YY_BUFFER_EOF_PENDING 2
 
 #define YY_BUFFER_EOF_PENDING 2
 

-  };
+       };

 #endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
 /* Stack of input buffers. */
 #endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
 /* Stack of input buffers. */


@@ -318,13 +318,13 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when xbt_graph_parse_text is formed. */
 static char yy_hold_char;
 
 /* yy_hold_char holds the character lost when xbt_graph_parse_text is formed. */
 static char yy_hold_char;

-static yy_size_t yy_n_chars;    /* number of characters read into yy_ch_buf */
+static yy_size_t yy_n_chars;           /* number of characters read into yy_ch_buf */

 yy_size_t xbt_graph_parse_leng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
 yy_size_t xbt_graph_parse_leng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;

-static int yy_init = 0;    /* whether we need to initialize */
-static int yy_start = 0;  /* start state number */
+static int yy_init = 0;                /* whether we need to initialize */
+static int yy_start = 0;       /* start state number */

 
 /* Flag which is used to allow xbt_graph_parse_wrap()'s to do buffer switches
  * instead of setting up a fresh xbt_graph_parse_in.  A bit of a hack ...
 
 /* Flag which is used to allow xbt_graph_parse_wrap()'s to do buffer switches
  * instead of setting up a fresh xbt_graph_parse_in.  A bit of a hack ...


@@ -356,24 +356,24 @@ void xbt_graph_parse_free (void *  );
 #define yy_new_buffer xbt_graph_parse__create_buffer
 
 #define yy_set_interactive(is_interactive) \
 #define yy_new_buffer xbt_graph_parse__create_buffer
 
 #define yy_set_interactive(is_interactive) \

-  { \
-  if ( ! YY_CURRENT_BUFFER ){ \
+       { \
+       if ( ! YY_CURRENT_BUFFER ){ \

         xbt_graph_parse_ensure_buffer_stack (); \
         xbt_graph_parse_ensure_buffer_stack (); \

-    YY_CURRENT_BUFFER_LVALUE =    \
+               YY_CURRENT_BUFFER_LVALUE =    \

             xbt_graph_parse__create_buffer(xbt_graph_parse_in,YY_BUF_SIZE ); \
             xbt_graph_parse__create_buffer(xbt_graph_parse_in,YY_BUF_SIZE ); \

-  } \
-  YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
-  }
+       } \
+       YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+       }

 
 #define yy_set_bol(at_bol) \
 
 #define yy_set_bol(at_bol) \

-  { \
-  if ( ! YY_CURRENT_BUFFER ){\
+       { \
+       if ( ! YY_CURRENT_BUFFER ){\

         xbt_graph_parse_ensure_buffer_stack (); \
         xbt_graph_parse_ensure_buffer_stack (); \

-    YY_CURRENT_BUFFER_LVALUE =    \
+               YY_CURRENT_BUFFER_LVALUE =    \

             xbt_graph_parse__create_buffer(xbt_graph_parse_in,YY_BUF_SIZE ); \
             xbt_graph_parse__create_buffer(xbt_graph_parse_in,YY_BUF_SIZE ); \

-  } \
-  YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
-  }
+       } \
+       YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+       }

 
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
 
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 


@@ -404,21 +404,21 @@ static void yy_fatal_error (yyconst char msg[]  );
  * corresponding action - sets up xbt_graph_parse_text.
  */
 #define YY_DO_BEFORE_ACTION \
  * corresponding action - sets up xbt_graph_parse_text.
  */
 #define YY_DO_BEFORE_ACTION \

-  (yytext_ptr) = yy_bp; \
-  xbt_graph_parse_leng = (size_t) (yy_cp - yy_bp); \
-  (yy_hold_char) = *yy_cp; \
-  *yy_cp = '\0'; \
-  (yy_c_buf_p) = yy_cp;
+       (yytext_ptr) = yy_bp; \
+       xbt_graph_parse_leng = (size_t) (yy_cp - yy_bp); \
+       (yy_hold_char) = *yy_cp; \
+       *yy_cp = '\0'; \
+       (yy_c_buf_p) = yy_cp;

 
 #define YY_NUM_RULES 92
 #define YY_END_OF_BUFFER 93
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
 
 #define YY_NUM_RULES 92
 #define YY_END_OF_BUFFER 93
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info

-  {
-  flex_int32_t yy_verify;
-  flex_int32_t yy_nxt;
-  };
+       {
+       flex_int32_t yy_verify;
+       flex_int32_t yy_nxt;
+       };

 static yyconst flex_int16_t yy_accept[564] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 static yyconst flex_int16_t yy_accept[564] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,


@@ -428,49 +428,49 @@ static yyconst flex_int16_t yy_accept[564] =
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
        93,   91,   17,   10,   10,   17,   17,   71,   10,   71,
         5,    6,    5,    8,    9,    8,   87,   79,   80,   88,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
        93,   91,   17,   10,   10,   17,   17,   71,   10,   71,
         5,    6,    5,    8,    9,    8,   87,   79,   80,   88,

-       85,   88,   86,   90,   79,   80,   90,   91,   26,   10,
-       26,   26,   26,   24,   26,   30,   10,   30,   30,   91,
-       91,   30,   91,   45,   10,   45,   45,   45,   43,   45,
+       85,   88,   86,   90,   79,   80,   90,   91,   34,   10,
+       34,   34,   34,   32,   34,   34,   34,   34,   34,   38,
+       10,   38,   91,   47,   10,   47,   47,   47,   45,   47,

 
 

-       45,   45,   45,   49,   10,   49,   91,   66,   10,   66,
-       66,   66,   64,   66,   66,   66,   66,   66,   70,   10,
+       51,   10,   51,   51,   91,   91,   51,   91,   66,   10,
+       66,   66,   66,   64,   66,   66,   66,   66,   70,   10,

        70,   88,   87,   10,    0,    2,    2,    0,    4,    7,
        70,   88,   87,   10,    0,    2,    2,    0,    4,    7,

-       82,   81,    0,    0,    0,    0,    0,    0,    0,   25,
-       27,   27,    0,    0,    0,    0,    0,    0,   44,   46,
-       46,   46,   46,   46,    0,   65,   67,   67,   67,   67,
+       82,   81,    0,    0,    0,    0,    0,    0,    0,   33,
+       35,   35,   35,   35,   35,   35,   35,    0,    0,   46,
+       48,   48,    0,    0,    0,    0,    0,   65,   67,   67,

        67,   67,   67,    0,    0,    0,    0,    0,    0,    0,
         3,    0,    0,    0,    0,    0,    0,    0,   89,    0,
        67,   67,   67,    0,    0,    0,    0,    0,    0,    0,
         3,    0,    0,    0,    0,    0,    0,    0,   89,    0,

-       27,    0,    0,    0,    0,    0,    0,    0,   46,   46,
-       46,   46,    0,    0,   67,   67,   67,   67,   67,   67,
+       35,   35,   35,   35,   35,   35,    0,    0,    0,   48,
+        0,    0,    0,    0,    0,    0,   67,   67,   67,   67,

 
         0,    0,    0,   84,    0,   16,    1,    0,    0,   77,
 
         0,    0,    0,   84,    0,   16,    1,    0,    0,   77,

-        0,    0,    0,   74,   73,    0,    0,   27,    0,    0,
-       29,    0,    0,    0,    0,    0,    0,   46,   46,   46,
-       46,    0,    0,   48,    0,   67,   67,   67,   67,   67,
+        0,    0,    0,   74,   73,    0,    0,   35,   35,   35,
+       35,   35,   35,    0,    0,   37,    0,    0,   48,    0,
+        0,   50,    0,    0,    0,    0,    0,   67,   67,   67,

        67,    0,    0,   69,    0,    0,    0,    0,   78,   72,
        67,    0,    0,   69,    0,    0,    0,    0,   78,   72,

-        0,    0,    0,   27,    0,   51,    0,   32,   31,   50,
-        0,    0,   46,    0,    0,   46,    0,    0,    0,   67,
-       67,    0,    0,   67,   67,    0,    0,    0,    0,    0,
-       12,    0,   75,   76,   19,   27,    0,   51,   18,   32,
-       31,   50,    0,   38,   37,    0,    0,    0,   36,   35,
-
-       46,    0,    0,   63,   62,    0,    0,   67,    0,   55,
-       54,   67,   67,    0,    0,    0,    0,    0,   11,   19,
-       27,    0,   18,    0,   34,   33,   46,    0,   47,    0,
-       53,   52,    0,    0,    0,    0,    0,    0,    0,   68,
-        0,    0,    0,    0,   27,    0,   28,   46,    0,   61,
-       60,    0,   57,   56,    0,   59,   58,    0,    0,    0,
-        0,   27,   46,   83,    0,    0,    0,   27,   46,   46,
+        0,    0,   19,    0,    0,   35,   35,    0,    0,   35,
+       35,    0,    0,   48,    0,    0,   53,   52,   18,    0,
+        0,   67,    0,    0,   67,    0,    0,    0,    0,    0,
+       12,    0,   75,   76,   19,    0,   21,   20,    0,    0,
+       35,    0,   27,   26,   35,   35,    0,   40,   48,    0,
+
+       39,   53,   52,   18,    0,   55,   54,    0,    0,    0,
+       59,   58,   67,    0,    0,    0,    0,    0,   11,    0,
+       23,   22,    0,    0,    0,    0,    0,    0,    0,   36,
+       40,   48,    0,   39,    0,   57,   56,   67,    0,   68,
+        0,    0,    0,    0,    0,   25,   24,    0,   29,   28,
+        0,   31,   30,   48,    0,   49,   67,    0,    0,    0,
+        0,   48,   67,   83,    0,    0,    0,   48,   67,   67,

         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,

-       40,   39,    0,   42,   41,    0,    0,    0,    0,    0,
+       61,   60,    0,   63,   62,    0,    0,    0,    0,    0,

 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,

-        0,    0,    0,   12,    0,   12,    0,    0,   21,    0,
-       20,    0,    0,    0,    0,    0,    0,    0,   23,   22,
+        0,    0,    0,   12,    0,   12,    0,    0,   42,    0,
+       41,    0,    0,    0,    0,    0,    0,    0,   44,   43,

         0,    0,    0,    0,    0,    0,    0,   11,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,   11,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,


@@ -481,8 +481,8 @@ static yyconst flex_int16_t yy_accept[564] =
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,

-        0,    0,    0,    0,    0,    0,   14,    0,    0,   15,
-        0,   13,    0
+        0,    0,    0,    0,    0,    0,   13,    0,    0,   15,
+        0,   14,    0

     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =


@@ -531,69 +531,69 @@ static yyconst flex_int16_t yy_base[594] =
     {   0,
         0,    0,    0,    3,    6,    9,   24,   27,   11,   14,
        15,   17,   29,   38,   45,   52,   59,   61,   67,   70,
     {   0,
         0,    0,    0,    3,    6,    9,   24,   27,   11,   14,
        15,   17,   29,   38,   45,   52,   59,   61,   67,   70,

-       93,  135,   73,   76,  111,  114,  117,  153,  156,  159,
-      176,  179,  182,  185,  200,  203,  206,  209,  225,    0,
-      279,  282,  285,  288,  304,    0,  358,  361,  363,  365,
-     1585, 1586, 1586,  380,  383,   47,   62, 1586,  386,  171,
-     1586, 1586, 1574, 1586, 1586, 1565, 1586, 1578, 1578,  365,
-     1586, 1586, 1586, 1586, 1576, 1576, 1546,  375, 1586,  389,
-     1559,    0,  195, 1586, 1526, 1586,  398,  391,  399,  402,
-      411,  414,  393, 1586,  420, 1557,    0,  401, 1586, 1540,
-
-     1539, 1538, 1525, 1586,  458,  422,  427, 1586,  464, 1552,
-        0,  409, 1586, 1535,    1, 1534, 1521, 1532, 1586,  467,
-      438, 1560, 1532,  470,   34, 1509, 1586, 1552, 1543, 1586,
-     1586, 1586,   69,   40, 1509, 1508, 1506, 1539, 1507, 1586,
-        0, 1532, 1514, 1516, 1503, 1505, 1504, 1512, 1586,    0,
-     1497, 1512, 1502, 1495, 1499, 1586,    0, 1492, 1507, 1496,
-     1496, 1487, 1489, 1499, 1505, 1517, 1516, 1523,  108, 1488,
-     1586,   75,    0, 1484, 1484, 1514, 1513, 1481, 1586, 1492,
-     1483,  473,  476, 1484, 1489, 1485, 1484, 1480, 1485, 1480,
-     1479, 1474,  479,  482, 1481, 1476, 1473, 1474, 1462, 1470,
-
-      485,  502, 1487, 1586, 1490, 1586, 1586,  110, 1464, 1586,
-     1491, 1490, 1454, 1586, 1586, 1452, 1455, 1452,  505,  508,
-     1586,  511, 1462, 1452, 1460, 1459, 1458,  514, 1452,  530,
-     1443,  533,  538, 1586,  546,  550, 1450, 1373,  555, 1387,
-     1375,  558,  566, 1586,  571, 1387,  435,  575, 1586, 1586,
-     1392, 1389, 1356, 1354,  578,  583, 1346,  588,  595,  598,
-      601,  604,  612,  617,  624, 1263,  620,  633,  637,  645,
-     1263,  649,  661, 1264, 1250,  653, 1280,  472, 1280,  657,
-     1586, 1279, 1586, 1586,  670, 1260,  674,  677,  680,  683,
-      686,  694,  697, 1586, 1586,  705,  710,  721, 1586, 1586,
-
-     1248,  729,  732, 1586, 1586,  740,  746,  756,  759, 1586,
-     1586,  767,  772,  775, 1264,   32,  104,  153, 1586,  778,
-     1226,  783,  788,  793, 1586, 1586, 1230,  801, 1586,  804,
-     1586, 1586,  812,  818,  828,  831,  839,  844,  855, 1586,
-     1234,  146,  179,  147, 1212,  858, 1586, 1215,  861, 1586,
-     1586,  875, 1586, 1586,  883, 1586, 1586, 1111,  891,  175,
-      445, 1066,  119, 1586,  894,  181,   89,  897,  900,  903,
-      501,  360,  399,  480,  475,  919,  922,  938,  941,  949,
-      954,  506,  509,  526,  599,  624,  965,  654,  678,  973,
-     1586, 1586,  981, 1586, 1586,  417,  176,  594,  548,  989,
-
-     1058, 1003, 1016,  937,  992,  407,  995,  998, 1001, 1018,
-      930,  918,  922,  910, 1026, 1029, 1035, 1038, 1055, 1063,
-     1081, 1113,  819,  790,  733,  616,  710, 1073,  721, 1131,
-      748,  284, 1149, 1181,  557,  565,  458,  449,  537,  770,
-      676,  805,  278,  369,  285,  291, 1076,  293, 1586,  211,
-     1586,  708,  693,  727,  162,  110,   76, 1105, 1586, 1586,
-      352,  735,  794,    5,  199,  820,  474, 1586, 1144,  850,
-     1173, 1199, 1207, 1212,  591,  754, 1220,  799,  831,  749,
-      833,  834,  848,  862,  897,  684,  791,  900,  912,  895,
-      901,  483,  808,  920,  930,  836,  890,  627,  892,  941,
-
-      962,  971,  993,  818,  873, 1005, 1007,  954,  960,  702,
-      872,  963, 1008, 1027, 1092, 1017, 1025, 1151, 1160, 1031,
-     1084, 1093, 1152, 1176, 1188, 1161, 1209, 1033, 1087, 1217,
-     1221, 1123, 1155, 1088, 1108, 1215, 1216, 1120, 1156, 1218,
-     1219, 1222, 1223, 1224, 1225, 1239, 1240, 1226, 1228, 1241,
-     1242, 1264, 1258, 1260, 1268, 1277, 1586, 1281, 1285, 1586,
-     1288, 1586, 1586, 1306, 1313, 1320, 1327, 1334, 1341, 1348,
-     1355, 1362, 1369, 1376, 1381, 1386, 1391, 1398, 1401, 1404,
-     1407, 1414, 1418, 1424, 1430, 1436, 1443, 1450, 1457, 1464,
-     1471, 1478, 1485
+       93,    0,   73,   76,  147,  150,  166,  208,  184,  187,
+      190,  226,  229,  232,  249,  252,  255,  258,  273,  276,
+      279,  282,  297,  300,  316,    0,  370,  373,  375,  377,
+     1585, 1586, 1586,  153,  156,   47,   62, 1586,  303,  244,
+     1586, 1586, 1574, 1586, 1586, 1565, 1586, 1578, 1578,  377,
+     1586, 1586, 1586, 1586, 1576, 1576, 1546,  377, 1586,  306,
+     1559,    0,  268, 1586, 1542,    1, 1541, 1528, 1539, 1586,
+      395,  382,  383, 1586,  401, 1554,    0,  292, 1586, 1521,
+
+     1586,  410,  414,  417,  405,  411,  423,  387, 1586,  435,
+     1552,    0,  422, 1586, 1535, 1534, 1533, 1520, 1586,  444,
+      448, 1560, 1532,  462,   34, 1509, 1586, 1552, 1543, 1586,
+     1586, 1586,  148,   38, 1509, 1508, 1506, 1539, 1519, 1586,
+        0, 1504, 1519, 1508, 1508, 1499, 1501, 1511, 1499, 1586,
+        0, 1524, 1506, 1496, 1498, 1497, 1505, 1586,    0, 1490,
+     1505, 1495, 1488, 1492, 1505, 1517, 1516, 1523,  178, 1488,
+     1586,   75,    0, 1484, 1484, 1514, 1513, 1481, 1586, 1486,
+     1491, 1486, 1483, 1484, 1472, 1480,  467,  470, 1485, 1476,
+      473,  476, 1483, 1479, 1478, 1474, 1479, 1474, 1473, 1468,
+
+      479,  496, 1487, 1586, 1490, 1586, 1586,  177, 1464, 1586,
+     1491, 1490, 1454, 1586, 1586, 1452, 1464,  499, 1458, 1449,
+      502, 1463, 1392,  506,  509, 1586,  518, 1382, 1370,  526,
+      529, 1586,  535, 1369, 1375, 1372, 1365,  546, 1355,  553,
+     1342,  557,  562, 1586,  569, 1288,  466,  574, 1586, 1586,
+     1295, 1293,  579,  582,  592,  586, 1266,  605,  608, 1268,
+     1253,  616, 1262, 1263,  621, 1259,  624,  627,  633,  638,
+      641,  649,  654,  658, 1237,  670, 1245,  505, 1244,  673,
+     1586, 1239, 1586, 1586,  676,  680, 1586, 1586,  690,  693,
+      701,  710, 1586, 1586,  718,  721,  725,  728, 1136,  737,
+
+      742,  745,  748,  754,  757, 1586, 1586,  765,  768,  777,
+     1586, 1586, 1097,  785, 1111,   32,  162,  226, 1586,  788,
+     1586, 1586,  796,  802,  812,  815,  823,  828,  839, 1586,
+      842, 1053,  845,  848,  852, 1586, 1586, 1030,  862, 1586,
+     1004,  219,  252,  220,  865, 1586, 1586,  873, 1586, 1586,
+      881, 1586, 1586,  943,  889, 1586,  938,  929,  892,  248,
+      390,  912,  110, 1586,  895,  204,  249,  898,  901,  917,
+      275,  372,  440,  254,  469,  920,  923,  939,  942,  950,
+      955,  478,  400,  508,  472,  522,  966,  495,  523,  974,
+     1586, 1586,  982, 1586, 1586,  595,  550,  631,  598,  990,
+
+      878,  824,  838,  761,  993,  561,  996,  999, 1002, 1019,
+      750,  723,  694,  684, 1027, 1030, 1036, 1039, 1056, 1064,
+     1082, 1114,  684,  695,  554,  516,  680, 1074,  724, 1132,
+      747,  534, 1150, 1182,  455,  486,  451,  435,  523,  746,
+      587,  767,  228,  389,  582,  305, 1077,  199, 1586,  192,
+     1586,  603,  672,  630,  156,   68,   75, 1106, 1586, 1586,
+      663,  688,  691,    5,  645,  777,  784, 1586, 1145,  810,
+     1174, 1200, 1208, 1213,  744,  820, 1221,  841,  868,  382,
+      804,  871,  888,  821,  860,  667,  778,  898,  913,  789,
+      802,  815,  870,  896,  921,  918,  932,  948,  969,  997,
+
+     1000,  972,  994,  920,  955, 1008, 1009, 1018, 1051, 1093,
+     1152, 1053, 1085, 1161, 1177,  272, 1189, 1190, 1202, 1210,
+     1211, 1035, 1153, 1215, 1217, 1162, 1225,  628,  945, 1226,
+     1227, 1075, 1088, 1109, 1110, 1156, 1222, 1124, 1223, 1224,
+     1229, 1230, 1231, 1232, 1233, 1045, 1043, 1234, 1238, 1249,
+     1254, 1274, 1262, 1255, 1281, 1284, 1586, 1287, 1291, 1586,
+     1294, 1586, 1586, 1312, 1319, 1326, 1333, 1340, 1347, 1354,
+     1361, 1368, 1375, 1382, 1387, 1392, 1397, 1404, 1407, 1410,
+     1413, 1420, 1424, 1430, 1436, 1442, 1449, 1456, 1463, 1470,
+     1477, 1484, 1491

 
     } ;
 
 
     } ;
 


@@ -601,44 +601,44 @@ static yyconst flex_int16_t yy_def[594] =
     {   0,
       564,  564,  565,  565,  565,  565,  566,  566,  567,  567,
       568,  568,  569,  569,  569,  569,  570,  570,  564,  564,
     {   0,
       564,  564,  565,  565,  565,  565,  566,  566,  567,  567,
       568,  568,  569,  569,  569,  569,  570,  570,  564,  564,

-      571,  571,  572,  572,  572,  572,  564,  564,  572,  572,
-      564,  564,  572,  572,  572,  572,  564,  564,  563,   39,
+      563,   21,  571,  571,  564,  564,  572,  572,  573,  573,
+      573,  573,  564,  564,  573,  573,  564,  564,  573,  573,

       573,  573,  564,  564,  563,   45,  574,  574,  569,  569,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
       573,  573,  564,  564,  563,   45,  574,  574,  569,  569,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,

-      563,  575,  563,  563,  575,  563,  563,  563,  563,  563,
+      563,  575,  563,  563,  575,  575,  575,  575,  575,  563,

       563,  563,  563,  563,  563,  563,  576,  563,  563,  576,
 
       563,  563,  563,  563,  563,  563,  576,  563,  563,  576,
 

-      576,  576,  576,  563,  563,  563,  563,  563,  563,  563,
-      577,  563,  563,  577,  577,  577,  577,  577,  563,  563,
+      563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
+      563,  577,  563,  563,  577,  577,  577,  577,  563,  563,

       563,  563,  563,  563,  578,  563,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
       563,  563,  563,  563,  578,  563,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,

-      575,  575,  579,  563,  563,  563,  563,  563,  563,  576,
-      576,  576,  576,  576,  580,  563,  577,  577,  577,  577,
+      575,  575,  575,  575,  575,  575,  575,  579,  563,  563,
+      576,  576,  580,  563,  563,  563,  563,  563,  577,  577,

       577,  577,  577,  581,  563,  563,  582,  563,  582,  563,
       563,  563,  583,  563,  563,  563,  563,  563,  563,  563,
       577,  577,  577,  581,  563,  563,  582,  563,  582,  563,
       563,  563,  583,  563,  563,  563,  563,  563,  563,  563,

-      575,  584,  584,  563,  563,  563,  563,  563,  576,  576,
-      576,  576,  585,  585,  577,  577,  577,  577,  577,  577,
+      575,  575,  575,  575,  575,  575,  584,  584,  563,  576,
+      585,  585,  563,  563,  563,  563,  577,  577,  577,  577,

 
       586,  586,  563,  563,  582,  563,  563,  582,  563,  563,
 
       586,  586,  563,  563,  582,  563,  563,  582,  563,  563,

-      583,  563,  563,  563,  563,  563,  563,  575,  563,  584,
-      563,  584,  563,  563,  563,  563,  563,  576,  576,  576,
-      576,  563,  585,  563,  585,  577,  577,  577,  577,  577,
+      583,  563,  563,  563,  563,  563,  563,  575,  575,  575,
+      575,  575,  575,  563,  584,  563,  584,  563,  576,  563,
+      585,  563,  585,  563,  563,  563,  563,  577,  577,  577,

       577,  563,  586,  563,  586,  563,  582,  587,  563,  563,
       577,  563,  586,  563,  586,  563,  582,  587,  563,  563,

-      563,  563,  563,  575,  584,  563,  563,  563,  563,  563,
-      563,  563,  576,  563,  563,  576,  585,  563,  563,  577,
-      577,  563,  563,  577,  577,  586,  563,  582,  587,  587,
-      563,  587,  563,  563,  563,  575,  584,  563,  563,  563,
-      563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
+      563,  563,  563,  563,  563,  575,  575,  563,  563,  575,
+      575,  584,  563,  576,  585,  563,  563,  563,  563,  563,
+      563,  577,  563,  563,  577,  586,  563,  582,  587,  587,
+      563,  587,  563,  563,  563,  563,  563,  563,  563,  563,
+      575,  563,  563,  563,  575,  575,  584,  563,  576,  585,

 
 

-      576,  585,  563,  563,  563,  563,  563,  577,  563,  563,
-      563,  577,  577,  586,  563,  582,  587,  587,  563,  563,
-      575,  584,  563,  563,  563,  563,  576,  563,  563,  563,

       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,

-      563,  582,  587,  587,  575,  563,  563,  576,  563,  563,
-      563,  563,  563,  563,  563,  563,  563,  563,  582,  587,
-      587,  575,  576,  563,  582,  587,  587,  575,  576,  576,
+      563,  563,  577,  586,  563,  582,  587,  587,  563,  563,
+      563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
+      563,  576,  585,  563,  563,  563,  563,  577,  563,  563,
+      563,  582,  587,  587,  563,  563,  563,  563,  563,  563,
+      563,  563,  563,  576,  563,  563,  577,  563,  582,  587,
+      587,  576,  577,  563,  582,  587,  587,  576,  577,  577,

       582,  582,  582,  587,  587,  563,  563,  563,  563,  563,
       563,  582,  582,  582,  587,  587,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  582,  582,  582,  587,  587,
       582,  582,  582,  587,  587,  563,  563,  563,  563,  563,
       563,  582,  582,  582,  587,  587,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  582,  582,  582,  587,  587,


@@ -672,176 +672,176 @@ static yyconst flex_int16_t yy_nxt[1642] =
       563,   54,   55,   54,   54,   55,   54,   54,   55,   54,
        54,   55,   54,   62,  563,   56,   62,   65,   56,   65,
        63,   57,  468,   63,   57,   59,   55,   59,   59,   55,
       563,   54,   55,   54,   54,   55,   54,   54,   55,   54,
        54,   55,   54,   62,  563,   56,   62,   65,   56,   65,
        63,   57,  468,   63,   57,   59,   55,   59,   59,   55,

-       59,   68,   69,   66,  159,   66,   70,   71,  160,   60,
+       59,   68,   69,   66,  143,   66,   70,   71,  144,   60,

        68,   69,   60,  168,   72,   70,   71,   68,   69,  206,
        73,  125,   70,   72,   68,   69,  169,   73,  342,   70,
        72,   75,   76,   75,   76,  126,  125,   72,   55,   55,
        68,   69,   60,  168,   72,   70,   71,   68,   69,  206,
        73,  125,   70,   72,   68,   69,  169,   73,  342,   70,
        72,   75,   76,   75,   76,  126,  125,   72,   55,   55,

-       55,   55,   55,   55,   87,   55,   87,   87,   55,   87,
-      127,  172,   78,  174,  456,   78,  175,  172,   88,  210,
-       77,   88,   77,   79,   80,   55,   80,   79,   79,   79,
-
-       79,   79,   79,   79,   81,   79,  281,   79,   83,   79,
-       84,   79,   87,   55,   87,   87,   55,   87,   55,   55,
-       55,  281,  173,   79,   79,  206,   89,  206,  464,   89,
-      375,  247,   90,  208,   85,   79,   80,   55,   80,   79,
-       79,   79,   79,   79,   79,   79,   81,   79,  343,   79,
-       83,   79,   84,   79,   55,   55,   55,   87,   55,   87,
-       87,   55,   87,  206,  281,   79,   79,  456,   90,  359,
-      281,   88,  369,  370,   88,  128,   85,   55,   55,   55,
-       55,   55,   55,   87,   55,   87,   87,   55,   87,  127,
-      344,   91,  281,  206,   91,  361,  281,   89,  281,  128,
-
-       89,   87,   55,   87,   87,   55,   87,   55,   55,   55,
-       55,   55,   55,  127,  360,   92,  206,  374,   92,  460,
-      366,   93,  406,  469,   93,   94,   95,   55,   95,   94,
-       94,   94,   94,   94,   94,   94,   96,   94,   97,   94,
-       98,   94,   99,   94,   97,   97,   97,   97,   97,   97,
-       97,   97,   97,   97,   97,   94,   94,   97,   97,   97,
-       97,  100,   97,   97,   97,   97,   97,  101,   97,  102,
-       97,  103,   97,   97,   97,   97,   97,   97,   97,   97,
-      105,   55,  105,  105,   55,  105,   55,   55,   55,   55,
-       55,   55,  443,  443,  106,  281,  282,  106,  459,  456,
-
-      107,  446,  446,  107,  108,  109,   55,  109,  108,  108,
-      108,  108,  108,  108,  108,  110,  108,  111,  108,  112,
-      108,  113,  108,  111,  111,  111,  111,  111,  111,  111,
-      111,  111,  111,  111,  108,  108,  111,  111,  111,  111,
-      114,  111,  111,  111,  111,  111,  115,  111,  116,  111,
-      111,  111,  111,  117,  118,  111,  111,  111,  111,  120,
-       55,  120,  120,   55,  120,   68,   69,   68,   69,  206,
-       70,  133,   70,  121,  456,  465,  121,  206,  122,  128,
-      122,  124,  124,  124,  124,  124,  124,  124,  124,  124,
-      124,  124,  124,  127,  123,  128,  123,  128,  134,  124,
-
-      124,  124,  143,  128,  135,  128,  128,  136,  383,  127,
-      143,  127,  137,  128,  139,  128,  206,  127,  128,  127,
-      127,  124,  124,  124,  206,  143,  128,  127,  144,  127,
-      145,  128,  127,  155,  206,  146,  144,  146,  145,  148,
-      127,  145,  128,  147,  384,  127,  146,  416,  144,  164,
-      145,  148,  206,  145,  405,  147,  127,  451,  147,  124,
-      124,  124,  281,  278,  144,  124,  124,  124,  124,  124,
-      124,  124,  124,  124,  219,  219,  219,  219,  219,  219,
-      232,  232,  232,  232,  232,  232,  242,  242,  242,  206,
-      221,  206,  281,  221,  367,  450,  234,  281,  471,  234,
-
-      206,  316,  244,  242,  242,  242,  219,  219,  219,  219,
-      219,  219,  219,  219,  219,  261,  261,  261,  206,  244,
-      386,  385,  221,  206,  222,  221,  206,  235,  221,  498,
-      262,  264,  264,  264,  232,  232,  232,  382,  245,  232,
-      232,  232,  397,  206,  255,  396,  265,  232,  232,  232,
-      234,  268,  268,  268,  206,  234,  272,  272,  272,  242,
-      242,  242,  398,  234,  452,  281,  269,  242,  242,  242,
-      449,  273,  242,  242,  242,  244,  280,  280,  280,  219,
-      219,  219,  267,  244,  288,  288,  288,  408,  244,  290,
-      290,  290,  281,  282,  448,  221,  291,  291,  291,  292,
-
-      292,  292,  261,  261,  261,  293,  293,  293,  206,  294,
-      276,  206,  295,  296,  296,  296,  281,  262,  264,  264,
-      264,  232,  232,  232,  287,  298,  298,  298,  297,  299,
-      480,  407,  300,  265,  268,  268,  268,  234,  303,  303,
-      303,  281,  304,  399,  206,  305,  306,  306,  306,  269,
-      272,  272,  272,  438,  242,  242,  242,  302,  280,  280,
-      280,  307,  309,  309,  309,  273,  310,  504,  400,  311,
-      244,  320,  320,  320,  281,  219,  219,  219,  288,  288,
-      288,  323,  323,  323,  290,  290,  290,  291,  291,  291,
-      314,  221,  401,  206,  317,  292,  292,  292,  293,  293,
-
-      293,  206,  294,  454,  402,  295,  296,  296,  296,  318,
-      206,  324,  324,  324,  322,  325,  403,  492,  326,  206,
-      462,  297,  298,  298,  298,  206,  299,  206,  404,  300,
-      328,  328,  328,  303,  303,  303,  461,  304,  206,  439,
-      305,  306,  306,  306,  206,  516,  329,  330,  330,  330,
-      441,  331,  206,  443,  332,  463,  307,  333,  333,  333,
-      309,  309,  309,  466,  310,  444,  206,  311,  335,  335,
-      335,  206,  334,  337,  337,  337,  339,  339,  339,  320,
-      320,  320,  437,  336,  346,  346,  346,  206,  338,  323,
-      323,  323,  340,  481,  324,  324,  324,  486,  325,  453,
-
-      347,  326,  328,  328,  328,  330,  330,  330,  206,  331,
-      443,  206,  332,  333,  333,  333,  206,  467,  329,  349,
-      349,  349,  444,  350,  493,  206,  351,  436,  334,  335,
-      335,  335,  352,  352,  352,  206,  353,  206,  484,  354,
-      337,  337,  337,  470,  336,  355,  355,  355,  206,  356,
-      206,  206,  357,  206,  499,  338,  339,  339,  339,  346,
-      346,  346,  349,  349,  349,  206,  350,  206,  435,  351,
-      485,  510,  340,  488,  473,  347,  352,  352,  352,  206,
-      353,  487,  502,  354,  355,  355,  355,  489,  356,  206,
-      206,  357,  365,  365,  365,  365,  365,  365,  376,  376,
-
-      376,  378,  378,  378,  380,  380,  380,  206,  206,  206,
-      490,  206,  206,  377,  206,  517,  379,  206,  206,  381,
-      376,  376,  376,  387,  387,  387,  511,  388,  496,  206,
-      389,  371,  505,  372,  497,  377,  503,  206,  373,  378,
-      378,  378,  390,  390,  390,  491,  391,  206,  494,  392,
-      380,  380,  380,  500,  379,  393,  393,  393,  206,  394,
-      495,  426,  395,  501,  425,  381,  387,  387,  387,  424,
-      388,  206,  423,  389,  390,  390,  390,  206,  391,  206,
-      206,  392,  393,  393,  393,  414,  394,  506,  206,  395,
-      409,  409,  409,  415,  415,  415,  417,  417,  417,  418,
-
-      418,  418,  409,  409,  409,  410,  281,  514,  507,  206,
-      206,  508,  206,  515,  419,  281,  518,  410,  281,  420,
-      420,  420,  206,  421,  206,  206,  422,  415,  415,  415,
-      428,  428,  428,  509,  206,  281,  417,  417,  417,  418,
-      418,  418,  206,  206,  206,  512,  206,  513,  206,  413,
-      206,  412,  206,  427,  419,  281,  430,  430,  430,  522,
-      431,  519,  429,  432,  420,  420,  420,  523,  421,  534,
-      520,  422,  281,  526,  428,  428,  428,  458,  458,  458,
-      281,  279,  279,  279,  279,  279,  279,  279,  279,  279,
-      206,  411,  279,  281,  282,  279,  279,  279,  281,  279,
-
-      440,  206,  368,  528,  206,  206,  458,  458,  458,  206,
-      206,  279,  279,  279,  279,  279,  279,  279,  279,  279,
-      279,  279,  281,  535,  279,  206,  527,  279,  279,  279,
-      281,  279,  430,  430,  430,  521,  431,  206,  540,  432,
-      206,  364,  317,  279,  279,  472,  472,  472,  281,  279,
-      279,  279,  279,  279,  447,  279,  279,  279,  541,  538,
-      279,  206,  529,  279,  279,  279,  281,  279,  206,  206,
-      544,  532,  206,  206,  474,  474,  474,  206,  206,  279,
-      279,  279,  279,  279,  279,  279,  279,  279,  279,  447,
-      206,  539,  279,  206,  524,  279,  279,  279,  281,  279,
-
-      472,  472,  472,  525,  475,  206,  545,  476,  477,  477,
-      477,  279,  279,  474,  474,  474,  206,  478,  530,  533,
-      479,  477,  477,  477,  206,  482,  206,  536,  483,  206,
-      531,  537,  206,  206,  206,  206,  206,  206,  206,  206,
-      206,  206,  206,  206,  552,  206,  555,  363,  552,  362,
-      555,  542,  543,  358,  546,  547,  206,  206,  206,  206,
-      550,  551,  553,  558,  554,  556,  556,  556,  558,  559,
-      559,  559,  548,  549,  348,  206,  345,  206,  556,  556,
-      556,  557,  561,  561,  561,  560,  559,  559,  559,  561,
-      561,  561,  341,  327,  557,  321,  319,  281,  562,  315,
-
-      313,  312,  560,  308,  301,  562,   52,   52,   52,   52,
-       52,   52,   52,   53,   53,   53,   53,   53,   53,   53,
-       58,   58,   58,   58,   58,   58,   58,   61,   61,   61,
-       61,   61,   61,   61,   64,   64,   64,   64,   64,   64,
-       64,   67,   67,   67,   67,   67,   67,   67,   74,   74,
-       74,   74,   74,   74,   74,   82,   82,   82,   82,   82,
-       82,   82,   86,   86,   86,   86,   86,   86,   86,  104,
-      104,  104,  104,  104,  104,  104,  119,  119,  119,  119,
-      119,  119,  119,  141,  141,  141,  289,  141,  150,  150,
-      150,  286,  150,  157,  157,  157,  285,  157,  167,  167,
-
-      167,  167,  167,  284,  167,  182,  283,  182,  193,  277,
-      193,  201,  275,  201,  205,  205,  205,  205,  205,  205,
-      205,  211,  274,  271,  211,  220,  220,  220,  220,  220,
-      220,  233,  233,  233,  233,  233,  233,  243,  243,  243,
-      243,  243,  243,  279,  279,  279,  279,  279,  279,  279,
-      433,  433,  433,  433,  433,  433,  433,  434,  434,  434,
-      434,  434,  434,  434,  442,  442,  442,  442,  442,  442,
-      442,  445,  445,  445,  445,  445,  445,  445,  455,  455,
-      455,  455,  455,  455,  455,  457,  457,  457,  457,  457,
-      457,  457,  270,  266,  263,  260,  259,  258,  257,  256,
-
-      254,  253,  252,  251,  250,  249,  248,  206,  246,  241,
-      240,  239,  238,  237,  236,  231,  230,  229,  228,  227,
-      226,  225,  224,  223,  218,  217,  216,  215,  214,  213,
+       55,   55,   55,   55,   91,   55,   91,   91,   55,   91,
+      127,  174,   78,  456,  175,   78,  464,  172,   92,  210,
+       77,   92,   77,   79,   80,   55,   80,   79,   79,   79,
+
+       79,   79,   79,   79,   81,   79,   82,   79,   83,   79,
+       84,   79,   82,   82,   82,   82,   82,   82,   82,   82,
+       82,   82,   82,   79,   79,   82,   82,   82,   82,   85,
+       82,   82,   82,   82,   82,   86,   82,   87,   82,   82,
+       82,   82,   88,   89,   82,   82,   82,   82,   55,   55,
+       55,   55,   55,   55,  124,  124,  124,  124,  124,  124,
+      172,  456,   93,  369,  370,   93,   94,   95,   55,   95,
+       94,   94,   94,   94,   94,   94,   94,   96,   94,  281,
+       94,   98,   94,   99,   94,  102,   55,  102,  102,   55,
+      102,  102,   55,  102,  206,  206,   94,   94,  247,  103,
+
+      460,  173,  103,  208,  459,  104,  343,  100,   94,   95,
+       55,   95,   94,   94,   94,   94,   94,   94,   94,   96,
+       94,  281,   94,   98,   94,   99,   94,  102,   55,  102,
+       55,   55,   55,   55,   55,   55,  206,  281,   94,   94,
+      374,  104,  359,  281,  105,  281,  282,  105,  128,  100,
+      102,   55,  102,  102,   55,  102,   55,   55,   55,   55,
+       55,   55,  127,  344,  103,  281,  281,  103,  361,  281,
+      106,  281,  128,  106,  102,   55,  102,  102,   55,  102,
+      102,   55,  102,  102,   55,  102,  127,  360,  104,  206,
+      375,  104,  206,  366,  107,  385,  128,  107,   55,   55,
+
+       55,   55,   55,   55,  124,  124,  124,  124,  124,  124,
+      127,  382,  108,  456,  522,  108,  109,  110,   55,  110,
+      109,  109,  109,  109,  109,  109,  109,  111,  109,  112,
+      109,  113,  109,  114,  109,  112,  112,  112,  112,  112,
+      112,  112,  112,  112,  112,  112,  109,  109,  112,  112,
+      112,  112,  115,  112,  112,  112,  112,  112,  116,  112,
+      117,  112,  118,  112,  112,  112,  112,  112,  112,  112,
+      112,  120,   55,  120,  120,   55,  120,   68,   69,   68,
+       69,  128,   70,  133,   70,  121,  128,  128,  121,  206,
+      122,  128,  122,  148,  456,  127,  124,  124,  124,  206,
+
+      127,  127,  124,  124,  124,  127,  123,  281,  123,  128,
+      134,  124,  124,  124,  139,  128,  135,  206,  128,  136,
+      383,  128,  149,  127,  137,  153,  128,  128,  153,  127,
+      486,  155,  127,  397,  153,  127,  124,  124,  124,  367,
+      127,  127,  157,  451,  154,  124,  124,  124,  139,  155,
+      154,  139,  128,  154,  139,  156,  154,  206,  155,  164,
+      157,  156,  154,  124,  124,  124,  127,  156,  224,  224,
+      224,  224,  224,  224,  230,  230,  230,  230,  230,  230,
+      242,  242,  242,  206,  226,  384,  281,  226,  450,  281,
+      232,  449,  448,  232,  278,  206,  244,  242,  242,  242,
+
+      254,  254,  254,  258,  258,  258,  227,  224,  224,  224,
+      224,  224,  224,  244,  386,  255,  399,  396,  259,  224,
+      224,  224,  206,  226,  233,  206,  226,  230,  230,  230,
+      230,  230,  230,  401,  316,  226,  230,  230,  230,  281,
+      206,  245,  443,  232,  398,  402,  232,  270,  270,  270,
+      452,  446,  232,  438,  273,  273,  273,  262,  242,  242,
+      242,  403,  271,  242,  242,  242,  400,  206,  265,  274,
+      242,  242,  242,  404,  244,  280,  280,  280,  206,  244,
+      285,  285,  285,  254,  254,  254,  244,  289,  289,  289,
+      443,  281,  282,  286,  286,  286,  406,  287,  255,  446,
+
+      288,  416,  290,  437,  206,  276,  258,  258,  258,  292,
+      292,  292,  206,  293,  454,  281,  294,  224,  224,  224,
+      206,  259,  230,  230,  230,  302,  302,  302,  303,  303,
+      303,  461,  405,  226,  304,  304,  304,  408,  232,  270,
+      270,  270,  305,  305,  305,  206,  306,  206,  206,  307,
+      308,  308,  308,  297,  271,  273,  273,  273,  463,  310,
+      310,  310,  206,  311,  534,  309,  312,  300,  407,  469,
+      274,  242,  242,  242,  280,  280,  280,  285,  285,  285,
+      206,  286,  286,  286,  206,  287,  465,  244,  288,  206,
+      281,  289,  289,  289,  320,  320,  320,  206,  321,  462,
+
+      492,  322,  323,  323,  323,  206,  290,  314,  206,  439,
+      317,  292,  292,  292,  467,  293,  466,  324,  294,  325,
+      325,  325,  327,  327,  327,  318,  329,  329,  329,  331,
+      331,  331,  436,  435,  326,  426,  425,  328,  230,  230,
+      230,  206,  330,  334,  334,  334,  302,  302,  302,  303,
+      303,  303,  443,  441,  232,  304,  304,  304,  305,  305,
+      305,  206,  306,  206,  444,  307,  308,  308,  308,  335,
+      335,  335,  443,  336,  424,  453,  337,  333,  310,  310,
+      310,  309,  311,  480,  444,  312,  339,  339,  339,  320,
+      320,  320,  423,  321,  206,  206,  322,  323,  323,  323,
+
+      470,  206,  340,  345,  345,  345,  206,  346,  471,  414,
+      347,  493,  324,  325,  325,  325,  348,  348,  348,  206,
+      349,  206,  496,  350,  327,  327,  327,  206,  326,  351,
+      351,  351,  206,  352,  473,  497,  353,  206,  206,  328,
+      329,  329,  329,  331,  331,  331,  355,  355,  355,  334,
+      334,  334,  487,  335,  335,  335,  330,  336,  206,  481,
+      337,  498,  356,  339,  339,  339,  345,  345,  345,  490,
+      346,  413,  412,  347,  348,  348,  348,  206,  349,  340,
+      484,  350,  351,  351,  351,  206,  352,  206,  206,  353,
+      355,  355,  355,  365,  365,  365,  365,  365,  365,  376,
+
+      376,  376,  378,  378,  378,  206,  356,  485,  491,  206,
+      488,  411,  206,  206,  377,  206,  499,  379,  380,  380,
+      380,  376,  376,  376,  387,  387,  387,  489,  388,  500,
+      206,  389,  371,  381,  372,  206,  377,  206,  206,  373,
+      378,  378,  378,  390,  390,  390,  494,  391,  368,  206,
+      392,  380,  380,  380,  501,  379,  393,  393,  393,  364,
+      394,  495,  206,  395,  502,  206,  381,  387,  387,  387,
+      363,  388,  206,  510,  389,  390,  390,  390,  503,  391,
+      362,  535,  392,  393,  393,  393,  206,  394,  504,  206,
+      395,  409,  409,  409,  415,  415,  415,  417,  417,  417,
+
+      418,  418,  418,  409,  409,  409,  410,  281,  511,  505,
+      206,  206,  508,  206,  206,  419,  281,  206,  410,  281,
+      420,  420,  420,  358,  421,  206,  206,  422,  415,  415,
+      415,  428,  428,  428,  509,  206,  281,  417,  417,  417,
+      418,  418,  418,  506,  206,  528,  507,  206,  512,  513,
+      552,  552,  206,  206,  427,  419,  281,  430,  430,  430,
+      206,  431,  206,  429,  432,  420,  420,  420,  206,  421,
+      206,  514,  422,  281,  357,  428,  428,  428,  458,  458,
+      458,  281,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  206,  206,  279,  281,  282,  279,  279,  279,  281,
+
+      279,  440,  206,  354,  515,  206,  518,  458,  458,  458,
+      206,  538,  279,  279,  279,  279,  279,  279,  279,  279,
+      279,  279,  279,  281,  539,  279,  206,  206,  279,  279,
+      279,  281,  279,  430,  430,  430,  516,  431,  519,  341,
+      432,  206,  338,  317,  279,  279,  472,  472,  472,  281,
+      279,  279,  279,  279,  279,  447,  279,  279,  279,  540,
+      541,  279,  206,  529,  279,  279,  279,  281,  279,  206,
+      206,  332,  532,  206,  544,  474,  474,  474,  206,  206,
+      279,  279,  279,  279,  279,  279,  279,  279,  279,  279,
+      447,  206,  542,  279,  206,  517,  279,  279,  279,  281,
+
+      279,  472,  472,  472,  520,  475,  206,  206,  476,  477,
+      477,  477,  279,  279,  474,  474,  474,  206,  478,  206,
+      521,  479,  477,  477,  477,  206,  482,  206,  206,  483,
+      206,  523,  206,  524,  206,  533,  536,  537,  206,  206,
+      206,  206,  206,  206,  206,  525,  206,  206,  206,  206,
+      206,  206,  526,  527,  555,  206,  319,  530,  543,  531,
+      546,  281,  555,  558,  315,  547,  206,  558,  550,  551,
+      553,  206,  206,  545,  554,  556,  556,  556,  313,  206,
+      548,  549,  559,  559,  559,  556,  556,  556,  561,  561,
+      561,  557,  559,  559,  559,  561,  561,  561,  560,  301,
+
+      299,  557,  298,  296,  562,  295,  291,  284,  560,  283,
+      277,  562,   52,   52,   52,   52,   52,   52,   52,   53,
+       53,   53,   53,   53,   53,   53,   58,   58,   58,   58,
+       58,   58,   58,   61,   61,   61,   61,   61,   61,   61,
+       64,   64,   64,   64,   64,   64,   64,   67,   67,   67,
+       67,   67,   67,   67,   74,   74,   74,   74,   74,   74,
+       74,   90,   90,   90,   90,   90,   90,   90,   97,   97,
+       97,   97,   97,   97,   97,  101,  101,  101,  101,  101,
+      101,  101,  119,  119,  119,  119,  119,  119,  119,  141,
+      141,  141,  275,  141,  151,  151,  151,  272,  151,  159,
+
+      159,  159,  269,  159,  167,  167,  167,  167,  167,  268,
+      167,  187,  267,  187,  191,  266,  191,  201,  264,  201,
+      205,  205,  205,  205,  205,  205,  205,  211,  263,  261,
+      211,  225,  225,  225,  225,  225,  225,  231,  231,  231,
+      231,  231,  231,  243,  243,  243,  243,  243,  243,  279,
+      279,  279,  279,  279,  279,  279,  433,  433,  433,  433,
+      433,  433,  433,  434,  434,  434,  434,  434,  434,  434,
+      442,  442,  442,  442,  442,  442,  442,  445,  445,  445,
+      445,  445,  445,  445,  455,  455,  455,  455,  455,  455,
+      455,  457,  457,  457,  457,  457,  457,  457,  260,  257,
+
+      256,  253,  252,  251,  250,  249,  248,  206,  246,  241,
+      240,  239,  238,  237,  236,  235,  234,  229,  228,  223,
+      222,  221,  220,  219,  218,  217,  216,  215,  214,  213,

       212,  209,  207,  206,  204,  203,  202,  200,  199,  198,
       212,  209,  207,  206,  204,  203,  202,  200,  199,  198,

-      197,  196,  195,  194,  192,  191,  190,  189,  188,  187,
-      186,  185,  184,  183,  181,  180,  179,  178,  177,  176,
-      171,  168,  170,  166,  165,  163,  162,  161,  158,  156,
-      154,  153,  152,  151,  149,  142,  140,  138,  132,  131,
+      197,  196,  195,  194,  193,  192,  190,  189,  188,  186,
+      185,  184,  183,  182,  181,  180,  179,  178,  177,  176,
+      171,  168,  170,  166,  165,  163,  162,  161,  160,  158,
+      152,  150,  147,  146,  145,  142,  140,  138,  132,  131,

       132,  131,  130,  129,  563,   51,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
 
       132,  131,  130,  129,  563,   51,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
 


@@ -857,176 +857,176 @@ static yyconst flex_int16_t yy_chk[1642] =
         0,    3,    3,    3,    4,    4,    4,    5,    5,    5,
         6,    6,    6,    9,    0,    3,   10,   11,    4,   12,
         9,    5,  464,   10,    6,    7,    7,    7,    8,    8,
         0,    3,    3,    3,    4,    4,    4,    5,    5,    5,
         6,    6,    6,    9,    0,    3,   10,   11,    4,   12,
         9,    5,  464,   10,    6,    7,    7,    7,    8,    8,

-        8,   13,   13,   11,  115,   12,   13,   13,  115,    7,
+        8,   13,   13,   11,   86,   12,   13,   13,   86,    7,

        14,   14,    8,  125,   13,   14,   14,   15,   15,  316,
        15,   56,   15,   14,   16,   16,  125,   16,  316,   16,
        15,   17,   17,   18,   18,   56,   57,   16,   19,   19,
        19,   20,   20,   20,   23,   23,   23,   24,   24,   24,
        14,   14,    8,  125,   13,   14,   14,   15,   15,  316,
        15,   56,   15,   14,   16,   16,  125,   16,  316,   16,
        15,   17,   17,   18,   18,   56,   57,   16,   19,   19,
        19,   20,   20,   20,   23,   23,   23,   24,   24,   24,

-       57,  133,   19,  134,  457,   20,  134,  172,   23,  172,
+       57,  134,   19,  457,  134,   20,  456,  172,   23,  172,

        17,   24,   18,   21,   21,   21,   21,   21,   21,   21,
 
        17,   24,   18,   21,   21,   21,   21,   21,   21,   21,
 

-       21,   21,   21,   21,   21,   21,  367,   21,   21,   21,
-       21,   21,   25,   25,   25,   26,   26,   26,   27,   27,
-       27,  317,  133,   21,   21,  169,   25,  208,  456,   26,
-      367,  208,   27,  169,   21,   22,   22,   22,   22,   22,
-       22,   22,   22,   22,   22,   22,   22,   22,  317,   22,
-       22,   22,   22,   22,   28,   28,   28,   29,   29,   29,
-       30,   30,   30,  342,  344,   22,   22,  455,   28,  342,
-      318,   29,  363,  363,   30,   60,   22,   31,   31,   31,
-       32,   32,   32,   33,   33,   33,   34,   34,   34,   60,
-      318,   31,  360,  397,   32,  344,  343,   33,  366,   83,
-
-       34,   35,   35,   35,   36,   36,   36,   37,   37,   37,
-       38,   38,   38,   83,  343,   35,  465,  366,   36,  450,
-      360,   37,  397,  465,   38,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-       41,   41,   41,   42,   42,   42,   43,   43,   43,   44,
-       44,   44,  432,  445,   41,  443,  443,   42,  448,  446,
-
-       43,  432,  445,   44,   45,   45,   45,   45,   45,   45,
+       21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
+       21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
+       21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
+       21,   21,   21,   21,   21,   21,   21,   21,   21,   21,
+       21,   21,   21,   21,   21,   21,   21,   21,   25,   25,
+       25,   26,   26,   26,   54,   54,   54,   55,   55,   55,
+      133,  455,   25,  363,  363,   26,   27,   27,   27,   27,
+       27,   27,   27,   27,   27,   27,   27,   27,   27,  317,
+       27,   27,   27,   27,   27,   29,   29,   29,   30,   30,
+       30,   31,   31,   31,  208,  169,   27,   27,  208,   29,
+
+      450,  133,   30,  169,  448,   31,  317,   27,   28,   28,
+       28,   28,   28,   28,   28,   28,   28,   28,   28,   28,
+       28,  366,   28,   28,   28,   28,   28,   32,   32,   32,
+       33,   33,   33,   34,   34,   34,  342,  344,   28,   28,
+      366,   32,  342,  318,   33,  443,  443,   34,   60,   28,
+       35,   35,   35,   36,   36,   36,   37,   37,   37,   38,
+       38,   38,   60,  318,   35,  360,  367,   36,  344,  343,
+       37,  374,   83,   38,   39,   39,   39,   40,   40,   40,
+       41,   41,   41,   42,   42,   42,   83,  343,   39,  516,
+      367,   40,  371,  360,   41,  374,   98,   42,   43,   43,
+
+       43,   44,   44,   44,   59,   59,   59,   80,   80,   80,
+       98,  371,   43,  446,  516,   44,   45,   45,   45,   45,
+       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,

        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
        45,   45,   45,   45,   45,   45,   45,   45,   45,   45,

-       45,   45,   45,   45,   45,   45,   45,   45,   45,   47,
-       47,   47,   48,   48,   48,   49,   49,   50,   50,  461,
-       49,   70,   50,   47,  444,  461,   48,  372,   49,   78,
-       50,   54,   54,   54,   55,   55,   55,   59,   59,   59,
-       80,   80,   80,   78,   49,   88,   50,   93,   70,   87,
-
-       87,   87,   88,   89,   70,   98,   90,   70,  372,   88,
-       89,   93,   70,  112,   78,   91,  373,   89,   92,   98,
-       90,   95,   95,   95,  406,   92,  106,  112,   88,   91,
-       88,  107,   92,  106,  396,   88,   89,   93,   89,   90,
-      106,   90,  121,   89,  373,  107,   90,  406,   91,  121,
-       91,   92,  247,   92,  396,   91,  121,  438,   92,  105,
-      105,  105,  361,  247,  107,  109,  109,  109,  120,  120,
-      120,  124,  124,  124,  182,  182,  182,  183,  183,  183,
-      193,  193,  193,  194,  194,  194,  201,  201,  201,  278,
-      182,  467,  375,  183,  361,  437,  193,  374,  467,  194,
-
-      492,  278,  201,  202,  202,  202,  219,  219,  219,  220,
-      220,  220,  222,  222,  222,  228,  228,  228,  371,  202,
-      375,  374,  219,  382,  183,  220,  383,  194,  222,  492,
-      228,  230,  230,  230,  232,  232,  232,  371,  202,  233,
-      233,  233,  383,  384,  222,  382,  230,  235,  235,  235,
-      232,  236,  236,  236,  439,  233,  239,  239,  239,  242,
-      242,  242,  384,  235,  439,  399,  236,  243,  243,  243,
-      436,  239,  245,  245,  245,  242,  248,  248,  248,  255,
-      255,  255,  235,  243,  256,  256,  256,  399,  245,  258,
-      258,  258,  248,  248,  435,  255,  259,  259,  259,  260,
-
-      260,  260,  261,  261,  261,  262,  262,  262,  475,  262,
-      245,  398,  262,  263,  263,  263,  385,  261,  264,  264,
-      264,  267,  267,  267,  255,  265,  265,  265,  263,  265,
-      475,  398,  265,  264,  268,  268,  268,  267,  269,  269,
-      269,  386,  269,  385,  498,  269,  270,  270,  270,  268,
-      272,  272,  272,  426,  276,  276,  276,  267,  280,  280,
-      280,  270,  273,  273,  273,  272,  273,  498,  386,  273,
-      276,  285,  285,  285,  280,  287,  287,  287,  288,  288,
-      288,  289,  289,  289,  290,  290,  290,  291,  291,  291,
-      276,  287,  388,  441,  280,  292,  292,  292,  293,  293,
-
-      293,  486,  293,  441,  388,  293,  296,  296,  296,  280,
-      453,  297,  297,  297,  287,  297,  389,  486,  297,  510,
-      453,  296,  298,  298,  298,  452,  298,  427,  389,  298,
-      302,  302,  302,  303,  303,  303,  452,  303,  429,  427,
-      303,  306,  306,  306,  454,  510,  302,  307,  307,  307,
-      429,  307,  462,  431,  307,  454,  306,  308,  308,  308,
-      309,  309,  309,  462,  309,  431,  480,  309,  312,  312,
-      312,  476,  308,  313,  313,  313,  314,  314,  314,  320,
-      320,  320,  425,  312,  322,  322,  322,  440,  313,  323,
-      323,  323,  314,  476,  324,  324,  324,  480,  324,  440,
-
-      322,  324,  328,  328,  328,  330,  330,  330,  487,  330,
-      442,  463,  330,  333,  333,  333,  478,  463,  328,  334,
-      334,  334,  442,  334,  487,  493,  334,  424,  333,  335,
-      335,  335,  336,  336,  336,  504,  336,  466,  478,  336,
-      337,  337,  337,  466,  335,  338,  338,  338,  479,  338,
-      481,  482,  338,  496,  493,  337,  339,  339,  339,  346,
-      346,  346,  349,  349,  349,  483,  349,  470,  423,  349,
-      479,  504,  339,  482,  470,  346,  352,  352,  352,  484,
-      352,  481,  496,  352,  355,  355,  355,  483,  355,  511,
-      505,  355,  359,  359,  359,  365,  365,  365,  368,  368,
-
-      368,  369,  369,  369,  370,  370,  370,  497,  359,  499,
-      484,  365,  490,  368,  485,  511,  369,  488,  491,  370,
-      376,  376,  376,  377,  377,  377,  505,  377,  490,  489,
-      377,  365,  499,  365,  491,  376,  497,  494,  365,  378,
-      378,  378,  379,  379,  379,  485,  379,  495,  488,  379,
-      380,  380,  380,  494,  378,  381,  381,  381,  500,  381,
-      489,  414,  381,  495,  413,  380,  387,  387,  387,  412,
-      387,  508,  411,  387,  390,  390,  390,  509,  390,  501,
-      512,  390,  393,  393,  393,  404,  393,  500,  502,  393,
-      400,  400,  400,  405,  405,  405,  407,  407,  407,  408,
-
-      408,  408,  409,  409,  409,  400,  400,  508,  501,  405,
-      503,  502,  407,  509,  408,  408,  512,  409,  409,  410,
-      410,  410,  506,  410,  507,  513,  410,  415,  415,  415,
-      416,  416,  416,  503,  516,  410,  417,  417,  417,  418,
-      418,  418,  517,  415,  514,  506,  416,  507,  520,  403,
-      528,  402,  417,  415,  418,  418,  419,  419,  419,  516,
-      419,  513,  417,  419,  420,  420,  420,  517,  420,  528,
-      514,  420,  419,  520,  428,  428,  428,  447,  447,  447,
-      420,  421,  421,  421,  421,  421,  421,  421,  421,  421,
-      428,  401,  421,  447,  447,  421,  421,  421,  421,  421,
-
-      428,  521,  362,  522,  529,  534,  458,  458,  458,  515,
-      522,  421,  421,  422,  422,  422,  422,  422,  422,  422,
-      422,  422,  458,  529,  422,  535,  521,  422,  422,  422,
-      422,  422,  430,  430,  430,  515,  430,  538,  534,  430,
-      532,  358,  458,  422,  422,  469,  469,  469,  430,  433,
-      433,  433,  433,  433,  433,  433,  433,  433,  535,  532,
-      433,  469,  523,  433,  433,  433,  433,  433,  518,  523,
-      538,  526,  533,  539,  471,  471,  471,  519,  526,  433,
-      433,  434,  434,  434,  434,  434,  434,  434,  434,  434,
-      471,  533,  434,  524,  518,  434,  434,  434,  434,  434,
-
-      472,  472,  472,  519,  472,  525,  539,  472,  473,  473,
-      473,  434,  434,  474,  474,  474,  472,  474,  524,  527,
-      474,  477,  477,  477,  473,  477,  527,  530,  477,  474,
-      525,  531,  536,  537,  530,  540,  541,  477,  531,  542,
-      543,  544,  545,  548,  546,  549,  550,  348,  547,  345,
-      551,  536,  537,  341,  540,  541,  546,  547,  550,  551,
-      544,  545,  548,  553,  549,  552,  552,  552,  554,  555,
-      555,  555,  542,  543,  327,  553,  321,  554,  556,  556,
-      556,  552,  558,  558,  558,  555,  559,  559,  559,  561,
-      561,  561,  315,  301,  556,  286,  282,  279,  558,  277,
-
-      275,  274,  559,  271,  266,  561,  564,  564,  564,  564,
-      564,  564,  564,  565,  565,  565,  565,  565,  565,  565,
-      566,  566,  566,  566,  566,  566,  566,  567,  567,  567,
-      567,  567,  567,  567,  568,  568,  568,  568,  568,  568,
-      568,  569,  569,  569,  569,  569,  569,  569,  570,  570,
-      570,  570,  570,  570,  570,  571,  571,  571,  571,  571,
-      571,  571,  572,  572,  572,  572,  572,  572,  572,  573,
-      573,  573,  573,  573,  573,  573,  574,  574,  574,  574,
-      574,  574,  574,  575,  575,  575,  257,  575,  576,  576,
-      576,  254,  576,  577,  577,  577,  253,  577,  578,  578,
-
-      578,  578,  578,  252,  578,  579,  251,  579,  580,  246,
-      580,  581,  241,  581,  582,  582,  582,  582,  582,  582,
-      582,  583,  240,  238,  583,  584,  584,  584,  584,  584,
-      584,  585,  585,  585,  585,  585,  585,  586,  586,  586,
-      586,  586,  586,  587,  587,  587,  587,  587,  587,  587,
-      588,  588,  588,  588,  588,  588,  588,  589,  589,  589,
-      589,  589,  589,  589,  590,  590,  590,  590,  590,  590,
-      590,  591,  591,  591,  591,  591,  591,  591,  592,  592,
-      592,  592,  592,  592,  592,  593,  593,  593,  593,  593,
-      593,  593,  237,  231,  229,  227,  226,  225,  224,  223,
-
-      218,  217,  216,  213,  212,  211,  209,  205,  203,  200,
-      199,  198,  197,  196,  195,  192,  191,  190,  189,  188,
-      187,  186,  185,  184,  181,  180,  178,  177,  176,  175,
+       45,   47,   47,   47,   48,   48,   48,   49,   49,   50,
+       50,   78,   49,   70,   50,   47,   92,   93,   48,  372,
+       49,  108,   50,   92,  444,   78,   91,   91,   91,  480,
+
+       92,   93,   95,   95,   95,  108,   49,  361,   50,  105,
+       70,  102,  102,  102,   78,  106,   70,  383,  103,   70,
+      372,  104,   93,  105,   70,  103,  113,  107,  104,  106,
+      480,  108,  103,  383,  107,  104,  110,  110,  110,  361,
+      113,  107,  105,  438,  105,  120,  120,  120,  106,  105,
+      106,  103,  121,  103,  104,  106,  104,  373,  103,  121,
+      107,  104,  107,  124,  124,  124,  121,  107,  187,  187,
+      187,  188,  188,  188,  191,  191,  191,  192,  192,  192,
+      201,  201,  201,  247,  187,  373,  375,  188,  437,  385,
+      191,  436,  435,  192,  247,  382,  201,  202,  202,  202,
+
+      218,  218,  218,  221,  221,  221,  188,  224,  224,  224,
+      225,  225,  225,  202,  375,  218,  385,  382,  221,  227,
+      227,  227,  278,  224,  192,  384,  225,  230,  230,  230,
+      231,  231,  231,  388,  278,  227,  233,  233,  233,  386,
+      439,  202,  432,  230,  384,  388,  231,  238,  238,  238,
+      439,  432,  233,  426,  240,  240,  240,  227,  242,  242,
+      242,  389,  238,  243,  243,  243,  386,  397,  233,  240,
+      245,  245,  245,  389,  242,  248,  248,  248,  406,  243,
+      253,  253,  253,  254,  254,  254,  245,  256,  256,  256,
+      445,  248,  248,  255,  255,  255,  397,  255,  254,  445,
+
+      255,  406,  256,  425,  441,  245,  258,  258,  258,  259,
+      259,  259,  396,  259,  441,  399,  259,  262,  262,  262,
+      452,  258,  265,  265,  265,  267,  267,  267,  268,  268,
+      268,  452,  396,  262,  269,  269,  269,  399,  265,  270,
+      270,  270,  271,  271,  271,  528,  271,  454,  398,  271,
+      272,  272,  272,  262,  270,  273,  273,  273,  454,  274,
+      274,  274,  465,  274,  528,  272,  274,  265,  398,  465,
+      273,  276,  276,  276,  280,  280,  280,  285,  285,  285,
+      461,  286,  286,  286,  486,  286,  461,  276,  286,  453,
+      280,  289,  289,  289,  290,  290,  290,  427,  290,  453,
+
+      486,  290,  291,  291,  291,  462,  289,  276,  463,  427,
+      280,  292,  292,  292,  463,  292,  462,  291,  292,  295,
+      295,  295,  296,  296,  296,  280,  297,  297,  297,  298,
+      298,  298,  424,  423,  295,  414,  413,  296,  300,  300,
+      300,  429,  297,  301,  301,  301,  302,  302,  302,  303,
+      303,  303,  431,  429,  300,  304,  304,  304,  305,  305,
+      305,  475,  305,  440,  431,  305,  308,  308,  308,  309,
+      309,  309,  442,  309,  412,  440,  309,  300,  310,  310,
+      310,  308,  310,  475,  442,  310,  314,  314,  314,  320,
+      320,  320,  411,  320,  466,  487,  320,  323,  323,  323,
+
+      466,  467,  314,  324,  324,  324,  490,  324,  467,  404,
+      324,  487,  323,  325,  325,  325,  326,  326,  326,  491,
+      326,  481,  490,  326,  327,  327,  327,  470,  325,  328,
+      328,  328,  492,  328,  470,  491,  328,  476,  484,  327,
+      329,  329,  329,  331,  331,  331,  333,  333,  333,  334,
+      334,  334,  481,  335,  335,  335,  329,  335,  478,  476,
+      335,  492,  333,  339,  339,  339,  345,  345,  345,  484,
+      345,  403,  402,  345,  348,  348,  348,  485,  348,  339,
+      478,  348,  351,  351,  351,  479,  351,  493,  482,  351,
+      355,  355,  355,  359,  359,  359,  365,  365,  365,  368,
+
+      368,  368,  369,  369,  369,  483,  355,  479,  485,  359,
+      482,  401,  365,  494,  368,  488,  493,  369,  370,  370,
+      370,  376,  376,  376,  377,  377,  377,  483,  377,  494,
+      489,  377,  365,  370,  365,  496,  376,  504,  495,  365,
+      378,  378,  378,  379,  379,  379,  488,  379,  362,  497,
+      379,  380,  380,  380,  495,  378,  381,  381,  381,  358,
+      381,  489,  529,  381,  496,  498,  380,  387,  387,  387,
+      357,  387,  505,  504,  387,  390,  390,  390,  497,  390,
+      354,  529,  390,  393,  393,  393,  499,  393,  498,  502,
+      393,  400,  400,  400,  405,  405,  405,  407,  407,  407,
+
+      408,  408,  408,  409,  409,  409,  400,  400,  505,  499,
+      405,  503,  502,  407,  500,  408,  408,  501,  409,  409,
+      410,  410,  410,  341,  410,  506,  507,  410,  415,  415,
+      415,  416,  416,  416,  503,  508,  410,  417,  417,  417,
+      418,  418,  418,  500,  415,  522,  501,  416,  506,  507,
+      546,  547,  522,  417,  415,  418,  418,  419,  419,  419,
+      547,  419,  546,  417,  419,  420,  420,  420,  509,  420,
+      512,  508,  420,  419,  338,  428,  428,  428,  447,  447,
+      447,  420,  421,  421,  421,  421,  421,  421,  421,  421,
+      421,  428,  532,  421,  447,  447,  421,  421,  421,  421,
+
+      421,  428,  513,  332,  509,  533,  512,  458,  458,  458,
+      510,  532,  421,  421,  422,  422,  422,  422,  422,  422,
+      422,  422,  422,  458,  533,  422,  534,  535,  422,  422,
+      422,  422,  422,  430,  430,  430,  510,  430,  513,  315,
+      430,  538,  313,  458,  422,  422,  469,  469,  469,  430,
+      433,  433,  433,  433,  433,  433,  433,  433,  433,  534,
+      535,  433,  469,  523,  433,  433,  433,  433,  433,  511,
+      523,  299,  526,  536,  538,  471,  471,  471,  514,  526,
+      433,  433,  434,  434,  434,  434,  434,  434,  434,  434,
+      434,  471,  536,  434,  515,  511,  434,  434,  434,  434,
+
+      434,  472,  472,  472,  514,  472,  517,  518,  472,  473,
+      473,  473,  434,  434,  474,  474,  474,  472,  474,  519,
+      515,  474,  477,  477,  477,  473,  477,  520,  521,  477,
+      474,  517,  524,  518,  525,  527,  530,  531,  477,  537,
+      539,  540,  527,  530,  531,  519,  541,  542,  543,  544,
+      545,  548,  520,  521,  550,  549,  282,  524,  537,  525,
+      540,  279,  551,  554,  277,  541,  550,  553,  544,  545,
+      548,  551,  554,  539,  549,  552,  552,  552,  275,  553,
+      542,  543,  555,  555,  555,  556,  556,  556,  558,  558,
+      558,  552,  559,  559,  559,  561,  561,  561,  555,  266,
+
+      264,  556,  263,  261,  558,  260,  257,  252,  559,  251,
+      246,  561,  564,  564,  564,  564,  564,  564,  564,  565,
+      565,  565,  565,  565,  565,  565,  566,  566,  566,  566,
+      566,  566,  566,  567,  567,  567,  567,  567,  567,  567,
+      568,  568,  568,  568,  568,  568,  568,  569,  569,  569,
+      569,  569,  569,  569,  570,  570,  570,  570,  570,  570,
+      570,  571,  571,  571,  571,  571,  571,  571,  572,  572,
+      572,  572,  572,  572,  572,  573,  573,  573,  573,  573,
+      573,  573,  574,  574,  574,  574,  574,  574,  574,  575,
+      575,  575,  241,  575,  576,  576,  576,  239,  576,  577,
+
+      577,  577,  237,  577,  578,  578,  578,  578,  578,  236,
+      578,  579,  235,  579,  580,  234,  580,  581,  229,  581,
+      582,  582,  582,  582,  582,  582,  582,  583,  228,  223,
+      583,  584,  584,  584,  584,  584,  584,  585,  585,  585,
+      585,  585,  585,  586,  586,  586,  586,  586,  586,  587,
+      587,  587,  587,  587,  587,  587,  588,  588,  588,  588,
+      588,  588,  588,  589,  589,  589,  589,  589,  589,  589,
+      590,  590,  590,  590,  590,  590,  590,  591,  591,  591,
+      591,  591,  591,  591,  592,  592,  592,  592,  592,  592,
+      592,  593,  593,  593,  593,  593,  593,  593,  222,  220,
+
+      219,  217,  216,  213,  212,  211,  209,  205,  203,  200,
+      199,  198,  197,  196,  195,  194,  193,  190,  189,  186,
+      185,  184,  183,  182,  181,  180,  178,  177,  176,  175,

       174,  170,  168,  167,  166,  165,  164,  163,  162,  161,
       174,  170,  168,  167,  166,  165,  164,  163,  162,  161,

-      160,  159,  158,  155,  154,  153,  152,  151,  148,  147,
+      160,  157,  156,  155,  154,  153,  152,  149,  148,  147,

       146,  145,  144,  143,  142,  139,  138,  137,  136,  135,
       146,  145,  144,  143,  142,  139,  138,  137,  136,  135,

-      129,  128,  126,  123,  122,  118,  117,  116,  114,  110,
-      103,  102,  101,  100,   96,   85,   81,   77,   76,   75,
+      129,  128,  126,  123,  122,  118,  117,  116,  115,  111,
+      100,   96,   89,   88,   87,   85,   81,   77,   76,   75,

        69,   68,   66,   63,   51,  563,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
 
        69,   68,   66,   63,   51,  563,  563,  563,  563,  563,
       563,  563,  563,  563,  563,  563,  563,  563,  563,  563,
 


@@ -1040,10 +1040,10 @@ static yyconst flex_int16_t yy_chk[1642] =
 /* Table of booleans, true if rule could match eol. */
 static yyconst flex_int32_t yy_rule_can_match_eol[93] =
     {   0,
 /* Table of booleans, true if rule could match eol. */
 static yyconst flex_int32_t yy_rule_can_match_eol[93] =
     {   0,

-0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1,
-    1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1,
+0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 
+    1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 
+    1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 

     1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0,     };
 
 static yy_state_type yy_last_accepting_state;
     1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0,     };
 
 static yy_state_type yy_last_accepting_state;


@@ -1066,13 +1066,13 @@ char *xbt_graph_parse_text;
  * FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
  * FleXML is Copyright (C) 2003-2013 Martin Quinson.  All rights reserved.
  * (1.9.6).
  * FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
  * FleXML is Copyright (C) 2003-2013 Martin Quinson.  All rights reserved.
  * (1.9.6).

- *
+ * 

  * There are two, intertwined parts to this program, part A and part B.
  *
  * Part A
  * ------
  * There are two, intertwined parts to this program, part A and part B.
  *
  * Part A
  * ------

- *
- * Some parts, here collectively called "Part A", are found in the
+ * 
+ * Some parts, here collectively called "Part A", are found in the 

  * FleXML package.  They are Copyright (C) 1999-2005 Kristoffer Rose
  * and Copyright (C) 2003-2013 Martin Quinson. All rights reserved.
  *
  * FleXML package.  They are Copyright (C) 1999-2005 Kristoffer Rose
  * and Copyright (C) 2003-2013 Martin Quinson. All rights reserved.
  *


@@ -1090,20 +1090,20 @@ char *xbt_graph_parse_text;
  * Notice that these are explicit rights granted to you for files
  * generated by the FleXML system.  For your rights in connection with
  * the FleXML system itself please consult the GNU General Public License.
  * Notice that these are explicit rights granted to you for files
  * generated by the FleXML system.  For your rights in connection with
  * the FleXML system itself please consult the GNU General Public License.

- *
+ * 

  * Part B
  * ------
  * Part B
  * ------

- *
- * The other parts, here collectively called "Part B", and which came
- * from the DTD used by FleXML to generate this program, can be
+ * 
+ * The other parts, here collectively called "Part B", and which came 
+ * from the DTD used by FleXML to generate this program, can be 

  * distributed (or not, as the case may be) under the terms of whoever
  * distributed (or not, as the case may be) under the terms of whoever

- * wrote them, provided these terms respect and obey the two conditions
+ * wrote them, provided these terms respect and obey the two conditions 

  * above under the heading "Part A".
  *
  * The author of and contributors to FleXML specifically disclaim
  * above under the heading "Part A".
  *
  * The author of and contributors to FleXML specifically disclaim

- * any copyright interest in "Part B", unless "Part B" was written
+ * any copyright interest in "Part B", unless "Part B" was written 

  * by the author of or contributors to FleXML.
  * by the author of or contributors to FleXML.

- *
+ * 

  */
 
 /* Version strings. */
  */
 
 /* Version strings. */


@@ -1116,7 +1116,7 @@ const char graphxml_flexml_version[] = "1.9.6";
 #include <assert.h>
 #include <stdarg.h>
 #include <ctype.h>
 #include <assert.h>
 #include <stdarg.h>
 #include <ctype.h>

-
+     

 #if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)
 # ifndef __STRICT_ANSI__
 #  include <io.h>
 #if defined(_XBT_WIN32) || defined(__WIN32__) || defined(WIN32) || defined(__TOS_WIN__)
 # ifndef __STRICT_ANSI__
 #  include <io.h>


@@ -1125,7 +1125,7 @@ const char graphxml_flexml_version[] = "1.9.6";
 #else
 # include <unistd.h>
 #endif
 #else
 # include <unistd.h>
 #endif

-
+     

 #ifndef FLEXML_INDEXSTACKSIZE
 #define FLEXML_INDEXSTACKSIZE 1000
 #endif
 #ifndef FLEXML_INDEXSTACKSIZE
 #define FLEXML_INDEXSTACKSIZE 1000
 #endif


@@ -1142,62 +1142,62 @@ const char graphxml_flexml_version[] = "1.9.6";
 int graphxml_pcdata_ix;
 extern char *graphxml_bufferstack;
 #define graphxml_pcdata (graphxml_bufferstack + graphxml_pcdata_ix)
 int graphxml_pcdata_ix;
 extern char *graphxml_bufferstack;
 #define graphxml_pcdata (graphxml_bufferstack + graphxml_pcdata_ix)

-AT_graphxml_node_position___y AX_graphxml_node_position___y;
-#define A_graphxml_node_position___y (graphxml_bufferstack + AX_graphxml_node_position___y)
-short int graphxml_node_position___y_isset;
+AT_graphxml_edge_data AX_graphxml_edge_data;
+#define A_graphxml_edge_data (graphxml_bufferstack + AX_graphxml_edge_data)
+short int graphxml_edge_data_isset;

 AT_graphxml_edge_label AX_graphxml_edge_label;
 #define A_graphxml_edge_label (graphxml_bufferstack + AX_graphxml_edge_label)
 short int graphxml_edge_label_isset;
 AT_graphxml_edge_label AX_graphxml_edge_label;
 #define A_graphxml_edge_label (graphxml_bufferstack + AX_graphxml_edge_label)
 short int graphxml_edge_label_isset;

-AT_graphxml_graph_isDirected AX_graphxml_graph_isDirected;
-#define A_graphxml_graph_isDirected AX_graphxml_graph_isDirected
-short int graphxml_graph_isDirected_isset;
-AT_graphxml_node_label AX_graphxml_node_label;
-#define A_graphxml_node_label (graphxml_bufferstack + AX_graphxml_node_label)
-short int graphxml_node_label_isset;

 AT_graphxml_edge_length AX_graphxml_edge_length;
 #define A_graphxml_edge_length (graphxml_bufferstack + AX_graphxml_edge_length)
 short int graphxml_edge_length_isset;
 AT_graphxml_edge_length AX_graphxml_edge_length;
 #define A_graphxml_edge_length (graphxml_bufferstack + AX_graphxml_edge_length)
 short int graphxml_edge_length_isset;

+AT_graphxml_edge_name AX_graphxml_edge_name;
+#define A_graphxml_edge_name (graphxml_bufferstack + AX_graphxml_edge_name)
+short int graphxml_edge_name_isset;

 AT_graphxml_edge_source AX_graphxml_edge_source;
 #define A_graphxml_edge_source (graphxml_bufferstack + AX_graphxml_edge_source)
 short int graphxml_edge_source_isset;
 AT_graphxml_edge_target AX_graphxml_edge_target;
 #define A_graphxml_edge_target (graphxml_bufferstack + AX_graphxml_edge_target)
 short int graphxml_edge_target_isset;
 AT_graphxml_edge_source AX_graphxml_edge_source;
 #define A_graphxml_edge_source (graphxml_bufferstack + AX_graphxml_edge_source)
 short int graphxml_edge_source_isset;
 AT_graphxml_edge_target AX_graphxml_edge_target;
 #define A_graphxml_edge_target (graphxml_bufferstack + AX_graphxml_edge_target)
 short int graphxml_edge_target_isset;

-AT_graphxml_node_name AX_graphxml_node_name;
-#define A_graphxml_node_name (graphxml_bufferstack + AX_graphxml_node_name)
-short int graphxml_node_name_isset;
-AT_graphxml_edge_data AX_graphxml_edge_data;
-#define A_graphxml_edge_data (graphxml_bufferstack + AX_graphxml_edge_data)
-short int graphxml_edge_data_isset;
+AT_graphxml_graph_isDirected AX_graphxml_graph_isDirected;
+#define A_graphxml_graph_isDirected AX_graphxml_graph_isDirected
+short int graphxml_graph_isDirected_isset;

 AT_graphxml_node_data AX_graphxml_node_data;
 #define A_graphxml_node_data (graphxml_bufferstack + AX_graphxml_node_data)
 short int graphxml_node_data_isset;
 AT_graphxml_node_data AX_graphxml_node_data;
 #define A_graphxml_node_data (graphxml_bufferstack + AX_graphxml_node_data)
 short int graphxml_node_data_isset;

-AT_graphxml_edge_name AX_graphxml_edge_name;
-#define A_graphxml_edge_name (graphxml_bufferstack + AX_graphxml_edge_name)
-short int graphxml_edge_name_isset;
+AT_graphxml_node_label AX_graphxml_node_label;
+#define A_graphxml_node_label (graphxml_bufferstack + AX_graphxml_node_label)
+short int graphxml_node_label_isset;
+AT_graphxml_node_name AX_graphxml_node_name;
+#define A_graphxml_node_name (graphxml_bufferstack + AX_graphxml_node_name)
+short int graphxml_node_name_isset;

 AT_graphxml_node_position___x AX_graphxml_node_position___x;
 #define A_graphxml_node_position___x (graphxml_bufferstack + AX_graphxml_node_position___x)
 short int graphxml_node_position___x_isset;
 AT_graphxml_node_position___x AX_graphxml_node_position___x;
 #define A_graphxml_node_position___x (graphxml_bufferstack + AX_graphxml_node_position___x)
 short int graphxml_node_position___x_isset;

+AT_graphxml_node_position___y AX_graphxml_node_position___y;
+#define A_graphxml_node_position___y (graphxml_bufferstack + AX_graphxml_node_position___y)
+short int graphxml_node_position___y_isset;

 
 /* XML state. */
 #ifdef FLEX_DEBUG
 
 /* XML state. */
 #ifdef FLEX_DEBUG

-# define ENTER(state)  debug_enter(state,#state)
-# define LEAVE    debug_leave()
-# define SET(state)  debug_set(state,#state)
+# define ENTER(state)  debug_enter(state,#state)
+# define LEAVE         debug_leave()
+# define SET(state)    debug_set(state,#state)

   static void debug_enter(int, const char*);
   static void debug_leave(void);
   static void debug_set(int, const char*);
 #else
   static void debug_enter(int, const char*);
   static void debug_leave(void);
   static void debug_set(int, const char*);
 #else

-# define ENTER(state)  (yy_push_state(state))
-# define LEAVE    (yy_pop_state())
-# define SET(state)  BEGIN(state)
+# define ENTER(state)  (yy_push_state(state))
+# define LEAVE         (yy_pop_state())
+# define SET(state)    BEGIN(state)

 #endif
 
 /* Generic actions. */
 #endif
 
 /* Generic actions. */

-#define SKIP  /*skip*/
+#define SKIP   /*skip*/

 #define SUCCEED        CLEANUP; return 0
 
 #define SUCCEED        CLEANUP; return 0
 

-#define FAIL  return fail
+#define FAIL   return fail

 static int fail(const char*, ...);
 
 enum {flexml_max_err_msg_size = 512};
 static int fail(const char*, ...);
 
 enum {flexml_max_err_msg_size = 512};


@@ -1234,12 +1234,12 @@ static int inext = 1;
 static int ck_blimit()
 {
      if (bnext >= blimit) {
 static int ck_blimit()
 {
      if (bnext >= blimit) {

-   blimit += FLEXML_BUFFERSTACKSIZE + 2;
-   {
-       char *temp = (char *) realloc(graphxml_bufferstack, blimit);
-       assert(temp);
-       graphxml_bufferstack = temp;
-   }
+        blimit += FLEXML_BUFFERSTACKSIZE + 2;
+        {
+            char *temp = (char *) realloc(graphxml_bufferstack, blimit);
+            assert(temp);
+            graphxml_bufferstack = temp;
+        }

      }
      return 0;
 }
      }
      return 0;
 }


@@ -1248,12 +1248,12 @@ static int ck_blimit()
 static int ck_ilimit()
 {
      if (inext >= ilimit) {
 static int ck_ilimit()
 {
      if (inext >= ilimit) {

-   ilimit += FLEXML_INDEXSTACKSIZE + 2;
-   {
-       int *temp = (int *) realloc(indexstack, ilimit);
-       assert(temp);
-       indexstack = temp;
-   }
+        ilimit += FLEXML_INDEXSTACKSIZE + 2;
+        {
+            int *temp = (int *) realloc(indexstack, ilimit);
+            assert(temp);
+            indexstack = temp;
+        }

      }
      return 0;
 }
      }
      return 0;
 }


@@ -1267,16 +1267,16 @@ static void graphxml_bufferliteral(char c, int* pp, const char* text)
       assert(s && e && s <= e);
       ++s;
       while (s < e) {
       assert(s && e && s <= e);
       ++s;
       while (s < e) {

-   if (isspace(*s)) {
-      BUFFERPUTC(' ');
-      do ++s; while (s < e && isspace(*s));
-   } else
-     BUFFERPUTC(*s++);
+        if (isspace(*s)) {
+           BUFFERPUTC(' ');
+           do ++s; while (s < e && isspace(*s));
+        } else
+          BUFFERPUTC(*s++);

       }
    } else {
       const char *s = text;
       while (*s)
       }
    } else {
       const char *s = text;
       while (*s)

-  BUFFERPUTC(*s++);
+       BUFFERPUTC(*s++);

    }
    BUFFERDONE;
 }
    }
    BUFFERDONE;
 }


@@ -1286,7 +1286,7 @@ static void pushbuffer(int p)
 {
     ck_ilimit();
     indexstack[inext++] = p;
 {
     ck_ilimit();
     indexstack[inext++] = p;

-    indexstack[inext++] = bnext;
+    indexstack[inext++] = bnext;    

 }
 
 static int popbuffer(void)
 }
 
 static int popbuffer(void)


@@ -1310,18 +1310,18 @@ static int popbuffer(void)
 /* Miscellaneous. */
 /* Parser states (flex `exclusive start conditions'):
  *
 /* Miscellaneous. */
 /* Parser states (flex `exclusive start conditions'):
  *

- * PROLOG  the XML prolog of the document before <?xml...>
- * DOCTYPE  the XML prolog of the document after <?xml...>
- * EPILOG  after the root element
- * INCOMMENT  inside an XML comment <!--....-->
- * INPI    inside an XML PI <?...?>
- * VALUE1  inside a '...'-delimited literal
- * VALUE2  inside a "..."-delimited literal
- * CDATA  inside a <![CDATA[...] ]> section.
- * ROOT_<tag>  expect root element <tag>
- * AL_<tag>  inside the attribute list for <tag>
- * IN_<tag>  inside a <tag> with element contents (ready for end tag)
- * IMPOSSIBLE  dummy to permit disabling rules; must be last
+ * PROLOG      the XML prolog of the document before <?xml...>
+ * DOCTYPE     the XML prolog of the document after <?xml...>
+ * EPILOG      after the root element
+ * INCOMMENT   inside an XML comment <!--....-->
+ * INPI                inside an XML PI <?...?>
+ * VALUE1      inside a '...'-delimited literal
+ * VALUE2      inside a "..."-delimited literal
+ * CDATA       inside a <![CDATA[...] ]> section.
+ * ROOT_<tag>  expect root element <tag>
+ * AL_<tag>    inside the attribute list for <tag>
+ * IN_<tag>    inside a <tag> with element contents (ready for end tag)
+ * IMPOSSIBLE  dummy to permit disabling rules; must be last

  */
 
 /* State names. */
  */
 
 /* State names. */


@@ -1336,21 +1336,21 @@ const char* *graphxml_statenames=NULL;
 #define VALUE1 6
 #define VALUE2 7
 #define CDATA 8
 #define VALUE1 6
 #define VALUE2 7
 #define CDATA 8

-#define ROOT_graphxml_graph 9
-#define AL_graphxml_graph 10
-#define S_graphxml_graph 11
-#define S_graphxml_graph_1 12
-#define S_graphxml_graph_2 13
-#define S_graphxml_graph_3 14
-#define S_graphxml_graph_4 15
-#define S_graphxml_graph_5 16
-#define E_graphxml_graph 17
-#define ROOT_graphxml_node 18
-#define AL_graphxml_node 19
-#define E_graphxml_node 20
-#define ROOT_graphxml_edge 21
-#define AL_graphxml_edge 22
-#define E_graphxml_edge 23
+#define ROOT_graphxml_edge 9
+#define AL_graphxml_edge 10
+#define E_graphxml_edge 11
+#define ROOT_graphxml_graph 12
+#define AL_graphxml_graph 13
+#define S_graphxml_graph 14
+#define S_graphxml_graph_1 15
+#define S_graphxml_graph_2 16
+#define S_graphxml_graph_3 17
+#define S_graphxml_graph_4 18
+#define S_graphxml_graph_5 19
+#define E_graphxml_graph 20
+#define ROOT_graphxml_node 21
+#define AL_graphxml_node 22
+#define E_graphxml_node 23

 #define IMPOSSIBLE 24
 
 #ifndef YY_NO_UNISTD_H
 #define IMPOSSIBLE 24
 
 #ifndef YY_NO_UNISTD_H


@@ -1436,11 +1436,11 @@ static int input (void );
         static int yy_start_stack_ptr = 0;
         static int yy_start_stack_depth = 0;
         static int *yy_start_stack = NULL;
         static int yy_start_stack_ptr = 0;
         static int yy_start_stack_depth = 0;
         static int *yy_start_stack = NULL;

-
+    

     static void yy_push_state (int new_state );
     static void yy_push_state (int new_state );

-
+    

     static void yy_pop_state (void );
     static void yy_pop_state (void );

-
+    

 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
 #ifdef __ia64__
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
 #ifdef __ia64__


@@ -1464,33 +1464,33 @@ static int input (void );
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \
  */
 #ifndef YY_INPUT
 #define YY_INPUT(buf,result,max_size) \

-  if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
-    { \
-    int c = '*'; \
-    size_t n; \
-    for ( n = 0; n < max_size && \
-           (c = getc( xbt_graph_parse_in )) != EOF && c != '\n'; ++n ) \
-      buf[n] = (char) c; \
-    if ( c == '\n' ) \
-      buf[n++] = (char) c; \
-    if ( c == EOF && ferror( xbt_graph_parse_in ) ) \
-      YY_FATAL_ERROR( "input in flex scanner failed" ); \
-    result = n; \
-    } \
-  else \
-    { \
-    errno=0; \
-    while ( (result = fread(buf, 1, max_size, xbt_graph_parse_in))==0 && ferror(xbt_graph_parse_in)) \
-      { \
-      if( errno != EINTR) \
-        { \
-        YY_FATAL_ERROR( "input in flex scanner failed" ); \
-        break; \
-        } \
-      errno=0; \
-      clearerr(xbt_graph_parse_in); \
-      } \
-    }\
+       if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+               { \
+               int c = '*'; \
+               size_t n; \
+               for ( n = 0; n < max_size && \
+                            (c = getc( xbt_graph_parse_in )) != EOF && c != '\n'; ++n ) \
+                       buf[n] = (char) c; \
+               if ( c == '\n' ) \
+                       buf[n++] = (char) c; \
+               if ( c == EOF && ferror( xbt_graph_parse_in ) ) \
+                       YY_FATAL_ERROR( "input in flex scanner failed" ); \
+               result = n; \
+               } \
+       else \
+               { \
+               errno=0; \
+               while ( (result = fread(buf, 1, max_size, xbt_graph_parse_in))==0 && ferror(xbt_graph_parse_in)) \
+                       { \
+                       if( errno != EINTR) \
+                               { \
+                               YY_FATAL_ERROR( "input in flex scanner failed" ); \
+                               break; \
+                               } \
+                       errno=0; \
+                       clearerr(xbt_graph_parse_in); \
+                       } \
+               }\

 \
 
 #endif
 \
 
 #endif


@@ -1539,43 +1539,43 @@ extern int xbt_graph_parse_lex (void);
 #endif
 
 #define YY_RULE_SETUP \
 #endif
 
 #define YY_RULE_SETUP \

-  YY_USER_ACTION
+       YY_USER_ACTION

 
 /** The main scanner function which does all the work.
  */
 YY_DECL
 {
 
 /** The main scanner function which does all the work.
  */
 YY_DECL
 {

-  yy_state_type yy_current_state;
-  char *yy_cp, *yy_bp;
-  int yy_act;
-
-  if ( !(yy_init) )
-    {
-    (yy_init) = 1;
+       yy_state_type yy_current_state;
+       char *yy_cp, *yy_bp;
+       int yy_act;
+    
+       if ( !(yy_init) )
+               {
+               (yy_init) = 1;

 
 #ifdef YY_USER_INIT
 
 #ifdef YY_USER_INIT

-    YY_USER_INIT;
+               YY_USER_INIT;

 #endif
 
 #endif
 

-    if ( ! (yy_start) )
-      (yy_start) = 1;  /* first start state */
+               if ( ! (yy_start) )
+                       (yy_start) = 1; /* first start state */

 
 

-    if ( ! xbt_graph_parse_in )
-      xbt_graph_parse_in = stdin;
+               if ( ! xbt_graph_parse_in )
+                       xbt_graph_parse_in = stdin;

 
 

-    if ( ! xbt_graph_parse_out )
-      xbt_graph_parse_out = stdout;
+               if ( ! xbt_graph_parse_out )
+                       xbt_graph_parse_out = stdout;

 
 

-    if ( ! YY_CURRENT_BUFFER ) {
-      xbt_graph_parse_ensure_buffer_stack ();
-      YY_CURRENT_BUFFER_LVALUE =
-        xbt_graph_parse__create_buffer(xbt_graph_parse_in,YY_BUF_SIZE );
-    }
+               if ( ! YY_CURRENT_BUFFER ) {
+                       xbt_graph_parse_ensure_buffer_stack ();
+                       YY_CURRENT_BUFFER_LVALUE =
+                               xbt_graph_parse__create_buffer(xbt_graph_parse_in,YY_BUF_SIZE );
+               }

 
 

-    xbt_graph_parse__load_buffer_state( );
-    }
+               xbt_graph_parse__load_buffer_state( );
+               }

 
 

-  {
+       {

 
  /* Bypass Flex's default INITIAL state and begin by parsing the XML prolog. */
  SET(PROLOG);
 
  /* Bypass Flex's default INITIAL state and begin by parsing the XML prolog. */
  SET(PROLOG);


@@ -1609,6 +1609,9 @@ YY_DECL
   graphxml_statenames[VALUE1] = NULL;
   graphxml_statenames[VALUE2] = NULL;
   graphxml_statenames[CDATA] = NULL;
   graphxml_statenames[VALUE1] = NULL;
   graphxml_statenames[VALUE2] = NULL;
   graphxml_statenames[CDATA] = NULL;

+  graphxml_statenames[ROOT_graphxml_edge] = NULL;
+  graphxml_statenames[AL_graphxml_edge] = NULL;
+  graphxml_statenames[E_graphxml_edge] = "edge";

   graphxml_statenames[ROOT_graphxml_graph] = NULL;
   graphxml_statenames[AL_graphxml_graph] = NULL;
   graphxml_statenames[S_graphxml_graph] = "graph";
   graphxml_statenames[ROOT_graphxml_graph] = NULL;
   graphxml_statenames[AL_graphxml_graph] = NULL;
   graphxml_statenames[S_graphxml_graph] = "graph";


@@ -1621,547 +1624,544 @@ YY_DECL
   graphxml_statenames[ROOT_graphxml_node] = NULL;
   graphxml_statenames[AL_graphxml_node] = NULL;
   graphxml_statenames[E_graphxml_node] = "node";
   graphxml_statenames[ROOT_graphxml_node] = NULL;
   graphxml_statenames[AL_graphxml_node] = NULL;
   graphxml_statenames[E_graphxml_node] = "node";

-  graphxml_statenames[ROOT_graphxml_edge] = NULL;
-  graphxml_statenames[AL_graphxml_edge] = NULL;
-  graphxml_statenames[E_graphxml_edge] = "edge";

   }
 
  /* COMMENTS and PIs: handled uniformly for efficiency. */
 
   }
 
  /* COMMENTS and PIs: handled uniformly for efficiency. */
 

-  while ( 1 )    /* loops until end-of-file is reached */
-    {
-    yy_cp = (yy_c_buf_p);
+       while ( 1 )             /* loops until end-of-file is reached */
+               {
+               yy_cp = (yy_c_buf_p);

 
 

-    /* Support of xbt_graph_parse_text. */
-    *yy_cp = (yy_hold_char);
+               /* Support of xbt_graph_parse_text. */
+               *yy_cp = (yy_hold_char);

 
 

-    /* yy_bp points to the position in yy_ch_buf of the start of
-     * the current run.
-     */
-    yy_bp = yy_cp;
+               /* yy_bp points to the position in yy_ch_buf of the start of
+                * the current run.
+                */
+               yy_bp = yy_cp;

 
 

-    yy_current_state = (yy_start);
+               yy_current_state = (yy_start);

 yy_match:
 yy_match:

-    do
-      {
-      YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
-      if ( yy_accept[yy_current_state] )
-        {
-        (yy_last_accepting_state) = yy_current_state;
-        (yy_last_accepting_cpos) = yy_cp;
-        }
-      while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-        {
-        yy_current_state = (int) yy_def[yy_current_state];
-        if ( yy_current_state >= 564 )
-          yy_c = yy_meta[(unsigned int) yy_c];
-        }
-      yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-      ++yy_cp;
-      }
-    while ( yy_base[yy_current_state] != 1586 );
+               do
+                       {
+                       YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
+                       if ( yy_accept[yy_current_state] )
+                               {
+                               (yy_last_accepting_state) = yy_current_state;
+                               (yy_last_accepting_cpos) = yy_cp;
+                               }
+                       while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+                               {
+                               yy_current_state = (int) yy_def[yy_current_state];
+                               if ( yy_current_state >= 564 )
+                                       yy_c = yy_meta[(unsigned int) yy_c];
+                               }
+                       yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+                       ++yy_cp;
+                       }
+               while ( yy_base[yy_current_state] != 1586 );

 
 yy_find_action:
 
 yy_find_action:

-    yy_act = yy_accept[yy_current_state];
-    if ( yy_act == 0 )
-      { /* have to back up */
-      yy_cp = (yy_last_accepting_cpos);
-      yy_current_state = (yy_last_accepting_state);
-      yy_act = yy_accept[yy_current_state];
-      }
-
-    YY_DO_BEFORE_ACTION;
-
-    if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
-      {
-      yy_size_t yyl;
-      for ( yyl = 0; yyl < xbt_graph_parse_leng; ++yyl )
-        if ( xbt_graph_parse_text[yyl] == '\n' )
-
+               yy_act = yy_accept[yy_current_state];
+               if ( yy_act == 0 )
+                       { /* have to back up */
+                       yy_cp = (yy_last_accepting_cpos);
+                       yy_current_state = (yy_last_accepting_state);
+                       yy_act = yy_accept[yy_current_state];
+                       }
+
+               YY_DO_BEFORE_ACTION;
+
+               if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
+                       {
+                       yy_size_t yyl;
+                       for ( yyl = 0; yyl < xbt_graph_parse_leng; ++yyl )
+                               if ( xbt_graph_parse_text[yyl] == '\n' )
+                                          

     xbt_graph_parse_lineno++;
 ;
     xbt_graph_parse_lineno++;
 ;

-      }
+                       }

 
 

-do_action:  /* This label is used only to access EOF actions. */
+do_action:     /* This label is used only to access EOF actions. */

 
 

-    switch ( yy_act )
-  { /* beginning of action switch */
-      case 0: /* must back up */
-      /* undo the effects of YY_DO_BEFORE_ACTION */
-      *yy_cp = (yy_hold_char);
-      yy_cp = (yy_last_accepting_cpos);
-      yy_current_state = (yy_last_accepting_state);
-      goto yy_find_action;
+               switch ( yy_act )
+       { /* beginning of action switch */
+                       case 0: /* must back up */
+                       /* undo the effects of YY_DO_BEFORE_ACTION */
+                       *yy_cp = (yy_hold_char);
+                       yy_cp = (yy_last_accepting_cpos);
+                       yy_current_state = (yy_last_accepting_state);
+                       goto yy_find_action;

 
 case 1:
 YY_RULE_SETUP
 ENTER(INCOMMENT);
 
 case 1:
 YY_RULE_SETUP
 ENTER(INCOMMENT);

-  YY_BREAK
+       YY_BREAK

 case 2:
 YY_RULE_SETUP
 ENTER(INPI);
 case 2:
 YY_RULE_SETUP
 ENTER(INPI);

-  YY_BREAK
+       YY_BREAK

 
 case 3:
 YY_RULE_SETUP
 LEAVE;
 
 case 3:
 YY_RULE_SETUP
 LEAVE;

-  YY_BREAK
+       YY_BREAK

 case 4:
 case 5:
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
 SKIP;
 case 4:
 case 5:
 case 6:
 /* rule 6 can match eol */
 YY_RULE_SETUP
 SKIP;

-  YY_BREAK
+       YY_BREAK

 case YY_STATE_EOF(INCOMMENT):
 FAIL("EOF in comment.");
 case YY_STATE_EOF(INCOMMENT):
 FAIL("EOF in comment.");

-  YY_BREAK
+       YY_BREAK

 
 case 7:
 YY_RULE_SETUP
 LEAVE;
 
 case 7:
 YY_RULE_SETUP
 LEAVE;

-  YY_BREAK
+       YY_BREAK

 case 8:
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
 SKIP;
 case 8:
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
 SKIP;

-  YY_BREAK
+       YY_BREAK

 case YY_STATE_EOF(INPI):
 FAIL("EOF in PI (processing instruction).");
 case YY_STATE_EOF(INPI):
 FAIL("EOF in PI (processing instruction).");

-  YY_BREAK
+       YY_BREAK

 
 /* SPACES: skipped uniformly */
 case 10:
 /* rule 10 can match eol */
 YY_RULE_SETUP
 SKIP;
 
 /* SPACES: skipped uniformly */
 case 10:
 /* rule 10 can match eol */
 YY_RULE_SETUP
 SKIP;

-  YY_BREAK
+       YY_BREAK

 /* PROLOG: determine root element and process it. */
 
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
 /* PROLOG: determine root element and process it. */
 
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP

-SET(DOCTYPE);
-  YY_BREAK
+SET(DOCTYPE); 
+       YY_BREAK

 case 12:
 /* rule 12 can match eol */
 YY_RULE_SETUP
 FAIL("Bad declaration %s.",xbt_graph_parse_text);
 case 12:
 /* rule 12 can match eol */
 YY_RULE_SETUP
 FAIL("Bad declaration %s.",xbt_graph_parse_text);

-  YY_BREAK
+       YY_BREAK

 
 case 13:
 /* rule 13 can match eol */
 YY_RULE_SETUP
 
 case 13:
 /* rule 13 can match eol */
 YY_RULE_SETUP

-SET(ROOT_graphxml_graph);
-  YY_BREAK
+SET(ROOT_graphxml_edge);
+       YY_BREAK

 case 14:
 /* rule 14 can match eol */
 YY_RULE_SETUP
 case 14:
 /* rule 14 can match eol */
 YY_RULE_SETUP

-SET(ROOT_graphxml_edge);
-  YY_BREAK
+SET(ROOT_graphxml_graph);
+       YY_BREAK

 case 15:
 /* rule 15 can match eol */
 YY_RULE_SETUP
 SET(ROOT_graphxml_node);
 case 15:
 /* rule 15 can match eol */
 YY_RULE_SETUP
 SET(ROOT_graphxml_node);

-  YY_BREAK
+       YY_BREAK

 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
 FAIL("Bad declaration %s.",xbt_graph_parse_text);
 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
 FAIL("Bad declaration %s.",xbt_graph_parse_text);

-  YY_BREAK
+       YY_BREAK

 case 17:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c' in prolog.", xbt_graph_parse_text[0]);
 case 17:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c' in prolog.", xbt_graph_parse_text[0]);

-  YY_BREAK
+       YY_BREAK

 case YY_STATE_EOF(PROLOG):
 case YY_STATE_EOF(DOCTYPE):
 FAIL("EOF in prolog.");
 case YY_STATE_EOF(PROLOG):
 case YY_STATE_EOF(DOCTYPE):
 FAIL("EOF in prolog.");

-  YY_BREAK
+       YY_BREAK

 
 /* RULES DERIVED FROM DTD. */
 
 /* RULES DERIVED FROM DTD. */

-/* <!-- Small DTD for xbt graphs. -->  */
-/*     isDirected (true|false) "true"
+/*     label           CDATA                ""
+  *     name            CDATA               #IMPLIED
+  *     source          CDATA               #REQUIRED
+  *     target          CDATA               #REQUIRED
+  *     length          CDATA               "-1.0"
+  *     data            CDATA               ""

   * >  */
 case 18:
 /* rule 18 can match eol */
 YY_RULE_SETUP
   * >  */
 case 18:
 /* rule 18 can match eol */
 YY_RULE_SETUP

-FAIL("Starting tag <graph> is not allowed here.");
-  YY_BREAK
+FAIL("Starting tag <edge> is not allowed here.");
+       YY_BREAK

 case 19:
 /* rule 19 can match eol */
 YY_RULE_SETUP
 {
 case 19:
 /* rule 19 can match eol */
 YY_RULE_SETUP
 {

-  AX_graphxml_graph_isDirected = A_graphxml_graph_isDirected_true;
-  graphxml_graph_isDirected_isset = 0;
-  ENTER(AL_graphxml_graph); pushbuffer(0);
+  AX_graphxml_edge_data = 0;
+  graphxml_edge_data_isset = 0;
+  AX_graphxml_edge_label = 0;
+  graphxml_edge_label_isset = 0;
+  AX_graphxml_edge_length = 11;
+  graphxml_edge_length_isset = 0;
+  AX_graphxml_edge_name = 0;
+  graphxml_edge_name_isset = 0;
+  AX_graphxml_edge_source = 0;
+  graphxml_edge_source_isset = 0;
+  AX_graphxml_edge_target = 0;
+  graphxml_edge_target_isset = 0;
+  ENTER(AL_graphxml_edge); pushbuffer(0);

   }
   }

-  YY_BREAK
+       YY_BREAK

 
 case 20:
 /* rule 20 can match eol */
 
 case 20:
 /* rule 20 can match eol */

+YY_RULE_SETUP
+if (graphxml_edge_data_isset != 0) {FAIL("Multiple definition of attribute data in <graphxml_edge>");} graphxml_edge_data_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_data);
+       YY_BREAK

 case 21:
 /* rule 21 can match eol */
 YY_RULE_SETUP
 case 21:
 /* rule 21 can match eol */
 YY_RULE_SETUP

-A_graphxml_graph_isDirected = A_graphxml_graph_isDirected_true;
-  YY_BREAK
+if (graphxml_edge_data_isset != 0) {FAIL("Multiple definition of attribute data in <graphxml_edge>");}  graphxml_edge_data_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_data);
+       YY_BREAK

 case 22:
 /* rule 22 can match eol */
 case 22:
 /* rule 22 can match eol */

+YY_RULE_SETUP
+if (graphxml_edge_label_isset != 0) {FAIL("Multiple definition of attribute label in <graphxml_edge>");} graphxml_edge_label_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_label);
+       YY_BREAK

 case 23:
 /* rule 23 can match eol */
 YY_RULE_SETUP
 case 23:
 /* rule 23 can match eol */
 YY_RULE_SETUP

-A_graphxml_graph_isDirected = A_graphxml_graph_isDirected_false;
-  YY_BREAK
+if (graphxml_edge_label_isset != 0) {FAIL("Multiple definition of attribute label in <graphxml_edge>");}  graphxml_edge_label_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_label);
+       YY_BREAK

 case 24:
 case 24:

+/* rule 24 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  LEAVE; STag_graphxml_graph();graphxml_pcdata_ix = 0; ENTER(S_graphxml_graph);
- }
-  YY_BREAK
+if (graphxml_edge_length_isset != 0) {FAIL("Multiple definition of attribute length in <graphxml_edge>");} graphxml_edge_length_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_length);
+       YY_BREAK

 case 25:
 case 25:

+/* rule 25 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  LEAVE; STag_graphxml_graph(); graphxml_pcdata_ix = 0; ETag_graphxml_graph(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case ROOT_graphxml_graph: SET(EPILOG); break;
-  }
- }
-  YY_BREAK
+if (graphxml_edge_length_isset != 0) {FAIL("Multiple definition of attribute length in <graphxml_edge>");}  graphxml_edge_length_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_length);
+       YY_BREAK

 case 26:
 case 26:

+/* rule 26 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of graph element.", xbt_graph_parse_text[0]);
-  YY_BREAK
+if (graphxml_edge_name_isset != 0) {FAIL("Multiple definition of attribute name in <graphxml_edge>");} graphxml_edge_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_name);
+       YY_BREAK

 case 27:
 case 27:

+/* rule 27 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `graph' element start tag.",xbt_graph_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_graphxml_graph):
-FAIL("EOF in attribute list of `graph' element.");
-  YY_BREAK
-
+if (graphxml_edge_name_isset != 0) {FAIL("Multiple definition of attribute name in <graphxml_edge>");}  graphxml_edge_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_name);
+       YY_BREAK

 case 28:
 /* rule 28 can match eol */
 YY_RULE_SETUP
 case 28:
 /* rule 28 can match eol */
 YY_RULE_SETUP

-{
-  LEAVE;
-  ETag_graphxml_graph();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case ROOT_graphxml_graph: SET(EPILOG); break;
-  }
- }
-  YY_BREAK
+if (graphxml_edge_source_isset != 0) {FAIL("Multiple definition of attribute source in <graphxml_edge>");} graphxml_edge_source_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_source);
+       YY_BREAK

 case 29:
 /* rule 29 can match eol */
 YY_RULE_SETUP
 case 29:
 /* rule 29 can match eol */
 YY_RULE_SETUP

-FAIL("Unexpected end-tag `%s': `</graph>' expected.",xbt_graph_parse_text);
-  YY_BREAK
+if (graphxml_edge_source_isset != 0) {FAIL("Multiple definition of attribute source in <graphxml_edge>");}  graphxml_edge_source_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_source);
+       YY_BREAK

 case 30:
 case 30:

+/* rule 30 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</graph>' expected.",xbt_graph_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_graphxml_graph):
-case YY_STATE_EOF(E_graphxml_graph):
-case YY_STATE_EOF(S_graphxml_graph_3):
-case YY_STATE_EOF(S_graphxml_graph_5):
-case YY_STATE_EOF(S_graphxml_graph_1):
-FAIL("Premature EOF: `</graph>' expected.");
-  YY_BREAK
-
-/*     label           CDATA                ""
-  *     name            CDATA                #REQUIRED
-  *     data            CDATA                ""
-  *     position_x      CDATA     "-1.0"
-  *     position_y      CDATA     "-1.0"
-  * >  */
+if (graphxml_edge_target_isset != 0) {FAIL("Multiple definition of attribute target in <graphxml_edge>");} graphxml_edge_target_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_target);
+       YY_BREAK

 case 31:
 /* rule 31 can match eol */
 YY_RULE_SETUP
 case 31:
 /* rule 31 can match eol */
 YY_RULE_SETUP

-FAIL("Starting tag <node> is not allowed here.");
-  YY_BREAK
+if (graphxml_edge_target_isset != 0) {FAIL("Multiple definition of attribute target in <graphxml_edge>");}  graphxml_edge_target_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_target);
+       YY_BREAK

 case 32:
 case 32:

-/* rule 32 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  AX_graphxml_node_label = 0;
-  graphxml_node_label_isset = 0;
-  AX_graphxml_node_name = 0;
-  graphxml_node_name_isset = 0;
-  AX_graphxml_node_data = 0;
-  graphxml_node_data_isset = 0;
-  AX_graphxml_node_position___x = 1;
-  graphxml_node_position___x_isset = 0;
-  AX_graphxml_node_position___y = 6;
-  graphxml_node_position___y_isset = 0;
-  ENTER(AL_graphxml_node); pushbuffer(0);
-  }
-  YY_BREAK
-
+  if (!AX_graphxml_edge_source) FAIL("Required attribute `source' not set for `edge' element.");
+  if (!AX_graphxml_edge_target) FAIL("Required attribute `target' not set for `edge' element.");
+  LEAVE; STag_graphxml_edge();graphxml_pcdata_ix = 0; ENTER(E_graphxml_edge);
+ }
+       YY_BREAK

 case 33:
 case 33:

-/* rule 33 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (graphxml_node_label_isset != 0) {FAIL("Multiple definition of attribute label in <graphxml_node>");} graphxml_node_label_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_label);
-  YY_BREAK
+{
+  if (!AX_graphxml_edge_source) FAIL("Required attribute `source' not set for `edge' element.");
+  if (!AX_graphxml_edge_target) FAIL("Required attribute `target' not set for `edge' element.");
+  LEAVE; STag_graphxml_edge(); graphxml_pcdata_ix = 0; ETag_graphxml_edge(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case ROOT_graphxml_edge: SET(EPILOG); break;
+   case S_graphxml_graph: case S_graphxml_graph_1: case S_graphxml_graph_3: case S_graphxml_graph_4: case S_graphxml_graph_5: SET(S_graphxml_graph_5); break;
+  }
+ }
+       YY_BREAK

 case 34:
 case 34:

-/* rule 34 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (graphxml_node_label_isset != 0) {FAIL("Multiple definition of attribute label in <graphxml_node>");}  graphxml_node_label_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_label);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of edge element.", xbt_graph_parse_text[0]);
+       YY_BREAK

 case 35:
 case 35:

-/* rule 35 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (graphxml_node_name_isset != 0) {FAIL("Multiple definition of attribute name in <graphxml_node>");} graphxml_node_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_name);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `edge' element start tag.",xbt_graph_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_graphxml_edge):
+FAIL("EOF in attribute list of `edge' element.");
+       YY_BREAK
+

 case 36:
 /* rule 36 can match eol */
 YY_RULE_SETUP
 case 36:
 /* rule 36 can match eol */
 YY_RULE_SETUP

-if (graphxml_node_name_isset != 0) {FAIL("Multiple definition of attribute name in <graphxml_node>");}  graphxml_node_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_name);
-  YY_BREAK
+{
+  LEAVE;
+  ETag_graphxml_edge();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case ROOT_graphxml_edge: SET(EPILOG); break;
+   case S_graphxml_graph: case S_graphxml_graph_1: case S_graphxml_graph_3: case S_graphxml_graph_4: case S_graphxml_graph_5: SET(S_graphxml_graph_5); break;
+  }
+ }
+       YY_BREAK

 case 37:
 /* rule 37 can match eol */
 YY_RULE_SETUP
 case 37:
 /* rule 37 can match eol */
 YY_RULE_SETUP

-if (graphxml_node_data_isset != 0) {FAIL("Multiple definition of attribute data in <graphxml_node>");} graphxml_node_data_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_data);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</edge>' expected.",xbt_graph_parse_text);
+       YY_BREAK

 case 38:
 case 38:

-/* rule 38 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (graphxml_node_data_isset != 0) {FAIL("Multiple definition of attribute data in <graphxml_node>");}  graphxml_node_data_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_data);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</edge>' expected.",xbt_graph_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_graphxml_edge):
+FAIL("Premature EOF: `</edge>' expected.");
+       YY_BREAK
+
+/* <!-- Small DTD for xbt graphs. -->  */
+/*     isDirected (true|false) "true"
+  * >  */

 case 39:
 /* rule 39 can match eol */
 YY_RULE_SETUP
 case 39:
 /* rule 39 can match eol */
 YY_RULE_SETUP

-if (graphxml_node_position___x_isset != 0) {FAIL("Multiple definition of attribute position_x in <graphxml_node>");} graphxml_node_position___x_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_position___x);
-  YY_BREAK
+FAIL("Starting tag <graph> is not allowed here.");
+       YY_BREAK

 case 40:
 /* rule 40 can match eol */
 YY_RULE_SETUP
 case 40:
 /* rule 40 can match eol */
 YY_RULE_SETUP

-if (graphxml_node_position___x_isset != 0) {FAIL("Multiple definition of attribute position_x in <graphxml_node>");}  graphxml_node_position___x_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_position___x);
-  YY_BREAK
+{
+  AX_graphxml_graph_isDirected = A_graphxml_graph_isDirected_true;
+  graphxml_graph_isDirected_isset = 0;
+  ENTER(AL_graphxml_graph); pushbuffer(0);
+  }
+       YY_BREAK
+

 case 41:
 /* rule 41 can match eol */
 case 41:
 /* rule 41 can match eol */

-YY_RULE_SETUP
-if (graphxml_node_position___y_isset != 0) {FAIL("Multiple definition of attribute position_y in <graphxml_node>");} graphxml_node_position___y_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_position___y);
-  YY_BREAK

 case 42:
 /* rule 42 can match eol */
 YY_RULE_SETUP
 case 42:
 /* rule 42 can match eol */
 YY_RULE_SETUP

-if (graphxml_node_position___y_isset != 0) {FAIL("Multiple definition of attribute position_y in <graphxml_node>");}  graphxml_node_position___y_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_position___y);
-  YY_BREAK
+A_graphxml_graph_isDirected = A_graphxml_graph_isDirected_true;
+       YY_BREAK

 case 43:
 case 43:

+/* rule 43 can match eol */
+case 44:
+/* rule 44 can match eol */
+YY_RULE_SETUP
+A_graphxml_graph_isDirected = A_graphxml_graph_isDirected_false;
+       YY_BREAK
+case 45:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_graphxml_node_name) FAIL("Required attribute `name' not set for `node' element.");
-  LEAVE; STag_graphxml_node();graphxml_pcdata_ix = 0; ENTER(E_graphxml_node);
+  LEAVE; STag_graphxml_graph();graphxml_pcdata_ix = 0; ENTER(S_graphxml_graph);

  }
  }

-  YY_BREAK
-case 44:
+       YY_BREAK
+case 46:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_graphxml_node_name) FAIL("Required attribute `name' not set for `node' element.");
-  LEAVE; STag_graphxml_node(); graphxml_pcdata_ix = 0; ETag_graphxml_node(); popbuffer(); /* attribute */
+  LEAVE; STag_graphxml_graph(); graphxml_pcdata_ix = 0; ETag_graphxml_graph(); popbuffer(); /* attribute */

   switch (YY_START) {
   switch (YY_START) {

-   case S_graphxml_graph: case S_graphxml_graph_2: case S_graphxml_graph_3: SET(S_graphxml_graph_3); break;
-   case ROOT_graphxml_node: SET(EPILOG); break;
+   case ROOT_graphxml_graph: SET(EPILOG); break;

   }
  }
   }
  }

-  YY_BREAK
-case 45:
+       YY_BREAK
+case 47:

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of node element.", xbt_graph_parse_text[0]);
-  YY_BREAK
-case 46:
+FAIL("Unexpected character `%c' in attribute list of graph element.", xbt_graph_parse_text[0]);
+       YY_BREAK
+case 48:

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `node' element start tag.",xbt_graph_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_graphxml_node):
-FAIL("EOF in attribute list of `node' element.");
-  YY_BREAK
+FAIL("Bad attribute `%s' in `graph' element start tag.",xbt_graph_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_graphxml_graph):
+FAIL("EOF in attribute list of `graph' element.");
+       YY_BREAK

 
 

-case 47:
-/* rule 47 can match eol */
+case 49:
+/* rule 49 can match eol */

 YY_RULE_SETUP
 {
   LEAVE;
 YY_RULE_SETUP
 {
   LEAVE;

-  ETag_graphxml_node();
+  ETag_graphxml_graph();

   popbuffer(); /* attribute */
   switch (YY_START) {
   popbuffer(); /* attribute */
   switch (YY_START) {

-   case S_graphxml_graph: case S_graphxml_graph_2: case S_graphxml_graph_3: SET(S_graphxml_graph_3); break;
-   case ROOT_graphxml_node: SET(EPILOG); break;
+   case ROOT_graphxml_graph: SET(EPILOG); break;

   }
  }
   }
  }

-  YY_BREAK
-case 48:
-/* rule 48 can match eol */
-YY_RULE_SETUP
-FAIL("Unexpected end-tag `%s': `</node>' expected.",xbt_graph_parse_text);
-  YY_BREAK
-case 49:
-YY_RULE_SETUP
-FAIL("Unexpected character `%c': `</node>' expected.",xbt_graph_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_graphxml_node):
-FAIL("Premature EOF: `</node>' expected.");
-  YY_BREAK
-
-/*     label           CDATA                ""
-  *     name            CDATA               #IMPLIED
-  *     source          CDATA               #REQUIRED
-  *     target          CDATA               #REQUIRED
-  *     length          CDATA               "-1.0"
-  *     data            CDATA               ""
-  * >  */
+       YY_BREAK

 case 50:
 /* rule 50 can match eol */
 YY_RULE_SETUP
 case 50:
 /* rule 50 can match eol */
 YY_RULE_SETUP

-FAIL("Starting tag <edge> is not allowed here.");
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</graph>' expected.",xbt_graph_parse_text);
+       YY_BREAK

 case 51:
 case 51:

-/* rule 51 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  AX_graphxml_edge_label = 0;
-  graphxml_edge_label_isset = 0;
-  AX_graphxml_edge_name = 0;
-  graphxml_edge_name_isset = 0;
-  AX_graphxml_edge_source = 0;
-  graphxml_edge_source_isset = 0;
-  AX_graphxml_edge_target = 0;
-  graphxml_edge_target_isset = 0;
-  AX_graphxml_edge_length = 11;
-  graphxml_edge_length_isset = 0;
-  AX_graphxml_edge_data = 0;
-  graphxml_edge_data_isset = 0;
-  ENTER(AL_graphxml_edge); pushbuffer(0);
-  }
-  YY_BREAK
+FAIL("Unexpected character `%c': `</graph>' expected.",xbt_graph_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_graphxml_graph):
+case YY_STATE_EOF(S_graphxml_graph):
+case YY_STATE_EOF(S_graphxml_graph_1):
+case YY_STATE_EOF(S_graphxml_graph_3):
+case YY_STATE_EOF(S_graphxml_graph_5):
+FAIL("Premature EOF: `</graph>' expected.");
+       YY_BREAK

 
 

+/*     label           CDATA                ""
+  *     name            CDATA                #REQUIRED
+  *     data            CDATA                ""
+  *     position_x         CDATA                "-1.0"
+  *     position_y         CDATA                "-1.0"
+  * >  */

 case 52:
 /* rule 52 can match eol */
 YY_RULE_SETUP
 case 52:
 /* rule 52 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_label_isset != 0) {FAIL("Multiple definition of attribute label in <graphxml_edge>");} graphxml_edge_label_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_label);
-  YY_BREAK
+FAIL("Starting tag <node> is not allowed here.");
+       YY_BREAK

 case 53:
 /* rule 53 can match eol */
 YY_RULE_SETUP
 case 53:
 /* rule 53 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_label_isset != 0) {FAIL("Multiple definition of attribute label in <graphxml_edge>");}  graphxml_edge_label_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_label);
-  YY_BREAK
+{
+  AX_graphxml_node_data = 0;
+  graphxml_node_data_isset = 0;
+  AX_graphxml_node_label = 0;
+  graphxml_node_label_isset = 0;
+  AX_graphxml_node_name = 0;
+  graphxml_node_name_isset = 0;
+  AX_graphxml_node_position___x = 1;
+  graphxml_node_position___x_isset = 0;
+  AX_graphxml_node_position___y = 6;
+  graphxml_node_position___y_isset = 0;
+  ENTER(AL_graphxml_node); pushbuffer(0);
+  }
+       YY_BREAK
+

 case 54:
 /* rule 54 can match eol */
 YY_RULE_SETUP
 case 54:
 /* rule 54 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_name_isset != 0) {FAIL("Multiple definition of attribute name in <graphxml_edge>");} graphxml_edge_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_name);
-  YY_BREAK
+if (graphxml_node_data_isset != 0) {FAIL("Multiple definition of attribute data in <graphxml_node>");} graphxml_node_data_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_data);
+       YY_BREAK

 case 55:
 /* rule 55 can match eol */
 YY_RULE_SETUP
 case 55:
 /* rule 55 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_name_isset != 0) {FAIL("Multiple definition of attribute name in <graphxml_edge>");}  graphxml_edge_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_name);
-  YY_BREAK
+if (graphxml_node_data_isset != 0) {FAIL("Multiple definition of attribute data in <graphxml_node>");}  graphxml_node_data_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_data);
+       YY_BREAK

 case 56:
 /* rule 56 can match eol */
 YY_RULE_SETUP
 case 56:
 /* rule 56 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_source_isset != 0) {FAIL("Multiple definition of attribute source in <graphxml_edge>");} graphxml_edge_source_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_source);
-  YY_BREAK
+if (graphxml_node_label_isset != 0) {FAIL("Multiple definition of attribute label in <graphxml_node>");} graphxml_node_label_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_label);
+       YY_BREAK

 case 57:
 /* rule 57 can match eol */
 YY_RULE_SETUP
 case 57:
 /* rule 57 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_source_isset != 0) {FAIL("Multiple definition of attribute source in <graphxml_edge>");}  graphxml_edge_source_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_source);
-  YY_BREAK
+if (graphxml_node_label_isset != 0) {FAIL("Multiple definition of attribute label in <graphxml_node>");}  graphxml_node_label_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_label);
+       YY_BREAK

 case 58:
 /* rule 58 can match eol */
 YY_RULE_SETUP
 case 58:
 /* rule 58 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_target_isset != 0) {FAIL("Multiple definition of attribute target in <graphxml_edge>");} graphxml_edge_target_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_target);
-  YY_BREAK
+if (graphxml_node_name_isset != 0) {FAIL("Multiple definition of attribute name in <graphxml_node>");} graphxml_node_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_name);
+       YY_BREAK

 case 59:
 /* rule 59 can match eol */
 YY_RULE_SETUP
 case 59:
 /* rule 59 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_target_isset != 0) {FAIL("Multiple definition of attribute target in <graphxml_edge>");}  graphxml_edge_target_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_target);
-  YY_BREAK
+if (graphxml_node_name_isset != 0) {FAIL("Multiple definition of attribute name in <graphxml_node>");}  graphxml_node_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_name);
+       YY_BREAK

 case 60:
 /* rule 60 can match eol */
 YY_RULE_SETUP
 case 60:
 /* rule 60 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_length_isset != 0) {FAIL("Multiple definition of attribute length in <graphxml_edge>");} graphxml_edge_length_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_length);
-  YY_BREAK
+if (graphxml_node_position___x_isset != 0) {FAIL("Multiple definition of attribute position_x in <graphxml_node>");} graphxml_node_position___x_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_position___x);
+       YY_BREAK

 case 61:
 /* rule 61 can match eol */
 YY_RULE_SETUP
 case 61:
 /* rule 61 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_length_isset != 0) {FAIL("Multiple definition of attribute length in <graphxml_edge>");}  graphxml_edge_length_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_length);
-  YY_BREAK
+if (graphxml_node_position___x_isset != 0) {FAIL("Multiple definition of attribute position_x in <graphxml_node>");}  graphxml_node_position___x_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_position___x);
+       YY_BREAK

 case 62:
 /* rule 62 can match eol */
 YY_RULE_SETUP
 case 62:
 /* rule 62 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_data_isset != 0) {FAIL("Multiple definition of attribute data in <graphxml_edge>");} graphxml_edge_data_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_edge_data);
-  YY_BREAK
+if (graphxml_node_position___y_isset != 0) {FAIL("Multiple definition of attribute position_y in <graphxml_node>");} graphxml_node_position___y_isset = 1; ENTER(VALUE1); BUFFERSET(AX_graphxml_node_position___y);
+       YY_BREAK

 case 63:
 /* rule 63 can match eol */
 YY_RULE_SETUP
 case 63:
 /* rule 63 can match eol */
 YY_RULE_SETUP

-if (graphxml_edge_data_isset != 0) {FAIL("Multiple definition of attribute data in <graphxml_edge>");}  graphxml_edge_data_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_edge_data);
-  YY_BREAK
+if (graphxml_node_position___y_isset != 0) {FAIL("Multiple definition of attribute position_y in <graphxml_node>");}  graphxml_node_position___y_isset = 1; ENTER(VALUE2); BUFFERSET(AX_graphxml_node_position___y);
+       YY_BREAK

 case 64:
 YY_RULE_SETUP
 {
 case 64:
 YY_RULE_SETUP
 {

-  if (!AX_graphxml_edge_source) FAIL("Required attribute `source' not set for `edge' element.");
-  if (!AX_graphxml_edge_target) FAIL("Required attribute `target' not set for `edge' element.");
-  LEAVE; STag_graphxml_edge();graphxml_pcdata_ix = 0; ENTER(E_graphxml_edge);
+  if (!AX_graphxml_node_name) FAIL("Required attribute `name' not set for `node' element.");
+  LEAVE; STag_graphxml_node();graphxml_pcdata_ix = 0; ENTER(E_graphxml_node);

  }
  }

-  YY_BREAK
+       YY_BREAK

 case 65:
 YY_RULE_SETUP
 {
 case 65:
 YY_RULE_SETUP
 {

-  if (!AX_graphxml_edge_source) FAIL("Required attribute `source' not set for `edge' element.");
-  if (!AX_graphxml_edge_target) FAIL("Required attribute `target' not set for `edge' element.");
-  LEAVE; STag_graphxml_edge(); graphxml_pcdata_ix = 0; ETag_graphxml_edge(); popbuffer(); /* attribute */
+  if (!AX_graphxml_node_name) FAIL("Required attribute `name' not set for `node' element.");
+  LEAVE; STag_graphxml_node(); graphxml_pcdata_ix = 0; ETag_graphxml_node(); popbuffer(); /* attribute */

   switch (YY_START) {
   switch (YY_START) {

-   case ROOT_graphxml_edge: SET(EPILOG); break;
-   case S_graphxml_graph_5: case S_graphxml_graph_4: case S_graphxml_graph_1: case S_graphxml_graph: case S_graphxml_graph_3: SET(S_graphxml_graph_5); break;
+   case ROOT_graphxml_node: SET(EPILOG); break;
+   case S_graphxml_graph: case S_graphxml_graph_2: case S_graphxml_graph_3: SET(S_graphxml_graph_3); break;

   }
  }
   }
  }

-  YY_BREAK
+       YY_BREAK

 case 66:
 YY_RULE_SETUP
 case 66:
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of edge element.", xbt_graph_parse_text[0]);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of node element.", xbt_graph_parse_text[0]);
+       YY_BREAK

 case 67:
 YY_RULE_SETUP
 case 67:
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `edge' element start tag.",xbt_graph_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_graphxml_edge):
-FAIL("EOF in attribute list of `edge' element.");
-  YY_BREAK
+FAIL("Bad attribute `%s' in `node' element start tag.",xbt_graph_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_graphxml_node):
+FAIL("EOF in attribute list of `node' element.");
+       YY_BREAK

 
 case 68:
 /* rule 68 can match eol */
 YY_RULE_SETUP
 {
   LEAVE;
 
 case 68:
 /* rule 68 can match eol */
 YY_RULE_SETUP
 {
   LEAVE;

-  ETag_graphxml_edge();
+  ETag_graphxml_node();

   popbuffer(); /* attribute */
   switch (YY_START) {
   popbuffer(); /* attribute */
   switch (YY_START) {

-   case ROOT_graphxml_edge: SET(EPILOG); break;
-   case S_graphxml_graph_5: case S_graphxml_graph_4: case S_graphxml_graph_1: case S_graphxml_graph: case S_graphxml_graph_3: SET(S_graphxml_graph_5); break;
+   case ROOT_graphxml_node: SET(EPILOG); break;
+   case S_graphxml_graph: case S_graphxml_graph_2: case S_graphxml_graph_3: SET(S_graphxml_graph_3); break;

   }
  }
   }
  }

-  YY_BREAK
+       YY_BREAK

 case 69:
 /* rule 69 can match eol */
 YY_RULE_SETUP
 case 69:
 /* rule 69 can match eol */
 YY_RULE_SETUP

-FAIL("Unexpected end-tag `%s': `</edge>' expected.",xbt_graph_parse_text);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</node>' expected.",xbt_graph_parse_text);
+       YY_BREAK

 case 70:
 YY_RULE_SETUP
 case 70:
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</edge>' expected.",xbt_graph_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_graphxml_edge):
-FAIL("Premature EOF: `</edge>' expected.");
-  YY_BREAK
+FAIL("Unexpected character `%c': `</node>' expected.",xbt_graph_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_graphxml_node):
+FAIL("Premature EOF: `</node>' expected.");
+       YY_BREAK

 
 /* EPILOG: after the root element. */
 
 case 71:
 YY_RULE_SETUP
 {SET(PROLOG); yyless(0); CLEANUP; return -1;}
 
 /* EPILOG: after the root element. */
 
 case 71:
 YY_RULE_SETUP
 {SET(PROLOG); yyless(0); CLEANUP; return -1;}

-  YY_BREAK
+       YY_BREAK

 case YY_STATE_EOF(EPILOG):
 SUCCEED;
 case YY_STATE_EOF(EPILOG):
 SUCCEED;

-  YY_BREAK
+       YY_BREAK

 
 /* CHARACTER DATA. */
 
 
 /* CHARACTER DATA. */
 


@@ -2169,32 +2169,32 @@ SUCCEED;
 case 72:
 YY_RULE_SETUP
 BUFFERPUTC('&');
 case 72:
 YY_RULE_SETUP
 BUFFERPUTC('&');

-  YY_BREAK
+       YY_BREAK

 case 73:
 YY_RULE_SETUP
 BUFFERPUTC('<');
 case 73:
 YY_RULE_SETUP
 BUFFERPUTC('<');

-  YY_BREAK
+       YY_BREAK

 case 74:
 YY_RULE_SETUP
 BUFFERPUTC('>');
 case 74:
 YY_RULE_SETUP
 BUFFERPUTC('>');

-  YY_BREAK
+       YY_BREAK

 case 75:
 YY_RULE_SETUP
 BUFFERPUTC('\'');
 case 75:
 YY_RULE_SETUP
 BUFFERPUTC('\'');

-  YY_BREAK
+       YY_BREAK

 case 76:
 YY_RULE_SETUP
 BUFFERPUTC('"');
 case 76:
 YY_RULE_SETUP
 BUFFERPUTC('"');

-  YY_BREAK
+       YY_BREAK

 /* Character entities. */
 case 77:
 YY_RULE_SETUP
 BUFFERPUTC((unsigned char)atoi(xbt_graph_parse_text+2));
 /* Character entities. */
 case 77:
 YY_RULE_SETUP
 BUFFERPUTC((unsigned char)atoi(xbt_graph_parse_text+2));

-  YY_BREAK
+       YY_BREAK

 case 78:
 YY_RULE_SETUP
 BUFFERPUTC((unsigned char)strtol(xbt_graph_parse_text+3,NULL,16));
 case 78:
 YY_RULE_SETUP
 BUFFERPUTC((unsigned char)strtol(xbt_graph_parse_text+3,NULL,16));

-  YY_BREAK
+       YY_BREAK

 
 case 79:
 /* rule 79 can match eol */
 
 case 79:
 /* rule 79 can match eol */


@@ -2206,55 +2206,55 @@ case 82:
 /* rule 82 can match eol */
 YY_RULE_SETUP
 BUFFERPUTC('\n');
 /* rule 82 can match eol */
 YY_RULE_SETUP
 BUFFERPUTC('\n');

-  YY_BREAK
+       YY_BREAK

 
 case 83:
 YY_RULE_SETUP
 ENTER(CDATA);
 
 case 83:
 YY_RULE_SETUP
 ENTER(CDATA);

-  YY_BREAK
+       YY_BREAK

 case 84:
 YY_RULE_SETUP
 FAIL("Unexpected `]""]>' in character data.");
 case 84:
 YY_RULE_SETUP
 FAIL("Unexpected `]""]>' in character data.");

-  YY_BREAK
+       YY_BREAK

 
 case 85:
 YY_RULE_SETUP
 BUFFERDONE; LEAVE;
 
 case 85:
 YY_RULE_SETUP
 BUFFERDONE; LEAVE;

-  YY_BREAK
+       YY_BREAK

 case YY_STATE_EOF(VALUE1):
 FAIL("EOF in literal (\"'\" expected).");
 case YY_STATE_EOF(VALUE1):
 FAIL("EOF in literal (\"'\" expected).");

-  YY_BREAK
+       YY_BREAK

 
 case 86:
 YY_RULE_SETUP
 BUFFERDONE; LEAVE;
 
 case 86:
 YY_RULE_SETUP
 BUFFERDONE; LEAVE;

-  YY_BREAK
+       YY_BREAK

 case YY_STATE_EOF(VALUE2):
 FAIL("EOF in literal (`\"' expected).");
 case YY_STATE_EOF(VALUE2):
 FAIL("EOF in literal (`\"' expected).");

-  YY_BREAK
+       YY_BREAK

 
 case 87:
 /* rule 87 can match eol */
 YY_RULE_SETUP
 BUFFERPUTC(xbt_graph_parse_text[0]);
 
 case 87:
 /* rule 87 can match eol */
 YY_RULE_SETUP
 BUFFERPUTC(xbt_graph_parse_text[0]);

-  YY_BREAK
+       YY_BREAK

 case 88:
 YY_RULE_SETUP
 FAIL("Spurious `%c' in character data.",xbt_graph_parse_text[0]);
 case 88:
 YY_RULE_SETUP
 FAIL("Spurious `%c' in character data.",xbt_graph_parse_text[0]);

-  YY_BREAK
+       YY_BREAK

 
 case 89:
 YY_RULE_SETUP
 LEAVE;
 
 case 89:
 YY_RULE_SETUP
 LEAVE;

-  YY_BREAK
-/* "]""]"    BUFFERPUTC(xbt_graph_parse_text[0]); BUFFERPUTC(xbt_graph_parse_text[1]); */
+       YY_BREAK
+/* "]""]"              BUFFERPUTC(xbt_graph_parse_text[0]); BUFFERPUTC(xbt_graph_parse_text[1]); */

 case 90:
 YY_RULE_SETUP
 BUFFERPUTC(xbt_graph_parse_text[0]);
 case 90:
 YY_RULE_SETUP
 BUFFERPUTC(xbt_graph_parse_text[0]);

-  YY_BREAK
+       YY_BREAK

 case YY_STATE_EOF(CDATA):
 FAIL("EOF in CDATA section.");
 case YY_STATE_EOF(CDATA):
 FAIL("EOF in CDATA section.");

-  YY_BREAK
+       YY_BREAK

 
 /* Impossible rules to avoid warnings from flex(1). */
 /* Ideally, this should be replaced by code in flexml.pl that
 
 /* Impossible rules to avoid warnings from flex(1). */
 /* Ideally, this should be replaced by code in flexml.pl that


@@ -2264,345 +2264,345 @@ case 91:
 /* rule 91 can match eol */
 YY_RULE_SETUP
 FAIL("Syntax error on character `%c'.", xbt_graph_parse_text[0]);
 /* rule 91 can match eol */
 YY_RULE_SETUP
 FAIL("Syntax error on character `%c'.", xbt_graph_parse_text[0]);

-  YY_BREAK
+       YY_BREAK

 
 case 92:
 YY_RULE_SETUP
 ECHO;
 
 case 92:
 YY_RULE_SETUP
 ECHO;

-  YY_BREAK
+       YY_BREAK

 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(INITIAL):

+case YY_STATE_EOF(ROOT_graphxml_edge):

 case YY_STATE_EOF(ROOT_graphxml_graph):
 case YY_STATE_EOF(S_graphxml_graph_2):
 case YY_STATE_EOF(S_graphxml_graph_4):
 case YY_STATE_EOF(ROOT_graphxml_node):
 case YY_STATE_EOF(ROOT_graphxml_graph):
 case YY_STATE_EOF(S_graphxml_graph_2):
 case YY_STATE_EOF(S_graphxml_graph_4):
 case YY_STATE_EOF(ROOT_graphxml_node):

-case YY_STATE_EOF(ROOT_graphxml_edge):

 case YY_STATE_EOF(IMPOSSIBLE):
 case YY_STATE_EOF(IMPOSSIBLE):

-  yyterminate();
-
-  case YY_END_OF_BUFFER:
-    {
-    /* Amount of text matched not including the EOB char. */
-    int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
-
-    /* Undo the effects of YY_DO_BEFORE_ACTION. */
-    *yy_cp = (yy_hold_char);
-    YY_RESTORE_YY_MORE_OFFSET
-
-    if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
-      {
-      /* We're scanning a new file or input source.  It's
-       * possible that this happened because the user
-       * just pointed xbt_graph_parse_in at a new source and called
-       * xbt_graph_parse_lex().  If so, then we have to assure
-       * consistency between YY_CURRENT_BUFFER and our
-       * globals.  Here is the right place to do so, because
-       * this is the first action (other than possibly a
-       * back-up) that will match for the new input source.
-       */
-      (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-      YY_CURRENT_BUFFER_LVALUE->yy_input_file = xbt_graph_parse_in;
-      YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
-      }
-
-    /* Note that here we test for yy_c_buf_p "<=" to the position
-     * of the first EOB in the buffer, since yy_c_buf_p will
-     * already have been incremented past the NUL character
-     * (since all states make transitions on EOB to the
-     * end-of-buffer state).  Contrast this with the test
-     * in input().
-     */
-    if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-      { /* This was really a NUL. */
-      yy_state_type yy_next_state;
-
-      (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
-
-      yy_current_state = yy_get_previous_state(  );
-
-      /* Okay, we're now positioned to make the NUL
-       * transition.  We couldn't have
-       * yy_get_previous_state() go ahead and do it
-       * for us because it doesn't know how to deal
-       * with the possibility of jamming (and we don't
-       * want to build jamming into it because then it
-       * will run more slowly).
-       */
-
-      yy_next_state = yy_try_NUL_trans( yy_current_state );
-
-      yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-
-      if ( yy_next_state )
-        {
-        /* Consume the NUL. */
-        yy_cp = ++(yy_c_buf_p);
-        yy_current_state = yy_next_state;
-        goto yy_match;
-        }
-
-      else
-        {
-        yy_cp = (yy_c_buf_p);
-        goto yy_find_action;
-        }
-      }
-
-    else switch ( yy_get_next_buffer(  ) )
-      {
-      case EOB_ACT_END_OF_FILE:
-        {
-        (yy_did_buffer_switch_on_eof) = 0;
-
-        if ( xbt_graph_parse_wrap( ) )
-          {
-          /* Note: because we've taken care in
-           * yy_get_next_buffer() to have set up
-           * xbt_graph_parse_text, we can now set up
-           * yy_c_buf_p so that if some total
-           * hoser (like flex itself) wants to
-           * call the scanner after we return the
-           * YY_NULL, it'll still work - another
-           * YY_NULL will get returned.
-           */
-          (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
-
-          yy_act = YY_STATE_EOF(YY_START);
-          goto do_action;
-          }
-
-        else
-          {
-          if ( ! (yy_did_buffer_switch_on_eof) )
-            YY_NEW_FILE;
-          }
-        break;
-        }
-
-      case EOB_ACT_CONTINUE_SCAN:
-        (yy_c_buf_p) =
-          (yytext_ptr) + yy_amount_of_matched_text;
-
-        yy_current_state = yy_get_previous_state(  );
-
-        yy_cp = (yy_c_buf_p);
-        yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-        goto yy_match;
-
-      case EOB_ACT_LAST_MATCH:
-        (yy_c_buf_p) =
-        &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
-
-        yy_current_state = yy_get_previous_state(  );
-
-        yy_cp = (yy_c_buf_p);
-        yy_bp = (yytext_ptr) + YY_MORE_ADJ;
-        goto yy_find_action;
-      }
-    break;
-    }
-
-  default:
-    YY_FATAL_ERROR(
-      "fatal flex scanner internal error--no action found" );
-  } /* end of action switch */
-    } /* end of scanning one token */
-  } /* end of user's declarations */
+       yyterminate();
+
+       case YY_END_OF_BUFFER:
+               {
+               /* Amount of text matched not including the EOB char. */
+               int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+               /* Undo the effects of YY_DO_BEFORE_ACTION. */
+               *yy_cp = (yy_hold_char);
+               YY_RESTORE_YY_MORE_OFFSET
+
+               if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+                       {
+                       /* We're scanning a new file or input source.  It's
+                        * possible that this happened because the user
+                        * just pointed xbt_graph_parse_in at a new source and called
+                        * xbt_graph_parse_lex().  If so, then we have to assure
+                        * consistency between YY_CURRENT_BUFFER and our
+                        * globals.  Here is the right place to do so, because
+                        * this is the first action (other than possibly a
+                        * back-up) that will match for the new input source.
+                        */
+                       (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+                       YY_CURRENT_BUFFER_LVALUE->yy_input_file = xbt_graph_parse_in;
+                       YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+                       }
+
+               /* Note that here we test for yy_c_buf_p "<=" to the position
+                * of the first EOB in the buffer, since yy_c_buf_p will
+                * already have been incremented past the NUL character
+                * (since all states make transitions on EOB to the
+                * end-of-buffer state).  Contrast this with the test
+                * in input().
+                */
+               if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+                       { /* This was really a NUL. */
+                       yy_state_type yy_next_state;
+
+                       (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+                       yy_current_state = yy_get_previous_state(  );
+
+                       /* Okay, we're now positioned to make the NUL
+                        * transition.  We couldn't have
+                        * yy_get_previous_state() go ahead and do it
+                        * for us because it doesn't know how to deal
+                        * with the possibility of jamming (and we don't
+                        * want to build jamming into it because then it
+                        * will run more slowly).
+                        */
+
+                       yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+                       yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+                       if ( yy_next_state )
+                               {
+                               /* Consume the NUL. */
+                               yy_cp = ++(yy_c_buf_p);
+                               yy_current_state = yy_next_state;
+                               goto yy_match;
+                               }
+
+                       else
+                               {
+                               yy_cp = (yy_c_buf_p);
+                               goto yy_find_action;
+                               }
+                       }
+
+               else switch ( yy_get_next_buffer(  ) )
+                       {
+                       case EOB_ACT_END_OF_FILE:
+                               {
+                               (yy_did_buffer_switch_on_eof) = 0;
+
+                               if ( xbt_graph_parse_wrap( ) )
+                                       {
+                                       /* Note: because we've taken care in
+                                        * yy_get_next_buffer() to have set up
+                                        * xbt_graph_parse_text, we can now set up
+                                        * yy_c_buf_p so that if some total
+                                        * hoser (like flex itself) wants to
+                                        * call the scanner after we return the
+                                        * YY_NULL, it'll still work - another
+                                        * YY_NULL will get returned.
+                                        */
+                                       (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+                                       yy_act = YY_STATE_EOF(YY_START);
+                                       goto do_action;
+                                       }
+
+                               else
+                                       {
+                                       if ( ! (yy_did_buffer_switch_on_eof) )
+                                               YY_NEW_FILE;
+                                       }
+                               break;
+                               }
+
+                       case EOB_ACT_CONTINUE_SCAN:
+                               (yy_c_buf_p) =
+                                       (yytext_ptr) + yy_amount_of_matched_text;
+
+                               yy_current_state = yy_get_previous_state(  );
+
+                               yy_cp = (yy_c_buf_p);
+                               yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                               goto yy_match;
+
+                       case EOB_ACT_LAST_MATCH:
+                               (yy_c_buf_p) =
+                               &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+                               yy_current_state = yy_get_previous_state(  );
+
+                               yy_cp = (yy_c_buf_p);
+                               yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                               goto yy_find_action;
+                       }
+               break;
+               }
+
+       default:
+               YY_FATAL_ERROR(
+                       "fatal flex scanner internal error--no action found" );
+       } /* end of action switch */
+               } /* end of scanning one token */
+       } /* end of user's declarations */

 } /* end of xbt_graph_parse_lex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
  * Returns a code representing an action:
 } /* end of xbt_graph_parse_lex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
  * Returns a code representing an action:

- *  EOB_ACT_LAST_MATCH -
- *  EOB_ACT_CONTINUE_SCAN - continue scanning from current position
- *  EOB_ACT_END_OF_FILE - end of file
+ *     EOB_ACT_LAST_MATCH -
+ *     EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *     EOB_ACT_END_OF_FILE - end of file

  */
 static int yy_get_next_buffer (void)
 {
  */
 static int yy_get_next_buffer (void)
 {

-      char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-  char *source = (yytext_ptr);
-  int number_to_move, i;
-  int ret_val;
-
-  if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
-    YY_FATAL_ERROR(
-    "fatal flex scanner internal error--end of buffer missed" );
-
-  if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
-    { /* Don't try to fill the buffer, so this is an EOF. */
-    if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
-      {
-      /* We matched a single character, the EOB, so
-       * treat this as a final EOF.
-       */
-      return EOB_ACT_END_OF_FILE;
-      }
-
-    else
-      {
-      /* We matched some text prior to the EOB, first
-       * process it.
-       */
-      return EOB_ACT_LAST_MATCH;
-      }
-    }
-
-  /* Try to read more data. */
+       char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+       char *source = (yytext_ptr);
+       int number_to_move, i;
+       int ret_val;
+
+       if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+               YY_FATAL_ERROR(
+               "fatal flex scanner internal error--end of buffer missed" );
+
+       if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+               { /* Don't try to fill the buffer, so this is an EOF. */
+               if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+                       {
+                       /* We matched a single character, the EOB, so
+                        * treat this as a final EOF.
+                        */
+                       return EOB_ACT_END_OF_FILE;
+                       }
+
+               else
+                       {
+                       /* We matched some text prior to the EOB, first
+                        * process it.
+                        */
+                       return EOB_ACT_LAST_MATCH;
+                       }
+               }
+
+       /* Try to read more data. */
+
+       /* First move last chars to start of buffer. */
+       number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+       for ( i = 0; i < number_to_move; ++i )
+               *(dest++) = *(source++);
+
+       if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+               /* don't do the read, it's not guaranteed to return an EOF,
+                * just force an EOF
+                */
+               YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+       else
+               {
+                       yy_size_t num_to_read =
+                       YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+               while ( num_to_read <= 0 )
+                       { /* Not enough room in the buffer - grow it. */
+
+                       /* just a shorter name for the current buffer */
+                       YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
+
+                       int yy_c_buf_p_offset =
+                               (int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+                       if ( b->yy_is_our_buffer )
+                               {
+                               yy_size_t new_size = b->yy_buf_size * 2;
+
+                               if ( new_size <= 0 )
+                                       b->yy_buf_size += b->yy_buf_size / 8;
+                               else
+                                       b->yy_buf_size *= 2;
+
+                               b->yy_ch_buf = (char *)
+                                       /* Include room in for 2 EOB chars. */
+                                       xbt_graph_parse_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+                               }
+                       else
+                               /* Can't grow it, we don't own it. */
+                               b->yy_ch_buf = 0;
+
+                       if ( ! b->yy_ch_buf )
+                               YY_FATAL_ERROR(
+                               "fatal error - scanner input buffer overflow" );
+
+                       (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+                       num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+                                               number_to_move - 1;
+
+                       }
+
+               if ( num_to_read > YY_READ_BUF_SIZE )
+                       num_to_read = YY_READ_BUF_SIZE;
+
+               /* Read in more data. */
+               YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+                       (yy_n_chars), num_to_read );
+
+               YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+               }
+
+       if ( (yy_n_chars) == 0 )
+               {
+               if ( number_to_move == YY_MORE_ADJ )
+                       {
+                       ret_val = EOB_ACT_END_OF_FILE;
+                       xbt_graph_parse_restart(xbt_graph_parse_in  );
+                       }
+
+               else
+                       {
+                       ret_val = EOB_ACT_LAST_MATCH;
+                       YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+                               YY_BUFFER_EOF_PENDING;
+                       }
+               }
+
+       else
+               ret_val = EOB_ACT_CONTINUE_SCAN;
+
+       if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+               /* Extend the array by 50%, plus the number we really need. */
+               yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+               YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) xbt_graph_parse_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+               if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+                       YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+       }
+
+       (yy_n_chars) += number_to_move;
+       YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+       YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+       (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];

 
 

-  /* First move last chars to start of buffer. */
-  number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
-
-  for ( i = 0; i < number_to_move; ++i )
-    *(dest++) = *(source++);
-
-  if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
-    /* don't do the read, it's not guaranteed to return an EOF,
-     * just force an EOF
-     */
-    YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
-
-  else
-    {
-      yy_size_t num_to_read =
-      YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
-
-    while ( num_to_read <= 0 )
-      { /* Not enough room in the buffer - grow it. */
-
-      /* just a shorter name for the current buffer */
-      YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
-
-      int yy_c_buf_p_offset =
-        (int) ((yy_c_buf_p) - b->yy_ch_buf);
-
-      if ( b->yy_is_our_buffer )
-        {
-        yy_size_t new_size = b->yy_buf_size * 2;
-
-        if ( new_size <= 0 )
-          b->yy_buf_size += b->yy_buf_size / 8;
-        else
-          b->yy_buf_size *= 2;
-
-        b->yy_ch_buf = (char *)
-          /* Include room in for 2 EOB chars. */
-          xbt_graph_parse_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
-        }
-      else
-        /* Can't grow it, we don't own it. */
-        b->yy_ch_buf = 0;
-
-      if ( ! b->yy_ch_buf )
-        YY_FATAL_ERROR(
-        "fatal error - scanner input buffer overflow" );
-
-      (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
-
-      num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
-            number_to_move - 1;
-
-      }
-
-    if ( num_to_read > YY_READ_BUF_SIZE )
-      num_to_read = YY_READ_BUF_SIZE;
-
-    /* Read in more data. */
-    YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-      (yy_n_chars), num_to_read );
-
-    YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-    }
-
-  if ( (yy_n_chars) == 0 )
-    {
-    if ( number_to_move == YY_MORE_ADJ )
-      {
-      ret_val = EOB_ACT_END_OF_FILE;
-      xbt_graph_parse_restart(xbt_graph_parse_in  );
-      }
-
-    else
-      {
-      ret_val = EOB_ACT_LAST_MATCH;
-      YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
-        YY_BUFFER_EOF_PENDING;
-      }
-    }
-
-  else
-    ret_val = EOB_ACT_CONTINUE_SCAN;
-
-  if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-    /* Extend the array by 50%, plus the number we really need. */
-    yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-    YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) xbt_graph_parse_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
-    if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-      YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-  }
-
-  (yy_n_chars) += number_to_move;
-  YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
-  YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
-
-  (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
-
-  return ret_val;
+       return ret_val;

 }
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
     static yy_state_type yy_get_previous_state (void)
 {
 }
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
 
     static yy_state_type yy_get_previous_state (void)
 {

-  yy_state_type yy_current_state;
-  char *yy_cp;
-
-  yy_current_state = (yy_start);
-
-  for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
-    {
-    YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
-    if ( yy_accept[yy_current_state] )
-      {
-      (yy_last_accepting_state) = yy_current_state;
-      (yy_last_accepting_cpos) = yy_cp;
-      }
-    while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-      {
-      yy_current_state = (int) yy_def[yy_current_state];
-      if ( yy_current_state >= 564 )
-        yy_c = yy_meta[(unsigned int) yy_c];
-      }
-    yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-    }
-
-  return yy_current_state;
+       yy_state_type yy_current_state;
+       char *yy_cp;
+    
+       yy_current_state = (yy_start);
+
+       for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+               {
+               YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+               if ( yy_accept[yy_current_state] )
+                       {
+                       (yy_last_accepting_state) = yy_current_state;
+                       (yy_last_accepting_cpos) = yy_cp;
+                       }
+               while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+                       {
+                       yy_current_state = (int) yy_def[yy_current_state];
+                       if ( yy_current_state >= 564 )
+                               yy_c = yy_meta[(unsigned int) yy_c];
+                       }
+               yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+               }
+
+       return yy_current_state;

 }
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis
 }
 
 /* yy_try_NUL_trans - try to make a transition on the NUL character
  *
  * synopsis

- *  next_state = yy_try_NUL_trans( current_state );
+ *     next_state = yy_try_NUL_trans( current_state );

  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {

-  int yy_is_jam;
-      char *yy_cp = (yy_c_buf_p);
-
-  YY_CHAR yy_c = 1;
-  if ( yy_accept[yy_current_state] )
-    {
-    (yy_last_accepting_state) = yy_current_state;
-    (yy_last_accepting_cpos) = yy_cp;
-    }
-  while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
-    {
-    yy_current_state = (int) yy_def[yy_current_state];
-    if ( yy_current_state >= 564 )
-      yy_c = yy_meta[(unsigned int) yy_c];
-    }
-  yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-  yy_is_jam = (yy_current_state == 563);
-
-    return yy_is_jam ? 0 : yy_current_state;
+       int yy_is_jam;
+       char *yy_cp = (yy_c_buf_p);
+
+       YY_CHAR yy_c = 1;
+       if ( yy_accept[yy_current_state] )
+               {
+               (yy_last_accepting_state) = yy_current_state;
+               (yy_last_accepting_cpos) = yy_cp;
+               }
+       while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+               {
+               yy_current_state = (int) yy_def[yy_current_state];
+               if ( yy_current_state >= 564 )
+                       yy_c = yy_meta[(unsigned int) yy_c];
+               }
+       yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+       yy_is_jam = (yy_current_state == 563);
+
+               return yy_is_jam ? 0 : yy_current_state;

 }
 
 #ifndef YY_NO_INPUT
 }
 
 #ifndef YY_NO_INPUT


@@ -2613,185 +2613,185 @@ static int yy_get_next_buffer (void)
 #endif
 
 {
 #endif
 
 {

-  int c;
-
-  *(yy_c_buf_p) = (yy_hold_char);
-
-  if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
-    {
-    /* yy_c_buf_p now points to the character we want to return.
-     * If this occurs *before* the EOB characters, then it's a
-     * valid NUL; if not, then we've hit the end of the buffer.
-     */
-    if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
-      /* This was really a NUL. */
-      *(yy_c_buf_p) = '\0';
-
-    else
-      { /* need more input */
-      yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
-      ++(yy_c_buf_p);
-
-      switch ( yy_get_next_buffer(  ) )
-        {
-        case EOB_ACT_LAST_MATCH:
-          /* This happens because yy_g_n_b()
-           * sees that we've accumulated a
-           * token and flags that we need to
-           * try matching the token before
-           * proceeding.  But for input(),
-           * there's no matching to consider.
-           * So convert the EOB_ACT_LAST_MATCH
-           * to EOB_ACT_END_OF_FILE.
-           */
-
-          /* Reset buffer status. */
-          xbt_graph_parse_restart(xbt_graph_parse_in );
-
-          /*FALLTHROUGH*/
-
-        case EOB_ACT_END_OF_FILE:
-          {
-          if ( xbt_graph_parse_wrap( ) )
-            return EOF;
-
-          if ( ! (yy_did_buffer_switch_on_eof) )
-            YY_NEW_FILE;
+       int c;
+    
+       *(yy_c_buf_p) = (yy_hold_char);
+
+       if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+               {
+               /* yy_c_buf_p now points to the character we want to return.
+                * If this occurs *before* the EOB characters, then it's a
+                * valid NUL; if not, then we've hit the end of the buffer.
+                */
+               if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+                       /* This was really a NUL. */
+                       *(yy_c_buf_p) = '\0';
+
+               else
+                       { /* need more input */
+                       yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+                       ++(yy_c_buf_p);
+
+                       switch ( yy_get_next_buffer(  ) )
+                               {
+                               case EOB_ACT_LAST_MATCH:
+                                       /* This happens because yy_g_n_b()
+                                        * sees that we've accumulated a
+                                        * token and flags that we need to
+                                        * try matching the token before
+                                        * proceeding.  But for input(),
+                                        * there's no matching to consider.
+                                        * So convert the EOB_ACT_LAST_MATCH
+                                        * to EOB_ACT_END_OF_FILE.
+                                        */
+
+                                       /* Reset buffer status. */
+                                       xbt_graph_parse_restart(xbt_graph_parse_in );
+
+                                       /*FALLTHROUGH*/
+
+                               case EOB_ACT_END_OF_FILE:
+                                       {
+                                       if ( xbt_graph_parse_wrap( ) )
+                                               return EOF;
+
+                                       if ( ! (yy_did_buffer_switch_on_eof) )
+                                               YY_NEW_FILE;

 #ifdef __cplusplus
 #ifdef __cplusplus

-          return yyinput();
+                                       return yyinput();

 #else
 #else

-          return input();
+                                       return input();

 #endif
 #endif

-          }
+                                       }

 
 

-        case EOB_ACT_CONTINUE_SCAN:
-          (yy_c_buf_p) = (yytext_ptr) + offset;
-          break;
-        }
-      }
-    }
+                               case EOB_ACT_CONTINUE_SCAN:
+                                       (yy_c_buf_p) = (yytext_ptr) + offset;
+                                       break;
+                               }
+                       }
+               }

 
 

-  c = *(unsigned char *) (yy_c_buf_p);  /* cast for 8-bit char's */
-  *(yy_c_buf_p) = '\0';  /* preserve xbt_graph_parse_text */
-  (yy_hold_char) = *++(yy_c_buf_p);
-
-  if ( c == '\n' )
+       c = *(unsigned char *) (yy_c_buf_p);    /* cast for 8-bit char's */
+       *(yy_c_buf_p) = '\0';   /* preserve xbt_graph_parse_text */
+       (yy_hold_char) = *++(yy_c_buf_p);

 
 

+       if ( c == '\n' )
+                  

     xbt_graph_parse_lineno++;
 ;
 
     xbt_graph_parse_lineno++;
 ;
 

-  return c;
+       return c;

 }
 }

-#endif  /* ifndef YY_NO_INPUT */
+#endif /* ifndef YY_NO_INPUT */

 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.
 
 /** Immediately switch to a different input stream.
  * @param input_file A readable stream.

- *
+ * 

  * @note This function does not reset the start condition to @c INITIAL .
  */
     void xbt_graph_parse_restart  (FILE * input_file )
 {
  * @note This function does not reset the start condition to @c INITIAL .
  */
     void xbt_graph_parse_restart  (FILE * input_file )
 {

-
-  if ( ! YY_CURRENT_BUFFER ){
+    
+       if ( ! YY_CURRENT_BUFFER ){

         xbt_graph_parse_ensure_buffer_stack ();
         xbt_graph_parse_ensure_buffer_stack ();

-    YY_CURRENT_BUFFER_LVALUE =
+               YY_CURRENT_BUFFER_LVALUE =

             xbt_graph_parse__create_buffer(xbt_graph_parse_in,YY_BUF_SIZE );
             xbt_graph_parse__create_buffer(xbt_graph_parse_in,YY_BUF_SIZE );

-  }
+       }

 
 

-  xbt_graph_parse__init_buffer(YY_CURRENT_BUFFER,input_file );
-  xbt_graph_parse__load_buffer_state( );
+       xbt_graph_parse__init_buffer(YY_CURRENT_BUFFER,input_file );
+       xbt_graph_parse__load_buffer_state( );

 }
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
 }
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.

- *
+ * 

  */
     void xbt_graph_parse__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
  */
     void xbt_graph_parse__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {

-
-  /* TODO. We should be able to replace this entire function body
-   * with
-   *    xbt_graph_parse_pop_buffer_state();
-   *    xbt_graph_parse_push_buffer_state(new_buffer);
+    
+       /* TODO. We should be able to replace this entire function body
+        * with
+        *              xbt_graph_parse_pop_buffer_state();
+        *              xbt_graph_parse_push_buffer_state(new_buffer);

      */
      */

-  xbt_graph_parse_ensure_buffer_stack ();
-  if ( YY_CURRENT_BUFFER == new_buffer )
-    return;
-
-  if ( YY_CURRENT_BUFFER )
-    {
-    /* Flush out information for old buffer. */
-    *(yy_c_buf_p) = (yy_hold_char);
-    YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-    YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-    }
-
-  YY_CURRENT_BUFFER_LVALUE = new_buffer;
-  xbt_graph_parse__load_buffer_state( );
-
-  /* We don't actually know whether we did this switch during
-   * EOF (xbt_graph_parse_wrap()) processing, but the only time this flag
-   * is looked at is after xbt_graph_parse_wrap() is called, so it's safe
-   * to go ahead and always set it.
-   */
-  (yy_did_buffer_switch_on_eof) = 1;
+       xbt_graph_parse_ensure_buffer_stack ();
+       if ( YY_CURRENT_BUFFER == new_buffer )
+               return;
+
+       if ( YY_CURRENT_BUFFER )
+               {
+               /* Flush out information for old buffer. */
+               *(yy_c_buf_p) = (yy_hold_char);
+               YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+               YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+               }
+
+       YY_CURRENT_BUFFER_LVALUE = new_buffer;
+       xbt_graph_parse__load_buffer_state( );
+
+       /* We don't actually know whether we did this switch during
+        * EOF (xbt_graph_parse_wrap()) processing, but the only time this flag
+        * is looked at is after xbt_graph_parse_wrap() is called, so it's safe
+        * to go ahead and always set it.
+        */
+       (yy_did_buffer_switch_on_eof) = 1;

 }
 
 static void xbt_graph_parse__load_buffer_state  (void)
 {
 }
 
 static void xbt_graph_parse__load_buffer_state  (void)
 {

-      (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-  (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-  xbt_graph_parse_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
-  (yy_hold_char) = *(yy_c_buf_p);
+       (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+       (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+       xbt_graph_parse_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+       (yy_hold_char) = *(yy_c_buf_p);

 }
 
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
 }
 
 /** Allocate and initialize an input buffer state.
  * @param file A readable stream.
  * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.

- *
+ * 

  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE xbt_graph_parse__create_buffer  (FILE * file, int  size )
 {
  * @return the allocated buffer state.
  */
     YY_BUFFER_STATE xbt_graph_parse__create_buffer  (FILE * file, int  size )
 {

-  YY_BUFFER_STATE b;
-
-  b = (YY_BUFFER_STATE) xbt_graph_parse_alloc(sizeof( struct yy_buffer_state )  );
-  if ( ! b )
-    YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse__create_buffer()" );
+       YY_BUFFER_STATE b;
+    
+       b = (YY_BUFFER_STATE) xbt_graph_parse_alloc(sizeof( struct yy_buffer_state )  );
+       if ( ! b )
+               YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse__create_buffer()" );

 
 

-  b->yy_buf_size = size;
+       b->yy_buf_size = size;

 
 

-  /* yy_ch_buf has to be 2 characters longer than the size given because
-   * we need to put in 2 end-of-buffer characters.
-   */
-  b->yy_ch_buf = (char *) xbt_graph_parse_alloc(b->yy_buf_size + 2  );
-  if ( ! b->yy_ch_buf )
-    YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse__create_buffer()" );
+       /* yy_ch_buf has to be 2 characters longer than the size given because
+        * we need to put in 2 end-of-buffer characters.
+        */
+       b->yy_ch_buf = (char *) xbt_graph_parse_alloc(b->yy_buf_size + 2  );
+       if ( ! b->yy_ch_buf )
+               YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse__create_buffer()" );

 
 

-  b->yy_is_our_buffer = 1;
+       b->yy_is_our_buffer = 1;

 
 

-  xbt_graph_parse__init_buffer(b,file );
+       xbt_graph_parse__init_buffer(b,file );

 
 

-  return b;
+       return b;

 }
 
 /** Destroy the buffer.
  * @param b a buffer created with xbt_graph_parse__create_buffer()
 }
 
 /** Destroy the buffer.
  * @param b a buffer created with xbt_graph_parse__create_buffer()

- *
+ * 

  */
     void xbt_graph_parse__delete_buffer (YY_BUFFER_STATE  b )
 {
  */
     void xbt_graph_parse__delete_buffer (YY_BUFFER_STATE  b )
 {

+    
+       if ( ! b )
+               return;

 
 

-  if ( ! b )
-    return;
-
-  if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
-    YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+       if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+               YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;

 
 

-  if ( b->yy_is_our_buffer )
-    xbt_graph_parse_free((void *) b->yy_ch_buf  );
+       if ( b->yy_is_our_buffer )
+               xbt_graph_parse_free((void *) b->yy_ch_buf  );

 
 

-  xbt_graph_parse_free((void *) b  );
+       xbt_graph_parse_free((void *) b  );

 }
 
 /* Initializes or reinitializes a buffer.
 }
 
 /* Initializes or reinitializes a buffer.


@@ -2801,12 +2801,12 @@ static void xbt_graph_parse__load_buffer_state  (void)
     static void xbt_graph_parse__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
 {
     static void xbt_graph_parse__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
 {

-  int oerrno = errno;
+       int oerrno = errno;
+    
+       xbt_graph_parse__flush_buffer(b );

 
 

-  xbt_graph_parse__flush_buffer(b );
-
-  b->yy_input_file = file;
-  b->yy_fill_buffer = 1;
+       b->yy_input_file = file;
+       b->yy_fill_buffer = 1;

 
     /* If b is the current buffer, then xbt_graph_parse__init_buffer was _probably_
      * called from xbt_graph_parse_restart() or through yy_get_next_buffer.
 
     /* If b is the current buffer, then xbt_graph_parse__init_buffer was _probably_
      * called from xbt_graph_parse_restart() or through yy_get_next_buffer.


@@ -2818,87 +2818,87 @@ static void xbt_graph_parse__load_buffer_state  (void)
     }
 
         b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
     }
 
         b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;

-
-  errno = oerrno;
+    
+       errno = oerrno;

 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.

- *
+ * 

  */
     void xbt_graph_parse__flush_buffer (YY_BUFFER_STATE  b )
 {
  */
     void xbt_graph_parse__flush_buffer (YY_BUFFER_STATE  b )
 {

-      if ( ! b )
-    return;
+       if ( ! b )
+               return;

 
 

-  b->yy_n_chars = 0;
+       b->yy_n_chars = 0;

 
 

-  /* We always need two end-of-buffer characters.  The first causes
-   * a transition to the end-of-buffer state.  The second causes
-   * a jam in that state.
-   */
-  b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
-  b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+       /* We always need two end-of-buffer characters.  The first causes
+        * a transition to the end-of-buffer state.  The second causes
+        * a jam in that state.
+        */
+       b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+       b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;

 
 

-  b->yy_buf_pos = &b->yy_ch_buf[0];
+       b->yy_buf_pos = &b->yy_ch_buf[0];

 
 

-  b->yy_at_bol = 1;
-  b->yy_buffer_status = YY_BUFFER_NEW;
+       b->yy_at_bol = 1;
+       b->yy_buffer_status = YY_BUFFER_NEW;

 
 

-  if ( b == YY_CURRENT_BUFFER )
-    xbt_graph_parse__load_buffer_state( );
+       if ( b == YY_CURRENT_BUFFER )
+               xbt_graph_parse__load_buffer_state( );

 }
 
 /** Pushes the new state onto the stack. The new state becomes
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.
 }
 
 /** Pushes the new state onto the stack. The new state becomes
  *  the current state. This function will allocate the stack
  *  if necessary.
  *  @param new_buffer The new state.

- *
+ *  

  */
 void xbt_graph_parse_push_buffer_state (YY_BUFFER_STATE new_buffer )
 {
  */
 void xbt_graph_parse_push_buffer_state (YY_BUFFER_STATE new_buffer )
 {

-      if (new_buffer == NULL)
-    return;
-
-  xbt_graph_parse_ensure_buffer_stack();
-
-  /* This block is copied from xbt_graph_parse__switch_to_buffer. */
-  if ( YY_CURRENT_BUFFER )
-    {
-    /* Flush out information for old buffer. */
-    *(yy_c_buf_p) = (yy_hold_char);
-    YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
-    YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
-    }
-
-  /* Only push if top exists. Otherwise, replace top. */
-  if (YY_CURRENT_BUFFER)
-    (yy_buffer_stack_top)++;
-  YY_CURRENT_BUFFER_LVALUE = new_buffer;
-
-  /* copied from xbt_graph_parse__switch_to_buffer. */
-  xbt_graph_parse__load_buffer_state( );
-  (yy_did_buffer_switch_on_eof) = 1;
+       if (new_buffer == NULL)
+               return;
+
+       xbt_graph_parse_ensure_buffer_stack();
+
+       /* This block is copied from xbt_graph_parse__switch_to_buffer. */
+       if ( YY_CURRENT_BUFFER )
+               {
+               /* Flush out information for old buffer. */
+               *(yy_c_buf_p) = (yy_hold_char);
+               YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+               YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+               }
+
+       /* Only push if top exists. Otherwise, replace top. */
+       if (YY_CURRENT_BUFFER)
+               (yy_buffer_stack_top)++;
+       YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+       /* copied from xbt_graph_parse__switch_to_buffer. */
+       xbt_graph_parse__load_buffer_state( );
+       (yy_did_buffer_switch_on_eof) = 1;

 }
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.
 }
 
 /** Removes and deletes the top of the stack, if present.
  *  The next element becomes the new top.

- *
+ *  

  */
 void xbt_graph_parse_pop_buffer_state (void)
 {
  */
 void xbt_graph_parse_pop_buffer_state (void)
 {

-      if (!YY_CURRENT_BUFFER)
-    return;
-
-  xbt_graph_parse__delete_buffer(YY_CURRENT_BUFFER );
-  YY_CURRENT_BUFFER_LVALUE = NULL;
-  if ((yy_buffer_stack_top) > 0)
-    --(yy_buffer_stack_top);
-
-  if (YY_CURRENT_BUFFER) {
-    xbt_graph_parse__load_buffer_state( );
-    (yy_did_buffer_switch_on_eof) = 1;
-  }
+       if (!YY_CURRENT_BUFFER)
+               return;
+
+       xbt_graph_parse__delete_buffer(YY_CURRENT_BUFFER );
+       YY_CURRENT_BUFFER_LVALUE = NULL;
+       if ((yy_buffer_stack_top) > 0)
+               --(yy_buffer_stack_top);
+
+       if (YY_CURRENT_BUFFER) {
+               xbt_graph_parse__load_buffer_state( );
+               (yy_did_buffer_switch_on_eof) = 1;
+       }

 }
 
 /* Allocates the stack if it does not exist.
 }
 
 /* Allocates the stack if it does not exist.


@@ -2906,163 +2906,163 @@ void xbt_graph_parse_pop_buffer_state (void)
  */
 static void xbt_graph_parse_ensure_buffer_stack (void)
 {
  */
 static void xbt_graph_parse_ensure_buffer_stack (void)
 {

-  yy_size_t num_to_alloc;
-
-  if (!(yy_buffer_stack)) {
+       yy_size_t num_to_alloc;
+    
+       if (!(yy_buffer_stack)) {

 
 

-    /* First allocation is just for 2 elements, since we don't know if this
-     * scanner will even need a stack. We use 2 instead of 1 to avoid an
-     * immediate realloc on the next call.
+               /* First allocation is just for 2 elements, since we don't know if this
+                * scanner will even need a stack. We use 2 instead of 1 to avoid an
+                * immediate realloc on the next call.

          */
          */

-    num_to_alloc = 1;
-    (yy_buffer_stack) = (struct yy_buffer_state**)xbt_graph_parse_alloc
-                (num_to_alloc * sizeof(struct yy_buffer_state*)
-                );
-    if ( ! (yy_buffer_stack) )
-      YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse_ensure_buffer_stack()" );
-
-    memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-
-    (yy_buffer_stack_max) = num_to_alloc;
-    (yy_buffer_stack_top) = 0;
-    return;
-  }
-
-  if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
-
-    /* Increase the buffer to prepare for a possible push. */
-    int grow_size = 8 /* arbitrary grow size */;
-
-    num_to_alloc = (yy_buffer_stack_max) + grow_size;
-    (yy_buffer_stack) = (struct yy_buffer_state**)xbt_graph_parse_realloc
-                ((yy_buffer_stack),
-                num_to_alloc * sizeof(struct yy_buffer_state*)
-                );
-    if ( ! (yy_buffer_stack) )
-      YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse_ensure_buffer_stack()" );
-
-    /* zero only the new slots.*/
-    memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
-    (yy_buffer_stack_max) = num_to_alloc;
-  }
+               num_to_alloc = 1;
+               (yy_buffer_stack) = (struct yy_buffer_state**)xbt_graph_parse_alloc
+                                                               (num_to_alloc * sizeof(struct yy_buffer_state*)
+                                                               );
+               if ( ! (yy_buffer_stack) )
+                       YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse_ensure_buffer_stack()" );
+                                                                 
+               memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+                               
+               (yy_buffer_stack_max) = num_to_alloc;
+               (yy_buffer_stack_top) = 0;
+               return;
+       }
+
+       if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+               /* Increase the buffer to prepare for a possible push. */
+               int grow_size = 8 /* arbitrary grow size */;
+
+               num_to_alloc = (yy_buffer_stack_max) + grow_size;
+               (yy_buffer_stack) = (struct yy_buffer_state**)xbt_graph_parse_realloc
+                                                               ((yy_buffer_stack),
+                                                               num_to_alloc * sizeof(struct yy_buffer_state*)
+                                                               );
+               if ( ! (yy_buffer_stack) )
+                       YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse_ensure_buffer_stack()" );
+
+               /* zero only the new slots.*/
+               memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+               (yy_buffer_stack_max) = num_to_alloc;
+       }

 }
 
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
 }
 
 /** Setup the input buffer state to scan directly from a user-specified character buffer.
  * @param base the character buffer
  * @param size the size in bytes of the character buffer

- *
- * @return the newly allocated buffer state object.
+ * 
+ * @return the newly allocated buffer state object. 

  */
 YY_BUFFER_STATE xbt_graph_parse__scan_buffer  (char * base, yy_size_t  size )
 {
  */
 YY_BUFFER_STATE xbt_graph_parse__scan_buffer  (char * base, yy_size_t  size )
 {

-  YY_BUFFER_STATE b;
-
-  if ( size < 2 ||
-       base[size-2] != YY_END_OF_BUFFER_CHAR ||
-       base[size-1] != YY_END_OF_BUFFER_CHAR )
-    /* They forgot to leave room for the EOB's. */
-    return 0;
-
-  b = (YY_BUFFER_STATE) xbt_graph_parse_alloc(sizeof( struct yy_buffer_state )  );
-  if ( ! b )
-    YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse__scan_buffer()" );
-
-  b->yy_buf_size = size - 2;  /* "- 2" to take care of EOB's */
-  b->yy_buf_pos = b->yy_ch_buf = base;
-  b->yy_is_our_buffer = 0;
-  b->yy_input_file = 0;
-  b->yy_n_chars = b->yy_buf_size;
-  b->yy_is_interactive = 0;
-  b->yy_at_bol = 1;
-  b->yy_fill_buffer = 0;
-  b->yy_buffer_status = YY_BUFFER_NEW;
-
-  xbt_graph_parse__switch_to_buffer(b  );
-
-  return b;
+       YY_BUFFER_STATE b;
+    
+       if ( size < 2 ||
+            base[size-2] != YY_END_OF_BUFFER_CHAR ||
+            base[size-1] != YY_END_OF_BUFFER_CHAR )
+               /* They forgot to leave room for the EOB's. */
+               return 0;
+
+       b = (YY_BUFFER_STATE) xbt_graph_parse_alloc(sizeof( struct yy_buffer_state )  );
+       if ( ! b )
+               YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse__scan_buffer()" );
+
+       b->yy_buf_size = size - 2;      /* "- 2" to take care of EOB's */
+       b->yy_buf_pos = b->yy_ch_buf = base;
+       b->yy_is_our_buffer = 0;
+       b->yy_input_file = 0;
+       b->yy_n_chars = b->yy_buf_size;
+       b->yy_is_interactive = 0;
+       b->yy_at_bol = 1;
+       b->yy_fill_buffer = 0;
+       b->yy_buffer_status = YY_BUFFER_NEW;
+
+       xbt_graph_parse__switch_to_buffer(b  );
+
+       return b;

 }
 
 /** Setup the input buffer state to scan a string. The next call to xbt_graph_parse_lex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
 }
 
 /** Setup the input buffer state to scan a string. The next call to xbt_graph_parse_lex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan

- *
+ * 

  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       xbt_graph_parse__scan_bytes() instead.
  */
 YY_BUFFER_STATE xbt_graph_parse__scan_string (yyconst char * yystr )
 {
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
  *       xbt_graph_parse__scan_bytes() instead.
  */
 YY_BUFFER_STATE xbt_graph_parse__scan_string (yyconst char * yystr )
 {

-
-  return xbt_graph_parse__scan_bytes(yystr,strlen(yystr) );
+    
+       return xbt_graph_parse__scan_bytes(yystr,strlen(yystr) );

 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to xbt_graph_parse_lex() will
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to xbt_graph_parse_lex() will
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.

- *
+ * 

  * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE xbt_graph_parse__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
 {
  * @return the newly allocated buffer state object.
  */
 YY_BUFFER_STATE xbt_graph_parse__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
 {

-  YY_BUFFER_STATE b;
-  char *buf;
-  yy_size_t n;
-  yy_size_t i;
-
-  /* Get memory for full buffer, including space for trailing EOB's. */
-  n = _yybytes_len + 2;
-  buf = (char *) xbt_graph_parse_alloc(n  );
-  if ( ! buf )
-    YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse__scan_bytes()" );
-
-  for ( i = 0; i < _yybytes_len; ++i )
-    buf[i] = yybytes[i];
-
-  buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
-
-  b = xbt_graph_parse__scan_buffer(buf,n );
-  if ( ! b )
-    YY_FATAL_ERROR( "bad buffer in xbt_graph_parse__scan_bytes()" );
-
-  /* It's okay to grow etc. this buffer, and we should throw it
-   * away when we're done.
-   */
-  b->yy_is_our_buffer = 1;
-
-  return b;
+       YY_BUFFER_STATE b;
+       char *buf;
+       yy_size_t n;
+       yy_size_t i;
+    
+       /* Get memory for full buffer, including space for trailing EOB's. */
+       n = _yybytes_len + 2;
+       buf = (char *) xbt_graph_parse_alloc(n  );
+       if ( ! buf )
+               YY_FATAL_ERROR( "out of dynamic memory in xbt_graph_parse__scan_bytes()" );
+
+       for ( i = 0; i < _yybytes_len; ++i )
+               buf[i] = yybytes[i];
+
+       buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+       b = xbt_graph_parse__scan_buffer(buf,n );
+       if ( ! b )
+               YY_FATAL_ERROR( "bad buffer in xbt_graph_parse__scan_bytes()" );
+
+       /* It's okay to grow etc. this buffer, and we should throw it
+        * away when we're done.
+        */
+       b->yy_is_our_buffer = 1;
+
+       return b;

 }
 
     static void yy_push_state (int  new_state )
 {
 }
 
     static void yy_push_state (int  new_state )
 {

-      if ( (yy_start_stack_ptr) >= (yy_start_stack_depth) )
-    {
-    yy_size_t new_size;
+       if ( (yy_start_stack_ptr) >= (yy_start_stack_depth) )
+               {
+               yy_size_t new_size;

 
 

-    (yy_start_stack_depth) += YY_START_STACK_INCR;
-    new_size = (yy_start_stack_depth) * sizeof( int );
+               (yy_start_stack_depth) += YY_START_STACK_INCR;
+               new_size = (yy_start_stack_depth) * sizeof( int );

 
 

-    if ( ! (yy_start_stack) )
-      (yy_start_stack) = (int *) xbt_graph_parse_alloc(new_size  );
+               if ( ! (yy_start_stack) )
+                       (yy_start_stack) = (int *) xbt_graph_parse_alloc(new_size  );

 
 

-    else
-      (yy_start_stack) = (int *) xbt_graph_parse_realloc((void *) (yy_start_stack),new_size  );
+               else
+                       (yy_start_stack) = (int *) xbt_graph_parse_realloc((void *) (yy_start_stack),new_size  );

 
 

-    if ( ! (yy_start_stack) )
-      YY_FATAL_ERROR( "out of memory expanding start-condition stack" );
-    }
+               if ( ! (yy_start_stack) )
+                       YY_FATAL_ERROR( "out of memory expanding start-condition stack" );
+               }

 
 

-  (yy_start_stack)[(yy_start_stack_ptr)++] = YY_START;
+       (yy_start_stack)[(yy_start_stack_ptr)++] = YY_START;

 
 

-  BEGIN(new_state);
+       BEGIN(new_state);

 }
 
     static void yy_pop_state  (void)
 {
 }
 
     static void yy_pop_state  (void)
 {

-      if ( --(yy_start_stack_ptr) < 0 )
-    YY_FATAL_ERROR( "start-condition stack underflow" );
+       if ( --(yy_start_stack_ptr) < 0 )
+               YY_FATAL_ERROR( "start-condition stack underflow" );

 
 

-  BEGIN((yy_start_stack)[(yy_start_stack_ptr)]);
+       BEGIN((yy_start_stack)[(yy_start_stack_ptr)]);

 }
 
 #ifndef YY_EXIT_FAILURE
 }
 
 #ifndef YY_EXIT_FAILURE


@@ -3071,40 +3071,40 @@ YY_BUFFER_STATE xbt_graph_parse__scan_bytes  (yyconst char * yybytes, yy_size_t
 
 static void yy_fatal_error (yyconst char* msg )
 {
 
 static void yy_fatal_error (yyconst char* msg )
 {

-      (void) fprintf( stderr, "%s\n", msg );
-  exit( YY_EXIT_FAILURE );
+       (void) fprintf( stderr, "%s\n", msg );
+       exit( YY_EXIT_FAILURE );

 }
 
 /* Redefine yyless() so it works in section 3 code. */
 
 #undef yyless
 #define yyless(n) \
 }
 
 /* Redefine yyless() so it works in section 3 code. */
 
 #undef yyless
 #define yyless(n) \

-  do \
-    { \
-    /* Undo effects of setting up xbt_graph_parse_text. */ \
+       do \
+               { \
+               /* Undo effects of setting up xbt_graph_parse_text. */ \

         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\

-    xbt_graph_parse_text[xbt_graph_parse_leng] = (yy_hold_char); \
-    (yy_c_buf_p) = xbt_graph_parse_text + yyless_macro_arg; \
-    (yy_hold_char) = *(yy_c_buf_p); \
-    *(yy_c_buf_p) = '\0'; \
-    xbt_graph_parse_leng = yyless_macro_arg; \
-    } \
-  while ( 0 )
+               xbt_graph_parse_text[xbt_graph_parse_leng] = (yy_hold_char); \
+               (yy_c_buf_p) = xbt_graph_parse_text + yyless_macro_arg; \
+               (yy_hold_char) = *(yy_c_buf_p); \
+               *(yy_c_buf_p) = '\0'; \
+               xbt_graph_parse_leng = yyless_macro_arg; \
+               } \
+       while ( 0 )

 
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.
 
 /* Accessor  methods (get/set functions) to struct members. */
 
 /** Get the current line number.

- *
+ * 

  */
 int xbt_graph_parse_get_lineno  (void)
 {
  */
 int xbt_graph_parse_get_lineno  (void)
 {

-
+        

     return xbt_graph_parse_lineno;
 }
 
 /** Get the input stream.
     return xbt_graph_parse_lineno;
 }
 
 /** Get the input stream.

- *
+ * 

  */
 FILE *xbt_graph_parse_get_in  (void)
 {
  */
 FILE *xbt_graph_parse_get_in  (void)
 {


@@ -3112,7 +3112,7 @@ FILE *xbt_graph_parse_get_in  (void)
 }
 
 /** Get the output stream.
 }
 
 /** Get the output stream.

- *
+ * 

  */
 FILE *xbt_graph_parse_get_out  (void)
 {
  */
 FILE *xbt_graph_parse_get_out  (void)
 {


@@ -3120,7 +3120,7 @@ FILE *xbt_graph_parse_get_out  (void)
 }
 
 /** Get the length of the current token.
 }
 
 /** Get the length of the current token.

- *
+ * 

  */
 yy_size_t xbt_graph_parse_get_leng  (void)
 {
  */
 yy_size_t xbt_graph_parse_get_leng  (void)
 {


@@ -3128,7 +3128,7 @@ yy_size_t xbt_graph_parse_get_leng  (void)
 }
 
 /** Get the current token.
 }
 
 /** Get the current token.

- *
+ * 

  */
 
 char *xbt_graph_parse_get_text  (void)
  */
 
 char *xbt_graph_parse_get_text  (void)


@@ -3138,18 +3138,18 @@ char *xbt_graph_parse_get_text  (void)
 
 /** Set the current line number.
  * @param line_number
 
 /** Set the current line number.
  * @param line_number

- *
+ * 

  */
 void xbt_graph_parse_set_lineno (int  line_number )
 {
  */
 void xbt_graph_parse_set_lineno (int  line_number )
 {

-
+    

     xbt_graph_parse_lineno = line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.
     xbt_graph_parse_lineno = line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param in_str A readable stream.

- *
+ * 

  * @see xbt_graph_parse__switch_to_buffer
  */
 void xbt_graph_parse_set_in (FILE *  in_str )
  * @see xbt_graph_parse__switch_to_buffer
  */
 void xbt_graph_parse_set_in (FILE *  in_str )


@@ -3180,7 +3180,7 @@ static int yy_init_globals (void)
 
     /* We do not touch xbt_graph_parse_lineno unless the option is enabled. */
     xbt_graph_parse_lineno =  1;
 
     /* We do not touch xbt_graph_parse_lineno unless the option is enabled. */
     xbt_graph_parse_lineno =  1;

-
+    

     (yy_buffer_stack) = 0;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
     (yy_buffer_stack) = 0;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;


@@ -3210,17 +3210,17 @@ static int yy_init_globals (void)
 /* xbt_graph_parse_lex_destroy is for both reentrant and non-reentrant scanners. */
 int xbt_graph_parse_lex_destroy  (void)
 {
 /* xbt_graph_parse_lex_destroy is for both reentrant and non-reentrant scanners. */
 int xbt_graph_parse_lex_destroy  (void)
 {

-
+    

     /* Pop the buffer stack, destroying each element. */
     /* Pop the buffer stack, destroying each element. */

-  while(YY_CURRENT_BUFFER){
-    xbt_graph_parse__delete_buffer(YY_CURRENT_BUFFER  );
-    YY_CURRENT_BUFFER_LVALUE = NULL;
-    xbt_graph_parse_pop_buffer_state();
-  }
+       while(YY_CURRENT_BUFFER){
+               xbt_graph_parse__delete_buffer(YY_CURRENT_BUFFER  );
+               YY_CURRENT_BUFFER_LVALUE = NULL;
+               xbt_graph_parse_pop_buffer_state();
+       }

 
 

-  /* Destroy the stack itself. */
-  xbt_graph_parse_free((yy_buffer_stack) );
-  (yy_buffer_stack) = NULL;
+       /* Destroy the stack itself. */
+       xbt_graph_parse_free((yy_buffer_stack) );
+       (yy_buffer_stack) = NULL;

 
     /* Destroy the start condition stack. */
         xbt_graph_parse_free((yy_start_stack)  );
 
     /* Destroy the start condition stack. */
         xbt_graph_parse_free((yy_start_stack)  );


@@ -3240,43 +3240,43 @@ int xbt_graph_parse_lex_destroy  (void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {

-  int i;
-  for ( i = 0; i < n; ++i )
-    s1[i] = s2[i];
+       int i;
+       for ( i = 0; i < n; ++i )
+               s1[i] = s2[i];

 }
 #endif
 
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s )
 {
 }
 #endif
 
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s )
 {

-  int n;
-  for ( n = 0; s[n]; ++n )
-    ;
+       int n;
+       for ( n = 0; s[n]; ++n )
+               ;

 
 

-  return n;
+       return n;

 }
 #endif
 
 void *xbt_graph_parse_alloc (yy_size_t  size )
 {
 }
 #endif
 
 void *xbt_graph_parse_alloc (yy_size_t  size )
 {

-  return (void *) malloc( size );
+       return (void *) malloc( size );

 }
 
 void *xbt_graph_parse_realloc  (void * ptr, yy_size_t  size )
 {
 }
 
 void *xbt_graph_parse_realloc  (void * ptr, yy_size_t  size )
 {

-  /* The cast to (char *) in the following accommodates both
-   * implementations that use char* generic pointers, and those
-   * that use void* generic pointers.  It works with the latter
-   * because both ANSI C and C++ allow castless assignment from
-   * any pointer type to void*, and deal with argument conversions
-   * as though doing an assignment.
-   */
-  return (void *) realloc( (char *) ptr, size );
+       /* The cast to (char *) in the following accommodates both
+        * implementations that use char* generic pointers, and those
+        * that use void* generic pointers.  It works with the latter
+        * because both ANSI C and C++ allow castless assignment from
+        * any pointer type to void*, and deal with argument conversions
+        * as though doing an assignment.
+        */
+       return (void *) realloc( (char *) ptr, size );

 }
 
 void xbt_graph_parse_free (void * ptr )
 {
 }
 
 void xbt_graph_parse_free (void * ptr )
 {

-  free( (char *) ptr );  /* see xbt_graph_parse_realloc() for (char *) cast */
+       free( (char *) ptr );   /* see xbt_graph_parse_realloc() for (char *) cast */

 }
 
 #define YYTABLES_NAME "yytables"
 }
 
 #define YYTABLES_NAME "yytables"


@@ -3285,8 +3285,8 @@ void xbt_graph_parse_free (void * ptr )
 int graphxml_element_context(int i)
 {
   return (0<i && i<yy_start_stack_depth
 int graphxml_element_context(int i)
 {
   return (0<i && i<yy_start_stack_depth

-    ? yy_start_stack[yy_start_stack_ptr - i]
-    : 0);
+         ? yy_start_stack[yy_start_stack_ptr - i]
+         : 0);

 }
 
 #ifdef FLEX_DEBUG
 }
 
 #ifdef FLEX_DEBUG


@@ -3325,7 +3325,7 @@ static void debug_enter(int state, const char* statename) {
 static void debug_leave(void) {
     if (xbt_graph_parse__flex_debug) {
         print_yy_stack("--LEAVE : ");
 static void debug_leave(void) {
     if (xbt_graph_parse__flex_debug) {
         print_yy_stack("--LEAVE : ");

-  print_graphxml_bufferstack();
+       print_graphxml_bufferstack();

     }
   yy_pop_state();
 }
     }
   yy_pop_state();
 }


@@ -3340,7 +3340,7 @@ static void cleanup(void)
 {
     if (graphxml_statenames) {
         free(graphxml_statenames);
 {
     if (graphxml_statenames) {
         free(graphxml_statenames);

-  graphxml_statenames = NULL;
+       graphxml_statenames = NULL;

     }
     free(graphxml_bufferstack);
     graphxml_bufferstack = NULL;
     }
     free(graphxml_bufferstack);
     graphxml_bufferstack = NULL;


@@ -3355,12 +3355,12 @@ static int fail(const char* fmt, ...)
     va_list ap; va_start(ap, fmt);
 #ifdef FLEXML_yylineno
     used = sprintf(flexml_err_msg,
     va_list ap; va_start(ap, fmt);
 #ifdef FLEXML_yylineno
     used = sprintf(flexml_err_msg,

-       "Invalid XML (XML input line %d, state %d): ",
-       xbt_graph_parse_lineno, YY_START);
+                  "Invalid XML (XML input line %d, state %d): ",
+                  xbt_graph_parse_lineno, YY_START);

 #else
     used = sprintf(flexml_err_msg,
 #else
     used = sprintf(flexml_err_msg,

-       "Invalid XML (state %d): ",
-       YY_START);
+                  "Invalid XML (state %d): ",
+                  YY_START);

 #endif
     chars_left = flexml_max_err_msg_size - used - 1;
     vsnprintf(flexml_err_msg + used, chars_left, fmt, ap);
 #endif
     chars_left = flexml_max_err_msg_size - used - 1;
     vsnprintf(flexml_err_msg + used, chars_left, fmt, ap);