Regenerate all flexml parsers with 1.9.6-4

[simgrid.git] / src / surf / simgrid_dtd.c

diff --git a/src/surf/simgrid_dtd.c b/src/surf/simgrid_dtd.c
index e960121..f5c632a 100644 (file)
--- a/src/surf/simgrid_dtd.c
+++ b/src/surf/simgrid_dtd.c
@@ -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


@@ -217,83 +217,83 @@ extern FILE *surf_parse_in, *surf_parse_out;
     
 /* 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 surf_parse_text. */ \
+       do \
+               { \
+               /* Undo effects of setting up surf_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 surf_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 surf_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 surf_parse_restart()), so that the user can continue scanning by
-   * just pointing surf_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 surf_parse_restart()), so that the user can continue scanning by
+        * just pointing surf_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 surf_parse_text is formed. */
 static char yy_hold_char;
 
 /* yy_hold_char holds the character lost when surf_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 surf_parse_leng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
 yy_size_t surf_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 surf_parse_wrap()'s to do buffer switches
  * instead of setting up a fresh surf_parse_in.  A bit of a hack ...
 
 /* Flag which is used to allow surf_parse_wrap()'s to do buffer switches
  * instead of setting up a fresh surf_parse_in.  A bit of a hack ...


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

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

         surf_parse_ensure_buffer_stack (); \
         surf_parse_ensure_buffer_stack (); \

-    YY_CURRENT_BUFFER_LVALUE =    \
+               YY_CURRENT_BUFFER_LVALUE =    \

             surf_parse__create_buffer(surf_parse_in,YY_BUF_SIZE ); \
             surf_parse__create_buffer(surf_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 ){\

         surf_parse_ensure_buffer_stack (); \
         surf_parse_ensure_buffer_stack (); \

-    YY_CURRENT_BUFFER_LVALUE =    \
+               YY_CURRENT_BUFFER_LVALUE =    \

             surf_parse__create_buffer(surf_parse_in,YY_BUF_SIZE ); \
             surf_parse__create_buffer(surf_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 surf_parse_text.
  */
 #define YY_DO_BEFORE_ACTION \
  * corresponding action - sets up surf_parse_text.
  */
 #define YY_DO_BEFORE_ACTION \

-  (yytext_ptr) = yy_bp; \
-  surf_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; \
+       surf_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 595
 #define YY_END_OF_BUFFER 596
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
 
 #define YY_NUM_RULES 595
 #define YY_END_OF_BUFFER 596
 /* 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[3466] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 static yyconst flex_int16_t yy_accept[3466] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,


@@ -450,348 +450,348 @@ static yyconst flex_int16_t yy_accept[3466] =
         0,    0,    0,    0,    0,    0,  596,  594,   15,   10,
        10,   15,   15,  574,   10,  574,    5,    6,    5,    8,
         9,    8,  590,  582,  583,  591,  588,  591,  589,  593,
         0,    0,    0,    0,    0,    0,  596,  594,   15,   10,
        10,   15,   15,  574,   10,  574,    5,    6,    5,    8,
         9,    8,  590,  582,  583,  591,  588,  591,  589,  593,

-      582,  583,  593,  130,   10,  130,  130,  130,  128,  130,
-      130,  134,   10,  134,  134,  594,  134,  594,  594,  134,
-      453,   10,  453,  453,  453,  451,  453,  453,  453,  457,
-
-       10,  457,  594,  457,  532,   10,  532,  532,  532,  530,
-      532,  536,   10,  536,  384,   10,  384,  384,  384,  382,
-      384,  384,  384,  388,   10,  388,  500,   10,  500,  500,
-      500,  498,  500,  500,  500,  504,   10,  504,  504,  483,
-       10,  483,  483,  483,  481,  483,  483,  487,   10,  487,
-      487,  331,   10,  331,  331,  331,  329,  331,  331,  331,
-      331,  331,  331,  335,   10,  335,  308,   10,  308,  308,
-      308,  306,  308,  308,  308,  308,  308,  308,  308,  308,
-      308,  312,   10,  312,  312,  543,   10,  543,  543,  543,
-      541,  543,  547,   10,  547,  547,  234,   10,  234,  234,
-
-      234,  232,  234,  238,   10,  238,  204,   10,  204,  204,
-      204,  202,  204,  204,  204,  204,  204,  208,   10,  208,
-      594,  208,  249,   10,  249,  249,  249,  247,  249,  249,
-      249,  253,   10,  253,   33,   10,   33,   33,   33,   31,
-       33,   37,   10,   37,  594,   37,  415,   10,  415,  415,
-      415,  413,  415,  415,  415,  415,  419,   10,  419,  419,
-      470,   10,  470,  470,  470,  468,  470,  470,  474,   10,
-      474,  569,   10,  569,  569,  569,  567,  569,  569,  573,
-       10,  573,  162,   10,  162,  162,  162,  160,  162,  162,
-      166,   10,  166,  175,   10,  175,  175,  175,  173,  175,
-
-      175,  179,   10,  179,  356,   10,  356,  356,  356,  354,
-      356,  356,  356,  356,  356,  356,  356,  360,   10,  360,
-      594,   22,   10,   22,   22,   22,   20,   22,   26,   10,
-       26,   26,  594,   26,  594,   26,  521,   10,  521,  521,
-      521,  519,  521,  521,  521,  521,  521,  525,   10,  525,
-      594,  525,  556,   10,  556,  556,  556,  554,  556,  556,
-      560,   10,  560,   78,   10,   78,   78,   78,   76,   78,
-       78,   78,   78,   78,   82,   10,   82,  432,   10,  432,
-      432,  432,  430,  432,  432,  436,   10,  436,  436,  369,
-       10,  369,  369,  369,  367,  369,  369,  373,   10,  373,
-
-      223,   10,  223,  223,  223,  221,  223,  223,  223,  223,
-      227,   10,  227,  227,  149,   10,  149,  149,  149,  147,
-      149,  149,  149,  149,  153,   10,  153,  594,  153,   48,
-       10,   48,   48,   48,   46,   48,   48,   48,  591,  590,
-      101,   10,  101,  101,  101,   99,  101,  101,  101,  105,
-       10,  105,   10,    0,    2,    2,    0,    4,    7,  585,
-      584,    0,    0,    0,    0,    0,    0,  129,  131,  131,
-      131,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+      582,  583,  593,   40,   10,   40,   40,   40,   38,   40,
+       40,   44,   10,   44,   44,  594,   44,  594,  594,   44,
+       61,   10,   61,   61,   61,   59,   61,   61,   61,   65,
+
+       10,   65,  594,   65,   72,   10,   72,   72,   72,   70,
+       72,   76,   10,   76,   87,   10,   87,   87,   87,   85,
+       87,   87,   87,   91,   10,   91,  104,   10,  104,  104,
+      104,  102,  104,  104,  104,  108,   10,  108,  108,  117,
+       10,  117,  117,  117,  115,  117,  117,  121,   10,  121,
+      121,  140,   10,  140,  140,  140,  138,  140,  140,  140,
+      140,  140,  140,  144,   10,  144,  199,   10,  199,  199,
+      199,  197,  199,  199,  199,  199,  199,  199,  199,  199,
+      199,  203,   10,  203,  203,  210,   10,  210,  210,  210,
+      208,  210,  214,   10,  214,  214,  221,   10,  221,  221,
+
+      221,  219,  221,  225,   10,  225,  250,   10,  250,  250,
+      250,  248,  250,  250,  250,  250,  250,  254,   10,  254,
+      594,  254,  265,   10,  265,  265,  265,  263,  265,  265,
+      265,  269,   10,  269,  276,   10,  276,  276,  276,  274,
+      276,  280,   10,  280,  594,  280,  307,   10,  307,  307,
+      307,  305,  307,  307,  307,  307,  311,   10,  311,  311,
+      324,   10,  324,  324,  324,  322,  324,  324,  328,   10,
+      328,  337,   10,  337,  337,  337,  335,  337,  337,  341,
+       10,  341,  350,   10,  350,  350,  350,  348,  350,  350,
+      354,   10,  354,  363,   10,  363,  363,  363,  361,  363,
+
+      363,  367,   10,  367,  388,   10,  388,  388,  388,  386,
+      388,  388,  388,  388,  388,  388,  388,  392,   10,  392,
+      594,  399,   10,  399,  399,  399,  397,  399,  403,   10,
+      403,  403,  594,  403,  594,  403,  420,   10,  420,  420,
+      420,  418,  420,  420,  420,  420,  420,  424,   10,  424,
+      594,  424,  433,   10,  433,  433,  433,  431,  433,  433,
+      437,   10,  437,  464,   10,  464,  464,  464,  462,  464,
+      464,  464,  464,  464,  468,   10,  468,  481,   10,  481,
+      481,  481,  479,  481,  481,  485,   10,  485,  485,  494,
+       10,  494,  494,  494,  492,  494,  494,  498,   10,  498,
+
+      513,   10,  513,  513,  513,  511,  513,  513,  513,  513,
+      517,   10,  517,  517,  532,   10,  532,  532,  532,  530,
+      532,  532,  532,  532,  536,   10,  536,  594,  536,  547,
+       10,  547,  547,  547,  545,  547,  547,  547,  591,  590,
+      569,   10,  569,  569,  569,  567,  569,  569,  569,  573,
+       10,  573,   10,    0,    2,    2,    0,    4,    7,  585,
+      584,    0,    0,    0,    0,    0,    0,   39,   41,   41,
+       41,    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,  452,  454,  454,  454,  454,  454,    0,
-        0,  531,  533,  533,    0,  383,  385,  385,  385,  385,
-        0,  499,  501,  501,  501,  501,    0,  482,  484,  484,
-      484,    0,  330,  332,  332,  332,  332,  332,  332,  332,
-      332,    0,  307,  309,  309,  309,  309,  309,  309,  309,
-      309,  309,  309,  309,  309,  309,  309,  309,  309,  309,
-        0,  542,  544,  544,    0,  233,  235,  235,    0,  203,
-      205,  205,  205,  205,  205,  205,  205,    0,    0,  248,
-      250,  250,  250,  250,    0,   32,   34,   34,    0,    0,
-      414,  416,  416,  416,  416,  416,  416,    0,  469,  471,
-
-      471,  471,    0,  568,  570,  570,  570,    0,  161,  163,
-      163,  163,    0,  174,  176,  176,  176,    0,  355,  357,
-      357,  357,  357,  357,  357,  357,  357,    0,    0,   21,
-       23,   23,    0,    0,    0,    0,    0,    0,  520,  522,
-      522,  522,  522,  522,  522,    0,    0,  555,  557,  557,
-      557,    0,   77,   79,   79,   79,   79,   79,   79,   79,
-       79,   79,    0,  431,  433,  433,  433,  433,    0,  368,
-      370,  370,  370,    0,  222,  224,  224,  224,  224,  224,
-        0,  148,  150,  150,  150,  150,  150,    0,    0,   47,
-       49,   49,   49,   49,    0,    0,    0,  100,  102,  102,
-
-      102,  102,    0,    0,    0,    0,    0,    3,    0,    0,
-        0,    0,    0,    0,    0,  592,    0,    0,  131,    0,
-        0,  107,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   60,   62,   62,   62,   62,   62,    0,
+        0,   71,   73,   73,    0,   86,   88,   88,   88,   88,
+        0,  103,  105,  105,  105,  105,    0,  116,  118,  118,
+      118,    0,  139,  141,  141,  141,  141,  141,  141,  141,
+      141,    0,  198,  200,  200,  200,  200,  200,  200,  200,
+      200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+        0,  209,  211,  211,    0,  220,  222,  222,    0,  249,
+      251,  251,  251,  251,  251,  251,  251,    0,    0,  264,
+      266,  266,  266,  266,    0,  275,  277,  277,    0,    0,
+      306,  308,  308,  308,  308,  308,  308,    0,  323,  325,
+
+      325,  325,    0,  336,  338,  338,  338,    0,  349,  351,
+      351,  351,    0,  362,  364,  364,  364,    0,  387,  389,
+      389,  389,  389,  389,  389,  389,  389,    0,    0,  398,
+      400,  400,    0,    0,    0,    0,    0,    0,  419,  421,
+      421,  421,  421,  421,  421,    0,    0,  432,  434,  434,
+      434,    0,  463,  465,  465,  465,  465,  465,  465,  465,
+      465,  465,    0,  480,  482,  482,  482,  482,    0,  493,
+      495,  495,  495,    0,  512,  514,  514,  514,  514,  514,
+        0,  531,  533,  533,  533,  533,  533,    0,    0,  546,
+      548,  548,  548,  548,    0,    0,    0,  568,  570,  570,
+
+      570,  570,    0,    0,    0,    0,    0,    3,    0,    0,
+        0,    0,    0,    0,    0,  592,    0,    0,   41,    0,
+        0,   17,    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,  106,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  106,    0,    0,  454,  454,
-      454,  454,    0,    0,    0,  533,    0,    0,  385,    0,
-        0,  385,    0,    0,  501,  501,  501,    0,    0,  484,
-      484,    0,    0,    0,    0,    0,    0,  332,  332,  332,
-      332,  332,    0,    0,  309,  309,    0,    0,  309,    0,
-
-        0,  309,  309,  309,  309,  309,  309,  309,  309,  309,
-      309,  309,    0,    0,    0,    0,    0,    0,  235,    0,
-        0,  205,  205,  205,    0,    0,  205,  205,  205,    0,
-        0,    0,    0,  250,    0,    0,    0,    0,    0,    0,
-       34,    0,    0,  107,  416,    0,    0,  416,  416,  416,
-        0,    0,  471,    0,    0,    0,    0,    0,    0,  570,
-        0,    0,  163,  163,    0,    0,  176,  176,    0,    0,
-      357,  357,  357,    0,    0,  357,  357,  357,    0,    0,
-        0,   23,    0,    0,    0,    0,    0,  522,  522,  522,
-      522,  522,    0,    0,    0,    0,    0,  557,    0,    0,
-
-       79,    0,    0,   79,   79,   79,   79,   79,   79,    0,
-        0,  433,  433,  433,    0,    0,  370,    0,    0,    0,
-        0,  224,  224,    0,    0,  224,    0,    0,  150,    0,
-        0,  150,  150,    0,    0,    0,   49,    0,    0,   49,
-        0,    0,    0,  587,  102,  102,  102,    0,    0,    0,
+        0,    0,   16,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,   16,    0,    0,   62,   62,
+       62,   62,    0,    0,    0,   73,    0,    0,   88,    0,
+        0,   88,    0,    0,  105,  105,  105,    0,    0,  118,
+      118,    0,    0,    0,    0,    0,    0,  141,  141,  141,
+      141,  141,    0,    0,  200,  200,    0,    0,  200,    0,
+
+        0,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+      200,  200,    0,    0,    0,    0,    0,    0,  222,    0,
+        0,  251,  251,  251,    0,    0,  251,  251,  251,    0,
+        0,    0,    0,  266,    0,    0,    0,    0,    0,    0,
+      277,    0,    0,   17,  308,    0,    0,  308,  308,  308,
+        0,    0,  325,    0,    0,    0,    0,    0,    0,  338,
+        0,    0,  351,  351,    0,    0,  364,  364,    0,    0,
+      389,  389,  389,    0,    0,  389,  389,  389,    0,    0,
+        0,  400,    0,    0,    0,    0,    0,  421,  421,  421,
+      421,  421,    0,    0,    0,    0,    0,  434,    0,    0,
+
+      465,    0,    0,  465,  465,  465,  465,  465,  465,    0,
+        0,  482,  482,  482,    0,    0,  495,    0,    0,    0,
+        0,  514,  514,    0,    0,  514,    0,    0,  533,    0,
+        0,  533,  533,    0,    0,    0,  548,    0,    0,  548,
+        0,    0,    0,  587,  570,  570,  570,    0,    0,    0,

        14,    1,    0,    0,  580,    0,    0,    0,  577,  576,
        14,    1,    0,    0,  580,    0,    0,    0,  577,  576,

-        0,    0,  109,  108,  131,    0,    0,  133,    0,  107,
-        0,    0,    0,    0,    0,    0,    0,  229,    0,    0,
+        0,    0,   19,   18,   41,    0,    0,   43,    0,   17,
+        0,    0,    0,    0,    0,    0,    0,  216,    0,    0,

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

-        0,    0,  106,    0,    0,    0,    0,    0,  228,    0,
+        0,    0,   16,    0,    0,    0,    0,    0,  215,    0,

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

-      454,  454,    0,    0,  454,    0,    0,  456,    0,    0,
-      533,    0,    0,  535,    0,  385,    0,  377,  376,  385,
-        0,    0,  387,    0,    0,    0,  501,  501,    0,    0,
-        0,    0,  503,    0,    0,    0,    0,    0,    0,    0,
-      486,    0,    0,  326,  325,    0,  316,  315,    0,    0,
-      332,  332,  332,  332,    0,    0,  334,    0,  309,  309,
-      309,  309,    0,  269,  268,  309,    0,  257,  256,    0,
-        0,  309,  309,  309,  309,  309,  309,  309,  309,  309,
-      309,    0,    0,  311,    0,    0,  540,  539,    0,    0,
-
-      546,    0,  235,    0,    0,  237,    0,  205,  205,  205,
-        0,  183,  182,  205,  205,  205,    0,    0,  207,    0,
-        0,    0,  250,    0,  242,  241,    0,  244,  243,    0,
-        0,  252,    0,   34,    0,    0,   36,    0,  416,    0,
-      392,  391,  416,  416,  416,    0,    0,  418,    0,  471,
-        0,  461,  460,    0,    0,  473,    0,    0,  564,  563,
-      570,    0,    0,  572,    0,  163,  163,    0,    0,  165,
-        0,  176,  176,    0,    0,  178,    0,  357,  357,  357,
-      357,    0,  339,  338,    0,    0,  357,  357,    0,    0,
-      359,    0,    0,   23,    0,    0,   25,    0,    0,    0,
-
-        0,  522,  522,  522,  522,  522,    0,    0,  524,    0,
-        0,    0,  551,  550,  557,    0,    0,  559,    0,   79,
-        0,   55,   54,    0,    0,   79,    0,    0,   79,   79,
-       79,    0,    0,   81,    0,    0,    0,    0,    0,  433,
-        0,    0,  435,    0,  370,    0,  364,  363,    0,    0,
-      372,    0,  224,  224,    0,  212,  211,  224,    0,    0,
-      226,    0,  150,    0,  138,  137,  150,  150,    0,    0,
-      152,    0,    0,   49,    0,   41,   40,   49,    0,    0,
-        0,   51,    0,  102,  102,  102,    0,    0,  104,    0,
-        0,    0,  581,  575,    0,    0,  131,    0,  132,    0,
-
-        0,    0,    0,    0,    0,    0,  229,  181,    0,  390,
-        0,    0,    0,  337,    0,    0,  549,    0,    0,    0,
-        0,  548,    0,    0,    0,    0,    0,  228,  180,    0,
-      389,  336,    0,    0,    0,    0,    0,    0,  442,  441,
-      454,  454,    0,  440,  439,  454,    0,  389,  533,    0,
-      385,  385,    0,    0,  493,  492,  501,  501,    0,  491,
-      490,    0,    0,  480,  479,    0,  478,  477,    0,    0,
-      328,  327,  332,  332,  332,  332,    0,  309,  309,  309,
-      309,    0,    0,    0,  271,  270,  309,  309,  309,  309,
-      309,  309,  309,  309,  309,  309,  309,    0,    0,    0,
-
-        0,    0,  205,  205,    0,    0,  205,  205,  205,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  416,  416,
-      416,  416,    0,  471,    0,  570,    0,    0,    0,  163,
-        0,    0,    0,  176,    0,  357,  357,  357,  357,    0,
-      347,  346,  357,  357,    0,    0,   23,    0,    0,    0,
-        0,  522,    0,    0,  522,  522,  522,    0,    0,  557,
-        0,   79,    0,   59,   58,    0,    0,    0,   57,   56,
-       79,    0,    0,   79,    0,    0,  425,  424,    0,  423,
-      422,  433,    0,  370,    0,  224,  224,  224,    0,  150,
-      150,    0,    0,    0,    0,    0,    0,   49,    0,    0,
-
-      102,    0,    0,  102,    0,    0,    0,    0,   12,    0,
-      578,  579,  131,    0,    0,    0,    0,    0,    0,    0,
-      181,    0,    0,  390,    0,    0,  154,    0,  337,    0,
-        0,  549,    0,  421,    0,   39,  548,    0,    0,    0,
-        0,    0,  180,    0,    0,  389,  336,  420,    0,   38,
-      421,  420,  454,  454,  454,    0,    0,    0,    0,    0,
-      385,  385,    0,  501,  501,    0,    0,    0,    0,  332,
-      332,  332,    0,  309,    0,    0,  309,  309,    0,  267,
-      266,  309,  309,    0,    0,  309,  309,  309,  309,  309,
-      309,  309,  309,    0,    0,    0,  231,  230,    0,  236,
-
-      205,  205,    0,  187,  186,    0,    0,  205,    0,    0,
-      205,    0,  155,    0,    0,  246,  245,    0,    0,   30,
-       29,    0,  416,  416,  416,    0,    0,  416,    0,  471,
-        0,    0,    0,    0,    0,  159,  158,  163,    0,    0,
-      172,  171,  176,    0,  357,    0,    0,  357,  357,    0,
-        0,  357,    0,    0,   23,    0,    0,    0,    0,  522,
-        0,  508,  507,  522,  522,  522,    0,    0,    0,    0,
-        0,   79,    0,   61,   60,   79,    0,   65,   64,   79,
-        0,  433,    0,  370,    0,  224,  224,  224,    0,  150,
-        0,    0,    0,  142,  141,    0,    0,    0,   43,   42,
-
-       49,    0,    0,  102,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,   11,  131,    0,    0,    0,    0,    0,
-        0,  537,    0,    0,    0,    0,  154,    0,    0,    0,
-       52,  421,  362,    0,   39,    0,    0,    0,    0,    0,
-        0,    0,    0,  420,  361,    0,   38,    0,    0,    0,
-        0,    0,  454,    0,    0,    0,  529,  528,    0,  385,
-      385,    0,    0,    0,    0,    0,    0,    0,    0,  324,
-      323,    0,    0,  332,    0,    0,    0,  309,    0,  287,
-      286,    0,    0,  309,  309,  309,    0,  265,  264,    0,
-        0,  309,  309,  309,  309,    0,    0,  309,  309,    0,
-
-        0,  205,  205,    0,  185,  184,    0,    0,    0,    0,
-        0,  205,    0,  206,  155,    0,    0,    0,  416,  416,
-      416,    0,    0,    0,  416,    0,  417,  471,    0,    0,
-      566,  565,    0,  163,    0,    0,    0,    0,  357,    0,
-      343,  342,    0,    0,  357,    0,  341,  340,  357,    0,
-      358,    0,   23,    0,  538,    0,   53,  522,  522,  522,
-      522,    0,    0,    0,  553,  552,    0,  558,   79,   79,
-       79,    0,  433,    0,  370,    0,    0,    0,  224,    0,
-        0,    0,  150,    0,  140,  139,    0,    0,   49,    0,
-        0,  102,    0,    0,    0,    0,    0,    0,    0,    0,
-
-        0,   96,   95,    0,    0,    0,    0,    0,    0,  438,
-        0,    0,    0,    0,  314,  255,  537,    0,   28,    0,
-        0,    0,    0,  505,   52,  362,  210,    0,  437,    0,
-        0,    0,  313,  254,    0,   27,  361,  209,    0,    0,
-      446,  445,    0,  444,  443,  454,    0,    0,    0,  385,
-        0,    0,    0,    0,  497,  496,    0,  495,  494,    0,
-        0,    0,  318,  317,    0,    0,    0,  320,  319,    0,
-      309,    0,  289,  288,  309,  309,  309,    0,  259,  258,
-        0,    0,  309,  309,  309,    0,  261,  260,  309,  309,
-        0,    0,  205,  205,    0,  201,  200,    0,    0,  205,
-
-        0,    0,    0,  416,    0,    0,  416,  416,    0,    0,
-      416,  471,    0,    0,  163,    0,  164,    0,  170,  169,
-        0,  357,    0,  345,  344,  357,  357,    0,    0,    0,
-        0,  538,  506,   53,  522,  522,  522,  522,    0,    0,
-       79,    0,    0,   79,    0,  433,    0,  434,  370,    0,
-        0,  220,  219,    0,    0,  224,    0,  214,  213,    0,
-        0,    0,  150,    0,    0,   49,    0,    0,   50,    0,
+       62,   62,    0,    0,   62,    0,    0,   64,    0,    0,
+       73,    0,    0,   75,    0,   88,    0,   82,   81,   88,
+        0,    0,   90,    0,    0,    0,  105,  105,    0,    0,
+        0,    0,  107,    0,    0,    0,    0,    0,    0,    0,
+      120,    0,    0,  125,  124,    0,  127,  126,    0,    0,
+      141,  141,  141,  141,    0,    0,  143,    0,  200,  200,
+      200,  200,    0,  158,  157,  200,    0,  162,  161,    0,
+        0,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+      200,    0,    0,  202,    0,    0,  207,  206,    0,    0,
+
+      213,    0,  222,    0,    0,  224,    0,  251,  251,  251,
+        0,  237,  236,  251,  251,  251,    0,    0,  253,    0,
+        0,    0,  266,    0,  260,  259,    0,  262,  261,    0,
+        0,  268,    0,  277,    0,    0,  279,    0,  308,    0,
+      288,  287,  308,  308,  308,    0,    0,  310,    0,  325,
+        0,  321,  320,    0,    0,  327,    0,    0,  332,  331,
+      338,    0,    0,  340,    0,  351,  351,    0,    0,  353,
+        0,  364,  364,    0,    0,  366,    0,  389,  389,  389,
+      389,    0,  379,  378,    0,    0,  389,  389,    0,    0,
+      391,    0,    0,  400,    0,    0,  402,    0,    0,    0,
+
+        0,  421,  421,  421,  421,  421,    0,    0,  423,    0,
+        0,    0,  428,  427,  434,    0,    0,  436,    0,  465,
+        0,  449,  448,    0,    0,  465,    0,    0,  465,  465,
+      465,    0,    0,  467,    0,    0,    0,    0,    0,  482,
+        0,    0,  484,    0,  495,    0,  491,  490,    0,    0,
+      497,    0,  514,  514,    0,  508,  507,  514,    0,    0,
+      516,    0,  533,    0,  525,  524,  533,  533,    0,    0,
+      535,    0,    0,  548,    0,  542,  541,  548,    0,    0,
+        0,  550,    0,  570,  570,  570,    0,    0,  572,    0,
+        0,    0,  581,  575,    0,    0,   41,    0,   42,    0,
+
+        0,    0,    0,    0,    0,    0,  216,  227,    0,  282,
+        0,    0,    0,  369,    0,    0,  426,    0,    0,    0,
+        0,  425,    0,    0,    0,    0,    0,  215,  226,    0,
+      281,  368,    0,    0,    0,    0,    0,    0,   48,   47,
+       62,   62,    0,   54,   53,   62,    0,  281,   73,    0,
+       88,   88,    0,    0,   95,   94,  105,  105,    0,  101,
+      100,    0,    0,  112,  111,    0,  114,  113,    0,    0,
+      129,  128,  141,  141,  141,  141,    0,  200,  200,  200,
+      200,    0,    0,    0,  164,  163,  200,  200,  200,  200,
+      200,  200,  200,  200,  200,  200,  200,    0,    0,    0,
+
+        0,    0,  251,  251,    0,    0,  251,  251,  251,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  308,  308,
+      308,  308,    0,  325,    0,  338,    0,    0,    0,  351,
+        0,    0,    0,  364,    0,  389,  389,  389,  389,    0,
+      381,  380,  389,  389,    0,    0,  400,    0,    0,    0,
+        0,  421,    0,    0,  421,  421,  421,    0,    0,  434,
+        0,  465,    0,  451,  450,    0,    0,    0,  455,  454,
+      465,    0,    0,  465,    0,    0,  472,  471,    0,  474,
+      473,  482,    0,  495,    0,  514,  514,  514,    0,  533,
+      533,    0,    0,    0,    0,    0,    0,  548,    0,    0,
+
+      570,    0,    0,  570,    0,    0,    0,    0,   12,    0,
+      578,  579,   41,    0,    0,    0,    0,    0,    0,    0,
+      227,    0,    0,  282,    0,    0,  342,    0,  369,    0,
+        0,  426,    0,  470,    0,  538,  425,    0,    0,    0,
+        0,    0,  226,    0,    0,  281,  368,  469,    0,  537,
+      470,  469,   62,   62,   62,    0,    0,    0,    0,    0,
+       88,   88,    0,  105,  105,    0,    0,    0,    0,  141,
+      141,  141,    0,  200,    0,    0,  200,  200,    0,  160,
+      159,  200,  200,    0,    0,  200,  200,  200,  200,  200,
+      200,  200,  200,    0,    0,    0,  218,  217,    0,  223,
+
+      251,  251,    0,  235,  234,    0,    0,  251,    0,    0,
+      251,    0,  343,    0,    0,  258,  257,    0,    0,  273,
+      272,    0,  308,  308,  308,    0,    0,  308,    0,  325,
+        0,    0,    0,    0,    0,  345,  344,  351,    0,    0,
+      358,  357,  364,    0,  389,    0,    0,  389,  389,    0,
+        0,  389,    0,    0,  400,    0,    0,    0,    0,  421,
+        0,  409,  408,  421,  421,  421,    0,    0,    0,    0,
+        0,  465,    0,  453,  452,  465,    0,  459,  458,  465,
+        0,  482,    0,  495,    0,  514,  514,  514,    0,  533,
+        0,    0,    0,  529,  528,    0,    0,    0,  540,  539,
+
+      548,    0,    0,  570,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   11,   41,    0,    0,    0,    0,    0,
+        0,  204,    0,    0,    0,    0,  342,    0,    0,    0,
+      438,  470,  487,    0,  538,    0,    0,    0,    0,    0,
+        0,    0,    0,  469,  486,    0,  537,    0,    0,    0,
+        0,    0,   62,    0,    0,    0,   69,   68,    0,   88,
+       88,    0,    0,    0,    0,    0,    0,    0,    0,  131,
+      130,    0,    0,  141,    0,    0,    0,  200,    0,  150,
+      149,    0,    0,  200,  200,  200,    0,  172,  171,    0,
+        0,  200,  200,  200,  200,    0,    0,  200,  200,    0,
+
+        0,  251,  251,    0,  239,  238,    0,    0,    0,    0,
+        0,  251,    0,  252,  343,    0,    0,    0,  308,  308,
+      308,    0,    0,    0,  308,    0,  309,  325,    0,    0,
+      334,  333,    0,  351,    0,    0,    0,    0,  389,    0,
+      373,  372,    0,    0,  389,    0,  383,  382,  389,    0,
+      390,    0,  400,    0,  205,    0,  439,  421,  421,  421,
+      421,    0,    0,    0,  430,  429,    0,  435,  465,  465,
+      465,    0,  482,    0,  495,    0,    0,    0,  514,    0,
+        0,    0,  533,    0,  527,  526,    0,    0,  548,    0,
+        0,  570,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        0,  566,  565,    0,    0,    0,    0,    0,    0,   46,
+        0,    0,    0,    0,  123,  146,  204,    0,  271,    0,
+        0,    0,    0,  404,  438,  487,  500,    0,   45,    0,
+        0,    0,  122,  145,    0,  270,  486,  499,    0,    0,
+       50,   49,    0,   52,   51,   62,    0,    0,    0,   88,
+        0,    0,    0,    0,   97,   96,    0,   99,   98,    0,
+        0,    0,  133,  132,    0,    0,    0,  137,  136,    0,
+      200,    0,  152,  151,  200,  200,  200,    0,  174,  173,
+        0,    0,  200,  200,  200,    0,  188,  187,  200,  200,
+        0,    0,  251,  251,    0,  241,  240,    0,    0,  251,
+
+        0,    0,    0,  308,    0,    0,  308,  308,    0,    0,
+      308,  325,    0,    0,  351,    0,  352,    0,  360,  359,
+        0,  389,    0,  375,  374,  389,  389,    0,    0,    0,
+        0,  205,  405,  439,  421,  421,  421,  421,    0,    0,
+      465,    0,    0,  465,    0,  482,    0,  483,  495,    0,
+        0,  502,  501,    0,    0,  514,    0,  510,  509,    0,
+        0,    0,  533,    0,    0,  548,    0,    0,  549,    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,  438,  526,
-      375,    0,    0,  314,  255,    0,   28,  458,    0,  167,
-
-       16,  505,  210,    0,    0,  437,  374,    0,    0,  313,
-      254,    0,   27,  209,    0,    0,  454,    0,  459,    0,
-      385,    0,  381,  380,    0,    0,    0,    0,  322,  321,
-        0,  309,  309,  309,  309,    0,  263,  262,  309,  309,
-      309,  309,    0,    0,    0,    0,  545,  205,  205,    0,
-        0,    0,    0,  205,  168,    0,    0,  416,    0,  398,
-      397,  416,  416,    0,    0,    0,    0,  416,  471,    0,
-        0,  163,    0,  357,  357,  357,   17,    0,   19,   18,
-        0,  506,    0,    0,  522,  522,  522,    0,  527,   79,
-        0,   67,   66,   79,    0,   80,  433,  370,    0,  371,
-
-        0,  216,  215,  224,    0,    0,  144,  143,  150,    0,
-        0,   49,  586,    0,   98,   97,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,   46,   66,
+       78,    0,    0,  123,  146,    0,  271,  312,    0,  355,
+
+      393,  404,  500,    0,    0,   45,   77,    0,    0,  122,
+      145,    0,  270,  499,    0,    0,   62,    0,  313,    0,
+       88,    0,   84,   83,    0,    0,    0,    0,  135,  134,
+        0,  200,  200,  200,  200,    0,  176,  175,  200,  200,
+      200,  200,    0,    0,    0,    0,  212,  251,  251,    0,
+        0,    0,    0,  251,  356,    0,    0,  308,    0,  290,
+      289,  308,  308,    0,    0,    0,    0,  308,  325,    0,
+        0,  351,    0,  389,  389,  389,  394,    0,  396,  395,
+        0,  405,    0,    0,  421,  421,  421,    0,   67,  465,
+        0,  457,  456,  465,    0,  466,  482,  495,    0,  496,
+
+        0,  504,  503,  514,    0,    0,  521,  520,  533,    0,
+        0,  548,  586,    0,  554,  553,    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,

-      526,  375,    0,    0,  240,  458,    0,  167,   16,    0,
-        0,  374,    0,    0,  239,    0,    0,  454,    0,  455,
-      459,    0,    0,    0,    0,    0,    0,    0,  333,  309,
-      309,  309,  309,  309,    0,    0,  309,  309,  309,    0,
-        0,    0,    0,  310,  205,  205,    0,  193,    0,  192,
-      205,  168,    0,    0,   35,    0,    0,  416,  416,  416,
-
-        0,  402,    0,  401,  416,    0,    0,    0,    0,    0,
-        0,    0,  357,  357,  357,   17,    0,    0,  510,  509,
-        0,    0,  522,  522,    0,  523,  527,    0,    0,   79,
-      433,  370,  224,    0,  225,  150,    0,    0,   49,    0,
+       66,   78,    0,    0,  256,  312,    0,  355,  393,    0,
+        0,   77,    0,    0,  255,    0,    0,   62,    0,   63,
+      313,    0,    0,    0,    0,    0,    0,    0,  142,  200,
+      200,  200,  200,  200,    0,    0,  200,  200,  200,    0,
+        0,    0,    0,  201,  251,  251,    0,  243,    0,  242,
+      251,  356,    0,    0,  278,    0,    0,  308,  308,  308,
+
+        0,  300,    0,  299,  308,    0,    0,    0,    0,    0,
+        0,    0,  389,  389,  389,  394,    0,    0,  407,  406,
+        0,    0,  421,  421,    0,  422,   67,    0,    0,  465,
+      482,  495,  514,    0,  515,  533,    0,    0,  548,    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,  240,  561,    0,
-        0,    0,    0,  239,    0,    0,  454,    0,  534,    0,
-      379,  378,    0,  386,    0,    0,  309,  309,  309,  309,
-      309,    0,  299,  298,  309,    0,    0,  309,    0,    0,
-
-        0,    0,  205,  205,  195,  194,    0,    0,    0,    0,
-      394,  393,  416,  416,  416,  404,  403,    0,    0,    0,
-        0,    0,    0,  472,    0,    0,  157,  156,    0,  177,
-      357,  357,    0,    0,    0,   24,    0,  514,  513,    0,
-        0,    0,    0,    0,    0,    0,   79,  433,  370,  224,
-      150,    0,  562,   49,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,  256,  329,    0,
+        0,    0,    0,  255,    0,    0,   62,    0,   74,    0,
+       80,   79,    0,   89,    0,    0,  200,  200,  200,  200,
+      200,    0,  178,  177,  200,    0,    0,  200,    0,    0,
+
+        0,    0,  251,  251,  245,  244,    0,    0,    0,    0,
+      284,  283,  308,  308,  308,  302,  301,    0,    0,    0,
+        0,    0,    0,  326,    0,    0,  347,  346,    0,  365,
+      389,  389,    0,    0,    0,  401,    0,  411,  410,    0,
+        0,    0,    0,    0,    0,    0,  465,  482,  495,  514,
+      533,    0,  330,  548,    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,  476,  561,    0,    0,    0,  475,    0,    0,    0,
-        0,    0,    0,  309,  309,  309,    0,    0,  309,  309,
-
-        0,  297,  296,  309,    0,    0,    0,    0,    0,    0,
-      205,    0,    0,    0,  197,  196,    0,  251,  416,  416,
-      416,    0,  406,  405,    0,    0,    0,    0,    0,    0,
-        0,  357,    0,    0,    0,  353,  352,    0,    0,    0,
-        0,  512,  511,    0,    0,    0,    0,    0,    0,   79,
-        0,    0,    0,    0,  224,  150,    0,  562,    0,    0,
-        0,    0,    0,    0,   88,    0,    0,    0,    0,   87,
+        0,  110,  329,    0,    0,    0,  109,    0,    0,    0,
+        0,    0,    0,  200,  200,  200,    0,    0,  200,  200,
+
+        0,  186,  185,  200,    0,    0,    0,    0,    0,    0,
+      251,    0,    0,    0,  247,  246,    0,  267,  308,  308,
+      308,    0,  304,  303,    0,    0,    0,    0,    0,    0,
+        0,  389,    0,    0,    0,  385,  384,    0,    0,    0,
+        0,  417,  416,    0,    0,    0,    0,    0,    0,  465,
+        0,    0,    0,    0,  514,  533,    0,  330,    0,    0,
+        0,    0,    0,    0,  558,    0,    0,    0,    0,  557,

         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,  476,  136,    0,
-        0,  475,  135,    0,    0,    0,    0,    0,    0,  309,
+        0,    0,    0,    0,    0,    0,    0,  110,  519,    0,
+        0,  109,  518,    0,    0,    0,    0,    0,    0,  200,

 
 

-      309,    0,    0,    0,  303,  302,    0,    0,  309,  309,
-        0,    0,    0,    0,    0,    0,    0,    0,  205,    0,
-      199,  198,  416,    0,    0,  416,    0,    0,    0,    0,
-        0,    0,    0,  571,  357,    0,  349,  348,    0,    0,
+      200,    0,    0,    0,  168,  167,    0,    0,  200,  200,
+        0,    0,    0,    0,    0,    0,    0,    0,  251,    0,
+      233,  232,  308,    0,    0,  308,    0,    0,    0,    0,
+        0,    0,    0,  339,  389,    0,  377,  376,    0,    0,

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

-       79,    0,    0,    0,    0,  366,  365,    0,    0,    0,
-        0,    0,    0,   45,   44,    0,    0,    0,    0,    0,
+      465,    0,    0,    0,    0,  489,  488,    0,    0,    0,
+        0,    0,    0,  544,  543,    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,  111,  119,    0,    0,    0,    0,  110,  118,    0,
-      489,  136,   84,  488,  135,   83,    0,    0,    0,    0,
+        0,   21,   29,    0,    0,    0,    0,   20,   28,    0,
+       93,  519,  552,   92,  518,  551,    0,    0,    0,    0,

 
 

-        0,    0,  485,  309,  309,    0,  301,  300,    0,  305,
-      304,  309,  309,    0,    0,    0,    0,    0,    0,    0,
-      189,  188,  205,  416,    0,  400,  399,  416,    0,    0,
-      463,    0,    0,  462,  357,    0,    0,    0,    0,    0,
+        0,    0,  119,  200,  200,    0,  166,  165,    0,  170,
+      169,  200,  200,    0,    0,    0,    0,    0,    0,    0,
+      229,  228,  251,  308,    0,  292,  291,  308,    0,    0,
+      315,    0,    0,  314,  389,    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,  218,  217,    0,  146,  145,    0,
-        0,    0,   94,    0,    0,    0,   93,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  113,    0,    0,
-        0,  112,    0,  489,   84,  488,   83,    0,    0,    0,
-        0,    0,  309,  309,    0,    0,  309,    0,  279,    0,
-
-        0,  278,    0,  205,    0,    0,    0,    0,    0,    0,
-        0,    0,  357,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,   63,   62,    0,    0,
-        0,    0,    0,  151,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,  506,  505,    0,  523,  522,    0,
+        0,    0,  564,    0,    0,    0,  563,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,   23,    0,    0,
+        0,   22,    0,   93,  552,   92,  551,    0,    0,    0,
+        0,    0,  200,  200,    0,    0,  200,    0,  192,    0,
+
+        0,  191,    0,  251,    0,    0,    0,    0,    0,    0,
+        0,    0,  389,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  461,  460,    0,    0,
+        0,    0,    0,  534,    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,  450,    0,  449,    0,    0,  502,  309,
-      309,    0,    0,    0,    0,    0,    0,  281,    0,  280,
-      205,    0,  396,  395,    0,    0,    0,  465,  467,  464,
-      466,  357,  516,    0,  515,    0,    0,   75,   71,    0,
-        0,   74,   70,    0,  429,    0,  428,    0,   92,    0,
-
-        0,   91,    0,    0,    0,  103,    0,    0,    0,   12,
-        0,   12,    0,  123,    0,    0,  121,  122,    0,    0,
-      120,  448,  447,  309,  309,    0,    0,    0,    0,    0,
-      285,  284,    0,    0,  205,    0,    0,    0,    0,  357,
-        0,    0,    0,    0,    0,    0,  427,  426,   86,   90,
-       85,   89,    0,    0,    0,    0,    0,    0,    0,  115,
-        0,    0,    0,  114,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,   58,    0,   57,    0,    0,  106,  200,
+      200,    0,    0,    0,    0,    0,    0,  194,    0,  193,
+      251,    0,  286,  285,    0,    0,    0,  317,  319,  316,
+      318,  389,  413,    0,  412,    0,    0,  447,  443,    0,
+        0,  446,  442,    0,  478,    0,  477,    0,  562,    0,
+
+        0,  561,    0,    0,    0,  571,    0,    0,    0,   12,
+        0,   12,    0,   33,    0,    0,   31,   32,    0,    0,
+       30,   56,   55,  200,  200,    0,    0,    0,    0,    0,
+      190,  189,    0,    0,  251,    0,    0,    0,    0,  389,
+        0,    0,    0,    0,    0,    0,  476,  475,  556,  560,
+      555,  559,    0,    0,    0,    0,    0,    0,    0,   25,
+        0,    0,    0,   24,    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,  295,  294,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  283,  282,    0,  191,  190,    0,    0,
-        0,    0,    0,    0,    0,  351,  350,    0,    0,   69,
-        0,   68,    0,    0,   11,    0,    0,    0,    0,    0,
+        0,    0,  148,  147,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  196,  195,    0,  231,  230,    0,    0,
+        0,    0,    0,    0,    0,  371,  370,    0,    0,  441,
+        0,  440,    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,    0,    0,    0,  518,  517,    0,
+        0,    0,    0,    0,    0,    0,    0,  415,  414,    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,   73,   72,    0,    0,    0,    0,
+        0,    0,    0,    0,  445,  444,    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,  125,  117,    0,  124,  116,    0,    0,    0,    0,
-        0,    0,  273,    0,    0,  272,    0,    0,  408,    0,
-        0,  407,    0,    0,    0,    0,    0,    0,    0,  277,
-        0,  276,    0,  410,    0,  409,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,  127,
-      126,    0,  291,    0,  290,    0,    0,    0,    0,    0,
-        0,  293,  292,  275,  274,  412,  411,    0,    0,    0,
+        0,   35,   27,    0,   34,   26,    0,    0,    0,    0,
+        0,    0,  180,    0,    0,  179,    0,    0,  294,    0,
+        0,  293,    0,    0,    0,    0,    0,    0,    0,  184,
+        0,  183,    0,  296,    0,  295,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,   37,
+       36,    0,  154,    0,  153,    0,    0,    0,    0,    0,
+        0,  156,  155,  182,  181,  298,  297,    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,
 


@@ -4510,34 +4510,34 @@ static yyconst flex_int16_t yy_chk[12587] =
 static yyconst flex_int32_t yy_rule_can_match_eol[596] =
     {   0,
 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 
 static yyconst flex_int32_t yy_rule_can_match_eol[596] =
     {   0,
 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 

-    0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 
-    1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
-    1, 1, 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, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 
+    1, 1, 1, 1, 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, 1, 1, 1, 1, 1, 1, 1, 1, 0, 
+    0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 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, 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, 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, 1, 
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+    1, 1, 1, 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, 0, 0, 0, 0, 1, 1, 0, 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, 
     1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 
     0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 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, 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, 0, 0, 0, 0, 1, 1, 0, 
-    1, 1, 1, 1, 1, 1, 1, 1, 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, 1, 1, 1, 1, 1, 
-    1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 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, 1, 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, 0, 0, 0, 0, 1, 1, 
+    0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 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, 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, 
+    1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 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, 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, 1, 1, 1, 1, 1, 1, 1, 1, 
     1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 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, 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, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 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, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 1, 1, 1, 
+    1, 1, 0, 0, 0, 0, 1, 1, 0, 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, 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, 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, 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, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 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, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 
+    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, 0, 0, 0, 0, 1, 1, 1, 1, 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, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0,     };
 
 static yy_state_type yy_last_accepting_state;
     0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0,     };
 
 static yy_state_type yy_last_accepting_state;


@@ -4999,23 +4999,23 @@ short int surfxml_trace___connect_trace_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};


@@ -5052,12 +5052,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(surfxml_bufferstack, blimit);
-       assert(temp);
-       surfxml_bufferstack = temp;
-   }
+        blimit += FLEXML_BUFFERSTACKSIZE + 2;
+        {
+            char *temp = (char *) realloc(surfxml_bufferstack, blimit);
+            assert(temp);
+            surfxml_bufferstack = temp;
+        }

      }
      return 0;
 }
      }
      return 0;
 }


@@ -5066,12 +5066,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;
 }


@@ -5085,16 +5085,16 @@ static void surfxml_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;
 }


@@ -5128,18 +5128,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. */


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

 \
 
 #endif
 \
 
 #endif


@@ -5455,43 +5455,43 @@ extern int surf_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;
+       yy_state_type yy_current_state;
+       char *yy_cp, *yy_bp;
+       int yy_act;

     
     

-  if ( !(yy_init) )
-    {
-    (yy_init) = 1;
+       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 ( ! surf_parse_in )
-      surf_parse_in = stdin;
+               if ( ! surf_parse_in )
+                       surf_parse_in = stdin;

 
 

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

 
 

-    if ( ! YY_CURRENT_BUFFER ) {
-      surf_parse_ensure_buffer_stack ();
-      YY_CURRENT_BUFFER_LVALUE =
-        surf_parse__create_buffer(surf_parse_in,YY_BUF_SIZE );
-    }
+               if ( ! YY_CURRENT_BUFFER ) {
+                       surf_parse_ensure_buffer_stack ();
+                       YY_CURRENT_BUFFER_LVALUE =
+                               surf_parse__create_buffer(surf_parse_in,YY_BUF_SIZE );
+               }

 
 

-    surf_parse__load_buffer_state( );
-    }
+               surf_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);


