From 4667912ec9d629ba8f3457886e19debd159e8b80 Mon Sep 17 00:00:00 2001 From: jmckenna Date: Sat, 12 Jun 2021 14:19:29 -0300 Subject: [PATCH 1/6] handle mapfile check --- src/mapfile/mapfile.c | 1042 ++++++++++++++++++----------------------- src/mapfile/mapfile.l | 3 +- 2 files changed, 450 insertions(+), 595 deletions(-) diff --git a/src/mapfile/mapfile.c b/src/mapfile/mapfile.c index 742a6716..899d09c3 100644 --- a/src/mapfile/mapfile.c +++ b/src/mapfile/mapfile.c @@ -54,7 +54,6 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; -#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -85,6 +84,8 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif +#endif /* ! C99 */ + #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -141,7 +142,15 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k. + * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. + * Ditto for the __ia64__ case accordingly. + */ +#define YY_BUF_SIZE 32768 +#else #define YY_BUF_SIZE 16384 +#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -153,12 +162,7 @@ typedef unsigned int flex_uint32_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - -extern yy_size_t yyleng; +extern int yyleng; extern FILE *yyin, *yyout; @@ -184,6 +188,11 @@ extern FILE *yyin, *yyout; #define unput(c) yyunput( c, (yytext_ptr) ) +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -201,7 +210,7 @@ struct yy_buffer_state /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - yy_size_t yy_n_chars; + int 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 @@ -271,8 +280,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ -yy_size_t yyleng; +static int yy_n_chars; /* number of characters read into yy_ch_buf */ +int yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -300,7 +309,7 @@ static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); void *yyalloc (yy_size_t ); void *yyrealloc (void *,yy_size_t ); @@ -461,11 +470,11 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 1, 1, 1, 1, 7, 1, 34, 35, 36, 37, + 1, 1, 1, 1, 7, 1, 29, 29, 29, 29, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 29, 55, 56, - 57, 58, 1, 1, 1, 1, 1, 1, 1, 1, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, + 29, 29, 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, @@ -482,96 +491,94 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[59] = +static yyconst flex_int32_t yy_meta[34] = { 0, 1, 2, 2, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3 + 3, 3, 3 } ; static yyconst flex_int16_t yy_base[706] = { 0, - 0, 45, 82, 0, 133, 0, 7, 20, 29, 52, - 72, 152, 181, 192, 203, 208, 214, 229, 267, 316, - 365, 418, 462, 0, 507, 558, 80, 120, 235, 240, - 609, 0, 658, 0, 241, 242, 706, 0, 243, 260, - 287, 288, 295, 333, 757, 806, 339, 340, 855, 898, - 941, 986, 341, 342, 385, 386, 391, 394, 373, 1613, - 1613, 1613, 360, 1613, 337, 13, 16, 9, 22, 11, - 40, 95, 105, 60, 43, 48, 116, 135, 193, 138, - 139, 388, 141, 153, 181, 191, 404, 226, 1613, 1613, - 338, 326, 327, 321, 0, 26, 12, 0, 254, 0, - - 78, 292, 0, 278, 309, 306, 293, 290, 0, 288, - 288, 0, 303, 323, 407, 433, 432, 338, 405, 436, - 452, 450, 455, 437, 453, 448, 473, 444, 481, 488, - 483, 488, 485, 491, 493, 509, 509, 502, 503, 506, - 509, 509, 505, 510, 522, 520, 538, 543, 538, 557, - 545, 560, 547, 550, 565, 567, 240, 237, 238, 1613, - 231, 565, 567, 556, 559, 555, 562, 578, 54, 576, - 572, 571, 585, 605, 606, 612, 614, 606, 610, 622, - 609, 609, 616, 631, 633, 630, 58, 623, 639, 220, - 1613, 209, 198, 1613, 194, 0, 165, 188, 0, 444, - - 155, 658, 0, 178, 153, 0, 669, 117, 662, 116, - 1613, 71, 68, 1613, 63, 0, 666, 653, 0, 671, - 655, 678, 668, 664, 676, 689, 679, 679, 704, 703, - 705, 716, 703, 711, 721, 166, 707, 715, 717, 221, - 732, 234, 723, 748, 734, 730, 755, 739, 743, 293, - 751, 761, 766, 762, 772, 765, 760, 772, 420, 782, - 782, 773, 787, 776, 780, 795, 797, 812, 803, 808, - 35, 1613, 19, 1613, 809, 1613, 816, 822, 805, 821, - 824, 825, 826, 816, 823, 818, 835, 834, 834, 858, - 847, 1613, 845, 852, 851, 869, 867, 1613, 855, 876, - - 863, 1613, 0, 1613, 0, 0, 860, 0, 877, 864, - 870, 887, 876, 878, 882, 895, 912, 896, 915, 906, - 917, 922, 920, 913, 907, 1613, 914, 913, 926, 931, - 928, 942, 940, 939, 951, 949, 962, 955, 948, 966, - 970, 955, 965, 963, 964, 966, 975, 973, 991, 990, - 1002, 992, 1002, 999, 998, 1010, 996, 1010, 1014, 1006, - 1002, 1015, 1011, 1010, 1025, 1013, 1024, 1613, 1018, 1035, - 721, 1026, 1042, 1043, 1036, 1040, 1029, 1040, 1054, 1055, - 1056, 1057, 1059, 1055, 1061, 0, 1050, 1066, 1613, 1613, - 1051, 1070, 1071, 1613, 1064, 1076, 1613, 1070, 1079, 1613, - - 1071, 1613, 1086, 1076, 1083, 1087, 1095, 1088, 1092, 1613, - 1100, 1092, 1102, 1103, 1108, 1105, 1100, 1111, 1115, 1103, - 1119, 1613, 1115, 1109, 1613, 1613, 1116, 1120, 1128, 1129, - 1134, 1613, 1613, 1137, 1613, 1123, 1140, 1141, 1150, 1147, - 1135, 1613, 1152, 1137, 1159, 1150, 1159, 1163, 1150, 1155, - 1170, 1613, 1613, 1154, 1155, 1159, 1163, 1178, 1183, 1176, - 1187, 1183, 1169, 1177, 1182, 1613, 1185, 1206, 1203, 1613, - 1189, 1613, 1208, 1613, 1613, 1202, 1215, 1208, 1613, 1198, - 1205, 1205, 1204, 1213, 1613, 1613, 1613, 1218, 1214, 1222, - 1613, 1231, 1613, 1218, 1217, 1613, 1219, 1234, 1613, 1226, - - 1227, 1227, 1613, 1242, 1235, 1255, 1245, 1259, 1260, 1247, - 1247, 1613, 1613, 1267, 1251, 1254, 1251, 1255, 1257, 1260, - 1259, 1260, 1278, 1275, 1613, 1613, 1274, 1269, 1270, 1272, - 1291, 1613, 1279, 1280, 1278, 1302, 1294, 1306, 1613, 1298, - 1308, 1298, 1299, 1613, 1305, 1613, 1613, 1301, 1613, 1306, - 1308, 1318, 1313, 1327, 1313, 1312, 1330, 1331, 1320, 1329, - 1330, 1342, 1345, 0, 1336, 1347, 1345, 1613, 1339, 1353, - 1358, 1363, 1356, 1365, 1366, 1367, 1613, 1370, 1613, 1361, - 1368, 1376, 1356, 1377, 1367, 1379, 1382, 1370, 1377, 1613, - 1388, 1613, 1386, 1375, 1386, 1395, 1613, 1403, 1613, 1613, - - 1386, 1398, 1397, 1410, 1404, 1404, 1613, 1407, 1613, 1613, - 1410, 1409, 1613, 1613, 1410, 1613, 1613, 1406, 1409, 1613, - 1418, 1418, 1613, 1613, 1613, 1433, 1613, 1415, 1420, 1613, - 1425, 1427, 1439, 1613, 1431, 1613, 1434, 1435, 1445, 1441, - 1455, 1613, 1439, 1458, 1613, 1444, 1613, 1458, 1613, 1453, - 1454, 1459, 1613, 1455, 1456, 1613, 1453, 1459, 1465, 1466, - 1472, 1613, 1482, 1472, 1486, 1613, 1613, 1613, 1474, 1491, - 1484, 1484, 1613, 1613, 1613, 1613, 1531, 1534, 1537, 1540, - 1543, 1546, 1549, 1552, 1555, 1558, 1561, 1564, 1567, 1570, - 1573, 1576, 1579, 1582, 1585, 1588, 1591, 18, 5, 1594, - - 1597, 1600, 1603, 1606, 1609 + 0, 19, 30, 0, 56, 0, 82, 101, 120, 131, + 142, 153, 164, 175, 186, 205, 224, 235, 247, 270, + 293, 320, 338, 0, 357, 383, 12, 13, 14, 22, + 409, 0, 432, 0, 42, 43, 455, 0, 61, 62, + 74, 75, 92, 94, 481, 504, 120, 142, 527, 544, + 561, 580, 164, 178, 180, 181, 600, 617, 912, 913, + 913, 913, 907, 913, 904, 888, 887, 899, 884, 897, + 882, 16, 1, 895, 874, 876, 872, 887, 55, 886, + 885, 95, 874, 883, 874, 871, 2, 880, 913, 913, + 887, 884, 885, 882, 0, 115, 90, 0, 866, 0, + + 126, 210, 0, 865, 881, 878, 879, 876, 0, 860, + 858, 0, 858, 853, 79, 36, 183, 852, 864, 853, + 866, 861, 864, 844, 858, 851, 110, 843, 855, 858, + 183, 853, 843, 841, 191, 854, 57, 845, 839, 837, + 837, 835, 828, 830, 838, 828, 844, 839, 830, 841, + 826, 839, 824, 825, 836, 131, 839, 836, 837, 913, + 834, 828, 828, 814, 815, 808, 813, 825, 800, 817, + 810, 802, 806, 815, 813, 817, 816, 803, 802, 812, + 797, 794, 796, 809, 808, 801, 783, 786, 792, 807, + 913, 804, 805, 913, 802, 0, 148, 803, 0, 215, + + 800, 794, 0, 170, 800, 0, 254, 797, 791, 797, + 913, 794, 795, 913, 792, 0, 786, 770, 0, 784, + 766, 785, 771, 764, 770, 781, 769, 765, 84, 778, + 769, 775, 756, 762, 769, 749, 752, 755, 755, 744, + 766, 742, 753, 144, 758, 752, 762, 742, 741, 734, + 746, 754, 750, 744, 192, 741, 734, 744, 726, 750, + 748, 736, 747, 729, 728, 732, 730, 742, 729, 732, + 743, 913, 740, 913, 726, 913, 731, 735, 715, 727, + 728, 727, 726, 714, 719, 710, 722, 714, 709, 722, + 707, 913, 702, 706, 700, 715, 711, 913, 697, 715, + + 699, 913, 0, 913, 0, 0, 694, 0, 708, 693, + 660, 664, 613, 608, 607, 605, 620, 602, 618, 607, + 615, 618, 613, 604, 592, 913, 593, 589, 599, 602, + 594, 603, 588, 583, 590, 586, 597, 583, 572, 586, + 588, 568, 575, 570, 569, 563, 570, 566, 575, 563, + 571, 557, 565, 560, 556, 563, 546, 558, 559, 549, + 541, 552, 544, 537, 550, 536, 538, 913, 530, 544, + 523, 529, 541, 540, 529, 531, 514, 520, 532, 530, + 529, 527, 527, 518, 522, 0, 509, 522, 913, 913, + 505, 518, 517, 913, 505, 515, 913, 507, 514, 913, + + 496, 913, 509, 496, 498, 498, 504, 493, 495, 913, + 501, 487, 495, 494, 495, 490, 483, 489, 491, 477, + 488, 913, 482, 471, 913, 913, 476, 475, 481, 480, + 483, 913, 913, 478, 913, 462, 477, 473, 476, 471, + 455, 913, 469, 452, 466, 455, 462, 464, 449, 452, + 462, 913, 913, 444, 441, 201, 444, 453, 452, 443, + 147, 447, 431, 428, 426, 913, 425, 224, 441, 913, + 421, 913, 438, 913, 913, 426, 436, 427, 913, 414, + 418, 413, 407, 414, 913, 913, 913, 416, 410, 414, + 913, 418, 913, 399, 395, 913, 394, 407, 913, 391, + + 390, 384, 913, 402, 385, 403, 388, 400, 399, 380, + 378, 913, 913, 396, 377, 378, 373, 371, 371, 371, + 368, 367, 381, 376, 913, 913, 370, 363, 362, 360, + 371, 913, 356, 355, 349, 368, 358, 366, 913, 355, + 363, 347, 345, 913, 349, 913, 913, 343, 913, 346, + 346, 351, 343, 355, 339, 336, 348, 344, 327, 331, + 327, 337, 332, 0, 321, 330, 325, 913, 313, 325, + 326, 329, 320, 323, 322, 321, 913, 321, 913, 310, + 315, 318, 287, 306, 294, 304, 303, 289, 291, 913, + 300, 913, 296, 283, 286, 293, 913, 299, 913, 913, + + 278, 284, 281, 290, 282, 272, 913, 269, 913, 913, + 270, 267, 913, 913, 266, 913, 913, 260, 261, 913, + 265, 263, 913, 913, 913, 275, 913, 254, 257, 913, + 258, 258, 257, 913, 247, 913, 248, 247, 249, 243, + 255, 913, 235, 249, 913, 231, 913, 239, 913, 224, + 223, 222, 913, 216, 208, 913, 202, 206, 198, 197, + 199, 913, 192, 170, 179, 913, 913, 913, 117, 97, + 54, 24, 913, 913, 913, 913, 637, 640, 643, 646, + 649, 652, 655, 658, 661, 664, 667, 670, 673, 676, + 679, 682, 685, 688, 691, 694, 697, 8, 5, 700, + + 703, 706, 709, 712, 715 } ; static yyconst flex_int16_t yy_def[706] = @@ -656,380 +663,220 @@ static yyconst flex_int16_t yy_def[706] = 676, 676, 676, 676, 676 } ; -static yyconst flex_int16_t yy_nxt[1672] = +static yyconst flex_int16_t yy_nxt[947] = { 0, - 676, 61, 62, 63, 64, 65, 61, 219, 89, 90, - 91, 66, 92, 201, 201, 67, 164, 199, 166, 68, - 216, 89, 90, 91, 272, 92, 60, 198, 198, 199, - 89, 90, 93, 162, 94, 61, 163, 66, 272, 60, - 66, 67, 164, 165, 166, 68, 61, 62, 63, 64, - 65, 61, 60, 89, 90, 93, 66, 94, 61, 162, - 67, 167, 163, 66, 68, 60, 66, 171, 214, 165, - 172, 214, 173, 61, 62, 96, 211, 97, 98, 205, - 205, 206, 66, 99, 60, 281, 67, 167, 299, 66, - 68, 69, 70, 171, 71, 60, 172, 72, 173, 60, - - 73, 60, 74, 75, 76, 77, 78, 79, 80, 99, - 281, 81, 169, 299, 168, 163, 170, 69, 70, 211, - 71, 60, 304, 72, 60, 60, 73, 60, 74, 75, - 76, 77, 78, 79, 80, 60, 81, 60, 169, 60, - 168, 163, 170, 174, 82, 83, 175, 84, 85, 179, - 180, 86, 87, 61, 62, 96, 304, 97, 98, 88, - 302, 60, 183, 99, 184, 60, 198, 198, 199, 174, - 82, 83, 175, 84, 85, 179, 180, 86, 87, 205, - 205, 206, 89, 90, 101, 88, 102, 103, 183, 99, - 184, 302, 104, 89, 90, 101, 325, 102, 103, 194, - - 185, 194, 176, 104, 89, 90, 105, 177, 106, 89, - 90, 105, 186, 106, 191, 89, 90, 107, 104, 108, - 61, 325, 60, 191, 178, 66, 185, 60, 176, 104, - 89, 90, 107, 177, 108, 61, 160, 189, 186, 60, - 66, 160, 272, 272, 60, 60, 60, 60, 60, 178, - 60, 66, 329, 60, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 189, 60, 331, 66, 60, 61, 62, - 63, 60, 65, 61, 202, 60, 60, 329, 110, 60, - 60, 60, 60, 60, 60, 60, 60, 60, 60, 111, - 331, 60, 60, 208, 208, 214, 214, 206, 209, 60, - - 202, 60, 60, 60, 110, 60, 60, 60, 217, 218, - 60, 211, 211, 147, 60, 111, 60, 61, 62, 63, - 60, 65, 61, 220, 209, 340, 194, 110, 60, 60, - 194, 191, 60, 60, 217, 218, 60, 60, 111, 147, - 60, 191, 160, 60, 60, 60, 60, 221, 60, 220, - 340, 147, 60, 110, 149, 149, 60, 60, 150, 150, - 60, 60, 229, 160, 111, 60, 61, 62, 63, 60, - 65, 61, 676, 221, 60, 676, 113, 147, 60, 676, - 149, 149, 60, 60, 150, 150, 60, 60, 229, 60, - 60, 114, 676, 676, 157, 60, 158, 157, 60, 158, - - 60, 60, 113, 676, 60, 60, 60, 181, 162, 60, - 60, 187, 182, 60, 676, 188, 230, 114, 60, 61, - 62, 63, 60, 65, 61, 222, 60, 60, 223, 113, - 60, 60, 60, 181, 162, 60, 60, 187, 182, 60, - 224, 188, 230, 226, 114, 201, 201, 227, 676, 199, - 676, 222, 349, 228, 223, 113, 676, 231, 676, 232, - 225, 233, 234, 235, 236, 237, 224, 676, 239, 226, - 114, 115, 116, 227, 117, 118, 119, 349, 120, 228, - 121, 122, 123, 231, 76, 232, 225, 233, 234, 235, - 236, 237, 240, 162, 239, 241, 676, 115, 116, 244, - - 117, 118, 119, 238, 120, 245, 121, 122, 123, 242, - 76, 60, 246, 676, 243, 247, 249, 252, 240, 162, - 248, 241, 124, 253, 250, 244, 60, 254, 238, 255, - 256, 245, 257, 125, 258, 242, 126, 259, 246, 243, - 251, 247, 249, 252, 260, 261, 248, 676, 124, 253, - 250, 676, 60, 254, 262, 255, 256, 263, 257, 125, - 258, 126, 60, 259, 264, 251, 265, 266, 267, 268, - 260, 261, 269, 124, 249, 274, 275, 60, 276, 277, - 262, 278, 279, 263, 125, 280, 676, 126, 270, 282, - 264, 283, 265, 266, 267, 268, 676, 284, 269, 124, - - 249, 274, 275, 60, 276, 277, 285, 278, 279, 676, - 125, 280, 126, 60, 270, 282, 286, 283, 287, 288, - 127, 289, 128, 284, 60, 290, 129, 130, 60, 291, - 292, 293, 285, 294, 131, 132, 676, 295, 296, 676, - 297, 676, 286, 298, 287, 288, 127, 289, 128, 300, - 60, 290, 129, 130, 60, 291, 292, 293, 301, 294, - 131, 132, 60, 295, 296, 133, 297, 134, 303, 298, - 208, 208, 305, 60, 206, 300, 306, 60, 307, 135, - 136, 308, 309, 137, 301, 310, 676, 138, 311, 676, - 312, 133, 676, 134, 303, 313, 314, 315, 305, 60, - - 316, 676, 306, 60, 307, 135, 136, 308, 309, 137, - 319, 310, 138, 139, 311, 140, 312, 141, 142, 317, - 320, 313, 314, 315, 321, 318, 316, 143, 144, 322, - 323, 145, 324, 326, 676, 146, 319, 327, 328, 139, - 330, 140, 332, 141, 142, 317, 320, 335, 336, 676, - 321, 318, 446, 143, 144, 322, 323, 145, 324, 326, - 146, 60, 337, 327, 328, 338, 330, 333, 332, 339, - 341, 342, 60, 335, 336, 147, 60, 446, 334, 343, - 344, 345, 274, 148, 676, 346, 347, 348, 337, 350, - 351, 338, 352, 333, 353, 339, 341, 342, 60, 676, - - 354, 147, 60, 334, 355, 343, 344, 345, 274, 148, - 60, 346, 347, 348, 356, 350, 351, 357, 352, 358, - 353, 60, 359, 360, 147, 60, 354, 361, 362, 363, - 355, 364, 148, 676, 365, 366, 367, 368, 369, 370, - 356, 676, 371, 357, 676, 358, 372, 60, 359, 360, - 147, 60, 373, 361, 362, 363, 374, 364, 148, 60, - 365, 366, 367, 368, 369, 370, 375, 151, 371, 376, - 60, 377, 372, 378, 60, 152, 676, 379, 373, 380, - 381, 382, 374, 383, 676, 384, 385, 676, 386, 387, - 388, 676, 375, 151, 389, 376, 60, 377, 390, 378, - - 60, 152, 60, 379, 391, 380, 381, 382, 392, 383, - 151, 384, 385, 60, 386, 387, 388, 60, 152, 676, - 389, 393, 394, 395, 390, 396, 397, 676, 398, 399, - 391, 400, 401, 402, 392, 676, 151, 676, 403, 60, - 404, 405, 406, 60, 152, 60, 407, 393, 394, 395, - 408, 396, 397, 153, 398, 399, 154, 400, 401, 402, - 60, 155, 409, 156, 403, 410, 404, 405, 406, 411, - 412, 413, 407, 414, 415, 676, 408, 416, 417, 153, - 676, 418, 154, 419, 420, 421, 60, 155, 409, 156, - 60, 410, 422, 423, 424, 411, 412, 413, 153, 414, - - 415, 154, 425, 416, 417, 60, 155, 418, 156, 419, - 420, 421, 426, 427, 428, 429, 430, 431, 422, 423, - 424, 432, 433, 434, 153, 435, 436, 154, 425, 437, - 438, 60, 155, 439, 156, 440, 441, 442, 426, 427, - 428, 429, 430, 431, 443, 444, 445, 432, 433, 434, - 447, 435, 436, 448, 449, 437, 438, 450, 451, 439, - 452, 440, 441, 442, 453, 454, 455, 456, 457, 458, - 443, 444, 445, 459, 460, 461, 447, 462, 463, 448, - 449, 464, 465, 450, 451, 452, 466, 467, 468, 469, - 453, 454, 455, 456, 457, 458, 470, 471, 472, 459, - - 460, 461, 473, 462, 463, 474, 475, 464, 465, 476, - 477, 478, 466, 467, 468, 469, 479, 480, 481, 482, - 483, 484, 470, 471, 472, 485, 486, 487, 473, 488, - 489, 474, 475, 490, 491, 476, 477, 478, 492, 493, - 494, 495, 479, 480, 481, 482, 483, 484, 496, 497, - 498, 485, 486, 487, 499, 488, 489, 500, 501, 490, - 491, 502, 503, 504, 492, 493, 494, 495, 505, 506, - 507, 508, 509, 510, 496, 497, 498, 511, 512, 513, - 499, 514, 516, 500, 501, 517, 515, 502, 503, 504, - 518, 519, 522, 523, 505, 506, 507, 508, 509, 510, - - 520, 524, 521, 511, 512, 513, 525, 514, 516, 526, - 529, 517, 515, 527, 530, 531, 518, 519, 522, 523, - 532, 528, 533, 534, 535, 536, 520, 524, 521, 537, - 538, 539, 525, 540, 541, 526, 529, 542, 543, 527, - 530, 531, 544, 545, 546, 547, 532, 528, 533, 534, - 535, 536, 548, 549, 551, 537, 538, 539, 550, 540, - 541, 552, 553, 542, 543, 554, 555, 556, 544, 545, - 546, 547, 557, 558, 559, 560, 561, 562, 548, 549, - 551, 563, 564, 550, 565, 566, 567, 552, 553, 568, - 569, 554, 555, 556, 570, 571, 572, 573, 557, 558, - - 559, 560, 561, 562, 574, 575, 576, 563, 564, 577, - 565, 566, 567, 578, 579, 568, 569, 580, 581, 582, - 570, 571, 572, 573, 583, 584, 585, 586, 587, 588, - 574, 575, 576, 589, 577, 590, 591, 592, 593, 578, - 579, 594, 595, 580, 581, 582, 596, 597, 598, 599, - 583, 584, 585, 586, 587, 588, 600, 601, 602, 589, - 603, 590, 591, 592, 593, 604, 605, 594, 595, 606, - 607, 608, 596, 597, 598, 599, 609, 610, 611, 612, - 613, 614, 600, 601, 602, 615, 603, 616, 617, 618, - 619, 604, 605, 620, 621, 606, 607, 608, 622, 623, - - 624, 625, 609, 610, 611, 612, 613, 614, 626, 627, - 628, 615, 616, 629, 617, 618, 619, 630, 631, 620, - 621, 632, 633, 634, 622, 623, 624, 625, 635, 636, - 637, 638, 639, 640, 626, 627, 628, 641, 642, 629, - 643, 644, 645, 630, 631, 646, 647, 632, 633, 634, - 648, 649, 650, 651, 635, 636, 637, 638, 639, 640, - 652, 653, 654, 641, 642, 655, 643, 644, 645, 656, - 657, 646, 647, 658, 659, 660, 648, 649, 650, 651, - 661, 662, 663, 676, 664, 665, 652, 653, 654, 666, - 667, 655, 668, 669, 670, 656, 657, 671, 672, 658, - - 659, 660, 673, 674, 675, 676, 661, 662, 663, 664, - 676, 665, 676, 676, 676, 666, 667, 676, 668, 669, - 670, 676, 676, 671, 672, 676, 676, 676, 673, 674, - 675, 60, 60, 60, 95, 95, 95, 100, 100, 100, - 109, 109, 109, 112, 112, 112, 159, 159, 159, 161, - 161, 161, 190, 190, 190, 192, 192, 192, 193, 193, - 193, 195, 195, 195, 196, 676, 196, 197, 197, 197, - 200, 200, 200, 203, 676, 203, 204, 204, 204, 207, - 207, 207, 210, 210, 210, 212, 212, 212, 213, 213, - 213, 215, 215, 215, 271, 271, 271, 273, 273, 273, - - 198, 198, 198, 201, 201, 201, 205, 205, 205, 208, - 208, 208, 59, 676, 676, 676, 676, 676, 676, 676, - 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, - 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, - 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, + 676, 61, 62, 63, 64, 65, 61, 219, 169, 187, + 216, 66, 170, 188, 676, 67, 60, 60, 60, 68, + 61, 62, 63, 64, 65, 61, 60, 60, 60, 60, + 66, 60, 60, 60, 67, 168, 163, 60, 68, 69, + 70, 60, 71, 224, 675, 72, 60, 60, 73, 60, + 74, 75, 76, 77, 78, 79, 80, 60, 60, 81, + 60, 60, 60, 225, 176, 60, 60, 82, 83, 177, + 84, 85, 250, 674, 86, 87, 60, 60, 60, 60, + 60, 60, 88, 89, 90, 91, 178, 92, 251, 60, + 60, 201, 201, 60, 60, 199, 60, 222, 60, 317, + + 223, 60, 89, 90, 91, 318, 92, 60, 673, 60, + 147, 60, 147, 60, 181, 162, 198, 198, 199, 182, + 60, 89, 90, 93, 60, 94, 61, 205, 205, 206, + 162, 66, 89, 90, 93, 149, 94, 61, 249, 150, + 238, 672, 66, 61, 62, 96, 60, 97, 98, 198, + 198, 199, 270, 99, 61, 62, 96, 149, 97, 98, + 520, 150, 521, 333, 99, 89, 90, 101, 60, 102, + 103, 205, 205, 206, 334, 104, 89, 90, 101, 60, + 102, 103, 60, 60, 60, 60, 104, 89, 90, 105, + 671, 106, 670, 60, 226, 60, 60, 60, 227, 60, + + 60, 345, 274, 669, 228, 60, 89, 90, 105, 242, + 106, 208, 208, 247, 243, 206, 201, 201, 248, 668, + 199, 667, 666, 514, 60, 89, 90, 107, 515, 108, + 61, 527, 665, 664, 663, 66, 89, 90, 107, 528, + 108, 61, 662, 661, 660, 659, 66, 60, 61, 62, + 63, 60, 65, 61, 658, 208, 208, 657, 110, 206, + 656, 655, 654, 653, 652, 651, 650, 649, 648, 111, + 60, 61, 62, 63, 60, 65, 61, 647, 646, 645, + 644, 110, 643, 642, 641, 640, 639, 638, 637, 636, + 635, 634, 111, 60, 61, 62, 63, 60, 65, 61, + + 633, 632, 631, 630, 113, 629, 628, 627, 626, 625, + 624, 623, 622, 621, 620, 619, 618, 617, 616, 114, + 60, 61, 62, 63, 60, 65, 61, 615, 614, 613, + 612, 113, 611, 610, 609, 608, 607, 606, 605, 604, + 603, 602, 601, 600, 599, 598, 114, 115, 116, 597, + 117, 118, 119, 596, 120, 595, 121, 122, 123, 594, + 76, 60, 593, 592, 591, 590, 589, 588, 587, 586, + 585, 584, 124, 583, 582, 581, 60, 580, 579, 578, + 577, 576, 575, 125, 574, 573, 126, 60, 572, 571, + 570, 569, 568, 567, 566, 565, 564, 563, 124, 562, + + 561, 560, 60, 559, 558, 557, 556, 555, 554, 125, + 553, 552, 126, 60, 551, 550, 549, 548, 547, 546, + 127, 545, 128, 544, 60, 543, 129, 130, 60, 542, + 541, 540, 539, 538, 131, 132, 60, 537, 536, 133, + 535, 134, 534, 533, 532, 531, 530, 60, 529, 526, + 525, 60, 524, 135, 136, 523, 522, 137, 519, 518, + 517, 138, 139, 516, 140, 513, 141, 142, 512, 511, + 510, 509, 508, 507, 506, 505, 143, 144, 504, 503, + 145, 502, 501, 500, 146, 60, 499, 498, 497, 496, + 495, 494, 493, 492, 491, 490, 60, 489, 488, 147, + + 60, 487, 486, 485, 484, 483, 482, 148, 60, 481, + 480, 479, 478, 477, 476, 475, 474, 473, 472, 60, + 471, 470, 147, 60, 469, 468, 467, 466, 465, 464, + 148, 60, 463, 462, 461, 460, 459, 458, 457, 151, + 456, 455, 60, 454, 453, 452, 60, 152, 60, 451, + 450, 449, 448, 447, 446, 445, 151, 444, 443, 60, + 442, 441, 440, 60, 152, 60, 439, 438, 437, 436, + 435, 434, 433, 153, 432, 431, 154, 430, 429, 428, + 60, 155, 427, 156, 60, 426, 425, 424, 423, 422, + 421, 420, 153, 419, 418, 154, 417, 416, 415, 60, + + 155, 414, 156, 157, 60, 158, 413, 412, 411, 410, + 409, 408, 407, 406, 405, 60, 404, 403, 402, 60, + 157, 60, 158, 401, 400, 399, 398, 397, 396, 395, + 394, 393, 60, 392, 391, 390, 60, 60, 60, 60, + 95, 95, 95, 100, 100, 100, 109, 109, 109, 112, + 112, 112, 159, 159, 159, 161, 161, 161, 190, 190, + 190, 192, 192, 192, 193, 193, 193, 195, 195, 195, + 196, 389, 196, 197, 197, 197, 200, 200, 200, 203, + 388, 203, 204, 204, 204, 207, 207, 207, 210, 210, + 210, 212, 212, 212, 213, 213, 213, 215, 215, 215, + + 271, 271, 271, 273, 273, 273, 198, 198, 198, 201, + 201, 201, 205, 205, 205, 208, 208, 208, 387, 386, + 385, 384, 383, 382, 381, 380, 379, 378, 377, 376, + 375, 374, 373, 372, 371, 370, 369, 368, 367, 366, + 365, 364, 363, 362, 361, 272, 272, 360, 359, 358, + 357, 356, 355, 354, 353, 352, 351, 350, 349, 348, + 347, 346, 344, 343, 342, 341, 340, 339, 338, 337, + 336, 335, 332, 331, 330, 329, 328, 327, 326, 325, + 324, 323, 322, 321, 320, 319, 316, 315, 314, 313, + 312, 311, 310, 309, 308, 307, 306, 214, 214, 211, + + 211, 305, 304, 304, 303, 302, 302, 194, 194, 191, + 191, 301, 300, 299, 298, 297, 296, 295, 294, 293, + 292, 291, 290, 289, 288, 287, 286, 285, 284, 283, + 282, 281, 280, 279, 278, 277, 276, 275, 274, 160, + 160, 272, 272, 269, 268, 267, 266, 265, 264, 263, + 262, 261, 260, 259, 258, 257, 256, 255, 254, 253, + 252, 249, 246, 245, 244, 241, 240, 239, 237, 236, + 235, 234, 233, 232, 231, 230, 229, 221, 220, 218, + 217, 214, 214, 211, 211, 209, 202, 194, 194, 191, + 191, 189, 186, 185, 184, 183, 180, 179, 175, 174, + + 173, 172, 171, 167, 166, 165, 164, 163, 162, 160, + 160, 676, 59, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, - 676 + 676, 676, 676, 676, 676, 676 } ; -static yyconst flex_int16_t yy_chk[1672] = +static yyconst flex_int16_t yy_chk[947] = { 0, - 0, 1, 1, 1, 1, 1, 1, 699, 7, 7, - 7, 1, 7, 97, 97, 1, 68, 97, 70, 1, - 698, 8, 8, 8, 273, 8, 7, 96, 96, 96, - 9, 9, 9, 66, 9, 9, 67, 1, 271, 8, - 9, 1, 68, 69, 70, 1, 2, 2, 2, 2, - 2, 2, 7, 10, 10, 10, 2, 10, 10, 66, - 2, 71, 67, 10, 2, 8, 9, 74, 215, 69, - 75, 213, 76, 11, 11, 11, 212, 11, 11, 101, - 101, 101, 2, 11, 27, 169, 2, 71, 187, 10, - 2, 3, 3, 74, 3, 27, 75, 3, 76, 27, - - 3, 3, 3, 3, 3, 3, 3, 3, 3, 11, - 169, 3, 73, 187, 72, 72, 73, 3, 3, 210, - 3, 27, 208, 3, 28, 27, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 28, 3, 5, 73, 28, - 72, 72, 73, 77, 5, 5, 78, 5, 5, 80, - 81, 5, 5, 12, 12, 12, 205, 12, 12, 5, - 201, 28, 83, 12, 84, 28, 197, 197, 197, 77, - 5, 5, 78, 5, 5, 80, 81, 5, 5, 204, - 204, 204, 13, 13, 13, 5, 13, 13, 83, 12, - 84, 198, 13, 14, 14, 14, 236, 14, 14, 195, - - 85, 193, 79, 14, 15, 15, 15, 79, 15, 16, - 16, 16, 86, 16, 192, 17, 17, 17, 13, 17, - 17, 236, 15, 190, 79, 17, 85, 16, 79, 14, - 18, 18, 18, 79, 18, 18, 161, 88, 86, 29, - 18, 159, 158, 157, 30, 35, 36, 39, 15, 79, - 29, 17, 240, 16, 29, 30, 35, 36, 39, 30, - 35, 36, 39, 88, 40, 242, 18, 19, 19, 19, - 19, 19, 19, 19, 99, 40, 29, 240, 19, 40, - 29, 30, 35, 36, 39, 30, 35, 36, 39, 19, - 242, 41, 42, 102, 102, 108, 107, 102, 104, 43, - - 99, 40, 41, 42, 19, 40, 41, 42, 110, 111, - 43, 106, 105, 43, 43, 19, 20, 20, 20, 20, - 20, 20, 20, 113, 104, 250, 94, 20, 41, 42, - 93, 92, 41, 42, 110, 111, 43, 44, 20, 43, - 43, 91, 65, 47, 48, 53, 54, 114, 44, 113, - 250, 44, 44, 20, 47, 48, 53, 54, 47, 48, - 53, 54, 118, 63, 20, 21, 21, 21, 21, 21, - 21, 21, 59, 114, 44, 0, 21, 44, 44, 0, - 47, 48, 53, 54, 47, 48, 53, 54, 118, 55, - 56, 21, 0, 0, 57, 57, 57, 58, 58, 58, - - 55, 56, 21, 0, 55, 56, 57, 82, 82, 58, - 57, 87, 82, 58, 0, 87, 119, 21, 22, 22, - 22, 22, 22, 22, 22, 115, 55, 56, 115, 22, - 55, 56, 57, 82, 82, 58, 57, 87, 82, 58, - 116, 87, 119, 117, 22, 200, 200, 117, 0, 200, - 0, 115, 259, 117, 115, 22, 0, 120, 0, 121, - 116, 122, 123, 124, 125, 126, 116, 0, 128, 117, - 22, 23, 23, 117, 23, 23, 23, 259, 23, 117, - 23, 23, 23, 120, 23, 121, 116, 122, 123, 124, - 125, 126, 129, 127, 128, 130, 0, 23, 23, 132, - - 23, 23, 23, 127, 23, 133, 23, 23, 23, 131, - 23, 25, 134, 0, 131, 135, 136, 138, 129, 127, - 135, 130, 25, 139, 137, 132, 25, 140, 127, 141, - 142, 133, 143, 25, 144, 131, 25, 145, 134, 131, - 137, 135, 136, 138, 146, 147, 135, 0, 25, 139, - 137, 0, 25, 140, 148, 141, 142, 149, 143, 25, - 144, 25, 26, 145, 150, 137, 151, 152, 153, 154, - 146, 147, 155, 26, 156, 162, 163, 26, 164, 165, - 148, 166, 167, 149, 26, 168, 0, 26, 156, 170, - 150, 171, 151, 152, 153, 154, 0, 172, 155, 26, - - 156, 162, 163, 26, 164, 165, 173, 166, 167, 0, - 26, 168, 26, 31, 156, 170, 174, 171, 175, 176, - 31, 177, 31, 172, 31, 178, 31, 31, 31, 179, - 180, 181, 173, 182, 31, 31, 0, 183, 184, 0, - 185, 0, 174, 186, 175, 176, 31, 177, 31, 188, - 31, 178, 31, 31, 31, 179, 180, 181, 189, 182, - 31, 31, 33, 183, 184, 33, 185, 33, 202, 186, - 207, 207, 209, 33, 207, 188, 217, 33, 218, 33, - 33, 220, 221, 33, 189, 222, 0, 33, 223, 0, - 224, 33, 0, 33, 202, 225, 226, 227, 209, 33, - - 228, 0, 217, 33, 218, 33, 33, 220, 221, 33, - 230, 222, 33, 37, 223, 37, 224, 37, 37, 229, - 231, 225, 226, 227, 232, 229, 228, 37, 37, 233, - 234, 37, 235, 237, 0, 37, 230, 238, 239, 37, - 241, 37, 243, 37, 37, 229, 231, 245, 246, 0, - 232, 229, 371, 37, 37, 233, 234, 37, 235, 237, - 37, 45, 247, 238, 239, 248, 241, 244, 243, 249, - 251, 252, 45, 245, 246, 45, 45, 371, 244, 253, - 254, 255, 255, 45, 0, 256, 257, 258, 247, 260, - 261, 248, 262, 244, 263, 249, 251, 252, 45, 0, - - 264, 45, 45, 244, 265, 253, 254, 255, 255, 45, - 46, 256, 257, 258, 266, 260, 261, 267, 262, 268, - 263, 46, 269, 270, 46, 46, 264, 275, 277, 278, - 265, 279, 46, 0, 280, 281, 282, 283, 284, 285, - 266, 0, 286, 267, 0, 268, 287, 46, 269, 270, - 46, 46, 288, 275, 277, 278, 289, 279, 46, 49, - 280, 281, 282, 283, 284, 285, 290, 49, 286, 291, - 49, 293, 287, 294, 49, 49, 0, 295, 288, 296, - 297, 299, 289, 300, 0, 301, 307, 0, 309, 310, - 311, 0, 290, 49, 312, 291, 49, 293, 313, 294, - - 49, 49, 50, 295, 314, 296, 297, 299, 315, 300, - 50, 301, 307, 50, 309, 310, 311, 50, 50, 0, - 312, 316, 317, 318, 313, 319, 320, 0, 321, 322, - 314, 323, 324, 325, 315, 0, 50, 0, 327, 50, - 328, 329, 330, 50, 50, 51, 331, 316, 317, 318, - 332, 319, 320, 51, 321, 322, 51, 323, 324, 325, - 51, 51, 333, 51, 327, 334, 328, 329, 330, 335, - 336, 337, 331, 338, 339, 0, 332, 340, 341, 51, - 0, 342, 51, 343, 344, 345, 51, 51, 333, 51, - 52, 334, 346, 347, 348, 335, 336, 337, 52, 338, - - 339, 52, 349, 340, 341, 52, 52, 342, 52, 343, - 344, 345, 350, 351, 352, 353, 354, 355, 346, 347, - 348, 356, 357, 358, 52, 359, 360, 52, 349, 361, - 362, 52, 52, 363, 52, 364, 365, 366, 350, 351, - 352, 353, 354, 355, 367, 369, 370, 356, 357, 358, - 372, 359, 360, 373, 374, 361, 362, 375, 376, 363, - 377, 364, 365, 366, 378, 379, 380, 381, 382, 383, - 367, 369, 370, 384, 385, 387, 372, 388, 391, 373, - 374, 392, 393, 375, 376, 377, 395, 396, 398, 399, - 378, 379, 380, 381, 382, 383, 401, 403, 404, 384, - - 385, 387, 405, 388, 391, 406, 407, 392, 393, 408, - 409, 411, 395, 396, 398, 399, 412, 413, 414, 415, - 416, 417, 401, 403, 404, 418, 419, 420, 405, 421, - 423, 406, 407, 424, 427, 408, 409, 411, 428, 429, - 430, 431, 412, 413, 414, 415, 416, 417, 434, 436, - 437, 418, 419, 420, 438, 421, 423, 439, 440, 424, - 427, 441, 443, 444, 428, 429, 430, 431, 445, 446, - 447, 448, 449, 450, 434, 436, 437, 451, 454, 455, - 438, 456, 457, 439, 440, 458, 456, 441, 443, 444, - 459, 460, 462, 463, 445, 446, 447, 448, 449, 450, - - 461, 464, 461, 451, 454, 455, 465, 456, 457, 467, - 469, 458, 456, 468, 471, 473, 459, 460, 462, 463, - 476, 468, 477, 478, 480, 481, 461, 464, 461, 482, - 483, 484, 465, 488, 489, 467, 469, 490, 492, 468, - 471, 473, 494, 495, 497, 498, 476, 468, 477, 478, - 480, 481, 500, 501, 504, 482, 483, 484, 502, 488, - 489, 505, 506, 490, 492, 507, 508, 509, 494, 495, - 497, 498, 510, 511, 514, 515, 516, 517, 500, 501, - 504, 518, 519, 502, 520, 521, 522, 505, 506, 523, - 524, 507, 508, 509, 527, 528, 529, 530, 510, 511, - - 514, 515, 516, 517, 531, 533, 534, 518, 519, 535, - 520, 521, 522, 536, 537, 523, 524, 538, 540, 541, - 527, 528, 529, 530, 542, 543, 545, 548, 550, 551, - 531, 533, 534, 552, 535, 553, 554, 555, 556, 536, - 537, 557, 558, 538, 540, 541, 559, 560, 561, 562, - 542, 543, 545, 548, 550, 551, 563, 565, 566, 552, - 567, 553, 554, 555, 556, 569, 570, 557, 558, 571, - 572, 573, 559, 560, 561, 562, 574, 575, 576, 578, - 580, 581, 563, 565, 566, 582, 567, 583, 584, 585, - 586, 569, 570, 587, 588, 571, 572, 573, 589, 591, - - 593, 594, 574, 575, 576, 578, 580, 581, 595, 596, - 598, 582, 583, 601, 584, 585, 586, 602, 603, 587, - 588, 604, 605, 606, 589, 591, 593, 594, 608, 611, - 612, 615, 618, 619, 595, 596, 598, 621, 622, 601, - 626, 628, 629, 602, 603, 631, 632, 604, 605, 606, - 633, 635, 637, 638, 608, 611, 612, 615, 618, 619, - 639, 640, 641, 621, 622, 643, 626, 628, 629, 644, - 646, 631, 632, 648, 650, 651, 633, 635, 637, 638, - 652, 654, 655, 0, 657, 658, 639, 640, 641, 659, - 660, 643, 661, 663, 664, 644, 646, 665, 669, 648, - - 650, 651, 670, 671, 672, 0, 652, 654, 655, 657, - 0, 658, 0, 0, 0, 659, 660, 0, 661, 663, - 664, 0, 0, 665, 669, 0, 0, 0, 670, 671, - 672, 677, 677, 677, 678, 678, 678, 679, 679, 679, - 680, 680, 680, 681, 681, 681, 682, 682, 682, 683, - 683, 683, 684, 684, 684, 685, 685, 685, 686, 686, - 686, 687, 687, 687, 688, 0, 688, 689, 689, 689, - 690, 690, 690, 691, 0, 691, 692, 692, 692, 693, - 693, 693, 694, 694, 694, 695, 695, 695, 696, 696, - 696, 697, 697, 697, 700, 700, 700, 701, 701, 701, - - 702, 702, 702, 703, 703, 703, 704, 704, 704, 705, - 705, 705, 676, 676, 676, 676, 676, 676, 676, 676, + 0, 1, 1, 1, 1, 1, 1, 699, 73, 87, + 698, 1, 73, 87, 0, 1, 27, 28, 29, 1, + 2, 2, 2, 2, 2, 2, 30, 27, 28, 29, + 2, 27, 28, 29, 2, 72, 72, 30, 2, 3, + 3, 30, 3, 116, 672, 3, 35, 36, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 35, 36, 3, + 5, 35, 36, 116, 79, 39, 40, 5, 5, 79, + 5, 5, 137, 671, 5, 5, 39, 40, 41, 42, + 39, 40, 5, 7, 7, 7, 79, 7, 137, 41, + 42, 97, 97, 41, 42, 97, 43, 115, 44, 229, + + 115, 7, 8, 8, 8, 229, 8, 43, 670, 44, + 43, 43, 44, 44, 82, 82, 96, 96, 96, 82, + 8, 9, 9, 9, 47, 9, 9, 101, 101, 101, + 127, 9, 10, 10, 10, 47, 10, 10, 156, 47, + 127, 669, 10, 11, 11, 11, 48, 11, 11, 197, + 197, 197, 156, 11, 12, 12, 12, 48, 12, 12, + 461, 48, 461, 244, 12, 13, 13, 13, 53, 13, + 13, 204, 204, 204, 244, 13, 14, 14, 14, 53, + 14, 14, 54, 53, 55, 56, 14, 15, 15, 15, + 665, 15, 664, 54, 117, 55, 56, 54, 117, 55, + + 56, 255, 255, 663, 117, 15, 16, 16, 16, 131, + 16, 102, 102, 135, 131, 102, 200, 200, 135, 661, + 200, 660, 659, 456, 16, 17, 17, 17, 456, 17, + 17, 468, 658, 657, 655, 17, 18, 18, 18, 468, + 18, 18, 654, 652, 651, 650, 18, 19, 19, 19, + 19, 19, 19, 19, 648, 207, 207, 646, 19, 207, + 644, 643, 641, 640, 639, 638, 637, 635, 633, 19, + 20, 20, 20, 20, 20, 20, 20, 632, 631, 629, + 628, 20, 626, 622, 621, 619, 618, 615, 612, 611, + 608, 606, 20, 21, 21, 21, 21, 21, 21, 21, + + 605, 604, 603, 602, 21, 601, 598, 596, 595, 594, + 593, 591, 589, 588, 587, 586, 585, 584, 583, 21, + 22, 22, 22, 22, 22, 22, 22, 582, 581, 580, + 578, 22, 576, 575, 574, 573, 572, 571, 570, 569, + 567, 566, 565, 563, 562, 561, 22, 23, 23, 560, + 23, 23, 23, 559, 23, 558, 23, 23, 23, 557, + 23, 25, 556, 555, 554, 553, 552, 551, 550, 548, + 545, 543, 25, 542, 541, 540, 25, 538, 537, 536, + 535, 534, 533, 25, 531, 530, 25, 26, 529, 528, + 527, 524, 523, 522, 521, 520, 519, 518, 26, 517, + + 516, 515, 26, 514, 511, 510, 509, 508, 507, 26, + 506, 505, 26, 31, 504, 502, 501, 500, 498, 497, + 31, 495, 31, 494, 31, 492, 31, 31, 31, 490, + 489, 488, 484, 483, 31, 31, 33, 482, 481, 33, + 480, 33, 478, 477, 476, 473, 471, 33, 469, 467, + 465, 33, 464, 33, 33, 463, 462, 33, 460, 459, + 458, 33, 37, 457, 37, 455, 37, 37, 454, 451, + 450, 449, 448, 447, 446, 445, 37, 37, 444, 443, + 37, 441, 440, 439, 37, 45, 438, 437, 436, 434, + 431, 430, 429, 428, 427, 424, 45, 423, 421, 45, + + 45, 420, 419, 418, 417, 416, 415, 45, 46, 414, + 413, 412, 411, 409, 408, 407, 406, 405, 404, 46, + 403, 401, 46, 46, 399, 398, 396, 395, 393, 392, + 46, 49, 391, 388, 387, 385, 384, 383, 382, 49, + 381, 380, 49, 379, 378, 377, 49, 49, 50, 376, + 375, 374, 373, 372, 371, 370, 50, 369, 367, 50, + 366, 365, 364, 50, 50, 51, 363, 362, 361, 360, + 359, 358, 357, 51, 356, 355, 51, 354, 353, 352, + 51, 51, 351, 51, 52, 350, 349, 348, 347, 346, + 345, 344, 52, 343, 342, 52, 341, 340, 339, 52, + + 52, 338, 52, 57, 57, 57, 337, 336, 335, 334, + 333, 332, 331, 330, 329, 57, 328, 327, 325, 57, + 58, 58, 58, 324, 323, 322, 321, 320, 319, 318, + 317, 316, 58, 315, 314, 313, 58, 677, 677, 677, + 678, 678, 678, 679, 679, 679, 680, 680, 680, 681, + 681, 681, 682, 682, 682, 683, 683, 683, 684, 684, + 684, 685, 685, 685, 686, 686, 686, 687, 687, 687, + 688, 312, 688, 689, 689, 689, 690, 690, 690, 691, + 311, 691, 692, 692, 692, 693, 693, 693, 694, 694, + 694, 695, 695, 695, 696, 696, 696, 697, 697, 697, + + 700, 700, 700, 701, 701, 701, 702, 702, 702, 703, + 703, 703, 704, 704, 704, 705, 705, 705, 310, 309, + 307, 301, 300, 299, 297, 296, 295, 294, 293, 291, + 290, 289, 288, 287, 286, 285, 284, 283, 282, 281, + 280, 279, 278, 277, 275, 273, 271, 270, 269, 268, + 267, 266, 265, 264, 263, 262, 261, 260, 259, 258, + 257, 256, 254, 253, 252, 251, 250, 249, 248, 247, + 246, 245, 243, 242, 241, 240, 239, 238, 237, 236, + 235, 234, 233, 232, 231, 230, 228, 227, 226, 225, + 224, 223, 222, 221, 220, 218, 217, 215, 213, 212, + + 210, 209, 208, 205, 202, 201, 198, 195, 193, 192, + 190, 189, 188, 187, 186, 185, 184, 183, 182, 181, + 180, 179, 178, 177, 176, 175, 174, 173, 172, 171, + 170, 169, 168, 167, 166, 165, 164, 163, 162, 161, + 159, 158, 157, 155, 154, 153, 152, 151, 150, 149, + 148, 147, 146, 145, 144, 143, 142, 141, 140, 139, + 138, 136, 134, 133, 132, 130, 129, 128, 126, 125, + 124, 123, 122, 121, 120, 119, 118, 114, 113, 111, + 110, 108, 107, 106, 105, 104, 99, 94, 93, 92, + 91, 88, 86, 85, 84, 83, 81, 80, 78, 77, + + 76, 75, 74, 71, 70, 69, 68, 67, 66, 65, + 63, 59, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, - 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, - 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, - 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, - 676 + 676, 676, 676, 676, 676, 676 } ; static yy_state_type yy_last_accepting_state; @@ -1046,8 +893,8 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "src/mapfile/mapfile.l" -#line 2 "src/mapfile/mapfile.l" +#line 1 "mapfile.l" +#line 2 "mapfile.l" #include @@ -1587,13 +1434,14 @@ static void end_layer() if (!map_l->storage->schema->use) buffer_add_str(map_l->storage->schema, "public"); if (!map_is_dump) map_l->retrievable=map_l->writable = false; - + map_l->name_prefix = buffer_init(); buffer_copy(map_l->name_prefix, map_l->name); if (map_l->ns_prefix->use) { buffer_add_head(map_l->name_prefix, ':'); buffer_add_head_str(map_l->name_prefix, map_l->ns_prefix->buf); } + map_l->name_no_uri = buffer_init(); buffer_copy(map_l->name_no_uri, map_l->name); if (map_l->ns_uri->use) { buffer_add_head(map_l->name, ':'); @@ -1635,7 +1483,7 @@ static void end_layer() -#line 1639 "src/mapfile/mapfile.c" +#line 1486 "src/mapfile/mapfile.c" #define INITIAL 0 #define MAP 1 @@ -1672,7 +1520,7 @@ static void end_layer() * down here because we want the user's section 1 to have been scanned first. * The user has a chance to override it with an option. */ -#ifndef _WIN32 + #ifndef _WIN32 #include #endif #endif @@ -1704,7 +1552,7 @@ FILE *yyget_out (void ); void yyset_out (FILE * out_str ); -yy_size_t yyget_leng (void ); +int yyget_leng (void ); char *yyget_text (void ); @@ -1754,7 +1602,12 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE +#ifdef __ia64__ +/* On IA-64, the buffer size is 16k, not 8k */ +#define YY_READ_BUF_SIZE 16384 +#else #define YY_READ_BUF_SIZE 8192 +#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -1762,7 +1615,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO fwrite( yytext, yyleng, 1, yyout ) +#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1773,7 +1626,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - yy_size_t n; \ + size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1855,10 +1708,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 598 "src/mapfile/mapfile.l" +#line 599 "mapfile.l" -#line 1860 "src/mapfile/mapfile.c" +#line 1712 "src/mapfile/mapfile.c" if ( !(yy_init) ) { @@ -1939,23 +1792,23 @@ YY_DECL case 1: YY_RULE_SETUP -#line 600 "src/mapfile/mapfile.l" +#line 601 "mapfile.l" { char c ; for (c=input() ; c && c != '\n' ; c=input()); } YY_BREAK case 2: YY_RULE_SETUP -#line 601 "src/mapfile/mapfile.l" +#line 602 "mapfile.l" { yy_push_state(INCLUDE); OWS_MAP_DBG } YY_BREAK case 3: YY_RULE_SETUP -#line 604 "src/mapfile/mapfile.l" +#line 605 "mapfile.l" { /*LEGEND rule must appears before END... */ yy_push_state(LEGEND); OWS_MAP_DBG } YY_BREAK case 4: YY_RULE_SETUP -#line 607 "src/mapfile/mapfile.l" +#line 608 "mapfile.l" { OWS_MAP_EATLINE if (yy_top_state() == INITIAL && YY_START != MAP) { @@ -1969,483 +1822,483 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 618 "src/mapfile/mapfile.l" +#line 619 "mapfile.l" { yy_push_state(MAP); OWS_MAP_DBG } YY_BREAK case 6: YY_RULE_SETUP -#line 619 "src/mapfile/mapfile.l" +#line 620 "mapfile.l" { yy_push_state(WEB); OWS_MAP_DBG } YY_BREAK case 7: YY_RULE_SETUP -#line 620 "src/mapfile/mapfile.l" +#line 621 "mapfile.l" { yy_push_state(QUERYMAP); OWS_MAP_DBG } YY_BREAK case 8: YY_RULE_SETUP -#line 621 "src/mapfile/mapfile.l" +#line 622 "mapfile.l" { OWS_MAP_EATLINE /* must be before SYMBOL */ } YY_BREAK case 9: YY_RULE_SETUP -#line 622 "src/mapfile/mapfile.l" +#line 623 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 10: YY_RULE_SETUP -#line 623 "src/mapfile/mapfile.l" +#line 624 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 11: YY_RULE_SETUP -#line 624 "src/mapfile/mapfile.l" +#line 625 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 12: YY_RULE_SETUP -#line 625 "src/mapfile/mapfile.l" +#line 626 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 13: YY_RULE_SETUP -#line 626 "src/mapfile/mapfile.l" +#line 627 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 14: YY_RULE_SETUP -#line 627 "src/mapfile/mapfile.l" +#line 628 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 15: YY_RULE_SETUP -#line 628 "src/mapfile/mapfile.l" +#line 629 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 16: YY_RULE_SETUP -#line 629 "src/mapfile/mapfile.l" +#line 630 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 17: YY_RULE_SETUP -#line 630 "src/mapfile/mapfile.l" +#line 631 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 18: YY_RULE_SETUP -#line 631 "src/mapfile/mapfile.l" +#line 632 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 19: YY_RULE_SETUP -#line 632 "src/mapfile/mapfile.l" +#line 633 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 20: YY_RULE_SETUP -#line 633 "src/mapfile/mapfile.l" +#line 634 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 21: YY_RULE_SETUP -#line 634 "src/mapfile/mapfile.l" +#line 635 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 22: YY_RULE_SETUP -#line 635 "src/mapfile/mapfile.l" +#line 636 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 23: YY_RULE_SETUP -#line 636 "src/mapfile/mapfile.l" +#line 637 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 24: YY_RULE_SETUP -#line 637 "src/mapfile/mapfile.l" +#line 638 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 25: YY_RULE_SETUP -#line 638 "src/mapfile/mapfile.l" +#line 639 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 26: YY_RULE_SETUP -#line 639 "src/mapfile/mapfile.l" +#line 640 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 27: YY_RULE_SETUP -#line 640 "src/mapfile/mapfile.l" +#line 641 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 28: YY_RULE_SETUP -#line 641 "src/mapfile/mapfile.l" +#line 642 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 29: YY_RULE_SETUP -#line 642 "src/mapfile/mapfile.l" +#line 643 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 30: YY_RULE_SETUP -#line 643 "src/mapfile/mapfile.l" +#line 644 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 31: YY_RULE_SETUP -#line 644 "src/mapfile/mapfile.l" +#line 645 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 32: YY_RULE_SETUP -#line 645 "src/mapfile/mapfile.l" +#line 646 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 33: YY_RULE_SETUP -#line 646 "src/mapfile/mapfile.l" +#line 647 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 34: YY_RULE_SETUP -#line 647 "src/mapfile/mapfile.l" +#line 648 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 35: YY_RULE_SETUP -#line 648 "src/mapfile/mapfile.l" +#line 649 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 36: YY_RULE_SETUP -#line 649 "src/mapfile/mapfile.l" +#line 650 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 37: YY_RULE_SETUP -#line 650 "src/mapfile/mapfile.l" +#line 651 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 38: YY_RULE_SETUP -#line 651 "src/mapfile/mapfile.l" +#line 652 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 39: YY_RULE_SETUP -#line 652 "src/mapfile/mapfile.l" +#line 653 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 40: YY_RULE_SETUP -#line 653 "src/mapfile/mapfile.l" +#line 654 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 41: YY_RULE_SETUP -#line 654 "src/mapfile/mapfile.l" +#line 655 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 42: YY_RULE_SETUP -#line 655 "src/mapfile/mapfile.l" +#line 656 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 43: YY_RULE_SETUP -#line 656 "src/mapfile/mapfile.l" +#line 657 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 44: YY_RULE_SETUP -#line 657 "src/mapfile/mapfile.l" +#line 658 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 45: YY_RULE_SETUP -#line 658 "src/mapfile/mapfile.l" +#line 659 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 46: YY_RULE_SETUP -#line 659 "src/mapfile/mapfile.l" +#line 660 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 47: YY_RULE_SETUP -#line 660 "src/mapfile/mapfile.l" +#line 661 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 48: YY_RULE_SETUP -#line 661 "src/mapfile/mapfile.l" +#line 662 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 49: YY_RULE_SETUP -#line 662 "src/mapfile/mapfile.l" +#line 663 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 50: YY_RULE_SETUP -#line 663 "src/mapfile/mapfile.l" +#line 664 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 51: YY_RULE_SETUP -#line 664 "src/mapfile/mapfile.l" +#line 665 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 52: YY_RULE_SETUP -#line 665 "src/mapfile/mapfile.l" +#line 666 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 53: YY_RULE_SETUP -#line 666 "src/mapfile/mapfile.l" +#line 667 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 54: YY_RULE_SETUP -#line 667 "src/mapfile/mapfile.l" +#line 668 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 55: YY_RULE_SETUP -#line 668 "src/mapfile/mapfile.l" +#line 669 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 56: YY_RULE_SETUP -#line 669 "src/mapfile/mapfile.l" +#line 670 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 57: YY_RULE_SETUP -#line 670 "src/mapfile/mapfile.l" +#line 671 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 58: YY_RULE_SETUP -#line 671 "src/mapfile/mapfile.l" +#line 672 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 59: YY_RULE_SETUP -#line 672 "src/mapfile/mapfile.l" +#line 673 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 60: YY_RULE_SETUP -#line 673 "src/mapfile/mapfile.l" +#line 674 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 61: YY_RULE_SETUP -#line 674 "src/mapfile/mapfile.l" +#line 675 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 62: YY_RULE_SETUP -#line 675 "src/mapfile/mapfile.l" +#line 676 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 63: YY_RULE_SETUP -#line 676 "src/mapfile/mapfile.l" +#line 677 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 64: YY_RULE_SETUP -#line 677 "src/mapfile/mapfile.l" +#line 678 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 65: YY_RULE_SETUP -#line 678 "src/mapfile/mapfile.l" +#line 679 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 66: YY_RULE_SETUP -#line 679 "src/mapfile/mapfile.l" +#line 680 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 67: YY_RULE_SETUP -#line 680 "src/mapfile/mapfile.l" +#line 681 "mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 68: YY_RULE_SETUP -#line 682 "src/mapfile/mapfile.l" +#line 683 "mapfile.l" { yy_push_state(SYMBOL); OWS_MAP_DBG } YY_BREAK case 69: YY_RULE_SETUP -#line 683 "src/mapfile/mapfile.l" +#line 684 "mapfile.l" { yy_push_state(SCALEBAR); OWS_MAP_DBG } YY_BREAK case 70: YY_RULE_SETUP -#line 684 "src/mapfile/mapfile.l" +#line 685 "mapfile.l" { yy_push_state(REFERENCE); OWS_MAP_DBG } YY_BREAK case 71: YY_RULE_SETUP -#line 685 "src/mapfile/mapfile.l" +#line 686 "mapfile.l" { yy_push_state(OUTPUTFORMAT); OWS_MAP_DBG } YY_BREAK case 72: YY_RULE_SETUP -#line 686 "src/mapfile/mapfile.l" +#line 687 "mapfile.l" { yy_push_state(METADATA); OWS_MAP_DBG } YY_BREAK case 73: YY_RULE_SETUP -#line 687 "src/mapfile/mapfile.l" +#line 688 "mapfile.l" { yy_push_state(GRID); OWS_MAP_DBG } YY_BREAK case 74: YY_RULE_SETUP -#line 688 "src/mapfile/mapfile.l" +#line 689 "mapfile.l" { yy_push_state(JOIN); OWS_MAP_DBG } YY_BREAK case 75: YY_RULE_SETUP -#line 689 "src/mapfile/mapfile.l" +#line 690 "mapfile.l" { yy_push_state(LAYER_METADATA); OWS_MAP_DBG } YY_BREAK case 76: YY_RULE_SETUP -#line 690 "src/mapfile/mapfile.l" +#line 691 "mapfile.l" { yy_push_state(CLASS); OWS_MAP_DBG } YY_BREAK case 77: YY_RULE_SETUP -#line 691 "src/mapfile/mapfile.l" +#line 692 "mapfile.l" { yy_push_state(STYLE); OWS_MAP_DBG } YY_BREAK case 78: YY_RULE_SETUP -#line 692 "src/mapfile/mapfile.l" +#line 693 "mapfile.l" { yy_push_state(LABEL); OWS_MAP_DBG } YY_BREAK case 79: YY_RULE_SETUP -#line 693 "src/mapfile/mapfile.l" +#line 694 "mapfile.l" { yy_push_state(PROJECTION); OWS_MAP_DBG } YY_BREAK case 80: YY_RULE_SETUP -#line 694 "src/mapfile/mapfile.l" +#line 695 "mapfile.l" { yy_push_state(PATTERN); OWS_MAP_DBG } YY_BREAK case 81: YY_RULE_SETUP -#line 695 "src/mapfile/mapfile.l" +#line 696 "mapfile.l" { yy_push_state(POINTS); OWS_MAP_DBG } YY_BREAK case 82: YY_RULE_SETUP -#line 696 "src/mapfile/mapfile.l" +#line 697 "mapfile.l" { yy_push_state(LABEL); OWS_MAP_DBG } YY_BREAK case 83: YY_RULE_SETUP -#line 697 "src/mapfile/mapfile.l" +#line 698 "mapfile.l" { yy_push_state(LAYER); map_l = ows_layer_init(); OWS_MAP_DBG } YY_BREAK case 84: YY_RULE_SETUP -#line 698 "src/mapfile/mapfile.l" +#line 699 "mapfile.l" { yy_push_state(FEATURE); OWS_MAP_DBG } YY_BREAK case 85: YY_RULE_SETUP -#line 699 "src/mapfile/mapfile.l" +#line 700 "mapfile.l" { BEGIN PROPERTIES; map_prop_state = MAP_NAME; } YY_BREAK case 86: YY_RULE_SETUP -#line 700 "src/mapfile/mapfile.l" +#line 701 "mapfile.l" { BEGIN LAYER_PROPERTIES; map_layer_prop_state = MAP_LAYER_NAME; } YY_BREAK case 87: YY_RULE_SETUP -#line 701 "src/mapfile/mapfile.l" +#line 702 "mapfile.l" { BEGIN LAYER_PROPERTIES; map_layer_prop_state = MAP_LAYER_CONNECTION; } YY_BREAK case 88: YY_RULE_SETUP -#line 702 "src/mapfile/mapfile.l" +#line 703 "mapfile.l" { BEGIN LAYER_CONNECTIONTYPE; } YY_BREAK case 89: YY_RULE_SETUP -#line 703 "src/mapfile/mapfile.l" +#line 704 "mapfile.l" { BEGIN LAYER; map_is_postgis=true; } YY_BREAK case 90: YY_RULE_SETUP -#line 704 "src/mapfile/mapfile.l" +#line 705 "mapfile.l" { BEGIN LAYER; map_is_postgis=false; } YY_BREAK case 91: YY_RULE_SETUP -#line 705 "src/mapfile/mapfile.l" +#line 706 "mapfile.l" { BEGIN LAYER_DUMP; } YY_BREAK case 92: YY_RULE_SETUP -#line 706 "src/mapfile/mapfile.l" +#line 707 "mapfile.l" { BEGIN LAYER; map_is_dump=true; } YY_BREAK case 93: YY_RULE_SETUP -#line 707 "src/mapfile/mapfile.l" +#line 708 "mapfile.l" { BEGIN LAYER; map_is_dump=false; } YY_BREAK case 94: /* rule 94 can match eol */ YY_RULE_SETUP -#line 709 "src/mapfile/mapfile.l" +#line 710 "mapfile.l" {} YY_BREAK case 95: /* rule 95 can match eol */ YY_RULE_SETUP -#line 711 "src/mapfile/mapfile.l" +#line 712 "mapfile.l" {metadata_key(yytext, true); BEGIN METADATA_VALUE;} YY_BREAK case 96: /* rule 96 can match eol */ YY_RULE_SETUP -#line 712 "src/mapfile/mapfile.l" +#line 713 "mapfile.l" {metadata_value(yytext, true); BEGIN METADATA;} YY_BREAK case 97: /* rule 97 can match eol */ YY_RULE_SETUP -#line 713 "src/mapfile/mapfile.l" +#line 714 "mapfile.l" {metadata_layer_key(yytext, true); BEGIN LAYER_METADATA_VALUE;} YY_BREAK case 98: /* rule 98 can match eol */ YY_RULE_SETUP -#line 714 "src/mapfile/mapfile.l" +#line 715 "mapfile.l" {metadata_layer_value(yytext, true); BEGIN LAYER_METADATA;} YY_BREAK case 99: /* rule 99 can match eol */ YY_RULE_SETUP -#line 715 "src/mapfile/mapfile.l" +#line 716 "mapfile.l" { char *p, *q; @@ -2479,40 +2332,40 @@ YY_RULE_SETUP case 100: /* rule 100 can match eol */ YY_RULE_SETUP -#line 746 "src/mapfile/mapfile.l" +#line 747 "mapfile.l" {properties(yytext, true); BEGIN MAP;} YY_BREAK case 101: YY_RULE_SETUP -#line 747 "src/mapfile/mapfile.l" +#line 748 "mapfile.l" {properties(yytext, false); BEGIN MAP;} YY_BREAK case 102: /* rule 102 can match eol */ YY_RULE_SETUP -#line 748 "src/mapfile/mapfile.l" +#line 749 "mapfile.l" {layer_properties(yytext, true); BEGIN LAYER;} YY_BREAK case 103: YY_RULE_SETUP -#line 749 "src/mapfile/mapfile.l" +#line 750 "mapfile.l" {layer_properties(yytext, false); BEGIN LAYER;} YY_BREAK case 104: /* rule 104 can match eol */ YY_RULE_SETUP -#line 750 "src/mapfile/mapfile.l" +#line 751 "mapfile.l" {} YY_BREAK case 105: YY_RULE_SETUP -#line 751 "src/mapfile/mapfile.l" +#line 752 "mapfile.l" {} YY_BREAK case 106: /* rule 106 can match eol */ YY_RULE_SETUP -#line 752 "src/mapfile/mapfile.l" +#line 753 "mapfile.l" {} YY_BREAK case YY_STATE_EOF(INITIAL): @@ -2544,7 +2397,7 @@ case YY_STATE_EOF(SYMBOL): case YY_STATE_EOF(PATTERN): case YY_STATE_EOF(POINTS): case YY_STATE_EOF(INCLUDE): -#line 754 "src/mapfile/mapfile.l" +#line 755 "mapfile.l" { /* End of main file */ if (map_include_stack_ptr == 0 && YY_START == 0) yyterminate(); @@ -2562,10 +2415,10 @@ case YY_STATE_EOF(INCLUDE): YY_BREAK case 107: YY_RULE_SETUP -#line 769 "src/mapfile/mapfile.l" +#line 770 "mapfile.l" ECHO; YY_BREAK -#line 2567 "src/mapfile/mapfile.c" +#line 2419 "src/mapfile/mapfile.c" case YY_END_OF_BUFFER: { @@ -2750,7 +2603,7 @@ static int yy_get_next_buffer (void) else { - yy_size_t num_to_read = + int num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -2764,7 +2617,7 @@ static int yy_get_next_buffer (void) if ( b->yy_is_our_buffer ) { - yy_size_t new_size = b->yy_buf_size * 2; + int new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -2795,7 +2648,7 @@ static int yy_get_next_buffer (void) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), num_to_read ); + (yy_n_chars), (size_t) num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -2917,7 +2770,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); + int offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -2941,7 +2794,7 @@ static int yy_get_next_buffer (void) case EOB_ACT_END_OF_FILE: { if ( yywrap( ) ) - return 0; + return EOF; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -3189,7 +3042,7 @@ void yypop_buffer_state (void) */ static void yyensure_buffer_stack (void) { - yy_size_t num_to_alloc; + int num_to_alloc; if (!(yy_buffer_stack)) { @@ -3281,16 +3134,17 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param bytes the byte buffer to scan - * @param len the number of bytes in the buffer pointed to by @a bytes. + * @param yybytes the byte buffer to scan + * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) { YY_BUFFER_STATE b; char *buf; - yy_size_t n, i; + yy_size_t n; + int i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -3409,7 +3263,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -yy_size_t yyget_leng (void) +int yyget_leng (void) { return yyleng; } @@ -3565,7 +3419,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 769 "src/mapfile/mapfile.l" +#line 770 "mapfile.l" diff --git a/src/mapfile/mapfile.l b/src/mapfile/mapfile.l index 36066e90..ecb29461 100644 --- a/src/mapfile/mapfile.l +++ b/src/mapfile/mapfile.l @@ -538,13 +538,14 @@ static void end_layer() if (!map_l->storage->schema->use) buffer_add_str(map_l->storage->schema, "public"); if (!map_is_dump) map_l->retrievable=map_l->writable = false; - + map_l->name_prefix = buffer_init(); buffer_copy(map_l->name_prefix, map_l->name); if (map_l->ns_prefix->use) { buffer_add_head(map_l->name_prefix, ':'); buffer_add_head_str(map_l->name_prefix, map_l->ns_prefix->buf); } + map_l->name_no_uri = buffer_init(); buffer_copy(map_l->name_no_uri, map_l->name); if (map_l->ns_uri->use) { buffer_add_head(map_l->name, ':'); From 857b4c076874329a282f92afc9926114f7a57c0b Mon Sep 17 00:00:00 2001 From: jmckenna Date: Sat, 12 Jun 2021 14:54:03 -0300 Subject: [PATCH 2/6] don't regenerate mapfile.c --- src/mapfile/mapfile.c | 1044 +++++++++++++++++++++++------------------ 1 file changed, 596 insertions(+), 448 deletions(-) diff --git a/src/mapfile/mapfile.c b/src/mapfile/mapfile.c index 899d09c3..9e9791b9 100644 --- a/src/mapfile/mapfile.c +++ b/src/mapfile/mapfile.c @@ -54,6 +54,7 @@ typedef int flex_int32_t; typedef unsigned char flex_uint8_t; typedef unsigned short int flex_uint16_t; typedef unsigned int flex_uint32_t; +#endif /* ! C99 */ /* Limits of integral types. */ #ifndef INT8_MIN @@ -84,8 +85,6 @@ typedef unsigned int flex_uint32_t; #define UINT32_MAX (4294967295U) #endif -#endif /* ! C99 */ - #endif /* ! FLEXINT_H */ #ifdef __cplusplus @@ -142,15 +141,7 @@ typedef unsigned int flex_uint32_t; /* Size of default input buffer. */ #ifndef YY_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k. - * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. - * Ditto for the __ia64__ case accordingly. - */ -#define YY_BUF_SIZE 32768 -#else #define YY_BUF_SIZE 16384 -#endif /* __ia64__ */ #endif /* The state buf must be large enough to hold one state per character in the main buffer. @@ -162,7 +153,12 @@ typedef unsigned int flex_uint32_t; typedef struct yy_buffer_state *YY_BUFFER_STATE; #endif -extern int yyleng; +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif + +extern yy_size_t yyleng; extern FILE *yyin, *yyout; @@ -188,11 +184,6 @@ extern FILE *yyin, *yyout; #define unput(c) yyunput( c, (yytext_ptr) ) -#ifndef YY_TYPEDEF_YY_SIZE_T -#define YY_TYPEDEF_YY_SIZE_T -typedef size_t yy_size_t; -#endif - #ifndef YY_STRUCT_YY_BUFFER_STATE #define YY_STRUCT_YY_BUFFER_STATE struct yy_buffer_state @@ -210,7 +201,7 @@ struct yy_buffer_state /* Number of characters read into yy_ch_buf, not including EOB * characters. */ - int yy_n_chars; + 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 @@ -280,8 +271,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */ /* yy_hold_char holds the character lost when yytext is formed. */ static char yy_hold_char; -static int yy_n_chars; /* number of characters read into yy_ch_buf */ -int yyleng; +static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */ +yy_size_t yyleng; /* Points to current character in buffer. */ static char *yy_c_buf_p = (char *) 0; @@ -309,7 +300,7 @@ static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file ); YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size ); YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str ); -YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len ); +YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,yy_size_t len ); void *yyalloc (yy_size_t ); void *yyrealloc (void *,yy_size_t ); @@ -470,11 +461,11 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 1, 1, 1, 1, 7, 1, 29, 29, 29, 29, + 1, 1, 1, 1, 7, 1, 34, 35, 36, 37, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, - 29, 29, 1, 1, 1, 1, 1, 1, 1, 1, + 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, + 48, 49, 50, 51, 52, 53, 54, 29, 55, 56, + 57, 58, 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, @@ -491,94 +482,96 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[34] = +static yyconst flex_int32_t yy_meta[59] = { 0, 1, 2, 2, 1, 1, 1, 1, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3 + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3 } ; static yyconst flex_int16_t yy_base[706] = { 0, - 0, 19, 30, 0, 56, 0, 82, 101, 120, 131, - 142, 153, 164, 175, 186, 205, 224, 235, 247, 270, - 293, 320, 338, 0, 357, 383, 12, 13, 14, 22, - 409, 0, 432, 0, 42, 43, 455, 0, 61, 62, - 74, 75, 92, 94, 481, 504, 120, 142, 527, 544, - 561, 580, 164, 178, 180, 181, 600, 617, 912, 913, - 913, 913, 907, 913, 904, 888, 887, 899, 884, 897, - 882, 16, 1, 895, 874, 876, 872, 887, 55, 886, - 885, 95, 874, 883, 874, 871, 2, 880, 913, 913, - 887, 884, 885, 882, 0, 115, 90, 0, 866, 0, - - 126, 210, 0, 865, 881, 878, 879, 876, 0, 860, - 858, 0, 858, 853, 79, 36, 183, 852, 864, 853, - 866, 861, 864, 844, 858, 851, 110, 843, 855, 858, - 183, 853, 843, 841, 191, 854, 57, 845, 839, 837, - 837, 835, 828, 830, 838, 828, 844, 839, 830, 841, - 826, 839, 824, 825, 836, 131, 839, 836, 837, 913, - 834, 828, 828, 814, 815, 808, 813, 825, 800, 817, - 810, 802, 806, 815, 813, 817, 816, 803, 802, 812, - 797, 794, 796, 809, 808, 801, 783, 786, 792, 807, - 913, 804, 805, 913, 802, 0, 148, 803, 0, 215, - - 800, 794, 0, 170, 800, 0, 254, 797, 791, 797, - 913, 794, 795, 913, 792, 0, 786, 770, 0, 784, - 766, 785, 771, 764, 770, 781, 769, 765, 84, 778, - 769, 775, 756, 762, 769, 749, 752, 755, 755, 744, - 766, 742, 753, 144, 758, 752, 762, 742, 741, 734, - 746, 754, 750, 744, 192, 741, 734, 744, 726, 750, - 748, 736, 747, 729, 728, 732, 730, 742, 729, 732, - 743, 913, 740, 913, 726, 913, 731, 735, 715, 727, - 728, 727, 726, 714, 719, 710, 722, 714, 709, 722, - 707, 913, 702, 706, 700, 715, 711, 913, 697, 715, - - 699, 913, 0, 913, 0, 0, 694, 0, 708, 693, - 660, 664, 613, 608, 607, 605, 620, 602, 618, 607, - 615, 618, 613, 604, 592, 913, 593, 589, 599, 602, - 594, 603, 588, 583, 590, 586, 597, 583, 572, 586, - 588, 568, 575, 570, 569, 563, 570, 566, 575, 563, - 571, 557, 565, 560, 556, 563, 546, 558, 559, 549, - 541, 552, 544, 537, 550, 536, 538, 913, 530, 544, - 523, 529, 541, 540, 529, 531, 514, 520, 532, 530, - 529, 527, 527, 518, 522, 0, 509, 522, 913, 913, - 505, 518, 517, 913, 505, 515, 913, 507, 514, 913, - - 496, 913, 509, 496, 498, 498, 504, 493, 495, 913, - 501, 487, 495, 494, 495, 490, 483, 489, 491, 477, - 488, 913, 482, 471, 913, 913, 476, 475, 481, 480, - 483, 913, 913, 478, 913, 462, 477, 473, 476, 471, - 455, 913, 469, 452, 466, 455, 462, 464, 449, 452, - 462, 913, 913, 444, 441, 201, 444, 453, 452, 443, - 147, 447, 431, 428, 426, 913, 425, 224, 441, 913, - 421, 913, 438, 913, 913, 426, 436, 427, 913, 414, - 418, 413, 407, 414, 913, 913, 913, 416, 410, 414, - 913, 418, 913, 399, 395, 913, 394, 407, 913, 391, - - 390, 384, 913, 402, 385, 403, 388, 400, 399, 380, - 378, 913, 913, 396, 377, 378, 373, 371, 371, 371, - 368, 367, 381, 376, 913, 913, 370, 363, 362, 360, - 371, 913, 356, 355, 349, 368, 358, 366, 913, 355, - 363, 347, 345, 913, 349, 913, 913, 343, 913, 346, - 346, 351, 343, 355, 339, 336, 348, 344, 327, 331, - 327, 337, 332, 0, 321, 330, 325, 913, 313, 325, - 326, 329, 320, 323, 322, 321, 913, 321, 913, 310, - 315, 318, 287, 306, 294, 304, 303, 289, 291, 913, - 300, 913, 296, 283, 286, 293, 913, 299, 913, 913, - - 278, 284, 281, 290, 282, 272, 913, 269, 913, 913, - 270, 267, 913, 913, 266, 913, 913, 260, 261, 913, - 265, 263, 913, 913, 913, 275, 913, 254, 257, 913, - 258, 258, 257, 913, 247, 913, 248, 247, 249, 243, - 255, 913, 235, 249, 913, 231, 913, 239, 913, 224, - 223, 222, 913, 216, 208, 913, 202, 206, 198, 197, - 199, 913, 192, 170, 179, 913, 913, 913, 117, 97, - 54, 24, 913, 913, 913, 913, 637, 640, 643, 646, - 649, 652, 655, 658, 661, 664, 667, 670, 673, 676, - 679, 682, 685, 688, 691, 694, 697, 8, 5, 700, - - 703, 706, 709, 712, 715 + 0, 45, 82, 0, 133, 0, 7, 20, 29, 52, + 72, 152, 181, 192, 203, 208, 214, 229, 267, 316, + 365, 418, 462, 0, 507, 558, 80, 120, 235, 240, + 609, 0, 658, 0, 241, 242, 706, 0, 243, 260, + 287, 288, 295, 333, 757, 806, 339, 340, 855, 898, + 941, 986, 341, 342, 385, 386, 391, 394, 373, 1613, + 1613, 1613, 360, 1613, 337, 13, 16, 9, 22, 11, + 40, 95, 105, 60, 43, 48, 116, 135, 193, 138, + 139, 388, 141, 153, 181, 191, 404, 226, 1613, 1613, + 338, 326, 327, 321, 0, 26, 12, 0, 254, 0, + + 78, 292, 0, 278, 309, 306, 293, 290, 0, 288, + 288, 0, 303, 323, 407, 433, 432, 338, 405, 436, + 452, 450, 455, 437, 453, 448, 473, 444, 481, 488, + 483, 488, 485, 491, 493, 509, 509, 502, 503, 506, + 509, 509, 505, 510, 522, 520, 538, 543, 538, 557, + 545, 560, 547, 550, 565, 567, 240, 237, 238, 1613, + 231, 565, 567, 556, 559, 555, 562, 578, 54, 576, + 572, 571, 585, 605, 606, 612, 614, 606, 610, 622, + 609, 609, 616, 631, 633, 630, 58, 623, 639, 220, + 1613, 209, 198, 1613, 194, 0, 165, 188, 0, 444, + + 155, 658, 0, 178, 153, 0, 669, 117, 662, 116, + 1613, 71, 68, 1613, 63, 0, 666, 653, 0, 671, + 655, 678, 668, 664, 676, 689, 679, 679, 704, 703, + 705, 716, 703, 711, 721, 166, 707, 715, 717, 221, + 732, 234, 723, 748, 734, 730, 755, 739, 743, 293, + 751, 761, 766, 762, 772, 765, 760, 772, 420, 782, + 782, 773, 787, 776, 780, 795, 797, 812, 803, 808, + 35, 1613, 19, 1613, 809, 1613, 816, 822, 805, 821, + 824, 825, 826, 816, 823, 818, 835, 834, 834, 858, + 847, 1613, 845, 852, 851, 869, 867, 1613, 855, 876, + + 863, 1613, 0, 1613, 0, 0, 860, 0, 877, 864, + 870, 887, 876, 878, 882, 895, 912, 896, 915, 906, + 917, 922, 920, 913, 907, 1613, 914, 913, 926, 931, + 928, 942, 940, 939, 951, 949, 962, 955, 948, 966, + 970, 955, 965, 963, 964, 966, 975, 973, 991, 990, + 1002, 992, 1002, 999, 998, 1010, 996, 1010, 1014, 1006, + 1002, 1015, 1011, 1010, 1025, 1013, 1024, 1613, 1018, 1035, + 721, 1026, 1042, 1043, 1036, 1040, 1029, 1040, 1054, 1055, + 1056, 1057, 1059, 1055, 1061, 0, 1050, 1066, 1613, 1613, + 1051, 1070, 1071, 1613, 1064, 1076, 1613, 1070, 1079, 1613, + + 1071, 1613, 1086, 1076, 1083, 1087, 1095, 1088, 1092, 1613, + 1100, 1092, 1102, 1103, 1108, 1105, 1100, 1111, 1115, 1103, + 1119, 1613, 1115, 1109, 1613, 1613, 1116, 1120, 1128, 1129, + 1134, 1613, 1613, 1137, 1613, 1123, 1140, 1141, 1150, 1147, + 1135, 1613, 1152, 1137, 1159, 1150, 1159, 1163, 1150, 1155, + 1170, 1613, 1613, 1154, 1155, 1159, 1163, 1178, 1183, 1176, + 1187, 1183, 1169, 1177, 1182, 1613, 1185, 1206, 1203, 1613, + 1189, 1613, 1208, 1613, 1613, 1202, 1215, 1208, 1613, 1198, + 1205, 1205, 1204, 1213, 1613, 1613, 1613, 1218, 1214, 1222, + 1613, 1231, 1613, 1218, 1217, 1613, 1219, 1234, 1613, 1226, + + 1227, 1227, 1613, 1242, 1235, 1255, 1245, 1259, 1260, 1247, + 1247, 1613, 1613, 1267, 1251, 1254, 1251, 1255, 1257, 1260, + 1259, 1260, 1278, 1275, 1613, 1613, 1274, 1269, 1270, 1272, + 1291, 1613, 1279, 1280, 1278, 1302, 1294, 1306, 1613, 1298, + 1308, 1298, 1299, 1613, 1305, 1613, 1613, 1301, 1613, 1306, + 1308, 1318, 1313, 1327, 1313, 1312, 1330, 1331, 1320, 1329, + 1330, 1342, 1345, 0, 1336, 1347, 1345, 1613, 1339, 1353, + 1358, 1363, 1356, 1365, 1366, 1367, 1613, 1370, 1613, 1361, + 1368, 1376, 1356, 1377, 1367, 1379, 1382, 1370, 1377, 1613, + 1388, 1613, 1386, 1375, 1386, 1395, 1613, 1403, 1613, 1613, + + 1386, 1398, 1397, 1410, 1404, 1404, 1613, 1407, 1613, 1613, + 1410, 1409, 1613, 1613, 1410, 1613, 1613, 1406, 1409, 1613, + 1418, 1418, 1613, 1613, 1613, 1433, 1613, 1415, 1420, 1613, + 1425, 1427, 1439, 1613, 1431, 1613, 1434, 1435, 1445, 1441, + 1455, 1613, 1439, 1458, 1613, 1444, 1613, 1458, 1613, 1453, + 1454, 1459, 1613, 1455, 1456, 1613, 1453, 1459, 1465, 1466, + 1472, 1613, 1482, 1472, 1486, 1613, 1613, 1613, 1474, 1491, + 1484, 1484, 1613, 1613, 1613, 1613, 1531, 1534, 1537, 1540, + 1543, 1546, 1549, 1552, 1555, 1558, 1561, 1564, 1567, 1570, + 1573, 1576, 1579, 1582, 1585, 1588, 1591, 18, 5, 1594, + + 1597, 1600, 1603, 1606, 1609 } ; static yyconst flex_int16_t yy_def[706] = @@ -663,220 +656,380 @@ static yyconst flex_int16_t yy_def[706] = 676, 676, 676, 676, 676 } ; -static yyconst flex_int16_t yy_nxt[947] = +static yyconst flex_int16_t yy_nxt[1672] = { 0, - 676, 61, 62, 63, 64, 65, 61, 219, 169, 187, - 216, 66, 170, 188, 676, 67, 60, 60, 60, 68, - 61, 62, 63, 64, 65, 61, 60, 60, 60, 60, - 66, 60, 60, 60, 67, 168, 163, 60, 68, 69, - 70, 60, 71, 224, 675, 72, 60, 60, 73, 60, - 74, 75, 76, 77, 78, 79, 80, 60, 60, 81, - 60, 60, 60, 225, 176, 60, 60, 82, 83, 177, - 84, 85, 250, 674, 86, 87, 60, 60, 60, 60, - 60, 60, 88, 89, 90, 91, 178, 92, 251, 60, - 60, 201, 201, 60, 60, 199, 60, 222, 60, 317, - - 223, 60, 89, 90, 91, 318, 92, 60, 673, 60, - 147, 60, 147, 60, 181, 162, 198, 198, 199, 182, - 60, 89, 90, 93, 60, 94, 61, 205, 205, 206, - 162, 66, 89, 90, 93, 149, 94, 61, 249, 150, - 238, 672, 66, 61, 62, 96, 60, 97, 98, 198, - 198, 199, 270, 99, 61, 62, 96, 149, 97, 98, - 520, 150, 521, 333, 99, 89, 90, 101, 60, 102, - 103, 205, 205, 206, 334, 104, 89, 90, 101, 60, - 102, 103, 60, 60, 60, 60, 104, 89, 90, 105, - 671, 106, 670, 60, 226, 60, 60, 60, 227, 60, - - 60, 345, 274, 669, 228, 60, 89, 90, 105, 242, - 106, 208, 208, 247, 243, 206, 201, 201, 248, 668, - 199, 667, 666, 514, 60, 89, 90, 107, 515, 108, - 61, 527, 665, 664, 663, 66, 89, 90, 107, 528, - 108, 61, 662, 661, 660, 659, 66, 60, 61, 62, - 63, 60, 65, 61, 658, 208, 208, 657, 110, 206, - 656, 655, 654, 653, 652, 651, 650, 649, 648, 111, - 60, 61, 62, 63, 60, 65, 61, 647, 646, 645, - 644, 110, 643, 642, 641, 640, 639, 638, 637, 636, - 635, 634, 111, 60, 61, 62, 63, 60, 65, 61, - - 633, 632, 631, 630, 113, 629, 628, 627, 626, 625, - 624, 623, 622, 621, 620, 619, 618, 617, 616, 114, - 60, 61, 62, 63, 60, 65, 61, 615, 614, 613, - 612, 113, 611, 610, 609, 608, 607, 606, 605, 604, - 603, 602, 601, 600, 599, 598, 114, 115, 116, 597, - 117, 118, 119, 596, 120, 595, 121, 122, 123, 594, - 76, 60, 593, 592, 591, 590, 589, 588, 587, 586, - 585, 584, 124, 583, 582, 581, 60, 580, 579, 578, - 577, 576, 575, 125, 574, 573, 126, 60, 572, 571, - 570, 569, 568, 567, 566, 565, 564, 563, 124, 562, - - 561, 560, 60, 559, 558, 557, 556, 555, 554, 125, - 553, 552, 126, 60, 551, 550, 549, 548, 547, 546, - 127, 545, 128, 544, 60, 543, 129, 130, 60, 542, - 541, 540, 539, 538, 131, 132, 60, 537, 536, 133, - 535, 134, 534, 533, 532, 531, 530, 60, 529, 526, - 525, 60, 524, 135, 136, 523, 522, 137, 519, 518, - 517, 138, 139, 516, 140, 513, 141, 142, 512, 511, - 510, 509, 508, 507, 506, 505, 143, 144, 504, 503, - 145, 502, 501, 500, 146, 60, 499, 498, 497, 496, - 495, 494, 493, 492, 491, 490, 60, 489, 488, 147, - - 60, 487, 486, 485, 484, 483, 482, 148, 60, 481, - 480, 479, 478, 477, 476, 475, 474, 473, 472, 60, - 471, 470, 147, 60, 469, 468, 467, 466, 465, 464, - 148, 60, 463, 462, 461, 460, 459, 458, 457, 151, - 456, 455, 60, 454, 453, 452, 60, 152, 60, 451, - 450, 449, 448, 447, 446, 445, 151, 444, 443, 60, - 442, 441, 440, 60, 152, 60, 439, 438, 437, 436, - 435, 434, 433, 153, 432, 431, 154, 430, 429, 428, - 60, 155, 427, 156, 60, 426, 425, 424, 423, 422, - 421, 420, 153, 419, 418, 154, 417, 416, 415, 60, - - 155, 414, 156, 157, 60, 158, 413, 412, 411, 410, - 409, 408, 407, 406, 405, 60, 404, 403, 402, 60, - 157, 60, 158, 401, 400, 399, 398, 397, 396, 395, - 394, 393, 60, 392, 391, 390, 60, 60, 60, 60, - 95, 95, 95, 100, 100, 100, 109, 109, 109, 112, - 112, 112, 159, 159, 159, 161, 161, 161, 190, 190, - 190, 192, 192, 192, 193, 193, 193, 195, 195, 195, - 196, 389, 196, 197, 197, 197, 200, 200, 200, 203, - 388, 203, 204, 204, 204, 207, 207, 207, 210, 210, - 210, 212, 212, 212, 213, 213, 213, 215, 215, 215, - - 271, 271, 271, 273, 273, 273, 198, 198, 198, 201, - 201, 201, 205, 205, 205, 208, 208, 208, 387, 386, - 385, 384, 383, 382, 381, 380, 379, 378, 377, 376, - 375, 374, 373, 372, 371, 370, 369, 368, 367, 366, - 365, 364, 363, 362, 361, 272, 272, 360, 359, 358, - 357, 356, 355, 354, 353, 352, 351, 350, 349, 348, - 347, 346, 344, 343, 342, 341, 340, 339, 338, 337, - 336, 335, 332, 331, 330, 329, 328, 327, 326, 325, - 324, 323, 322, 321, 320, 319, 316, 315, 314, 313, - 312, 311, 310, 309, 308, 307, 306, 214, 214, 211, - - 211, 305, 304, 304, 303, 302, 302, 194, 194, 191, - 191, 301, 300, 299, 298, 297, 296, 295, 294, 293, - 292, 291, 290, 289, 288, 287, 286, 285, 284, 283, - 282, 281, 280, 279, 278, 277, 276, 275, 274, 160, - 160, 272, 272, 269, 268, 267, 266, 265, 264, 263, - 262, 261, 260, 259, 258, 257, 256, 255, 254, 253, - 252, 249, 246, 245, 244, 241, 240, 239, 237, 236, - 235, 234, 233, 232, 231, 230, 229, 221, 220, 218, - 217, 214, 214, 211, 211, 209, 202, 194, 194, 191, - 191, 189, 186, 185, 184, 183, 180, 179, 175, 174, - - 173, 172, 171, 167, 166, 165, 164, 163, 162, 160, - 160, 676, 59, 676, 676, 676, 676, 676, 676, 676, + 676, 61, 62, 63, 64, 65, 61, 219, 89, 90, + 91, 66, 92, 201, 201, 67, 164, 199, 166, 68, + 216, 89, 90, 91, 272, 92, 60, 198, 198, 199, + 89, 90, 93, 162, 94, 61, 163, 66, 272, 60, + 66, 67, 164, 165, 166, 68, 61, 62, 63, 64, + 65, 61, 60, 89, 90, 93, 66, 94, 61, 162, + 67, 167, 163, 66, 68, 60, 66, 171, 214, 165, + 172, 214, 173, 61, 62, 96, 211, 97, 98, 205, + 205, 206, 66, 99, 60, 281, 67, 167, 299, 66, + 68, 69, 70, 171, 71, 60, 172, 72, 173, 60, + + 73, 60, 74, 75, 76, 77, 78, 79, 80, 99, + 281, 81, 169, 299, 168, 163, 170, 69, 70, 211, + 71, 60, 304, 72, 60, 60, 73, 60, 74, 75, + 76, 77, 78, 79, 80, 60, 81, 60, 169, 60, + 168, 163, 170, 174, 82, 83, 175, 84, 85, 179, + 180, 86, 87, 61, 62, 96, 304, 97, 98, 88, + 302, 60, 183, 99, 184, 60, 198, 198, 199, 174, + 82, 83, 175, 84, 85, 179, 180, 86, 87, 205, + 205, 206, 89, 90, 101, 88, 102, 103, 183, 99, + 184, 302, 104, 89, 90, 101, 325, 102, 103, 194, + + 185, 194, 176, 104, 89, 90, 105, 177, 106, 89, + 90, 105, 186, 106, 191, 89, 90, 107, 104, 108, + 61, 325, 60, 191, 178, 66, 185, 60, 176, 104, + 89, 90, 107, 177, 108, 61, 160, 189, 186, 60, + 66, 160, 272, 272, 60, 60, 60, 60, 60, 178, + 60, 66, 329, 60, 60, 60, 60, 60, 60, 60, + 60, 60, 60, 189, 60, 331, 66, 60, 61, 62, + 63, 60, 65, 61, 202, 60, 60, 329, 110, 60, + 60, 60, 60, 60, 60, 60, 60, 60, 60, 111, + 331, 60, 60, 208, 208, 214, 214, 206, 209, 60, + + 202, 60, 60, 60, 110, 60, 60, 60, 217, 218, + 60, 211, 211, 147, 60, 111, 60, 61, 62, 63, + 60, 65, 61, 220, 209, 340, 194, 110, 60, 60, + 194, 191, 60, 60, 217, 218, 60, 60, 111, 147, + 60, 191, 160, 60, 60, 60, 60, 221, 60, 220, + 340, 147, 60, 110, 149, 149, 60, 60, 150, 150, + 60, 60, 229, 160, 111, 60, 61, 62, 63, 60, + 65, 61, 676, 221, 60, 676, 113, 147, 60, 676, + 149, 149, 60, 60, 150, 150, 60, 60, 229, 60, + 60, 114, 676, 676, 157, 60, 158, 157, 60, 158, + + 60, 60, 113, 676, 60, 60, 60, 181, 162, 60, + 60, 187, 182, 60, 676, 188, 230, 114, 60, 61, + 62, 63, 60, 65, 61, 222, 60, 60, 223, 113, + 60, 60, 60, 181, 162, 60, 60, 187, 182, 60, + 224, 188, 230, 226, 114, 201, 201, 227, 676, 199, + 676, 222, 349, 228, 223, 113, 676, 231, 676, 232, + 225, 233, 234, 235, 236, 237, 224, 676, 239, 226, + 114, 115, 116, 227, 117, 118, 119, 349, 120, 228, + 121, 122, 123, 231, 76, 232, 225, 233, 234, 235, + 236, 237, 240, 162, 239, 241, 676, 115, 116, 244, + + 117, 118, 119, 238, 120, 245, 121, 122, 123, 242, + 76, 60, 246, 676, 243, 247, 249, 252, 240, 162, + 248, 241, 124, 253, 250, 244, 60, 254, 238, 255, + 256, 245, 257, 125, 258, 242, 126, 259, 246, 243, + 251, 247, 249, 252, 260, 261, 248, 676, 124, 253, + 250, 676, 60, 254, 262, 255, 256, 263, 257, 125, + 258, 126, 60, 259, 264, 251, 265, 266, 267, 268, + 260, 261, 269, 124, 249, 274, 275, 60, 276, 277, + 262, 278, 279, 263, 125, 280, 676, 126, 270, 282, + 264, 283, 265, 266, 267, 268, 676, 284, 269, 124, + + 249, 274, 275, 60, 276, 277, 285, 278, 279, 676, + 125, 280, 126, 60, 270, 282, 286, 283, 287, 288, + 127, 289, 128, 284, 60, 290, 129, 130, 60, 291, + 292, 293, 285, 294, 131, 132, 676, 295, 296, 676, + 297, 676, 286, 298, 287, 288, 127, 289, 128, 300, + 60, 290, 129, 130, 60, 291, 292, 293, 301, 294, + 131, 132, 60, 295, 296, 133, 297, 134, 303, 298, + 208, 208, 305, 60, 206, 300, 306, 60, 307, 135, + 136, 308, 309, 137, 301, 310, 676, 138, 311, 676, + 312, 133, 676, 134, 303, 313, 314, 315, 305, 60, + + 316, 676, 306, 60, 307, 135, 136, 308, 309, 137, + 319, 310, 138, 139, 311, 140, 312, 141, 142, 317, + 320, 313, 314, 315, 321, 318, 316, 143, 144, 322, + 323, 145, 324, 326, 676, 146, 319, 327, 328, 139, + 330, 140, 332, 141, 142, 317, 320, 335, 336, 676, + 321, 318, 446, 143, 144, 322, 323, 145, 324, 326, + 146, 60, 337, 327, 328, 338, 330, 333, 332, 339, + 341, 342, 60, 335, 336, 147, 60, 446, 334, 343, + 344, 345, 274, 148, 676, 346, 347, 348, 337, 350, + 351, 338, 352, 333, 353, 339, 341, 342, 60, 676, + + 354, 147, 60, 334, 355, 343, 344, 345, 274, 148, + 60, 346, 347, 348, 356, 350, 351, 357, 352, 358, + 353, 60, 359, 360, 147, 60, 354, 361, 362, 363, + 355, 364, 148, 676, 365, 366, 367, 368, 369, 370, + 356, 676, 371, 357, 676, 358, 372, 60, 359, 360, + 147, 60, 373, 361, 362, 363, 374, 364, 148, 60, + 365, 366, 367, 368, 369, 370, 375, 151, 371, 376, + 60, 377, 372, 378, 60, 152, 676, 379, 373, 380, + 381, 382, 374, 383, 676, 384, 385, 676, 386, 387, + 388, 676, 375, 151, 389, 376, 60, 377, 390, 378, + + 60, 152, 60, 379, 391, 380, 381, 382, 392, 383, + 151, 384, 385, 60, 386, 387, 388, 60, 152, 676, + 389, 393, 394, 395, 390, 396, 397, 676, 398, 399, + 391, 400, 401, 402, 392, 676, 151, 676, 403, 60, + 404, 405, 406, 60, 152, 60, 407, 393, 394, 395, + 408, 396, 397, 153, 398, 399, 154, 400, 401, 402, + 60, 155, 409, 156, 403, 410, 404, 405, 406, 411, + 412, 413, 407, 414, 415, 676, 408, 416, 417, 153, + 676, 418, 154, 419, 420, 421, 60, 155, 409, 156, + 60, 410, 422, 423, 424, 411, 412, 413, 153, 414, + + 415, 154, 425, 416, 417, 60, 155, 418, 156, 419, + 420, 421, 426, 427, 428, 429, 430, 431, 422, 423, + 424, 432, 433, 434, 153, 435, 436, 154, 425, 437, + 438, 60, 155, 439, 156, 440, 441, 442, 426, 427, + 428, 429, 430, 431, 443, 444, 445, 432, 433, 434, + 447, 435, 436, 448, 449, 437, 438, 450, 451, 439, + 452, 440, 441, 442, 453, 454, 455, 456, 457, 458, + 443, 444, 445, 459, 460, 461, 447, 462, 463, 448, + 449, 464, 465, 450, 451, 452, 466, 467, 468, 469, + 453, 454, 455, 456, 457, 458, 470, 471, 472, 459, + + 460, 461, 473, 462, 463, 474, 475, 464, 465, 476, + 477, 478, 466, 467, 468, 469, 479, 480, 481, 482, + 483, 484, 470, 471, 472, 485, 486, 487, 473, 488, + 489, 474, 475, 490, 491, 476, 477, 478, 492, 493, + 494, 495, 479, 480, 481, 482, 483, 484, 496, 497, + 498, 485, 486, 487, 499, 488, 489, 500, 501, 490, + 491, 502, 503, 504, 492, 493, 494, 495, 505, 506, + 507, 508, 509, 510, 496, 497, 498, 511, 512, 513, + 499, 514, 516, 500, 501, 517, 515, 502, 503, 504, + 518, 519, 522, 523, 505, 506, 507, 508, 509, 510, + + 520, 524, 521, 511, 512, 513, 525, 514, 516, 526, + 529, 517, 515, 527, 530, 531, 518, 519, 522, 523, + 532, 528, 533, 534, 535, 536, 520, 524, 521, 537, + 538, 539, 525, 540, 541, 526, 529, 542, 543, 527, + 530, 531, 544, 545, 546, 547, 532, 528, 533, 534, + 535, 536, 548, 549, 551, 537, 538, 539, 550, 540, + 541, 552, 553, 542, 543, 554, 555, 556, 544, 545, + 546, 547, 557, 558, 559, 560, 561, 562, 548, 549, + 551, 563, 564, 550, 565, 566, 567, 552, 553, 568, + 569, 554, 555, 556, 570, 571, 572, 573, 557, 558, + + 559, 560, 561, 562, 574, 575, 576, 563, 564, 577, + 565, 566, 567, 578, 579, 568, 569, 580, 581, 582, + 570, 571, 572, 573, 583, 584, 585, 586, 587, 588, + 574, 575, 576, 589, 577, 590, 591, 592, 593, 578, + 579, 594, 595, 580, 581, 582, 596, 597, 598, 599, + 583, 584, 585, 586, 587, 588, 600, 601, 602, 589, + 603, 590, 591, 592, 593, 604, 605, 594, 595, 606, + 607, 608, 596, 597, 598, 599, 609, 610, 611, 612, + 613, 614, 600, 601, 602, 615, 603, 616, 617, 618, + 619, 604, 605, 620, 621, 606, 607, 608, 622, 623, + + 624, 625, 609, 610, 611, 612, 613, 614, 626, 627, + 628, 615, 616, 629, 617, 618, 619, 630, 631, 620, + 621, 632, 633, 634, 622, 623, 624, 625, 635, 636, + 637, 638, 639, 640, 626, 627, 628, 641, 642, 629, + 643, 644, 645, 630, 631, 646, 647, 632, 633, 634, + 648, 649, 650, 651, 635, 636, 637, 638, 639, 640, + 652, 653, 654, 641, 642, 655, 643, 644, 645, 656, + 657, 646, 647, 658, 659, 660, 648, 649, 650, 651, + 661, 662, 663, 676, 664, 665, 652, 653, 654, 666, + 667, 655, 668, 669, 670, 656, 657, 671, 672, 658, + + 659, 660, 673, 674, 675, 676, 661, 662, 663, 664, + 676, 665, 676, 676, 676, 666, 667, 676, 668, 669, + 670, 676, 676, 671, 672, 676, 676, 676, 673, 674, + 675, 60, 60, 60, 95, 95, 95, 100, 100, 100, + 109, 109, 109, 112, 112, 112, 159, 159, 159, 161, + 161, 161, 190, 190, 190, 192, 192, 192, 193, 193, + 193, 195, 195, 195, 196, 676, 196, 197, 197, 197, + 200, 200, 200, 203, 676, 203, 204, 204, 204, 207, + 207, 207, 210, 210, 210, 212, 212, 212, 213, 213, + 213, 215, 215, 215, 271, 271, 271, 273, 273, 273, + + 198, 198, 198, 201, 201, 201, 205, 205, 205, 208, + 208, 208, 59, 676, 676, 676, 676, 676, 676, 676, + 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, + 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, + 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, - 676, 676, 676, 676, 676, 676 + 676 } ; -static yyconst flex_int16_t yy_chk[947] = +static yyconst flex_int16_t yy_chk[1672] = { 0, - 0, 1, 1, 1, 1, 1, 1, 699, 73, 87, - 698, 1, 73, 87, 0, 1, 27, 28, 29, 1, - 2, 2, 2, 2, 2, 2, 30, 27, 28, 29, - 2, 27, 28, 29, 2, 72, 72, 30, 2, 3, - 3, 30, 3, 116, 672, 3, 35, 36, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 35, 36, 3, - 5, 35, 36, 116, 79, 39, 40, 5, 5, 79, - 5, 5, 137, 671, 5, 5, 39, 40, 41, 42, - 39, 40, 5, 7, 7, 7, 79, 7, 137, 41, - 42, 97, 97, 41, 42, 97, 43, 115, 44, 229, - - 115, 7, 8, 8, 8, 229, 8, 43, 670, 44, - 43, 43, 44, 44, 82, 82, 96, 96, 96, 82, - 8, 9, 9, 9, 47, 9, 9, 101, 101, 101, - 127, 9, 10, 10, 10, 47, 10, 10, 156, 47, - 127, 669, 10, 11, 11, 11, 48, 11, 11, 197, - 197, 197, 156, 11, 12, 12, 12, 48, 12, 12, - 461, 48, 461, 244, 12, 13, 13, 13, 53, 13, - 13, 204, 204, 204, 244, 13, 14, 14, 14, 53, - 14, 14, 54, 53, 55, 56, 14, 15, 15, 15, - 665, 15, 664, 54, 117, 55, 56, 54, 117, 55, - - 56, 255, 255, 663, 117, 15, 16, 16, 16, 131, - 16, 102, 102, 135, 131, 102, 200, 200, 135, 661, - 200, 660, 659, 456, 16, 17, 17, 17, 456, 17, - 17, 468, 658, 657, 655, 17, 18, 18, 18, 468, - 18, 18, 654, 652, 651, 650, 18, 19, 19, 19, - 19, 19, 19, 19, 648, 207, 207, 646, 19, 207, - 644, 643, 641, 640, 639, 638, 637, 635, 633, 19, - 20, 20, 20, 20, 20, 20, 20, 632, 631, 629, - 628, 20, 626, 622, 621, 619, 618, 615, 612, 611, - 608, 606, 20, 21, 21, 21, 21, 21, 21, 21, - - 605, 604, 603, 602, 21, 601, 598, 596, 595, 594, - 593, 591, 589, 588, 587, 586, 585, 584, 583, 21, - 22, 22, 22, 22, 22, 22, 22, 582, 581, 580, - 578, 22, 576, 575, 574, 573, 572, 571, 570, 569, - 567, 566, 565, 563, 562, 561, 22, 23, 23, 560, - 23, 23, 23, 559, 23, 558, 23, 23, 23, 557, - 23, 25, 556, 555, 554, 553, 552, 551, 550, 548, - 545, 543, 25, 542, 541, 540, 25, 538, 537, 536, - 535, 534, 533, 25, 531, 530, 25, 26, 529, 528, - 527, 524, 523, 522, 521, 520, 519, 518, 26, 517, - - 516, 515, 26, 514, 511, 510, 509, 508, 507, 26, - 506, 505, 26, 31, 504, 502, 501, 500, 498, 497, - 31, 495, 31, 494, 31, 492, 31, 31, 31, 490, - 489, 488, 484, 483, 31, 31, 33, 482, 481, 33, - 480, 33, 478, 477, 476, 473, 471, 33, 469, 467, - 465, 33, 464, 33, 33, 463, 462, 33, 460, 459, - 458, 33, 37, 457, 37, 455, 37, 37, 454, 451, - 450, 449, 448, 447, 446, 445, 37, 37, 444, 443, - 37, 441, 440, 439, 37, 45, 438, 437, 436, 434, - 431, 430, 429, 428, 427, 424, 45, 423, 421, 45, - - 45, 420, 419, 418, 417, 416, 415, 45, 46, 414, - 413, 412, 411, 409, 408, 407, 406, 405, 404, 46, - 403, 401, 46, 46, 399, 398, 396, 395, 393, 392, - 46, 49, 391, 388, 387, 385, 384, 383, 382, 49, - 381, 380, 49, 379, 378, 377, 49, 49, 50, 376, - 375, 374, 373, 372, 371, 370, 50, 369, 367, 50, - 366, 365, 364, 50, 50, 51, 363, 362, 361, 360, - 359, 358, 357, 51, 356, 355, 51, 354, 353, 352, - 51, 51, 351, 51, 52, 350, 349, 348, 347, 346, - 345, 344, 52, 343, 342, 52, 341, 340, 339, 52, - - 52, 338, 52, 57, 57, 57, 337, 336, 335, 334, - 333, 332, 331, 330, 329, 57, 328, 327, 325, 57, - 58, 58, 58, 324, 323, 322, 321, 320, 319, 318, - 317, 316, 58, 315, 314, 313, 58, 677, 677, 677, - 678, 678, 678, 679, 679, 679, 680, 680, 680, 681, - 681, 681, 682, 682, 682, 683, 683, 683, 684, 684, - 684, 685, 685, 685, 686, 686, 686, 687, 687, 687, - 688, 312, 688, 689, 689, 689, 690, 690, 690, 691, - 311, 691, 692, 692, 692, 693, 693, 693, 694, 694, - 694, 695, 695, 695, 696, 696, 696, 697, 697, 697, - - 700, 700, 700, 701, 701, 701, 702, 702, 702, 703, - 703, 703, 704, 704, 704, 705, 705, 705, 310, 309, - 307, 301, 300, 299, 297, 296, 295, 294, 293, 291, - 290, 289, 288, 287, 286, 285, 284, 283, 282, 281, - 280, 279, 278, 277, 275, 273, 271, 270, 269, 268, - 267, 266, 265, 264, 263, 262, 261, 260, 259, 258, - 257, 256, 254, 253, 252, 251, 250, 249, 248, 247, - 246, 245, 243, 242, 241, 240, 239, 238, 237, 236, - 235, 234, 233, 232, 231, 230, 228, 227, 226, 225, - 224, 223, 222, 221, 220, 218, 217, 215, 213, 212, - - 210, 209, 208, 205, 202, 201, 198, 195, 193, 192, - 190, 189, 188, 187, 186, 185, 184, 183, 182, 181, - 180, 179, 178, 177, 176, 175, 174, 173, 172, 171, - 170, 169, 168, 167, 166, 165, 164, 163, 162, 161, - 159, 158, 157, 155, 154, 153, 152, 151, 150, 149, - 148, 147, 146, 145, 144, 143, 142, 141, 140, 139, - 138, 136, 134, 133, 132, 130, 129, 128, 126, 125, - 124, 123, 122, 121, 120, 119, 118, 114, 113, 111, - 110, 108, 107, 106, 105, 104, 99, 94, 93, 92, - 91, 88, 86, 85, 84, 83, 81, 80, 78, 77, - - 76, 75, 74, 71, 70, 69, 68, 67, 66, 65, - 63, 59, 676, 676, 676, 676, 676, 676, 676, 676, + 0, 1, 1, 1, 1, 1, 1, 699, 7, 7, + 7, 1, 7, 97, 97, 1, 68, 97, 70, 1, + 698, 8, 8, 8, 273, 8, 7, 96, 96, 96, + 9, 9, 9, 66, 9, 9, 67, 1, 271, 8, + 9, 1, 68, 69, 70, 1, 2, 2, 2, 2, + 2, 2, 7, 10, 10, 10, 2, 10, 10, 66, + 2, 71, 67, 10, 2, 8, 9, 74, 215, 69, + 75, 213, 76, 11, 11, 11, 212, 11, 11, 101, + 101, 101, 2, 11, 27, 169, 2, 71, 187, 10, + 2, 3, 3, 74, 3, 27, 75, 3, 76, 27, + + 3, 3, 3, 3, 3, 3, 3, 3, 3, 11, + 169, 3, 73, 187, 72, 72, 73, 3, 3, 210, + 3, 27, 208, 3, 28, 27, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 28, 3, 5, 73, 28, + 72, 72, 73, 77, 5, 5, 78, 5, 5, 80, + 81, 5, 5, 12, 12, 12, 205, 12, 12, 5, + 201, 28, 83, 12, 84, 28, 197, 197, 197, 77, + 5, 5, 78, 5, 5, 80, 81, 5, 5, 204, + 204, 204, 13, 13, 13, 5, 13, 13, 83, 12, + 84, 198, 13, 14, 14, 14, 236, 14, 14, 195, + + 85, 193, 79, 14, 15, 15, 15, 79, 15, 16, + 16, 16, 86, 16, 192, 17, 17, 17, 13, 17, + 17, 236, 15, 190, 79, 17, 85, 16, 79, 14, + 18, 18, 18, 79, 18, 18, 161, 88, 86, 29, + 18, 159, 158, 157, 30, 35, 36, 39, 15, 79, + 29, 17, 240, 16, 29, 30, 35, 36, 39, 30, + 35, 36, 39, 88, 40, 242, 18, 19, 19, 19, + 19, 19, 19, 19, 99, 40, 29, 240, 19, 40, + 29, 30, 35, 36, 39, 30, 35, 36, 39, 19, + 242, 41, 42, 102, 102, 108, 107, 102, 104, 43, + + 99, 40, 41, 42, 19, 40, 41, 42, 110, 111, + 43, 106, 105, 43, 43, 19, 20, 20, 20, 20, + 20, 20, 20, 113, 104, 250, 94, 20, 41, 42, + 93, 92, 41, 42, 110, 111, 43, 44, 20, 43, + 43, 91, 65, 47, 48, 53, 54, 114, 44, 113, + 250, 44, 44, 20, 47, 48, 53, 54, 47, 48, + 53, 54, 118, 63, 20, 21, 21, 21, 21, 21, + 21, 21, 59, 114, 44, 0, 21, 44, 44, 0, + 47, 48, 53, 54, 47, 48, 53, 54, 118, 55, + 56, 21, 0, 0, 57, 57, 57, 58, 58, 58, + + 55, 56, 21, 0, 55, 56, 57, 82, 82, 58, + 57, 87, 82, 58, 0, 87, 119, 21, 22, 22, + 22, 22, 22, 22, 22, 115, 55, 56, 115, 22, + 55, 56, 57, 82, 82, 58, 57, 87, 82, 58, + 116, 87, 119, 117, 22, 200, 200, 117, 0, 200, + 0, 115, 259, 117, 115, 22, 0, 120, 0, 121, + 116, 122, 123, 124, 125, 126, 116, 0, 128, 117, + 22, 23, 23, 117, 23, 23, 23, 259, 23, 117, + 23, 23, 23, 120, 23, 121, 116, 122, 123, 124, + 125, 126, 129, 127, 128, 130, 0, 23, 23, 132, + + 23, 23, 23, 127, 23, 133, 23, 23, 23, 131, + 23, 25, 134, 0, 131, 135, 136, 138, 129, 127, + 135, 130, 25, 139, 137, 132, 25, 140, 127, 141, + 142, 133, 143, 25, 144, 131, 25, 145, 134, 131, + 137, 135, 136, 138, 146, 147, 135, 0, 25, 139, + 137, 0, 25, 140, 148, 141, 142, 149, 143, 25, + 144, 25, 26, 145, 150, 137, 151, 152, 153, 154, + 146, 147, 155, 26, 156, 162, 163, 26, 164, 165, + 148, 166, 167, 149, 26, 168, 0, 26, 156, 170, + 150, 171, 151, 152, 153, 154, 0, 172, 155, 26, + + 156, 162, 163, 26, 164, 165, 173, 166, 167, 0, + 26, 168, 26, 31, 156, 170, 174, 171, 175, 176, + 31, 177, 31, 172, 31, 178, 31, 31, 31, 179, + 180, 181, 173, 182, 31, 31, 0, 183, 184, 0, + 185, 0, 174, 186, 175, 176, 31, 177, 31, 188, + 31, 178, 31, 31, 31, 179, 180, 181, 189, 182, + 31, 31, 33, 183, 184, 33, 185, 33, 202, 186, + 207, 207, 209, 33, 207, 188, 217, 33, 218, 33, + 33, 220, 221, 33, 189, 222, 0, 33, 223, 0, + 224, 33, 0, 33, 202, 225, 226, 227, 209, 33, + + 228, 0, 217, 33, 218, 33, 33, 220, 221, 33, + 230, 222, 33, 37, 223, 37, 224, 37, 37, 229, + 231, 225, 226, 227, 232, 229, 228, 37, 37, 233, + 234, 37, 235, 237, 0, 37, 230, 238, 239, 37, + 241, 37, 243, 37, 37, 229, 231, 245, 246, 0, + 232, 229, 371, 37, 37, 233, 234, 37, 235, 237, + 37, 45, 247, 238, 239, 248, 241, 244, 243, 249, + 251, 252, 45, 245, 246, 45, 45, 371, 244, 253, + 254, 255, 255, 45, 0, 256, 257, 258, 247, 260, + 261, 248, 262, 244, 263, 249, 251, 252, 45, 0, + + 264, 45, 45, 244, 265, 253, 254, 255, 255, 45, + 46, 256, 257, 258, 266, 260, 261, 267, 262, 268, + 263, 46, 269, 270, 46, 46, 264, 275, 277, 278, + 265, 279, 46, 0, 280, 281, 282, 283, 284, 285, + 266, 0, 286, 267, 0, 268, 287, 46, 269, 270, + 46, 46, 288, 275, 277, 278, 289, 279, 46, 49, + 280, 281, 282, 283, 284, 285, 290, 49, 286, 291, + 49, 293, 287, 294, 49, 49, 0, 295, 288, 296, + 297, 299, 289, 300, 0, 301, 307, 0, 309, 310, + 311, 0, 290, 49, 312, 291, 49, 293, 313, 294, + + 49, 49, 50, 295, 314, 296, 297, 299, 315, 300, + 50, 301, 307, 50, 309, 310, 311, 50, 50, 0, + 312, 316, 317, 318, 313, 319, 320, 0, 321, 322, + 314, 323, 324, 325, 315, 0, 50, 0, 327, 50, + 328, 329, 330, 50, 50, 51, 331, 316, 317, 318, + 332, 319, 320, 51, 321, 322, 51, 323, 324, 325, + 51, 51, 333, 51, 327, 334, 328, 329, 330, 335, + 336, 337, 331, 338, 339, 0, 332, 340, 341, 51, + 0, 342, 51, 343, 344, 345, 51, 51, 333, 51, + 52, 334, 346, 347, 348, 335, 336, 337, 52, 338, + + 339, 52, 349, 340, 341, 52, 52, 342, 52, 343, + 344, 345, 350, 351, 352, 353, 354, 355, 346, 347, + 348, 356, 357, 358, 52, 359, 360, 52, 349, 361, + 362, 52, 52, 363, 52, 364, 365, 366, 350, 351, + 352, 353, 354, 355, 367, 369, 370, 356, 357, 358, + 372, 359, 360, 373, 374, 361, 362, 375, 376, 363, + 377, 364, 365, 366, 378, 379, 380, 381, 382, 383, + 367, 369, 370, 384, 385, 387, 372, 388, 391, 373, + 374, 392, 393, 375, 376, 377, 395, 396, 398, 399, + 378, 379, 380, 381, 382, 383, 401, 403, 404, 384, + + 385, 387, 405, 388, 391, 406, 407, 392, 393, 408, + 409, 411, 395, 396, 398, 399, 412, 413, 414, 415, + 416, 417, 401, 403, 404, 418, 419, 420, 405, 421, + 423, 406, 407, 424, 427, 408, 409, 411, 428, 429, + 430, 431, 412, 413, 414, 415, 416, 417, 434, 436, + 437, 418, 419, 420, 438, 421, 423, 439, 440, 424, + 427, 441, 443, 444, 428, 429, 430, 431, 445, 446, + 447, 448, 449, 450, 434, 436, 437, 451, 454, 455, + 438, 456, 457, 439, 440, 458, 456, 441, 443, 444, + 459, 460, 462, 463, 445, 446, 447, 448, 449, 450, + + 461, 464, 461, 451, 454, 455, 465, 456, 457, 467, + 469, 458, 456, 468, 471, 473, 459, 460, 462, 463, + 476, 468, 477, 478, 480, 481, 461, 464, 461, 482, + 483, 484, 465, 488, 489, 467, 469, 490, 492, 468, + 471, 473, 494, 495, 497, 498, 476, 468, 477, 478, + 480, 481, 500, 501, 504, 482, 483, 484, 502, 488, + 489, 505, 506, 490, 492, 507, 508, 509, 494, 495, + 497, 498, 510, 511, 514, 515, 516, 517, 500, 501, + 504, 518, 519, 502, 520, 521, 522, 505, 506, 523, + 524, 507, 508, 509, 527, 528, 529, 530, 510, 511, + + 514, 515, 516, 517, 531, 533, 534, 518, 519, 535, + 520, 521, 522, 536, 537, 523, 524, 538, 540, 541, + 527, 528, 529, 530, 542, 543, 545, 548, 550, 551, + 531, 533, 534, 552, 535, 553, 554, 555, 556, 536, + 537, 557, 558, 538, 540, 541, 559, 560, 561, 562, + 542, 543, 545, 548, 550, 551, 563, 565, 566, 552, + 567, 553, 554, 555, 556, 569, 570, 557, 558, 571, + 572, 573, 559, 560, 561, 562, 574, 575, 576, 578, + 580, 581, 563, 565, 566, 582, 567, 583, 584, 585, + 586, 569, 570, 587, 588, 571, 572, 573, 589, 591, + + 593, 594, 574, 575, 576, 578, 580, 581, 595, 596, + 598, 582, 583, 601, 584, 585, 586, 602, 603, 587, + 588, 604, 605, 606, 589, 591, 593, 594, 608, 611, + 612, 615, 618, 619, 595, 596, 598, 621, 622, 601, + 626, 628, 629, 602, 603, 631, 632, 604, 605, 606, + 633, 635, 637, 638, 608, 611, 612, 615, 618, 619, + 639, 640, 641, 621, 622, 643, 626, 628, 629, 644, + 646, 631, 632, 648, 650, 651, 633, 635, 637, 638, + 652, 654, 655, 0, 657, 658, 639, 640, 641, 659, + 660, 643, 661, 663, 664, 644, 646, 665, 669, 648, + + 650, 651, 670, 671, 672, 0, 652, 654, 655, 657, + 0, 658, 0, 0, 0, 659, 660, 0, 661, 663, + 664, 0, 0, 665, 669, 0, 0, 0, 670, 671, + 672, 677, 677, 677, 678, 678, 678, 679, 679, 679, + 680, 680, 680, 681, 681, 681, 682, 682, 682, 683, + 683, 683, 684, 684, 684, 685, 685, 685, 686, 686, + 686, 687, 687, 687, 688, 0, 688, 689, 689, 689, + 690, 690, 690, 691, 0, 691, 692, 692, 692, 693, + 693, 693, 694, 694, 694, 695, 695, 695, 696, 696, + 696, 697, 697, 697, 700, 700, 700, 701, 701, 701, + + 702, 702, 702, 703, 703, 703, 704, 704, 704, 705, + 705, 705, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, - 676, 676, 676, 676, 676, 676 + 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, + 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, + 676, 676, 676, 676, 676, 676, 676, 676, 676, 676, + 676 } ; static yy_state_type yy_last_accepting_state; @@ -893,8 +1046,8 @@ int yy_flex_debug = 0; #define YY_MORE_ADJ 0 #define YY_RESTORE_YY_MORE_OFFSET char *yytext; -#line 1 "mapfile.l" -#line 2 "mapfile.l" +#line 1 "src/mapfile/mapfile.l" +#line 2 "src/mapfile/mapfile.l" #include @@ -1434,14 +1587,15 @@ static void end_layer() if (!map_l->storage->schema->use) buffer_add_str(map_l->storage->schema, "public"); if (!map_is_dump) map_l->retrievable=map_l->writable = false; - map_l->name_prefix = buffer_init(); + + map_l->name_prefix = buffer_init(); buffer_copy(map_l->name_prefix, map_l->name); if (map_l->ns_prefix->use) { buffer_add_head(map_l->name_prefix, ':'); buffer_add_head_str(map_l->name_prefix, map_l->ns_prefix->buf); } - map_l->name_no_uri = buffer_init(); + map_l->name_no_uri = buffer_init(); buffer_copy(map_l->name_no_uri, map_l->name); if (map_l->ns_uri->use) { buffer_add_head(map_l->name, ':'); @@ -1483,7 +1637,7 @@ static void end_layer() -#line 1486 "src/mapfile/mapfile.c" +#line 1639 "src/mapfile/mapfile.c" #define INITIAL 0 #define MAP 1 @@ -1520,7 +1674,7 @@ static void end_layer() * down here because we want the user's section 1 to have been scanned first. * The user has a chance to override it with an option. */ - #ifndef _WIN32 +#ifndef _WIN32 #include #endif #endif @@ -1552,7 +1706,7 @@ FILE *yyget_out (void ); void yyset_out (FILE * out_str ); -int yyget_leng (void ); +yy_size_t yyget_leng (void ); char *yyget_text (void ); @@ -1602,12 +1756,7 @@ static int input (void ); /* Amount of stuff to slurp up with each read. */ #ifndef YY_READ_BUF_SIZE -#ifdef __ia64__ -/* On IA-64, the buffer size is 16k, not 8k */ -#define YY_READ_BUF_SIZE 16384 -#else #define YY_READ_BUF_SIZE 8192 -#endif /* __ia64__ */ #endif /* Copy whatever the last rule matched to the standard output. */ @@ -1615,7 +1764,7 @@ static int input (void ); /* This used to be an fputs(), but since the string might contain NUL's, * we now use fwrite(). */ -#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0) +#define ECHO fwrite( yytext, yyleng, 1, yyout ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1626,7 +1775,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + yy_size_t n; \ for ( n = 0; n < max_size && \ (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1708,10 +1857,10 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 599 "mapfile.l" +#line 598 "src/mapfile/mapfile.l" -#line 1712 "src/mapfile/mapfile.c" +#line 1860 "src/mapfile/mapfile.c" if ( !(yy_init) ) { @@ -1792,23 +1941,23 @@ YY_DECL case 1: YY_RULE_SETUP -#line 601 "mapfile.l" +#line 600 "src/mapfile/mapfile.l" { char c ; for (c=input() ; c && c != '\n' ; c=input()); } YY_BREAK case 2: YY_RULE_SETUP -#line 602 "mapfile.l" +#line 601 "src/mapfile/mapfile.l" { yy_push_state(INCLUDE); OWS_MAP_DBG } YY_BREAK case 3: YY_RULE_SETUP -#line 605 "mapfile.l" +#line 604 "src/mapfile/mapfile.l" { /*LEGEND rule must appears before END... */ yy_push_state(LEGEND); OWS_MAP_DBG } YY_BREAK case 4: YY_RULE_SETUP -#line 608 "mapfile.l" +#line 607 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE if (yy_top_state() == INITIAL && YY_START != MAP) { @@ -1822,483 +1971,483 @@ YY_RULE_SETUP YY_BREAK case 5: YY_RULE_SETUP -#line 619 "mapfile.l" +#line 618 "src/mapfile/mapfile.l" { yy_push_state(MAP); OWS_MAP_DBG } YY_BREAK case 6: YY_RULE_SETUP -#line 620 "mapfile.l" +#line 619 "src/mapfile/mapfile.l" { yy_push_state(WEB); OWS_MAP_DBG } YY_BREAK case 7: YY_RULE_SETUP -#line 621 "mapfile.l" +#line 620 "src/mapfile/mapfile.l" { yy_push_state(QUERYMAP); OWS_MAP_DBG } YY_BREAK case 8: YY_RULE_SETUP -#line 622 "mapfile.l" +#line 621 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE /* must be before SYMBOL */ } YY_BREAK case 9: YY_RULE_SETUP -#line 623 "mapfile.l" +#line 622 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 10: YY_RULE_SETUP -#line 624 "mapfile.l" +#line 623 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 11: YY_RULE_SETUP -#line 625 "mapfile.l" +#line 624 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 12: YY_RULE_SETUP -#line 626 "mapfile.l" +#line 625 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 13: YY_RULE_SETUP -#line 627 "mapfile.l" +#line 626 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 14: YY_RULE_SETUP -#line 628 "mapfile.l" +#line 627 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 15: YY_RULE_SETUP -#line 629 "mapfile.l" +#line 628 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 16: YY_RULE_SETUP -#line 630 "mapfile.l" +#line 629 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 17: YY_RULE_SETUP -#line 631 "mapfile.l" +#line 630 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 18: YY_RULE_SETUP -#line 632 "mapfile.l" +#line 631 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 19: YY_RULE_SETUP -#line 633 "mapfile.l" +#line 632 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 20: YY_RULE_SETUP -#line 634 "mapfile.l" +#line 633 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 21: YY_RULE_SETUP -#line 635 "mapfile.l" +#line 634 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 22: YY_RULE_SETUP -#line 636 "mapfile.l" +#line 635 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 23: YY_RULE_SETUP -#line 637 "mapfile.l" +#line 636 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 24: YY_RULE_SETUP -#line 638 "mapfile.l" +#line 637 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 25: YY_RULE_SETUP -#line 639 "mapfile.l" +#line 638 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 26: YY_RULE_SETUP -#line 640 "mapfile.l" +#line 639 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 27: YY_RULE_SETUP -#line 641 "mapfile.l" +#line 640 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 28: YY_RULE_SETUP -#line 642 "mapfile.l" +#line 641 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 29: YY_RULE_SETUP -#line 643 "mapfile.l" +#line 642 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 30: YY_RULE_SETUP -#line 644 "mapfile.l" +#line 643 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 31: YY_RULE_SETUP -#line 645 "mapfile.l" +#line 644 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 32: YY_RULE_SETUP -#line 646 "mapfile.l" +#line 645 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 33: YY_RULE_SETUP -#line 647 "mapfile.l" +#line 646 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 34: YY_RULE_SETUP -#line 648 "mapfile.l" +#line 647 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 35: YY_RULE_SETUP -#line 649 "mapfile.l" +#line 648 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 36: YY_RULE_SETUP -#line 650 "mapfile.l" +#line 649 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 37: YY_RULE_SETUP -#line 651 "mapfile.l" +#line 650 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 38: YY_RULE_SETUP -#line 652 "mapfile.l" +#line 651 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 39: YY_RULE_SETUP -#line 653 "mapfile.l" +#line 652 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 40: YY_RULE_SETUP -#line 654 "mapfile.l" +#line 653 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 41: YY_RULE_SETUP -#line 655 "mapfile.l" +#line 654 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 42: YY_RULE_SETUP -#line 656 "mapfile.l" +#line 655 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 43: YY_RULE_SETUP -#line 657 "mapfile.l" +#line 656 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 44: YY_RULE_SETUP -#line 658 "mapfile.l" +#line 657 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 45: YY_RULE_SETUP -#line 659 "mapfile.l" +#line 658 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 46: YY_RULE_SETUP -#line 660 "mapfile.l" +#line 659 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 47: YY_RULE_SETUP -#line 661 "mapfile.l" +#line 660 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 48: YY_RULE_SETUP -#line 662 "mapfile.l" +#line 661 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 49: YY_RULE_SETUP -#line 663 "mapfile.l" +#line 662 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 50: YY_RULE_SETUP -#line 664 "mapfile.l" +#line 663 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 51: YY_RULE_SETUP -#line 665 "mapfile.l" +#line 664 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 52: YY_RULE_SETUP -#line 666 "mapfile.l" +#line 665 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 53: YY_RULE_SETUP -#line 667 "mapfile.l" +#line 666 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 54: YY_RULE_SETUP -#line 668 "mapfile.l" +#line 667 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 55: YY_RULE_SETUP -#line 669 "mapfile.l" +#line 668 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 56: YY_RULE_SETUP -#line 670 "mapfile.l" +#line 669 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 57: YY_RULE_SETUP -#line 671 "mapfile.l" +#line 670 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 58: YY_RULE_SETUP -#line 672 "mapfile.l" +#line 671 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 59: YY_RULE_SETUP -#line 673 "mapfile.l" +#line 672 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 60: YY_RULE_SETUP -#line 674 "mapfile.l" +#line 673 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 61: YY_RULE_SETUP -#line 675 "mapfile.l" +#line 674 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 62: YY_RULE_SETUP -#line 676 "mapfile.l" +#line 675 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 63: YY_RULE_SETUP -#line 677 "mapfile.l" +#line 676 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 64: YY_RULE_SETUP -#line 678 "mapfile.l" +#line 677 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 65: YY_RULE_SETUP -#line 679 "mapfile.l" +#line 678 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 66: YY_RULE_SETUP -#line 680 "mapfile.l" +#line 679 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 67: YY_RULE_SETUP -#line 681 "mapfile.l" +#line 680 "src/mapfile/mapfile.l" { OWS_MAP_EATLINE } YY_BREAK case 68: YY_RULE_SETUP -#line 683 "mapfile.l" +#line 682 "src/mapfile/mapfile.l" { yy_push_state(SYMBOL); OWS_MAP_DBG } YY_BREAK case 69: YY_RULE_SETUP -#line 684 "mapfile.l" +#line 683 "src/mapfile/mapfile.l" { yy_push_state(SCALEBAR); OWS_MAP_DBG } YY_BREAK case 70: YY_RULE_SETUP -#line 685 "mapfile.l" +#line 684 "src/mapfile/mapfile.l" { yy_push_state(REFERENCE); OWS_MAP_DBG } YY_BREAK case 71: YY_RULE_SETUP -#line 686 "mapfile.l" +#line 685 "src/mapfile/mapfile.l" { yy_push_state(OUTPUTFORMAT); OWS_MAP_DBG } YY_BREAK case 72: YY_RULE_SETUP -#line 687 "mapfile.l" +#line 686 "src/mapfile/mapfile.l" { yy_push_state(METADATA); OWS_MAP_DBG } YY_BREAK case 73: YY_RULE_SETUP -#line 688 "mapfile.l" +#line 687 "src/mapfile/mapfile.l" { yy_push_state(GRID); OWS_MAP_DBG } YY_BREAK case 74: YY_RULE_SETUP -#line 689 "mapfile.l" +#line 688 "src/mapfile/mapfile.l" { yy_push_state(JOIN); OWS_MAP_DBG } YY_BREAK case 75: YY_RULE_SETUP -#line 690 "mapfile.l" +#line 689 "src/mapfile/mapfile.l" { yy_push_state(LAYER_METADATA); OWS_MAP_DBG } YY_BREAK case 76: YY_RULE_SETUP -#line 691 "mapfile.l" +#line 690 "src/mapfile/mapfile.l" { yy_push_state(CLASS); OWS_MAP_DBG } YY_BREAK case 77: YY_RULE_SETUP -#line 692 "mapfile.l" +#line 691 "src/mapfile/mapfile.l" { yy_push_state(STYLE); OWS_MAP_DBG } YY_BREAK case 78: YY_RULE_SETUP -#line 693 "mapfile.l" +#line 692 "src/mapfile/mapfile.l" { yy_push_state(LABEL); OWS_MAP_DBG } YY_BREAK case 79: YY_RULE_SETUP -#line 694 "mapfile.l" +#line 693 "src/mapfile/mapfile.l" { yy_push_state(PROJECTION); OWS_MAP_DBG } YY_BREAK case 80: YY_RULE_SETUP -#line 695 "mapfile.l" +#line 694 "src/mapfile/mapfile.l" { yy_push_state(PATTERN); OWS_MAP_DBG } YY_BREAK case 81: YY_RULE_SETUP -#line 696 "mapfile.l" +#line 695 "src/mapfile/mapfile.l" { yy_push_state(POINTS); OWS_MAP_DBG } YY_BREAK case 82: YY_RULE_SETUP -#line 697 "mapfile.l" +#line 696 "src/mapfile/mapfile.l" { yy_push_state(LABEL); OWS_MAP_DBG } YY_BREAK case 83: YY_RULE_SETUP -#line 698 "mapfile.l" +#line 697 "src/mapfile/mapfile.l" { yy_push_state(LAYER); map_l = ows_layer_init(); OWS_MAP_DBG } YY_BREAK case 84: YY_RULE_SETUP -#line 699 "mapfile.l" +#line 698 "src/mapfile/mapfile.l" { yy_push_state(FEATURE); OWS_MAP_DBG } YY_BREAK case 85: YY_RULE_SETUP -#line 700 "mapfile.l" +#line 699 "src/mapfile/mapfile.l" { BEGIN PROPERTIES; map_prop_state = MAP_NAME; } YY_BREAK case 86: YY_RULE_SETUP -#line 701 "mapfile.l" +#line 700 "src/mapfile/mapfile.l" { BEGIN LAYER_PROPERTIES; map_layer_prop_state = MAP_LAYER_NAME; } YY_BREAK case 87: YY_RULE_SETUP -#line 702 "mapfile.l" +#line 701 "src/mapfile/mapfile.l" { BEGIN LAYER_PROPERTIES; map_layer_prop_state = MAP_LAYER_CONNECTION; } YY_BREAK case 88: YY_RULE_SETUP -#line 703 "mapfile.l" +#line 702 "src/mapfile/mapfile.l" { BEGIN LAYER_CONNECTIONTYPE; } YY_BREAK case 89: YY_RULE_SETUP -#line 704 "mapfile.l" +#line 703 "src/mapfile/mapfile.l" { BEGIN LAYER; map_is_postgis=true; } YY_BREAK case 90: YY_RULE_SETUP -#line 705 "mapfile.l" +#line 704 "src/mapfile/mapfile.l" { BEGIN LAYER; map_is_postgis=false; } YY_BREAK case 91: YY_RULE_SETUP -#line 706 "mapfile.l" +#line 705 "src/mapfile/mapfile.l" { BEGIN LAYER_DUMP; } YY_BREAK case 92: YY_RULE_SETUP -#line 707 "mapfile.l" +#line 706 "src/mapfile/mapfile.l" { BEGIN LAYER; map_is_dump=true; } YY_BREAK case 93: YY_RULE_SETUP -#line 708 "mapfile.l" +#line 707 "src/mapfile/mapfile.l" { BEGIN LAYER; map_is_dump=false; } YY_BREAK case 94: /* rule 94 can match eol */ YY_RULE_SETUP -#line 710 "mapfile.l" +#line 709 "src/mapfile/mapfile.l" {} YY_BREAK case 95: /* rule 95 can match eol */ YY_RULE_SETUP -#line 712 "mapfile.l" +#line 711 "src/mapfile/mapfile.l" {metadata_key(yytext, true); BEGIN METADATA_VALUE;} YY_BREAK case 96: /* rule 96 can match eol */ YY_RULE_SETUP -#line 713 "mapfile.l" +#line 712 "src/mapfile/mapfile.l" {metadata_value(yytext, true); BEGIN METADATA;} YY_BREAK case 97: /* rule 97 can match eol */ YY_RULE_SETUP -#line 714 "mapfile.l" +#line 713 "src/mapfile/mapfile.l" {metadata_layer_key(yytext, true); BEGIN LAYER_METADATA_VALUE;} YY_BREAK case 98: /* rule 98 can match eol */ YY_RULE_SETUP -#line 715 "mapfile.l" +#line 714 "src/mapfile/mapfile.l" {metadata_layer_value(yytext, true); BEGIN LAYER_METADATA;} YY_BREAK case 99: /* rule 99 can match eol */ YY_RULE_SETUP -#line 716 "mapfile.l" +#line 715 "src/mapfile/mapfile.l" { char *p, *q; @@ -2332,40 +2481,40 @@ YY_RULE_SETUP case 100: /* rule 100 can match eol */ YY_RULE_SETUP -#line 747 "mapfile.l" +#line 746 "src/mapfile/mapfile.l" {properties(yytext, true); BEGIN MAP;} YY_BREAK case 101: YY_RULE_SETUP -#line 748 "mapfile.l" +#line 747 "src/mapfile/mapfile.l" {properties(yytext, false); BEGIN MAP;} YY_BREAK case 102: /* rule 102 can match eol */ YY_RULE_SETUP -#line 749 "mapfile.l" +#line 748 "src/mapfile/mapfile.l" {layer_properties(yytext, true); BEGIN LAYER;} YY_BREAK case 103: YY_RULE_SETUP -#line 750 "mapfile.l" +#line 749 "src/mapfile/mapfile.l" {layer_properties(yytext, false); BEGIN LAYER;} YY_BREAK case 104: /* rule 104 can match eol */ YY_RULE_SETUP -#line 751 "mapfile.l" +#line 750 "src/mapfile/mapfile.l" {} YY_BREAK case 105: YY_RULE_SETUP -#line 752 "mapfile.l" +#line 751 "src/mapfile/mapfile.l" {} YY_BREAK case 106: /* rule 106 can match eol */ YY_RULE_SETUP -#line 753 "mapfile.l" +#line 752 "src/mapfile/mapfile.l" {} YY_BREAK case YY_STATE_EOF(INITIAL): @@ -2397,7 +2546,7 @@ case YY_STATE_EOF(SYMBOL): case YY_STATE_EOF(PATTERN): case YY_STATE_EOF(POINTS): case YY_STATE_EOF(INCLUDE): -#line 755 "mapfile.l" +#line 754 "src/mapfile/mapfile.l" { /* End of main file */ if (map_include_stack_ptr == 0 && YY_START == 0) yyterminate(); @@ -2415,10 +2564,10 @@ case YY_STATE_EOF(INCLUDE): YY_BREAK case 107: YY_RULE_SETUP -#line 770 "mapfile.l" +#line 769 "src/mapfile/mapfile.l" ECHO; YY_BREAK -#line 2419 "src/mapfile/mapfile.c" +#line 2567 "src/mapfile/mapfile.c" case YY_END_OF_BUFFER: { @@ -2603,7 +2752,7 @@ static int yy_get_next_buffer (void) else { - int num_to_read = + yy_size_t num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; while ( num_to_read <= 0 ) @@ -2617,7 +2766,7 @@ static int yy_get_next_buffer (void) if ( b->yy_is_our_buffer ) { - int new_size = b->yy_buf_size * 2; + yy_size_t new_size = b->yy_buf_size * 2; if ( new_size <= 0 ) b->yy_buf_size += b->yy_buf_size / 8; @@ -2648,7 +2797,7 @@ static int yy_get_next_buffer (void) /* Read in more data. */ YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), - (yy_n_chars), (size_t) num_to_read ); + (yy_n_chars), num_to_read ); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); } @@ -2770,7 +2919,7 @@ static int yy_get_next_buffer (void) else { /* need more input */ - int offset = (yy_c_buf_p) - (yytext_ptr); + yy_size_t offset = (yy_c_buf_p) - (yytext_ptr); ++(yy_c_buf_p); switch ( yy_get_next_buffer( ) ) @@ -2794,7 +2943,7 @@ static int yy_get_next_buffer (void) case EOB_ACT_END_OF_FILE: { if ( yywrap( ) ) - return EOF; + return 0; if ( ! (yy_did_buffer_switch_on_eof) ) YY_NEW_FILE; @@ -3042,7 +3191,7 @@ void yypop_buffer_state (void) */ static void yyensure_buffer_stack (void) { - int num_to_alloc; + yy_size_t num_to_alloc; if (!(yy_buffer_stack)) { @@ -3134,17 +3283,16 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) /** Setup the input buffer state to scan the given bytes. The next call to yylex() will * scan from a @e copy of @a bytes. - * @param yybytes the byte buffer to scan - * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. + * @param bytes the byte buffer to scan + * @param len the number of bytes in the buffer pointed to by @a bytes. * * @return the newly allocated buffer state object. */ -YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, int _yybytes_len ) +YY_BUFFER_STATE yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len ) { YY_BUFFER_STATE b; char *buf; - yy_size_t n; - int i; + yy_size_t n, i; /* Get memory for full buffer, including space for trailing EOB's. */ n = _yybytes_len + 2; @@ -3263,7 +3411,7 @@ FILE *yyget_out (void) /** Get the length of the current token. * */ -int yyget_leng (void) +yy_size_t yyget_leng (void) { return yyleng; } @@ -3419,7 +3567,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 770 "mapfile.l" +#line 769 "src/mapfile/mapfile.l" From 51efe9182256564f52b5d8860f442205a9aed43a Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Sat, 12 Jun 2021 15:28:10 -0300 Subject: [PATCH 3/6] handle PostGIS 3.1 --- demo/install.sh.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/demo/install.sh.in b/demo/install.sh.in index 89de7d51..a2bd50b1 100755 --- a/demo/install.sh.in +++ b/demo/install.sh.in @@ -11,7 +11,9 @@ PGUSER=postgres SHP2PGSQL=@SHP2PGSQL@ DB=tinyows_demo -if [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then +if [ -d /usr/local/pgsql/share/contrib/postgis-3.1 ]; then + PGSHARE=/usr/local/pgsql/share/contrib/postgis-3.1 +elif [ -d @POSTGIS_SHARE@/contrib/postgis-3.0 ]; then PGSHARE=@POSTGIS_SHARE@/contrib/postgis-3.0 elif [ -d @POSTGIS_SHARE@/contrib/postgis-2.5 ]; then PGSHARE=@POSTGIS_SHARE@/contrib/postgis-2.5 From c31674208ea186ed965ecede88660d4a3515fd2e Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Sat, 12 Jun 2021 15:33:13 -0300 Subject: [PATCH 4/6] fix indentation --- src/mapfile/mapfile.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mapfile/mapfile.l b/src/mapfile/mapfile.l index ecb29461..82a26463 100644 --- a/src/mapfile/mapfile.l +++ b/src/mapfile/mapfile.l @@ -538,14 +538,14 @@ static void end_layer() if (!map_l->storage->schema->use) buffer_add_str(map_l->storage->schema, "public"); if (!map_is_dump) map_l->retrievable=map_l->writable = false; - map_l->name_prefix = buffer_init(); + map_l->name_prefix = buffer_init(); buffer_copy(map_l->name_prefix, map_l->name); if (map_l->ns_prefix->use) { buffer_add_head(map_l->name_prefix, ':'); buffer_add_head_str(map_l->name_prefix, map_l->ns_prefix->buf); } - map_l->name_no_uri = buffer_init(); + map_l->name_no_uri = buffer_init(); buffer_copy(map_l->name_no_uri, map_l->name); if (map_l->ns_uri->use) { buffer_add_head(map_l->name, ':'); From 5c6458a468f913f8a8a82b3a26a9c7280d873ee2 Mon Sep 17 00:00:00 2001 From: Jeff McKenna Date: Sat, 12 Jun 2021 16:48:19 -0300 Subject: [PATCH 5/6] debian library order patch --- Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 4dd219d4..e5c77695 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,7 +25,7 @@ GIT_FLAGS=@GIT_FLAGS@ SRC=src/fe/fe_comparison_ops.c src/fe/fe_error.c src/fe/fe_filter.c src/fe/fe_filter_capabilities.c src/fe/fe_function.c src/fe/fe_logical_ops.c src/fe/fe_spatial_ops.c src/mapfile/mapfile.c src/ows/ows_bbox.c src/ows/ows.c src/ows/ows_config.c src/ows/ows_error.c src/ows/ows_geobbox.c src/ows/ows_get_capabilities.c src/ows/ows_layer.c src/ows/ows_metadata.c src/ows/ows_psql.c src/ows/ows_request.c src/ows/ows_srs.c src/ows/ows_storage.c src/ows/ows_version.c src/struct/alist.c src/struct/array.c src/struct/buffer.c src/struct/cgi_request.c src/struct/list.c src/struct/mlist.c src/struct/regexp.c src/wfs/wfs_describe.c src/wfs/wfs_error.c src/wfs/wfs_get_capabilities.c src/wfs/wfs_get_feature.c src/wfs/wfs_request.c src/wfs/wfs_transaction.c src/ows/ows_libxml.c all: - $(CC) -o tinyows $(SRC) $(XMLFLAGS) $(CFLAGS) $(PGFLAGS) $(FCGIFLAGS) $(GIT_FLAGS) -lfl + $(CC) $(CFLAGS) $(POSTGIS_INC) $(XML2_INC) $(FCGI_INC) $(SVN_FLAGS) $(SRC) -o tinyows -lfl $(POSTGIS_LIB) $(XML2_LIB) $(FCGI_LIB) @rm -rf tinyows.dSYM flex: From 37aec1fabc569c3a239457dbaab373e91be6271c Mon Sep 17 00:00:00 2001 From: jmckenna Date: Sat, 12 Jun 2021 17:35:15 -0300 Subject: [PATCH 6/6] fix indentation, again --- src/mapfile/mapfile.l | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mapfile/mapfile.l b/src/mapfile/mapfile.l index 82a26463..6b73b4e4 100644 --- a/src/mapfile/mapfile.l +++ b/src/mapfile/mapfile.l @@ -538,6 +538,7 @@ static void end_layer() if (!map_l->storage->schema->use) buffer_add_str(map_l->storage->schema, "public"); if (!map_is_dump) map_l->retrievable=map_l->writable = false; + map_l->name_prefix = buffer_init(); buffer_copy(map_l->name_prefix, map_l->name); if (map_l->ns_prefix->use) {