diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 720af8382169f09b86c6b8fad22a9d92214b4476..b15989fa827175d0aeb5591b54ca6c40b0e0c3fe 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -172,7 +172,7 @@
#line 1 "Gmsh.y"
-// $Id: Gmsh.tab.cpp,v 1.94 2001-07-26 21:36:31 remacle Exp $
+// $Id: Gmsh.tab.cpp,v 1.95 2001-07-30 12:54:40 geuzaine Exp $
//
// Generaliser sprintf avec des chaines de caracteres
@@ -460,9 +460,9 @@ static const short yyrhs[] = { 188,
7, 262, 6, 0, 4, 179, 251, 180, 181, 87,
181, 4, 7, 262, 6, 0, 4, 181, 88, 7,
263, 6, 0, 4, 179, 251, 180, 181, 88, 7,
- 263, 6, 0, 55, 177, 5, 178, 181, 5, 7,
- 251, 6, 0, 55, 177, 5, 178, 181, 5, 7,
- 5, 6, 0, 36, 177, 251, 178, 7, 253, 6,
+ 263, 6, 0, 55, 177, 4, 178, 181, 4, 7,
+ 251, 6, 0, 55, 177, 4, 178, 181, 4, 7,
+ 265, 6, 0, 36, 177, 251, 178, 7, 253, 6,
0, 51, 36, 177, 251, 178, 7, 259, 6, 0,
67, 36, 259, 7, 183, 251, 182, 251, 182, 251,
184, 6, 0, 43, 44, 259, 7, 251, 6, 0,
@@ -498,7 +498,7 @@ static const short yyrhs[] = { 188,
237, 0, 61, 183, 240, 184, 0, 64, 183, 240,
184, 0, 64, 4, 179, 251, 180, 6, 0, 64,
98, 6, 0, 4, 265, 6, 0, 4, 251, 6,
- 0, 55, 177, 5, 178, 181, 5, 6, 0, 94,
+ 0, 55, 177, 4, 178, 181, 4, 6, 0, 94,
6, 0, 35, 6, 0, 89, 177, 251, 8, 251,
178, 0, 89, 177, 251, 8, 251, 8, 251, 178,
0, 89, 4, 90, 183, 251, 8, 251, 184, 0,
@@ -843,7 +843,7 @@ static const short yydefact[] = { 0,
0, 0, 47, 0, 0, 0, 0, 0, 52, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 141, 146, 148, 0, 154, 0,
- 0, 0, 166, 318, 0, 227, 226, 156, 155, 192,
+ 0, 0, 166, 318, 0, 227, 226, 155, 156, 192,
0, 188, 0, 0, 0, 0, 0, 0, 221, 0,
0, 0, 306, 0, 305, 0, 0, 0, 0, 0,
0, 304, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -905,171 +905,171 @@ static const short yydefgoto[] = { 1536,
};
static const short yypact[] = { 1999,
- 25,-32768,-32768, -123,-32768, 27, 2132,-32768, 20, 39,
- 58, 97, 107, 126, 131, 12, 17, 33,-32768,-32768,
--32768,-32768, 1550, 55, 196, -148, 64, 124, -25, -30,
- 148, 151, 230, 159, 241, 282, 317, 374, 299, 240,
- 186, 181, 182, 182, 208, 206, 303, 368, 14, 377,
- 422, 120, 266, -14, 23,-32768, 302,-32768, 510,-32768,
- 520, 523, 488,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768, 526, 20, 2171,
--32768,-32768,-32768,-32768,-32768, 353, 353, 548,-32768, -130,
- 15,-32768,-32768, 379, 380, 382, 383, 384, 389, 390,
- 393, 394, 396, 397, 399, 400, 401, 402, 403, 406,
- 420, 421, 425, 426, 427, 428, 429,-32768,-32768,-32768,
--32768, 1266, 1266, 1266,-32768,-32768, 1266, 522, 21, 1266,
- 552, 955,-32768, 601, 549,-32768, 1266, 1266, 1266, 1266,
- 431, 1266, 1266, 432, 1266, 1266, 1266, 768, 1266, 430,
- 434, 435, 768, 433, 438, 437, 440, 445, 446, 447,
- 610, 182, 182, 182, 1266, 1266, 177,-32768, 202, 182,
- 442, 443, 444,-32768, 768, 449, 625,-32768,-32768,-32768,
- 768, 768, 1266, -50, 1266, 543, 1266, 1266,-32768, 628,
--32768, 458,-32768, 20, 460, 461, 462, 467, 469, 470,
- 493, 494, 495, 496, 497, 513, 514, 515, 518, 519,
- 521, 527, 529, 530, 532, 534, 535, 539, 550, 566,
- 570, 573, 574, 575, 688, 547, 525, 571, 1266, 693,
--32768, 182,-32768, 1266, 1266, 1266, 1266, 1266, 1266, 1266,
- 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266,
- 1266, 1266, 1266, 1266, 106, 34, 34, 556, 556, 556,
- 5009, 747, 1582, 4884, 31, 576, 748, 1047,-32768,-32768,
- 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266,
- 1266, 1266, 1266, 1266, 1266,-32768, -80, 5032, 2244, 5055,
- 5078, 1266, 5101, 2267, 1266, 2290, 5124, 5147, 94, 1003,
- 1582, 1729, 749,-32768, 5170, 1266, 1266, 1266, 751, 1266,
- 1266, 1266, 1266, 1266, 1266, 1266, 583, 9,-32768,-32768,
- 1320, 2658, 182, 182, 381, 381, 104, 1266, 1266, 1266,
- 339, 173, 1266,-32768, 1947, 755, 756, 5193, 679, 1266,
- 5216, 582, 1744, 5239,-32768, 1266, 618, 762, 763, 764,
- 765, 769, 770, 771, 794, 795, 796, 798, 799, 802,
- 803, 804, 805, 807, 808, 809, 810, 812, 813, 815,
- 638, 816, 818, 819, 821, 824, 823,-32768, -10, 825,
- 826, 829, 4909, -100, 205, -17, 5262, 5285, 5308, 5331,
+ 68,-32768,-32768, -123,-32768, 33, 2132,-32768, 15, 58,
+ 107, 153, 168, 184, 186, -40, 55, 137,-32768,-32768,
+-32768,-32768, 1550, 161, 196, -142, 187, 209, -39, -25,
+ 218, 228, 364, 243, 385, 392, 402, 354, 328, 419,
+ 276, 271, 145, 145, 274, 240, 279, 423, 5, 463,
+ 468, 136, 321, -11, 12,-32768, 325,-32768, 517,-32768,
+ 549, 554, 520,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768, 558, 15, 2171,
+-32768,-32768,-32768,-32768,-32768, 389, 389, 562,-32768, -131,
+ 16,-32768,-32768, 393, 394, 396, 397, 399, 400, 401,
+ 403, 405, 406, 420, 421, 424, 427, 428, 429, 430,
+ 431, 432, 434, 435, 436, 437, 438,-32768,-32768,-32768,
+-32768, 67, 67, 67,-32768,-32768, 67, 522, 24, 67,
+ 573, 955,-32768, 610, 612,-32768, 67, 67, 67, 67,
+ 444, 67, 67, 445, 67, 67, 67, 768, 67, 440,
+ 447, 449, 768, 442, 450, 451, 454, 457, 458, 460,
+ 623, 145, 145, 145, 67, 67, -58,-32768, 4, 145,
+ 455, 456, 464,-32768, 768, 467, 642,-32768,-32768,-32768,
+ 768, 768, 67, -50, 67, 581, 67, 67,-32768, 666,
+-32768, 496,-32768, 15, 497, 513, 514, 515, 516, 518,
+ 519, 521, 523, 526, 527, 529, 530, 532, 534, 535,
+ 550, 552, 555, 557, 559, 560, 561, 563, 564, 565,
+ 566, 570, 571, 574, 692, 553, 572, 575, 67, 727,
+-32768, 145,-32768, 67, 67, 67, 67, 67, 67, 67,
+ 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+ 67, 67, 67, 67, 241, 34, 34, 576, 576, 576,
+ 5009, 732, 1266, 4884, 31, 577, 746, 1047,-32768,-32768,
+ 67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+ 67, 67, 67, 67, 67,-32768, -80, 5032, 2244, 5055,
+ 5078, 67, 5101, 2267, 67, 2290, 5124, 5147, -34, 1003,
+ 1266, 1729, 747,-32768, 5170, 67, 67, 67, 748, 67,
+ 67, 67, 67, 67, 67, 67, 578, 104,-32768,-32768,
+ 1320, 2658, 145, 145, 448, 448, 175, 67, 67, 67,
+ 340, 261, 67,-32768, 1947, 754, 755, 5193, 678, 67,
+ 5216, 582, 1744, 5239,-32768, 67, 616, 761, 762, 763,
+ 764, 765, 769, 770, 771, 794, 795, 796, 798, 799,
+ 800, 803, 804, 805, 806, 808, 809, 810, 811, 813,
+ 638, 814, 816, 817, 819, 823, 822,-32768, -72, 825,
+ 826, 829, 4909, 193, 11, -17, 5262, 5285, 5308, 5331,
5354, 5377, 5400, 5423, 5446, 5469, 5492, 2679, 5515, 5538,
- 5561, 5584, 5607, 5630, 2700, 2721, 2742, 121,-32768, 225,
- 647, 653,-32768, 768, 1623, 1729,-32768, 174, 166, 34,
- 1266, 830, 838, 16,-32768, 1770, 970, 555, 572, 572,
- 256, 256, 256, 256, -40, -40, 556, 556, 556, 556,
- 846, 1582, 849, 852, 853, 854, 5653, 858, 861, 5676,
- 862, 863, 864, 639, 231, 1582, 245, 1266, 1266, 865,
- 2313, 5699, 5722, 1266, 2336, 2359, 5745, 5768, 5791, 5814,
- 5837, 678, 182, 1266, 1266,-32768,-32768,-32768, 685, 2195,
--32768, 689, 1266, 2763, 2784, 2805,-32768,-32768,-32768, 1266,
- 4934,-32768, 694, 695, 869, 702, 5860, 873, 1266, 1266,
--32768, 5883, 732, 700, 701, 703, 706, 707, 708, 709,
+ 5561, 5584, 5607, 5630, 2700, 2721, 2742, -106,-32768, 59,
+ 646, 653,-32768, 768, 1623, 1729,-32768, 169, 166, 34,
+ 67, 830, 838, 17,-32768, 1770, 970, 426, 248, 248,
+ 233, 233, 233, 233, 258, 258, 576, 576, 576, 576,
+ 846, 1266, 849, 852, 853, 854, 5653, 858, 861, 5676,
+ 862, 863, 864, 640, 264, 1266, 176, 67, 67, 865,
+ 2313, 5699, 5722, 67, 2336, 2359, 5745, 5768, 5791, 5814,
+ 5837, 688, 145, 67, 67,-32768,-32768,-32768, 675, 2195,
+-32768, 689, 67, 2763, 2784, 2805,-32768,-32768,-32768, 67,
+ 4934,-32768, 693, 694, 871, 702, 5860, 873, 67, 67,
+-32768, 5883, 733, 699, 701, 703, 706, 707, 708, 709,
710, 711, 712, 713, 714, 716, 717, 718, 719, 720,
- 721, 725, 726, 727, 728, 730, 731, 734, 735, 736,
- 750, 754, 757,-32768, 909, 753,-32768, 760, 164,-32768,
--32768, 766, 767, 772, 773, 775, 776, 777, 778, 779,
- 780, 781, 782, 940,-32768,-32768,-32768,-32768,-32768,-32768,
+ 721, 725, 726, 728, 730, 731, 734, 735, 736, 749,
+ 750, 757, 760,-32768, 904, 758,-32768, 767, 182,-32768,
+-32768, 737, 766, 773, 775, 776, 777, 778, 779, 780,
+ 781, 782, 786, 938,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768, 1266,-32768,-32768,
--32768,-32768,-32768,-32768, 1266, 1266, 1266, 1266, 943,-32768,
- 1582, 34,-32768, 956, 1582, 783, 150, 1266, 958, 962,
- 1068,-32768, 963, 790, 18, 965, 1266,-32768, 252, 182,
+-32768,-32768,-32768,-32768,-32768,-32768,-32768, 67,-32768,-32768,
+-32768,-32768,-32768,-32768, 67, 67, 67, 67, 942,-32768,
+ 1266, 34,-32768, 941, 1266, 784, 42, 67, 956, 962,
+ 1068,-32768, 963, 790, 18, 965, 67,-32768, 60, 145,
-32768, 768, 768, 966, 768,-32768, 967,-32768, 768, 768,
--32768, 1582, 975, 274,-32768, 1785, 1162, 789, 968, 969,
- 973, 681, 974, 1001, 1002, 1004, 1032, 1042, 1048, 972,
- 227, 2826, 2847,-32768,-32768, 2382, 182, 182, 182, 1261,
- 976, 1266, 1266, 768, 1266, 1052, 768, 1800, 878, 1053,
- 916, 1007, 1266, 1266, 182, 1059, 1060, 897, 1063, 1064,
- 768, 768, 1065, 182, 1066, 1067, 768, 768, 1070, 1072,
- 1074, 1075, 1076, 768, 343, 768, 1078, 1077, 1079, 1080,
- 1083,-32768, 1081, 353, 1085,-32768, 516, 1266, 1266, 1266,
- 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266,-32768,
- 5906, 5929, 5952, 5975, 4959, 893, 272, 924,-32768, 1729,
--32768, 111, 200, 922, 1097, 1350,-32768,-32768,-32768, 18,
- 1266, 926, 1266,-32768, 279,-32768, 1201, 1099, 11, 59,
- 1102, 768, 1104, 768, 1110, 1120, 286,-32768, 1582,-32768,
- 1266,-32768, 1266, 768, 768, 768,-32768, 260, 768, 768,
- 768, 768, 768, 768, 768, 344, 1266, 1266, 1266, 960,
- 142, 145, 149,-32768,-32768, 2868, 2889, 1138, 5998, -108,
- 1062, 1266, 1266,-32768, 971, 20, 977, 2910, 2931, 4,
- 978, 979, 980, 983, 981, 986, 985, 989, 69, 990,
- 987, 995, 992, 994, 996, 997, 999, 1000, 1005,-32768,
--32768,-32768,-32768,-32768, 1006, 1018, 1019, 1026, 1036, 1009,
- 1037,-32768, 1038, -100, 1139, 2952, 2973, 2994, 3015, 3036,
+-32768, 1266, 975, 222,-32768, 1785, 1162, 789, 968, 969,
+ 973, 681, 974, 1001, 1002, 1004, 1032, 1042, 1048, 978,
+ 177, 2826, 2847,-32768,-32768, 2382, 145, 145, 145, 1261,
+ 971, 67, 67, 768, 67, 1052, 768, 1800, 878, 1053,
+ 916, 1007, 67, 67, 145, 1059, 1060, 897, 1063, 1064,
+ 768, 768, 1065, 145, 1066, 1067, 768, 768, 1070, 1072,
+ 1074, 1075, 1076, 768, 344, 768, 1078, 1077, 1079, 1080,
+ 1083,-32768, 1081, 389, 1085,-32768, 645, 67, 67, 67,
+ 67, 67, 67, 67, 67, 67, 67, 67, 67,-32768,
+ 5906, 5929, 5952, 5975, 4959, 893, 118, 924,-32768, 1729,
+-32768, 111, 172, 922, 1097, 1350,-32768,-32768,-32768, 18,
+ 67, 926, 67,-32768, 284,-32768, 1201, 1099, 41, 25,
+ 1102, 768, 1104, 768, 1110, 1120, 288,-32768, 1266,-32768,
+ 67,-32768, 67, 768, 768, 768,-32768, 376, 768, 768,
+ 768, 768, 768, 768, 768, 433, 67, 67, 67, 960,
+ 115, 149, 170,-32768,-32768, 2868, 2889, 1138, 5998, -132,
+ 1062, 67, 67,-32768, 976, 15, 972, 2910, 2931, 2,
+ 979, 982, 980, 985, 983, 986, 989, 990, 69, 991,
+ 996, 998, 995, 997, 999, 1000, 1005, 1006, 1011,-32768,
+-32768,-32768,-32768,-32768, 1018, 1019, 1026, 1036, 1037, 1043,
+ 1038,-32768, 1057, 193, 1139, 2952, 2973, 2994, 3015, 3036,
3057, 3078, 3099, 3120, 3141, 3162, 3183,-32768,-32768,-32768,
--32768, 1008,-32768,-32768,-32768, 768, 34, 1266, 1143, 1146,
- 16,-32768, 1145, 4984, 1069, 3204, 18,-32768,-32768,-32768,
--32768, 182,-32768, 1147,-32768, 1171,-32768,-32768, 1041, 287,
- 1201, 3225, 1178, 1179, 1223, 1266, 1266, 1233, 1234, 1235,
- 1236, 1237, 1239, 1240,-32768, 67, 2405, 6021, 2157, 381,
- 182, 1241, 182, 1242, 182, 7, 1266, 1266,-32768, 1243,
- 768, 768, 1165, 768, 334, 6044, 1266, 20, 1249, 1266,
- 768, 1247, 1263, 1262, 1103, 1268, 343, 1291, 1269, 1266,
- 1293, 1297, 1295, 1296, 1300, 343, 1266, 1266, 1266, 768,
- 1308, 1313, 343, 1266, 1330, 1331, 1317, 1266, 353,-32768,
--32768, 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266,
- 1266, 1266, 1266, 1332, 1329, 1333, 1498,-32768, 1334, 1336,
--32768, 1156, 1159, 1266,-32768, 42,-32768,-32768,-32768, 1163,
- 1266,-32768,-32768,-32768, 1607, 1653,-32768,-32768,-32768,-32768,
--32768,-32768,-32768, 1338, 1674, 1164,-32768, 1266,-32768, 1188,
- 229,-32768, 233,-32768, 235,-32768, -21, 3246, 3267, -108,
- 275,-32768, 290, 1166, 1265, 1266,-32768,-32768, 3288, 20,
+-32768, 1061,-32768,-32768,-32768, 768, 34, 67, 1143, 1146,
+ 17,-32768, 1145, 4984, 1069, 3204, 18,-32768,-32768,-32768,
+-32768, 145,-32768, 1147,-32768, 1151,-32768,-32768, 987, 291,
+ 1201, 3225, 1172, 1177, 1178, 67, 67, 1179, 1223, 1234,
+ 1235, 1237, 1239, 1240,-32768, 1582, 2405, 6021, 2157, 448,
+ 145, 1241, 145, 1242, 145, 8, 67, 67,-32768, 1243,
+ 768, 768, 1165, 768, 327, 6044, 67, 15, 1249, 67,
+ 768, 1247, 1263, 1262, 1103, 1268, 344, 1291, 1269, 67,
+ 1293, 1297, 1295, 1296, 1300, 344, 67, 67, 67, 768,
+ 1308, 1313, 344, 67, 1330, 1331, 1317, 67, 389,-32768,
+-32768, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+ 67, 67, 67, 1332, 1329, 1333, 1498,-32768, 1334, 1336,
+-32768, 1156, 1159, 67,-32768, 43,-32768,-32768,-32768, 1163,
+ 67,-32768,-32768,-32768, 1607, 1653,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768, 1674, 1338, 1164,-32768, 67,-32768, 1188,
+ 183,-32768, 202,-32768, 207,-32768, 1, 3246, 3267, -132,
+ 131,-32768, 296, 1166, 1265, 67,-32768,-32768, 3288, 15,
1184, 3309, 1192,-32768, 1193,-32768, 1194,-32768, 1209,-32768,
1206, 6067,-32768, 1207,-32768,-32768, 1212, 1213, 6090, 3330,
6113, 1210,-32768, 1215, 1216, 3351, 1214, 1217,-32768, 3372,
1219, 3393, 3414, 3435, 3456, 3477, 3498, 3519, 3540, 3561,
3582, 3603, 3624, 1221,-32768,-32768,-32768, 18,-32768, 1314,
- 1399, 3645,-32768,-32768, 3666,-32768,-32768,-32768,-32768, 381,
- 2186,-32768, 1266, 1266, 1266, 1407, 1232, -27,-32768, 1266,
- 1266, 1354,-32768, 768,-32768, 768, 1266, 2428, 768, 1277,
- 1435, -108, 343, 1441, 1266, 1439, 343, 1440, 1444, 1448,
- 1449, 1452, 1266, 1453, 768, 1454, 1455, 1266, 1461, 1467,
- 1266, 1469, 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266,
- 1266, 1266, 1266, 1266,-32768, 1475,-32768,-32768, 1266, 1470,
- 1307, 1266,-32768, 2451, 2474, 2497,-32768, 768, 1489,-32768,
- 2520, 2543, 1315,-32768, 1318, 1689,-32768, 1327, 20,-32768,
+ 1399, 3645,-32768,-32768, 3666,-32768,-32768,-32768,-32768, 448,
+ 2186,-32768, 67, 67, 67, 1407, 1232, -38,-32768, 67,
+ 67, 1354,-32768, 768,-32768, 768, 67, 2428, 768, 1277,
+ 1435, -132, 344, 1441, 67, 1439, 344, 1440, 1444, 1448,
+ 1449, 1452, 67, 1453, 768, 1454, 1455, 67, 1461, 1467,
+ 67, 1469, 67, 67, 67, 67, 67, 67, 67, 67,
+ 67, 67, 67, 67,-32768, 1475,-32768,-32768, 67, 1470,
+ 1307, 67,-32768, 2451, 2474, 2497,-32768, 768, 1489,-32768,
+ 2520, 2543, 1315,-32768, 1318, 1689,-32768, 1327, 15,-32768,
1339, 1340, 1341, 3687,-32768, 1319,-32768, 1321,-32768,-32768,
-32768, 6136,-32768, 1342,-32768,-32768, 6159, 1347,-32768, 6182,
1346, 3708, 3729, 3750, 3771, 3792, 3813, 3834, 3855, 3876,
6205, 6228, 6251,-32768, 2215, 1348,-32768, 2566, 1525, 1526,
- 10, 1351,-32768, 1528, 1529, 768, 768,-32768, 1530, 20,
- 343, 343, 343, 343, 1531, 1532, 1536, 343, 1537, 1545,
- 1546, 1551, 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266,
- 1266,-32768,-32768,-32768, 1266,-32768, 1553,-32768,-32768,-32768,
--32768, -21, 768,-32768,-32768, 1405, 1397,-32768, 20, 1406,
- 1408, 1411, 1436,-32768,-32768,-32768, 1433,-32768,-32768,-32768,
- 1434, 3897, 3918, 3939, 3960, 3981, 4002, 4023, 4044, 4065,
- 1437, 1438, 1442, 2589, 1446, -18, 1447, 768, 1534, 1473,
- 343, 343, 1613, 1616, 343, 1618, 1266, 1266, 1266, 1266,
- 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266,-32768, 1619,
- 1624, 768, 1485, 1487, 20, 1490, 1491,-32768,-32768, 1493,
- 1497, 4086, 4107, 4128, 4149, 4170, 4191, 4212, 4233, 4254,
- 291, 1201, 296, 1201, 300, 1201, 1492,-32768, 1494, 1594,
- 1266, 20, 343, 768, 1673, 1675, 1266, 1266, 1266, 1266,
- 1266, 1266, 1266, 1266, 1266, 1266, 1676, 1266, 1677, 1266,
- 1678, 1679, 1680, 1504, 4275, 20, 1506, 1508,-32768,-32768,
+ 13, 1351,-32768, 1528, 1529, 768, 768,-32768, 1530, 15,
+ 344, 344, 344, 344, 1531, 1532, 1536, 344, 1537, 1545,
+ 1546, 1551, 67, 67, 67, 67, 67, 67, 67, 67,
+ 67,-32768,-32768,-32768, 67,-32768, 1553,-32768,-32768,-32768,
+-32768, 1, 768,-32768,-32768, 1406, 1397,-32768, 15, 1408,
+ 1436, 1411, 1442,-32768,-32768,-32768, 1437,-32768,-32768,-32768,
+ 1443, 3897, 3918, 3939, 3960, 3981, 4002, 4023, 4044, 4065,
+ 1434, 1438, 1445, 2589, 1447, -36, 1487, 768, 1539, 1478,
+ 344, 344, 1618, 1624, 344, 1665, 67, 67, 67, 67,
+ 67, 67, 67, 67, 67, 67, 67, 67,-32768, 1666,
+ 1667, 768, 1488, 1492, 15, 1494, 1495,-32768,-32768, 1500,
+ 1501, 4086, 4107, 4128, 4149, 4170, 4191, 4212, 4233, 4254,
+ 297, 1201, 317, 1201, 326, 1201, 1497,-32768, 1499, 1599,
+ 67, 15, 344, 768, 1678, 1679, 67, 67, 67, 67,
+ 67, 67, 67, 67, 67, 67, 1680, 67, 1681, 67,
+ 1682, 1684, 1685, 1509, 4275, 15, 1511, 1512,-32768,-32768,
4296, 4317, 4338, 4359, 4380, 4401, 6274, 6297, 6320, 1201,
--32768, 1201,-32768, 1201,-32768,-32768,-32768, 1266, 1266, 1541,
- 343, 768, 1266, 1266, 1266, 1266, 1266, 1266,-32768,-32768,
--32768, 4422, 2612, 1542, 1510, 1512, 4443, 4464, 4485, 4506,
- 4527, 4548, 1514, 1515, 1516, 1266, 1694,-32768, 768, 343,
- 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266, 1266, 2635,
--32768, 1519, 1533, 4569, 4590, 4611, 4632, 4653, 4674, 301,
- 1201, 305, 1201, 323, 1201, 1700, 768, 1701, 1266, 1266,
- 1266, 1266, 1266, 1266, 1266, 1702, 1266, 1703, 1266, 1704,
--32768, 1538,-32768, 4695, 4716, 4737, 6343, 6366, 6389, 1201,
--32768, 1201,-32768, 1201,-32768, 768, 1266, 1266, 1266,-32768,
--32768,-32768, 1539, 4758, 4779, 4800, 1535, 1543, 1547, 768,
- 1266, 1266, 1266, 1266, 1266, 1266, 1552, 4821, 4842, 4863,
- 324, 1201, 327, 1201, 330, 1201, 343, 1266, 1266, 1266,
- 1266, 1706, 1266, 1707, 1266, 1708, 1554, 6412, 6435, 6458,
- 1201,-32768, 1201,-32768, 1201,-32768, 1713,-32768,-32768,-32768,
--32768, 1555, 1556, 1557, 1266, 1266, 1266, 331, 1201, 337,
- 1201, 338, 1201, 1266, 1719, 1266, 1722, 1266, 1727, 1201,
--32768, 1201,-32768, 1201,-32768, 1735, 1736,-32768
+-32768, 1201,-32768, 1201,-32768,-32768,-32768, 67, 67, 1547,
+ 344, 768, 67, 67, 67, 67, 67, 67,-32768,-32768,
+-32768, 4422, 2612, 1548, 1516, 1518, 4443, 4464, 4485, 4506,
+ 4527, 4548, 1523, 1524, 1527, 67, 1695,-32768, 768, 344,
+ 67, 67, 67, 67, 67, 67, 67, 67, 67, 2635,
+-32768, 1538, 1533, 4569, 4590, 4611, 4632, 4653, 4674, 330,
+ 1201, 331, 1201, 334, 1201, 1702, 768, 1703, 67, 67,
+ 67, 67, 67, 67, 67, 1706, 67, 1707, 67, 1708,
+-32768, 1543,-32768, 4695, 4716, 4737, 6343, 6366, 6389, 1201,
+-32768, 1201,-32768, 1201,-32768, 768, 67, 67, 67,-32768,
+-32768,-32768, 1544, 4758, 4779, 4800, 1535, 1549, 1552, 768,
+ 67, 67, 67, 67, 67, 67, 1554, 4821, 4842, 4863,
+ 337, 1201, 338, 1201, 345, 1201, 344, 67, 67, 67,
+ 67, 1713, 67, 1715, 67, 1722, 1555, 6412, 6435, 6458,
+ 1201,-32768, 1201,-32768, 1201,-32768, 1724,-32768,-32768,-32768,
+-32768, 1556, 1557, 1558, 67, 67, 67, 346, 1201, 372,
+ 1201, 375, 1201, 67, 1728, 67, 1732, 67, 1736, 1201,
+-32768, 1201,-32768, 1201,-32768, 1743, 1745,-32768
};
static const short yypgoto[] = {-32768,
-73,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 1200,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768, 1203,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, -258, -22,
--32768, 1737, 1738, -321, 281, 1739,-32768,-32768,-32768,-32768,
- 511, -1070,-32768,-32768, -905, -23,-32768, -29,-32768, -84,
--32768, -967, 840, 785, -261, -287, -726, 896,-32768, -246
+-32768, 1739, 1740, -321, -46, 1746,-32768,-32768,-32768,-32768,
+ 524, -1068,-32768,-32768, -900, -23,-32768, -29,-32768, -84,
+-32768, -956, 848, 785, -261, -293, -726, 900,-32768, -244
};
@@ -1077,105 +1077,105 @@ static const short yypgoto[] = {-32768,
static const short yytable[] = { 132,
- 131, 417, 227, 853, 482, 194, 421, 1140, 410, 411,
- 412, 1019, 996, 457, 169, 1231, 860, 176, 232, 604,
- 1028, 732, 77, 9, 265, 184, 186, 1035, 137, 10,
- 8, 144, 1082, 339, 138, 1076, 141, 420, 409, 417,
- 1077, 1076, 125, 126, 1076, 80, 1077, 1063, 229, 1077,
- 230, 542, 543, 544, 545, 546, 547, 548, 549, 550,
- 551, 552, 553, 81, 861, 115, 116, 117, 901, 89,
- 90, 984, 125, 126, 902, 93, 94, 95, 96, 97,
+ 131, 417, 227, 853, 482, 194, 421, 457, 176, 1140,
+ 410, 411, 412, 996, 169, 186, 1019, 77, 1231, 232,
+ 604, 732, 141, 9, 1076, 1028, 1076, 265, 184, 1077,
+ 861, 1077, 1035, 339, 137, 10, 144, 420, 409, 417,
+ 138, 125, 126, 1082, 901, 723, 860, 229, 1063, 230,
+ 902, 542, 543, 544, 545, 546, 547, 548, 549, 550,
+ 551, 552, 553, 1076, 80, 115, 116, 117, 1077, 89,
+ 90, 862, 588, 8, 589, 93, 94, 95, 96, 97,
98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
108, 109, 110, 111, 112, 113, 114, 441, 258, 259,
- 260, 442, 82, 261, 264, 862, 268, 266, 267, 408,
- 409, 177, 83, 288, 289, 290, 291, 92, 293, 294,
- 347, 296, 297, 298, 1151, 305, 340, 282, 283, 284,
- 965, 84, 318, 319, 320, 285, 85, 115, 116, 117,
- 327, 321, 322, 11, 12, 13, 14, 15, 16, 17,
- 18, 142, 145, 723, 609, 181, 1139, 143, 182, 338,
- 598, 341, 185, 343, 344, 1291, 554, 534, 624, 323,
- 324, 535, 92, 600, 323, 324, 323, 324, 489, 490,
- 417, 912, 118, 119, 120, 121, 78, 1152, 86, 997,
- 473, 1156, 1232, 87, 417, 1140, 178, 233, 605, 187,
- 733, 136, 385, 125, 126, 383, 847, 323, 324, 88,
+ 260, 442, 177, 261, 264, 534, 268, 323, 324, 535,
+ 266, 267, 81, 288, 289, 290, 291, 92, 293, 294,
+ 347, 296, 297, 298, 325, 305, 340, 331, 724, 725,
+ 965, 335, 318, 319, 320, 1151, 86, 142, 125, 126,
+ 327, 321, 322, 143, 454, 1139, 230, 1291, 609, 11,
+ 12, 13, 14, 15, 16, 17, 18, 145, 82, 338,
+ 598, 341, 624, 343, 344, 185, 554, 323, 324, 323,
+ 324, 181, 92, 83, 182, 600, 323, 324, 847, 912,
+ 417, 78, 118, 119, 120, 121, 326, 178, 187, 84,
+ 997, 85, 1152, 541, 417, 1232, 1156, 1140, 233, 605,
+ 733, 136, 385, 125, 126, 383, 323, 324, 323, 324,
387, 388, 389, 390, 391, 392, 393, 394, 395, 396,
397, 398, 399, 400, 401, 402, 403, 404, 405, 406,
- 407, 135, 122, 123, 323, 324, 724, 725, 124, 416,
- 139, 171, 422, 127, 172, 173, 921, 426, 427, 428,
+ 407, 87, 122, 123, 323, 324, 590, 738, 124, 416,
+ 591, 595, 422, 127, 408, 409, 921, 426, 427, 428,
429, 430, 431, 432, 433, 434, 435, 436, 437, 438,
- 439, 440, 118, 119, 120, 121, 125, 126, 447, 323,
- 324, 450, 454, 148, 230, 157, 259, 416, 158, 159,
- 150, 160, 461, 462, 463, 483, 465, 466, 467, 468,
- 469, 470, 471, 476, 477, 1240, 1241, 1242, 1243, 588,
- 140, 589, 1247, 717, 484, 485, 486, 323, 324, 491,
- 323, 324, 876, 877, 323, 324, 497, 118, 119, 120,
- 121, 151, 502, 891, 146, 892, 893, 147, 894, 417,
- 895, 1126, 896, 721, 747, 149, 125, 126, 125, 126,
- 156, 1006, 323, 324, 695, 718, 597, 163, 164, 885,
- 886, 118, 119, 120, 121, 595, 152, 596, 165, 325,
- 417, 540, 161, 162, 166, 1296, 1297, 323, 324, 1300,
- 323, 324, 125, 126, 26, 27, 28, 29, 30, 31,
- 32, 33, 179, 34, 326, 36, 37, 541, 39, 40,
- 170, 259, 323, 324, 323, 324, 599, 601, 323, 324,
- 323, 324, 590, 125, 126, 52, 591, 175, 767, 623,
- 1073, 230, 153, 154, 1074, 155, 1075, 1347, 416, 53,
- 54, 280, 281, 282, 283, 284, 595, 180, 625, 738,
- 383, 285, 416, 595, 626, 627, 42, 43, 44, 45,
- 632, 47, 183, 641, 810, 811, 812, 813, 814, 844,
- 642, 643, 1083, 595, 331, 595, 1084, 750, 335, 646,
- 857, 870, 858, 846, 848, 1385, 650, 595, 595, 869,
- 970, 1084, 1336, 1085, 1337, 658, 659, 1338, 188, 1339,
- 63, 1340, 1435, 1341, 1436, 174, 1437, 417, 1438, 271,
- 272, 273, 274, 275, 1413, 276, 277, 278, 279, 280,
- 281, 282, 283, 284, 1439, 1491, 1440, 1492, 1493, 285,
- 1494, 1495, 1524, 1496, 1525, 189, 696, 1007, 1526, 1528,
- 1527, 1529, 487, 190, 89, 90, 191, 192, 193, 225,
+ 439, 440, 118, 119, 120, 121, 489, 490, 447, 323,
+ 324, 450, 115, 116, 117, 171, 259, 416, 172, 173,
+ 323, 324, 461, 462, 463, 473, 465, 466, 467, 468,
+ 469, 470, 471, 476, 477, 844, 891, 717, 892, 595,
+ 1240, 1241, 1242, 1243, 484, 485, 486, 1247, 1083, 491,
+ 163, 164, 1084, 88, 323, 324, 497, 118, 119, 120,
+ 121, 165, 502, 118, 119, 120, 121, 166, 747, 417,
+ 893, 1126, 894, 721, 1006, 323, 324, 135, 125, 126,
+ 323, 324, 323, 324, 125, 126, 597, 718, 323, 324,
+ 595, 895, 596, 896, 125, 126, 483, 595, 767, 625,
+ 417, 540, 695, 139, 1073, 125, 126, 323, 324, 156,
+ 1296, 1297, 323, 324, 1300, 26, 27, 28, 29, 30,
+ 31, 32, 33, 1074, 34, 140, 36, 37, 1075, 39,
+ 40, 259, 153, 154, 146, 155, 599, 601, 280, 281,
+ 282, 283, 284, 595, 147, 750, 52, 148, 285, 276,
+ 277, 278, 279, 280, 281, 282, 283, 284, 416, 149,
+ 53, 54, 1347, 285, 150, 282, 283, 284, 876, 877,
+ 383, 151, 416, 285, 626, 627, 125, 126, 885, 886,
+ 632, 152, 623, 641, 230, 810, 811, 812, 813, 814,
+ 642, 643, 161, 162, 157, 870, 170, 158, 159, 646,
+ 160, 174, 175, 846, 848, 857, 650, 858, 179, 595,
+ 1385, 869, 595, 180, 970, 658, 659, 1084, 1336, 1085,
+ 1337, 63, 271, 272, 273, 274, 275, 417, 276, 277,
+ 278, 279, 280, 281, 282, 283, 284, 183, 1338, 1413,
+ 1339, 188, 285, 42, 43, 44, 45, 1340, 47, 1341,
+ 1007, 1435, 1437, 1436, 1438, 1439, 696, 1440, 1491, 1493,
+ 1492, 1494, 189, 487, 89, 90, 1495, 1524, 1496, 1525,
93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 228, 287, 711, 234, 235, 269, 236, 237,
- 238, 712, 713, 714, 715, 239, 240, 416, 990, 241,
- 242, 720, 243, 244, 726, 245, 246, 247, 248, 249,
- 739, 1497, 250, 737, 542, 543, 544, 545, 546, 547,
- 548, 549, 550, 551, 552, 553, 251, 252, 416, 383,
- 956, 253, 254, 255, 256, 257, 286, 292, 295, 823,
- 307, 308, 306, 312, 317, 310, 313, 771, 772, 773,
- 311, 314, 315, 316, 328, 329, 330, 333, 776, 777,
- 334, 779, 342, 345, 346, 790, 348, 349, 350, 788,
- 789, 89, 90, 351, 799, 352, 353, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 354,
- 355, 356, 357, 358, 826, 827, 828, 829, 830, 831,
- 832, 833, 834, 835, 836, 837, 757, 122, 123, 359,
- 360, 361, 378, 124, 362, 363, 384, 364, 127, 825,
- 849, 262, 381, 365, 263, 366, 367, 854, 368, 856,
- 369, 370, 908, 274, 275, 371, 276, 277, 278, 279,
- 280, 281, 282, 283, 284, 416, 372, 871, 380, 872,
- 285, 285, 758, 276, 277, 278, 279, 280, 281, 282,
- 283, 284, 373, 887, 888, 889, 374, 285, 1131, 375,
- 376, 377, 382, 414, 424, 459, 423, 464, 905, 906,
- 472, 493, 494, 496, 499, 503, 504, 505, 506, 507,
- 89, 299, 527, 508, 509, 510, 93, 94, 95, 96,
+ 113, 114, 190, 1526, 711, 1527, 1528, 191, 1529, 192,
+ 193, 712, 713, 714, 715, 225, 228, 416, 990, 234,
+ 235, 720, 236, 237, 726, 238, 239, 240, 269, 241,
+ 739, 242, 243, 737, 274, 275, 1497, 276, 277, 278,
+ 279, 280, 281, 282, 283, 284, 244, 245, 416, 383,
+ 246, 285, 956, 247, 248, 249, 250, 251, 252, 823,
+ 253, 254, 255, 256, 257, 286, 287, 771, 772, 773,
+ 292, 295, 306, 307, 310, 308, 317, 312, 776, 777,
+ 313, 779, 311, 314, 315, 790, 316, 328, 329, 788,
+ 789, 985, 89, 90, 799, 333, 330, 334, 93, 94,
+ 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 342, 345, 346, 348, 826, 827, 828, 829, 830, 831,
+ 832, 833, 834, 835, 836, 837, 757, 122, 123, 349,
+ 350, 351, 352, 124, 353, 354, 378, 355, 127, 356,
+ 849, 262, 357, 358, 263, 359, 360, 854, 361, 856,
+ 362, 363, 908, 542, 543, 544, 545, 546, 547, 548,
+ 549, 550, 551, 552, 553, 416, 364, 871, 365, 872,
+ 384, 366, 758, 367, 380, 368, 369, 370, 414, 371,
+ 372, 373, 374, 887, 888, 889, 375, 376, 1131, 381,
+ 377, 285, 424, 459, 464, 472, 382, 423, 905, 906,
+ 493, 494, 496, 503, 499, 504, 505, 506, 507, 508,
+ 89, 299, 527, 509, 510, 511, 93, 94, 95, 96,
97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 113, 114, 511, 512,
- 513, 940, 514, 515, 122, 123, 516, 517, 518, 519,
- 124, 520, 521, 522, 523, 127, 524, 525, 621, 526,
- 528, 622, 529, 530, 957, 531, 532, 533, 592, 536,
+ 107, 108, 109, 110, 111, 112, 113, 114, 512, 513,
+ 514, 940, 515, 516, 517, 122, 123, 518, 519, 520,
+ 521, 124, 522, 523, 524, 525, 127, 526, 528, 621,
+ 529, 530, 622, 531, 957, 532, 533, 592, 825, 536,
593, 537, 966, 538, 1010, 602, 271, 272, 273, 274,
275, 603, 276, 277, 278, 279, 280, 281, 282, 283,
- 284, 608, 975, 976, 1041, 610, 285, 611, 640, 612,
- 613, 991, 985, 993, 615, 995, 616, 618, 644, 619,
- 620, 628, 645, 998, 999, 654, 652, 653, 655, 657,
- 661, 662, 663, 1009, 664, 783, 1012, 665, 666, 667,
+ 284, 608, 975, 976, 1041, 610, 285, 611, 644, 612,
+ 613, 991, 984, 993, 615, 995, 616, 618, 640, 619,
+ 620, 628, 645, 998, 999, 652, 653, 654, 655, 657,
+ 662, 661, 663, 1009, 664, 783, 1012, 665, 666, 667,
668, 669, 670, 671, 672, 673, 1022, 674, 675, 676,
- 677, 678, 679, 1029, 1030, 1031, 680, 681, 682, 683,
- 1036, 684, 685, 692, 1040, 686, 687, 688, 1042, 1043,
+ 677, 678, 679, 1029, 1030, 1031, 680, 681, 692, 682,
+ 1036, 683, 684, 698, 1040, 685, 686, 687, 1042, 1043,
1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051, 1052, 1053,
- 693, 689, 303, 122, 300, 690, 1090, 309, 691, 124,
- 1062, 694, 698, 699, 127, 710, 716, 1065, 700, 701,
- 301, 702, 703, 704, 705, 706, 707, 708, 709, 332,
- 270, 719, 722, 727, 1071, 336, 337, 728, 731, 730,
- 736, 753, 742, 744, 754, 755, 766, 89, 90, 756,
- 759, 775, 1088, 93, 94, 95, 96, 97, 98, 99,
+ 688, 689, 303, 122, 300, 693, 1090, 309, 690, 124,
+ 1062, 691, 699, 710, 127, 716, 719, 1065, 694, 700,
+ 301, 701, 702, 703, 704, 705, 706, 707, 708, 332,
+ 270, 727, 709, 722, 1071, 336, 337, 728, 731, 730,
+ 736, 753, 742, 744, 754, 755, 775, 89, 90, 756,
+ 759, 766, 1088, 93, 94, 95, 96, 97, 98, 99,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
110, 111, 112, 113, 114, 89, 455, 760, 761, 787,
762, 93, 94, 95, 96, 97, 98, 99, 100, 101,
@@ -1192,18 +1192,18 @@ static const short yytable[] = { 132,
280, 281, 282, 283, 284, 868, 1239, 273, 274, 275,
285, 276, 277, 278, 279, 280, 281, 282, 283, 284,
122, 123, 890, 899, 941, 285, 124, 904, 958, 959,
- 961, 127, 967, 907, 748, 963, 914, 749, 909, 913,
- 916, 915, 917, 918, 923, 1270, 919, 752, 122, 123,
- 920, 922, 924, 925, 124, 926, 968, 927, 928, 127,
- 929, 930, 931, 972, 973, 456, 937, 932, 954, 1252,
- 1253, 1254, 1255, 1256, 1257, 1258, 1259, 1260, 594, 933,
- 934, 1264, 271, 272, 273, 274, 275, 935, 276, 277,
- 278, 279, 280, 281, 282, 283, 284, 936, 938, 939,
- 969, 1322, 285, 271, 272, 273, 274, 275, 974, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 977, 978,
- 979, 980, 981, 285, 982, 983, 992, 994, 1346, 1000,
+ 961, 127, 967, 909, 748, 963, 968, 749, 907, 914,
+ 913, 915, 916, 918, 917, 1270, 969, 752, 122, 123,
+ 919, 920, 922, 923, 124, 924, 925, 972, 926, 127,
+ 927, 928, 973, 974, 977, 456, 929, 930, 931, 1252,
+ 1253, 1254, 1255, 1256, 1257, 1258, 1259, 1260, 594, 932,
+ 933, 1264, 271, 272, 273, 274, 275, 934, 276, 277,
+ 278, 279, 280, 281, 282, 283, 284, 935, 936, 938,
+ 937, 1322, 285, 271, 272, 273, 274, 275, 978, 276,
+ 277, 278, 279, 280, 281, 282, 283, 284, 939, 979,
+ 980, 954, 981, 285, 982, 983, 992, 994, 1346, 1000,
1004, 1011, 1014, 1302, 1303, 1304, 1305, 1306, 1307, 1308,
- 1309, 1310, 1312, 1314, 1316, 1015, 774, 1016, 89, 90,
+ 1309, 1310, 1312, 1314, 1316, 1015, 774, 1016, 89, 299,
1017, 1021, 1370, 1018, 93, 94, 95, 96, 97, 98,
99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 1020, 1345, 1023, 1024,
@@ -1211,7 +1211,7 @@ static const short yytable[] = { 132,
1358, 1359, 1360, 1033, 1362, 1034, 1364, 271, 272, 273,
274, 275, 1039, 276, 277, 278, 279, 280, 281, 282,
283, 284, 1037, 1038, 1055, 1054, 1060, 285, 1056, 1061,
- 1058, 1059, 1064, 1068, 1382, 1383, 1070, 1087, 1086, 1387,
+ 1058, 1059, 1064, 1069, 1382, 1383, 1070, 1087, 1086, 1387,
1388, 1389, 1390, 1391, 1392, 852, 271, 272, 273, 274,
275, 1091, 276, 277, 278, 279, 280, 281, 282, 283,
284, 1072, 1410, 1093, 1094, 1095, 285, 1414, 1415, 1416,
@@ -1220,7 +1220,7 @@ static const short yytable[] = { 132,
1112, 1127, 1128, 745, 746, 1444, 1445, 1446, 1447, 1448,
1449, 1450, 1137, 1452, 1138, 1454, 271, 272, 273, 274,
275, 1149, 276, 277, 278, 279, 280, 281, 282, 283,
- 284, 122, 123, 1464, 1465, 1466, 285, 124, 778, 1143,
+ 284, 122, 415, 1464, 1465, 1466, 285, 124, 778, 1143,
1150, 781, 127, 1153, 1155, 1157, 1158, 1478, 1479, 1480,
1482, 1484, 1486, 1159, 1160, 796, 797, 1161, 1163, 1165,
1166, 802, 803, 1168, 1498, 1499, 1500, 1501, 809, 1503,
@@ -1235,24 +1235,24 @@ static const short yytable[] = { 132,
1249, 1250, 89, 90, 91, 1251, 92, 1265, 93, 94,
95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 1269, 115, 116, 117, 89, 299, 1268, 1271, 1273, 1272,
+ 1269, 115, 116, 117, 89, 90, 409, 1268, 1273, 1271,
93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 1066, 1274, 1275, 1276, 1294, 1295, 1298, 1286,
- 1287, 1299, 1301, 1317, 1288, 89, 455, 1290, 1292, 1318,
+ 113, 114, 1066, 115, 116, 117, 1286, 1272, 1275, 1274,
+ 1287, 1294, 1295, 1298, 1276, 89, 455, 1288, 1290, 1299,
955, 93, 94, 95, 96, 97, 98, 99, 100, 101,
102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
112, 113, 114, 271, 272, 273, 274, 275, 1067, 276,
- 277, 278, 279, 280, 281, 282, 283, 284, 1320, 1321,
- 1325, 1323, 1324, 285, 1326, 1342, 1344, 1343, 1349, 1069,
- 1350, 1361, 1363, 1365, 1366, 1367, 1368, 1371, 1005, 1372,
- 1384, 1399, 1398, 1400, 1198, 1013, 1407, 1408, 1409, 1411,
- 1427, 118, 119, 120, 121, 1441, 1443, 1451, 1453, 1455,
- 1428, 1502, 1504, 1506, 1032, 122, 123, 1474, 1511, 1456,
- 1470, 124, 125, 126, 1531, 1475, 127, 1533, 128, 1476,
- 129, 1507, 1535, 1487, 1537, 1538, 458, 1515, 1516, 1517,
- 697, 1003, 1266, 68, 69, 70, 960, 122, 415, 0,
- 0, 500, 0, 124, 0, 0, 0, 0, 127, 0,
+ 277, 278, 279, 280, 281, 282, 283, 284, 1292, 1301,
+ 1317, 1320, 1318, 285, 1321, 1323, 1324, 1325, 1326, 1068,
+ 1342, 1344, 1343, 1349, 1350, 1361, 1363, 1365, 1005, 1366,
+ 1367, 1368, 1371, 1372, 1198, 1013, 1384, 1399, 1398, 1400,
+ 1411, 118, 119, 120, 121, 1407, 1408, 1441, 1443, 1409,
+ 1428, 1451, 1453, 1455, 1032, 122, 123, 1474, 1502, 1427,
+ 1504, 124, 125, 126, 1456, 1470, 127, 1506, 128, 1511,
+ 129, 1475, 1507, 1531, 1476, 1487, 458, 1533, 1515, 1516,
+ 1517, 1535, 1537, 697, 1538, 68, 69, 122, 123, 1003,
+ 960, 500, 70, 124, 0, 1266, 0, 0, 127, 0,
0, 0, 271, 272, 273, 274, 275, 0, 276, 277,
278, 279, 280, 281, 282, 283, 284, 607, 0, 0,
0, 0, 285, 0, 0, 0, 0, 0, 122, 123,
@@ -1744,105 +1744,105 @@ static const short yytable[] = { 132,
};
static const short yycheck[] = { 23,
- 23, 263, 87, 730, 326, 79, 265, 1078, 255, 256,
- 257, 917, 6, 301, 44, 6, 6, 4, 4, 4,
- 926, 4, 3, 147, 4, 40, 4, 933, 177, 3,
- 6, 62, 1000, 84, 183, 63, 62, 7, 5, 301,
- 68, 63, 173, 174, 63, 7, 68, 6, 179, 68,
- 181, 69, 70, 71, 72, 73, 74, 75, 76, 77,
- 78, 79, 80, 6, 6, 32, 33, 34, 177, 3,
- 4, 5, 173, 174, 183, 9, 10, 11, 12, 13,
+ 23, 263, 87, 730, 326, 79, 265, 301, 4, 1078,
+ 255, 256, 257, 6, 44, 4, 917, 3, 6, 4,
+ 4, 4, 62, 147, 63, 926, 63, 4, 40, 68,
+ 6, 68, 933, 84, 177, 3, 62, 7, 5, 301,
+ 183, 173, 174, 1000, 177, 4, 6, 179, 6, 181,
+ 183, 69, 70, 71, 72, 73, 74, 75, 76, 77,
+ 78, 79, 80, 63, 7, 32, 33, 34, 68, 3,
+ 4, 47, 179, 6, 181, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 178, 122, 123,
- 124, 182, 6, 127, 128, 47, 130, 87, 88, 4,
- 5, 98, 6, 137, 138, 139, 140, 7, 142, 143,
- 194, 145, 146, 147, 1092, 149, 177, 168, 169, 170,
- 857, 6, 162, 163, 164, 176, 6, 32, 33, 34,
- 170, 165, 166, 117, 118, 119, 120, 121, 122, 123,
- 124, 177, 183, 4, 442, 36, 184, 183, 39, 183,
- 419, 185, 177, 187, 188, 184, 184, 178, 456, 166,
- 167, 182, 7, 420, 166, 167, 166, 167, 6, 7,
- 442, 178, 152, 153, 154, 155, 167, 1093, 177, 183,
- 182, 1097, 183, 177, 456, 1266, 183, 183, 183, 177,
- 183, 6, 232, 173, 174, 229, 7, 166, 167, 177,
+ 124, 182, 98, 127, 128, 178, 130, 166, 167, 182,
+ 87, 88, 6, 137, 138, 139, 140, 7, 142, 143,
+ 194, 145, 146, 147, 183, 149, 177, 174, 87, 88,
+ 857, 178, 162, 163, 164, 1092, 177, 177, 173, 174,
+ 170, 165, 166, 183, 179, 184, 181, 184, 442, 117,
+ 118, 119, 120, 121, 122, 123, 124, 183, 6, 183,
+ 419, 185, 456, 187, 188, 177, 184, 166, 167, 166,
+ 167, 36, 7, 6, 39, 420, 166, 167, 7, 178,
+ 442, 167, 152, 153, 154, 155, 183, 183, 177, 6,
+ 183, 6, 1093, 183, 456, 183, 1097, 1266, 183, 183,
+ 183, 6, 232, 173, 174, 229, 166, 167, 166, 167,
234, 235, 236, 237, 238, 239, 240, 241, 242, 243,
244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
- 254, 177, 166, 167, 166, 167, 87, 88, 172, 263,
- 177, 36, 265, 177, 39, 40, 178, 271, 272, 273,
+ 254, 177, 166, 167, 166, 167, 178, 178, 172, 263,
+ 182, 182, 265, 177, 4, 5, 178, 271, 272, 273,
274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
- 284, 285, 152, 153, 154, 155, 173, 174, 292, 166,
- 167, 295, 179, 44, 181, 36, 300, 301, 39, 40,
- 40, 42, 306, 307, 308, 182, 310, 311, 312, 313,
- 314, 315, 316, 323, 324, 1201, 1202, 1203, 1204, 179,
- 177, 181, 1208, 591, 328, 329, 330, 166, 167, 333,
- 166, 167, 53, 54, 166, 167, 340, 152, 153, 154,
- 155, 40, 346, 182, 177, 184, 182, 177, 184, 591,
- 182, 1058, 184, 595, 622, 177, 173, 174, 173, 174,
- 42, 8, 166, 167, 181, 592, 181, 166, 167, 6,
- 7, 152, 153, 154, 155, 182, 40, 184, 177, 183,
- 622, 384, 177, 183, 183, 1271, 1272, 166, 167, 1275,
- 166, 167, 173, 174, 36, 37, 38, 39, 40, 41,
- 42, 43, 6, 45, 183, 47, 48, 183, 50, 51,
- 183, 415, 166, 167, 166, 167, 419, 421, 166, 167,
- 166, 167, 178, 173, 174, 67, 182, 40, 182, 179,
- 182, 181, 39, 40, 182, 42, 182, 1323, 442, 81,
- 82, 166, 167, 168, 169, 170, 182, 6, 184, 178,
- 454, 176, 456, 182, 458, 459, 56, 57, 58, 59,
- 464, 61, 177, 473, 102, 103, 104, 105, 106, 178,
- 474, 475, 178, 182, 174, 182, 182, 184, 178, 483,
- 182, 749, 184, 722, 723, 1371, 490, 182, 182, 184,
- 184, 182, 182, 184, 184, 499, 500, 182, 177, 184,
- 142, 182, 182, 184, 184, 183, 182, 749, 184, 156,
- 157, 158, 159, 160, 1400, 162, 163, 164, 165, 166,
- 167, 168, 169, 170, 182, 182, 184, 184, 182, 176,
- 184, 182, 182, 184, 184, 6, 539, 184, 182, 182,
- 184, 184, 184, 4, 3, 4, 4, 40, 3, 177,
+ 284, 285, 152, 153, 154, 155, 6, 7, 292, 166,
+ 167, 295, 32, 33, 34, 36, 300, 301, 39, 40,
+ 166, 167, 306, 307, 308, 182, 310, 311, 312, 313,
+ 314, 315, 316, 323, 324, 178, 182, 591, 184, 182,
+ 1201, 1202, 1203, 1204, 328, 329, 330, 1208, 178, 333,
+ 166, 167, 182, 177, 166, 167, 340, 152, 153, 154,
+ 155, 177, 346, 152, 153, 154, 155, 183, 622, 591,
+ 182, 1058, 184, 595, 8, 166, 167, 177, 173, 174,
+ 166, 167, 166, 167, 173, 174, 181, 592, 166, 167,
+ 182, 182, 184, 184, 173, 174, 182, 182, 182, 184,
+ 622, 384, 181, 177, 182, 173, 174, 166, 167, 42,
+ 1271, 1272, 166, 167, 1275, 36, 37, 38, 39, 40,
+ 41, 42, 43, 182, 45, 177, 47, 48, 182, 50,
+ 51, 415, 39, 40, 177, 42, 419, 421, 166, 167,
+ 168, 169, 170, 182, 177, 184, 67, 44, 176, 162,
+ 163, 164, 165, 166, 167, 168, 169, 170, 442, 177,
+ 81, 82, 1323, 176, 40, 168, 169, 170, 53, 54,
+ 454, 40, 456, 176, 458, 459, 173, 174, 6, 7,
+ 464, 40, 179, 473, 181, 102, 103, 104, 105, 106,
+ 474, 475, 177, 183, 36, 749, 183, 39, 40, 483,
+ 42, 183, 40, 722, 723, 182, 490, 184, 6, 182,
+ 1371, 184, 182, 6, 184, 499, 500, 182, 182, 184,
+ 184, 142, 156, 157, 158, 159, 160, 749, 162, 163,
+ 164, 165, 166, 167, 168, 169, 170, 177, 182, 1400,
+ 184, 177, 176, 56, 57, 58, 59, 182, 61, 184,
+ 184, 182, 182, 184, 184, 182, 539, 184, 182, 182,
+ 184, 184, 6, 184, 3, 4, 182, 182, 184, 184,
9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 5, 5, 578, 177, 177, 6, 177, 177,
- 177, 585, 586, 587, 588, 177, 177, 591, 890, 177,
- 177, 595, 177, 177, 598, 177, 177, 177, 177, 177,
- 610, 1487, 177, 607, 69, 70, 71, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 177, 177, 622, 623,
- 847, 177, 177, 177, 177, 177, 6, 177, 177, 694,
- 177, 177, 183, 177, 5, 183, 177, 647, 648, 649,
- 183, 177, 177, 177, 183, 183, 183, 179, 652, 653,
- 6, 655, 90, 6, 177, 665, 177, 177, 177, 663,
- 664, 3, 4, 177, 674, 177, 177, 9, 10, 11,
- 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 177,
- 177, 177, 177, 177, 698, 699, 700, 701, 702, 703,
+ 29, 30, 4, 182, 578, 184, 182, 4, 184, 40,
+ 3, 585, 586, 587, 588, 177, 5, 591, 890, 177,
+ 177, 595, 177, 177, 598, 177, 177, 177, 6, 177,
+ 610, 177, 177, 607, 159, 160, 1487, 162, 163, 164,
+ 165, 166, 167, 168, 169, 170, 177, 177, 622, 623,
+ 177, 176, 847, 177, 177, 177, 177, 177, 177, 694,
+ 177, 177, 177, 177, 177, 6, 5, 647, 648, 649,
+ 177, 177, 183, 177, 183, 177, 4, 177, 652, 653,
+ 177, 655, 183, 177, 177, 665, 177, 183, 183, 663,
+ 664, 886, 3, 4, 674, 179, 183, 6, 9, 10,
+ 11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
+ 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
+ 90, 6, 177, 177, 698, 699, 700, 701, 702, 703,
704, 705, 706, 707, 708, 709, 6, 166, 167, 177,
- 177, 177, 5, 172, 177, 177, 4, 177, 177, 184,
- 723, 180, 178, 177, 183, 177, 177, 731, 177, 733,
- 177, 177, 786, 159, 160, 177, 162, 163, 164, 165,
- 166, 167, 168, 169, 170, 749, 177, 751, 182, 753,
- 176, 176, 52, 162, 163, 164, 165, 166, 167, 168,
- 169, 170, 177, 767, 768, 769, 177, 176, 1070, 177,
- 177, 177, 182, 7, 7, 7, 181, 7, 782, 783,
- 178, 7, 7, 85, 183, 148, 5, 5, 5, 5,
+ 177, 177, 177, 172, 177, 177, 5, 177, 177, 177,
+ 723, 180, 177, 177, 183, 177, 177, 731, 177, 733,
+ 177, 177, 786, 69, 70, 71, 72, 73, 74, 75,
+ 76, 77, 78, 79, 80, 749, 177, 751, 177, 753,
+ 4, 177, 52, 177, 182, 177, 177, 177, 7, 177,
+ 177, 177, 177, 767, 768, 769, 177, 177, 1070, 178,
+ 177, 176, 7, 7, 7, 178, 182, 181, 782, 783,
+ 7, 7, 85, 148, 183, 5, 5, 5, 5, 5,
3, 4, 135, 5, 5, 5, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 5, 5,
- 5, 824, 5, 5, 166, 167, 5, 5, 5, 5,
- 172, 5, 5, 5, 5, 177, 5, 5, 180, 5,
- 5, 183, 5, 5, 848, 5, 3, 5, 182, 5,
+ 5, 824, 5, 5, 5, 166, 167, 5, 5, 5,
+ 5, 172, 5, 5, 5, 5, 177, 5, 5, 180,
+ 5, 5, 183, 5, 848, 3, 5, 182, 184, 5,
178, 6, 862, 5, 908, 6, 156, 157, 158, 159,
160, 4, 162, 163, 164, 165, 166, 167, 168, 169,
- 170, 6, 876, 877, 939, 7, 176, 6, 181, 7,
- 7, 891, 886, 893, 7, 895, 6, 6, 184, 7,
- 7, 7, 184, 897, 898, 7, 183, 183, 177, 7,
- 149, 182, 182, 907, 182, 8, 910, 182, 182, 182,
+ 170, 6, 876, 877, 939, 7, 176, 6, 184, 7,
+ 7, 891, 886, 893, 7, 895, 6, 6, 181, 7,
+ 7, 7, 184, 897, 898, 183, 183, 7, 177, 7,
+ 182, 149, 182, 907, 182, 8, 910, 182, 182, 182,
182, 182, 182, 182, 182, 182, 920, 182, 182, 182,
- 182, 182, 182, 927, 928, 929, 182, 182, 182, 182,
- 934, 182, 182, 5, 938, 182, 182, 182, 942, 943,
+ 182, 182, 182, 927, 928, 929, 182, 182, 5, 182,
+ 934, 182, 182, 177, 938, 182, 182, 182, 942, 943,
944, 945, 946, 947, 948, 949, 950, 951, 952, 953,
- 178, 182, 148, 166, 167, 182, 1010, 153, 182, 172,
- 964, 182, 177, 177, 177, 6, 4, 971, 177, 177,
+ 182, 182, 148, 166, 167, 178, 1010, 153, 182, 172,
+ 964, 182, 177, 6, 177, 4, 6, 971, 182, 177,
183, 177, 177, 177, 177, 177, 177, 177, 177, 175,
- 6, 6, 180, 6, 988, 181, 182, 6, 179, 7,
- 6, 183, 7, 7, 7, 7, 5, 3, 4, 7,
- 7, 6, 1006, 9, 10, 11, 12, 13, 14, 15,
+ 6, 6, 177, 180, 988, 181, 182, 6, 179, 7,
+ 6, 183, 7, 7, 7, 7, 6, 3, 4, 7,
+ 7, 4, 1006, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 3, 4, 7, 7, 3,
7, 9, 10, 11, 12, 13, 14, 15, 16, 17,
@@ -1859,16 +1859,16 @@ static const short yycheck[] = { 23,
166, 167, 168, 169, 170, 6, 1200, 158, 159, 160,
176, 162, 163, 164, 165, 166, 167, 168, 169, 170,
166, 167, 183, 6, 6, 176, 172, 86, 6, 4,
- 6, 177, 6, 183, 180, 87, 178, 183, 182, 182,
- 178, 182, 182, 178, 178, 1239, 182, 6, 166, 167,
- 182, 182, 178, 182, 172, 182, 6, 182, 182, 177,
- 182, 182, 178, 6, 6, 183, 178, 182, 181, 1213,
+ 6, 177, 6, 182, 180, 87, 6, 183, 183, 178,
+ 182, 182, 178, 178, 182, 1239, 180, 6, 166, 167,
+ 182, 182, 182, 178, 172, 178, 182, 6, 182, 177,
+ 182, 182, 6, 6, 6, 183, 182, 182, 178, 1213,
1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 414, 182,
182, 1225, 156, 157, 158, 159, 160, 182, 162, 163,
164, 165, 166, 167, 168, 169, 170, 182, 182, 182,
- 180, 1295, 176, 156, 157, 158, 159, 160, 6, 162,
- 163, 164, 165, 166, 167, 168, 169, 170, 6, 6,
- 6, 6, 6, 176, 6, 6, 6, 6, 1322, 7,
+ 178, 1295, 176, 156, 157, 158, 159, 160, 6, 162,
+ 163, 164, 165, 166, 167, 168, 169, 170, 182, 6,
+ 6, 181, 6, 176, 6, 6, 6, 6, 1322, 7,
86, 3, 6, 1277, 1278, 1279, 1280, 1281, 1282, 1283,
1284, 1285, 1286, 1287, 1288, 3, 6, 6, 3, 4,
168, 3, 1346, 6, 9, 10, 11, 12, 13, 14,
@@ -1902,24 +1902,24 @@ static const short yycheck[] = { 23,
6, 6, 3, 4, 5, 5, 7, 5, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 184, 32, 33, 34, 3, 4, 182, 182, 178, 182,
+ 184, 32, 33, 34, 3, 4, 5, 182, 178, 182,
9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 6, 178, 182, 182, 83, 145, 6, 183,
- 183, 6, 5, 5, 183, 3, 4, 182, 182, 6,
+ 29, 30, 6, 32, 33, 34, 183, 182, 182, 178,
+ 183, 83, 145, 6, 182, 3, 4, 183, 182, 6,
846, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 156, 157, 158, 159, 160, 6, 162,
- 163, 164, 165, 166, 167, 168, 169, 170, 184, 183,
- 178, 182, 182, 176, 178, 184, 83, 184, 6, 6,
- 6, 6, 6, 6, 6, 6, 183, 182, 904, 182,
- 150, 182, 151, 182, 6, 911, 183, 183, 183, 6,
- 182, 152, 153, 154, 155, 6, 6, 6, 6, 6,
+ 163, 164, 165, 166, 167, 168, 169, 170, 182, 5,
+ 5, 184, 6, 176, 183, 182, 182, 178, 178, 6,
+ 184, 83, 184, 6, 6, 6, 6, 6, 904, 6,
+ 6, 183, 182, 182, 6, 911, 150, 182, 151, 182,
+ 6, 152, 153, 154, 155, 183, 183, 6, 6, 183,
178, 6, 6, 6, 930, 166, 167, 183, 6, 182,
- 182, 172, 173, 174, 6, 183, 177, 6, 179, 183,
- 181, 178, 6, 182, 0, 0, 8, 183, 183, 183,
- 541, 902, 1232, 7, 7, 7, 851, 166, 167, -1,
- -1, 8, -1, 172, -1, -1, -1, -1, 177, -1,
+ 6, 172, 173, 174, 182, 182, 177, 6, 179, 6,
+ 181, 183, 178, 6, 183, 182, 8, 6, 183, 183,
+ 183, 6, 0, 541, 0, 7, 7, 166, 167, 902,
+ 851, 8, 7, 172, -1, 1232, -1, -1, 177, -1,
-1, -1, 156, 157, 158, 159, 160, -1, 162, 163,
164, 165, 166, 167, 168, 169, 170, 8, -1, -1,
-1, -1, 176, -1, -1, -1, -1, -1, 166, 167,
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index a57a2d2a050c21f4cede8594f872b11196373901..5de7be2a79e6f0a507871fca4f71aa6284c0d84b 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,6 +1,6 @@
%{
-// $Id: Gmsh.y,v 1.82 2001-07-26 21:36:32 remacle Exp $
+// $Id: Gmsh.y,v 1.83 2001-07-30 12:54:40 geuzaine Exp $
//
// Generaliser sprintf avec des chaines de caracteres
@@ -1065,7 +1065,7 @@ Affectation :
List_Delete($8);
}
// P l u g i n s ...
- | tPlugin '(' tBIGSTR ')' '.' tBIGSTR tAFFECT FExpr tEND
+ | tPlugin '(' tSTRING ')' '.' tSTRING tAFFECT FExpr tEND
{
#ifndef _NOPLUGIN
try
@@ -1078,7 +1078,7 @@ Affectation :
}
#endif
}
- | tPlugin '(' tBIGSTR ')' '.' tBIGSTR tAFFECT tBIGSTR tEND
+ | tPlugin '(' tSTRING ')' '.' tSTRING tAFFECT StringExpr tEND
{
#ifndef _NOPLUGIN
try
@@ -1551,7 +1551,7 @@ Command :
else
vyyerror("Unknown command '%s'", $1);
}
- | tPlugin '(' tBIGSTR ')' '.' tBIGSTR tEND
+ | tPlugin '(' tSTRING ')' '.' tSTRING tEND
{
#ifndef _NOPLUGIN
GMSH_PluginManager::Instance()->Action($3,$6,0);
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 70a8165d5f3d9f081e4ba2bee9b5d0ce6e8e0871..daed6b4dd6968fbc17252c16f6ec88e4a3c9ceb2 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -2,7 +2,7 @@
/* A lexical scanner generated by flex */
/* Scanner skeleton version:
- * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.94 2001-07-26 21:36:32 remacle Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.95 2001-07-30 12:54:41 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -990,7 +990,7 @@ char *yytext;
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.94 2001-07-26 21:36:32 remacle Exp $
+// $Id: Gmsh.yy.cpp,v 1.95 2001-07-30 12:54:41 geuzaine Exp $
#include <stdio.h>
#include <stdlib.h>