@@ -5533,31 +5533,7 @@ YY_DECL
   surfxml_statenames[VALUE1] = NULL;
   surfxml_statenames[VALUE2] = NULL;
   surfxml_statenames[CDATA] = NULL;
   surfxml_statenames[VALUE1] = NULL;
   surfxml_statenames[VALUE2] = NULL;
   surfxml_statenames[CDATA] = NULL;

-  surfxml_statenames[ROOT_surfxml_platform] = NULL;
-  surfxml_statenames[AL_surfxml_platform] = NULL;
-  surfxml_statenames[E_surfxml_platform] = "platform";
-  surfxml_statenames[S_surfxml_platform] = "platform";
-  surfxml_statenames[S_surfxml_platform_1] = "platform";
-  surfxml_statenames[S_surfxml_platform_2] = "platform";
-  surfxml_statenames[S_surfxml_platform_3] = "platform";
-  surfxml_statenames[S_surfxml_platform_4] = "platform";
-  surfxml_statenames[S_surfxml_platform_5] = "platform";
-  surfxml_statenames[S_surfxml_platform_6] = "platform";
-  surfxml_statenames[S_surfxml_platform_7] = "platform";
-  surfxml_statenames[S_surfxml_platform_8] = "platform";
-  surfxml_statenames[AL_surfxml_include] = NULL;
-  surfxml_statenames[E_surfxml_include] = "include";
-  surfxml_statenames[S_surfxml_include] = "include";
-  surfxml_statenames[S_surfxml_include_1] = "include";
-  surfxml_statenames[S_surfxml_include_2] = "include";
-  surfxml_statenames[AL_surfxml_trace] = NULL;
-  surfxml_statenames[IN_trace] = "trace";
-  surfxml_statenames[AL_surfxml_random] = NULL;
-  surfxml_statenames[E_surfxml_random] = "random";
-  surfxml_statenames[AL_surfxml_trace___connect] = NULL;
-  surfxml_statenames[E_surfxml_trace___connect] = "trace_connect";

   surfxml_statenames[AL_surfxml_AS] = NULL;
   surfxml_statenames[AL_surfxml_AS] = NULL;

-  surfxml_statenames[E_surfxml_AS] = "AS";

   surfxml_statenames[S_surfxml_AS] = "AS";
   surfxml_statenames[S_surfxml_AS_1] = "AS";
   surfxml_statenames[S_surfxml_AS_2] = "AS";
   surfxml_statenames[S_surfxml_AS] = "AS";
   surfxml_statenames[S_surfxml_AS_1] = "AS";
   surfxml_statenames[S_surfxml_AS_2] = "AS";


@@ -5567,3964 +5543,3988 @@ YY_DECL
   surfxml_statenames[S_surfxml_AS_6] = "AS";
   surfxml_statenames[S_surfxml_AS_7] = "AS";
   surfxml_statenames[S_surfxml_AS_8] = "AS";
   surfxml_statenames[S_surfxml_AS_6] = "AS";
   surfxml_statenames[S_surfxml_AS_7] = "AS";
   surfxml_statenames[S_surfxml_AS_8] = "AS";

-  surfxml_statenames[AL_surfxml_storage___type] = NULL;
-  surfxml_statenames[E_surfxml_storage___type] = "storage_type";
-  surfxml_statenames[S_surfxml_storage___type] = "storage_type";
-  surfxml_statenames[S_surfxml_storage___type_1] = "storage_type";
-  surfxml_statenames[S_surfxml_storage___type_2] = "storage_type";
-  surfxml_statenames[AL_surfxml_mount] = NULL;
-  surfxml_statenames[E_surfxml_mount] = "mount";
-  surfxml_statenames[AL_surfxml_mstorage] = NULL;
-  surfxml_statenames[E_surfxml_mstorage] = "mstorage";
+  surfxml_statenames[E_surfxml_AS] = "AS";
+  surfxml_statenames[AL_surfxml_ASroute] = NULL;
+  surfxml_statenames[S_surfxml_ASroute] = "ASroute";
+  surfxml_statenames[S_surfxml_ASroute_1] = "ASroute";
+  surfxml_statenames[S_surfxml_ASroute_2] = "ASroute";
+  surfxml_statenames[E_surfxml_ASroute] = "ASroute";
+  surfxml_statenames[AL_surfxml_argument] = NULL;
+  surfxml_statenames[E_surfxml_argument] = "argument";
+  surfxml_statenames[AL_surfxml_backbone] = NULL;
+  surfxml_statenames[E_surfxml_backbone] = "backbone";
+  surfxml_statenames[AL_surfxml_bypassASroute] = NULL;
+  surfxml_statenames[S_surfxml_bypassASroute] = "bypassASroute";
+  surfxml_statenames[S_surfxml_bypassASroute_1] = "bypassASroute";
+  surfxml_statenames[S_surfxml_bypassASroute_2] = "bypassASroute";
+  surfxml_statenames[E_surfxml_bypassASroute] = "bypassASroute";
+  surfxml_statenames[AL_surfxml_bypassRoute] = NULL;
+  surfxml_statenames[S_surfxml_bypassRoute] = "bypassRoute";
+  surfxml_statenames[S_surfxml_bypassRoute_1] = "bypassRoute";
+  surfxml_statenames[S_surfxml_bypassRoute_2] = "bypassRoute";
+  surfxml_statenames[E_surfxml_bypassRoute] = "bypassRoute";
+  surfxml_statenames[AL_surfxml_cabinet] = NULL;
+  surfxml_statenames[E_surfxml_cabinet] = "cabinet";
+  surfxml_statenames[AL_surfxml_cluster] = NULL;
+  surfxml_statenames[S_surfxml_cluster] = "cluster";
+  surfxml_statenames[S_surfxml_cluster_1] = "cluster";
+  surfxml_statenames[S_surfxml_cluster_2] = "cluster";
+  surfxml_statenames[E_surfxml_cluster] = "cluster";
+  surfxml_statenames[AL_surfxml_config] = NULL;
+  surfxml_statenames[S_surfxml_config] = "config";
+  surfxml_statenames[S_surfxml_config_1] = "config";
+  surfxml_statenames[S_surfxml_config_2] = "config";
+  surfxml_statenames[E_surfxml_config] = "config";
+  surfxml_statenames[AL_surfxml_gpu] = NULL;
+  surfxml_statenames[E_surfxml_gpu] = "gpu";

   surfxml_statenames[AL_surfxml_host] = NULL;
   surfxml_statenames[AL_surfxml_host] = NULL;

-  surfxml_statenames[E_surfxml_host] = "host";

   surfxml_statenames[S_surfxml_host] = "host";
   surfxml_statenames[S_surfxml_host_1] = "host";
   surfxml_statenames[S_surfxml_host_2] = "host";
   surfxml_statenames[S_surfxml_host] = "host";
   surfxml_statenames[S_surfxml_host_1] = "host";
   surfxml_statenames[S_surfxml_host_2] = "host";

-  surfxml_statenames[AL_surfxml_storage] = NULL;
-  surfxml_statenames[E_surfxml_storage] = "storage";
-  surfxml_statenames[S_surfxml_storage] = "storage";
-  surfxml_statenames[S_surfxml_storage_1] = "storage";
-  surfxml_statenames[S_surfxml_storage_2] = "storage";
-  surfxml_statenames[AL_surfxml_gpu] = NULL;
-  surfxml_statenames[E_surfxml_gpu] = "gpu";
+  surfxml_statenames[E_surfxml_host] = "host";

   surfxml_statenames[AL_surfxml_host___link] = NULL;
   surfxml_statenames[E_surfxml_host___link] = "host_link";
   surfxml_statenames[AL_surfxml_host___link] = NULL;
   surfxml_statenames[E_surfxml_host___link] = "host_link";

-  surfxml_statenames[AL_surfxml_cluster] = NULL;
-  surfxml_statenames[E_surfxml_cluster] = "cluster";
-  surfxml_statenames[S_surfxml_cluster] = "cluster";
-  surfxml_statenames[S_surfxml_cluster_1] = "cluster";
-  surfxml_statenames[S_surfxml_cluster_2] = "cluster";
-  surfxml_statenames[AL_surfxml_cabinet] = NULL;
-  surfxml_statenames[E_surfxml_cabinet] = "cabinet";
-  surfxml_statenames[AL_surfxml_peer] = NULL;
-  surfxml_statenames[E_surfxml_peer] = "peer";
-  surfxml_statenames[AL_surfxml_router] = NULL;
-  surfxml_statenames[E_surfxml_router] = "router";
-  surfxml_statenames[AL_surfxml_backbone] = NULL;
-  surfxml_statenames[E_surfxml_backbone] = "backbone";
+  surfxml_statenames[AL_surfxml_include] = NULL;
+  surfxml_statenames[S_surfxml_include] = "include";
+  surfxml_statenames[S_surfxml_include_1] = "include";
+  surfxml_statenames[S_surfxml_include_2] = "include";
+  surfxml_statenames[E_surfxml_include] = "include";

   surfxml_statenames[AL_surfxml_link] = NULL;
   surfxml_statenames[AL_surfxml_link] = NULL;

-  surfxml_statenames[E_surfxml_link] = "link";

   surfxml_statenames[S_surfxml_link] = "link";
   surfxml_statenames[S_surfxml_link_1] = "link";
   surfxml_statenames[S_surfxml_link_2] = "link";
   surfxml_statenames[S_surfxml_link] = "link";
   surfxml_statenames[S_surfxml_link_1] = "link";
   surfxml_statenames[S_surfxml_link_2] = "link";

-  surfxml_statenames[AL_surfxml_route] = NULL;
-  surfxml_statenames[E_surfxml_route] = "route";
-  surfxml_statenames[S_surfxml_route] = "route";
-  surfxml_statenames[S_surfxml_route_1] = "route";
-  surfxml_statenames[S_surfxml_route_2] = "route";
-  surfxml_statenames[AL_surfxml_ASroute] = NULL;
-  surfxml_statenames[E_surfxml_ASroute] = "ASroute";
-  surfxml_statenames[S_surfxml_ASroute] = "ASroute";
-  surfxml_statenames[S_surfxml_ASroute_1] = "ASroute";
-  surfxml_statenames[S_surfxml_ASroute_2] = "ASroute";
+  surfxml_statenames[E_surfxml_link] = "link";

   surfxml_statenames[AL_surfxml_link___ctn] = NULL;
   surfxml_statenames[E_surfxml_link___ctn] = "link_ctn";
   surfxml_statenames[AL_surfxml_link___ctn] = NULL;
   surfxml_statenames[E_surfxml_link___ctn] = "link_ctn";

-  surfxml_statenames[AL_surfxml_bypassRoute] = NULL;
-  surfxml_statenames[E_surfxml_bypassRoute] = "bypassRoute";
-  surfxml_statenames[S_surfxml_bypassRoute] = "bypassRoute";
-  surfxml_statenames[S_surfxml_bypassRoute_1] = "bypassRoute";
-  surfxml_statenames[S_surfxml_bypassRoute_2] = "bypassRoute";
-  surfxml_statenames[AL_surfxml_bypassASroute] = NULL;
-  surfxml_statenames[E_surfxml_bypassASroute] = "bypassASroute";
-  surfxml_statenames[S_surfxml_bypassASroute] = "bypassASroute";
-  surfxml_statenames[S_surfxml_bypassASroute_1] = "bypassASroute";
-  surfxml_statenames[S_surfxml_bypassASroute_2] = "bypassASroute";
+  surfxml_statenames[AL_surfxml_model___prop] = NULL;
+  surfxml_statenames[E_surfxml_model___prop] = "model_prop";
+  surfxml_statenames[AL_surfxml_mount] = NULL;
+  surfxml_statenames[E_surfxml_mount] = "mount";
+  surfxml_statenames[AL_surfxml_mstorage] = NULL;
+  surfxml_statenames[E_surfxml_mstorage] = "mstorage";
+  surfxml_statenames[AL_surfxml_peer] = NULL;
+  surfxml_statenames[E_surfxml_peer] = "peer";
+  surfxml_statenames[ROOT_surfxml_platform] = NULL;
+  surfxml_statenames[AL_surfxml_platform] = NULL;
+  surfxml_statenames[S_surfxml_platform] = "platform";
+  surfxml_statenames[S_surfxml_platform_1] = "platform";
+  surfxml_statenames[S_surfxml_platform_2] = "platform";
+  surfxml_statenames[S_surfxml_platform_3] = "platform";
+  surfxml_statenames[S_surfxml_platform_4] = "platform";
+  surfxml_statenames[S_surfxml_platform_5] = "platform";
+  surfxml_statenames[S_surfxml_platform_6] = "platform";
+  surfxml_statenames[S_surfxml_platform_7] = "platform";
+  surfxml_statenames[S_surfxml_platform_8] = "platform";
+  surfxml_statenames[E_surfxml_platform] = "platform";

   surfxml_statenames[AL_surfxml_process] = NULL;
   surfxml_statenames[AL_surfxml_process] = NULL;

-  surfxml_statenames[E_surfxml_process] = "process";

   surfxml_statenames[S_surfxml_process] = "process";
   surfxml_statenames[S_surfxml_process_1] = "process";
   surfxml_statenames[S_surfxml_process_2] = "process";
   surfxml_statenames[S_surfxml_process] = "process";
   surfxml_statenames[S_surfxml_process_1] = "process";
   surfxml_statenames[S_surfxml_process_2] = "process";

-  surfxml_statenames[AL_surfxml_argument] = NULL;
-  surfxml_statenames[E_surfxml_argument] = "argument";
-  surfxml_statenames[AL_surfxml_config] = NULL;
-  surfxml_statenames[E_surfxml_config] = "config";
-  surfxml_statenames[S_surfxml_config] = "config";
-  surfxml_statenames[S_surfxml_config_1] = "config";
-  surfxml_statenames[S_surfxml_config_2] = "config";
+  surfxml_statenames[E_surfxml_process] = "process";

   surfxml_statenames[AL_surfxml_prop] = NULL;
   surfxml_statenames[E_surfxml_prop] = "prop";
   surfxml_statenames[AL_surfxml_prop] = NULL;
   surfxml_statenames[E_surfxml_prop] = "prop";

-  surfxml_statenames[AL_surfxml_model___prop] = NULL;
-  surfxml_statenames[E_surfxml_model___prop] = "model_prop";
+  surfxml_statenames[AL_surfxml_random] = NULL;
+  surfxml_statenames[E_surfxml_random] = "random";
+  surfxml_statenames[AL_surfxml_route] = NULL;
+  surfxml_statenames[S_surfxml_route] = "route";
+  surfxml_statenames[S_surfxml_route_1] = "route";
+  surfxml_statenames[S_surfxml_route_2] = "route";
+  surfxml_statenames[E_surfxml_route] = "route";
+  surfxml_statenames[AL_surfxml_router] = NULL;
+  surfxml_statenames[E_surfxml_router] = "router";
+  surfxml_statenames[AL_surfxml_storage] = NULL;
+  surfxml_statenames[S_surfxml_storage] = "storage";
+  surfxml_statenames[S_surfxml_storage_1] = "storage";
+  surfxml_statenames[S_surfxml_storage_2] = "storage";
+  surfxml_statenames[E_surfxml_storage] = "storage";
+  surfxml_statenames[AL_surfxml_storage___type] = NULL;
+  surfxml_statenames[S_surfxml_storage___type] = "storage_type";
+  surfxml_statenames[S_surfxml_storage___type_1] = "storage_type";
+  surfxml_statenames[S_surfxml_storage___type_2] = "storage_type";
+  surfxml_statenames[E_surfxml_storage___type] = "storage_type";
+  surfxml_statenames[AL_surfxml_trace] = NULL;
+  surfxml_statenames[IN_trace] = "trace";
+  surfxml_statenames[AL_surfxml_trace___connect] = NULL;
+  surfxml_statenames[E_surfxml_trace___connect] = "trace_connect";

   }
 
  /* 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 surf_parse_text. */
-    *yy_cp = (yy_hold_char);
+               /* Support of surf_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 >= 3466 )
-          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] != 12512 );
+               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 >= 3466 )
+                                       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] != 12512 );

 
 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 < surf_parse_leng; ++yyl )
-        if ( surf_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 < surf_parse_leng; ++yyl )
+                               if ( surf_parse_text[yyl] == '\n' )
+                                          

     surf_parse_lineno++;
 ;
     surf_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
 SET(DOCTYPE); 
 /* PROLOG: determine root element and process it. */
 
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
 SET(DOCTYPE); 

-  YY_BREAK
+       YY_BREAK

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

-  YY_BREAK
+       YY_BREAK

 
 case 13:
 /* rule 13 can match eol */
 YY_RULE_SETUP
 SET(ROOT_surfxml_platform);
 
 case 13:
 /* rule 13 can match eol */
 YY_RULE_SETUP
 SET(ROOT_surfxml_platform);

-  YY_BREAK
+       YY_BREAK

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

-  YY_BREAK
+       YY_BREAK

 case 15:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c' in prolog.", surf_parse_text[0]);
 case 15:
 YY_RULE_SETUP
 FAIL("Unexpected character `%c' in prolog.", surf_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 SURF based tools. -->  */

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

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

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

-  AX_surfxml_platform_version = 1;
-  surfxml_platform_version_isset = 0;
-  ENTER(AL_surfxml_platform); pushbuffer(0);
+  AX_surfxml_AS_id = 0;
+  surfxml_AS_id_isset = 0;
+  AX_surfxml_AS_routing = AU_surfxml_AS_routing;
+  surfxml_AS_routing_isset = 0;
+  ENTER(AL_surfxml_AS); pushbuffer(0);

   }
   }

-  YY_BREAK
+       YY_BREAK

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

-if (surfxml_platform_version_isset != 0) {FAIL("Multiple definition of attribute version in <surfxml_platform>");} surfxml_platform_version_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_platform_version);
-  YY_BREAK
+if (surfxml_AS_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_AS>");} surfxml_AS_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_AS_id);
+       YY_BREAK

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

-if (surfxml_platform_version_isset != 0) {FAIL("Multiple definition of attribute version in <surfxml_platform>");}  surfxml_platform_version_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_platform_version);
-  YY_BREAK
+if (surfxml_AS_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_AS>");}  surfxml_AS_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_AS_id);
+       YY_BREAK

 case 20:
 case 20:

-YY_RULE_SETUP
-{
-  LEAVE; STag_surfxml_platform();surfxml_pcdata_ix = 0; ENTER(S_surfxml_platform);
- }
-  YY_BREAK
+/* rule 20 can match eol */

 case 21:
 case 21:

+/* rule 21 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  LEAVE; STag_surfxml_platform(); surfxml_pcdata_ix = 0; ETag_surfxml_platform(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case ROOT_surfxml_platform: SET(EPILOG); break;
-  }
- }
-  YY_BREAK
+A_surfxml_AS_routing = A_surfxml_AS_routing_Full;
+       YY_BREAK

 case 22:
 case 22:

-YY_RULE_SETUP
-FAIL("Unexpected character `%c' in attribute list of platform element.", surf_parse_text[0]);
-  YY_BREAK
+/* rule 22 can match eol */

 case 23:
 case 23:

+/* rule 23 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `platform' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_platform):
-FAIL("EOF in attribute list of `platform' element.");
-  YY_BREAK
-
+A_surfxml_AS_routing = A_surfxml_AS_routing_Floyd;
+       YY_BREAK

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

-YY_RULE_SETUP
-{
-  LEAVE;
-  ETag_surfxml_platform();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case ROOT_surfxml_platform: SET(EPILOG); break;
-  }
- }
-  YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</platform>' expected.",surf_parse_text);
-  YY_BREAK
+A_surfxml_AS_routing = A_surfxml_AS_routing_Dijkstra;
+       YY_BREAK

 case 26:
 case 26:

-YY_RULE_SETUP
-FAIL("Unexpected character `%c': `</platform>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_platform_1):
-case YY_STATE_EOF(S_surfxml_platform_6):
-case YY_STATE_EOF(S_surfxml_platform_4):
-case YY_STATE_EOF(S_surfxml_platform_3):
-case YY_STATE_EOF(S_surfxml_platform):
-case YY_STATE_EOF(E_surfxml_platform):
-case YY_STATE_EOF(S_surfxml_platform_8):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</platform>' expected.");
-  YY_BREAK
-
+/* rule 26 can match eol */

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

-FAIL("Starting tag <include> is not allowed here.");
-  YY_BREAK
+A_surfxml_AS_routing = A_surfxml_AS_routing_DijkstraCache;
+       YY_BREAK

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

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

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  AX_surfxml_include_file = 0;
-  surfxml_include_file_isset = 0;
-  ENTER(AL_surfxml_include); pushbuffer(0);
-  }
-  YY_BREAK
-
-case 29:
-/* rule 29 can match eol */
-YY_RULE_SETUP
-if (surfxml_include_file_isset != 0) {FAIL("Multiple definition of attribute file in <surfxml_include>");} surfxml_include_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_include_file);
-  YY_BREAK
+A_surfxml_AS_routing = A_surfxml_AS_routing_None;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_include_file_isset != 0) {FAIL("Multiple definition of attribute file in <surfxml_include>");}  surfxml_include_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_include_file);
-  YY_BREAK

 case 31:
 case 31:

+/* rule 31 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_include_file) FAIL("Required attribute `file' not set for `include' element.");
-  LEAVE; STag_surfxml_include();surfxml_pcdata_ix = 0; ENTER(S_surfxml_include);
- }
-  YY_BREAK
+A_surfxml_AS_routing = A_surfxml_AS_routing_Vivaldi;
+       YY_BREAK

 case 32:
 case 32:

-YY_RULE_SETUP
-{
-  if (!AX_surfxml_include_file) FAIL("Required attribute `file' not set for `include' element.");
-  LEAVE; STag_surfxml_include(); surfxml_pcdata_ix = 0; ETag_surfxml_include(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
-  }
- }
-  YY_BREAK
+/* rule 32 can match eol */

 case 33:
 case 33:

+/* rule 33 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of include element.", surf_parse_text[0]);
-  YY_BREAK
+A_surfxml_AS_routing = A_surfxml_AS_routing_Cluster;
+       YY_BREAK

 case 34:
 case 34:

-YY_RULE_SETUP
-FAIL("Bad attribute `%s' in `include' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_include):
-FAIL("EOF in attribute list of `include' element.");
-  YY_BREAK
-
+/* rule 34 can match eol */

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

-{
-  LEAVE;
-  ETag_surfxml_include();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
-  }
- }
-  YY_BREAK
+A_surfxml_AS_routing = A_surfxml_AS_routing_Cluster___torus;
+       YY_BREAK

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

-YY_RULE_SETUP
-FAIL("Unexpected end-tag `%s': `</include>' expected.",surf_parse_text);
-  YY_BREAK

 case 37:
 case 37:

