diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp index d94d9da03ea64c27e7d0b17eb6dd4c94bacd4d9d..dee690c8ea4778336bfb1904764a6f8e7d629522 100644 --- a/Geo/Geo.cpp +++ b/Geo/Geo.cpp @@ -1,4 +1,4 @@ -/* $Id: Geo.cpp,v 1.4 2000-11-26 15:43:45 geuzaine Exp $ */ +/* $Id: Geo.cpp,v 1.5 2000-11-28 14:42:42 geuzaine Exp $ */ #include "Gmsh.h" #include "Const.h" @@ -73,21 +73,21 @@ void add_infile(char *text, char *fich){ void del_pnt(int p1, char *fich){ char text[BUFFSIZE]; - sprintf(text,"Delete {\n Point(%d);\n}",p1); + sprintf(text,"Delete {\n Point{%d};\n}",p1); add_infile(text,fich); } void del_seg(int p1, char *fich){ char text[BUFFSIZE]; - sprintf(text,"Delete {\n Line(%d);\n}",p1); + sprintf(text,"Delete {\n Line{%d};\n}",p1); add_infile(text,fich); } void del_srf(int p1, char *fich){ char text[BUFFSIZE]; - sprintf(text,"Delete {\n Surface(%d);\n}",p1); + sprintf(text,"Delete {\n Surface{%d};\n}",p1); add_infile(text,fich); } @@ -164,10 +164,10 @@ void add_trsfline (int N, int *l, char *fich){ } if(Mode_Transfinite == 0) sprintf(text2,"} = %s;",nb_pts); + else if(Mode_Transfinite == 1) + sprintf(text2,"} = %s Using Progression %s;",nb_pts,mode_value); else if(Mode_Transfinite == 2) sprintf(text2,"} = %s Using Bump %s;",nb_pts,mode_value); - else if(Mode_Transfinite == 1) - sprintf(text2,"} = %s Using Power %s;",nb_pts,mode_value); strcat(text,text2); add_infile(text,fich); } @@ -191,16 +191,16 @@ void add_point(char *fich){ void add_attractor(char *fich, int ip, int typ){ char text[BUFFSIZE]; if(typ == 0) { - sprintf(text,"Attractor Point (%s,%s,%s) = {%d};", - attrx_text,attry_text,attrdec_text,ip); + sprintf(text,"Attractor Point {%d} = {%s,%s,%s} = ;", + ip,attrx_text,attry_text,attrdec_text); } else if(typ == 1){ - sprintf(text,"Attractor Line (%s,%s,%s) = {%d};", - attrx_text,attry_text,attrdec_text,ip); + sprintf(text,"Attractor Line {%d} = {%s,%s,%s};", + ip, attrx_text,attry_text,attrdec_text); } else if(typ == 2) { - sprintf(text,"Attractor Surface (%s,%s,%s) = {%d};", - attrx_text,attry_text,attrdec_text,ip); + sprintf(text,"Attractor Surface {%d} = {%s,%s,%s};", + ip,attrx_text,attry_text,attrdec_text); } add_infile(text,fich); } @@ -454,7 +454,7 @@ void add_physical_entity(List_T *list, char *fich, int type, int *num){ void extrude(int s, char *fich, char *what){ char text[BUFFSIZE]; - sprintf(text,"Extrude %s (%d, {%s,%s,%s});",what,s,tx_text,ty_text,tz_text); + sprintf(text,"Extrude %s {%d, {%s,%s,%s}};",what,s,tx_text,ty_text,tz_text); add_infile(text,fich); add_infile("Coherence;",fich); } @@ -462,10 +462,10 @@ void translate_seg(int add, int s, char *fich){ char text[BUFFSIZE]; if(add) - sprintf(text,"Translate({%s,%s,%s}) {\n Duplicata { Line(%d); }\n}", + sprintf(text,"Translate {%s,%s,%s} {\n Duplicata { Line{%d}; }\n}", tx_text,ty_text,tz_text,s); else - sprintf(text,"Translate({%s,%s,%s}) {\n Line(%d);\n}", + sprintf(text,"Translate {%s,%s,%s} {\n Line{%d};\n}", tx_text,ty_text,tz_text,s); add_infile(text,fich); add_infile("Coherence;",fich); @@ -476,10 +476,10 @@ void translate_surf(int add, int s, char *fich){ char text[BUFFSIZE]; if(add) - sprintf(text,"Translate({%s,%s,%s}) {\n Duplicata { Surface(%d); }\n}", + sprintf(text,"Translate {%s,%s,%s} {\n Duplicata { Surface{%d}; }\n}", tx_text,ty_text,tz_text,s); else - sprintf(text,"Translate({%s,%s,%s}) {\n Surface(%d);\n}", + sprintf(text,"Translate {%s,%s,%s} {\n Surface{%d};\n}", tx_text,ty_text,tz_text,s); add_infile(text,fich); add_infile("Coherence;",fich); @@ -489,10 +489,10 @@ void translate_pt(int add, int s, char *fich){ char text[BUFFSIZE]; if(add) - sprintf(text,"Translate({%s,%s,%s}) {\n Duplicata { Point(%d); }\n}", + sprintf(text,"Translate {%s,%s,%s} {\n Duplicata { Point{%d}; }\n}", tx_text,ty_text,tz_text,s); else - sprintf(text,"Translate({%s,%s,%s}) {\n Point(%d);\n}", + sprintf(text,"Translate {%s,%s,%s} {\n Point{%d};\n}", tx_text,ty_text,tz_text,s); add_infile(text,fich); add_infile("Coherence;",fich); @@ -502,10 +502,10 @@ void rotate(int add, int s, char *fich, char *quoi){ char text[BUFFSIZE]; if(add) - sprintf(text,"Rotate({%s,%s,%s},{%s,%s,%s},%s) {\n Duplicata { %s(%d); }\n}", + sprintf(text,"Rotate { {%s,%s,%s},{%s,%s,%s},%s } {\n Duplicata { %s{%d}; }\n}", ax_text,ay_text,az_text,px_text,py_text,pz_text,angle_text, quoi,s); else - sprintf(text,"Rotate({%s,%s,%s},{%s,%s,%s},%s) {\n %s(%d);\n }", + sprintf(text,"Rotate { {%s,%s,%s},{%s,%s,%s},%s } {\n %s{%d};\n }", ax_text,ay_text,az_text,px_text,py_text,pz_text,angle_text, quoi,s); add_infile(text,fich); add_infile("Coherence;",fich); @@ -515,10 +515,10 @@ void dilate(int add, int s, char *fich, char *quoi){ char text[BUFFSIZE]; if(add) - sprintf(text,"Dilate({%s,%s,%s},%s) {\n Duplicata { %s(%d); }\n}", + sprintf(text,"Dilate { {%s,%s,%s},%s } {\n Duplicata { %s{%d}; }\n}", dx_text,dy_text,dz_text,df_text, quoi,s); else - sprintf(text,"Dilate({%s,%s,%s},%s) {\n %s(%d);\n }", + sprintf(text,"Dilate { {%s,%s,%s},%s } {\n %s{%d};\n }", dx_text,dy_text,dz_text,df_text, quoi,s); add_infile(text,fich); add_infile("Coherence;",fich); @@ -528,7 +528,7 @@ void dilate(int add, int s, char *fich, char *quoi){ void protude(int s, char *fich, char *what){ char text[BUFFSIZE]; - sprintf(text,"Extrude %s(%d, {%s,%s,%s}, {%s,%s,%s}, %s);",what,s,ax_text,ay_text, + sprintf(text,"Extrude %s {%d, {%s,%s,%s}, {%s,%s,%s}, %s};",what,s,ax_text,ay_text, az_text,px_text,py_text,pz_text,angle_text); add_infile(text,fich); add_infile("Coherence;",fich); diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp index 13066bf585394ceb4fc5e03434422929813f0130..5f17a69c205d8a259a0407bb2e4d42866e35075f 100644 --- a/Parser/Gmsh.tab.cpp +++ b/Parser/Gmsh.tab.cpp @@ -146,7 +146,7 @@ #define UMINUS 396 #line 1 "Gmsh.y" - /* $Id: Gmsh.tab.cpp,v 1.10 2000-11-28 11:28:35 geuzaine Exp $ */ + /* $Id: Gmsh.tab.cpp,v 1.11 2000-11-28 14:42:44 geuzaine Exp $ */ #include <stdarg.h> @@ -216,7 +216,7 @@ typedef union { -#define YYFINAL 1336 +#define YYFINAL 1326 #define YYFLAG -32768 #define YYNTBASE 157 @@ -281,19 +281,19 @@ static const short yyprhs[] = { 0, 758, 784, 786, 790, 791, 817, 819, 823, 824, 856, 858, 862, 863, 895, 897, 901, 902, 934, 939, 947, 956, 969, 976, 982, 990, 998, 1011, 1019, 1029, 1047, - 1055, 1064, 1073, 1079, 1087, 1099, 1108, 1118, 1127, 1150, - 1171, 1180, 1189, 1195, 1204, 1212, 1221, 1229, 1241, 1249, - 1259, 1261, 1263, 1265, 1266, 1269, 1274, 1279, 1283, 1291, - 1300, 1312, 1325, 1338, 1347, 1360, 1369, 1381, 1397, 1399, - 1402, 1412, 1415, 1422, 1432, 1442, 1451, 1460, 1469, 1476, - 1481, 1484, 1489, 1490, 1493, 1494, 1500, 1501, 1507, 1508, - 1514, 1515, 1518, 1523, 1532, 1537, 1547, 1555, 1557, 1559, - 1561, 1563, 1565, 1567, 1571, 1575, 1579, 1583, 1587, 1591, - 1594, 1597, 1602, 1607, 1612, 1617, 1622, 1627, 1632, 1637, - 1642, 1647, 1654, 1659, 1664, 1669, 1674, 1679, 1684, 1691, - 1698, 1705, 1707, 1709, 1711, 1715, 1722, 1734, 1744, 1752, - 1760, 1761, 1765, 1767, 1771, 1772, 1776, 1780, 1782, 1786, - 1787, 1789, 1793, 1795, 1797, 1801 + 1055, 1064, 1073, 1081, 1093, 1099, 1108, 1118, 1127, 1150, + 1171, 1180, 1189, 1195, 1204, 1212, 1221, 1227, 1239, 1245, + 1255, 1257, 1259, 1261, 1262, 1265, 1270, 1275, 1279, 1288, + 1301, 1310, 1323, 1332, 1345, 1357, 1373, 1375, 1378, 1388, + 1391, 1398, 1408, 1418, 1427, 1436, 1445, 1452, 1457, 1460, + 1465, 1466, 1469, 1470, 1476, 1477, 1483, 1484, 1490, 1491, + 1494, 1499, 1508, 1513, 1523, 1531, 1533, 1535, 1537, 1539, + 1541, 1543, 1547, 1551, 1555, 1559, 1563, 1567, 1570, 1573, + 1578, 1583, 1588, 1593, 1598, 1603, 1608, 1613, 1618, 1623, + 1630, 1635, 1640, 1645, 1650, 1655, 1660, 1667, 1674, 1681, + 1683, 1685, 1687, 1691, 1698, 1710, 1720, 1728, 1736, 1737, + 1741, 1743, 1747, 1748, 1752, 1756, 1758, 1762, 1763, 1765, + 1769, 1771, 1773, 1777 }; static const short yyrhs[] = { 159, @@ -392,21 +392,21 @@ static const short yyrhs[] = { 159, 151, 227, 151, 227, 151, 227, 152, 203, 153, 201, 154, 6, 0, 4, 7, 227, 6, 0, 30, 150, 227, 152, 7, 230, 6, 0, 45, 30, 150, 227, - 152, 7, 235, 6, 0, 64, 30, 150, 227, 151, - 227, 151, 227, 152, 7, 235, 6, 0, 37, 38, - 235, 7, 227, 6, 0, 30, 150, 227, 152, 6, + 152, 7, 235, 6, 0, 64, 30, 235, 7, 150, + 227, 151, 227, 151, 227, 152, 6, 0, 37, 38, + 235, 7, 227, 6, 0, 30, 153, 227, 154, 6, 0, 33, 150, 227, 152, 7, 235, 6, 0, 35, - 150, 227, 152, 7, 235, 6, 0, 64, 33, 150, - 227, 151, 227, 151, 227, 152, 7, 235, 6, 0, + 150, 227, 152, 7, 235, 6, 0, 64, 33, 235, + 7, 153, 227, 151, 227, 151, 227, 154, 6, 0, 31, 150, 227, 152, 7, 235, 6, 0, 31, 150, 227, 152, 7, 235, 41, 230, 6, 0, 39, 150, - 227, 152, 7, 150, 227, 151, 227, 151, 5, 151, - 5, 151, 5, 152, 6, 0, 32, 150, 227, 152, + 227, 152, 7, 153, 227, 151, 227, 151, 5, 151, + 5, 151, 5, 154, 6, 0, 32, 150, 227, 152, 7, 235, 6, 0, 45, 33, 150, 227, 152, 7, 235, 6, 0, 33, 57, 150, 227, 152, 7, 235, - 6, 0, 33, 150, 227, 152, 6, 0, 78, 150, - 227, 152, 7, 235, 6, 0, 79, 150, 227, 152, - 7, 235, 83, 235, 80, 227, 6, 0, 41, 34, + 6, 0, 78, 150, 227, 152, 7, 235, 6, 0, + 79, 150, 227, 152, 7, 235, 83, 235, 80, 227, + 6, 0, 33, 153, 227, 154, 6, 0, 41, 34, 150, 227, 152, 7, 235, 6, 0, 131, 34, 150, 227, 152, 7, 227, 235, 6, 0, 42, 34, 150, 227, 152, 7, 235, 6, 0, 79, 34, 81, 82, @@ -415,69 +415,66 @@ static const short yyrhs[] = { 159, 34, 150, 227, 152, 7, 233, 83, 153, 235, 151, 235, 154, 80, 153, 227, 151, 227, 154, 6, 0, 45, 34, 150, 227, 152, 7, 235, 6, 0, 34, - 57, 150, 227, 152, 7, 235, 6, 0, 34, 150, - 227, 152, 6, 0, 44, 36, 150, 227, 152, 7, + 57, 150, 227, 152, 7, 235, 6, 0, 34, 153, + 227, 154, 6, 0, 44, 36, 150, 227, 152, 7, 235, 6, 0, 36, 150, 227, 152, 7, 235, 6, 0, 45, 36, 150, 227, 152, 7, 235, 6, 0, - 52, 150, 230, 152, 153, 207, 154, 0, 51, 150, - 230, 151, 230, 151, 227, 152, 153, 207, 154, 0, - 53, 150, 230, 152, 153, 207, 154, 0, 54, 150, - 230, 151, 227, 152, 153, 207, 154, 0, 209, 0, - 208, 0, 206, 0, 0, 208, 205, 0, 56, 153, - 208, 154, 0, 60, 153, 208, 154, 0, 58, 5, - 6, 0, 55, 150, 227, 151, 230, 152, 6, 0, - 55, 34, 150, 227, 151, 230, 152, 6, 0, 55, - 150, 227, 151, 230, 151, 230, 151, 227, 152, 6, - 0, 55, 34, 150, 227, 151, 230, 151, 230, 151, - 227, 152, 6, 0, 55, 30, 150, 227, 151, 230, - 151, 230, 151, 227, 152, 6, 0, 55, 30, 150, - 227, 151, 230, 152, 6, 0, 55, 33, 150, 227, - 151, 230, 151, 230, 151, 227, 152, 6, 0, 55, - 33, 150, 227, 151, 230, 152, 6, 0, 55, 34, - 150, 227, 151, 230, 152, 153, 213, 154, 6, 0, - 55, 34, 150, 227, 151, 230, 151, 230, 151, 227, - 152, 153, 213, 154, 6, 0, 214, 0, 213, 214, - 0, 65, 153, 235, 151, 235, 151, 235, 154, 6, - 0, 59, 6, 0, 43, 33, 235, 7, 227, 6, - 0, 43, 33, 235, 7, 227, 46, 49, 227, 6, - 0, 43, 33, 235, 7, 227, 46, 48, 227, 6, - 0, 43, 34, 153, 227, 154, 7, 235, 6, 0, - 40, 34, 153, 227, 154, 7, 235, 6, 0, 43, - 36, 153, 227, 154, 7, 235, 6, 0, 59, 34, - 235, 7, 227, 6, 0, 59, 34, 235, 6, 0, - 61, 6, 0, 84, 153, 218, 154, 0, 0, 218, - 219, 0, 0, 85, 220, 153, 223, 154, 0, 0, - 86, 221, 153, 223, 154, 0, 0, 87, 222, 153, - 223, 154, 0, 0, 224, 223, 0, 4, 7, 4, - 6, 0, 4, 7, 153, 4, 151, 227, 154, 6, - 0, 4, 7, 225, 6, 0, 153, 227, 151, 227, - 151, 227, 151, 227, 154, 0, 153, 227, 151, 227, - 151, 227, 154, 0, 91, 0, 92, 0, 93, 0, - 94, 0, 95, 0, 228, 0, 150, 227, 152, 0, - 227, 144, 227, 0, 227, 143, 227, 0, 227, 145, - 227, 0, 227, 146, 227, 0, 227, 149, 227, 0, - 144, 227, 0, 143, 227, 0, 10, 150, 227, 152, - 0, 11, 150, 227, 152, 0, 12, 150, 227, 152, - 0, 13, 150, 227, 152, 0, 14, 150, 227, 152, - 0, 15, 150, 227, 152, 0, 16, 150, 227, 152, - 0, 17, 150, 227, 152, 0, 18, 150, 227, 152, - 0, 19, 150, 227, 152, 0, 20, 150, 227, 151, - 227, 152, 0, 21, 150, 227, 152, 0, 22, 150, - 227, 152, 0, 23, 150, 227, 152, 0, 24, 150, - 227, 152, 0, 25, 150, 227, 152, 0, 26, 150, - 227, 152, 0, 27, 150, 227, 151, 227, 152, 0, - 28, 150, 227, 151, 227, 152, 0, 29, 150, 227, - 151, 227, 152, 0, 3, 0, 9, 0, 4, 0, - 227, 8, 227, 0, 227, 8, 155, 227, 156, 227, - 0, 153, 227, 151, 227, 151, 227, 151, 227, 151, - 227, 154, 0, 153, 227, 151, 227, 151, 227, 151, - 227, 154, 0, 153, 227, 151, 227, 151, 227, 154, - 0, 150, 227, 151, 227, 151, 227, 152, 0, 0, - 150, 232, 152, 0, 5, 0, 232, 151, 5, 0, - 0, 153, 234, 154, 0, 150, 234, 152, 0, 235, - 0, 234, 151, 235, 0, 0, 227, 0, 153, 236, - 154, 0, 227, 0, 229, 0, 236, 151, 227, 0, - 236, 151, 229, 0 + 52, 230, 153, 207, 154, 0, 51, 153, 230, 151, + 230, 151, 227, 154, 153, 207, 154, 0, 53, 230, + 153, 207, 154, 0, 54, 153, 230, 151, 227, 154, + 153, 207, 154, 0, 209, 0, 208, 0, 206, 0, + 0, 208, 205, 0, 56, 153, 208, 154, 0, 60, + 153, 208, 154, 0, 58, 5, 6, 0, 55, 30, + 153, 227, 151, 230, 154, 6, 0, 55, 30, 153, + 227, 151, 230, 151, 230, 151, 227, 154, 6, 0, + 55, 33, 153, 227, 151, 230, 154, 6, 0, 55, + 33, 153, 227, 151, 230, 151, 230, 151, 227, 154, + 6, 0, 55, 34, 153, 227, 151, 230, 154, 6, + 0, 55, 34, 153, 227, 151, 230, 151, 230, 151, + 227, 154, 6, 0, 55, 34, 153, 227, 151, 230, + 154, 153, 213, 154, 6, 0, 55, 34, 153, 227, + 151, 230, 151, 230, 151, 227, 154, 153, 213, 154, + 6, 0, 214, 0, 213, 214, 0, 65, 153, 235, + 151, 235, 151, 235, 154, 6, 0, 59, 6, 0, + 43, 33, 235, 7, 227, 6, 0, 43, 33, 235, + 7, 227, 46, 49, 227, 6, 0, 43, 33, 235, + 7, 227, 46, 48, 227, 6, 0, 43, 34, 153, + 227, 154, 7, 235, 6, 0, 40, 34, 153, 227, + 154, 7, 235, 6, 0, 43, 36, 153, 227, 154, + 7, 235, 6, 0, 59, 34, 235, 7, 227, 6, + 0, 59, 34, 235, 6, 0, 61, 6, 0, 84, + 153, 218, 154, 0, 0, 218, 219, 0, 0, 85, + 220, 153, 223, 154, 0, 0, 86, 221, 153, 223, + 154, 0, 0, 87, 222, 153, 223, 154, 0, 0, + 224, 223, 0, 4, 7, 4, 6, 0, 4, 7, + 153, 4, 151, 227, 154, 6, 0, 4, 7, 225, + 6, 0, 153, 227, 151, 227, 151, 227, 151, 227, + 154, 0, 153, 227, 151, 227, 151, 227, 154, 0, + 91, 0, 92, 0, 93, 0, 94, 0, 95, 0, + 228, 0, 150, 227, 152, 0, 227, 144, 227, 0, + 227, 143, 227, 0, 227, 145, 227, 0, 227, 146, + 227, 0, 227, 149, 227, 0, 144, 227, 0, 143, + 227, 0, 10, 150, 227, 152, 0, 11, 150, 227, + 152, 0, 12, 150, 227, 152, 0, 13, 150, 227, + 152, 0, 14, 150, 227, 152, 0, 15, 150, 227, + 152, 0, 16, 150, 227, 152, 0, 17, 150, 227, + 152, 0, 18, 150, 227, 152, 0, 19, 150, 227, + 152, 0, 20, 150, 227, 151, 227, 152, 0, 21, + 150, 227, 152, 0, 22, 150, 227, 152, 0, 23, + 150, 227, 152, 0, 24, 150, 227, 152, 0, 25, + 150, 227, 152, 0, 26, 150, 227, 152, 0, 27, + 150, 227, 151, 227, 152, 0, 28, 150, 227, 151, + 227, 152, 0, 29, 150, 227, 151, 227, 152, 0, + 3, 0, 9, 0, 4, 0, 227, 8, 227, 0, + 227, 8, 155, 227, 156, 227, 0, 153, 227, 151, + 227, 151, 227, 151, 227, 151, 227, 154, 0, 153, + 227, 151, 227, 151, 227, 151, 227, 154, 0, 153, + 227, 151, 227, 151, 227, 154, 0, 150, 227, 151, + 227, 151, 227, 152, 0, 0, 150, 232, 152, 0, + 5, 0, 232, 151, 5, 0, 0, 153, 234, 154, + 0, 150, 234, 152, 0, 235, 0, 234, 151, 235, + 0, 0, 227, 0, 153, 236, 154, 0, 227, 0, + 229, 0, 236, 151, 227, 0, 236, 151, 229, 0 }; #endif @@ -498,19 +495,19 @@ static const short yyrline[] = { 0, 554, 560, 563, 567, 579, 585, 588, 592, 605, 611, 614, 618, 631, 637, 640, 644, 657, 669, 683, 694, 700, 719, 730, 738, 744, 750, 769, 775, 791, 798, - 804, 810, 816, 825, 831, 853, 859, 878, 899, 907, + 804, 810, 816, 822, 841, 853, 859, 878, 899, 907, 913, 919, 925, 937, 943, 949, 961, 967, 972, 977, - 984, 986, 987, 990, 995, 1006, 1024, 1039, 1070, 1075, - 1079, 1083, 1087, 1093, 1098, 1102, 1106, 1111, 1119, 1123, - 1128, 1146, 1156, 1174, 1191, 1208, 1229, 1249, 1269, 1286, - 1310, 1321, 1325, 1327, 1330, 1333, 1334, 1336, 1337, 1339, - 1342, 1344, 1347, 1358, 1368, 1378, 1386, 1462, 1464, 1465, - 1466, 1467, 1470, 1472, 1473, 1474, 1475, 1476, 1477, 1478, - 1479, 1480, 1481, 1482, 1483, 1484, 1485, 1486, 1487, 1488, - 1489, 1490, 1491, 1492, 1493, 1494, 1495, 1496, 1497, 1498, - 1499, 1502, 1504, 1505, 1516, 1523, 1536, 1545, 1553, 1561, - 1571, 1575, 1580, 1584, 1589, 1593, 1597, 1603, 1609, 1615, - 1619, 1625, 1638, 1644, 1653, 1657 + 984, 986, 987, 990, 995, 1006, 1024, 1039, 1070, 1076, + 1082, 1086, 1090, 1094, 1098, 1103, 1110, 1114, 1119, 1137, + 1147, 1165, 1182, 1199, 1220, 1240, 1260, 1277, 1301, 1312, + 1316, 1318, 1321, 1324, 1325, 1327, 1328, 1330, 1333, 1335, + 1338, 1349, 1359, 1369, 1377, 1453, 1455, 1456, 1457, 1458, + 1461, 1463, 1464, 1465, 1466, 1467, 1468, 1469, 1470, 1471, + 1472, 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1480, 1481, + 1482, 1483, 1484, 1485, 1486, 1487, 1488, 1489, 1490, 1493, + 1495, 1496, 1507, 1514, 1527, 1536, 1544, 1552, 1562, 1566, + 1571, 1575, 1580, 1584, 1588, 1594, 1600, 1606, 1610, 1616, + 1629, 1635, 1644, 1648 }; #endif @@ -575,16 +572,16 @@ static const short yyr1[] = { 0, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 205, 206, 206, 206, 206, 207, 207, 207, 208, 208, 209, 210, 211, 212, 212, - 212, 212, 212, 212, 212, 212, 212, 212, 213, 213, - 214, 214, 215, 215, 215, 215, 215, 215, 215, 215, - 216, 217, 218, 218, 220, 219, 221, 219, 222, 219, - 223, 223, 224, 224, 224, 225, 225, 226, 226, 226, - 226, 226, 227, 227, 227, 227, 227, 227, 227, 227, + 212, 212, 212, 212, 212, 212, 213, 213, 214, 214, + 215, 215, 215, 215, 215, 215, 215, 215, 216, 217, + 218, 218, 220, 219, 221, 219, 222, 219, 223, 223, + 224, 224, 224, 225, 225, 226, 226, 226, 226, 226, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, 227, - 227, 228, 228, 228, 229, 229, 230, 230, 230, 230, - 231, 231, 232, 232, 233, 233, 233, 234, 234, 235, - 235, 235, 236, 236, 236, 236 + 227, 227, 227, 227, 227, 227, 227, 227, 227, 228, + 228, 228, 229, 229, 230, 230, 230, 230, 231, 231, + 232, 232, 233, 233, 233, 234, 234, 235, 235, 235, + 236, 236, 236, 236 }; static const short yyr2[] = { 0, @@ -602,19 +599,19 @@ static const short yyr2[] = { 0, 25, 1, 3, 0, 25, 1, 3, 0, 31, 1, 3, 0, 31, 1, 3, 0, 31, 4, 7, 8, 12, 6, 5, 7, 7, 12, 7, 9, 17, 7, - 8, 8, 5, 7, 11, 8, 9, 8, 22, 20, - 8, 8, 5, 8, 7, 8, 7, 11, 7, 9, - 1, 1, 1, 0, 2, 4, 4, 3, 7, 8, - 11, 12, 12, 8, 12, 8, 11, 15, 1, 2, - 9, 2, 6, 9, 9, 8, 8, 8, 6, 4, - 2, 4, 0, 2, 0, 5, 0, 5, 0, 5, - 0, 2, 4, 8, 4, 9, 7, 1, 1, 1, - 1, 1, 1, 3, 3, 3, 3, 3, 3, 2, - 2, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 6, 4, 4, 4, 4, 4, 4, 6, 6, - 6, 1, 1, 1, 3, 6, 11, 9, 7, 7, - 0, 3, 1, 3, 0, 3, 3, 1, 3, 0, - 1, 3, 1, 1, 3, 3 + 8, 8, 7, 11, 5, 8, 9, 8, 22, 20, + 8, 8, 5, 8, 7, 8, 5, 11, 5, 9, + 1, 1, 1, 0, 2, 4, 4, 3, 8, 12, + 8, 12, 8, 12, 11, 15, 1, 2, 9, 2, + 6, 9, 9, 8, 8, 8, 6, 4, 2, 4, + 0, 2, 0, 5, 0, 5, 0, 5, 0, 2, + 4, 8, 4, 9, 7, 1, 1, 1, 1, 1, + 1, 3, 3, 3, 3, 3, 3, 2, 2, 4, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 6, + 4, 4, 4, 4, 4, 4, 6, 6, 6, 1, + 1, 1, 3, 6, 11, 9, 7, 7, 0, 3, + 1, 3, 0, 3, 3, 1, 3, 0, 1, 3, + 1, 1, 3, 3 }; static const short yydefact[] = { 51, @@ -624,127 +621,126 @@ static const short yydefact[] = { 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52, 53, 54, 55, 56, 57, - 58, 62, 59, 60, 61, 63, 242, 244, 243, 0, + 58, 62, 59, 60, 61, 63, 240, 242, 241, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 213, 12, 0, 13, 14, 16, 15, - 17, 251, 251, 0, 64, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 260, 0, 0, 0, 0, - 260, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 164, 0, 260, 164, - 191, 0, 0, 0, 0, 0, 0, 193, 0, 0, + 0, 0, 0, 211, 12, 0, 13, 14, 16, 15, + 17, 249, 249, 0, 64, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 258, 0, 0, + 0, 0, 258, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 164, + 0, 258, 164, 189, 0, 258, 258, 0, 0, 0, + 191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 221, - 220, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 219, 218, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 261, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 259, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 168, 0, - 0, 0, 67, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 164, 164, 0, 0, 0, + 0, 0, 168, 0, 0, 0, 67, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 214, 216, 215, 217, 218, 219, 0, + 0, 0, 0, 0, 0, 0, 0, 212, 214, 213, + 215, 216, 217, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 251, 0, 0, 0, 0, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 253, 0, 0, 0, 0, 128, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 263, 264, 0, 0, 0, + 0, 261, 262, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 163, 0, 162, 161, 0, 0, 0, 0, 0, 166, + 165, 188, 0, 167, 0, 0, 0, 0, 0, 0, + 0, 0, 193, 195, 197, 190, 192, 0, 220, 221, + 222, 223, 224, 225, 226, 227, 228, 229, 0, 231, + 232, 233, 234, 235, 236, 0, 0, 0, 214, 213, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 166, 165, 190, 0, 167, 0, 0, 0, 0, - 0, 0, 0, 0, 195, 197, 199, 192, 194, 0, - 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, - 0, 233, 234, 235, 236, 237, 238, 0, 0, 0, - 216, 215, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 252, 0, 19, 0, 133, 0, - 260, 260, 0, 143, 260, 0, 153, 260, 260, 0, - 0, 262, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 164, 164, - 0, 0, 0, 0, 0, 0, 67, 0, 0, 0, + 0, 0, 250, 0, 19, 0, 0, 133, 258, 258, + 0, 258, 145, 0, 153, 258, 258, 0, 0, 260, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, - 78, 79, 0, 0, 260, 0, 0, 260, 0, 0, + 0, 0, 0, 0, 0, 0, 157, 159, 0, 0, + 0, 0, 0, 67, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 68, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 0, + 0, 258, 0, 0, 258, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 260, 260, 0, 0, - 0, 0, 260, 260, 0, 0, 0, 0, 0, 260, - 0, 260, 0, 0, 0, 0, 0, 254, 0, 251, - 0, 0, 0, 260, 0, 260, 0, 0, 0, 245, - 265, 266, 132, 0, 260, 260, 260, 183, 0, 260, - 260, 260, 260, 260, 260, 260, 0, 0, 0, 163, - 0, 162, 161, 0, 0, 0, 0, 0, 0, 0, - 189, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 65, 0, 0, 0, 0, 255, - 0, 201, 201, 201, 0, 232, 239, 240, 241, 0, + 0, 0, 0, 258, 258, 0, 0, 0, 0, 258, + 258, 0, 0, 0, 0, 0, 258, 0, 258, 0, + 0, 0, 0, 0, 252, 0, 249, 0, 0, 0, + 258, 0, 258, 0, 0, 0, 243, 263, 264, 132, + 0, 258, 258, 258, 181, 0, 258, 258, 258, 258, + 258, 258, 258, 0, 0, 0, 0, 0, 0, 0, + 187, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 65, 0, 0, 0, 0, 253, + 0, 199, 199, 199, 0, 230, 237, 238, 239, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 208, 209, 210, 211, 212, 0, 0, + 0, 0, 0, 206, 207, 208, 209, 210, 0, 0, 0, 0, 0, 0, 0, 18, 0, 129, 137, 0, 140, 0, 134, 0, 135, 155, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 157, 159, 164, 0, 0, 0, 0, - 0, 0, 0, 169, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 144, - 0, 260, 260, 0, 260, 0, 0, 201, 0, 0, - 260, 0, 0, 0, 260, 0, 0, 0, 0, 0, + 0, 0, 0, 164, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 260, 0, 0, 0, 0, 0, 0, - 0, 0, 251, 0, 142, 152, 0, 0, 187, 146, - 148, 0, 0, 186, 188, 154, 130, 141, 151, 156, - 0, 0, 0, 0, 0, 174, 0, 176, 0, 170, - 0, 0, 66, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 255, 0, 258, - 0, 0, 0, 0, 196, 202, 198, 200, 0, 0, - 0, 0, 0, 21, 0, 30, 0, 34, 0, 28, - 0, 0, 33, 0, 38, 36, 0, 0, 0, 0, - 0, 0, 45, 0, 0, 0, 0, 0, 50, 0, - 0, 138, 246, 0, 185, 184, 250, 0, 249, 164, - 160, 0, 0, 0, 0, 0, 0, 179, 0, 0, + 0, 0, 0, 0, 0, 143, 0, 258, 258, 0, + 258, 0, 0, 199, 0, 0, 258, 0, 0, 0, + 258, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 258, + 0, 0, 0, 0, 0, 0, 0, 0, 249, 0, + 142, 152, 0, 0, 185, 146, 148, 0, 0, 184, + 186, 154, 130, 141, 151, 156, 0, 248, 0, 247, + 0, 0, 169, 0, 171, 0, 173, 0, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 260, 257, 256, 260, 0, 0, - 0, 0, 147, 0, 0, 255, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 260, 0, + 0, 0, 0, 253, 0, 256, 0, 0, 0, 0, + 194, 200, 196, 198, 0, 0, 0, 0, 0, 21, + 0, 30, 0, 34, 0, 28, 0, 0, 33, 0, + 38, 36, 0, 0, 0, 0, 0, 0, 45, 0, + 0, 0, 0, 0, 50, 0, 0, 138, 244, 0, + 183, 182, 164, 0, 160, 0, 0, 0, 0, 0, + 0, 177, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 258, 255, 254, + 258, 0, 0, 0, 0, 147, 0, 0, 253, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 182, 260, 0, 180, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 260, - 260, 0, 259, 0, 0, 203, 244, 0, 205, 0, - 35, 0, 0, 0, 0, 25, 0, 31, 0, 37, - 26, 39, 0, 42, 0, 46, 47, 0, 0, 49, - 0, 0, 0, 0, 248, 158, 0, 0, 0, 0, - 177, 171, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 260, 260, 145, 0, + 0, 258, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 246, 0, 0, 0, 180, 258, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 173, 175, 172, 0, - 260, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 82, 86, 90, 131, 136, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 29, 32, 40, 0, 41, 48, - 43, 0, 0, 247, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 260, 0, + 0, 0, 0, 0, 0, 257, 0, 0, 201, 242, + 0, 203, 0, 35, 0, 0, 0, 0, 25, 0, + 31, 0, 37, 26, 39, 0, 42, 0, 46, 47, + 0, 0, 49, 0, 0, 0, 158, 0, 0, 0, + 0, 0, 175, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 258, 258, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 260, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 204, 0, 0, 0, - 0, 24, 27, 0, 0, 0, 178, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 245, 170, 172, 174, + 0, 258, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 82, 86, 90, 131, 136, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 29, 32, 40, 0, 41, + 48, 43, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 258, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 258, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 202, 0, 0, 0, + 0, 24, 27, 0, 0, 0, 176, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 80, 0, - 84, 0, 88, 0, 0, 0, 207, 0, 0, 260, + 84, 0, 88, 0, 0, 0, 205, 0, 0, 258, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 44, 20, 139, 181, 0, + 0, 0, 0, 0, 0, 44, 20, 139, 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 81, 83, - 85, 87, 89, 91, 0, 0, 206, 0, 0, 260, + 85, 87, 89, 91, 0, 0, 204, 0, 0, 258, 0, 0, 0, 0, 0, 0, 94, 98, 102, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 5, 260, 0, 0, 0, + 0, 0, 0, 0, 0, 5, 258, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 150, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 0, - 96, 0, 100, 0, 260, 0, 0, 0, 0, 0, + 96, 0, 100, 0, 258, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 149, 0, 22, 0, 0, 0, 0, 0, 0, 93, 95, 97, - 99, 101, 103, 260, 0, 0, 0, 106, 110, 114, - 0, 0, 0, 0, 0, 0, 0, 260, 0, 0, + 99, 101, 103, 258, 0, 0, 0, 106, 110, 114, + 0, 0, 0, 0, 0, 0, 0, 258, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 104, 0, 108, 0, 112, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 105, 107, @@ -754,666 +750,659 @@ static const short yydefact[] = { 51, 123, 125, 127, 0, 0, 0 }; -static const short yydefgoto[] = { 1334, - 4, 5, 18, 19, 20, 21, 6, 55, 56, 368, - 1108, 491, 1056, 1110, 492, 1057, 1112, 493, 1058, 1218, - 494, 1191, 1220, 495, 1192, 1222, 496, 1193, 1279, 497, - 1265, 1281, 498, 1266, 1283, 499, 1267, 1316, 500, 1310, - 1318, 501, 1311, 1320, 502, 1312, 57, 363, 580, 581, - 582, 583, 61, 62, 63, 857, 858, 64, 65, 66, - 260, 379, 509, 510, 511, 717, 718, 882, 649, 224, - 94, 337, 240, 210, 322, 714, 799, 800, 338 +static const short yydefgoto[] = { 1324, + 4, 5, 18, 19, 20, 21, 6, 55, 56, 376, + 1098, 498, 1046, 1100, 499, 1047, 1102, 500, 1048, 1208, + 501, 1181, 1210, 502, 1182, 1212, 503, 1183, 1269, 504, + 1255, 1271, 505, 1256, 1273, 506, 1257, 1306, 507, 1300, + 1308, 508, 1301, 1310, 509, 1302, 57, 371, 361, 362, + 363, 364, 61, 62, 63, 851, 852, 64, 65, 66, + 264, 387, 516, 517, 518, 713, 714, 875, 649, 229, + 94, 343, 134, 213, 326, 710, 795, 796, 344 }; -static const short yypact[] = { 266, --32768,-32768, -112,-32768, 344, 1309, 667, 9, 68, 59, - 61, 76, 110, 114, -45, -22, -8,-32768,-32768,-32768, --32768, 172, 165, 35, 47, 49, -37, -31, 63, 65, - 181, 67, 189, 236, 282, 44, 216, 103, 143, 168, - 188, 198, -26, 196, 349, 325, 228, 383, 391, 3, - 247, -29, 253, 373,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 283, - 284, 287, 288, 290, 291, 292, 295, 296, 297, 299, - 308, 312, 317, 332, 337, 338, 342, 343, 345, 667, - 667, 667, 611,-32768,-32768, 1361,-32768,-32768,-32768,-32768, --32768, 348, 348, 500,-32768, 667, 667, 667, 667, 356, - 667, 361, 667, 667, 667, 505, 667, 387, 394, 395, - 505, 389, 400, 397, 410, 415, 421, 423, -58, -58, - -58, -58, 424, 425, 428, 667,-32768, 549, 505,-32768, --32768, -57, 429, 430, 667, -53, 667,-32768, 432, 667, - 667, 667, 667, 667, 667, 667, 667, 667, 667, 667, - 667, 667, 667, 667, 667, 667, 667, 667, 667, 434, - 434, 358, 667, 667, 667, 667, 667, 611, 435, 448, - 454, 455, 459, 462, 466, 467, 468, 469, 495, 496, - 503, 504, 506, 507, 509, 510, 519, 523, 555, 556, - 557, 559, 564, 568, 569, 570, 576, 580, 602, 433, - 458, 499, 112, 732, 742, 780, 667, 791, 667, 802, - 817, 828, 667, 320, 661, 846, 667, 667, 667, 697, - 667, 667, 667, 667, 667, 667, 667, 667, 667, 578, - 590, 592, 581, 667, 667, 667, 259, 825,-32768, 187, - 1017, -58,-32768, 667, 667, 894, 649, 667, 940, -56, - 667, 954, 1034, 1062, 1088, 1108, 1125, 1144, 1177, 1232, - 1252, 418, 1262, 1272, 1282, 1292, 1349, 1359, 1154, 1806, - 1815, 667, 667,-32768, -73, 43, 434, 434, 434, 218, - 741, 744, 747, 748, 753, 754, 761, 762, 764, 765, - 766, 767, 769, 771, 785, 786, 787, 792, 793, 795, - 796, 797, 799, 623, 800, 801, 803, 804, 811, 810, --32768, -114, 834, 836, 835,-32768, 202, 837, 841, 1369, - 235, 1379, 843, 844, 845, 197,-32768, -39, 667, 847, - 457, 1390, 1400, 667, 498, 518, 1410, 1420, 1430, 1440, - 1450, 1824, 1833, -58, 654, 663, 667, 1842, 1851, 1860, - -58,-32768,-32768,-32768, 667,-32768, 690, 346, 1869, 1878, - 856, 700, 1460, 858,-32768,-32768,-32768,-32768,-32768, 1470, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 667,-32768,-32768,-32768,-32768,-32768,-32768, 667, 667, 667, - -23, -23, 715, 717, 720, 722, 728, 729, 745, 746, - 749, 755, 756, 759, 776, 777, 779, 788, 790, 798, - 807, 813, 816, 819, 824, 827, 830, 831, 848, 850, - 852, 853, 864, 878,-32768, 740,-32768, 866,-32768, -58, - 505, 505, 886,-32768, 505, 892,-32768, 505, 505, 31, - 667,-32768, 119, 781, 931, 935, 937, 57, 943, 948, - 969, 979, 989, 990, 1011, 667, 667, 868, 334, 334, - 1480, -58, -58, -58, 84, 128,-32768, 870, 871, 872, - 874, 879, 891, 895, 907, 910, 913, 914, 915, 1022, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, --32768,-32768, 667, 667, 505, 667, 1035, 505, 925, 926, - 927, 1037, 1490, 1500, 1510, 1520, 953, 1085, 667, 667, - -58, 1087, 1090, 946, 1091, 1098, 505, 505, 1099, -58, - 1101, 1102, 505, 505, 1104, 1107, 1109, 1111, 1112, 505, - 333, 505, 1113, 1123, 1127, 1114, 1130,-32768, 1124, 348, - 1128, 21, 1129, 505, 1131, 505, 1132, 1133, 667, 320, - 197,-32768,-32768, 667, 505, 505, 505,-32768, 211, 505, - 505, 505, 505, 505, 505, 505, 1887, 1896, 667,-32768, - 959, 1110,-32768, 996, 1000, 131, 179, 219, -58, 1150, --32768, 404, 667, 667, 667, 667, 667, 667, 667, 667, - 667, 667, 667, 667,-32768, 1905, 1914, 1151, 1530, -18, - 1077, 1157, 1157, 1157, 667,-32768,-32768,-32768,-32768, 667, - 1012, 1923, 1932, 1010, 1019, 1020, 1025, 1021, 1031, 1032, - 1039, 1040, 1049, 1051, 1057, 1058, 1052, 1061, 1064, 1065, - 1066, 1067, 1075,-32768,-32768,-32768,-32768,-32768, 1068, 1078, - 1084, 1092, 1093, 1086, 1094,-32768, 1095,-32768,-32768, -58, --32768, 1207,-32768, 1230,-32768,-32768, -75, 1941, 1233, 1236, - 1241, 667, 667, 1249, 1250, 1253, 1255, 1266, 1267, 1269, - 667, 667, 1543,-32768,-32768, 334, -58, 1270, -58, 1277, - -58, 11, 1134,-32768, 1285, 1950, 1959, 1968, 1977, 1986, - 1995, 2004, 2013, 2022, 2031, 2040, 2049, 667, 667,-32768, - 1251, 505, 505, 1195, 505, 1287, 1138, 1157, 1141, 1147, - 286, 611, 1299, 667, 505, 1298, 1308, 1306, 1169, 1310, - 333, 1312, 1321, 667, 1319, 1324, 1322, 1325, 1327, 333, - 667, 667, 667, 505, 1326, 1330, 333, 667, 1331, 1333, - 1341, 667, 348, 1350,-32768,-32768, 667, 667,-32768,-32768, --32768, 135, 178,-32768,-32768,-32768,-32768,-32768,-32768,-32768, - 1553, 340, 1184, 1201, 1206,-32768, 1215,-32768, 1221,-32768, - 28, 667,-32768, 667, 667, 667, 667, 667, 667, 667, - 667, 667, 667, 667, 667, 1563, 1573, -18, 243,-32768, - -24, 1205, 1300, 10,-32768,-32768,-32768,-32768, 1373, 611, - 1231, 2058, 1234,-32768, 1235,-32768, 1238,-32768, 1240,-32768, - 1248, 1586,-32768, 1258,-32768,-32768, 1260, 1261, 1596, 2067, - 1606, 1259,-32768, 1268, 1271, 2076, 1278, 1280,-32768, 2085, - 1279,-32768, 320, 2094,-32768,-32768,-32768, 667,-32768, 334, --32768, 667, 667, 667, 1376, 1247, -43,-32768, 1616, 2103, - 2112, 2121, 2130, 2139, 2148, 2157, 2166, 2175, 2184, 2193, - 2202, 1395, 1396, 1336, 505,-32768,-32768, 505, 667, 1416, - 809, 1427,-32768, -55, 1433, -18, 333, 1439, 667, 1437, - 333, 1446, 1442, 1447, 1448, 1449, 667, 1461, 505, 1462, - 1463, 667, 1443, 1464, 667, 1451, 1467, 392, 1320, 1626, - 1636, 1646,-32768, 505, 1479,-32768, 1491, 667, 667, 667, - 667, 667, 667, 667, 667, 667, 667, 667, 667, 505, - 505, 1343,-32768, 1348, 190,-32768, 1355, 2211,-32768, 667, --32768, 1356, 1358, 1365, 2220,-32768, 1368,-32768, 1374,-32768, --32768,-32768, 1656,-32768, 1366,-32768,-32768, 1666, 1375,-32768, - 1676, 1378, 1386, 667,-32768,-32768, 1494, 1504, 12, 1387, --32768,-32768, 2229, 2238, 2247, 2256, 2265, 2274, 2283, 2292, - 2301, 1686, 1696, 1706, 1524, 1534, 505, 505,-32768, 667, - 667, 611, 333, 333, 333, 333, 1535, 1541, 1542, 333, - 1544, 1545, 1551, 1468, 1555, 554,-32768,-32768,-32768, 28, - 505, 667, 667, 667, 667, 667, 667, 667, 667, 667, --32768,-32768,-32768,-32768,-32768, 1407, 1413, 567, 2310, 611, - 1417, 1419, 1409, 1425,-32768,-32768,-32768, 1436,-32768,-32768, --32768, 1456, 1457,-32768, -40, 1459, 2319, 2328, 2337, 2346, - 2355, 2364, 2373, 2382, 2391, 1418, 1428, 1435, 505, 1498, - 1584, 667, 100, 333, 333, 1585, 1591, 333, 1593, 1595, - 1605, 505, 667, 667, 667, 667, 667, 667, 667, 667, - 667, 667, 667, 667, 1466, 1465,-32768, 405, 667, 1476, - 1477,-32768,-32768, 1469, 1485, 1486,-32768, 1487, 2400, 2409, - 2418, 2427, 2436, 2445, 2454, 2463, 2472, 22, 320, 36, - 320, 53, 320, 1521, 667, 667,-32768, 611, 333, 505, - 1611, 1625, 1634, 1641, 667, 667, 667, 667, 667, 667, - 667, 667, 667, 667, 1642, 667, 1644, 667, 1645, 1505, - 2481, 579, 611, 1509, 1516,-32768,-32768,-32768,-32768, 2490, - 2499, 2508, 2517, 2526, 2535, 1716, 1726, 1736, 320,-32768, - 320,-32768, 320,-32768, 667, 667,-32768, 650, 333, 505, - 667, 667, 667, 667, 667, 667,-32768,-32768,-32768, 2544, - 594, 1528, 1519, 1526, 2553, 2562, 2571, 2580, 2589, 2598, - 1508, 1518, 1525, 667, 1674,-32768, 505, 333, 667, 667, - 667, 667, 667, 667, 667, 667, 667, 619,-32768, 1532, - 1529, 2607, 2616, 2625, 2634, 2643, 2652, 60, 320, 99, - 320, 140, 320, 1678, 505, 1684, 667, 667, 667, 667, - 667, 667, 667, 1685, 667, 1687, 667, 1688,-32768, 1549, --32768, 2661, 2670, 2679, 1746, 1756, 1766, 320,-32768, 320, --32768, 320,-32768, 505, 667, 667, 667,-32768,-32768,-32768, - 1550, 2688, 2697, 2706, 1557, 1558, 1560, 505, 667, 667, - 667, 667, 667, 667, 1552, 2715, 2724, 2733, 166, 320, - 174, 320, 175, 320, 333, 667, 667, 667, 667, 1698, - 667, 1714, 667, 1715, 1571, 1776, 1786, 1796, 320,-32768, - 320,-32768, 320,-32768, 1718,-32768,-32768,-32768,-32768, 1574, - 1580, 1581, 667, 667, 667, 214, 320, 215, 320, 229, - 320, 667, 1720, 667, 1730, 667, 1731, 320,-32768, 320, --32768, 320,-32768, 1743, 1744,-32768 +static const short yypact[] = { 7, +-32768,-32768, -127,-32768, 24, 793, 613, 10, 11, 22, + 35, 42, 122, 138, -120, 38, 43,-32768,-32768,-32768, +-32768, 191, 201, -116, 63, 68, -46, -26, 70, 74, + 202, 78, 213, 218, 223, 56, 251, 169, 141, -73, + -73, 142, 189, 143, 306, 278, 166, 329, 335, 65, + 192, -29, 209, 321,-32768,-32768,-32768,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 206, + 221, 222, 228, 229, 241, 247, 256, 262, 263, 264, + 287, 288, 289, 294, 295, 296, 313, 314, 337, 613, + 613, 613, 512,-32768,-32768, 1273,-32768,-32768,-32768,-32768, +-32768, 339, 339, 358,-32768, 613, 613, 613, 613, 613, + 345, 613, 613, 350, 613, 613, 613, 457, 613, 236, + 355, 362, 457, 389, 394, 367, 398, 405, 408, 411, + -73, 613, 613, 409, 410, -73, 416, 417, 419,-32768, + 568, 457,-32768,-32768, -59, 457, 457, 613, -62, 613, +-32768, 425, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 431, 431, 669, 613, 613, 613, 613, 613, + 512, 432, 433, 434, 435, 448, 449, 461, 462, 465, + 468, 469, 471, 493, 494, 496, 509, 510, 517, 518, + 544, 545, 549, 550, 552, 557, 558, 562, 569, 570, + 574, 705, 571, 573, 576, 66, 717, 364, 821, 979, + 613, 989, 400, 613, 460, 1001, 1017, 613, 944, 721, + 1027, 613, 613, 613, 722, 613, 613, 613, 613, 613, + 613, 613, 587, -70, 1058, 185, 185, 589, 613, 613, + 613, 899,-32768, 40, 915, -73,-32768, 736, 738, 1048, + 670, 613, 1078, -72, 613, 1098, 1115, 1134, 1169, 1183, + 1261, 1271, 1281, 1291, 1301, 1738, 1311, 1321, 1331, 1346, + 1356, 1366, 1747, 1756, 1765, 613, 613,-32768, 55, 200, + 431, 431, 431, 259, 737, 748, 750, 753, 756, 763, + 764, 766, 767, 784, 785, 787, 790, 795, 796, 797, + 804, 812, 814, 815, 817, 826, 838, 674, 845, 851, + 859, 863, 839, 865,-32768, 94, 868, 870, 869,-32768, + 875, 880, 878, 883, 1376, 885, 881, 1386, 887, 889, + 890, 171,-32768, 29, 613, 891, 547, 1396, 1406, 613, + 560, 572, 1416, 1426, 1436, 1446, 1456, -73, 613, 613, +-32768, 746, 976,-32768, 747, 613, 1774, 1783, 1794,-32768, +-32768,-32768, 613,-32768, 749, 232, 769, 768, 896, 770, + 1466, 909,-32768,-32768,-32768,-32768,-32768, 1476,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 613,-32768, +-32768,-32768,-32768,-32768,-32768, 613, 613, 613, -106, -106, + 779, 774, 777, 786, 788, 791, 802, 807, 810, 811, + 818, 820, 833, 834, 836, 841, 844, 854, 876, 884, + 892, 897, 898, 900, 901, 917, 919, 920, 926, 927, + 934, 922,-32768, 803,-32768, 941, -73,-32768, 457, 457, + 961, 457,-32768, 965,-32768, 457, 457, 41, 613,-32768, + 105, 835, 982, 983, 1009, 32, 1012, 1019, 1022, 1024, + 1025, 1034, 1037, 952, 1803, 1813,-32768,-32768, 590, -73, + -73, -73, 116,-32768, 954, 956, 968, 970, 977, 980, + 986, 987, 990, 992, 993, 1002, 1028,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 613, + 613, 457, 613, 1043, 457, 949, 998, 1011, 1122, 1486, + 1496, 1506, 1517, 1005, 1162, 613, 613, -73, 1164, 1165, + 1029, 1172, 1175, 457, 457, 1177, -73, 1178, 1192, 457, + 457, 1193, 1195, 1196, 1202, 1203, 457, 559, 457, 1205, + 1212, 1214, 1226, 1228,-32768, 1229, 339, 1230, 30, 1231, + 457, 1239, 457, 1240, 1242, 613, 944, 171,-32768,-32768, + 613, 457, 457, 457,-32768, 158, 457, 457, 457, 457, + 457, 457, 457, 613, 613, 613, 1081, 44, 102, 119, +-32768, 255, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613,-32768, 1822, 1831, 1243, 1527, 121, + 1168, 1258, 1258, 1258, 613,-32768,-32768,-32768,-32768, 613, + 1112, 1841, 1850, 1113, 1117, 1114, 1124, 1121, 1130, 1132, + 1131, 1136, 1133, 1138, 1140, 1141, 1139, 1143, 1144, 1148, + 1149, 1150, 1151,-32768,-32768,-32768,-32768,-32768, 1153, 1157, + 1171, 1173, 1179, 1167, 1180,-32768, 1182,-32768,-32768, -73, +-32768, 1296,-32768, 1314,-32768,-32768, 238, 1859, 1328, 1330, + 1332, 613, 613, 1334, 1335, 1336, 1337, 1338, 1339, 1340, + 605, 1537, 304, 185, -73, 1341, -73, 1345, -73, 14, + 1354, 1868, 1878, 1887, 1896, 1905, 1914, 1923, 1932, 1941, + 1950, 1959, 1968, 613, 613,-32768, 1357, 457, 457, 1269, + 457, 1358, 1213, 1258, 1225, 1227, 407, 512, 1363, 613, + 457, 1362, 1377, 1378, 1237, 1379, 559, 1380, 1394, 613, + 1402, 1408, 1403, 1412, 1409, 559, 613, 613, 613, 457, + 1413, 1418, 559, 613, 1419, 1425, 1423, 613, 339, 1432, +-32768,-32768, 613, 613,-32768,-32768,-32768, 123, 132,-32768, +-32768,-32768,-32768,-32768,-32768,-32768, 1278,-32768, 613,-32768, + 1285, 1232,-32768, 1290,-32768, 1297,-32768, -33,-32768, 613, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 1977, 1986, 121, 112,-32768, 135, 1279, 1369, 13, +-32768,-32768,-32768,-32768, 1445, 512, 1300, 1995, 1307,-32768, + 1308,-32768, 1310,-32768, 1316,-32768, 1318, 1547,-32768, 1320, +-32768,-32768, 1326, 1327, 1557, 2004, 1567, 1333,-32768, 1329, + 1342, 2013, 1352, 1344,-32768, 2022, 1353,-32768, 944, 2031, +-32768,-32768, 185, 347,-32768, 613, 613, 613, 1479, 1289, + -30,-32768, 2040, 2049, 2058, 2067, 2076, 2085, 2094, 2103, + 2112, 2121, 2130, 2139, 613, 613, 1389, 457,-32768,-32768, + 457, 613, 1480, 660, 1482,-32768, 224, 1500, 121, 559, + 1459, 613, 1501, 559, 1507, 1511, 1518, 1520, 1521, 613, + 1528, 457, 1530, 1531, 613, 1514, 1538, 613, 1477, 1541, + 1393, 613,-32768, 642, 662, 735,-32768, 457, 1548,-32768, + 613, 613, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 1577, 837, 1370,-32768, 1382, 139,-32768, 1392, + 2148,-32768, 613,-32768, 1405, 1415, 1422, 2157,-32768, 1401, +-32768, 1411,-32768,-32768,-32768, 1587,-32768, 1433,-32768,-32768, + 1597, 1424,-32768, 1607, 1435, 1442,-32768, 879, 1551, 1558, + 15, 1443,-32768, 2166, 2175, 2184, 2193, 2202, 2211, 2220, + 2229, 2238, 1617, 1627, 1637, 1561, 1568, 457, 457,-32768, + 613, 613, 512, 559, 559, 559, 559, 1571, 1581, 1590, + 559, 1591, 1598, 1600, 1578, 1602,-32768,-32768,-32768,-32768, + -33, 457, 613, 613, 613, 613, 613, 613, 613, 613, + 613,-32768,-32768,-32768,-32768,-32768, 1452, 1460, 893, 2247, + 512, 1462, 1465, 1471, 1472,-32768,-32768,-32768, 1475,-32768, +-32768,-32768, 1483, 1485, 28, 1492, 2256, 2265, 2274, 2283, + 2292, 2301, 2310, 2319, 2328, 1464, 1474, 1484, 457, 1553, + 1640, 613, 231, 559, 559, 1648, 1650, 559, 1652, 1654, + 1658, 457, 613, 613, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 1499, 1512,-32768, 422, 613, 1516, + 1523,-32768,-32768, 1525, 1526, 1533,-32768, 1534, 2337, 2346, + 2355, 2364, 2373, 2382, 2391, 2400, 2409, 159, 944, 182, + 944, 190, 944, 1595, 613, 613,-32768, 512, 559, 457, + 1679, 1688, 1689, 1691, 613, 613, 613, 613, 613, 613, + 613, 613, 613, 613, 1692, 613, 1698, 613, 1699, 1554, + 2418, 930, 512, 1563, 1564,-32768,-32768,-32768,-32768, 2427, + 2436, 2445, 2454, 2463, 2472, 1647, 1657, 1667, 944,-32768, + 944,-32768, 944,-32768, 613, 613,-32768, 621, 559, 457, + 613, 613, 613, 613, 613, 613,-32768,-32768,-32768, 2481, + 937, 1584, 1566, 1574, 2490, 2499, 2508, 2517, 2526, 2535, + 1555, 1565, 1575, 613, 1721,-32768, 457, 559, 613, 613, + 613, 613, 613, 613, 613, 613, 613, 951,-32768, 1583, + 1585, 2544, 2553, 2562, 2571, 2580, 2589, 196, 944, 197, + 944, 203, 944, 1729, 457, 1732, 613, 613, 613, 613, + 613, 613, 613, 1739, 613, 1741, 613, 1742,-32768, 1593, +-32768, 2598, 2607, 2616, 1677, 1687, 1697, 944,-32768, 944, +-32768, 944,-32768, 457, 613, 613, 613,-32768,-32768,-32768, + 1606, 2625, 2634, 2643, 1605, 1611, 1612, 457, 613, 613, + 613, 613, 613, 613, 1616, 2652, 2661, 2670, 234, 944, + 239, 944, 244, 944, 559, 613, 613, 613, 613, 1762, + 613, 1768, 613, 1769, 1625, 1707, 1717, 1727, 944,-32768, + 944,-32768, 944,-32768, 1778,-32768,-32768,-32768,-32768, 1632, + 1634, 1635, 613, 613, 613, 303, 944, 308, 944, 348, + 944, 613, 1788, 613, 1789, 613, 1791, 944,-32768, 944, +-32768, 944,-32768, 1798, 1804,-32768 }; static const short yypgoto[] = {-32768, --32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 1276, +-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 1323, -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,-32768, 1740, 1741, -468, - 58, 1748,-32768,-32768,-32768, 757, -854,-32768,-32768,-32768, --32768,-32768,-32768,-32768,-32768, -601,-32768,-32768, -708, -7, --32768, 1305, -121, -102,-32768, -777, 1044, 460,-32768 +-32768,-32768,-32768,-32768,-32768,-32768,-32768, 1799, 1802, -241, + 371, 1808,-32768,-32768,-32768, 816, -848,-32768,-32768,-32768, +-32768,-32768,-32768,-32768,-32768, -591,-32768,-32768, -694, -7, +-32768, 1359, -40, -101,-32768, -782, 1106, 776,-32768 }; -#define YYLAST 2884 +#define YYLAST 2821 static const short yytable[] = { 93, - 211, 584, 916, 133, 146, 252, 134, 135, 241, 242, - 243, 719, 720, 880, 95, 855, 780, 1009, 855, 110, - 874, 856, 819, 7, 856, 112, 659, 257, 375, 376, - 377, 828, 143, 67, 68, 144, 434, 435, 835, 69, - 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - -221, 660, 568, -221, 97, -221, 98, 282, 283, 175, - 176, -221, -221, 177, 96, 177, 121, 122, 940, 123, - 757, 99, 170, 171, 172, 178, 855, 282, 283, 175, - 176, 238, 856, 177, 239, 253, 258, 378, 213, 214, - 215, 216, 569, 218, 102, 220, 221, 222, 942, 226, - 915, 451, 111, 1071, 452, 100, 806, 326, 113, 101, - 147, 175, 176, 136, 563, 177, 875, 103, 247, 877, - 367, 712, 125, 591, 713, 126, 127, 256, 128, 259, - 845, 104, 262, 263, 264, 265, 266, 267, 268, 269, - 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, - 280, 281, 881, 781, 1010, 285, 286, 287, 288, 289, - 290, 106, 1134, 90, 91, 1135, -220, 105, 943, -220, - 92, -220, 947, 846, 107, 559, 1136, -220, -220, 1137, - 916, 177, 364, 365, 248, 989, 108, 251, 109, 282, - 283, 175, 176, 1138, 450, 177, 1139, 439, 440, 330, - 1233, 332, 114, 1234, 115, 336, 117, 774, 116, 341, - 342, 343, 118, 345, 346, 347, 348, 349, 350, 351, - 352, 353, 468, 1089, 589, 590, 358, 359, 360, 475, - 444, 445, 282, 283, 175, 176, 369, 370, 177, 1235, - 373, 124, 1236, 380, 282, 283, 175, 176, 672, 673, - 177, 282, 283, 175, 176, -7, -7, 177, -7, 119, - 282, 283, 175, 176, 401, 402, 177, 282, 283, 175, - 176, 687, 688, 177, 1031, 1032, 1033, 1034, 67, 68, - 1237, 1038, 129, 1238, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, - 85, 86, 87, 88, 89, 120, 1289, 130, 551, 1290, - 282, 283, 175, 176, 1291, 1293, 177, 1292, 1294, 689, - 690, 453, 282, 283, 175, 176, 458, 131, 177, 282, - 283, 175, 176, -1, 8, 177, 9, 132, 137, 471, - 586, 587, 588, 138, 403, 1090, 1091, 476, 139, 1094, - 282, 283, 175, 176, 1322, 1324, 177, 1323, 1325, 691, - 692, -7, -7, -7, -7, -7, -7, -7, -7, 1326, - 140, 909, 1327, 513, 39, 40, 41, 42, 141, 44, - 514, 515, 516, 875, 876, 142, 145, 1, 2, 624, - 3, 282, 283, 175, 176, 148, 149, 177, 633, 361, - 1144, 478, 479, 480, 481, 482, 483, 484, 485, 486, - 487, 488, 489, 644, 645, 646, 647, 648, 173, 174, - 175, 176, 150, 151, 177, 92, 152, 153, 223, 154, - 155, 156, 560, 561, 157, 158, 159, 657, 160, 10, - 11, 12, 13, 14, 15, 16, 17, 161, 577, 578, - 1183, 162, 282, 283, 175, 176, 163, 693, 177, 478, - 479, 480, 481, 482, 483, 484, 485, 486, 487, 488, - 489, 164, 282, 283, 175, 176, 165, 166, 177, 1211, - 848, 167, 168, 849, 169, 606, 607, 209, 609, 490, - 282, 283, 175, 176, 212, 217, 177, 67, 68, 284, - 219, 622, 623, 69, 70, 71, 72, 73, 74, 75, - 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, - 86, 87, 88, 89, 282, 283, 175, 176, 754, 227, - 177, 231, 964, 228, 229, 965, 233, 282, 283, 175, - 176, 667, 232, 177, 249, 1116, 668, 695, 1117, 234, - 282, 283, 175, 176, 235, 775, 177, 777, 391, 779, - 236, 683, 237, 244, 245, 225, 1295, 246, 254, 255, - 230, 261, 177, 323, 291, 696, 697, 698, 699, 700, - 701, 702, 703, 704, 705, 706, 707, 292, 250, 282, - 283, 175, 176, 293, 294, 177, 321, 721, 295, 324, - 455, 296, 722, 67, 68, 297, 298, 299, 300, 69, + 135, 214, 910, 256, 149, 365, -7, -7, 7, -7, + 111, 867, 383, 384, 385, 95, 873, 96, 261, 777, + 1000, 715, 716, -1, 8, 849, 9, 97, 849, 102, + 114, 850, 815, 107, 850, 659, 108, 575, 178, 179, + 98, 824, 180, 67, 68, 372, 373, 99, 831, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, - 282, 283, 175, 176, 301, 302, 177, 90, 91, 325, - 841, 459, 303, 304, 92, 305, 306, 223, 307, 308, - 282, 283, 175, 176, 762, 763, 177, 339, 309, 67, - 68, 460, 310, 771, 772, 69, 70, 71, 72, 73, + 660, 330, 286, 287, 178, 179, 132, 576, 180, 133, + 359, 386, 173, 174, 175, 181, 849, 262, 123, 124, + 243, 125, 850, 257, 146, 248, 935, 147, 216, 217, + 218, 219, 220, 112, 222, 223, 113, 225, 226, 227, + 570, 231, -7, -7, -7, -7, -7, -7, -7, -7, + 150, 591, 802, 909, 244, 245, 115, 100, 841, 10, + 11, 12, 13, 14, 15, 16, 17, 842, 1, 2, + 260, 3, 263, 101, 980, 266, 267, 268, 269, 270, + 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, + 281, 282, 283, 284, 285, 874, 778, 1001, 289, 290, + 291, 292, 293, 294, 286, 287, 178, 179, 458, 459, + 180, 1061, 460, 90, 91, 936, 910, 103, -219, 940, + 92, -219, 104, -219, 685, 566, 105, 686, 127, -219, + -219, 128, 129, 180, 130, 672, 673, 106, 286, 287, + 178, 179, 109, 335, 180, 375, 338, 110, 137, 116, + 342, 138, 139, 117, 347, 348, 349, 119, 351, 352, + 353, 354, 355, 356, 357, 39, 40, 41, 42, 118, + 44, 367, 368, 369, 442, 443, 120, 286, 287, 178, + 179, 121, 687, 180, 381, 688, 122, 388, 286, 287, + 178, 179, 868, 869, 180, 286, 287, 178, 179, 689, + 708, 180, 690, 709, 286, 287, 178, 179, 409, 410, + 180, 286, 287, 178, 179, 868, 126, 180, 870, 1022, + 1023, 1024, 1025, 131, 136, 140, 1029, 485, 486, 487, + 488, 489, 490, 491, 492, 493, 494, 495, 496, 1124, + 141, 142, 1125, 286, 287, 178, 179, 474, 143, 180, + 485, 486, 487, 488, 489, 490, 491, 492, 493, 494, + 495, 496, 1126, -218, 144, 1127, -218, 461, -218, 145, + 1128, 148, 466, 1129, -218, -218, 1223, 1225, 180, 1224, + 1226, 475, 476, 1227, 152, 153, 1228, 933, 479, 1080, + 1081, 151, 215, 1084, 1079, 483, 286, 287, 178, 179, + 154, 155, 180, 286, 287, 178, 179, 156, 157, 180, + 286, 287, 178, 179, 1279, 497, 180, 1280, 232, 1281, + 158, 520, 1282, 753, 1283, 411, 159, 1284, 521, 522, + 523, 286, 287, 178, 179, 160, 558, 180, 691, 67, + 68, 161, 162, 163, 1134, 69, 70, 71, 72, 73, + 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, + 84, 85, 86, 87, 88, 89, 164, 165, 166, 588, + 589, 590, 771, 167, 168, 169, 286, 287, 178, 179, + 567, 568, 180, 1312, 769, 657, 1313, 770, 1314, 67, + 68, 1315, 170, 171, 1173, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, - 84, 85, 86, 87, 88, 89, 282, 283, 175, 176, - 796, 797, 177, 344, 311, 312, 313, 1044, 314, 282, - 283, 175, 176, 315, 810, 177, 812, 316, 317, 318, - 1061, 282, 283, 175, 176, 319, 822, 177, 354, 320, - 372, 357, 1167, 829, 830, 831, 282, 283, 175, 176, - 836, 355, 177, 356, 840, 404, 427, 1195, 405, 843, - 844, 406, 407, 173, 174, 175, 176, 408, 409, 177, - 92, 282, 283, 175, 176, 410, 411, 177, 412, 413, - 414, 415, 1224, 416, 859, 417, 860, 861, 862, 863, - 864, 865, 866, 867, 868, 869, 870, 871, 1182, 418, - 419, 420, 282, 283, 175, 176, 421, 422, 177, 423, - 424, 425, 884, 426, 428, 429, 469, 430, 431, 90, - 91, 67, 937, 432, 433, 470, 92, 69, 70, 71, - 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, - 82, 83, 84, 85, 86, 87, 88, 89, 436, 438, - 908, 437, 477, 441, 910, 911, 912, 442, 447, 506, - 448, 449, 517, 454, 24, 25, 26, 27, 28, 29, - 30, 31, 505, 32, 508, 34, 35, 518, 37, 38, - 519, 935, 520, 938, 282, 283, 175, 176, 521, 522, - 177, 945, 548, 327, 282, 283, 175, 176, 50, 953, - 177, 549, 554, 328, 958, 523, 524, 961, 556, 525, - 552, 553, 51, 52, 555, 526, 527, 557, 558, 528, - 973, 974, 975, 976, 977, 978, 979, 980, 981, 982, - 983, 984, 282, 283, 175, 176, 529, 530, 177, 531, - 564, 329, 992, 282, 283, 175, 176, 565, 532, 177, - 533, 566, 331, 567, 282, 283, 175, 176, 534, 570, - 177, 90, 91, 333, 571, 54, 1006, 535, 92, 282, - 283, 175, 176, 536, 608, 177, 537, 611, 334, 538, - 282, 283, 175, 176, 539, 572, 177, 540, 362, 335, - 541, 542, 1028, 1029, 1030, 573, 630, 631, 282, 283, - 175, 176, 636, 637, 177, 574, 575, 340, 543, 643, - 544, 650, 545, 546, 1047, 1048, 1049, 1050, 1051, 1052, - 1053, 1054, 1055, 662, 547, 664, 550, 576, 579, 593, - 594, 595, 1063, 596, 669, 670, 671, 605, 597, 674, - 675, 676, 677, 678, 679, 680, 282, 283, 175, 176, - 598, 610, 177, 615, 599, 371, 24, 25, 26, 27, - 28, 29, 30, 31, 1088, 32, 600, 34, 35, 601, - 37, 38, 602, 603, 604, 1099, 1100, 1101, 1102, 1103, - 1104, 1105, 1106, 1107, 1109, 1111, 1113, 612, 613, 614, - 50, 1118, 282, 283, 175, 176, 620, 621, 177, 625, - 627, 374, 626, 628, 51, 52, 282, 283, 175, 176, - 629, 632, 177, 634, 635, 381, 638, 1141, 1142, 639, - 1143, 640, 684, 641, 642, 651, 654, 1150, 1151, 1152, - 1153, 1154, 1155, 1156, 1157, 1158, 1159, 652, 1161, 656, - 1163, 653, 655, 658, 661, 1168, 663, 665, 666, 24, - 25, 26, 27, 28, 29, 30, 31, 54, 32, 685, - 34, 35, 686, 37, 38, 694, 710, 1180, 1181, 715, - 716, 726, 723, 1185, 1186, 1187, 1188, 1189, 1190, 727, - 366, 728, 730, 50, 803, 729, 282, 283, 175, 176, - 809, 731, 177, 732, 813, 382, 1208, 51, 52, 733, - 734, 1212, 1213, 1214, 1215, 1216, 1217, 1219, 1221, 1223, - 735, 736, 739, 832, 282, 283, 175, 176, 737, 738, - 177, 740, 755, 383, 741, 742, 743, 744, 746, 1242, - 1243, 1244, 1245, 1246, 1247, 1248, 745, 1250, 747, 1252, - 282, 283, 175, 176, 748, 756, 177, 751, 759, 384, - 54, 760, 749, 750, 752, 753, 761, 1262, 1263, 1264, - 282, 283, 175, 176, 764, 765, 177, 798, 766, 385, - 767, 1276, 1277, 1278, 1280, 1282, 1284, 282, 283, 175, - 176, 768, 769, 177, 770, 776, 386, 802, 1296, 1297, - 1298, 1299, 778, 1301, 782, 1303, 282, 283, 175, 176, - 783, 805, 177, 804, 807, 387, 282, 283, 175, 176, - 808, 811, 177, 814, 398, 1317, 1319, 1321, -3, 22, - 815, 816, 23, 817, 1328, 818, 1330, 820, 1332, 282, - 283, 175, 176, 821, 823, 177, 824, 825, 388, 827, - 826, 833, 834, 837, 933, 838, 850, 934, 24, 25, - 26, 27, 28, 29, 30, 31, 839, 32, 33, 34, - 35, 36, 37, 38, 851, 842, 852, 878, 955, 39, - 40, 41, 42, 43, 44, 853, 45, 46, 47, 48, - 49, 854, 50, 970, 282, 283, 175, 176, 883, 879, - 177, 913, 885, 389, 887, 888, 51, 52, 889, 985, - 986, 890, 53, 179, 282, 283, 175, 176, 891, 914, - 177, 930, 931, 390, 282, 283, 175, 176, 893, 899, - 177, 894, 895, 392, 282, 283, 175, 176, 932, 900, - 177, 936, 901, 393, 282, 283, 175, 176, 903, 906, - 177, 904, 939, 394, 282, 283, 175, 176, 941, 54, - 177, 944, 946, 395, 949, 959, 1026, 1027, 180, 181, - 182, 948, 950, 951, 952, 962, 183, 184, 185, 186, - 187, 188, 189, 190, 191, 192, 954, 956, 957, 960, - 1046, 963, 1042, 966, 193, 194, 195, 196, 197, 198, - 199, 200, 201, 202, 971, 203, 204, 205, 206, 207, - 208, 282, 283, 175, 176, 987, 972, 177, 988, 1007, - 396, 282, 283, 175, 176, 990, 993, 177, 994, 1008, - 397, 282, 283, 175, 176, 995, 1000, 177, 1085, 997, - 443, 282, 283, 175, 176, 998, 1002, 177, 1004, 1024, - 446, 1098, 282, 283, 175, 176, 1005, 1011, 177, 1025, - 1035, 456, 282, 283, 175, 176, 1036, 1037, 177, 1039, - 1040, 457, 282, 283, 175, 176, 1041, 1059, 177, 1043, - 1066, 461, 282, 283, 175, 176, 1060, 1064, 177, 1065, - 1082, 462, 282, 283, 175, 176, 1067, 1086, 177, 1145, - 1083, 463, 282, 283, 175, 176, 1068, 1084, 177, 1087, - 1092, 464, 282, 283, 175, 176, 1093, 1095, 177, 1096, - 1140, 465, 282, 283, 175, 176, 1069, 1070, 177, 1072, - 1097, 507, 282, 283, 175, 176, 1146, 1115, 177, 1114, - 1121, 512, 282, 283, 175, 176, 1119, 1120, 177, 1184, - 1147, 585, 282, 283, 175, 176, 1122, 1123, 177, 1148, - 1124, 616, 282, 283, 175, 176, 1149, 1160, 177, 1162, - 1164, 617, 282, 283, 175, 176, 1210, 1165, 177, 1169, - 1205, 618, 282, 283, 175, 176, 1170, 1196, 177, 1197, - 1206, 619, 282, 283, 175, 176, 1198, 1207, 177, 1209, - 1226, 711, 1225, 1239, 1240, 282, 283, 175, 176, 1241, - 1249, 177, 1251, 1253, 773, 282, 283, 175, 176, 1254, - 1268, 177, 1285, 1300, 847, 282, 283, 175, 176, 1272, - 1273, 177, 1274, 1261, 872, 282, 283, 175, 176, 1302, - 1304, 177, 1305, 1309, 873, 1329, 1313, 1275, 282, 283, - 175, 176, 1314, 1315, 177, 1331, 1333, 892, 282, 283, - 175, 176, 1335, 1336, 177, 58, 59, 896, 282, 283, - 175, 176, 592, 60, 177, 562, 801, 898, 282, 283, - 175, 176, 0, 0, 177, 0, 1045, 917, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 967, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 968, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 969, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 999, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1001, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1003, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1021, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1022, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1023, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1177, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1178, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1179, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1258, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1259, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1260, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1306, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1307, 282, 283, - 175, 176, 0, 0, 177, 0, 0, 1308, 282, 283, - 175, 176, 0, 0, 177, 0, 399, 282, 283, 175, - 176, 0, 0, 177, 0, 400, 282, 283, 175, 176, - 0, 0, 177, 0, 466, 282, 283, 175, 176, 0, - 0, 177, 0, 467, 282, 283, 175, 176, 0, 0, - 177, 0, 472, 282, 283, 175, 176, 0, 0, 177, - 0, 473, 282, 283, 175, 176, 0, 0, 177, 0, - 474, 282, 283, 175, 176, 0, 0, 177, 0, 503, - 282, 283, 175, 176, 0, 0, 177, 0, 504, 282, - 283, 175, 176, 0, 0, 177, 0, 681, 282, 283, - 175, 176, 0, 0, 177, 0, 682, 282, 283, 175, - 176, 0, 0, 177, 0, 708, 282, 283, 175, 176, - 0, 0, 177, 0, 709, 282, 283, 175, 176, 0, - 0, 177, 0, 724, 282, 283, 175, 176, 0, 0, - 177, 0, 725, 282, 283, 175, 176, 0, 0, 177, - 0, 758, 282, 283, 175, 176, 0, 0, 177, 0, - 784, 282, 283, 175, 176, 0, 0, 177, 0, 785, - 282, 283, 175, 176, 0, 0, 177, 0, 786, 282, - 283, 175, 176, 0, 0, 177, 0, 787, 282, 283, - 175, 176, 0, 0, 177, 0, 788, 282, 283, 175, - 176, 0, 0, 177, 0, 789, 282, 283, 175, 176, - 0, 0, 177, 0, 790, 282, 283, 175, 176, 0, - 0, 177, 0, 791, 282, 283, 175, 176, 0, 0, - 177, 0, 792, 282, 283, 175, 176, 0, 0, 177, - 0, 793, 282, 283, 175, 176, 0, 0, 177, 0, - 794, 282, 283, 175, 176, 0, 0, 177, 0, 795, - 282, 283, 175, 176, 0, 0, 177, 0, 886, 282, - 283, 175, 176, 0, 0, 177, 0, 897, 282, 283, - 175, 176, 0, 0, 177, 0, 902, 282, 283, 175, - 176, 0, 0, 177, 0, 905, 282, 283, 175, 176, - 0, 0, 177, 0, 907, 282, 283, 175, 176, 0, - 0, 177, 0, 918, 282, 283, 175, 176, 0, 0, - 177, 0, 919, 282, 283, 175, 176, 0, 0, 177, - 0, 920, 282, 283, 175, 176, 0, 0, 177, 0, - 921, 282, 283, 175, 176, 0, 0, 177, 0, 922, - 282, 283, 175, 176, 0, 0, 177, 0, 923, 282, - 283, 175, 176, 0, 0, 177, 0, 924, 282, 283, - 175, 176, 0, 0, 177, 0, 925, 282, 283, 175, - 176, 0, 0, 177, 0, 926, 282, 283, 175, 176, - 0, 0, 177, 0, 927, 282, 283, 175, 176, 0, - 0, 177, 0, 928, 282, 283, 175, 176, 0, 0, - 177, 0, 929, 282, 283, 175, 176, 0, 0, 177, - 0, 991, 282, 283, 175, 176, 0, 0, 177, 0, - 996, 282, 283, 175, 176, 0, 0, 177, 0, 1012, - 282, 283, 175, 176, 0, 0, 177, 0, 1013, 282, - 283, 175, 176, 0, 0, 177, 0, 1014, 282, 283, - 175, 176, 0, 0, 177, 0, 1015, 282, 283, 175, - 176, 0, 0, 177, 0, 1016, 282, 283, 175, 176, - 0, 0, 177, 0, 1017, 282, 283, 175, 176, 0, - 0, 177, 0, 1018, 282, 283, 175, 176, 0, 0, - 177, 0, 1019, 282, 283, 175, 176, 0, 0, 177, - 0, 1020, 282, 283, 175, 176, 0, 0, 177, 0, - 1062, 282, 283, 175, 176, 0, 0, 177, 0, 1073, - 282, 283, 175, 176, 0, 0, 177, 0, 1074, 282, - 283, 175, 176, 0, 0, 177, 0, 1075, 282, 283, - 175, 176, 0, 0, 177, 0, 1076, 282, 283, 175, - 176, 0, 0, 177, 0, 1077, 282, 283, 175, 176, - 0, 0, 177, 0, 1078, 282, 283, 175, 176, 0, - 0, 177, 0, 1079, 282, 283, 175, 176, 0, 0, - 177, 0, 1080, 282, 283, 175, 176, 0, 0, 177, - 0, 1081, 282, 283, 175, 176, 0, 0, 177, 0, - 1125, 282, 283, 175, 176, 0, 0, 177, 0, 1126, - 282, 283, 175, 176, 0, 0, 177, 0, 1127, 282, - 283, 175, 176, 0, 0, 177, 0, 1128, 282, 283, - 175, 176, 0, 0, 177, 0, 1129, 282, 283, 175, - 176, 0, 0, 177, 0, 1130, 282, 283, 175, 176, - 0, 0, 177, 0, 1131, 282, 283, 175, 176, 0, - 0, 177, 0, 1132, 282, 283, 175, 176, 0, 0, - 177, 0, 1133, 282, 283, 175, 176, 0, 0, 177, - 0, 1166, 282, 283, 175, 176, 0, 0, 177, 0, - 1171, 282, 283, 175, 176, 0, 0, 177, 0, 1172, - 282, 283, 175, 176, 0, 0, 177, 0, 1173, 282, - 283, 175, 176, 0, 0, 177, 0, 1174, 282, 283, - 175, 176, 0, 0, 177, 0, 1175, 282, 283, 175, - 176, 0, 0, 177, 0, 1176, 282, 283, 175, 176, - 0, 0, 177, 0, 1194, 282, 283, 175, 176, 0, - 0, 177, 0, 1199, 282, 283, 175, 176, 0, 0, - 177, 0, 1200, 282, 283, 175, 176, 0, 0, 177, - 0, 1201, 282, 283, 175, 176, 0, 0, 177, 0, - 1202, 282, 283, 175, 176, 0, 0, 177, 0, 1203, - 282, 283, 175, 176, 0, 0, 177, 0, 1204, 282, - 283, 175, 176, 0, 0, 177, 0, 1227, 282, 283, - 175, 176, 0, 0, 177, 0, 1228, 282, 283, 175, - 176, 0, 0, 177, 0, 1229, 282, 283, 175, 176, - 0, 0, 177, 0, 1230, 282, 283, 175, 176, 0, - 0, 177, 0, 1231, 282, 283, 175, 176, 0, 0, - 177, 0, 1232, 282, 283, 175, 176, 0, 0, 177, - 0, 1255, 282, 283, 175, 176, 0, 0, 177, 0, - 1256, 282, 283, 175, 176, 0, 0, 177, 0, 1257, - 282, 283, 175, 176, 0, 0, 177, 0, 1269, 282, - 283, 175, 176, 0, 0, 177, 0, 1270, 282, 283, - 175, 176, 0, 0, 177, 0, 1271, 282, 283, 175, - 176, 0, 0, 177, 0, 1286, 282, 283, 175, 176, - 0, 0, 177, 0, 1287, 282, 283, 175, 176, 0, - 0, 177, 0, 1288 + 84, 85, 86, 87, 88, 89, 172, 624, 212, 286, + 287, 178, 179, 1201, 221, 180, 633, 902, 1316, 224, + 903, 1317, 606, 607, 233, 609, 286, 287, 178, 179, + 252, 234, 180, 255, 67, 68, 238, 332, 622, 623, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, + 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, + 89, 236, 286, 287, 178, 179, 237, 239, 180, 176, + 177, 178, 179, 337, 240, 180, 92, 241, 667, 228, + 242, 246, 247, 668, 286, 287, 178, 179, 249, 250, + 180, 251, 1106, 253, 265, 1107, 681, 682, 683, 180, + 1285, 295, 296, 297, 298, 692, 693, 694, 695, 696, + 697, 698, 699, 700, 701, 702, 703, 299, 300, 90, + 91, 901, 286, 287, 178, 179, 92, 717, 180, 228, + 301, 302, 718, 339, 303, 67, 68, 304, 305, 750, + 306, 69, 70, 71, 72, 73, 74, 75, 76, 77, + 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, + 88, 89, 307, 308, 772, 309, 774, 837, 776, 644, + 645, 646, 647, 648, 176, 177, 178, 179, 310, 311, + 180, 92, 67, 930, 758, 759, 312, 313, 69, 70, + 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, + 81, 82, 83, 84, 85, 86, 87, 88, 89, 286, + 287, 178, 179, 314, 315, 180, 792, 793, 316, 317, + 463, 318, 286, 287, 178, 179, 319, 320, 180, 325, + 806, 321, 808, 467, 286, 287, 178, 179, 322, 323, + 180, 327, 818, 324, 328, 468, 329, 345, 350, 825, + 826, 827, 286, 287, 178, 179, 832, 358, 180, 366, + 836, 412, 377, 587, 378, 839, 840, 286, 287, 178, + 179, 380, 413, 180, 414, 90, 91, 415, 767, 1172, + 416, 844, 92, 286, 287, 178, 179, 417, 418, 180, + 419, 420, 853, 854, 855, 856, 857, 858, 859, 860, + 861, 862, 863, 864, 286, 287, 178, 179, 421, 422, + 180, 423, -3, 22, 424, 959, 23, 435, 877, 425, + 426, 427, 90, 91, 286, 287, 178, 179, 428, 92, + 180, 286, 287, 178, 179, 960, 429, 180, 430, 431, + 288, 432, 24, 25, 26, 27, 28, 29, 30, 31, + 433, 32, 33, 34, 35, 36, 37, 38, 904, 905, + 906, 440, 434, 39, 40, 41, 42, 43, 44, 436, + 45, 46, 47, 48, 49, 437, 50, 923, 924, 286, + 287, 178, 179, 438, 928, 180, 931, 439, 331, 441, + 51, 52, 444, 446, 938, 445, 53, 286, 287, 178, + 179, 447, 946, 180, 449, 448, 453, 951, 961, 450, + 954, 452, 455, 230, 958, 456, 457, 462, 235, 477, + 478, 484, 512, 964, 965, 966, 967, 968, 969, 970, + 971, 972, 973, 974, 975, 515, 524, 254, 510, 513, + 511, 258, 259, 54, 525, 983, 555, 526, 24, 25, + 26, 27, 28, 29, 30, 31, 527, 32, 528, 34, + 35, 529, 37, 38, 24, 25, 26, 27, 28, 29, + 30, 31, 530, 32, 556, 34, 35, 531, 37, 38, + 532, 533, 50, 286, 287, 178, 179, 561, 534, 180, + 535, 563, 333, 1019, 1020, 1021, 51, 52, 50, 286, + 287, 178, 179, 536, 537, 180, 538, 571, 572, 573, + 977, 539, 51, 52, 540, 1037, 1038, 1039, 1040, 1041, + 1042, 1043, 1044, 1045, 541, 24, 25, 26, 27, 28, + 29, 30, 31, 1053, 32, 574, 34, 35, 577, 37, + 38, 286, 287, 178, 179, 578, 542, 180, 579, 54, + 580, 581, 997, 605, 543, 286, 287, 178, 179, 50, + 582, 180, 544, 583, 1078, 54, 1051, 545, 546, 610, + 547, 548, 370, 51, 52, 1089, 1090, 1091, 1092, 1093, + 1094, 1095, 1096, 1097, 1099, 1101, 1103, 549, 374, 550, + 551, 1108, 286, 287, 178, 179, 552, 553, 180, 286, + 287, 178, 179, 1157, 554, 180, 286, 287, 178, 179, + 1185, 557, 180, 286, 287, 178, 179, 1131, 1132, 180, + 1133, 612, 584, 593, 1214, 594, 54, 1140, 1141, 1142, + 1143, 1144, 1145, 1146, 1147, 1148, 1149, 595, 1151, 596, + 1153, 286, 287, 178, 179, 1158, 597, 180, 615, 598, + 334, 286, 287, 178, 179, 599, 600, 180, 620, 601, + 336, 602, 603, 286, 287, 178, 179, 1170, 1171, 180, + 613, 604, 340, 1175, 1176, 1177, 1178, 1179, 1180, 286, + 287, 178, 179, 614, 621, 180, 625, 626, 341, 286, + 287, 178, 179, 627, 628, 180, 1198, 629, 346, 632, + 634, 1202, 1203, 1204, 1205, 1206, 1207, 1209, 1211, 1213, + 286, 287, 178, 179, 635, 638, 180, 639, 640, 379, + 286, 287, 178, 179, 641, 642, 180, 651, 360, 1232, + 1233, 1234, 1235, 1236, 1237, 1238, 652, 1240, 653, 1242, + 286, 287, 178, 179, 559, 560, 180, 562, 654, 382, + 655, 564, 565, 684, 656, 658, 661, 1252, 1253, 1254, + 286, 287, 178, 179, 663, 665, 180, 666, 706, 389, + 711, 1266, 1267, 1268, 1270, 1272, 1274, 286, 287, 178, + 179, 712, 719, 180, 722, 724, 390, 723, 1286, 1287, + 1288, 1289, 726, 1291, 725, 1293, 286, 287, 178, 179, + 727, 729, 180, 728, 731, 391, 730, 608, 732, 735, + 611, 733, 734, 736, 737, 1307, 1309, 1311, 738, 739, + 740, 751, 741, 742, 1318, 182, 1320, 743, 1322, 630, + 631, 286, 287, 178, 179, 636, 637, 180, 747, 752, + 392, 744, 643, 745, 650, 286, 287, 178, 179, 746, + 748, 180, 749, 755, 393, 756, 662, 757, 664, 760, + 761, 762, 763, 764, 765, 766, 773, 669, 670, 671, + 775, 798, 674, 675, 676, 677, 678, 679, 680, 779, + 183, 184, 185, 794, 800, 807, 801, 810, 186, 187, + 188, 189, 190, 191, 192, 193, 194, 195, 803, 811, + 804, 813, 846, 812, 814, 816, 196, 197, 198, 199, + 200, 201, 202, 203, 204, 205, 817, 206, 207, 208, + 209, 210, 211, 286, 287, 178, 179, 819, 821, 180, + 820, 823, 394, 286, 287, 178, 179, 822, 829, 180, + 830, 833, 395, 286, 287, 178, 179, 834, 835, 180, + 843, 871, 396, 286, 287, 178, 179, 838, 845, 180, + 847, 908, 397, 286, 287, 178, 179, 848, 872, 180, + 876, 878, 398, 286, 287, 178, 179, 880, 881, 180, + 882, 937, 400, 286, 287, 178, 179, 883, 884, 180, + 886, 925, 401, 286, 287, 178, 179, 887, 888, 180, + 893, 955, 402, 892, 907, 929, 799, 932, 286, 287, + 178, 179, 805, 894, 180, 897, 809, 403, 286, 287, + 178, 179, 896, 899, 180, 934, 939, 404, 286, 287, + 178, 179, 941, 942, 180, 828, 952, 405, 286, 287, + 178, 179, 978, 943, 180, 944, 945, 451, 286, 287, + 178, 179, 979, 947, 180, 949, 950, 454, 286, 287, + 178, 179, 981, 953, 180, 956, 957, 464, 286, 287, + 178, 179, 988, 963, 180, 984, 998, 465, 286, 287, + 178, 179, 989, 999, 180, 985, 1015, 469, 286, 287, + 178, 179, 986, 1016, 180, 993, 1026, 470, 286, 287, + 178, 179, 1033, 991, 180, 995, 1027, 471, 286, 287, + 178, 179, 996, 1002, 180, 1028, 1030, 472, 286, 287, + 178, 179, 1049, 1031, 180, 1032, 1034, 473, 286, 287, + 178, 179, 1054, 1050, 180, 1055, 1072, 514, 286, 287, + 178, 179, 1056, 1057, 180, 1058, 1073, 519, 286, 287, + 178, 179, 1076, 1059, 180, 1060, 1074, 616, 286, 287, + 178, 179, 1062, 926, 180, 1077, 927, 617, 286, 287, + 178, 179, 1104, 1082, 180, 1083, 1085, 618, 1086, 286, + 287, 178, 179, 1087, 1105, 180, 1109, 948, 619, 286, + 287, 178, 179, 1110, 1130, 180, 1111, 1112, 707, 286, + 287, 178, 179, 962, 1136, 180, 1113, 1114, 768, 286, + 287, 178, 179, 1137, 1138, 180, 1139, 1150, 885, 286, + 287, 178, 179, 1152, 1154, 180, 1155, 1195, 889, 286, + 287, 178, 179, 1159, 1160, 180, 1187, 1196, 891, 286, + 287, 178, 179, 1186, 1188, 180, 1199, 1197, 976, 286, + 287, 178, 179, 1215, 1229, 180, 1216, 1231, 990, 286, + 287, 178, 179, 1244, 1239, 180, 1241, 1243, 992, 286, + 287, 178, 179, 1017, 1018, 180, 1258, 1262, 994, 286, + 287, 178, 179, 1263, 1264, 180, 1275, 1290, 1012, 286, + 287, 178, 179, 1292, 1294, 180, 1295, 1036, 1013, 286, + 287, 178, 179, 1299, 1303, 180, 1304, 1305, 1014, 286, + 287, 178, 179, 1319, 1321, 180, 1323, 1325, 1167, 286, + 287, 178, 179, 1326, 58, 180, 592, 59, 1168, 286, + 287, 178, 179, 60, 797, 180, 1035, 569, 1169, 286, + 287, 178, 179, 0, 1075, 180, 0, 0, 1248, 286, + 287, 178, 179, 0, 0, 180, 0, 1088, 1249, 286, + 287, 178, 179, 0, 0, 180, 0, 0, 1250, 286, + 287, 178, 179, 0, 0, 180, 0, 0, 1296, 286, + 287, 178, 179, 0, 0, 180, 0, 0, 1297, 286, + 287, 178, 179, 0, 0, 180, 0, 0, 1298, 0, + 286, 287, 178, 179, 0, 1135, 180, 0, 399, 286, + 287, 178, 179, 0, 0, 180, 0, 406, 286, 287, + 178, 179, 0, 0, 180, 0, 407, 286, 287, 178, + 179, 0, 0, 180, 0, 408, 286, 287, 178, 179, + 0, 0, 180, 0, 480, 286, 287, 178, 179, 0, + 0, 180, 0, 481, 0, 1174, 286, 287, 178, 179, + 0, 0, 180, 0, 482, 286, 287, 178, 179, 0, + 0, 180, 0, 585, 0, 286, 287, 178, 179, 0, + 0, 180, 1200, 586, 286, 287, 178, 179, 0, 0, + 180, 0, 704, 286, 287, 178, 179, 0, 0, 180, + 0, 705, 0, 286, 287, 178, 179, 0, 0, 180, + 1230, 720, 286, 287, 178, 179, 0, 0, 180, 0, + 721, 286, 287, 178, 179, 0, 0, 180, 0, 754, + 286, 287, 178, 179, 0, 0, 180, 0, 780, 1251, + 286, 287, 178, 179, 0, 0, 180, 0, 781, 286, + 287, 178, 179, 1265, 0, 180, 0, 782, 286, 287, + 178, 179, 0, 0, 180, 0, 783, 286, 287, 178, + 179, 0, 0, 180, 0, 784, 286, 287, 178, 179, + 0, 0, 180, 0, 785, 286, 287, 178, 179, 0, + 0, 180, 0, 786, 286, 287, 178, 179, 0, 0, + 180, 0, 787, 286, 287, 178, 179, 0, 0, 180, + 0, 788, 286, 287, 178, 179, 0, 0, 180, 0, + 789, 286, 287, 178, 179, 0, 0, 180, 0, 790, + 286, 287, 178, 179, 0, 0, 180, 0, 791, 286, + 287, 178, 179, 0, 0, 180, 0, 865, 286, 287, + 178, 179, 0, 0, 180, 0, 866, 286, 287, 178, + 179, 0, 0, 180, 0, 879, 286, 287, 178, 179, + 0, 0, 180, 0, 890, 286, 287, 178, 179, 0, + 0, 180, 0, 895, 286, 287, 178, 179, 0, 0, + 180, 0, 898, 286, 287, 178, 179, 0, 0, 180, + 0, 900, 286, 287, 178, 179, 0, 0, 180, 0, + 911, 286, 287, 178, 179, 0, 0, 180, 0, 912, + 286, 287, 178, 179, 0, 0, 180, 0, 913, 286, + 287, 178, 179, 0, 0, 180, 0, 914, 286, 287, + 178, 179, 0, 0, 180, 0, 915, 286, 287, 178, + 179, 0, 0, 180, 0, 916, 286, 287, 178, 179, + 0, 0, 180, 0, 917, 286, 287, 178, 179, 0, + 0, 180, 0, 918, 286, 287, 178, 179, 0, 0, + 180, 0, 919, 286, 287, 178, 179, 0, 0, 180, + 0, 920, 286, 287, 178, 179, 0, 0, 180, 0, + 921, 286, 287, 178, 179, 0, 0, 180, 0, 922, + 286, 287, 178, 179, 0, 0, 180, 0, 982, 286, + 287, 178, 179, 0, 0, 180, 0, 987, 286, 287, + 178, 179, 0, 0, 180, 0, 1003, 286, 287, 178, + 179, 0, 0, 180, 0, 1004, 286, 287, 178, 179, + 0, 0, 180, 0, 1005, 286, 287, 178, 179, 0, + 0, 180, 0, 1006, 286, 287, 178, 179, 0, 0, + 180, 0, 1007, 286, 287, 178, 179, 0, 0, 180, + 0, 1008, 286, 287, 178, 179, 0, 0, 180, 0, + 1009, 286, 287, 178, 179, 0, 0, 180, 0, 1010, + 286, 287, 178, 179, 0, 0, 180, 0, 1011, 286, + 287, 178, 179, 0, 0, 180, 0, 1052, 286, 287, + 178, 179, 0, 0, 180, 0, 1063, 286, 287, 178, + 179, 0, 0, 180, 0, 1064, 286, 287, 178, 179, + 0, 0, 180, 0, 1065, 286, 287, 178, 179, 0, + 0, 180, 0, 1066, 286, 287, 178, 179, 0, 0, + 180, 0, 1067, 286, 287, 178, 179, 0, 0, 180, + 0, 1068, 286, 287, 178, 179, 0, 0, 180, 0, + 1069, 286, 287, 178, 179, 0, 0, 180, 0, 1070, + 286, 287, 178, 179, 0, 0, 180, 0, 1071, 286, + 287, 178, 179, 0, 0, 180, 0, 1115, 286, 287, + 178, 179, 0, 0, 180, 0, 1116, 286, 287, 178, + 179, 0, 0, 180, 0, 1117, 286, 287, 178, 179, + 0, 0, 180, 0, 1118, 286, 287, 178, 179, 0, + 0, 180, 0, 1119, 286, 287, 178, 179, 0, 0, + 180, 0, 1120, 286, 287, 178, 179, 0, 0, 180, + 0, 1121, 286, 287, 178, 179, 0, 0, 180, 0, + 1122, 286, 287, 178, 179, 0, 0, 180, 0, 1123, + 286, 287, 178, 179, 0, 0, 180, 0, 1156, 286, + 287, 178, 179, 0, 0, 180, 0, 1161, 286, 287, + 178, 179, 0, 0, 180, 0, 1162, 286, 287, 178, + 179, 0, 0, 180, 0, 1163, 286, 287, 178, 179, + 0, 0, 180, 0, 1164, 286, 287, 178, 179, 0, + 0, 180, 0, 1165, 286, 287, 178, 179, 0, 0, + 180, 0, 1166, 286, 287, 178, 179, 0, 0, 180, + 0, 1184, 286, 287, 178, 179, 0, 0, 180, 0, + 1189, 286, 287, 178, 179, 0, 0, 180, 0, 1190, + 286, 287, 178, 179, 0, 0, 180, 0, 1191, 286, + 287, 178, 179, 0, 0, 180, 0, 1192, 286, 287, + 178, 179, 0, 0, 180, 0, 1193, 286, 287, 178, + 179, 0, 0, 180, 0, 1194, 286, 287, 178, 179, + 0, 0, 180, 0, 1217, 286, 287, 178, 179, 0, + 0, 180, 0, 1218, 286, 287, 178, 179, 0, 0, + 180, 0, 1219, 286, 287, 178, 179, 0, 0, 180, + 0, 1220, 286, 287, 178, 179, 0, 0, 180, 0, + 1221, 286, 287, 178, 179, 0, 0, 180, 0, 1222, + 286, 287, 178, 179, 0, 0, 180, 0, 1245, 286, + 287, 178, 179, 0, 0, 180, 0, 1246, 286, 287, + 178, 179, 0, 0, 180, 0, 1247, 286, 287, 178, + 179, 0, 0, 180, 0, 1259, 286, 287, 178, 179, + 0, 0, 180, 0, 1260, 286, 287, 178, 179, 0, + 0, 180, 0, 1261, 286, 287, 178, 179, 0, 0, + 180, 0, 1276, 286, 287, 178, 179, 0, 0, 180, + 0, 1277, 286, 287, 178, 179, 0, 0, 180, 0, + 1278 }; static const short yycheck[] = { 7, - 103, 470, 857, 30, 34, 63, 33, 34, 130, 131, - 132, 613, 614, 4, 6, 59, 6, 6, 59, 57, - 798, 65, 731, 136, 65, 57, 6, 81, 85, 86, - 87, 740, 30, 3, 4, 33, 151, 152, 747, 9, + 41, 103, 851, 63, 34, 247, 0, 1, 136, 3, + 57, 794, 85, 86, 87, 6, 4, 7, 81, 6, + 6, 613, 614, 0, 1, 59, 3, 6, 59, 150, + 57, 65, 727, 150, 65, 6, 153, 6, 145, 146, + 6, 736, 149, 3, 4, 6, 7, 6, 743, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 134, 41, 6, 137, 6, 139, 6, 143, 144, 145, - 146, 145, 146, 149, 7, 149, 33, 34, 134, 36, - 156, 6, 90, 91, 92, 93, 59, 143, 144, 145, - 146, 150, 65, 149, 153, 153, 150, 154, 106, 107, - 108, 109, 46, 111, 150, 113, 114, 115, 886, 117, - 154, 151, 150, 154, 154, 6, 718, 6, 150, 6, - 150, 145, 146, 150, 6, 149, 151, 150, 136, 154, - 252, 150, 30, 6, 153, 33, 34, 145, 36, 147, - 6, 150, 150, 151, 152, 153, 154, 155, 156, 157, + 41, 6, 143, 144, 145, 146, 150, 46, 149, 153, + 151, 154, 90, 91, 92, 93, 59, 150, 33, 34, + 131, 36, 65, 153, 30, 136, 879, 33, 106, 107, + 108, 109, 110, 150, 112, 113, 153, 115, 116, 117, + 6, 119, 106, 107, 108, 109, 110, 111, 112, 113, + 150, 6, 714, 154, 132, 133, 153, 6, 6, 106, + 107, 108, 109, 110, 111, 112, 113, 6, 132, 133, + 148, 135, 150, 6, 6, 153, 154, 155, 156, 157, 158, 159, 160, 161, 162, 163, 164, 165, 166, 167, - 168, 169, 153, 153, 153, 173, 174, 175, 176, 177, - 178, 7, 151, 143, 144, 154, 134, 6, 887, 137, - 150, 139, 891, 6, 150, 155, 151, 145, 146, 154, - 1045, 149, 6, 7, 137, 6, 150, 140, 150, 143, - 144, 145, 146, 151, 8, 149, 154, 6, 7, 217, - 151, 219, 150, 154, 150, 223, 150, 686, 38, 227, - 228, 229, 34, 231, 232, 233, 234, 235, 236, 237, - 238, 239, 354, 134, 151, 152, 244, 245, 246, 361, - 6, 7, 143, 144, 145, 146, 254, 255, 149, 151, - 258, 36, 154, 261, 143, 144, 145, 146, 48, 49, - 149, 143, 144, 145, 146, 0, 1, 149, 3, 34, - 143, 144, 145, 146, 282, 283, 149, 143, 144, 145, - 146, 151, 152, 149, 993, 994, 995, 996, 3, 4, - 151, 1000, 150, 154, 9, 10, 11, 12, 13, 14, - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 34, 151, 150, 440, 154, - 143, 144, 145, 146, 151, 151, 149, 154, 154, 151, - 152, 339, 143, 144, 145, 146, 344, 150, 149, 143, - 144, 145, 146, 0, 1, 149, 3, 150, 153, 357, - 472, 473, 474, 5, 137, 1064, 1065, 365, 34, 1068, - 143, 144, 145, 146, 151, 151, 149, 154, 154, 151, - 152, 106, 107, 108, 109, 110, 111, 112, 113, 151, - 153, 850, 154, 391, 51, 52, 53, 54, 6, 56, - 398, 399, 400, 151, 152, 5, 150, 132, 133, 521, - 135, 143, 144, 145, 146, 153, 34, 149, 530, 151, - 1119, 66, 67, 68, 69, 70, 71, 72, 73, 74, - 75, 76, 77, 91, 92, 93, 94, 95, 143, 144, - 145, 146, 150, 150, 149, 150, 150, 150, 153, 150, - 150, 150, 450, 451, 150, 150, 150, 550, 150, 106, - 107, 108, 109, 110, 111, 112, 113, 150, 466, 467, - 1169, 150, 143, 144, 145, 146, 150, 589, 149, 66, - 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, - 77, 150, 143, 144, 145, 146, 150, 150, 149, 1198, - 151, 150, 150, 154, 150, 503, 504, 150, 506, 154, - 143, 144, 145, 146, 5, 150, 149, 3, 4, 152, - 150, 519, 520, 9, 10, 11, 12, 13, 14, 15, - 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 143, 144, 145, 146, 660, 153, - 149, 153, 151, 150, 150, 154, 150, 143, 144, 145, - 146, 559, 153, 149, 6, 151, 564, 154, 154, 150, - 143, 144, 145, 146, 150, 687, 149, 689, 151, 691, - 150, 579, 150, 150, 150, 116, 1285, 150, 150, 150, - 121, 150, 149, 151, 150, 593, 594, 595, 596, 597, - 598, 599, 600, 601, 602, 603, 604, 150, 139, 143, - 144, 145, 146, 150, 150, 149, 5, 615, 150, 152, - 154, 150, 620, 3, 4, 150, 150, 150, 150, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, - 143, 144, 145, 146, 150, 150, 149, 143, 144, 151, - 753, 154, 150, 150, 150, 150, 150, 153, 150, 150, - 143, 144, 145, 146, 672, 673, 149, 7, 150, 3, - 4, 154, 150, 681, 682, 9, 10, 11, 12, 13, + 168, 169, 170, 171, 172, 153, 153, 153, 176, 177, + 178, 179, 180, 181, 143, 144, 145, 146, 8, 151, + 149, 154, 154, 143, 144, 880, 1035, 150, 134, 884, + 150, 137, 150, 139, 151, 155, 6, 154, 30, 145, + 146, 33, 34, 149, 36, 48, 49, 7, 143, 144, + 145, 146, 150, 221, 149, 256, 224, 150, 30, 150, + 228, 33, 34, 150, 232, 233, 234, 150, 236, 237, + 238, 239, 240, 241, 242, 51, 52, 53, 54, 38, + 56, 249, 250, 251, 151, 152, 34, 143, 144, 145, + 146, 34, 151, 149, 262, 154, 34, 265, 143, 144, + 145, 146, 151, 152, 149, 143, 144, 145, 146, 151, + 150, 149, 154, 153, 143, 144, 145, 146, 286, 287, + 149, 143, 144, 145, 146, 151, 36, 149, 154, 984, + 985, 986, 987, 153, 153, 153, 991, 66, 67, 68, + 69, 70, 71, 72, 73, 74, 75, 76, 77, 151, + 5, 34, 154, 143, 144, 145, 146, 358, 153, 149, + 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, + 76, 77, 151, 134, 6, 154, 137, 345, 139, 5, + 151, 150, 350, 154, 145, 146, 151, 151, 149, 154, + 154, 359, 360, 151, 34, 150, 154, 134, 366, 1054, + 1055, 153, 5, 1058, 134, 373, 143, 144, 145, 146, + 150, 150, 149, 143, 144, 145, 146, 150, 150, 149, + 143, 144, 145, 146, 151, 154, 149, 154, 153, 151, + 150, 399, 154, 156, 151, 137, 150, 154, 406, 407, + 408, 143, 144, 145, 146, 150, 447, 149, 154, 3, + 4, 150, 150, 150, 1109, 9, 10, 11, 12, 13, + 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, 150, 150, 150, 480, + 481, 482, 684, 150, 150, 150, 143, 144, 145, 146, + 458, 459, 149, 151, 151, 557, 154, 154, 151, 3, + 4, 154, 150, 150, 1159, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 143, 144, 145, 146, - 708, 709, 149, 7, 150, 150, 150, 154, 150, 143, - 144, 145, 146, 150, 722, 149, 724, 150, 150, 150, - 154, 143, 144, 145, 146, 150, 734, 149, 151, 150, - 82, 151, 154, 741, 742, 743, 143, 144, 145, 146, - 748, 152, 149, 152, 752, 5, 124, 154, 5, 757, - 758, 5, 5, 143, 144, 145, 146, 5, 5, 149, - 150, 143, 144, 145, 146, 5, 5, 149, 5, 5, - 5, 5, 154, 5, 782, 5, 784, 785, 786, 787, - 788, 789, 790, 791, 792, 793, 794, 795, 139, 5, - 5, 5, 143, 144, 145, 146, 5, 5, 149, 5, - 5, 5, 810, 5, 5, 5, 153, 5, 5, 143, - 144, 3, 4, 3, 5, 153, 150, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 5, 5, - 848, 6, 153, 7, 852, 853, 854, 7, 6, 150, - 7, 7, 138, 7, 30, 31, 32, 33, 34, 35, - 36, 37, 7, 39, 7, 41, 42, 151, 44, 45, - 151, 879, 151, 881, 143, 144, 145, 146, 151, 151, - 149, 889, 5, 152, 143, 144, 145, 146, 64, 897, - 149, 152, 7, 152, 902, 151, 151, 905, 7, 151, - 441, 442, 78, 79, 445, 151, 151, 448, 449, 151, - 918, 919, 920, 921, 922, 923, 924, 925, 926, 927, - 928, 929, 143, 144, 145, 146, 151, 151, 149, 151, - 150, 152, 940, 143, 144, 145, 146, 7, 151, 149, - 151, 7, 152, 7, 143, 144, 145, 146, 151, 7, - 149, 143, 144, 152, 7, 131, 964, 151, 150, 143, - 144, 145, 146, 151, 505, 149, 151, 508, 152, 151, - 143, 144, 145, 146, 151, 7, 149, 151, 154, 152, - 151, 151, 990, 991, 992, 7, 527, 528, 143, 144, - 145, 146, 533, 534, 149, 7, 7, 152, 151, 540, - 151, 542, 151, 151, 1012, 1013, 1014, 1015, 1016, 1017, - 1018, 1019, 1020, 554, 151, 556, 151, 7, 151, 150, - 150, 150, 1030, 150, 565, 566, 567, 6, 150, 570, - 571, 572, 573, 574, 575, 576, 143, 144, 145, 146, - 150, 7, 149, 7, 150, 152, 30, 31, 32, 33, - 34, 35, 36, 37, 1062, 39, 150, 41, 42, 150, - 44, 45, 150, 150, 150, 1073, 1074, 1075, 1076, 1077, - 1078, 1079, 1080, 1081, 1082, 1083, 1084, 153, 153, 153, - 64, 1089, 143, 144, 145, 146, 134, 3, 149, 3, - 145, 152, 3, 3, 78, 79, 143, 144, 145, 146, - 3, 3, 149, 3, 3, 152, 3, 1115, 1116, 3, - 1118, 3, 154, 3, 3, 3, 3, 1125, 1126, 1127, - 1128, 1129, 1130, 1131, 1132, 1133, 1134, 5, 1136, 6, - 1138, 5, 3, 6, 6, 1143, 6, 6, 6, 30, - 31, 32, 33, 34, 35, 36, 37, 131, 39, 154, - 41, 42, 153, 44, 45, 6, 6, 1165, 1166, 83, - 4, 152, 151, 1171, 1172, 1173, 1174, 1175, 1176, 151, - 154, 152, 152, 64, 715, 151, 143, 144, 145, 146, - 721, 151, 149, 152, 725, 152, 1194, 78, 79, 151, - 151, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, - 152, 151, 151, 744, 143, 144, 145, 146, 152, 152, - 149, 151, 6, 152, 151, 151, 151, 151, 151, 1227, - 1228, 1229, 1230, 1231, 1232, 1233, 152, 1235, 151, 1237, - 143, 144, 145, 146, 151, 6, 149, 152, 6, 152, - 131, 6, 151, 151, 151, 151, 6, 1255, 1256, 1257, - 143, 144, 145, 146, 6, 6, 149, 7, 6, 152, - 6, 1269, 1270, 1271, 1272, 1273, 1274, 143, 144, 145, - 146, 6, 6, 149, 6, 6, 152, 83, 1286, 1287, - 1288, 1289, 6, 1291, 151, 1293, 143, 144, 145, 146, - 6, 154, 149, 7, 154, 152, 143, 144, 145, 146, - 154, 3, 149, 6, 151, 1313, 1314, 1315, 0, 1, - 3, 6, 4, 145, 1322, 6, 1324, 6, 1326, 143, - 144, 145, 146, 3, 6, 149, 3, 6, 152, 3, - 6, 6, 3, 3, 875, 3, 153, 878, 30, 31, - 32, 33, 34, 35, 36, 37, 6, 39, 40, 41, - 42, 43, 44, 45, 154, 6, 151, 153, 899, 51, - 52, 53, 54, 55, 56, 151, 58, 59, 60, 61, - 62, 151, 64, 914, 143, 144, 145, 146, 6, 80, - 149, 6, 152, 152, 151, 151, 78, 79, 151, 930, - 931, 152, 84, 33, 143, 144, 145, 146, 151, 153, - 149, 7, 7, 152, 143, 144, 145, 146, 151, 151, - 149, 152, 152, 152, 143, 144, 145, 146, 83, 152, - 149, 6, 152, 152, 143, 144, 145, 146, 151, 151, - 149, 152, 6, 152, 143, 144, 145, 146, 6, 131, - 149, 3, 6, 152, 3, 3, 987, 988, 88, 89, - 90, 6, 6, 6, 6, 5, 96, 97, 98, 99, - 100, 101, 102, 103, 104, 105, 6, 6, 6, 6, - 1011, 5, 5, 154, 114, 115, 116, 117, 118, 119, - 120, 121, 122, 123, 6, 125, 126, 127, 128, 129, - 130, 143, 144, 145, 146, 153, 6, 149, 151, 6, - 152, 143, 144, 145, 146, 151, 151, 149, 151, 6, - 152, 143, 144, 145, 146, 151, 151, 149, 1059, 152, - 152, 143, 144, 145, 146, 152, 152, 149, 151, 6, - 152, 1072, 143, 144, 145, 146, 151, 151, 149, 6, - 6, 152, 143, 144, 145, 146, 6, 6, 149, 6, - 6, 152, 143, 144, 145, 146, 6, 151, 149, 5, - 152, 152, 143, 144, 145, 146, 154, 151, 149, 151, - 153, 152, 143, 144, 145, 146, 152, 80, 149, 1120, - 153, 152, 143, 144, 145, 146, 151, 153, 149, 6, - 6, 152, 143, 144, 145, 146, 6, 5, 149, 5, - 80, 152, 143, 144, 145, 146, 151, 151, 149, 151, - 6, 152, 143, 144, 145, 146, 6, 153, 149, 154, - 152, 152, 143, 144, 145, 146, 151, 151, 149, 1170, - 6, 152, 143, 144, 145, 146, 152, 152, 149, 6, - 154, 152, 143, 144, 145, 146, 6, 6, 149, 6, - 6, 152, 143, 144, 145, 146, 1197, 153, 149, 151, - 153, 152, 143, 144, 145, 146, 151, 140, 149, 151, - 153, 152, 143, 144, 145, 146, 151, 153, 149, 6, - 152, 152, 151, 6, 1225, 143, 144, 145, 146, 6, - 6, 149, 6, 6, 152, 143, 144, 145, 146, 151, - 151, 149, 151, 6, 152, 143, 144, 145, 146, 153, - 153, 149, 153, 1254, 152, 143, 144, 145, 146, 6, - 6, 149, 152, 6, 152, 6, 153, 1268, 143, 144, - 145, 146, 153, 153, 149, 6, 6, 152, 143, 144, - 145, 146, 0, 0, 149, 6, 6, 152, 143, 144, - 145, 146, 477, 6, 149, 451, 713, 152, 143, 144, - 145, 146, -1, -1, 149, -1, 1010, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, - 145, 146, -1, -1, 149, -1, -1, 152, 143, 144, + 24, 25, 26, 27, 28, 29, 150, 528, 150, 143, + 144, 145, 146, 1188, 150, 149, 537, 151, 151, 150, + 154, 154, 510, 511, 150, 513, 143, 144, 145, 146, + 140, 150, 149, 143, 3, 4, 150, 154, 526, 527, + 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, + 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, + 29, 153, 143, 144, 145, 146, 153, 150, 149, 143, + 144, 145, 146, 154, 150, 149, 150, 150, 566, 153, + 150, 153, 153, 571, 143, 144, 145, 146, 153, 153, + 149, 153, 151, 6, 150, 154, 584, 585, 586, 149, + 1275, 150, 150, 150, 150, 593, 594, 595, 596, 597, + 598, 599, 600, 601, 602, 603, 604, 150, 150, 143, + 144, 843, 143, 144, 145, 146, 150, 615, 149, 153, + 150, 150, 620, 154, 150, 3, 4, 150, 150, 660, + 150, 9, 10, 11, 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, + 28, 29, 150, 150, 685, 150, 687, 749, 689, 91, + 92, 93, 94, 95, 143, 144, 145, 146, 150, 150, + 149, 150, 3, 4, 672, 673, 150, 150, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, + 21, 22, 23, 24, 25, 26, 27, 28, 29, 143, + 144, 145, 146, 150, 150, 149, 704, 705, 150, 150, + 154, 150, 143, 144, 145, 146, 150, 150, 149, 5, + 718, 150, 720, 154, 143, 144, 145, 146, 150, 150, + 149, 151, 730, 150, 152, 154, 151, 7, 7, 737, + 738, 739, 143, 144, 145, 146, 744, 151, 149, 151, + 748, 5, 7, 154, 7, 753, 754, 143, 144, 145, + 146, 82, 5, 149, 5, 143, 144, 5, 154, 139, + 5, 769, 150, 143, 144, 145, 146, 5, 5, 149, + 5, 5, 780, 781, 782, 783, 784, 785, 786, 787, + 788, 789, 790, 791, 143, 144, 145, 146, 5, 5, + 149, 5, 0, 1, 5, 154, 4, 124, 806, 5, + 5, 5, 143, 144, 143, 144, 145, 146, 5, 150, + 149, 143, 144, 145, 146, 154, 5, 149, 5, 5, + 152, 5, 30, 31, 32, 33, 34, 35, 36, 37, + 5, 39, 40, 41, 42, 43, 44, 45, 846, 847, + 848, 3, 5, 51, 52, 53, 54, 55, 56, 5, + 58, 59, 60, 61, 62, 5, 64, 865, 866, 143, + 144, 145, 146, 5, 872, 149, 874, 5, 152, 5, + 78, 79, 5, 5, 882, 6, 84, 143, 144, 145, + 146, 7, 890, 149, 7, 6, 6, 895, 154, 7, + 898, 7, 6, 118, 902, 7, 7, 7, 123, 154, + 154, 153, 7, 911, 912, 913, 914, 915, 916, 917, + 918, 919, 920, 921, 922, 7, 138, 142, 150, 150, + 153, 146, 147, 131, 151, 933, 5, 151, 30, 31, + 32, 33, 34, 35, 36, 37, 151, 39, 151, 41, + 42, 151, 44, 45, 30, 31, 32, 33, 34, 35, + 36, 37, 151, 39, 152, 41, 42, 151, 44, 45, + 151, 151, 64, 143, 144, 145, 146, 7, 151, 149, + 151, 7, 152, 981, 982, 983, 78, 79, 64, 143, + 144, 145, 146, 151, 151, 149, 151, 153, 7, 7, + 154, 151, 78, 79, 151, 1003, 1004, 1005, 1006, 1007, + 1008, 1009, 1010, 1011, 151, 30, 31, 32, 33, 34, + 35, 36, 37, 1021, 39, 7, 41, 42, 7, 44, + 45, 143, 144, 145, 146, 7, 151, 149, 7, 131, + 7, 7, 154, 6, 151, 143, 144, 145, 146, 64, + 7, 149, 151, 7, 1052, 131, 154, 151, 151, 7, + 151, 151, 154, 78, 79, 1063, 1064, 1065, 1066, 1067, + 1068, 1069, 1070, 1071, 1072, 1073, 1074, 151, 154, 151, + 151, 1079, 143, 144, 145, 146, 151, 151, 149, 143, + 144, 145, 146, 154, 151, 149, 143, 144, 145, 146, + 154, 151, 149, 143, 144, 145, 146, 1105, 1106, 149, + 1108, 153, 151, 150, 154, 150, 131, 1115, 1116, 1117, + 1118, 1119, 1120, 1121, 1122, 1123, 1124, 150, 1126, 150, + 1128, 143, 144, 145, 146, 1133, 150, 149, 7, 150, + 152, 143, 144, 145, 146, 150, 150, 149, 134, 150, + 152, 150, 150, 143, 144, 145, 146, 1155, 1156, 149, + 153, 150, 152, 1161, 1162, 1163, 1164, 1165, 1166, 143, + 144, 145, 146, 153, 3, 149, 3, 3, 152, 143, + 144, 145, 146, 145, 3, 149, 1184, 3, 152, 3, + 3, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1196, 1197, + 143, 144, 145, 146, 3, 3, 149, 3, 3, 152, + 143, 144, 145, 146, 3, 3, 149, 3, 151, 1217, + 1218, 1219, 1220, 1221, 1222, 1223, 5, 1225, 5, 1227, + 143, 144, 145, 146, 449, 450, 149, 452, 3, 152, + 3, 456, 457, 153, 6, 6, 6, 1245, 1246, 1247, + 143, 144, 145, 146, 6, 6, 149, 6, 6, 152, + 83, 1259, 1260, 1261, 1262, 1263, 1264, 143, 144, 145, + 146, 4, 151, 149, 152, 152, 152, 151, 1276, 1277, + 1278, 1279, 152, 1281, 151, 1283, 143, 144, 145, 146, + 151, 151, 149, 152, 152, 152, 151, 512, 151, 151, + 515, 152, 152, 151, 151, 1303, 1304, 1305, 151, 151, + 151, 6, 152, 151, 1312, 33, 1314, 151, 1316, 534, + 535, 143, 144, 145, 146, 540, 541, 149, 152, 6, + 152, 151, 547, 151, 549, 143, 144, 145, 146, 151, + 151, 149, 151, 6, 152, 6, 561, 6, 563, 6, + 6, 6, 6, 6, 6, 6, 6, 572, 573, 574, + 6, 83, 577, 578, 579, 580, 581, 582, 583, 6, + 88, 89, 90, 7, 7, 3, 154, 6, 96, 97, + 98, 99, 100, 101, 102, 103, 104, 105, 154, 3, + 154, 145, 151, 6, 6, 6, 114, 115, 116, 117, + 118, 119, 120, 121, 122, 123, 3, 125, 126, 127, + 128, 129, 130, 143, 144, 145, 146, 6, 6, 149, + 3, 3, 152, 143, 144, 145, 146, 6, 6, 149, + 3, 3, 152, 143, 144, 145, 146, 3, 6, 149, + 153, 153, 152, 143, 144, 145, 146, 6, 154, 149, + 151, 153, 152, 143, 144, 145, 146, 151, 80, 149, + 6, 152, 152, 143, 144, 145, 146, 151, 151, 149, + 151, 3, 152, 143, 144, 145, 146, 152, 151, 149, + 151, 83, 152, 143, 144, 145, 146, 152, 152, 149, + 152, 5, 152, 151, 6, 6, 711, 6, 143, 144, + 145, 146, 717, 152, 149, 152, 721, 152, 143, 144, + 145, 146, 151, 151, 149, 6, 6, 152, 143, 144, + 145, 146, 6, 3, 149, 740, 3, 152, 143, 144, + 145, 146, 153, 6, 149, 6, 6, 152, 143, 144, + 145, 146, 151, 6, 149, 6, 6, 152, 143, 144, + 145, 146, 151, 6, 149, 5, 154, 152, 143, 144, + 145, 146, 152, 6, 149, 151, 6, 152, 143, 144, + 145, 146, 152, 6, 149, 151, 6, 152, 143, 144, + 145, 146, 151, 6, 149, 152, 6, 152, 143, 144, + 145, 146, 5, 151, 149, 151, 6, 152, 143, 144, + 145, 146, 151, 151, 149, 6, 6, 152, 143, 144, + 145, 146, 151, 6, 149, 6, 5, 152, 143, 144, + 145, 146, 151, 154, 149, 151, 153, 152, 143, 144, + 145, 146, 152, 152, 149, 151, 153, 152, 143, 144, + 145, 146, 80, 151, 149, 151, 153, 152, 143, 144, + 145, 146, 151, 868, 149, 6, 871, 152, 143, 144, + 145, 146, 154, 6, 149, 6, 5, 152, 5, 143, + 144, 145, 146, 6, 153, 149, 151, 892, 152, 143, + 144, 145, 146, 151, 80, 149, 152, 152, 152, 143, + 144, 145, 146, 908, 6, 149, 154, 154, 152, 143, + 144, 145, 146, 6, 6, 149, 6, 6, 152, 143, + 144, 145, 146, 6, 6, 149, 153, 153, 152, 143, + 144, 145, 146, 151, 151, 149, 151, 153, 152, 143, + 144, 145, 146, 140, 151, 149, 6, 153, 152, 143, + 144, 145, 146, 151, 6, 149, 152, 6, 152, 143, + 144, 145, 146, 151, 6, 149, 6, 6, 152, 143, + 144, 145, 146, 978, 979, 149, 151, 153, 152, 143, + 144, 145, 146, 153, 153, 149, 151, 6, 152, 143, + 144, 145, 146, 6, 6, 149, 152, 1002, 152, 143, + 144, 145, 146, 6, 153, 149, 153, 153, 152, 143, + 144, 145, 146, 6, 6, 149, 6, 0, 152, 143, + 144, 145, 146, 0, 6, 149, 484, 6, 152, 143, + 144, 145, 146, 6, 709, 149, 1001, 459, 152, 143, + 144, 145, 146, -1, 1049, 149, -1, -1, 152, 143, + 144, 145, 146, -1, -1, 149, -1, 1062, 152, 143, + 144, 145, 146, -1, -1, 149, -1, -1, 152, 143, + 144, 145, 146, -1, -1, 149, -1, -1, 152, 143, + 144, 145, 146, -1, -1, 149, -1, -1, 152, 143, + 144, 145, 146, -1, -1, 149, -1, -1, 152, -1, + 143, 144, 145, 146, -1, 1110, 149, -1, 151, 143, + 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, - -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, + -1, 149, -1, 151, -1, 1160, 143, 144, 145, 146, + -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, + -1, 149, -1, 151, -1, 143, 144, 145, 146, -1, + -1, 149, 1187, 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, 149, - -1, 151, 143, 144, 145, 146, -1, -1, 149, -1, + -1, 151, -1, 143, 144, 145, 146, -1, -1, 149, + 1215, 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, + 143, 144, 145, 146, -1, -1, 149, -1, 151, 1244, 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, - 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, + 144, 145, 146, 1258, -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, @@ -1492,13 +1481,7 @@ static const short yycheck[] = { 7, -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, -1, 149, -1, - 151, 143, 144, 145, 146, -1, -1, 149, -1, 151, - 143, 144, 145, 146, -1, -1, 149, -1, 151, 143, - 144, 145, 146, -1, -1, 149, -1, 151, 143, 144, - 145, 146, -1, -1, 149, -1, 151, 143, 144, 145, - 146, -1, -1, 149, -1, 151, 143, 144, 145, 146, - -1, -1, 149, -1, 151, 143, 144, 145, 146, -1, - -1, 149, -1, 151 + 151 }; /* -*-C-*- Note some compilers choke on comments on `#line' lines. */ #line 3 "/usr/local/share/bison.simple" @@ -2625,15 +2608,15 @@ case 131: Attractor *a; double p; int ip; - for(int i=0;i<List_Nbr(yyvsp[-1].l);i++){ - List_Read(yyvsp[-1].l,i,&p); + for(int i=0;i<List_Nbr(yyvsp[-9].l);i++){ + List_Read(yyvsp[-9].l,i,&p); ip = (int)p; v = FindVertex(ip,THEM); if(!v) vyyerror("Unkown Point %d", ip); else{ a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1, - yyvsp[-8].d,yyvsp[-6].d,yyvsp[-4].d,v,NULL,NULL); + yyvsp[-6].d,yyvsp[-4].d,yyvsp[-2].d,v,NULL,NULL); List_Add(THEM->Metric->Attractors,&a); } } @@ -2682,15 +2665,15 @@ case 136: Attractor *a; double p; int ip; - for(int i=0;i<List_Nbr(yyvsp[-1].l);i++){ - List_Read(yyvsp[-1].l,i,&p); + for(int i=0;i<List_Nbr(yyvsp[-9].l);i++){ + List_Read(yyvsp[-9].l,i,&p); ip = (int)p; c = FindCurve(ip,THEM); if(!c) vyyerror("Unkown Curve %d", ip); else{ a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1, - yyvsp[-8].d,yyvsp[-6].d,yyvsp[-4].d,NULL,c,NULL); + yyvsp[-6].d,yyvsp[-4].d,yyvsp[-2].d,NULL,c,NULL); List_Add(THEM->Metric->Attractors,&a); } } @@ -2756,25 +2739,14 @@ case 142: break;} case 143: #line 817 "Gmsh.y" -{ - yyval.s.Num = (int)yyvsp[-2].d; - Curve *c = FindCurve(yyval.s.Num,THEM); - if(!c) - vyyerror("Unkown Curve %d", yyval.s.Num); - else - yyval.s.Type = c->Typ; - ; - break;} -case 144: -#line 826 "Gmsh.y" { Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_BSPLN,2,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL); yyval.s.Type = MSH_SEGM_BSPLN; yyval.s.Num = (int)yyvsp[-4].d; ; break;} -case 145: -#line 832 "Gmsh.y" +case 144: +#line 823 "Gmsh.y" { List_T *Temp; int i; @@ -2794,6 +2766,17 @@ case 145: List_Delete(Temp); ; break;} +case 145: +#line 842 "Gmsh.y" +{ + yyval.s.Num = (int)yyvsp[-2].d; + Curve *c = FindCurve(yyval.s.Num,THEM); + if(!c) + vyyerror("Unkown Curve %d", yyval.s.Num); + else + yyval.s.Type = c->Typ; + ; + break;} case 146: #line 854 "Gmsh.y" { @@ -2914,7 +2897,7 @@ case 156: case 157: #line 963 "Gmsh.y" { - TranslateShapes (yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-1].l,1); + TranslateShapes (yyvsp[-3].v[0],yyvsp[-3].v[1],yyvsp[-3].v[2],yyvsp[-1].l,1); yyval.l = yyvsp[-1].l; ; break;} @@ -2928,7 +2911,7 @@ case 158: case 159: #line 973 "Gmsh.y" { - SymmetryShapes(yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-4].v[3],yyvsp[-1].l,1); + SymmetryShapes(yyvsp[-3].v[0],yyvsp[-3].v[1],yyvsp[-3].v[2],yyvsp[-3].v[3],yyvsp[-1].l,1); yyval.l = yyvsp[-1].l; ; break;} @@ -3012,80 +2995,68 @@ case 168: case 169: #line 1072 "Gmsh.y" { - Extrude_ProtudeSurface(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,0,NULL); + Curve *pc, *prc; + Extrude_ProtudePoint(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,&pc,&prc,NULL); ; break;} case 170: -#line 1076 "Gmsh.y" +#line 1077 "Gmsh.y" { - Extrude_ProtudeSurface(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,0,NULL); + Curve *pc, *prc; + Extrude_ProtudePoint(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d, + &pc,&prc,NULL); ; break;} case 171: -#line 1080 "Gmsh.y" +#line 1083 "Gmsh.y" { - Extrude_ProtudeSurface(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d,0,NULL); + Extrude_ProtudeCurve(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,NULL); ; break;} case 172: -#line 1084 "Gmsh.y" +#line 1087 "Gmsh.y" { - Extrude_ProtudeSurface(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d,0,NULL); + Extrude_ProtudeCurve(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d,NULL); ; break;} case 173: -#line 1088 "Gmsh.y" +#line 1091 "Gmsh.y" { - Curve *pc, *prc; - Extrude_ProtudePoint(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d, - &pc,&prc,NULL); + Extrude_ProtudeSurface(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,0,NULL); ; break;} case 174: -#line 1094 "Gmsh.y" +#line 1095 "Gmsh.y" { - Curve *pc, *prc; - Extrude_ProtudePoint(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,&pc,&prc,NULL); + Extrude_ProtudeSurface(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d,0,NULL); ; break;} case 175: #line 1099 "Gmsh.y" -{ - Extrude_ProtudeCurve(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d,NULL); - ; - break;} -case 176: -#line 1103 "Gmsh.y" -{ - Extrude_ProtudeCurve(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,NULL); - ; - break;} -case 177: -#line 1107 "Gmsh.y" { int vol = NEWREG(); Extrude_ProtudeSurface(1,(int)yyvsp[-7].d,yyvsp[-5].v[0],yyvsp[-5].v[1],yyvsp[-5].v[2],0.,0.,0.,0.,vol,&extr); ; break;} -case 178: -#line 1113 "Gmsh.y" +case 176: +#line 1104 "Gmsh.y" { int vol = NEWREG(); Extrude_ProtudeSurface(0,(int)yyvsp[-11].d,yyvsp[-9].v[0],yyvsp[-9].v[1],yyvsp[-9].v[2],yyvsp[-7].v[0],yyvsp[-7].v[1],yyvsp[-7].v[2],yyvsp[-5].d,vol,&extr); ; break;} -case 179: -#line 1121 "Gmsh.y" +case 177: +#line 1112 "Gmsh.y" { ; break;} -case 180: -#line 1124 "Gmsh.y" +case 178: +#line 1115 "Gmsh.y" { ; break;} -case 181: -#line 1130 "Gmsh.y" +case 179: +#line 1121 "Gmsh.y" { double d; int j; @@ -3103,14 +3074,14 @@ case 181: } ; break;} -case 182: -#line 1147 "Gmsh.y" +case 180: +#line 1138 "Gmsh.y" { extr.mesh.Recombine = true; ; break;} -case 183: -#line 1158 "Gmsh.y" +case 181: +#line 1149 "Gmsh.y" { Curve *c; for(i=0;i<List_Nbr(yyvsp[-3].l);i++){ @@ -3128,8 +3099,8 @@ case 183: } ; break;} -case 184: -#line 1175 "Gmsh.y" +case 182: +#line 1166 "Gmsh.y" { Curve *c; for(i=0;i<List_Nbr(yyvsp[-6].l);i++){ @@ -3147,8 +3118,8 @@ case 184: } ; break;} -case 185: -#line 1192 "Gmsh.y" +case 183: +#line 1183 "Gmsh.y" { Curve *c; for(i=0;i<List_Nbr(yyvsp[-6].l);i++){ @@ -3166,8 +3137,8 @@ case 185: } ; break;} -case 186: -#line 1209 "Gmsh.y" +case 184: +#line 1200 "Gmsh.y" { Surface *s = FindSurface((int)yyvsp[-4].d,THEM); if(!s) @@ -3189,8 +3160,8 @@ case 186: } ; break;} -case 187: -#line 1230 "Gmsh.y" +case 185: +#line 1221 "Gmsh.y" { Surface *s = FindSurface((int)yyvsp[-4].d,THEM); if(!s) @@ -3211,8 +3182,8 @@ case 187: } ; break;} -case 188: -#line 1250 "Gmsh.y" +case 186: +#line 1241 "Gmsh.y" { Volume *v = FindVolume((int)yyvsp[-4].d,THEM); if(!v) @@ -3233,8 +3204,8 @@ case 188: } ; break;} -case 189: -#line 1270 "Gmsh.y" +case 187: +#line 1261 "Gmsh.y" { Surface *s; for(i=0;i<List_Nbr(yyvsp[-3].l);i++){ @@ -3252,8 +3223,8 @@ case 189: } ; break;} -case 190: -#line 1287 "Gmsh.y" +case 188: +#line 1278 "Gmsh.y" { Surface *s; for(i=0;i<List_Nbr(yyvsp[-1].l);i++){ @@ -3271,26 +3242,26 @@ case 190: } ; break;} -case 191: -#line 1312 "Gmsh.y" +case 189: +#line 1303 "Gmsh.y" { Coherence_PS(); ; break;} -case 195: -#line 1332 "Gmsh.y" +case 193: +#line 1323 "Gmsh.y" { ColorField = ColorGeneral; ; break;} -case 197: -#line 1335 "Gmsh.y" +case 195: +#line 1326 "Gmsh.y" { ColorField = ColorGeometry; ; break;} -case 199: -#line 1338 "Gmsh.y" +case 197: +#line 1329 "Gmsh.y" { ColorField = ColorMesh; ; break;} -case 203: -#line 1349 "Gmsh.y" +case 201: +#line 1340 "Gmsh.y" { i = Get_ColorForString(ColorString, -1, yyvsp[-1].c, &flag); if(flag) vyyerror("Unknown Color '%s'", yyvsp[-1].c); @@ -3301,8 +3272,8 @@ case 203: *ptr = i ; ; break;} -case 204: -#line 1359 "Gmsh.y" +case 202: +#line 1350 "Gmsh.y" { i = Get_ColorForString(ColorString, (int)yyvsp[-2].d, yyvsp[-4].c, &flag); if(flag) vyyerror("Unknown Color '%s'", yyvsp[-4].c); @@ -3313,8 +3284,8 @@ case 204: *ptr = i ; ; break;} -case 205: -#line 1369 "Gmsh.y" +case 203: +#line 1360 "Gmsh.y" { Get_ColorPointerForString(ColorField, yyvsp[-3].c, &flag, &ptr); if(flag) @@ -3323,8 +3294,8 @@ case 205: *ptr = PACK_COLOR((int)yyvsp[-1].v[0], (int)yyvsp[-1].v[1], (int)yyvsp[-1].v[2], (int)yyvsp[-1].v[3]); ; break;} -case 206: -#line 1380 "Gmsh.y" +case 204: +#line 1371 "Gmsh.y" { yyval.v[0]=yyvsp[-7].d; yyval.v[1]=yyvsp[-5].d; @@ -3332,8 +3303,8 @@ case 206: yyval.v[3]=yyvsp[-1].d; ; break;} -case 207: -#line 1387 "Gmsh.y" +case 205: +#line 1378 "Gmsh.y" { yyval.v[0]=yyvsp[-5].d; yyval.v[1]=yyvsp[-3].d; @@ -3341,152 +3312,152 @@ case 207: yyval.v[3]=255.; ; break;} -case 208: -#line 1463 "Gmsh.y" +case 206: +#line 1454 "Gmsh.y" {yyval.i = 1;; break;} -case 209: -#line 1464 "Gmsh.y" +case 207: +#line 1455 "Gmsh.y" {yyval.i = 0;; break;} -case 210: -#line 1465 "Gmsh.y" +case 208: +#line 1456 "Gmsh.y" {yyval.i = -1;; break;} -case 211: -#line 1466 "Gmsh.y" +case 209: +#line 1457 "Gmsh.y" {yyval.i = -1;; break;} -case 212: -#line 1467 "Gmsh.y" +case 210: +#line 1458 "Gmsh.y" {yyval.i = -1;; break;} -case 213: -#line 1471 "Gmsh.y" +case 211: +#line 1462 "Gmsh.y" { yyval.d = yyvsp[0].d; ; break;} -case 214: -#line 1472 "Gmsh.y" +case 212: +#line 1463 "Gmsh.y" { yyval.d = yyvsp[-1].d; ; break;} -case 215: -#line 1473 "Gmsh.y" +case 213: +#line 1464 "Gmsh.y" { yyval.d = yyvsp[-2].d - yyvsp[0].d; ; break;} -case 216: -#line 1474 "Gmsh.y" +case 214: +#line 1465 "Gmsh.y" { yyval.d = yyvsp[-2].d + yyvsp[0].d; ; break;} -case 217: -#line 1475 "Gmsh.y" +case 215: +#line 1466 "Gmsh.y" { yyval.d = yyvsp[-2].d * yyvsp[0].d; ; break;} -case 218: -#line 1476 "Gmsh.y" +case 216: +#line 1467 "Gmsh.y" { yyval.d = yyvsp[-2].d / yyvsp[0].d; ; break;} -case 219: -#line 1477 "Gmsh.y" +case 217: +#line 1468 "Gmsh.y" { yyval.d = pow(yyvsp[-2].d, yyvsp[0].d); ; break;} -case 220: -#line 1478 "Gmsh.y" +case 218: +#line 1469 "Gmsh.y" { yyval.d = - yyvsp[0].d; ; break;} -case 221: -#line 1479 "Gmsh.y" +case 219: +#line 1470 "Gmsh.y" { yyval.d = yyvsp[0].d; ; break;} -case 222: -#line 1480 "Gmsh.y" +case 220: +#line 1471 "Gmsh.y" { yyval.d = exp(yyvsp[-1].d); ; break;} -case 223: -#line 1481 "Gmsh.y" +case 221: +#line 1472 "Gmsh.y" { yyval.d = log(yyvsp[-1].d); ; break;} -case 224: -#line 1482 "Gmsh.y" +case 222: +#line 1473 "Gmsh.y" { yyval.d = log10(yyvsp[-1].d); ; break;} -case 225: -#line 1483 "Gmsh.y" +case 223: +#line 1474 "Gmsh.y" { yyval.d = sqrt(yyvsp[-1].d); ; break;} -case 226: -#line 1484 "Gmsh.y" +case 224: +#line 1475 "Gmsh.y" { yyval.d = sin(yyvsp[-1].d); ; break;} -case 227: -#line 1485 "Gmsh.y" +case 225: +#line 1476 "Gmsh.y" { yyval.d = asin(yyvsp[-1].d); ; break;} -case 228: -#line 1486 "Gmsh.y" +case 226: +#line 1477 "Gmsh.y" { yyval.d = cos(yyvsp[-1].d); ; break;} -case 229: -#line 1487 "Gmsh.y" +case 227: +#line 1478 "Gmsh.y" { yyval.d = acos(yyvsp[-1].d); ; break;} -case 230: -#line 1488 "Gmsh.y" +case 228: +#line 1479 "Gmsh.y" { yyval.d = tan(yyvsp[-1].d); ; break;} -case 231: -#line 1489 "Gmsh.y" +case 229: +#line 1480 "Gmsh.y" { yyval.d = atan(yyvsp[-1].d); ; break;} -case 232: -#line 1490 "Gmsh.y" +case 230: +#line 1481 "Gmsh.y" { yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ; break;} -case 233: -#line 1491 "Gmsh.y" +case 231: +#line 1482 "Gmsh.y" { yyval.d = sinh(yyvsp[-1].d); ; break;} -case 234: -#line 1492 "Gmsh.y" +case 232: +#line 1483 "Gmsh.y" { yyval.d = cosh(yyvsp[-1].d); ; break;} -case 235: -#line 1493 "Gmsh.y" +case 233: +#line 1484 "Gmsh.y" { yyval.d = tanh(yyvsp[-1].d); ; break;} -case 236: -#line 1494 "Gmsh.y" +case 234: +#line 1485 "Gmsh.y" { yyval.d = fabs(yyvsp[-1].d); ; break;} -case 237: -#line 1495 "Gmsh.y" +case 235: +#line 1486 "Gmsh.y" { yyval.d = floor(yyvsp[-1].d); ; break;} -case 238: -#line 1496 "Gmsh.y" +case 236: +#line 1487 "Gmsh.y" { yyval.d = ceil(yyvsp[-1].d); ; break;} -case 239: -#line 1497 "Gmsh.y" +case 237: +#line 1488 "Gmsh.y" { yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ; break;} -case 240: -#line 1498 "Gmsh.y" +case 238: +#line 1489 "Gmsh.y" { yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ; break;} -case 241: -#line 1499 "Gmsh.y" +case 239: +#line 1490 "Gmsh.y" { yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ; break;} -case 242: -#line 1503 "Gmsh.y" +case 240: +#line 1494 "Gmsh.y" { yyval.d = yyvsp[0].d; ; break;} -case 243: -#line 1504 "Gmsh.y" +case 241: +#line 1495 "Gmsh.y" { yyval.d = 3.141592653589793; ; break;} -case 244: -#line 1506 "Gmsh.y" +case 242: +#line 1497 "Gmsh.y" { TheSymbol.Name = yyvsp[0].c ; if (!List_Query(Symbol_L, &TheSymbol, CompareSymbols)) { @@ -3496,16 +3467,16 @@ case 244: Free(yyvsp[0].c); ; break;} -case 245: -#line 1518 "Gmsh.y" +case 243: +#line 1509 "Gmsh.y" { ListOfDouble2_L = List_Create(2,1,sizeof(double)) ; for(d=yyvsp[-2].d ; (yyvsp[-2].d<yyvsp[0].d)?(d<=yyvsp[0].d):(d>=yyvsp[0].d) ; (yyvsp[-2].d<yyvsp[0].d)?(d+=1.):(d-=1.)) List_Add(ListOfDouble2_L, &d) ; ; break;} -case 246: -#line 1524 "Gmsh.y" +case 244: +#line 1515 "Gmsh.y" { ListOfDouble2_L = List_Create(2,1,sizeof(double)) ; if(!yyvsp[-2].d || (yyvsp[-5].d<yyvsp[0].d && yyvsp[-2].d<0) || (yyvsp[-5].d>yyvsp[0].d && yyvsp[-2].d>0)){ @@ -3517,8 +3488,8 @@ case 246: List_Add(ListOfDouble2_L, &d) ; ; break;} -case 247: -#line 1538 "Gmsh.y" +case 245: +#line 1529 "Gmsh.y" { yyval.v[0]=yyvsp[-9].d; yyval.v[1]=yyvsp[-7].d; @@ -3527,8 +3498,8 @@ case 247: yyval.v[4]=yyvsp[-1].d; ; break;} -case 248: -#line 1546 "Gmsh.y" +case 246: +#line 1537 "Gmsh.y" { yyval.v[0]=yyvsp[-7].d; yyval.v[1]=yyvsp[-5].d; @@ -3537,8 +3508,8 @@ case 248: yyval.v[4]=1.0; ; break;} -case 249: -#line 1554 "Gmsh.y" +case 247: +#line 1545 "Gmsh.y" { yyval.v[0]=yyvsp[-5].d; yyval.v[1]=yyvsp[-3].d; @@ -3547,8 +3518,8 @@ case 249: yyval.v[4]=1.0; ; break;} -case 250: -#line 1562 "Gmsh.y" +case 248: +#line 1553 "Gmsh.y" { yyval.v[0]=yyvsp[-5].d; yyval.v[1]=yyvsp[-3].d; @@ -3557,6 +3528,16 @@ case 250: yyval.v[4]=1.0; ; break;} +case 249: +#line 1564 "Gmsh.y" +{ + ; + break;} +case 250: +#line 1567 "Gmsh.y" +{ + ; + break;} case 251: #line 1573 "Gmsh.y" { @@ -3574,67 +3555,57 @@ case 253: break;} case 254: #line 1585 "Gmsh.y" -{ - ; - break;} -case 255: -#line 1591 "Gmsh.y" -{ - ; - break;} -case 256: -#line 1594 "Gmsh.y" { yyval.l=ListOfListOfDouble_L; ; break;} -case 257: -#line 1598 "Gmsh.y" +case 255: +#line 1589 "Gmsh.y" { yyval.l=ListOfListOfDouble_L; ; break;} -case 258: -#line 1605 "Gmsh.y" +case 256: +#line 1596 "Gmsh.y" { ListOfListOfDouble_L = List_Create(2,1,sizeof(List_T*)) ; List_Add(ListOfListOfDouble_L, &(yyvsp[0].l)) ; ; break;} -case 259: -#line 1610 "Gmsh.y" +case 257: +#line 1601 "Gmsh.y" { List_Add(ListOfListOfDouble_L, &(yyvsp[0].l)) ; ; break;} -case 260: -#line 1617 "Gmsh.y" +case 258: +#line 1608 "Gmsh.y" { ; break;} -case 261: -#line 1620 "Gmsh.y" +case 259: +#line 1611 "Gmsh.y" { ListOfDouble_L = List_Create(2,1,sizeof(double)) ; List_Add(ListOfDouble_L, &(yyvsp[0].d)) ; yyval.l=ListOfDouble_L; ; break;} -case 262: -#line 1626 "Gmsh.y" +case 260: +#line 1617 "Gmsh.y" { yyval.l=ListOfDouble_L; ; break;} -case 263: -#line 1640 "Gmsh.y" +case 261: +#line 1631 "Gmsh.y" { ListOfDouble_L = List_Create(2,1,sizeof(double)) ; List_Add(ListOfDouble_L, &(yyvsp[0].d)) ; ; break;} -case 264: -#line 1645 "Gmsh.y" +case 262: +#line 1636 "Gmsh.y" { ListOfDouble_L = List_Create(2,1,sizeof(double)) ; for(i=0 ; i<List_Nbr(ListOfDouble2_L) ; i++){ @@ -3644,14 +3615,14 @@ case 264: List_Delete(ListOfDouble2_L); ; break;} -case 265: -#line 1654 "Gmsh.y" +case 263: +#line 1645 "Gmsh.y" { List_Add(ListOfDouble_L, &(yyvsp[0].d)) ; ; break;} -case 266: -#line 1658 "Gmsh.y" +case 264: +#line 1649 "Gmsh.y" { for(i=0 ; i<List_Nbr(ListOfDouble2_L) ; i++){ List_Read(ListOfDouble2_L, i, &d) ; @@ -3858,7 +3829,7 @@ yyerrhandle: yystate = yyn; goto yynewstate; } -#line 1668 "Gmsh.y" +#line 1659 "Gmsh.y" void InitSymbols(void){ diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y index d06c0be66336d971e6ba4fde1368c4ad20e612af..d8bab136b57c48cf539f779da17c0f008007982a 100644 --- a/Parser/Gmsh.y +++ b/Parser/Gmsh.y @@ -1,4 +1,4 @@ -%{ /* $Id: Gmsh.y,v 1.8 2000-11-28 11:28:35 geuzaine Exp $ */ +%{ /* $Id: Gmsh.y,v 1.9 2000-11-28 14:42:44 geuzaine Exp $ */ #include <stdarg.h> @@ -697,21 +697,21 @@ Shape : $$.Type = MSH_PHYSICAL_POINT; $$.Num = (int)$4; } - | tAttractor tPoint '(' FExpr ',' FExpr ',' FExpr ')' tAFFECT ListOfDouble tEND + | tAttractor tPoint ListOfDouble tAFFECT '(' FExpr ',' FExpr ',' FExpr ')' tEND { Vertex *v; Attractor *a; double p; int ip; - for(int i=0;i<List_Nbr($11);i++){ - List_Read($11,i,&p); + for(int i=0;i<List_Nbr($3);i++){ + List_Read($3,i,&p); ip = (int)p; v = FindVertex(ip,THEM); if(!v) vyyerror("Unkown Point %d", ip); else{ a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1, - $4,$6,$8,v,NULL,NULL); + $6,$8,$10,v,NULL,NULL); List_Add(THEM->Metric->Attractors,&a); } } @@ -727,7 +727,7 @@ Shape : v->lc = $5; } } - | tPoint '(' FExpr ')' tEND + | tPoint '{' FExpr '}' tEND { $$.Type = MSH_POINT; $$.Num = (int)$3; @@ -747,21 +747,21 @@ Shape : $$.Type = MSH_SEGM_SPLN; $$.Num = (int)$3; } - | tAttractor tLine '(' FExpr ',' FExpr ',' FExpr ')' tAFFECT ListOfDouble tEND + | tAttractor tLine ListOfDouble tAFFECT '{' FExpr ',' FExpr ',' FExpr '}' tEND { Curve *c; Attractor *a; double p; int ip; - for(int i=0;i<List_Nbr($11);i++){ - List_Read($11,i,&p); + for(int i=0;i<List_Nbr($3);i++){ + List_Read($3,i,&p); ip = (int)p; c = FindCurve(ip,THEM); if(!c) vyyerror("Unkown Curve %d", ip); else{ a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1, - $4,$6,$8,NULL,c,NULL); + $6,$8,$10,NULL,c,NULL); List_Add(THEM->Metric->Attractors,&a); } } @@ -789,7 +789,7 @@ Shape : $$.Num = (int)$3; } | tParametric '(' FExpr ')' tAFFECT - '(' FExpr ',' FExpr ',' tBIGSTR ',' tBIGSTR ',' tBIGSTR ')' tEND + '{' FExpr ',' FExpr ',' tBIGSTR ',' tBIGSTR ',' tBIGSTR '}' tEND { Cdbseg101((int)$3,MSH_SEGM_PARAMETRIC,2,NULL,NULL,-1,-1,$7,$9,$11,$13,$15); $$.Type = MSH_SEGM_PARAMETRIC ; @@ -813,15 +813,6 @@ Shape : Cdbz101((int)$4,$$.Type,0,0,0,0,0,NULL,$7,NULL); $$.Num = (int)$4; } - | tLine '(' FExpr ')' tEND - { - $$.Num = (int)$3; - Curve *c = FindCurve($$.Num,THEM); - if(!c) - vyyerror("Unkown Curve %d", $$.Num); - else - $$.Type = c->Typ; - } | tBSpline '(' FExpr ')' tAFFECT ListOfDouble tEND { Cdbseg101((int)$3,MSH_SEGM_BSPLN,2,$6,NULL,-1,-1,0.,1.,NULL,NULL,NULL); @@ -847,6 +838,15 @@ Shape : AddCurveInDataBase ((int)$3,MSH_SEGM_NURBS,(int)$10,Temp,$8,-1,-1,0.,1.); List_Delete(Temp); } + | tLine '{' FExpr '}' tEND + { + $$.Num = (int)$3; + Curve *c = FindCurve($$.Num,THEM); + if(!c) + vyyerror("Unkown Curve %d", $$.Num); + else + $$.Type = c->Typ; + } /* -------- Surfaces -------- */ @@ -922,7 +922,7 @@ Shape : $$.Type = MSH_SURF_LOOP; $$.Num = (int)$4; } - | tSurface '(' FExpr ')' tEND + | tSurface '{' FExpr '}' tEND { $$.Num = (int)$3; Surface *s = FindSurface($$.Num,THEM); @@ -959,22 +959,22 @@ Shape : ------------------- */ Transform : - tTranslate '(' VExpr ')' '{' MultipleShape '}' + tTranslate VExpr '{' MultipleShape '}' { - TranslateShapes ($3[0],$3[1],$3[2],$6,1); - $$ = $6; + TranslateShapes ($2[0],$2[1],$2[2],$4,1); + $$ = $4; } - | tRotate '(' VExpr ',' VExpr ',' FExpr ')' '{' MultipleShape '}' + | tRotate '{' VExpr ',' VExpr ',' FExpr '}' '{' MultipleShape '}' { RotateShapes($3[0],$3[1],$3[2],$5[0],$5[1],$5[2],$7,$10); $$ = $10; } - | tSymmetry '(' VExpr ')' '{' MultipleShape '}' + | tSymmetry VExpr '{' MultipleShape '}' { - SymmetryShapes($3[0],$3[1],$3[2],$3[3],$6,1); - $$ = $6; + SymmetryShapes($2[0],$2[1],$2[2],$2[3],$4,1); + $$ = $4; } - | tDilate '(' VExpr ',' FExpr ')' '{' MultipleShape '}' + | tDilate '{' VExpr ',' FExpr '}' '{' MultipleShape '}' { DilatShapes($3[0],$3[1],$3[2],$5,$8,1); $$ = $8; @@ -1068,48 +1068,39 @@ Macro : --------------- */ Extrude : - tExtrude '(' FExpr ',' VExpr ')' tEND + tExtrude tPoint '{' FExpr ',' VExpr '}' tEND { - Extrude_ProtudeSurface(1,(int)$3,$5[0],$5[1],$5[2],0.,0.,0.,0.,0,NULL); - } - | tExtrude tSurface '(' FExpr ',' VExpr ')' tEND - { - Extrude_ProtudeSurface(1,(int)$4,$6[0],$6[1],$6[2],0.,0.,0.,0.,0,NULL); - } - | tExtrude '(' FExpr ',' VExpr ',' VExpr ',' FExpr ')' tEND - { - Extrude_ProtudeSurface(0,(int)$3,$5[0],$5[1],$5[2],$7[0],$7[1],$7[2],$9,0,NULL); - } - | tExtrude tSurface '(' FExpr ',' VExpr ',' VExpr ',' FExpr ')' tEND - { - Extrude_ProtudeSurface(0,(int)$4,$6[0],$6[1],$6[2],$8[0],$8[1],$8[2],$10,0,NULL); + Curve *pc, *prc; + Extrude_ProtudePoint(1,(int)$4,$6[0],$6[1],$6[2],0.,0.,0.,0.,&pc,&prc,NULL); } - | tExtrude tPoint '(' FExpr ',' VExpr ',' VExpr ',' FExpr ')' tEND + | tExtrude tPoint '{' FExpr ',' VExpr ',' VExpr ',' FExpr '}' tEND { Curve *pc, *prc; Extrude_ProtudePoint(0,(int)$4,$6[0],$6[1],$6[2],$8[0],$8[1],$8[2],$10, &pc,&prc,NULL); } - | tExtrude tPoint '(' FExpr ',' VExpr ')' tEND + | tExtrude tLine'{' FExpr ',' VExpr '}' tEND { - Curve *pc, *prc; - Extrude_ProtudePoint(1,(int)$4,$6[0],$6[1],$6[2],0.,0.,0.,0.,&pc,&prc,NULL); + Extrude_ProtudeCurve(1,(int)$4,$6[0],$6[1],$6[2],0.,0.,0.,0.,NULL); } - | tExtrude tLine'(' FExpr ',' VExpr ',' VExpr ',' FExpr ')' tEND + | tExtrude tLine'{' FExpr ',' VExpr ',' VExpr ',' FExpr '}' tEND { Extrude_ProtudeCurve(0,(int)$4,$6[0],$6[1],$6[2],$8[0],$8[1],$8[2],$10,NULL); } - | tExtrude tLine'(' FExpr ',' VExpr ')' tEND + | tExtrude tSurface '{' FExpr ',' VExpr '}' tEND { - Extrude_ProtudeCurve(1,(int)$4,$6[0],$6[1],$6[2],0.,0.,0.,0.,NULL); + Extrude_ProtudeSurface(1,(int)$4,$6[0],$6[1],$6[2],0.,0.,0.,0.,0,NULL); + } + | tExtrude tSurface '{' FExpr ',' VExpr ',' VExpr ',' FExpr '}' tEND + { + Extrude_ProtudeSurface(0,(int)$4,$6[0],$6[1],$6[2],$8[0],$8[1],$8[2],$10,0,NULL); } - | tExtrude tSurface '(' FExpr ',' VExpr ')' '{' ExtrudeParameters '}' tEND + | tExtrude tSurface '{' FExpr ',' VExpr '}' '{' ExtrudeParameters '}' tEND { int vol = NEWREG(); Extrude_ProtudeSurface(1,(int)$4,$6[0],$6[1],$6[2],0.,0.,0.,0.,vol,&extr); } - | tExtrude tSurface '(' FExpr ',' VExpr ',' VExpr ',' FExpr ')' - '{' ExtrudeParameters '}'tEND + | tExtrude tSurface '{' FExpr ',' VExpr ',' VExpr ',' FExpr '}' '{' ExtrudeParameters '}'tEND { int vol = NEWREG(); Extrude_ProtudeSurface(0,(int)$4,$6[0],$6[1],$6[2],$8[0],$8[1],$8[2],$10,vol,&extr); diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp index 530fd55b7809115640eef91cb7b15dc8af2bde5a..0c7d4f274fb12a6e027d0bec0d4af3297f1dff88 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.10 2000-11-28 11:28:35 geuzaine Exp $ + * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.11 2000-11-28 14:42:44 geuzaine Exp $ */ #define FLEX_SCANNER