diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index cf4585494aa27bf85e9bb03f70a2ee31dd2ba924..7c918d1ca1ffccf03c29c462ffefc85490c7c35f 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -149,7 +149,7 @@
#define UMINUS 399
#line 1 "Gmsh.y"
- /* $Id: Gmsh.tab.cpp,v 1.15 2000-12-05 15:30:31 geuzaine Exp $ */
+ /* $Id: Gmsh.tab.cpp,v 1.16 2000-12-05 19:19:54 geuzaine Exp $ */
#include <stdarg.h>
@@ -394,7 +394,7 @@ static const short yyrhs[] = { 162,
206, 156, 204, 157, 6, 0, 4, 7, 241, 6,
0, 30, 153, 241, 155, 7, 244, 6, 0, 45,
30, 153, 241, 155, 7, 249, 6, 0, 64, 30,
- 249, 7, 153, 241, 154, 241, 154, 241, 155, 6,
+ 249, 7, 156, 241, 154, 241, 154, 241, 157, 6,
0, 37, 38, 249, 7, 241, 6, 0, 30, 156,
241, 157, 6, 0, 33, 153, 241, 155, 7, 249,
6, 0, 35, 153, 241, 155, 7, 249, 6, 0,
@@ -819,24 +819,24 @@ static const short yypact[] = { 436,
400, 410, 411, 413, 415, 416, 417, 420, 422, 423,
424, 425, 426, 430, 432, 433, 434, 448, 449, 455,
459, 462, 463, 464, 469, 471, 493, 498, 499, 503,
- 579, 456, 504, 506, 62, 1171, 351, 1267, 1278, 663,
- 1342, 501, 663, 564, 1352, 1362, 663, 222, 656, 1373,
+ 579, 456, 504, 506, 62, 1171, 351, 1274, 1342, 663,
+ 1352, 501, 663, 564, 1362, 1373, 663, 222, 656, 1385,
663, 663, 663, 657, 663, 663, 663, 663, 663, 663,
663, 511, 390, 2044, 83, 83, 540, 663, 663, 663,
- 431,-32768, 24, 1015, -77,-32768, 689, 698, 1385, 625,
- 663, 1395, 42, 663, 1405, 1415, 1441, 1501, 1516, 1526,
- 1536, 1594, 1604, 1614, 2053, 1624, 1634, 1644, 1654, 1664,
- 1674, 2062, 2071, 2080, 663, 663,-32768, 53, 164, 389,
+ 431,-32768, 24, 1015, -77,-32768, 689, 698, 1395, 625,
+ 663, 1405, 42, 663, 1415, 1441, 1501, 1516, 1526, 1536,
+ 1594, 1604, 1614, 1624, 2053, 1634, 1644, 1654, 1664, 1674,
+ 1684, 2062, 2071, 2080, 663, 663,-32768, 53, 164, 389,
389, 389, 366, 703, 709, 710, 713, 714, 717, 722,
723, 725, 727, 730, 731, 732, 733, 734, 735, 739,
740, 741, 744, 748, 750, 753, 632, 755, 759, 760,
766, 770, 769,-32768, -138, 771, 772, 778,-32768, 768,
- 785, 805, 811, 1684, 813, 786, 1694, 816, 819, 823,
- 207,-32768, 119, 663, 828, 577, 1704, 1714, 663, 775,
- 814, 1724, 1734, 1744, 1754, 1764, -77, 663, 663,-32768,
+ 785, 805, 811, 1694, 813, 786, 1704, 816, 819, 823,
+ 207,-32768, 119, 663, 828, 577, 1714, 1724, 663, 775,
+ 814, 1734, 1744, 1754, 1764, 1774, -77, 663, 663,-32768,
620, 1168,-32768, 671, 663, 2089, 2098, 2107,-32768,-32768,
--32768, 663,-32768, 680, 802, 684, 704, 852, 708, 1774,
- 855, 707, 711, 724, 726, 729,-32768,-32768, 1784,-32768,
+-32768, 663,-32768, 680, 802, 681, 704, 852, 708, 1784,
+ 855, 707, 711, 724, 726, 729,-32768,-32768, 1794,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 663,
-32768,-32768,-32768,-32768,-32768,-32768, 663, 663, 663, 55,
55, 745, 737, 761, 762, 763, 765, 774, 776, 779,
@@ -850,7 +850,7 @@ static const short yypact[] = { 436,
923, 924, 928, 935, 936, 939, 943, 1085,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
663, 663, 1428, 663, 1094, 1428,-32768,-32768,-32768,-32768,
--32768, 1096, 1794, 1804, 1814, 1824, 965, 1122, 663, 663,
+-32768, 1096, 1804, 1814, 1824, 1834, 965, 1122, 663, 663,
-77, 1135, 1149, 1006, 1154, 1159, 1428, 1428, 1160, -77,
1162, 1163, 1428, 1428, 1164, 1167, 1170, 1172, 1173, 1428,
300, 1428, 1174, 1169, 1183, 1187, 1189,-32768, 1188, 330,
@@ -859,21 +859,21 @@ static const short yypact[] = { 436,
1428, 1428, 1428, 1428, 1428, 1428, 663, 663, 663, 1037,
148, 161, 163,-32768, 1208, 663, 663, 663, 663, 663,
663, 663, 663, 663, 663, 663, 663,-32768, 2134, 2143,
- 1219, 1834, 84, 1112, 9, 10, 19, 29, 30, 663,
+ 1219, 1844, 84, 1112, 9, 10, 19, 29, 30, 663,
-32768,-32768,-32768,-32768, 663, 1060, 2152, 2161, 1078, 1080,
1081, 1084, 1088, 1086, 1097, 1099, 1100, 1101, 1113, 1111,
1114, 1116, 1117, 1118, 1139, 1141, 1147, 1156,-32768,-32768,
-32768,-32768,-32768, 1155, 1180, 1181, 1197, 1203, 1182, 1204,
-32768, 1213,-32768,-32768, -77,-32768, 1229,-32768, 1233,-32768,
-32768, 282, 2170, 1243, 1244, 1249, 663, 663, 1262, 1316,
- 1318, 1319, 1321, 1336, 1337, 846, 1844, 378, 83, -77,
+ 1318, 1319, 1321, 1336, 1337, 846, 1854, 378, 83, -77,
1363, -77, 1364, -77, 21, 1369, 2179, 2188, 2197, 2206,
2215, 2224, 2233, 2242, 2251, 2260, 2269, 2278, 663, 663,
-32768, 1361, 1428, 1428, 1293, 1428, 1370,-32768,-32768,-32768,
1371,-32768,-32768,-32768, 1372,-32768,-32768,-32768, 1375,-32768,
-32768,-32768, 1382,-32768,-32768,-32768, 271, 1458, 1377, 663,
- 1428, 1384, 1388, 1411, 1270, 1414, 300, 1417, 1418, 663,
- 1422, 1426, 1429, 1452, 1431, 300, 663, 663, 663, 1428,
+ 1428, 1384, 1388, 1411, 1270, 1419, 300, 1421, 1425, 663,
+ 1424, 1430, 1429, 1452, 1431, 300, 663, 663, 663, 1428,
1453, 1457, 300, 663, 1460, 1461, 1459, 663, 330, 1486,
-32768,-32768, 663, 663,-32768,-32768,-32768, 120, 183,-32768,
-32768,-32768,-32768,-32768,-32768,-32768, 1340,-32768, 663,-32768,
@@ -882,24 +882,24 @@ static const short yypact[] = { 436,
663, 2287, 2296, 84, -58,-32768, 179, 1350, 1432, 616,
1357, 829, 1359, 884, 1360, 997, 1367, 1383, 1379, 1512,
1458, 1390, 2305, 1392,-32768, 1394,-32768, 1401,-32768, 1403,
--32768, 1402, 1854,-32768, 1412,-32768,-32768, 1404, 1410, 1864,
- 2314, 1874, 1419,-32768, 1413, 1416, 2323, 1423, 1421,-32768,
- 2332, 1424,-32768, 222, 2341,-32768,-32768, 83, 457,-32768,
+-32768, 1402, 1864,-32768, 1412,-32768,-32768, 1404, 1410, 1874,
+ 2314, 1884, 1414,-32768, 1416, 1417, 2323, 1422, 1418,-32768,
+ 2332, 1423,-32768, 222, 2341,-32768,-32768, 83, 457,-32768,
663, 663, 663, 1520, 1393, -41,-32768, 2350, 2359, 2368,
2377, 2386, 2395, 2404, 2413, 2422, 2431, 2440, 2449, 663,
663, 1444, 1428,-32768,-32768, 1428, 663, 1563, 663, 192,
- 1566, 1575, 1574, 215, 1579, 1575, 1585, 230, 1586, 1575,
+ 1572, 1575, 1574, 215, 1579, 1575, 1585, 230, 1586, 1575,
1588, 239, 1589, 1575, 1591, 257, 1592, 1575,-32768, -57,
1593, 84, 300, 1597, 663, 1595, 300, 1596, 1600, 1602,
1603, 1622, 663, 1623, 1428, 1625, 1626, 663, 1617, 1639,
663, 1646, 1647, 1473, 663,-32768, 887, 926, 938,-32768,
1428, 1648,-32768, 663, 663, 663, 663, 663, 663, 663,
- 663, 663, 663, 663, 663, 1884, 999, 1499,-32768, 1503,
+ 663, 663, 663, 663, 663, 999, 1012, 1499,-32768, 1503,
264,-32768, 1158,-32768,-32768, 1651, 1502, 1575,-32768,-32768,
-32768, 1509,-32768,-32768,-32768, 1513,-32768,-32768,-32768, 1519,
-32768,-32768,-32768, 1522, 663,-32768, 1515, 1523, 1532, 2458,
-32768, 1525,-32768, 1534,-32768,-32768,-32768, 1894,-32768, 1533,
--32768,-32768, 1904, 1535,-32768, 1914, 1538, 1539,-32768, 1012,
+-32768,-32768, 1904, 1535,-32768, 1914, 1538, 1539,-32768, 1151,
1688, 1689, 22, 1542,-32768, 2467, 2476, 2485, 2494, 2503,
2512, 2521, 2530, 2539, 1924, 1934, 1944, 1695, 1696, 1428,
1428,-32768, 18,-32768,-32768,-32768,-32768,-32768,-32768, 1458,
@@ -915,17 +915,17 @@ static const short yypact[] = { 436,
663, 663, 663, 663, 1637, 1641, 663, 663, 663, 1650,
1653,-32768,-32768, 1640, 1643, 1657,-32768, 1658, 2638, 2647,
2656, 2665, 2674, 2683, 2692, 2701, 2710, 189, 222, 218,
- 222, 235, 222, 1725, 663, 1151, 2719, 1458, 300, 1428,
+ 222, 235, 222, 1725, 663, 1192, 2719, 1458, 300, 1428,
1802, 1811, 1812, 1818, 663, 663, 663, 663, 663, 663,
663, 663, 663, 663, 1819, 663, 1821, 663, 1822, 1678,
2728, 1829, 663, 1458, 1683, 1690,-32768,-32768,-32768,-32768,
2737, 2746, 2755, 2764, 2773, 2782, 1954, 1964, 1974, 222,
-32768, 222,-32768, 222,-32768, 663, 663,-32768, 552, 1069,
300, 1428, 663, 663, 663, 663, 663, 663,-32768,-32768,
--32768, 2791, 1192, 663,-32768, 1635, 1691, 1693, 2800, 2809,
- 2818, 2827, 2836, 2845, 1682, 1692, 1699, 663, 1848, 1207,
+-32768, 2791, 1207, 663,-32768, 1635, 1691, 1693, 2800, 2809,
+ 2818, 2827, 2836, 2845, 1682, 1692, 1699, 663, 1848, 1214,
-32768, 1428, 300, 663, 663, 663, 663, 663, 663, 663,
- 663, 663, 1214,-32768,-32768, 1703, 1710, 2854, 2863, 2872,
+ 663, 663, 1267,-32768,-32768, 1703, 1710, 2854, 2863, 2872,
2881, 2890, 2899, 268, 222, 286, 222, 293, 222, 1852,
1428, 1858, 663, 663, 663, 663, 663, 663, 663, 1861,
663, 1862, 663, 1868,-32768, 1721,-32768, 2908, 2917, 2926,
@@ -1073,8 +1073,8 @@ static const short yytable[] = { 92,
85, 86, 87, 88, 626, 1159, 1160, 1161, 1162, 1163,
1164, 1165, 1166, 1167, 1169, 1171, 1173, 630, 1010, 1176,
1177, 1178, 89, 90, 285, 286, 177, 178, 54, 899,
- 179, 631, 132, 632, 1024, 1039, 633, 285, 286, 177,
- 178, 634, 637, 179, 639, 640, 643, 1201, 1064, 644,
+ 179, 631, 132, 632, 1024, 1038, 633, 285, 286, 177,
+ 178, 634, 637, 179, 639, 640, 643, 1201, 1039, 644,
1204, 373, 645, 657, 646, 647, 656, 1211, 1212, 1213,
1214, 1215, 1216, 1217, 1218, 1219, 1220, 658, 1222, 659,
1224, 660, 689, 661, 716, 1229, 1230, 24, 25, 26,
@@ -1088,70 +1088,71 @@ static const short yytable[] = { 92,
756, 757, 1104, 486, 487, 488, 489, 490, 491, 492,
493, 494, 495, 496, 497, 1308, 1309, 1310, 1311, 1312,
1313, 1314, 758, 1316, 759, 1318, 285, 286, 177, 178,
- 760, 54, 179, 285, 286, 177, 178, 1202, 762, 179,
+ 760, 54, 179, 285, 286, 177, 178, 1064, 762, 179,
761, 358, 287, 1328, 1329, 1330, 285, 286, 177, 178,
1145, 781, 179, 782, 783, 330, 784, 1342, 1343, 1344,
1346, 1348, 1350, 763, 764, 1158, 767, 285, 286, 177,
- 178, 785, 786, 179, 1362, 1363, 1364, 1365, 1259, 1367,
+ 178, 785, 786, 179, 1362, 1363, 1364, 1365, 1202, 1367,
765, 1369, 285, 286, 177, 178, 766, 768, 179, 285,
- 286, 177, 178, 1275, 696, 179, 769, 814, 793, 795,
- 1290, 1383, 1385, 1387, 799, 818, 820, 822, 824, 832,
+ 286, 177, 178, 1259, 696, 179, 769, 814, 793, 795,
+ 1275, 1383, 1385, 1387, 799, 818, 820, 822, 824, 832,
1394, 826, 1396, 1206, 1398, 66, 67, 915, 828, 835,
836, 68, 69, 70, 71, 72, 73, 74, 75, 76,
77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
- 87, 88, 285, 286, 177, 178, 837, 838, 179, 839,
- 842, 332, 841, 285, 286, 177, 178, 844, 845, 179,
- 66, 67, 333, 848, 846, 1248, 68, 69, 70, 71,
+ 87, 88, 285, 286, 177, 178, 837, 838, 179, 285,
+ 286, 177, 178, 1290, 839, 179, 841, 842, 332, 844,
+ 66, 67, 845, 848, 846, 1248, 68, 69, 70, 71,
72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
82, 83, 84, 85, 86, 87, 88, 847, 854, 855,
66, 67, 858, 859, 860, 1276, 68, 69, 70, 71,
72, 73, 74, 75, 76, 77, 78, 79, 80, 81,
82, 83, 84, 85, 86, 87, 88, 285, 286, 177,
- 178, 863, 871, 179, 1306, 868, 335, 285, 286, 177,
- 178, 870, 872, 179, 873, 896, 339, 285, 286, 177,
- 178, 897, 902, 179, 906, 910, 340, 919, 285, 286,
- 177, 178, 914, 1327, 179, 950, 968, 345, 89, 90,
- 285, 286, 177, 178, 918, 899, 179, 1341, 132, 378,
- 285, 286, 177, 178, 921, 923, 179, 924, 951, 381,
- 285, 286, 177, 178, 925, 927, 179, 926, 930, 390,
- 285, 286, 177, 178, 931, 929, 179, 936, 972, 391,
- 937, 975, 935, 89, 90, 940, 939, 942, 976, 979,
+ 178, 863, 871, 179, 1306, 868, 333, 285, 286, 177,
+ 178, 870, 872, 179, 873, 896, 335, 285, 286, 177,
+ 178, 897, 902, 179, 906, 910, 339, 919, 285, 286,
+ 177, 178, 914, 1327, 179, 950, 968, 340, 89, 90,
+ 285, 286, 177, 178, 918, 899, 179, 1341, 132, 345,
+ 285, 286, 177, 178, 921, 923, 179, 924, 951, 378,
+ 285, 286, 177, 178, 925, 927, 179, 926, 930, 381,
+ 285, 286, 177, 178, 931, 929, 179, 935, 972, 390,
+ 936, 937, 940, 89, 90, 939, 942, 975, 976, 979,
91, -3, 22, 227, 981, 23, 285, 286, 177, 178,
- 983, 985, 179, 987, 989, 392, 991, 993, 996, 999,
+ 983, 985, 179, 987, 989, 391, 991, 993, 996, 999,
1001, 1003, 1004, 175, 176, 177, 178, 1005, 1006, 179,
91, 24, 25, 26, 27, 28, 29, 30, 31, 1014,
32, 33, 34, 35, 36, 37, 38, 1007, 1009, 1019,
1011, 1012, 39, 40, 41, 42, 43, 44, 181, 45,
46, 47, 48, 49, 1015, 50, 285, 286, 177, 178,
- 1017, 1018, 179, 1025, 1040, 393, 1041, 1043, 1044, 51,
+ 1017, 1018, 179, 1025, 1040, 392, 1041, 1043, 1044, 51,
52, 285, 286, 177, 178, 1046, 53, 179, 1051, 1047,
- 394, 285, 286, 177, 178, 1048, 1052, 179, 1049, 1055,
- 395, 285, 286, 177, 178, 1053, 1058, 179, 1056, 1060,
- 396, 1062, 1063, 1065, 1066, 1069, 182, 183, 184, 1117,
+ 393, 285, 286, 177, 178, 1048, 1052, 179, 1049, 1055,
+ 394, 285, 286, 177, 178, 1053, 1058, 179, 1056, 1060,
+ 395, 1062, 1063, 1065, 1066, 1069, 182, 183, 184, 1117,
1082, 1083, 1094, 1095, 185, 186, 187, 188, 189, 190,
191, 192, 193, 194, 1096, 54, 1098, 1099, 1100, 1101,
1102, 1118, 195, 196, 197, 198, 199, 200, 201, 202,
203, 204, 1119, 205, 206, 207, 208, 209, 210, 285,
- 286, 177, 178, 1122, 1126, 179, 1146, 1152, 397, 285,
- 286, 177, 178, 1127, 1124, 179, 1153, 1155, 398, 285,
- 286, 177, 178, 1125, 1128, 179, 1129, 1142, 399, 285,
- 286, 177, 178, 1130, 1132, 179, 1156, 1261, 401, 285,
- 286, 177, 178, 1143, 1144, 179, 1147, 1157, 402, 285,
- 286, 177, 178, 1174, 1181, 179, 1175, 1182, 403, 285,
- 286, 177, 178, 1179, 1200, 179, 1180, 1207, 404, 285,
- 286, 177, 178, 1183, 1184, 179, 1208, 1209, 405, 285,
- 286, 177, 178, 1210, 1221, 179, 1223, 1225, 406, 285,
- 286, 177, 178, 1226, 1228, 179, 1231, 1270, 452, 285,
- 286, 177, 178, 1232, 1262, 179, 1263, 1271, 455, 285,
- 286, 177, 178, 1274, 1272, 179, 1291, 1305, 465, 285,
- 286, 177, 178, 1307, 1292, 179, 1315, 1317, 466, 285,
- 286, 177, 178, 1319, 1320, 179, 1334, 1338, 470, 285,
- 286, 177, 178, 1339, 1340, 179, 1351, 1366, 471, 285,
- 286, 177, 178, 1368, 1370, 179, 1375, 1371, 472, 285,
- 286, 177, 178, 1379, 1380, 179, 1395, 1381, 473, 285,
- 286, 177, 178, 1397, 1399, 179, 1401, 1402, 474, 285,
- 286, 177, 178, 595, 58, 179, 59, 60, 515, 285,
- 286, 177, 178, 1103, 572, 179, 817, 0, 522, 285,
+ 286, 177, 178, 1122, 1126, 179, 1146, 1152, 396, 285,
+ 286, 177, 178, 1127, 1124, 179, 1153, 1155, 397, 285,
+ 286, 177, 178, 1125, 1128, 179, 1129, 1142, 398, 285,
+ 286, 177, 178, 1130, 1132, 179, 1156, 1261, 399, 285,
+ 286, 177, 178, 1143, 1144, 179, 1147, 1157, 401, 285,
+ 286, 177, 178, 1174, 1181, 179, 1175, 1182, 402, 285,
+ 286, 177, 178, 1179, 1200, 179, 1180, 1207, 403, 285,
+ 286, 177, 178, 1183, 1184, 179, 1208, 1209, 404, 285,
+ 286, 177, 178, 1210, 1221, 179, 1223, 1225, 405, 285,
+ 286, 177, 178, 1226, 1228, 179, 1231, 1270, 406, 285,
+ 286, 177, 178, 1232, 1262, 179, 1263, 1271, 452, 285,
+ 286, 177, 178, 1274, 1272, 179, 1291, 1305, 455, 285,
+ 286, 177, 178, 1307, 1292, 179, 1315, 1317, 465, 285,
+ 286, 177, 178, 1319, 1320, 179, 1334, 1338, 466, 285,
+ 286, 177, 178, 1339, 1340, 179, 1351, 1366, 470, 285,
+ 286, 177, 178, 1368, 1370, 179, 1375, 1371, 471, 285,
+ 286, 177, 178, 1379, 1380, 179, 1395, 1381, 472, 285,
+ 286, 177, 178, 1397, 1399, 179, 1401, 1402, 473, 285,
+ 286, 177, 178, 595, 58, 179, 59, 60, 474, 285,
+ 286, 177, 178, 1103, 572, 179, 817, 0, 515, 285,
+ 286, 177, 178, 0, 0, 179, 0, 0, 522, 285,
286, 177, 178, 0, 0, 179, 0, 0, 621, 285,
286, 177, 178, 0, 0, 179, 0, 0, 622, 285,
286, 177, 178, 0, 0, 179, 0, 0, 623, 285,
@@ -1161,7 +1162,6 @@ static const short yytable[] = { 92,
286, 177, 178, 0, 0, 179, 0, 0, 928, 285,
286, 177, 178, 0, 0, 179, 0, 0, 932, 285,
286, 177, 178, 0, 0, 179, 0, 0, 934, 285,
- 286, 177, 178, 0, 0, 179, 0, 0, 1038, 285,
286, 177, 178, 0, 0, 179, 0, 0, 1057, 285,
286, 177, 178, 0, 0, 179, 0, 0, 1059, 285,
286, 177, 178, 0, 0, 179, 0, 0, 1061, 285,
@@ -1358,7 +1358,7 @@ static const short yycheck[] = { 7,
808, 809, 810, 811, 146, 147, 148, 149, 146, 147,
152, 7, 820, 155, 822, 153, 824, 7, 826, 7,
828, 6, 820, 831, 822, 7, 824, 157, 826, 7,
- 828, 3, 4, 5, 7, 156, 153, 9, 10, 11,
+ 828, 3, 4, 5, 7, 156, 156, 9, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 7, 156,
153, 7, 156, 871, 872, 873, 156, 66, 67, 68,
@@ -1416,9 +1416,9 @@ static const short yycheck[] = { 7,
1388, 7, 1390, 1180, 1392, 3, 4, 5, 7, 6,
3, 9, 10, 11, 12, 13, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 146, 147, 148, 149, 6, 148, 152, 6,
- 3, 155, 6, 146, 147, 148, 149, 6, 3, 152,
- 3, 4, 155, 3, 6, 1232, 9, 10, 11, 12,
+ 28, 29, 146, 147, 148, 149, 6, 148, 152, 146,
+ 147, 148, 149, 157, 6, 152, 6, 3, 155, 6,
+ 3, 4, 3, 3, 6, 1232, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 6, 6, 3,
3, 4, 3, 3, 6, 1262, 9, 10, 11, 12,
@@ -1431,8 +1431,8 @@ static const short yycheck[] = { 7,
146, 147, 148, 149, 156, 153, 152, 1334, 156, 155,
146, 147, 148, 149, 155, 154, 152, 154, 156, 155,
146, 147, 148, 149, 154, 154, 152, 155, 155, 155,
- 146, 147, 148, 149, 155, 154, 152, 155, 6, 155,
- 155, 6, 154, 146, 147, 155, 154, 154, 4, 6,
+ 146, 147, 148, 149, 155, 154, 152, 154, 6, 155,
+ 155, 155, 155, 146, 147, 154, 154, 6, 4, 6,
153, 0, 1, 156, 6, 4, 146, 147, 148, 149,
6, 6, 152, 6, 6, 155, 6, 6, 6, 3,
6, 6, 3, 146, 147, 148, 149, 6, 6, 152,
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 5d7ae8db04a2115f8841a1ae9553d5c9d1570722..64d065cdfaabe1db605cc32d8e9a1e1bf70cf953 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,4 +1,4 @@
-%{ /* $Id: Gmsh.y,v 1.14 2000-12-05 15:30:32 geuzaine Exp $ */
+%{ /* $Id: Gmsh.y,v 1.15 2000-12-05 19:19:54 geuzaine Exp $ */
#include <stdarg.h>
@@ -693,7 +693,7 @@ Shape :
$$.Type = MSH_PHYSICAL_POINT;
$$.Num = (int)$4;
}
- | tAttractor tPoint ListOfDouble tAFFECT '(' FExpr ',' FExpr ',' FExpr ')' tEND
+ | tAttractor tPoint ListOfDouble tAFFECT '{' FExpr ',' FExpr ',' FExpr '}' tEND
{
Vertex *v;
Attractor *a;
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index b0520daf7bce802a2366f8abe27b32290caf4829..1a2e95f72fa50dbb5e914920090abe8573b69c8b 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.15 2000-12-05 15:30:32 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.16 2000-12-05 19:19:54 geuzaine Exp $
*/
#define FLEX_SCANNER