+/* rule 37 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</include>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_include_2):
-case YY_STATE_EOF(E_surfxml_include):
-case YY_STATE_EOF(S_surfxml_include):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</include>' expected.");
-  YY_BREAK
-
+A_surfxml_AS_routing = A_surfxml_AS_routing_Cluster___fat___tree;
+       YY_BREAK

 case 38:
 case 38:

-/* rule 38 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Starting tag <trace> is not allowed here.");
-  YY_BREAK
+{
+  if (!AX_surfxml_AS_id) FAIL("Required attribute `id' not set for `AS' element.");
+  if (!AX_surfxml_AS_routing) FAIL("Required attribute `routing' not set for `AS' element.");
+  LEAVE; STag_surfxml_AS();surfxml_pcdata_ix = 0; ENTER(S_surfxml_AS);
+ }
+       YY_BREAK

 case 39:
 case 39:

-/* rule 39 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  AX_surfxml_trace_id = 0;
-  surfxml_trace_id_isset = 0;
-  AX_surfxml_trace_file = 0;
-  surfxml_trace_file_isset = 0;
-  AX_surfxml_trace_periodicity = 0;
-  surfxml_trace_periodicity_isset = 0;
-  ENTER(AL_surfxml_trace); pushbuffer(0);
+  if (!AX_surfxml_AS_id) FAIL("Required attribute `id' not set for `AS' element.");
+  if (!AX_surfxml_AS_routing) FAIL("Required attribute `routing' not set for `AS' element.");
+  LEAVE; STag_surfxml_AS(); surfxml_pcdata_ix = 0; ETag_surfxml_AS(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;

   }
   }

-  YY_BREAK
-
+ }
+       YY_BREAK

 case 40:
 case 40:

-/* rule 40 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_trace_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_trace>");} surfxml_trace_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_id);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of AS element.", surf_parse_text[0]);
+       YY_BREAK

 case 41:
 case 41:

-/* rule 41 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_trace_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_trace>");}  surfxml_trace_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_id);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `AS' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_AS):
+FAIL("EOF in attribute list of `AS' element.");
+       YY_BREAK
+

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

-if (surfxml_trace_file_isset != 0) {FAIL("Multiple definition of attribute file in <surfxml_trace>");} surfxml_trace_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_file);
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_AS();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
+  }
+ }
+       YY_BREAK

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

-if (surfxml_trace_file_isset != 0) {FAIL("Multiple definition of attribute file in <surfxml_trace>");}  surfxml_trace_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_file);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</AS>' expected.",surf_parse_text);
+       YY_BREAK

 case 44:
 case 44:

-/* rule 44 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_trace_periodicity_isset != 0) {FAIL("Multiple definition of attribute periodicity in <surfxml_trace>");} surfxml_trace_periodicity_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_periodicity);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</AS>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_AS):
+case YY_STATE_EOF(S_surfxml_AS):
+case YY_STATE_EOF(S_surfxml_AS_1):
+case YY_STATE_EOF(S_surfxml_AS_3):
+case YY_STATE_EOF(S_surfxml_AS_4):
+case YY_STATE_EOF(S_surfxml_AS_6):
+case YY_STATE_EOF(S_surfxml_AS_8):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</AS>' expected.");
+       YY_BREAK
+

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

-if (surfxml_trace_periodicity_isset != 0) {FAIL("Multiple definition of attribute periodicity in <surfxml_trace>");}  surfxml_trace_periodicity_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_periodicity);
-  YY_BREAK
+FAIL("Starting tag <ASroute> is not allowed here.");
+       YY_BREAK

 case 46:
 case 46:

+/* rule 46 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_trace_id) FAIL("Required attribute `id' not set for `trace' element.");
-  if (!AX_surfxml_trace_periodicity) FAIL("Required attribute `periodicity' not set for `trace' element.");
-  LEAVE; STag_surfxml_trace();pushbuffer(surfxml_pcdata_ix); BUFFERSET(surfxml_pcdata_ix);; ENTER(IN_trace);
- }
-  YY_BREAK
+  AX_surfxml_ASroute_dst = 0;
+  surfxml_ASroute_dst_isset = 0;
+  AX_surfxml_ASroute_gw___dst = 0;
+  surfxml_ASroute_gw___dst_isset = 0;
+  AX_surfxml_ASroute_gw___src = 0;
+  surfxml_ASroute_gw___src_isset = 0;
+  AX_surfxml_ASroute_src = 0;
+  surfxml_ASroute_src_isset = 0;
+  AX_surfxml_ASroute_symmetrical = A_surfxml_ASroute_symmetrical_YES;
+  surfxml_ASroute_symmetrical_isset = 0;
+  ENTER(AL_surfxml_ASroute); pushbuffer(0);
+  }
+       YY_BREAK
+

 case 47:
 case 47:

+/* rule 47 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_trace_id) FAIL("Required attribute `id' not set for `trace' element.");
-  if (!AX_surfxml_trace_periodicity) FAIL("Required attribute `periodicity' not set for `trace' element.");
-  LEAVE; STag_surfxml_trace(); surfxml_pcdata_ix = 0; ETag_surfxml_trace(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_ASroute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_ASroute>");} surfxml_ASroute_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_dst);
+       YY_BREAK

 case 48:
 case 48:

+/* rule 48 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of trace element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_ASroute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_ASroute>");}  surfxml_ASroute_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_dst);
+       YY_BREAK

 case 49:
 case 49:

+/* rule 49 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `trace' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_trace):
-FAIL("EOF in attribute list of `trace' element.");
-  YY_BREAK
-
+if (surfxml_ASroute_gw___dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in <surfxml_ASroute>");} surfxml_ASroute_gw___dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_gw___dst);
+       YY_BREAK

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

-{
-  LEAVE;
-  BUFFERDONE;
-  ETag_surfxml_trace();
-  surfxml_pcdata_ix = popbuffer();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_ASroute_gw___dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in <surfxml_ASroute>");}  surfxml_ASroute_gw___dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_gw___dst);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</trace>' expected.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(IN_trace):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</trace>' expected.");
-  YY_BREAK
-
+if (surfxml_ASroute_gw___src_isset != 0) {FAIL("Multiple definition of attribute gw_src in <surfxml_ASroute>");} surfxml_ASroute_gw___src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_gw___src);
+       YY_BREAK

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

-FAIL("Starting tag <random> is not allowed here.");
-  YY_BREAK
+if (surfxml_ASroute_gw___src_isset != 0) {FAIL("Multiple definition of attribute gw_src in <surfxml_ASroute>");}  surfxml_ASroute_gw___src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_gw___src);
+       YY_BREAK

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

-{
-  AX_surfxml_random_id = 0;
-  surfxml_random_id_isset = 0;
-  AX_surfxml_random_min = 0;
-  surfxml_random_min_isset = 0;
-  AX_surfxml_random_max = 0;
-  surfxml_random_max_isset = 0;
-  AX_surfxml_random_mean = 0;
-  surfxml_random_mean_isset = 0;
-  AX_surfxml_random_std___deviation = 0;
-  surfxml_random_std___deviation_isset = 0;
-  AX_surfxml_random_seed = 5;
-  surfxml_random_seed_isset = 0;
-  AX_surfxml_random_radical = 0;
-  surfxml_random_radical_isset = 0;
-  AX_surfxml_random_generator = A_surfxml_random_generator_DRAND48;
-  surfxml_random_generator_isset = 0;
-  ENTER(AL_surfxml_random); pushbuffer(0);
-  }
-  YY_BREAK
-
+if (surfxml_ASroute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_ASroute>");} surfxml_ASroute_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_src);
+       YY_BREAK

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

-if (surfxml_random_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_random>");} surfxml_random_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_id);
-  YY_BREAK
+if (surfxml_ASroute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_ASroute>");}  surfxml_ASroute_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_src);
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_random_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_random>");}  surfxml_random_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_id);
-  YY_BREAK

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

-if (surfxml_random_min_isset != 0) {FAIL("Multiple definition of attribute min in <surfxml_random>");} surfxml_random_min_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_min);
-  YY_BREAK
+A_surfxml_ASroute_symmetrical = A_surfxml_ASroute_symmetrical_YES;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_random_min_isset != 0) {FAIL("Multiple definition of attribute min in <surfxml_random>");}  surfxml_random_min_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_min);
-  YY_BREAK

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

-if (surfxml_random_max_isset != 0) {FAIL("Multiple definition of attribute max in <surfxml_random>");} surfxml_random_max_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_max);
-  YY_BREAK
+A_surfxml_ASroute_symmetrical = A_surfxml_ASroute_symmetrical_NO;
+       YY_BREAK

 case 59:
 case 59:

-/* rule 59 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_random_max_isset != 0) {FAIL("Multiple definition of attribute max in <surfxml_random>");}  surfxml_random_max_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_max);
-  YY_BREAK
+{
+  if (!AX_surfxml_ASroute_dst) FAIL("Required attribute `dst' not set for `ASroute' element.");
+  if (!AX_surfxml_ASroute_gw___dst) FAIL("Required attribute `gw_dst' not set for `ASroute' element.");
+  if (!AX_surfxml_ASroute_gw___src) FAIL("Required attribute `gw_src' not set for `ASroute' element.");
+  if (!AX_surfxml_ASroute_src) FAIL("Required attribute `src' not set for `ASroute' element.");
+  LEAVE; STag_surfxml_ASroute();surfxml_pcdata_ix = 0; ENTER(S_surfxml_ASroute);
+ }
+       YY_BREAK

 case 60:
 case 60:

-/* rule 60 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_random_mean_isset != 0) {FAIL("Multiple definition of attribute mean in <surfxml_random>");} surfxml_random_mean_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_mean);
-  YY_BREAK
+{
+  if (!AX_surfxml_ASroute_dst) FAIL("Required attribute `dst' not set for `ASroute' element.");
+  if (!AX_surfxml_ASroute_gw___dst) FAIL("Required attribute `gw_dst' not set for `ASroute' element.");
+  if (!AX_surfxml_ASroute_gw___src) FAIL("Required attribute `gw_src' not set for `ASroute' element.");
+  if (!AX_surfxml_ASroute_src) FAIL("Required attribute `src' not set for `ASroute' element.");
+  LEAVE; STag_surfxml_ASroute(); surfxml_pcdata_ix = 0; ETag_surfxml_ASroute(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+   case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+  }
+ }
+       YY_BREAK

 case 61:
 case 61:

-/* rule 61 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_random_mean_isset != 0) {FAIL("Multiple definition of attribute mean in <surfxml_random>");}  surfxml_random_mean_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_mean);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of ASroute element.", surf_parse_text[0]);
+       YY_BREAK

 case 62:
 case 62:

-/* rule 62 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_random_std___deviation_isset != 0) {FAIL("Multiple definition of attribute std_deviation in <surfxml_random>");} surfxml_random_std___deviation_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_std___deviation);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `ASroute' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_ASroute):
+FAIL("EOF in attribute list of `ASroute' element.");
+       YY_BREAK
+

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

-if (surfxml_random_std___deviation_isset != 0) {FAIL("Multiple definition of attribute std_deviation in <surfxml_random>");}  surfxml_random_std___deviation_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_std___deviation);
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_ASroute();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+   case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+  }
+ }
+       YY_BREAK

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

-if (surfxml_random_seed_isset != 0) {FAIL("Multiple definition of attribute seed in <surfxml_random>");} surfxml_random_seed_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_seed);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</ASroute>' expected.",surf_parse_text);
+       YY_BREAK

 case 65:
 case 65:

-/* rule 65 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_random_seed_isset != 0) {FAIL("Multiple definition of attribute seed in <surfxml_random>");}  surfxml_random_seed_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_seed);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</ASroute>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_ASroute):
+case YY_STATE_EOF(S_surfxml_ASroute):
+case YY_STATE_EOF(S_surfxml_ASroute_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</ASroute>' expected.");
+       YY_BREAK
+

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

-if (surfxml_random_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_random>");} surfxml_random_radical_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_radical);
-  YY_BREAK
+FAIL("Starting tag <argument> is not allowed here.");
+       YY_BREAK

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

-if (surfxml_random_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_random>");}  surfxml_random_radical_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_radical);
-  YY_BREAK
+{
+  AX_surfxml_argument_value = 0;
+  surfxml_argument_value_isset = 0;
+  ENTER(AL_surfxml_argument); pushbuffer(0);
+  }
+       YY_BREAK
+

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

+YY_RULE_SETUP
+if (surfxml_argument_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_argument>");} surfxml_argument_value_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_argument_value);
+       YY_BREAK

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

-A_surfxml_random_generator = A_surfxml_random_generator_DRAND48;
-  YY_BREAK
+if (surfxml_argument_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_argument>");}  surfxml_argument_value_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_argument_value);
+       YY_BREAK

 case 70:
 case 70:

-/* rule 70 can match eol */
-case 71:
-/* rule 71 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-A_surfxml_random_generator = A_surfxml_random_generator_RAND;
-  YY_BREAK
-case 72:
-/* rule 72 can match eol */
-case 73:
-/* rule 73 can match eol */
+{
+  if (!AX_surfxml_argument_value) FAIL("Required attribute `value' not set for `argument' element.");
+  LEAVE; STag_surfxml_argument();surfxml_pcdata_ix = 0; ENTER(E_surfxml_argument);
+ }
+       YY_BREAK
+case 71:

 YY_RULE_SETUP
 YY_RULE_SETUP

-A_surfxml_random_generator = A_surfxml_random_generator_RNGSTREAM;
-  YY_BREAK
+{
+  if (!AX_surfxml_argument_value) FAIL("Required attribute `value' not set for `argument' element.");
+  LEAVE; STag_surfxml_argument(); surfxml_pcdata_ix = 0; ETag_surfxml_argument(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_process: case S_surfxml_process_1: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
+  }
+ }
+       YY_BREAK
+case 72:
+YY_RULE_SETUP
+FAIL("Unexpected character `%c' in attribute list of argument element.", surf_parse_text[0]);
+       YY_BREAK
+case 73:
+YY_RULE_SETUP
+FAIL("Bad attribute `%s' in `argument' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_argument):
+FAIL("EOF in attribute list of `argument' element.");
+       YY_BREAK
+

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

+YY_RULE_SETUP
+{
+  LEAVE;
+  ETag_surfxml_argument();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_process: case S_surfxml_process_1: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
+  }
+ }
+       YY_BREAK

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

-A_surfxml_random_generator = A_surfxml_random_generator_NONE;
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</argument>' expected.",surf_parse_text);
+       YY_BREAK

 case 76:
 YY_RULE_SETUP
 case 76:
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_random_id) FAIL("Required attribute `id' not set for `random' element.");
-  if (!AX_surfxml_random_min) FAIL("Required attribute `min' not set for `random' element.");
-  if (!AX_surfxml_random_max) FAIL("Required attribute `max' not set for `random' element.");
-  if (!AX_surfxml_random_mean) FAIL("Required attribute `mean' not set for `random' element.");
-  if (!AX_surfxml_random_std___deviation) FAIL("Required attribute `std_deviation' not set for `random' element.");
-  LEAVE; STag_surfxml_random();surfxml_pcdata_ix = 0; ENTER(E_surfxml_random);
- }
-  YY_BREAK
+FAIL("Unexpected character `%c': `</argument>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_argument):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</argument>' expected.");
+       YY_BREAK
+

 case 77:
 case 77:

+/* rule 77 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_random_id) FAIL("Required attribute `id' not set for `random' element.");
-  if (!AX_surfxml_random_min) FAIL("Required attribute `min' not set for `random' element.");
-  if (!AX_surfxml_random_max) FAIL("Required attribute `max' not set for `random' element.");
-  if (!AX_surfxml_random_mean) FAIL("Required attribute `mean' not set for `random' element.");
-  if (!AX_surfxml_random_std___deviation) FAIL("Required attribute `std_deviation' not set for `random' element.");
-  LEAVE; STag_surfxml_random(); surfxml_pcdata_ix = 0; ETag_surfxml_random(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_platform: case S_surfxml_platform_2: case S_surfxml_platform_3: SET(S_surfxml_platform_3); break;
-  }
- }
-  YY_BREAK
+FAIL("Starting tag <backbone> is not allowed here.");
+       YY_BREAK

 case 78:
 case 78:

+/* rule 78 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of random element.", surf_parse_text[0]);
-  YY_BREAK
+{
+  AX_surfxml_backbone_bandwidth = 0;
+  surfxml_backbone_bandwidth_isset = 0;
+  AX_surfxml_backbone_id = 0;
+  surfxml_backbone_id_isset = 0;
+  AX_surfxml_backbone_latency = 0;
+  surfxml_backbone_latency_isset = 0;
+  ENTER(AL_surfxml_backbone); pushbuffer(0);
+  }
+       YY_BREAK
+

 case 79:
 case 79:

+/* rule 79 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `random' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_random):
-FAIL("EOF in attribute list of `random' element.");
-  YY_BREAK
-
+if (surfxml_backbone_bandwidth_isset != 0) {FAIL("Multiple definition of attribute bandwidth in <surfxml_backbone>");} surfxml_backbone_bandwidth_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_backbone_bandwidth);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_random();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_platform: case S_surfxml_platform_2: case S_surfxml_platform_3: SET(S_surfxml_platform_3); break;
-  }
- }
-  YY_BREAK
+if (surfxml_backbone_bandwidth_isset != 0) {FAIL("Multiple definition of attribute bandwidth in <surfxml_backbone>");}  surfxml_backbone_bandwidth_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_backbone_bandwidth);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</random>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_backbone_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_backbone>");} surfxml_backbone_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_backbone_id);
+       YY_BREAK

 case 82:
 case 82:

+/* rule 82 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</random>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_random):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</random>' expected.");
-  YY_BREAK
-
+if (surfxml_backbone_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_backbone>");}  surfxml_backbone_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_backbone_id);
+       YY_BREAK

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

-FAIL("Starting tag <trace_connect> is not allowed here.");
-  YY_BREAK
+if (surfxml_backbone_latency_isset != 0) {FAIL("Multiple definition of attribute latency in <surfxml_backbone>");} surfxml_backbone_latency_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_backbone_latency);
+       YY_BREAK

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

-{
-  AX_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_HOST___AVAIL;
-  surfxml_trace___connect_kind_isset = 0;
-  AX_surfxml_trace___connect_trace = 0;
-  surfxml_trace___connect_trace_isset = 0;
-  AX_surfxml_trace___connect_element = 0;
-  surfxml_trace___connect_element_isset = 0;
-  ENTER(AL_surfxml_trace___connect); pushbuffer(0);
-  }
-  YY_BREAK
-
+if (surfxml_backbone_latency_isset != 0) {FAIL("Multiple definition of attribute latency in <surfxml_backbone>");}  surfxml_backbone_latency_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_backbone_latency);
+       YY_BREAK

 case 85:
 case 85:

-/* rule 85 can match eol */
+YY_RULE_SETUP
+{
+  if (!AX_surfxml_backbone_bandwidth) FAIL("Required attribute `bandwidth' not set for `backbone' element.");
+  if (!AX_surfxml_backbone_id) FAIL("Required attribute `id' not set for `backbone' element.");
+  if (!AX_surfxml_backbone_latency) FAIL("Required attribute `latency' not set for `backbone' element.");
+  LEAVE; STag_surfxml_backbone();surfxml_pcdata_ix = 0; ENTER(E_surfxml_backbone);
+ }
+       YY_BREAK

 case 86:
 case 86:

-/* rule 86 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-A_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_HOST___AVAIL;
-  YY_BREAK
+{
+  if (!AX_surfxml_backbone_bandwidth) FAIL("Required attribute `bandwidth' not set for `backbone' element.");
+  if (!AX_surfxml_backbone_id) FAIL("Required attribute `id' not set for `backbone' element.");
+  if (!AX_surfxml_backbone_latency) FAIL("Required attribute `latency' not set for `backbone' element.");
+  LEAVE; STag_surfxml_backbone(); surfxml_pcdata_ix = 0; ETag_surfxml_backbone(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+  }
+ }
+       YY_BREAK

 case 87:
 case 87:

-/* rule 87 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected character `%c' in attribute list of backbone element.", surf_parse_text[0]);
+       YY_BREAK

 case 88:
 case 88:

-/* rule 88 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-A_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_POWER;
-  YY_BREAK
+FAIL("Bad attribute `%s' in `backbone' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_backbone):
+FAIL("EOF in attribute list of `backbone' element.");
+       YY_BREAK
+

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

+YY_RULE_SETUP
+{
+  LEAVE;
+  ETag_surfxml_backbone();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+  }
+ }
+       YY_BREAK

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

-A_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_LINK___AVAIL;
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</backbone>' expected.",surf_parse_text);
+       YY_BREAK

 case 91:
 case 91:

-/* rule 91 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected character `%c': `</backbone>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_backbone):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</backbone>' expected.");
+       YY_BREAK
+

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

-A_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_BANDWIDTH;
-  YY_BREAK
+FAIL("Starting tag <bypassASroute> is not allowed here.");
+       YY_BREAK

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

+YY_RULE_SETUP
+{
+  AX_surfxml_bypassASroute_dst = 0;
+  surfxml_bypassASroute_dst_isset = 0;
+  AX_surfxml_bypassASroute_gw___dst = 0;
+  surfxml_bypassASroute_gw___dst_isset = 0;
+  AX_surfxml_bypassASroute_gw___src = 0;
+  surfxml_bypassASroute_gw___src_isset = 0;
+  AX_surfxml_bypassASroute_src = 0;
+  surfxml_bypassASroute_src_isset = 0;
+  ENTER(AL_surfxml_bypassASroute); pushbuffer(0);
+  }
+       YY_BREAK
+

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

-A_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_LATENCY;
-  YY_BREAK
+if (surfxml_bypassASroute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_bypassASroute>");} surfxml_bypassASroute_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassASroute_dst);
+       YY_BREAK

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

-if (surfxml_trace___connect_trace_isset != 0) {FAIL("Multiple definition of attribute trace in <surfxml_trace___connect>");} surfxml_trace___connect_trace_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace___connect_trace);
-  YY_BREAK
+if (surfxml_bypassASroute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_bypassASroute>");}  surfxml_bypassASroute_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassASroute_dst);
+       YY_BREAK

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

-if (surfxml_trace___connect_trace_isset != 0) {FAIL("Multiple definition of attribute trace in <surfxml_trace___connect>");}  surfxml_trace___connect_trace_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace___connect_trace);
-  YY_BREAK
+if (surfxml_bypassASroute_gw___dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in <surfxml_bypassASroute>");} surfxml_bypassASroute_gw___dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassASroute_gw___dst);
+       YY_BREAK

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

-if (surfxml_trace___connect_element_isset != 0) {FAIL("Multiple definition of attribute element in <surfxml_trace___connect>");} surfxml_trace___connect_element_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace___connect_element);
-  YY_BREAK
+if (surfxml_bypassASroute_gw___dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in <surfxml_bypassASroute>");}  surfxml_bypassASroute_gw___dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassASroute_gw___dst);
+       YY_BREAK

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

-if (surfxml_trace___connect_element_isset != 0) {FAIL("Multiple definition of attribute element in <surfxml_trace___connect>");}  surfxml_trace___connect_element_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace___connect_element);
-  YY_BREAK
+if (surfxml_bypassASroute_gw___src_isset != 0) {FAIL("Multiple definition of attribute gw_src in <surfxml_bypassASroute>");} surfxml_bypassASroute_gw___src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassASroute_gw___src);
+       YY_BREAK

 case 99:
 case 99:

+/* rule 99 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_trace___connect_trace) FAIL("Required attribute `trace' not set for `trace_connect' element.");
-  if (!AX_surfxml_trace___connect_element) FAIL("Required attribute `element' not set for `trace_connect' element.");
-  LEAVE; STag_surfxml_trace___connect();surfxml_pcdata_ix = 0; ENTER(E_surfxml_trace___connect);
- }
-  YY_BREAK
+if (surfxml_bypassASroute_gw___src_isset != 0) {FAIL("Multiple definition of attribute gw_src in <surfxml_bypassASroute>");}  surfxml_bypassASroute_gw___src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassASroute_gw___src);
+       YY_BREAK

 case 100:
 case 100:

+/* rule 100 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_trace___connect_trace) FAIL("Required attribute `trace' not set for `trace_connect' element.");
-  if (!AX_surfxml_trace___connect_element) FAIL("Required attribute `element' not set for `trace_connect' element.");
-  LEAVE; STag_surfxml_trace___connect(); surfxml_pcdata_ix = 0; ETag_surfxml_trace___connect(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_bypassASroute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_bypassASroute>");} surfxml_bypassASroute_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassASroute_src);
+       YY_BREAK

 case 101:
 case 101:

+/* rule 101 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of trace_connect element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_bypassASroute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_bypassASroute>");}  surfxml_bypassASroute_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassASroute_src);
+       YY_BREAK

 case 102:
 YY_RULE_SETUP
 case 102:
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `trace_connect' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_trace___connect):
-FAIL("EOF in attribute list of `trace_connect' element.");
-  YY_BREAK
-
+{
+  if (!AX_surfxml_bypassASroute_dst) FAIL("Required attribute `dst' not set for `bypassASroute' element.");
+  if (!AX_surfxml_bypassASroute_gw___dst) FAIL("Required attribute `gw_dst' not set for `bypassASroute' element.");
+  if (!AX_surfxml_bypassASroute_gw___src) FAIL("Required attribute `gw_src' not set for `bypassASroute' element.");
+  if (!AX_surfxml_bypassASroute_src) FAIL("Required attribute `src' not set for `bypassASroute' element.");
+  LEAVE; STag_surfxml_bypassASroute();surfxml_pcdata_ix = 0; ENTER(S_surfxml_bypassASroute);
+ }
+       YY_BREAK

 case 103:
 case 103:

-/* rule 103 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  LEAVE;
-  ETag_surfxml_trace___connect();
-  popbuffer(); /* attribute */
+  if (!AX_surfxml_bypassASroute_dst) FAIL("Required attribute `dst' not set for `bypassASroute' element.");
+  if (!AX_surfxml_bypassASroute_gw___dst) FAIL("Required attribute `gw_dst' not set for `bypassASroute' element.");
+  if (!AX_surfxml_bypassASroute_gw___src) FAIL("Required attribute `gw_src' not set for `bypassASroute' element.");
+  if (!AX_surfxml_bypassASroute_src) FAIL("Required attribute `src' not set for `bypassASroute' element.");
+  LEAVE; STag_surfxml_bypassASroute(); surfxml_pcdata_ix = 0; ETag_surfxml_bypassASroute(); popbuffer(); /* attribute */

   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;

-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;

   }
  }
   }
  }

-  YY_BREAK
+       YY_BREAK

 case 104:
 case 104:

-/* rule 104 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected end-tag `%s': `</trace_connect>' expected.",surf_parse_text);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of bypassASroute element.", surf_parse_text[0]);
+       YY_BREAK

 case 105:
 YY_RULE_SETUP
 case 105:
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</trace_connect>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_trace___connect):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</trace_connect>' expected.");
-  YY_BREAK
+FAIL("Bad attribute `%s' in `bypassASroute' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_bypassASroute):
+FAIL("EOF in attribute list of `bypassASroute' element.");
+       YY_BREAK

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

-FAIL("Starting tag <AS> is not allowed here.");
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_bypassASroute();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+  }
+ }
+       YY_BREAK

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

-{
-  AX_surfxml_AS_id = 0;
-  surfxml_AS_id_isset = 0;
-  AX_surfxml_AS_routing = AU_surfxml_AS_routing;
-  surfxml_AS_routing_isset = 0;
-  ENTER(AL_surfxml_AS); pushbuffer(0);
-  }
-  YY_BREAK
-
+FAIL("Unexpected end-tag `%s': `</bypassASroute>' expected.",surf_parse_text);
+       YY_BREAK

 case 108:
 case 108:

-/* rule 108 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_AS_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_AS>");} surfxml_AS_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_AS_id);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</bypassASroute>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_bypassASroute):
+case YY_STATE_EOF(S_surfxml_bypassASroute):
+case YY_STATE_EOF(S_surfxml_bypassASroute_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</bypassASroute>' expected.");
+       YY_BREAK
+

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

-if (surfxml_AS_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_AS>");}  surfxml_AS_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_AS_id);
-  YY_BREAK
+FAIL("Starting tag <bypassRoute> is not allowed here.");
+       YY_BREAK

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

+YY_RULE_SETUP
+{
+  AX_surfxml_bypassRoute_dst = 0;
+  surfxml_bypassRoute_dst_isset = 0;
+  AX_surfxml_bypassRoute_src = 0;
+  surfxml_bypassRoute_src_isset = 0;
+  ENTER(AL_surfxml_bypassRoute); pushbuffer(0);
+  }
+       YY_BREAK
+

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

-A_surfxml_AS_routing = A_surfxml_AS_routing_Full;
-  YY_BREAK
+if (surfxml_bypassRoute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_bypassRoute>");} surfxml_bypassRoute_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_dst);
+       YY_BREAK

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

+YY_RULE_SETUP
+if (surfxml_bypassRoute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_bypassRoute>");}  surfxml_bypassRoute_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_dst);
+       YY_BREAK

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

-A_surfxml_AS_routing = A_surfxml_AS_routing_Floyd;
-  YY_BREAK
+if (surfxml_bypassRoute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_bypassRoute>");} surfxml_bypassRoute_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_src);
+       YY_BREAK

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

+YY_RULE_SETUP
+if (surfxml_bypassRoute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_bypassRoute>");}  surfxml_bypassRoute_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_src);
+       YY_BREAK

 case 115:
 case 115:

-/* rule 115 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-A_surfxml_AS_routing = A_surfxml_AS_routing_Dijkstra;
-  YY_BREAK
-case 116:
-/* rule 116 can match eol */
+{
+  if (!AX_surfxml_bypassRoute_dst) FAIL("Required attribute `dst' not set for `bypassRoute' element.");
+  if (!AX_surfxml_bypassRoute_src) FAIL("Required attribute `src' not set for `bypassRoute' element.");
+  LEAVE; STag_surfxml_bypassRoute();surfxml_pcdata_ix = 0; ENTER(S_surfxml_bypassRoute);
+ }
+       YY_BREAK
+case 116:
+YY_RULE_SETUP
+{
+  if (!AX_surfxml_bypassRoute_dst) FAIL("Required attribute `dst' not set for `bypassRoute' element.");
+  if (!AX_surfxml_bypassRoute_src) FAIL("Required attribute `src' not set for `bypassRoute' element.");
+  LEAVE; STag_surfxml_bypassRoute(); surfxml_pcdata_ix = 0; ETag_surfxml_bypassRoute(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+  }
+ }
+       YY_BREAK

 case 117:
 case 117:

-/* rule 117 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-A_surfxml_AS_routing = A_surfxml_AS_routing_DijkstraCache;
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of bypassRoute element.", surf_parse_text[0]);
+       YY_BREAK

 case 118:
 case 118:

-/* rule 118 can match eol */
+YY_RULE_SETUP
+FAIL("Bad attribute `%s' in `bypassRoute' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_bypassRoute):
+FAIL("EOF in attribute list of `bypassRoute' element.");
+       YY_BREAK
+

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

-A_surfxml_AS_routing = A_surfxml_AS_routing_None;
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_bypassRoute();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+  }
+ }
+       YY_BREAK

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

+YY_RULE_SETUP
+FAIL("Unexpected end-tag `%s': `</bypassRoute>' expected.",surf_parse_text);
+       YY_BREAK

 case 121:
 case 121:

-/* rule 121 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-A_surfxml_AS_routing = A_surfxml_AS_routing_Vivaldi;
-  YY_BREAK
+FAIL("Unexpected character `%c': `</bypassRoute>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_bypassRoute):
+case YY_STATE_EOF(S_surfxml_bypassRoute):
+case YY_STATE_EOF(S_surfxml_bypassRoute_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</bypassRoute>' expected.");
+       YY_BREAK
+

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

+YY_RULE_SETUP
+FAIL("Starting tag <cabinet> is not allowed here.");
+       YY_BREAK

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

-A_surfxml_AS_routing = A_surfxml_AS_routing_Cluster;
-  YY_BREAK
+{
+  AX_surfxml_cabinet_bw = 0;
+  surfxml_cabinet_bw_isset = 0;
+  AX_surfxml_cabinet_id = 0;
+  surfxml_cabinet_id_isset = 0;
+  AX_surfxml_cabinet_lat = 0;
+  surfxml_cabinet_lat_isset = 0;
+  AX_surfxml_cabinet_power = 0;
+  surfxml_cabinet_power_isset = 0;
+  AX_surfxml_cabinet_prefix = 0;
+  surfxml_cabinet_prefix_isset = 0;
+  AX_surfxml_cabinet_radical = 0;
+  surfxml_cabinet_radical_isset = 0;
+  AX_surfxml_cabinet_suffix = 0;
+  surfxml_cabinet_suffix_isset = 0;
+  ENTER(AL_surfxml_cabinet); pushbuffer(0);
+  }
+       YY_BREAK
+

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

+YY_RULE_SETUP
+if (surfxml_cabinet_bw_isset != 0) {FAIL("Multiple definition of attribute bw in <surfxml_cabinet>");} surfxml_cabinet_bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_bw);
+       YY_BREAK

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

-A_surfxml_AS_routing = A_surfxml_AS_routing_Cluster___torus;
-  YY_BREAK
+if (surfxml_cabinet_bw_isset != 0) {FAIL("Multiple definition of attribute bw in <surfxml_cabinet>");}  surfxml_cabinet_bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_bw);
+       YY_BREAK

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

+YY_RULE_SETUP
+if (surfxml_cabinet_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_cabinet>");} surfxml_cabinet_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_id);
+       YY_BREAK

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

-A_surfxml_AS_routing = A_surfxml_AS_routing_Cluster___fat___tree;
-  YY_BREAK
+if (surfxml_cabinet_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_cabinet>");}  surfxml_cabinet_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_id);
+       YY_BREAK

 case 128:
 case 128:

+/* rule 128 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_AS_id) FAIL("Required attribute `id' not set for `AS' element.");
-  if (!AX_surfxml_AS_routing) FAIL("Required attribute `routing' not set for `AS' element.");
-  LEAVE; STag_surfxml_AS();surfxml_pcdata_ix = 0; ENTER(S_surfxml_AS);
- }
-  YY_BREAK
+if (surfxml_cabinet_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_cabinet>");} surfxml_cabinet_lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_lat);
+       YY_BREAK

 case 129:
 case 129:

+/* rule 129 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_AS_id) FAIL("Required attribute `id' not set for `AS' element.");
-  if (!AX_surfxml_AS_routing) FAIL("Required attribute `routing' not set for `AS' element.");
-  LEAVE; STag_surfxml_AS(); surfxml_pcdata_ix = 0; ETag_surfxml_AS(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_cabinet_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_cabinet>");}  surfxml_cabinet_lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_lat);
+       YY_BREAK

 case 130:
 case 130:

+/* rule 130 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of AS element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_cabinet_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_cabinet>");} surfxml_cabinet_power_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_power);
+       YY_BREAK

 case 131:
 case 131:

+/* rule 131 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `AS' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_AS):
-FAIL("EOF in attribute list of `AS' element.");
-  YY_BREAK
-
+if (surfxml_cabinet_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_cabinet>");}  surfxml_cabinet_power_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_power);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_AS();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_cabinet_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in <surfxml_cabinet>");} surfxml_cabinet_prefix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_prefix);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</AS>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_cabinet_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in <surfxml_cabinet>");}  surfxml_cabinet_prefix_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_prefix);
+       YY_BREAK

 case 134:
 case 134:

+/* rule 134 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</AS>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_AS_8):
-case YY_STATE_EOF(E_surfxml_AS):
-case YY_STATE_EOF(S_surfxml_AS):
-case YY_STATE_EOF(S_surfxml_AS_4):
-case YY_STATE_EOF(S_surfxml_AS_6):
-case YY_STATE_EOF(S_surfxml_AS_3):
-case YY_STATE_EOF(S_surfxml_AS_1):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</AS>' expected.");
-  YY_BREAK
-
+if (surfxml_cabinet_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_cabinet>");} surfxml_cabinet_radical_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_radical);
+       YY_BREAK

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

-FAIL("Starting tag <storage_type> is not allowed here.");
-  YY_BREAK
+if (surfxml_cabinet_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_cabinet>");}  surfxml_cabinet_radical_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_radical);
+       YY_BREAK

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

-{
-  AX_surfxml_storage___type_id = 0;
-  surfxml_storage___type_id_isset = 0;
-  AX_surfxml_storage___type_model = 0;
-  surfxml_storage___type_model_isset = 0;
-  AX_surfxml_storage___type_size = 0;
-  surfxml_storage___type_size_isset = 0;
-  AX_surfxml_storage___type_content = 0;
-  surfxml_storage___type_content_isset = 0;
-  AX_surfxml_storage___type_content___type = 16;
-  surfxml_storage___type_content___type_isset = 0;
-  ENTER(AL_surfxml_storage___type); pushbuffer(0);
-  }
-  YY_BREAK
-
+if (surfxml_cabinet_suffix_isset != 0) {FAIL("Multiple definition of attribute suffix in <surfxml_cabinet>");} surfxml_cabinet_suffix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_suffix);
+       YY_BREAK

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

-if (surfxml_storage___type_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_storage___type>");} surfxml_storage___type_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage___type_id);
-  YY_BREAK
+if (surfxml_cabinet_suffix_isset != 0) {FAIL("Multiple definition of attribute suffix in <surfxml_cabinet>");}  surfxml_cabinet_suffix_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_suffix);
+       YY_BREAK

 case 138:
 case 138:

-/* rule 138 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_storage___type_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_storage___type>");}  surfxml_storage___type_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage___type_id);
-  YY_BREAK
+{
+  if (!AX_surfxml_cabinet_bw) FAIL("Required attribute `bw' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_id) FAIL("Required attribute `id' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_lat) FAIL("Required attribute `lat' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_power) FAIL("Required attribute `power' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_prefix) FAIL("Required attribute `prefix' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_radical) FAIL("Required attribute `radical' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_suffix) FAIL("Required attribute `suffix' not set for `cabinet' element.");
+  LEAVE; STag_surfxml_cabinet();surfxml_pcdata_ix = 0; ENTER(E_surfxml_cabinet);
+ }
+       YY_BREAK

 case 139:
 case 139:

-/* rule 139 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_storage___type_model_isset != 0) {FAIL("Multiple definition of attribute model in <surfxml_storage___type>");} surfxml_storage___type_model_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage___type_model);
-  YY_BREAK
+{
+  if (!AX_surfxml_cabinet_bw) FAIL("Required attribute `bw' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_id) FAIL("Required attribute `id' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_lat) FAIL("Required attribute `lat' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_power) FAIL("Required attribute `power' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_prefix) FAIL("Required attribute `prefix' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_radical) FAIL("Required attribute `radical' not set for `cabinet' element.");
+  if (!AX_surfxml_cabinet_suffix) FAIL("Required attribute `suffix' not set for `cabinet' element.");
+  LEAVE; STag_surfxml_cabinet(); surfxml_pcdata_ix = 0; ETag_surfxml_cabinet(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
+  }
+ }
+       YY_BREAK

 case 140:
 case 140:

-/* rule 140 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_storage___type_model_isset != 0) {FAIL("Multiple definition of attribute model in <surfxml_storage___type>");}  surfxml_storage___type_model_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage___type_model);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of cabinet element.", surf_parse_text[0]);
+       YY_BREAK

 case 141:
 case 141:

-/* rule 141 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_storage___type_size_isset != 0) {FAIL("Multiple definition of attribute size in <surfxml_storage___type>");} surfxml_storage___type_size_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage___type_size);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `cabinet' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_cabinet):
+FAIL("EOF in attribute list of `cabinet' element.");
+       YY_BREAK
+

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

-if (surfxml_storage___type_size_isset != 0) {FAIL("Multiple definition of attribute size in <surfxml_storage___type>");}  surfxml_storage___type_size_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage___type_size);
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_cabinet();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
+  }
+ }
+       YY_BREAK

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

-if (surfxml_storage___type_content_isset != 0) {FAIL("Multiple definition of attribute content in <surfxml_storage___type>");} surfxml_storage___type_content_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage___type_content);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</cabinet>' expected.",surf_parse_text);
+       YY_BREAK

 case 144:
 case 144:

-/* rule 144 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_storage___type_content_isset != 0) {FAIL("Multiple definition of attribute content in <surfxml_storage___type>");}  surfxml_storage___type_content_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage___type_content);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</cabinet>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_cabinet):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</cabinet>' expected.");
+       YY_BREAK
+

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

-if (surfxml_storage___type_content___type_isset != 0) {FAIL("Multiple definition of attribute content_type in <surfxml_storage___type>");} surfxml_storage___type_content___type_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage___type_content___type);
-  YY_BREAK
+FAIL("Starting tag <cluster> is not allowed here.");
+       YY_BREAK

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

-if (surfxml_storage___type_content___type_isset != 0) {FAIL("Multiple definition of attribute content_type in <surfxml_storage___type>");}  surfxml_storage___type_content___type_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage___type_content___type);
-  YY_BREAK
+{
+  AX_surfxml_cluster_availability___file = 0;
+  surfxml_cluster_availability___file_isset = 0;
+  AX_surfxml_cluster_bb___bw = 0;
+  surfxml_cluster_bb___bw_isset = 0;
+  AX_surfxml_cluster_bb___lat = 0;
+  surfxml_cluster_bb___lat_isset = 0;
+  AX_surfxml_cluster_bb___sharing___policy = A_surfxml_cluster_bb___sharing___policy_SHARED;
+  surfxml_cluster_bb___sharing___policy_isset = 0;
+  AX_surfxml_cluster_bw = 0;
+  surfxml_cluster_bw_isset = 0;
+  AX_surfxml_cluster_core = 44;
+  surfxml_cluster_core_isset = 0;
+  AX_surfxml_cluster_id = 0;
+  surfxml_cluster_id_isset = 0;
+  AX_surfxml_cluster_lat = 0;
+  surfxml_cluster_lat_isset = 0;
+  AX_surfxml_cluster_limiter___link = 0;
+  surfxml_cluster_limiter___link_isset = 0;
+  AX_surfxml_cluster_loopback___bw = 0;
+  surfxml_cluster_loopback___bw_isset = 0;
+  AX_surfxml_cluster_loopback___lat = 0;
+  surfxml_cluster_loopback___lat_isset = 0;
+  AX_surfxml_cluster_power = 0;
+  surfxml_cluster_power_isset = 0;
+  AX_surfxml_cluster_prefix = 0;
+  surfxml_cluster_prefix_isset = 0;
+  AX_surfxml_cluster_radical = 0;
+  surfxml_cluster_radical_isset = 0;
+  AX_surfxml_cluster_router___id = 0;
+  surfxml_cluster_router___id_isset = 0;
+  AX_surfxml_cluster_sharing___policy = A_surfxml_cluster_sharing___policy_FULLDUPLEX;
+  surfxml_cluster_sharing___policy_isset = 0;
+  AX_surfxml_cluster_state___file = 0;
+  surfxml_cluster_state___file_isset = 0;
+  AX_surfxml_cluster_suffix = 0;
+  surfxml_cluster_suffix_isset = 0;
+  AX_surfxml_cluster_topo___parameters = 0;
+  surfxml_cluster_topo___parameters_isset = 0;
+  AX_surfxml_cluster_topology = A_surfxml_cluster_topology_FLAT;
+  surfxml_cluster_topology_isset = 0;
+  ENTER(AL_surfxml_cluster); pushbuffer(0);
+  }
+       YY_BREAK
+

 case 147:
 case 147:

+/* rule 147 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_storage___type_id) FAIL("Required attribute `id' not set for `storage_type' element.");
-  if (!AX_surfxml_storage___type_model) FAIL("Required attribute `model' not set for `storage_type' element.");
-  if (!AX_surfxml_storage___type_size) FAIL("Required attribute `size' not set for `storage_type' element.");
-  LEAVE; STag_surfxml_storage___type();surfxml_pcdata_ix = 0; ENTER(S_surfxml_storage___type);
- }
-  YY_BREAK
+if (surfxml_cluster_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_cluster>");} surfxml_cluster_availability___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_availability___file);
+       YY_BREAK

 case 148:
 case 148:

+/* rule 148 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_storage___type_id) FAIL("Required attribute `id' not set for `storage_type' element.");
-  if (!AX_surfxml_storage___type_model) FAIL("Required attribute `model' not set for `storage_type' element.");
-  if (!AX_surfxml_storage___type_size) FAIL("Required attribute `size' not set for `storage_type' element.");
-  LEAVE; STag_surfxml_storage___type(); surfxml_pcdata_ix = 0; ETag_surfxml_storage___type(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_cluster_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_cluster>");}  surfxml_cluster_availability___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_availability___file);
+       YY_BREAK

 case 149:
 case 149:

+/* rule 149 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of storage_type element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_cluster_bb___bw_isset != 0) {FAIL("Multiple definition of attribute bb_bw in <surfxml_cluster>");} surfxml_cluster_bb___bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb___bw);
+       YY_BREAK

 case 150:
 case 150:

+/* rule 150 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `storage_type' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_storage___type):
-FAIL("EOF in attribute list of `storage_type' element.");
-  YY_BREAK
-
+if (surfxml_cluster_bb___bw_isset != 0) {FAIL("Multiple definition of attribute bb_bw in <surfxml_cluster>");}  surfxml_cluster_bb___bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bb___bw);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_storage___type();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_cluster_bb___lat_isset != 0) {FAIL("Multiple definition of attribute bb_lat in <surfxml_cluster>");} surfxml_cluster_bb___lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb___lat);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</storage_type>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_cluster_bb___lat_isset != 0) {FAIL("Multiple definition of attribute bb_lat in <surfxml_cluster>");}  surfxml_cluster_bb___lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bb___lat);
+       YY_BREAK

 case 153:
 case 153:

-YY_RULE_SETUP
-FAIL("Unexpected character `%c': `</storage_type>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_storage___type_2):
-case YY_STATE_EOF(S_surfxml_storage___type):
-case YY_STATE_EOF(E_surfxml_storage___type):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</storage_type>' expected.");
-  YY_BREAK
-
+/* rule 153 can match eol */

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

