diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-26 20:58:15 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-26 20:58:15 -0500 |
| commit | 68fd119104cf123043eb7ee573de638cc159f743 (patch) | |
| tree | 6e2944b4a19988514a37a13ef03524b9b1e0b6fe | |
| parent | 6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d (diff) | |
| parent | 970116b129a0dfd4ac8e90f1788ad7e81e3f6d71 (diff) | |
| download | tqt3-68fd119104cf123043eb7ee573de638cc159f743.tar.gz tqt3-68fd119104cf123043eb7ee573de638cc159f743.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
| -rw-r--r-- | src/moc/moc_lex.cpp | 895 | ||||
| -rw-r--r-- | src/moc/moc_yacc.cpp | 10 |
2 files changed, 451 insertions, 454 deletions
diff --git a/src/moc/moc_lex.cpp b/src/moc/moc_lex.cpp index 5b76dd4ff..aca7638ba 100644 --- a/src/moc/moc_lex.cpp +++ b/src/moc/moc_lex.cpp @@ -377,7 +377,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[623] = +static yyconst flex_int16_t yy_accept[617] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -386,68 +386,67 @@ static yyconst flex_int16_t yy_accept[623] = 105, 105, 105, 105, 139, 134, 148, 139, 113, 148, 148, 148, 130, 148, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, - 99, 99, 99, 99, 139, 134, 140, 139, 140, 140, - 106, 106, 106, 106, 106, 15, 16, 139, 134, 141, - 139, 141, 141, 107, 107, 107, 107, 107, 28, 29, - - 139, 134, 145, 139, 54, 55, 58, 145, 59, 56, - 57, 60, 139, 134, 143, 139, 42, 43, 46, 143, - 47, 44, 45, 139, 134, 144, 139, 48, 49, 52, - 144, 53, 50, 51, 139, 134, 142, 139, 111, 142, - 13, 14, 139, 134, 137, 137, 112, 61, 62, 137, - 137, 134, 149, 139, 149, 139, 134, 147, 139, 147, - 139, 134, 34, 35, 100, 100, 100, 100, 100, 104, - 101, 102, 103, 139, 136, 135, 139, 134, 134, 134, - 0, 108, 0, 105, 105, 105, 105, 105, 113, 0, - 0, 123, 0, 0, 132, 131, 130, 92, 99, 99, + 99, 99, 99, 139, 134, 140, 139, 140, 140, 106, + 106, 106, 106, 15, 16, 139, 134, 141, 139, 141, + 141, 107, 107, 107, 107, 107, 28, 29, 139, 134, + + 145, 139, 54, 55, 58, 145, 59, 56, 57, 60, + 139, 134, 143, 139, 42, 43, 46, 143, 47, 44, + 45, 139, 134, 144, 139, 48, 49, 52, 144, 53, + 50, 51, 139, 134, 142, 139, 111, 142, 13, 14, + 139, 134, 137, 137, 112, 61, 62, 137, 137, 134, + 149, 139, 149, 139, 134, 147, 139, 147, 139, 134, + 34, 35, 100, 100, 100, 100, 100, 104, 101, 102, + 103, 139, 136, 135, 139, 134, 134, 134, 0, 108, + 0, 105, 105, 105, 105, 105, 113, 0, 0, 123, + 0, 0, 132, 131, 130, 92, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, 0, 109, + 0, 106, 106, 106, 106, 106, 106, 0, 110, 0, + 107, 107, 107, 107, 107, 111, 0, 138, 112, 0, + 138, 100, 100, 100, 100, 100, 100, 104, 0, 135, + 134, 105, 105, 105, 105, 114, 0, 0, 114, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 93, 131, 99, 99, 87, 99, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 76, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, - 99, 0, 109, 0, 106, 106, 106, 106, 106, 106, - 106, 0, 110, 0, 107, 107, 107, 107, 107, 111, - 0, 138, 112, 0, 138, 100, 100, 100, 100, 100, - 100, 104, 0, 135, 134, 105, 105, 105, 105, 114, - 0, 0, 114, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 93, 131, 99, 99, 99, 99, - 99, 99, 99, 87, 99, 99, 99, 99, 99, 99, - - 99, 99, 99, 99, 76, 99, 99, 99, 99, 99, - 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, - 99, 99, 99, 99, 99, 99, 99, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 107, 107, - 107, 107, 100, 100, 100, 100, 100, 100, 134, 105, - 105, 105, 105, 129, 125, 124, 126, 0, 127, 122, - 115, 116, 117, 118, 119, 120, 121, 0, 99, 99, - 99, 99, 99, 99, 99, 65, 74, 99, 99, 99, - 83, 99, 99, 99, 99, 77, 99, 99, 99, 99, + 99, 99, 99, 99, 99, 99, 99, 99, 106, 106, + 106, 106, 106, 106, 107, 107, 107, 107, 100, 100, + 100, 100, 100, 100, 134, 105, 105, 105, 105, 129, + 125, 124, 126, 0, 127, 122, 115, 116, 117, 118, + 119, 120, 121, 0, 99, 99, 99, 99, 99, 99, + 65, 74, 99, 99, 99, 83, 99, 99, 99, 99, + 77, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, - - 99, 99, 99, 99, 99, 82, 99, 106, 106, 106, - 106, 106, 106, 106, 106, 106, 106, 106, 107, 107, - 107, 107, 100, 36, 100, 100, 100, 100, 134, 1, - 105, 105, 3, 127, 128, 99, 99, 99, 99, 99, - 99, 99, 84, 72, 99, 99, 80, 99, 99, 99, - 99, 99, 99, 99, 99, 99, 75, 99, 99, 7, - 99, 99, 99, 96, 99, 86, 99, 97, 99, 99, - 106, 106, 106, 106, 106, 106, 106, 106, 106, 106, - 21, 30, 107, 107, 33, 100, 39, 100, 100, 37, - 134, 105, 105, 99, 99, 99, 99, 12, 99, 99, - - 81, 68, 63, 69, 99, 99, 99, 99, 99, 90, - 99, 99, 78, 67, 85, 99, 99, 99, 99, 99, - 106, 106, 106, 106, 27, 106, 106, 106, 17, 106, - 107, 107, 100, 100, 38, 134, 105, 105, 99, 11, - 99, 99, 99, 99, 95, 99, 99, 88, 99, 99, - 6, 99, 64, 99, 71, 99, 106, 26, 106, 106, - 106, 19, 106, 20, 107, 107, 100, 100, 134, 134, - 105, 4, 99, 99, 99, 99, 99, 99, 91, 99, - 66, 94, 79, 73, 106, 106, 106, 106, 106, 107, - 31, 100, 100, 133, 2, 99, 99, 99, 5, 99, - - 98, 89, 106, 106, 106, 23, 18, 32, 100, 100, - 99, 10, 9, 70, 106, 25, 24, 40, 41, 8, - 22, 0 + 82, 99, 106, 106, 106, 106, 106, 106, 106, 106, + + 106, 106, 107, 107, 107, 107, 100, 36, 100, 100, + 100, 100, 134, 1, 105, 105, 3, 127, 128, 99, + 99, 99, 99, 99, 99, 99, 84, 72, 99, 99, + 80, 99, 99, 99, 99, 99, 99, 99, 99, 99, + 75, 99, 99, 7, 99, 99, 99, 96, 99, 86, + 99, 97, 99, 99, 106, 106, 106, 106, 106, 106, + 106, 106, 106, 106, 21, 30, 107, 107, 33, 100, + 39, 100, 100, 37, 134, 105, 105, 99, 99, 99, + 99, 99, 99, 99, 81, 68, 63, 69, 99, 99, + 99, 99, 99, 90, 99, 99, 78, 67, 85, 99, + + 99, 99, 99, 99, 106, 106, 106, 106, 106, 106, + 106, 106, 17, 106, 107, 107, 100, 100, 38, 134, + 105, 105, 99, 99, 99, 99, 99, 12, 99, 95, + 99, 99, 88, 99, 99, 6, 99, 64, 99, 71, + 99, 106, 106, 106, 106, 106, 27, 19, 106, 20, + 107, 107, 100, 100, 134, 134, 105, 4, 99, 11, + 99, 99, 99, 99, 99, 91, 99, 66, 94, 79, + 73, 106, 26, 106, 106, 106, 106, 107, 31, 100, + 100, 133, 2, 99, 5, 99, 99, 99, 98, 89, + 106, 23, 106, 106, 18, 32, 100, 100, 99, 99, + + 99, 70, 106, 106, 106, 40, 41, 99, 10, 9, + 106, 25, 24, 8, 22, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -494,160 +493,160 @@ static yyconst flex_int32_t yy_meta[72] = 1 } ; -static yyconst flex_int16_t yy_base[649] = +static yyconst flex_int16_t yy_base[644] = { 0, - 0, 3, 16, 5, 87, 9, 158, 227, 233, 302, - 307, 377, 319, 447, 331, 492, 343, 355, 537, 582, - 369, 390, 395, 398, 628, 311, 425, 464, 1206, 1207, - 229, 1207, 316, 364, 1154, 1207, 304, 307, 328, 0, - 1147, 1155, 1150, 1138, 403, 1149, 1207, 352, 1154, 317, - 403, 374, 425, 1181, 0, 1150, 1160, 1148, 311, 387, - 1134, 348, 274, 1134, 1132, 1126, 1142, 1128, 370, 1136, - 407, 428, 361, 401, 476, 1136, 1207, 443, 386, 471, - 0, 1139, 1149, 423, 430, 1207, 1207, 505, 1133, 1207, - 487, 407, 489, 0, 1126, 1134, 1129, 1117, 1207, 1207, - - 510, 1128, 1207, 512, 1207, 1207, 1207, 496, 1207, 1207, - 1207, 1207, 515, 1127, 1207, 517, 1207, 1207, 1207, 512, - 1207, 1207, 1207, 521, 1126, 1207, 526, 1207, 1207, 1207, - 520, 1207, 1207, 1207, 529, 1125, 1207, 541, 1130, 524, - 1207, 1207, 545, 1123, 1207, 550, 1128, 1207, 1207, 545, - 557, 1121, 1207, 559, 554, 563, 1120, 1207, 568, 562, - 571, 1119, 1207, 1207, 0, 1144, 1143, 420, 1130, 1121, - 1207, 1207, 1207, 576, 1207, 0, 590, 0, 0, 1113, - 544, 1207, 1160, 0, 1115, 1104, 1103, 1104, 1114, 593, - 1151, 1150, 695, 1144, 589, 592, 597, 1207, 0, 678, - - 1108, 1098, 1095, 1088, 1103, 1102, 1090, 1083, 1082, 1082, - 1085, 1088, 286, 1084, 1078, 1083, 1088, 520, 1090, 1084, - 1077, 1082, 1075, 506, 1076, 1071, 1071, 554, 1075, 1068, - 543, 577, 1207, 1125, 0, 683, 1081, 558, 1078, 1072, - 1065, 700, 1207, 1120, 0, 1075, 1064, 1063, 1064, 1074, - 611, 617, 1073, 619, 717, 0, 1079, 686, 1079, 1081, - 1085, 1068, 710, 0, 1059, 1048, 1058, 1048, 1049, 1207, - 1100, 1099, 1098, 715, 718, 1097, 1096, 1095, 1094, 1093, - 1092, 1091, 1090, 1089, 1207, 712, 1064, 1061, 1052, 1055, - 1066, 1056, 1030, 0, 1028, 1025, 1023, 1022, 1035, 1025, - - 1030, 1033, 1028, 1023, 0, 1024, 1029, 1024, 1013, 1008, - 1009, 1015, 1015, 1008, 1010, 1004, 1003, 1001, 1004, 1004, - 1011, 1002, 1005, 1001, 995, 1007, 1009, 1025, 1022, 1013, - 1016, 1027, 1017, 984, 985, 991, 988, 982, 982, 992, - 982, 983, 1012, 1016, 1014, 1009, 1000, 997, 979, 971, - 970, 975, 977, 1207, 1207, 1207, 1207, 724, 1207, 1207, - 1207, 1207, 1207, 1207, 1207, 1207, 1207, 1023, 1008, 988, - 1002, 992, 986, 1002, 966, 0, 0, 959, 957, 963, - 0, 957, 954, 958, 957, 0, 966, 951, 965, 964, - 959, 954, 946, 944, 573, 944, 950, 955, 947, 936, - - 951, 942, 946, 945, 933, 0, 933, 975, 955, 969, - 959, 953, 969, 942, 937, 932, 939, 923, 922, 921, - 926, 928, 954, 0, 941, 944, 953, 952, 917, 0, - 914, 926, 0, 1207, 1207, 935, 940, 934, 935, 931, - 938, 911, 0, 0, 914, 906, 0, 913, 911, 905, - 900, 896, 895, 908, 907, 892, 0, 898, 903, 0, - 903, 888, 903, 0, 898, 0, 890, 0, 900, 891, - 908, 913, 907, 908, 904, 911, 876, 889, 888, 880, - 0, 0, 875, 887, 0, 901, 0, 894, 908, 0, - 879, 882, 865, 890, 889, 889, 900, 0, 899, 864, - - 0, 0, 0, 0, 870, 873, 860, 867, 854, 0, - 865, 853, 0, 0, 0, 851, 861, 861, 855, 854, - 872, 871, 871, 882, 0, 881, 853, 840, 0, 840, - 854, 837, 879, 878, 0, 853, 847, 844, 862, 0, - 854, 840, 849, 819, 0, 814, 801, 0, 806, 795, - 0, 797, 0, 790, 0, 781, 799, 0, 798, 782, - 790, 0, 710, 0, 710, 706, 734, 733, 708, 365, - 700, 0, 718, 726, 710, 708, 699, 690, 0, 690, - 0, 0, 0, 0, 704, 712, 696, 695, 660, 652, - 0, 596, 563, 1207, 0, 500, 479, 449, 0, 429, - - 0, 0, 448, 429, 379, 0, 0, 0, 364, 339, - 285, 0, 0, 0, 279, 0, 0, 0, 0, 0, - 0, 1207, 763, 769, 775, 781, 787, 793, 799, 805, - 811, 817, 819, 825, 831, 833, 839, 841, 847, 849, - 855, 861, 863, 869, 875, 881, 884, 889 + 0, 3, 16, 5, 87, 9, 158, 229, 300, 176, + 370, 440, 181, 510, 249, 555, 207, 211, 600, 645, + 252, 281, 267, 383, 691, 185, 389, 402, 1191, 1192, + 178, 1192, 183, 220, 1139, 1192, 184, 372, 185, 0, + 1132, 1140, 1135, 1123, 416, 1134, 1192, 198, 1139, 243, + 409, 195, 414, 1166, 0, 1146, 1134, 196, 376, 1120, + 204, 229, 1120, 1118, 1112, 1128, 1114, 214, 1122, 383, + 400, 317, 339, 454, 1122, 1192, 204, 422, 399, 0, + 1136, 370, 240, 1192, 1192, 459, 1120, 1192, 461, 429, + 458, 0, 1113, 1121, 1116, 1104, 1192, 1192, 470, 1115, + + 1192, 475, 1192, 1192, 1192, 469, 1192, 1192, 1192, 1192, + 485, 1114, 1192, 478, 1192, 1192, 1192, 479, 1192, 1192, + 1192, 491, 1113, 1192, 493, 1192, 1192, 1192, 488, 1192, + 1192, 1192, 497, 1112, 1192, 502, 1117, 496, 1192, 1192, + 523, 1110, 1192, 505, 1115, 1192, 1192, 507, 528, 1108, + 1192, 530, 514, 533, 1107, 1192, 535, 530, 539, 1106, + 1192, 1192, 0, 1131, 1130, 427, 1117, 1108, 1192, 1192, + 1192, 544, 1192, 0, 546, 0, 0, 1100, 440, 1192, + 1147, 0, 1102, 1091, 1090, 1091, 1101, 546, 1138, 1137, + 758, 1131, 555, 560, 565, 1192, 0, 1095, 1085, 1082, + + 1075, 1090, 1089, 1077, 1070, 1069, 1069, 1072, 1075, 318, + 1071, 1065, 1070, 1075, 522, 1077, 1071, 1064, 1069, 1062, + 505, 1063, 1058, 1058, 427, 1062, 1055, 527, 465, 1192, + 1112, 0, 1068, 529, 1065, 1059, 1052, 470, 1192, 1107, + 0, 1062, 1051, 1050, 1051, 1061, 582, 588, 1060, 588, + 592, 0, 1066, 363, 1066, 1068, 1072, 1055, 592, 0, + 1046, 1035, 1045, 1035, 1036, 1192, 1087, 1086, 1085, 600, + 603, 1084, 1083, 1082, 1081, 1080, 1079, 1078, 1077, 1076, + 1192, 607, 601, 1023, 0, 1021, 1018, 1016, 1015, 1028, + 1018, 1023, 1026, 1021, 1016, 0, 1017, 1022, 1017, 1006, + + 1001, 1002, 1008, 1008, 1001, 1003, 997, 996, 994, 997, + 997, 1004, 995, 998, 994, 988, 1000, 1002, 607, 983, + 984, 990, 987, 981, 981, 991, 981, 982, 1011, 1015, + 1013, 1008, 999, 996, 978, 970, 969, 974, 976, 1192, + 1192, 1192, 1192, 645, 1192, 1192, 1192, 1192, 1192, 1192, + 1192, 1192, 1192, 1022, 997, 994, 584, 989, 1000, 967, + 0, 0, 960, 958, 964, 0, 958, 955, 959, 958, + 0, 967, 952, 966, 965, 960, 955, 947, 945, 564, + 945, 951, 956, 948, 937, 952, 943, 947, 946, 934, + 0, 934, 966, 963, 615, 958, 969, 945, 940, 935, + + 942, 926, 925, 924, 929, 931, 957, 0, 944, 947, + 956, 955, 920, 0, 917, 929, 0, 1192, 1192, 955, + 935, 944, 948, 938, 932, 914, 0, 0, 917, 909, + 0, 916, 914, 908, 899, 888, 882, 891, 890, 869, + 0, 875, 876, 0, 876, 854, 862, 0, 850, 0, + 838, 0, 848, 832, 861, 785, 793, 796, 785, 779, + 752, 765, 764, 756, 0, 0, 751, 762, 0, 776, + 0, 769, 781, 0, 752, 754, 737, 762, 767, 773, + 760, 761, 757, 735, 0, 0, 0, 0, 741, 744, + 731, 738, 725, 0, 736, 724, 0, 0, 0, 722, + + 732, 732, 726, 725, 743, 748, 754, 741, 742, 738, + 723, 710, 0, 708, 722, 705, 747, 746, 0, 721, + 714, 638, 650, 649, 663, 648, 659, 0, 631, 0, + 632, 619, 0, 628, 617, 0, 626, 0, 626, 0, + 624, 637, 636, 650, 635, 646, 0, 0, 618, 0, + 619, 616, 645, 644, 618, 584, 610, 0, 632, 0, + 618, 626, 606, 593, 586, 0, 583, 0, 0, 0, + 0, 604, 0, 592, 599, 590, 560, 548, 0, 541, + 534, 1192, 0, 529, 0, 536, 516, 497, 0, 0, + 489, 0, 478, 420, 0, 0, 429, 412, 394, 378, + + 347, 0, 272, 264, 223, 0, 0, 230, 0, 0, + 184, 0, 0, 0, 0, 1192, 826, 832, 838, 844, + 850, 856, 862, 868, 874, 880, 886, 888, 894, 900, + 902, 908, 910, 916, 918, 924, 930, 932, 938, 944, + 950, 953, 958 } ; -static yyconst flex_int16_t yy_def[649] = +static yyconst flex_int16_t yy_def[644] = { 0, - 623, 623, 622, 3, 622, 5, 622, 7, 622, 9, - 624, 624, 625, 625, 626, 626, 627, 627, 628, 628, - 629, 629, 630, 630, 622, 25, 623, 623, 622, 622, - 622, 622, 622, 622, 631, 622, 622, 632, 622, 633, - 633, 633, 633, 633, 622, 631, 622, 622, 634, 635, - 622, 622, 622, 622, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 622, 631, 622, 622, 637, 622, - 638, 638, 638, 638, 638, 622, 622, 622, 631, 622, - 622, 639, 622, 640, 640, 640, 640, 640, 622, 622, - - 622, 631, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 631, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 631, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 631, 622, 622, 641, 622, - 622, 622, 622, 631, 622, 622, 642, 622, 622, 622, - 622, 631, 622, 622, 622, 622, 631, 622, 622, 622, - 622, 631, 622, 622, 643, 643, 643, 643, 643, 644, - 622, 622, 622, 622, 622, 645, 622, 631, 631, 631, - 632, 622, 632, 633, 633, 633, 633, 633, 634, 634, - 622, 622, 646, 622, 622, 622, 622, 622, 636, 636, - - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 637, 622, 637, 638, 638, 638, 638, 638, 638, - 638, 639, 622, 639, 640, 640, 640, 640, 640, 641, - 641, 622, 642, 642, 622, 643, 643, 643, 643, 643, - 643, 644, 644, 645, 631, 633, 633, 633, 633, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 647, 622, 622, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 640, 640, - 640, 640, 643, 643, 643, 643, 643, 643, 631, 633, - 633, 633, 633, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 647, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - - 636, 636, 636, 636, 636, 636, 636, 638, 638, 638, - 638, 638, 638, 638, 638, 638, 638, 638, 640, 640, - 640, 640, 643, 643, 643, 643, 643, 643, 631, 633, - 633, 633, 633, 622, 622, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 638, 640, 640, 640, 640, 643, 643, 643, 643, 643, - 631, 633, 633, 636, 636, 636, 636, 636, 636, 636, - - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 638, 638, 638, 638, 638, 638, 638, 638, 638, 638, - 640, 640, 643, 643, 643, 648, 633, 633, 636, 636, - 636, 636, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 636, 636, 638, 638, 638, 638, - 638, 638, 638, 638, 640, 640, 643, 643, 648, 648, - 633, 633, 636, 636, 636, 636, 636, 636, 636, 636, - 636, 636, 636, 636, 638, 638, 638, 638, 638, 640, - 640, 643, 643, 622, 633, 636, 636, 636, 636, 636, - - 636, 636, 638, 638, 638, 638, 638, 640, 643, 643, - 636, 636, 636, 636, 638, 638, 638, 643, 643, 636, - 638, 0, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622 + 617, 617, 616, 3, 616, 5, 618, 618, 616, 9, + 619, 619, 620, 620, 621, 621, 622, 622, 623, 623, + 624, 624, 625, 625, 616, 25, 617, 617, 616, 616, + 616, 616, 616, 616, 626, 616, 616, 627, 616, 628, + 628, 628, 628, 628, 616, 626, 616, 616, 629, 630, + 616, 616, 616, 616, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 616, 626, 616, 616, 632, 616, 633, + 633, 633, 633, 616, 616, 616, 626, 616, 616, 634, + 616, 635, 635, 635, 635, 635, 616, 616, 616, 626, + + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 626, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 626, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 626, 616, 616, 636, 616, 616, 616, + 616, 626, 616, 616, 637, 616, 616, 616, 616, 626, + 616, 616, 616, 616, 626, 616, 616, 616, 616, 626, + 616, 616, 638, 638, 638, 638, 638, 639, 616, 616, + 616, 616, 616, 640, 616, 626, 626, 626, 627, 616, + 627, 628, 628, 628, 628, 628, 629, 629, 616, 616, + 641, 616, 616, 616, 616, 616, 631, 631, 631, 631, + + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 632, 616, + 632, 633, 633, 633, 633, 633, 633, 634, 616, 634, + 635, 635, 635, 635, 635, 636, 636, 616, 637, 637, + 616, 638, 638, 638, 638, 638, 638, 639, 639, 640, + 626, 628, 628, 628, 628, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 642, + 616, 616, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 633, 633, + 633, 633, 633, 633, 635, 635, 635, 635, 638, 638, + 638, 638, 638, 638, 626, 628, 628, 628, 628, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 642, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 633, 633, 633, 633, 633, 633, 633, 633, + + 633, 633, 635, 635, 635, 635, 638, 638, 638, 638, + 638, 638, 626, 628, 628, 628, 628, 616, 616, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 633, 633, 633, 633, 633, 633, + 633, 633, 633, 633, 633, 635, 635, 635, 635, 638, + 638, 638, 638, 638, 626, 628, 628, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + + 631, 631, 631, 631, 633, 633, 633, 633, 633, 633, + 633, 633, 633, 633, 635, 635, 638, 638, 638, 643, + 628, 628, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 633, 633, 633, 633, 633, 633, 633, 633, 633, + 635, 635, 638, 638, 643, 643, 628, 628, 631, 631, + 631, 631, 631, 631, 631, 631, 631, 631, 631, 631, + 631, 633, 633, 633, 633, 633, 633, 635, 635, 638, + 638, 616, 628, 631, 631, 631, 631, 631, 631, 631, + 633, 633, 633, 633, 633, 635, 638, 638, 631, 631, + + 631, 631, 633, 633, 633, 638, 638, 631, 631, 631, + 633, 633, 633, 631, 633, 0, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616 } ; -static yyconst flex_int16_t yy_nxt[1279] = +static yyconst flex_int16_t yy_nxt[1264] = { 0, - 622, 31, 31, 32, 31, 34, 32, 45, 35, 622, - 46, 75, 33, 622, 76, 33, 36, 37, 37, 32, + 616, 31, 31, 32, 31, 34, 32, 45, 35, 616, + 46, 74, 33, 616, 75, 33, 36, 37, 37, 32, 38, 36, 36, 36, 36, 36, 36, 36, 39, 36, 36, 36, 36, 36, 36, 36, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, @@ -659,136 +658,135 @@ static yyconst flex_int16_t yy_nxt[1279] = 53, 53, 53, 54, 47, 47, 47, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 56, 55, 55, 57, 55, 55, 55, 55, - 47, 47, 47, 58, 59, 55, 60, 61, 62, 63, - 55, 55, 64, 65, 66, 67, 68, 69, 70, 71, - 72, 73, 74, 55, 55, 55, 47, 47, 77, 78, - 78, 32, 79, 77, 77, 77, 77, 77, 77, 77, - 80, 77, 77, 77, 77, 77, 77, 77, 81, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 81, 81, - 81, 81, 81, 82, 81, 81, 83, 81, 81, 81, - - 81, 77, 77, 77, 81, 81, 81, 81, 81, 81, - 81, 81, 81, 81, 81, 81, 81, 81, 84, 81, - 85, 81, 81, 81, 81, 81, 81, 86, 87, 88, - 174, 174, 89, 90, 91, 91, 32, 92, 90, 90, - 90, 90, 90, 90, 90, 93, 90, 90, 90, 90, - 90, 90, 90, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 94, 94, 94, 94, - 94, 94, 94, 94, 94, 94, 90, 90, 90, 94, - 94, 94, 95, 94, 94, 94, 94, 94, 94, 94, - 94, 96, 94, 94, 94, 94, 97, 98, 94, 94, - - 94, 94, 99, 100, 101, 174, 174, 102, 104, 104, - 32, 182, 621, 34, 105, 106, 35, 107, 620, 108, - 116, 116, 32, 192, 109, 175, 117, 118, 176, 119, - 211, 120, 127, 127, 32, 212, 121, 175, 128, 129, - 176, 130, 304, 131, 138, 138, 32, 139, 132, 305, - 110, 183, 111, 174, 174, 140, 138, 143, 32, 139, - 144, 193, 122, 619, 123, 174, 177, 140, 594, 178, - 154, 154, 32, 203, 133, 204, 134, 112, 104, 113, - 32, 155, 114, 175, 105, 106, 176, 107, 618, 108, - 233, 154, 156, 32, 109, 157, 159, 159, 32, 159, - - 161, 32, 155, 162, 174, 177, 209, 160, 178, 570, - 160, 243, 141, 142, 194, 210, 195, 195, 195, 228, - 110, 617, 111, 229, 141, 142, 31, 31, 32, 170, - 234, 218, 171, 172, 219, 173, 196, 33, 197, 197, - 197, 205, 259, 206, 174, 174, 207, 112, 116, 124, - 32, 244, 125, 616, 117, 118, 230, 119, 260, 120, - 231, 221, 222, 223, 121, 31, 34, 32, 170, 35, - 224, 171, 172, 615, 173, 614, 33, 174, 177, 225, - 175, 178, 226, 176, 238, 240, 241, 239, 174, 174, - 122, 613, 123, 127, 135, 32, 227, 136, 175, 128, - - 129, 176, 130, 612, 131, 175, 174, 177, 176, 132, - 178, 174, 177, 174, 174, 178, 174, 177, 174, 174, - 178, 175, 174, 177, 176, 611, 178, 174, 174, 175, - 174, 177, 176, 175, 178, 133, 176, 134, 146, 146, - 32, 147, 174, 174, 148, 149, 174, 177, 182, 150, - 178, 252, 252, 317, 175, 148, 149, 176, 252, 255, - 174, 174, 178, 175, 174, 177, 176, 318, 178, 174, - 174, 175, 174, 177, 176, 310, 178, 174, 174, 311, - 148, 233, 149, 146, 151, 32, 147, 152, 183, 148, - 149, 174, 177, 610, 150, 178, 189, 189, 326, 327, - - 148, 149, 195, 195, 195, 286, 286, 286, 196, 322, - 197, 197, 197, 334, 250, 250, 323, 335, 252, 252, - 458, 234, 253, 253, 459, 148, 609, 149, 30, 31, - 31, 32, 30, 30, 30, 163, 164, 30, 30, 30, - 33, 30, 30, 30, 30, 30, 30, 30, 165, 165, - 165, 166, 165, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 167, 168, 165, 165, 165, 169, - 165, 30, 30, 30, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 30, 30, 272, - - 287, 273, 288, 608, 243, 328, 344, 329, 274, 275, - 607, 289, 290, 262, 262, 291, 330, 331, 252, 255, - 332, 357, 178, 345, 359, 286, 286, 286, 358, 358, - 434, 358, 358, 606, 605, 604, 603, 358, 358, 276, - 602, 601, 277, 278, 244, 600, 599, 279, 598, 597, - 596, 595, 570, 280, 593, 592, 281, 591, 282, 590, - 283, 589, 284, 30, 30, 30, 30, 30, 30, 103, - 103, 103, 103, 103, 103, 115, 115, 115, 115, 115, - 115, 126, 126, 126, 126, 126, 126, 137, 137, 137, - 137, 137, 137, 145, 145, 145, 145, 145, 145, 153, - - 153, 153, 153, 153, 153, 158, 158, 158, 158, 158, - 158, 179, 588, 179, 179, 179, 179, 181, 587, 181, - 181, 181, 181, 184, 184, 189, 586, 585, 189, 189, - 189, 191, 584, 191, 191, 191, 191, 199, 199, 232, - 583, 232, 232, 232, 232, 235, 235, 242, 582, 242, - 242, 242, 242, 245, 245, 250, 581, 580, 250, 250, - 250, 253, 579, 578, 253, 253, 253, 256, 256, 262, - 577, 576, 262, 262, 262, 264, 575, 264, 264, 264, - 264, 271, 574, 271, 271, 271, 271, 368, 368, 569, - 573, 569, 569, 569, 569, 572, 571, 570, 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, 520, 519, 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, 490, 489, 488, 487, - 486, 485, 484, 483, 482, 481, 480, 479, 478, 477, - 476, 475, 474, 473, 472, 471, 470, 469, 468, 467, - - 466, 465, 464, 463, 462, 461, 460, 457, 456, 455, - 454, 453, 452, 451, 450, 449, 448, 447, 446, 445, - 444, 443, 442, 441, 440, 439, 438, 437, 436, 435, - 433, 432, 431, 430, 429, 428, 427, 426, 425, 424, - 423, 422, 421, 420, 419, 418, 417, 416, 415, 414, - 413, 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, 382, 381, 380, 379, 378, 377, 376, 375, 374, - 373, 372, 371, 370, 369, 354, 367, 366, 365, 364, - - 363, 362, 361, 360, 356, 355, 354, 353, 352, 351, - 350, 349, 263, 348, 347, 346, 343, 254, 251, 342, - 341, 340, 339, 242, 338, 337, 336, 333, 232, 325, - 324, 321, 320, 319, 316, 315, 314, 313, 312, 309, - 308, 307, 306, 303, 302, 301, 300, 299, 298, 297, - 296, 295, 294, 293, 292, 285, 270, 270, 190, 269, - 268, 267, 266, 181, 265, 263, 261, 258, 257, 180, - 180, 180, 254, 180, 251, 180, 180, 180, 180, 249, - 248, 247, 246, 180, 237, 236, 180, 220, 217, 216, - 215, 214, 213, 208, 202, 201, 200, 198, 190, 180, - - 188, 187, 186, 185, 180, 622, 29, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622 + 55, 55, 55, 55, 55, 56, 55, 55, 55, 55, + 47, 47, 47, 57, 58, 55, 59, 60, 61, 62, + 55, 55, 63, 64, 65, 66, 67, 68, 69, 70, + 71, 72, 73, 55, 55, 55, 47, 47, 76, 77, + 77, 32, 78, 76, 76, 76, 76, 76, 76, 76, + 79, 76, 76, 76, 76, 76, 76, 76, 99, 172, + 172, 100, 114, 114, 32, 172, 172, 34, 115, 116, + 35, 117, 173, 118, 173, 174, 81, 174, 119, 172, + + 172, 76, 76, 76, 173, 172, 172, 174, 136, 136, + 32, 137, 136, 141, 32, 137, 142, 615, 82, 138, + 83, 172, 175, 138, 120, 176, 121, 84, 85, 76, + 77, 86, 32, 78, 87, 76, 76, 76, 76, 76, + 76, 79, 76, 76, 76, 76, 76, 76, 76, 190, + 125, 125, 32, 152, 152, 32, 126, 127, 200, 128, + 201, 129, 206, 614, 153, 613, 130, 81, 157, 157, + 32, 207, 76, 76, 76, 215, 139, 140, 216, 158, + 139, 140, 152, 154, 32, 208, 155, 191, 612, 82, + 209, 83, 131, 153, 132, 236, 237, 611, 84, 85, + + 88, 89, 89, 32, 90, 88, 88, 88, 88, 88, + 88, 88, 91, 88, 88, 88, 88, 88, 88, 88, + 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, + 92, 92, 92, 92, 92, 92, 92, 92, 92, 92, + 92, 92, 92, 88, 88, 88, 92, 92, 92, 93, + 92, 92, 92, 92, 92, 92, 92, 92, 94, 92, + 92, 92, 92, 95, 96, 92, 92, 92, 92, 97, + 98, 102, 102, 32, 295, 225, 180, 103, 104, 226, + 105, 296, 106, 330, 157, 159, 32, 107, 160, 610, + 31, 31, 32, 168, 227, 158, 169, 170, 228, 171, + + 331, 33, 609, 31, 34, 32, 168, 35, 173, 169, + 170, 174, 171, 108, 33, 109, 181, 172, 175, 608, + 192, 176, 193, 193, 193, 194, 230, 195, 195, 195, + 202, 234, 203, 239, 235, 204, 607, 218, 219, 220, + 110, 102, 111, 32, 180, 112, 221, 103, 104, 255, + 105, 222, 106, 606, 223, 172, 175, 107, 605, 176, + 172, 175, 172, 172, 176, 256, 231, 173, 224, 230, + 174, 172, 175, 240, 239, 176, 172, 172, 173, 172, + 172, 174, 313, 108, 181, 109, 172, 175, 173, 314, + 176, 174, 172, 175, 172, 172, 176, 173, 172, 175, + + 174, 604, 176, 172, 172, 173, 248, 248, 174, 231, + 110, 114, 122, 32, 240, 123, 173, 115, 116, 174, + 117, 603, 118, 173, 172, 175, 174, 119, 176, 248, + 251, 172, 172, 176, 172, 175, 172, 172, 176, 173, + 172, 175, 174, 602, 176, 172, 172, 172, 175, 187, + 187, 176, 308, 120, 601, 121, 125, 133, 32, 600, + 134, 599, 126, 127, 598, 128, 309, 129, 193, 193, + 193, 597, 130, 282, 282, 282, 194, 301, 195, 195, + 195, 302, 317, 318, 320, 246, 246, 582, 321, 248, + 248, 249, 249, 248, 251, 258, 258, 176, 131, 596, + + 132, 144, 144, 32, 145, 422, 343, 146, 147, 345, + 595, 442, 148, 344, 344, 443, 344, 344, 146, 147, + 282, 282, 282, 355, 423, 356, 594, 593, 556, 393, + 592, 394, 591, 590, 357, 358, 457, 589, 359, 588, + 395, 396, 587, 146, 397, 147, 144, 149, 32, 145, + 150, 418, 146, 147, 586, 458, 585, 148, 344, 344, + 584, 583, 556, 146, 147, 581, 580, 579, 578, 577, + 576, 575, 574, 573, 572, 571, 570, 569, 568, 567, + 566, 565, 564, 563, 562, 561, 560, 559, 146, 558, + 147, 30, 31, 31, 32, 30, 30, 30, 161, 162, + + 30, 30, 30, 33, 30, 30, 30, 30, 30, 30, + 30, 163, 163, 163, 164, 163, 163, 163, 163, 163, + 163, 163, 163, 163, 163, 163, 163, 165, 166, 163, + 163, 163, 167, 163, 30, 30, 30, 163, 163, 163, + 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + 30, 30, 268, 557, 269, 556, 554, 553, 552, 551, + 550, 270, 271, 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, 272, 520, 519, 273, 274, 518, 517, 516, + 275, 515, 514, 513, 512, 511, 276, 510, 509, 277, + 508, 278, 507, 279, 506, 280, 30, 30, 30, 30, + 30, 30, 80, 80, 80, 80, 80, 80, 101, 101, + 101, 101, 101, 101, 113, 113, 113, 113, 113, 113, + 124, 124, 124, 124, 124, 124, 135, 135, 135, 135, + 135, 135, 143, 143, 143, 143, 143, 143, 151, 151, + 151, 151, 151, 151, 156, 156, 156, 156, 156, 156, + 177, 505, 177, 177, 177, 177, 179, 504, 179, 179, + 179, 179, 182, 182, 187, 503, 502, 187, 187, 187, + + 189, 501, 189, 189, 189, 189, 197, 197, 229, 500, + 229, 229, 229, 229, 232, 232, 238, 499, 238, 238, + 238, 238, 241, 241, 246, 498, 497, 246, 246, 246, + 249, 496, 495, 249, 249, 249, 252, 252, 258, 494, + 493, 258, 258, 258, 260, 492, 260, 260, 260, 260, + 267, 491, 267, 267, 267, 267, 354, 354, 555, 490, + 555, 555, 555, 555, 489, 488, 487, 486, 485, 484, + 483, 482, 481, 480, 479, 478, 477, 476, 475, 474, + 473, 472, 471, 470, 469, 468, 467, 466, 465, 464, + 463, 462, 461, 460, 459, 456, 455, 454, 453, 452, + + 451, 450, 449, 448, 447, 446, 445, 444, 441, 440, + 439, 438, 437, 436, 435, 434, 433, 432, 431, 430, + 429, 428, 427, 426, 425, 424, 421, 420, 419, 417, + 416, 415, 414, 413, 412, 411, 410, 409, 408, 407, + 406, 405, 404, 403, 402, 401, 400, 399, 398, 392, + 391, 390, 389, 388, 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, 360, 340, 353, 352, 351, 350, 349, 348, 347, + 346, 342, 341, 340, 339, 338, 337, 336, 335, 259, + + 334, 333, 332, 329, 250, 247, 328, 327, 326, 325, + 238, 324, 323, 322, 319, 229, 316, 315, 312, 311, + 310, 307, 306, 305, 304, 303, 300, 299, 298, 297, + 294, 293, 292, 291, 290, 289, 288, 287, 286, 285, + 284, 283, 281, 266, 266, 188, 265, 264, 263, 262, + 179, 261, 259, 257, 254, 253, 178, 178, 178, 250, + 178, 247, 178, 178, 178, 178, 245, 244, 243, 242, + 178, 233, 178, 217, 214, 213, 212, 211, 210, 205, + 199, 198, 196, 188, 178, 186, 185, 184, 183, 178, + 616, 29, 616, 616, 616, 616, 616, 616, 616, 616, + + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616 } ; -static yyconst flex_int16_t yy_chk[1279] = +static yyconst flex_int16_t yy_chk[1264] = { 0, 0, 1, 1, 1, 2, 2, 2, 4, 2, 0, 4, 6, 1, 0, 6, 2, 3, 3, 3, 3, @@ -808,128 +806,127 @@ static yyconst flex_int16_t yy_chk[1279] = 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, + 7, 7, 7, 7, 7, 7, 7, 7, 10, 31, + 31, 10, 13, 13, 13, 37, 37, 26, 13, 13, + 26, 13, 33, 13, 39, 33, 7, 39, 13, 48, + + 48, 7, 7, 7, 52, 77, 77, 52, 17, 17, + 17, 17, 18, 18, 18, 18, 18, 611, 7, 17, + 7, 34, 34, 18, 13, 34, 13, 7, 7, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 50, + 15, 15, 15, 21, 21, 21, 15, 15, 58, 15, + 58, 15, 61, 608, 21, 605, 15, 8, 23, 23, + 23, 61, 8, 8, 8, 68, 17, 17, 68, 23, + 18, 18, 22, 22, 22, 62, 22, 50, 604, 8, + 62, 8, 15, 22, 15, 83, 83, 603, 8, 8, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, - 7, 7, 7, 7, 7, 7, 7, 7, 7, 8, - 31, 31, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, + 9, 11, 11, 11, 210, 72, 38, 11, 11, 72, + 11, 210, 11, 254, 24, 24, 24, 11, 24, 601, + 27, 27, 27, 27, 73, 24, 27, 27, 73, 27, + + 254, 27, 600, 28, 28, 28, 28, 28, 79, 28, + 28, 79, 28, 11, 28, 11, 38, 45, 45, 599, + 51, 45, 51, 51, 51, 53, 78, 53, 53, 53, + 59, 82, 59, 90, 82, 59, 598, 70, 70, 70, + 11, 12, 12, 12, 179, 12, 70, 12, 12, 166, + 12, 71, 12, 597, 71, 74, 74, 12, 594, 74, + 86, 86, 89, 89, 86, 166, 78, 91, 71, 229, + 91, 99, 99, 90, 238, 99, 102, 102, 106, 114, + 114, 106, 225, 12, 179, 12, 111, 111, 118, 225, + 111, 118, 122, 122, 125, 125, 122, 129, 133, 133, + + 129, 593, 133, 136, 136, 138, 144, 144, 138, 229, + 12, 14, 14, 14, 238, 14, 148, 14, 14, 148, + 14, 591, 14, 153, 141, 141, 153, 14, 141, 149, + 149, 152, 152, 149, 154, 154, 157, 157, 154, 158, + 159, 159, 158, 588, 159, 172, 172, 175, 175, 188, + 188, 175, 221, 14, 587, 14, 16, 16, 16, 586, + 16, 584, 16, 16, 581, 16, 221, 16, 193, 193, + 193, 580, 16, 194, 194, 194, 195, 215, 195, 195, + 195, 215, 228, 228, 234, 247, 247, 556, 234, 248, + 248, 250, 250, 251, 251, 259, 259, 251, 16, 578, + + 16, 19, 19, 19, 19, 357, 270, 19, 19, 271, + 577, 380, 19, 270, 270, 380, 271, 271, 19, 19, + 282, 282, 282, 283, 357, 283, 576, 575, 556, 319, + 574, 319, 572, 567, 283, 283, 395, 565, 283, 564, + 319, 319, 563, 19, 319, 19, 20, 20, 20, 20, + 20, 344, 20, 20, 562, 395, 561, 20, 344, 344, + 559, 557, 555, 20, 20, 554, 553, 552, 551, 549, + 546, 545, 544, 543, 542, 541, 539, 537, 535, 534, + 532, 531, 529, 527, 526, 525, 524, 523, 20, 522, + 20, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 9, 9, 9, 9, 10, 37, 37, 10, 11, 11, - 11, 38, 615, 26, 11, 11, 26, 11, 611, 11, - 13, 13, 13, 50, 11, 33, 13, 13, 33, 13, - 63, 13, 15, 15, 15, 63, 13, 39, 15, 15, - 39, 15, 213, 15, 17, 17, 17, 17, 15, 213, - 11, 38, 11, 48, 48, 17, 18, 18, 18, 18, - 18, 50, 13, 610, 13, 34, 34, 18, 570, 34, - 21, 21, 21, 59, 15, 59, 15, 11, 12, 12, - 12, 21, 12, 52, 12, 12, 52, 12, 609, 12, - 79, 22, 22, 22, 12, 22, 23, 23, 23, 24, - - 24, 24, 22, 24, 45, 45, 62, 23, 45, 570, - 24, 92, 17, 17, 51, 62, 51, 51, 51, 73, - 12, 605, 12, 73, 18, 18, 27, 27, 27, 27, - 79, 69, 27, 27, 69, 27, 53, 27, 53, 53, - 53, 60, 168, 60, 78, 78, 60, 12, 14, 14, - 14, 92, 14, 604, 14, 14, 74, 14, 168, 14, - 74, 71, 71, 71, 14, 28, 28, 28, 28, 28, - 71, 28, 28, 603, 28, 600, 28, 75, 75, 72, - 80, 75, 72, 80, 84, 85, 85, 84, 91, 91, - 14, 598, 14, 16, 16, 16, 72, 16, 93, 16, - - 16, 93, 16, 597, 16, 108, 88, 88, 108, 16, - 88, 101, 101, 104, 104, 101, 113, 113, 116, 116, - 113, 120, 124, 124, 120, 596, 124, 127, 127, 131, - 135, 135, 131, 140, 135, 16, 140, 16, 19, 19, - 19, 19, 138, 138, 19, 19, 143, 143, 181, 19, - 143, 146, 146, 224, 150, 19, 19, 150, 151, 151, - 154, 154, 151, 155, 156, 156, 155, 224, 156, 159, - 159, 160, 161, 161, 160, 218, 161, 174, 174, 218, - 19, 232, 19, 20, 20, 20, 20, 20, 181, 20, - 20, 177, 177, 593, 20, 177, 190, 190, 231, 231, - - 20, 20, 195, 195, 195, 196, 196, 196, 197, 228, - 197, 197, 197, 238, 251, 251, 228, 238, 252, 252, - 395, 232, 254, 254, 395, 20, 592, 20, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, - 25, 25, 25, 25, 25, 25, 25, 25, 25, 193, - - 200, 193, 200, 590, 242, 236, 258, 236, 193, 193, - 589, 200, 200, 263, 263, 200, 236, 236, 255, 255, - 236, 274, 255, 258, 275, 286, 286, 286, 274, 274, - 358, 275, 275, 588, 587, 586, 585, 358, 358, 193, - 580, 578, 193, 193, 242, 577, 576, 193, 575, 574, - 573, 571, 569, 193, 568, 567, 193, 566, 193, 565, - 193, 563, 193, 623, 623, 623, 623, 623, 623, 624, - 624, 624, 624, 624, 624, 625, 625, 625, 625, 625, - 625, 626, 626, 626, 626, 626, 626, 627, 627, 627, - 627, 627, 627, 628, 628, 628, 628, 628, 628, 629, - - 629, 629, 629, 629, 629, 630, 630, 630, 630, 630, - 630, 631, 561, 631, 631, 631, 631, 632, 560, 632, - 632, 632, 632, 633, 633, 634, 559, 557, 634, 634, - 634, 635, 556, 635, 635, 635, 635, 636, 636, 637, - 554, 637, 637, 637, 637, 638, 638, 639, 552, 639, - 639, 639, 639, 640, 640, 641, 550, 549, 641, 641, - 641, 642, 547, 546, 642, 642, 642, 643, 643, 644, - 544, 543, 644, 644, 644, 645, 542, 645, 645, 645, - 645, 646, 541, 646, 646, 646, 646, 647, 647, 648, - 539, 648, 648, 648, 648, 538, 537, 536, 534, 533, - - 532, 531, 530, 528, 527, 526, 524, 523, 522, 521, - 520, 519, 518, 517, 516, 512, 511, 509, 508, 507, - 506, 505, 500, 499, 497, 496, 495, 494, 493, 492, - 491, 489, 488, 486, 484, 483, 480, 479, 478, 477, - 476, 475, 474, 473, 472, 471, 470, 469, 467, 465, - 463, 462, 461, 459, 458, 456, 455, 454, 453, 452, - 451, 450, 449, 448, 446, 445, 442, 441, 440, 439, - 438, 437, 436, 432, 431, 429, 428, 427, 426, 425, - 423, 422, 421, 420, 419, 418, 417, 416, 415, 414, - 413, 412, 411, 410, 409, 408, 407, 405, 404, 403, - - 402, 401, 400, 399, 398, 397, 396, 394, 393, 392, - 391, 390, 389, 388, 387, 385, 384, 383, 382, 380, - 379, 378, 375, 374, 373, 372, 371, 370, 369, 368, - 353, 352, 351, 350, 349, 348, 347, 346, 345, 344, - 343, 342, 341, 340, 339, 338, 337, 336, 335, 334, - 333, 332, 331, 330, 329, 328, 327, 326, 325, 324, - 323, 322, 321, 320, 319, 318, 317, 316, 315, 314, - 313, 312, 311, 310, 309, 308, 307, 306, 304, 303, - 302, 301, 300, 299, 298, 297, 296, 295, 293, 292, - 291, 290, 289, 288, 287, 284, 283, 282, 281, 280, - - 279, 278, 277, 276, 273, 272, 271, 269, 268, 267, - 266, 265, 262, 261, 260, 259, 257, 253, 250, 249, - 248, 247, 246, 244, 241, 240, 239, 237, 234, 230, - 229, 227, 226, 225, 223, 222, 221, 220, 219, 217, - 216, 215, 214, 212, 211, 210, 209, 208, 207, 206, - 205, 204, 203, 202, 201, 194, 192, 191, 189, 188, - 187, 186, 185, 183, 180, 170, 169, 167, 166, 162, - 157, 152, 147, 144, 139, 136, 125, 114, 102, 98, - 97, 96, 95, 89, 83, 82, 76, 70, 68, 67, - 66, 65, 64, 61, 58, 57, 56, 54, 49, 46, - - 44, 43, 42, 41, 35, 29, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622, 622, 622, - 622, 622, 622, 622, 622, 622, 622, 622 + 25, 25, 191, 521, 191, 520, 518, 517, 516, 515, + 514, 191, 191, 512, 511, 510, 509, 508, 507, 506, + 505, 504, 503, 502, 501, 500, 496, 495, 493, 492, + 491, 490, 489, 484, 483, 482, 481, 480, 479, 478, + + 477, 476, 191, 475, 473, 191, 191, 472, 470, 468, + 191, 467, 464, 463, 462, 461, 191, 460, 459, 191, + 458, 191, 457, 191, 456, 191, 617, 617, 617, 617, + 617, 617, 618, 618, 618, 618, 618, 618, 619, 619, + 619, 619, 619, 619, 620, 620, 620, 620, 620, 620, + 621, 621, 621, 621, 621, 621, 622, 622, 622, 622, + 622, 622, 623, 623, 623, 623, 623, 623, 624, 624, + 624, 624, 624, 624, 625, 625, 625, 625, 625, 625, + 626, 455, 626, 626, 626, 626, 627, 454, 627, 627, + 627, 627, 628, 628, 629, 453, 451, 629, 629, 629, + + 630, 449, 630, 630, 630, 630, 631, 631, 632, 447, + 632, 632, 632, 632, 633, 633, 634, 446, 634, 634, + 634, 634, 635, 635, 636, 445, 443, 636, 636, 636, + 637, 442, 440, 637, 637, 637, 638, 638, 639, 439, + 438, 639, 639, 639, 640, 437, 640, 640, 640, 640, + 641, 436, 641, 641, 641, 641, 642, 642, 643, 435, + 643, 643, 643, 643, 434, 433, 432, 430, 429, 426, + 425, 424, 423, 422, 421, 420, 416, 415, 413, 412, + 411, 410, 409, 407, 406, 405, 404, 403, 402, 401, + 400, 399, 398, 397, 396, 394, 393, 392, 390, 389, + + 388, 387, 386, 385, 384, 383, 382, 381, 379, 378, + 377, 376, 375, 374, 373, 372, 370, 369, 368, 367, + 365, 364, 363, 360, 359, 358, 356, 355, 354, 339, + 338, 337, 336, 335, 334, 333, 332, 331, 330, 329, + 328, 327, 326, 325, 324, 323, 322, 321, 320, 318, + 317, 316, 315, 314, 313, 312, 311, 310, 309, 308, + 307, 306, 305, 304, 303, 302, 301, 300, 299, 298, + 297, 295, 294, 293, 292, 291, 290, 289, 288, 287, + 286, 284, 280, 279, 278, 277, 276, 275, 274, 273, + 272, 269, 268, 267, 265, 264, 263, 262, 261, 258, + + 257, 256, 255, 253, 249, 246, 245, 244, 243, 242, + 240, 237, 236, 235, 233, 231, 227, 226, 224, 223, + 222, 220, 219, 218, 217, 216, 214, 213, 212, 211, + 209, 208, 207, 206, 205, 204, 203, 202, 201, 200, + 199, 198, 192, 190, 189, 187, 186, 185, 184, 183, + 181, 178, 168, 167, 165, 164, 160, 155, 150, 145, + 142, 137, 134, 123, 112, 100, 96, 95, 94, 93, + 87, 81, 75, 69, 67, 66, 65, 64, 63, 60, + 57, 56, 54, 49, 46, 44, 43, 42, 41, 35, + 29, 616, 616, 616, 616, 616, 616, 616, 616, 616, + + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616, 616, 616, 616, 616, 616, 616, 616, + 616, 616, 616 } ; static yy_state_type yy_last_accepting_state; @@ -1052,7 +1049,7 @@ extern void addExpressionChar( const char ); extern void addExpressionString( const char * ); extern void moc_warn( const char *msg ); -#line 1056 "lex.yy.c" +#line 1053 "lex.yy.c" #define INITIAL 0 #define OUTSIDE 1 @@ -1258,7 +1255,7 @@ YY_DECL #line 113 "moc.l" -#line 1262 "lex.yy.c" +#line 1259 "lex.yy.c" if ( !(yy_init) ) { @@ -1312,13 +1309,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 623 ) + if ( yy_current_state >= 617 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 1207 ); + while ( yy_base[yy_current_state] != 1192 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -2296,7 +2293,7 @@ YY_RULE_SETUP #line 496 "moc.l" ECHO; YY_BREAK -#line 2300 "lex.yy.c" +#line 2297 "lex.yy.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(OUTSIDE): case YY_STATE_EOF(QT_DEF): @@ -2602,7 +2599,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 623 ) + if ( yy_current_state >= 617 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2630,11 +2627,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 623 ) + if ( yy_current_state >= 617 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 622); + yy_is_jam = (yy_current_state == 616); return yy_is_jam ? 0 : yy_current_state; } diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index 57ee1e861..83caffeb9 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -1334,11 +1334,11 @@ static const char *const yytname[] = "ENUM", "CLASS", "STRUCT", "UNION", "ASM", "PRIVATE", "PROTECTED", "PUBLIC", "OPERATOR", "DBL_COLON", "TRIPLE_DOT", "TEMPLATE", "NAMESPACE", "USING", "MUTABLE", "THROW", "SIGNALS", "SLOTS", "TQ_OBJECT", - "TQ_PROPERTY", "TQ_OVERRIDE", "TQ_CLASSINFO", "TQ_ENUMS", "TQ_SETS", "READ", - "WRITE", "STORED", "DESIGNABLE", "SCRIPTABLE", "RESET", "'{'", "'}'", - "'='", "';'", "'<'", "'>'", "','", "'['", "']'", "'('", "')'", "'*'", - "'&'", "':'", "'+'", "'-'", "'/'", "'%'", "'^'", "'|'", "'~'", "'!'", - "$accept", "declaration_seq", "declaration", "namespace_def", + "TQ_PROPERTY", "TQ_OVERRIDE", "TQ_CLASSINFO", "TQ_ENUMS", "TQ_SETS", + "READ", "WRITE", "STORED", "DESIGNABLE", "SCRIPTABLE", "RESET", "'{'", + "'}'", "'='", "';'", "'<'", "'>'", "','", "'['", "']'", "'('", "')'", + "'*'", "'&'", "':'", "'+'", "'-'", "'/'", "'%'", "'^'", "'|'", "'~'", + "'!'", "$accept", "declaration_seq", "declaration", "namespace_def", "named_namespace_def", "$@1", "$@2", "unnamed_namespace_def", "$@3", "$@4", "namespace_body", "namespace_alias_def", "using_directive", "using_declaration", "class_def", "$@5", "class_name", |