From: Martin Quinson Date: Mon, 15 Oct 2018 12:26:29 +0000 (+0200) Subject: forbid cabinet in inner zones X-Git-Tag: v3_22~889 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/0e80c1ab49011f9512b4278979123375d9135ff2 forbid cabinet in inner zones --- diff --git a/src/surf/xml/simgrid.dtd b/src/surf/xml/simgrid.dtd index d499d3d5e1..0e9eb83d30 100644 --- a/src/surf/xml/simgrid.dtd +++ b/src/surf/xml/simgrid.dtd @@ -117,7 +117,7 @@ To upgrade your files, use the tool simgrid_update_xml = 4086 ) + if ( yy_current_state >= 4088 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 14057 ); + while ( yy_base[yy_current_state] != 14062 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -7288,10 +7288,10 @@ YY_RULE_SETUP 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_13: case S_surfxml_AS_14: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; - case S_surfxml_zone_13: case S_surfxml_zone_14: case S_surfxml_zone_1: SET(S_surfxml_zone_14); break; - case S_surfxml_zone: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; + case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; + case S_surfxml_zone: case S_surfxml_zone_13: case S_surfxml_zone_14: SET(S_surfxml_zone_14); break; + case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; } } YY_BREAK @@ -7315,10 +7315,10 @@ YY_RULE_SETUP ETag_surfxml_backbone(); popbuffer(); /* attribute */ switch (YY_START) { - case S_surfxml_AS: case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; - case S_surfxml_zone_13: case S_surfxml_zone_14: case S_surfxml_zone_1: SET(S_surfxml_zone_14); break; - case S_surfxml_zone: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; + case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; + case S_surfxml_zone: case S_surfxml_zone_13: case S_surfxml_zone_14: SET(S_surfxml_zone_14); break; + case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; } } YY_BREAK @@ -7804,12 +7804,11 @@ YY_RULE_SETUP 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_13: case S_surfxml_AS_14: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; + case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS: case S_surfxml_AS_1: 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; - case S_surfxml_zone_13: case S_surfxml_zone_14: case S_surfxml_zone_1: SET(S_surfxml_zone_14); break; - case S_surfxml_zone: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; + case S_surfxml_zone: case S_surfxml_zone_13: case S_surfxml_zone_14: case S_surfxml_zone_1: case S_surfxml_zone_3: SET(S_surfxml_zone_14); break; } } YY_BREAK @@ -7833,12 +7832,11 @@ YY_RULE_SETUP ETag_surfxml_cabinet(); popbuffer(); /* attribute */ switch (YY_START) { - case S_surfxml_AS: case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; + case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS: case S_surfxml_AS_1: 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; - case S_surfxml_zone_13: case S_surfxml_zone_14: case S_surfxml_zone_1: SET(S_surfxml_zone_14); break; - case S_surfxml_zone: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; + case S_surfxml_zone: case S_surfxml_zone_13: case S_surfxml_zone_14: case S_surfxml_zone_1: case S_surfxml_zone_3: SET(S_surfxml_zone_14); break; } } YY_BREAK @@ -8582,12 +8580,12 @@ 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_13: case S_surfxml_AS_14: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; + case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS: case S_surfxml_AS_1: 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; - case S_surfxml_zone_13: case S_surfxml_zone_14: case S_surfxml_zone_1: SET(S_surfxml_zone_14); break; - case S_surfxml_zone: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; + case S_surfxml_zone: case S_surfxml_zone_13: case S_surfxml_zone_14: SET(S_surfxml_zone_14); break; + case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; } } YY_BREAK @@ -8611,12 +8609,12 @@ YY_RULE_SETUP ETag_surfxml_include(); popbuffer(); /* attribute */ switch (YY_START) { - case S_surfxml_AS: case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; + case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS: case S_surfxml_AS_1: 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; - case S_surfxml_zone_13: case S_surfxml_zone_14: case S_surfxml_zone_1: SET(S_surfxml_zone_14); break; - case S_surfxml_zone: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; + case S_surfxml_zone: case S_surfxml_zone_13: case S_surfxml_zone_14: SET(S_surfxml_zone_14); break; + case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; } } YY_BREAK @@ -8765,10 +8763,10 @@ YY_RULE_SETUP 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_13: case S_surfxml_AS_14: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; - case S_surfxml_zone_13: case S_surfxml_zone_14: case S_surfxml_zone_1: SET(S_surfxml_zone_14); break; - case S_surfxml_zone: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; + case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; + case S_surfxml_zone: case S_surfxml_zone_13: case S_surfxml_zone_14: SET(S_surfxml_zone_14); break; + case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; } } YY_BREAK @@ -8792,10 +8790,10 @@ YY_RULE_SETUP ETag_surfxml_link(); popbuffer(); /* attribute */ switch (YY_START) { - case S_surfxml_AS: case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; - case S_surfxml_zone_13: case S_surfxml_zone_14: case S_surfxml_zone_1: SET(S_surfxml_zone_14); break; - case S_surfxml_zone: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; + case S_surfxml_AS_13: case S_surfxml_AS_14: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS: case S_surfxml_AS_1: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; + case S_surfxml_zone: case S_surfxml_zone_13: case S_surfxml_zone_14: SET(S_surfxml_zone_14); break; + case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; } } YY_BREAK @@ -10396,18 +10394,18 @@ YY_RULE_SETUP 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_10: case S_surfxml_AS_11: case S_surfxml_AS_7: SET(S_surfxml_AS_11); break; - case S_surfxml_AS_13: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS: case S_surfxml_AS_12: case S_surfxml_AS_14: case S_surfxml_AS_15: case S_surfxml_AS_16: SET(S_surfxml_AS_16); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; - case S_surfxml_AS_4: case S_surfxml_AS_8: case S_surfxml_AS_9: SET(S_surfxml_AS_9); break; + case S_surfxml_AS_10: case S_surfxml_AS_11: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: SET(S_surfxml_AS_11); break; + case S_surfxml_AS_13: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS_12: case S_surfxml_AS_14: case S_surfxml_AS_15: case S_surfxml_AS_16: SET(S_surfxml_AS_16); break; + case S_surfxml_AS_1: case S_surfxml_AS_5: SET(S_surfxml_AS_6); break; + case S_surfxml_AS: case S_surfxml_AS_8: case S_surfxml_AS_9: SET(S_surfxml_AS_9); 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; - case S_surfxml_zone: case S_surfxml_zone_10: case S_surfxml_zone_11: case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_4: case S_surfxml_zone_7: SET(S_surfxml_zone_11); break; + case S_surfxml_zone: case S_surfxml_zone_10: case S_surfxml_zone_11: case S_surfxml_zone_4: case S_surfxml_zone_6: case S_surfxml_zone_7: SET(S_surfxml_zone_11); break; case S_surfxml_zone_13: case S_surfxml_zone_14: SET(S_surfxml_zone_14); break; case S_surfxml_zone_12: case S_surfxml_zone_15: case S_surfxml_zone_16: SET(S_surfxml_zone_16); break; - case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; - case S_surfxml_zone_8: case S_surfxml_zone_9: SET(S_surfxml_zone_9); break; + case S_surfxml_zone_5: SET(S_surfxml_zone_6); break; + case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_8: case S_surfxml_zone_9: SET(S_surfxml_zone_9); break; } } YY_BREAK @@ -10433,18 +10431,18 @@ YY_RULE_SETUP surfxml_pcdata_ix = popbuffer(); popbuffer(); /* attribute */ switch (YY_START) { - case S_surfxml_AS_10: case S_surfxml_AS_11: case S_surfxml_AS_7: SET(S_surfxml_AS_11); break; - case S_surfxml_AS_13: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS: case S_surfxml_AS_12: case S_surfxml_AS_14: case S_surfxml_AS_15: case S_surfxml_AS_16: SET(S_surfxml_AS_16); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; - case S_surfxml_AS_4: case S_surfxml_AS_8: case S_surfxml_AS_9: SET(S_surfxml_AS_9); break; + case S_surfxml_AS_10: case S_surfxml_AS_11: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: SET(S_surfxml_AS_11); break; + case S_surfxml_AS_13: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS_12: case S_surfxml_AS_14: case S_surfxml_AS_15: case S_surfxml_AS_16: SET(S_surfxml_AS_16); break; + case S_surfxml_AS_1: case S_surfxml_AS_5: SET(S_surfxml_AS_6); break; + case S_surfxml_AS: case S_surfxml_AS_8: case S_surfxml_AS_9: SET(S_surfxml_AS_9); 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; - case S_surfxml_zone: case S_surfxml_zone_10: case S_surfxml_zone_11: case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_4: case S_surfxml_zone_7: SET(S_surfxml_zone_11); break; + case S_surfxml_zone: case S_surfxml_zone_10: case S_surfxml_zone_11: case S_surfxml_zone_4: case S_surfxml_zone_6: case S_surfxml_zone_7: SET(S_surfxml_zone_11); break; case S_surfxml_zone_13: case S_surfxml_zone_14: SET(S_surfxml_zone_14); break; case S_surfxml_zone_12: case S_surfxml_zone_15: case S_surfxml_zone_16: SET(S_surfxml_zone_16); break; - case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; - case S_surfxml_zone_8: case S_surfxml_zone_9: SET(S_surfxml_zone_9); break; + case S_surfxml_zone_5: SET(S_surfxml_zone_6); break; + case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_8: case S_surfxml_zone_9: SET(S_surfxml_zone_9); break; } } YY_BREAK @@ -10546,18 +10544,18 @@ YY_RULE_SETUP 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) { - case S_surfxml_AS_10: case S_surfxml_AS_11: case S_surfxml_AS_7: SET(S_surfxml_AS_11); break; - case S_surfxml_AS_13: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS: case S_surfxml_AS_12: case S_surfxml_AS_14: case S_surfxml_AS_15: case S_surfxml_AS_16: SET(S_surfxml_AS_16); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; - case S_surfxml_AS_4: case S_surfxml_AS_8: case S_surfxml_AS_9: SET(S_surfxml_AS_9); break; + case S_surfxml_AS_10: case S_surfxml_AS_11: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: SET(S_surfxml_AS_11); break; + case S_surfxml_AS_13: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS_12: case S_surfxml_AS_14: case S_surfxml_AS_15: case S_surfxml_AS_16: SET(S_surfxml_AS_16); break; + case S_surfxml_AS_1: case S_surfxml_AS_5: SET(S_surfxml_AS_6); break; + case S_surfxml_AS: case S_surfxml_AS_8: case S_surfxml_AS_9: SET(S_surfxml_AS_9); 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; - case S_surfxml_zone: case S_surfxml_zone_10: case S_surfxml_zone_11: case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_4: case S_surfxml_zone_7: SET(S_surfxml_zone_11); break; + case S_surfxml_zone: case S_surfxml_zone_10: case S_surfxml_zone_11: case S_surfxml_zone_4: case S_surfxml_zone_6: case S_surfxml_zone_7: SET(S_surfxml_zone_11); break; case S_surfxml_zone_13: case S_surfxml_zone_14: SET(S_surfxml_zone_14); break; case S_surfxml_zone_12: case S_surfxml_zone_15: case S_surfxml_zone_16: SET(S_surfxml_zone_16); break; - case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; - case S_surfxml_zone_8: case S_surfxml_zone_9: SET(S_surfxml_zone_9); break; + case S_surfxml_zone_5: SET(S_surfxml_zone_6); break; + case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_8: case S_surfxml_zone_9: SET(S_surfxml_zone_9); break; } } YY_BREAK @@ -10581,18 +10579,18 @@ YY_RULE_SETUP ETag_surfxml_trace___connect(); popbuffer(); /* attribute */ switch (YY_START) { - case S_surfxml_AS_10: case S_surfxml_AS_11: case S_surfxml_AS_7: SET(S_surfxml_AS_11); break; - case S_surfxml_AS_13: case S_surfxml_AS_1: SET(S_surfxml_AS_14); break; - case S_surfxml_AS: case S_surfxml_AS_12: case S_surfxml_AS_14: case S_surfxml_AS_15: case S_surfxml_AS_16: SET(S_surfxml_AS_16); break; - case S_surfxml_AS_3: case S_surfxml_AS_5: case S_surfxml_AS_6: SET(S_surfxml_AS_6); break; - case S_surfxml_AS_4: case S_surfxml_AS_8: case S_surfxml_AS_9: SET(S_surfxml_AS_9); break; + case S_surfxml_AS_10: case S_surfxml_AS_11: case S_surfxml_AS_4: case S_surfxml_AS_6: case S_surfxml_AS_7: SET(S_surfxml_AS_11); break; + case S_surfxml_AS_13: case S_surfxml_AS_3: SET(S_surfxml_AS_14); break; + case S_surfxml_AS_12: case S_surfxml_AS_14: case S_surfxml_AS_15: case S_surfxml_AS_16: SET(S_surfxml_AS_16); break; + case S_surfxml_AS_1: case S_surfxml_AS_5: SET(S_surfxml_AS_6); break; + case S_surfxml_AS: case S_surfxml_AS_8: case S_surfxml_AS_9: SET(S_surfxml_AS_9); 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; - case S_surfxml_zone: case S_surfxml_zone_10: case S_surfxml_zone_11: case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_4: case S_surfxml_zone_7: SET(S_surfxml_zone_11); break; + case S_surfxml_zone: case S_surfxml_zone_10: case S_surfxml_zone_11: case S_surfxml_zone_4: case S_surfxml_zone_6: case S_surfxml_zone_7: SET(S_surfxml_zone_11); break; case S_surfxml_zone_13: case S_surfxml_zone_14: SET(S_surfxml_zone_14); break; case S_surfxml_zone_12: case S_surfxml_zone_15: case S_surfxml_zone_16: SET(S_surfxml_zone_16); break; - case S_surfxml_zone_5: case S_surfxml_zone_6: SET(S_surfxml_zone_6); break; - case S_surfxml_zone_8: case S_surfxml_zone_9: SET(S_surfxml_zone_9); break; + case S_surfxml_zone_5: SET(S_surfxml_zone_6); break; + case S_surfxml_zone_1: case S_surfxml_zone_3: case S_surfxml_zone_8: case S_surfxml_zone_9: SET(S_surfxml_zone_9); break; } } YY_BREAK @@ -10611,7 +10609,7 @@ FAIL("Premature EOF: `' expected."); /* - * (((AS|zone|include|link|backbone|cabinet|cluster|peer|trace|trace_connect)*, + * (((AS|zone|include|link|backbone|cluster|peer|trace|trace_connect)*, * (zoneRoute|ASroute|trace|trace_connect|bypassASroute|bypassZoneRoute)*, * (trace|trace_connect)*) * |((include|storage_type|storage|host|cabinet|router|link|backbone|trace|trace_connect|host_link)*, @@ -11386,7 +11384,7 @@ static int yy_get_next_buffer (void) 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 >= 4086 ) + if ( yy_current_state >= 4088 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -11414,11 +11412,11 @@ static int yy_get_next_buffer (void) 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 >= 4086 ) + if ( yy_current_state >= 4088 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 4085); + yy_is_jam = (yy_current_state == 4087); return yy_is_jam ? 0 : yy_current_state; }