-FAIL("Starting tag <mount> is not allowed here.");
-  YY_BREAK
+A_surfxml_cluster_bb___sharing___policy = A_surfxml_cluster_bb___sharing___policy_SHARED;
+       YY_BREAK

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

-YY_RULE_SETUP
-{
-  AX_surfxml_mount_storageId = 0;
-  surfxml_mount_storageId_isset = 0;
-  AX_surfxml_mount_name = 0;
-  surfxml_mount_name_isset = 0;
-  ENTER(AL_surfxml_mount); pushbuffer(0);
-  }
-  YY_BREAK
-

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

-if (surfxml_mount_storageId_isset != 0) {FAIL("Multiple definition of attribute storageId in <surfxml_mount>");} surfxml_mount_storageId_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_mount_storageId);
-  YY_BREAK
+A_surfxml_cluster_bb___sharing___policy = A_surfxml_cluster_bb___sharing___policy_FATPIPE;
+       YY_BREAK

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

-if (surfxml_mount_storageId_isset != 0) {FAIL("Multiple definition of attribute storageId in <surfxml_mount>");}  surfxml_mount_storageId_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_mount_storageId);
-  YY_BREAK
+if (surfxml_cluster_bw_isset != 0) {FAIL("Multiple definition of attribute bw in <surfxml_cluster>");} surfxml_cluster_bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bw);
+       YY_BREAK

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

-if (surfxml_mount_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_mount>");} surfxml_mount_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_mount_name);
-  YY_BREAK
+if (surfxml_cluster_bw_isset != 0) {FAIL("Multiple definition of attribute bw in <surfxml_cluster>");}  surfxml_cluster_bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bw);
+       YY_BREAK

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

-if (surfxml_mount_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_mount>");}  surfxml_mount_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_mount_name);
-  YY_BREAK
+if (surfxml_cluster_core_isset != 0) {FAIL("Multiple definition of attribute core in <surfxml_cluster>");} surfxml_cluster_core_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_core);
+       YY_BREAK

 case 160:
 case 160:

+/* rule 160 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_mount_storageId) FAIL("Required attribute `storageId' not set for `mount' element.");
-  if (!AX_surfxml_mount_name) FAIL("Required attribute `name' not set for `mount' element.");
-  LEAVE; STag_surfxml_mount();surfxml_pcdata_ix = 0; ENTER(E_surfxml_mount);
- }
-  YY_BREAK
+if (surfxml_cluster_core_isset != 0) {FAIL("Multiple definition of attribute core in <surfxml_cluster>");}  surfxml_cluster_core_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_core);
+       YY_BREAK

 case 161:
 case 161:

+/* rule 161 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_mount_storageId) FAIL("Required attribute `storageId' not set for `mount' element.");
-  if (!AX_surfxml_mount_name) FAIL("Required attribute `name' not set for `mount' element.");
-  LEAVE; STag_surfxml_mount(); surfxml_pcdata_ix = 0; ETag_surfxml_mount(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
-  }
- }
-  YY_BREAK
+if (surfxml_cluster_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_cluster>");} surfxml_cluster_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_id);
+       YY_BREAK

 case 162:
 case 162:

+/* rule 162 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of mount element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_cluster_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_cluster>");}  surfxml_cluster_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_id);
+       YY_BREAK

 case 163:
 case 163:

+/* rule 163 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `mount' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_mount):
-FAIL("EOF in attribute list of `mount' element.");
-  YY_BREAK
-
+if (surfxml_cluster_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_cluster>");} surfxml_cluster_lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_lat);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_mount();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
-  }
- }
-  YY_BREAK
+if (surfxml_cluster_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_cluster>");}  surfxml_cluster_lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_lat);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</mount>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_cluster_limiter___link_isset != 0) {FAIL("Multiple definition of attribute limiter_link in <surfxml_cluster>");} surfxml_cluster_limiter___link_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_limiter___link);
+       YY_BREAK

 case 166:
 case 166:

+/* rule 166 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</mount>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_mount):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</mount>' expected.");
-  YY_BREAK
-
+if (surfxml_cluster_limiter___link_isset != 0) {FAIL("Multiple definition of attribute limiter_link in <surfxml_cluster>");}  surfxml_cluster_limiter___link_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_limiter___link);
+       YY_BREAK

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

-FAIL("Starting tag <mstorage> is not allowed here.");
-  YY_BREAK
+if (surfxml_cluster_loopback___bw_isset != 0) {FAIL("Multiple definition of attribute loopback_bw in <surfxml_cluster>");} surfxml_cluster_loopback___bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_loopback___bw);
+       YY_BREAK

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

-{
-  AX_surfxml_mstorage_typeId = 0;
-  surfxml_mstorage_typeId_isset = 0;
-  AX_surfxml_mstorage_name = 0;
-  surfxml_mstorage_name_isset = 0;
-  ENTER(AL_surfxml_mstorage); pushbuffer(0);
-  }
-  YY_BREAK
-
+if (surfxml_cluster_loopback___bw_isset != 0) {FAIL("Multiple definition of attribute loopback_bw in <surfxml_cluster>");}  surfxml_cluster_loopback___bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_loopback___bw);
+       YY_BREAK

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

-if (surfxml_mstorage_typeId_isset != 0) {FAIL("Multiple definition of attribute typeId in <surfxml_mstorage>");} surfxml_mstorage_typeId_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_mstorage_typeId);
-  YY_BREAK
+if (surfxml_cluster_loopback___lat_isset != 0) {FAIL("Multiple definition of attribute loopback_lat in <surfxml_cluster>");} surfxml_cluster_loopback___lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_loopback___lat);
+       YY_BREAK

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

-if (surfxml_mstorage_typeId_isset != 0) {FAIL("Multiple definition of attribute typeId in <surfxml_mstorage>");}  surfxml_mstorage_typeId_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_mstorage_typeId);
-  YY_BREAK
+if (surfxml_cluster_loopback___lat_isset != 0) {FAIL("Multiple definition of attribute loopback_lat in <surfxml_cluster>");}  surfxml_cluster_loopback___lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_loopback___lat);
+       YY_BREAK

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

-if (surfxml_mstorage_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_mstorage>");} surfxml_mstorage_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_mstorage_name);
-  YY_BREAK
+if (surfxml_cluster_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_cluster>");} surfxml_cluster_power_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_power);
+       YY_BREAK

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

-if (surfxml_mstorage_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_mstorage>");}  surfxml_mstorage_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_mstorage_name);
-  YY_BREAK
+if (surfxml_cluster_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_cluster>");}  surfxml_cluster_power_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_power);
+       YY_BREAK

 case 173:
 case 173:

+/* rule 173 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_mstorage_typeId) FAIL("Required attribute `typeId' not set for `mstorage' element.");
-  if (!AX_surfxml_mstorage_name) FAIL("Required attribute `name' not set for `mstorage' element.");
-  LEAVE; STag_surfxml_mstorage();surfxml_pcdata_ix = 0; ENTER(E_surfxml_mstorage);
- }
-  YY_BREAK
+if (surfxml_cluster_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in <surfxml_cluster>");} surfxml_cluster_prefix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_prefix);
+       YY_BREAK

 case 174:
 case 174:

+/* rule 174 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_mstorage_typeId) FAIL("Required attribute `typeId' not set for `mstorage' element.");
-  if (!AX_surfxml_mstorage_name) FAIL("Required attribute `name' not set for `mstorage' element.");
-  LEAVE; STag_surfxml_mstorage(); surfxml_pcdata_ix = 0; ETag_surfxml_mstorage(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
-  }
- }
-  YY_BREAK
+if (surfxml_cluster_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in <surfxml_cluster>");}  surfxml_cluster_prefix_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_prefix);
+       YY_BREAK

 case 175:
 case 175:

+/* rule 175 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of mstorage element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_cluster_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_cluster>");} surfxml_cluster_radical_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_radical);
+       YY_BREAK

 case 176:
 case 176:

+/* rule 176 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `mstorage' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_mstorage):
-FAIL("EOF in attribute list of `mstorage' element.");
-  YY_BREAK
-
+if (surfxml_cluster_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_cluster>");}  surfxml_cluster_radical_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_radical);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_mstorage();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
-  }
- }
-  YY_BREAK
+if (surfxml_cluster_router___id_isset != 0) {FAIL("Multiple definition of attribute router_id in <surfxml_cluster>");} surfxml_cluster_router___id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_router___id);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</mstorage>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_cluster_router___id_isset != 0) {FAIL("Multiple definition of attribute router_id in <surfxml_cluster>");}  surfxml_cluster_router___id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_router___id);
+       YY_BREAK

 case 179:
 case 179:

-YY_RULE_SETUP
-FAIL("Unexpected character `%c': `</mstorage>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_mstorage):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</mstorage>' expected.");
-  YY_BREAK
-
+/* rule 179 can match eol */

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

-FAIL("Starting tag <host> is not allowed here.");
-  YY_BREAK
+A_surfxml_cluster_sharing___policy = A_surfxml_cluster_sharing___policy_SHARED;
+       YY_BREAK

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

-YY_RULE_SETUP
-{
-  AX_surfxml_host_id = 0;
-  surfxml_host_id_isset = 0;
-  AX_surfxml_host_power = 0;
-  surfxml_host_power_isset = 0;
-  AX_surfxml_host_core = 25;
-  surfxml_host_core_isset = 0;
-  AX_surfxml_host_availability = 27;
-  surfxml_host_availability_isset = 0;
-  AX_surfxml_host_availability___file = 0;
-  surfxml_host_availability___file_isset = 0;
-  AX_surfxml_host_state = A_surfxml_host_state_ON;
-  surfxml_host_state_isset = 0;
-  AX_surfxml_host_state___file = 0;
-  surfxml_host_state___file_isset = 0;
-  AX_surfxml_host_coordinates = 0;
-  surfxml_host_coordinates_isset = 0;
-  AX_surfxml_host_pstate = 31;
-  surfxml_host_pstate_isset = 0;
-  ENTER(AL_surfxml_host); pushbuffer(0);
-  }
-  YY_BREAK
-

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

-if (surfxml_host_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_host>");} surfxml_host_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_id);
-  YY_BREAK
+A_surfxml_cluster_sharing___policy = A_surfxml_cluster_sharing___policy_FULLDUPLEX;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_host_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_host>");}  surfxml_host_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_id);
-  YY_BREAK

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

-if (surfxml_host_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_host>");} surfxml_host_power_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_power);
-  YY_BREAK
+A_surfxml_cluster_sharing___policy = A_surfxml_cluster_sharing___policy_FATPIPE;
+       YY_BREAK

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

-if (surfxml_host_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_host>");}  surfxml_host_power_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_power);
-  YY_BREAK
+if (surfxml_cluster_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_cluster>");} surfxml_cluster_state___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_state___file);
+       YY_BREAK

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

-if (surfxml_host_core_isset != 0) {FAIL("Multiple definition of attribute core in <surfxml_host>");} surfxml_host_core_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_core);
-  YY_BREAK
+if (surfxml_cluster_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_cluster>");}  surfxml_cluster_state___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_state___file);
+       YY_BREAK

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

-if (surfxml_host_core_isset != 0) {FAIL("Multiple definition of attribute core in <surfxml_host>");}  surfxml_host_core_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_core);
-  YY_BREAK
+if (surfxml_cluster_suffix_isset != 0) {FAIL("Multiple definition of attribute suffix in <surfxml_cluster>");} surfxml_cluster_suffix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_suffix);
+       YY_BREAK

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

-if (surfxml_host_availability_isset != 0) {FAIL("Multiple definition of attribute availability in <surfxml_host>");} surfxml_host_availability_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability);
-  YY_BREAK
+if (surfxml_cluster_suffix_isset != 0) {FAIL("Multiple definition of attribute suffix in <surfxml_cluster>");}  surfxml_cluster_suffix_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_suffix);
+       YY_BREAK

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

-if (surfxml_host_availability_isset != 0) {FAIL("Multiple definition of attribute availability in <surfxml_host>");}  surfxml_host_availability_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability);
-  YY_BREAK
+if (surfxml_cluster_topo___parameters_isset != 0) {FAIL("Multiple definition of attribute topo_parameters in <surfxml_cluster>");} surfxml_cluster_topo___parameters_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_topo___parameters);
+       YY_BREAK

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

-if (surfxml_host_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_host>");} surfxml_host_availability___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability___file);
-  YY_BREAK
+if (surfxml_cluster_topo___parameters_isset != 0) {FAIL("Multiple definition of attribute topo_parameters in <surfxml_cluster>");}  surfxml_cluster_topo___parameters_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_topo___parameters);
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_host_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_host>");}  surfxml_host_availability___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability___file);
-  YY_BREAK

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

+YY_RULE_SETUP
+A_surfxml_cluster_topology = A_surfxml_cluster_topology_FLAT;
+       YY_BREAK

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

-YY_RULE_SETUP
-A_surfxml_host_state = A_surfxml_host_state_ON;
-  YY_BREAK

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

+YY_RULE_SETUP
+A_surfxml_cluster_topology = A_surfxml_cluster_topology_TORUS;
+       YY_BREAK

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

-YY_RULE_SETUP
-A_surfxml_host_state = A_surfxml_host_state_OFF;
-  YY_BREAK

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

-if (surfxml_host_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_host>");} surfxml_host_state___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_state___file);
-  YY_BREAK
+A_surfxml_cluster_topology = A_surfxml_cluster_topology_FAT___TREE;
+       YY_BREAK

 case 197:
 case 197:

-/* rule 197 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_host_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_host>");}  surfxml_host_state___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_state___file);
-  YY_BREAK
+{
+  if (!AX_surfxml_cluster_bw) FAIL("Required attribute `bw' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_id) FAIL("Required attribute `id' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_lat) FAIL("Required attribute `lat' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_power) FAIL("Required attribute `power' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_prefix) FAIL("Required attribute `prefix' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_radical) FAIL("Required attribute `radical' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_suffix) FAIL("Required attribute `suffix' not set for `cluster' element.");
+  LEAVE; STag_surfxml_cluster();surfxml_pcdata_ix = 0; ENTER(S_surfxml_cluster);
+ }
+       YY_BREAK

 case 198:
 case 198:

-/* rule 198 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_host_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_host>");} surfxml_host_coordinates_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_coordinates);
-  YY_BREAK
+{
+  if (!AX_surfxml_cluster_bw) FAIL("Required attribute `bw' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_id) FAIL("Required attribute `id' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_lat) FAIL("Required attribute `lat' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_power) FAIL("Required attribute `power' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_prefix) FAIL("Required attribute `prefix' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_radical) FAIL("Required attribute `radical' not set for `cluster' element.");
+  if (!AX_surfxml_cluster_suffix) FAIL("Required attribute `suffix' not set for `cluster' element.");
+  LEAVE; STag_surfxml_cluster(); surfxml_pcdata_ix = 0; ETag_surfxml_cluster(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
+  }
+ }
+       YY_BREAK

 case 199:
 case 199:

-/* rule 199 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_host_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_host>");}  surfxml_host_coordinates_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_coordinates);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of cluster element.", surf_parse_text[0]);
+       YY_BREAK

 case 200:
 case 200:

-/* rule 200 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_host_pstate_isset != 0) {FAIL("Multiple definition of attribute pstate in <surfxml_host>");} surfxml_host_pstate_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_pstate);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `cluster' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_cluster):
+FAIL("EOF in attribute list of `cluster' element.");
+       YY_BREAK
+

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

-if (surfxml_host_pstate_isset != 0) {FAIL("Multiple definition of attribute pstate in <surfxml_host>");}  surfxml_host_pstate_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_pstate);
-  YY_BREAK
-case 202:
-YY_RULE_SETUP
-{
-  if (!AX_surfxml_host_id) FAIL("Required attribute `id' not set for `host' element.");
-  if (!AX_surfxml_host_power) FAIL("Required attribute `power' not set for `host' element.");
-  LEAVE; STag_surfxml_host();surfxml_pcdata_ix = 0; ENTER(S_surfxml_host);
- }
-  YY_BREAK
-case 203:
-YY_RULE_SETUP

 {
 {

-  if (!AX_surfxml_host_id) FAIL("Required attribute `id' not set for `host' element.");
-  if (!AX_surfxml_host_power) FAIL("Required attribute `power' not set for `host' element.");
-  LEAVE; STag_surfxml_host(); surfxml_pcdata_ix = 0; ETag_surfxml_host(); popbuffer(); /* attribute */
+  LEAVE;
+  ETag_surfxml_cluster();
+  popbuffer(); /* attribute */

   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;

+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;

   }
  }
   }
  }

-  YY_BREAK
+       YY_BREAK
+case 202:
+/* rule 202 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected end-tag `%s': `</cluster>' expected.",surf_parse_text);
+       YY_BREAK
+case 203:
+YY_RULE_SETUP
+FAIL("Unexpected character `%c': `</cluster>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_cluster):
+case YY_STATE_EOF(S_surfxml_cluster):
+case YY_STATE_EOF(S_surfxml_cluster_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</cluster>' expected.");
+       YY_BREAK
+

 case 204:
 case 204:

+/* rule 204 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of host element.", surf_parse_text[0]);
-  YY_BREAK
+FAIL("Starting tag <config> is not allowed here.");
+       YY_BREAK

 case 205:
 case 205:

+/* rule 205 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `host' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_host):
-FAIL("EOF in attribute list of `host' element.");
-  YY_BREAK
+{
+  AX_surfxml_config_id = 0;
+  surfxml_config_id_isset = 0;
+  ENTER(AL_surfxml_config); pushbuffer(0);
+  }
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_host();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_config_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_config>");} surfxml_config_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_config_id);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</host>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_config_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_config>");}  surfxml_config_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_config_id);
+       YY_BREAK

 case 208:
 YY_RULE_SETUP
 case 208:
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</host>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_host_2):
-case YY_STATE_EOF(S_surfxml_host):
-case YY_STATE_EOF(E_surfxml_host):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</host>' expected.");
-  YY_BREAK
-
+{
+  LEAVE; STag_surfxml_config();surfxml_pcdata_ix = 0; ENTER(S_surfxml_config);
+ }
+       YY_BREAK

 case 209:
 case 209:

-/* rule 209 can match eol */
-YY_RULE_SETUP
-FAIL("Starting tag <storage> is not allowed here.");
-  YY_BREAK
-case 210:
-/* rule 210 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  AX_surfxml_storage_id = 0;
-  surfxml_storage_id_isset = 0;
-  AX_surfxml_storage_typeId = 0;
-  surfxml_storage_typeId_isset = 0;
-  AX_surfxml_storage_content = 0;
-  surfxml_storage_content_isset = 0;
-  AX_surfxml_storage_content___type = 35;
-  surfxml_storage_content___type_isset = 0;
-  AX_surfxml_storage_attach = 0;
-  surfxml_storage_attach_isset = 0;
-  ENTER(AL_surfxml_storage); pushbuffer(0);
+  LEAVE; STag_surfxml_config(); surfxml_pcdata_ix = 0; ETag_surfxml_config(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_platform: case S_surfxml_platform_2: case S_surfxml_platform_3: SET(S_surfxml_platform_3); break;

   }
   }

-  YY_BREAK
-
+ }
+       YY_BREAK
+case 210:
+YY_RULE_SETUP
+FAIL("Unexpected character `%c' in attribute list of config element.", surf_parse_text[0]);
+       YY_BREAK

 case 211:
 case 211:

-/* rule 211 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_storage_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_storage>");} surfxml_storage_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage_id);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `config' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_config):
+FAIL("EOF in attribute list of `config' element.");
+       YY_BREAK
+

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

-if (surfxml_storage_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_storage>");}  surfxml_storage_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage_id);
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_config();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_platform: case S_surfxml_platform_2: case S_surfxml_platform_3: SET(S_surfxml_platform_3); break;
+  }
+ }
+       YY_BREAK

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

-if (surfxml_storage_typeId_isset != 0) {FAIL("Multiple definition of attribute typeId in <surfxml_storage>");} surfxml_storage_typeId_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage_typeId);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</config>' expected.",surf_parse_text);
+       YY_BREAK

 case 214:
 case 214:

-/* rule 214 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_storage_typeId_isset != 0) {FAIL("Multiple definition of attribute typeId in <surfxml_storage>");}  surfxml_storage_typeId_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage_typeId);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</config>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_config):
+case YY_STATE_EOF(S_surfxml_config):
+case YY_STATE_EOF(S_surfxml_config_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</config>' expected.");
+       YY_BREAK
+

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

-if (surfxml_storage_content_isset != 0) {FAIL("Multiple definition of attribute content in <surfxml_storage>");} surfxml_storage_content_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage_content);
-  YY_BREAK
+FAIL("Starting tag <gpu> is not allowed here.");
+       YY_BREAK

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

-if (surfxml_storage_content_isset != 0) {FAIL("Multiple definition of attribute content in <surfxml_storage>");}  surfxml_storage_content_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage_content);
-  YY_BREAK
+{
+  AX_surfxml_gpu_name = 0;
+  surfxml_gpu_name_isset = 0;
+  ENTER(AL_surfxml_gpu); pushbuffer(0);
+  }
+       YY_BREAK
+

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

-if (surfxml_storage_content___type_isset != 0) {FAIL("Multiple definition of attribute content_type in <surfxml_storage>");} surfxml_storage_content___type_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage_content___type);
-  YY_BREAK
+if (surfxml_gpu_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_gpu>");} surfxml_gpu_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_gpu_name);
+       YY_BREAK

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

-if (surfxml_storage_content___type_isset != 0) {FAIL("Multiple definition of attribute content_type in <surfxml_storage>");}  surfxml_storage_content___type_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage_content___type);
-  YY_BREAK
+if (surfxml_gpu_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_gpu>");}  surfxml_gpu_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_gpu_name);
+       YY_BREAK

 case 219:
 case 219:

-/* rule 219 can match eol */
-YY_RULE_SETUP
-if (surfxml_storage_attach_isset != 0) {FAIL("Multiple definition of attribute attach in <surfxml_storage>");} surfxml_storage_attach_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage_attach);
-  YY_BREAK
-case 220:
-/* rule 220 can match eol */
-YY_RULE_SETUP
-if (surfxml_storage_attach_isset != 0) {FAIL("Multiple definition of attribute attach in <surfxml_storage>");}  surfxml_storage_attach_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage_attach);
-  YY_BREAK
-case 221:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_storage_id) FAIL("Required attribute `id' not set for `storage' element.");
-  if (!AX_surfxml_storage_typeId) FAIL("Required attribute `typeId' not set for `storage' element.");
-  if (!AX_surfxml_storage_attach) FAIL("Required attribute `attach' not set for `storage' element.");
-  LEAVE; STag_surfxml_storage();surfxml_pcdata_ix = 0; ENTER(S_surfxml_storage);
+  if (!AX_surfxml_gpu_name) FAIL("Required attribute `name' not set for `gpu' element.");
+  LEAVE; STag_surfxml_gpu();surfxml_pcdata_ix = 0; ENTER(E_surfxml_gpu);

  }
  }

-  YY_BREAK
-case 222:
+       YY_BREAK
+case 220:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_storage_id) FAIL("Required attribute `id' not set for `storage' element.");
-  if (!AX_surfxml_storage_typeId) FAIL("Required attribute `typeId' not set for `storage' element.");
-  if (!AX_surfxml_storage_attach) FAIL("Required attribute `attach' not set for `storage' element.");
-  LEAVE; STag_surfxml_storage(); surfxml_pcdata_ix = 0; ETag_surfxml_storage(); popbuffer(); /* attribute */
+  if (!AX_surfxml_gpu_name) FAIL("Required attribute `name' not set for `gpu' element.");
+  LEAVE; STag_surfxml_gpu(); surfxml_pcdata_ix = 0; ETag_surfxml_gpu(); popbuffer(); /* attribute */

   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   }
  }
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   }
  }

-  YY_BREAK
-case 223:
+       YY_BREAK
+case 221:

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of storage element.", surf_parse_text[0]);
-  YY_BREAK
-case 224:
+FAIL("Unexpected character `%c' in attribute list of gpu element.", surf_parse_text[0]);
+       YY_BREAK
+case 222:

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `storage' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_storage):
-FAIL("EOF in attribute list of `storage' element.");
-  YY_BREAK
+FAIL("Bad attribute `%s' in `gpu' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_gpu):
+FAIL("EOF in attribute list of `gpu' element.");
+       YY_BREAK

 
 

-case 225:
-/* rule 225 can match eol */
+case 223:
+/* rule 223 can match eol */

 YY_RULE_SETUP
 {
   LEAVE;
 YY_RULE_SETUP
 {
   LEAVE;

-  ETag_surfxml_storage();
+  ETag_surfxml_gpu();

   popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   }
  }
   popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   }
  }

-  YY_BREAK
+       YY_BREAK
+case 224:
+/* rule 224 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected end-tag `%s': `</gpu>' expected.",surf_parse_text);
+       YY_BREAK
+case 225:
+YY_RULE_SETUP
+FAIL("Unexpected character `%c': `</gpu>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_gpu):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</gpu>' expected.");
+       YY_BREAK
+

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

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

 case 227:
 case 227:

+/* rule 227 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</storage>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_storage_2):
-case YY_STATE_EOF(S_surfxml_storage):
-case YY_STATE_EOF(E_surfxml_storage):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</storage>' expected.");
-  YY_BREAK
+{
+  AX_surfxml_host_availability = 27;
+  surfxml_host_availability_isset = 0;
+  AX_surfxml_host_availability___file = 0;
+  surfxml_host_availability___file_isset = 0;
+  AX_surfxml_host_coordinates = 0;
+  surfxml_host_coordinates_isset = 0;
+  AX_surfxml_host_core = 25;
+  surfxml_host_core_isset = 0;
+  AX_surfxml_host_id = 0;
+  surfxml_host_id_isset = 0;
+  AX_surfxml_host_power = 0;
+  surfxml_host_power_isset = 0;
+  AX_surfxml_host_pstate = 31;
+  surfxml_host_pstate_isset = 0;
+  AX_surfxml_host_state = A_surfxml_host_state_ON;
+  surfxml_host_state_isset = 0;
+  AX_surfxml_host_state___file = 0;
+  surfxml_host_state___file_isset = 0;
+  ENTER(AL_surfxml_host); pushbuffer(0);
+  }
+       YY_BREAK

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

-FAIL("Starting tag <gpu> is not allowed here.");
-  YY_BREAK
-case 229:
-/* rule 229 can match eol */
-YY_RULE_SETUP
-{
-  AX_surfxml_gpu_name = 0;
-  surfxml_gpu_name_isset = 0;
-  ENTER(AL_surfxml_gpu); pushbuffer(0);
-  }
-  YY_BREAK
-
+if (surfxml_host_availability_isset != 0) {FAIL("Multiple definition of attribute availability in <surfxml_host>");} surfxml_host_availability_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability);
+       YY_BREAK
+case 229:
+/* rule 229 can match eol */
+YY_RULE_SETUP
+if (surfxml_host_availability_isset != 0) {FAIL("Multiple definition of attribute availability in <surfxml_host>");}  surfxml_host_availability_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability);
+       YY_BREAK

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

-if (surfxml_gpu_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_gpu>");} surfxml_gpu_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_gpu_name);
-  YY_BREAK
+if (surfxml_host_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_host>");} surfxml_host_availability___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_availability___file);
+       YY_BREAK

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

-if (surfxml_gpu_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_gpu>");}  surfxml_gpu_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_gpu_name);
-  YY_BREAK
+if (surfxml_host_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_host>");}  surfxml_host_availability___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_availability___file);
+       YY_BREAK

 case 232:
 case 232:

+/* rule 232 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_gpu_name) FAIL("Required attribute `name' not set for `gpu' element.");
-  LEAVE; STag_surfxml_gpu();surfxml_pcdata_ix = 0; ENTER(E_surfxml_gpu);
- }
-  YY_BREAK
+if (surfxml_host_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_host>");} surfxml_host_coordinates_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_coordinates);
+       YY_BREAK

 case 233:
 case 233:

+/* rule 233 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_gpu_name) FAIL("Required attribute `name' not set for `gpu' element.");
-  LEAVE; STag_surfxml_gpu(); surfxml_pcdata_ix = 0; ETag_surfxml_gpu(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_host_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_host>");}  surfxml_host_coordinates_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_coordinates);
+       YY_BREAK

 case 234:
 case 234:

+/* rule 234 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of gpu element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_host_core_isset != 0) {FAIL("Multiple definition of attribute core in <surfxml_host>");} surfxml_host_core_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_core);
+       YY_BREAK

 case 235:
 case 235:

+/* rule 235 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `gpu' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_gpu):
-FAIL("EOF in attribute list of `gpu' element.");
-  YY_BREAK
-
+if (surfxml_host_core_isset != 0) {FAIL("Multiple definition of attribute core in <surfxml_host>");}  surfxml_host_core_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_core);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_gpu();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_host_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_host>");} surfxml_host_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_id);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</gpu>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_host_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_host>");}  surfxml_host_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_id);
+       YY_BREAK

 case 238:
 case 238:

+/* rule 238 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</gpu>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_gpu):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</gpu>' expected.");
-  YY_BREAK
-
+if (surfxml_host_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_host>");} surfxml_host_power_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_power);
+       YY_BREAK

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

-FAIL("Starting tag <host_link> is not allowed here.");
-  YY_BREAK
+if (surfxml_host_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_host>");}  surfxml_host_power_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_power);
+       YY_BREAK

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

-{
-  AX_surfxml_host___link_id = 0;
-  surfxml_host___link_id_isset = 0;
-  AX_surfxml_host___link_up = 0;
-  surfxml_host___link_up_isset = 0;
-  AX_surfxml_host___link_down = 0;
-  surfxml_host___link_down_isset = 0;
-  ENTER(AL_surfxml_host___link); pushbuffer(0);
-  }
-  YY_BREAK
-
+if (surfxml_host_pstate_isset != 0) {FAIL("Multiple definition of attribute pstate in <surfxml_host>");} surfxml_host_pstate_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_pstate);
+       YY_BREAK

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

-if (surfxml_host___link_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_host___link>");} surfxml_host___link_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host___link_id);
-  YY_BREAK
+if (surfxml_host_pstate_isset != 0) {FAIL("Multiple definition of attribute pstate in <surfxml_host>");}  surfxml_host_pstate_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_pstate);
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_host___link_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_host___link>");}  surfxml_host___link_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host___link_id);
-  YY_BREAK

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

-if (surfxml_host___link_up_isset != 0) {FAIL("Multiple definition of attribute up in <surfxml_host___link>");} surfxml_host___link_up_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host___link_up);
-  YY_BREAK
+A_surfxml_host_state = A_surfxml_host_state_ON;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_host___link_up_isset != 0) {FAIL("Multiple definition of attribute up in <surfxml_host___link>");}  surfxml_host___link_up_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host___link_up);
-  YY_BREAK

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

-if (surfxml_host___link_down_isset != 0) {FAIL("Multiple definition of attribute down in <surfxml_host___link>");} surfxml_host___link_down_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host___link_down);
-  YY_BREAK
+A_surfxml_host_state = A_surfxml_host_state_OFF;
+       YY_BREAK

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

-if (surfxml_host___link_down_isset != 0) {FAIL("Multiple definition of attribute down in <surfxml_host___link>");}  surfxml_host___link_down_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host___link_down);
-  YY_BREAK
+if (surfxml_host_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_host>");} surfxml_host_state___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host_state___file);
+       YY_BREAK

 case 247:
 case 247:

+/* rule 247 can match eol */
+YY_RULE_SETUP
+if (surfxml_host_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_host>");}  surfxml_host_state___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host_state___file);
+       YY_BREAK
+case 248:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_host___link_id) FAIL("Required attribute `id' not set for `host_link' element.");
-  if (!AX_surfxml_host___link_up) FAIL("Required attribute `up' not set for `host_link' element.");
-  if (!AX_surfxml_host___link_down) FAIL("Required attribute `down' not set for `host_link' element.");
-  LEAVE; STag_surfxml_host___link();surfxml_pcdata_ix = 0; ENTER(E_surfxml_host___link);
+  if (!AX_surfxml_host_id) FAIL("Required attribute `id' not set for `host' element.");
+  if (!AX_surfxml_host_power) FAIL("Required attribute `power' not set for `host' element.");
+  LEAVE; STag_surfxml_host();surfxml_pcdata_ix = 0; ENTER(S_surfxml_host);

  }
  }

-  YY_BREAK
-case 248:
+       YY_BREAK
+case 249:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_host___link_id) FAIL("Required attribute `id' not set for `host_link' element.");
-  if (!AX_surfxml_host___link_up) FAIL("Required attribute `up' not set for `host_link' element.");
-  if (!AX_surfxml_host___link_down) FAIL("Required attribute `down' not set for `host_link' element.");
-  LEAVE; STag_surfxml_host___link(); surfxml_pcdata_ix = 0; ETag_surfxml_host___link(); popbuffer(); /* attribute */
+  if (!AX_surfxml_host_id) FAIL("Required attribute `id' not set for `host' element.");
+  if (!AX_surfxml_host_power) FAIL("Required attribute `power' not set for `host' element.");
+  LEAVE; STag_surfxml_host(); surfxml_pcdata_ix = 0; ETag_surfxml_host(); popbuffer(); /* attribute */

   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   }
  }
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   }
  }

-  YY_BREAK
-case 249:
-YY_RULE_SETUP
-FAIL("Unexpected character `%c' in attribute list of host_link element.", surf_parse_text[0]);
-  YY_BREAK
+       YY_BREAK

 case 250:
 YY_RULE_SETUP
 case 250:
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `host_link' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_host___link):
-FAIL("EOF in attribute list of `host_link' element.");
-  YY_BREAK
-
+FAIL("Unexpected character `%c' in attribute list of host element.", surf_parse_text[0]);
+       YY_BREAK

 case 251:
 case 251:

