diff options
| author | Matthias Kramm <kramm@quiss.org> | 2011-10-06 20:46:59 -0700 |
|---|---|---|
| committer | Matthias Kramm <kramm@quiss.org> | 2011-10-06 20:46:59 -0700 |
| commit | b55553d5681cb1f26ef255c847d42dd1bb2f443f (patch) | |
| tree | a98f73c4ebc8a163fcf0b95c53fbb9b3223de5ca | |
| parent | f2b9dea8b60b456bcb550698cb6c422a154d6d84 (diff) | |
fixed release building
| -rwxr-xr-x[-rw-r--r--] | config.guess | 0 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | installer/Makefile | 6 | ||||
| -rw-r--r-- | lib/Makefile.in | 6 | ||||
| -rw-r--r-- | lib/action/lex.swf5.c | 738 | ||||
| -rw-r--r-- | release.in | 5 |
6 files changed, 485 insertions, 272 deletions
diff --git a/config.guess b/config.guess index 2313a174..2313a174 100644..100755 --- a/config.guess +++ b/config.guess diff --git a/configure.in b/configure.in index c130937d..05279758 100644 --- a/configure.in +++ b/configure.in @@ -37,7 +37,7 @@ if test "x$enable_lame" = "xno";then fi,DISABLE_LAME=) PACKAGE=swftools -VERSION=2010-08-05-2217 +VERSION=2011-10-06-2021 # ------------------------------------------------------------------ diff --git a/installer/Makefile b/installer/Makefile index 35a00086..94693160 100644 --- a/installer/Makefile +++ b/installer/Makefile @@ -1,6 +1,6 @@ -CC=/opt/xmingw/bin/i386-mingw32msvc-gcc -DWIN32 -Wno-trigraphs -STRIP=/opt/xmingw/bin/i386-mingw32msvc-strip -WINDRES=/opt/xmingw/bin/i386-mingw32msvc-windres +CC=i686-pc-mingw32-gcc -DWIN32 -Wno-trigraphs +STRIP=i686-pc-mingw32-strip +WINDRES=i686-pc-mingw32-windres LICENSE=gpl.c diff --git a/lib/Makefile.in b/lib/Makefile.in index 48b3b021..7056ba5b 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -149,8 +149,14 @@ devices/ocr.$(O): devices/ocr.c devices/ocr.h gocr/gocr.h filters/alpha.$(O): filters/alpha.c gfxfilter.h $(C) filters/alpha.c -o filters/alpha.$(O) +filters/flatten.$(O): filters/flatten.c gfxfilter.h + $(C) filters/flatten.c -o filters/flatten.$(O) filters/remove_font_transform.$(O): filters/remove_font_transform.c gfxfilter.h $(C) filters/remove_font_transform.c -o filters/remove_font_transform.$(O) +filters/remove_invisible_characters.$(O): filters/remove_invisible_characters.c gfxfilter.h + $(C) filters/remove_invisible_characters.c -o filters/remove_invisible_characters.$(O) +filters/rescale_images.$(O): filters/rescale_images.c gfxfilter.h + $(C) filters/rescale_images.c -o filters/rescale_images.$(O) readers/swf2.$(O): readers/swf.c readers/swf.h $(C) readers/swf.c -o readers/swf2.$(O) diff --git a/lib/action/lex.swf5.c b/lib/action/lex.swf5.c index b2f6b73a..33f3676a 100644 --- a/lib/action/lex.swf5.c +++ b/lib/action/lex.swf5.c @@ -5,10 +5,29 @@ /* A lexical scanner generated by flex */ +#define yy_create_buffer swf5_create_buffer +#define yy_delete_buffer swf5_delete_buffer +#define yy_flex_debug swf5_flex_debug +#define yy_init_buffer swf5_init_buffer +#define yy_flush_buffer swf5_flush_buffer +#define yy_load_buffer_state swf5_load_buffer_state +#define yy_switch_to_buffer swf5_switch_to_buffer +#define yyin swf5in +#define yyleng swf5leng +#define yylex swf5lex +#define yylineno swf5lineno +#define yyout swf5out +#define yyrestart swf5restart +#define yytext swf5text +#define yywrap swf5wrap +#define yyalloc swf5alloc +#define yyrealloc swf5realloc +#define yyfree swf5free + #define FLEX_SCANNER #define YY_FLEX_MAJOR_VERSION 2 #define YY_FLEX_MINOR_VERSION 5 -#define YY_FLEX_SUBMINOR_VERSION 33 +#define YY_FLEX_SUBMINOR_VERSION 35 #if YY_FLEX_SUBMINOR_VERSION > 0 #define FLEX_BETA #endif @@ -30,7 +49,7 @@ /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */ -#if __STDC_VERSION__ >= 199901L +#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h, * if you want the limit (max/min) macros for int types. @@ -93,11 +112,12 @@ typedef unsigned int flex_uint32_t; #else /* ! __cplusplus */ -#if __STDC__ +/* C99 requires __STDC__ to be defined as 1. */ +#if defined (__STDC__) #define YY_USE_CONST -#endif /* __STDC__ */ +#endif /* defined (__STDC__) */ #endif /* ! __cplusplus */ #ifdef YY_USE_CONST @@ -177,14 +197,9 @@ extern FILE *swf5in, *swf5out; #define unput(c) yyunput( c, (yytext_ptr) ) -/* The following is because we cannot portably get our hands on size_t - * (without autoconf's help, which isn't available because we want - * flex-generated scanners to compile on their own). - */ - #ifndef YY_TYPEDEF_YY_SIZE_T #define YY_TYPEDEF_YY_SIZE_T -typedef unsigned int yy_size_t; +typedef size_t yy_size_t; #endif #ifndef YY_STRUCT_YY_BUFFER_STATE @@ -377,9 +392,9 @@ static yyconst flex_int16_t yy_accept[650] = 0, 0, 0, 0, 167, 165, 119, 164, 165, 152, 165, 151, 146, 165, 153, 154, 149, 144, 159, 145, 160, 150, 3, 3, 162, 142, 140, 143, 141, 161, - 155, 156, 148, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, - 112, 157, 147, 158, 163, 112, 112, 112, 112, 112, + 112, 112, 112, 112, 112, 112, 112, 112, 155, 156, + 148, 157, 147, 158, 163, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 112, 164, 125, 0, 115, 113, 0, 126, 132, 0, 116, 114, 0, 128, 120, 130, 121, 131, 117, 118, 129, @@ -455,14 +470,14 @@ static yyconst flex_int32_t yy_ec[256] = 1, 2, 5, 6, 1, 1, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 21, 21, 21, 21, 22, 22, 23, 24, 25, - 26, 27, 28, 1, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, - 50, 51, 52, 53, 54, 55, 56, 57, 58, 33, - 29, 30, 31, 32, 33, 1, 34, 35, 36, 37, - - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, - 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, - 58, 33, 59, 60, 61, 62, 1, 1, 1, 1, + 26, 27, 28, 1, 29, 30, 31, 32, 33, 34, + 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, + 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, + 55, 56, 57, 58, 54, 1, 59, 60, 61, 62, + + 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, + 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, + 83, 54, 84, 85, 86, 87, 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, @@ -479,91 +494,93 @@ static yyconst flex_int32_t yy_ec[256] = 1, 1, 1, 1, 1 } ; -static yyconst flex_int32_t yy_meta[63] = +static yyconst flex_int32_t yy_meta[88] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, - 2, 2, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 3, 2, 2, 2, 2, 2, 2, 3, + 2, 2, 1, 1, 1, 1, 1, 1, 2, 2, + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 1, 1, - 1, 1 + 3, 3, 3, 3, 1, 1, 1, 1, 2, 2, + 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 1, 1, 1, 1 } ; static yyconst flex_int16_t yy_base[654] = { 0, - 0, 0, 29, 0, 741, 742, 742, 742, 737, 713, - 67, 742, 64, 76, 742, 742, 712, 67, 742, 68, - 742, 70, 82, 89, 742, 742, 63, 711, 65, 742, - 742, 742, 742, 0, 684, 684, 78, 75, 69, 82, - 77, 81, 79, 80, 683, 86, 109, 95, 87, 699, - 80, 742, 114, 742, 742, 105, 681, 112, 116, 116, - 117, 120, 124, 121, 130, 99, 128, 139, 697, 682, - 742, 742, 180, 182, 742, 726, 742, 742, 178, 187, - 742, 725, 742, 742, 742, 742, 742, 742, 742, 742, - 179, 200, 207, 0, 701, 742, 742, 742, 176, 0, - - 680, 687, 159, 673, 676, 168, 0, 673, 669, 686, - 674, 667, 670, 663, 662, 0, 153, 667, 679, 158, - 667, 674, 676, 671, 212, 661, 189, 654, 658, 670, - 662, 663, 155, 653, 650, 658, 646, 742, 742, 661, - 660, 61, 191, 201, 641, 646, 187, 640, 640, 202, - 198, 213, 212, 655, 646, 195, 637, 652, 651, 142, - 635, 633, 643, 215, 649, 225, 632, 631, 250, 0, - 742, 742, 655, 0, 646, 634, 640, 0, 203, 643, - 638, 630, 636, 628, 620, 0, 635, 208, 622, 616, - 0, 628, 630, 0, 613, 620, 0, 606, 608, 255, - - 625, 613, 606, 606, 609, 605, 603, 615, 618, 615, - 614, 0, 606, 609, 0, 0, 602, 603, 0, 605, - 601, 0, 599, 610, 232, 0, 590, 590, 599, 599, - 601, 587, 583, 582, 582, 245, 0, 246, 0, 581, - 592, 242, 593, 580, 581, 587, 229, 579, 589, 0, - 742, 582, 586, 0, 590, 581, 568, 568, 578, 0, - 0, 581, 565, 575, 565, 576, 580, 560, 243, 573, - 0, 0, 572, 562, 554, 557, 573, 554, 552, 568, - 558, 564, 0, 553, 562, 0, 563, 219, 561, 559, - 551, 557, 560, 258, 540, 556, 540, 543, 552, 553, - - 542, 544, 548, 534, 545, 545, 531, 542, 0, 0, - 541, 540, 543, 542, 522, 521, 257, 526, 519, 520, - 0, 520, 0, 518, 515, 520, 521, 527, 528, 0, - 521, 516, 516, 509, 512, 517, 509, 522, 504, 503, - 507, 514, 504, 499, 501, 497, 506, 508, 0, 506, - 0, 503, 245, 505, 504, 490, 488, 493, 487, 486, - 501, 494, 500, 0, 493, 0, 480, 483, 481, 492, - 474, 475, 489, 471, 472, 477, 482, 470, 469, 256, - 482, 467, 477, 465, 481, 460, 479, 0, 458, 458, - 0, 476, 461, 470, 488, 472, 469, 0, 449, 452, - - 468, 467, 0, 454, 0, 459, 444, 0, 0, 447, - 0, 266, 449, 442, 0, 460, 0, 458, 450, 440, - 447, 455, 443, 434, 433, 0, 440, 0, 450, 431, - 0, 448, 429, 445, 437, 438, 435, 438, 433, 423, - 439, 265, 430, 435, 436, 423, 430, 0, 414, 419, - 414, 0, 418, 425, 420, 419, 414, 413, 410, 419, - 409, 401, 409, 414, 416, 410, 397, 411, 414, 413, - 408, 398, 268, 403, 392, 384, 396, 387, 394, 385, - 399, 384, 397, 400, 394, 392, 397, 390, 379, 390, - 380, 373, 380, 386, 0, 385, 0, 0, 384, 373, - - 382, 385, 380, 379, 361, 362, 377, 379, 356, 358, - 357, 361, 370, 356, 371, 347, 368, 0, 356, 351, - 0, 359, 0, 348, 358, 346, 356, 345, 342, 341, - 358, 339, 350, 350, 0, 0, 265, 349, 0, 336, - 0, 341, 0, 347, 338, 349, 0, 0, 341, 0, - 330, 336, 346, 328, 336, 340, 0, 0, 331, 0, - 322, 337, 0, 326, 0, 338, 0, 337, 0, 332, - 331, 323, 0, 314, 0, 326, 313, 0, 0, 316, - 0, 309, 317, 323, 0, 318, 301, 304, 309, 0, - 318, 0, 0, 315, 307, 306, 301, 294, 312, 329, - - 295, 294, 291, 299, 306, 307, 289, 289, 302, 292, - 0, 0, 0, 0, 0, 289, 0, 0, 296, 295, - 293, 0, 282, 288, 274, 0, 0, 0, 280, 0, - 296, 291, 281, 285, 0, 0, 279, 279, 260, 264, - 0, 266, 259, 0, 262, 0, 92, 0, 742, 317, - 320, 322, 66 + 0, 0, 59, 0, 322, 1377, 1377, 1377, 317, 275, + 92, 1377, 89, 101, 1377, 1377, 259, 99, 1377, 90, + 1377, 111, 124, 131, 1377, 1377, 82, 212, 87, 1377, + 87, 89, 125, 123, 119, 131, 130, 0, 128, 134, + 122, 112, 135, 185, 176, 169, 154, 180, 1377, 1377, + 1377, 1377, 152, 1377, 1377, 187, 174, 192, 223, 228, + 190, 227, 234, 232, 246, 234, 272, 280, 212, 233, + 1377, 1377, 176, 237, 1377, 228, 1377, 1377, 227, 279, + 1377, 223, 1377, 1377, 1377, 1377, 1377, 1377, 1377, 1377, + 318, 334, 344, 0, 161, 1377, 1377, 1377, 168, 0, + + 243, 254, 327, 248, 285, 307, 0, 305, 321, 340, + 330, 326, 331, 327, 328, 0, 333, 336, 353, 332, + 345, 354, 358, 355, 371, 352, 378, 347, 358, 377, + 372, 385, 392, 378, 377, 390, 380, 1377, 1377, 397, + 398, 403, 393, 404, 384, 398, 429, 394, 397, 445, + 437, 448, 454, 437, 440, 435, 433, 456, 457, 451, + 443, 448, 463, 492, 472, 500, 457, 458, 521, 0, + 1377, 1377, 112, 0, 507, 504, 512, 0, 515, 518, + 515, 509, 517, 512, 506, 0, 523, 507, 514, 510, + 0, 525, 529, 0, 514, 524, 0, 516, 520, 583, + + 549, 546, 546, 548, 553, 551, 558, 572, 577, 576, + 577, 0, 572, 577, 0, 0, 572, 575, 0, 579, + 577, 0, 577, 591, 581, 0, 573, 576, 587, 596, + 600, 588, 586, 592, 601, 637, 0, 640, 0, 607, + 620, 626, 623, 612, 624, 638, 634, 634, 650, 0, + 1377, 645, 655, 0, 661, 654, 643, 645, 657, 0, + 0, 662, 653, 672, 669, 682, 688, 670, 685, 693, + 0, 0, 694, 686, 680, 686, 704, 687, 688, 706, + 698, 707, 0, 698, 709, 0, 712, 710, 717, 717, + 712, 720, 725, 726, 713, 744, 730, 735, 746, 756, + + 747, 751, 757, 745, 759, 761, 749, 762, 0, 0, + 763, 764, 769, 771, 753, 754, 782, 761, 756, 763, + 0, 765, 0, 765, 764, 771, 775, 788, 804, 0, + 799, 796, 798, 800, 805, 812, 806, 821, 806, 807, + 813, 822, 814, 811, 815, 814, 825, 829, 0, 829, + 0, 828, 823, 837, 838, 827, 827, 834, 835, 843, + 865, 860, 868, 0, 863, 0, 859, 864, 864, 877, + 861, 865, 881, 865, 868, 875, 882, 872, 874, 883, + 889, 876, 889, 884, 902, 883, 904, 0, 885, 887, + 0, 912, 906, 922, 108, 927, 926, 0, 908, 920, + + 938, 939, 0, 928, 0, 935, 923, 0, 0, 928, + 0, 945, 933, 928, 0, 948, 0, 948, 943, 935, + 945, 955, 949, 942, 943, 0, 952, 0, 964, 947, + 0, 966, 954, 979, 978, 981, 980, 985, 989, 981, + 999, 996, 993, 1001, 1004, 993, 1002, 0, 989, 996, + 994, 0, 1000, 1009, 1006, 1007, 1008, 1009, 1008, 1019, + 1011, 1005, 1015, 1027, 1038, 1039, 1028, 1044, 1049, 1057, + 1054, 1046, 1060, 1054, 1046, 1040, 1054, 1047, 1056, 1049, + 1065, 1053, 1068, 1073, 1070, 1074, 1081, 1076, 1067, 1080, + 1072, 1067, 1081, 1096, 0, 1102, 0, 0, 1103, 1094, + + 1105, 1117, 1114, 1115, 1099, 1102, 1120, 1124, 1103, 1107, + 1108, 1114, 1125, 1114, 1131, 1109, 1132, 0, 1122, 1123, + 0, 1133, 0, 1124, 1136, 1126, 1138, 1129, 1133, 1141, + 1165, 1148, 1161, 1163, 0, 0, 1165, 1171, 0, 1161, + 0, 1168, 0, 1176, 1171, 1184, 0, 0, 1178, 0, + 1169, 1177, 1189, 1174, 1184, 1190, 0, 0, 1183, 0, + 1176, 1197, 0, 1188, 0, 1202, 0, 1203, 0, 1200, + 1201, 1195, 0, 1193, 0, 1214, 1208, 0, 0, 1213, + 0, 1208, 1218, 1233, 0, 1230, 1215, 1220, 1227, 0, + 1239, 0, 0, 1238, 1232, 1233, 1230, 1225, 1245, 97, + + 1232, 1233, 1232, 1242, 1251, 1258, 1242, 1244, 1259, 1251, + 0, 0, 0, 0, 0, 1250, 0, 0, 1259, 1265, + 1272, 0, 1268, 1276, 1264, 0, 0, 0, 1272, 0, + 1297, 1294, 1286, 1292, 0, 0, 1288, 1301, 1284, 1290, + 0, 1295, 1295, 0, 1300, 0, 1294, 0, 1377, 1368, + 1371, 1373, 91 } ; static yyconst flex_int16_t yy_def[654] = @@ -571,9 +588,9 @@ static yyconst flex_int16_t yy_def[654] = 649, 1, 1, 3, 649, 649, 649, 649, 649, 649, 650, 649, 649, 651, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, - 649, 649, 649, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, - 652, 649, 649, 649, 649, 652, 652, 652, 652, 652, + 652, 652, 652, 652, 652, 652, 652, 652, 649, 649, + 649, 649, 649, 649, 649, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 652, 649, 649, 650, 650, 649, 650, 649, 649, 651, 651, 649, 651, 649, 649, 649, 649, 649, 649, 649, 649, @@ -642,100 +659,172 @@ static yyconst flex_int16_t yy_def[654] = 649, 649, 649 } ; -static yyconst flex_int16_t yy_nxt[805] = +static yyconst flex_int16_t yy_nxt[1465] = { 0, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 24, - 24, 24, 25, 26, 27, 28, 29, 30, 31, 6, - 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 34, 42, 34, 34, 43, 34, 44, 45, 46, 34, - 47, 48, 49, 34, 50, 51, 34, 34, 52, 53, - 54, 55, 56, 57, 58, 59, 60, 170, 61, 74, - 62, 77, 75, 63, 64, 65, 66, 67, 80, 84, - 68, 88, 86, 69, 81, 70, 89, 95, 96, 78, - 98, 99, 85, 87, 217, 90, 76, 91, 175, 92, - - 92, 92, 92, 93, 91, 82, 93, 93, 93, 93, - 93, 103, 106, 109, 114, 111, 118, 120, 104, 116, - 136, 137, 107, 110, 115, 105, 119, 117, 108, 112, - 123, 125, 128, 121, 132, 113, 124, 133, 94, 138, - 648, 140, 126, 158, 134, 143, 127, 129, 130, 159, - 131, 141, 104, 144, 149, 153, 101, 145, 116, 105, - 109, 151, 147, 107, 115, 148, 150, 156, 154, 146, - 110, 152, 123, 139, 155, 160, 162, 157, 124, 163, - 80, 161, 74, 121, 74, 75, 81, 75, 209, 80, - 239, 164, 165, 240, 166, 81, 169, 169, 169, 169, - - 169, 172, 173, 176, 190, 191, 180, 82, 210, 76, - 177, 76, 181, 194, 195, 91, 82, 92, 92, 92, - 92, 93, 91, 222, 93, 93, 93, 93, 93, 200, - 200, 200, 200, 200, 202, 218, 219, 226, 255, 180, - 223, 203, 177, 227, 192, 181, 193, 230, 244, 228, - 236, 195, 229, 190, 191, 256, 231, 353, 248, 232, - 264, 265, 245, 233, 354, 246, 207, 169, 169, 169, - 169, 169, 200, 200, 200, 200, 200, 292, 303, 306, - 319, 320, 304, 307, 264, 265, 293, 311, 337, 305, - 308, 360, 312, 382, 313, 387, 314, 338, 413, 463, - - 438, 519, 489, 647, 646, 361, 439, 464, 345, 490, - 645, 576, 644, 643, 642, 520, 577, 73, 73, 73, - 79, 79, 79, 100, 100, 641, 640, 639, 638, 637, - 636, 635, 634, 633, 632, 631, 630, 629, 628, 627, - 626, 625, 624, 623, 622, 621, 620, 619, 618, 617, - 616, 615, 614, 613, 612, 611, 610, 609, 608, 607, - 606, 605, 604, 603, 602, 601, 600, 599, 598, 597, - 596, 595, 594, 593, 592, 591, 590, 589, 588, 587, - 586, 585, 584, 583, 582, 581, 580, 579, 578, 575, - 574, 573, 572, 571, 570, 569, 568, 567, 566, 565, - - 564, 563, 562, 561, 560, 559, 558, 557, 556, 555, - 554, 553, 552, 551, 550, 549, 548, 547, 546, 545, - 544, 543, 542, 541, 540, 539, 538, 537, 536, 535, - 534, 533, 532, 531, 530, 529, 528, 527, 526, 525, - 524, 523, 522, 521, 518, 517, 516, 515, 514, 513, - 512, 511, 510, 509, 508, 507, 506, 505, 504, 503, - 502, 501, 500, 499, 498, 497, 496, 495, 494, 493, - 492, 491, 488, 487, 486, 485, 484, 483, 482, 481, - 480, 479, 478, 477, 476, 475, 474, 473, 472, 471, - 470, 469, 468, 467, 466, 465, 462, 461, 460, 459, - - 458, 457, 456, 455, 454, 453, 452, 451, 450, 449, - 448, 447, 446, 445, 444, 443, 442, 441, 440, 437, - 436, 435, 434, 433, 432, 431, 430, 429, 428, 427, - 426, 425, 424, 423, 422, 421, 420, 419, 418, 417, - 416, 415, 414, 412, 411, 410, 409, 408, 407, 406, - 405, 404, 403, 402, 401, 400, 399, 398, 397, 396, - 395, 394, 393, 392, 391, 390, 389, 388, 387, 386, - 385, 384, 383, 381, 380, 379, 378, 377, 376, 375, - 374, 373, 372, 371, 370, 369, 368, 367, 366, 365, - 364, 363, 362, 359, 358, 357, 356, 355, 352, 351, - - 350, 349, 348, 347, 346, 345, 344, 343, 342, 341, - 340, 339, 336, 335, 334, 333, 332, 331, 330, 329, - 328, 327, 326, 325, 324, 323, 322, 321, 318, 317, - 316, 315, 310, 309, 302, 301, 300, 299, 298, 297, - 296, 295, 294, 291, 290, 259, 289, 288, 287, 286, - 285, 284, 283, 282, 281, 280, 279, 278, 277, 276, - 275, 274, 273, 272, 271, 270, 269, 268, 267, 266, - 263, 262, 261, 260, 259, 258, 257, 254, 253, 252, - 251, 250, 249, 247, 243, 242, 241, 197, 238, 237, - 235, 234, 225, 224, 221, 220, 216, 215, 214, 213, - - 212, 211, 208, 207, 206, 205, 204, 201, 199, 198, - 197, 196, 193, 192, 189, 188, 187, 186, 185, 184, - 183, 182, 179, 178, 175, 174, 171, 649, 649, 168, - 167, 142, 135, 122, 102, 101, 97, 83, 72, 71, - 649, 5, 649, 649, 649, 649, 649, 649, 649, 649, + 24, 24, 25, 26, 27, 28, 29, 30, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 38, 38, 40, + 38, 41, 42, 43, 38, 44, 45, 46, 38, 47, + 48, 38, 38, 38, 49, 6, 50, 51, 31, 32, + 33, 34, 35, 36, 37, 38, 39, 38, 38, 40, + 38, 41, 42, 43, 38, 44, 45, 46, 38, 47, + 48, 38, 38, 52, 53, 54, 55, 56, 57, 58, + 59, 60, 170, 61, 74, 62, 77, 75, 63, 64, + + 65, 66, 67, 80, 86, 68, 95, 96, 69, 81, + 70, 84, 98, 99, 78, 87, 618, 56, 57, 58, + 59, 60, 88, 61, 85, 62, 452, 89, 63, 64, + 65, 66, 67, 101, 102, 68, 90, 251, 69, 91, + 70, 92, 92, 92, 92, 93, 91, 76, 93, 93, + 93, 93, 93, 103, 120, 106, 82, 122, 109, 111, + 104, 116, 114, 101, 102, 107, 118, 105, 110, 117, + 121, 108, 115, 112, 123, 94, 119, 138, 74, 113, + 124, 75, 135, 103, 120, 106, 171, 122, 109, 111, + 104, 116, 114, 172, 173, 107, 118, 105, 110, 117, + + 121, 108, 115, 112, 123, 94, 119, 125, 128, 113, + 124, 132, 135, 126, 133, 136, 137, 127, 140, 142, + 143, 134, 149, 129, 130, 649, 131, 104, 141, 80, + 649, 76, 115, 101, 105, 81, 139, 97, 128, 74, + 167, 132, 75, 126, 133, 136, 137, 127, 140, 142, + 143, 134, 149, 129, 130, 144, 131, 104, 141, 145, + 116, 153, 115, 101, 105, 107, 151, 109, 150, 147, + 167, 146, 148, 158, 154, 168, 152, 110, 156, 159, + 155, 80, 82, 174, 83, 144, 175, 81, 157, 145, + 116, 153, 76, 178, 121, 107, 151, 109, 150, 147, + + 72, 146, 148, 158, 154, 168, 152, 110, 156, 159, + 155, 123, 162, 174, 160, 163, 175, 124, 157, 71, + 161, 649, 649, 178, 121, 649, 179, 164, 165, 649, + 166, 649, 649, 649, 82, 169, 169, 169, 169, 169, + 180, 123, 162, 649, 160, 163, 181, 124, 182, 91, + 161, 92, 92, 92, 92, 93, 179, 164, 165, 91, + 166, 93, 93, 93, 93, 93, 176, 183, 184, 185, + 180, 186, 187, 177, 188, 189, 181, 192, 182, 190, + 191, 193, 194, 195, 196, 197, 198, 199, 200, 200, + 200, 200, 200, 201, 204, 649, 176, 183, 184, 185, + + 205, 186, 187, 177, 188, 189, 206, 192, 207, 190, + 191, 193, 194, 195, 196, 197, 198, 199, 202, 208, + 209, 211, 212, 201, 204, 203, 213, 214, 215, 216, + 205, 217, 218, 220, 219, 175, 206, 180, 207, 177, + 210, 221, 224, 181, 225, 649, 649, 649, 202, 208, + 209, 211, 212, 649, 649, 203, 213, 214, 215, 216, + 222, 217, 218, 220, 219, 175, 649, 180, 234, 177, + 210, 221, 224, 181, 225, 226, 193, 223, 192, 235, + 237, 227, 229, 228, 230, 236, 195, 238, 197, 241, + 222, 190, 191, 231, 239, 242, 232, 240, 234, 243, + + 233, 247, 249, 250, 649, 226, 193, 223, 192, 235, + 237, 227, 229, 228, 230, 236, 195, 238, 197, 241, + 244, 190, 191, 231, 239, 242, 232, 240, 248, 243, + 233, 247, 249, 250, 245, 252, 207, 246, 169, 169, + 169, 169, 169, 253, 254, 255, 257, 258, 259, 260, + 244, 261, 262, 263, 264, 265, 266, 267, 248, 268, + 269, 270, 256, 271, 245, 252, 207, 246, 272, 273, + 649, 649, 649, 253, 254, 255, 257, 258, 259, 260, + 274, 261, 262, 263, 264, 265, 266, 267, 275, 268, + 269, 270, 256, 271, 276, 277, 278, 279, 272, 273, + + 200, 200, 200, 200, 200, 280, 281, 282, 283, 284, + 274, 285, 286, 287, 288, 289, 259, 290, 275, 291, + 294, 292, 295, 296, 276, 277, 278, 279, 264, 265, + 293, 297, 298, 299, 300, 280, 281, 282, 283, 284, + 301, 285, 286, 287, 288, 289, 259, 290, 302, 291, + 294, 292, 295, 296, 309, 310, 315, 316, 264, 265, + 293, 297, 298, 299, 300, 303, 311, 317, 306, 304, + 301, 312, 307, 313, 318, 314, 305, 321, 302, 308, + 319, 320, 322, 323, 309, 310, 315, 316, 324, 325, + 326, 327, 328, 329, 330, 303, 311, 317, 306, 304, + + 331, 312, 307, 313, 318, 314, 305, 321, 332, 308, + 319, 320, 322, 323, 333, 334, 335, 336, 324, 325, + 326, 327, 328, 329, 330, 337, 339, 340, 341, 342, + 331, 343, 344, 345, 338, 346, 347, 348, 332, 349, + 350, 351, 352, 353, 333, 334, 335, 336, 355, 356, + 354, 357, 358, 359, 360, 337, 339, 340, 341, 342, + 362, 343, 344, 345, 338, 346, 347, 348, 361, 349, + 350, 351, 352, 353, 363, 364, 365, 366, 355, 356, + 354, 357, 358, 359, 360, 367, 368, 369, 370, 371, + 362, 372, 373, 374, 375, 376, 377, 378, 361, 379, + + 380, 381, 383, 384, 363, 364, 365, 366, 385, 386, + 387, 388, 389, 382, 390, 367, 368, 369, 370, 371, + 391, 372, 373, 374, 375, 376, 377, 378, 345, 379, + 380, 381, 383, 384, 392, 393, 394, 395, 385, 386, + 387, 388, 389, 382, 390, 396, 397, 398, 399, 400, + 391, 401, 402, 403, 404, 405, 406, 407, 345, 408, + 409, 410, 411, 412, 392, 393, 394, 395, 387, 414, + 415, 413, 416, 417, 418, 396, 397, 398, 399, 400, + 419, 401, 402, 403, 404, 405, 406, 407, 420, 408, + 409, 410, 411, 412, 421, 422, 423, 424, 387, 414, + + 415, 413, 416, 417, 418, 425, 426, 427, 428, 429, + 419, 430, 431, 432, 433, 434, 435, 436, 420, 437, + 440, 441, 438, 442, 421, 422, 423, 424, 439, 443, + 444, 445, 446, 447, 448, 425, 426, 427, 428, 429, + 449, 430, 431, 432, 433, 434, 435, 436, 450, 437, + 440, 441, 438, 442, 451, 453, 454, 455, 439, 443, + 444, 445, 446, 447, 448, 456, 457, 458, 459, 460, + 449, 461, 462, 463, 465, 466, 467, 468, 450, 469, + 470, 464, 471, 472, 451, 453, 454, 455, 473, 474, + 475, 476, 477, 478, 479, 456, 457, 458, 459, 460, + + 480, 461, 462, 463, 465, 466, 467, 468, 481, 469, + 470, 464, 471, 472, 482, 483, 484, 485, 473, 474, + 475, 476, 477, 478, 479, 486, 487, 488, 489, 491, + 480, 492, 493, 494, 495, 490, 496, 497, 481, 498, + 499, 500, 501, 502, 482, 483, 484, 485, 503, 504, + 505, 506, 507, 508, 509, 486, 487, 488, 489, 491, + 510, 492, 493, 494, 495, 490, 496, 497, 511, 498, + 499, 500, 501, 502, 512, 513, 514, 515, 503, 504, + 505, 506, 507, 508, 509, 516, 517, 518, 519, 521, + 510, 522, 523, 524, 525, 526, 527, 528, 511, 529, + + 530, 531, 520, 532, 512, 513, 514, 515, 533, 534, + 535, 536, 537, 538, 539, 516, 517, 518, 519, 521, + 540, 522, 523, 524, 525, 526, 527, 528, 541, 529, + 530, 531, 520, 532, 542, 543, 544, 545, 533, 534, + 535, 536, 537, 538, 539, 546, 547, 548, 549, 550, + 540, 551, 552, 553, 554, 555, 556, 557, 541, 558, + 559, 560, 561, 562, 542, 543, 544, 545, 563, 564, + 565, 566, 567, 568, 569, 546, 547, 548, 549, 550, + 570, 551, 552, 553, 554, 555, 556, 557, 571, 558, + 559, 560, 561, 562, 572, 573, 574, 575, 563, 564, + + 565, 566, 567, 568, 569, 578, 576, 579, 580, 581, + 570, 577, 582, 583, 584, 585, 586, 587, 571, 588, + 589, 590, 591, 592, 572, 573, 574, 575, 593, 594, + 595, 596, 597, 598, 599, 578, 576, 579, 580, 581, + 600, 577, 582, 583, 584, 585, 586, 587, 601, 588, + 589, 590, 591, 592, 602, 603, 604, 605, 593, 594, + 595, 596, 597, 598, 599, 606, 607, 608, 609, 610, + 600, 611, 612, 613, 614, 615, 616, 617, 601, 619, + 620, 621, 622, 623, 602, 603, 604, 605, 624, 625, + 626, 627, 628, 629, 630, 606, 607, 608, 609, 610, + + 631, 611, 612, 613, 614, 615, 616, 617, 632, 619, + 620, 621, 622, 623, 633, 634, 635, 636, 624, 625, + 626, 627, 628, 629, 630, 637, 638, 639, 640, 641, + 631, 642, 643, 644, 645, 646, 647, 648, 632, 649, + 649, 649, 649, 649, 633, 634, 635, 636, 649, 649, + 649, 649, 649, 649, 649, 637, 638, 639, 640, 641, + 649, 642, 643, 644, 645, 646, 647, 648, 73, 73, + 73, 79, 79, 79, 100, 100, 5, 649, 649, 649, + 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, + 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, + + 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, - 649, 649, 649, 649 } ; -static yyconst flex_int16_t yy_chk[805] = +static yyconst flex_int16_t yy_chk[1465] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -743,88 +832,160 @@ static yyconst flex_int16_t yy_chk[805] = 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, 3, 3, 3, 3, 3, 653, 3, 11, - 3, 13, 11, 3, 3, 3, 3, 3, 14, 18, - 3, 22, 20, 3, 14, 3, 22, 27, 27, 13, - 29, 29, 18, 20, 142, 22, 11, 23, 142, 23, - - 23, 23, 23, 23, 24, 14, 24, 24, 24, 24, - 24, 37, 38, 39, 41, 40, 43, 44, 37, 42, - 51, 51, 38, 39, 41, 37, 43, 42, 38, 40, - 46, 47, 48, 44, 49, 40, 46, 49, 23, 53, - 647, 56, 47, 66, 49, 58, 47, 48, 48, 66, - 48, 56, 58, 59, 61, 64, 56, 59, 62, 58, - 60, 63, 60, 59, 61, 60, 62, 65, 64, 59, - 60, 63, 67, 53, 64, 67, 68, 65, 67, 68, - 79, 67, 73, 65, 74, 73, 79, 74, 133, 80, - 160, 68, 68, 160, 68, 80, 91, 91, 91, 91, - - 91, 99, 99, 103, 117, 117, 106, 79, 133, 73, - 103, 74, 106, 120, 120, 92, 80, 92, 92, 92, - 92, 92, 93, 147, 93, 93, 93, 93, 93, 125, - 125, 125, 125, 125, 127, 143, 144, 150, 179, 144, - 147, 127, 143, 150, 151, 144, 152, 153, 164, 151, - 156, 156, 152, 150, 150, 179, 153, 288, 166, 153, - 188, 188, 164, 153, 288, 164, 166, 169, 169, 169, - 169, 169, 200, 200, 200, 200, 200, 225, 236, 238, - 247, 247, 236, 238, 225, 225, 225, 242, 269, 236, - 238, 294, 242, 317, 242, 353, 242, 269, 353, 412, - - 380, 473, 442, 645, 643, 294, 380, 412, 317, 442, - 642, 537, 640, 639, 638, 473, 537, 650, 650, 650, - 651, 651, 651, 652, 652, 637, 634, 633, 632, 631, - 629, 625, 624, 623, 621, 620, 619, 616, 610, 609, - 608, 607, 606, 605, 604, 603, 602, 601, 600, 599, - 598, 597, 596, 595, 594, 591, 589, 588, 587, 586, - 584, 583, 582, 580, 577, 576, 574, 572, 571, 570, - 568, 566, 564, 562, 561, 559, 556, 555, 554, 553, - 552, 551, 549, 546, 545, 544, 542, 540, 538, 534, - 533, 532, 531, 530, 529, 528, 527, 526, 525, 524, - - 522, 520, 519, 517, 516, 515, 514, 513, 512, 511, - 510, 509, 508, 507, 506, 505, 504, 503, 502, 501, - 500, 499, 496, 494, 493, 492, 491, 490, 489, 488, - 487, 486, 485, 484, 483, 482, 481, 480, 479, 478, - 477, 476, 475, 474, 472, 471, 470, 469, 468, 467, - 466, 465, 464, 463, 462, 461, 460, 459, 458, 457, - 456, 455, 454, 453, 451, 450, 449, 447, 446, 445, - 444, 443, 441, 440, 439, 438, 437, 436, 435, 434, - 433, 432, 430, 429, 427, 425, 424, 423, 422, 421, - 420, 419, 418, 416, 414, 413, 410, 407, 406, 404, - - 402, 401, 400, 399, 397, 396, 395, 394, 393, 392, - 390, 389, 387, 386, 385, 384, 383, 382, 381, 379, - 378, 377, 376, 375, 374, 373, 372, 371, 370, 369, - 368, 367, 365, 363, 362, 361, 360, 359, 358, 357, - 356, 355, 354, 352, 350, 348, 347, 346, 345, 344, - 343, 342, 341, 340, 339, 338, 337, 336, 335, 334, - 333, 332, 331, 329, 328, 327, 326, 325, 324, 322, - 320, 319, 318, 316, 315, 314, 313, 312, 311, 308, - 307, 306, 305, 304, 303, 302, 301, 300, 299, 298, - 297, 296, 295, 293, 292, 291, 290, 289, 287, 285, - - 284, 282, 281, 280, 279, 278, 277, 276, 275, 274, - 273, 270, 268, 267, 266, 265, 264, 263, 262, 259, - 258, 257, 256, 255, 253, 252, 249, 248, 246, 245, - 244, 243, 241, 240, 235, 234, 233, 232, 231, 230, - 229, 228, 227, 224, 223, 221, 220, 218, 217, 214, - 213, 211, 210, 209, 208, 207, 206, 205, 204, 203, - 202, 201, 199, 198, 196, 195, 193, 192, 190, 189, - 187, 185, 184, 183, 182, 181, 180, 177, 176, 175, - 173, 168, 167, 165, 163, 162, 161, 159, 158, 157, - 155, 154, 149, 148, 146, 145, 141, 140, 137, 136, - - 135, 134, 132, 131, 130, 129, 128, 126, 124, 123, - 122, 121, 119, 118, 115, 114, 113, 112, 111, 110, - 109, 108, 105, 104, 102, 101, 95, 82, 76, 70, - 69, 57, 50, 45, 36, 35, 28, 17, 10, 9, - 5, 649, 649, 649, 649, 649, 649, 649, 649, 649, + 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, 3, 3, 3, + 3, 3, 653, 3, 11, 3, 13, 11, 3, 3, + + 3, 3, 3, 14, 20, 3, 27, 27, 3, 14, + 3, 18, 29, 29, 13, 20, 600, 3, 3, 3, + 3, 3, 22, 3, 18, 3, 395, 22, 3, 3, + 3, 3, 3, 31, 32, 3, 22, 173, 3, 23, + 3, 23, 23, 23, 23, 23, 24, 11, 24, 24, + 24, 24, 24, 33, 41, 34, 14, 42, 35, 36, + 33, 39, 37, 31, 32, 34, 40, 33, 35, 39, + 41, 34, 37, 36, 43, 23, 40, 53, 73, 36, + 43, 73, 47, 33, 41, 34, 95, 42, 35, 36, + 33, 39, 37, 99, 99, 34, 40, 33, 35, 39, + + 41, 34, 37, 36, 43, 23, 40, 44, 45, 36, + 43, 46, 47, 44, 46, 48, 48, 44, 56, 57, + 58, 46, 61, 45, 45, 82, 45, 58, 56, 79, + 76, 73, 61, 56, 58, 79, 53, 28, 45, 74, + 69, 46, 74, 44, 46, 48, 48, 44, 56, 57, + 58, 46, 61, 45, 45, 59, 45, 58, 56, 59, + 62, 64, 61, 56, 58, 59, 63, 60, 62, 60, + 69, 59, 60, 66, 64, 70, 63, 60, 65, 66, + 64, 80, 79, 101, 17, 59, 102, 80, 65, 59, + 62, 64, 74, 104, 65, 59, 63, 60, 62, 60, + + 10, 59, 60, 66, 64, 70, 63, 60, 65, 66, + 64, 67, 68, 101, 67, 68, 102, 67, 65, 9, + 67, 5, 0, 104, 65, 0, 105, 68, 68, 0, + 68, 0, 0, 0, 80, 91, 91, 91, 91, 91, + 106, 67, 68, 0, 67, 68, 106, 67, 108, 92, + 67, 92, 92, 92, 92, 92, 105, 68, 68, 93, + 68, 93, 93, 93, 93, 93, 103, 109, 110, 111, + 106, 112, 113, 103, 114, 115, 106, 118, 108, 117, + 117, 119, 120, 120, 121, 122, 123, 124, 125, 125, + 125, 125, 125, 126, 128, 0, 103, 109, 110, 111, + + 129, 112, 113, 103, 114, 115, 130, 118, 131, 117, + 117, 119, 120, 120, 121, 122, 123, 124, 127, 132, + 133, 134, 135, 126, 128, 127, 136, 137, 140, 141, + 129, 142, 143, 145, 144, 142, 130, 144, 131, 143, + 133, 146, 148, 144, 149, 0, 0, 0, 127, 132, + 133, 134, 135, 0, 0, 127, 136, 137, 140, 141, + 147, 142, 143, 145, 144, 142, 0, 144, 154, 143, + 133, 146, 148, 144, 149, 150, 152, 147, 151, 155, + 157, 150, 152, 151, 153, 156, 156, 158, 159, 161, + 147, 150, 150, 153, 160, 162, 153, 160, 154, 163, + + 153, 165, 167, 168, 0, 150, 152, 147, 151, 155, + 157, 150, 152, 151, 153, 156, 156, 158, 159, 161, + 164, 150, 150, 153, 160, 162, 153, 160, 166, 163, + 153, 165, 167, 168, 164, 175, 166, 164, 169, 169, + 169, 169, 169, 176, 177, 179, 180, 181, 182, 183, + 164, 184, 185, 187, 188, 188, 189, 190, 166, 192, + 193, 195, 179, 196, 164, 175, 166, 164, 198, 199, + 0, 0, 0, 176, 177, 179, 180, 181, 182, 183, + 201, 184, 185, 187, 188, 188, 189, 190, 202, 192, + 193, 195, 179, 196, 203, 204, 205, 206, 198, 199, + + 200, 200, 200, 200, 200, 207, 208, 209, 210, 211, + 201, 213, 214, 217, 218, 220, 221, 223, 202, 224, + 227, 225, 228, 229, 203, 204, 205, 206, 225, 225, + 225, 230, 231, 232, 233, 207, 208, 209, 210, 211, + 234, 213, 214, 217, 218, 220, 221, 223, 235, 224, + 227, 225, 228, 229, 240, 241, 243, 244, 225, 225, + 225, 230, 231, 232, 233, 236, 242, 245, 238, 236, + 234, 242, 238, 242, 246, 242, 236, 248, 235, 238, + 247, 247, 249, 252, 240, 241, 243, 244, 253, 255, + 256, 257, 258, 259, 262, 236, 242, 245, 238, 236, + + 263, 242, 238, 242, 246, 242, 236, 248, 264, 238, + 247, 247, 249, 252, 265, 266, 267, 268, 253, 255, + 256, 257, 258, 259, 262, 269, 270, 273, 274, 275, + 263, 276, 277, 278, 269, 279, 280, 281, 264, 282, + 284, 285, 287, 288, 265, 266, 267, 268, 289, 290, + 288, 291, 292, 293, 294, 269, 270, 273, 274, 275, + 295, 276, 277, 278, 269, 279, 280, 281, 294, 282, + 284, 285, 287, 288, 296, 297, 298, 299, 289, 290, + 288, 291, 292, 293, 294, 300, 301, 302, 303, 304, + 295, 305, 306, 307, 308, 311, 312, 313, 294, 314, + + 315, 316, 318, 319, 296, 297, 298, 299, 320, 322, + 324, 325, 326, 317, 327, 300, 301, 302, 303, 304, + 328, 305, 306, 307, 308, 311, 312, 313, 317, 314, + 315, 316, 318, 319, 329, 331, 332, 333, 320, 322, + 324, 325, 326, 317, 327, 334, 335, 336, 337, 338, + 328, 339, 340, 341, 342, 343, 344, 345, 317, 346, + 347, 348, 350, 352, 329, 331, 332, 333, 353, 354, + 355, 353, 356, 357, 358, 334, 335, 336, 337, 338, + 359, 339, 340, 341, 342, 343, 344, 345, 360, 346, + 347, 348, 350, 352, 361, 362, 363, 365, 353, 354, + + 355, 353, 356, 357, 358, 367, 368, 369, 370, 371, + 359, 372, 373, 374, 375, 376, 377, 378, 360, 379, + 381, 382, 380, 383, 361, 362, 363, 365, 380, 384, + 385, 386, 387, 389, 390, 367, 368, 369, 370, 371, + 392, 372, 373, 374, 375, 376, 377, 378, 393, 379, + 381, 382, 380, 383, 394, 396, 397, 399, 380, 384, + 385, 386, 387, 389, 390, 400, 401, 402, 404, 406, + 392, 407, 410, 412, 413, 414, 416, 418, 393, 419, + 420, 412, 421, 422, 394, 396, 397, 399, 423, 424, + 425, 427, 429, 430, 432, 400, 401, 402, 404, 406, + + 433, 407, 410, 412, 413, 414, 416, 418, 434, 419, + 420, 412, 421, 422, 435, 436, 437, 438, 423, 424, + 425, 427, 429, 430, 432, 439, 440, 441, 442, 443, + 433, 444, 445, 446, 447, 442, 449, 450, 434, 451, + 453, 454, 455, 456, 435, 436, 437, 438, 457, 458, + 459, 460, 461, 462, 463, 439, 440, 441, 442, 443, + 464, 444, 445, 446, 447, 442, 449, 450, 465, 451, + 453, 454, 455, 456, 466, 467, 468, 469, 457, 458, + 459, 460, 461, 462, 463, 470, 471, 472, 473, 474, + 464, 475, 476, 477, 478, 479, 480, 481, 465, 482, + + 483, 484, 473, 485, 466, 467, 468, 469, 486, 487, + 488, 489, 490, 491, 492, 470, 471, 472, 473, 474, + 493, 475, 476, 477, 478, 479, 480, 481, 494, 482, + 483, 484, 473, 485, 496, 499, 500, 501, 486, 487, + 488, 489, 490, 491, 492, 502, 503, 504, 505, 506, + 493, 507, 508, 509, 510, 511, 512, 513, 494, 514, + 515, 516, 517, 519, 496, 499, 500, 501, 520, 522, + 524, 525, 526, 527, 528, 502, 503, 504, 505, 506, + 529, 507, 508, 509, 510, 511, 512, 513, 530, 514, + 515, 516, 517, 519, 531, 532, 533, 534, 520, 522, + + 524, 525, 526, 527, 528, 538, 537, 540, 542, 544, + 529, 537, 545, 546, 549, 551, 552, 553, 530, 554, + 555, 556, 559, 561, 531, 532, 533, 534, 562, 564, + 566, 568, 570, 571, 572, 538, 537, 540, 542, 544, + 574, 537, 545, 546, 549, 551, 552, 553, 576, 554, + 555, 556, 559, 561, 577, 580, 582, 583, 562, 564, + 566, 568, 570, 571, 572, 584, 586, 587, 588, 589, + 574, 591, 594, 595, 596, 597, 598, 599, 576, 601, + 602, 603, 604, 605, 577, 580, 582, 583, 606, 607, + 608, 609, 610, 616, 619, 584, 586, 587, 588, 589, + + 620, 591, 594, 595, 596, 597, 598, 599, 621, 601, + 602, 603, 604, 605, 623, 624, 625, 629, 606, 607, + 608, 609, 610, 616, 619, 631, 632, 633, 634, 637, + 620, 638, 639, 640, 642, 643, 645, 647, 621, 0, + 0, 0, 0, 0, 623, 624, 625, 629, 0, 0, + 0, 0, 0, 0, 0, 631, 632, 633, 634, 637, + 0, 638, 639, 640, 642, 643, 645, 647, 650, 650, + 650, 651, 651, 651, 652, 652, 649, 649, 649, 649, + 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, + 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, + + 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, 649, - 649, 649, 649, 649 } ; @@ -932,7 +1093,7 @@ void swf5ParseInit(const char *script, int debug) static void yyunput YY_PROTO(( int c, char *buf_ptr )); void do_unput5(const char c) { unput(c); } -#line 936 "lex.swf5.c" +#line 1097 "lex.swf5.c" #define INITIAL 0 #define asm 1 @@ -951,6 +1112,35 @@ void swf5ParseInit(const char *script, int debug) static int yy_init_globals (void ); +/* Accessor methods to globals. + These are made visible to non-reentrant scanners for convenience. */ + +int swf5lex_destroy (void ); + +int swf5get_debug (void ); + +void swf5set_debug (int debug_flag ); + +YY_EXTRA_TYPE swf5get_extra (void ); + +void swf5set_extra (YY_EXTRA_TYPE user_defined ); + +FILE *swf5get_in (void ); + +void swf5set_in (FILE * in_str ); + +FILE *swf5get_out (void ); + +void swf5set_out (FILE * out_str ); + +int swf5get_leng (void ); + +char *swf5get_text (void ); + +int swf5get_lineno (void ); + +void swf5set_lineno (int line_number ); + /* Macros after this point can all be overridden by user definitions in * section 1. */ @@ -993,7 +1183,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 (void) fwrite( swf5text, swf5leng, 1, swf5out ) +#define ECHO fwrite( swf5text, swf5leng, 1, swf5out ) #endif /* Gets input and stuffs it into "buf". number of characters read, or YY_NULL, @@ -1004,7 +1194,7 @@ static int input (void ); if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ { \ int c = '*'; \ - size_t n; \ + int n; \ for ( n = 0; n < max_size && \ (c = getc( swf5in )) != EOF && c != '\n'; ++n ) \ buf[n] = (char) c; \ @@ -1089,7 +1279,7 @@ YY_DECL #line 98 "swf5compiler.flex" -#line 1093 "lex.swf5.c" +#line 1283 "lex.swf5.c" if ( !(yy_init) ) { @@ -1148,7 +1338,7 @@ yy_match: yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 742 ); + while ( yy_base[yy_current_state] != 1377 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2036,7 +2226,7 @@ YY_RULE_SETUP #line 303 "swf5compiler.flex" ECHO; YY_BREAK -#line 2040 "lex.swf5.c" +#line 2230 "lex.swf5.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(asm): yyterminate(); @@ -2268,7 +2458,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); } @@ -2292,6 +2482,14 @@ static int yy_get_next_buffer (void) else ret_val = EOB_ACT_CONTINUE_SCAN; + if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) { + /* Extend the array by 50%, plus the number we really need. */ + yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1); + YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) swf5realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ); + if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf ) + YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" ); + } + (yy_n_chars) += number_to_move; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR; YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR; @@ -2717,7 +2915,9 @@ static void swf5ensure_buffer_stack (void) (yy_buffer_stack) = (struct yy_buffer_state**)swf5alloc (num_to_alloc * sizeof(struct yy_buffer_state*) ); - + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in swf5ensure_buffer_stack()" ); + memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); (yy_buffer_stack_max) = num_to_alloc; @@ -2735,6 +2935,8 @@ static void swf5ensure_buffer_stack (void) ((yy_buffer_stack), num_to_alloc * sizeof(struct yy_buffer_state*) ); + if ( ! (yy_buffer_stack) ) + YY_FATAL_ERROR( "out of dynamic memory in swf5ensure_buffer_stack()" ); /* zero only the new slots.*/ memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*)); @@ -2779,7 +2981,7 @@ YY_BUFFER_STATE swf5_scan_buffer (char * base, yy_size_t size ) /** Setup the input buffer state to scan a string. The next call to swf5lex() will * scan from a @e copy of @a str. - * @param str a NUL-terminated string to scan + * @param yystr a NUL-terminated string to scan * * @return the newly allocated buffer state object. * @note If you want to scan bytes that may contain NUL values, then use @@ -250,6 +250,8 @@ ${name}/lib/gfxpoly/wind.c \ ${name}/lib/gfxpoly/wind.h \ ${name}/lib/gfxpoly/xrow.c \ ${name}/lib/gfxpoly/xrow.h \ +${name}/lib/gfxpoly/moments.c \ +${name}/lib/gfxpoly/moments.h \ ${name}/lib/gfxpoly/heap.h \ ${name}/lib/pdf/bbox.c \ ${name}/lib/pdf/bbox.h \ @@ -285,6 +287,9 @@ ${name}/lib/filters/alpha.c \ ${name}/lib/filters/one_big_font.c \ ${name}/lib/filters/vectors_to_glyphs.c \ ${name}/lib/filters/remove_font_transforms.c \ +${name}/lib/filters/remove_invisible_characters.c \ +${name}/lib/filters/flatten.c \ +${name}/lib/filters/rescale_images.c \ ${name}/lib/pdf/popplercompat.cc \ ${name}/lib/pdf/popplercompat.h \ ${name}/lib/pdf/VectorGraphicOutputDev.h \ |