From bc5f945db724984312da4c8d3905c1db7d168889 Mon Sep 17 00:00:00 2001 From: alegrand Date: Tue, 21 Mar 2006 12:45:29 +0000 Subject: [PATCH] keep up with last Darina's modifications of the DTD git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@1971 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/xbt/graphxml.h | 23 +- src/xbt/graphxml.c | 1168 ++++++++++++++++++++-------------------- src/xbt/graphxml.l | 20 +- 3 files changed, 623 insertions(+), 588 deletions(-) diff --git a/include/xbt/graphxml.h b/include/xbt/graphxml.h index 354d999570..a99ad510d8 100644 --- a/include/xbt/graphxml.h +++ b/include/xbt/graphxml.h @@ -1,9 +1,9 @@ /* XML processor/application API for ../../src/xbt/graphxml.dtd. - * Generated 2006/03/21 12:59:32. + * Generated 2006/03/21 13:43:39. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright © 1999-2005 Kristoffer Rose. All rights reserved. - * (Id: flexml.pl,v 1.46 2006/03/21 08:24:12 legranda Exp). + * (Id: flexml.pl,v 1.47 2006/03/21 11:12:57 legranda Exp). * * There are two, intertwined parts to this program, part A and part B. * @@ -56,29 +56,32 @@ extern void STag_graphxml_edge(void); extern void ETag_graphxml_edge(void); /* XML application data. */ -typedef const char* AT_graphxml_edge_target; -#define AU_graphxml_edge_target NULL typedef const char* AT_graphxml_node_name; #define AU_graphxml_node_name NULL +typedef const char* AT_graphxml_edge_source; +#define AU_graphxml_edge_source NULL +typedef enum { AU_graphxml_edge_isDirected, A_graphxml_edge_isDirected_true,A_graphxml_edge_isDirected_false } AT_graphxml_edge_isDirected; +typedef const char* AT_graphxml_edge_target; +#define AU_graphxml_edge_target NULL typedef const char* AT_graphxml_node_label; #define AU_graphxml_node_label NULL typedef const char* AT_graphxml_edge_label; #define AU_graphxml_edge_label NULL -typedef const char* AT_graphxml_edge_source; -#define AU_graphxml_edge_source NULL -typedef enum { AU_graphxml_edge_isDirected, A_graphxml_edge_isDirected_true,A_graphxml_edge_isDirected_false } AT_graphxml_edge_isDirected; typedef const char* AT_graphxml_edge_name; #define AU_graphxml_edge_name NULL +typedef const char* AT_graphxml_edge_length; +#define AU_graphxml_edge_length NULL /* FleXML-provided data. */ extern const char* pcdata; -extern AT_graphxml_edge_target A_graphxml_edge_target; extern AT_graphxml_node_name A_graphxml_node_name; -extern AT_graphxml_node_label A_graphxml_node_label; -extern AT_graphxml_edge_label A_graphxml_edge_label; extern AT_graphxml_edge_source A_graphxml_edge_source; extern AT_graphxml_edge_isDirected A_graphxml_edge_isDirected; +extern AT_graphxml_edge_target A_graphxml_edge_target; +extern AT_graphxml_node_label A_graphxml_node_label; +extern AT_graphxml_edge_label A_graphxml_edge_label; extern AT_graphxml_edge_name A_graphxml_edge_name; +extern AT_graphxml_edge_length A_graphxml_edge_length; /* XML application utilities. */ extern int graphxml_element_context(int); diff --git a/src/xbt/graphxml.c b/src/xbt/graphxml.c index fca82c1ed5..e4f8efaaff 100644 --- a/src/xbt/graphxml.c +++ b/src/xbt/graphxml.c @@ -380,8 +380,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 79 -#define YY_END_OF_BUFFER 80 +#define YY_NUM_RULES 81 +#define YY_END_OF_BUFFER 82 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -389,52 +389,53 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[497] = +static yyconst flex_int16_t yy_accept[507] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 80, 78, 17, 10, 10, 17, 17, 58, 10, 58, - 5, 6, 5, 8, 9, 8, 74, 66, 67, 75, - 72, 75, 73, 77, 66, 67, 77, 78, 21, 10, - 21, 21, 21, 19, 25, 10, 25, 25, 78, 78, + 82, 80, 17, 10, 10, 17, 17, 60, 10, 60, + 5, 6, 5, 8, 9, 8, 76, 68, 69, 77, + 74, 77, 75, 79, 68, 69, 79, 80, 21, 10, + 21, 21, 21, 19, 25, 10, 25, 25, 80, 80, 25, 33, 10, 33, 33, 33, 31, 33, 33, 37, - 10, 37, 53, 10, 53, 53, 53, 51, 53, 53, - 53, 53, 53, 57, 10, 57, 75, 74, 10, 0, - 2, 2, 0, 4, 7, 69, 68, 0, 0, 0, + 10, 37, 55, 10, 55, 55, 55, 53, 55, 55, + 55, 55, 55, 59, 10, 59, 77, 76, 10, 0, + 2, 2, 0, 4, 7, 71, 70, 0, 0, 0, 0, 0, 0, 0, 20, 22, 0, 0, 0, 32, - 34, 34, 34, 0, 52, 54, 54, 54, 54, 54, - 54, 0, 0, 0, 0, 0, 0, 0, 3, 0, - 0, 0, 0, 0, 0, 0, 76, 0, 0, 0, - 0, 0, 34, 34, 0, 0, 54, 54, 54, 54, - 54, 0, 0, 0, 71, 0, 16, 1, 0, 0, - 64, 0, 0, 0, 61, 60, 0, 0, 0, 0, - - 24, 0, 0, 0, 34, 34, 0, 0, 36, 0, - 54, 54, 54, 54, 54, 0, 0, 56, 0, 0, - 0, 0, 65, 59, 0, 0, 0, 0, 38, 26, - 34, 0, 0, 0, 54, 54, 0, 0, 54, 54, - 0, 0, 0, 0, 0, 12, 0, 62, 63, 18, - 0, 38, 26, 0, 0, 0, 30, 29, 0, 54, - 0, 0, 0, 42, 41, 54, 54, 0, 0, 0, - 0, 0, 11, 18, 0, 0, 28, 27, 0, 35, - 54, 0, 40, 39, 0, 0, 0, 0, 0, 55, - 0, 0, 0, 0, 0, 23, 54, 0, 44, 43, - - 0, 46, 45, 0, 0, 0, 0, 54, 70, 0, - 0, 0, 54, 0, 0, 0, 0, 0, 0, 0, + 34, 34, 34, 0, 54, 56, 56, 56, 56, 56, + 56, 56, 0, 0, 0, 0, 0, 0, 0, 3, + 0, 0, 0, 0, 0, 0, 0, 78, 0, 0, + 0, 0, 0, 34, 34, 0, 0, 56, 56, 56, + 56, 56, 56, 0, 0, 0, 73, 0, 16, 1, + 0, 0, 66, 0, 0, 0, 63, 62, 0, 0, + + 0, 0, 24, 0, 0, 0, 34, 34, 0, 0, + 36, 0, 56, 56, 56, 56, 56, 56, 0, 0, + 58, 0, 0, 0, 0, 67, 61, 0, 0, 0, + 0, 38, 26, 34, 0, 0, 0, 56, 56, 56, + 0, 0, 56, 56, 0, 0, 0, 0, 0, 12, + 0, 64, 65, 18, 0, 38, 26, 0, 0, 0, + 30, 29, 0, 56, 0, 0, 56, 0, 42, 41, + 56, 56, 0, 0, 0, 0, 0, 11, 18, 0, + 0, 28, 27, 0, 35, 56, 0, 40, 39, 0, + 0, 0, 0, 0, 0, 0, 57, 0, 0, 0, + + 0, 0, 23, 56, 0, 48, 47, 0, 44, 43, + 0, 46, 45, 0, 0, 0, 0, 56, 72, 0, + 0, 0, 56, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 12, 0, - 0, 48, 0, 47, 0, 0, 0, 0, 0, 0, - 0, 50, 49, 0, 0, 0, 0, 0, 0, 0, + 0, 50, 0, 49, 0, 0, 0, 0, 0, 0, + 0, 52, 51, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -444,8 +445,8 @@ static yyconst flex_int16_t yy_accept[497] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, - 0, 0, 14, 0, 15, 0 + 0, 0, 14, 0, 15, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -490,166 +491,168 @@ static yyconst flex_int32_t yy_meta[54] = 5, 5, 5 } ; -static yyconst flex_int16_t yy_base[527] = +static yyconst flex_int16_t yy_base[537] = { 0, 0, 0, 0, 3, 6, 9, 24, 27, 11, 14, 15, 17, 29, 38, 45, 52, 59, 61, 67, 70, 93, 125, 73, 76, 143, 146, 149, 164, 167, 170, 173, 188, 191, 194, 197, 212, 215, 218, 234, 0, 286, 289, 292, 295, 311, 0, 363, 366, 368, 370, - 1424, 1425, 1425, 111, 114, 47, 62, 1425, 117, 159, - 1425, 1425, 1413, 1425, 1425, 1404, 1425, 1417, 1417, 368, - 1425, 1425, 1425, 1425, 1415, 1415, 1385, 372, 1425, 221, - 1398, 0, 183, 1425, 1425, 385, 380, 385, 375, 376, - 393, 1425, 423, 1397, 0, 207, 1425, 1381, 1380, 1425, - - 426, 404, 1425, 429, 1394, 0, 401, 1425, 1362, 1377, - 1376, 1363, 1374, 1425, 432, 432, 1401, 1373, 436, 34, - 1351, 1425, 1393, 1384, 1425, 1425, 1425, 37, 39, 1351, - 1350, 1348, 1380, 1349, 1425, 0, 1357, 1359, 1349, 1425, - 0, 1359, 1349, 1347, 1425, 0, 1367, 1355, 1345, 1336, - 1338, 1348, 1353, 1365, 1364, 1371, 137, 1337, 1425, 145, - 0, 1333, 1333, 1362, 1361, 1330, 1425, 1341, 439, 443, - 1266, 1268, 1257, 1254, 446, 450, 1247, 1248, 1241, 1225, - 1229, 456, 463, 1164, 1425, 1167, 1425, 1425, 17, 1142, - 1425, 1168, 1167, 1132, 1425, 1425, 1130, 1133, 467, 474, - - 1425, 480, 1141, 1140, 1134, 484, 500, 503, 1425, 506, - 1126, 1127, 512, 1133, 1129, 523, 528, 1425, 531, 1142, - 385, 534, 1425, 1425, 1148, 1147, 1117, 541, 552, 558, - 561, 564, 570, 580, 1109, 586, 589, 593, 1108, 1090, - 605, 1112, 378, 1108, 608, 1425, 1106, 1425, 1425, 611, - 616, 625, 628, 633, 637, 645, 1425, 1425, 655, 1084, - 659, 662, 675, 1425, 1425, 683, 686, 689, 1033, 282, - 143, 70, 1425, 692, 695, 702, 1425, 1425, 712, 1425, - 954, 715, 1425, 1425, 723, 729, 739, 742, 750, 1425, - 978, 161, 104, 136, 755, 1425, 951, 758, 1425, 1425, - - 768, 1425, 1425, 953, 776, 163, 444, 892, 1425, 779, - 191, 164, 782, 193, 185, 445, 438, 455, 785, 789, - 457, 479, 504, 188, 476, 801, 473, 501, 510, 41, - 532, 562, 809, 843, 827, 839, 808, 817, 576, 826, - 829, 834, 839, 780, 763, 724, 712, 851, 856, 859, - 863, 880, 888, 906, 938, 626, 587, 556, 520, 603, - 898, 637, 956, 664, 292, 974, 1006, 482, 511, 435, - 446, 365, 692, 530, 731, 285, 415, 471, 409, 901, - 301, 1425, 297, 1425, 557, 684, 651, 224, 104, 75, - 930, 1425, 1425, 553, 654, 620, 5, 711, 710, 751, - - 1425, 969, 783, 998, 1024, 1032, 1037, 586, 635, 1045, - 757, 831, 604, 691, 832, 846, 702, 791, 567, 782, - 881, 913, 807, 855, 788, 850, 860, 918, 917, 948, - 683, 877, 950, 985, 909, 912, 737, 946, 977, 979, - 967, 1011, 1014, 1026, 1027, 1034, 1035, 1038, 1040, 1041, - 1042, 1043, 1047, 1048, 806, 1056, 1050, 1052, 1061, 1066, - 729, 1055, 1077, 1082, 1078, 1079, 1053, 1057, 1080, 1081, - 1058, 1083, 1084, 1086, 1087, 1088, 1091, 1092, 1105, 1103, - 1095, 1100, 1123, 1116, 1140, 1129, 1121, 1146, 1149, 1425, - 1152, 1157, 1425, 1169, 1425, 1425, 1187, 1194, 1201, 1208, - - 1215, 1222, 1229, 1236, 1243, 1250, 1257, 1262, 1267, 1272, - 1279, 1282, 1285, 1288, 1295, 1299, 1305, 1311, 1317, 1324, - 1331, 1338, 1345, 1352, 1359, 1366 + 1447, 1448, 1448, 111, 114, 47, 62, 1448, 117, 159, + 1448, 1448, 1436, 1448, 1448, 1427, 1448, 1440, 1440, 368, + 1448, 1448, 1448, 1448, 1438, 1438, 1408, 372, 1448, 221, + 1421, 0, 183, 1448, 1448, 385, 380, 385, 375, 376, + 393, 1448, 423, 1420, 0, 207, 1448, 1404, 1403, 1448, + + 426, 404, 1448, 429, 1417, 0, 401, 1448, 1385, 2, + 1400, 1387, 1398, 1448, 432, 432, 1425, 1397, 436, 34, + 1375, 1448, 1417, 1408, 1448, 1448, 1448, 37, 39, 1375, + 1374, 1372, 1404, 1373, 1448, 0, 1381, 1383, 1373, 1448, + 0, 1383, 1373, 1371, 1448, 0, 1391, 1379, 1368, 1368, + 1359, 1361, 1371, 1376, 1388, 1387, 1394, 137, 1360, 1448, + 145, 0, 1356, 1356, 1385, 1384, 1353, 1448, 1364, 439, + 443, 1357, 1359, 1357, 1356, 446, 450, 1283, 1286, 1274, + 1273, 1259, 1265, 456, 463, 1275, 1448, 1274, 1448, 1448, + 66, 1245, 1448, 1190, 1189, 1154, 1448, 1448, 1152, 1155, + + 467, 474, 1448, 480, 1163, 1162, 1156, 484, 500, 503, + 1448, 506, 1149, 1154, 1145, 512, 1159, 1156, 523, 528, + 1448, 531, 1165, 385, 534, 1448, 1448, 1172, 1170, 1144, + 541, 552, 558, 561, 564, 570, 580, 1145, 586, 1141, + 589, 593, 1142, 1128, 605, 1156, 378, 1139, 608, 1448, + 1137, 1448, 1448, 611, 616, 625, 628, 633, 637, 645, + 1448, 1448, 655, 1117, 659, 662, 675, 678, 1448, 1448, + 686, 691, 694, 1110, 282, 143, 166, 1448, 697, 702, + 707, 1448, 1448, 715, 1448, 1085, 719, 1448, 1448, 727, + 732, 743, 746, 754, 759, 770, 1448, 1114, 161, 104, + + 163, 773, 1448, 1024, 776, 1448, 1448, 790, 1448, 1448, + 798, 1448, 1448, 997, 806, 164, 105, 930, 1448, 809, + 437, 188, 812, 444, 445, 187, 438, 472, 815, 819, + 457, 479, 504, 476, 533, 831, 473, 519, 190, 41, + 482, 532, 839, 928, 867, 872, 854, 847, 540, 856, + 859, 864, 869, 822, 803, 802, 738, 881, 886, 889, + 893, 910, 918, 936, 968, 658, 632, 551, 549, 586, + 928, 603, 986, 649, 292, 1004, 1036, 510, 522, 452, + 463, 365, 656, 557, 696, 285, 415, 530, 409, 931, + 301, 1448, 297, 1448, 576, 657, 654, 227, 211, 98, + + 960, 1448, 1448, 620, 697, 719, 5, 714, 735, 765, + 1448, 999, 780, 1028, 1054, 1062, 1067, 583, 652, 1075, + 748, 808, 706, 722, 813, 861, 733, 749, 709, 751, + 788, 821, 812, 837, 606, 607, 868, 885, 862, 880, + 746, 907, 911, 947, 941, 942, 785, 905, 978, 1007, + 961, 973, 777, 1006, 976, 980, 1016, 1032, 1044, 1056, + 1064, 1065, 1069, 1070, 1078, 1079, 1073, 1074, 1083, 1084, + 1081, 1082, 1092, 1095, 1086, 1087, 1091, 1096, 1101, 1102, + 1103, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 888, 1122, + 1114, 1115, 1009, 1127, 1159, 1136, 1140, 1162, 1165, 1448, + + 1168, 1171, 1448, 1188, 1448, 1448, 1206, 1213, 1220, 1227, + 1234, 1241, 1248, 1255, 1262, 1269, 1276, 1281, 1286, 1291, + 1298, 1301, 1304, 1307, 1314, 1318, 1324, 1330, 1336, 1343, + 1350, 1357, 1364, 1371, 1378, 1385 } ; -static yyconst flex_int16_t yy_def[527] = +static yyconst flex_int16_t yy_def[537] = { 0, - 497, 497, 498, 498, 498, 498, 499, 499, 500, 500, - 501, 501, 502, 502, 502, 502, 503, 503, 497, 497, - 504, 504, 505, 505, 505, 505, 497, 497, 505, 505, - 497, 497, 505, 505, 505, 505, 497, 497, 496, 39, - 506, 506, 497, 497, 496, 45, 507, 507, 502, 502, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 508, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 509, 496, 496, 509, 509, 496, - - 496, 496, 496, 496, 496, 510, 496, 496, 510, 510, - 510, 510, 510, 496, 496, 496, 496, 496, 496, 511, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 508, 512, 496, 496, 496, - 509, 509, 509, 513, 496, 510, 510, 510, 510, 510, - 510, 514, 496, 496, 515, 496, 515, 496, 496, 496, - 516, 496, 496, 496, 496, 496, 496, 496, 517, 517, - 496, 496, 509, 509, 518, 518, 510, 510, 510, 510, - 510, 519, 519, 496, 496, 515, 496, 496, 515, 496, - 496, 516, 496, 496, 496, 496, 496, 496, 496, 517, - - 496, 517, 496, 496, 509, 509, 496, 518, 496, 518, - 510, 510, 510, 510, 510, 496, 519, 496, 519, 496, - 515, 520, 496, 496, 496, 496, 496, 517, 496, 496, - 509, 496, 496, 518, 510, 510, 496, 496, 510, 510, - 519, 496, 515, 520, 520, 496, 520, 496, 496, 496, - 517, 496, 496, 496, 496, 496, 496, 496, 518, 510, - 496, 496, 496, 496, 496, 510, 510, 519, 496, 515, - 520, 520, 496, 496, 517, 496, 496, 496, 496, 496, - 510, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 515, 520, 520, 496, 496, 510, 496, 496, 496, - - 496, 496, 496, 496, 515, 520, 520, 510, 496, 515, - 520, 520, 510, 515, 515, 515, 520, 520, 496, 496, - 515, 515, 515, 520, 520, 496, 496, 496, 515, 515, - 515, 520, 520, 496, 496, 496, 496, 515, 515, 515, - 520, 520, 520, 496, 496, 496, 496, 515, 515, 515, - 520, 520, 520, 521, 522, 496, 496, 496, 496, 515, - 515, 515, 520, 523, 524, 521, 522, 496, 496, 496, - 496, 515, 515, 515, 523, 520, 525, 524, 526, 520, - 496, 496, 496, 496, 515, 515, 515, 525, 496, 526, - 520, 496, 496, 515, 515, 515, 496, 515, 515, 515, - - 496, 515, 515, 515, 515, 515, 515, 515, 515, 515, - 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, - 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, - 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, - 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, - 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, - 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, - 515, 515, 515, 515, 515, 515, 515, 515, 515, 515, - 515, 515, 515, 515, 515, 515, 515, 515, 515, 496, - 515, 515, 496, 515, 496, 0, 496, 496, 496, 496, - - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496 + 507, 507, 508, 508, 508, 508, 509, 509, 510, 510, + 511, 511, 512, 512, 512, 512, 513, 513, 507, 507, + 514, 514, 515, 515, 515, 515, 507, 507, 515, 515, + 507, 507, 515, 515, 515, 515, 507, 507, 506, 39, + 516, 516, 507, 507, 506, 45, 517, 517, 512, 512, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 518, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 519, 506, 506, 519, 519, 506, + + 506, 506, 506, 506, 506, 520, 506, 506, 520, 520, + 520, 520, 520, 506, 506, 506, 506, 506, 506, 521, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 518, 522, 506, 506, 506, + 519, 519, 519, 523, 506, 520, 520, 520, 520, 520, + 520, 520, 524, 506, 506, 525, 506, 525, 506, 506, + 506, 526, 506, 506, 506, 506, 506, 506, 506, 527, + 527, 506, 506, 519, 519, 528, 528, 520, 520, 520, + 520, 520, 520, 529, 529, 506, 506, 525, 506, 506, + 525, 506, 506, 526, 506, 506, 506, 506, 506, 506, + + 506, 527, 506, 527, 506, 506, 519, 519, 506, 528, + 506, 528, 520, 520, 520, 520, 520, 520, 506, 529, + 506, 529, 506, 525, 530, 506, 506, 506, 506, 506, + 527, 506, 506, 519, 506, 506, 528, 520, 520, 520, + 506, 506, 520, 520, 529, 506, 525, 530, 530, 506, + 530, 506, 506, 506, 527, 506, 506, 506, 506, 506, + 506, 506, 528, 520, 506, 506, 520, 506, 506, 506, + 520, 520, 529, 506, 525, 530, 530, 506, 506, 527, + 506, 506, 506, 506, 506, 520, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 525, 530, + + 530, 506, 506, 520, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 525, 530, 530, 520, 506, 525, + 530, 530, 520, 525, 525, 525, 530, 530, 506, 506, + 525, 525, 525, 530, 530, 506, 506, 506, 525, 525, + 525, 530, 530, 506, 506, 506, 506, 525, 525, 525, + 530, 530, 530, 506, 506, 506, 506, 525, 525, 525, + 530, 530, 530, 531, 532, 506, 506, 506, 506, 525, + 525, 525, 530, 533, 534, 531, 532, 506, 506, 506, + 506, 525, 525, 525, 533, 530, 535, 534, 536, 530, + 506, 506, 506, 506, 525, 525, 525, 535, 506, 536, + + 530, 506, 506, 525, 525, 525, 506, 525, 525, 525, + 506, 525, 525, 525, 525, 525, 525, 525, 525, 525, + 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, + 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, + 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, + 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, + 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, + 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, + 525, 525, 525, 525, 525, 525, 525, 525, 525, 525, + 525, 525, 525, 525, 525, 525, 525, 525, 525, 506, + + 525, 525, 506, 525, 506, 0, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506 } ; -static yyconst flex_int16_t yy_nxt[1479] = +static yyconst flex_int16_t yy_nxt[1502] = { 0, - 496, 54, 55, 54, 54, 55, 54, 54, 55, 54, - 54, 55, 54, 62, 496, 56, 62, 65, 56, 65, - 63, 57, 401, 63, 57, 59, 55, 59, 59, 55, - 59, 68, 69, 66, 187, 66, 70, 71, 221, 60, - 68, 69, 60, 156, 72, 70, 71, 68, 69, 160, - 73, 120, 70, 72, 68, 69, 157, 73, 187, 70, + 506, 54, 55, 54, 54, 55, 54, 54, 55, 54, + 54, 55, 54, 62, 506, 56, 62, 65, 56, 65, + 63, 57, 411, 63, 57, 59, 55, 59, 59, 55, + 59, 68, 69, 66, 148, 66, 70, 71, 149, 60, + 68, 69, 60, 157, 72, 70, 71, 68, 69, 161, + 73, 120, 70, 72, 68, 69, 158, 73, 189, 70, 72, 75, 76, 75, 76, 121, 120, 72, 55, 55, 55, 55, 55, 55, 86, 55, 86, 86, 55, 86, - 122, 162, 78, 389, 163, 78, 339, 246, 87, 161, + 122, 163, 78, 189, 164, 78, 349, 224, 87, 162, 77, 87, 77, 79, 80, 55, 80, 79, 79, 79, - 79, 79, 79, 79, 81, 79, 294, 79, 83, 79, + 79, 79, 79, 79, 81, 79, 399, 79, 83, 79, 84, 79, 119, 119, 119, 119, 119, 119, 119, 119, - 119, 246, 397, 79, 79, 79, 80, 55, 80, 79, - 79, 79, 79, 79, 79, 79, 81, 79, 306, 79, + 119, 250, 250, 79, 79, 79, 80, 55, 80, 79, + 79, 79, 79, 79, 79, 79, 81, 79, 316, 79, 83, 79, 84, 79, 86, 55, 86, 86, 55, 86, - 55, 55, 55, 246, 187, 79, 79, 160, 88, 191, - 246, 88, 189, 123, 89, 55, 55, 55, 86, 55, - 86, 86, 55, 86, 55, 55, 55, 122, 187, 89, - 246, 246, 87, 307, 305, 87, 293, 123, 90, 55, + 55, 55, 55, 322, 189, 79, 79, 161, 88, 193, + 250, 88, 191, 123, 89, 55, 55, 55, 86, 55, + 86, 86, 55, 86, 55, 55, 55, 122, 189, 89, + 250, 250, 87, 250, 315, 87, 300, 123, 90, 55, 55, 55, 86, 55, 86, 86, 55, 86, 86, 55, - 86, 122, 187, 90, 318, 246, 88, 311, 246, 88, - 187, 123, 91, 86, 55, 86, 55, 55, 55, 55, - 55, 55, 119, 119, 119, 122, 317, 91, 321, 389, - 89, 332, 322, 89, 92, 93, 55, 93, 92, 92, + 86, 122, 301, 90, 189, 250, 88, 189, 321, 88, + 317, 123, 91, 86, 55, 86, 55, 55, 55, 55, + 55, 55, 119, 119, 119, 122, 348, 91, 328, 407, + 89, 333, 399, 89, 92, 93, 55, 93, 92, 92, 92, 92, 92, 92, 92, 94, 92, 95, 92, 96, 92, 97, 92, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 95, 92, 92, 95, 95, 95, 95, 95, 95, 95, 95, 95, 98, 95, 99, 95, 95, 95, 95, 95, 95, 95, 95, 95, 101, 55, 101, - 101, 55, 101, 55, 55, 55, 55, 55, 55, 187, + 101, 55, 101, 55, 55, 55, 55, 55, 55, 189, - 376, 102, 246, 247, 102, 393, 392, 90, 292, 379, + 386, 102, 250, 251, 102, 403, 402, 90, 299, 389, 90, 103, 104, 55, 104, 103, 103, 103, 103, 103, 103, 103, 105, 103, 106, 103, 107, 103, 108, 103, 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, @@ -657,165 +660,169 @@ static yyconst flex_int16_t yy_nxt[1479] = 106, 109, 110, 106, 111, 106, 106, 106, 106, 112, 113, 106, 106, 106, 115, 55, 115, 115, 55, 115, 68, 69, 68, 69, 128, 70, 123, 70, 116, 123, - 123, 116, 187, 117, 123, 117, 119, 119, 119, 123, - 122, 137, 385, 122, 122, 187, 137, 123, 122, 118, + 123, 116, 189, 117, 123, 117, 119, 119, 119, 123, + 122, 137, 395, 122, 122, 189, 137, 123, 122, 118, - 129, 118, 187, 122, 137, 123, 130, 270, 123, 131, - 134, 122, 138, 243, 132, 144, 138, 389, 139, 122, - 389, 138, 122, 139, 119, 119, 119, 119, 119, 119, + 129, 118, 189, 122, 137, 123, 130, 275, 123, 131, + 134, 122, 138, 247, 132, 144, 138, 399, 139, 122, + 399, 138, 122, 139, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 119, 123, 119, 119, 119, - 199, 199, 199, 152, 199, 199, 199, 207, 207, 207, - 122, 207, 207, 207, 384, 246, 201, 216, 216, 216, - 201, 246, 187, 209, 216, 216, 216, 209, 199, 199, - 199, 383, 246, 218, 187, 199, 199, 199, 324, 376, - 218, 199, 199, 199, 201, 232, 232, 232, 379, 323, - 202, 201, 312, 246, 210, 329, 187, 201, 219, 325, - - 233, 207, 207, 207, 207, 207, 207, 207, 207, 207, - 334, 330, 228, 237, 237, 237, 382, 209, 381, 333, - 209, 187, 335, 209, 216, 216, 216, 187, 238, 216, - 216, 216, 216, 216, 216, 245, 245, 245, 336, 331, - 218, 234, 199, 199, 199, 218, 338, 187, 218, 187, - 337, 246, 247, 252, 252, 252, 371, 387, 201, 253, - 253, 253, 254, 254, 254, 232, 232, 232, 340, 241, - 187, 256, 256, 256, 187, 257, 398, 255, 258, 246, - 233, 207, 207, 207, 187, 394, 251, 261, 261, 261, - 237, 237, 237, 187, 263, 263, 263, 209, 264, 425, - - 341, 265, 262, 187, 370, 238, 216, 216, 216, 245, - 245, 245, 274, 274, 274, 349, 259, 199, 199, 199, - 187, 187, 218, 369, 413, 246, 252, 252, 252, 253, - 253, 253, 372, 201, 254, 254, 254, 187, 276, 276, - 276, 268, 277, 400, 271, 278, 256, 256, 256, 255, - 257, 419, 187, 258, 187, 275, 279, 279, 279, 272, - 261, 261, 261, 282, 282, 282, 374, 283, 187, 376, - 284, 187, 280, 414, 368, 262, 263, 263, 263, 396, - 264, 377, 399, 265, 285, 285, 285, 287, 287, 287, - 289, 289, 289, 274, 274, 274, 295, 295, 295, 286, - - 187, 187, 288, 276, 276, 276, 290, 277, 187, 187, - 278, 395, 296, 279, 279, 279, 282, 282, 282, 187, - 283, 386, 437, 284, 285, 285, 285, 187, 187, 280, - 298, 298, 298, 403, 299, 402, 376, 300, 420, 286, - 287, 287, 287, 301, 301, 301, 187, 302, 377, 423, - 303, 289, 289, 289, 187, 288, 295, 295, 295, 298, - 298, 298, 359, 299, 467, 358, 300, 290, 187, 301, - 301, 301, 296, 302, 187, 404, 303, 310, 310, 310, - 310, 310, 310, 319, 319, 319, 319, 319, 319, 443, - 326, 326, 326, 187, 327, 417, 187, 328, 320, 187, - - 187, 320, 326, 326, 326, 187, 327, 406, 187, 328, - 342, 342, 342, 357, 426, 314, 461, 315, 348, 348, - 348, 356, 316, 187, 187, 343, 246, 350, 350, 350, - 351, 351, 351, 431, 187, 342, 342, 342, 424, 429, - 353, 353, 353, 187, 354, 352, 246, 355, 187, 187, - 343, 246, 348, 348, 348, 347, 246, 361, 361, 361, - 350, 350, 350, 187, 351, 351, 351, 187, 187, 418, - 421, 346, 187, 187, 345, 344, 187, 187, 360, 352, - 246, 363, 363, 363, 422, 364, 362, 430, 365, 353, - 353, 353, 433, 354, 187, 432, 355, 246, 187, 361, - - 361, 361, 391, 391, 391, 246, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 187, 438, 244, 246, 247, - 244, 244, 244, 246, 244, 373, 187, 313, 427, 187, - 187, 391, 391, 391, 187, 187, 244, 244, 244, 244, - 244, 244, 244, 244, 244, 244, 244, 246, 441, 244, - 434, 442, 244, 244, 244, 246, 244, 363, 363, 363, - 428, 364, 435, 187, 365, 187, 271, 187, 244, 244, - 405, 405, 405, 246, 244, 244, 244, 244, 244, 380, - 244, 244, 244, 309, 187, 244, 187, 308, 244, 244, - 244, 246, 244, 436, 187, 439, 187, 304, 444, 407, - - 407, 407, 187, 297, 244, 244, 244, 244, 244, 244, - 244, 244, 244, 244, 380, 187, 445, 244, 446, 447, - 244, 244, 244, 246, 244, 405, 405, 405, 187, 408, - 440, 187, 409, 410, 410, 410, 244, 244, 407, 407, - 407, 187, 411, 187, 187, 412, 410, 410, 410, 187, - 415, 187, 187, 416, 187, 187, 449, 187, 187, 187, - 187, 291, 187, 448, 187, 187, 462, 187, 450, 187, - 187, 465, 187, 187, 187, 187, 466, 453, 187, 451, - 454, 455, 456, 187, 457, 458, 452, 469, 459, 460, - 468, 463, 470, 464, 187, 187, 187, 187, 187, 187, - - 187, 187, 473, 187, 187, 187, 474, 477, 187, 187, - 485, 485, 187, 471, 472, 475, 476, 187, 281, 479, - 187, 480, 187, 273, 488, 246, 483, 484, 488, 491, - 486, 269, 478, 187, 491, 487, 481, 482, 187, 267, - 187, 489, 489, 489, 266, 260, 187, 492, 492, 492, - 489, 489, 489, 494, 494, 494, 250, 490, 492, 492, - 492, 249, 248, 493, 242, 240, 490, 239, 236, 495, - 494, 494, 494, 235, 493, 231, 230, 229, 227, 226, - 225, 224, 223, 222, 187, 220, 495, 52, 52, 52, - 52, 52, 52, 52, 53, 53, 53, 53, 53, 53, - - 53, 58, 58, 58, 58, 58, 58, 58, 61, 61, - 61, 61, 61, 61, 61, 64, 64, 64, 64, 64, - 64, 64, 67, 67, 67, 67, 67, 67, 67, 74, - 74, 74, 74, 74, 74, 74, 82, 82, 82, 82, - 82, 82, 82, 85, 85, 85, 85, 85, 85, 85, - 100, 100, 100, 100, 100, 100, 100, 114, 114, 114, - 114, 114, 114, 114, 136, 136, 136, 215, 136, 141, - 141, 141, 214, 141, 146, 146, 146, 213, 146, 155, - 155, 155, 155, 155, 212, 155, 169, 211, 169, 175, - 206, 175, 182, 205, 182, 186, 186, 186, 186, 186, - - 186, 186, 192, 204, 203, 192, 200, 200, 200, 200, - 200, 200, 208, 208, 208, 208, 208, 208, 217, 217, - 217, 217, 217, 217, 244, 244, 244, 244, 244, 244, - 244, 366, 366, 366, 366, 366, 366, 366, 367, 367, - 367, 367, 367, 367, 367, 375, 375, 375, 375, 375, - 375, 375, 378, 378, 378, 378, 378, 378, 378, 388, - 388, 388, 388, 388, 388, 388, 390, 390, 390, 390, - 390, 390, 390, 198, 197, 196, 195, 194, 193, 190, - 188, 187, 185, 184, 183, 181, 180, 179, 178, 177, - 176, 174, 173, 172, 171, 170, 168, 167, 166, 165, - - 164, 159, 156, 158, 154, 153, 151, 150, 149, 148, - 147, 145, 143, 142, 140, 135, 133, 127, 126, 127, - 126, 125, 124, 496, 51, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496 + 201, 201, 201, 153, 201, 201, 201, 209, 209, 209, + 122, 209, 209, 209, 250, 250, 203, 219, 219, 219, + 203, 189, 189, 211, 219, 219, 219, 211, 201, 201, + 201, 394, 327, 221, 189, 201, 201, 201, 334, 331, + 221, 201, 201, 201, 203, 235, 235, 235, 393, 250, + 204, 203, 332, 250, 212, 339, 189, 203, 222, 189, + + 236, 209, 209, 209, 209, 209, 209, 209, 209, 209, + 344, 340, 231, 241, 241, 241, 335, 211, 350, 342, + 211, 189, 345, 211, 219, 219, 219, 392, 242, 219, + 219, 219, 219, 219, 219, 249, 249, 249, 386, 341, + 221, 237, 201, 201, 201, 221, 391, 389, 221, 250, + 250, 250, 251, 256, 256, 256, 346, 189, 203, 257, + 257, 257, 258, 258, 258, 235, 235, 235, 347, 245, + 351, 260, 260, 260, 189, 261, 343, 259, 262, 359, + 236, 209, 209, 209, 397, 381, 255, 265, 265, 265, + 241, 241, 241, 189, 268, 268, 268, 211, 269, 380, + + 189, 270, 266, 189, 404, 242, 219, 219, 219, 249, + 249, 249, 279, 279, 279, 382, 263, 201, 201, 201, + 189, 423, 221, 189, 189, 250, 256, 256, 256, 257, + 257, 257, 384, 203, 258, 258, 258, 189, 281, 281, + 281, 273, 282, 408, 276, 283, 260, 260, 260, 259, + 261, 441, 442, 262, 386, 280, 284, 284, 284, 277, + 265, 265, 265, 287, 287, 287, 387, 288, 379, 189, + 289, 189, 285, 189, 189, 266, 290, 290, 290, 268, + 268, 268, 406, 269, 405, 396, 270, 292, 292, 292, + 424, 291, 294, 294, 294, 296, 296, 296, 279, 279, + + 279, 386, 293, 302, 302, 302, 378, 295, 281, 281, + 281, 297, 282, 387, 189, 283, 284, 284, 284, 303, + 287, 287, 287, 189, 288, 409, 189, 289, 290, 290, + 290, 189, 285, 305, 305, 305, 189, 306, 412, 189, + 307, 435, 410, 291, 292, 292, 292, 308, 308, 308, + 189, 309, 189, 429, 310, 294, 294, 294, 413, 293, + 311, 311, 311, 189, 312, 189, 189, 313, 189, 430, + 295, 296, 296, 296, 302, 302, 302, 305, 305, 305, + 433, 306, 189, 436, 307, 447, 427, 297, 369, 414, + 303, 308, 308, 308, 189, 309, 434, 189, 310, 311, + + 311, 311, 189, 312, 416, 189, 313, 320, 320, 320, + 320, 320, 320, 329, 329, 329, 329, 329, 329, 459, + 336, 336, 336, 189, 337, 189, 189, 338, 330, 189, + 189, 330, 336, 336, 336, 437, 337, 453, 189, 338, + 352, 352, 352, 368, 439, 324, 428, 325, 358, 358, + 358, 431, 326, 367, 189, 353, 250, 360, 360, 360, + 361, 361, 361, 366, 189, 352, 352, 352, 438, 440, + 363, 363, 363, 189, 364, 362, 250, 365, 189, 189, + 353, 250, 358, 358, 358, 189, 250, 371, 371, 371, + 360, 360, 360, 495, 361, 361, 361, 189, 189, 432, + + 443, 357, 189, 189, 356, 189, 189, 445, 370, 362, + 250, 373, 373, 373, 355, 374, 372, 444, 375, 363, + 363, 363, 189, 364, 189, 446, 365, 250, 189, 371, + 371, 371, 401, 401, 401, 250, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 189, 448, 248, 250, 251, + 248, 248, 248, 250, 248, 383, 449, 454, 189, 189, + 354, 401, 401, 401, 189, 323, 248, 248, 248, 248, + 248, 248, 248, 248, 248, 248, 248, 250, 189, 248, + 451, 452, 248, 248, 248, 250, 248, 373, 373, 373, + 189, 374, 450, 189, 375, 189, 276, 189, 248, 248, + + 415, 415, 415, 250, 248, 248, 248, 248, 248, 390, + 248, 248, 248, 457, 498, 248, 189, 455, 248, 248, + 248, 250, 248, 189, 189, 458, 189, 319, 461, 417, + 417, 417, 462, 189, 248, 248, 248, 248, 248, 248, + 248, 248, 248, 248, 390, 189, 456, 248, 460, 189, + 248, 248, 248, 250, 248, 415, 415, 415, 463, 418, + 318, 189, 419, 420, 420, 420, 248, 248, 417, 417, + 417, 189, 421, 189, 464, 422, 420, 420, 420, 189, + 425, 189, 189, 426, 189, 465, 189, 189, 471, 472, + 189, 189, 189, 475, 476, 189, 189, 466, 189, 189, + + 189, 189, 479, 189, 189, 480, 467, 468, 189, 189, + 469, 470, 189, 189, 473, 474, 477, 478, 189, 189, + 189, 481, 482, 189, 189, 189, 189, 189, 189, 189, + 495, 189, 189, 314, 304, 498, 485, 486, 298, 189, + 483, 501, 489, 490, 189, 484, 493, 494, 501, 496, + 497, 286, 487, 189, 278, 488, 250, 189, 491, 492, + 499, 499, 499, 502, 502, 502, 499, 499, 499, 504, + 504, 504, 502, 502, 502, 274, 500, 272, 271, 503, + 267, 264, 500, 254, 253, 505, 252, 246, 503, 504, + 504, 504, 244, 243, 240, 239, 238, 234, 233, 232, + + 230, 229, 228, 227, 226, 505, 52, 52, 52, 52, + 52, 52, 52, 53, 53, 53, 53, 53, 53, 53, + 58, 58, 58, 58, 58, 58, 58, 61, 61, 61, + 61, 61, 61, 61, 64, 64, 64, 64, 64, 64, + 64, 67, 67, 67, 67, 67, 67, 67, 74, 74, + 74, 74, 74, 74, 74, 82, 82, 82, 82, 82, + 82, 82, 85, 85, 85, 85, 85, 85, 85, 100, + 100, 100, 100, 100, 100, 100, 114, 114, 114, 114, + 114, 114, 114, 136, 136, 136, 225, 136, 141, 141, + 141, 189, 141, 146, 146, 146, 223, 146, 156, 156, + + 156, 156, 156, 218, 156, 170, 217, 170, 176, 216, + 176, 184, 215, 184, 188, 188, 188, 188, 188, 188, + 188, 194, 214, 213, 194, 202, 202, 202, 202, 202, + 202, 210, 210, 210, 210, 210, 210, 220, 220, 220, + 220, 220, 220, 248, 248, 248, 248, 248, 248, 248, + 376, 376, 376, 376, 376, 376, 376, 377, 377, 377, + 377, 377, 377, 377, 385, 385, 385, 385, 385, 385, + 385, 388, 388, 388, 388, 388, 388, 388, 398, 398, + 398, 398, 398, 398, 398, 400, 400, 400, 400, 400, + 400, 400, 208, 207, 206, 205, 200, 199, 198, 197, + + 196, 195, 192, 190, 189, 187, 186, 185, 183, 182, + 181, 180, 179, 178, 177, 175, 174, 173, 172, 171, + 169, 168, 167, 166, 165, 160, 157, 159, 155, 154, + 152, 151, 150, 147, 145, 143, 142, 140, 135, 133, + 127, 126, 127, 126, 125, 124, 506, 51, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + + 506 } ; -static yyconst flex_int16_t yy_chk[1479] = +static yyconst flex_int16_t yy_chk[1502] = { 0, 0, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6, 9, 0, 3, 10, 11, 4, 12, - 9, 5, 397, 10, 6, 7, 7, 7, 8, 8, - 8, 13, 13, 11, 189, 12, 13, 13, 189, 7, + 9, 5, 407, 10, 6, 7, 7, 7, 8, 8, + 8, 13, 13, 11, 110, 12, 13, 13, 110, 7, 14, 14, 8, 120, 13, 14, 14, 15, 15, 128, - 15, 56, 15, 14, 16, 16, 120, 16, 330, 16, + 15, 56, 15, 14, 16, 16, 120, 16, 340, 16, 15, 17, 17, 18, 18, 56, 57, 16, 19, 19, 19, 20, 20, 20, 23, 23, 23, 24, 24, 24, - 57, 129, 19, 390, 129, 20, 330, 272, 23, 128, + 57, 129, 19, 191, 129, 20, 340, 191, 23, 128, 17, 24, 18, 21, 21, 21, 21, 21, 21, 21, - 21, 21, 21, 21, 21, 21, 272, 21, 21, 21, + 21, 21, 21, 21, 21, 21, 400, 21, 21, 21, 21, 21, 54, 54, 54, 55, 55, 55, 59, 59, - 59, 293, 389, 21, 21, 22, 22, 22, 22, 22, - 22, 22, 22, 22, 22, 22, 22, 22, 293, 22, + 59, 300, 317, 21, 21, 22, 22, 22, 22, 22, + 22, 22, 22, 22, 22, 22, 22, 22, 300, 22, 22, 22, 22, 22, 25, 25, 25, 26, 26, 26, - 27, 27, 27, 294, 157, 22, 22, 160, 25, 160, - 271, 26, 157, 60, 27, 28, 28, 28, 29, 29, - 29, 30, 30, 30, 31, 31, 31, 60, 292, 28, - 306, 312, 29, 294, 292, 30, 271, 83, 31, 32, + 27, 27, 27, 317, 158, 22, 22, 161, 25, 161, + 276, 26, 158, 60, 27, 28, 28, 28, 29, 29, + 29, 30, 30, 30, 31, 31, 31, 60, 299, 28, + 301, 316, 29, 277, 299, 30, 276, 83, 31, 32, 32, 32, 33, 33, 33, 34, 34, 34, 35, 35, - 35, 83, 315, 32, 312, 324, 33, 306, 311, 34, - 314, 96, 35, 36, 36, 36, 37, 37, 37, 38, - 38, 38, 80, 80, 80, 96, 311, 36, 314, 388, - 37, 324, 315, 38, 39, 39, 39, 39, 39, 39, + 35, 83, 277, 32, 326, 322, 33, 339, 316, 34, + 301, 96, 35, 36, 36, 36, 37, 37, 37, 38, + 38, 38, 80, 80, 80, 96, 339, 36, 322, 399, + 37, 326, 398, 38, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 41, 41, 41, - 42, 42, 42, 43, 43, 43, 44, 44, 44, 270, + 42, 42, 42, 43, 43, 43, 44, 44, 44, 275, - 365, 41, 376, 376, 42, 383, 381, 43, 270, 365, + 375, 41, 386, 386, 42, 393, 391, 43, 275, 375, 44, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, @@ -823,137 +830,141 @@ static yyconst flex_int16_t yy_chk[1479] = 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 47, 47, 47, 48, 48, 48, 49, 49, 50, 50, 70, 49, 78, 50, 47, 89, - 90, 48, 372, 49, 87, 50, 86, 86, 86, 88, - 78, 87, 372, 89, 90, 243, 88, 91, 87, 49, + 90, 48, 382, 49, 87, 50, 86, 86, 86, 88, + 78, 87, 382, 89, 90, 247, 88, 91, 87, 49, - 70, 50, 221, 88, 91, 107, 70, 243, 102, 70, - 78, 91, 90, 221, 70, 102, 87, 379, 89, 107, - 377, 88, 102, 87, 93, 93, 93, 101, 101, 101, + 70, 50, 224, 88, 91, 107, 70, 247, 102, 70, + 78, 91, 90, 224, 70, 102, 87, 389, 89, 107, + 387, 88, 102, 87, 93, 93, 93, 101, 101, 101, 104, 104, 104, 115, 115, 115, 116, 119, 119, 119, - 169, 169, 169, 116, 170, 170, 170, 175, 175, 175, - 116, 176, 176, 176, 371, 317, 169, 182, 182, 182, - 170, 307, 316, 175, 183, 183, 183, 176, 199, 199, - 199, 370, 318, 182, 321, 200, 200, 200, 317, 378, - 183, 202, 202, 202, 199, 206, 206, 206, 378, 316, - 170, 200, 307, 325, 176, 321, 322, 202, 183, 318, - - 206, 207, 207, 207, 208, 208, 208, 210, 210, 210, - 327, 322, 202, 213, 213, 213, 369, 207, 368, 325, - 208, 323, 327, 210, 216, 216, 216, 329, 213, 217, - 217, 217, 219, 219, 219, 222, 222, 222, 328, 323, - 216, 210, 228, 228, 228, 217, 329, 374, 219, 331, - 328, 222, 222, 229, 229, 229, 359, 374, 228, 230, - 230, 230, 231, 231, 231, 232, 232, 232, 331, 219, - 394, 233, 233, 233, 385, 233, 394, 231, 233, 332, - 232, 234, 234, 234, 419, 385, 228, 236, 236, 236, - 237, 237, 237, 339, 238, 238, 238, 234, 238, 419, - - 332, 238, 236, 408, 358, 237, 241, 241, 241, 245, - 245, 245, 250, 250, 250, 339, 234, 251, 251, 251, - 360, 413, 241, 357, 408, 245, 252, 252, 252, 253, - 253, 253, 360, 251, 254, 254, 254, 396, 255, 255, - 255, 241, 255, 396, 245, 255, 256, 256, 256, 254, - 256, 413, 409, 256, 362, 251, 259, 259, 259, 245, - 261, 261, 261, 262, 262, 262, 362, 262, 387, 364, - 262, 395, 259, 409, 356, 261, 263, 263, 263, 387, - 263, 364, 395, 263, 266, 266, 266, 267, 267, 267, - 268, 268, 268, 274, 274, 274, 275, 275, 275, 266, - - 431, 386, 267, 276, 276, 276, 268, 276, 414, 373, - 276, 386, 275, 279, 279, 279, 282, 282, 282, 417, - 282, 373, 431, 282, 285, 285, 285, 399, 398, 279, - 286, 286, 286, 399, 286, 398, 375, 286, 414, 285, - 287, 287, 287, 288, 288, 288, 461, 288, 375, 417, - 288, 289, 289, 289, 437, 287, 295, 295, 295, 298, - 298, 298, 347, 298, 461, 346, 298, 289, 400, 301, - 301, 301, 295, 301, 411, 400, 301, 305, 305, 305, - 310, 310, 310, 313, 313, 313, 319, 319, 319, 437, - 320, 320, 320, 305, 320, 411, 310, 320, 313, 420, - - 403, 319, 326, 326, 326, 425, 326, 403, 418, 326, - 333, 333, 333, 345, 420, 310, 455, 310, 338, 338, - 338, 344, 310, 455, 423, 333, 333, 340, 340, 340, - 341, 341, 341, 425, 338, 342, 342, 342, 418, 423, - 343, 343, 343, 340, 343, 341, 341, 343, 412, 415, - 342, 342, 348, 348, 348, 337, 343, 349, 349, 349, - 350, 350, 350, 416, 351, 351, 351, 426, 348, 412, - 415, 336, 424, 349, 335, 334, 350, 427, 348, 351, - 351, 352, 352, 352, 416, 352, 350, 424, 352, 353, - 353, 353, 427, 353, 432, 426, 353, 352, 421, 361, - - 361, 361, 380, 380, 380, 353, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 361, 432, 354, 380, 380, - 354, 354, 354, 354, 354, 361, 435, 308, 421, 436, - 422, 391, 391, 391, 429, 428, 354, 354, 355, 355, - 355, 355, 355, 355, 355, 355, 355, 391, 435, 355, - 428, 436, 355, 355, 355, 355, 355, 363, 363, 363, - 422, 363, 429, 438, 363, 430, 391, 433, 355, 355, - 402, 402, 402, 363, 366, 366, 366, 366, 366, 366, - 366, 366, 366, 304, 441, 366, 402, 297, 366, 366, - 366, 366, 366, 430, 439, 433, 440, 291, 438, 404, - - 404, 404, 434, 281, 366, 366, 367, 367, 367, 367, - 367, 367, 367, 367, 367, 404, 439, 367, 440, 441, - 367, 367, 367, 367, 367, 405, 405, 405, 442, 405, - 434, 443, 405, 406, 406, 406, 367, 367, 407, 407, - 407, 405, 407, 444, 445, 407, 410, 410, 410, 406, - 410, 446, 447, 410, 407, 448, 443, 449, 450, 451, - 452, 269, 410, 442, 453, 454, 456, 457, 444, 458, - 467, 459, 462, 456, 468, 471, 460, 447, 459, 445, - 448, 449, 450, 460, 451, 452, 446, 463, 453, 454, - 462, 457, 464, 458, 463, 465, 466, 469, 470, 464, - - 472, 473, 467, 474, 475, 476, 468, 471, 477, 478, - 479, 480, 481, 465, 466, 469, 470, 482, 260, 473, - 480, 474, 479, 247, 484, 244, 477, 478, 483, 487, - 481, 242, 472, 484, 486, 482, 475, 476, 487, 240, - 483, 485, 485, 485, 239, 235, 486, 488, 488, 488, - 489, 489, 489, 491, 491, 491, 227, 485, 492, 492, - 492, 226, 225, 488, 220, 215, 489, 214, 212, 491, - 494, 494, 494, 211, 492, 205, 204, 203, 198, 197, - 194, 193, 192, 190, 186, 184, 494, 497, 497, 497, - 497, 497, 497, 497, 498, 498, 498, 498, 498, 498, - - 498, 499, 499, 499, 499, 499, 499, 499, 500, 500, - 500, 500, 500, 500, 500, 501, 501, 501, 501, 501, - 501, 501, 502, 502, 502, 502, 502, 502, 502, 503, - 503, 503, 503, 503, 503, 503, 504, 504, 504, 504, - 504, 504, 504, 505, 505, 505, 505, 505, 505, 505, - 506, 506, 506, 506, 506, 506, 506, 507, 507, 507, - 507, 507, 507, 507, 508, 508, 508, 181, 508, 509, - 509, 509, 180, 509, 510, 510, 510, 179, 510, 511, - 511, 511, 511, 511, 178, 511, 512, 177, 512, 513, - 174, 513, 514, 173, 514, 515, 515, 515, 515, 515, - - 515, 515, 516, 172, 171, 516, 517, 517, 517, 517, - 517, 517, 518, 518, 518, 518, 518, 518, 519, 519, - 519, 519, 519, 519, 520, 520, 520, 520, 520, 520, - 520, 521, 521, 521, 521, 521, 521, 521, 522, 522, - 522, 522, 522, 522, 522, 523, 523, 523, 523, 523, - 523, 523, 524, 524, 524, 524, 524, 524, 524, 525, - 525, 525, 525, 525, 525, 525, 526, 526, 526, 526, - 526, 526, 526, 168, 166, 165, 164, 163, 162, 158, - 156, 155, 154, 153, 152, 151, 150, 149, 148, 147, - 144, 143, 142, 139, 138, 137, 134, 133, 132, 131, - - 130, 124, 123, 121, 118, 117, 113, 112, 111, 110, - 109, 105, 99, 98, 94, 81, 77, 76, 75, 69, - 68, 66, 63, 51, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496, 496, 496, - 496, 496, 496, 496, 496, 496, 496, 496 + 170, 170, 170, 116, 171, 171, 171, 176, 176, 176, + 116, 177, 177, 177, 321, 327, 170, 184, 184, 184, + 171, 324, 325, 176, 185, 185, 185, 177, 201, 201, + 201, 381, 321, 184, 331, 202, 202, 202, 327, 324, + 185, 204, 204, 204, 201, 208, 208, 208, 380, 328, + 171, 202, 325, 334, 177, 331, 332, 204, 185, 341, + + 208, 209, 209, 209, 210, 210, 210, 212, 212, 212, + 337, 332, 204, 216, 216, 216, 328, 209, 341, 334, + 210, 333, 337, 212, 219, 219, 219, 379, 216, 220, + 220, 220, 222, 222, 222, 225, 225, 225, 388, 333, + 219, 212, 231, 231, 231, 220, 378, 388, 222, 342, + 335, 225, 225, 232, 232, 232, 338, 349, 231, 233, + 233, 233, 234, 234, 234, 235, 235, 235, 338, 222, + 342, 236, 236, 236, 384, 236, 335, 234, 236, 349, + 235, 237, 237, 237, 384, 369, 231, 239, 239, 239, + 241, 241, 241, 395, 242, 242, 242, 237, 242, 368, + + 418, 242, 239, 370, 395, 241, 245, 245, 245, 249, + 249, 249, 254, 254, 254, 370, 237, 255, 255, 255, + 372, 418, 245, 435, 436, 249, 256, 256, 256, 257, + 257, 257, 372, 255, 258, 258, 258, 404, 259, 259, + 259, 245, 259, 404, 249, 259, 260, 260, 260, 258, + 260, 435, 436, 260, 374, 255, 263, 263, 263, 249, + 265, 265, 265, 266, 266, 266, 374, 266, 367, 419, + 266, 397, 263, 383, 396, 265, 267, 267, 267, 268, + 268, 268, 397, 268, 396, 383, 268, 271, 271, 271, + 419, 267, 272, 272, 272, 273, 273, 273, 279, 279, + + 279, 385, 271, 280, 280, 280, 366, 272, 281, 281, + 281, 273, 281, 385, 405, 281, 284, 284, 284, 280, + 287, 287, 287, 423, 287, 405, 429, 287, 290, 290, + 290, 408, 284, 291, 291, 291, 406, 291, 408, 424, + 291, 429, 406, 290, 292, 292, 292, 293, 293, 293, + 427, 293, 409, 423, 293, 294, 294, 294, 409, 292, + 295, 295, 295, 441, 295, 421, 428, 295, 430, 424, + 294, 296, 296, 296, 302, 302, 302, 305, 305, 305, + 427, 305, 410, 430, 305, 441, 421, 296, 357, 410, + 302, 308, 308, 308, 453, 308, 428, 413, 308, 311, + + 311, 311, 447, 311, 413, 431, 311, 315, 315, 315, + 320, 320, 320, 323, 323, 323, 329, 329, 329, 453, + 330, 330, 330, 315, 330, 422, 320, 330, 323, 433, + 425, 329, 336, 336, 336, 431, 336, 447, 432, 336, + 343, 343, 343, 356, 433, 320, 422, 320, 348, 348, + 348, 425, 320, 355, 434, 343, 343, 350, 350, 350, + 351, 351, 351, 354, 348, 352, 352, 352, 432, 434, + 353, 353, 353, 350, 353, 351, 351, 353, 426, 439, + 352, 352, 358, 358, 358, 437, 353, 359, 359, 359, + 360, 360, 360, 489, 361, 361, 361, 440, 358, 426, + + 437, 347, 438, 359, 346, 489, 360, 439, 358, 361, + 361, 362, 362, 362, 345, 362, 360, 438, 362, 363, + 363, 363, 448, 363, 442, 440, 363, 362, 443, 371, + 371, 371, 390, 390, 390, 363, 364, 364, 364, 364, + 364, 364, 364, 364, 364, 371, 442, 364, 390, 390, + 364, 364, 364, 364, 364, 371, 443, 448, 445, 446, + 344, 401, 401, 401, 444, 318, 364, 364, 365, 365, + 365, 365, 365, 365, 365, 365, 365, 401, 451, 365, + 445, 446, 365, 365, 365, 365, 365, 373, 373, 373, + 452, 373, 444, 455, 373, 449, 401, 456, 365, 365, + + 412, 412, 412, 373, 376, 376, 376, 376, 376, 376, + 376, 376, 376, 451, 493, 376, 412, 449, 376, 376, + 376, 376, 376, 454, 450, 452, 493, 314, 455, 414, + 414, 414, 456, 457, 376, 376, 377, 377, 377, 377, + 377, 377, 377, 377, 377, 414, 450, 377, 454, 458, + 377, 377, 377, 377, 377, 415, 415, 415, 457, 415, + 304, 459, 415, 416, 416, 416, 377, 377, 417, 417, + 417, 415, 417, 460, 458, 417, 420, 420, 420, 416, + 420, 461, 462, 420, 417, 459, 463, 464, 465, 466, + 467, 468, 420, 469, 470, 465, 466, 460, 471, 472, + + 469, 470, 473, 475, 476, 474, 461, 462, 477, 473, + 463, 464, 474, 478, 467, 468, 471, 472, 479, 480, + 481, 475, 476, 482, 483, 484, 485, 486, 487, 488, + 490, 491, 492, 298, 286, 494, 479, 480, 274, 490, + 477, 496, 483, 484, 494, 478, 487, 488, 497, 491, + 492, 264, 481, 496, 251, 482, 248, 497, 485, 486, + 495, 495, 495, 498, 498, 498, 499, 499, 499, 501, + 501, 501, 502, 502, 502, 246, 495, 244, 243, 498, + 240, 238, 499, 230, 229, 501, 228, 223, 502, 504, + 504, 504, 218, 217, 215, 214, 213, 207, 206, 205, + + 200, 199, 196, 195, 194, 504, 507, 507, 507, 507, + 507, 507, 507, 508, 508, 508, 508, 508, 508, 508, + 509, 509, 509, 509, 509, 509, 509, 510, 510, 510, + 510, 510, 510, 510, 511, 511, 511, 511, 511, 511, + 511, 512, 512, 512, 512, 512, 512, 512, 513, 513, + 513, 513, 513, 513, 513, 514, 514, 514, 514, 514, + 514, 514, 515, 515, 515, 515, 515, 515, 515, 516, + 516, 516, 516, 516, 516, 516, 517, 517, 517, 517, + 517, 517, 517, 518, 518, 518, 192, 518, 519, 519, + 519, 188, 519, 520, 520, 520, 186, 520, 521, 521, + + 521, 521, 521, 183, 521, 522, 182, 522, 523, 181, + 523, 524, 180, 524, 525, 525, 525, 525, 525, 525, + 525, 526, 179, 178, 526, 527, 527, 527, 527, 527, + 527, 528, 528, 528, 528, 528, 528, 529, 529, 529, + 529, 529, 529, 530, 530, 530, 530, 530, 530, 530, + 531, 531, 531, 531, 531, 531, 531, 532, 532, 532, + 532, 532, 532, 532, 533, 533, 533, 533, 533, 533, + 533, 534, 534, 534, 534, 534, 534, 534, 535, 535, + 535, 535, 535, 535, 535, 536, 536, 536, 536, 536, + 536, 536, 175, 174, 173, 172, 169, 167, 166, 165, + + 164, 163, 159, 157, 156, 155, 154, 153, 152, 151, + 150, 149, 148, 147, 144, 143, 142, 139, 138, 137, + 134, 133, 132, 131, 130, 124, 123, 121, 118, 117, + 113, 112, 111, 109, 105, 99, 98, 94, 81, 77, + 76, 75, 69, 68, 66, 63, 51, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + 506, 506, 506, 506, 506, 506, 506, 506, 506, 506, + + 506 } ; /* Table of booleans, true if rule could match eol. */ -static yyconst flex_int32_t yy_rule_can_match_eol[80] = +static yyconst flex_int32_t yy_rule_can_match_eol[82] = { 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 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, 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, - }; + 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; static char *yy_last_accepting_cpos; @@ -971,11 +982,11 @@ int xbt_graph_parse__flex_debug = 0; char *xbt_graph_parse_text; #line 1 "xbt/graphxml.l" /* Validating XML processor for graphxml.dtd. - * Generated 2006/03/21 12:59:33. + * Generated 2006/03/21 13:43:39. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright © 1999-2005 Kristoffer Rose. All rights reserved. - * (Id: flexml.pl,v 1.46 2006/03/21 08:24:12 legranda Exp). + * (Id: flexml.pl,v 1.47 2006/03/21 11:12:57 legranda Exp). * * There are two, intertwined parts to this program, part A and part B. * @@ -1019,9 +1030,9 @@ char *xbt_graph_parse_text; /* Version strings. */ const char rcs_graphxml_flexml_skeleton[] = - "$" "Id: skel,v 1.27 2006/03/21 08:24:12 legranda Exp $"; + "$" "Id: skel,v 1.28 2006/03/21 12:04:13 legranda Exp $"; const char rcs_graphxml_flexml[] = - "$" "Id: flexml.pl,v 1.46 2006/03/21 08:24:12 legranda Exp $"; + "$" "Id: flexml.pl,v 1.47 2006/03/21 11:12:57 legranda Exp $"; /* ANSI headers. */ #include @@ -1038,13 +1049,14 @@ const char rcs_graphxml_flexml[] = /* XML processor api. */ /* FleXML-provided data. */ const char* pcdata; -AT_graphxml_edge_target A_graphxml_edge_target; AT_graphxml_node_name A_graphxml_node_name; -AT_graphxml_node_label A_graphxml_node_label; -AT_graphxml_edge_label A_graphxml_edge_label; AT_graphxml_edge_source A_graphxml_edge_source; AT_graphxml_edge_isDirected A_graphxml_edge_isDirected; +AT_graphxml_edge_target A_graphxml_edge_target; +AT_graphxml_node_label A_graphxml_node_label; +AT_graphxml_edge_label A_graphxml_edge_label; AT_graphxml_edge_name A_graphxml_edge_name; +AT_graphxml_edge_length A_graphxml_edge_length; /* XML state. */ #ifdef FLEX_DEBUG @@ -1151,10 +1163,10 @@ static char* popbuffer(void) -#line 210 "xbt/graphxml.l" +#line 211 "xbt/graphxml.l" /* State names. */ const char* *graphxml_statenames=NULL; -#line 1158 "xbt/graphxml.c" +#line 1170 "xbt/graphxml.c" #define INITIAL 0 #define PROLOG 1 @@ -1337,7 +1349,7 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 214 "xbt/graphxml.l" +#line 215 "xbt/graphxml.l" /* Bypass Flex's default INITIAL state and begin by parsing the XML prolog. */ @@ -1372,7 +1384,7 @@ YY_DECL /* COMMENTS and PIs: handled uniformly for efficiency. */ -#line 1376 "xbt/graphxml.c" +#line 1388 "xbt/graphxml.c" if ( !(yy_init) ) { @@ -1425,13 +1437,13 @@ yy_match: 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 >= 497 ) + if ( yy_current_state >= 507 ) 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] != 1425 ); + while ( yy_base[yy_current_state] != 1448 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1467,52 +1479,52 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 249 "xbt/graphxml.l" +#line 250 "xbt/graphxml.l" ENTER(INCOMMENT); YY_BREAK case 2: YY_RULE_SETUP -#line 250 "xbt/graphxml.l" +#line 251 "xbt/graphxml.l" ENTER(INPI); YY_BREAK case 3: YY_RULE_SETUP -#line 253 "xbt/graphxml.l" +#line 254 "xbt/graphxml.l" LEAVE; YY_BREAK case 4: -#line 255 "xbt/graphxml.l" -case 5: #line 256 "xbt/graphxml.l" +case 5: +#line 257 "xbt/graphxml.l" case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 256 "xbt/graphxml.l" +#line 257 "xbt/graphxml.l" SKIP; YY_BREAK case YY_STATE_EOF(INCOMMENT): -#line 257 "xbt/graphxml.l" +#line 258 "xbt/graphxml.l" FAIL("EOF in comment."); YY_BREAK case 7: YY_RULE_SETUP -#line 260 "xbt/graphxml.l" +#line 261 "xbt/graphxml.l" LEAVE; YY_BREAK case 8: -#line 262 "xbt/graphxml.l" +#line 263 "xbt/graphxml.l" case 9: /* rule 9 can match eol */ YY_RULE_SETUP -#line 262 "xbt/graphxml.l" +#line 263 "xbt/graphxml.l" SKIP; YY_BREAK case YY_STATE_EOF(INPI): -#line 263 "xbt/graphxml.l" +#line 264 "xbt/graphxml.l" FAIL("EOF in PI (processing instruction)."); YY_BREAK @@ -1520,7 +1532,7 @@ FAIL("EOF in PI (processing instruction)."); case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 268 "xbt/graphxml.l" +#line 269 "xbt/graphxml.l" SKIP; YY_BREAK /* PROLOG: determine root element and process it. */ @@ -1528,13 +1540,13 @@ SKIP; case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 273 "xbt/graphxml.l" +#line 274 "xbt/graphxml.l" SET(DOCTYPE); YY_BREAK case 12: /* rule 12 can match eol */ YY_RULE_SETUP -#line 274 "xbt/graphxml.l" +#line 275 "xbt/graphxml.l" FAIL("Bad declaration %s.",xbt_graph_parse_text); YY_BREAK @@ -1542,35 +1554,35 @@ FAIL("Bad declaration %s.",xbt_graph_parse_text); case 13: /* rule 13 can match eol */ YY_RULE_SETUP -#line 278 "xbt/graphxml.l" +#line 279 "xbt/graphxml.l" SET(ROOT_graphxml_edge); YY_BREAK case 14: /* rule 14 can match eol */ YY_RULE_SETUP -#line 279 "xbt/graphxml.l" +#line 280 "xbt/graphxml.l" SET(ROOT_graphxml_node); YY_BREAK case 15: /* rule 15 can match eol */ YY_RULE_SETUP -#line 280 "xbt/graphxml.l" +#line 281 "xbt/graphxml.l" SET(ROOT_graphxml_graph); YY_BREAK case 16: /* rule 16 can match eol */ YY_RULE_SETUP -#line 281 "xbt/graphxml.l" +#line 282 "xbt/graphxml.l" FAIL("Bad declaration %s.",xbt_graph_parse_text); YY_BREAK case 17: YY_RULE_SETUP -#line 282 "xbt/graphxml.l" +#line 283 "xbt/graphxml.l" FAIL("Unexpected character `%c' in prolog.", xbt_graph_parse_text[0]); YY_BREAK case YY_STATE_EOF(PROLOG): case YY_STATE_EOF(DOCTYPE): -#line 283 "xbt/graphxml.l" +#line 284 "xbt/graphxml.l" FAIL("EOF in prolog."); YY_BREAK @@ -1579,7 +1591,7 @@ FAIL("EOF in prolog."); case 18: /* rule 18 can match eol */ YY_RULE_SETUP -#line 290 "xbt/graphxml.l" +#line 291 "xbt/graphxml.l" { ENTER(AL_graphxml_graph); } @@ -1587,14 +1599,14 @@ YY_RULE_SETUP case 19: YY_RULE_SETUP -#line 295 "xbt/graphxml.l" +#line 296 "xbt/graphxml.l" { LEAVE; STag_graphxml_graph();pcdata = NULL; ENTER(S_graphxml_graph); } YY_BREAK case 20: YY_RULE_SETUP -#line 298 "xbt/graphxml.l" +#line 299 "xbt/graphxml.l" { LEAVE; STag_graphxml_graph(); pcdata = NULL; ETag_graphxml_graph(); switch (YY_START) { @@ -1604,16 +1616,16 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 304 "xbt/graphxml.l" +#line 305 "xbt/graphxml.l" FAIL("Unexpected character `%c' in attribute list of graph element.", xbt_graph_parse_text[0]); YY_BREAK case 22: YY_RULE_SETUP -#line 305 "xbt/graphxml.l" +#line 306 "xbt/graphxml.l" FAIL("Bad attribute `%s' in `graph' element start tag.",xbt_graph_parse_text); YY_BREAK case YY_STATE_EOF(AL_graphxml_graph): -#line 306 "xbt/graphxml.l" +#line 307 "xbt/graphxml.l" FAIL("EOF in attribute list of `graph' element."); YY_BREAK @@ -1621,7 +1633,7 @@ FAIL("EOF in attribute list of `graph' element."); case 23: /* rule 23 can match eol */ YY_RULE_SETUP -#line 310 "xbt/graphxml.l" +#line 311 "xbt/graphxml.l" { LEAVE; ETag_graphxml_graph(); @@ -1633,12 +1645,12 @@ YY_RULE_SETUP case 24: /* rule 24 can match eol */ YY_RULE_SETUP -#line 317 "xbt/graphxml.l" +#line 318 "xbt/graphxml.l" FAIL("Unexpected end-tag `%s': `' expected.",xbt_graph_parse_text); YY_BREAK case 25: YY_RULE_SETUP -#line 318 "xbt/graphxml.l" +#line 319 "xbt/graphxml.l" FAIL("Unexpected character `%c': `' expected.",xbt_graph_parse_text[0]); YY_BREAK case YY_STATE_EOF(S_graphxml_graph_1): @@ -1646,7 +1658,7 @@ case YY_STATE_EOF(E_graphxml_graph): case YY_STATE_EOF(S_graphxml_graph_3): case YY_STATE_EOF(S_graphxml_graph_5): case YY_STATE_EOF(S_graphxml_graph): -#line 319 "xbt/graphxml.l" +#line 320 "xbt/graphxml.l" FAIL("Premature EOF: `' expected."); YY_BREAK @@ -1656,7 +1668,7 @@ FAIL("Premature EOF: `' expected."); case 26: /* rule 26 can match eol */ YY_RULE_SETUP -#line 326 "xbt/graphxml.l" +#line 327 "xbt/graphxml.l" { A_graphxml_node_label = NULL; A_graphxml_node_name = NULL; @@ -1667,30 +1679,30 @@ YY_RULE_SETUP case 27: /* rule 27 can match eol */ YY_RULE_SETUP -#line 333 "xbt/graphxml.l" +#line 334 "xbt/graphxml.l" ENTER(VALUE1); BUFFERSET(A_graphxml_node_label); YY_BREAK case 28: /* rule 28 can match eol */ YY_RULE_SETUP -#line 334 "xbt/graphxml.l" +#line 335 "xbt/graphxml.l" ENTER(VALUE2); BUFFERSET(A_graphxml_node_label); YY_BREAK case 29: /* rule 29 can match eol */ YY_RULE_SETUP -#line 336 "xbt/graphxml.l" +#line 337 "xbt/graphxml.l" ENTER(VALUE1); BUFFERSET(A_graphxml_node_name); YY_BREAK case 30: /* rule 30 can match eol */ YY_RULE_SETUP -#line 337 "xbt/graphxml.l" +#line 338 "xbt/graphxml.l" ENTER(VALUE2); BUFFERSET(A_graphxml_node_name); YY_BREAK case 31: YY_RULE_SETUP -#line 339 "xbt/graphxml.l" +#line 340 "xbt/graphxml.l" { if (!A_graphxml_node_name) FAIL("Required attribute `name' not set for `node' element."); LEAVE; STag_graphxml_node();pcdata = NULL; ENTER(E_graphxml_node); @@ -1698,7 +1710,7 @@ YY_RULE_SETUP YY_BREAK case 32: YY_RULE_SETUP -#line 343 "xbt/graphxml.l" +#line 344 "xbt/graphxml.l" { if (!A_graphxml_node_name) FAIL("Required attribute `name' not set for `node' element."); LEAVE; STag_graphxml_node(); pcdata = NULL; ETag_graphxml_node(); @@ -1710,16 +1722,16 @@ YY_RULE_SETUP YY_BREAK case 33: YY_RULE_SETUP -#line 351 "xbt/graphxml.l" +#line 352 "xbt/graphxml.l" FAIL("Unexpected character `%c' in attribute list of node element.", xbt_graph_parse_text[0]); YY_BREAK case 34: YY_RULE_SETUP -#line 352 "xbt/graphxml.l" +#line 353 "xbt/graphxml.l" FAIL("Bad attribute `%s' in `node' element start tag.",xbt_graph_parse_text); YY_BREAK case YY_STATE_EOF(AL_graphxml_node): -#line 353 "xbt/graphxml.l" +#line 354 "xbt/graphxml.l" FAIL("EOF in attribute list of `node' element."); YY_BREAK @@ -1727,7 +1739,7 @@ FAIL("EOF in attribute list of `node' element."); case 35: /* rule 35 can match eol */ YY_RULE_SETUP -#line 357 "xbt/graphxml.l" +#line 358 "xbt/graphxml.l" { LEAVE; ETag_graphxml_node(); @@ -1740,16 +1752,16 @@ YY_RULE_SETUP case 36: /* rule 36 can match eol */ YY_RULE_SETUP -#line 365 "xbt/graphxml.l" +#line 366 "xbt/graphxml.l" FAIL("Unexpected end-tag `%s': `' expected.",xbt_graph_parse_text); YY_BREAK case 37: YY_RULE_SETUP -#line 366 "xbt/graphxml.l" +#line 367 "xbt/graphxml.l" FAIL("Unexpected character `%c': `' expected.",xbt_graph_parse_text[0]); YY_BREAK case YY_STATE_EOF(E_graphxml_node): -#line 367 "xbt/graphxml.l" +#line 368 "xbt/graphxml.l" FAIL("Premature EOF: `' expected."); YY_BREAK @@ -1757,17 +1769,19 @@ FAIL("Premature EOF: `' expected."); * name CDATA #IMPLIED * source CDATA #REQUIRED * target CDATA #REQUIRED + * length CDATA "0.0" * isDirected (true|false) "true" * > */ case 38: /* rule 38 can match eol */ YY_RULE_SETUP -#line 377 "xbt/graphxml.l" +#line 379 "xbt/graphxml.l" { A_graphxml_edge_label = NULL; A_graphxml_edge_name = NULL; A_graphxml_edge_source = NULL; A_graphxml_edge_target = NULL; + A_graphxml_edge_length = "0.0"; A_graphxml_edge_isDirected = A_graphxml_edge_isDirected_true; ENTER(AL_graphxml_edge); } @@ -1776,81 +1790,93 @@ YY_RULE_SETUP case 39: /* rule 39 can match eol */ YY_RULE_SETUP -#line 387 "xbt/graphxml.l" +#line 390 "xbt/graphxml.l" ENTER(VALUE1); BUFFERSET(A_graphxml_edge_label); YY_BREAK case 40: /* rule 40 can match eol */ YY_RULE_SETUP -#line 388 "xbt/graphxml.l" +#line 391 "xbt/graphxml.l" ENTER(VALUE2); BUFFERSET(A_graphxml_edge_label); YY_BREAK case 41: /* rule 41 can match eol */ YY_RULE_SETUP -#line 390 "xbt/graphxml.l" +#line 393 "xbt/graphxml.l" ENTER(VALUE1); BUFFERSET(A_graphxml_edge_name); YY_BREAK case 42: /* rule 42 can match eol */ YY_RULE_SETUP -#line 391 "xbt/graphxml.l" +#line 394 "xbt/graphxml.l" ENTER(VALUE2); BUFFERSET(A_graphxml_edge_name); YY_BREAK case 43: /* rule 43 can match eol */ YY_RULE_SETUP -#line 393 "xbt/graphxml.l" +#line 396 "xbt/graphxml.l" ENTER(VALUE1); BUFFERSET(A_graphxml_edge_source); YY_BREAK case 44: /* rule 44 can match eol */ YY_RULE_SETUP -#line 394 "xbt/graphxml.l" +#line 397 "xbt/graphxml.l" ENTER(VALUE2); BUFFERSET(A_graphxml_edge_source); YY_BREAK case 45: /* rule 45 can match eol */ YY_RULE_SETUP -#line 396 "xbt/graphxml.l" +#line 399 "xbt/graphxml.l" ENTER(VALUE1); BUFFERSET(A_graphxml_edge_target); YY_BREAK case 46: /* rule 46 can match eol */ YY_RULE_SETUP -#line 397 "xbt/graphxml.l" +#line 400 "xbt/graphxml.l" ENTER(VALUE2); BUFFERSET(A_graphxml_edge_target); YY_BREAK case 47: /* rule 47 can match eol */ -#line 400 "xbt/graphxml.l" +YY_RULE_SETUP +#line 402 "xbt/graphxml.l" +ENTER(VALUE1); BUFFERSET(A_graphxml_edge_length); + YY_BREAK case 48: /* rule 48 can match eol */ YY_RULE_SETUP -#line 400 "xbt/graphxml.l" -A_graphxml_edge_isDirected = A_graphxml_edge_isDirected_true; +#line 403 "xbt/graphxml.l" +ENTER(VALUE2); BUFFERSET(A_graphxml_edge_length); YY_BREAK case 49: /* rule 49 can match eol */ -#line 402 "xbt/graphxml.l" +#line 406 "xbt/graphxml.l" case 50: /* rule 50 can match eol */ YY_RULE_SETUP -#line 402 "xbt/graphxml.l" -A_graphxml_edge_isDirected = A_graphxml_edge_isDirected_false; +#line 406 "xbt/graphxml.l" +A_graphxml_edge_isDirected = A_graphxml_edge_isDirected_true; YY_BREAK case 51: +/* rule 51 can match eol */ +#line 408 "xbt/graphxml.l" +case 52: +/* rule 52 can match eol */ YY_RULE_SETUP -#line 404 "xbt/graphxml.l" +#line 408 "xbt/graphxml.l" +A_graphxml_edge_isDirected = A_graphxml_edge_isDirected_false; + YY_BREAK +case 53: +YY_RULE_SETUP +#line 410 "xbt/graphxml.l" { if (!A_graphxml_edge_source) FAIL("Required attribute `source' not set for `edge' element."); if (!A_graphxml_edge_target) FAIL("Required attribute `target' not set for `edge' element."); LEAVE; STag_graphxml_edge();pcdata = NULL; ENTER(E_graphxml_edge); } YY_BREAK -case 52: +case 54: YY_RULE_SETUP -#line 409 "xbt/graphxml.l" +#line 415 "xbt/graphxml.l" { if (!A_graphxml_edge_source) FAIL("Required attribute `source' not set for `edge' element."); if (!A_graphxml_edge_target) FAIL("Required attribute `target' not set for `edge' element."); @@ -1861,26 +1887,26 @@ YY_RULE_SETUP } } YY_BREAK -case 53: +case 55: YY_RULE_SETUP -#line 418 "xbt/graphxml.l" +#line 424 "xbt/graphxml.l" FAIL("Unexpected character `%c' in attribute list of edge element.", xbt_graph_parse_text[0]); YY_BREAK -case 54: +case 56: YY_RULE_SETUP -#line 419 "xbt/graphxml.l" +#line 425 "xbt/graphxml.l" FAIL("Bad attribute `%s' in `edge' element start tag.",xbt_graph_parse_text); YY_BREAK case YY_STATE_EOF(AL_graphxml_edge): -#line 420 "xbt/graphxml.l" +#line 426 "xbt/graphxml.l" FAIL("EOF in attribute list of `edge' element."); YY_BREAK -case 55: -/* rule 55 can match eol */ +case 57: +/* rule 57 can match eol */ YY_RULE_SETUP -#line 424 "xbt/graphxml.l" +#line 430 "xbt/graphxml.l" { LEAVE; ETag_graphxml_edge(); @@ -1890,152 +1916,152 @@ YY_RULE_SETUP } } YY_BREAK -case 56: -/* rule 56 can match eol */ +case 58: +/* rule 58 can match eol */ YY_RULE_SETUP -#line 432 "xbt/graphxml.l" +#line 438 "xbt/graphxml.l" FAIL("Unexpected end-tag `%s': `' expected.",xbt_graph_parse_text); YY_BREAK -case 57: +case 59: YY_RULE_SETUP -#line 433 "xbt/graphxml.l" +#line 439 "xbt/graphxml.l" FAIL("Unexpected character `%c': `' expected.",xbt_graph_parse_text[0]); YY_BREAK case YY_STATE_EOF(E_graphxml_edge): -#line 434 "xbt/graphxml.l" +#line 440 "xbt/graphxml.l" FAIL("Premature EOF: `' expected."); YY_BREAK /* EPILOG: after the root element. */ -case 58: +case 60: YY_RULE_SETUP -#line 440 "xbt/graphxml.l" +#line 446 "xbt/graphxml.l" {SET(PROLOG); yyless(0); CLEANUP; return -1;} YY_BREAK case YY_STATE_EOF(EPILOG): -#line 441 "xbt/graphxml.l" +#line 447 "xbt/graphxml.l" SUCCEED; YY_BREAK /* CHARACTER DATA. */ /* Non-defined standard entities... */ -case 59: +case 61: YY_RULE_SETUP -#line 448 "xbt/graphxml.l" +#line 454 "xbt/graphxml.l" BUFFERPUTC('&'); YY_BREAK -case 60: +case 62: YY_RULE_SETUP -#line 449 "xbt/graphxml.l" +#line 455 "xbt/graphxml.l" BUFFERPUTC('<'); YY_BREAK -case 61: +case 63: YY_RULE_SETUP -#line 450 "xbt/graphxml.l" +#line 456 "xbt/graphxml.l" BUFFERPUTC('>'); YY_BREAK -case 62: +case 64: YY_RULE_SETUP -#line 451 "xbt/graphxml.l" +#line 457 "xbt/graphxml.l" BUFFERPUTC('\''); YY_BREAK -case 63: +case 65: YY_RULE_SETUP -#line 452 "xbt/graphxml.l" +#line 458 "xbt/graphxml.l" BUFFERPUTC('"'); YY_BREAK /* Character entities. */ -case 64: +case 66: YY_RULE_SETUP -#line 455 "xbt/graphxml.l" +#line 461 "xbt/graphxml.l" BUFFERPUTC((unsigned char)atoi(xbt_graph_parse_text+2)); YY_BREAK -case 65: +case 67: YY_RULE_SETUP -#line 456 "xbt/graphxml.l" +#line 462 "xbt/graphxml.l" BUFFERPUTC((unsigned char)strtol(xbt_graph_parse_text+3,NULL,16)); YY_BREAK -case 66: -/* rule 66 can match eol */ -#line 461 "xbt/graphxml.l" -case 67: -/* rule 67 can match eol */ -#line 462 "xbt/graphxml.l" case 68: /* rule 68 can match eol */ -#line 463 "xbt/graphxml.l" +#line 467 "xbt/graphxml.l" case 69: /* rule 69 can match eol */ +#line 468 "xbt/graphxml.l" +case 70: +/* rule 70 can match eol */ +#line 469 "xbt/graphxml.l" +case 71: +/* rule 71 can match eol */ YY_RULE_SETUP -#line 463 "xbt/graphxml.l" +#line 469 "xbt/graphxml.l" BUFFERPUTC('\n'); YY_BREAK -case 70: +case 72: YY_RULE_SETUP -#line 467 "xbt/graphxml.l" +#line 473 "xbt/graphxml.l" ENTER(CDATA); YY_BREAK -case 71: +case 73: YY_RULE_SETUP -#line 468 "xbt/graphxml.l" +#line 474 "xbt/graphxml.l" FAIL("Unexpected `]""]>' in character data."); YY_BREAK -case 72: +case 74: YY_RULE_SETUP -#line 472 "xbt/graphxml.l" +#line 478 "xbt/graphxml.l" BUFFERDONE; LEAVE; YY_BREAK case YY_STATE_EOF(VALUE1): -#line 473 "xbt/graphxml.l" +#line 479 "xbt/graphxml.l" FAIL("EOF in literal (\"'\" expected)."); YY_BREAK -case 73: +case 75: YY_RULE_SETUP -#line 477 "xbt/graphxml.l" +#line 483 "xbt/graphxml.l" BUFFERDONE; LEAVE; YY_BREAK case YY_STATE_EOF(VALUE2): -#line 478 "xbt/graphxml.l" +#line 484 "xbt/graphxml.l" FAIL("EOF in literal (`\"' expected)."); YY_BREAK -case 74: -/* rule 74 can match eol */ +case 76: +/* rule 76 can match eol */ YY_RULE_SETUP -#line 482 "xbt/graphxml.l" +#line 488 "xbt/graphxml.l" BUFFERPUTC(xbt_graph_parse_text[0]); YY_BREAK -case 75: +case 77: YY_RULE_SETUP -#line 483 "xbt/graphxml.l" +#line 489 "xbt/graphxml.l" FAIL("Spurious `%c' in character data.",xbt_graph_parse_text[0]); YY_BREAK -case 76: +case 78: YY_RULE_SETUP -#line 487 "xbt/graphxml.l" +#line 493 "xbt/graphxml.l" LEAVE; YY_BREAK /* "]""]" BUFFERPUTC(xbt_graph_parse_text[0]); BUFFERPUTC(xbt_graph_parse_text[1]); */ -case 77: +case 79: YY_RULE_SETUP -#line 489 "xbt/graphxml.l" +#line 495 "xbt/graphxml.l" BUFFERPUTC(xbt_graph_parse_text[0]); YY_BREAK case YY_STATE_EOF(CDATA): -#line 490 "xbt/graphxml.l" +#line 496 "xbt/graphxml.l" FAIL("EOF in CDATA section."); YY_BREAK @@ -2043,19 +2069,19 @@ FAIL("EOF in CDATA section."); /* Ideally, this should be replaced by code in flexml.pl that generates just the states not covered by other rules. */ -case 78: -/* rule 78 can match eol */ +case 80: +/* rule 80 can match eol */ YY_RULE_SETUP -#line 497 "xbt/graphxml.l" +#line 503 "xbt/graphxml.l" FAIL("Syntax error on character `%c'.", xbt_graph_parse_text[0]); YY_BREAK -case 79: +case 81: YY_RULE_SETUP -#line 500 "xbt/graphxml.l" +#line 506 "xbt/graphxml.l" ECHO; YY_BREAK -#line 2059 "xbt/graphxml.c" +#line 2085 "xbt/graphxml.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(ROOT_graphxml_graph): case YY_STATE_EOF(S_graphxml_graph_2): @@ -2345,7 +2371,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 >= 497 ) + if ( yy_current_state >= 507 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2373,11 +2399,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 >= 497 ) + if ( yy_current_state >= 507 ) 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 == 496); + yy_is_jam = (yy_current_state == 506); return yy_is_jam ? 0 : yy_current_state; } @@ -3059,7 +3085,7 @@ void xbt_graph_parse_free (void * ptr ) #define YYTABLES_NAME "yytables" -#line 500 "xbt/graphxml.l" +#line 506 "xbt/graphxml.l" diff --git a/src/xbt/graphxml.l b/src/xbt/graphxml.l index 423adbc7c9..194efb8abb 100644 --- a/src/xbt/graphxml.l +++ b/src/xbt/graphxml.l @@ -1,9 +1,9 @@ /* Validating XML processor for graphxml.dtd. - * Generated 2006/03/21 12:59:33. + * Generated 2006/03/21 13:43:39. * * This program was generated with the FleXML XML processor generator. * FleXML is Copyright © 1999-2005 Kristoffer Rose. All rights reserved. - * (Id: flexml.pl,v 1.46 2006/03/21 08:24:12 legranda Exp). + * (Id: flexml.pl,v 1.47 2006/03/21 11:12:57 legranda Exp). * * There are two, intertwined parts to this program, part A and part B. * @@ -48,9 +48,9 @@ /* Version strings. */ const char rcs_graphxml_flexml_skeleton[] = - "$" "Id: skel,v 1.27 2006/03/21 08:24:12 legranda Exp $"; + "$" "Id: skel,v 1.28 2006/03/21 12:04:13 legranda Exp $"; const char rcs_graphxml_flexml[] = - "$" "Id: flexml.pl,v 1.46 2006/03/21 08:24:12 legranda Exp $"; + "$" "Id: flexml.pl,v 1.47 2006/03/21 11:12:57 legranda Exp $"; /* ANSI headers. */ #include @@ -67,13 +67,14 @@ const char rcs_graphxml_flexml[] = /* XML processor api. */ /* FleXML-provided data. */ const char* pcdata; -AT_graphxml_edge_target A_graphxml_edge_target; AT_graphxml_node_name A_graphxml_node_name; -AT_graphxml_node_label A_graphxml_node_label; -AT_graphxml_edge_label A_graphxml_edge_label; AT_graphxml_edge_source A_graphxml_edge_source; AT_graphxml_edge_isDirected A_graphxml_edge_isDirected; +AT_graphxml_edge_target A_graphxml_edge_target; +AT_graphxml_node_label A_graphxml_node_label; +AT_graphxml_edge_label A_graphxml_edge_label; AT_graphxml_edge_name A_graphxml_edge_name; +AT_graphxml_edge_length A_graphxml_edge_length; /* XML state. */ #ifdef FLEX_DEBUG @@ -371,6 +372,7 @@ const char* *graphxml_statenames=NULL; * name CDATA #IMPLIED * source CDATA #REQUIRED * target CDATA #REQUIRED + * length CDATA "0.0" * isDirected (true|false) "true" * > */ @@ -379,6 +381,7 @@ const char* *graphxml_statenames=NULL; A_graphxml_edge_name = NULL; A_graphxml_edge_source = NULL; A_graphxml_edge_target = NULL; + A_graphxml_edge_length = "0.0"; A_graphxml_edge_isDirected = A_graphxml_edge_isDirected_true; ENTER(AL_graphxml_edge); } @@ -396,6 +399,9 @@ const char* *graphxml_statenames=NULL; "target"{Eq}\' ENTER(VALUE1); BUFFERSET(A_graphxml_edge_target); "target"{Eq}\" ENTER(VALUE2); BUFFERSET(A_graphxml_edge_target); + "length"{Eq}\' ENTER(VALUE1); BUFFERSET(A_graphxml_edge_length); + "length"{Eq}\" ENTER(VALUE2); BUFFERSET(A_graphxml_edge_length); + "isDirected"{Eq}"'true'" | "isDirected"{Eq}"\"true\"" A_graphxml_edge_isDirected = A_graphxml_edge_isDirected_true; "isDirected"{Eq}"'false'" | -- 2.20.1