-/* rule 251 can match eol */
+YY_RULE_SETUP
+FAIL("Bad attribute `%s' in `host' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_host):
+FAIL("EOF in attribute list of `host' element.");
+       YY_BREAK
+
+case 252:
+/* rule 252 can match eol */

 YY_RULE_SETUP
 {
   LEAVE;
 YY_RULE_SETUP
 {
   LEAVE;

-  ETag_surfxml_host___link();
+  ETag_surfxml_host();

   popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   }
  }
   popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   }
  }

-  YY_BREAK
-case 252:
-/* rule 252 can match eol */
-YY_RULE_SETUP
-FAIL("Unexpected end-tag `%s': `</host_link>' expected.",surf_parse_text);
-  YY_BREAK
+       YY_BREAK

 case 253:
 case 253:

+/* rule 253 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</host_link>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_host___link):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</host_link>' expected.");
-  YY_BREAK
-
+FAIL("Unexpected end-tag `%s': `</host>' expected.",surf_parse_text);
+       YY_BREAK

 case 254:
 case 254:

-/* rule 254 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Starting tag <cluster> is not allowed here.");
-  YY_BREAK
+FAIL("Unexpected character `%c': `</host>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_host):
+case YY_STATE_EOF(S_surfxml_host):
+case YY_STATE_EOF(S_surfxml_host_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</host>' expected.");
+       YY_BREAK
+

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

-{
-  AX_surfxml_cluster_id = 0;
-  surfxml_cluster_id_isset = 0;
-  AX_surfxml_cluster_prefix = 0;
-  surfxml_cluster_prefix_isset = 0;
-  AX_surfxml_cluster_suffix = 0;
-  surfxml_cluster_suffix_isset = 0;
-  AX_surfxml_cluster_radical = 0;
-  surfxml_cluster_radical_isset = 0;
-  AX_surfxml_cluster_power = 0;
-  surfxml_cluster_power_isset = 0;
-  AX_surfxml_cluster_core = 44;
-  surfxml_cluster_core_isset = 0;
-  AX_surfxml_cluster_bw = 0;
-  surfxml_cluster_bw_isset = 0;
-  AX_surfxml_cluster_lat = 0;
-  surfxml_cluster_lat_isset = 0;
-  AX_surfxml_cluster_sharing___policy = A_surfxml_cluster_sharing___policy_FULLDUPLEX;
-  surfxml_cluster_sharing___policy_isset = 0;
-  AX_surfxml_cluster_topology = A_surfxml_cluster_topology_FLAT;
-  surfxml_cluster_topology_isset = 0;
-  AX_surfxml_cluster_topo___parameters = 0;
-  surfxml_cluster_topo___parameters_isset = 0;
-  AX_surfxml_cluster_bb___bw = 0;
-  surfxml_cluster_bb___bw_isset = 0;
-  AX_surfxml_cluster_bb___lat = 0;
-  surfxml_cluster_bb___lat_isset = 0;
-  AX_surfxml_cluster_bb___sharing___policy = A_surfxml_cluster_bb___sharing___policy_SHARED;
-  surfxml_cluster_bb___sharing___policy_isset = 0;
-  AX_surfxml_cluster_availability___file = 0;
-  surfxml_cluster_availability___file_isset = 0;
-  AX_surfxml_cluster_state___file = 0;
-  surfxml_cluster_state___file_isset = 0;
-  AX_surfxml_cluster_router___id = 0;
-  surfxml_cluster_router___id_isset = 0;
-  AX_surfxml_cluster_limiter___link = 0;
-  surfxml_cluster_limiter___link_isset = 0;
-  AX_surfxml_cluster_loopback___bw = 0;
-  surfxml_cluster_loopback___bw_isset = 0;
-  AX_surfxml_cluster_loopback___lat = 0;
-  surfxml_cluster_loopback___lat_isset = 0;
-  ENTER(AL_surfxml_cluster); pushbuffer(0);
-  }
-  YY_BREAK
-
+FAIL("Starting tag <host_link> is not allowed here.");
+       YY_BREAK

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

-if (surfxml_cluster_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_cluster>");} surfxml_cluster_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_id);
-  YY_BREAK
+{
+  AX_surfxml_host___link_down = 0;
+  surfxml_host___link_down_isset = 0;
+  AX_surfxml_host___link_id = 0;
+  surfxml_host___link_id_isset = 0;
+  AX_surfxml_host___link_up = 0;
+  surfxml_host___link_up_isset = 0;
+  ENTER(AL_surfxml_host___link); pushbuffer(0);
+  }
+       YY_BREAK
+

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

-if (surfxml_cluster_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_cluster>");}  surfxml_cluster_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_id);
-  YY_BREAK
+if (surfxml_host___link_down_isset != 0) {FAIL("Multiple definition of attribute down in <surfxml_host___link>");} surfxml_host___link_down_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host___link_down);
+       YY_BREAK

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

-if (surfxml_cluster_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in <surfxml_cluster>");} surfxml_cluster_prefix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_prefix);
-  YY_BREAK
+if (surfxml_host___link_down_isset != 0) {FAIL("Multiple definition of attribute down in <surfxml_host___link>");}  surfxml_host___link_down_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host___link_down);
+       YY_BREAK

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

-if (surfxml_cluster_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in <surfxml_cluster>");}  surfxml_cluster_prefix_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_prefix);
-  YY_BREAK
+if (surfxml_host___link_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_host___link>");} surfxml_host___link_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host___link_id);
+       YY_BREAK

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

-if (surfxml_cluster_suffix_isset != 0) {FAIL("Multiple definition of attribute suffix in <surfxml_cluster>");} surfxml_cluster_suffix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_suffix);
-  YY_BREAK
+if (surfxml_host___link_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_host___link>");}  surfxml_host___link_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host___link_id);
+       YY_BREAK

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

-if (surfxml_cluster_suffix_isset != 0) {FAIL("Multiple definition of attribute suffix in <surfxml_cluster>");}  surfxml_cluster_suffix_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_suffix);
-  YY_BREAK
+if (surfxml_host___link_up_isset != 0) {FAIL("Multiple definition of attribute up in <surfxml_host___link>");} surfxml_host___link_up_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_host___link_up);
+       YY_BREAK

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

-if (surfxml_cluster_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_cluster>");} surfxml_cluster_radical_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_radical);
-  YY_BREAK
+if (surfxml_host___link_up_isset != 0) {FAIL("Multiple definition of attribute up in <surfxml_host___link>");}  surfxml_host___link_up_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_host___link_up);
+       YY_BREAK

 case 263:
 case 263:

-/* rule 263 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_cluster_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_cluster>");}  surfxml_cluster_radical_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_radical);
-  YY_BREAK
+{
+  if (!AX_surfxml_host___link_down) FAIL("Required attribute `down' not set for `host_link' element.");
+  if (!AX_surfxml_host___link_id) FAIL("Required attribute `id' not set for `host_link' element.");
+  if (!AX_surfxml_host___link_up) FAIL("Required attribute `up' not set for `host_link' element.");
+  LEAVE; STag_surfxml_host___link();surfxml_pcdata_ix = 0; ENTER(E_surfxml_host___link);
+ }
+       YY_BREAK

 case 264:
 case 264:

-/* rule 264 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_cluster_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_cluster>");} surfxml_cluster_power_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_power);
-  YY_BREAK
+{
+  if (!AX_surfxml_host___link_down) FAIL("Required attribute `down' not set for `host_link' element.");
+  if (!AX_surfxml_host___link_id) FAIL("Required attribute `id' not set for `host_link' element.");
+  if (!AX_surfxml_host___link_up) FAIL("Required attribute `up' not set for `host_link' element.");
+  LEAVE; STag_surfxml_host___link(); surfxml_pcdata_ix = 0; ETag_surfxml_host___link(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+  }
+ }
+       YY_BREAK

 case 265:
 case 265:

-/* rule 265 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_cluster_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_cluster>");}  surfxml_cluster_power_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_power);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of host_link element.", surf_parse_text[0]);
+       YY_BREAK

 case 266:
 case 266:

-/* rule 266 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_cluster_core_isset != 0) {FAIL("Multiple definition of attribute core in <surfxml_cluster>");} surfxml_cluster_core_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_core);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `host_link' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_host___link):
+FAIL("EOF in attribute list of `host_link' element.");
+       YY_BREAK
+

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

-if (surfxml_cluster_core_isset != 0) {FAIL("Multiple definition of attribute core in <surfxml_cluster>");}  surfxml_cluster_core_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_core);
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_host___link();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+  }
+ }
+       YY_BREAK

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

-if (surfxml_cluster_bw_isset != 0) {FAIL("Multiple definition of attribute bw in <surfxml_cluster>");} surfxml_cluster_bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bw);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</host_link>' expected.",surf_parse_text);
+       YY_BREAK

 case 269:
 case 269:

-/* rule 269 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_cluster_bw_isset != 0) {FAIL("Multiple definition of attribute bw in <surfxml_cluster>");}  surfxml_cluster_bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bw);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</host_link>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_host___link):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</host_link>' expected.");
+       YY_BREAK
+

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

-if (surfxml_cluster_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_cluster>");} surfxml_cluster_lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_lat);
-  YY_BREAK
+FAIL("Starting tag <include> is not allowed here.");
+       YY_BREAK

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

-if (surfxml_cluster_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_cluster>");}  surfxml_cluster_lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_lat);
-  YY_BREAK
+{
+  AX_surfxml_include_file = 0;
+  surfxml_include_file_isset = 0;
+  ENTER(AL_surfxml_include); pushbuffer(0);
+  }
+       YY_BREAK
+

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

+YY_RULE_SETUP
+if (surfxml_include_file_isset != 0) {FAIL("Multiple definition of attribute file in <surfxml_include>");} surfxml_include_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_include_file);
+       YY_BREAK

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

-A_surfxml_cluster_sharing___policy = A_surfxml_cluster_sharing___policy_SHARED;
-  YY_BREAK
+if (surfxml_include_file_isset != 0) {FAIL("Multiple definition of attribute file in <surfxml_include>");}  surfxml_include_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_include_file);
+       YY_BREAK

 case 274:
 case 274:

-/* rule 274 can match eol */
+YY_RULE_SETUP
+{
+  if (!AX_surfxml_include_file) FAIL("Required attribute `file' not set for `include' element.");
+  LEAVE; STag_surfxml_include();surfxml_pcdata_ix = 0; ENTER(S_surfxml_include);
+ }
+       YY_BREAK

 case 275:
 case 275:

-/* rule 275 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-A_surfxml_cluster_sharing___policy = A_surfxml_cluster_sharing___policy_FULLDUPLEX;
-  YY_BREAK
+{
+  if (!AX_surfxml_include_file) FAIL("Required attribute `file' not set for `include' element.");
+  LEAVE; STag_surfxml_include(); surfxml_pcdata_ix = 0; ETag_surfxml_include(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
+  }
+ }
+       YY_BREAK

 case 276:
 case 276:

-/* rule 276 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected character `%c' in attribute list of include element.", surf_parse_text[0]);
+       YY_BREAK

 case 277:
 case 277:

-/* rule 277 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-A_surfxml_cluster_sharing___policy = A_surfxml_cluster_sharing___policy_FATPIPE;
-  YY_BREAK
+FAIL("Bad attribute `%s' in `include' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_include):
+FAIL("EOF in attribute list of `include' element.");
+       YY_BREAK
+

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

+YY_RULE_SETUP
+{
+  LEAVE;
+  ETag_surfxml_include();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
+  }
+ }
+       YY_BREAK

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

-A_surfxml_cluster_topology = A_surfxml_cluster_topology_FLAT;
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</include>' expected.",surf_parse_text);
+       YY_BREAK

 case 280:
 case 280:

-/* rule 280 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected character `%c': `</include>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_include):
+case YY_STATE_EOF(S_surfxml_include):
+case YY_STATE_EOF(S_surfxml_include_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</include>' expected.");
+       YY_BREAK
+

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

-A_surfxml_cluster_topology = A_surfxml_cluster_topology_TORUS;
-  YY_BREAK
+FAIL("Starting tag <link> is not allowed here.");
+       YY_BREAK

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

+YY_RULE_SETUP
+{
+  AX_surfxml_link_bandwidth = 0;
+  surfxml_link_bandwidth_isset = 0;
+  AX_surfxml_link_bandwidth___file = 0;
+  surfxml_link_bandwidth___file_isset = 0;
+  AX_surfxml_link_id = 0;
+  surfxml_link_id_isset = 0;
+  AX_surfxml_link_latency = 46;
+  surfxml_link_latency_isset = 0;
+  AX_surfxml_link_latency___file = 0;
+  surfxml_link_latency___file_isset = 0;
+  AX_surfxml_link_sharing___policy = A_surfxml_link_sharing___policy_SHARED;
+  surfxml_link_sharing___policy_isset = 0;
+  AX_surfxml_link_state = A_surfxml_link_state_ON;
+  surfxml_link_state_isset = 0;
+  AX_surfxml_link_state___file = 0;
+  surfxml_link_state___file_isset = 0;
+  ENTER(AL_surfxml_link); pushbuffer(0);
+  }
+       YY_BREAK
+

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

-A_surfxml_cluster_topology = A_surfxml_cluster_topology_FAT___TREE;
-  YY_BREAK
+if (surfxml_link_bandwidth_isset != 0) {FAIL("Multiple definition of attribute bandwidth in <surfxml_link>");} surfxml_link_bandwidth_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth);
+       YY_BREAK

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

-if (surfxml_cluster_topo___parameters_isset != 0) {FAIL("Multiple definition of attribute topo_parameters in <surfxml_cluster>");} surfxml_cluster_topo___parameters_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_topo___parameters);
-  YY_BREAK
+if (surfxml_link_bandwidth_isset != 0) {FAIL("Multiple definition of attribute bandwidth in <surfxml_link>");}  surfxml_link_bandwidth_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth);
+       YY_BREAK

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

-if (surfxml_cluster_topo___parameters_isset != 0) {FAIL("Multiple definition of attribute topo_parameters in <surfxml_cluster>");}  surfxml_cluster_topo___parameters_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_topo___parameters);
-  YY_BREAK
+if (surfxml_link_bandwidth___file_isset != 0) {FAIL("Multiple definition of attribute bandwidth_file in <surfxml_link>");} surfxml_link_bandwidth___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth___file);
+       YY_BREAK

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

-if (surfxml_cluster_bb___bw_isset != 0) {FAIL("Multiple definition of attribute bb_bw in <surfxml_cluster>");} surfxml_cluster_bb___bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb___bw);
-  YY_BREAK
+if (surfxml_link_bandwidth___file_isset != 0) {FAIL("Multiple definition of attribute bandwidth_file in <surfxml_link>");}  surfxml_link_bandwidth___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth___file);
+       YY_BREAK

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

-if (surfxml_cluster_bb___bw_isset != 0) {FAIL("Multiple definition of attribute bb_bw in <surfxml_cluster>");}  surfxml_cluster_bb___bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bb___bw);
-  YY_BREAK
+if (surfxml_link_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_link>");} surfxml_link_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_id);
+       YY_BREAK

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

-if (surfxml_cluster_bb___lat_isset != 0) {FAIL("Multiple definition of attribute bb_lat in <surfxml_cluster>");} surfxml_cluster_bb___lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_bb___lat);
-  YY_BREAK
+if (surfxml_link_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_link>");}  surfxml_link_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_id);
+       YY_BREAK

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

-if (surfxml_cluster_bb___lat_isset != 0) {FAIL("Multiple definition of attribute bb_lat in <surfxml_cluster>");}  surfxml_cluster_bb___lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_bb___lat);
-  YY_BREAK
+if (surfxml_link_latency_isset != 0) {FAIL("Multiple definition of attribute latency in <surfxml_link>");} surfxml_link_latency_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency);
+       YY_BREAK

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

+YY_RULE_SETUP
+if (surfxml_link_latency_isset != 0) {FAIL("Multiple definition of attribute latency in <surfxml_link>");}  surfxml_link_latency_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency);
+       YY_BREAK

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

-A_surfxml_cluster_bb___sharing___policy = A_surfxml_cluster_bb___sharing___policy_SHARED;
-  YY_BREAK
+if (surfxml_link_latency___file_isset != 0) {FAIL("Multiple definition of attribute latency_file in <surfxml_link>");} surfxml_link_latency___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency___file);
+       YY_BREAK

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

+YY_RULE_SETUP
+if (surfxml_link_latency___file_isset != 0) {FAIL("Multiple definition of attribute latency_file in <surfxml_link>");}  surfxml_link_latency___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency___file);
+       YY_BREAK

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

-YY_RULE_SETUP
-A_surfxml_cluster_bb___sharing___policy = A_surfxml_cluster_bb___sharing___policy_FATPIPE;
-  YY_BREAK

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

-if (surfxml_cluster_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_cluster>");} surfxml_cluster_availability___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_availability___file);
-  YY_BREAK
+A_surfxml_link_sharing___policy = A_surfxml_link_sharing___policy_SHARED;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_cluster_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_cluster>");}  surfxml_cluster_availability___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_availability___file);
-  YY_BREAK

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

-if (surfxml_cluster_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_cluster>");} surfxml_cluster_state___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_state___file);
-  YY_BREAK
+A_surfxml_link_sharing___policy = A_surfxml_link_sharing___policy_FATPIPE;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_cluster_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_cluster>");}  surfxml_cluster_state___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_state___file);
-  YY_BREAK

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

-if (surfxml_cluster_router___id_isset != 0) {FAIL("Multiple definition of attribute router_id in <surfxml_cluster>");} surfxml_cluster_router___id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_router___id);
-  YY_BREAK
+A_surfxml_link_sharing___policy = A_surfxml_link_sharing___policy_FULLDUPLEX;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_cluster_router___id_isset != 0) {FAIL("Multiple definition of attribute router_id in <surfxml_cluster>");}  surfxml_cluster_router___id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_router___id);
-  YY_BREAK

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

-if (surfxml_cluster_limiter___link_isset != 0) {FAIL("Multiple definition of attribute limiter_link in <surfxml_cluster>");} surfxml_cluster_limiter___link_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_limiter___link);
-  YY_BREAK
+A_surfxml_link_state = A_surfxml_link_state_ON;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_cluster_limiter___link_isset != 0) {FAIL("Multiple definition of attribute limiter_link in <surfxml_cluster>");}  surfxml_cluster_limiter___link_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_limiter___link);
-  YY_BREAK

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

-if (surfxml_cluster_loopback___bw_isset != 0) {FAIL("Multiple definition of attribute loopback_bw in <surfxml_cluster>");} surfxml_cluster_loopback___bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_loopback___bw);
-  YY_BREAK
+A_surfxml_link_state = A_surfxml_link_state_OFF;
+       YY_BREAK

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

-if (surfxml_cluster_loopback___bw_isset != 0) {FAIL("Multiple definition of attribute loopback_bw in <surfxml_cluster>");}  surfxml_cluster_loopback___bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_loopback___bw);
-  YY_BREAK
+if (surfxml_link_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_link>");} surfxml_link_state___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_state___file);
+       YY_BREAK

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

-if (surfxml_cluster_loopback___lat_isset != 0) {FAIL("Multiple definition of attribute loopback_lat in <surfxml_cluster>");} surfxml_cluster_loopback___lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cluster_loopback___lat);
-  YY_BREAK
+if (surfxml_link_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_link>");}  surfxml_link_state___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_state___file);
+       YY_BREAK

 case 305:
 case 305:

-/* rule 305 can match eol */
-YY_RULE_SETUP
-if (surfxml_cluster_loopback___lat_isset != 0) {FAIL("Multiple definition of attribute loopback_lat in <surfxml_cluster>");}  surfxml_cluster_loopback___lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cluster_loopback___lat);
-  YY_BREAK
-case 306:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_cluster_id) FAIL("Required attribute `id' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_prefix) FAIL("Required attribute `prefix' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_suffix) FAIL("Required attribute `suffix' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_radical) FAIL("Required attribute `radical' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_power) FAIL("Required attribute `power' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_bw) FAIL("Required attribute `bw' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_lat) FAIL("Required attribute `lat' not set for `cluster' element.");
-  LEAVE; STag_surfxml_cluster();surfxml_pcdata_ix = 0; ENTER(S_surfxml_cluster);
+  if (!AX_surfxml_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `link' element.");
+  if (!AX_surfxml_link_id) FAIL("Required attribute `id' not set for `link' element.");
+  LEAVE; STag_surfxml_link();surfxml_pcdata_ix = 0; ENTER(S_surfxml_link);

  }
  }

-  YY_BREAK
-case 307:
+       YY_BREAK
+case 306:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_cluster_id) FAIL("Required attribute `id' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_prefix) FAIL("Required attribute `prefix' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_suffix) FAIL("Required attribute `suffix' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_radical) FAIL("Required attribute `radical' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_power) FAIL("Required attribute `power' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_bw) FAIL("Required attribute `bw' not set for `cluster' element.");
-  if (!AX_surfxml_cluster_lat) FAIL("Required attribute `lat' not set for `cluster' element.");
-  LEAVE; STag_surfxml_cluster(); surfxml_pcdata_ix = 0; ETag_surfxml_cluster(); popbuffer(); /* attribute */
+  if (!AX_surfxml_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `link' element.");
+  if (!AX_surfxml_link_id) FAIL("Required attribute `id' not set for `link' element.");
+  LEAVE; STag_surfxml_link(); surfxml_pcdata_ix = 0; ETag_surfxml_link(); popbuffer(); /* attribute */

   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;

-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;

   }
  }
   }
  }

-  YY_BREAK
-case 308:
+       YY_BREAK
+case 307:

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of cluster element.", surf_parse_text[0]);
-  YY_BREAK
-case 309:
+FAIL("Unexpected character `%c' in attribute list of link element.", surf_parse_text[0]);
+       YY_BREAK
+case 308:

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `cluster' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_cluster):
-FAIL("EOF in attribute list of `cluster' element.");
-  YY_BREAK
+FAIL("Bad attribute `%s' in `link' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_link):
+FAIL("EOF in attribute list of `link' element.");
+       YY_BREAK

 
 

-case 310:
-/* rule 310 can match eol */
+case 309:
+/* rule 309 can match eol */

 YY_RULE_SETUP
 {
   LEAVE;
 YY_RULE_SETUP
 {
   LEAVE;

-  ETag_surfxml_cluster();
+  ETag_surfxml_link();

   popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;

-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;

   }
  }
   }
  }

-  YY_BREAK
+       YY_BREAK
+case 310:
+/* rule 310 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected end-tag `%s': `</link>' expected.",surf_parse_text);
+       YY_BREAK

 case 311:
 case 311:

-/* rule 311 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected end-tag `%s': `</cluster>' expected.",surf_parse_text);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</link>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_link):
+case YY_STATE_EOF(S_surfxml_link):
+case YY_STATE_EOF(S_surfxml_link_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</link>' expected.");
+       YY_BREAK
+

 case 312:
 case 312:

+/* rule 312 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</cluster>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_cluster):
-case YY_STATE_EOF(S_surfxml_cluster_2):
-case YY_STATE_EOF(E_surfxml_cluster):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</cluster>' expected.");
-  YY_BREAK
-
+FAIL("Starting tag <link_ctn> is not allowed here.");
+       YY_BREAK

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

-FAIL("Starting tag <cabinet> is not allowed here.");
-  YY_BREAK
-case 314:
-/* rule 314 can match eol */
-YY_RULE_SETUP

 {
 {

-  AX_surfxml_cabinet_id = 0;
-  surfxml_cabinet_id_isset = 0;
-  AX_surfxml_cabinet_prefix = 0;
-  surfxml_cabinet_prefix_isset = 0;
-  AX_surfxml_cabinet_suffix = 0;
-  surfxml_cabinet_suffix_isset = 0;
-  AX_surfxml_cabinet_radical = 0;
-  surfxml_cabinet_radical_isset = 0;
-  AX_surfxml_cabinet_power = 0;
-  surfxml_cabinet_power_isset = 0;
-  AX_surfxml_cabinet_bw = 0;
-  surfxml_cabinet_bw_isset = 0;
-  AX_surfxml_cabinet_lat = 0;
-  surfxml_cabinet_lat_isset = 0;
-  ENTER(AL_surfxml_cabinet); pushbuffer(0);
+  AX_surfxml_link___ctn_direction = A_surfxml_link___ctn_direction_NONE;
+  surfxml_link___ctn_direction_isset = 0;
+  AX_surfxml_link___ctn_id = 0;
+  surfxml_link___ctn_id_isset = 0;
+  ENTER(AL_surfxml_link___ctn); pushbuffer(0);

   }
   }

-  YY_BREAK
+       YY_BREAK

 
 

+case 314:
+/* rule 314 can match eol */

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

-if (surfxml_cabinet_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_cabinet>");} surfxml_cabinet_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_id);
-  YY_BREAK
+A_surfxml_link___ctn_direction = A_surfxml_link___ctn_direction_UP;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_cabinet_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_cabinet>");}  surfxml_cabinet_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_id);
-  YY_BREAK

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

-if (surfxml_cabinet_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in <surfxml_cabinet>");} surfxml_cabinet_prefix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_prefix);
-  YY_BREAK
+A_surfxml_link___ctn_direction = A_surfxml_link___ctn_direction_DOWN;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_cabinet_prefix_isset != 0) {FAIL("Multiple definition of attribute prefix in <surfxml_cabinet>");}  surfxml_cabinet_prefix_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_prefix);
-  YY_BREAK

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

-if (surfxml_cabinet_suffix_isset != 0) {FAIL("Multiple definition of attribute suffix in <surfxml_cabinet>");} surfxml_cabinet_suffix_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_suffix);
-  YY_BREAK
+A_surfxml_link___ctn_direction = A_surfxml_link___ctn_direction_NONE;
+       YY_BREAK

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

-if (surfxml_cabinet_suffix_isset != 0) {FAIL("Multiple definition of attribute suffix in <surfxml_cabinet>");}  surfxml_cabinet_suffix_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_suffix);
-  YY_BREAK
+if (surfxml_link___ctn_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_link___ctn>");} surfxml_link___ctn_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link___ctn_id);
+       YY_BREAK

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

-if (surfxml_cabinet_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_cabinet>");} surfxml_cabinet_radical_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_radical);
-  YY_BREAK
+if (surfxml_link___ctn_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_link___ctn>");}  surfxml_link___ctn_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link___ctn_id);
+       YY_BREAK

 case 322:
 case 322:

-/* rule 322 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_cabinet_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_cabinet>");}  surfxml_cabinet_radical_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_radical);
-  YY_BREAK
+{
+  if (!AX_surfxml_link___ctn_id) FAIL("Required attribute `id' not set for `link_ctn' element.");
+  LEAVE; STag_surfxml_link___ctn();surfxml_pcdata_ix = 0; ENTER(E_surfxml_link___ctn);
+ }
+       YY_BREAK

 case 323:
 case 323:

-/* rule 323 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_cabinet_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_cabinet>");} surfxml_cabinet_power_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_power);
-  YY_BREAK
+{
+  if (!AX_surfxml_link___ctn_id) FAIL("Required attribute `id' not set for `link_ctn' element.");
+  LEAVE; STag_surfxml_link___ctn(); surfxml_pcdata_ix = 0; ETag_surfxml_link___ctn(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_ASroute: case S_surfxml_ASroute_1: case S_surfxml_ASroute_2: SET(S_surfxml_ASroute_2); break;
+   case S_surfxml_bypassASroute: case S_surfxml_bypassASroute_1: case S_surfxml_bypassASroute_2: SET(S_surfxml_bypassASroute_2); break;
+   case S_surfxml_bypassRoute: case S_surfxml_bypassRoute_1: case S_surfxml_bypassRoute_2: SET(S_surfxml_bypassRoute_2); break;
+   case S_surfxml_route: case S_surfxml_route_1: case S_surfxml_route_2: SET(S_surfxml_route_2); break;
+  }
+ }
+       YY_BREAK

 case 324:
 case 324:

-/* rule 324 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_cabinet_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_cabinet>");}  surfxml_cabinet_power_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_power);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of link_ctn element.", surf_parse_text[0]);
+       YY_BREAK

 case 325:
 case 325:

-/* rule 325 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_cabinet_bw_isset != 0) {FAIL("Multiple definition of attribute bw in <surfxml_cabinet>");} surfxml_cabinet_bw_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_bw);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `link_ctn' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_link___ctn):
+FAIL("EOF in attribute list of `link_ctn' element.");
+       YY_BREAK
+

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

-if (surfxml_cabinet_bw_isset != 0) {FAIL("Multiple definition of attribute bw in <surfxml_cabinet>");}  surfxml_cabinet_bw_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_bw);
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_link___ctn();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_ASroute: case S_surfxml_ASroute_1: case S_surfxml_ASroute_2: SET(S_surfxml_ASroute_2); break;
+   case S_surfxml_bypassASroute: case S_surfxml_bypassASroute_1: case S_surfxml_bypassASroute_2: SET(S_surfxml_bypassASroute_2); break;
+   case S_surfxml_bypassRoute: case S_surfxml_bypassRoute_1: case S_surfxml_bypassRoute_2: SET(S_surfxml_bypassRoute_2); break;
+   case S_surfxml_route: case S_surfxml_route_1: case S_surfxml_route_2: SET(S_surfxml_route_2); break;
+  }
+ }
+       YY_BREAK

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

-if (surfxml_cabinet_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_cabinet>");} surfxml_cabinet_lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_cabinet_lat);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</link_ctn>' expected.",surf_parse_text);
+       YY_BREAK

 case 328:
 case 328:

-/* rule 328 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_cabinet_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_cabinet>");}  surfxml_cabinet_lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_cabinet_lat);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</link_ctn>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_link___ctn):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</link_ctn>' expected.");
+       YY_BREAK
+
+/* <!-- <!ATTLIST model_prop key CDATA #REQUIRED> -->
+  * <!-- <!ATTLIST model_prop key CDATA #REQUIRED> -->  */

 case 329:
 case 329:

-YY_RULE_SETUP
-{
-  if (!AX_surfxml_cabinet_id) FAIL("Required attribute `id' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_prefix) FAIL("Required attribute `prefix' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_suffix) FAIL("Required attribute `suffix' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_radical) FAIL("Required attribute `radical' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_power) FAIL("Required attribute `power' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_bw) FAIL("Required attribute `bw' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_lat) FAIL("Required attribute `lat' not set for `cabinet' element.");
-  LEAVE; STag_surfxml_cabinet();surfxml_pcdata_ix = 0; ENTER(E_surfxml_cabinet);
- }
-  YY_BREAK
+/* rule 329 can match eol */
+YY_RULE_SETUP
+FAIL("Starting tag <model_prop> is not allowed here.");
+       YY_BREAK

 case 330:
 case 330:

+/* rule 330 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_cabinet_id) FAIL("Required attribute `id' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_prefix) FAIL("Required attribute `prefix' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_suffix) FAIL("Required attribute `suffix' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_radical) FAIL("Required attribute `radical' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_power) FAIL("Required attribute `power' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_bw) FAIL("Required attribute `bw' not set for `cabinet' element.");
-  if (!AX_surfxml_cabinet_lat) FAIL("Required attribute `lat' not set for `cabinet' element.");
-  LEAVE; STag_surfxml_cabinet(); surfxml_pcdata_ix = 0; ETag_surfxml_cabinet(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
+  AX_surfxml_model___prop_id = 0;
+  surfxml_model___prop_id_isset = 0;
+  AX_surfxml_model___prop_value = 0;
+  surfxml_model___prop_value_isset = 0;
+  ENTER(AL_surfxml_model___prop); pushbuffer(0);

   }
   }

- }
-  YY_BREAK
+       YY_BREAK
+

 case 331:
 case 331:

+/* rule 331 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of cabinet element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_model___prop_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_model___prop>");} surfxml_model___prop_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_model___prop_id);
+       YY_BREAK

 case 332:
 case 332:

+/* rule 332 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `cabinet' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_cabinet):
-FAIL("EOF in attribute list of `cabinet' element.");
-  YY_BREAK
-
+if (surfxml_model___prop_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_model___prop>");}  surfxml_model___prop_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_model___prop_id);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_cabinet();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_model___prop_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_model___prop>");} surfxml_model___prop_value_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_model___prop_value);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</cabinet>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_model___prop_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_model___prop>");}  surfxml_model___prop_value_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_model___prop_value);
+       YY_BREAK

 case 335:
 YY_RULE_SETUP
 case 335:
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</cabinet>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_cabinet):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</cabinet>' expected.");
-  YY_BREAK
-
+{
+  if (!AX_surfxml_model___prop_id) FAIL("Required attribute `id' not set for `model_prop' element.");
+  if (!AX_surfxml_model___prop_value) FAIL("Required attribute `value' not set for `model_prop' element.");
+  LEAVE; STag_surfxml_model___prop();surfxml_pcdata_ix = 0; ENTER(E_surfxml_model___prop);
+ }
+       YY_BREAK

 case 336:
 case 336:

-/* rule 336 can match eol */
-YY_RULE_SETUP
-FAIL("Starting tag <peer> is not allowed here.");
-  YY_BREAK
-case 337:
-/* rule 337 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  AX_surfxml_peer_id = 0;
-  surfxml_peer_id_isset = 0;
-  AX_surfxml_peer_power = 0;
-  surfxml_peer_power_isset = 0;
-  AX_surfxml_peer_bw___in = 0;
-  surfxml_peer_bw___in_isset = 0;
-  AX_surfxml_peer_bw___out = 0;
-  surfxml_peer_bw___out_isset = 0;
-  AX_surfxml_peer_lat = 0;
-  surfxml_peer_lat_isset = 0;
-  AX_surfxml_peer_coordinates = 0;
-  surfxml_peer_coordinates_isset = 0;
-  AX_surfxml_peer_availability___file = 0;
-  surfxml_peer_availability___file_isset = 0;
-  AX_surfxml_peer_state___file = 0;
-  surfxml_peer_state___file_isset = 0;
-  ENTER(AL_surfxml_peer); pushbuffer(0);
+  if (!AX_surfxml_model___prop_id) FAIL("Required attribute `id' not set for `model_prop' element.");
+  if (!AX_surfxml_model___prop_value) FAIL("Required attribute `value' not set for `model_prop' element.");
+  LEAVE; STag_surfxml_model___prop(); surfxml_pcdata_ix = 0; ETag_surfxml_model___prop(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_storage___type: case S_surfxml_storage___type_1: case S_surfxml_storage___type_2: SET(S_surfxml_storage___type_2); break;

   }
   }

-  YY_BREAK
-
+ }
+       YY_BREAK
+case 337:
+YY_RULE_SETUP
+FAIL("Unexpected character `%c' in attribute list of model_prop element.", surf_parse_text[0]);
+       YY_BREAK

 case 338:
 case 338:

-/* rule 338 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_peer_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_peer>");} surfxml_peer_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_id);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `model_prop' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_model___prop):
+FAIL("EOF in attribute list of `model_prop' element.");
+       YY_BREAK
+

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

-if (surfxml_peer_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_peer>");}  surfxml_peer_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_id);
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_model___prop();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_storage___type: case S_surfxml_storage___type_1: case S_surfxml_storage___type_2: SET(S_surfxml_storage___type_2); break;
+  }
+ }
+       YY_BREAK

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

-if (surfxml_peer_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_peer>");} surfxml_peer_power_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_power);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</model_prop>' expected.",surf_parse_text);
+       YY_BREAK

 case 341:
 case 341:

-/* rule 341 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_peer_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_peer>");}  surfxml_peer_power_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_power);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</model_prop>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_model___prop):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</model_prop>' expected.");
+       YY_BREAK
+

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

-if (surfxml_peer_bw___in_isset != 0) {FAIL("Multiple definition of attribute bw_in in <surfxml_peer>");} surfxml_peer_bw___in_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_bw___in);
-  YY_BREAK
+FAIL("Starting tag <mount> is not allowed here.");
+       YY_BREAK

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

-if (surfxml_peer_bw___in_isset != 0) {FAIL("Multiple definition of attribute bw_in in <surfxml_peer>");}  surfxml_peer_bw___in_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_bw___in);
-  YY_BREAK
+{
+  AX_surfxml_mount_name = 0;
+  surfxml_mount_name_isset = 0;
+  AX_surfxml_mount_storageId = 0;
+  surfxml_mount_storageId_isset = 0;
+  ENTER(AL_surfxml_mount); pushbuffer(0);
+  }
+       YY_BREAK
+

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

-if (surfxml_peer_bw___out_isset != 0) {FAIL("Multiple definition of attribute bw_out in <surfxml_peer>");} surfxml_peer_bw___out_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_bw___out);
-  YY_BREAK
+if (surfxml_mount_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_mount>");} surfxml_mount_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_mount_name);
+       YY_BREAK

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

-if (surfxml_peer_bw___out_isset != 0) {FAIL("Multiple definition of attribute bw_out in <surfxml_peer>");}  surfxml_peer_bw___out_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_bw___out);
-  YY_BREAK
+if (surfxml_mount_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_mount>");}  surfxml_mount_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_mount_name);
+       YY_BREAK

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

-if (surfxml_peer_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_peer>");} surfxml_peer_lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_lat);
-  YY_BREAK
+if (surfxml_mount_storageId_isset != 0) {FAIL("Multiple definition of attribute storageId in <surfxml_mount>");} surfxml_mount_storageId_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_mount_storageId);
+       YY_BREAK

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

-if (surfxml_peer_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_peer>");}  surfxml_peer_lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_lat);
-  YY_BREAK
+if (surfxml_mount_storageId_isset != 0) {FAIL("Multiple definition of attribute storageId in <surfxml_mount>");}  surfxml_mount_storageId_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_mount_storageId);
+       YY_BREAK

 case 348:
 case 348:

-/* rule 348 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_peer_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_peer>");} surfxml_peer_coordinates_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_coordinates);
-  YY_BREAK
+{
+  if (!AX_surfxml_mount_name) FAIL("Required attribute `name' not set for `mount' element.");
+  if (!AX_surfxml_mount_storageId) FAIL("Required attribute `storageId' not set for `mount' element.");
+  LEAVE; STag_surfxml_mount();surfxml_pcdata_ix = 0; ENTER(E_surfxml_mount);
+ }
+       YY_BREAK

 case 349:
 case 349:

-/* rule 349 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_peer_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_peer>");}  surfxml_peer_coordinates_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_coordinates);
-  YY_BREAK
+{
+  if (!AX_surfxml_mount_name) FAIL("Required attribute `name' not set for `mount' element.");
+  if (!AX_surfxml_mount_storageId) FAIL("Required attribute `storageId' not set for `mount' element.");
+  LEAVE; STag_surfxml_mount(); surfxml_pcdata_ix = 0; ETag_surfxml_mount(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
+  }
+ }
+       YY_BREAK

 case 350:
 case 350:

-/* rule 350 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_peer_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_peer>");} surfxml_peer_availability___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_availability___file);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of mount element.", surf_parse_text[0]);
+       YY_BREAK

 case 351:
 case 351:

-/* rule 351 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_peer_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_peer>");}  surfxml_peer_availability___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_availability___file);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `mount' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_mount):
+FAIL("EOF in attribute list of `mount' element.");
+       YY_BREAK
+

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

-if (surfxml_peer_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_peer>");} surfxml_peer_state___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_state___file);
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_mount();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
+  }
+ }
+       YY_BREAK

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

-if (surfxml_peer_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_peer>");}  surfxml_peer_state___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_state___file);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</mount>' expected.",surf_parse_text);
+       YY_BREAK

 case 354:
 YY_RULE_SETUP
 case 354:
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_peer_id) FAIL("Required attribute `id' not set for `peer' element.");
-  if (!AX_surfxml_peer_power) FAIL("Required attribute `power' not set for `peer' element.");
-  if (!AX_surfxml_peer_bw___in) FAIL("Required attribute `bw_in' not set for `peer' element.");
-  if (!AX_surfxml_peer_bw___out) FAIL("Required attribute `bw_out' not set for `peer' element.");
-  if (!AX_surfxml_peer_lat) FAIL("Required attribute `lat' not set for `peer' element.");
-  LEAVE; STag_surfxml_peer();surfxml_pcdata_ix = 0; ENTER(E_surfxml_peer);
- }
-  YY_BREAK
+FAIL("Unexpected character `%c': `</mount>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_mount):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</mount>' expected.");
+       YY_BREAK
+

 case 355:
 case 355:

+/* rule 355 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_peer_id) FAIL("Required attribute `id' not set for `peer' element.");
-  if (!AX_surfxml_peer_power) FAIL("Required attribute `power' not set for `peer' element.");
-  if (!AX_surfxml_peer_bw___in) FAIL("Required attribute `bw_in' not set for `peer' element.");
-  if (!AX_surfxml_peer_bw___out) FAIL("Required attribute `bw_out' not set for `peer' element.");
-  if (!AX_surfxml_peer_lat) FAIL("Required attribute `lat' not set for `peer' element.");
-  LEAVE; STag_surfxml_peer(); surfxml_pcdata_ix = 0; ETag_surfxml_peer(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
-  }
- }
-  YY_BREAK
+FAIL("Starting tag <mstorage> is not allowed here.");
+       YY_BREAK

 case 356:
 case 356:

+/* rule 356 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of peer element.", surf_parse_text[0]);
-  YY_BREAK
+{
+  AX_surfxml_mstorage_name = 0;
+  surfxml_mstorage_name_isset = 0;
+  AX_surfxml_mstorage_typeId = 0;
+  surfxml_mstorage_typeId_isset = 0;
+  ENTER(AL_surfxml_mstorage); pushbuffer(0);
+  }
+       YY_BREAK
+

 case 357:
 case 357:

+/* rule 357 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `peer' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_peer):
-FAIL("EOF in attribute list of `peer' element.");
-  YY_BREAK
-
+if (surfxml_mstorage_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_mstorage>");} surfxml_mstorage_name_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_mstorage_name);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_peer();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_mstorage_name_isset != 0) {FAIL("Multiple definition of attribute name in <surfxml_mstorage>");}  surfxml_mstorage_name_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_mstorage_name);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</peer>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_mstorage_typeId_isset != 0) {FAIL("Multiple definition of attribute typeId in <surfxml_mstorage>");} surfxml_mstorage_typeId_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_mstorage_typeId);
+       YY_BREAK

 case 360:
 case 360:

+/* rule 360 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</peer>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_peer):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</peer>' expected.");
-  YY_BREAK
-
+if (surfxml_mstorage_typeId_isset != 0) {FAIL("Multiple definition of attribute typeId in <surfxml_mstorage>");}  surfxml_mstorage_typeId_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_mstorage_typeId);
+       YY_BREAK

 case 361:
 case 361:

-/* rule 361 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Starting tag <router> is not allowed here.");
-  YY_BREAK
+{
+  if (!AX_surfxml_mstorage_name) FAIL("Required attribute `name' not set for `mstorage' element.");
+  if (!AX_surfxml_mstorage_typeId) FAIL("Required attribute `typeId' not set for `mstorage' element.");
+  LEAVE; STag_surfxml_mstorage();surfxml_pcdata_ix = 0; ENTER(E_surfxml_mstorage);
+ }
+       YY_BREAK

 case 362:
 case 362:

-/* rule 362 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  AX_surfxml_router_id = 0;
-  surfxml_router_id_isset = 0;
-  AX_surfxml_router_coordinates = 0;
-  surfxml_router_coordinates_isset = 0;
-  ENTER(AL_surfxml_router); pushbuffer(0);
+  if (!AX_surfxml_mstorage_name) FAIL("Required attribute `name' not set for `mstorage' element.");
+  if (!AX_surfxml_mstorage_typeId) FAIL("Required attribute `typeId' not set for `mstorage' element.");
+  LEAVE; STag_surfxml_mstorage(); surfxml_pcdata_ix = 0; ETag_surfxml_mstorage(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;

   }
   }

-  YY_BREAK
-
+ }
+       YY_BREAK

 case 363:
 case 363:

-/* rule 363 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_router_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_router>");} surfxml_router_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_router_id);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of mstorage element.", surf_parse_text[0]);
+       YY_BREAK

 case 364:
 case 364:

-/* rule 364 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_router_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_router>");}  surfxml_router_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_router_id);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `mstorage' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_mstorage):
+FAIL("EOF in attribute list of `mstorage' element.");
+       YY_BREAK
+

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

-if (surfxml_router_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_router>");} surfxml_router_coordinates_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_router_coordinates);
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_mstorage();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
+  }
+ }
+       YY_BREAK

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

-if (surfxml_router_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_router>");}  surfxml_router_coordinates_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_router_coordinates);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</mstorage>' expected.",surf_parse_text);
+       YY_BREAK

 case 367:
 YY_RULE_SETUP
 case 367:
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_router_id) FAIL("Required attribute `id' not set for `router' element.");
-  LEAVE; STag_surfxml_router();surfxml_pcdata_ix = 0; ENTER(E_surfxml_router);
- }
-  YY_BREAK
+FAIL("Unexpected character `%c': `</mstorage>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_mstorage):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</mstorage>' expected.");
+       YY_BREAK
+

 case 368:
 case 368:

+/* rule 368 can match eol */
+YY_RULE_SETUP
+FAIL("Starting tag <peer> is not allowed here.");
+       YY_BREAK
+case 369:
+/* rule 369 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_router_id) FAIL("Required attribute `id' not set for `router' element.");
-  LEAVE; STag_surfxml_router(); surfxml_pcdata_ix = 0; ETag_surfxml_router(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+  AX_surfxml_peer_availability___file = 0;
+  surfxml_peer_availability___file_isset = 0;
+  AX_surfxml_peer_bw___in = 0;
+  surfxml_peer_bw___in_isset = 0;
+  AX_surfxml_peer_bw___out = 0;
+  surfxml_peer_bw___out_isset = 0;
+  AX_surfxml_peer_coordinates = 0;
+  surfxml_peer_coordinates_isset = 0;
+  AX_surfxml_peer_id = 0;
+  surfxml_peer_id_isset = 0;
+  AX_surfxml_peer_lat = 0;
+  surfxml_peer_lat_isset = 0;
+  AX_surfxml_peer_power = 0;
+  surfxml_peer_power_isset = 0;
+  AX_surfxml_peer_state___file = 0;
+  surfxml_peer_state___file_isset = 0;
+  ENTER(AL_surfxml_peer); pushbuffer(0);

   }
   }

- }
-  YY_BREAK
-case 369:
-YY_RULE_SETUP
-FAIL("Unexpected character `%c' in attribute list of router element.", surf_parse_text[0]);
-  YY_BREAK
+       YY_BREAK
+

 case 370:
 case 370:

+/* rule 370 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `router' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_router):
-FAIL("EOF in attribute list of `router' element.");
-  YY_BREAK
-
+if (surfxml_peer_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_peer>");} surfxml_peer_availability___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_availability___file);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_router();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_peer_availability___file_isset != 0) {FAIL("Multiple definition of attribute availability_file in <surfxml_peer>");}  surfxml_peer_availability___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_availability___file);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</router>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_peer_bw___in_isset != 0) {FAIL("Multiple definition of attribute bw_in in <surfxml_peer>");} surfxml_peer_bw___in_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_bw___in);
+       YY_BREAK

 case 373:
 case 373:

+/* rule 373 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</router>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_router):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</router>' expected.");
-  YY_BREAK
-
+if (surfxml_peer_bw___in_isset != 0) {FAIL("Multiple definition of attribute bw_in in <surfxml_peer>");}  surfxml_peer_bw___in_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_bw___in);
+       YY_BREAK

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

-FAIL("Starting tag <backbone> is not allowed here.");
-  YY_BREAK
+if (surfxml_peer_bw___out_isset != 0) {FAIL("Multiple definition of attribute bw_out in <surfxml_peer>");} surfxml_peer_bw___out_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_bw___out);
+       YY_BREAK

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

-{
-  AX_surfxml_backbone_id = 0;
-  surfxml_backbone_id_isset = 0;
-  AX_surfxml_backbone_bandwidth = 0;
-  surfxml_backbone_bandwidth_isset = 0;
-  AX_surfxml_backbone_latency = 0;
-  surfxml_backbone_latency_isset = 0;
-  ENTER(AL_surfxml_backbone); pushbuffer(0);
-  }
-  YY_BREAK
-
+if (surfxml_peer_bw___out_isset != 0) {FAIL("Multiple definition of attribute bw_out in <surfxml_peer>");}  surfxml_peer_bw___out_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_bw___out);
+       YY_BREAK

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

-if (surfxml_backbone_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_backbone>");} surfxml_backbone_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_backbone_id);
-  YY_BREAK
+if (surfxml_peer_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_peer>");} surfxml_peer_coordinates_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_coordinates);
+       YY_BREAK

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

-if (surfxml_backbone_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_backbone>");}  surfxml_backbone_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_backbone_id);
-  YY_BREAK
+if (surfxml_peer_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_peer>");}  surfxml_peer_coordinates_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_coordinates);
+       YY_BREAK

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

-if (surfxml_backbone_bandwidth_isset != 0) {FAIL("Multiple definition of attribute bandwidth in <surfxml_backbone>");} surfxml_backbone_bandwidth_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_backbone_bandwidth);
-  YY_BREAK
+if (surfxml_peer_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_peer>");} surfxml_peer_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_id);
+       YY_BREAK

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

-if (surfxml_backbone_bandwidth_isset != 0) {FAIL("Multiple definition of attribute bandwidth in <surfxml_backbone>");}  surfxml_backbone_bandwidth_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_backbone_bandwidth);
-  YY_BREAK
+if (surfxml_peer_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_peer>");}  surfxml_peer_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_id);
+       YY_BREAK

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

-if (surfxml_backbone_latency_isset != 0) {FAIL("Multiple definition of attribute latency in <surfxml_backbone>");} surfxml_backbone_latency_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_backbone_latency);
-  YY_BREAK
+if (surfxml_peer_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_peer>");} surfxml_peer_lat_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_lat);
+       YY_BREAK

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

-if (surfxml_backbone_latency_isset != 0) {FAIL("Multiple definition of attribute latency in <surfxml_backbone>");}  surfxml_backbone_latency_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_backbone_latency);
-  YY_BREAK
+if (surfxml_peer_lat_isset != 0) {FAIL("Multiple definition of attribute lat in <surfxml_peer>");}  surfxml_peer_lat_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_lat);
+       YY_BREAK

 case 382:
 case 382:

+/* rule 382 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_backbone_id) FAIL("Required attribute `id' not set for `backbone' element.");
-  if (!AX_surfxml_backbone_bandwidth) FAIL("Required attribute `bandwidth' not set for `backbone' element.");
-  if (!AX_surfxml_backbone_latency) FAIL("Required attribute `latency' not set for `backbone' element.");
-  LEAVE; STag_surfxml_backbone();surfxml_pcdata_ix = 0; ENTER(E_surfxml_backbone);
- }
-  YY_BREAK
+if (surfxml_peer_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_peer>");} surfxml_peer_power_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_power);
+       YY_BREAK

 case 383:
 case 383:

+/* rule 383 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_backbone_id) FAIL("Required attribute `id' not set for `backbone' element.");
-  if (!AX_surfxml_backbone_bandwidth) FAIL("Required attribute `bandwidth' not set for `backbone' element.");
-  if (!AX_surfxml_backbone_latency) FAIL("Required attribute `latency' not set for `backbone' element.");
-  LEAVE; STag_surfxml_backbone(); surfxml_pcdata_ix = 0; ETag_surfxml_backbone(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_peer_power_isset != 0) {FAIL("Multiple definition of attribute power in <surfxml_peer>");}  surfxml_peer_power_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_power);
+       YY_BREAK

 case 384:
 case 384:

+/* rule 384 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of backbone element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_peer_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_peer>");} surfxml_peer_state___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_peer_state___file);
+       YY_BREAK

 case 385:
 case 385:

+/* rule 385 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `backbone' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_backbone):
-FAIL("EOF in attribute list of `backbone' element.");
-  YY_BREAK
-
+if (surfxml_peer_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_peer>");}  surfxml_peer_state___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_peer_state___file);
+       YY_BREAK

 case 386:
 case 386:

-/* rule 386 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  LEAVE;
-  ETag_surfxml_backbone();
-  popbuffer(); /* attribute */
+  if (!AX_surfxml_peer_bw___in) FAIL("Required attribute `bw_in' not set for `peer' element.");
+  if (!AX_surfxml_peer_bw___out) FAIL("Required attribute `bw_out' not set for `peer' element.");
+  if (!AX_surfxml_peer_id) FAIL("Required attribute `id' not set for `peer' element.");
+  if (!AX_surfxml_peer_lat) FAIL("Required attribute `lat' not set for `peer' element.");
+  if (!AX_surfxml_peer_power) FAIL("Required attribute `power' not set for `peer' element.");
+  LEAVE; STag_surfxml_peer();surfxml_pcdata_ix = 0; ENTER(E_surfxml_peer);
+ }
+       YY_BREAK
+case 387:
+YY_RULE_SETUP
+{
+  if (!AX_surfxml_peer_bw___in) FAIL("Required attribute `bw_in' not set for `peer' element.");
+  if (!AX_surfxml_peer_bw___out) FAIL("Required attribute `bw_out' not set for `peer' element.");
+  if (!AX_surfxml_peer_id) FAIL("Required attribute `id' not set for `peer' element.");
+  if (!AX_surfxml_peer_lat) FAIL("Required attribute `lat' not set for `peer' element.");
+  if (!AX_surfxml_peer_power) FAIL("Required attribute `power' not set for `peer' element.");
+  LEAVE; STag_surfxml_peer(); surfxml_pcdata_ix = 0; ETag_surfxml_peer(); popbuffer(); /* attribute */

   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;

+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;

   }
  }
   }
  }

-  YY_BREAK
-case 387:
-/* rule 387 can match eol */
-YY_RULE_SETUP
-FAIL("Unexpected end-tag `%s': `</backbone>' expected.",surf_parse_text);
-  YY_BREAK
+       YY_BREAK

 case 388:
 YY_RULE_SETUP
 case 388:
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</backbone>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_backbone):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</backbone>' expected.");
-  YY_BREAK
-
+FAIL("Unexpected character `%c' in attribute list of peer element.", surf_parse_text[0]);
+       YY_BREAK

 case 389:
 case 389:

-/* rule 389 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Starting tag <link> is not allowed here.");
-  YY_BREAK
+FAIL("Bad attribute `%s' in `peer' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_peer):
+FAIL("EOF in attribute list of `peer' element.");
+       YY_BREAK
+

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

-  AX_surfxml_link_id = 0;
-  surfxml_link_id_isset = 0;
-  AX_surfxml_link_bandwidth = 0;
-  surfxml_link_bandwidth_isset = 0;
-  AX_surfxml_link_bandwidth___file = 0;
-  surfxml_link_bandwidth___file_isset = 0;
-  AX_surfxml_link_latency = 46;
-  surfxml_link_latency_isset = 0;
-  AX_surfxml_link_latency___file = 0;
-  surfxml_link_latency___file_isset = 0;
-  AX_surfxml_link_state = A_surfxml_link_state_ON;
-  surfxml_link_state_isset = 0;
-  AX_surfxml_link_state___file = 0;
-  surfxml_link_state___file_isset = 0;
-  AX_surfxml_link_sharing___policy = A_surfxml_link_sharing___policy_SHARED;
-  surfxml_link_sharing___policy_isset = 0;
-  ENTER(AL_surfxml_link); pushbuffer(0);
+  LEAVE;
+  ETag_surfxml_peer();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;

   }
   }

-  YY_BREAK
-
+ }
+       YY_BREAK

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

-if (surfxml_link_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_link>");} surfxml_link_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_id);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</peer>' expected.",surf_parse_text);
+       YY_BREAK

 case 392:
 case 392:

-/* rule 392 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_link_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_link>");}  surfxml_link_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_id);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</peer>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_peer):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</peer>' expected.");
+       YY_BREAK
+
+/* <!-- Small DTD for SURF based tools. -->  */

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

-if (surfxml_link_bandwidth_isset != 0) {FAIL("Multiple definition of attribute bandwidth in <surfxml_link>");} surfxml_link_bandwidth_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth);
-  YY_BREAK
+FAIL("Starting tag <platform> is not allowed here.");
+       YY_BREAK

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

-if (surfxml_link_bandwidth_isset != 0) {FAIL("Multiple definition of attribute bandwidth in <surfxml_link>");}  surfxml_link_bandwidth_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth);
-  YY_BREAK
+{
+  AX_surfxml_platform_version = 1;
+  surfxml_platform_version_isset = 0;
+  ENTER(AL_surfxml_platform); pushbuffer(0);
+  }
+       YY_BREAK
+

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

-if (surfxml_link_bandwidth___file_isset != 0) {FAIL("Multiple definition of attribute bandwidth_file in <surfxml_link>");} surfxml_link_bandwidth___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_bandwidth___file);
-  YY_BREAK
+if (surfxml_platform_version_isset != 0) {FAIL("Multiple definition of attribute version in <surfxml_platform>");} surfxml_platform_version_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_platform_version);
+       YY_BREAK

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

-if (surfxml_link_bandwidth___file_isset != 0) {FAIL("Multiple definition of attribute bandwidth_file in <surfxml_link>");}  surfxml_link_bandwidth___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_bandwidth___file);
-  YY_BREAK
+if (surfxml_platform_version_isset != 0) {FAIL("Multiple definition of attribute version in <surfxml_platform>");}  surfxml_platform_version_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_platform_version);
+       YY_BREAK

 case 397:
 case 397:

-/* rule 397 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_link_latency_isset != 0) {FAIL("Multiple definition of attribute latency in <surfxml_link>");} surfxml_link_latency_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency);
-  YY_BREAK
+{
+  LEAVE; STag_surfxml_platform();surfxml_pcdata_ix = 0; ENTER(S_surfxml_platform);
+ }
+       YY_BREAK

 case 398:
 case 398:

-/* rule 398 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_link_latency_isset != 0) {FAIL("Multiple definition of attribute latency in <surfxml_link>");}  surfxml_link_latency_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency);
-  YY_BREAK
+{
+  LEAVE; STag_surfxml_platform(); surfxml_pcdata_ix = 0; ETag_surfxml_platform(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case ROOT_surfxml_platform: SET(EPILOG); break;
+  }
+ }
+       YY_BREAK

 case 399:
 case 399:

-/* rule 399 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_link_latency___file_isset != 0) {FAIL("Multiple definition of attribute latency_file in <surfxml_link>");} surfxml_link_latency___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_latency___file);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of platform element.", surf_parse_text[0]);
+       YY_BREAK

 case 400:
 case 400:

-/* rule 400 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_link_latency___file_isset != 0) {FAIL("Multiple definition of attribute latency_file in <surfxml_link>");}  surfxml_link_latency___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_latency___file);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `platform' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_platform):
+FAIL("EOF in attribute list of `platform' element.");
+       YY_BREAK
+

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

+YY_RULE_SETUP
+{
+  LEAVE;
+  ETag_surfxml_platform();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case ROOT_surfxml_platform: SET(EPILOG); break;
+  }
+ }
+       YY_BREAK

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

-A_surfxml_link_state = A_surfxml_link_state_ON;
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</platform>' expected.",surf_parse_text);
+       YY_BREAK

 case 403:
 case 403:

-/* rule 403 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected character `%c': `</platform>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_platform):
+case YY_STATE_EOF(S_surfxml_platform):
+case YY_STATE_EOF(S_surfxml_platform_1):
+case YY_STATE_EOF(S_surfxml_platform_3):
+case YY_STATE_EOF(S_surfxml_platform_4):
+case YY_STATE_EOF(S_surfxml_platform_6):
+case YY_STATE_EOF(S_surfxml_platform_8):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</platform>' expected.");
+       YY_BREAK
+

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

-A_surfxml_link_state = A_surfxml_link_state_OFF;
-  YY_BREAK
+FAIL("Starting tag <process> is not allowed here.");
+       YY_BREAK

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

-if (surfxml_link_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_link>");} surfxml_link_state___file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link_state___file);
-  YY_BREAK
+{
+  AX_surfxml_process_function = 0;
+  surfxml_process_function_isset = 0;
+  AX_surfxml_process_host = 0;
+  surfxml_process_host_isset = 0;
+  AX_surfxml_process_kill___time = 55;
+  surfxml_process_kill___time_isset = 0;
+  AX_surfxml_process_on___failure = A_surfxml_process_on___failure_DIE;
+  surfxml_process_on___failure_isset = 0;
+  AX_surfxml_process_start___time = 50;
+  surfxml_process_start___time_isset = 0;
+  ENTER(AL_surfxml_process); pushbuffer(0);
+  }
+       YY_BREAK
+

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

-if (surfxml_link_state___file_isset != 0) {FAIL("Multiple definition of attribute state_file in <surfxml_link>");}  surfxml_link_state___file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link_state___file);
-  YY_BREAK
+if (surfxml_process_function_isset != 0) {FAIL("Multiple definition of attribute function in <surfxml_process>");} surfxml_process_function_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_function);
+       YY_BREAK

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

+YY_RULE_SETUP
+if (surfxml_process_function_isset != 0) {FAIL("Multiple definition of attribute function in <surfxml_process>");}  surfxml_process_function_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_function);
+       YY_BREAK

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

-A_surfxml_link_sharing___policy = A_surfxml_link_sharing___policy_SHARED;
-  YY_BREAK
+if (surfxml_process_host_isset != 0) {FAIL("Multiple definition of attribute host in <surfxml_process>");} surfxml_process_host_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_host);
+       YY_BREAK

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

+YY_RULE_SETUP
+if (surfxml_process_host_isset != 0) {FAIL("Multiple definition of attribute host in <surfxml_process>");}  surfxml_process_host_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_host);
+       YY_BREAK

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

-A_surfxml_link_sharing___policy = A_surfxml_link_sharing___policy_FATPIPE;
-  YY_BREAK
+if (surfxml_process_kill___time_isset != 0) {FAIL("Multiple definition of attribute kill_time in <surfxml_process>");} surfxml_process_kill___time_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_kill___time);
+       YY_BREAK

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

+YY_RULE_SETUP
+if (surfxml_process_kill___time_isset != 0) {FAIL("Multiple definition of attribute kill_time in <surfxml_process>");}  surfxml_process_kill___time_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_kill___time);
+       YY_BREAK

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

-YY_RULE_SETUP
-A_surfxml_link_sharing___policy = A_surfxml_link_sharing___policy_FULLDUPLEX;
-  YY_BREAK

 case 413:
 case 413:

+/* rule 413 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_link_id) FAIL("Required attribute `id' not set for `link' element.");
-  if (!AX_surfxml_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `link' element.");
-  LEAVE; STag_surfxml_link();surfxml_pcdata_ix = 0; ENTER(S_surfxml_link);
- }
-  YY_BREAK
+A_surfxml_process_on___failure = A_surfxml_process_on___failure_DIE;
+       YY_BREAK

 case 414:
 case 414:

-YY_RULE_SETUP
-{
-  if (!AX_surfxml_link_id) FAIL("Required attribute `id' not set for `link' element.");
-  if (!AX_surfxml_link_bandwidth) FAIL("Required attribute `bandwidth' not set for `link' element.");
-  LEAVE; STag_surfxml_link(); surfxml_pcdata_ix = 0; ETag_surfxml_link(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-  }
- }
-  YY_BREAK
+/* rule 414 can match eol */

 case 415:
 case 415:

+/* rule 415 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of link element.", surf_parse_text[0]);
-  YY_BREAK
+A_surfxml_process_on___failure = A_surfxml_process_on___failure_RESTART;
+       YY_BREAK

 case 416:
 case 416:

+/* rule 416 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `link' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_link):
-FAIL("EOF in attribute list of `link' element.");
-  YY_BREAK
-
+if (surfxml_process_start___time_isset != 0) {FAIL("Multiple definition of attribute start_time in <surfxml_process>");} surfxml_process_start___time_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_start___time);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_link();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
-  }
- }
-  YY_BREAK
+if (surfxml_process_start___time_isset != 0) {FAIL("Multiple definition of attribute start_time in <surfxml_process>");}  surfxml_process_start___time_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_start___time);
+       YY_BREAK

 case 418:
 case 418:

-/* rule 418 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected end-tag `%s': `</link>' expected.",surf_parse_text);
-  YY_BREAK
+{
+  if (!AX_surfxml_process_function) FAIL("Required attribute `function' not set for `process' element.");
+  if (!AX_surfxml_process_host) FAIL("Required attribute `host' not set for `process' element.");
+  LEAVE; STag_surfxml_process();surfxml_pcdata_ix = 0; ENTER(S_surfxml_process);
+ }
+       YY_BREAK

 case 419:
 YY_RULE_SETUP
 case 419:
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</link>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_link):
-case YY_STATE_EOF(S_surfxml_link_2):
-case YY_STATE_EOF(E_surfxml_link):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</link>' expected.");
-  YY_BREAK
-
+{
+  if (!AX_surfxml_process_function) FAIL("Required attribute `function' not set for `process' element.");
+  if (!AX_surfxml_process_host) FAIL("Required attribute `host' not set for `process' element.");
+  LEAVE; STag_surfxml_process(); surfxml_pcdata_ix = 0; ETag_surfxml_process(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_4: case S_surfxml_platform_6: case S_surfxml_platform_7: case S_surfxml_platform_8: SET(S_surfxml_platform_8); break;
+  }
+ }
+       YY_BREAK

 case 420:
 case 420:

-/* rule 420 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Starting tag <route> is not allowed here.");
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of process element.", surf_parse_text[0]);
+       YY_BREAK

 case 421:
 case 421:

-/* rule 421 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  AX_surfxml_route_src = 0;
-  surfxml_route_src_isset = 0;
-  AX_surfxml_route_dst = 0;
-  surfxml_route_dst_isset = 0;
-  AX_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES;
-  surfxml_route_symmetrical_isset = 0;
-  ENTER(AL_surfxml_route); pushbuffer(0);
-  }
-  YY_BREAK
+FAIL("Bad attribute `%s' in `process' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_process):
+FAIL("EOF in attribute list of `process' element.");
+       YY_BREAK

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

-if (surfxml_route_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_route>");} surfxml_route_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_route_src);
-  YY_BREAK
+{
+  LEAVE;
+  ETag_surfxml_process();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_4: case S_surfxml_platform_6: case S_surfxml_platform_7: case S_surfxml_platform_8: SET(S_surfxml_platform_8); break;
+  }
+ }
+       YY_BREAK

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

-if (surfxml_route_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_route>");}  surfxml_route_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_route_src);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</process>' expected.",surf_parse_text);
+       YY_BREAK

 case 424:
 case 424:

-/* rule 424 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_route_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_route>");} surfxml_route_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_route_dst);
-  YY_BREAK
+FAIL("Unexpected character `%c': `</process>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_process):
+case YY_STATE_EOF(S_surfxml_process):
+case YY_STATE_EOF(S_surfxml_process_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</process>' expected.");
+       YY_BREAK
+
+/* <!-- <!ATTLIST prop key CDATA #REQUIRED> -->
+  * <!-- <!ATTLIST prop key CDATA #REQUIRED> -->  */

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

-if (surfxml_route_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_route>");}  surfxml_route_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_route_dst);
-  YY_BREAK
+FAIL("Starting tag <prop> is not allowed here.");
+       YY_BREAK

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

+YY_RULE_SETUP
+{
+  AX_surfxml_prop_id = 0;
+  surfxml_prop_id_isset = 0;
+  AX_surfxml_prop_value = 0;
+  surfxml_prop_value_isset = 0;
+  ENTER(AL_surfxml_prop); pushbuffer(0);
+  }
+       YY_BREAK
+

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

-A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES;
-  YY_BREAK
+if (surfxml_prop_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_prop>");} surfxml_prop_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_id);
+       YY_BREAK

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

+YY_RULE_SETUP
+if (surfxml_prop_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_prop>");}  surfxml_prop_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_id);
+       YY_BREAK

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

-A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
-  YY_BREAK
+if (surfxml_prop_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_prop>");} surfxml_prop_value_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_value);
+       YY_BREAK

 case 430:
 case 430:

+/* rule 430 can match eol */
+YY_RULE_SETUP
+if (surfxml_prop_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_prop>");}  surfxml_prop_value_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_value);
+       YY_BREAK
+case 431:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_route_src) FAIL("Required attribute `src' not set for `route' element.");
-  if (!AX_surfxml_route_dst) FAIL("Required attribute `dst' not set for `route' element.");
-  LEAVE; STag_surfxml_route();surfxml_pcdata_ix = 0; ENTER(S_surfxml_route);
+  if (!AX_surfxml_prop_id) FAIL("Required attribute `id' not set for `prop' element.");
+  if (!AX_surfxml_prop_value) FAIL("Required attribute `value' not set for `prop' element.");
+  LEAVE; STag_surfxml_prop();surfxml_pcdata_ix = 0; ENTER(E_surfxml_prop);

  }
  }

-  YY_BREAK
-case 431:
+       YY_BREAK
+case 432:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_route_src) FAIL("Required attribute `src' not set for `route' element.");
-  if (!AX_surfxml_route_dst) FAIL("Required attribute `dst' not set for `route' element.");
-  LEAVE; STag_surfxml_route(); surfxml_pcdata_ix = 0; ETag_surfxml_route(); popbuffer(); /* attribute */
+  if (!AX_surfxml_prop_id) FAIL("Required attribute `id' not set for `prop' element.");
+  if (!AX_surfxml_prop_value) FAIL("Required attribute `value' not set for `prop' element.");
+  LEAVE; STag_surfxml_prop(); surfxml_pcdata_ix = 0; ETag_surfxml_prop(); popbuffer(); /* attribute */

   switch (YY_START) {
   switch (YY_START) {

-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+   case S_surfxml_AS: case S_surfxml_AS_2: case S_surfxml_AS_3: SET(S_surfxml_AS_3); break;
+   case S_surfxml_cluster: case S_surfxml_cluster_1: case S_surfxml_cluster_2: SET(S_surfxml_cluster_2); break;
+   case S_surfxml_config: case S_surfxml_config_1: case S_surfxml_config_2: SET(S_surfxml_config_2); break;
+   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
+   case S_surfxml_link: case S_surfxml_link_1: case S_surfxml_link_2: SET(S_surfxml_link_2); break;
+   case S_surfxml_process: case S_surfxml_process_1: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
+   case S_surfxml_storage: case S_surfxml_storage_1: case S_surfxml_storage_2: SET(S_surfxml_storage_2); break;
+   case S_surfxml_storage___type: case S_surfxml_storage___type_1: case S_surfxml_storage___type_2: SET(S_surfxml_storage___type_2); break;

   }
  }
   }
  }

-  YY_BREAK
-case 432:
-YY_RULE_SETUP
-FAIL("Unexpected character `%c' in attribute list of route element.", surf_parse_text[0]);
-  YY_BREAK
+       YY_BREAK

 case 433:
 YY_RULE_SETUP
 case 433:
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `route' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_route):
-FAIL("EOF in attribute list of `route' element.");
-  YY_BREAK
-
+FAIL("Unexpected character `%c' in attribute list of prop element.", surf_parse_text[0]);
+       YY_BREAK

 case 434:
 case 434:

-/* rule 434 can match eol */
+YY_RULE_SETUP
+FAIL("Bad attribute `%s' in `prop' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_prop):
+FAIL("EOF in attribute list of `prop' element.");
+       YY_BREAK
+
+case 435:
+/* rule 435 can match eol */

 YY_RULE_SETUP
 {
   LEAVE;
 YY_RULE_SETUP
 {
   LEAVE;

-  ETag_surfxml_route();
+  ETag_surfxml_prop();

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

-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+   case S_surfxml_AS: case S_surfxml_AS_2: case S_surfxml_AS_3: SET(S_surfxml_AS_3); break;
+   case S_surfxml_cluster: case S_surfxml_cluster_1: case S_surfxml_cluster_2: SET(S_surfxml_cluster_2); break;
+   case S_surfxml_config: case S_surfxml_config_1: case S_surfxml_config_2: SET(S_surfxml_config_2); break;
+   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
+   case S_surfxml_link: case S_surfxml_link_1: case S_surfxml_link_2: SET(S_surfxml_link_2); break;
+   case S_surfxml_process: case S_surfxml_process_1: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
+   case S_surfxml_storage: case S_surfxml_storage_1: case S_surfxml_storage_2: SET(S_surfxml_storage_2); break;
+   case S_surfxml_storage___type: case S_surfxml_storage___type_1: case S_surfxml_storage___type_2: SET(S_surfxml_storage___type_2); break;

   }
  }
   }
  }

-  YY_BREAK
-case 435:
-/* rule 435 can match eol */
-YY_RULE_SETUP
-FAIL("Unexpected end-tag `%s': `</route>' expected.",surf_parse_text);
-  YY_BREAK
+       YY_BREAK

 case 436:
 case 436:

+/* rule 436 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</route>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_route_2):
-case YY_STATE_EOF(E_surfxml_route):
-case YY_STATE_EOF(S_surfxml_route):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</route>' expected.");
-  YY_BREAK
-
+FAIL("Unexpected end-tag `%s': `</prop>' expected.",surf_parse_text);
+       YY_BREAK

 case 437:
 case 437:

-/* rule 437 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Starting tag <ASroute> is not allowed here.");
-  YY_BREAK
+FAIL("Unexpected character `%c': `</prop>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_prop):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</prop>' expected.");
+       YY_BREAK
+

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

-{
-  AX_surfxml_ASroute_src = 0;
-  surfxml_ASroute_src_isset = 0;
-  AX_surfxml_ASroute_dst = 0;
-  surfxml_ASroute_dst_isset = 0;
-  AX_surfxml_ASroute_gw___src = 0;
-  surfxml_ASroute_gw___src_isset = 0;
-  AX_surfxml_ASroute_gw___dst = 0;
-  surfxml_ASroute_gw___dst_isset = 0;
-  AX_surfxml_ASroute_symmetrical = A_surfxml_ASroute_symmetrical_YES;
-  surfxml_ASroute_symmetrical_isset = 0;
-  ENTER(AL_surfxml_ASroute); pushbuffer(0);
-  }
-  YY_BREAK
-
+FAIL("Starting tag <random> is not allowed here.");
+       YY_BREAK

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

-if (surfxml_ASroute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_ASroute>");} surfxml_ASroute_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_src);
-  YY_BREAK
+{
+  AX_surfxml_random_generator = A_surfxml_random_generator_DRAND48;
+  surfxml_random_generator_isset = 0;
+  AX_surfxml_random_id = 0;
+  surfxml_random_id_isset = 0;
+  AX_surfxml_random_max = 0;
+  surfxml_random_max_isset = 0;
+  AX_surfxml_random_mean = 0;
+  surfxml_random_mean_isset = 0;
+  AX_surfxml_random_min = 0;
+  surfxml_random_min_isset = 0;
+  AX_surfxml_random_radical = 0;
+  surfxml_random_radical_isset = 0;
+  AX_surfxml_random_seed = 5;
+  surfxml_random_seed_isset = 0;
+  AX_surfxml_random_std___deviation = 0;
+  surfxml_random_std___deviation_isset = 0;
+  ENTER(AL_surfxml_random); pushbuffer(0);
+  }
+       YY_BREAK
+

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

-YY_RULE_SETUP
-if (surfxml_ASroute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_ASroute>");}  surfxml_ASroute_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_src);
-  YY_BREAK

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

-if (surfxml_ASroute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_ASroute>");} surfxml_ASroute_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_dst);
-  YY_BREAK
+A_surfxml_random_generator = A_surfxml_random_generator_DRAND48;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_ASroute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_ASroute>");}  surfxml_ASroute_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_dst);
-  YY_BREAK

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

-if (surfxml_ASroute_gw___src_isset != 0) {FAIL("Multiple definition of attribute gw_src in <surfxml_ASroute>");} surfxml_ASroute_gw___src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_gw___src);
-  YY_BREAK
+A_surfxml_random_generator = A_surfxml_random_generator_RAND;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_ASroute_gw___src_isset != 0) {FAIL("Multiple definition of attribute gw_src in <surfxml_ASroute>");}  surfxml_ASroute_gw___src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_gw___src);
-  YY_BREAK

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

-if (surfxml_ASroute_gw___dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in <surfxml_ASroute>");} surfxml_ASroute_gw___dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_ASroute_gw___dst);
-  YY_BREAK
+A_surfxml_random_generator = A_surfxml_random_generator_RNGSTREAM;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_ASroute_gw___dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in <surfxml_ASroute>");}  surfxml_ASroute_gw___dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_ASroute_gw___dst);
-  YY_BREAK

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

+YY_RULE_SETUP
+A_surfxml_random_generator = A_surfxml_random_generator_NONE;
+       YY_BREAK

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

-A_surfxml_ASroute_symmetrical = A_surfxml_ASroute_symmetrical_YES;
-  YY_BREAK
+if (surfxml_random_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_random>");} surfxml_random_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_id);
+       YY_BREAK

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

+YY_RULE_SETUP
+if (surfxml_random_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_random>");}  surfxml_random_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_id);
+       YY_BREAK

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

-A_surfxml_ASroute_symmetrical = A_surfxml_ASroute_symmetrical_NO;
-  YY_BREAK
+if (surfxml_random_max_isset != 0) {FAIL("Multiple definition of attribute max in <surfxml_random>");} surfxml_random_max_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_max);
+       YY_BREAK

 case 451:
 case 451:

+/* rule 451 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_ASroute_src) FAIL("Required attribute `src' not set for `ASroute' element.");
-  if (!AX_surfxml_ASroute_dst) FAIL("Required attribute `dst' not set for `ASroute' element.");
-  if (!AX_surfxml_ASroute_gw___src) FAIL("Required attribute `gw_src' not set for `ASroute' element.");
-  if (!AX_surfxml_ASroute_gw___dst) FAIL("Required attribute `gw_dst' not set for `ASroute' element.");
-  LEAVE; STag_surfxml_ASroute();surfxml_pcdata_ix = 0; ENTER(S_surfxml_ASroute);
- }
-  YY_BREAK
+if (surfxml_random_max_isset != 0) {FAIL("Multiple definition of attribute max in <surfxml_random>");}  surfxml_random_max_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_max);
+       YY_BREAK

 case 452:
 case 452:

+/* rule 452 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_ASroute_src) FAIL("Required attribute `src' not set for `ASroute' element.");
-  if (!AX_surfxml_ASroute_dst) FAIL("Required attribute `dst' not set for `ASroute' element.");
-  if (!AX_surfxml_ASroute_gw___src) FAIL("Required attribute `gw_src' not set for `ASroute' element.");
-  if (!AX_surfxml_ASroute_gw___dst) FAIL("Required attribute `gw_dst' not set for `ASroute' element.");
-  LEAVE; STag_surfxml_ASroute(); surfxml_pcdata_ix = 0; ETag_surfxml_ASroute(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: SET(S_surfxml_AS_6); break;
-   case S_surfxml_AS: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
-  }
- }
-  YY_BREAK
+if (surfxml_random_mean_isset != 0) {FAIL("Multiple definition of attribute mean in <surfxml_random>");} surfxml_random_mean_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_mean);
+       YY_BREAK

 case 453:
 case 453:

+/* rule 453 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of ASroute element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_random_mean_isset != 0) {FAIL("Multiple definition of attribute mean in <surfxml_random>");}  surfxml_random_mean_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_mean);
+       YY_BREAK

 case 454:
 case 454:

+/* rule 454 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `ASroute' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_ASroute):
-FAIL("EOF in attribute list of `ASroute' element.");
-  YY_BREAK
-
+if (surfxml_random_min_isset != 0) {FAIL("Multiple definition of attribute min in <surfxml_random>");} surfxml_random_min_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_min);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_ASroute();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: SET(S_surfxml_AS_6); break;
-   case S_surfxml_AS: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
-  }
- }
-  YY_BREAK
+if (surfxml_random_min_isset != 0) {FAIL("Multiple definition of attribute min in <surfxml_random>");}  surfxml_random_min_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_min);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</ASroute>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_random_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_random>");} surfxml_random_radical_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_radical);
+       YY_BREAK

 case 457:
 case 457:

+/* rule 457 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</ASroute>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_ASroute_2):
-case YY_STATE_EOF(S_surfxml_ASroute):
-case YY_STATE_EOF(E_surfxml_ASroute):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</ASroute>' expected.");
-  YY_BREAK
-
+if (surfxml_random_radical_isset != 0) {FAIL("Multiple definition of attribute radical in <surfxml_random>");}  surfxml_random_radical_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_radical);
+       YY_BREAK

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

-FAIL("Starting tag <link_ctn> is not allowed here.");
-  YY_BREAK
+if (surfxml_random_seed_isset != 0) {FAIL("Multiple definition of attribute seed in <surfxml_random>");} surfxml_random_seed_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_seed);
+       YY_BREAK

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

-{
-  AX_surfxml_link___ctn_id = 0;
-  surfxml_link___ctn_id_isset = 0;
-  AX_surfxml_link___ctn_direction = A_surfxml_link___ctn_direction_NONE;
-  surfxml_link___ctn_direction_isset = 0;
-  ENTER(AL_surfxml_link___ctn); pushbuffer(0);
-  }
-  YY_BREAK
-
+if (surfxml_random_seed_isset != 0) {FAIL("Multiple definition of attribute seed in <surfxml_random>");}  surfxml_random_seed_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_seed);
+       YY_BREAK

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

-if (surfxml_link___ctn_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_link___ctn>");} surfxml_link___ctn_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_link___ctn_id);
-  YY_BREAK
+if (surfxml_random_std___deviation_isset != 0) {FAIL("Multiple definition of attribute std_deviation in <surfxml_random>");} surfxml_random_std___deviation_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_random_std___deviation);
+       YY_BREAK

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

-if (surfxml_link___ctn_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_link___ctn>");}  surfxml_link___ctn_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_link___ctn_id);
-  YY_BREAK
+if (surfxml_random_std___deviation_isset != 0) {FAIL("Multiple definition of attribute std_deviation in <surfxml_random>");}  surfxml_random_std___deviation_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_random_std___deviation);
+       YY_BREAK

 case 462:
 case 462:

-/* rule 462 can match eol */
+YY_RULE_SETUP
+{
+  if (!AX_surfxml_random_id) FAIL("Required attribute `id' not set for `random' element.");
+  if (!AX_surfxml_random_max) FAIL("Required attribute `max' not set for `random' element.");
+  if (!AX_surfxml_random_mean) FAIL("Required attribute `mean' not set for `random' element.");
+  if (!AX_surfxml_random_min) FAIL("Required attribute `min' not set for `random' element.");
+  if (!AX_surfxml_random_std___deviation) FAIL("Required attribute `std_deviation' not set for `random' element.");
+  LEAVE; STag_surfxml_random();surfxml_pcdata_ix = 0; ENTER(E_surfxml_random);
+ }
+       YY_BREAK

 case 463:
 case 463:

-/* rule 463 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-A_surfxml_link___ctn_direction = A_surfxml_link___ctn_direction_UP;
-  YY_BREAK
+{
+  if (!AX_surfxml_random_id) FAIL("Required attribute `id' not set for `random' element.");
+  if (!AX_surfxml_random_max) FAIL("Required attribute `max' not set for `random' element.");
+  if (!AX_surfxml_random_mean) FAIL("Required attribute `mean' not set for `random' element.");
+  if (!AX_surfxml_random_min) FAIL("Required attribute `min' not set for `random' element.");
+  if (!AX_surfxml_random_std___deviation) FAIL("Required attribute `std_deviation' not set for `random' element.");
+  LEAVE; STag_surfxml_random(); surfxml_pcdata_ix = 0; ETag_surfxml_random(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_platform: case S_surfxml_platform_2: case S_surfxml_platform_3: SET(S_surfxml_platform_3); break;
+  }
+ }
+       YY_BREAK

 case 464:
 case 464:

-/* rule 464 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected character `%c' in attribute list of random element.", surf_parse_text[0]);
+       YY_BREAK

 case 465:
 case 465:

-/* rule 465 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-A_surfxml_link___ctn_direction = A_surfxml_link___ctn_direction_DOWN;
-  YY_BREAK
+FAIL("Bad attribute `%s' in `random' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_random):
+FAIL("EOF in attribute list of `random' element.");
+       YY_BREAK
+

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

+YY_RULE_SETUP
+{
+  LEAVE;
+  ETag_surfxml_random();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_platform: case S_surfxml_platform_2: case S_surfxml_platform_3: SET(S_surfxml_platform_3); break;
+  }
+ }
+       YY_BREAK

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

-A_surfxml_link___ctn_direction = A_surfxml_link___ctn_direction_NONE;
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</random>' expected.",surf_parse_text);
+       YY_BREAK

 case 468:
 YY_RULE_SETUP
 case 468:
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_link___ctn_id) FAIL("Required attribute `id' not set for `link_ctn' element.");
-  LEAVE; STag_surfxml_link___ctn();surfxml_pcdata_ix = 0; ENTER(E_surfxml_link___ctn);
- }
-  YY_BREAK
+FAIL("Unexpected character `%c': `</random>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_random):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</random>' expected.");
+       YY_BREAK
+

 case 469:
 case 469:

+/* rule 469 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_link___ctn_id) FAIL("Required attribute `id' not set for `link_ctn' element.");
-  LEAVE; STag_surfxml_link___ctn(); surfxml_pcdata_ix = 0; ETag_surfxml_link___ctn(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_ASroute: case S_surfxml_ASroute_1: case S_surfxml_ASroute_2: SET(S_surfxml_ASroute_2); break;
-   case S_surfxml_bypassASroute: case S_surfxml_bypassASroute_1: case S_surfxml_bypassASroute_2: SET(S_surfxml_bypassASroute_2); break;
-   case S_surfxml_bypassRoute: case S_surfxml_bypassRoute_1: case S_surfxml_bypassRoute_2: SET(S_surfxml_bypassRoute_2); break;
-   case S_surfxml_route: case S_surfxml_route_1: case S_surfxml_route_2: SET(S_surfxml_route_2); break;
-  }
- }
-  YY_BREAK
+FAIL("Starting tag <route> is not allowed here.");
+       YY_BREAK

 case 470:
 case 470:

+/* rule 470 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of link_ctn element.", surf_parse_text[0]);
-  YY_BREAK
+{
+  AX_surfxml_route_dst = 0;
+  surfxml_route_dst_isset = 0;
+  AX_surfxml_route_src = 0;
+  surfxml_route_src_isset = 0;
+  AX_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES;
+  surfxml_route_symmetrical_isset = 0;
+  ENTER(AL_surfxml_route); pushbuffer(0);
+  }
+       YY_BREAK
+

 case 471:
 case 471:

+/* rule 471 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `link_ctn' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_link___ctn):
-FAIL("EOF in attribute list of `link_ctn' element.");
-  YY_BREAK
-
+if (surfxml_route_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_route>");} surfxml_route_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_route_dst);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_link___ctn();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_ASroute: case S_surfxml_ASroute_1: case S_surfxml_ASroute_2: SET(S_surfxml_ASroute_2); break;
-   case S_surfxml_bypassASroute: case S_surfxml_bypassASroute_1: case S_surfxml_bypassASroute_2: SET(S_surfxml_bypassASroute_2); break;
-   case S_surfxml_bypassRoute: case S_surfxml_bypassRoute_1: case S_surfxml_bypassRoute_2: SET(S_surfxml_bypassRoute_2); break;
-   case S_surfxml_route: case S_surfxml_route_1: case S_surfxml_route_2: SET(S_surfxml_route_2); break;
-  }
- }
-  YY_BREAK
+if (surfxml_route_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_route>");}  surfxml_route_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_route_dst);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</link_ctn>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_route_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_route>");} surfxml_route_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_route_src);
+       YY_BREAK

 case 474:
 case 474:

+/* rule 474 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</link_ctn>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_link___ctn):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</link_ctn>' expected.");
-  YY_BREAK
-
+if (surfxml_route_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_route>");}  surfxml_route_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_route_src);
+       YY_BREAK

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

-YY_RULE_SETUP
-FAIL("Starting tag <bypassRoute> is not allowed here.");
-  YY_BREAK

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

-{
-  AX_surfxml_bypassRoute_src = 0;
-  surfxml_bypassRoute_src_isset = 0;
-  AX_surfxml_bypassRoute_dst = 0;
-  surfxml_bypassRoute_dst_isset = 0;
-  ENTER(AL_surfxml_bypassRoute); pushbuffer(0);
-  }
-  YY_BREAK
-
+A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_bypassRoute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_bypassRoute>");} surfxml_bypassRoute_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_src);
-  YY_BREAK

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

-if (surfxml_bypassRoute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_bypassRoute>");}  surfxml_bypassRoute_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_src);
-  YY_BREAK
+A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
+       YY_BREAK

 case 479:
 case 479:

-/* rule 479 can match eol */
-YY_RULE_SETUP
-if (surfxml_bypassRoute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_bypassRoute>");} surfxml_bypassRoute_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassRoute_dst);
-  YY_BREAK
-case 480:
-/* rule 480 can match eol */
-YY_RULE_SETUP
-if (surfxml_bypassRoute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_bypassRoute>");}  surfxml_bypassRoute_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassRoute_dst);
-  YY_BREAK
-case 481:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_bypassRoute_src) FAIL("Required attribute `src' not set for `bypassRoute' element.");
-  if (!AX_surfxml_bypassRoute_dst) FAIL("Required attribute `dst' not set for `bypassRoute' element.");
-  LEAVE; STag_surfxml_bypassRoute();surfxml_pcdata_ix = 0; ENTER(S_surfxml_bypassRoute);
+  if (!AX_surfxml_route_dst) FAIL("Required attribute `dst' not set for `route' element.");
+  if (!AX_surfxml_route_src) FAIL("Required attribute `src' not set for `route' element.");
+  LEAVE; STag_surfxml_route();surfxml_pcdata_ix = 0; ENTER(S_surfxml_route);

  }
  }

-  YY_BREAK
-case 482:
+       YY_BREAK
+case 480:

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_bypassRoute_src) FAIL("Required attribute `src' not set for `bypassRoute' element.");
-  if (!AX_surfxml_bypassRoute_dst) FAIL("Required attribute `dst' not set for `bypassRoute' element.");
-  LEAVE; STag_surfxml_bypassRoute(); surfxml_pcdata_ix = 0; ETag_surfxml_bypassRoute(); popbuffer(); /* attribute */
+  if (!AX_surfxml_route_dst) FAIL("Required attribute `dst' not set for `route' element.");
+  if (!AX_surfxml_route_src) FAIL("Required attribute `src' not set for `route' element.");
+  LEAVE; STag_surfxml_route(); surfxml_pcdata_ix = 0; ETag_surfxml_route(); popbuffer(); /* attribute */

   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
   }
  }
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
   }
  }

-  YY_BREAK
-case 483:
+       YY_BREAK
+case 481:

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of bypassRoute element.", surf_parse_text[0]);
-  YY_BREAK
-case 484:
+FAIL("Unexpected character `%c' in attribute list of route element.", surf_parse_text[0]);
+       YY_BREAK
+case 482:

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `bypassRoute' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_bypassRoute):
-FAIL("EOF in attribute list of `bypassRoute' element.");
-  YY_BREAK
+FAIL("Bad attribute `%s' in `route' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_route):
+FAIL("EOF in attribute list of `route' element.");
+       YY_BREAK

 
 

-case 485:
-/* rule 485 can match eol */
+case 483:
+/* rule 483 can match eol */

 YY_RULE_SETUP
 {
   LEAVE;
 YY_RULE_SETUP
 {
   LEAVE;

-  ETag_surfxml_bypassRoute();
+  ETag_surfxml_route();

   popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
   }
  }
   popbuffer(); /* attribute */
   switch (YY_START) {
    case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
   }
  }

-  YY_BREAK
+       YY_BREAK
+case 484:
+/* rule 484 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected end-tag `%s': `</route>' expected.",surf_parse_text);
+       YY_BREAK
+case 485:
+YY_RULE_SETUP
+FAIL("Unexpected character `%c': `</route>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_route):
+case YY_STATE_EOF(S_surfxml_route):
+case YY_STATE_EOF(S_surfxml_route_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</route>' expected.");
+       YY_BREAK
+

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

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

 case 487:
 case 487:

+/* rule 487 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</bypassRoute>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_bypassRoute_2):
-case YY_STATE_EOF(E_surfxml_bypassRoute):
-case YY_STATE_EOF(S_surfxml_bypassRoute):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</bypassRoute>' expected.");
-  YY_BREAK
+{
+  AX_surfxml_router_coordinates = 0;
+  surfxml_router_coordinates_isset = 0;
+  AX_surfxml_router_id = 0;
+  surfxml_router_id_isset = 0;
+  ENTER(AL_surfxml_router); pushbuffer(0);
+  }
+       YY_BREAK

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

-FAIL("Starting tag <bypassASroute> is not allowed here.");
-  YY_BREAK
+if (surfxml_router_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_router>");} surfxml_router_coordinates_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_router_coordinates);
+       YY_BREAK

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

-{
-  AX_surfxml_bypassASroute_src = 0;
-  surfxml_bypassASroute_src_isset = 0;
-  AX_surfxml_bypassASroute_dst = 0;
-  surfxml_bypassASroute_dst_isset = 0;
-  AX_surfxml_bypassASroute_gw___src = 0;
-  surfxml_bypassASroute_gw___src_isset = 0;
-  AX_surfxml_bypassASroute_gw___dst = 0;
-  surfxml_bypassASroute_gw___dst_isset = 0;
-  ENTER(AL_surfxml_bypassASroute); pushbuffer(0);
-  }
-  YY_BREAK
-
+if (surfxml_router_coordinates_isset != 0) {FAIL("Multiple definition of attribute coordinates in <surfxml_router>");}  surfxml_router_coordinates_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_router_coordinates);
+       YY_BREAK

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

-if (surfxml_bypassASroute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_bypassASroute>");} surfxml_bypassASroute_src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassASroute_src);
-  YY_BREAK
+if (surfxml_router_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_router>");} surfxml_router_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_router_id);
+       YY_BREAK

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

-if (surfxml_bypassASroute_src_isset != 0) {FAIL("Multiple definition of attribute src in <surfxml_bypassASroute>");}  surfxml_bypassASroute_src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassASroute_src);
-  YY_BREAK
+if (surfxml_router_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_router>");}  surfxml_router_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_router_id);
+       YY_BREAK

 case 492:
 case 492:

-/* rule 492 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_bypassASroute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_bypassASroute>");} surfxml_bypassASroute_dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassASroute_dst);
-  YY_BREAK
+{
+  if (!AX_surfxml_router_id) FAIL("Required attribute `id' not set for `router' element.");
+  LEAVE; STag_surfxml_router();surfxml_pcdata_ix = 0; ENTER(E_surfxml_router);
+ }
+       YY_BREAK

 case 493:
 case 493:

-/* rule 493 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_bypassASroute_dst_isset != 0) {FAIL("Multiple definition of attribute dst in <surfxml_bypassASroute>");}  surfxml_bypassASroute_dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassASroute_dst);
-  YY_BREAK
+{
+  if (!AX_surfxml_router_id) FAIL("Required attribute `id' not set for `router' element.");
+  LEAVE; STag_surfxml_router(); surfxml_pcdata_ix = 0; ETag_surfxml_router(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+  }
+ }
+       YY_BREAK

 case 494:
 case 494:

-/* rule 494 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_bypassASroute_gw___src_isset != 0) {FAIL("Multiple definition of attribute gw_src in <surfxml_bypassASroute>");} surfxml_bypassASroute_gw___src_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassASroute_gw___src);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of router element.", surf_parse_text[0]);
+       YY_BREAK

 case 495:
 case 495:

-/* rule 495 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_bypassASroute_gw___src_isset != 0) {FAIL("Multiple definition of attribute gw_src in <surfxml_bypassASroute>");}  surfxml_bypassASroute_gw___src_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassASroute_gw___src);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `router' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_router):
+FAIL("EOF in attribute list of `router' element.");
+       YY_BREAK
+

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

-if (surfxml_bypassASroute_gw___dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in <surfxml_bypassASroute>");} surfxml_bypassASroute_gw___dst_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_bypassASroute_gw___dst);
-  YY_BREAK
-case 497:
-/* rule 497 can match eol */
-YY_RULE_SETUP
-if (surfxml_bypassASroute_gw___dst_isset != 0) {FAIL("Multiple definition of attribute gw_dst in <surfxml_bypassASroute>");}  surfxml_bypassASroute_gw___dst_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_bypassASroute_gw___dst);
-  YY_BREAK
-case 498:
-YY_RULE_SETUP
-{
-  if (!AX_surfxml_bypassASroute_src) FAIL("Required attribute `src' not set for `bypassASroute' element.");
-  if (!AX_surfxml_bypassASroute_dst) FAIL("Required attribute `dst' not set for `bypassASroute' element.");
-  if (!AX_surfxml_bypassASroute_gw___src) FAIL("Required attribute `gw_src' not set for `bypassASroute' element.");
-  if (!AX_surfxml_bypassASroute_gw___dst) FAIL("Required attribute `gw_dst' not set for `bypassASroute' element.");
-  LEAVE; STag_surfxml_bypassASroute();surfxml_pcdata_ix = 0; ENTER(S_surfxml_bypassASroute);
- }
-  YY_BREAK
-case 499:
-YY_RULE_SETUP

 {
 {

-  if (!AX_surfxml_bypassASroute_src) FAIL("Required attribute `src' not set for `bypassASroute' element.");
-  if (!AX_surfxml_bypassASroute_dst) FAIL("Required attribute `dst' not set for `bypassASroute' element.");
-  if (!AX_surfxml_bypassASroute_gw___src) FAIL("Required attribute `gw_src' not set for `bypassASroute' element.");
-  if (!AX_surfxml_bypassASroute_gw___dst) FAIL("Required attribute `gw_dst' not set for `bypassASroute' element.");
-  LEAVE; STag_surfxml_bypassASroute(); surfxml_pcdata_ix = 0; ETag_surfxml_bypassASroute(); popbuffer(); /* attribute */
+  LEAVE;
+  ETag_surfxml_router();
+  popbuffer(); /* attribute */

   switch (YY_START) {
   switch (YY_START) {

-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;

   }
  }
   }
  }

-  YY_BREAK
+       YY_BREAK
+case 497:
+/* rule 497 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected end-tag `%s': `</router>' expected.",surf_parse_text);
+       YY_BREAK
+case 498:
+YY_RULE_SETUP
+FAIL("Unexpected character `%c': `</router>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_router):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</router>' expected.");
+       YY_BREAK
+
+case 499:
+/* rule 499 can match eol */
+YY_RULE_SETUP
+FAIL("Starting tag <storage> is not allowed here.");
+       YY_BREAK

 case 500:
 case 500:

+/* rule 500 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of bypassASroute element.", surf_parse_text[0]);
-  YY_BREAK
+{
+  AX_surfxml_storage_attach = 0;
+  surfxml_storage_attach_isset = 0;
+  AX_surfxml_storage_content = 0;
+  surfxml_storage_content_isset = 0;
+  AX_surfxml_storage_content___type = 35;
+  surfxml_storage_content___type_isset = 0;
+  AX_surfxml_storage_id = 0;
+  surfxml_storage_id_isset = 0;
+  AX_surfxml_storage_typeId = 0;
+  surfxml_storage_typeId_isset = 0;
+  ENTER(AL_surfxml_storage); pushbuffer(0);
+  }
+       YY_BREAK
+

 case 501:
 case 501:

+/* rule 501 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `bypassASroute' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_bypassASroute):
-FAIL("EOF in attribute list of `bypassASroute' element.");
-  YY_BREAK
-
+if (surfxml_storage_attach_isset != 0) {FAIL("Multiple definition of attribute attach in <surfxml_storage>");} surfxml_storage_attach_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage_attach);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_bypassASroute();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
-  }
- }
-  YY_BREAK
+if (surfxml_storage_attach_isset != 0) {FAIL("Multiple definition of attribute attach in <surfxml_storage>");}  surfxml_storage_attach_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage_attach);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</bypassASroute>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_storage_content_isset != 0) {FAIL("Multiple definition of attribute content in <surfxml_storage>");} surfxml_storage_content_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage_content);
+       YY_BREAK

 case 504:
 case 504:

+/* rule 504 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</bypassASroute>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_bypassASroute):
-case YY_STATE_EOF(S_surfxml_bypassASroute_2):
-case YY_STATE_EOF(S_surfxml_bypassASroute):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</bypassASroute>' expected.");
-  YY_BREAK
-
+if (surfxml_storage_content_isset != 0) {FAIL("Multiple definition of attribute content in <surfxml_storage>");}  surfxml_storage_content_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage_content);
+       YY_BREAK

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

-FAIL("Starting tag <process> is not allowed here.");
-  YY_BREAK
+if (surfxml_storage_content___type_isset != 0) {FAIL("Multiple definition of attribute content_type in <surfxml_storage>");} surfxml_storage_content___type_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage_content___type);
+       YY_BREAK

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

-{
-  AX_surfxml_process_host = 0;
-  surfxml_process_host_isset = 0;
-  AX_surfxml_process_function = 0;
-  surfxml_process_function_isset = 0;
-  AX_surfxml_process_start___time = 50;
-  surfxml_process_start___time_isset = 0;
-  AX_surfxml_process_kill___time = 55;
-  surfxml_process_kill___time_isset = 0;
-  AX_surfxml_process_on___failure = A_surfxml_process_on___failure_DIE;
-  surfxml_process_on___failure_isset = 0;
-  ENTER(AL_surfxml_process); pushbuffer(0);
-  }
-  YY_BREAK
-
+if (surfxml_storage_content___type_isset != 0) {FAIL("Multiple definition of attribute content_type in <surfxml_storage>");}  surfxml_storage_content___type_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage_content___type);
+       YY_BREAK

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

-if (surfxml_process_host_isset != 0) {FAIL("Multiple definition of attribute host in <surfxml_process>");} surfxml_process_host_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_host);
-  YY_BREAK
+if (surfxml_storage_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_storage>");} surfxml_storage_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage_id);
+       YY_BREAK

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

-if (surfxml_process_host_isset != 0) {FAIL("Multiple definition of attribute host in <surfxml_process>");}  surfxml_process_host_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_host);
-  YY_BREAK
+if (surfxml_storage_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_storage>");}  surfxml_storage_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage_id);
+       YY_BREAK

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

-if (surfxml_process_function_isset != 0) {FAIL("Multiple definition of attribute function in <surfxml_process>");} surfxml_process_function_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_function);
-  YY_BREAK
+if (surfxml_storage_typeId_isset != 0) {FAIL("Multiple definition of attribute typeId in <surfxml_storage>");} surfxml_storage_typeId_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage_typeId);
+       YY_BREAK

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

-if (surfxml_process_function_isset != 0) {FAIL("Multiple definition of attribute function in <surfxml_process>");}  surfxml_process_function_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_function);
-  YY_BREAK
+if (surfxml_storage_typeId_isset != 0) {FAIL("Multiple definition of attribute typeId in <surfxml_storage>");}  surfxml_storage_typeId_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage_typeId);
+       YY_BREAK

 case 511:
 case 511:

-/* rule 511 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_process_start___time_isset != 0) {FAIL("Multiple definition of attribute start_time in <surfxml_process>");} surfxml_process_start___time_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_start___time);
-  YY_BREAK
+{
+  if (!AX_surfxml_storage_attach) FAIL("Required attribute `attach' not set for `storage' element.");
+  if (!AX_surfxml_storage_id) FAIL("Required attribute `id' not set for `storage' element.");
+  if (!AX_surfxml_storage_typeId) FAIL("Required attribute `typeId' not set for `storage' element.");
+  LEAVE; STag_surfxml_storage();surfxml_pcdata_ix = 0; ENTER(S_surfxml_storage);
+ }
+       YY_BREAK

 case 512:
 case 512:

-/* rule 512 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_process_start___time_isset != 0) {FAIL("Multiple definition of attribute start_time in <surfxml_process>");}  surfxml_process_start___time_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_start___time);
-  YY_BREAK
+{
+  if (!AX_surfxml_storage_attach) FAIL("Required attribute `attach' not set for `storage' element.");
+  if (!AX_surfxml_storage_id) FAIL("Required attribute `id' not set for `storage' element.");
+  if (!AX_surfxml_storage_typeId) FAIL("Required attribute `typeId' not set for `storage' element.");
+  LEAVE; STag_surfxml_storage(); surfxml_pcdata_ix = 0; ETag_surfxml_storage(); popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+  }
+ }
+       YY_BREAK

 case 513:
 case 513:

-/* rule 513 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_process_kill___time_isset != 0) {FAIL("Multiple definition of attribute kill_time in <surfxml_process>");} surfxml_process_kill___time_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_process_kill___time);
-  YY_BREAK
+FAIL("Unexpected character `%c' in attribute list of storage element.", surf_parse_text[0]);
+       YY_BREAK

 case 514:
 case 514:

-/* rule 514 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-if (surfxml_process_kill___time_isset != 0) {FAIL("Multiple definition of attribute kill_time in <surfxml_process>");}  surfxml_process_kill___time_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_process_kill___time);
-  YY_BREAK
+FAIL("Bad attribute `%s' in `storage' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_storage):
+FAIL("EOF in attribute list of `storage' element.");
+       YY_BREAK
+

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

+YY_RULE_SETUP
+{
+  LEAVE;
+  ETag_surfxml_storage();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;
+  }
+ }
+       YY_BREAK

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

-A_surfxml_process_on___failure = A_surfxml_process_on___failure_DIE;
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</storage>' expected.",surf_parse_text);
+       YY_BREAK

 case 517:
 case 517:

-/* rule 517 can match eol */
+YY_RULE_SETUP
+FAIL("Unexpected character `%c': `</storage>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_storage):
+case YY_STATE_EOF(S_surfxml_storage):
+case YY_STATE_EOF(S_surfxml_storage_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</storage>' expected.");
+       YY_BREAK
+

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

-A_surfxml_process_on___failure = A_surfxml_process_on___failure_RESTART;
-  YY_BREAK
+FAIL("Starting tag <storage_type> is not allowed here.");
+       YY_BREAK

 case 519:
 case 519:

+/* rule 519 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_process_host) FAIL("Required attribute `host' not set for `process' element.");
-  if (!AX_surfxml_process_function) FAIL("Required attribute `function' not set for `process' element.");
-  LEAVE; STag_surfxml_process();surfxml_pcdata_ix = 0; ENTER(S_surfxml_process);
- }
-  YY_BREAK
+  AX_surfxml_storage___type_content = 0;
+  surfxml_storage___type_content_isset = 0;
+  AX_surfxml_storage___type_content___type = 16;
+  surfxml_storage___type_content___type_isset = 0;
+  AX_surfxml_storage___type_id = 0;
+  surfxml_storage___type_id_isset = 0;
+  AX_surfxml_storage___type_model = 0;
+  surfxml_storage___type_model_isset = 0;
+  AX_surfxml_storage___type_size = 0;
+  surfxml_storage___type_size_isset = 0;
+  ENTER(AL_surfxml_storage___type); pushbuffer(0);
+  }
+       YY_BREAK
+

 case 520:
 case 520:

+/* rule 520 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_process_host) FAIL("Required attribute `host' not set for `process' element.");
-  if (!AX_surfxml_process_function) FAIL("Required attribute `function' not set for `process' element.");
-  LEAVE; STag_surfxml_process(); surfxml_pcdata_ix = 0; ETag_surfxml_process(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_4: case S_surfxml_platform_6: case S_surfxml_platform_7: case S_surfxml_platform_8: SET(S_surfxml_platform_8); break;
-  }
- }
-  YY_BREAK
+if (surfxml_storage___type_content_isset != 0) {FAIL("Multiple definition of attribute content in <surfxml_storage___type>");} surfxml_storage___type_content_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage___type_content);
+       YY_BREAK

 case 521:
 case 521:

+/* rule 521 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of process element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_storage___type_content_isset != 0) {FAIL("Multiple definition of attribute content in <surfxml_storage___type>");}  surfxml_storage___type_content_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage___type_content);
+       YY_BREAK

 case 522:
 case 522:

+/* rule 522 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `process' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_process):
-FAIL("EOF in attribute list of `process' element.");
-  YY_BREAK
-
+if (surfxml_storage___type_content___type_isset != 0) {FAIL("Multiple definition of attribute content_type in <surfxml_storage___type>");} surfxml_storage___type_content___type_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage___type_content___type);
+       YY_BREAK

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

-{
-  LEAVE;
-  ETag_surfxml_process();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_4: case S_surfxml_platform_6: case S_surfxml_platform_7: case S_surfxml_platform_8: SET(S_surfxml_platform_8); break;
-  }
- }
-  YY_BREAK
+if (surfxml_storage___type_content___type_isset != 0) {FAIL("Multiple definition of attribute content_type in <surfxml_storage___type>");}  surfxml_storage___type_content___type_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage___type_content___type);
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</process>' expected.",surf_parse_text);
-  YY_BREAK
+if (surfxml_storage___type_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_storage___type>");} surfxml_storage___type_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage___type_id);
+       YY_BREAK

 case 525:
 case 525:

+/* rule 525 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</process>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_process):
-case YY_STATE_EOF(E_surfxml_process):
-case YY_STATE_EOF(S_surfxml_process_2):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</process>' expected.");
-  YY_BREAK
-
+if (surfxml_storage___type_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_storage___type>");}  surfxml_storage___type_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage___type_id);
+       YY_BREAK

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

-FAIL("Starting tag <argument> is not allowed here.");
-  YY_BREAK
+if (surfxml_storage___type_model_isset != 0) {FAIL("Multiple definition of attribute model in <surfxml_storage___type>");} surfxml_storage___type_model_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage___type_model);
+       YY_BREAK

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

-{
-  AX_surfxml_argument_value = 0;
-  surfxml_argument_value_isset = 0;
-  ENTER(AL_surfxml_argument); pushbuffer(0);
-  }
-  YY_BREAK
-
+if (surfxml_storage___type_model_isset != 0) {FAIL("Multiple definition of attribute model in <surfxml_storage___type>");}  surfxml_storage___type_model_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage___type_model);
+       YY_BREAK

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

-if (surfxml_argument_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_argument>");} surfxml_argument_value_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_argument_value);
-  YY_BREAK
+if (surfxml_storage___type_size_isset != 0) {FAIL("Multiple definition of attribute size in <surfxml_storage___type>");} surfxml_storage___type_size_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_storage___type_size);
+       YY_BREAK

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

-if (surfxml_argument_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_argument>");}  surfxml_argument_value_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_argument_value);
-  YY_BREAK
+if (surfxml_storage___type_size_isset != 0) {FAIL("Multiple definition of attribute size in <surfxml_storage___type>");}  surfxml_storage___type_size_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_storage___type_size);
+       YY_BREAK

 case 530:
 YY_RULE_SETUP
 {
 case 530:
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_argument_value) FAIL("Required attribute `value' not set for `argument' element.");
-  LEAVE; STag_surfxml_argument();surfxml_pcdata_ix = 0; ENTER(E_surfxml_argument);
+  if (!AX_surfxml_storage___type_id) FAIL("Required attribute `id' not set for `storage_type' element.");
+  if (!AX_surfxml_storage___type_model) FAIL("Required attribute `model' not set for `storage_type' element.");
+  if (!AX_surfxml_storage___type_size) FAIL("Required attribute `size' not set for `storage_type' element.");
+  LEAVE; STag_surfxml_storage___type();surfxml_pcdata_ix = 0; ENTER(S_surfxml_storage___type);

  }
  }

-  YY_BREAK
+       YY_BREAK

 case 531:
 YY_RULE_SETUP
 {
 case 531:
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_argument_value) FAIL("Required attribute `value' not set for `argument' element.");
-  LEAVE; STag_surfxml_argument(); surfxml_pcdata_ix = 0; ETag_surfxml_argument(); popbuffer(); /* attribute */
+  if (!AX_surfxml_storage___type_id) FAIL("Required attribute `id' not set for `storage_type' element.");
+  if (!AX_surfxml_storage___type_model) FAIL("Required attribute `model' not set for `storage_type' element.");
+  if (!AX_surfxml_storage___type_size) FAIL("Required attribute `size' not set for `storage_type' element.");
+  LEAVE; STag_surfxml_storage___type(); surfxml_pcdata_ix = 0; ETag_surfxml_storage___type(); popbuffer(); /* attribute */

   switch (YY_START) {
   switch (YY_START) {

-   case S_surfxml_process: case S_surfxml_process_1: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;

   }
  }
   }
  }

-  YY_BREAK
+       YY_BREAK

 case 532:
 YY_RULE_SETUP
 case 532:
 YY_RULE_SETUP

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

 case 533:
 YY_RULE_SETUP
 case 533:
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `argument' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_argument):
-FAIL("EOF in attribute list of `argument' element.");
-  YY_BREAK
+FAIL("Bad attribute `%s' in `storage_type' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_storage___type):
+FAIL("EOF in attribute list of `storage_type' element.");
+       YY_BREAK

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

-  ETag_surfxml_argument();
+  ETag_surfxml_storage___type();

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

-   case S_surfxml_process: case S_surfxml_process_1: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break;

   }
  }
   }
  }

-  YY_BREAK
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</argument>' expected.",surf_parse_text);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</storage_type>' expected.",surf_parse_text);
+       YY_BREAK

 case 536:
 YY_RULE_SETUP
 case 536:
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</argument>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_argument):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</argument>' expected.");
-  YY_BREAK
+FAIL("Unexpected character `%c': `</storage_type>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_storage___type):
+case YY_STATE_EOF(S_surfxml_storage___type):
+case YY_STATE_EOF(S_surfxml_storage___type_2):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</storage_type>' expected.");
+       YY_BREAK

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

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

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

-  AX_surfxml_config_id = 0;
-  surfxml_config_id_isset = 0;
-  ENTER(AL_surfxml_config); pushbuffer(0);
+  AX_surfxml_trace_file = 0;
+  surfxml_trace_file_isset = 0;
+  AX_surfxml_trace_id = 0;
+  surfxml_trace_id_isset = 0;
+  AX_surfxml_trace_periodicity = 0;
+  surfxml_trace_periodicity_isset = 0;
+  ENTER(AL_surfxml_trace); pushbuffer(0);

   }
   }

-  YY_BREAK
+       YY_BREAK

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

-if (surfxml_config_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_config>");} surfxml_config_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_config_id);
-  YY_BREAK
+if (surfxml_trace_file_isset != 0) {FAIL("Multiple definition of attribute file in <surfxml_trace>");} surfxml_trace_file_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_file);
+       YY_BREAK

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

-if (surfxml_config_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_config>");}  surfxml_config_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_config_id);
-  YY_BREAK
+if (surfxml_trace_file_isset != 0) {FAIL("Multiple definition of attribute file in <surfxml_trace>");}  surfxml_trace_file_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_file);
+       YY_BREAK

 case 541:
 case 541:

+/* rule 541 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  LEAVE; STag_surfxml_config();surfxml_pcdata_ix = 0; ENTER(S_surfxml_config);
- }
-  YY_BREAK
+if (surfxml_trace_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_trace>");} surfxml_trace_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_id);
+       YY_BREAK

 case 542:
 case 542:

+/* rule 542 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  LEAVE; STag_surfxml_config(); surfxml_pcdata_ix = 0; ETag_surfxml_config(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_platform: case S_surfxml_platform_2: case S_surfxml_platform_3: SET(S_surfxml_platform_3); break;
-  }
- }
-  YY_BREAK
+if (surfxml_trace_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_trace>");}  surfxml_trace_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_id);
+       YY_BREAK

 case 543:
 case 543:

+/* rule 543 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of config element.", surf_parse_text[0]);
-  YY_BREAK
+if (surfxml_trace_periodicity_isset != 0) {FAIL("Multiple definition of attribute periodicity in <surfxml_trace>");} surfxml_trace_periodicity_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace_periodicity);
+       YY_BREAK

 case 544:
 case 544:

+/* rule 544 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `config' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_config):
-FAIL("EOF in attribute list of `config' element.");
-  YY_BREAK
-
+if (surfxml_trace_periodicity_isset != 0) {FAIL("Multiple definition of attribute periodicity in <surfxml_trace>");}  surfxml_trace_periodicity_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace_periodicity);
+       YY_BREAK

 case 545:
 case 545:

-/* rule 545 can match eol */

 YY_RULE_SETUP
 {
 YY_RULE_SETUP
 {

-  LEAVE;
-  ETag_surfxml_config();
-  popbuffer(); /* attribute */
+  if (!AX_surfxml_trace_id) FAIL("Required attribute `id' not set for `trace' element.");
+  if (!AX_surfxml_trace_periodicity) FAIL("Required attribute `periodicity' not set for `trace' element.");
+  LEAVE; STag_surfxml_trace();pushbuffer(surfxml_pcdata_ix); BUFFERSET(surfxml_pcdata_ix);; ENTER(IN_trace);
+ }
+       YY_BREAK
+case 546:
+YY_RULE_SETUP
+{
+  if (!AX_surfxml_trace_id) FAIL("Required attribute `id' not set for `trace' element.");
+  if (!AX_surfxml_trace_periodicity) FAIL("Required attribute `periodicity' not set for `trace' element.");
+  LEAVE; STag_surfxml_trace(); surfxml_pcdata_ix = 0; ETag_surfxml_trace(); popbuffer(); /* attribute */

   switch (YY_START) {
   switch (YY_START) {

-   case S_surfxml_platform: case S_surfxml_platform_2: case S_surfxml_platform_3: SET(S_surfxml_platform_3); break;
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;

   }
  }
   }
  }

-  YY_BREAK
-case 546:
-/* rule 546 can match eol */
-YY_RULE_SETUP
-FAIL("Unexpected end-tag `%s': `</config>' expected.",surf_parse_text);
-  YY_BREAK
+       YY_BREAK

 case 547:
 YY_RULE_SETUP
 case 547:
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</config>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(S_surfxml_config):
-case YY_STATE_EOF(S_surfxml_config_2):
-case YY_STATE_EOF(E_surfxml_config):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</config>' expected.");
-  YY_BREAK
-
-/* <!-- <!ATTLIST prop key CDATA #REQUIRED> -->
-  * <!-- <!ATTLIST prop key CDATA #REQUIRED> -->  */
+FAIL("Unexpected character `%c' in attribute list of trace element.", surf_parse_text[0]);
+       YY_BREAK

 case 548:
 case 548:

-/* rule 548 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Starting tag <prop> is not allowed here.");
-  YY_BREAK
+FAIL("Bad attribute `%s' in `trace' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_trace):
+FAIL("EOF in attribute list of `trace' element.");
+       YY_BREAK
+

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

-  AX_surfxml_prop_id = 0;
-  surfxml_prop_id_isset = 0;
-  AX_surfxml_prop_value = 0;
-  surfxml_prop_value_isset = 0;
-  ENTER(AL_surfxml_prop); pushbuffer(0);
+  LEAVE;
+  BUFFERDONE;
+  ETag_surfxml_trace();
+  surfxml_pcdata_ix = popbuffer();
+  popbuffer(); /* attribute */
+  switch (YY_START) {
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;

   }
   }

-  YY_BREAK
-
+ }
+       YY_BREAK

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

-if (surfxml_prop_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_prop>");} surfxml_prop_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_id);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</trace>' expected.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(IN_trace):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</trace>' expected.");
+       YY_BREAK
+

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

-if (surfxml_prop_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_prop>");}  surfxml_prop_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_id);
-  YY_BREAK
+FAIL("Starting tag <trace_connect> is not allowed here.");
+       YY_BREAK

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

-if (surfxml_prop_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_prop>");} surfxml_prop_value_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_prop_value);
-  YY_BREAK
+{
+  AX_surfxml_trace___connect_element = 0;
+  surfxml_trace___connect_element_isset = 0;
+  AX_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_HOST___AVAIL;
+  surfxml_trace___connect_kind_isset = 0;
+  AX_surfxml_trace___connect_trace = 0;
+  surfxml_trace___connect_trace_isset = 0;
+  ENTER(AL_surfxml_trace___connect); pushbuffer(0);
+  }
+       YY_BREAK
+

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

-if (surfxml_prop_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_prop>");}  surfxml_prop_value_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_prop_value);
-  YY_BREAK
+if (surfxml_trace___connect_element_isset != 0) {FAIL("Multiple definition of attribute element in <surfxml_trace___connect>");} surfxml_trace___connect_element_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace___connect_element);
+       YY_BREAK

 case 554:
 case 554:

+/* rule 554 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-{
-  if (!AX_surfxml_prop_id) FAIL("Required attribute `id' not set for `prop' element.");
-  if (!AX_surfxml_prop_value) FAIL("Required attribute `value' not set for `prop' element.");
-  LEAVE; STag_surfxml_prop();surfxml_pcdata_ix = 0; ENTER(E_surfxml_prop);
- }
-  YY_BREAK
+if (surfxml_trace___connect_element_isset != 0) {FAIL("Multiple definition of attribute element in <surfxml_trace___connect>");}  surfxml_trace___connect_element_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace___connect_element);
+       YY_BREAK

 case 555:
 case 555:

-YY_RULE_SETUP
-{
-  if (!AX_surfxml_prop_id) FAIL("Required attribute `id' not set for `prop' element.");
-  if (!AX_surfxml_prop_value) FAIL("Required attribute `value' not set for `prop' element.");
-  LEAVE; STag_surfxml_prop(); surfxml_pcdata_ix = 0; ETag_surfxml_prop(); popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_2: case S_surfxml_AS_3: SET(S_surfxml_AS_3); break;
-   case S_surfxml_cluster: case S_surfxml_cluster_1: case S_surfxml_cluster_2: SET(S_surfxml_cluster_2); break;
-   case S_surfxml_config: case S_surfxml_config_1: case S_surfxml_config_2: SET(S_surfxml_config_2); break;
-   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
-   case S_surfxml_link: case S_surfxml_link_1: case S_surfxml_link_2: SET(S_surfxml_link_2); break;
-   case S_surfxml_process: case S_surfxml_process_1: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
-   case S_surfxml_storage: case S_surfxml_storage_1: case S_surfxml_storage_2: SET(S_surfxml_storage_2); break;
-   case S_surfxml_storage___type: case S_surfxml_storage___type_1: case S_surfxml_storage___type_2: SET(S_surfxml_storage___type_2); break;
-  }
- }
-  YY_BREAK
+/* rule 555 can match eol */

 case 556:
 case 556:

+/* rule 556 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c' in attribute list of prop element.", surf_parse_text[0]);
-  YY_BREAK
+A_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_HOST___AVAIL;
+       YY_BREAK

 case 557:
 case 557:

-YY_RULE_SETUP
-FAIL("Bad attribute `%s' in `prop' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_prop):
-FAIL("EOF in attribute list of `prop' element.");
-  YY_BREAK
-
+/* rule 557 can match eol */

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

-{
-  LEAVE;
-  ETag_surfxml_prop();
-  popbuffer(); /* attribute */
-  switch (YY_START) {
-   case S_surfxml_AS: case S_surfxml_AS_2: case S_surfxml_AS_3: SET(S_surfxml_AS_3); break;
-   case S_surfxml_cluster: case S_surfxml_cluster_1: case S_surfxml_cluster_2: SET(S_surfxml_cluster_2); break;
-   case S_surfxml_config: case S_surfxml_config_1: case S_surfxml_config_2: SET(S_surfxml_config_2); break;
-   case S_surfxml_host: case S_surfxml_host_1: case S_surfxml_host_2: SET(S_surfxml_host_2); break;
-   case S_surfxml_link: case S_surfxml_link_1: case S_surfxml_link_2: SET(S_surfxml_link_2); break;
-   case S_surfxml_process: case S_surfxml_process_1: case S_surfxml_process_2: SET(S_surfxml_process_2); break;
-   case S_surfxml_storage: case S_surfxml_storage_1: case S_surfxml_storage_2: SET(S_surfxml_storage_2); break;
-   case S_surfxml_storage___type: case S_surfxml_storage___type_1: case S_surfxml_storage___type_2: SET(S_surfxml_storage___type_2); break;
-  }
- }
-  YY_BREAK
+A_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_POWER;
+       YY_BREAK

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

-YY_RULE_SETUP
-FAIL("Unexpected end-tag `%s': `</prop>' expected.",surf_parse_text);
-  YY_BREAK

 case 560:
 case 560:

+/* rule 560 can match eol */

 YY_RULE_SETUP
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</prop>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_prop):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</prop>' expected.");
-  YY_BREAK
-
-/* <!-- <!ATTLIST model_prop key CDATA #REQUIRED> -->
-  * <!-- <!ATTLIST model_prop key CDATA #REQUIRED> -->  */
+A_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_LINK___AVAIL;
+       YY_BREAK

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

-YY_RULE_SETUP
-FAIL("Starting tag <model_prop> is not allowed here.");
-  YY_BREAK

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

-{
-  AX_surfxml_model___prop_id = 0;
-  surfxml_model___prop_id_isset = 0;
-  AX_surfxml_model___prop_value = 0;
-  surfxml_model___prop_value_isset = 0;
-  ENTER(AL_surfxml_model___prop); pushbuffer(0);
-  }
-  YY_BREAK
-
+A_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_BANDWIDTH;
+       YY_BREAK

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

-YY_RULE_SETUP
-if (surfxml_model___prop_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_model___prop>");} surfxml_model___prop_id_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_model___prop_id);
-  YY_BREAK

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

-if (surfxml_model___prop_id_isset != 0) {FAIL("Multiple definition of attribute id in <surfxml_model___prop>");}  surfxml_model___prop_id_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_model___prop_id);
-  YY_BREAK
+A_surfxml_trace___connect_kind = A_surfxml_trace___connect_kind_LATENCY;
+       YY_BREAK

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

-if (surfxml_model___prop_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_model___prop>");} surfxml_model___prop_value_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_model___prop_value);
-  YY_BREAK
+if (surfxml_trace___connect_trace_isset != 0) {FAIL("Multiple definition of attribute trace in <surfxml_trace___connect>");} surfxml_trace___connect_trace_isset = 1; ENTER(VALUE1); BUFFERSET(AX_surfxml_trace___connect_trace);
+       YY_BREAK

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

-if (surfxml_model___prop_value_isset != 0) {FAIL("Multiple definition of attribute value in <surfxml_model___prop>");}  surfxml_model___prop_value_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_model___prop_value);
-  YY_BREAK
+if (surfxml_trace___connect_trace_isset != 0) {FAIL("Multiple definition of attribute trace in <surfxml_trace___connect>");}  surfxml_trace___connect_trace_isset = 1; ENTER(VALUE2); BUFFERSET(AX_surfxml_trace___connect_trace);
+       YY_BREAK

 case 567:
 YY_RULE_SETUP
 {
 case 567:
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_model___prop_id) FAIL("Required attribute `id' not set for `model_prop' element.");
-  if (!AX_surfxml_model___prop_value) FAIL("Required attribute `value' not set for `model_prop' element.");
-  LEAVE; STag_surfxml_model___prop();surfxml_pcdata_ix = 0; ENTER(E_surfxml_model___prop);
+  if (!AX_surfxml_trace___connect_element) FAIL("Required attribute `element' not set for `trace_connect' element.");
+  if (!AX_surfxml_trace___connect_trace) FAIL("Required attribute `trace' not set for `trace_connect' element.");
+  LEAVE; STag_surfxml_trace___connect();surfxml_pcdata_ix = 0; ENTER(E_surfxml_trace___connect);

  }
  }

-  YY_BREAK
+       YY_BREAK

 case 568:
 YY_RULE_SETUP
 {
 case 568:
 YY_RULE_SETUP
 {

-  if (!AX_surfxml_model___prop_id) FAIL("Required attribute `id' not set for `model_prop' element.");
-  if (!AX_surfxml_model___prop_value) FAIL("Required attribute `value' not set for `model_prop' element.");
-  LEAVE; STag_surfxml_model___prop(); surfxml_pcdata_ix = 0; ETag_surfxml_model___prop(); popbuffer(); /* attribute */
+  if (!AX_surfxml_trace___connect_element) FAIL("Required attribute `element' not set for `trace_connect' element.");
+  if (!AX_surfxml_trace___connect_trace) FAIL("Required attribute `trace' not set for `trace_connect' element.");
+  LEAVE; STag_surfxml_trace___connect(); surfxml_pcdata_ix = 0; ETag_surfxml_trace___connect(); popbuffer(); /* attribute */

   switch (YY_START) {
   switch (YY_START) {

-   case S_surfxml_storage___type: case S_surfxml_storage___type_1: case S_surfxml_storage___type_2: SET(S_surfxml_storage___type_2); break;
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;

   }
  }
   }
  }

-  YY_BREAK
+       YY_BREAK

 case 569:
 YY_RULE_SETUP
 case 569:
 YY_RULE_SETUP

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

 case 570:
 YY_RULE_SETUP
 case 570:
 YY_RULE_SETUP

-FAIL("Bad attribute `%s' in `model_prop' element start tag.",surf_parse_text);
-  YY_BREAK
-case YY_STATE_EOF(AL_surfxml_model___prop):
-FAIL("EOF in attribute list of `model_prop' element.");
-  YY_BREAK
+FAIL("Bad attribute `%s' in `trace_connect' element start tag.",surf_parse_text);
+       YY_BREAK
+case YY_STATE_EOF(AL_surfxml_trace___connect):
+FAIL("EOF in attribute list of `trace_connect' element.");
+       YY_BREAK

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

-  ETag_surfxml_model___prop();
+  ETag_surfxml_trace___connect();

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

-   case S_surfxml_storage___type: case S_surfxml_storage___type_1: case S_surfxml_storage___type_2: SET(S_surfxml_storage___type_2); break;
+   case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_3: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: case S_surfxml_AS_8: SET(S_surfxml_AS_8); break;
+   case S_surfxml_include: case S_surfxml_include_1: case S_surfxml_include_2: SET(S_surfxml_include_2); break;
+   case S_surfxml_platform: case S_surfxml_platform_1: case S_surfxml_platform_3: case S_surfxml_platform_5: case S_surfxml_platform_6: SET(S_surfxml_platform_6); break;

   }
  }
   }
  }

-  YY_BREAK
+       YY_BREAK

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

-FAIL("Unexpected end-tag `%s': `</model_prop>' expected.",surf_parse_text);
-  YY_BREAK
+FAIL("Unexpected end-tag `%s': `</trace_connect>' expected.",surf_parse_text);
+       YY_BREAK

 case 573:
 YY_RULE_SETUP
 case 573:
 YY_RULE_SETUP

-FAIL("Unexpected character `%c': `</model_prop>' expected.",surf_parse_text[0]);
-  YY_BREAK
-case YY_STATE_EOF(E_surfxml_model___prop):
-if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</model_prop>' expected.");
-  YY_BREAK
+FAIL("Unexpected character `%c': `</trace_connect>' expected.",surf_parse_text[0]);
+       YY_BREAK
+case YY_STATE_EOF(E_surfxml_trace___connect):
+if(!ETag_surfxml_include_state()) FAIL("Premature EOF: `</trace_connect>' expected.");
+       YY_BREAK

 
 /* EPILOG: after the root element. */
 
 case 574:
 YY_RULE_SETUP
 {SET(PROLOG); yyless(0); CLEANUP; return -1;}
 
 /* EPILOG: after the root element. */
 
 case 574:
 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. */
 


@@ -9532,32 +9532,32 @@ SUCCEED;
 case 575:
 YY_RULE_SETUP
 BUFFERPUTC('&');
 case 575:
 YY_RULE_SETUP
 BUFFERPUTC('&');

-  YY_BREAK
+       YY_BREAK

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

-  YY_BREAK
+       YY_BREAK

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

-  YY_BREAK
+       YY_BREAK

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

-  YY_BREAK
+       YY_BREAK

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

-  YY_BREAK
+       YY_BREAK

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

-  YY_BREAK
+       YY_BREAK

 case 581:
 YY_RULE_SETUP
 BUFFERPUTC((unsigned char)strtol(surf_parse_text+3,NULL,16));
 case 581:
 YY_RULE_SETUP
 BUFFERPUTC((unsigned char)strtol(surf_parse_text+3,NULL,16));

-  YY_BREAK
+       YY_BREAK

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


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

-  YY_BREAK
+       YY_BREAK

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

-  YY_BREAK
+       YY_BREAK

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

-  YY_BREAK
+       YY_BREAK

 
 case 588:
 YY_RULE_SETUP
 BUFFERDONE; LEAVE;
 
 case 588:
 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 589:
 YY_RULE_SETUP
 BUFFERDONE; LEAVE;
 
 case 589:
 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 590:
 /* rule 590 can match eol */
 YY_RULE_SETUP
 BUFFERPUTC(surf_parse_text[0]);
 
 case 590:
 /* rule 590 can match eol */
 YY_RULE_SETUP
 BUFFERPUTC(surf_parse_text[0]);

-  YY_BREAK
+       YY_BREAK

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

-  YY_BREAK
+       YY_BREAK

 
 case 592:
 YY_RULE_SETUP
 LEAVE;
 
 case 592:
 YY_RULE_SETUP
 LEAVE;

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

 case 593:
 YY_RULE_SETUP
 BUFFERPUTC(surf_parse_text[0]);
 case 593:
 YY_RULE_SETUP
 BUFFERPUTC(surf_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


@@ -9627,12 +9627,12 @@ case 594:
 /* rule 594 can match eol */
 YY_RULE_SETUP
 FAIL("Syntax error on character `%c'.", surf_parse_text[0]);
 /* rule 594 can match eol */
 YY_RULE_SETUP
 FAIL("Syntax error on character `%c'.", surf_parse_text[0]);

-  YY_BREAK
+       YY_BREAK

 
 case 595:
 YY_RULE_SETUP
 ECHO;
 
 case 595:
 YY_RULE_SETUP
 ECHO;

-  YY_BREAK
+       YY_BREAK

 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(S_surfxml_AS_2):
 case YY_STATE_EOF(S_surfxml_AS_5):
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(S_surfxml_AS_2):
 case YY_STATE_EOF(S_surfxml_AS_5):


@@ -9654,332 +9654,332 @@ case YY_STATE_EOF(S_surfxml_route_1):
 case YY_STATE_EOF(S_surfxml_storage_1):
 case YY_STATE_EOF(S_surfxml_storage___type_1):
 case YY_STATE_EOF(IMPOSSIBLE):
 case YY_STATE_EOF(S_surfxml_storage_1):
 case YY_STATE_EOF(S_surfxml_storage___type_1):
 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 surf_parse_in at a new source and called
-       * surf_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 = surf_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 ( surf_parse_wrap( ) )
-          {
-          /* Note: because we've taken care in
-           * yy_get_next_buffer() to have set up
-           * surf_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 surf_parse_in at a new source and called
+                        * surf_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 = surf_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 ( surf_parse_wrap( ) )
+                                       {
+                                       /* Note: because we've taken care in
+                                        * yy_get_next_buffer() to have set up
+                                        * surf_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 surf_parse_lex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
  * Returns a code representing an action:
 } /* end of surf_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;
-      }
-    }
+       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. */
+                                       surf_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;
+                       surf_parse_restart(surf_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 *) surf_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];

 
 

-  /* 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. */
-          surf_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;
-      surf_parse_restart(surf_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 *) surf_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_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 >= 3466 )
-        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_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 >= 3466 )
+                               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 >= 3466 )
-      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 == 3465);
-
-    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 >= 3466 )
+                       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 == 3465);
+
+               return yy_is_jam ? 0 : yy_current_state;

 }
 
 #ifndef YY_NO_INPUT
 }
 
 #ifndef YY_NO_INPUT


@@ -9990,76 +9990,76 @@ static int yy_get_next_buffer (void)
 #endif
 
 {
 #endif
 
 {

-  int c;
+       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. */
-          surf_parse_restart(surf_parse_in );
-
-          /*FALLTHROUGH*/
-
-        case EOB_ACT_END_OF_FILE:
-          {
-          if ( surf_parse_wrap( ) )
-            return EOF;
-
-          if ( ! (yy_did_buffer_switch_on_eof) )
-            YY_NEW_FILE;
+       *(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. */
+                                       surf_parse_restart(surf_parse_in );
+
+                                       /*FALLTHROUGH*/
+
+                               case EOB_ACT_END_OF_FILE:
+                                       {
+                                       if ( surf_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 surf_parse_text */
-  (yy_hold_char) = *++(yy_c_buf_p);
+       c = *(unsigned char *) (yy_c_buf_p);    /* cast for 8-bit char's */
+       *(yy_c_buf_p) = '\0';   /* preserve surf_parse_text */
+       (yy_hold_char) = *++(yy_c_buf_p);

 
 

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

     surf_parse_lineno++;
 ;
 
     surf_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.


@@ -10069,14 +10069,14 @@ static int yy_get_next_buffer (void)
     void surf_parse_restart  (FILE * input_file )
 {
     
     void surf_parse_restart  (FILE * input_file )
 {
     

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

         surf_parse_ensure_buffer_stack ();
         surf_parse_ensure_buffer_stack ();

-    YY_CURRENT_BUFFER_LVALUE =
+               YY_CURRENT_BUFFER_LVALUE =

             surf_parse__create_buffer(surf_parse_in,YY_BUF_SIZE );
             surf_parse__create_buffer(surf_parse_in,YY_BUF_SIZE );

-  }
+       }

 
 

-  surf_parse__init_buffer(YY_CURRENT_BUFFER,input_file );
-  surf_parse__load_buffer_state( );
+       surf_parse__init_buffer(YY_CURRENT_BUFFER,input_file );
+       surf_parse__load_buffer_state( );

 }
 
 /** Switch to a different input buffer.
 }
 
 /** Switch to a different input buffer.


@@ -10086,40 +10086,40 @@ static int yy_get_next_buffer (void)
     void surf_parse__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
     
     void surf_parse__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
     

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

      */
      */

-  surf_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;
-  surf_parse__load_buffer_state( );
-
-  /* We don't actually know whether we did this switch during
-   * EOF (surf_parse_wrap()) processing, but the only time this flag
-   * is looked at is after surf_parse_wrap() is called, so it's safe
-   * to go ahead and always set it.
-   */
-  (yy_did_buffer_switch_on_eof) = 1;
+       surf_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;
+       surf_parse__load_buffer_state( );
+
+       /* We don't actually know whether we did this switch during
+        * EOF (surf_parse_wrap()) processing, but the only time this flag
+        * is looked at is after surf_parse_wrap() is called, so it's safe
+        * to go ahead and always set it.
+        */
+       (yy_did_buffer_switch_on_eof) = 1;

 }
 
 static void surf_parse__load_buffer_state  (void)
 {
 }
 
 static void surf_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;
-  surf_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;
+       surf_parse_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+       (yy_hold_char) = *(yy_c_buf_p);

 }
 
 /** Allocate and initialize an input buffer state.
 }
 
 /** Allocate and initialize an input buffer state.


@@ -10130,26 +10130,26 @@ static void surf_parse__load_buffer_state  (void)
  */
     YY_BUFFER_STATE surf_parse__create_buffer  (FILE * file, int  size )
 {
  */
     YY_BUFFER_STATE surf_parse__create_buffer  (FILE * file, int  size )
 {

-  YY_BUFFER_STATE b;
+       YY_BUFFER_STATE b;

     
     

-  b = (YY_BUFFER_STATE) surf_parse_alloc(sizeof( struct yy_buffer_state )  );
-  if ( ! b )
-    YY_FATAL_ERROR( "out of dynamic memory in surf_parse__create_buffer()" );
+       b = (YY_BUFFER_STATE) surf_parse_alloc(sizeof( struct yy_buffer_state )  );
+       if ( ! b )
+               YY_FATAL_ERROR( "out of dynamic memory in surf_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 *) surf_parse_alloc(b->yy_buf_size + 2  );
-  if ( ! b->yy_ch_buf )
-    YY_FATAL_ERROR( "out of dynamic memory in surf_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 *) surf_parse_alloc(b->yy_buf_size + 2  );
+       if ( ! b->yy_ch_buf )
+               YY_FATAL_ERROR( "out of dynamic memory in surf_parse__create_buffer()" );

 
 

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

 
 

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

 
 

-  return b;
+       return b;

 }
 
 /** Destroy the buffer.
 }
 
 /** Destroy the buffer.


@@ -10159,16 +10159,16 @@ static void surf_parse__load_buffer_state  (void)
     void surf_parse__delete_buffer (YY_BUFFER_STATE  b )
 {
     
     void surf_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 )
-    surf_parse_free((void *) b->yy_ch_buf  );
+       if ( b->yy_is_our_buffer )
+               surf_parse_free((void *) b->yy_ch_buf  );

 
 

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

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


@@ -10178,12 +10178,12 @@ static void surf_parse__load_buffer_state  (void)
     static void surf_parse__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
 {
     static void surf_parse__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
 {

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

     
     

-  surf_parse__flush_buffer(b );
+       surf_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 surf_parse__init_buffer was _probably_
      * called from surf_parse_restart() or through yy_get_next_buffer.
 
     /* If b is the current buffer, then surf_parse__init_buffer was _probably_
      * called from surf_parse_restart() or through yy_get_next_buffer.


@@ -10196,7 +10196,7 @@ static void surf_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.
 }
 
 /** Discard all buffered characters. On the next scan, YY_INPUT will be called.


@@ -10205,25 +10205,25 @@ static void surf_parse__load_buffer_state  (void)
  */
     void surf_parse__flush_buffer (YY_BUFFER_STATE  b )
 {
  */
     void surf_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 )
-    surf_parse__load_buffer_state( );
+       if ( b == YY_CURRENT_BUFFER )
+               surf_parse__load_buffer_state( );

 }
 
 /** Pushes the new state onto the stack. The new state becomes
 }
 
 /** Pushes the new state onto the stack. The new state becomes


@@ -10234,28 +10234,28 @@ static void surf_parse__load_buffer_state  (void)
  */
 void surf_parse_push_buffer_state (YY_BUFFER_STATE new_buffer )
 {
  */
 void surf_parse_push_buffer_state (YY_BUFFER_STATE new_buffer )
 {

-      if (new_buffer == NULL)
-    return;
+       if (new_buffer == NULL)
+               return;

 
 

-  surf_parse_ensure_buffer_stack();
+       surf_parse_ensure_buffer_stack();

 
 

-  /* This block is copied from surf_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);
-    }
+       /* This block is copied from surf_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;
+       /* Only push if top exists. Otherwise, replace top. */
+       if (YY_CURRENT_BUFFER)
+               (yy_buffer_stack_top)++;
+       YY_CURRENT_BUFFER_LVALUE = new_buffer;

 
 

-  /* copied from surf_parse__switch_to_buffer. */
-  surf_parse__load_buffer_state( );
-  (yy_did_buffer_switch_on_eof) = 1;
+       /* copied from surf_parse__switch_to_buffer. */
+       surf_parse__load_buffer_state( );
+       (yy_did_buffer_switch_on_eof) = 1;

 }
 
 /** Removes and deletes the top of the stack, if present.
 }
 
 /** Removes and deletes the top of the stack, if present.


@@ -10264,18 +10264,18 @@ void surf_parse_push_buffer_state (YY_BUFFER_STATE new_buffer )
  */
 void surf_parse_pop_buffer_state (void)
 {
  */
 void surf_parse_pop_buffer_state (void)
 {

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

 
 

-  surf_parse__delete_buffer(YY_CURRENT_BUFFER );
-  YY_CURRENT_BUFFER_LVALUE = NULL;
-  if ((yy_buffer_stack_top) > 0)
-    --(yy_buffer_stack_top);
+       surf_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) {
-    surf_parse__load_buffer_state( );
-    (yy_did_buffer_switch_on_eof) = 1;
-  }
+       if (YY_CURRENT_BUFFER) {
+               surf_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.


@@ -10283,45 +10283,45 @@ void surf_parse_pop_buffer_state (void)
  */
 static void surf_parse_ensure_buffer_stack (void)
 {
  */
 static void surf_parse_ensure_buffer_stack (void)
 {

-  yy_size_t num_to_alloc;
+       yy_size_t num_to_alloc;

     
     

-  if (!(yy_buffer_stack)) {
+       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**)surf_parse_alloc
-                (num_to_alloc * sizeof(struct yy_buffer_state*)
-                );
-    if ( ! (yy_buffer_stack) )
-      YY_FATAL_ERROR( "out of dynamic memory in surf_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**)surf_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 surf_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**)surf_parse_alloc
+                                                               (num_to_alloc * sizeof(struct yy_buffer_state*)
+                                                               );
+               if ( ! (yy_buffer_stack) )
+                       YY_FATAL_ERROR( "out of dynamic memory in surf_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**)surf_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 surf_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.
 }
 
 /** Setup the input buffer state to scan directly from a user-specified character buffer.


@@ -10332,31 +10332,31 @@ static void surf_parse_ensure_buffer_stack (void)
  */
 YY_BUFFER_STATE surf_parse__scan_buffer  (char * base, yy_size_t  size )
 {
  */
 YY_BUFFER_STATE surf_parse__scan_buffer  (char * base, yy_size_t  size )
 {

-  YY_BUFFER_STATE 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) surf_parse_alloc(sizeof( struct yy_buffer_state )  );
-  if ( ! b )
-    YY_FATAL_ERROR( "out of dynamic memory in surf_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;
-
-  surf_parse__switch_to_buffer(b  );
-
-  return 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) surf_parse_alloc(sizeof( struct yy_buffer_state )  );
+       if ( ! b )
+               YY_FATAL_ERROR( "out of dynamic memory in surf_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;
+
+       surf_parse__switch_to_buffer(b  );
+
+       return b;

 }
 
 /** Setup the input buffer state to scan a string. The next call to surf_parse_lex() will
 }
 
 /** Setup the input buffer state to scan a string. The next call to surf_parse_lex() will


@@ -10370,7 +10370,7 @@ YY_BUFFER_STATE surf_parse__scan_buffer  (char * base, yy_size_t  size )
 YY_BUFFER_STATE surf_parse__scan_string (yyconst char * yystr )
 {
     
 YY_BUFFER_STATE surf_parse__scan_string (yyconst char * yystr )
 {
     

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

 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to surf_parse_lex() will
 }
 
 /** Setup the input buffer state to scan the given bytes. The next call to surf_parse_lex() will


@@ -10382,64 +10382,64 @@ YY_BUFFER_STATE surf_parse__scan_string (yyconst char * yystr )
  */
 YY_BUFFER_STATE surf_parse__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
 {
  */
 YY_BUFFER_STATE surf_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;
+       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 *) surf_parse_alloc(n  );
-  if ( ! buf )
-    YY_FATAL_ERROR( "out of dynamic memory in surf_parse__scan_bytes()" );
+       /* Get memory for full buffer, including space for trailing EOB's. */
+       n = _yybytes_len + 2;
+       buf = (char *) surf_parse_alloc(n  );
+       if ( ! buf )
+               YY_FATAL_ERROR( "out of dynamic memory in surf_parse__scan_bytes()" );

 
 

-  for ( i = 0; i < _yybytes_len; ++i )
-    buf[i] = yybytes[i];
+       for ( i = 0; i < _yybytes_len; ++i )
+               buf[i] = yybytes[i];

 
 

-  buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+       buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;

 
 

-  b = surf_parse__scan_buffer(buf,n );
-  if ( ! b )
-    YY_FATAL_ERROR( "bad buffer in surf_parse__scan_bytes()" );
+       b = surf_parse__scan_buffer(buf,n );
+       if ( ! b )
+               YY_FATAL_ERROR( "bad buffer in surf_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;
+       /* 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;
+       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 *) surf_parse_alloc(new_size  );
+               if ( ! (yy_start_stack) )
+                       (yy_start_stack) = (int *) surf_parse_alloc(new_size  );

 
 

-    else
-      (yy_start_stack) = (int *) surf_parse_realloc((void *) (yy_start_stack),new_size  );
+               else
+                       (yy_start_stack) = (int *) surf_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


@@ -10448,26 +10448,26 @@ YY_BUFFER_STATE surf_parse__scan_bytes  (yyconst char * yybytes, yy_size_t  _yyb
 
 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 surf_parse_text. */ \
+       do \
+               { \
+               /* Undo effects of setting up surf_parse_text. */ \

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

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

 
 /* Accessor  methods (get/set functions) to struct members. */
 
 
 /* Accessor  methods (get/set functions) to struct members. */
 


@@ -10589,15 +10589,15 @@ int surf_parse_lex_destroy  (void)
 {
     
     /* Pop the buffer stack, destroying each element. */
 {
     
     /* Pop the buffer stack, destroying each element. */

-  while(YY_CURRENT_BUFFER){
-    surf_parse__delete_buffer(YY_CURRENT_BUFFER  );
-    YY_CURRENT_BUFFER_LVALUE = NULL;
-    surf_parse_pop_buffer_state();
-  }
+       while(YY_CURRENT_BUFFER){
+               surf_parse__delete_buffer(YY_CURRENT_BUFFER  );
+               YY_CURRENT_BUFFER_LVALUE = NULL;
+               surf_parse_pop_buffer_state();
+       }

 
 

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

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


@@ -10617,43 +10617,43 @@ int surf_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 *surf_parse_alloc (yy_size_t  size )
 {
 }
 #endif
 
 void *surf_parse_alloc (yy_size_t  size )
 {

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

 }
 
 void *surf_parse_realloc  (void * ptr, yy_size_t  size )
 {
 }
 
 void *surf_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 surf_parse_free (void * ptr )
 {
 }
 
 void surf_parse_free (void * ptr )
 {

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

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


@@ -10662,8 +10662,8 @@ void surf_parse_free (void * ptr )
 int surfxml_element_context(int i)
 {
   return (0<i && i<yy_start_stack_depth
 int surfxml_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


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

-  print_surfxml_bufferstack();
+       print_surfxml_bufferstack();

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


@@ -10717,7 +10717,7 @@ static void cleanup(void)
 {
     if (surfxml_statenames) {
         free(surfxml_statenames);
 {
     if (surfxml_statenames) {
         free(surfxml_statenames);

-  surfxml_statenames = NULL;
+       surfxml_statenames = NULL;

     }
     free(surfxml_bufferstack);
     surfxml_bufferstack = NULL;
     }
     free(surfxml_bufferstack);
     surfxml_bufferstack = NULL;


@@ -10732,12 +10732,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): ",
-       surf_parse_lineno, YY_START);
+                  "Invalid XML (XML input line %d, state %d): ",
+                  surf_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);