From 7691c264c13be74f7067abcef54b04f6c0121ec5 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 19 Sep 2003 17:22:29 +0000
Subject: [PATCH] Fix + generalize index retrival for geometrical
transformation
---
Geo/CAD.cpp | 90 +-
Geo/CAD.h | 33 +-
Parser/Gmsh.tab.cpp | 4754 +++++++++++++++++++++--------------------
Parser/Gmsh.y | 812 ++++---
Parser/Gmsh.yy.cpp | 4 +-
doc/VERSIONS | 6 +-
doc/texinfo/gmsh.texi | 55 +-
tutorial/t2.geo | 12 +-
8 files changed, 3084 insertions(+), 2682 deletions(-)
diff --git a/Geo/CAD.cpp b/Geo/CAD.cpp
index c4f1a30328..14f2d6ffa7 100644
--- a/Geo/CAD.cpp
+++ b/Geo/CAD.cpp
@@ -1,4 +1,4 @@
-// $Id: CAD.cpp,v 1.64 2003-08-27 01:45:09 geuzaine Exp $
+// $Id: CAD.cpp,v 1.65 2003-09-19 17:22:25 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -1050,27 +1050,28 @@ void ProtudeXYZ(double &x, double &y, double &z, ExtrudeParams * e)
List_Reset(ListOfTransformedPoints);
}
-void Extrude_ProtudePoint(int type, int ip,
- double T0, double T1, double T2,
- double A0, double A1, double A2,
- double X0, double X1, double X2, double alpha,
- Curve ** pc, Curve ** prc, int final,
- ExtrudeParams * e)
+int Extrude_ProtudePoint(int type, int ip,
+ double T0, double T1, double T2,
+ double A0, double A1, double A2,
+ double X0, double X1, double X2, double alpha,
+ Curve ** pc, Curve ** prc, int final,
+ ExtrudeParams * e)
{
double xnew, ynew, znew, matrix[4][4], T[3], Ax[3], d;
Vertex V, *pv, *newp, *chapeau;
Curve *c;
- int i;
+ int i, chapeauNum;
pv = &V;
pv->Num = ip;
*pc = *prc = NULL;
if(!Tree_Query(THEM->Points, &pv))
- return;
+ return 0;
Msg(DEBUG, "Extrude Point %d", ip);
chapeau = DuplicateVertex(pv);
+ chapeauNum = chapeau->Num;
switch (type) {
@@ -1083,7 +1084,7 @@ void Extrude_ProtudePoint(int type, int ip,
ApplyTransformationToPoint(matrix, chapeau);
if(!comparePosition(&pv, &chapeau))
- return;
+ return chapeauNum;
c = Create_Curve(NEWLINE(), MSH_SEGM_LINE, 1, NULL, NULL, -1, -1, 0., 1.);
c->Control_Points = List_Create(2, 1, sizeof(Vertex *));
c->Extrude = new ExtrudeParams;
@@ -1120,7 +1121,7 @@ void Extrude_ProtudePoint(int type, int ip,
ApplyTransformationToPoint(matrix, chapeau);
if(!comparePosition(&pv, &chapeau))
- return;
+ return chapeauNum;
c = Create_Curve(NEWLINE(), MSH_SEGM_CIRC, 1, NULL, NULL, -1, -1, 0., 1.);
c->Control_Points = List_Create(3, 1, sizeof(Vertex *));
c->Extrude = new ExtrudeParams;
@@ -1193,7 +1194,7 @@ void Extrude_ProtudePoint(int type, int ip,
default:
Msg(GERROR, "Unknown extrusion type");
- return;
+ return chapeauNum;
}
End_Curve(c);
@@ -1206,29 +1207,36 @@ void Extrude_ProtudePoint(int type, int ip,
if(CTX.geom.auto_coherence && final)
ReplaceAllDuplicates(THEM);
+
+ return chapeauNum;
}
-Surface *Extrude_ProtudeCurve(int type, int ic,
- double T0, double T1, double T2,
- double A0, double A1, double A2,
- double X0, double X1, double X2, double alpha,
- int final, ExtrudeParams * e)
+int Extrude_ProtudeCurve(int type, int ic,
+ double T0, double T1, double T2,
+ double A0, double A1, double A2,
+ double X0, double X1, double X2, double alpha,
+ Surface ** ps, int final,
+ ExtrudeParams * e)
{
double matrix[4][4], T[3], Ax[3];
Curve *CurveBeg, *CurveEnd;
Curve *ReverseChapeau, *ReverseBeg, *ReverseEnd;
Curve *pc, *revpc, *chapeau;
Surface *s;
+ int chapeauNum;
pc = FindCurve(ic, THEM);
revpc = FindCurve(-ic, THEM);
+ *ps = NULL;
- if(!pc || !revpc)
- return NULL;
+ if(!pc || !revpc){
+ return 0;
+ }
Msg(DEBUG, "Extrude Curve %d", ic);
chapeau = DuplicateCurve(pc);
+ chapeauNum = chapeau->Num;
chapeau->Extrude = new ExtrudeParams(COPIED_ENTITY);
chapeau->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha);
@@ -1298,7 +1306,7 @@ Surface *Extrude_ProtudeCurve(int type, int ic,
break;
default:
Msg(GERROR, "Unknown extrusion type");
- return NULL;
+ return chapeauNum;
}
Extrude_ProtudePoint(type, pc->beg->Num, T0, T1, T2,
@@ -1308,8 +1316,9 @@ Surface *Extrude_ProtudeCurve(int type, int ic,
A0, A1, A2, X0, X1, X2, alpha,
&CurveEnd, &ReverseEnd, 0, e);
- if(!CurveBeg && !CurveEnd)
- return NULL;
+ if(!CurveBeg && !CurveEnd){
+ return chapeauNum;
+ }
if(!CurveBeg || !CurveEnd)
s = Create_Surface(NEWSURFACE(), MSH_SURF_TRIC);
@@ -1347,32 +1356,34 @@ Surface *Extrude_ProtudeCurve(int type, int ic,
List_Reset(ListOfTransformedPoints);
- if(CTX.geom.auto_coherence && final) {
+ *ps = s;
+
+ if(CTX.geom.auto_coherence && final)
ReplaceAllDuplicates(THEM);
- return NULL;
- }
- else
- return s;
+
+ return chapeauNum;
}
-void Extrude_ProtudeSurface(int type, int is,
- double T0, double T1, double T2,
- double A0, double A1, double A2,
- double X0, double X1, double X2, double alpha,
- int NewVolume, ExtrudeParams * e)
+int Extrude_ProtudeSurface(int type, int is,
+ double T0, double T1, double T2,
+ double A0, double A1, double A2,
+ double X0, double X1, double X2, double alpha,
+ int NewVolume, ExtrudeParams * e)
{
double matrix[4][4], T[3], Ax[3];
Curve *c, *c2;
- int i;
+ int i, chapeauNum;
Surface *s, *ps, *chapeau;
Volume *pv = NULL;
if(!(ps = FindSurface(is, THEM)))
- return;
+ return 0;
Msg(DEBUG, "Extrude Surface %d", is);
chapeau = DuplicateSurface(ps);
+ chapeauNum = chapeau->Num;
+
chapeau->Extrude = new ExtrudeParams(COPIED_ENTITY);
chapeau->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha);
chapeau->Extrude->geo.Source = ps->Num;
@@ -1385,7 +1396,7 @@ void Extrude_ProtudeSurface(int type, int is,
if(c->Num < 0)
if(!(c = FindCurve(-c->Num, THEM))) {
Msg(GERROR, "Unknown Curve %d", -c->Num);
- return;
+ return chapeauNum;
}
c->Extrude = new ExtrudeParams(COPIED_ENTITY);
c->Extrude->fill(type, T0, T1, T2, A0, A1, A2, X0, X1, X2, alpha);
@@ -1410,9 +1421,8 @@ void Extrude_ProtudeSurface(int type, int is,
for(i = 0; i < List_Nbr(ps->Generatrices); i++) {
List_Read(ps->Generatrices, i, &c);
- s =
- Extrude_ProtudeCurve(type, c->Num, T0, T1, T2, A0, A1, A2, X0, X1, X2,
- alpha, 0, e);
+ Extrude_ProtudeCurve(type, c->Num, T0, T1, T2, A0, A1, A2, X0, X1, X2,
+ alpha, &s, 0, e);
if(pv && s)
List_Add(pv->Surfaces, &s);
}
@@ -1479,7 +1489,7 @@ void Extrude_ProtudeSurface(int type, int is,
break;
default:
Msg(GERROR, "Unknown extrusion type");
- return;
+ return chapeauNum;
}
Tree_Suppress(THEM->Surfaces, &chapeau);
@@ -1496,6 +1506,8 @@ void Extrude_ProtudeSurface(int type, int is,
ReplaceAllDuplicates(THEM);
List_Reset(ListOfTransformedPoints);
+
+ return chapeauNum;
}
// Duplicate removal
diff --git a/Geo/CAD.h b/Geo/CAD.h
index c9ecec3d9f..a379f7fe97 100644
--- a/Geo/CAD.h
+++ b/Geo/CAD.h
@@ -63,22 +63,23 @@ void ColorShape(int Type, int Num, unsigned int Color);
void ProtudeXYZ(double &x, double &y, double &z, ExtrudeParams *e);
-void Extrude_ProtudePoint(int type, int ip,
- double T0, double T1, double T2,
- double A0, double A1, double A2,
- double X0, double X1, double X2, double alpha,
- Curve **pc, Curve **prc, int final,
- ExtrudeParams *e);
-Surface *Extrude_ProtudeCurve(int type, int ic,
- double T0, double T1, double T2,
- double A0, double A1, double A2,
- double X0, double X1, double X2, double alpha,
- int final, ExtrudeParams *e);
-void Extrude_ProtudeSurface(int type, int is,
- double T0, double T1, double T2,
- double A0, double A1, double A2,
- double X0, double X1, double X2, double alpha,
- int NewVolume, ExtrudeParams *e);
+int Extrude_ProtudePoint(int type, int ip,
+ double T0, double T1, double T2,
+ double A0, double A1, double A2,
+ double X0, double X1, double X2, double alpha,
+ Curve **pc, Curve **prc, int final,
+ ExtrudeParams *e);
+int Extrude_ProtudeCurve(int type, int ic,
+ double T0, double T1, double T2,
+ double A0, double A1, double A2,
+ double X0, double X1, double X2, double alpha,
+ Surface **ps, int final,
+ ExtrudeParams *e);
+int Extrude_ProtudeSurface(int type, int is,
+ double T0, double T1, double T2,
+ double A0, double A1, double A2,
+ double X0, double X1, double X2, double alpha,
+ int NewVolume, ExtrudeParams *e);
void ReplaceAllDuplicates(Mesh *m);
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 64bee0af10..1403d2fc91 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -189,8 +189,7 @@
#line 1 "Gmsh.y"
-
-// $Id: Gmsh.tab.cpp,v 1.161 2003-09-17 18:00:53 geuzaine Exp $
+// $Id: Gmsh.tab.cpp,v 1.162 2003-09-19 17:22:25 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -271,7 +270,7 @@ void yymsg (int type, char *fmt, ...);
void skip_until (char *skip, char *until);
int PrintListOfDouble (char *format, List_T *list, char *buffer);
-#line 85 "Gmsh.y"
+#line 84 "Gmsh.y"
typedef union {
char *c;
int i;
@@ -291,7 +290,7 @@ typedef union {
-#define YYFINAL 2286
+#define YYFINAL 2293
#define YYFLAG -32768
#define YYNTBASE 203
@@ -389,9 +388,9 @@ static const short yyprhs[] = { 0,
2947, 2949, 2954, 2957, 2963, 2967, 2974, 2979, 2987, 2989,
2992, 2995, 2999, 3003, 3015, 3025, 3033, 3041, 3042, 3046,
3048, 3052, 3053, 3057, 3061, 3063, 3067, 3069, 3071, 3075,
- 3080, 3084, 3090, 3094, 3099, 3106, 3114, 3116, 3118, 3122,
- 3126, 3136, 3144, 3146, 3152, 3156, 3163, 3165, 3169, 3171,
- 3178, 3183, 3188, 3195, 3202
+ 3080, 3084, 3090, 3095, 3097, 3099, 3101, 3105, 3110, 3117,
+ 3125, 3127, 3129, 3133, 3137, 3147, 3155, 3157, 3163, 3167,
+ 3174, 3176, 3180, 3182, 3189, 3194, 3199, 3206, 3213
};
static const short yyrhs[] = { 206,
@@ -703,72 +702,73 @@ static const short yyrhs[] = { 206,
0, 0, 201, 328, 202, 0, 195, 328, 196, 0,
329, 0, 328, 200, 329, 0, 321, 0, 330, 0,
201, 331, 202, 0, 185, 201, 331, 202, 0, 321,
- 8, 321, 0, 321, 8, 321, 8, 321, 0, 4,
- 197, 198, 0, 185, 4, 197, 198, 0, 4, 197,
- 201, 331, 202, 198, 0, 185, 4, 197, 201, 331,
- 202, 198, 0, 321, 0, 330, 0, 331, 200, 321,
- 0, 331, 200, 330, 0, 201, 321, 200, 321, 200,
- 321, 200, 321, 202, 0, 201, 321, 200, 321, 200,
- 321, 202, 0, 4, 0, 4, 199, 105, 199, 4,
- 0, 201, 334, 202, 0, 4, 197, 321, 198, 199,
- 106, 0, 332, 0, 334, 200, 332, 0, 5, 0,
- 35, 195, 335, 200, 335, 196, 0, 36, 195, 335,
- 196, 0, 34, 195, 335, 196, 0, 34, 195, 335,
- 200, 331, 196, 0, 34, 195, 4, 199, 4, 196,
- 0, 34, 195, 4, 197, 321, 198, 199, 4, 196,
- 0
+ 8, 321, 0, 321, 8, 321, 8, 321, 0, 38,
+ 201, 321, 202, 0, 298, 0, 301, 0, 306, 0,
+ 4, 197, 198, 0, 185, 4, 197, 198, 0, 4,
+ 197, 201, 331, 202, 198, 0, 185, 4, 197, 201,
+ 331, 202, 198, 0, 321, 0, 330, 0, 331, 200,
+ 321, 0, 331, 200, 330, 0, 201, 321, 200, 321,
+ 200, 321, 200, 321, 202, 0, 201, 321, 200, 321,
+ 200, 321, 202, 0, 4, 0, 4, 199, 105, 199,
+ 4, 0, 201, 334, 202, 0, 4, 197, 321, 198,
+ 199, 106, 0, 332, 0, 334, 200, 332, 0, 5,
+ 0, 35, 195, 335, 200, 335, 196, 0, 36, 195,
+ 335, 196, 0, 34, 195, 335, 196, 0, 34, 195,
+ 335, 200, 331, 196, 0, 34, 195, 4, 199, 4,
+ 196, 0, 34, 195, 4, 197, 321, 198, 199, 4,
+ 196, 0
};
#endif
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 170, 172, 173, 174, 179, 181, 184, 192, 206, 216,
- 218, 221, 223, 224, 227, 233, 238, 239, 240, 243,
- 247, 250, 256, 261, 267, 275, 280, 284, 290, 295,
- 299, 304, 308, 311, 316, 320, 324, 328, 333, 337,
- 340, 344, 348, 352, 356, 360, 364, 367, 371, 374,
- 378, 381, 388, 392, 398, 400, 401, 402, 403, 404,
- 405, 406, 407, 408, 409, 410, 411, 414, 419, 434,
- 439, 445, 450, 451, 452, 453, 454, 455, 456, 457,
- 458, 459, 460, 461, 462, 463, 464, 465, 466, 467,
- 468, 469, 470, 471, 472, 473, 474, 475, 478, 481,
- 485, 491, 497, 500, 504, 510, 516, 519, 523, 529,
- 535, 538, 542, 550, 556, 559, 563, 571, 577, 580,
- 584, 592, 598, 601, 605, 617, 623, 626, 630, 642,
- 648, 651, 655, 667, 673, 676, 680, 693, 699, 702,
- 706, 719, 725, 728, 732, 745, 751, 754, 758, 771,
- 777, 780, 784, 797, 803, 806, 810, 823, 829, 832,
- 836, 859, 865, 868, 872, 895, 901, 904, 908, 931,
- 937, 940, 944, 962, 968, 971, 975, 993, 999, 1002,
- 1006, 1024, 1030, 1033, 1037, 1054, 1060, 1063, 1067, 1084,
- 1090, 1093, 1097, 1114, 1120, 1126, 1133, 1141, 1147, 1153,
- 1160, 1168, 1177, 1179, 1180, 1181, 1182, 1185, 1187, 1190,
- 1221, 1255, 1302, 1317, 1326, 1341, 1353, 1367, 1390, 1414,
- 1426, 1440, 1452, 1466, 1486, 1508, 1520, 1536, 1547, 1553,
- 1572, 1586, 1592, 1598, 1617, 1623, 1629, 1645, 1652, 1658,
- 1664, 1675, 1686, 1711, 1717, 1736, 1758, 1764, 1772, 1778,
- 1784, 1793, 1799, 1805, 1815, 1821, 1826, 1831, 1838, 1840,
- 1841, 1844, 1849, 1854, 1869, 1884, 1903, 1914, 1923, 1931,
- 1935, 1943, 1955, 2037, 2057, 2062, 2066, 2086, 2098, 2108,
- 2129, 2150, 2171, 2177, 2182, 2187, 2191, 2199, 2210, 2217,
- 2224, 2229, 2236, 2241, 2248, 2253, 2263, 2268, 2273, 2278,
- 2283, 2288, 2293, 2298, 2303, 2311, 2316, 2321, 2326, 2331,
- 2337, 2343, 2349, 2355, 2363, 2367, 2372, 2399, 2423, 2431,
- 2450, 2468, 2486, 2508, 2529, 2550, 2564, 2583, 2588, 2597,
- 2599, 2600, 2601, 2602, 2605, 2607, 2608, 2609, 2610, 2611,
- 2612, 2613, 2614, 2621, 2622, 2623, 2624, 2625, 2626, 2627,
- 2628, 2629, 2630, 2631, 2632, 2633, 2634, 2635, 2636, 2637,
- 2638, 2639, 2640, 2641, 2642, 2643, 2644, 2645, 2646, 2647,
- 2648, 2649, 2650, 2651, 2652, 2654, 2655, 2656, 2657, 2658,
- 2659, 2660, 2661, 2662, 2663, 2664, 2665, 2666, 2667, 2668,
- 2669, 2670, 2671, 2672, 2673, 2674, 2679, 2684, 2685, 2686,
- 2690, 2701, 2718, 2729, 2748, 2764, 2780, 2796, 2813, 2818,
- 2822, 2826, 2830, 2836, 2841, 2845, 2849, 2855, 2859, 2864,
- 2868, 2873, 2877, 2881, 2887, 2893, 2900, 2906, 2910, 2914,
- 2936, 2943, 2978, 2992, 3008, 3028, 3052, 3058, 3062, 3066,
- 3077, 3082, 3093, 3098, 3116, 3121, 3134, 3140, 3146, 3151,
- 3159, 3172, 3176, 3194, 3208
+ 169, 171, 172, 173, 178, 180, 183, 191, 205, 215,
+ 217, 220, 222, 223, 226, 232, 237, 238, 239, 242,
+ 246, 249, 255, 260, 266, 274, 279, 283, 289, 294,
+ 298, 303, 307, 310, 315, 319, 323, 327, 332, 336,
+ 339, 343, 347, 351, 355, 359, 363, 366, 370, 373,
+ 377, 380, 387, 391, 397, 399, 400, 401, 402, 403,
+ 404, 405, 406, 407, 408, 409, 410, 413, 418, 433,
+ 438, 444, 449, 450, 451, 452, 453, 454, 455, 456,
+ 457, 458, 459, 460, 461, 462, 463, 464, 465, 466,
+ 467, 468, 469, 470, 471, 472, 473, 474, 477, 480,
+ 484, 490, 496, 499, 503, 509, 515, 518, 522, 528,
+ 534, 537, 541, 549, 555, 558, 562, 570, 576, 579,
+ 583, 591, 597, 600, 604, 616, 622, 625, 629, 641,
+ 647, 650, 654, 666, 672, 675, 679, 692, 698, 701,
+ 705, 718, 724, 727, 731, 744, 750, 753, 757, 770,
+ 776, 779, 783, 796, 802, 805, 809, 822, 828, 831,
+ 835, 858, 864, 867, 871, 894, 900, 903, 907, 930,
+ 936, 939, 943, 961, 967, 970, 974, 992, 998, 1001,
+ 1005, 1023, 1029, 1032, 1036, 1053, 1059, 1062, 1066, 1083,
+ 1089, 1092, 1096, 1113, 1119, 1125, 1132, 1140, 1146, 1152,
+ 1159, 1167, 1176, 1178, 1179, 1180, 1181, 1184, 1186, 1189,
+ 1220, 1254, 1301, 1316, 1325, 1340, 1352, 1366, 1389, 1413,
+ 1425, 1439, 1451, 1465, 1485, 1507, 1519, 1535, 1546, 1552,
+ 1571, 1585, 1591, 1597, 1616, 1622, 1628, 1644, 1651, 1657,
+ 1663, 1674, 1685, 1710, 1716, 1735, 1757, 1763, 1771, 1777,
+ 1783, 1792, 1798, 1804, 1814, 1820, 1825, 1830, 1837, 1839,
+ 1840, 1843, 1848, 1852, 1866, 1880, 1898, 1909, 1919, 1927,
+ 1931, 1939, 1951, 2034, 2054, 2059, 2063, 2083, 2095, 2105,
+ 2126, 2147, 2168, 2174, 2179, 2184, 2188, 2196, 2209, 2219,
+ 2229, 2234, 2244, 2249, 2259, 2264, 2277, 2294, 2311, 2328,
+ 2333, 2350, 2355, 2372, 2377, 2397, 2413, 2429, 2445, 2450,
+ 2467, 2473, 2490, 2496, 2515, 2519, 2524, 2551, 2575, 2583,
+ 2602, 2620, 2638, 2660, 2681, 2702, 2716, 2735, 2740, 2749,
+ 2751, 2752, 2753, 2754, 2757, 2759, 2760, 2761, 2762, 2763,
+ 2764, 2765, 2766, 2773, 2774, 2775, 2776, 2777, 2778, 2779,
+ 2780, 2781, 2782, 2783, 2784, 2785, 2786, 2787, 2788, 2789,
+ 2790, 2791, 2792, 2793, 2794, 2795, 2796, 2797, 2798, 2799,
+ 2800, 2801, 2802, 2803, 2804, 2806, 2807, 2808, 2809, 2810,
+ 2811, 2812, 2813, 2814, 2815, 2816, 2817, 2818, 2819, 2820,
+ 2821, 2822, 2823, 2824, 2825, 2826, 2831, 2836, 2837, 2838,
+ 2842, 2853, 2870, 2881, 2900, 2916, 2932, 2948, 2965, 2970,
+ 2974, 2978, 2982, 2988, 2993, 2997, 3001, 3007, 3011, 3016,
+ 3020, 3025, 3029, 3033, 3039, 3045, 3052, 3058, 3062, 3066,
+ 3076, 3083, 3094, 3114, 3123, 3132, 3141, 3155, 3171, 3191,
+ 3215, 3221, 3225, 3229, 3240, 3245, 3256, 3261, 3279, 3284,
+ 3297, 3303, 3309, 3314, 3322, 3335, 3339, 3357, 3371
};
#endif
@@ -875,9 +875,9 @@ static const short yyr1[] = { 0,
322, 322, 322, 322, 322, 322, 322, 322, 323, 323,
323, 323, 323, 324, 324, 324, 324, 325, 325, 326,
326, 327, 327, 327, 328, 328, 329, 329, 329, 329,
- 330, 330, 330, 330, 330, 330, 331, 331, 331, 331,
- 332, 332, 332, 332, 333, 333, 334, 334, 335, 335,
- 335, 335, 335, 335, 335
+ 330, 330, 330, 330, 330, 330, 330, 330, 330, 330,
+ 331, 331, 331, 331, 332, 332, 332, 332, 333, 333,
+ 334, 334, 335, 335, 335, 335, 335, 335, 335
};
static const short yyr2[] = { 0,
@@ -924,9 +924,9 @@ static const short yyr2[] = { 0,
1, 4, 2, 5, 3, 6, 4, 7, 1, 2,
2, 3, 3, 11, 9, 7, 7, 0, 3, 1,
3, 0, 3, 3, 1, 3, 1, 1, 3, 4,
- 3, 5, 3, 4, 6, 7, 1, 1, 3, 3,
- 9, 7, 1, 5, 3, 6, 1, 3, 1, 6,
- 4, 4, 6, 6, 9
+ 3, 5, 4, 1, 1, 1, 3, 4, 6, 7,
+ 1, 1, 3, 3, 9, 7, 1, 5, 3, 6,
+ 1, 3, 1, 6, 4, 4, 6, 6, 9
};
static const short yydefact[] = { 0,
@@ -939,7 +939,7 @@ static const short yydefact[] = { 0,
287, 0, 284, 0, 0, 0, 54, 56, 55, 57,
58, 59, 60, 61, 62, 67, 66, 63, 64, 65,
5, 0, 0, 0, 15, 16, 18, 17, 19, 418,
- 418, 0, 397, 401, 449, 203, 398, 399, 400, 0,
+ 418, 0, 397, 401, 453, 203, 398, 399, 400, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 204, 205, 206, 207, 0, 0, 0,
@@ -949,7 +949,7 @@ static const short yydefact[] = { 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 409, 0, 0, 0, 0, 0, 0, 262, 0,
0, 0, 262, 328, 329, 0, 0, 0, 0, 0,
- 0, 443, 0, 0, 0, 0, 0, 276, 0, 283,
+ 0, 447, 0, 0, 0, 0, 0, 276, 0, 283,
0, 6, 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,
@@ -962,457 +962,459 @@ static const short yydefact[] = { 0,
0, 0, 0, 0, 0, 0, 0, 0, 214, 274,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 273, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 401, 0, 0, 427, 0,
- 428, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 411, 410, 0, 0,
- 0, 0, 262, 262, 0, 0, 0, 0, 0, 0,
- 0, 0, 271, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 262, 0, 0, 0, 285, 0, 0,
+ 0, 0, 0, 0, 0, 401, 0, 0, 0, 434,
+ 435, 436, 427, 0, 428, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 411, 410, 0, 0, 0, 0, 262, 262, 0, 0,
+ 0, 0, 0, 0, 0, 0, 271, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 262, 0, 0,
+ 0, 285, 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, 420, 0, 0, 0, 0, 0,
+ 405, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 420, 0, 0, 0, 0, 0, 405, 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, 453, 0, 0, 0,
+ 336, 0, 0, 441, 442, 0, 0, 203, 0, 0,
+ 0, 0, 210, 0, 353, 352, 350, 351, 346, 348,
+ 347, 349, 341, 340, 342, 343, 344, 345, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 401, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 449, 0, 0, 0, 336, 0, 0, 437,
- 438, 0, 0, 203, 0, 0, 0, 0, 210, 0,
- 353, 352, 350, 351, 346, 348, 347, 349, 341, 340,
- 342, 343, 344, 345, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 401, 0, 0, 0, 0,
+ 0, 0, 413, 412, 261, 0, 260, 259, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 267, 263, 327,
+ 0, 0, 269, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 286, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 413, 412, 261,
- 0, 260, 259, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 267, 263, 327, 0, 0, 269, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 286, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 419, 0,
+ 0, 21, 0, 402, 407, 72, 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, 419, 0, 0, 21, 0, 402, 407,
- 72, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 73, 74, 75, 76, 77, 78, 79,
+ 80, 81, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 355,
+ 376, 356, 377, 357, 378, 358, 379, 359, 380, 360,
+ 381, 361, 382, 362, 383, 363, 384, 375, 396, 364,
+ 385, 0, 0, 366, 387, 367, 388, 368, 389, 369,
+ 390, 370, 391, 371, 392, 0, 0, 0, 0, 0,
+ 0, 0, 0, 456, 0, 0, 455, 0, 0, 0,
+ 0, 0, 0, 0, 0, 220, 0, 0, 0, 0,
+ 0, 68, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 437, 0, 0, 0, 0, 429, 431, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, 98, 355, 376, 356, 377, 357, 378,
- 358, 379, 359, 380, 360, 381, 361, 382, 362, 383,
- 363, 384, 375, 396, 364, 385, 0, 0, 366, 387,
- 367, 388, 368, 389, 369, 390, 370, 391, 371, 392,
- 0, 0, 0, 0, 0, 0, 0, 0, 452, 0,
- 0, 451, 0, 0, 0, 0, 0, 0, 0, 0,
- 220, 0, 0, 0, 0, 0, 68, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 433, 0, 0, 0,
- 429, 431, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 255, 257, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 255, 257, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 272, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 272, 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, 421, 0, 418, 0,
- 404, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 421, 0, 418, 0, 404, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 70, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 213, 439, 440, 0, 0, 0, 0, 0, 215,
- 216, 218, 0, 0, 447, 0, 224, 354, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 434, 0,
- 430, 0, 231, 0, 0, 0, 0, 0, 320, 0,
+ 0, 0, 0, 0, 70, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 213, 443, 444,
+ 0, 0, 0, 0, 0, 215, 216, 218, 0, 0,
+ 451, 0, 224, 354, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 433, 438, 0, 430, 0, 231,
+ 0, 0, 0, 0, 0, 320, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 268, 0, 0, 0, 326,
- 270, 0, 0, 0, 0, 0, 422, 0, 444, 0,
- 0, 0, 278, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 268, 0, 0, 0, 326, 270, 0, 0,
+ 0, 0, 0, 422, 0, 448, 0, 0, 0, 278,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 330, 331,
- 332, 333, 334, 0, 0, 0, 0, 0, 0, 0,
- 20, 0, 406, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 330, 331, 332, 333, 334,
+ 0, 0, 0, 0, 0, 0, 0, 20, 0, 406,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 365, 386, 372, 393, 373, 394, 374, 395, 0, 454,
- 453, 450, 0, 203, 0, 0, 0, 0, 211, 0,
- 0, 0, 445, 69, 228, 235, 0, 236, 0, 232,
- 0, 233, 253, 0, 0, 432, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 275, 0, 0, 0, 0, 262, 0, 291, 0, 300,
- 0, 309, 0, 0, 0, 0, 0, 241, 242, 0,
+ 0, 0, 0, 0, 0, 0, 0, 365, 386, 372,
+ 393, 373, 394, 374, 395, 0, 458, 457, 454, 0,
+ 203, 0, 0, 0, 0, 211, 0, 0, 0, 449,
+ 69, 228, 235, 0, 236, 0, 232, 0, 233, 253,
+ 0, 0, 432, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 275, 0, 0,
+ 0, 0, 262, 0, 291, 0, 300, 0, 309, 0,
+ 0, 0, 0, 0, 241, 242, 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, 418,
- 408, 71, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 418, 408, 71, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 221, 0, 0, 222, 0, 448, 0, 240,
- 251, 435, 0, 0, 324, 244, 246, 0, 0, 0,
- 323, 325, 252, 229, 239, 250, 254, 0, 0, 0,
- 417, 0, 416, 0, 0, 288, 0, 0, 297, 0,
- 0, 306, 0, 264, 265, 266, 0, 0, 422, 0,
- 425, 0, 0, 0, 0, 442, 0, 280, 279, 0,
- 0, 0, 0, 0, 23, 0, 32, 0, 36, 0,
- 30, 0, 0, 35, 0, 40, 38, 0, 0, 0,
- 0, 0, 0, 47, 0, 0, 0, 0, 0, 52,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 221,
+ 0, 0, 222, 0, 452, 0, 240, 251, 439, 0,
+ 0, 324, 244, 246, 0, 0, 0, 323, 325, 252,
+ 229, 239, 250, 254, 0, 0, 0, 417, 0, 416,
+ 0, 0, 288, 0, 0, 297, 0, 0, 306, 0,
+ 264, 265, 266, 0, 0, 422, 0, 425, 0, 0,
+ 0, 0, 446, 0, 280, 279, 0, 0, 0, 0,
+ 0, 23, 0, 32, 0, 36, 0, 30, 0, 0,
+ 35, 0, 40, 38, 0, 0, 0, 0, 0, 0,
+ 47, 0, 0, 0, 0, 0, 52, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 212,
- 217, 219, 0, 225, 0, 237, 436, 0, 0, 322,
- 321, 226, 227, 262, 0, 258, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 424, 0, 423, 0, 0,
- 0, 0, 0, 0, 0, 422, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 212, 217, 219, 0,
+ 225, 0, 237, 440, 0, 0, 322, 321, 226, 227,
+ 262, 0, 258, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 424, 0, 423, 0, 0, 0, 0, 0,
+ 0, 0, 422, 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, 459,
+ 0, 450, 0, 0, 0, 0, 415, 0, 0, 0,
+ 0, 0, 0, 0, 0, 315, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 426, 0, 0, 445, 281,
+ 0, 0, 37, 0, 0, 0, 0, 27, 0, 33,
+ 0, 39, 28, 41, 0, 44, 0, 48, 49, 0,
+ 0, 51, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 455, 0, 446, 0, 0, 0, 0, 415,
- 0, 0, 0, 0, 0, 0, 0, 0, 315, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 426, 0,
- 0, 441, 281, 0, 0, 37, 0, 0, 0, 0,
- 27, 0, 33, 0, 39, 28, 41, 0, 44, 0,
- 48, 49, 0, 0, 51, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 223, 0, 0, 256, 0, 0, 293, 0, 319, 0,
+ 0, 316, 302, 0, 0, 311, 0, 0, 0, 0,
+ 0, 0, 243, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 101, 105, 109,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 223, 0, 0, 256, 0, 0, 293,
- 0, 319, 0, 0, 316, 302, 0, 0, 311, 0,
- 0, 0, 0, 0, 0, 243, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 101, 105, 109, 0, 0, 0, 0, 0, 0, 0,
+ 0, 197, 0, 0, 0, 414, 289, 0, 0, 0,
+ 292, 298, 0, 0, 301, 307, 0, 0, 310, 230,
+ 234, 0, 0, 245, 0, 0, 0, 0, 0, 31,
+ 34, 42, 0, 43, 50, 45, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 197, 0, 0, 0, 414, 289,
- 0, 0, 0, 292, 298, 0, 0, 301, 307, 0,
- 0, 310, 230, 234, 0, 0, 245, 0, 0, 0,
- 0, 0, 31, 34, 42, 0, 43, 50, 45, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 295, 0, 0, 304,
+ 0, 313, 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, 295,
- 0, 0, 304, 0, 313, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 201, 0, 247, 0,
+ 290, 0, 0, 0, 299, 0, 0, 308, 0, 0,
+ 0, 0, 0, 0, 26, 29, 0, 0, 0, 99,
+ 0, 103, 0, 107, 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, 201,
- 0, 247, 0, 290, 0, 0, 0, 299, 0, 0,
- 308, 0, 0, 0, 0, 0, 0, 26, 29, 0,
- 0, 0, 99, 0, 103, 0, 107, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 195, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 195,
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, 294, 0, 0, 318, 303,
+ 0, 312, 0, 0, 0, 0, 0, 0, 46, 22,
+ 100, 102, 104, 106, 108, 110, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 294, 0,
- 0, 318, 303, 0, 312, 0, 0, 0, 0, 0,
- 0, 46, 22, 100, 102, 104, 106, 108, 110, 0,
+ 0, 0, 0, 0, 0, 0, 0, 196, 198, 0,
+ 199, 238, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 113, 117, 121, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 296, 317, 305, 314, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 196, 198, 0, 199, 238, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 113, 117, 121, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 296, 317, 305,
- 314, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 200, 202, 0, 0, 8, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 200, 202, 0,
- 0, 8, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 249, 0, 0, 0,
- 111, 0, 115, 0, 119, 0, 0, 0, 0, 0,
+ 0, 0, 0, 249, 0, 0, 0, 111, 0, 115,
+ 0, 119, 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, 248, 0, 24,
+ 112, 114, 116, 118, 120, 122, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 248, 0, 24, 112, 114, 116, 118, 120, 122, 0,
+ 0, 0, 0, 0, 0, 125, 129, 133, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 125, 129,
- 133, 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,
- 0, 0, 0, 0, 0, 0, 123, 0, 127, 0,
- 131, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 123, 0, 127, 0, 131, 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, 124,
- 126, 128, 130, 132, 134, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 137, 141, 145, 149, 153, 157, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 25, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 124, 126, 128, 130,
+ 132, 134, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 137, 141,
+ 145, 149, 153, 157, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 25, 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, 135, 0,
- 139, 0, 143, 0, 147, 0, 151, 0, 155, 0,
+ 0, 0, 0, 0, 0, 135, 0, 139, 0, 143,
+ 0, 147, 0, 151, 0, 155, 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, 136,
- 138, 140, 142, 144, 146, 148, 150, 152, 154, 156,
- 158, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 185, 189, 193, 0,
+ 0, 0, 0, 0, 0, 0, 136, 138, 140, 142,
+ 144, 146, 148, 150, 152, 154, 156, 158, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 185, 189, 193, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 183, 0, 187, 0, 191, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 184, 186, 188,
- 190, 192, 194, 0, 0, 0, 173, 177, 181, 0,
+ 0, 183, 0, 187, 0, 191, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 171, 0, 175, 0, 179,
+ 0, 0, 0, 0, 184, 186, 188, 190, 192, 194,
+ 0, 0, 0, 173, 177, 181, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 172, 174, 176, 178, 180, 182, 0, 0,
+ 0, 0, 171, 0, 175, 0, 179, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 172,
+ 174, 176, 178, 180, 182, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 161, 165, 169, 0,
- 0, 0, 0, 0, 0, 0, 159, 0, 163, 0,
- 167, 0, 0, 0, 0, 0, 0, 160, 162, 164,
- 166, 168, 170, 0, 0, 0
+ 0, 0, 0, 161, 165, 169, 0, 0, 0, 0,
+ 0, 0, 0, 159, 0, 163, 0, 167, 0, 0,
+ 0, 0, 0, 0, 160, 162, 164, 166, 168, 170,
+ 0, 0, 0
};
-static const short yydefgoto[] = { 2284,
+static const short yydefgoto[] = { 2291,
83, 5, 6, 19, 20, 21, 22, 7, 67, 68,
- 69, 419, 1602, 629, 1511, 1604, 630, 1512, 1606, 631,
- 1513, 1820, 632, 1767, 1822, 633, 1768, 1824, 634, 1769,
- 1956, 635, 1918, 1958, 636, 1919, 1960, 637, 1920, 2068,
- 638, 2038, 2070, 639, 2039, 2072, 640, 2040, 2074, 641,
- 2041, 2076, 642, 2042, 2078, 643, 2043, 2266, 644, 2260,
- 2268, 645, 2261, 2270, 646, 2262, 2215, 647, 2203, 2217,
- 648, 2204, 2219, 649, 2205, 2164, 650, 2146, 2166, 651,
- 2147, 2168, 652, 2148, 1629, 653, 1535, 1723, 654, 1631,
- 136, 240, 70, 544, 530, 531, 532, 533, 74, 75,
- 76, 77, 78, 1167, 1481, 1585, 1170, 1486, 1589, 1173,
- 1490, 1592, 1348, 1349, 79, 80, 954, 329, 139, 347,
- 172, 235, 412, 1063, 1180, 1181, 331, 472, 194, 715,
- 866, 140
+ 69, 423, 1609, 634, 1518, 1611, 635, 1519, 1613, 636,
+ 1520, 1827, 637, 1774, 1829, 638, 1775, 1831, 639, 1776,
+ 1963, 640, 1925, 1965, 641, 1926, 1967, 642, 1927, 2075,
+ 643, 2045, 2077, 644, 2046, 2079, 645, 2047, 2081, 646,
+ 2048, 2083, 647, 2049, 2085, 648, 2050, 2273, 649, 2267,
+ 2275, 650, 2268, 2277, 651, 2269, 2222, 652, 2210, 2224,
+ 653, 2211, 2226, 654, 2212, 2171, 655, 2153, 2173, 656,
+ 2154, 2175, 657, 2155, 1636, 658, 1542, 1730, 659, 1638,
+ 136, 240, 70, 549, 330, 536, 537, 331, 74, 75,
+ 76, 77, 332, 1174, 1488, 1592, 1177, 1493, 1596, 1180,
+ 1497, 1599, 1355, 1356, 79, 80, 961, 333, 139, 351,
+ 172, 235, 416, 1070, 1187, 1188, 335, 476, 194, 720,
+ 872, 140
};
-static const short yypact[] = { 2799,
- 84,-32768,-32768, -37,-32768, 12, 3110,-32768, 14, 118,
- 125, 134, 152, 176, 194, 10, 19, 76,-32768,-32768,
--32768,-32768, 2336, 102, 302, 119, 137, 146, -15, 261,
- 177, 188, 283, 196, 356, 396, 402, 407, 439, 370,
- 100, 230, 271, -93, -93, 317, 21, 3, 473, 2,
- 518, 558, 74, 330, 333, -28, 5, 7,-32768, 337,
--32768, 561,-32768, 564, 571, 542,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 586, 14, 2977,-32768,-32768,-32768,-32768,-32768, 428,
- 428, 624,-32768, 110, 8,-32768,-32768,-32768,-32768, -52,
- 151, 325, 334, 338, 343, 344, 347, 348, 351, 354,
- 355, 358, 359, 362, 363, 366, 376, 377, 381, 384,
- 444, 458, 480,-32768,-32768,-32768,-32768, 2440, 2440, 2440,
--32768,-32768, 2440, 583, 27, 2440, 646, 740,-32768, 673,
- 677,-32768, 2440, 2440, 2440, 496, 2440, 513, 2440, 2440,
- 1488, 2440, 529, 536, 537, 538, 1488, 533, 541, 544,
- 550, 552, 553, 554, 746, -93, -93, -93, 2440, 2440,
- -116,-32768, -84, -93, 551, 556, 557, 562,-32768, 1488,
- 563, 745,-32768,-32768,-32768, 1488, 1488, 2440, 2440, -60,
- 2440, 555, 2440, 560, 645, 2440, 2440,-32768, 756,-32768,
- 568,-32768, 14, 569, 570, 574, 575, 577, 579, 580,
- 582, 584, 585, 587, 588, 590, 591, 593, 594, 626,
- 636, 637, 638, 640, 644, 652, 663, 665, 669, 670,
- 671, 672, 674, 761, 675, 641, 679, 2440, 836,-32768,
- -93,-32768, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 42, 39, 39, 676, 676, 676,
- 809, 856, 2533, 2790, 25, 681, 861, 781,-32768,-32768,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440,-32768, -19, 10704, 10727, 10750,
- 2440, 10773, 2440, 10796, 10819, 256, 1555, 2533, 668, 864,
--32768, 10842, 2440, 2440, 2440, 2440, 865, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 678, -91,-32768,-32768, 3502, 3523,
- -93, -93, 372, 372, -81, 2440, 2440, 2440, 2440, 2662,
- 270, 2440,-32768, 2698, 866, 874, 10865, 10888, 779, 2440,
- 10911, 778, 3544,-32768, 683, 969, 10934,-32768, 2440, 719,
- 881, 882, 883, 884, 885, 886, 887, 889, 890, 891,
- 895, 896, 897, 898, 899, 900, 901, 902, 903, 904,
- 905, 906, 907, 765, 924, 925, 926, 927, 930, 931,
--32768, 103, 934, 929, 935, 10054, 163, 139, 2918, 10957,
- 10079, 10980, 10104, 11003, 10129, 11026, 10154, 11049, 10179, 11072,
- 10204, 11095, 10229, 11118, 10254, 11141, 10279, 11164, 10304, 11187,
- 10329, 3565, 3586, 11210, 10354, 11233, 10379, 11256, 10404, 11279,
- 10429, 11302, 10454, 11325, 10479, 3607, 3628, 3649, 3670, 3691,
- 3712, 191,-32768, 131, 742, 747,-32768, 1488, 2628, 668,
--32768, 380, 20, 39, 2440, 938, 941, 9,-32768, 2107,
- 193, 219, 280, 280, 291, 291, 291, 291, 323, 323,
- 676, 676, 676, 676, 940, 2533, 942, 943, 944, 11348,
- 945, 11371, 946, 953, 1157, 322, 2533, 383, 2440, 2440,
- 963, 2299, 11394, 11417, 11440, 2440, 2845, 3009, 11463, 11486,
- 11509, 11532, 11555, 748, -93, 2440, 2440,-32768,-32768,-32768,
- 769, 3190,-32768, 774, 2440, 3733, 3754, 3775, 10504, -114,
- -39, -40,-32768,-32768,-32768, 2440, 10529,-32768, 777, 780,
- 972, 973, 753, 11578, 981, 800, 2440, 2832, 2440, 2440,
--32768, 11601, 833, 801, 802, 804, 806, 812, 813, 814,
- 815, 816, 817, 818, 820, 821, 822, 823, 824, 825,
- 826, 827, 828, 829, 830, 831, 832, 835, 838, 839,
- 840, 841, 842,-32768, 1031, 847,-32768, 844, -5,-32768,
--32768, 851, 852, 854, 855, 858, 859, 860, 862, 867,
- 868, 869, 873, 875, 876, 878, 879, 880, 916, 928,
- 933, 936, 937, 939, 947, 970, 997, 1045,-32768,-32768,
+static const short yypact[] = { 2645,
+ 58,-32768,-32768, -92,-32768, 269, 2925,-32768, 19, 77,
+ 108, 122, 130, 145, 173, 14, 24, 67,-32768,-32768,
+-32768,-32768, 2312, 98, 188, 101, 117, 141, -37, 280,
+ 161, 171, 313, 178, 345, 362, 406, 410, 566, 428,
+ 148, 263, 279, -76, -76, 284, 433, 5, 446, 7,
+ 498, 512, 74, 329, 332, -19, 9, 10,-32768, 350,
+-32768, 548,-32768, 560, 614, 528,-32768,-32768,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768, 659, 19, 2760,-32768,-32768,-32768,-32768,-32768, 380,
+ 380, 575,-32768, -36, 13,-32768,-32768,-32768,-32768, -93,
+ 197, 241, 349, 379, 384, 414, 418, 419, 422, 426,
+ 427, 430, 431, 434, 435, 468, 469, 472, 473, 488,
+ 451, 476, 477,-32768,-32768,-32768,-32768, 2547, 2547, 2547,
+-32768,-32768, 2547, 946, 26, 2547, 674, 650,-32768, 678,
+ 682,-32768, 2547, 2547, 2547, 544, 2547, 561, 2547, 2547,
+ 574, 2547, 517, 565, 573, 628, 574, 529, 547, 634,
+ 647, 676, 686, 687, 725, -76, -76, -76, 2547, 2547,
+ -106,-32768, -32, -76, 579, 653, 669, 570,-32768, 574,
+ 690, 887,-32768,-32768,-32768, 574, 574, 2547, 2547, -57,
+ 2547, 704, 2547, 708, 802, 2547, 2547,-32768, 905,-32768,
+ 717,-32768, 19, 733, 734, 735, 736, 737, 740, 741,
+ 742, 743, 744, 745, 746, 747, 748, 749, 751, 752,
+ 756, 757, 759, 784, 786, 787, 788, 789, 790, 791,
+ 792, 793, 810, 929, 806, 811, 808, 2547, 1005,-32768,
+ -76,-32768, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 57, 54, 54, 817, 817, 817,
+ 10646, 1006, 2359, 9971, 25, 813, 1007, 675,-32768,-32768,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547,-32768, -125, 10669, 10692, 10715,
+ 2547, 10738, 2547, 10761, 10784, 252, 819, 1488, 2359,-32768,
+-32768,-32768, 1765, 1011,-32768, 10807, 2547, 2547, 2547, 2547,
+ 1014, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 826, 0,
+-32768,-32768, 3419, 3440, -76, -76, 471, 471, 144, 2547,
+ 2547, 2547, 2547, -1, 270, 2547,-32768, 2014, 1016, 1017,
+ 10830, 10853, 925, 2547, 10876, 926, 3461,-32768, 829, 1812,
+ 10899,-32768, 2547, 866, 1028, 1029, 1030, 1031, 1032, 1033,
+ 1034, 1037, 1038, 1039, 1040, 1041, 1042, 1044, 1048, 1049,
+ 1051, 1052, 1053, 1054, 1055, 1056, 1057, 909, 1059, 1061,
+ 1062, 1063, 1066, 1065,-32768, -120, 1070, 1071, 1073, 9996,
+ 346, -2, 2754, 10922, 10021, 10945, 10046, 10968, 10071, 10991,
+ 10096, 11014, 10121, 11037, 10146, 11060, 10171, 11083, 10196, 11106,
+ 10221, 11129, 10246, 11152, 10271, 3482, 3503, 11175, 10296, 11198,
+ 10321, 11221, 10346, 11244, 10371, 11267, 10396, 11290, 10421, 3524,
+ 3545, 3566, 3587, 3608, 3629, 204,-32768, 320, 871, 880,
+-32768, 574, 2610, 1765,-32768, 490, 262, 54, 2547, 1074,
+ 1077, 17,-32768, 2087, 243, 282, 692, 692, 327, 327,
+ 327, 327, -44, -44, 817, 817, 817, 817, 1076, 2359,
+ 1078, 1079, 1111, 11313, 1122, 11336, 1125, 1127, 1171, 2547,
+ 308, 2359, 491, 2547, 2547, 1128, 2896, 11359, 11382, 11405,
+ 2547, 2932, 2955, 11428, 11451, 11474, 11497, 11520, 885, -76,
+ 2547, 2547,-32768,-32768,-32768, 935, 3005,-32768, 936, 2547,
+ 3650, 3671, 3692, 10446, -127, -41, -30,-32768,-32768,-32768,
+ 2547, 10471,-32768, 938, 941, 1133, 1136, 950, 11543, 1146,
+ 965, 2547, 2621, 2547, 2547,-32768, 11566, 998, 966, 967,
+ 970, 972, 976, 977, 978, 979, 1008, 1009, 1035, 1036,
+ 1046, 1050, 1060, 1067, 1069, 1072, 1075, 1080, 1082, 1083,
+ 1084, 1085, 1087, 1088, 1090, 1117, 1118, 1121,-32768, 1202,
+ 1010,-32768, 1124, 111,-32768,-32768, 1043, 1045, 1047, 1064,
+ 1068, 1081, 1134, 1135, 1141, 1151, 1153, 1154, 1155, 1158,
+ 1159, 1162, 1163, 1164, 1165, 1167, 1168, 1169, 1170, 1172,
+ 1173, 1175, 1228,-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,
--32768,-32768,-32768,-32768,-32768,-32768, 2440, 2440,-32768,-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 1052,-32768, 2533,
- 39,-32768, 1053, 2533, 863, 31, 2440, 1054, 1063, 932,
--32768, 1070, 951, 5, 1072, 2440,-32768, 189, -93, 1488,
- 1488, 1115, 1488, 1117, 1488, 1488,-32768, 2533, 1187, 388,
--32768, 2487, 1046, 957, 1118, 1120, 1122, 1123, 450, 1126,
- 1128, 1129, 1130, 1131, 1133, 1134, 1075, 153, 3796, 3817,
--32768,-32768, 3081, -93, -93, -93, 1188, 2533, 2533, 2533,
- 1414, 1189, 2440, 2440, 1488, 1488, 2440, 1186, 1488, 1221,
- 3838,-32768, 2502, 642, 1230, 1076, 1235, 2440, 2440, -93,
- 1238, 1239, 1057, 1242, 1244, 1488, 1488, 1246, -93, 1249,
- 1250, 1488, 1488, 1251, 1252, 1253, 1255, 1256, 1488, 236,
- 1488, 1257, 1258, 1259, 1265, 1267,-32768, 1266, 428, 1269,
--32768, 2986, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,-32768, 11624,
- 10554, 11647, 10579, 11670, 10604, 11693, 10629, 10654, 1065, 212,
- 1066,-32768, 668,-32768, 123, 172, 1077, 1264, 1620,-32768,
--32768,-32768, 5, 2440,-32768, 416,-32768, 12544, 1271, 82,
- 37, 1272, 1488, 1274, 1488, 1275, 1277, 417,-32768, 2533,
--32768, 2440,-32768, 2440, 1488, 1488, 1488, 1080,-32768, 401,
- 1488, 1488, 1488, 1488, 1488, 1488, 1488, 500, 2440, 2440,
- 2440, 1109, -118, -105, -86,-32768, 420, 440, 441,-32768,
--32768, 3859, 3880, 1305, 1306, 11716, -112, 1210,-32768, 2440,
- 2440, 2440,-32768, 1114, 14, 1121, 3901, 3922, -124, 1124,
- 1127, 1125, 1132, 1135, 1136, 1137, 1138, -21, 1139, 1140,
- 1144, 1143, 1145, 1146, 1148, 1149, 1150, 1155,-32768,-32768,
--32768,-32768,-32768, 1153, 1154, 1156, 1159, 1160, 1161, 1162,
--32768, 1163, 163, 1311, 3943, 3964, 3985, 4006, 4027, 4048,
- 4069, 4090, 4111, 4132, 4153, 4174, 4195, 4216, 4237, 4258,
- 4279, 4300, 4321, 4342, 4363, 4384, 4405, 4426, 4447, 4468,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 1165,-32768,
--32768,-32768, 1488, 39, 2440, 1316, 1322, 9,-32768, 1321,
- 10679, 5,-32768,-32768,-32768,-32768, -93,-32768, 1323,-32768,
- 1324,-32768,-32768, 1167, 445, 12544, 4489, 1325, 1328, 1338,
- 2440, 2440, 2440, 1355, 1360, 1361, 1362, 1363, 1364, 1367,
--32768, 2406, 3134, 11739, 1294, 372, -93, 1368, -93, 1369,
- -93, 1370, 1372, 1373, 1374, 2440, 2440,-32768,-32768, 1376,
- 1488, 1488, 1280, 1488, 2434, 314, 11762, 2440, 14, 1378,
- 2440, 1488, 1380, 1384, 1383, 1204, 1385, 236, 1386, 1390,
- 2440, 1388, 1392, 1391, 1393, 1397, 236, 2440, 2440, 2440,
- 1488, 1395, 1399, 236, 2440, 1400, 1402, 1404, 2440, 428,
--32768,-32768, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 1408, 1407,
- 1409, 1674,-32768, 1389, 1410,-32768, 1209,-32768, 90,-32768,
--32768,-32768, 1216, 2440,-32768,-32768,-32768, 4510, 1758, 1806,
--32768,-32768,-32768,-32768,-32768,-32768,-32768, 1871, 1411, 1217,
--32768, 2440,-32768, 1219, 165,-32768, 1218, 167,-32768, 1222,
- 209,-32768, 1223,-32768,-32768,-32768, 4531, 4552, -112, 254,
--32768, 446, 1224, 1326, 2440,-32768, 2440,-32768,-32768, 4573,
- 14, 1226, 4594, 1228,-32768, 1229,-32768, 1254,-32768, 1234,
--32768, 1260, 11785,-32768, 1261,-32768,-32768, 1262, 1263, 11808,
- 4615, 11831, 1273,-32768, 1268, 1287, 4636, 1284, 1290,-32768,
- 4657, 1293, 4678, 4699, 4720, 4741, 4762, 4783, 4804, 4825,
- 4846, 4867, 4888, 4909, 4930, 4951, 4972, 4993, 5014, 5035,
- 5056, 5077, 5098, 5119, 5140, 5161, 5182, 5203, 1299,-32768,
--32768,-32768, 5,-32768, 1320,-32768,-32768, 5224, 2440,-32768,
--32768,-32768,-32768, 372, 2589,-32768, 2304, 68, 2304, 68,
- 2304, 68, 2440, 2440, 1348,-32768, 1488,-32768, 1488, 2440,
- 3157, 3186, 1488, 1292, 1450, -112, 236, 1454, 2440, 1456,
- 236, 1457, 1462, 1461, 1515, 1516, 2440, 1517, 1488, 1518,
- 1519, 2440, 1523, 1521, 2440, 1524, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440,-32768, 1522,-32768, 1525, 11854, 1329, 2440,-32768,
- 2304, 2304, 2440, 3209, 237, 1550, 1356, -43,-32768, 3238,
- 243, -42, 3268, 245, -33, 3291, 3314, 1403,-32768, 1405,
- 2081,-32768,-32768, 1359, 14,-32768, 1406, 1412, 1413, 5245,
--32768, 1366,-32768, 1418,-32768,-32768,-32768, 11877,-32768, 1415,
--32768,-32768, 11900, 1420,-32768, 11923, 1417, 11946, 11969, 11992,
- 5266, 5287, 5308, 5329, 5350, 5371, 5392, 5413, 5434, 5455,
- 5476, 5497, 5518, 5539, 5560, 5581, 5602, 5623, 5644, 5665,
- 5686, 12015, 5707,-32768, 1421, 1488,-32768, 3337, 3475, 1587,
- 2440,-32768, 1488, 1597,-32768, 1601, 2440, 1603, 1604, 2440,
- 1612, 1614, 1616, 1488, 1488,-32768, 1617, 14, 236, 236,
- 236, 236, 1618, 1622, 1624, 236, 1646, 1647, 1648, 1650,
--32768,-32768,-32768, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440,-32768, 2440, 1651, 1488,-32768,-32768,
- 1458, 3360, 1460,-32768,-32768, 1463, 3383,-32768,-32768, 1464,
- 3406,-32768,-32768,-32768, 1466, 1459,-32768, 14, 1467, 1469,
- 1474, 1475,-32768,-32768,-32768, 1476,-32768,-32768,-32768, 1477,
- 1473, 1478, 1480, 5728, 5749, 5770, 5791, 5812, 5833, 5854,
- 5875, 5896, 5917, 5938, 5959, 5980, 6001, 6022, 6043, 6064,
- 6085, 6106, 6127, 6148, 1481, 12038, 1484, 1652, 68, 1657,
- 1488, 68, 1669, 68, 1679, 1488, 1585, 1527, 236, 236,
- 1681, 1682, 236, 1687, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 39,-32768,
- 1688,-32768, -30,-32768, 1493, 449, -26,-32768, 1494, -18,
--32768, 1495, 1497, 1499, 14, 1501, 1502,-32768,-32768, 1507,
- 1508, 456, 12544, 457, 12544, 460, 12544, 6169, 6190, 6211,
- 6232, 6253, 6274, 6295, 6316, 6337, 6358, 6379, 6400, 6421,
- 6442, 6463, 6484, 6505, 6526, 6547, 6568, 6589, 461,-32768,
- 1504, 1509, 1700, 68, 1488, 1703, 1704, 68, 1706, 68,
- 1613, 2440, 14, 236, 1488, 1707, 1727, 2440, 1728, 2440,
- 1729, 2440, 1730, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 39, 1731, 39, 1732,-32768, -17,
- 1539,-32768,-32768, -14,-32768, -1, 1541, 6610, 14, 1543,
- 1544,-32768,-32768, 12544,-32768, 12544,-32768, 12544,-32768, 12061,
- 12084, 12107, 6631, 6652, 6673, 6694, 6715, 6736, 6757, 6778,
- 6799, 6820, 6841, 6862, 6883, 6904, 6925, 6946, 6967, 6988,
--32768,-32768, 464,-32768,-32768, 1740, 1741, 1742, 1743, 2440,
- 2440, 1583, 236, 1488,-32768,-32768,-32768, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 39, 1746,-32768,-32768,-32768,
--32768, 7009, 3429, 1584, 1554, 1557, 1558, 1559, 1560, 7030,
- 7051, 7072, 7093, 7114, 7135, 7156, 7177, 7198, 7219, 7240,
- 7261, 7282, 7303, 7324, 7345, 7366, 7387,-32768,-32768, 2440,
- 1749,-32768, 1488, 236, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 3452,-32768, 1562, 1567, 465,
- 12544, 478, 12544, 483, 12544, 7408, 7429, 7450, 7471, 7492,
- 7513, 7534, 7555, 7576, 7597, 7618, 7639, 7660, 7681, 7702,
- 7723, 7744, 7765, 1752, 1488, 1759, 2440, 1760, 2440, 1762,
- 2440, 1763, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
--32768, 1570,-32768, 12544,-32768, 12544,-32768, 12544,-32768, 12130,
- 12153, 12176, 7786, 7807, 7828, 7849, 7870, 7891, 7912, 7933,
- 7954, 7975, 7996, 8017, 8038, 8059, 8080, 1488,-32768,-32768,
--32768, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 1571, 1592, 1598, 1608,
- 8101, 8122, 8143, 8164, 8185, 8206, 8227, 8248, 8269, 8290,
- 8311, 8332, 8353, 8374, 8395, 1488, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 1610, 486, 12544, 487, 12544, 490,
- 12544, 8416, 8437, 8458, 8479, 8500, 8521, 8542, 8563, 8584,
- 8605, 8626, 8647, 8668, 8689, 8710, 236, 2440, 1805, 2440,
- 1807, 2440, 1809, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 1621, 12544,
--32768, 12544,-32768, 12544,-32768, 12199, 12222, 12245, 12268, 12291,
- 12314, 8731, 8752, 8773, 8794, 8815, 8836, 8857, 8878, 8899,
- 1810,-32768,-32768,-32768,-32768,-32768,-32768, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440,-32768, 1619, 1626, 1628,
- 1662, 1663, 1664, 8920, 8941, 8962, 8983, 9004, 9025, 9046,
- 9067, 9088, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 494, 12544, 497,
- 12544, 498, 12544, 501, 12544, 502, 12544, 507, 12544, 9109,
- 9130, 9151, 9172, 9193, 9214, 9235, 9256, 9277, 2440, 1812,
- 2440, 1813, 2440, 1815, 2440, 1816, 2440, 1817, 2440, 1819,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 2440, 12544,
--32768, 12544,-32768, 12544,-32768, 12544,-32768, 12544,-32768, 12544,
--32768, 9298, 9319, 9340, 9361, 9382, 9403, 12337, 12360, 12383,
- 2440, 2440, 2440, 2440, 2440, 2440,-32768,-32768,-32768, 9424,
- 9445, 9466, 9487, 9508, 9529, 1665, 1666, 1668, 2440, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 2440, 9550, 9571, 9592,
- 9613, 9634, 9655, 511, 12544, 512, 12544, 515, 12544, 2440,
- 2440, 2440, 2440, 2440, 2440, 2440, 1847, 2440, 1864, 2440,
- 1865, 9676, 9697, 9718, 12406, 12429, 12452, 12544,-32768, 12544,
--32768, 12544,-32768, 2440, 2440, 2440,-32768,-32768,-32768, 9739,
- 9760, 9781, 1671, 1672, 1673, 2440, 2440, 2440, 2440, 2440,
- 2440, 9802, 9823, 9844, 516, 12544, 519, 12544, 522, 12544,
- 2440, 2440, 2440, 2440, 1869, 2440, 1870, 2440, 1872, 9865,
- 9886, 9907, 12544,-32768, 12544,-32768, 12544,-32768, 2440, 2440,
- 2440, 9928, 9949, 9970, 2440, 2440, 2440, 9991, 10012, 10033,
- 2440, 2440, 2440, 12475, 12498, 12521,-32768,-32768,-32768, 1693,
- 1694, 1695, 2440, 2440, 2440, 523, 12544, 526, 12544, 527,
- 12544, 2440, 1891, 2440, 1892, 2440, 1893, 12544,-32768, 12544,
--32768, 12544,-32768, 1900, 1901,-32768
+-32768, 2547, 2547,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 1233,-32768, 2359, 54,-32768, 1235, 2359, 1058,
+ 43, 2547, 1238, 1242, 714,-32768, 1232, 1131, 9, 1246,
+ 2547,-32768, 323, -76, 574, 574, 1247, 574, 1254, 574,
+ 574,-32768, 2359, 2986, 1201, 494,-32768, 2115, 739, 1174,
+ 1255, 1258, 1263, 1264, 467, 1267, 1270, 1271, 1272, 1315,
+ 1345, 1364, 1369, 150, 3713, 3734,-32768,-32768, 3009, -76,
+ -76, -76, 1368, 2359, 2359, 2359, 816, 1370, 2547, 2547,
+ 574, 574, 2547, 1371, 574, 1373, 3755,-32768, 2286, 375,
+ 1372, 1217, 1378, 2547, 2547, -76, 1379, 1380, 1198, 1384,
+ 1385, 574, 574, 1386, -76, 1387, 1389, 574, 574, 1390,
+ 1391, 1392, 1394, 1395, 574, 372, 574, 1397, 1396, 1398,
+ 1401, 1403,-32768, 1402, 380, 1405,-32768, 2780, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547,-32768, 11589, 10496, 11612, 10521, 11635,
+ 10546, 11658, 10571, 10596, 1211, 340, 1214,-32768, 1765,-32768,
+ 160, 311, 1213, 1406, 939,-32768,-32768,-32768, 9, 2547,
+-32768, 497,-32768, 12509, 1410, 81, 51, 1412, 574, 1413,
+ 574, 1415, 1416, 501,-32768,-32768, 2359,-32768, 2547,-32768,
+ 2547, 574, 574, 574, 1229,-32768, 583, 574, 574, 574,
+ 574, 574, 574, 574, 651, 2547, 2547, 2547, 1222, -119,
+ -99, -67,-32768, 502, 505, 506,-32768,-32768, 3776, 3797,
+ 1419, 1420, 11681, -61, 1323,-32768, 2547, 2547, 2547,-32768,
+ 1227, 19, 1230, 3818, 3839, 206, 1231, 1236, 1237, 1239,
+ 1259, 1240, 1266, 1276, 294, 1277, 1282, 1283, 1284, 1285,
+ 1286, 1288, 1290, 1293, 1298,-32768,-32768,-32768,-32768,-32768,
+ 1295, 1321, 1322, 1324, 1325, 1327, 1326,-32768, 1328, 346,
+ 1423, 3860, 3881, 3902, 3923, 3944, 3965, 3986, 4007, 4028,
+ 4049, 4070, 4091, 4112, 4133, 4154, 4175, 4196, 4217, 4238,
+ 4259, 4280, 4301, 4322, 4343, 4364, 4385,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768, 1234,-32768,-32768,-32768, 574,
+ 54, 2547, 1476, 1479, 17,-32768, 1521, 10621, 9,-32768,
+-32768,-32768,-32768, -76,-32768, 1523,-32768, 1524,-32768,-32768,
+ 1333, 511, 12509, 4406, 1526, 1527, 1528, 2547, 2547, 2547,
+ 1529, 1530, 1531, 1532, 1557, 1558, 1559,-32768, 2422, 3032,
+ 11704, 1287, 471, -76, 1560, -76, 1561, -76, 1562, 1563,
+ 1564, 1565, 2547, 2547,-32768,-32768, 1567, 574, 574, 1471,
+ 574, 2353, 194, 11727, 2547, 19, 1573, 2547, 574, 1601,
+ 1614, 1612, 1433, 1615, 372, 1617, 1621, 2547, 1622, 1624,
+ 1623, 1625, 1632, 372, 2547, 2547, 2547, 574, 1631, 1656,
+ 372, 2547, 1657, 1658, 1659, 2547, 380,-32768,-32768, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 1616, 1660, 1661, 974,-32768,
+ 1655, 1662,-32768, 1431,-32768, 90,-32768,-32768,-32768, 1465,
+ 2547,-32768,-32768,-32768, 4427, 1157, 1428,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768, 1627, 1663, 1473,-32768, 2547,-32768,
+ 1474, 157,-32768, 1478, 162,-32768, 1480, 164,-32768, 1481,
+-32768,-32768,-32768, 4448, 4469, -61, 347,-32768, 514, 1483,
+ 1574, 2547,-32768, 2547,-32768,-32768, 4490, 19, 1484, 4511,
+ 1477,-32768, 1485,-32768, 1486,-32768, 1492,-32768, 1490, 11750,
+-32768, 1491,-32768,-32768, 1496, 1498, 11773, 4532, 11796, 1495,
+-32768, 1500, 1501, 4553, 1502, 1505,-32768, 4574, 1503, 4595,
+ 4616, 4637, 4658, 4679, 4700, 4721, 4742, 4763, 4784, 4805,
+ 4826, 4847, 4868, 4889, 4910, 4931, 4952, 4973, 4994, 5015,
+ 5036, 5057, 5078, 5099, 5120, 1508,-32768,-32768,-32768, 9,
+-32768, 1592,-32768,-32768, 5141, 2547,-32768,-32768,-32768,-32768,
+ 471, 2826,-32768, 1569, 292, 1569, 292, 1569, 292, 2547,
+ 2547, 1602,-32768, 574,-32768, 574, 2547, 3055, 3084, 574,
+ 1542, 1701, -61, 372, 1705, 2547, 1703, 372, 1704, 1708,
+ 1706, 1707, 1710, 2547, 1711, 574, 1712, 1713, 2547, 1717,
+ 1715, 2547, 1735, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,-32768,
+ 1736,-32768, 1738, 11819, 1539, 2547,-32768, 1569, 1569, 2547,
+ 3107, 200, 1739, 1543, -40,-32768, 3140, 213, -15, 3169,
+ 257, -11, 3192, 3215, 1545,-32768, 1547, 1681,-32768,-32768,
+ 1546, 19,-32768, 1549, 1550, 1551, 5162,-32768, 1556,-32768,
+ 1566,-32768,-32768,-32768, 11842,-32768, 1555,-32768,-32768, 11865,
+ 1570,-32768, 11888, 1568, 11911, 11934, 11957, 5183, 5204, 5225,
+ 5246, 5267, 5288, 5309, 5330, 5351, 5372, 5393, 5414, 5435,
+ 5456, 5477, 5498, 5519, 5540, 5561, 5582, 5603, 11980, 5624,
+-32768, 1571, 574,-32768, 3245, 3392, 1750, 2547,-32768, 574,
+ 1751,-32768, 1752, 2547, 1754, 1755, 2547, 1757, 1759, 1761,
+ 574, 574,-32768, 1763, 19, 372, 372, 372, 372, 1766,
+ 1769, 1770, 372, 1771, 1772, 1794, 1801,-32768,-32768,-32768,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547,-32768, 2547, 1811, 574,-32768,-32768, 1618, 3277, 1626,
+-32768,-32768, 1628, 3300,-32768,-32768, 1629, 3323,-32768,-32768,
+-32768, 1634, 1620,-32768, 19, 1636, 1670, 1664, 1675,-32768,
+-32768,-32768, 1672,-32768,-32768,-32768, 1673, 1676, 1677, 1678,
+ 5645, 5666, 5687, 5708, 5729, 5750, 5771, 5792, 5813, 5834,
+ 5855, 5876, 5897, 5918, 5939, 5960, 5981, 6002, 6023, 6044,
+ 6065, 1679, 12003, 1674, 1817, 292, 1818, 574, 292, 1819,
+ 292, 1821, 574, 1716, 1665, 372, 372, 1826, 1870, 372,
+ 1813, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 54,-32768, 1876,-32768, 1,
+-32768, 1682, 515, 11,-32768, 1683, 93,-32768, 1684, 1680,
+ 1700, 19, 1702, 1709,-32768,-32768, 1714, 1718, 519, 12509,
+ 522, 12509, 523, 12509, 6086, 6107, 6128, 6149, 6170, 6191,
+ 6212, 6233, 6254, 6275, 6296, 6317, 6338, 6359, 6380, 6401,
+ 6422, 6443, 6464, 6485, 6506, 526,-32768, 1719, 1742, 1897,
+ 292, 574, 1898, 1899, 292, 1900, 292, 1806, 2547, 19,
+ 372, 574, 1902, 1905, 2547, 1906, 2547, 1907, 2547, 1909,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 54, 1910, 54, 1911,-32768, 106, 1753,-32768,-32768,
+ 109,-32768, 238, 1756, 6527, 19, 1758, 1760,-32768,-32768,
+ 12509,-32768, 12509,-32768, 12509,-32768, 12026, 12049, 12072, 6548,
+ 6569, 6590, 6611, 6632, 6653, 6674, 6695, 6716, 6737, 6758,
+ 6779, 6800, 6821, 6842, 6863, 6884, 6905,-32768,-32768, 534,
+-32768,-32768, 1912, 1913, 1948, 1950, 2547, 2547, 1793, 372,
+ 574,-32768,-32768,-32768, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 54, 1957,-32768,-32768,-32768,-32768, 6926, 3346,
+ 1796, 1767, 1783, 1790, 1800, 1802, 6947, 6968, 6989, 7010,
+ 7031, 7052, 7073, 7094, 7115, 7136, 7157, 7178, 7199, 7220,
+ 7241, 7262, 7283, 7304,-32768,-32768, 2547, 1978,-32768, 574,
+ 372, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 3369,-32768, 1804, 1809, 535, 12509, 538, 12509,
+ 549, 12509, 7325, 7346, 7367, 7388, 7409, 7430, 7451, 7472,
+ 7493, 7514, 7535, 7556, 7577, 7598, 7619, 7640, 7661, 7682,
+ 1996, 574, 2001, 2547, 2002, 2547, 2003, 2547, 2004, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547,-32768, 1822,-32768,
+ 12509,-32768, 12509,-32768, 12509,-32768, 12095, 12118, 12141, 7703,
+ 7724, 7745, 7766, 7787, 7808, 7829, 7850, 7871, 7892, 7913,
+ 7934, 7955, 7976, 7997, 574,-32768,-32768,-32768, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 1823, 1810, 1820, 1824, 8018, 8039, 8060,
+ 8081, 8102, 8123, 8144, 8165, 8186, 8207, 8228, 8249, 8270,
+ 8291, 8312, 574, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 1827, 552, 12509, 553, 12509, 563, 12509, 8333, 8354,
+ 8375, 8396, 8417, 8438, 8459, 8480, 8501, 8522, 8543, 8564,
+ 8585, 8606, 8627, 372, 2547, 2018, 2547, 2020, 2547, 2022,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 1833, 12509,-32768, 12509,-32768,
+ 12509,-32768, 12164, 12187, 12210, 12233, 12256, 12279, 8648, 8669,
+ 8690, 8711, 8732, 8753, 8774, 8795, 8816, 2024,-32768,-32768,
+-32768,-32768,-32768,-32768, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547,-32768, 1830, 1831, 1832, 1834, 1835, 1859,
+ 8837, 8858, 8879, 8900, 8921, 8942, 8963, 8984, 9005, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 571, 12509, 572, 12509, 576, 12509,
+ 577, 12509, 581, 12509, 584, 12509, 9026, 9047, 9068, 9089,
+ 9110, 9131, 9152, 9173, 9194, 2547, 2028, 2547, 2056, 2547,
+ 2060, 2547, 2063, 2547, 2064, 2547, 2065, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 2547, 2547, 12509,-32768, 12509,-32768,
+ 12509,-32768, 12509,-32768, 12509,-32768, 12509,-32768, 9215, 9236,
+ 9257, 9278, 9299, 9320, 12302, 12325, 12348, 2547, 2547, 2547,
+ 2547, 2547, 2547,-32768,-32768,-32768, 9341, 9362, 9383, 9404,
+ 9425, 9446, 1871, 1873, 1875, 2547, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2547, 9467, 9488, 9509, 9530, 9551, 9572,
+ 585, 12509, 588, 12509, 589, 12509, 2547, 2547, 2547, 2547,
+ 2547, 2547, 2547, 2072, 2547, 2074, 2547, 2076, 9593, 9614,
+ 9635, 12371, 12394, 12417, 12509,-32768, 12509,-32768, 12509,-32768,
+ 2547, 2547, 2547,-32768,-32768,-32768, 9656, 9677, 9698, 1893,
+ 1895, 1896, 2547, 2547, 2547, 2547, 2547, 2547, 9719, 9740,
+ 9761, 592, 12509, 593, 12509, 639, 12509, 2547, 2547, 2547,
+ 2547, 2092, 2547, 2093, 2547, 2094, 9782, 9803, 9824, 12509,
+-32768, 12509,-32768, 12509,-32768, 2547, 2547, 2547, 9845, 9866,
+ 9887, 2547, 2547, 2547, 9908, 9929, 9950, 2547, 2547, 2547,
+ 12440, 12463, 12486,-32768,-32768,-32768, 1901, 1903, 1904, 2547,
+ 2547, 2547, 643, 12509, 646, 12509, 665, 12509, 2547, 2095,
+ 2547, 2097, 2547, 2100, 12509,-32768, 12509,-32768, 12509,-32768,
+ 2107, 2108,-32768
};
static const short yypgoto[] = {-32768,
- -32,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768, 1301,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ -25,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768, 1504,-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,-32768,
@@ -1420,445 +1422,422 @@ static const short yypgoto[] = {-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,
- -290, -22,-32768, 1896, 1897, -351, -161, 1898,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768, -1214, -1318,-32768,-32768, -1023, -23,-32768, 218,
--32768, -89,-32768, -1163, 845, 1511, -289, -318, -706, 948,
--32768, -266
+ -289, -22,-32768, 2102, -5, -353, -171, -3,-32768,-32768,
+-32768,-32768, 2104,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768, -1252, -1326,-32768,-32768, -1031, -23,-32768, -29,
+-32768, -88,-32768, -1152, 1092, 1513, -199, -319, -712, 1106,
+-32768, -267
};
-#define YYLAST 12738
+#define YYLAST 12703
static const short yytable[] = { 138,
- 137, 236, 534, 471, 475, 181, 178, 865, 192, 508,
- 195, 241, 713, 190, 10, 1275, 81, 360, 464, 465,
- 466, 364, 1346, 1346, 148, 146, 96, 1347, 1347, 1425,
- 295, 474, 1346, 1425, 856, 1346, 1425, 1347, 471, 1346,
- 1347, 369, 1016, 463, 1347, 462, 463, 1346, 1346, 146,
- 203, 1346, 1347, 1347, 1200, 1352, 1347, 1355, 175, 351,
- 352, 176, 177, 1209, 1346, 351, 352, 351, 352, 1347,
- 1216, 1073, 121, 122, 123, 121, 122, 123, 351, 352,
- 143, 1047, 1061, 1048, 353, 1017, 758, 1015, 1062, 8,
- 167, 168, 351, 352, 1049, 1256, 1050, 351, 352, 351,
- 352, 169, 351, 352, 288, 289, 290, 170, 525, 291,
- 294, 186, 298, 1051, 187, 1052, 354, 182, 535, 318,
- 319, 320, 1367, 322, 84, 324, 325, 9, 332, 96,
- 85, 296, 297, 1346, 370, 857, 858, 161, 1347, 86,
- 162, 163, 243, 164, 244, 349, 350, 11, 12, 13,
- 14, 15, 16, 17, 18, 147, 1010, 87, 1424, 1428,
- 760, 759, 351, 352, 367, 368, 191, 371, 1431, 373,
- 380, 1633, 376, 377, 1082, 1637, 495, 718, 1004, 147,
- 496, 88, 707, 1639, 1726, 131, 132, 1728, 730, 124,
- 125, 126, 127, 810, 124, 125, 126, 127, 82, 89,
- 1729, 196, 183, 179, 90, 193, 471, 709, 242, 714,
- 131, 132, 558, 91, 416, 131, 132, 471, 706, 420,
- 421, 422, 423, 424, 425, 426, 427, 428, 429, 430,
- 431, 432, 433, 434, 435, 436, 437, 438, 439, 440,
- 441, 442, 443, 444, 445, 446, 447, 448, 449, 450,
- 451, 452, 453, 454, 455, 456, 457, 458, 459, 460,
- 461, 171, 173, 1368, 1425, 351, 352, 1372, 1425, 470,
- 92, 1425, 476, 351, 352, 545, 546, 480, 481, 482,
- 483, 484, 485, 486, 487, 488, 489, 490, 491, 492,
- 493, 494, 124, 125, 126, 127, 141, 500, 594, 502,
- 131, 132, 595, 289, 470, 1138, 238, 142, 239, 512,
- 513, 514, 515, 143, 517, 518, 519, 520, 521, 522,
- 523, 1187, 351, 352, 1583, 148, 699, 1587, 151, 1590,
- 700, 144, 536, 537, 538, 539, 351, 352, 547, 601,
- 145, 124, 125, 126, 127, 245, 554, 246, 351, 352,
- 351, 352, 899, 131, 132, 562, 949, 950, 951, 952,
- 953, 1425, 131, 132, 1267, 1425, 1269, 1425, 303, 304,
- 305, 149, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 850, 150, 346, 869, 348, 315, 697, 704, 698,
- 152, 355, 351, 352, 600, 304, 305, 153, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 1001, 1271, 878,
- 471, 704, 315, 160, 854, 1499, 1500, 1501, 1502, 1680,
- 351, 352, 1506, 1684, 165, 1686, 351, 352, 351, 352,
- 43, 44, 45, 46, 851, 48, 1421, 154, 471, 907,
- 908, 909, 1427, 155, 1430, 289, 131, 132, 156, 1276,
- 708, 710, 505, 1277, 239, 889, 1032, 1033, 418, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 471, 471,
- 471, 166, 470, 315, 310, 311, 312, 313, 314, 157,
- 158, 416, 159, 470, 315, 732, 733, 301, 302, 303,
- 304, 305, 739, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 749, 750, 890, 1041, 1042, 315, 312, 313,
- 314, 753, 131, 132, 180, 1188, 315, 174, 729, 247,
- 239, 248, 761, 184, 188, 1596, 1597, 189, 249, 1600,
- 250, 197, 251, 771, 252, 773, 774, 253, 255, 254,
- 256, 257, 259, 258, 260, 261, 1334, 262, 263, 265,
- 264, 266, 267, 269, 268, 270, 271, 273, 272, 274,
- 275, 1025, 276, 185, 1003, 1005, 198, 199, 528, 529,
- 277, 279, 278, 280, 200, 281, 811, 282, 283, 704,
- 284, 705, 704, 201, 731, 93, 94, 704, 202, 881,
- 471, 97, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 1012, 704, 1013, 1024, 704,
- 1690, 1053, 234, 301, 302, 303, 304, 305, 237, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 285, 704,
- 704, 1054, 1055, 315, 704, 1277, 1143, 1278, 1635, 922,
- 1636, 299, 286, 840, 841, 1648, 1650, 1649, 1651, 1652,
- 1675, 1653, 1676, 1756, 1847, 1757, 1848, 842, 843, 844,
- 845, 846, 847, 848, 287, 509, 470, 1849, 316, 1850,
- 853, 317, 1851, 859, 1852, 1978, 1980, 1979, 1981, 1982,
- 321, 1983, 868, 2089, 1164, 2090, 2091, 2093, 2092, 2094,
- 2095, 2097, 2096, 2098, 470, 416, 2099, 323, 2100, 1765,
- 2176, 2178, 2177, 2179, 2180, 2224, 2181, 2225, 2226, 962,
- 2227, 2228, 2272, 2229, 2273, 2274, 2276, 2275, 2277, 333,
- 334, 335, 336, 338, 470, 470, 470, 1131, 340, 912,
- 913, 339, 748, 916, 341, 300, 342, 343, 344, 345,
- 363, 356, 375, 372, 927, 928, 357, 358, 359, 362,
- 374, 378, 379, 381, 382, 411, 128, 129, 383, 384,
- 1819, 385, 130, 386, 387, 1159, 388, 133, 389, 390,
- 292, 391, 392, 293, 393, 394, 479, 395, 396, 965,
- 966, 967, 968, 969, 970, 971, 972, 973, 974, 975,
- 976, 977, 978, 979, 980, 981, 982, 983, 984, 985,
- 986, 987, 988, 989, 990, 301, 302, 303, 304, 305,
- 397, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 398, 399, 400, 1006, 401, 315, 414, 923, 402, 417,
- 1011, 301, 302, 303, 304, 305, 403, 306, 307, 308,
- 309, 310, 311, 312, 313, 314, 470, 404, 1026, 405,
- 1027, 315, 468, 406, 407, 408, 409, 478, 410, 315,
- 510, 516, 549, 524, 413, 1043, 1044, 1045, 415, 477,
- 550, 553, 556, 559, 563, 564, 565, 566, 567, 568,
- 569, 570, 1069, 571, 572, 573, 1065, 1066, 1067, 574,
- 575, 576, 577, 578, 579, 580, 581, 582, 583, 584,
- 585, 586, 1338, 301, 302, 303, 304, 305, 587, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 588, 589,
- 590, 591, 592, 315, 597, 593, 870, 862, 596, 598,
- 1101, 701, 702, 711, 712, 717, 747, 767, 719, 720,
- 721, 723, 725, 1999, 301, 302, 303, 304, 305, 726,
- 306, 307, 308, 309, 310, 311, 312, 313, 314, 734,
- 751, 903, 904, 905, 315, 752, 560, 763, 765, 766,
- 764, 1132, 301, 302, 303, 304, 305, 769, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 929, 770, 776,
- 777, 778, 315, 779, 467, 780, 938, 1148, 1149, 1150,
- 1222, 781, 782, 783, 784, 785, 786, 787, 1158, 788,
- 789, 790, 791, 792, 793, 794, 795, 796, 797, 798,
- 799, 800, 1177, 1178, 801, 807, 1191, 802, 803, 804,
- 805, 806, 808, 809, 1190, 813, 814, 1193, 815, 816,
- 839, 883, 817, 818, 819, 849, 820, 1203, 852, 860,
- 855, 821, 822, 823, 1210, 1211, 1212, 824, 861, 825,
- 826, 1217, 827, 828, 829, 1221, 863, 867, 898, 1223,
- 1224, 1225, 1226, 1227, 1228, 1229, 1230, 1231, 1232, 1233,
+ 137, 72, 236, 73, 539, 479, 871, 364, 178, 513,
+ 181, 368, 192, 195, 171, 173, 241, 468, 469, 470,
+ 718, 81, 190, 146, 1359, 1353, 1362, 146, 1432, 295,
+ 1354, 478, 1432, 1282, 148, 1432, 545, 27, 28, 546,
+ 547, 31, 32, 33, 373, 34, 862, 36, 37, 38,
+ 1353, 40, 41, 1207, 1353, 1354, 1023, 203, 467, 1354,
+ 466, 467, 1216, 8, 355, 356, 1353, 143, 53, 1223,
+ 499, 1354, 9, 764, 500, 599, 1353, 355, 356, 600,
+ 1054, 1354, 1055, 84, 355, 356, 1022, 121, 122, 123,
+ 121, 122, 123, 475, 357, 1263, 54, 55, 56, 1024,
+ 1056, 243, 1057, 244, 288, 289, 290, 167, 168, 291,
+ 294, 186, 298, 85, 187, 66, 355, 356, 169, 318,
+ 319, 320, 182, 322, 170, 324, 325, 86, 336, 475,
+ 296, 297, 1058, 1068, 1059, 87, 350, 374, 352, 1069,
+ 1374, 312, 313, 314, 359, 353, 354, 863, 864, 315,
+ 88, 355, 356, 147, 131, 132, 1017, 147, 1353, 765,
+ 238, 1431, 239, 1354, 371, 372, 96, 375, 358, 377,
+ 766, 1353, 380, 381, 1353, 191, 1354, 384, 89, 1354,
+ 723, 355, 356, 355, 356, 161, 1435, 712, 162, 163,
+ 1438, 164, 736, 142, 124, 125, 126, 127, 606, 530,
+ 548, 1194, 1640, 82, 196, 179, 563, 183, 90, 193,
+ 714, 422, 1644, 242, 420, 131, 132, 719, 91, 424,
+ 425, 426, 427, 428, 429, 430, 431, 432, 433, 434,
+ 435, 436, 437, 438, 439, 440, 441, 442, 443, 444,
+ 445, 446, 447, 448, 449, 450, 451, 452, 453, 454,
+ 455, 456, 457, 458, 459, 460, 461, 462, 463, 464,
+ 465, 92, 1375, 1432, 355, 356, 1379, 1432, 96, 474,
+ 1432, 10, 480, 355, 356, 550, 551, 484, 485, 486,
+ 487, 488, 489, 490, 491, 492, 493, 494, 495, 496,
+ 497, 498, 141, 1590, 1646, 143, 1594, 504, 1597, 506,
+ 475, 131, 132, 1353, 289, 474, 1145, 1733, 1354, 816,
+ 1735, 144, 475, 517, 518, 519, 520, 1011, 522, 523,
+ 524, 525, 526, 527, 528, 533, 534, 355, 356, 124,
+ 125, 126, 127, 355, 356, 145, 541, 542, 543, 544,
+ 355, 356, 552, 540, 148, 355, 356, 355, 356, 906,
+ 559, 535, 535, 538, 538, 149, 1274, 1353, 151, 567,
+ 1432, 1276, 1354, 1278, 1432, 150, 1432, 301, 302, 303,
+ 304, 305, 152, 306, 307, 308, 309, 310, 311, 312,
+ 313, 314, 929, 355, 356, 856, 153, 315, 1687, 355,
+ 356, 245, 1691, 246, 1693, 1195, 355, 356, 605, 1428,
+ 702, 1080, 703, 154, 11, 12, 13, 14, 15, 16,
+ 17, 18, 1434, 884, 1506, 1507, 1508, 1509, 303, 304,
+ 305, 1513, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 124, 125, 126, 127, 247, 315, 248, 857, 1736,
+ 355, 356, 131, 132, 914, 915, 916, 155, 509, 289,
+ 239, 156, 131, 132, 713, 715, 1437, 165, 304, 305,
+ 711, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 175, 160, 896, 176, 177, 315, 474, 355, 356, 166,
+ 124, 125, 126, 127, 174, 420, 734, 180, 474, 1089,
+ 738, 739, 956, 957, 958, 959, 960, 745, 131, 132,
+ 754, 131, 132, 184, 735, 475, 239, 755, 756, 860,
+ 310, 311, 312, 313, 314, 704, 759, 185, 875, 705,
+ 315, 897, 709, 188, 1603, 1604, 189, 767, 1607, 43,
+ 44, 45, 46, 475, 48, 1008, 131, 132, 777, 709,
+ 779, 780, 1283, 249, 197, 250, 1284, 1341, 301, 302,
+ 303, 304, 305, 198, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 199, 475, 475, 475, 1032, 315, 201,
+ 930, 1010, 1012, 251, 234, 252, 93, 326, 253, 237,
+ 254, 817, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
+ 115, 116, 117, 118, 119, 120, 157, 158, 255, 159,
+ 256, 327, 257, 259, 258, 260, 261, 200, 262, 1697,
+ 263, 265, 264, 266, 267, 269, 268, 270, 271, 273,
+ 272, 274, 43, 44, 45, 46, 47, 48, 1039, 1040,
+ 301, 302, 303, 304, 305, 285, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 300, 1048, 1049, 846, 847,
+ 315, 202, 275, 277, 276, 278, 279, 281, 280, 282,
+ 286, 287, 848, 849, 850, 851, 852, 853, 854, 299,
+ 483, 474, 283, 316, 284, 859, 317, 475, 865, 709,
+ 709, 710, 737, 709, 876, 888, 1019, 874, 1020, 1171,
+ 709, 709, 1031, 1060, 709, 709, 1061, 1062, 1772, 474,
+ 709, 420, 1150, 1284, 1642, 1285, 1643, 337, 1655, 868,
+ 1656, 1657, 1659, 1658, 1660, 1682, 969, 1683, 349, 342,
+ 910, 911, 912, 1763, 1854, 1764, 1855, 1856, 321, 1857,
+ 474, 474, 474, 1138, 890, 919, 920, 343, 1858, 923,
+ 1859, 1985, 1987, 1986, 1988, 323, 936, 128, 328, 338,
+ 934, 935, 1989, 130, 1990, 945, 363, 339, 133, 1826,
+ 2096, 2098, 2097, 2099, 329, 2100, 2102, 2101, 2103, 360,
+ 2104, 1166, 2105, 2106, 2183, 2107, 2184, 2185, 2187, 2186,
+ 2188, 2231, 2233, 2232, 2234, 972, 973, 974, 975, 976,
+ 977, 978, 979, 980, 981, 982, 983, 984, 985, 986,
+ 987, 988, 989, 990, 991, 992, 993, 994, 995, 996,
+ 997, 917, 340, 301, 302, 303, 304, 305, 344, 306,
+ 307, 308, 309, 310, 311, 312, 313, 314, 2235, 1013,
+ 2236, 345, 2279, 315, 2280, 2281, 1018, 2282, 301, 302,
+ 303, 304, 305, 361, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 474, 2283, 1033, 2284, 1034, 315, 362,
+ 346, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 347, 348, 1050, 1051, 1052, 315, 366, 301, 302, 303,
+ 304, 305, 367, 306, 307, 308, 309, 310, 311, 312,
+ 313, 314, 376, 1072, 1073, 1074, 1076, 315, 378, 379,
+ 382, 383, 301, 302, 303, 304, 305, 1345, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 385, 386, 387,
+ 388, 389, 315, 415, 390, 391, 392, 393, 394, 395,
+ 396, 397, 398, 399, 1016, 400, 401, 1108, 93, 94,
+ 402, 403, 2006, 404, 97, 98, 99, 100, 101, 102,
+ 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+ 113, 114, 115, 116, 117, 118, 119, 120, 405, 1259,
+ 406, 407, 408, 409, 410, 411, 412, 413, 1139, 301,
+ 302, 303, 304, 305, 1146, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 414, 417, 418, 419, 421, 315,
+ 315, 481, 472, 482, 1155, 1156, 1157, 515, 1229, 510,
+ 521, 529, 554, 555, 1172, 1165, 1175, 558, 1178, 564,
+ 561, 568, 569, 570, 571, 572, 573, 574, 575, 1184,
+ 1185, 576, 577, 578, 579, 580, 581, 535, 582, 538,
+ 1198, 1197, 583, 584, 1200, 585, 586, 587, 588, 589,
+ 590, 591, 592, 593, 1210, 594, 595, 596, 597, 598,
+ 706, 1217, 1218, 1219, 601, 707, 602, 603, 1224, 716,
+ 717, 722, 1228, 753, 724, 725, 1230, 1231, 1232, 1233,
1234, 1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243,
- 1244, 1245, 1246, 1247, 1248, 301, 302, 303, 304, 305,
- 830, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 1258, 873, 831, 875, 885, 315, 886, 832, 887, 888,
- 833, 834, 891, 835, 892, 893, 894, 895, 1265, 896,
- 897, 836, 301, 302, 303, 304, 305, 864, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 884, 1284, 93,
- 94, 1281, 315, 1282, 837, 97, 98, 99, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 93,
- 94, 838, 917, 906, 911, 97, 98, 99, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 301,
- 302, 303, 304, 305, 919, 306, 307, 308, 309, 310,
- 311, 312, 313, 314, 1139, 1337, 924, 926, 925, 315,
- 930, 931, 932, 1344, 933, 1350, 934, 1353, 937, 1356,
- 1357, 939, 940, 943, 944, 945, 1361, 946, 947, 956,
- 1000, 1002, 957, 958, 1165, 1370, 1168, 959, 1171, 960,
- 1008, 961, 963, 1378, 1031, 1007, 1014, 1018, 1383, 1020,
- 1022, 1386, 1023, 1388, 1389, 1390, 1391, 1392, 1393, 1394,
+ 1244, 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253,
+ 1254, 1255, 301, 302, 303, 304, 305, 726, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 1265, 728, 128,
+ 129, 730, 315, 731, 740, 130, 757, 758, 769, 771,
+ 133, 770, 772, 292, 773, 1272, 293, 301, 302, 303,
+ 304, 305, 775, 306, 307, 308, 309, 310, 311, 312,
+ 313, 314, 1267, 776, 782, 783, 784, 315, 1288, 785,
+ 1289, 786, 1291, 93, 94, 787, 788, 789, 790, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 93, 94, 814, 813, 791, 792, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 845, 793, 794, 855, 819, 869, 820,
+ 858, 821, 1344, 866, 1352, 795, 1358, 867, 1361, 796,
+ 1351, 873, 1357, 879, 1360, 861, 1363, 1364, 822, 797,
+ 881, 892, 823, 1368, 893, 535, 798, 538, 799, 894,
+ 895, 800, 1377, 898, 801, 824, 899, 900, 901, 802,
+ 1385, 803, 804, 805, 806, 1390, 807, 808, 1393, 809,
1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402, 1403, 1404,
- 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413, 1046,
- 1058, 1059, 1630, 1064, 1068, 1418, 1102, 288, 289, 1419,
- 1070, 1133, 1075, 1074, 1076, 1134, 1136, 1077, 1140, 1141,
- 1145, 1079, 1438, 1146, 1078, 1084, 1080, 1081, 1083, 1085,
- 128, 129, 1086, 1147, 1087, 1088, 130, 1089, 1090, 1091,
- 1092, 133, 1093, 1094, 727, 1095, 1098, 728, 1096, 1097,
- 1151, 1099, 1100, 1129, 1142, 1152, 1153, 1154, 1155, 1156,
- 128, 129, 1157, 1166, 1169, 1172, 130, 1174, 1175, 1176,
- 1192, 133, 1179, 1183, 879, 1195, 1196, 880, 1197, 1198,
- 1199, 1201, 1202, 1204, 1205, 1253, 1206, 1482, 1207, 1208,
- 1214, 1215, 1218, 1487, 1219, 1498, 1491, 1255, 1721, 1220,
- 1724, 1249, 1250, 1257, 1251, 1254, 1263, 1264, 1268, 910,
- 1266, 1285, 1270, 1272, 1279, 1335, 1280, 1287, 1288, 1290,
- 1514, 1515, 1516, 1517, 1518, 1519, 1520, 1521, 1522, 1523,
+ 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1413, 1414,
+ 1415, 1416, 1417, 1418, 1419, 1420, 810, 811, 1637, 352,
+ 812, 902, 1425, 815, 288, 289, 1426, 870, 825, 826,
+ 301, 302, 303, 304, 305, 827, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 828, 1445, 829, 830, 831,
+ 315, 903, 832, 833, 128, 129, 834, 835, 836, 837,
+ 130, 838, 839, 840, 841, 133, 842, 843, 732, 844,
+ 904, 733, 905, 913, 891, 918, 926, 924, 931, 932,
+ 933, 937, 938, 939, 128, 129, 940, 941, 944, 946,
+ 130, 947, 950, 951, 952, 133, 953, 954, 886, 963,
+ 964, 887, 965, 966, 1489, 967, 1007, 968, 970, 1009,
+ 1494, 1014, 1015, 1498, 1728, 1021, 1731, 1025, 1027, 1505,
+ 1029, 1030, 1053, 1038, 1065, 1066, 1071, 1075, 1109, 1077,
+ 1081, 1082, 1136, 1268, 1084, 1086, 1083, 1521, 1522, 1523,
1524, 1525, 1526, 1527, 1528, 1529, 1530, 1531, 1532, 1533,
- 1534, 1358, 1536, 1289, 1365, 1366, 1369, 1294, 1295, 1291,
- 1293, 1371, 1373, 1300, 1374, 1548, 1375, 301, 302, 303,
- 304, 305, 1299, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 1301, 1303, 1345, 1304, 1351, 315, 1354, 1788,
- 93, 326, 1306, 1162, 1333, 1163, 97, 98, 99, 100,
+ 1534, 1535, 1536, 1537, 1538, 1539, 1540, 1541, 1085, 1543,
+ 301, 302, 303, 304, 305, 1087, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 1088, 1090, 1091, 1092, 1555,
+ 315, 1140, 1141, 1093, 1094, 1095, 1169, 1096, 1170, 1097,
+ 93, 511, 1098, 1099, 1100, 1795, 97, 98, 99, 100,
101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 1376, 1377, 1379, 1381, 1382, 1384, 1385, 1414, 1387, 1415,
- 1417, 1603, 1605, 1607, 1608, 1609, 1610, 1611, 1612, 1613,
+ 1101, 1102, 1105, 1103, 1104, 1106, 1143, 1107, 1147, 1148,
+ 1149, 1152, 1153, 1154, 1158, 1159, 1160, 1161, 1610, 1612,
1614, 1615, 1616, 1617, 1618, 1619, 1620, 1621, 1622, 1623,
- 1624, 1625, 1626, 1627, 1628, 1422, 1423, 93, 506, 348,
- 1437, 1443, 1643, 97, 98, 99, 100, 101, 102, 103,
- 104, 105, 106, 107, 108, 109, 110, 111, 112, 113,
- 114, 115, 116, 117, 118, 119, 120, 301, 302, 303,
- 304, 305, 1480, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 1484, 1434, 1435, 1439, 1485, 315, 1488, 1489,
- 1689, 1440, 1441, 1444, 1446, 1448, 1450, 1492, 1688, 1493,
- 1477, 1494, 1497, 1503, 1694, 1009, 1696, 1504, 1698, 1505,
- 1700, 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1708, 1709,
+ 1624, 1625, 1626, 1627, 1628, 1629, 1630, 1631, 1632, 1633,
+ 1634, 1635, 1162, 1163, 1164, 1173, 1176, 1179, 1181, 1182,
+ 1183, 93, 94, 1186, 1190, 1199, 1650, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 301, 302, 303, 304, 305, 1202, 306, 307, 308,
+ 309, 310, 311, 312, 313, 314, 1203, 1204, 1205, 1256,
+ 1206, 315, 1208, 1209, 1696, 1695, 1212, 1211, 1213, 1262,
+ 1214, 1701, 1269, 1703, 1215, 1705, 1221, 1707, 1708, 1709,
1710, 1711, 1712, 1713, 1714, 1715, 1716, 1717, 1718, 1719,
- 1720, 1507, 1508, 1509, 1510, 1537, 1732, 1582, 1539, 1541,
- 1547, 330, 1584, 1542, 1544, 1546, 1549, 337, 1550, 1551,
- 1552, 128, 327, 1555, 1588, 1553, 1554, 130, 1556, 1252,
- 1557, 1579, 133, 1581, 1591, 1594, 1598, 1599, 328, 1595,
- 361, 1601, 1632, 1634, 1638, 1640, 365, 366, 1641, 1642,
- 1644, 1645, 1646, 1647, 1677, 1679, 1762, 1763, 1682, 1683,
- 1678, 1685, 1692, 1687, 1770, 1771, 1772, 1773, 1774, 1775,
- 1776, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785,
- 1786, 1787, 1693, 1695, 1697, 1699, 1722, 1725, 128, 129,
- 1727, 1730, 1733, 1734, 130, 1758, 1759, 1760, 1761, 133,
- 1764, 1789, 1792, 1793, 1817, 507, 1794, 1871, 1795, 1796,
- 1797, 1845, 1846, 1260, 1873, 1875, 1816, 1877, 1879, 1898,
- 1936, 1821, 1823, 1825, 1826, 1827, 1828, 1829, 1830, 1831,
+ 1720, 1721, 1722, 1723, 1724, 1725, 1726, 1727, 1222, 1225,
+ 1226, 1260, 1264, 334, 1227, 1257, 1258, 1261, 1270, 341,
+ 1739, 128, 129, 1271, 1287, 1273, 1294, 130, 1275, 1292,
+ 1277, 1279, 133, 1286, 1295, 1296, 1443, 1297, 512, 1298,
+ 1300, 1301, 365, 1302, 1306, 1307, 1308, 1342, 369, 370,
+ 1311, 1310, 1313, 1340, 1372, 1365, 1373, 1376, 1378, 1380,
+ 1381, 1382, 1383, 1769, 1770, 1384, 1386, 1388, 1389, 1391,
+ 1392, 1777, 1778, 1779, 1780, 1781, 1782, 1783, 1784, 1785,
+ 1786, 1787, 1788, 1789, 1790, 1791, 1792, 1793, 1794, 1394,
+ 1424, 1421, 1422, 1430, 1429, 1441, 1442, 1444, 1446, 1447,
+ 1448, 1450, 1348, 1349, 1453, 1487, 1491, 1492, 130, 1495,
+ 1496, 1451, 1499, 1350, 1500, 1455, 1501, 1457, 1504, 170,
+ 1484, 1510, 514, 1823, 1511, 1512, 1514, 1515, 1828, 1830,
1832, 1833, 1834, 1835, 1836, 1837, 1838, 1839, 1840, 1841,
- 1842, 1843, 1937, 301, 302, 303, 304, 305, 1938, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 1939, 1977,
- 2001, 1261, 2003, 315, 2005, 2037, 2021, 2111, 2113, 2053,
- 2115, 2117, 2119, 1874, 2121, 1876, 2054, 1878, 2055, 1880,
- 1881, 1882, 1883, 1884, 1885, 1886, 1887, 1888, 1889, 1890,
- 1891, 1892, 1893, 1894, 1895, 1896, 1897, 301, 302, 303,
- 304, 305, 2189, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 2056, 2057, 2058, 2155, 2156, 315, 2157, 2191,
- 2193, 2209, 2210, 2211, 2234, 2236, 1262, 2238, 1921, 1922,
- 1923, 1924, 1925, 1926, 1927, 1928, 1929, 1930, 1931, 1932,
- 1933, 1934, 1935, 2263, 2264, 2265, 2279, 2281, 2283, 2285,
- 2286, 812, 71, 72, 73, 0, 1182, 0, 0, 0,
- 0, 0, 0, 1957, 1959, 1961, 1962, 1963, 1964, 1965,
- 1966, 1967, 1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975,
- 1976, 301, 302, 303, 304, 305, 0, 306, 307, 308,
- 309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 0, 0, 2000, 1135, 2002, 0, 2004, 0,
- 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015,
- 2016, 2017, 2018, 2019, 2020, 0, 0, 0, 703, 301,
+ 1842, 1843, 1844, 1845, 1846, 1847, 1848, 1849, 1850, 1516,
+ 301, 302, 303, 304, 305, 1517, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 1544, 1601, 1608, 1546, 565,
+ 315, 1554, 1589, 1591, 1595, 1548, 1598, 1602, 1549, 1551,
+ 1881, 1605, 1883, 1553, 1885, 1556, 1887, 1888, 1889, 1890,
+ 1891, 1892, 1893, 1894, 1895, 1896, 1897, 1898, 1899, 1900,
+ 1901, 1902, 1903, 1904, 301, 302, 303, 304, 305, 1558,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 1557,
+ 1559, 1560, 1561, 1588, 315, 1606, 1562, 1563, 1564, 1586,
+ 1639, 1648, 1641, 1645, 1647, 1928, 1929, 1930, 1931, 1932,
+ 1933, 1934, 1935, 1936, 1937, 1938, 1939, 1940, 1941, 1942,
+ 1649, 1651, 1686, 1689, 1690, 1692, 1694, 1699, 1652, 1653,
+ 1700, 1702, 1704, 1654, 1706, 1729, 1732, 1765, 1766, 1684,
+ 1964, 1966, 1968, 1969, 1970, 1971, 1972, 1973, 1974, 1975,
+ 1976, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 301, 302,
+ 303, 304, 305, 1685, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 1767, 1734, 1768, 1737, 1740, 315, 1741,
+ 1771, 2007, 1796, 2009, 1799, 2011, 1800, 2013, 2014, 2015,
+ 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024, 2025,
+ 2026, 2027, 1801, 1824, 708, 301, 302, 303, 304, 305,
+ 1802, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1803, 1878, 1804, 1852, 1853, 315, 1880, 1882, 1884, 1886,
+ 1944, 2051, 2052, 2053, 2054, 2055, 2056, 2057, 2058, 2059,
+ 1945, 1905, 1943, 2008, 1946, 2010, 1984, 2012, 2028, 2044,
+ 2060, 2061, 2062, 2118, 2063, 2064, 2076, 2078, 2080, 2082,
+ 2084, 2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094,
+ 2095, 545, 27, 28, 546, 547, 31, 32, 33, 2065,
+ 34, 2120, 36, 37, 38, 2122, 40, 41, 2124, 2126,
+ 2128, 2162, 2117, 2163, 2119, 2164, 2121, 2196, 2123, 2198,
+ 2125, 2200, 2127, 53, 2129, 2130, 2131, 2132, 2133, 2134,
+ 2135, 2136, 2137, 2216, 721, 2217, 2218, 2241, 2243, 2245,
+ 2286, 2270, 2288, 2271, 2272, 2290, 2292, 2293, 71, 818,
+ 78, 54, 55, 56, 2147, 2148, 2149, 2150, 2151, 2152,
+ 1142, 0, 889, 0, 0, 0, 0, 0, 0, 0,
+ 66, 0, 2165, 2166, 2167, 2168, 2169, 2170, 2172, 2174,
+ 2176, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 2189, 2190, 2191, 2192, 2193, 2194, 2195,
+ 1189, 2197, 0, 2199, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 2207, 2208, 2209,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 2219,
+ 2220, 2221, 2223, 2225, 2227, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 2237, 2238, 2239, 2240, 0, 2242,
+ 0, 2244, 0, 0, 0, 553, 0, 0, 0, 0,
+ 0, 0, 2249, 2250, 2251, 0, 0, 0, 2255, 2256,
+ 2257, 0, 0, 0, 2261, 2262, 2263, 877, 878, 0,
+ 880, 0, 882, 883, 0, 0, 2274, 2276, 2278, 0,
+ 0, 0, 0, 0, 0, 2285, 0, 2287, 0, 2289,
+ 301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
+ 315, 0, 0, 921, 922, 0, 0, 925, 301, 302,
+ 303, 304, 305, 928, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 0, 942, 943, 0, 0, 315, 0,
+ 948, 949, 0, 0, 93, 94, 95, 955, 96, 962,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 0, 121, 122, 123, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 93, 326, 0, 0, 0, 0, 97, 98, 99,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 1026, 0, 1028, 0, 0, 327, 0, 0, 0,
+ 0, 0, 0, 0, 1035, 1036, 1037, 0, 0, 0,
+ 1041, 1042, 1043, 1044, 1045, 1046, 1047, 43, 44, 45,
+ 46, 47, 48, 0, 93, 94, 467, 0, 0, 0,
+ 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 0, 121, 122, 123, 0, 301,
302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 0, 0, 0, 0, 2044, 2045, 2046, 2047, 2048, 2049,
- 2050, 2051, 2052, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2069,
- 2071, 2073, 2075, 2077, 2079, 2080, 2081, 2082, 2083, 2084,
- 2085, 2086, 2087, 2088, 301, 302, 303, 304, 305, 0,
- 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 2110, 0, 2112, 0, 2114,
- 0, 2116, 0, 2118, 0, 2120, 0, 2122, 2123, 2124,
- 2125, 2126, 2127, 2128, 2129, 2130, 1436, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 2140, 2141, 2142,
- 2143, 2144, 2145, 0, 716, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 2158, 2159, 2160, 2161, 2162,
- 2163, 2165, 2167, 2169, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 2182, 2183, 2184, 2185,
- 2186, 2187, 2188, 0, 2190, 0, 2192, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 2200, 2201, 2202, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 2212, 2213, 2214, 2216, 2218, 2220, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 2230, 2231, 2232,
- 2233, 0, 2235, 0, 2237, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 2242, 2243, 2244, 0, 0,
- 0, 2248, 2249, 2250, 0, 0, 0, 2254, 2255, 2256,
- 871, 872, 0, 874, 0, 876, 877, 0, 0, 2267,
- 2269, 2271, 0, 0, 0, 0, 0, 0, 2278, 0,
- 2280, 0, 2282, 0, 301, 302, 303, 304, 305, 0,
- 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 914, 915, 0, 0, 918,
- 301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
- 310, 311, 312, 313, 314, 0, 935, 936, 0, 0,
- 315, 0, 941, 942, 0, 0, 93, 94, 0, 948,
- 0, 955, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 0, 0, 93, 94,
- 95, 0, 96, 0, 97, 98, 99, 100, 101, 102,
- 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 0, 121,
- 122, 123, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1019, 0, 1021, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 1028, 1029, 1030, 0, 0,
- 0, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 93, 94,
- 463, 0, 0, 0, 97, 98, 99, 100, 101, 102,
- 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 0, 121,
- 122, 123, 93, 94, 0, 0, 0, 0, 97, 98,
+ 0, 124, 125, 126, 127, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 128, 129, 0, 0, 0,
+ 0, 130, 131, 132, 0, 0, 133, 0, 134, 0,
+ 135, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 1137, 0, 0, 0, 301, 302, 303, 304,
+ 305, 0, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 0, 128, 473, 0, 0, 315, 0, 130, 93,
+ 94, 0, 1192, 133, 1193, 97, 98, 99, 100, 101,
+ 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 0,
+ 0, 0, 0, 1191, 0, 0, 0, 0, 0, 0,
+ 0, 1201, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 128, 129, 0, 0, 0,
+ 1220, 130, 93, 511, 0, 0, 133, 0, 97, 98,
99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 1341, 1342, 0,
- 0, 0, 315, 130, 882, 0, 0, 0, 1343, 0,
- 735, 0, 0, 0, 170, 124, 125, 126, 127, 921,
- 0, 0, 0, 1130, 0, 0, 0, 0, 0, 128,
- 129, 0, 0, 0, 0, 130, 131, 132, 0, 0,
- 133, 0, 134, 0, 135, 93, 326, 0, 0, 0,
- 0, 97, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1184, 0, 0, 0, 0, 0,
- 0, 0, 1194, 0, 0, 0, 0, 0, 0, 128,
- 129, 0, 0, 0, 0, 130, 0, 0, 0, 0,
- 133, 1213, 0, 0, 0, 0, 0, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 128, 129, 0, 0, 315, 0, 130,
- 93, 506, 0, 1185, 133, 1186, 97, 98, 99, 100,
- 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
- 310, 311, 312, 313, 314, 301, 302, 303, 304, 305,
- 315, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 315, 0, 0, 0, 540,
- 27, 28, 541, 542, 31, 32, 33, 0, 34, 0,
- 36, 37, 38, 0, 40, 41, 128, 469, 0, 0,
- 0, 0, 130, 0, 0, 0, 0, 133, 0, 0,
- 0, 53, 0, 0, 0, 540, 27, 28, 541, 542,
- 31, 32, 33, 0, 34, 0, 36, 37, 38, 0,
- 40, 41, 0, 0, 0, 0, 0, 0, 0, 54,
- 55, 56, 301, 302, 303, 304, 305, 53, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 66, 0,
- 0, 0, 315, 0, 0, 0, 0, 1359, 1339, 1360,
- 1340, 0, 0, 1364, 0, 54, 55, 56, -10, 1,
- 0, -10, -53, 0, 0, 0, 0, 0, 0, 1380,
- 0, 128, 129, 0, 66, 0, 0, 130, 0, 0,
- 0, 0, 133, 0, 0, 0, 0, 0, 0, 0,
- 0, -53, 0, 0, 0, -53, -53, -53, -53, -53,
- -53, -53, -53, -53, 0, -53, -53, -53, -53, -53,
- -53, -53, -53, 0, 0, 0, -53, -53, -53, -53,
- -53, -53, -53, 543, -53, -53, -53, -53, -53, 540,
- 27, 28, 541, 542, 31, 32, 33, 0, 34, 0,
- 36, 37, 38, 0, 40, 41, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, -53, -53, -53, 548,
- 0, 53, 0, -53, 0, -53, 0, -53, -53, -53,
- -53, -53, -53, -53, 0, -53, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1478, 0, 0, 54,
- 55, 56, 0, 1483, -10, -10, -10, -10, -10, -10,
- -10, -10, 0, 0, 1495, 1496, 0, 0, 66, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 2,
- 3, 0, 4, 301, 302, 303, 304, 305, 0, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 0, 0, 0, 473, 1538, 602,
- 603, 604, 605, 606, 607, 608, 609, 610, 611, 612,
- 613, 614, 615, 616, 617, 618, 619, 620, 621, 622,
- 623, 624, 625, 626, 627, 0, 0, 204, 301, 302,
- 303, 304, 305, 0, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 772, 0, 0, 0, 0, 315, 0,
- 0, 0, 0, 0, 0, 0, 740, 0, 0, 0,
- 0, 1586, 0, 0, 0, 0, 1593, 602, 603, 604,
- 605, 606, 607, 608, 609, 610, 611, 612, 613, 614,
- 615, 616, 617, 618, 619, 620, 621, 622, 623, 624,
- 625, 626, 627, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 205, 206, 207, 0, 0, 0,
- 0, 0, 208, 209, 210, 211, 212, 213, 214, 215,
- 216, 217, 0, 23, 0, 0, 0, 0, 0, 628,
- 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
- 0, 228, 229, 230, 231, 232, 233, 0, 0, 0,
- 0, 0, 24, 0, 0, 1681, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 1691, 34, 35, 36, 37,
- 38, 39, 40, 41, 0, 0, 0, 42, 43, 44,
- 45, 46, 47, 48, 0, 49, 50, 51, 52, 53,
- 0, 0, 301, 302, 303, 304, 305, 964, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 0, 54, 55, 56,
- 741, 0, 0, 0, 57, 0, 58, 0, 59, 60,
- 61, 62, 63, 64, 65, 0, 66, 540, 27, 28,
- 541, 542, 31, 32, 33, 0, 34, 0, 36, 37,
- 38, 0, 40, 41, 1766, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 301, 302, 303, 304, 305, 53,
- 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 0, 0, 0, 0, 0,
- 0, 0, 902, 0, 0, 0, 0, 54, 55, 56,
+ 119, 120, 0, 0, -10, 1, 0, -10, -53, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 545, 27,
+ 28, 546, 547, 31, 32, 33, 0, 34, 0, 36,
+ 37, 38, 0, 40, 41, 0, 0, -53, 0, 0,
+ 0, -53, -53, -53, -53, -53, -53, -53, -53, -53,
+ 53, -53, -53, -53, -53, -53, -53, -53, -53, 0,
+ 0, 0, -53, -53, -53, -53, -53, -53, -53, 0,
+ -53, -53, -53, -53, -53, 0, 0, 0, 54, 55,
+ 56, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 128, 129, 0, 0, 0, 0, 130, 66, 0, 0,
+ 0, 133, -53, -53, -53, 0, 0, 0, 0, -53,
+ 0, -53, 0, -53, -53, -53, -53, -53, -53, -53,
+ 0, -53, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 1818, 0, 0, 66, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 301, 302, 303, 304, 305, 1160, 306, 307, 308, 309,
- 310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 0, 0, 0, 0, 1872, 0, 0, 1362, 301,
+ -10, -10, -10, -10, -10, -10, -10, -10, 0, 0,
+ 0, 0, 0, 128, 129, 0, 1366, 0, 1367, 130,
+ 204, 0, 1371, 0, 133, 2, 3, 0, 4, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1387, 0,
+ 0, 0, 778, 0, 0, 607, 608, 609, 610, 611,
+ 612, 613, 614, 615, 616, 617, 618, 619, 620, 621,
+ 622, 623, 624, 625, 626, 627, 628, 629, 630, 631,
+ 632, 607, 608, 609, 610, 611, 612, 613, 614, 615,
+ 616, 617, 618, 619, 620, 621, 622, 623, 624, 625,
+ 626, 627, 628, 629, 630, 631, 632, 205, 206, 207,
+ 0, 0, 0, 0, 0, 208, 209, 210, 211, 212,
+ 213, 214, 215, 216, 217, 0, 0, 0, 0, 0,
+ 0, 0, 0, 218, 219, 220, 221, 222, 223, 224,
+ 225, 226, 227, 0, 228, 229, 230, 231, 232, 233,
+ 0, 0, 0, 0, 0, 0, 0, 0, 23, 0,
+ 0, 0, 0, 0, 0, 1485, 0, 0, 0, 0,
+ 0, 0, 1490, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1502, 1503, 633, 0, 24, 0, 0,
+ 0, 25, 26, 27, 28, 29, 30, 31, 32, 33,
+ 0, 34, 35, 36, 37, 38, 39, 40, 41, 0,
+ 0, 971, 42, 43, 44, 45, 46, 47, 48, 0,
+ 49, 50, 51, 52, 53, 0, 0, 1545, 0, 301,
302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 0, 0, 301, 302, 303, 304, 305, 1363, 306, 307,
+ 0, 0, 54, 55, 56, 1346, 0, 1347, 0, 57,
+ 0, 58, 0, 59, 60, 61, 62, 63, 64, 65,
+ 0, 66, 545, 27, 28, 546, 547, 31, 32, 33,
+ 0, 34, 0, 36, 37, 38, 0, 40, 41, 0,
+ 1593, 0, 0, 0, 0, 1600, 0, 0, 0, 301,
+ 302, 303, 304, 305, 53, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 0, 0, 0, 0, 741, 0, 0,
+ 0, 0, 54, 55, 56, 301, 302, 303, 304, 305,
+ 0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 0, 66, 0, 0, 0, 315, 0, 0, 301, 302,
+ 303, 304, 305, 746, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
+ 0, 0, 0, 0, 1688, 0, 747, 0, 0, 301,
+ 302, 303, 304, 305, 1698, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 301, 302, 303, 304, 305, 885, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 0, 0, 1917, 0,
- 1420, 301, 302, 303, 304, 305, 0, 306, 307, 308,
- 309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 0, 0, 0, 0, 0, 0, 0, 1426,
- 0, 301, 302, 303, 304, 305, 1955, 306, 307, 308,
- 309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 0, 0, 301, 302, 303, 304, 305, 1429,
- 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 0, 0, 301, 302, 303,
- 304, 305, 1432, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 315, 0, 0, 301, 302, 303, 304, 305,
+ 909, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 0, 0, 0, 0, 0, 315, 0, 0, 301, 302,
+ 303, 304, 305, 1167, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
+ 0, 0, 0, 1773, 0, 0, 1369, 301, 302, 303,
+ 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 301, 302, 303, 304, 305, 1433, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 1370, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
+ 315, 0, 0, 0, 0, 0, 0, 0, 1427, 0,
+ 0, 0, 1825, 301, 302, 303, 304, 305, 0, 306,
+ 307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
+ 0, 0, 0, 315, 0, 0, 0, 0, 0, 0,
+ 0, 1433, 301, 302, 303, 304, 305, 0, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
+ 0, 0, 315, 0, 1879, 301, 302, 303, 304, 305,
+ 1436, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 0, 0, 0, 0, 0, 315, 0, 0, 301, 302,
+ 303, 304, 305, 1439, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
+ 0, 0, 0, 0, 0, 0, 1440, 1924, 301, 302,
+ 303, 304, 305, 0, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
+ 0, 0, 0, 0, 0, 0, 1486, 0, 0, 0,
+ 301, 302, 303, 304, 305, 1962, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 0, 0, 301, 302, 303, 304, 305, 1479, 306,
+ 315, 0, 0, 301, 302, 303, 304, 305, 1547, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
0, 0, 0, 315, 0, 0, 301, 302, 303, 304,
- 305, 1540, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1550, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 0, 0, 301,
- 302, 303, 304, 305, 1543, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 1552, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 0, 0, 301, 302, 303, 304, 305, 1545, 306, 307,
+ 0, 0, 301, 302, 303, 304, 305, 1798, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
0, 0, 315, 0, 0, 301, 302, 303, 304, 305,
- 1791, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 315, 0, 0, 301, 302,
- 303, 304, 305, 1844, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
- 467, 0, 0, 0, 526, 301, 302, 303, 304, 305,
- 0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 526, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 527, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 557, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 677, 306, 307, 308, 309, 310,
- 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 678, 306, 307, 308, 309,
- 310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 691, 306, 307, 308,
- 309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 692, 306, 307,
+ 1851, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 0, 0, 0, 0, 0, 315, 0, 471, 0, 0,
+ 0, 531, 301, 302, 303, 304, 305, 0, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 693, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 531, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 694,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 532,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 695, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 562, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 696, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 682, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 754, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 683, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 755, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 696, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 756, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 697, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 900, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 698, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 901, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 699, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 920, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 700, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 1056, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 701, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 1057,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 760,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1071, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 761, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1072, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 762, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 1103, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 907, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 1104, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 908, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 1105, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 927, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 1106, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 1063, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 1107, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 1064, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 1108, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 1078, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 1109, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 1079, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
0, 0, 0, 315, 301, 302, 303, 304, 305, 1110,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
@@ -1900,39 +1879,39 @@ static const short yytable[] = { 138,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
0, 315, 301, 302, 303, 304, 305, 1128, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 1144, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 1129, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 1259,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 1130,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1273, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1131, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1274, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1132, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 1283, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 1133, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 1286, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 1134, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 1297, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 1135, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 1302, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 1151, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 1305, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 1266, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 1307, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 1280, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 1308, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 1281, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 1309,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 1290,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1310, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1293, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1311, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1304, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 1312, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 1309, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 1313, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 1312, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
302, 303, 304, 305, 1314, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
@@ -1974,24 +1953,24 @@ static const short yytable[] = { 138,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
304, 305, 1332, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 1336, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 1333, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 1442, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 1334, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 1454, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 1335, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 1455, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 1336, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 1456, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 1337, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 1457, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 1338, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 1458,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 1339,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1459, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1343, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1460, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1449, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
304, 305, 1461, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
@@ -2022,22 +2001,22 @@ static const short yytable[] = { 138,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
301, 302, 303, 304, 305, 1474, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 1476, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 1475, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 1558, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 1476, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 1559, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 1477, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 1560,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 1478,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1561, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1479, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1562, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1480, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 1563, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 1481, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 1564, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 1483, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
302, 303, 304, 305, 1565, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
@@ -2068,20 +2047,20 @@ static const short yytable[] = { 138,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
0, 315, 301, 302, 303, 304, 305, 1578, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 1654, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 1579, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 1655,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 1580,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1656, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1581, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1657, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1582, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 1658, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 1583, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 1659, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 1584, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 1660, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 1585, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
301, 302, 303, 304, 305, 1661, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
@@ -2112,22 +2091,22 @@ static const short yytable[] = { 138,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
0, 0, 315, 301, 302, 303, 304, 305, 1674, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 1731,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 1675,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1738, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1676, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1739, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1677, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 1740, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 1678, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 1741, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 1679, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 1742, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 1680, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 1743, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 1681, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 1744, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 1738, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
0, 315, 301, 302, 303, 304, 305, 1745, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
@@ -2152,22 +2131,22 @@ static const short yytable[] = { 138,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
0, 315, 301, 302, 303, 304, 305, 1755, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 1790, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 1756, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 1798,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 1757,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1799, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1758, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1800, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1759, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 1801, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 1760, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 1802, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 1761, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 1803, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 1762, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 1804, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 1797, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
315, 301, 302, 303, 304, 305, 1805, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
@@ -2192,20 +2171,20 @@ static const short yytable[] = { 138,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
315, 301, 302, 303, 304, 305, 1815, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 1853, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 1816, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 1854, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 1817, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 1855,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 1818,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1856, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1819, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1857, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1820, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 1858, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 1821, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 1859, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 1822, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
302, 303, 304, 305, 1860, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
@@ -2230,20 +2209,20 @@ static const short yytable[] = { 138,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
302, 303, 304, 305, 1870, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 1902, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 1871, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 1903, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 1872, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 1904, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 1873, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 1905, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 1874, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 1906,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 1875,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1907, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1876, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1908, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1877, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
304, 305, 1909, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
@@ -2262,19 +2241,19 @@ static const short yytable[] = { 138,
0, 0, 0, 315, 301, 302, 303, 304, 305, 1916,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1940, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1917, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1941, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1918, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 1942, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 1919, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 1943, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 1920, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 1944, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 1921, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 1945, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 1922, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 1946, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 1923, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
0, 315, 301, 302, 303, 304, 305, 1947, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
@@ -2293,20 +2272,20 @@ static const short yytable[] = { 138,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
302, 303, 304, 305, 1954, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 1984, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 1955, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 1985, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 1956, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 1986, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 1957, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 1987, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 1958, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 1988,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 1959,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 1989, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1960, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 1990, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 1961, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
304, 305, 1991, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
@@ -2325,743 +2304,757 @@ static const short yytable[] = { 138,
0, 0, 0, 315, 301, 302, 303, 304, 305, 1998,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 2028, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1999, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 2029, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 2000, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 2030, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 2001, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 2031, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 2002, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 2032, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 2003, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 2033, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 2004, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 2034, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 2005, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
0, 315, 301, 302, 303, 304, 305, 2035, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
0, 0, 315, 301, 302, 303, 304, 305, 2036, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 2059,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 2037,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 2060, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 2038, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 2061, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 2039, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 2062, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 2040, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 2063, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 2041, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 2064, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 2042, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 2065, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 2043, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
315, 301, 302, 303, 304, 305, 2066, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
0, 315, 301, 302, 303, 304, 305, 2067, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 2101, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 2068, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 2102,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 2069,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 2103, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 2070, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 2104, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 2071, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 2105, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 2072, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 2106, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 2073, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 2107, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 2074, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
301, 302, 303, 304, 305, 2108, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
315, 301, 302, 303, 304, 305, 2109, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 2131, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 2110, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 2132, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 2111, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 2133,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 2112,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 2134, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 2113, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 2135, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 2114, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 2136, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 2115, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 2149, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 2116, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 2150, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 2138, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 2151, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 2139, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 2152, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 2140, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 2153, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 2141, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 2154, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 2142, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 2170,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 2143,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 2171, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 2156, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 2172, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 2157, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 2173, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 2158, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 2174, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 2159, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 2175, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 2160, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 2194, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 2161, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 2195, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 2177, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 2196, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 2178, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 2206, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 2179, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 2207,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 2180,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 2208, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 2181, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 2221, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 2182, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 2222, 306, 307, 308, 309, 310, 311, 312,
+ 304, 305, 2201, 306, 307, 308, 309, 310, 311, 312,
313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
- 303, 304, 305, 2223, 306, 307, 308, 309, 310, 311,
+ 303, 304, 305, 2202, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
- 302, 303, 304, 305, 2239, 306, 307, 308, 309, 310,
+ 302, 303, 304, 305, 2203, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 301, 302, 303, 304, 305, 2240, 306, 307, 308, 309,
+ 301, 302, 303, 304, 305, 2213, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 301, 302, 303, 304, 305, 2241, 306, 307, 308,
+ 315, 301, 302, 303, 304, 305, 2214, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 301, 302, 303, 304, 305, 2245, 306, 307,
+ 0, 315, 301, 302, 303, 304, 305, 2215, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 301, 302, 303, 304, 305, 2246, 306,
+ 0, 0, 315, 301, 302, 303, 304, 305, 2228, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 301, 302, 303, 304, 305, 2247,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 2229,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
0, 0, 0, 0, 315, 301, 302, 303, 304, 305,
- 2251, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 2230, 306, 307, 308, 309, 310, 311, 312, 313, 314,
0, 0, 0, 0, 0, 315, 301, 302, 303, 304,
- 305, 2252, 306, 307, 308, 309, 310, 311, 312, 313,
+ 305, 2246, 306, 307, 308, 309, 310, 311, 312, 313,
314, 0, 0, 0, 0, 0, 315, 301, 302, 303,
- 304, 305, 2253, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 599, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 656, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 658, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 660, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 662, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 664, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 666, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 668, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 670, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 672, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 674, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 676, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 680, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 682, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 684, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 686, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 688, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 690, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 757, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 762, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 992, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 994, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 996, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 998, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 0,
- 0, 999, 301, 302, 303, 304, 305, 0, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 0, 0, 1137, 301, 302, 303,
- 304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 497,
- 301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
+ 304, 305, 2247, 306, 307, 308, 309, 310, 311, 312,
+ 313, 314, 0, 0, 0, 0, 0, 315, 301, 302,
+ 303, 304, 305, 2248, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 0, 0, 0, 0, 0, 315, 301,
+ 302, 303, 304, 305, 2252, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 301, 302, 303, 304, 305, 2253, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 0, 498, 301, 302, 303, 304, 305, 0, 306,
+ 315, 301, 302, 303, 304, 305, 2254, 306, 307, 308,
+ 309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
+ 0, 315, 301, 302, 303, 304, 305, 2258, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
+ 0, 0, 315, 301, 302, 303, 304, 305, 2259, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 0, 499, 301, 302, 303, 304,
- 305, 0, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 0, 0, 0, 0, 0, 315, 0, 501, 301,
+ 0, 0, 0, 315, 301, 302, 303, 304, 305, 2260,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 477, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 604, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 661, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 663, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 665, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 667, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 669, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 671, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 673, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 675, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 677, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 679, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 681, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 685, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 687, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 689, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 691, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 693, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 695, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 763, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 768, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 999, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 1001, 301,
302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 0, 503, 301, 302, 303, 304, 305, 0, 306, 307,
+ 0, 0, 0, 1003, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 1005, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 0, 0, 1006, 301, 302, 303, 304, 305, 0,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
+ 0, 0, 0, 0, 315, 0, 0, 0, 1144, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 471, 301, 302, 303, 304, 305, 0, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 504, 301, 302, 303, 304, 305,
+ 0, 0, 315, 0, 501, 301, 302, 303, 304, 305,
0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 315, 0, 511, 301, 302,
+ 0, 0, 0, 0, 0, 315, 0, 502, 301, 302,
303, 304, 305, 0, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
- 551, 301, 302, 303, 304, 305, 0, 306, 307, 308,
+ 503, 301, 302, 303, 304, 305, 0, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 0, 552, 301, 302, 303, 304, 305, 0,
+ 0, 315, 0, 505, 301, 302, 303, 304, 305, 0,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 0, 555, 301, 302, 303,
+ 0, 0, 0, 0, 315, 0, 507, 301, 302, 303,
304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 561,
+ 313, 314, 0, 0, 0, 0, 0, 315, 0, 508,
301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 0, 655, 301, 302, 303, 304, 305, 0, 306,
+ 315, 0, 516, 301, 302, 303, 304, 305, 0, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 0, 657, 301, 302, 303, 304,
+ 0, 0, 0, 315, 0, 556, 301, 302, 303, 304,
305, 0, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 0, 0, 0, 0, 0, 315, 0, 659, 301,
+ 314, 0, 0, 0, 0, 0, 315, 0, 557, 301,
302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 0, 661, 301, 302, 303, 304, 305, 0, 306, 307,
+ 0, 560, 301, 302, 303, 304, 305, 0, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 663, 301, 302, 303, 304, 305,
+ 0, 0, 315, 0, 566, 301, 302, 303, 304, 305,
0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 315, 0, 665, 301, 302,
+ 0, 0, 0, 0, 0, 315, 0, 660, 301, 302,
303, 304, 305, 0, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
- 667, 301, 302, 303, 304, 305, 0, 306, 307, 308,
+ 662, 301, 302, 303, 304, 305, 0, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 0, 669, 301, 302, 303, 304, 305, 0,
+ 0, 315, 0, 664, 301, 302, 303, 304, 305, 0,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 0, 671, 301, 302, 303,
+ 0, 0, 0, 0, 315, 0, 666, 301, 302, 303,
304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 673,
+ 313, 314, 0, 0, 0, 0, 0, 315, 0, 668,
301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 0, 675, 301, 302, 303, 304, 305, 0, 306,
+ 315, 0, 670, 301, 302, 303, 304, 305, 0, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 0, 679, 301, 302, 303, 304,
+ 0, 0, 0, 315, 0, 672, 301, 302, 303, 304,
305, 0, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 0, 0, 0, 0, 0, 315, 0, 681, 301,
+ 314, 0, 0, 0, 0, 0, 315, 0, 674, 301,
302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 0, 683, 301, 302, 303, 304, 305, 0, 306, 307,
+ 0, 676, 301, 302, 303, 304, 305, 0, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 685, 301, 302, 303, 304, 305,
+ 0, 0, 315, 0, 678, 301, 302, 303, 304, 305,
0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 315, 0, 687, 301, 302,
+ 0, 0, 0, 0, 0, 315, 0, 680, 301, 302,
303, 304, 305, 0, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
- 689, 301, 302, 303, 304, 305, 0, 306, 307, 308,
+ 684, 301, 302, 303, 304, 305, 0, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 0, 722, 301, 302, 303, 304, 305, 0,
+ 0, 315, 0, 686, 301, 302, 303, 304, 305, 0,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 0, 724, 301, 302, 303,
+ 0, 0, 0, 0, 315, 0, 688, 301, 302, 303,
304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 736,
+ 313, 314, 0, 0, 0, 0, 0, 315, 0, 690,
301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 0, 737, 301, 302, 303, 304, 305, 0, 306,
+ 315, 0, 692, 301, 302, 303, 304, 305, 0, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 0, 738, 301, 302, 303, 304,
+ 0, 0, 0, 315, 0, 694, 301, 302, 303, 304,
305, 0, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 0, 0, 0, 0, 0, 315, 0, 742, 301,
+ 314, 0, 0, 0, 0, 0, 315, 0, 727, 301,
302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 0, 743, 301, 302, 303, 304, 305, 0, 306, 307,
+ 0, 729, 301, 302, 303, 304, 305, 0, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 744, 301, 302, 303, 304, 305,
+ 0, 0, 315, 0, 742, 301, 302, 303, 304, 305,
0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 315, 0, 745, 301, 302,
+ 0, 0, 0, 0, 0, 315, 0, 743, 301, 302,
303, 304, 305, 0, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
- 746, 301, 302, 303, 304, 305, 0, 306, 307, 308,
+ 744, 301, 302, 303, 304, 305, 0, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 0, 768, 301, 302, 303, 304, 305, 0,
+ 0, 315, 0, 748, 301, 302, 303, 304, 305, 0,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 0, 775, 301, 302, 303,
+ 0, 0, 0, 0, 315, 0, 749, 301, 302, 303,
304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 991,
+ 313, 314, 0, 0, 0, 0, 0, 315, 0, 750,
301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 0, 993, 301, 302, 303, 304, 305, 0, 306,
+ 315, 0, 751, 301, 302, 303, 304, 305, 0, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 0, 995, 301, 302, 303, 304,
+ 0, 0, 0, 315, 0, 752, 301, 302, 303, 304,
305, 0, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 0, 0, 0, 0, 0, 315, 0, 997, 301,
+ 314, 0, 0, 0, 0, 0, 315, 0, 774, 301,
302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 0, 1060, 301, 302, 303, 304, 305, 0, 306, 307,
+ 0, 781, 301, 302, 303, 304, 305, 0, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 1161, 301, 302, 303, 304, 305,
+ 0, 0, 315, 0, 998, 301, 302, 303, 304, 305,
0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 315, 0, 1189, 301, 302,
+ 0, 0, 0, 0, 0, 315, 0, 1000, 301, 302,
303, 304, 305, 0, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
- 1292, 301, 302, 303, 304, 305, 0, 306, 307, 308,
+ 1002, 301, 302, 303, 304, 305, 0, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 0, 1296, 301, 302, 303, 304, 305, 0,
+ 0, 315, 0, 1004, 301, 302, 303, 304, 305, 0,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 0, 1298, 301, 302, 303,
+ 0, 0, 0, 0, 315, 0, 1067, 301, 302, 303,
304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 1416,
+ 313, 314, 0, 0, 0, 0, 0, 315, 0, 1168,
301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 0, 1445, 301, 302, 303, 304, 305, 0, 306,
+ 315, 0, 1196, 301, 302, 303, 304, 305, 0, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 0, 1447, 301, 302, 303, 304,
+ 0, 0, 0, 315, 0, 1299, 301, 302, 303, 304,
305, 0, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 0, 0, 0, 0, 0, 315, 0, 1449, 301,
+ 314, 0, 0, 0, 0, 0, 315, 0, 1303, 301,
302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 0, 1451, 301, 302, 303, 304, 305, 0, 306, 307,
+ 0, 1305, 301, 302, 303, 304, 305, 0, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 1452, 301, 302, 303, 304, 305,
+ 0, 0, 315, 0, 1423, 301, 302, 303, 304, 305,
0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 315, 0, 1453, 301, 302,
+ 0, 0, 0, 0, 0, 315, 0, 1452, 301, 302,
303, 304, 305, 0, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
- 1475, 301, 302, 303, 304, 305, 0, 306, 307, 308,
+ 1454, 301, 302, 303, 304, 305, 0, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 0, 1580, 301, 302, 303, 304, 305, 0,
+ 0, 315, 0, 1456, 301, 302, 303, 304, 305, 0,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 0, 1735, 301, 302, 303,
+ 0, 0, 0, 0, 315, 0, 1458, 301, 302, 303,
304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 1736,
+ 313, 314, 0, 0, 0, 0, 0, 315, 0, 1459,
301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 0, 1737, 301, 302, 303, 304, 305, 0, 306,
+ 315, 0, 1460, 301, 302, 303, 304, 305, 0, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 0, 1899, 301, 302, 303, 304,
+ 0, 0, 0, 315, 0, 1482, 301, 302, 303, 304,
305, 0, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 0, 0, 0, 0, 0, 315, 0, 1900, 301,
+ 314, 0, 0, 0, 0, 0, 315, 0, 1587, 301,
302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 0, 1901, 301, 302, 303, 304, 305, 0, 306, 307,
+ 0, 1742, 301, 302, 303, 304, 305, 0, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 2022, 301, 302, 303, 304, 305,
+ 0, 0, 315, 0, 1743, 301, 302, 303, 304, 305,
0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 315, 0, 2023, 301, 302,
+ 0, 0, 0, 0, 0, 315, 0, 1744, 301, 302,
303, 304, 305, 0, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
- 2024, 301, 302, 303, 304, 305, 0, 306, 307, 308,
+ 1906, 301, 302, 303, 304, 305, 0, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 0, 2025, 301, 302, 303, 304, 305, 0,
+ 0, 315, 0, 1907, 301, 302, 303, 304, 305, 0,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 0, 2026, 301, 302, 303,
+ 0, 0, 0, 0, 315, 0, 1908, 301, 302, 303,
304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315, 0, 2027,
+ 313, 314, 0, 0, 0, 0, 0, 315, 0, 2029,
301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
- 315, 0, 2137, 301, 302, 303, 304, 305, 0, 306,
+ 315, 0, 2030, 301, 302, 303, 304, 305, 0, 306,
307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
- 0, 0, 0, 315, 0, 2138, 301, 302, 303, 304,
+ 0, 0, 0, 315, 0, 2031, 301, 302, 303, 304,
305, 0, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 0, 0, 0, 0, 0, 315, 0, 2139, 301,
+ 314, 0, 0, 0, 0, 0, 315, 0, 2032, 301,
302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
- 0, 2197, 301, 302, 303, 304, 305, 0, 306, 307,
+ 0, 2033, 301, 302, 303, 304, 305, 0, 306, 307,
308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
- 0, 0, 315, 0, 2198, 301, 302, 303, 304, 305,
+ 0, 0, 315, 0, 2034, 301, 302, 303, 304, 305,
0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 0, 0, 0, 0, 0, 315, 0, 2199, 301, 302,
+ 0, 0, 0, 0, 0, 315, 0, 2144, 301, 302,
303, 304, 305, 0, 306, 307, 308, 309, 310, 311,
312, 313, 314, 0, 0, 0, 0, 0, 315, 0,
- 2257, 301, 302, 303, 304, 305, 0, 306, 307, 308,
+ 2145, 301, 302, 303, 304, 305, 0, 306, 307, 308,
309, 310, 311, 312, 313, 314, 0, 0, 0, 0,
- 0, 315, 0, 2258, 301, 302, 303, 304, 305, 0,
+ 0, 315, 0, 2146, 301, 302, 303, 304, 305, 0,
306, 307, 308, 309, 310, 311, 312, 313, 314, 0,
- 0, 0, 0, 0, 315, 0, 2259, 301, 302, 303,
+ 0, 0, 0, 0, 315, 0, 2204, 301, 302, 303,
304, 305, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 0, 0, 0, 0, 0, 315
+ 313, 314, 0, 0, 0, 0, 0, 315, 0, 2205,
+ 301, 302, 303, 304, 305, 0, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 0, 0, 0, 0, 0,
+ 315, 0, 2206, 301, 302, 303, 304, 305, 0, 306,
+ 307, 308, 309, 310, 311, 312, 313, 314, 0, 0,
+ 0, 0, 0, 315, 0, 2264, 301, 302, 303, 304,
+ 305, 0, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 0, 0, 0, 0, 0, 315, 0, 2265, 301,
+ 302, 303, 304, 305, 0, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 0, 0, 0, 0, 0, 315,
+ 0, 2266, 301, 302, 303, 304, 305, 0, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 0, 0, 0,
+ 0, 0, 315
};
static const short yycheck[] = { 23,
- 23, 91, 354, 293, 295, 4, 4, 714, 4, 328,
- 4, 4, 4, 42, 3, 1179, 3, 179, 285, 286,
- 287, 183, 66, 66, 65, 65, 7, 71, 71, 1348,
- 4, 7, 66, 1352, 4, 66, 1355, 71, 328, 66,
- 71, 102, 6, 5, 71, 4, 5, 66, 66, 65,
- 83, 66, 71, 71, 1078, 1270, 71, 1272, 38, 184,
- 185, 41, 42, 1087, 66, 184, 185, 184, 185, 71,
- 1094, 196, 34, 35, 36, 34, 35, 36, 184, 185,
- 195, 200, 195, 202, 201, 49, 201, 6, 201, 6,
- 184, 185, 184, 185, 200, 6, 202, 184, 185, 184,
- 185, 195, 184, 185, 128, 129, 130, 201, 200, 133,
- 134, 38, 136, 200, 41, 202, 201, 116, 200, 143,
- 144, 145, 1286, 147, 7, 149, 150, 165, 152, 7,
- 6, 105, 106, 66, 195, 105, 106, 38, 71, 6,
- 41, 42, 195, 44, 197, 169, 170, 136, 137, 138,
- 139, 140, 141, 142, 143, 195, 863, 6, 202, 202,
- 201, 201, 184, 185, 188, 189, 195, 191, 202, 193,
- 203, 202, 196, 197, 196, 202, 196, 496, 7, 195,
- 200, 6, 473, 202, 202, 191, 192, 202, 507, 170,
- 171, 172, 173, 199, 170, 171, 172, 173, 185, 6,
- 202, 195, 201, 201, 195, 201, 496, 474, 201, 201,
- 191, 192, 374, 195, 238, 191, 192, 507, 199, 243,
+ 23, 7, 91, 7, 358, 295, 719, 179, 4, 329,
+ 4, 183, 4, 4, 44, 45, 4, 285, 286, 287,
+ 4, 3, 42, 65, 1277, 66, 1279, 65, 1355, 4,
+ 71, 7, 1359, 1186, 65, 1362, 38, 39, 40, 41,
+ 42, 43, 44, 45, 102, 47, 4, 49, 50, 51,
+ 66, 53, 54, 1085, 66, 71, 6, 83, 5, 71,
+ 4, 5, 1094, 6, 184, 185, 66, 195, 70, 1101,
+ 196, 71, 165, 201, 200, 196, 66, 184, 185, 200,
+ 200, 71, 202, 7, 184, 185, 6, 34, 35, 36,
+ 34, 35, 36, 293, 201, 6, 98, 99, 100, 49,
+ 200, 195, 202, 197, 128, 129, 130, 184, 185, 133,
+ 134, 38, 136, 6, 41, 117, 184, 185, 195, 143,
+ 144, 145, 116, 147, 201, 149, 150, 6, 152, 329,
+ 105, 106, 200, 195, 202, 6, 166, 195, 168, 201,
+ 1293, 186, 187, 188, 174, 169, 170, 105, 106, 194,
+ 6, 184, 185, 195, 191, 192, 869, 195, 66, 201,
+ 197, 202, 199, 71, 188, 189, 7, 191, 201, 193,
+ 201, 66, 196, 197, 66, 195, 71, 203, 6, 71,
+ 500, 184, 185, 184, 185, 38, 202, 477, 41, 42,
+ 202, 44, 512, 6, 170, 171, 172, 173, 201, 200,
+ 202, 8, 202, 185, 195, 201, 378, 201, 195, 201,
+ 478, 241, 202, 201, 238, 191, 192, 201, 195, 243,
244, 245, 246, 247, 248, 249, 250, 251, 252, 253,
254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
264, 265, 266, 267, 268, 269, 270, 271, 272, 273,
274, 275, 276, 277, 278, 279, 280, 281, 282, 283,
- 284, 44, 45, 1287, 1583, 184, 185, 1291, 1587, 293,
- 195, 1590, 295, 184, 185, 6, 7, 301, 302, 303,
+ 284, 195, 1294, 1590, 184, 185, 1298, 1594, 7, 293,
+ 1597, 3, 295, 184, 185, 6, 7, 301, 302, 303,
304, 305, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 315, 170, 171, 172, 173, 195, 321, 196, 323,
- 191, 192, 200, 327, 328, 1012, 197, 6, 199, 333,
- 334, 335, 336, 195, 338, 339, 340, 341, 342, 343,
- 344, 8, 184, 185, 1539, 65, 196, 1542, 46, 1544,
- 200, 195, 356, 357, 358, 359, 184, 185, 362, 201,
- 195, 170, 171, 172, 173, 195, 370, 197, 184, 185,
- 184, 185, 200, 191, 192, 379, 121, 122, 123, 124,
- 125, 1680, 191, 192, 200, 1684, 200, 1686, 176, 177,
- 178, 195, 180, 181, 182, 183, 184, 185, 186, 187,
- 188, 700, 195, 166, 196, 168, 194, 197, 200, 199,
- 195, 174, 184, 185, 417, 177, 178, 42, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, 196, 200, 728,
- 700, 200, 194, 44, 704, 1439, 1440, 1441, 1442, 1634,
- 184, 185, 1446, 1638, 195, 1640, 184, 185, 184, 185,
- 59, 60, 61, 62, 701, 64, 200, 42, 728, 758,
- 759, 760, 200, 42, 200, 469, 191, 192, 42, 196,
- 473, 475, 197, 200, 199, 6, 56, 57, 241, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, 758, 759,
- 760, 201, 496, 194, 184, 185, 186, 187, 188, 41,
- 42, 505, 44, 507, 194, 509, 510, 174, 175, 176,
- 177, 178, 516, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 526, 527, 55, 6, 7, 194, 186, 187,
- 188, 535, 191, 192, 42, 202, 194, 201, 197, 195,
- 199, 197, 546, 6, 195, 1549, 1550, 195, 195, 1553,
- 197, 195, 195, 557, 197, 559, 560, 195, 195, 197,
- 197, 195, 195, 197, 197, 195, 1253, 197, 195, 195,
- 197, 197, 195, 195, 197, 197, 195, 195, 197, 197,
- 195, 880, 197, 6, 855, 856, 6, 4, 351, 352,
- 195, 195, 197, 197, 4, 195, 599, 197, 195, 200,
- 197, 202, 200, 42, 202, 3, 4, 200, 3, 202,
- 880, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, 200, 200, 202, 202, 200,
- 1644, 202, 195, 174, 175, 176, 177, 178, 5, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, 195, 200,
- 200, 202, 202, 194, 200, 200, 202, 202, 200, 8,
- 202, 6, 195, 677, 678, 200, 200, 202, 202, 200,
- 200, 202, 202, 200, 200, 202, 202, 691, 692, 693,
- 694, 695, 696, 697, 195, 8, 700, 200, 6, 202,
- 704, 5, 200, 707, 202, 200, 200, 202, 202, 200,
- 195, 202, 716, 200, 1046, 202, 200, 200, 202, 202,
- 200, 200, 202, 202, 728, 729, 200, 195, 202, 1733,
- 200, 200, 202, 202, 200, 200, 202, 202, 200, 809,
- 202, 200, 200, 202, 202, 200, 200, 202, 202, 201,
- 195, 195, 195, 201, 758, 759, 760, 1004, 195, 763,
- 764, 201, 525, 767, 195, 6, 195, 195, 195, 4,
- 6, 201, 108, 199, 778, 779, 201, 201, 197, 197,
- 201, 6, 195, 195, 195, 5, 184, 185, 195, 195,
- 1794, 195, 190, 195, 195, 1042, 195, 195, 195, 195,
- 198, 195, 195, 201, 195, 195, 6, 195, 195, 813,
- 814, 815, 816, 817, 818, 819, 820, 821, 822, 823,
+ 314, 315, 195, 1546, 202, 195, 1549, 321, 1551, 323,
+ 500, 191, 192, 66, 328, 329, 1019, 202, 71, 199,
+ 202, 195, 512, 337, 338, 339, 340, 7, 342, 343,
+ 344, 345, 346, 347, 348, 355, 356, 184, 185, 170,
+ 171, 172, 173, 184, 185, 195, 360, 361, 362, 363,
+ 184, 185, 366, 200, 65, 184, 185, 184, 185, 200,
+ 374, 357, 358, 357, 358, 195, 200, 66, 46, 383,
+ 1687, 200, 71, 200, 1691, 195, 1693, 174, 175, 176,
+ 177, 178, 195, 180, 181, 182, 183, 184, 185, 186,
+ 187, 188, 8, 184, 185, 705, 42, 194, 1641, 184,
+ 185, 195, 1645, 197, 1647, 202, 184, 185, 421, 200,
+ 197, 196, 199, 42, 136, 137, 138, 139, 140, 141,
+ 142, 143, 200, 733, 1446, 1447, 1448, 1449, 176, 177,
+ 178, 1453, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, 170, 171, 172, 173, 195, 194, 197, 706, 202,
+ 184, 185, 191, 192, 764, 765, 766, 42, 197, 473,
+ 199, 42, 191, 192, 477, 479, 200, 195, 177, 178,
+ 199, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ 38, 44, 6, 41, 42, 194, 500, 184, 185, 201,
+ 170, 171, 172, 173, 201, 509, 510, 42, 512, 196,
+ 514, 515, 121, 122, 123, 124, 125, 521, 191, 192,
+ 530, 191, 192, 6, 197, 705, 199, 531, 532, 709,
+ 184, 185, 186, 187, 188, 196, 540, 6, 196, 200,
+ 194, 55, 200, 195, 1556, 1557, 195, 551, 1560, 59,
+ 60, 61, 62, 733, 64, 196, 191, 192, 562, 200,
+ 564, 565, 196, 195, 195, 197, 200, 1260, 174, 175,
+ 176, 177, 178, 6, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 4, 764, 765, 766, 887, 194, 42,
+ 196, 861, 862, 195, 195, 197, 3, 4, 195, 5,
+ 197, 604, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 41, 42, 195, 44,
+ 197, 38, 195, 195, 197, 197, 195, 4, 197, 1651,
+ 195, 195, 197, 197, 195, 195, 197, 197, 195, 195,
+ 197, 197, 59, 60, 61, 62, 63, 64, 56, 57,
+ 174, 175, 176, 177, 178, 195, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 6, 6, 7, 682, 683,
+ 194, 3, 195, 195, 197, 197, 195, 195, 197, 197,
+ 195, 195, 696, 697, 698, 699, 700, 701, 702, 6,
+ 6, 705, 195, 6, 197, 709, 5, 887, 712, 200,
+ 200, 202, 202, 200, 724, 202, 200, 721, 202, 1053,
+ 200, 200, 202, 202, 200, 200, 202, 202, 1740, 733,
+ 200, 735, 202, 200, 200, 202, 202, 201, 200, 6,
+ 202, 200, 200, 202, 202, 200, 815, 202, 4, 201,
+ 760, 761, 762, 200, 200, 202, 202, 200, 195, 202,
+ 764, 765, 766, 1011, 6, 769, 770, 201, 200, 773,
+ 202, 200, 200, 202, 202, 195, 786, 184, 185, 195,
+ 784, 785, 200, 190, 202, 795, 197, 195, 195, 1801,
+ 200, 200, 202, 202, 201, 200, 200, 202, 202, 201,
+ 200, 1049, 202, 200, 200, 202, 202, 200, 200, 202,
+ 202, 200, 200, 202, 202, 819, 820, 821, 822, 823,
824, 825, 826, 827, 828, 829, 830, 831, 832, 833,
- 834, 835, 836, 837, 838, 174, 175, 176, 177, 178,
+ 834, 835, 836, 837, 838, 839, 840, 841, 842, 843,
+ 844, 6, 195, 174, 175, 176, 177, 178, 195, 180,
+ 181, 182, 183, 184, 185, 186, 187, 188, 200, 862,
+ 202, 195, 200, 194, 202, 200, 870, 202, 174, 175,
+ 176, 177, 178, 201, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 887, 200, 889, 202, 891, 194, 201,
195, 180, 181, 182, 183, 184, 185, 186, 187, 188,
- 195, 195, 195, 856, 195, 194, 196, 196, 195, 4,
- 864, 174, 175, 176, 177, 178, 195, 180, 181, 182,
- 183, 184, 185, 186, 187, 188, 880, 195, 882, 195,
- 884, 194, 7, 195, 195, 195, 195, 7, 195, 194,
- 7, 7, 7, 196, 200, 899, 900, 901, 200, 199,
- 7, 103, 105, 201, 166, 5, 5, 5, 5, 5,
- 5, 5, 925, 5, 5, 5, 920, 921, 922, 5,
- 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 1264, 174, 175, 176, 177, 178, 154, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, 5, 5,
- 5, 5, 3, 194, 6, 5, 719, 6, 5, 5,
- 963, 200, 196, 6, 4, 6, 199, 195, 7, 7,
- 7, 7, 7, 1977, 174, 175, 176, 177, 178, 7,
- 180, 181, 182, 183, 184, 185, 186, 187, 188, 7,
- 202, 754, 755, 756, 194, 202, 8, 201, 7, 7,
- 201, 1005, 174, 175, 176, 177, 178, 7, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, 780, 199, 167,
- 200, 200, 194, 200, 196, 200, 789, 1031, 1032, 1033,
- 1100, 200, 200, 200, 200, 200, 200, 200, 1042, 200,
- 200, 200, 200, 200, 200, 200, 200, 200, 200, 200,
- 200, 200, 1056, 1057, 200, 5, 1069, 200, 200, 200,
- 200, 200, 196, 200, 1068, 195, 195, 1071, 195, 195,
- 6, 6, 195, 195, 195, 4, 195, 1081, 6, 6,
- 198, 195, 195, 195, 1088, 1089, 1090, 195, 6, 195,
- 195, 1095, 195, 195, 195, 1099, 7, 6, 4, 1103,
- 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113,
+ 195, 195, 906, 907, 908, 194, 197, 174, 175, 176,
+ 177, 178, 6, 180, 181, 182, 183, 184, 185, 186,
+ 187, 188, 199, 927, 928, 929, 932, 194, 201, 108,
+ 6, 195, 174, 175, 176, 177, 178, 1271, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 195, 195, 195,
+ 195, 195, 194, 5, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 6, 195, 195, 970, 3, 4,
+ 195, 195, 1984, 195, 9, 10, 11, 12, 13, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 195, 6,
+ 195, 195, 195, 195, 195, 195, 195, 195, 1012, 174,
+ 175, 176, 177, 178, 1024, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, 195, 200, 196, 200, 4, 194,
+ 194, 199, 7, 7, 1038, 1039, 1040, 7, 1107, 201,
+ 7, 196, 7, 7, 1054, 1049, 1056, 103, 1058, 201,
+ 105, 166, 5, 5, 5, 5, 5, 5, 5, 1063,
+ 1064, 5, 5, 5, 5, 5, 5, 1053, 5, 1053,
+ 1076, 1075, 5, 5, 1078, 5, 5, 5, 5, 5,
+ 5, 5, 154, 5, 1088, 5, 5, 5, 3, 5,
+ 200, 1095, 1096, 1097, 5, 196, 6, 5, 1102, 6,
+ 4, 6, 1106, 199, 7, 7, 1110, 1111, 1112, 1113,
1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123,
- 1124, 1125, 1126, 1127, 1128, 174, 175, 176, 177, 178,
- 195, 180, 181, 182, 183, 184, 185, 186, 187, 188,
- 1144, 7, 195, 7, 7, 194, 7, 195, 7, 7,
- 195, 195, 7, 195, 7, 7, 7, 7, 1162, 7,
- 7, 195, 174, 175, 176, 177, 178, 197, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, 201, 1191, 3,
- 4, 1185, 194, 1187, 195, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 3,
- 4, 195, 7, 6, 6, 9, 10, 11, 12, 13,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 174,
- 175, 176, 177, 178, 4, 180, 181, 182, 183, 184,
- 185, 186, 187, 188, 1017, 1259, 7, 3, 163, 194,
- 3, 3, 186, 1267, 3, 1269, 3, 1271, 3, 1273,
- 1274, 3, 3, 3, 3, 3, 1280, 3, 3, 3,
- 196, 196, 5, 5, 1047, 1289, 1049, 3, 1051, 3,
- 7, 6, 4, 1297, 195, 199, 6, 6, 1302, 6,
- 6, 1305, 6, 1307, 1308, 1309, 1310, 1311, 1312, 1313,
+ 1124, 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133,
+ 1134, 1135, 174, 175, 176, 177, 178, 7, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, 1151, 7, 184,
+ 185, 7, 194, 7, 7, 190, 202, 202, 201, 7,
+ 195, 201, 7, 198, 195, 1169, 201, 174, 175, 176,
+ 177, 178, 7, 180, 181, 182, 183, 184, 185, 186,
+ 187, 188, 6, 199, 167, 200, 200, 194, 1192, 200,
+ 1194, 200, 1198, 3, 4, 200, 200, 200, 200, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 3, 4, 196, 5, 200, 200, 9,
+ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 6, 200, 200, 4, 195, 7, 195,
+ 6, 195, 1266, 6, 1274, 200, 1276, 6, 1278, 200,
+ 1274, 6, 1276, 7, 1278, 198, 1280, 1281, 195, 200,
+ 7, 7, 195, 1287, 7, 1271, 200, 1271, 200, 7,
+ 7, 200, 1296, 7, 200, 195, 7, 7, 7, 200,
+ 1304, 200, 200, 200, 200, 1309, 200, 200, 1312, 200,
1314, 1315, 1316, 1317, 1318, 1319, 1320, 1321, 1322, 1323,
- 1324, 1325, 1326, 1327, 1328, 1329, 1330, 1331, 1332, 201,
- 6, 6, 1579, 104, 201, 1339, 6, 1341, 1342, 1343,
- 200, 6, 196, 200, 200, 4, 6, 196, 6, 6,
- 6, 196, 1365, 6, 200, 196, 200, 200, 200, 196,
- 184, 185, 200, 6, 200, 200, 190, 200, 200, 200,
- 196, 195, 200, 200, 198, 200, 196, 201, 200, 200,
- 6, 200, 200, 199, 198, 6, 6, 6, 6, 6,
- 184, 185, 6, 6, 6, 6, 190, 6, 6, 6,
- 3, 195, 7, 104, 198, 6, 3, 201, 6, 186,
- 6, 6, 3, 6, 3, 7, 6, 1421, 6, 3,
- 6, 3, 3, 1427, 3, 1438, 1430, 199, 1675, 6,
- 1677, 4, 6, 198, 6, 6, 6, 201, 201, 6,
- 202, 196, 201, 201, 201, 106, 101, 200, 200, 196,
- 1454, 1455, 1456, 1457, 1458, 1459, 1460, 1461, 1462, 1463,
+ 1324, 1325, 1326, 1327, 1328, 1329, 1330, 1331, 1332, 1333,
+ 1334, 1335, 1336, 1337, 1338, 1339, 200, 200, 1586, 1349,
+ 200, 7, 1346, 200, 1348, 1349, 1350, 197, 195, 195,
+ 174, 175, 176, 177, 178, 195, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 195, 1372, 195, 195, 195,
+ 194, 7, 195, 195, 184, 185, 195, 195, 195, 195,
+ 190, 195, 195, 195, 195, 195, 195, 195, 198, 195,
+ 7, 201, 4, 6, 201, 6, 4, 7, 7, 163,
+ 3, 3, 3, 186, 184, 185, 3, 3, 3, 3,
+ 190, 3, 3, 3, 3, 195, 3, 3, 198, 3,
+ 5, 201, 5, 3, 1428, 3, 196, 6, 4, 196,
+ 1434, 199, 7, 1437, 1682, 6, 1684, 6, 6, 1445,
+ 6, 6, 201, 195, 6, 6, 104, 201, 6, 200,
+ 200, 196, 199, 6, 196, 196, 200, 1461, 1462, 1463,
1464, 1465, 1466, 1467, 1468, 1469, 1470, 1471, 1472, 1473,
- 1474, 104, 1476, 200, 163, 6, 3, 196, 196, 200,
- 200, 6, 6, 196, 3, 1498, 6, 174, 175, 176,
- 177, 178, 200, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 196, 200, 1267, 196, 1269, 194, 1271, 1756,
- 3, 4, 200, 200, 196, 202, 9, 10, 11, 12,
+ 1474, 1475, 1476, 1477, 1478, 1479, 1480, 1481, 200, 1483,
+ 174, 175, 176, 177, 178, 200, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 200, 200, 196, 196, 1505,
+ 194, 6, 4, 200, 200, 200, 200, 200, 202, 200,
+ 3, 4, 200, 196, 200, 1763, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 6, 6, 6, 6, 6, 3, 6, 6, 5, 5,
- 202, 1555, 1556, 1557, 1558, 1559, 1560, 1561, 1562, 1563,
+ 200, 200, 196, 200, 200, 200, 6, 200, 6, 6,
+ 198, 6, 6, 6, 6, 6, 6, 6, 1562, 1563,
1564, 1565, 1566, 1567, 1568, 1569, 1570, 1571, 1572, 1573,
- 1574, 1575, 1576, 1577, 1578, 6, 201, 3, 4, 1342,
- 202, 196, 1595, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 174, 175, 176,
- 177, 178, 6, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 6, 201, 200, 200, 6, 194, 6, 6,
- 1643, 200, 200, 196, 200, 196, 200, 6, 1642, 6,
- 200, 6, 6, 6, 1648, 6, 1650, 6, 1652, 6,
- 1654, 1655, 1656, 1657, 1658, 1659, 1660, 1661, 1662, 1663,
+ 1574, 1575, 1576, 1577, 1578, 1579, 1580, 1581, 1582, 1583,
+ 1584, 1585, 6, 6, 6, 6, 6, 6, 6, 6,
+ 6, 3, 4, 7, 104, 3, 1602, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 174, 175, 176, 177, 178, 6, 180, 181, 182,
+ 183, 184, 185, 186, 187, 188, 3, 6, 186, 4,
+ 6, 194, 6, 3, 1650, 1649, 3, 6, 6, 199,
+ 6, 1655, 6, 1657, 3, 1659, 6, 1661, 1662, 1663,
1664, 1665, 1666, 1667, 1668, 1669, 1670, 1671, 1672, 1673,
- 1674, 6, 6, 6, 5, 5, 1689, 6, 201, 200,
- 202, 151, 6, 201, 201, 200, 200, 157, 200, 196,
- 196, 184, 185, 201, 6, 200, 200, 190, 201, 6,
- 201, 201, 195, 200, 6, 101, 6, 6, 201, 163,
- 180, 5, 5, 201, 201, 201, 186, 187, 202, 201,
- 200, 200, 196, 196, 201, 6, 1730, 1731, 6, 6,
- 202, 6, 6, 101, 1738, 1739, 1740, 1741, 1742, 1743,
- 1744, 1745, 1746, 1747, 1748, 1749, 1750, 1751, 1752, 1753,
- 1754, 1755, 6, 6, 6, 6, 6, 6, 184, 185,
- 202, 201, 200, 200, 190, 6, 6, 6, 6, 195,
- 168, 6, 169, 200, 6, 201, 200, 6, 201, 201,
- 201, 200, 196, 6, 6, 6, 1790, 6, 6, 200,
- 200, 1795, 1796, 1797, 1798, 1799, 1800, 1801, 1802, 1803,
+ 1674, 1675, 1676, 1677, 1678, 1679, 1680, 1681, 3, 3,
+ 3, 7, 198, 151, 6, 6, 6, 6, 6, 157,
+ 1696, 184, 185, 201, 101, 202, 200, 190, 201, 196,
+ 201, 201, 195, 201, 200, 200, 6, 196, 201, 200,
+ 200, 196, 180, 196, 200, 196, 196, 106, 186, 187,
+ 196, 200, 200, 196, 163, 104, 6, 3, 6, 6,
+ 3, 6, 6, 1737, 1738, 6, 6, 6, 6, 3,
+ 6, 1745, 1746, 1747, 1748, 1749, 1750, 1751, 1752, 1753,
+ 1754, 1755, 1756, 1757, 1758, 1759, 1760, 1761, 1762, 5,
+ 202, 6, 5, 201, 6, 201, 200, 202, 200, 200,
+ 200, 196, 184, 185, 200, 6, 6, 6, 190, 6,
+ 6, 196, 6, 195, 6, 196, 6, 200, 6, 201,
+ 200, 6, 8, 1797, 6, 6, 6, 6, 1802, 1803,
1804, 1805, 1806, 1807, 1808, 1809, 1810, 1811, 1812, 1813,
- 1814, 1815, 201, 174, 175, 176, 177, 178, 201, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, 201, 200,
- 6, 6, 6, 194, 6, 6, 196, 6, 6, 201,
- 6, 6, 6, 1847, 6, 1849, 201, 1851, 201, 1853,
- 1854, 1855, 1856, 1857, 1858, 1859, 1860, 1861, 1862, 1863,
- 1864, 1865, 1866, 1867, 1868, 1869, 1870, 174, 175, 176,
- 177, 178, 6, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, 201, 201, 201, 201, 201, 194, 201, 6,
- 6, 201, 201, 201, 6, 6, 6, 6, 1902, 1903,
- 1904, 1905, 1906, 1907, 1908, 1909, 1910, 1911, 1912, 1913,
- 1914, 1915, 1916, 201, 201, 201, 6, 6, 6, 0,
- 0, 601, 7, 7, 7, -1, 1062, -1, -1, -1,
- -1, -1, -1, 1937, 1938, 1939, 1940, 1941, 1942, 1943,
+ 1814, 1815, 1816, 1817, 1818, 1819, 1820, 1821, 1822, 6,
+ 174, 175, 176, 177, 178, 5, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, 5, 101, 5, 201, 8,
+ 194, 202, 6, 6, 6, 200, 6, 163, 201, 201,
+ 1854, 6, 1856, 200, 1858, 200, 1860, 1861, 1862, 1863,
+ 1864, 1865, 1866, 1867, 1868, 1869, 1870, 1871, 1872, 1873,
+ 1874, 1875, 1876, 1877, 174, 175, 176, 177, 178, 196,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, 200,
+ 196, 200, 200, 200, 194, 6, 201, 201, 201, 201,
+ 5, 202, 201, 201, 201, 1909, 1910, 1911, 1912, 1913,
+ 1914, 1915, 1916, 1917, 1918, 1919, 1920, 1921, 1922, 1923,
+ 201, 200, 6, 6, 6, 6, 101, 6, 200, 196,
+ 6, 6, 6, 196, 6, 6, 6, 6, 6, 201,
1944, 1945, 1946, 1947, 1948, 1949, 1950, 1951, 1952, 1953,
- 1954, 174, 175, 176, 177, 178, -1, 180, 181, 182,
- 183, 184, 185, 186, 187, 188, -1, -1, -1, -1,
- -1, 194, -1, -1, 1978, 1008, 1980, -1, 1982, -1,
- 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993,
- 1994, 1995, 1996, 1997, 1998, -1, -1, -1, 468, 174,
+ 1954, 1955, 1956, 1957, 1958, 1959, 1960, 1961, 174, 175,
+ 176, 177, 178, 202, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, 6, 202, 6, 201, 200, 194, 200,
+ 168, 1985, 6, 1987, 169, 1989, 200, 1991, 1992, 1993,
+ 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+ 2004, 2005, 200, 6, 472, 174, 175, 176, 177, 178,
+ 201, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ 201, 6, 201, 200, 196, 194, 6, 6, 6, 6,
+ 201, 2035, 2036, 2037, 2038, 2039, 2040, 2041, 2042, 2043,
+ 201, 200, 200, 6, 201, 6, 200, 6, 196, 6,
+ 201, 201, 201, 6, 201, 201, 2060, 2061, 2062, 2063,
+ 2064, 2065, 2066, 2067, 2068, 2069, 2070, 2071, 2072, 2073,
+ 2074, 38, 39, 40, 41, 42, 43, 44, 45, 201,
+ 47, 6, 49, 50, 51, 6, 53, 54, 6, 6,
+ 6, 201, 2096, 201, 2098, 201, 2100, 6, 2102, 6,
+ 2104, 6, 2106, 70, 2108, 2109, 2110, 2111, 2112, 2113,
+ 2114, 2115, 2116, 201, 8, 201, 201, 6, 6, 6,
+ 6, 201, 6, 201, 201, 6, 0, 0, 7, 606,
+ 7, 98, 99, 100, 2138, 2139, 2140, 2141, 2142, 2143,
+ 1015, -1, 8, -1, -1, -1, -1, -1, -1, -1,
+ 117, -1, 2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163,
+ 2164, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 2177, 2178, 2179, 2180, 2181, 2182, 2183,
+ 1069, 2185, -1, 2187, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 2201, 2202, 2203,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 2213,
+ 2214, 2215, 2216, 2217, 2218, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 2228, 2229, 2230, 2231, -1, 2233,
+ -1, 2235, -1, -1, -1, 202, -1, -1, -1, -1,
+ -1, -1, 2246, 2247, 2248, -1, -1, -1, 2252, 2253,
+ 2254, -1, -1, -1, 2258, 2259, 2260, 725, 726, -1,
+ 728, -1, 730, 731, -1, -1, 2270, 2271, 2272, -1,
+ -1, -1, -1, -1, -1, 2279, -1, 2281, -1, 2283,
+ 174, 175, 176, 177, 178, -1, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, -1, -1, -1, -1, -1,
+ 194, -1, -1, 771, 772, -1, -1, 775, 174, 175,
+ 176, 177, 178, 8, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, -1, 792, 793, -1, -1, 194, -1,
+ 798, 799, -1, -1, 3, 4, 5, 805, 7, 807,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, -1, 34, 35, 36, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 3, 4, -1, -1, -1, -1, 9, 10, 11,
+ 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
+ 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 879, -1, 881, -1, -1, 38, -1, -1, -1,
+ -1, -1, -1, -1, 892, 893, 894, -1, -1, -1,
+ 898, 899, 900, 901, 902, 903, 904, 59, 60, 61,
+ 62, 63, 64, -1, 3, 4, 5, -1, -1, -1,
+ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
+ 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
+ 29, 30, 31, 32, -1, 34, 35, 36, -1, 174,
175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
- -1, -1, -1, -1, 2028, 2029, 2030, 2031, 2032, 2033,
- 2034, 2035, 2036, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 2053,
- 2054, 2055, 2056, 2057, 2058, 2059, 2060, 2061, 2062, 2063,
- 2064, 2065, 2066, 2067, 174, 175, 176, 177, 178, -1,
- 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
- -1, -1, -1, -1, 194, 2089, -1, 2091, -1, 2093,
- -1, 2095, -1, 2097, -1, 2099, -1, 2101, 2102, 2103,
- 2104, 2105, 2106, 2107, 2108, 2109, 6, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 2131, 2132, 2133,
- 2134, 2135, 2136, -1, 8, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 2149, 2150, 2151, 2152, 2153,
- 2154, 2155, 2156, 2157, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 2170, 2171, 2172, 2173,
- 2174, 2175, 2176, -1, 2178, -1, 2180, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 2194, 2195, 2196, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 2206, 2207, 2208, 2209, 2210, 2211, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 2221, 2222, 2223,
- 2224, -1, 2226, -1, 2228, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 2239, 2240, 2241, -1, -1,
- -1, 2245, 2246, 2247, -1, -1, -1, 2251, 2252, 2253,
- 720, 721, -1, 723, -1, 725, 726, -1, -1, 2263,
- 2264, 2265, -1, -1, -1, -1, -1, -1, 2272, -1,
- 2274, -1, 2276, -1, 174, 175, 176, 177, 178, -1,
- 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
- -1, -1, -1, -1, 194, 765, 766, -1, -1, 769,
- 174, 175, 176, 177, 178, -1, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, -1, 786, 787, -1, -1,
- 194, -1, 792, 793, -1, -1, 3, 4, -1, 799,
- -1, 801, 9, 10, 11, 12, 13, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, -1, -1, 3, 4,
- 5, -1, 7, -1, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, -1, 34,
- 35, 36, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 873, -1, 875, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 885, 886, 887, -1, -1,
- -1, 891, 892, 893, 894, 895, 896, 897, 3, 4,
- 5, -1, -1, -1, 9, 10, 11, 12, 13, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, -1, 34,
- 35, 36, 3, 4, -1, -1, -1, -1, 9, 10,
+ -1, 170, 171, 172, 173, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 184, 185, -1, -1, -1,
+ -1, 190, 191, 192, -1, -1, 195, -1, 197, -1,
+ 199, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 1010, -1, -1, -1, 174, 175, 176, 177,
+ 178, -1, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, -1, 184, 185, -1, -1, 194, -1, 190, 3,
+ 4, -1, 200, 195, 202, 9, 10, 11, 12, 13,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, -1,
+ -1, -1, -1, 1071, -1, -1, -1, -1, -1, -1,
+ -1, 1079, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 184, 185, -1, -1, -1,
+ 1098, 190, 3, 4, -1, -1, 195, -1, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, 184, 185, -1,
- -1, -1, 194, 190, 8, -1, -1, -1, 195, -1,
- 202, -1, -1, -1, 201, 170, 171, 172, 173, 8,
- -1, -1, -1, 1003, -1, -1, -1, -1, -1, 184,
- 185, -1, -1, -1, -1, 190, 191, 192, -1, -1,
- 195, -1, 197, -1, 199, 3, 4, -1, -1, -1,
- -1, 9, 10, 11, 12, 13, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 1064, -1, -1, -1, -1, -1,
- -1, -1, 1072, -1, -1, -1, -1, -1, -1, 184,
- 185, -1, -1, -1, -1, 190, -1, -1, -1, -1,
- 195, 1091, -1, -1, -1, -1, -1, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, 184, 185, -1, -1, 194, -1, 190,
- 3, 4, -1, 200, 195, 202, 9, 10, 11, 12,
- 13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 174, 175, 176, 177, 178, -1, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, 174, 175, 176, 177, 178,
- 194, 180, 181, 182, 183, 184, 185, 186, 187, 188,
- -1, -1, -1, -1, -1, 194, -1, -1, -1, 38,
- 39, 40, 41, 42, 43, 44, 45, -1, 47, -1,
- 49, 50, 51, -1, 53, 54, 184, 185, -1, -1,
- -1, -1, 190, -1, -1, -1, -1, 195, -1, -1,
- -1, 70, -1, -1, -1, 38, 39, 40, 41, 42,
- 43, 44, 45, -1, 47, -1, 49, 50, 51, -1,
- 53, 54, -1, -1, -1, -1, -1, -1, -1, 98,
- 99, 100, 174, 175, 176, 177, 178, 70, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, 117, -1,
- -1, -1, 194, -1, -1, -1, -1, 1277, 200, 1279,
- 202, -1, -1, 1283, -1, 98, 99, 100, 0, 1,
- -1, 3, 4, -1, -1, -1, -1, -1, -1, 1299,
- -1, 184, 185, -1, 117, -1, -1, 190, -1, -1,
- -1, -1, 195, -1, -1, -1, -1, -1, -1, -1,
- -1, 33, -1, -1, -1, 37, 38, 39, 40, 41,
- 42, 43, 44, 45, -1, 47, 48, 49, 50, 51,
- 52, 53, 54, -1, -1, -1, 58, 59, 60, 61,
- 62, 63, 64, 202, 66, 67, 68, 69, 70, 38,
- 39, 40, 41, 42, 43, 44, 45, -1, 47, -1,
- 49, 50, 51, -1, 53, 54, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 98, 99, 100, 202,
- -1, 70, -1, 105, -1, 107, -1, 109, 110, 111,
- 112, 113, 114, 115, -1, 117, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 1416, -1, -1, 98,
- 99, 100, -1, 1423, 136, 137, 138, 139, 140, 141,
- 142, 143, -1, -1, 1434, 1435, -1, -1, 117, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 161,
- 162, -1, 164, 174, 175, 176, 177, 178, -1, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, -1, -1,
- -1, -1, -1, 194, -1, -1, -1, 198, 1478, 72,
- 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
- 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
- 93, 94, 95, 96, 97, -1, -1, 41, 174, 175,
- 176, 177, 178, -1, 180, 181, 182, 183, 184, 185,
- 186, 187, 188, 202, -1, -1, -1, -1, 194, -1,
- -1, -1, -1, -1, -1, -1, 202, -1, -1, -1,
- -1, 1541, -1, -1, -1, -1, 1546, 72, 73, 74,
- 75, 76, 77, 78, 79, 80, 81, 82, 83, 84,
- 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
- 95, 96, 97, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 118, 119, 120, -1, -1, -1,
- -1, -1, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 135, -1, 4, -1, -1, -1, -1, -1, 202,
- 144, 145, 146, 147, 148, 149, 150, 151, 152, 153,
- -1, 155, 156, 157, 158, 159, 160, -1, -1, -1,
- -1, -1, 33, -1, -1, 1635, 37, 38, 39, 40,
- 41, 42, 43, 44, 45, 1645, 47, 48, 49, 50,
- 51, 52, 53, 54, -1, -1, -1, 58, 59, 60,
- 61, 62, 63, 64, -1, 66, 67, 68, 69, 70,
- -1, -1, 174, 175, 176, 177, 178, 202, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, -1, 98, 99, 100,
- 202, -1, -1, -1, 105, -1, 107, -1, 109, 110,
- 111, 112, 113, 114, 115, -1, 117, 38, 39, 40,
- 41, 42, 43, 44, 45, -1, 47, -1, 49, 50,
- 51, -1, 53, 54, 1734, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 174, 175, 176, 177, 178, 70,
- 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
- -1, -1, -1, -1, 194, -1, -1, -1, -1, -1,
- -1, -1, 202, -1, -1, -1, -1, 98, 99, 100,
+ 31, 32, -1, -1, 0, 1, -1, 3, 4, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 38, 39,
+ 40, 41, 42, 43, 44, 45, -1, 47, -1, 49,
+ 50, 51, -1, 53, 54, -1, -1, 33, -1, -1,
+ -1, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ 70, 47, 48, 49, 50, 51, 52, 53, 54, -1,
+ -1, -1, 58, 59, 60, 61, 62, 63, 64, -1,
+ 66, 67, 68, 69, 70, -1, -1, -1, 98, 99,
+ 100, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 184, 185, -1, -1, -1, -1, 190, 117, -1, -1,
+ -1, 195, 98, 99, 100, -1, -1, -1, -1, 105,
+ -1, 107, -1, 109, 110, 111, 112, 113, 114, 115,
+ -1, 117, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 1793, -1, -1, 117, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- 174, 175, 176, 177, 178, 202, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, -1, -1, -1, -1, -1,
- 194, -1, -1, -1, -1, 1845, -1, -1, 202, 174,
+ 136, 137, 138, 139, 140, 141, 142, 143, -1, -1,
+ -1, -1, -1, 184, 185, -1, 1284, -1, 1286, 190,
+ 41, -1, 1290, -1, 195, 161, 162, -1, 164, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 1306, -1,
+ -1, -1, 202, -1, -1, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+ 97, 72, 73, 74, 75, 76, 77, 78, 79, 80,
+ 81, 82, 83, 84, 85, 86, 87, 88, 89, 90,
+ 91, 92, 93, 94, 95, 96, 97, 118, 119, 120,
+ -1, -1, -1, -1, -1, 126, 127, 128, 129, 130,
+ 131, 132, 133, 134, 135, -1, -1, -1, -1, -1,
+ -1, -1, -1, 144, 145, 146, 147, 148, 149, 150,
+ 151, 152, 153, -1, 155, 156, 157, 158, 159, 160,
+ -1, -1, -1, -1, -1, -1, -1, -1, 4, -1,
+ -1, -1, -1, -1, -1, 1423, -1, -1, -1, -1,
+ -1, -1, 1430, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 1441, 1442, 202, -1, 33, -1, -1,
+ -1, 37, 38, 39, 40, 41, 42, 43, 44, 45,
+ -1, 47, 48, 49, 50, 51, 52, 53, 54, -1,
+ -1, 202, 58, 59, 60, 61, 62, 63, 64, -1,
+ 66, 67, 68, 69, 70, -1, -1, 1485, -1, 174,
175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, 98, 99, 100, 200, -1, 202, -1, 105,
+ -1, 107, -1, 109, 110, 111, 112, 113, 114, 115,
+ -1, 117, 38, 39, 40, 41, 42, 43, 44, 45,
+ -1, 47, -1, 49, 50, 51, -1, 53, 54, -1,
+ 1548, -1, -1, -1, -1, 1553, -1, -1, -1, 174,
+ 175, 176, 177, 178, 70, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, -1, -1, -1, -1, 202, -1, -1,
+ -1, -1, 98, 99, 100, 174, 175, 176, 177, 178,
+ -1, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ -1, 117, -1, -1, -1, 194, -1, -1, 174, 175,
+ 176, 177, 178, 202, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, -1, -1, -1, -1, -1, 194, -1,
+ -1, -1, -1, -1, 1642, -1, 202, -1, -1, 174,
+ 175, 176, 177, 178, 1652, 180, 181, 182, 183, 184,
185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
-1, -1, 174, 175, 176, 177, 178, 202, 180, 181,
182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, -1, -1, 1898, -1,
- 202, 174, 175, 176, 177, 178, -1, 180, 181, 182,
- 183, 184, 185, 186, 187, 188, -1, -1, -1, -1,
- -1, 194, -1, -1, -1, -1, -1, -1, -1, 202,
- -1, 174, 175, 176, 177, 178, 1936, 180, 181, 182,
- 183, 184, 185, 186, 187, 188, -1, -1, -1, -1,
- -1, 194, -1, -1, 174, 175, 176, 177, 178, 202,
- 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
- -1, -1, -1, -1, 194, -1, -1, 174, 175, 176,
- 177, 178, 202, 180, 181, 182, 183, 184, 185, 186,
+ -1, -1, 194, -1, -1, 174, 175, 176, 177, 178,
+ 202, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ -1, -1, -1, -1, -1, 194, -1, -1, 174, 175,
+ 176, 177, 178, 202, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, -1, -1, -1, -1, -1, 194, -1,
+ -1, -1, -1, 1741, -1, -1, 202, 174, 175, 176,
+ 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
174, 175, 176, 177, 178, 202, 180, 181, 182, 183,
184, 185, 186, 187, 188, -1, -1, -1, -1, -1,
+ 194, -1, -1, -1, -1, -1, -1, -1, 202, -1,
+ -1, -1, 1800, 174, 175, 176, 177, 178, -1, 180,
+ 181, 182, 183, 184, 185, 186, 187, 188, -1, -1,
+ -1, -1, -1, 194, -1, -1, -1, -1, -1, -1,
+ -1, 202, 174, 175, 176, 177, 178, -1, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
+ -1, -1, 194, -1, 1852, 174, 175, 176, 177, 178,
+ 202, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ -1, -1, -1, -1, -1, 194, -1, -1, 174, 175,
+ 176, 177, 178, 202, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, -1, -1, -1, -1, -1, 194, -1,
+ -1, -1, -1, -1, -1, -1, 202, 1905, 174, 175,
+ 176, 177, 178, -1, 180, 181, 182, 183, 184, 185,
+ 186, 187, 188, -1, -1, -1, -1, -1, 194, -1,
+ -1, -1, -1, -1, -1, -1, 202, -1, -1, -1,
+ 174, 175, 176, 177, 178, 1943, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, -1, -1, -1, -1, -1,
194, -1, -1, 174, 175, 176, 177, 178, 202, 180,
181, 182, 183, 184, 185, 186, 187, 188, -1, -1,
-1, -1, -1, 194, -1, -1, 174, 175, 176, 177,
@@ -3073,11 +3066,15 @@ static const short yycheck[] = { 23,
182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
-1, -1, 194, -1, -1, 174, 175, 176, 177, 178,
202, 180, 181, 182, 183, 184, 185, 186, 187, 188,
- -1, -1, -1, -1, -1, 194, -1, -1, 174, 175,
- 176, 177, 178, 202, 180, 181, 182, 183, 184, 185,
- 186, 187, 188, -1, -1, -1, -1, -1, 194, -1,
- 196, -1, -1, -1, 200, 174, 175, 176, 177, 178,
- -1, 180, 181, 182, 183, 184, 185, 186, 187, 188,
+ -1, -1, -1, -1, -1, 194, -1, 196, -1, -1,
+ -1, 200, 174, 175, 176, 177, 178, -1, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
+ -1, -1, 194, 174, 175, 176, 177, 178, 200, 180,
+ 181, 182, 183, 184, 185, 186, 187, 188, -1, -1,
+ -1, -1, -1, 194, 174, 175, 176, 177, 178, 200,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, 174, 175, 176, 177, 178,
+ 200, 180, 181, 182, 183, 184, 185, 186, 187, 188,
-1, -1, -1, -1, -1, 194, 174, 175, 176, 177,
178, 200, 180, 181, 182, 183, 184, 185, 186, 187,
188, -1, -1, -1, -1, -1, 194, 174, 175, 176,
@@ -3725,87 +3722,74 @@ static const short yycheck[] = { 23,
182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
-1, -1, 194, 174, 175, 176, 177, 178, 200, 180,
181, 182, 183, 184, 185, 186, 187, 188, -1, -1,
- -1, -1, -1, 194, 174, 175, 176, 177, 178, 200,
- 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
- -1, -1, -1, -1, 194, 174, 175, 176, 177, 178,
- 200, 180, 181, 182, 183, 184, 185, 186, 187, 188,
- -1, -1, -1, -1, -1, 194, 174, 175, 176, 177,
- 178, 200, 180, 181, 182, 183, 184, 185, 186, 187,
- 188, -1, -1, -1, -1, -1, 194, 174, 175, 176,
- 177, 178, 200, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, -1,
- -1, 198, 174, 175, 176, 177, 178, -1, 180, 181,
- 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
- -1, -1, 194, -1, -1, -1, 198, 174, 175, 176,
- 177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194, -1, 196,
- 174, 175, 176, 177, 178, -1, 180, 181, 182, 183,
- 184, 185, 186, 187, 188, -1, -1, -1, -1, -1,
- 194, -1, 196, 174, 175, 176, 177, 178, -1, 180,
- 181, 182, 183, 184, 185, 186, 187, 188, -1, -1,
- -1, -1, -1, 194, -1, 196, 174, 175, 176, 177,
- 178, -1, 180, 181, 182, 183, 184, 185, 186, 187,
- 188, -1, -1, -1, -1, -1, 194, -1, 196, 174,
+ -1, -1, -1, 194, 174, 175, 176, 177, 178, 200,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, -1, -1, 198, 174, 175, 176, 177, 178, -1,
+ 180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
+ -1, -1, -1, -1, 194, -1, -1, -1, 198, 174,
175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
-1, 196, 174, 175, 176, 177, 178, -1, 180, 181,
@@ -3982,7 +3966,19 @@ static const short yycheck[] = { 23,
180, 181, 182, 183, 184, 185, 186, 187, 188, -1,
-1, -1, -1, -1, 194, -1, 196, 174, 175, 176,
177, 178, -1, 180, 181, 182, 183, 184, 185, 186,
- 187, 188, -1, -1, -1, -1, -1, 194
+ 187, 188, -1, -1, -1, -1, -1, 194, -1, 196,
+ 174, 175, 176, 177, 178, -1, 180, 181, 182, 183,
+ 184, 185, 186, 187, 188, -1, -1, -1, -1, -1,
+ 194, -1, 196, 174, 175, 176, 177, 178, -1, 180,
+ 181, 182, 183, 184, 185, 186, 187, 188, -1, -1,
+ -1, -1, -1, 194, -1, 196, 174, 175, 176, 177,
+ 178, -1, 180, 181, 182, 183, 184, 185, 186, 187,
+ 188, -1, -1, -1, -1, -1, 194, -1, 196, 174,
+ 175, 176, 177, 178, -1, 180, 181, 182, 183, 184,
+ 185, 186, 187, 188, -1, -1, -1, -1, -1, 194,
+ -1, 196, 174, 175, 176, 177, 178, -1, 180, 181,
+ 182, 183, 184, 185, 186, 187, 188, -1, -1, -1,
+ -1, -1, 194
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
#line 3 "/usr/share/bison.simple"
@@ -4528,28 +4524,28 @@ yyreduce:
switch (yyn) {
case 4:
-#line 174 "Gmsh.y"
+#line 173 "Gmsh.y"
{ yyerrok ; return 1; ;
break;}
case 5:
-#line 180 "Gmsh.y"
+#line 179 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 6:
-#line 181 "Gmsh.y"
+#line 180 "Gmsh.y"
{ yyval.d = -yyvsp[0].d; ;
break;}
case 7:
-#line 186 "Gmsh.y"
+#line 185 "Gmsh.y"
{
yymsg(INFO, "STL file format");
- STL_Surf = Create_Surface(1,MSH_SURF_STL);
+ STL_Surf = Create_Surface(1, MSH_SURF_STL);
STL_Surf->STL = new STL_Data;
return 1;
;
break;}
case 8:
-#line 200 "Gmsh.y"
+#line 199 "Gmsh.y"
{
STL_Surf->STL->Add_Facet( yyvsp[-12].d, yyvsp[-11].d, yyvsp[-10].d,
yyvsp[-8].d, yyvsp[-7].d, yyvsp[-6].d,
@@ -4558,7 +4554,7 @@ case 8:
;
break;}
case 9:
-#line 207 "Gmsh.y"
+#line 206 "Gmsh.y"
{
yymsg(INFO, "STL file format read");
Tree_Add(THEM->Surfaces, &STL_Surf);
@@ -4566,393 +4562,393 @@ case 9:
;
break;}
case 12:
-#line 222 "Gmsh.y"
+#line 221 "Gmsh.y"
{ return 1; ;
break;}
case 13:
-#line 223 "Gmsh.y"
+#line 222 "Gmsh.y"
{ return 1; ;
break;}
case 14:
-#line 224 "Gmsh.y"
+#line 223 "Gmsh.y"
{ return 1; ;
break;}
case 15:
-#line 229 "Gmsh.y"
+#line 228 "Gmsh.y"
{
yymsg(INFO, "Step Iso-10303-21 file format");
Create_Step_Solid_BRep();
;
break;}
case 16:
-#line 234 "Gmsh.y"
+#line 233 "Gmsh.y"
{
yymsg(INFO, "Step Iso-10303-21 file format read");
Resolve_BREP ();
;
break;}
case 20:
-#line 245 "Gmsh.y"
+#line 244 "Gmsh.y"
{
;
break;}
case 21:
-#line 248 "Gmsh.y"
+#line 247 "Gmsh.y"
{
;
break;}
case 22:
-#line 252 "Gmsh.y"
+#line 251 "Gmsh.y"
{
;
break;}
case 23:
-#line 258 "Gmsh.y"
+#line 257 "Gmsh.y"
{
- Add_Cartesian_Point((int)yyvsp[-8].d,yyvsp[-4].c,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2]);
+ Add_Cartesian_Point((int)yyvsp[-8].d, yyvsp[-4].c, yyvsp[-2].v[0], yyvsp[-2].v[1], yyvsp[-2].v[2]);
;
break;}
case 24:
-#line 264 "Gmsh.y"
+#line 263 "Gmsh.y"
{
Add_BSpline_Curve_With_Knots ((int)yyvsp[-22].d, yyvsp[-18].c, (int) yyvsp[-16].d, yyvsp[-14].l, yyvsp[-6].l, yyvsp[-4].l, 0., 1.);
;
break;}
case 25:
-#line 271 "Gmsh.y"
+#line 270 "Gmsh.y"
{
Add_BSpline_Surface_With_Knots ((int)yyvsp[-30].d, yyvsp[-26].c, (int) yyvsp[-24].d, (int) yyvsp[-22].d, yyvsp[-20].l, yyvsp[-10].l,
yyvsp[-8].l, yyvsp[-6].l, yyvsp[-4].l, 0., 1., 0., 1. );
;
break;}
case 26:
-#line 277 "Gmsh.y"
+#line 276 "Gmsh.y"
{
Add_Edge_Curve ((int)yyvsp[-14].d, yyvsp[-10].c , (int)yyvsp[-8].d , (int)yyvsp[-6].d, (int)yyvsp[-4].d);
;
break;}
case 27:
-#line 281 "Gmsh.y"
+#line 280 "Gmsh.y"
{
- Add_Face_Outer_Bound((int)yyvsp[-10].d,yyvsp[-6].c,(int)yyvsp[-4].d,yyvsp[-2].i,1);
+ Add_Face_Outer_Bound((int)yyvsp[-10].d, yyvsp[-6].c, (int)yyvsp[-4].d, yyvsp[-2].i, 1);
;
break;}
case 28:
-#line 285 "Gmsh.y"
+#line 284 "Gmsh.y"
{
// check the norm! Face_Bound : hole outside surface!
yymsg(INFO, "Found a face bound");
- Add_Face_Outer_Bound((int)yyvsp[-10].d,yyvsp[-6].c,(int)yyvsp[-4].d,yyvsp[-2].i,0);
+ Add_Face_Outer_Bound((int)yyvsp[-10].d, yyvsp[-6].c, (int)yyvsp[-4].d, yyvsp[-2].i, 0);
;
break;}
case 29:
-#line 292 "Gmsh.y"
+#line 291 "Gmsh.y"
{
- Add_Oriented_Edge((int)yyvsp[-14].d,yyvsp[-10].c,(int)yyvsp[-4].d,yyvsp[-2].i);
+ Add_Oriented_Edge((int)yyvsp[-14].d, yyvsp[-10].c, (int)yyvsp[-4].d, yyvsp[-2].i);
;
break;}
case 30:
-#line 296 "Gmsh.y"
+#line 295 "Gmsh.y"
{
- Add_Edge_Loop((int)yyvsp[-8].d,yyvsp[-4].c,yyvsp[-2].l);
+ Add_Edge_Loop((int)yyvsp[-8].d, yyvsp[-4].c, yyvsp[-2].l);
;
break;}
case 31:
-#line 301 "Gmsh.y"
+#line 300 "Gmsh.y"
{
- Add_Advanced_Face((int)yyvsp[-12].d,yyvsp[-8].c,yyvsp[-6].l,(int)yyvsp[-4].d,yyvsp[-2].i);
+ Add_Advanced_Face((int)yyvsp[-12].d, yyvsp[-8].c, yyvsp[-6].l, (int)yyvsp[-4].d, yyvsp[-2].i);
;
break;}
case 32:
-#line 305 "Gmsh.y"
+#line 304 "Gmsh.y"
{
- Add_Vertex_Point((int)yyvsp[-8].d,yyvsp[-4].c,(int)yyvsp[-2].d);
+ Add_Vertex_Point((int)yyvsp[-8].d, yyvsp[-4].c, (int)yyvsp[-2].d);
;
break;}
case 33:
-#line 309 "Gmsh.y"
+#line 308 "Gmsh.y"
{
;
break;}
case 34:
-#line 313 "Gmsh.y"
+#line 312 "Gmsh.y"
{
Add_Axis2_Placement3D ( (int)yyvsp[-12].d, (int)yyvsp[-4].d, (int)yyvsp[-2].d, (int)yyvsp[-6].d);
;
break;}
case 35:
-#line 317 "Gmsh.y"
+#line 316 "Gmsh.y"
{
Add_Direction((int)yyvsp[-8].d , yyvsp[-4].c, yyvsp[-2].v[0], yyvsp[-2].v[1], yyvsp[-2].v[2]);
;
break;}
case 36:
-#line 321 "Gmsh.y"
+#line 320 "Gmsh.y"
{
- Add_Plane((int)yyvsp[-8].d,yyvsp[-4].c,(int)yyvsp[-2].d);
+ Add_Plane((int)yyvsp[-8].d, yyvsp[-4].c, (int)yyvsp[-2].d);
;
break;}
case 37:
-#line 325 "Gmsh.y"
+#line 324 "Gmsh.y"
{
Add_Line ((int)yyvsp[-10].d, yyvsp[-6].c , (int) yyvsp[-4].d, (int)yyvsp[-2].d);
;
break;}
case 38:
-#line 329 "Gmsh.y"
+#line 328 "Gmsh.y"
{
yymsg(INFO, "Found a closed shell");
Add_Closed_Shell((int)yyvsp[-8].d, yyvsp[-4].c , yyvsp[-2].l);
;
break;}
case 39:
-#line 335 "Gmsh.y"
+#line 334 "Gmsh.y"
{
;
break;}
case 40:
-#line 338 "Gmsh.y"
+#line 337 "Gmsh.y"
{
;
break;}
case 41:
-#line 341 "Gmsh.y"
+#line 340 "Gmsh.y"
{
Add_Cylinder ((int)yyvsp[-10].d, yyvsp[-6].c , (int)yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 42:
-#line 345 "Gmsh.y"
+#line 344 "Gmsh.y"
{
- Add_Cone ((int)yyvsp[-12].d, yyvsp[-8].c , (int)yyvsp[-6].d, yyvsp[-4].d,yyvsp[-2].d);
+ Add_Cone ((int)yyvsp[-12].d, yyvsp[-8].c , (int)yyvsp[-6].d, yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 43:
-#line 349 "Gmsh.y"
+#line 348 "Gmsh.y"
{
- Add_Torus ((int)yyvsp[-12].d, yyvsp[-8].c , (int)yyvsp[-6].d, yyvsp[-4].d,yyvsp[-2].d);
+ Add_Torus ((int)yyvsp[-12].d, yyvsp[-8].c , (int)yyvsp[-6].d, yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 44:
-#line 353 "Gmsh.y"
+#line 352 "Gmsh.y"
{
Add_Circle((int) yyvsp[-10].d, yyvsp[-6].c, (int) yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 45:
-#line 357 "Gmsh.y"
+#line 356 "Gmsh.y"
{
Add_Ellipse((int) yyvsp[-12].d, yyvsp[-8].c, (int) yyvsp[-6].d, yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 46:
-#line 362 "Gmsh.y"
+#line 361 "Gmsh.y"
{
;
break;}
case 47:
-#line 365 "Gmsh.y"
+#line 364 "Gmsh.y"
{
;
break;}
case 48:
-#line 369 "Gmsh.y"
+#line 368 "Gmsh.y"
{
;
break;}
case 49:
-#line 372 "Gmsh.y"
+#line 371 "Gmsh.y"
{
;
break;}
case 50:
-#line 376 "Gmsh.y"
+#line 375 "Gmsh.y"
{
;
break;}
case 51:
-#line 379 "Gmsh.y"
+#line 378 "Gmsh.y"
{
;
break;}
case 52:
-#line 382 "Gmsh.y"
+#line 381 "Gmsh.y"
{
;
break;}
case 53:
-#line 390 "Gmsh.y"
+#line 389 "Gmsh.y"
{
;
break;}
case 54:
-#line 393 "Gmsh.y"
+#line 392 "Gmsh.y"
{
yymsg(INFO, "Gmsh file format read");
;
break;}
case 55:
-#line 399 "Gmsh.y"
+#line 398 "Gmsh.y"
{ return 1; ;
break;}
case 56:
-#line 400 "Gmsh.y"
+#line 399 "Gmsh.y"
{ return 1; ;
break;}
case 57:
-#line 401 "Gmsh.y"
+#line 400 "Gmsh.y"
{ return 1; ;
break;}
case 58:
-#line 402 "Gmsh.y"
+#line 401 "Gmsh.y"
{ return 1; ;
break;}
case 59:
-#line 403 "Gmsh.y"
+#line 402 "Gmsh.y"
{ return 1; ;
break;}
case 60:
-#line 404 "Gmsh.y"
+#line 403 "Gmsh.y"
{ return 1; ;
break;}
case 61:
-#line 405 "Gmsh.y"
+#line 404 "Gmsh.y"
{ return 1; ;
break;}
case 62:
-#line 406 "Gmsh.y"
+#line 405 "Gmsh.y"
{ return 1; ;
break;}
case 63:
-#line 407 "Gmsh.y"
+#line 406 "Gmsh.y"
{ return 1; ;
break;}
case 64:
-#line 408 "Gmsh.y"
+#line 407 "Gmsh.y"
{ return 1; ;
break;}
case 65:
-#line 409 "Gmsh.y"
+#line 408 "Gmsh.y"
{ return 1; ;
break;}
case 66:
-#line 410 "Gmsh.y"
+#line 409 "Gmsh.y"
{ return 1; ;
break;}
case 67:
-#line 411 "Gmsh.y"
+#line 410 "Gmsh.y"
{ return 1; ;
break;}
case 68:
-#line 416 "Gmsh.y"
+#line 415 "Gmsh.y"
{
Msg(DIRECT, yyvsp[-2].c);
;
break;}
case 69:
-#line 420 "Gmsh.y"
+#line 419 "Gmsh.y"
{
- i = PrintListOfDouble(yyvsp[-4].c,yyvsp[-2].l,tmpstring);
- if(i<0)
+ i = PrintListOfDouble(yyvsp[-4].c, yyvsp[-2].l, tmpstring);
+ if(i < 0)
yymsg(GERROR, "Too few arguments in Printf");
- else if(i>0)
- yymsg(GERROR, "Too many arguments (%d) in Printf", i);
+ else if(i > 0)
+ yymsg(GERROR, "%d extra argument%s in Printf", i, (i>1)?"s":"");
else
Msg(DIRECT, tmpstring);
List_Delete(yyvsp[-2].l);
;
break;}
case 70:
-#line 436 "Gmsh.y"
+#line 435 "Gmsh.y"
{
if(!strcmp(yyvsp[-5].c, "View")) EndView(View, 1, yyname, yyvsp[-4].c);
;
break;}
case 71:
-#line 440 "Gmsh.y"
+#line 439 "Gmsh.y"
{
if(!strcmp(yyvsp[-7].c, "View")) EndView(View, 1, yyname, yyvsp[-6].c);
;
break;}
case 72:
-#line 447 "Gmsh.y"
+#line 446 "Gmsh.y"
{
View = BeginView(1);
;
break;}
case 99:
-#line 480 "Gmsh.y"
+#line 479 "Gmsh.y"
{ List_Add(View->SP, &yyvsp[0].d) ; ;
break;}
case 100:
-#line 482 "Gmsh.y"
+#line 481 "Gmsh.y"
{ List_Add(View->SP, &yyvsp[0].d) ; ;
break;}
case 101:
-#line 487 "Gmsh.y"
+#line 486 "Gmsh.y"
{
List_Add(View->SP, &yyvsp[-5].d); List_Add(View->SP, &yyvsp[-3].d);
List_Add(View->SP, &yyvsp[-1].d);
;
break;}
case 102:
-#line 492 "Gmsh.y"
+#line 491 "Gmsh.y"
{
View->NbSP++ ;
;
break;}
case 103:
-#line 499 "Gmsh.y"
+#line 498 "Gmsh.y"
{ List_Add(View->VP, &yyvsp[0].d) ; ;
break;}
case 104:
-#line 501 "Gmsh.y"
+#line 500 "Gmsh.y"
{ List_Add(View->VP, &yyvsp[0].d) ; ;
break;}
case 105:
-#line 506 "Gmsh.y"
+#line 505 "Gmsh.y"
{
List_Add(View->VP, &yyvsp[-5].d); List_Add(View->VP, &yyvsp[-3].d);
List_Add(View->VP, &yyvsp[-1].d);
;
break;}
case 106:
-#line 511 "Gmsh.y"
+#line 510 "Gmsh.y"
{
View->NbVP++ ;
;
break;}
case 107:
-#line 518 "Gmsh.y"
+#line 517 "Gmsh.y"
{ List_Add(View->TP, &yyvsp[0].d) ; ;
break;}
case 108:
-#line 520 "Gmsh.y"
+#line 519 "Gmsh.y"
{ List_Add(View->TP, &yyvsp[0].d) ; ;
break;}
case 109:
-#line 525 "Gmsh.y"
+#line 524 "Gmsh.y"
{
List_Add(View->TP, &yyvsp[-5].d); List_Add(View->TP, &yyvsp[-3].d);
List_Add(View->TP, &yyvsp[-1].d);
;
break;}
case 110:
-#line 530 "Gmsh.y"
+#line 529 "Gmsh.y"
{
View->NbTP++ ;
;
break;}
case 111:
-#line 537 "Gmsh.y"
+#line 536 "Gmsh.y"
{ List_Add(View->SL, &yyvsp[0].d) ; ;
break;}
case 112:
-#line 539 "Gmsh.y"
+#line 538 "Gmsh.y"
{ List_Add(View->SL, &yyvsp[0].d) ; ;
break;}
case 113:
-#line 545 "Gmsh.y"
+#line 544 "Gmsh.y"
{
List_Add(View->SL, &yyvsp[-11].d); List_Add(View->SL, &yyvsp[-5].d);
List_Add(View->SL, &yyvsp[-9].d); List_Add(View->SL, &yyvsp[-3].d);
@@ -4960,21 +4956,21 @@ case 113:
;
break;}
case 114:
-#line 551 "Gmsh.y"
+#line 550 "Gmsh.y"
{
View->NbSL++ ;
;
break;}
case 115:
-#line 558 "Gmsh.y"
+#line 557 "Gmsh.y"
{ List_Add(View->VL, &yyvsp[0].d) ; ;
break;}
case 116:
-#line 560 "Gmsh.y"
+#line 559 "Gmsh.y"
{ List_Add(View->VL, &yyvsp[0].d) ; ;
break;}
case 117:
-#line 566 "Gmsh.y"
+#line 565 "Gmsh.y"
{
List_Add(View->VL, &yyvsp[-11].d); List_Add(View->VL, &yyvsp[-5].d);
List_Add(View->VL, &yyvsp[-9].d); List_Add(View->VL, &yyvsp[-3].d);
@@ -4982,21 +4978,21 @@ case 117:
;
break;}
case 118:
-#line 572 "Gmsh.y"
+#line 571 "Gmsh.y"
{
View->NbVL++ ;
;
break;}
case 119:
-#line 579 "Gmsh.y"
+#line 578 "Gmsh.y"
{ List_Add(View->TL, &yyvsp[0].d) ; ;
break;}
case 120:
-#line 581 "Gmsh.y"
+#line 580 "Gmsh.y"
{ List_Add(View->TL, &yyvsp[0].d) ; ;
break;}
case 121:
-#line 587 "Gmsh.y"
+#line 586 "Gmsh.y"
{
List_Add(View->TL, &yyvsp[-11].d); List_Add(View->TL, &yyvsp[-5].d);
List_Add(View->TL, &yyvsp[-9].d); List_Add(View->TL, &yyvsp[-3].d);
@@ -5004,21 +5000,21 @@ case 121:
;
break;}
case 122:
-#line 593 "Gmsh.y"
+#line 592 "Gmsh.y"
{
View->NbTL++ ;
;
break;}
case 123:
-#line 600 "Gmsh.y"
+#line 599 "Gmsh.y"
{ List_Add(View->ST, &yyvsp[0].d) ; ;
break;}
case 124:
-#line 602 "Gmsh.y"
+#line 601 "Gmsh.y"
{ List_Add(View->ST, &yyvsp[0].d) ; ;
break;}
case 125:
-#line 609 "Gmsh.y"
+#line 608 "Gmsh.y"
{
List_Add(View->ST, &yyvsp[-17].d); List_Add(View->ST, &yyvsp[-11].d);
List_Add(View->ST, &yyvsp[-5].d);
@@ -5029,21 +5025,21 @@ case 125:
;
break;}
case 126:
-#line 618 "Gmsh.y"
+#line 617 "Gmsh.y"
{
View->NbST++ ;
;
break;}
case 127:
-#line 625 "Gmsh.y"
+#line 624 "Gmsh.y"
{ List_Add(View->VT, &yyvsp[0].d) ; ;
break;}
case 128:
-#line 627 "Gmsh.y"
+#line 626 "Gmsh.y"
{ List_Add(View->VT, &yyvsp[0].d) ; ;
break;}
case 129:
-#line 634 "Gmsh.y"
+#line 633 "Gmsh.y"
{
List_Add(View->VT, &yyvsp[-17].d); List_Add(View->VT, &yyvsp[-11].d);
List_Add(View->VT, &yyvsp[-5].d);
@@ -5054,21 +5050,21 @@ case 129:
;
break;}
case 130:
-#line 643 "Gmsh.y"
+#line 642 "Gmsh.y"
{
View->NbVT++ ;
;
break;}
case 131:
-#line 650 "Gmsh.y"
+#line 649 "Gmsh.y"
{ List_Add(View->TT, &yyvsp[0].d) ; ;
break;}
case 132:
-#line 652 "Gmsh.y"
+#line 651 "Gmsh.y"
{ List_Add(View->TT, &yyvsp[0].d) ; ;
break;}
case 133:
-#line 659 "Gmsh.y"
+#line 658 "Gmsh.y"
{
List_Add(View->TT, &yyvsp[-17].d); List_Add(View->TT, &yyvsp[-11].d);
List_Add(View->TT, &yyvsp[-5].d);
@@ -5079,21 +5075,21 @@ case 133:
;
break;}
case 134:
-#line 668 "Gmsh.y"
+#line 667 "Gmsh.y"
{
View->NbTT++ ;
;
break;}
case 135:
-#line 675 "Gmsh.y"
+#line 674 "Gmsh.y"
{ List_Add(View->SQ, &yyvsp[0].d) ; ;
break;}
case 136:
-#line 677 "Gmsh.y"
+#line 676 "Gmsh.y"
{ List_Add(View->SQ, &yyvsp[0].d) ; ;
break;}
case 137:
-#line 685 "Gmsh.y"
+#line 684 "Gmsh.y"
{
List_Add(View->SQ, &yyvsp[-23].d); List_Add(View->SQ, &yyvsp[-17].d);
List_Add(View->SQ, &yyvsp[-11].d); List_Add(View->SQ, &yyvsp[-5].d);
@@ -5104,21 +5100,21 @@ case 137:
;
break;}
case 138:
-#line 694 "Gmsh.y"
+#line 693 "Gmsh.y"
{
View->NbSQ++ ;
;
break;}
case 139:
-#line 701 "Gmsh.y"
+#line 700 "Gmsh.y"
{ List_Add(View->VQ, &yyvsp[0].d) ; ;
break;}
case 140:
-#line 703 "Gmsh.y"
+#line 702 "Gmsh.y"
{ List_Add(View->VQ, &yyvsp[0].d) ; ;
break;}
case 141:
-#line 711 "Gmsh.y"
+#line 710 "Gmsh.y"
{
List_Add(View->VQ, &yyvsp[-23].d); List_Add(View->VQ, &yyvsp[-17].d);
List_Add(View->VQ, &yyvsp[-11].d); List_Add(View->VQ, &yyvsp[-5].d);
@@ -5129,21 +5125,21 @@ case 141:
;
break;}
case 142:
-#line 720 "Gmsh.y"
+#line 719 "Gmsh.y"
{
View->NbVQ++ ;
;
break;}
case 143:
-#line 727 "Gmsh.y"
+#line 726 "Gmsh.y"
{ List_Add(View->TQ, &yyvsp[0].d) ; ;
break;}
case 144:
-#line 729 "Gmsh.y"
+#line 728 "Gmsh.y"
{ List_Add(View->TQ, &yyvsp[0].d) ; ;
break;}
case 145:
-#line 737 "Gmsh.y"
+#line 736 "Gmsh.y"
{
List_Add(View->TQ, &yyvsp[-23].d); List_Add(View->TQ, &yyvsp[-17].d);
List_Add(View->TQ, &yyvsp[-11].d); List_Add(View->TQ, &yyvsp[-5].d);
@@ -5154,21 +5150,21 @@ case 145:
;
break;}
case 146:
-#line 746 "Gmsh.y"
+#line 745 "Gmsh.y"
{
View->NbTQ++ ;
;
break;}
case 147:
-#line 753 "Gmsh.y"
+#line 752 "Gmsh.y"
{ List_Add(View->SS, &yyvsp[0].d) ; ;
break;}
case 148:
-#line 755 "Gmsh.y"
+#line 754 "Gmsh.y"
{ List_Add(View->SS, &yyvsp[0].d) ; ;
break;}
case 149:
-#line 763 "Gmsh.y"
+#line 762 "Gmsh.y"
{
List_Add(View->SS, &yyvsp[-23].d); List_Add(View->SS, &yyvsp[-17].d);
List_Add(View->SS, &yyvsp[-11].d); List_Add(View->SS, &yyvsp[-5].d);
@@ -5179,21 +5175,21 @@ case 149:
;
break;}
case 150:
-#line 772 "Gmsh.y"
+#line 771 "Gmsh.y"
{
View->NbSS++ ;
;
break;}
case 151:
-#line 779 "Gmsh.y"
+#line 778 "Gmsh.y"
{ List_Add(View->VS, &yyvsp[0].d) ; ;
break;}
case 152:
-#line 781 "Gmsh.y"
+#line 780 "Gmsh.y"
{ List_Add(View->VS, &yyvsp[0].d) ; ;
break;}
case 153:
-#line 789 "Gmsh.y"
+#line 788 "Gmsh.y"
{
List_Add(View->VS, &yyvsp[-23].d); List_Add(View->VS, &yyvsp[-17].d);
List_Add(View->VS, &yyvsp[-11].d); List_Add(View->VS, &yyvsp[-5].d);
@@ -5204,21 +5200,21 @@ case 153:
;
break;}
case 154:
-#line 798 "Gmsh.y"
+#line 797 "Gmsh.y"
{
View->NbVS++ ;
;
break;}
case 155:
-#line 805 "Gmsh.y"
+#line 804 "Gmsh.y"
{ List_Add(View->TS, &yyvsp[0].d) ; ;
break;}
case 156:
-#line 807 "Gmsh.y"
+#line 806 "Gmsh.y"
{ List_Add(View->TS, &yyvsp[0].d) ; ;
break;}
case 157:
-#line 815 "Gmsh.y"
+#line 814 "Gmsh.y"
{
List_Add(View->TS, &yyvsp[-23].d); List_Add(View->TS, &yyvsp[-17].d);
List_Add(View->TS, &yyvsp[-11].d); List_Add(View->TS, &yyvsp[-5].d);
@@ -5229,21 +5225,21 @@ case 157:
;
break;}
case 158:
-#line 824 "Gmsh.y"
+#line 823 "Gmsh.y"
{
View->NbTS++ ;
;
break;}
case 159:
-#line 831 "Gmsh.y"
+#line 830 "Gmsh.y"
{ List_Add(View->SH, &yyvsp[0].d) ; ;
break;}
case 160:
-#line 833 "Gmsh.y"
+#line 832 "Gmsh.y"
{ List_Add(View->SH, &yyvsp[0].d) ; ;
break;}
case 161:
-#line 845 "Gmsh.y"
+#line 844 "Gmsh.y"
{
List_Add(View->SH, &yyvsp[-47].d); List_Add(View->SH, &yyvsp[-41].d);
List_Add(View->SH, &yyvsp[-35].d); List_Add(View->SH, &yyvsp[-29].d);
@@ -5260,21 +5256,21 @@ case 161:
;
break;}
case 162:
-#line 860 "Gmsh.y"
+#line 859 "Gmsh.y"
{
View->NbSH++ ;
;
break;}
case 163:
-#line 867 "Gmsh.y"
+#line 866 "Gmsh.y"
{ List_Add(View->VH, &yyvsp[0].d) ; ;
break;}
case 164:
-#line 869 "Gmsh.y"
+#line 868 "Gmsh.y"
{ List_Add(View->VH, &yyvsp[0].d) ; ;
break;}
case 165:
-#line 881 "Gmsh.y"
+#line 880 "Gmsh.y"
{
List_Add(View->VH, &yyvsp[-47].d); List_Add(View->VH, &yyvsp[-41].d);
List_Add(View->VH, &yyvsp[-35].d); List_Add(View->VH, &yyvsp[-29].d);
@@ -5291,21 +5287,21 @@ case 165:
;
break;}
case 166:
-#line 896 "Gmsh.y"
+#line 895 "Gmsh.y"
{
View->NbVH++ ;
;
break;}
case 167:
-#line 903 "Gmsh.y"
+#line 902 "Gmsh.y"
{ List_Add(View->TH, &yyvsp[0].d) ; ;
break;}
case 168:
-#line 905 "Gmsh.y"
+#line 904 "Gmsh.y"
{ List_Add(View->TH, &yyvsp[0].d) ; ;
break;}
case 169:
-#line 917 "Gmsh.y"
+#line 916 "Gmsh.y"
{
List_Add(View->TH, &yyvsp[-47].d); List_Add(View->TH, &yyvsp[-41].d);
List_Add(View->TH, &yyvsp[-35].d); List_Add(View->TH, &yyvsp[-29].d);
@@ -5322,21 +5318,21 @@ case 169:
;
break;}
case 170:
-#line 932 "Gmsh.y"
+#line 931 "Gmsh.y"
{
View->NbTH++ ;
;
break;}
case 171:
-#line 939 "Gmsh.y"
+#line 938 "Gmsh.y"
{ List_Add(View->SI, &yyvsp[0].d) ; ;
break;}
case 172:
-#line 941 "Gmsh.y"
+#line 940 "Gmsh.y"
{ List_Add(View->SI, &yyvsp[0].d) ; ;
break;}
case 173:
-#line 951 "Gmsh.y"
+#line 950 "Gmsh.y"
{
List_Add(View->SI, &yyvsp[-35].d); List_Add(View->SI, &yyvsp[-29].d);
List_Add(View->SI, &yyvsp[-23].d); List_Add(View->SI, &yyvsp[-17].d);
@@ -5350,21 +5346,21 @@ case 173:
;
break;}
case 174:
-#line 963 "Gmsh.y"
+#line 962 "Gmsh.y"
{
View->NbSI++ ;
;
break;}
case 175:
-#line 970 "Gmsh.y"
+#line 969 "Gmsh.y"
{ List_Add(View->VI, &yyvsp[0].d) ; ;
break;}
case 176:
-#line 972 "Gmsh.y"
+#line 971 "Gmsh.y"
{ List_Add(View->VI, &yyvsp[0].d) ; ;
break;}
case 177:
-#line 982 "Gmsh.y"
+#line 981 "Gmsh.y"
{
List_Add(View->VI, &yyvsp[-35].d); List_Add(View->VI, &yyvsp[-29].d);
List_Add(View->VI, &yyvsp[-23].d); List_Add(View->VI, &yyvsp[-17].d);
@@ -5378,21 +5374,21 @@ case 177:
;
break;}
case 178:
-#line 994 "Gmsh.y"
+#line 993 "Gmsh.y"
{
View->NbVI++ ;
;
break;}
case 179:
-#line 1001 "Gmsh.y"
+#line 1000 "Gmsh.y"
{ List_Add(View->TI, &yyvsp[0].d) ; ;
break;}
case 180:
-#line 1003 "Gmsh.y"
+#line 1002 "Gmsh.y"
{ List_Add(View->TI, &yyvsp[0].d) ; ;
break;}
case 181:
-#line 1013 "Gmsh.y"
+#line 1012 "Gmsh.y"
{
List_Add(View->TI, &yyvsp[-35].d); List_Add(View->TI, &yyvsp[-29].d);
List_Add(View->TI, &yyvsp[-23].d); List_Add(View->TI, &yyvsp[-17].d);
@@ -5406,21 +5402,21 @@ case 181:
;
break;}
case 182:
-#line 1025 "Gmsh.y"
+#line 1024 "Gmsh.y"
{
View->NbTI++ ;
;
break;}
case 183:
-#line 1032 "Gmsh.y"
+#line 1031 "Gmsh.y"
{ List_Add(View->SY, &yyvsp[0].d) ; ;
break;}
case 184:
-#line 1034 "Gmsh.y"
+#line 1033 "Gmsh.y"
{ List_Add(View->SY, &yyvsp[0].d) ; ;
break;}
case 185:
-#line 1043 "Gmsh.y"
+#line 1042 "Gmsh.y"
{
List_Add(View->SY, &yyvsp[-29].d); List_Add(View->SY, &yyvsp[-23].d);
List_Add(View->SY, &yyvsp[-17].d); List_Add(View->SY, &yyvsp[-11].d);
@@ -5434,21 +5430,21 @@ case 185:
;
break;}
case 186:
-#line 1055 "Gmsh.y"
+#line 1054 "Gmsh.y"
{
View->NbSY++ ;
;
break;}
case 187:
-#line 1062 "Gmsh.y"
+#line 1061 "Gmsh.y"
{ List_Add(View->VY, &yyvsp[0].d) ; ;
break;}
case 188:
-#line 1064 "Gmsh.y"
+#line 1063 "Gmsh.y"
{ List_Add(View->VY, &yyvsp[0].d) ; ;
break;}
case 189:
-#line 1073 "Gmsh.y"
+#line 1072 "Gmsh.y"
{
List_Add(View->VY, &yyvsp[-29].d); List_Add(View->VY, &yyvsp[-23].d);
List_Add(View->VY, &yyvsp[-17].d); List_Add(View->VY, &yyvsp[-11].d);
@@ -5462,21 +5458,21 @@ case 189:
;
break;}
case 190:
-#line 1085 "Gmsh.y"
+#line 1084 "Gmsh.y"
{
View->NbVY++ ;
;
break;}
case 191:
-#line 1092 "Gmsh.y"
+#line 1091 "Gmsh.y"
{ List_Add(View->TY, &yyvsp[0].d) ; ;
break;}
case 192:
-#line 1094 "Gmsh.y"
+#line 1093 "Gmsh.y"
{ List_Add(View->TY, &yyvsp[0].d) ; ;
break;}
case 193:
-#line 1103 "Gmsh.y"
+#line 1102 "Gmsh.y"
{
List_Add(View->TY, &yyvsp[-29].d); List_Add(View->TY, &yyvsp[-23].d);
List_Add(View->TY, &yyvsp[-17].d); List_Add(View->TY, &yyvsp[-11].d);
@@ -5490,27 +5486,27 @@ case 193:
;
break;}
case 194:
-#line 1115 "Gmsh.y"
+#line 1114 "Gmsh.y"
{
View->NbTY++ ;
;
break;}
case 195:
-#line 1122 "Gmsh.y"
+#line 1121 "Gmsh.y"
{
- for(i=0; i<(int)strlen(yyvsp[0].c)+1; i++) List_Add(View->T2C, &yyvsp[0].c[i]) ;
+ for(i = 0; i < (int)strlen(yyvsp[0].c)+1; i++) List_Add(View->T2C, &yyvsp[0].c[i]) ;
Free(yyvsp[0].c);
;
break;}
case 196:
-#line 1127 "Gmsh.y"
+#line 1126 "Gmsh.y"
{
- for(i=0; i<(int)strlen(yyvsp[0].c)+1; i++) List_Add(View->T2C, &yyvsp[0].c[i]) ;
+ for(i = 0; i < (int)strlen(yyvsp[0].c)+1; i++) List_Add(View->T2C, &yyvsp[0].c[i]) ;
Free(yyvsp[0].c);
;
break;}
case 197:
-#line 1135 "Gmsh.y"
+#line 1134 "Gmsh.y"
{
List_Add(View->T2D, &yyvsp[-5].d); List_Add(View->T2D, &yyvsp[-3].d);
List_Add(View->T2D, &yyvsp[-1].d);
@@ -5519,27 +5515,27 @@ case 197:
;
break;}
case 198:
-#line 1142 "Gmsh.y"
+#line 1141 "Gmsh.y"
{
View->NbT2++ ;
;
break;}
case 199:
-#line 1149 "Gmsh.y"
+#line 1148 "Gmsh.y"
{
- for(i=0; i<(int)strlen(yyvsp[0].c)+1; i++) List_Add(View->T3C, &yyvsp[0].c[i]) ;
+ for(i = 0; i < (int)strlen(yyvsp[0].c)+1; i++) List_Add(View->T3C, &yyvsp[0].c[i]) ;
Free(yyvsp[0].c);
;
break;}
case 200:
-#line 1154 "Gmsh.y"
+#line 1153 "Gmsh.y"
{
- for(i=0; i<(int)strlen(yyvsp[0].c)+1; i++) List_Add(View->T3C, &yyvsp[0].c[i]) ;
+ for(i = 0; i < (int)strlen(yyvsp[0].c)+1; i++) List_Add(View->T3C, &yyvsp[0].c[i]) ;
Free(yyvsp[0].c);
;
break;}
case 201:
-#line 1162 "Gmsh.y"
+#line 1161 "Gmsh.y"
{
List_Add(View->T3D, &yyvsp[-7].d); List_Add(View->T3D, &yyvsp[-5].d);
List_Add(View->T3D, &yyvsp[-3].d); List_Add(View->T3D, &yyvsp[-1].d);
@@ -5548,45 +5544,45 @@ case 201:
;
break;}
case 202:
-#line 1169 "Gmsh.y"
+#line 1168 "Gmsh.y"
{
View->NbT3++ ;
;
break;}
case 203:
-#line 1178 "Gmsh.y"
+#line 1177 "Gmsh.y"
{ yyval.i = 0 ; ;
break;}
case 204:
-#line 1179 "Gmsh.y"
+#line 1178 "Gmsh.y"
{ yyval.i = 1 ; ;
break;}
case 205:
-#line 1180 "Gmsh.y"
+#line 1179 "Gmsh.y"
{ yyval.i = 2 ; ;
break;}
case 206:
-#line 1181 "Gmsh.y"
+#line 1180 "Gmsh.y"
{ yyval.i = 3 ; ;
break;}
case 207:
-#line 1182 "Gmsh.y"
+#line 1181 "Gmsh.y"
{ yyval.i = 4 ; ;
break;}
case 208:
-#line 1186 "Gmsh.y"
+#line 1185 "Gmsh.y"
{ yyval.i = 1 ; ;
break;}
case 209:
-#line 1187 "Gmsh.y"
+#line 1186 "Gmsh.y"
{ yyval.i = -1 ; ;
break;}
case 210:
-#line 1195 "Gmsh.y"
+#line 1194 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(1,1,sizeof(double));
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(1, 1, sizeof(double));
if(!yyvsp[-2].i){
List_Put(TheSymbol.val, 0, &yyvsp[-1].d);
Tree_Add(Symbol_T, &TheSymbol);
@@ -5610,11 +5606,11 @@ case 210:
;
break;}
case 211:
-#line 1222 "Gmsh.y"
+#line 1221 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-6].c;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(5,5,sizeof(double));
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(5, 5, sizeof(double));
if(!yyvsp[-2].i){
List_Put(TheSymbol.val, (int)yyvsp[-4].d, &yyvsp[-1].d);
Tree_Add(Symbol_T, &TheSymbol);
@@ -5645,18 +5641,18 @@ case 211:
;
break;}
case 212:
-#line 1256 "Gmsh.y"
+#line 1255 "Gmsh.y"
{
if(List_Nbr(yyvsp[-5].l) != List_Nbr(yyvsp[-1].l))
yymsg(GERROR, "Incompatible array dimensions in affectation");
else{
TheSymbol.Name = yyvsp[-8].c;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(5,5,sizeof(double));
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(5, 5, sizeof(double));
if(!yyvsp[-2].i){
- for(i=0 ; i<List_Nbr(yyvsp[-5].l) ; i++){
- List_Put(TheSymbol.val, (int)(*(double*)List_Pointer(yyvsp[-5].l,i)),
- (double*)List_Pointer(yyvsp[-1].l,i));
+ for(i = 0; i < List_Nbr(yyvsp[-5].l); i++){
+ List_Put(TheSymbol.val, (int)(*(double*)List_Pointer(yyvsp[-5].l, i)),
+ (double*)List_Pointer(yyvsp[-1].l, i));
}
Tree_Add(Symbol_T, &TheSymbol);
}
@@ -5664,9 +5660,9 @@ case 212:
yymsg(GERROR, "Unknown variable '%s'", yyvsp[-8].c) ;
}
else{
- for(i=0 ; i<List_Nbr(yyvsp[-5].l) ; i++){
- j = (int)(*(double*)List_Pointer(yyvsp[-5].l,i)) ;
- d = *(double*)List_Pointer(yyvsp[-1].l,i) ;
+ for(i = 0; i < List_Nbr(yyvsp[-5].l); i++){
+ j = (int)(*(double*)List_Pointer(yyvsp[-5].l, i)) ;
+ d = *(double*)List_Pointer(yyvsp[-1].l, i) ;
if((pd = (double*)List_Pointer_Test(pSymbol->val, j))){
switch(yyvsp[-2].i){
case 0 : *pd = d; break ;
@@ -5693,12 +5689,12 @@ case 212:
;
break;}
case 213:
-#line 1303 "Gmsh.y"
+#line 1302 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-5].c;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(5,5,sizeof(double));
- List_Copy(yyvsp[-1].l,TheSymbol.val);
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(5, 5, sizeof(double));
+ List_Copy(yyvsp[-1].l, TheSymbol.val);
Tree_Add(Symbol_T, &TheSymbol);
}
else{
@@ -5709,20 +5705,20 @@ case 213:
;
break;}
case 214:
-#line 1318 "Gmsh.y"
+#line 1317 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-2].c;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol)))
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol)))
yymsg(GERROR, "Unknown variable '%s'", yyvsp[-2].c) ;
else
*(double*)List_Pointer_Fast(pSymbol->val, 0) += yyvsp[-1].i;
;
break;}
case 215:
-#line 1327 "Gmsh.y"
+#line 1326 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-5].c ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol)))
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol)))
yymsg(GERROR, "Unknown variable '%s'", yyvsp[-5].c) ;
else{
if((pd = (double*)List_Pointer_Test(pSymbol->val, (int)yyvsp[-3].d)))
@@ -5733,7 +5729,7 @@ case 215:
;
break;}
case 216:
-#line 1342 "Gmsh.y"
+#line 1341 "Gmsh.y"
{
if(!(pStrCat = Get_StringOptionCategory(yyvsp[-5].c)))
yymsg(GERROR, "Unknown string option class '%s'", yyvsp[-5].c);
@@ -5741,12 +5737,12 @@ case 216:
if(!(pStrOpt = (char *(*) (int, int, char *))Get_StringOption(yyvsp[-3].c, pStrCat)))
yymsg(GERROR, "Unknown string option '%s.%s'", yyvsp[-5].c, yyvsp[-3].c);
else
- pStrOpt(0,GMSH_SET|GMSH_GUI,yyvsp[-1].c) ;
+ pStrOpt(0, GMSH_SET|GMSH_GUI, yyvsp[-1].c) ;
}
;
break;}
case 217:
-#line 1354 "Gmsh.y"
+#line 1353 "Gmsh.y"
{
if(!(pStrCat = Get_StringOptionCategory(yyvsp[-8].c)))
yymsg(GERROR, "Unknown string option class '%s'", yyvsp[-8].c);
@@ -5754,12 +5750,12 @@ case 217:
if(!(pStrOpt = (char *(*) (int, int, char *))Get_StringOption(yyvsp[-3].c, pStrCat)))
yymsg(GERROR, "Unknown string option '%s[%d].%s'", yyvsp[-8].c, (int)yyvsp[-6].d, yyvsp[-3].c);
else
- pStrOpt((int)yyvsp[-6].d,GMSH_SET|GMSH_GUI,yyvsp[-1].c) ;
+ pStrOpt((int)yyvsp[-6].d, GMSH_SET|GMSH_GUI, yyvsp[-1].c) ;
}
;
break;}
case 218:
-#line 1368 "Gmsh.y"
+#line 1367 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
yymsg(GERROR, "Unknown numeric option class '%s'", yyvsp[-5].c);
@@ -5769,21 +5765,21 @@ case 218:
else{
switch(yyvsp[-2].i){
case 0 : d = yyvsp[-1].d ; break ;
- case 1 : d = pNumOpt(0,GMSH_GET,0) + yyvsp[-1].d ; break ;
- case 2 : d = pNumOpt(0,GMSH_GET,0) - yyvsp[-1].d ; break ;
- case 3 : d = pNumOpt(0,GMSH_GET,0) * yyvsp[-1].d ; break ;
+ case 1 : d = pNumOpt(0, GMSH_GET, 0) + yyvsp[-1].d ; break ;
+ case 2 : d = pNumOpt(0, GMSH_GET, 0) - yyvsp[-1].d ; break ;
+ case 3 : d = pNumOpt(0, GMSH_GET, 0) * yyvsp[-1].d ; break ;
case 4 :
- if(yyvsp[-1].d) d = pNumOpt(0,GMSH_GET,0) / yyvsp[-1].d ;
+ if(yyvsp[-1].d) d = pNumOpt(0, GMSH_GET, 0) / yyvsp[-1].d ;
else yymsg(GERROR, "Division by zero in '%s.%s /= %g'", yyvsp[-5].c, yyvsp[-3].c, yyvsp[-1].d);
break;
}
- pNumOpt(0,GMSH_SET|GMSH_GUI, d) ;
+ pNumOpt(0, GMSH_SET|GMSH_GUI, d) ;
}
}
;
break;}
case 219:
-#line 1391 "Gmsh.y"
+#line 1390 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-8].c)))
yymsg(GERROR, "Unknown numeric option class '%s'", yyvsp[-8].c);
@@ -5793,22 +5789,22 @@ case 219:
else{
switch(yyvsp[-2].i){
case 0 : d = yyvsp[-1].d; break ;
- case 1 : d = pNumOpt((int)yyvsp[-6].d,GMSH_GET,0) + yyvsp[-1].d ; break ;
- case 2 : d = pNumOpt((int)yyvsp[-6].d,GMSH_GET,0) - yyvsp[-1].d ; break ;
- case 3 : d = pNumOpt((int)yyvsp[-6].d,GMSH_GET,0) * yyvsp[-1].d ; break ;
+ case 1 : d = pNumOpt((int)yyvsp[-6].d, GMSH_GET, 0) + yyvsp[-1].d ; break ;
+ case 2 : d = pNumOpt((int)yyvsp[-6].d, GMSH_GET, 0) - yyvsp[-1].d ; break ;
+ case 3 : d = pNumOpt((int)yyvsp[-6].d, GMSH_GET, 0) * yyvsp[-1].d ; break ;
case 4 :
- if(yyvsp[-1].d) d = pNumOpt((int)yyvsp[-6].d,GMSH_GET,0) / yyvsp[-1].d ;
+ if(yyvsp[-1].d) d = pNumOpt((int)yyvsp[-6].d, GMSH_GET, 0) / yyvsp[-1].d ;
else yymsg(GERROR, "Division by zero in '%s[%d].%s /= %g'",
yyvsp[-8].c, (int)yyvsp[-6].d, yyvsp[-3].c, yyvsp[-1].d);
break;
}
- pNumOpt((int)yyvsp[-6].d,GMSH_SET|GMSH_GUI,d) ;
+ pNumOpt((int)yyvsp[-6].d, GMSH_SET|GMSH_GUI, d) ;
}
}
;
break;}
case 220:
-#line 1415 "Gmsh.y"
+#line 1414 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-4].c)))
yymsg(GERROR, "Unknown numeric option class '%s'", yyvsp[-4].c);
@@ -5816,12 +5812,12 @@ case 220:
if(!(pNumOpt = (double (*) (int, int, double))Get_NumberOption(yyvsp[-2].c, pNumCat)))
yymsg(GERROR, "Unknown numeric option '%s.%s'", yyvsp[-4].c, yyvsp[-2].c);
else
- pNumOpt(0,GMSH_SET|GMSH_GUI,pNumOpt(0,GMSH_GET,0)+yyvsp[-1].i) ;
+ pNumOpt(0, GMSH_SET|GMSH_GUI, pNumOpt(0, GMSH_GET, 0)+yyvsp[-1].i) ;
}
;
break;}
case 221:
-#line 1427 "Gmsh.y"
+#line 1426 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-7].c)))
yymsg(GERROR, "Unknown numeric option class '%s'", yyvsp[-7].c);
@@ -5829,12 +5825,12 @@ case 221:
if(!(pNumOpt = (double (*) (int, int, double))Get_NumberOption(yyvsp[-2].c, pNumCat)))
yymsg(GERROR, "Unknown numeric option '%s[%d].%s'", yyvsp[-7].c, (int)yyvsp[-5].d, yyvsp[-2].c);
else
- pNumOpt((int)yyvsp[-5].d,GMSH_SET|GMSH_GUI,pNumOpt((int)yyvsp[-5].d,GMSH_GET,0)+yyvsp[-1].i) ;
+ pNumOpt((int)yyvsp[-5].d, GMSH_SET|GMSH_GUI, pNumOpt((int)yyvsp[-5].d, GMSH_GET, 0)+yyvsp[-1].i) ;
}
;
break;}
case 222:
-#line 1441 "Gmsh.y"
+#line 1440 "Gmsh.y"
{
if(!(pColCat = Get_ColorOptionCategory(yyvsp[-7].c)))
yymsg(GERROR, "Unknown color option class '%s'", yyvsp[-7].c);
@@ -5842,12 +5838,12 @@ case 222:
if(!(pColOpt = (unsigned int (*) (int, int, unsigned int))Get_ColorOption(yyvsp[-3].c, pColCat)))
yymsg(GERROR, "Unknown color option '%s.Color.%s'", yyvsp[-7].c, yyvsp[-3].c);
else
- pColOpt(0,GMSH_SET|GMSH_GUI,yyvsp[-1].u) ;
+ pColOpt(0, GMSH_SET|GMSH_GUI, yyvsp[-1].u) ;
}
;
break;}
case 223:
-#line 1453 "Gmsh.y"
+#line 1452 "Gmsh.y"
{
if(!(pColCat = Get_ColorOptionCategory(yyvsp[-10].c)))
yymsg(GERROR, "Unknown color option class '%s'", yyvsp[-10].c);
@@ -5855,12 +5851,12 @@ case 223:
if(!(pColOpt = (unsigned int (*) (int, int, unsigned int))Get_ColorOption(yyvsp[-3].c, pColCat)))
yymsg(GERROR, "Unknown color option '%s[%d].Color.%s'", yyvsp[-10].c, (int)yyvsp[-8].d, yyvsp[-3].c);
else
- pColOpt((int)yyvsp[-8].d,GMSH_SET|GMSH_GUI,yyvsp[-1].u) ;
+ pColOpt((int)yyvsp[-8].d, GMSH_SET|GMSH_GUI, yyvsp[-1].u) ;
}
;
break;}
case 224:
-#line 1467 "Gmsh.y"
+#line 1466 "Gmsh.y"
{
GmshColorTable *ct = Get_ColorTable(0);
if(!ct)
@@ -5871,7 +5867,7 @@ case 224:
yymsg(GERROR, "Too many (%d>%d) colors in View[%d].ColorTable",
ct->size, COLORTABLE_NBMAX_COLOR, 0);
else
- for(i=0 ; i<ct->size ; i++) List_Read(yyvsp[-1].l, i, &ct->table[i]);
+ for(i = 0; i < ct->size; i++) List_Read(yyvsp[-1].l, i, &ct->table[i]);
if(ct->size == 1){
ct->size = 2;
ct->table[1] = ct->table[0];
@@ -5881,7 +5877,7 @@ case 224:
;
break;}
case 225:
-#line 1487 "Gmsh.y"
+#line 1486 "Gmsh.y"
{
GmshColorTable *ct = Get_ColorTable((int)yyvsp[-6].d);
if(!ct)
@@ -5892,7 +5888,7 @@ case 225:
yymsg(GERROR, "Too many (%d>%d) colors in View[%d].ColorTable",
ct->size, COLORTABLE_NBMAX_COLOR, (int)yyvsp[-6].d);
else
- for(i=0 ; i<ct->size ; i++) List_Read(yyvsp[-1].l, i, &ct->table[i]);
+ for(i = 0; i < ct->size; i++) List_Read(yyvsp[-1].l, i, &ct->table[i]);
if(ct->size == 1){
ct->size = 2;
ct->table[1] = ct->table[0];
@@ -5902,74 +5898,74 @@ case 225:
;
break;}
case 226:
-#line 1509 "Gmsh.y"
+#line 1508 "Gmsh.y"
{
if(CTX.default_plugins){
try {
- GMSH_PluginManager::Instance()->SetPluginOption(yyvsp[-6].c,yyvsp[-3].c,yyvsp[-1].d);
+ GMSH_PluginManager::Instance()->SetPluginOption(yyvsp[-6].c, yyvsp[-3].c, yyvsp[-1].d);
}
catch (...) {
- yymsg(WARNING, "Unknown option '%s' or plugin '%s'",yyvsp[-3].c,yyvsp[-6].c);
+ yymsg(WARNING, "Unknown option '%s' or plugin '%s'", yyvsp[-3].c, yyvsp[-6].c);
}
}
;
break;}
case 227:
-#line 1521 "Gmsh.y"
+#line 1520 "Gmsh.y"
{
if(CTX.default_plugins){
try {
- GMSH_PluginManager::Instance()->SetPluginOption(yyvsp[-6].c,yyvsp[-3].c,yyvsp[-1].c);
+ GMSH_PluginManager::Instance()->SetPluginOption(yyvsp[-6].c, yyvsp[-3].c, yyvsp[-1].c);
}
catch (...) {
- yymsg(WARNING, "Unknown option '%s' or plugin '%s'",yyvsp[-3].c,yyvsp[-6].c);
+ yymsg(WARNING, "Unknown option '%s' or plugin '%s'", yyvsp[-3].c, yyvsp[-6].c);
}
}
;
break;}
case 228:
-#line 1541 "Gmsh.y"
+#line 1540 "Gmsh.y"
{
- Cdbpts101((int)yyvsp[-4].d,yyvsp[-1].v[0],yyvsp[-1].v[1],yyvsp[-1].v[2],yyvsp[-1].v[3],yyvsp[-1].v[4]);
+ Cdbpts101((int)yyvsp[-4].d, yyvsp[-1].v[0], yyvsp[-1].v[1], yyvsp[-1].v[2], yyvsp[-1].v[3], yyvsp[-1].v[4]);
yyval.s.Type = MSH_POINT;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 229:
-#line 1548 "Gmsh.y"
+#line 1547 "Gmsh.y"
{
- Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_POINT,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
+ Cdbz101((int)yyvsp[-4].d, MSH_PHYSICAL_POINT, 0, 0, 0, 0, 0, NULL, yyvsp[-1].l, NULL);
yyval.s.Type = MSH_PHYSICAL_POINT;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 230:
-#line 1554 "Gmsh.y"
+#line 1553 "Gmsh.y"
{
Vertex *v;
Attractor *a;
double p;
int ip;
- for(int i=0;i<List_Nbr(yyvsp[-9].l);i++){
- List_Read(yyvsp[-9].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 = FindPoint(ip,THEM);
+ v = FindPoint(ip, THEM);
if(!v)
yymsg(WARNING, "Unknown Point %d", ip);
else{
a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1,
- yyvsp[-6].d,yyvsp[-4].d,yyvsp[-2].d,v,NULL,NULL);
- List_Add(THEM->Metric->Attractors,&a);
+ yyvsp[-6].d, yyvsp[-4].d, yyvsp[-2].d, v, NULL, NULL);
+ List_Add(THEM->Metric->Attractors, &a);
}
}
;
break;}
case 231:
-#line 1573 "Gmsh.y"
+#line 1572 "Gmsh.y"
{
- for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
- List_Read(yyvsp[-3].l,i,&d);
- Vertex *v = FindPoint((int)d,THEM);
+ for(i = 0; i < List_Nbr(yyvsp[-3].l); i++){
+ List_Read(yyvsp[-3].l, i, &d);
+ Vertex *v = FindPoint((int)d, THEM);
if(!v)
yymsg(WARNING, "Unknown Point %d", (int)d);
else
@@ -5978,69 +5974,69 @@ case 231:
;
break;}
case 232:
-#line 1587 "Gmsh.y"
+#line 1586 "Gmsh.y"
{
- Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_LINE,1,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ Cdbseg101((int)yyvsp[-4].d, MSH_SEGM_LINE, 1, yyvsp[-1].l, NULL, -1, -1, 0., 1., NULL, NULL, NULL);
yyval.s.Type = MSH_SEGM_LINE;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 233:
-#line 1593 "Gmsh.y"
+#line 1592 "Gmsh.y"
{
- Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_SPLN,3,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ Cdbseg101((int)yyvsp[-4].d, MSH_SEGM_SPLN, 3, yyvsp[-1].l, NULL, -1, -1, 0., 1., NULL, NULL, NULL);
yyval.s.Type = MSH_SEGM_SPLN;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 234:
-#line 1599 "Gmsh.y"
+#line 1598 "Gmsh.y"
{
Curve *c;
Attractor *a;
double p;
int ip;
- for(int i=0;i<List_Nbr(yyvsp[-9].l);i++){
- List_Read(yyvsp[-9].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);
+ c = FindCurve(ip, THEM);
if(!c)
yymsg(WARNING, "Unknown Curve %d", ip);
else{
a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1,
- yyvsp[-6].d,yyvsp[-4].d,yyvsp[-2].d,NULL,c,NULL);
- List_Add(THEM->Metric->Attractors,&a);
+ yyvsp[-6].d, yyvsp[-4].d, yyvsp[-2].d, NULL, c, NULL);
+ List_Add(THEM->Metric->Attractors, &a);
}
}
;
break;}
case 235:
-#line 1618 "Gmsh.y"
+#line 1617 "Gmsh.y"
{
- Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_CIRC,2,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ Cdbseg101((int)yyvsp[-4].d, MSH_SEGM_CIRC, 2, yyvsp[-1].l, NULL, -1, -1, 0., 1., NULL, NULL, NULL);
yyval.s.Type = MSH_SEGM_CIRC ;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 236:
-#line 1624 "Gmsh.y"
+#line 1623 "Gmsh.y"
{
- Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_ELLI,2,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ Cdbseg101((int)yyvsp[-4].d, MSH_SEGM_ELLI, 2, yyvsp[-1].l, NULL, -1, -1, 0., 1., NULL, NULL, NULL);
yyval.s.Type = MSH_SEGM_ELLI ;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 237:
-#line 1630 "Gmsh.y"
+#line 1629 "Gmsh.y"
{
List_T *temp;
- int i,j;
+ int i, j;
double d;
- temp = List_Create(List_Nbr(yyvsp[-3].l),1,sizeof(int));
- for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
- List_Read(yyvsp[-3].l,i,&d);
+ temp = List_Create(List_Nbr(yyvsp[-3].l), 1, sizeof(int));
+ for(i = 0; i < List_Nbr(yyvsp[-3].l); i++){
+ List_Read(yyvsp[-3].l, i, &d);
j = (int)d;
- List_Add(temp,&j);
+ List_Add(temp, &j);
}
AddCircleInDataBase ((int) yyvsp[-6].d, MSH_SEGM_CIRC, temp, yyvsp[-1].v);
List_Delete(temp);
@@ -6049,34 +6045,34 @@ case 237:
;
break;}
case 238:
-#line 1647 "Gmsh.y"
+#line 1646 "Gmsh.y"
{
- Cdbseg101((int)yyvsp[-14].d,MSH_SEGM_PARAMETRIC,2,NULL,NULL,-1,-1,yyvsp[-10].d,yyvsp[-8].d,yyvsp[-6].c,yyvsp[-4].c,yyvsp[-2].c);
+ Cdbseg101((int)yyvsp[-14].d, MSH_SEGM_PARAMETRIC, 2, NULL, NULL, -1, -1, yyvsp[-10].d, yyvsp[-8].d, yyvsp[-6].c, yyvsp[-4].c, yyvsp[-2].c);
yyval.s.Type = MSH_SEGM_PARAMETRIC ;
yyval.s.Num = (int)yyvsp[-14].d;
;
break;}
case 239:
-#line 1653 "Gmsh.y"
+#line 1652 "Gmsh.y"
{
- Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_LINE,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
+ Cdbz101((int)yyvsp[-4].d, MSH_PHYSICAL_LINE, 0, 0, 0, 0, 0, NULL, yyvsp[-1].l, NULL);
yyval.s.Type = MSH_PHYSICAL_LINE;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 240:
-#line 1659 "Gmsh.y"
+#line 1658 "Gmsh.y"
{
yyval.s.Type = MSH_SEGM_LOOP;
- Cdbz101((int)yyvsp[-4].d,yyval.s.Type,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
+ Cdbz101((int)yyvsp[-4].d, yyval.s.Type, 0, 0, 0, 0, 0, NULL, yyvsp[-1].l, NULL);
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 241:
-#line 1665 "Gmsh.y"
+#line 1664 "Gmsh.y"
{
if(List_Nbr(yyvsp[-1].l) > 3){
- Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_BSPLN,2,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ 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;
}
@@ -6086,10 +6082,10 @@ case 241:
;
break;}
case 242:
-#line 1676 "Gmsh.y"
+#line 1675 "Gmsh.y"
{
if(List_Nbr(yyvsp[-1].l) > 3){
- Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_BEZIER,2,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ Cdbseg101((int)yyvsp[-4].d, MSH_SEGM_BEZIER, 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;
}
@@ -6099,7 +6095,7 @@ case 242:
;
break;}
case 243:
-#line 1687 "Gmsh.y"
+#line 1686 "Gmsh.y"
{
List_T *Temp;
int i;
@@ -6111,35 +6107,35 @@ case 243:
List_Nbr(yyvsp[-3].l), List_Nbr(yyvsp[-5].l), (int)yyvsp[-1].d, List_Nbr(yyvsp[-5].l) + (int)yyvsp[-1].d + 1);
}
else{
- Temp = List_Create(List_Nbr(yyvsp[-5].l),1,sizeof(int));
- for(i=0;i<List_Nbr(yyvsp[-5].l);i++) {
- List_Read(yyvsp[-5].l,i,&d);
+ Temp = List_Create(List_Nbr(yyvsp[-5].l), 1, sizeof(int));
+ for(i = 0; i < List_Nbr(yyvsp[-5].l); i++) {
+ List_Read(yyvsp[-5].l, i, &d);
j = (int)d;
- List_Add(Temp,&j);
+ List_Add(Temp, &j);
}
- AddCurveInDataBase ((int)yyvsp[-8].d,MSH_SEGM_NURBS,(int)yyvsp[-1].d,Temp,yyvsp[-3].l,-1,-1,0.,1.);
+ AddCurveInDataBase ((int)yyvsp[-8].d, MSH_SEGM_NURBS, (int)yyvsp[-1].d, Temp, yyvsp[-3].l, -1, -1, 0., 1.);
List_Delete(Temp);
}
;
break;}
case 244:
-#line 1712 "Gmsh.y"
+#line 1711 "Gmsh.y"
{
- Cdbz101((int)yyvsp[-4].d,MSH_SURF_PLAN,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
+ Cdbz101((int)yyvsp[-4].d, MSH_SURF_PLAN, 0, 0, 0, 0, 0, NULL, yyvsp[-1].l, NULL);
yyval.s.Type = MSH_SURF_PLAN;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 245:
-#line 1718 "Gmsh.y"
+#line 1717 "Gmsh.y"
{
Surface *s,*support;
- support = FindSurface((int)yyvsp[-4].d,THEM);
+ support = FindSurface((int)yyvsp[-4].d, THEM);
if(!support)
yymsg(GERROR, "Unknown Surface %d", (int)yyvsp[-4].d);
else{
- Cdbz101((int)yyvsp[-8].d,MSH_SURF_PLAN,0,0,0,0,0,NULL,yyvsp[-2].l,NULL);
- s = FindSurface((int)yyvsp[-8].d,THEM);
+ Cdbz101((int)yyvsp[-8].d, MSH_SURF_PLAN, 0, 0, 0, 0, 0, NULL, yyvsp[-2].l, NULL);
+ s = FindSurface((int)yyvsp[-8].d, THEM);
if(!s)
yymsg(GERROR, "Unknown Surface %d", (int)yyvsp[-8].d);
else{
@@ -6152,11 +6148,11 @@ case 245:
;
break;}
case 246:
-#line 1737 "Gmsh.y"
+#line 1736 "Gmsh.y"
{
- List_Read(yyvsp[-1].l,0,&d);
+ List_Read(yyvsp[-1].l, 0, &d);
i = (int)d;
- EdgeLoop *el = FindEdgeLoop(i,THEM);
+ EdgeLoop *el = FindEdgeLoop(i, THEM);
if(!el)
yymsg(GERROR, "Unknown Line Loop %d", i);
else{
@@ -6164,231 +6160,228 @@ case 246:
if(j==4)
yyval.s.Type = MSH_SURF_REGL;
else if(j==3)
- yyval.s.Type = MSH_SURF_TRIC;
+ yyval.s.Type = MSH_SURF_TRIC;
else
yymsg(GERROR, "Wrong definition of Ruled Surface %d: "
"%d borders instead of 3 or 4",
(int)yyvsp[-4].d, j);
- Cdbz101((int)yyvsp[-4].d,yyval.s.Type,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
+ Cdbz101((int)yyvsp[-4].d, yyval.s.Type, 0, 0, 0, 0, 0, NULL, yyvsp[-1].l, NULL);
yyval.s.Num = (int)yyvsp[-4].d;
}
;
break;}
case 247:
-#line 1759 "Gmsh.y"
+#line 1758 "Gmsh.y"
{
- AddTriangulationToSurface ((int) yyvsp[-10].d, (int) yyvsp[-6].d, (int) yyvsp[-4].d,yyvsp[-2].l,yyvsp[-1].l);
+ AddTriangulationToSurface ((int) yyvsp[-10].d, (int) yyvsp[-6].d, (int) yyvsp[-4].d, yyvsp[-2].l, yyvsp[-1].l);
yyval.s.Num = (int)yyvsp[-10].d;
;
break;}
case 248:
-#line 1767 "Gmsh.y"
+#line 1766 "Gmsh.y"
{
CreateNurbsSurface ( (int) yyvsp[-16].d , (int)yyvsp[-4].d , (int)yyvsp[-2].d , yyvsp[-13].l, yyvsp[-10].l, yyvsp[-8].l);
- yyval.s.Type = MSH_SURF_NURBS;
+ yyval.s.Type = MSH_SURF_NURBS;
yyval.s.Num = (int)yyvsp[-16].d;
;
break;}
case 249:
-#line 1775 "Gmsh.y"
+#line 1774 "Gmsh.y"
{
CreateNurbsSurfaceSupport ((int)yyvsp[-16].d, (int) yyvsp[-4].d , (int) yyvsp[-2].d , yyvsp[-13].l, yyvsp[-10].l, yyvsp[-8].l);
;
break;}
case 250:
-#line 1779 "Gmsh.y"
+#line 1778 "Gmsh.y"
{
- Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_SURFACE,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
+ Cdbz101((int)yyvsp[-4].d, MSH_PHYSICAL_SURFACE, 0, 0, 0, 0, 0, NULL, yyvsp[-1].l, NULL);
yyval.s.Type = MSH_PHYSICAL_SURFACE;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 251:
-#line 1785 "Gmsh.y"
+#line 1784 "Gmsh.y"
{
- Cdbz101((int)yyvsp[-4].d,MSH_SURF_LOOP,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
+ Cdbz101((int)yyvsp[-4].d, MSH_SURF_LOOP, 0, 0, 0, 0, 0, NULL, yyvsp[-1].l, NULL);
yyval.s.Type = MSH_SURF_LOOP;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 252:
-#line 1794 "Gmsh.y"
+#line 1793 "Gmsh.y"
{
- Cdbz101((int)yyvsp[-4].d,MSH_VOLUME,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
+ Cdbz101((int)yyvsp[-4].d, MSH_VOLUME, 0, 0, 0, 0, 0, NULL, yyvsp[-1].l, NULL);
yyval.s.Type = MSH_VOLUME;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 253:
-#line 1800 "Gmsh.y"
+#line 1799 "Gmsh.y"
{
- Cdbz101((int)yyvsp[-4].d,MSH_VOLUME,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
+ Cdbz101((int)yyvsp[-4].d, MSH_VOLUME, 0, 0, 0, 0, 0, NULL, yyvsp[-1].l, NULL);
yyval.s.Type = MSH_VOLUME;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 254:
-#line 1806 "Gmsh.y"
+#line 1805 "Gmsh.y"
{
- Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_VOLUME,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
+ Cdbz101((int)yyvsp[-4].d, MSH_PHYSICAL_VOLUME, 0, 0, 0, 0, 0, NULL, yyvsp[-1].l, NULL);
yyval.s.Type = MSH_PHYSICAL_VOLUME;
yyval.s.Num = (int)yyvsp[-4].d;
;
break;}
case 255:
-#line 1817 "Gmsh.y"
+#line 1816 "Gmsh.y"
{
- TranslateShapes (yyvsp[-3].v[0],yyvsp[-3].v[1],yyvsp[-3].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;}
case 256:
-#line 1822 "Gmsh.y"
+#line 1821 "Gmsh.y"
{
- RotateShapes(yyvsp[-8].v[0],yyvsp[-8].v[1],yyvsp[-8].v[2],yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].d,yyvsp[-1].l,1);
+ RotateShapes(yyvsp[-8].v[0], yyvsp[-8].v[1], yyvsp[-8].v[2], yyvsp[-6].v[0], yyvsp[-6].v[1], yyvsp[-6].v[2], yyvsp[-4].d, yyvsp[-1].l, 1);
yyval.l = yyvsp[-1].l;
;
break;}
case 257:
-#line 1827 "Gmsh.y"
+#line 1826 "Gmsh.y"
{
- SymmetryShapes(yyvsp[-3].v[0],yyvsp[-3].v[1],yyvsp[-3].v[2],yyvsp[-3].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;}
case 258:
-#line 1832 "Gmsh.y"
+#line 1831 "Gmsh.y"
{
- DilatShapes(yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].d,yyvsp[-1].l,1);
+ DilatShapes(yyvsp[-6].v[0], yyvsp[-6].v[1], yyvsp[-6].v[2], yyvsp[-4].d, yyvsp[-1].l, 1);
yyval.l = yyvsp[-1].l;
;
break;}
case 259:
-#line 1839 "Gmsh.y"
+#line 1838 "Gmsh.y"
{ yyval.l = yyvsp[0].l; ;
break;}
case 260:
-#line 1840 "Gmsh.y"
+#line 1839 "Gmsh.y"
{ yyval.l = yyvsp[0].l; ;
break;}
case 261:
-#line 1841 "Gmsh.y"
+#line 1840 "Gmsh.y"
{ yyval.l = yyvsp[0].l; ;
break;}
case 262:
-#line 1846 "Gmsh.y"
+#line 1845 "Gmsh.y"
{
- yyval.l = List_Create(3,3,sizeof(Shape));
+ yyval.l = List_Create(3, 3, sizeof(Shape));
;
break;}
case 263:
-#line 1850 "Gmsh.y"
+#line 1849 "Gmsh.y"
{
- List_Add(yyval.l,&yyvsp[0].s);
- yyval.l = yyvsp[-1].l;
+ List_Add(yyval.l, &yyvsp[0].s);
;
break;}
case 264:
-#line 1855 "Gmsh.y"
+#line 1853 "Gmsh.y"
{
- for(i=0;i<List_Nbr(yyvsp[-2].l);i++){
+ for(i = 0; i < List_Nbr(yyvsp[-2].l); i++){
List_Read(yyvsp[-2].l, i, &d);
TheShape.Num = (int)d;
- Vertex *v = FindPoint(TheShape.Num,THEM);
+ Vertex *v = FindPoint(TheShape.Num, THEM);
if(!v)
yymsg(WARNING, "Unknown Point %d", TheShape.Num);
else{
TheShape.Type = MSH_POINT;
- List_Add(yyval.l,&TheShape);
+ List_Add(yyval.l, &TheShape);
}
}
- yyval.l = yyvsp[-5].l;
;
break;}
case 265:
-#line 1870 "Gmsh.y"
+#line 1867 "Gmsh.y"
{
- for(i=0;i<List_Nbr(yyvsp[-2].l);i++){
+ for(i = 0; i < List_Nbr(yyvsp[-2].l); i++){
List_Read(yyvsp[-2].l, i, &d);
TheShape.Num = (int)d;
- Curve *c = FindCurve(TheShape.Num,THEM);
+ Curve *c = FindCurve(TheShape.Num, THEM);
if(!c)
yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
else{
TheShape.Type = c->Typ;
- List_Add(yyval.l,&TheShape);
+ List_Add(yyval.l, &TheShape);
}
}
- yyval.l = yyvsp[-5].l;
;
break;}
case 266:
-#line 1885 "Gmsh.y"
+#line 1881 "Gmsh.y"
{
- for(i=0;i<List_Nbr(yyvsp[-2].l);i++){
+ for(i = 0; i < List_Nbr(yyvsp[-2].l); i++){
List_Read(yyvsp[-2].l, i, &d);
TheShape.Num = (int)d;
- Surface *s = FindSurface(TheShape.Num,THEM);
+ Surface *s = FindSurface(TheShape.Num, THEM);
if(!s)
yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
else{
TheShape.Type = s->Typ;
- List_Add(yyval.l,&TheShape);
+ List_Add(yyval.l, &TheShape);
}
}
- yyval.l = yyvsp[-5].l;
;
break;}
case 267:
-#line 1905 "Gmsh.y"
+#line 1900 "Gmsh.y"
{
- yyval.l = List_Create(3,3,sizeof(Shape));
- for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
- List_Read (yyvsp[-1].l,i,&TheShape);
- CopyShape(TheShape.Type,TheShape.Num,&j);
+ yyval.l = List_Create(3, 3, sizeof(Shape));
+ for(i = 0; i < List_Nbr(yyvsp[-1].l); i++){
+ List_Read (yyvsp[-1].l, i, &TheShape);
+ CopyShape(TheShape.Type, TheShape.Num, &j);
TheShape.Num = j;
- List_Add(yyval.l,&TheShape);
+ List_Add(yyval.l, &TheShape);
}
;
break;}
case 268:
-#line 1915 "Gmsh.y"
+#line 1910 "Gmsh.y"
{
- if(!strcmp(yyvsp[-4].c, "View")) DuplicateView((int)yyvsp[-2].d,0);
+ if(!strcmp(yyvsp[-4].c, "View")) DuplicateView((int)yyvsp[-2].d, 0);
+ yyval.l = NULL;
;
break;}
case 269:
-#line 1925 "Gmsh.y"
+#line 1921 "Gmsh.y"
{
- for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
- List_Read (yyvsp[-1].l,i,&TheShape);
- DeleteShape(TheShape.Type,TheShape.Num);
+ for(i = 0; i < List_Nbr(yyvsp[-1].l); i++){
+ List_Read (yyvsp[-1].l, i, &TheShape);
+ DeleteShape(TheShape.Type, TheShape.Num);
}
;
break;}
case 270:
-#line 1932 "Gmsh.y"
+#line 1928 "Gmsh.y"
{
if(!strcmp(yyvsp[-4].c, "View")) FreeView((int)yyvsp[-2].d);
;
break;}
case 271:
-#line 1936 "Gmsh.y"
+#line 1932 "Gmsh.y"
{
Init_Mesh(THEM, 1);
;
break;}
case 272:
-#line 1945 "Gmsh.y"
+#line 1941 "Gmsh.y"
{
- for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
- List_Read (yyvsp[-1].l,i,&TheShape);
- ColorShape(TheShape.Type,TheShape.Num,yyvsp[-3].u);
+ for(i = 0; i < List_Nbr(yyvsp[-1].l); i++){
+ List_Read (yyvsp[-1].l, i, &TheShape);
+ ColorShape(TheShape.Type, TheShape.Num, yyvsp[-3].u);
}
;
break;}
case 273:
-#line 1957 "Gmsh.y"
+#line 1953 "Gmsh.y"
{
if(!strcmp(yyvsp[-2].c, "Include")){
@@ -6409,18 +6402,19 @@ case 273:
if((yyin = fopen(tmpstring,"r"))){
Msg(INFO, "Including '%s'", tmpstring);
- strcpy(yynameTab[RecursionLevel-1],yyname);
- yylinenoTab[RecursionLevel-1]=yylineno;
- yylineno=1;
- strcpy(yyname,tmpstring);
+ strcpy(yynameTab[RecursionLevel-1], yyname);
+ yylinenoTab[RecursionLevel-1] = yylineno;
+ yylineno = 1;
+ strcpy(yyname, tmpstring);
while(!feof(yyin)){
yyparse();
}
- // FIXME: If we do fclose, we cannot call a Function defined
- // in another file...
+ // warning, warning... If we close the stream, we cannot
+ // call a Function defined in another file... So we just
+ // leave it open (arghhh)
//fclose(yyin);
yyin = yyinTab[--RecursionLevel];
- strcpy(yyname,yynameTab[RecursionLevel]);
+ strcpy(yyname, yynameTab[RecursionLevel]);
yylineno = yylinenoTab[RecursionLevel];
}
else{
@@ -6471,7 +6465,7 @@ case 273:
;
break;}
case 274:
-#line 2038 "Gmsh.y"
+#line 2035 "Gmsh.y"
{
if(!strcmp(yyvsp[-2].c, "Sleep")){
@@ -6484,7 +6478,7 @@ case 274:
else if(!strcmp(yyvsp[-2].c, "Mesh")){
//Maillage_Dimension_0(THEM);
- //mai3d(THEM,(int)$2);
+ //mai3d(THEM, (int)$2);
yymsg(GERROR, "Mesh directives are not (yet) allowed in scripts");
}
@@ -6493,20 +6487,20 @@ case 274:
;
break;}
case 275:
-#line 2058 "Gmsh.y"
+#line 2055 "Gmsh.y"
{
if(CTX.default_plugins)
- GMSH_PluginManager::Instance()->Action(yyvsp[-4].c,yyvsp[-1].c,0);
+ GMSH_PluginManager::Instance()->Action(yyvsp[-4].c, yyvsp[-1].c, 0);
;
break;}
case 276:
-#line 2063 "Gmsh.y"
+#line 2060 "Gmsh.y"
{
exit(0);
;
break;}
case 277:
-#line 2067 "Gmsh.y"
+#line 2064 "Gmsh.y"
{
#if defined(HAVE_FLTK)
if(!CTX.batch){ // we're in interactive mode
@@ -6524,7 +6518,7 @@ case 277:
;
break;}
case 278:
-#line 2089 "Gmsh.y"
+#line 2086 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = yyvsp[-3].d ;
LoopControlVariablesTab[ImbricatedLoop][1] = yyvsp[-1].d ;
@@ -6536,7 +6530,7 @@ case 278:
;
break;}
case 279:
-#line 2099 "Gmsh.y"
+#line 2096 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = yyvsp[-5].d ;
LoopControlVariablesTab[ImbricatedLoop][1] = yyvsp[-3].d ;
@@ -6548,7 +6542,7 @@ case 279:
;
break;}
case 280:
-#line 2109 "Gmsh.y"
+#line 2106 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = yyvsp[-3].d ;
LoopControlVariablesTab[ImbricatedLoop][1] = yyvsp[-1].d ;
@@ -6556,8 +6550,8 @@ case 280:
LoopControlVariablesNameTab[ImbricatedLoop] = yyvsp[-6].c ;
TheSymbol.Name = yyvsp[-6].c;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(1,1,sizeof(double));
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(1, 1, sizeof(double));
List_Put(TheSymbol.val, 0, &yyvsp[-3].d);
Tree_Add(Symbol_T, &TheSymbol);
}
@@ -6571,7 +6565,7 @@ case 280:
;
break;}
case 281:
-#line 2130 "Gmsh.y"
+#line 2127 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = yyvsp[-5].d ;
LoopControlVariablesTab[ImbricatedLoop][1] = yyvsp[-3].d ;
@@ -6579,8 +6573,8 @@ case 281:
LoopControlVariablesNameTab[ImbricatedLoop] = yyvsp[-8].c ;
TheSymbol.Name = yyvsp[-8].c;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(1,1,sizeof(double));
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(1, 1, sizeof(double));
List_Put(TheSymbol.val, 0, &yyvsp[-5].d);
Tree_Add(Symbol_T, &TheSymbol);
}
@@ -6594,7 +6588,7 @@ case 281:
;
break;}
case 282:
-#line 2151 "Gmsh.y"
+#line 2148 "Gmsh.y"
{
if(LoopControlVariablesTab[ImbricatedLoop-1][1] >
LoopControlVariablesTab[ImbricatedLoop-1][0]){
@@ -6617,254 +6611,410 @@ case 282:
;
break;}
case 283:
-#line 2172 "Gmsh.y"
+#line 2169 "Gmsh.y"
{
- if(!FunctionManager::Instance()->createFunction(yyvsp[0].c,yyin,yyname,yylineno))
- yymsg(GERROR, "Redefinition of function %s",yyvsp[0].c);
+ if(!FunctionManager::Instance()->createFunction(yyvsp[0].c, yyin, yyname, yylineno))
+ yymsg(GERROR, "Redefinition of function %s", yyvsp[0].c);
skip_until(NULL, "Return");
;
break;}
case 284:
-#line 2178 "Gmsh.y"
+#line 2175 "Gmsh.y"
{
- if(!FunctionManager::Instance()->leaveFunction(&yyin,yyname,yylineno))
+ if(!FunctionManager::Instance()->leaveFunction(&yyin, yyname, yylineno))
yymsg(GERROR, "Error while exiting function");
;
break;}
case 285:
-#line 2183 "Gmsh.y"
+#line 2180 "Gmsh.y"
{
- if(!FunctionManager::Instance()->enterFunction(yyvsp[-1].c,&yyin,yyname,yylineno))
- yymsg(GERROR, "Unknown function %s",yyvsp[-1].c);
+ if(!FunctionManager::Instance()->enterFunction(yyvsp[-1].c, &yyin, yyname, yylineno))
+ yymsg(GERROR, "Unknown function %s", yyvsp[-1].c);
;
break;}
case 286:
-#line 2188 "Gmsh.y"
+#line 2185 "Gmsh.y"
{
if(!yyvsp[-1].d) skip_until("If", "EndIf");
;
break;}
case 287:
-#line 2192 "Gmsh.y"
+#line 2189 "Gmsh.y"
{
;
break;}
case 288:
-#line 2204 "Gmsh.y"
+#line 2200 "Gmsh.y"
{
Curve *pc, *prc;
- Extrude_ProtudePoint(TRANSLATE,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],
- 0.,0.,0.,0.,0.,0.,0.,
- &pc,&prc,1,NULL);
+ TheShape.Num = Extrude_ProtudePoint(TRANSLATE, (int)yyvsp[-4].d, yyvsp[-2].v[0], yyvsp[-2].v[1], yyvsp[-2].v[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ &pc, &prc, 1, NULL);
+ TheShape.Type = MSH_POINT;
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 289:
-#line 2211 "Gmsh.y"
+#line 2210 "Gmsh.y"
{
Curve *pc, *prc;
- Extrude_ProtudePoint(ROTATE,(int)yyvsp[-8].d,0.,0.,0.,
- 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,1,NULL);
+ TheShape.Num = Extrude_ProtudePoint(ROTATE, (int)yyvsp[-8].d, 0., 0., 0.,
+ 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, 1, NULL);
+ TheShape.Type = MSH_POINT;
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 290:
-#line 2218 "Gmsh.y"
+#line 2220 "Gmsh.y"
{
Curve *pc, *prc;
- Extrude_ProtudePoint(TRANSLATE_ROTATE,(int)yyvsp[-10].d,yyvsp[-8].v[0],yyvsp[-8].v[1],yyvsp[-8].v[2],
- 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,1,NULL);
+ TheShape.Num = Extrude_ProtudePoint(TRANSLATE_ROTATE, (int)yyvsp[-10].d, yyvsp[-8].v[0], yyvsp[-8].v[1], yyvsp[-8].v[2],
+ 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, 1, NULL);
+ TheShape.Type = MSH_POINT;
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 291:
-#line 2225 "Gmsh.y"
+#line 2230 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 292:
-#line 2230 "Gmsh.y"
+#line 2235 "Gmsh.y"
{
Curve *pc, *prc;
- Extrude_ProtudePoint(TRANSLATE,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],
- 0.,0.,0.,0.,0.,0.,0.,
- &pc,&prc,1,&extr);
+ TheShape.Num = Extrude_ProtudePoint(TRANSLATE, (int)yyvsp[-8].d, yyvsp[-6].v[0], yyvsp[-6].v[1], yyvsp[-6].v[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ &pc, &prc, 1, &extr);
+ TheShape.Type = MSH_POINT;
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 293:
-#line 2237 "Gmsh.y"
+#line 2245 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 294:
-#line 2242 "Gmsh.y"
+#line 2250 "Gmsh.y"
{
Curve *pc, *prc;
- Extrude_ProtudePoint(ROTATE,(int)yyvsp[-12].d,0.,0.,0.,
- yyvsp[-10].v[0],yyvsp[-10].v[1],yyvsp[-10].v[2],yyvsp[-8].v[0],yyvsp[-8].v[1],yyvsp[-8].v[2],yyvsp[-6].d,
- &pc,&prc,1,&extr);
+ TheShape.Num = Extrude_ProtudePoint(ROTATE, (int)yyvsp[-12].d, 0., 0., 0.,
+ yyvsp[-10].v[0], yyvsp[-10].v[1], yyvsp[-10].v[2], yyvsp[-8].v[0], yyvsp[-8].v[1], yyvsp[-8].v[2], yyvsp[-6].d,
+ &pc, &prc, 1, &extr);
+ TheShape.Type = MSH_POINT;
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 295:
-#line 2249 "Gmsh.y"
+#line 2260 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 296:
-#line 2254 "Gmsh.y"
+#line 2265 "Gmsh.y"
{
Curve *pc, *prc;
- Extrude_ProtudePoint(TRANSLATE_ROTATE,(int)yyvsp[-14].d,yyvsp[-12].v[0],yyvsp[-12].v[1],yyvsp[-12].v[2],
- yyvsp[-10].v[0],yyvsp[-10].v[1],yyvsp[-10].v[2],yyvsp[-8].v[0],yyvsp[-8].v[1],yyvsp[-8].v[2],yyvsp[-6].d,
- &pc,&prc,1,&extr);
+ TheShape.Num = Extrude_ProtudePoint(TRANSLATE_ROTATE, (int)yyvsp[-14].d, yyvsp[-12].v[0], yyvsp[-12].v[1], yyvsp[-12].v[2],
+ yyvsp[-10].v[0], yyvsp[-10].v[1], yyvsp[-10].v[2], yyvsp[-8].v[0], yyvsp[-8].v[1], yyvsp[-8].v[2], yyvsp[-6].d,
+ &pc, &prc, 1, &extr);
+ TheShape.Type = MSH_POINT;
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 297:
-#line 2264 "Gmsh.y"
-{
- Extrude_ProtudeCurve(TRANSLATE,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],
- 0.,0.,0.,0.,0.,0.,0.,1,NULL);
+#line 2278 "Gmsh.y"
+{
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(TRANSLATE, (int)yyvsp[-4].d, yyvsp[-2].v[0], yyvsp[-2].v[1], yyvsp[-2].v[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ &ps, 1, NULL);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 298:
-#line 2269 "Gmsh.y"
-{
- Extrude_ProtudeCurve(ROTATE,(int)yyvsp[-8].d,0.,0.,0.,
- 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,1,NULL);
+#line 2295 "Gmsh.y"
+{
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(ROTATE, (int)yyvsp[-8].d, 0., 0., 0.,
+ 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,
+ &ps, 1, NULL);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 299:
-#line 2274 "Gmsh.y"
+#line 2312 "Gmsh.y"
{
- Extrude_ProtudeCurve(TRANSLATE_ROTATE,(int)yyvsp[-10].d,yyvsp[-8].v[0],yyvsp[-8].v[1],yyvsp[-8].v[2],
- 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,1,NULL);
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(TRANSLATE_ROTATE, (int)yyvsp[-10].d, yyvsp[-8].v[0], yyvsp[-8].v[1], yyvsp[-8].v[2],
+ 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,
+ &ps, 1, NULL);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 300:
-#line 2279 "Gmsh.y"
+#line 2329 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 301:
-#line 2284 "Gmsh.y"
-{
- Extrude_ProtudeCurve(TRANSLATE,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],
- 0.,0.,0.,0.,0.,0.,0.,1,&extr);
+#line 2334 "Gmsh.y"
+{
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(TRANSLATE, (int)yyvsp[-8].d, yyvsp[-6].v[0], yyvsp[-6].v[1], yyvsp[-6].v[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ &ps, 1, &extr);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 302:
-#line 2289 "Gmsh.y"
+#line 2351 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 303:
-#line 2294 "Gmsh.y"
+#line 2356 "Gmsh.y"
{
- Extrude_ProtudeCurve(ROTATE,(int)yyvsp[-12].d,0.,0.,0.,
- yyvsp[-10].v[0],yyvsp[-10].v[1],yyvsp[-10].v[2],yyvsp[-8].v[0],yyvsp[-8].v[1],yyvsp[-8].v[2],yyvsp[-6].d,1,&extr);
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(ROTATE, (int)yyvsp[-12].d, 0., 0., 0.,
+ yyvsp[-10].v[0], yyvsp[-10].v[1], yyvsp[-10].v[2], yyvsp[-8].v[0], yyvsp[-8].v[1], yyvsp[-8].v[2], yyvsp[-6].d,
+ &ps, 1, &extr);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 304:
-#line 2299 "Gmsh.y"
+#line 2373 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 305:
-#line 2304 "Gmsh.y"
-{
- Extrude_ProtudeCurve(TRANSLATE_ROTATE,(int)yyvsp[-14].d,yyvsp[-12].v[0],yyvsp[-12].v[1],yyvsp[-12].v[2],
- yyvsp[-10].v[0],yyvsp[-10].v[1],yyvsp[-10].v[2],yyvsp[-8].v[0],yyvsp[-8].v[1],yyvsp[-8].v[2],yyvsp[-6].d,1,&extr);
+#line 2378 "Gmsh.y"
+{
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(TRANSLATE_ROTATE, (int)yyvsp[-14].d, yyvsp[-12].v[0], yyvsp[-12].v[1], yyvsp[-12].v[2],
+ yyvsp[-10].v[0], yyvsp[-10].v[1], yyvsp[-10].v[2], yyvsp[-8].v[0], yyvsp[-8].v[1], yyvsp[-8].v[2], yyvsp[-6].d,
+ &ps, 1, &extr);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 306:
-#line 2312 "Gmsh.y"
-{
- Extrude_ProtudeSurface(TRANSLATE,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],
- 0.,0.,0.,0.,0.,0.,0.,0,NULL);
+#line 2398 "Gmsh.y"
+{
+ TheShape.Num = Extrude_ProtudeSurface(TRANSLATE, (int)yyvsp[-4].d, yyvsp[-2].v[0], yyvsp[-2].v[1], yyvsp[-2].v[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ 0, NULL);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 307:
-#line 2317 "Gmsh.y"
-{
- Extrude_ProtudeSurface(ROTATE,(int)yyvsp[-8].d,0.,0.,0.,
- 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);
+#line 2414 "Gmsh.y"
+{
+ TheShape.Num = Extrude_ProtudeSurface(ROTATE, (int)yyvsp[-8].d, 0., 0., 0.,
+ 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);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 308:
-#line 2322 "Gmsh.y"
-{
- Extrude_ProtudeSurface(TRANSLATE_ROTATE,(int)yyvsp[-10].d,yyvsp[-8].v[0],yyvsp[-8].v[1],yyvsp[-8].v[2],
- 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);
+#line 2430 "Gmsh.y"
+{
+ TheShape.Num = Extrude_ProtudeSurface(TRANSLATE_ROTATE, (int)yyvsp[-10].d, yyvsp[-8].v[0], yyvsp[-8].v[1], yyvsp[-8].v[2],
+ 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);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 309:
-#line 2327 "Gmsh.y"
+#line 2446 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 310:
-#line 2332 "Gmsh.y"
+#line 2451 "Gmsh.y"
{
int vol = NEWREG();
- Extrude_ProtudeSurface(TRANSLATE,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],
- 0.,0.,0.,0.,0.,0.,0.,vol,&extr);
+ TheShape.Num = Extrude_ProtudeSurface(TRANSLATE, (int)yyvsp[-8].d, yyvsp[-6].v[0], yyvsp[-6].v[1], yyvsp[-6].v[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ vol, &extr);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 311:
-#line 2338 "Gmsh.y"
+#line 2468 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 312:
-#line 2344 "Gmsh.y"
+#line 2474 "Gmsh.y"
{
int vol = NEWREG();
- Extrude_ProtudeSurface(ROTATE,(int)yyvsp[-12].d,0.,0.,0.,
- yyvsp[-10].v[0],yyvsp[-10].v[1],yyvsp[-10].v[2],yyvsp[-8].v[0],yyvsp[-8].v[1],yyvsp[-8].v[2],yyvsp[-6].d,vol,&extr);
+ TheShape.Num = Extrude_ProtudeSurface(ROTATE, (int)yyvsp[-12].d, 0., 0., 0.,
+ yyvsp[-10].v[0], yyvsp[-10].v[1], yyvsp[-10].v[2], yyvsp[-8].v[0], yyvsp[-8].v[1], yyvsp[-8].v[2], yyvsp[-6].d,
+ vol, &extr);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 313:
-#line 2350 "Gmsh.y"
+#line 2491 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = false;
extr.mesh.Recombine = false;
;
break;}
case 314:
-#line 2356 "Gmsh.y"
+#line 2497 "Gmsh.y"
{
int vol = NEWREG();
- Extrude_ProtudeSurface(TRANSLATE_ROTATE,(int)yyvsp[-14].d,yyvsp[-12].v[0],yyvsp[-12].v[1],yyvsp[-12].v[2],
- yyvsp[-10].v[0],yyvsp[-10].v[1],yyvsp[-10].v[2],yyvsp[-8].v[0],yyvsp[-8].v[1],yyvsp[-8].v[2],yyvsp[-6].d,vol,&extr);
+ TheShape.Num = Extrude_ProtudeSurface(TRANSLATE_ROTATE, (int)yyvsp[-14].d, yyvsp[-12].v[0], yyvsp[-12].v[1], yyvsp[-12].v[2],
+ yyvsp[-10].v[0], yyvsp[-10].v[1], yyvsp[-10].v[2], yyvsp[-8].v[0], yyvsp[-8].v[1], yyvsp[-8].v[2], yyvsp[-6].d,
+ vol, &extr);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ yyval.l = List_Create(1, 1, sizeof(Shape));
+ List_Add(yyval.l, &TheShape);
;
break;}
case 315:
-#line 2365 "Gmsh.y"
+#line 2517 "Gmsh.y"
{
;
break;}
case 316:
-#line 2368 "Gmsh.y"
+#line 2520 "Gmsh.y"
{
;
break;}
case 317:
-#line 2374 "Gmsh.y"
+#line 2526 "Gmsh.y"
{
double d;
extr.mesh.ExtrudeMesh = true;
@@ -6873,12 +7023,12 @@ case 317:
extr.mesh.NbElmLayer = (int*)Malloc(extr.mesh.NbLayer*sizeof(int));
extr.mesh.ZonLayer = (int*)Malloc(extr.mesh.NbLayer*sizeof(int));
extr.mesh.hLayer = (double*)Malloc(extr.mesh.NbLayer*sizeof(double));
- for(int i=0;i<List_Nbr(yyvsp[-6].l);i++){
- List_Read(yyvsp[-6].l,i,&d);
+ for(int i = 0; i < List_Nbr(yyvsp[-6].l); i++){
+ List_Read(yyvsp[-6].l, i, &d);
extr.mesh.NbElmLayer[i] = (d>0)?(int)d:1;
- List_Read(yyvsp[-4].l,i,&d);
+ List_Read(yyvsp[-4].l, i, &d);
extr.mesh.ZonLayer[i] = (int)d;
- List_Read(yyvsp[-2].l,i,&d);
+ List_Read(yyvsp[-2].l, i, &d);
extr.mesh.hLayer[i] = d;
}
}
@@ -6892,7 +7042,7 @@ case 317:
;
break;}
case 318:
-#line 2400 "Gmsh.y"
+#line 2552 "Gmsh.y"
{
double d;
extr.mesh.ExtrudeMesh = true;
@@ -6901,11 +7051,11 @@ case 318:
extr.mesh.NbElmLayer = (int*)Malloc(extr.mesh.NbLayer*sizeof(int));
extr.mesh.ZonLayer = (int*)Malloc(extr.mesh.NbLayer*sizeof(int));
extr.mesh.hLayer = (double*)Malloc(extr.mesh.NbLayer*sizeof(double));
- for(int i=0;i<List_Nbr(yyvsp[-4].l);i++){
- List_Read(yyvsp[-4].l,i,&d);
+ for(int i = 0; i < List_Nbr(yyvsp[-4].l); i++){
+ List_Read(yyvsp[-4].l, i, &d);
extr.mesh.NbElmLayer[i] = (d>0)?(int)d:1;
extr.mesh.ZonLayer[i] = 0;
- List_Read(yyvsp[-2].l,i,&d);
+ List_Read(yyvsp[-2].l, i, &d);
extr.mesh.hLayer[i] = d;
}
}
@@ -6918,19 +7068,19 @@ case 318:
;
break;}
case 319:
-#line 2424 "Gmsh.y"
+#line 2576 "Gmsh.y"
{
extr.mesh.Recombine = true;
;
break;}
case 320:
-#line 2433 "Gmsh.y"
+#line 2585 "Gmsh.y"
{
Curve *c;
- for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
- List_Read(yyvsp[-3].l,i,&d);
+ for(i = 0; i < List_Nbr(yyvsp[-3].l); i++){
+ List_Read(yyvsp[-3].l, i, &d);
j = (int)fabs(d);
- c = FindCurve(j,THEM);
+ c = FindCurve(j, THEM);
if(!c)
yymsg(WARNING, "Unknown Curve %d", j);
else{
@@ -6944,13 +7094,13 @@ case 320:
;
break;}
case 321:
-#line 2451 "Gmsh.y"
+#line 2603 "Gmsh.y"
{
Curve *c;
- for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
- List_Read(yyvsp[-6].l,i,&d);
+ for(i = 0; i < List_Nbr(yyvsp[-6].l); i++){
+ List_Read(yyvsp[-6].l, i, &d);
j = (int)fabs(d);
- c = FindCurve(j,THEM);
+ c = FindCurve(j, THEM);
if(!c)
yymsg(WARNING, "Unknown Curve %d", j);
else{
@@ -6964,13 +7114,13 @@ case 321:
;
break;}
case 322:
-#line 2469 "Gmsh.y"
+#line 2621 "Gmsh.y"
{
Curve *c;
- for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
- List_Read(yyvsp[-6].l,i,&d);
+ for(i = 0; i < List_Nbr(yyvsp[-6].l); i++){
+ List_Read(yyvsp[-6].l, i, &d);
j = (int)fabs(d);
- c = FindCurve(j,THEM);
+ c = FindCurve(j, THEM);
if(!c)
yymsg(WARNING, "Unknown Curve %d", j);
else{
@@ -6984,9 +7134,9 @@ case 322:
;
break;}
case 323:
-#line 2487 "Gmsh.y"
+#line 2639 "Gmsh.y"
{
- Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
+ Surface *s = FindSurface((int)yyvsp[-4].d, THEM);
if(!s)
yymsg(WARNING, "Unknown Surface %d", (int)yyvsp[-4].d);
else{
@@ -6997,8 +7147,8 @@ case 323:
"%d points instead of 3 or 4" , yyvsp[-4].d, k) ;
}
else{
- for(i=0;i<k;i++){
- List_Read(yyvsp[-1].l,i,&d);
+ for(i = 0; i < k; i++){
+ List_Read(yyvsp[-1].l, i, &d);
j = (int)fabs(d);
s->ipar[i] = j;
}
@@ -7008,9 +7158,9 @@ case 323:
;
break;}
case 324:
-#line 2509 "Gmsh.y"
+#line 2661 "Gmsh.y"
{
- Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
+ Surface *s = FindSurface((int)yyvsp[-4].d, THEM);
if(!s)
yymsg(WARNING, "Unknown Surface %d", (int)yyvsp[-4].d);
else{
@@ -7020,8 +7170,8 @@ case 324:
yymsg(GERROR, "Wrong definition of Elliptic Surface %d: "
"%d points instead of 4" , yyvsp[-4].d, k) ;
else{
- for(i=0;i<k;i++){
- List_Read(yyvsp[-1].l,i,&d);
+ for(i = 0; i < k; i++){
+ List_Read(yyvsp[-1].l, i, &d);
j = (int)fabs(d);
s->ipar[i] = j;
}
@@ -7031,20 +7181,20 @@ case 324:
;
break;}
case 325:
-#line 2530 "Gmsh.y"
+#line 2682 "Gmsh.y"
{
- Volume *v = FindVolume((int)yyvsp[-4].d,THEM);
+ Volume *v = FindVolume((int)yyvsp[-4].d, THEM);
if(!v)
yymsg(WARNING, "Unknown Volume %d", (int)yyvsp[-4].d);
else{
v->Method = TRANSFINI;
k = List_Nbr(yyvsp[-1].l);
- if(k!=6 && k!=8)
+ if(k != 6 && k != 8)
yymsg(GERROR, "Wrong definition of Transfinite Volume %d: "
"%d points instead of 6 or 8" , yyvsp[-4].d, k) ;
else{
- for(i=0;i<k;i++){
- List_Read(yyvsp[-1].l,i,&d);
+ for(i = 0; i < k; i++){
+ List_Read(yyvsp[-1].l, i, &d);
j = (int)fabs(d);
v->ipar[i] = j;
}
@@ -7054,13 +7204,13 @@ case 325:
;
break;}
case 326:
-#line 2551 "Gmsh.y"
+#line 2703 "Gmsh.y"
{
Surface *s;
- for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
- List_Read(yyvsp[-3].l,i,&d);
+ for(i = 0; i < List_Nbr(yyvsp[-3].l); i++){
+ List_Read(yyvsp[-3].l, i, &d);
j = (int)d;
- s = FindSurface(j,THEM);
+ s = FindSurface(j, THEM);
if(s){
s->Recombine = 1;
s->RecombineAngle = (yyvsp[-1].d > 0 && yyvsp[-1].d < 90) ? yyvsp[-1].d : 90;
@@ -7070,13 +7220,13 @@ case 326:
;
break;}
case 327:
-#line 2565 "Gmsh.y"
+#line 2717 "Gmsh.y"
{
Surface *s;
- for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
- List_Read(yyvsp[-1].l,i,&d);
+ for(i = 0; i < List_Nbr(yyvsp[-1].l); i++){
+ List_Read(yyvsp[-1].l, i, &d);
j = (int)d;
- s = FindSurface(j,THEM);
+ s = FindSurface(j, THEM);
if(s){
s->Recombine = 1;
s->RecombineAngle = 30.;
@@ -7086,71 +7236,71 @@ case 327:
;
break;}
case 328:
-#line 2585 "Gmsh.y"
+#line 2737 "Gmsh.y"
{
ReplaceAllDuplicates(THEM);
;
break;}
case 329:
-#line 2589 "Gmsh.y"
+#line 2741 "Gmsh.y"
{
IntersectAllSegmentsTogether();
;
break;}
case 330:
-#line 2598 "Gmsh.y"
+#line 2750 "Gmsh.y"
{yyval.i = 1;;
break;}
case 331:
-#line 2599 "Gmsh.y"
+#line 2751 "Gmsh.y"
{yyval.i = 0;;
break;}
case 332:
-#line 2600 "Gmsh.y"
+#line 2752 "Gmsh.y"
{yyval.i = -1;;
break;}
case 333:
-#line 2601 "Gmsh.y"
+#line 2753 "Gmsh.y"
{yyval.i = -1;;
break;}
case 334:
-#line 2602 "Gmsh.y"
+#line 2754 "Gmsh.y"
{yyval.i = -1;;
break;}
case 335:
-#line 2606 "Gmsh.y"
+#line 2758 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 336:
-#line 2607 "Gmsh.y"
+#line 2759 "Gmsh.y"
{ yyval.d = yyvsp[-1].d ; ;
break;}
case 337:
-#line 2608 "Gmsh.y"
+#line 2760 "Gmsh.y"
{ yyval.d = -yyvsp[0].d ; ;
break;}
case 338:
-#line 2609 "Gmsh.y"
+#line 2761 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 339:
-#line 2610 "Gmsh.y"
+#line 2762 "Gmsh.y"
{ yyval.d = !yyvsp[0].d ; ;
break;}
case 340:
-#line 2611 "Gmsh.y"
+#line 2763 "Gmsh.y"
{ yyval.d = yyvsp[-2].d - yyvsp[0].d ; ;
break;}
case 341:
-#line 2612 "Gmsh.y"
+#line 2764 "Gmsh.y"
{ yyval.d = yyvsp[-2].d + yyvsp[0].d ; ;
break;}
case 342:
-#line 2613 "Gmsh.y"
+#line 2765 "Gmsh.y"
{ yyval.d = yyvsp[-2].d * yyvsp[0].d ; ;
break;}
case 343:
-#line 2615 "Gmsh.y"
+#line 2767 "Gmsh.y"
{
if(!yyvsp[0].d)
yymsg(GERROR, "Division by zero in '%g / %g'", yyvsp[-2].d, yyvsp[0].d);
@@ -7159,238 +7309,238 @@ case 343:
;
break;}
case 344:
-#line 2621 "Gmsh.y"
+#line 2773 "Gmsh.y"
{ yyval.d = (int)yyvsp[-2].d % (int)yyvsp[0].d ; ;
break;}
case 345:
-#line 2622 "Gmsh.y"
-{ yyval.d = pow(yyvsp[-2].d,yyvsp[0].d) ; ;
+#line 2774 "Gmsh.y"
+{ yyval.d = pow(yyvsp[-2].d, yyvsp[0].d) ; ;
break;}
case 346:
-#line 2623 "Gmsh.y"
+#line 2775 "Gmsh.y"
{ yyval.d = yyvsp[-2].d < yyvsp[0].d ; ;
break;}
case 347:
-#line 2624 "Gmsh.y"
+#line 2776 "Gmsh.y"
{ yyval.d = yyvsp[-2].d > yyvsp[0].d ; ;
break;}
case 348:
-#line 2625 "Gmsh.y"
+#line 2777 "Gmsh.y"
{ yyval.d = yyvsp[-2].d <= yyvsp[0].d ; ;
break;}
case 349:
-#line 2626 "Gmsh.y"
+#line 2778 "Gmsh.y"
{ yyval.d = yyvsp[-2].d >= yyvsp[0].d ; ;
break;}
case 350:
-#line 2627 "Gmsh.y"
+#line 2779 "Gmsh.y"
{ yyval.d = yyvsp[-2].d == yyvsp[0].d ; ;
break;}
case 351:
-#line 2628 "Gmsh.y"
+#line 2780 "Gmsh.y"
{ yyval.d = yyvsp[-2].d != yyvsp[0].d ; ;
break;}
case 352:
-#line 2629 "Gmsh.y"
+#line 2781 "Gmsh.y"
{ yyval.d = yyvsp[-2].d && yyvsp[0].d ; ;
break;}
case 353:
-#line 2630 "Gmsh.y"
+#line 2782 "Gmsh.y"
{ yyval.d = yyvsp[-2].d || yyvsp[0].d ; ;
break;}
case 354:
-#line 2631 "Gmsh.y"
+#line 2783 "Gmsh.y"
{ yyval.d = yyvsp[-4].d? yyvsp[-2].d : yyvsp[0].d ; ;
break;}
case 355:
-#line 2632 "Gmsh.y"
+#line 2784 "Gmsh.y"
{ yyval.d = exp(yyvsp[-1].d); ;
break;}
case 356:
-#line 2633 "Gmsh.y"
+#line 2785 "Gmsh.y"
{ yyval.d = log(yyvsp[-1].d); ;
break;}
case 357:
-#line 2634 "Gmsh.y"
+#line 2786 "Gmsh.y"
{ yyval.d = log10(yyvsp[-1].d); ;
break;}
case 358:
-#line 2635 "Gmsh.y"
+#line 2787 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-1].d); ;
break;}
case 359:
-#line 2636 "Gmsh.y"
+#line 2788 "Gmsh.y"
{ yyval.d = sin(yyvsp[-1].d); ;
break;}
case 360:
-#line 2637 "Gmsh.y"
+#line 2789 "Gmsh.y"
{ yyval.d = asin(yyvsp[-1].d); ;
break;}
case 361:
-#line 2638 "Gmsh.y"
+#line 2790 "Gmsh.y"
{ yyval.d = cos(yyvsp[-1].d); ;
break;}
case 362:
-#line 2639 "Gmsh.y"
+#line 2791 "Gmsh.y"
{ yyval.d = acos(yyvsp[-1].d); ;
break;}
case 363:
-#line 2640 "Gmsh.y"
+#line 2792 "Gmsh.y"
{ yyval.d = tan(yyvsp[-1].d); ;
break;}
case 364:
-#line 2641 "Gmsh.y"
+#line 2793 "Gmsh.y"
{ yyval.d = atan(yyvsp[-1].d); ;
break;}
case 365:
-#line 2642 "Gmsh.y"
-{ yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2794 "Gmsh.y"
+{ yyval.d = atan2(yyvsp[-3].d, yyvsp[-1].d); ;
break;}
case 366:
-#line 2643 "Gmsh.y"
+#line 2795 "Gmsh.y"
{ yyval.d = sinh(yyvsp[-1].d); ;
break;}
case 367:
-#line 2644 "Gmsh.y"
+#line 2796 "Gmsh.y"
{ yyval.d = cosh(yyvsp[-1].d); ;
break;}
case 368:
-#line 2645 "Gmsh.y"
+#line 2797 "Gmsh.y"
{ yyval.d = tanh(yyvsp[-1].d); ;
break;}
case 369:
-#line 2646 "Gmsh.y"
+#line 2798 "Gmsh.y"
{ yyval.d = fabs(yyvsp[-1].d); ;
break;}
case 370:
-#line 2647 "Gmsh.y"
+#line 2799 "Gmsh.y"
{ yyval.d = floor(yyvsp[-1].d); ;
break;}
case 371:
-#line 2648 "Gmsh.y"
+#line 2800 "Gmsh.y"
{ yyval.d = ceil(yyvsp[-1].d); ;
break;}
case 372:
-#line 2649 "Gmsh.y"
-{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2801 "Gmsh.y"
+{ yyval.d = fmod(yyvsp[-3].d, yyvsp[-1].d); ;
break;}
case 373:
-#line 2650 "Gmsh.y"
-{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2802 "Gmsh.y"
+{ yyval.d = fmod(yyvsp[-3].d, yyvsp[-1].d); ;
break;}
case 374:
-#line 2651 "Gmsh.y"
+#line 2803 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
break;}
case 375:
-#line 2652 "Gmsh.y"
+#line 2804 "Gmsh.y"
{ yyval.d = yyvsp[-1].d*(double)rand()/(double)RAND_MAX; ;
break;}
case 376:
-#line 2654 "Gmsh.y"
+#line 2806 "Gmsh.y"
{ yyval.d = exp(yyvsp[-1].d); ;
break;}
case 377:
-#line 2655 "Gmsh.y"
+#line 2807 "Gmsh.y"
{ yyval.d = log(yyvsp[-1].d); ;
break;}
case 378:
-#line 2656 "Gmsh.y"
+#line 2808 "Gmsh.y"
{ yyval.d = log10(yyvsp[-1].d); ;
break;}
case 379:
-#line 2657 "Gmsh.y"
+#line 2809 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-1].d); ;
break;}
case 380:
-#line 2658 "Gmsh.y"
+#line 2810 "Gmsh.y"
{ yyval.d = sin(yyvsp[-1].d); ;
break;}
case 381:
-#line 2659 "Gmsh.y"
+#line 2811 "Gmsh.y"
{ yyval.d = asin(yyvsp[-1].d); ;
break;}
case 382:
-#line 2660 "Gmsh.y"
+#line 2812 "Gmsh.y"
{ yyval.d = cos(yyvsp[-1].d); ;
break;}
case 383:
-#line 2661 "Gmsh.y"
+#line 2813 "Gmsh.y"
{ yyval.d = acos(yyvsp[-1].d); ;
break;}
case 384:
-#line 2662 "Gmsh.y"
+#line 2814 "Gmsh.y"
{ yyval.d = tan(yyvsp[-1].d); ;
break;}
case 385:
-#line 2663 "Gmsh.y"
+#line 2815 "Gmsh.y"
{ yyval.d = atan(yyvsp[-1].d); ;
break;}
case 386:
-#line 2664 "Gmsh.y"
-{ yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2816 "Gmsh.y"
+{ yyval.d = atan2(yyvsp[-3].d, yyvsp[-1].d); ;
break;}
case 387:
-#line 2665 "Gmsh.y"
+#line 2817 "Gmsh.y"
{ yyval.d = sinh(yyvsp[-1].d); ;
break;}
case 388:
-#line 2666 "Gmsh.y"
+#line 2818 "Gmsh.y"
{ yyval.d = cosh(yyvsp[-1].d); ;
break;}
case 389:
-#line 2667 "Gmsh.y"
+#line 2819 "Gmsh.y"
{ yyval.d = tanh(yyvsp[-1].d); ;
break;}
case 390:
-#line 2668 "Gmsh.y"
+#line 2820 "Gmsh.y"
{ yyval.d = fabs(yyvsp[-1].d); ;
break;}
case 391:
-#line 2669 "Gmsh.y"
+#line 2821 "Gmsh.y"
{ yyval.d = floor(yyvsp[-1].d); ;
break;}
case 392:
-#line 2670 "Gmsh.y"
+#line 2822 "Gmsh.y"
{ yyval.d = ceil(yyvsp[-1].d); ;
break;}
case 393:
-#line 2671 "Gmsh.y"
-{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2823 "Gmsh.y"
+{ yyval.d = fmod(yyvsp[-3].d, yyvsp[-1].d); ;
break;}
case 394:
-#line 2672 "Gmsh.y"
-{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
+#line 2824 "Gmsh.y"
+{ yyval.d = fmod(yyvsp[-3].d, yyvsp[-1].d); ;
break;}
case 395:
-#line 2673 "Gmsh.y"
+#line 2825 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
break;}
case 396:
-#line 2674 "Gmsh.y"
+#line 2826 "Gmsh.y"
{ yyval.d = yyvsp[-1].d*(double)rand()/(double)RAND_MAX; ;
break;}
case 397:
-#line 2683 "Gmsh.y"
+#line 2835 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 398:
-#line 2684 "Gmsh.y"
+#line 2836 "Gmsh.y"
{ yyval.d = 3.141592653589793; ;
break;}
case 399:
-#line 2685 "Gmsh.y"
+#line 2837 "Gmsh.y"
{ yyval.d = ParUtil::Instance()->rank(); ;
break;}
case 400:
-#line 2686 "Gmsh.y"
+#line 2838 "Gmsh.y"
{ yyval.d = ParUtil::Instance()->size(); ;
break;}
case 401:
-#line 2691 "Gmsh.y"
+#line 2843 "Gmsh.y"
{
TheSymbol.Name = yyvsp[0].c ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", yyvsp[0].c) ;
yyval.d = 0. ;
}
@@ -7399,10 +7549,10 @@ case 401:
;
break;}
case 402:
-#line 2702 "Gmsh.y"
+#line 2854 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", yyvsp[-3].c) ;
yyval.d = 0. ;
}
@@ -7417,10 +7567,10 @@ case 402:
;
break;}
case 403:
-#line 2719 "Gmsh.y"
+#line 2871 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-1].c ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", yyvsp[-1].c) ;
yyval.d = 0. ;
}
@@ -7429,10 +7579,10 @@ case 403:
;
break;}
case 404:
-#line 2730 "Gmsh.y"
+#line 2882 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-4].c ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", yyvsp[-4].c) ;
yyval.d = 0. ;
}
@@ -7447,7 +7597,7 @@ case 404:
;
break;}
case 405:
-#line 2749 "Gmsh.y"
+#line 2901 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-2].c))){
yymsg(GERROR, "Unknown numeric option class '%s'", yyvsp[-2].c);
@@ -7464,7 +7614,7 @@ case 405:
;
break;}
case 406:
-#line 2765 "Gmsh.y"
+#line 2917 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c))){
yymsg(GERROR, "Unknown numeric option class '%s'", yyvsp[-5].c);
@@ -7481,7 +7631,7 @@ case 406:
;
break;}
case 407:
-#line 2781 "Gmsh.y"
+#line 2933 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-3].c))){
yymsg(GERROR, "Unknown numeric option class '%s'", yyvsp[-3].c);
@@ -7498,7 +7648,7 @@ case 407:
;
break;}
case 408:
-#line 2797 "Gmsh.y"
+#line 2949 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-6].c))){
yymsg(GERROR, "Unknown numeric option class '%s'", yyvsp[-6].c);
@@ -7515,205 +7665,260 @@ case 408:
;
break;}
case 409:
-#line 2815 "Gmsh.y"
+#line 2967 "Gmsh.y"
{
memcpy(yyval.v, yyvsp[0].v, 5*sizeof(double)) ;
;
break;}
case 410:
-#line 2819 "Gmsh.y"
+#line 2971 "Gmsh.y"
{
- for(i=0 ; i<5 ; i++) yyval.v[i] = -yyvsp[0].v[i] ;
+ for(i = 0; i < 5; i++) yyval.v[i] = -yyvsp[0].v[i] ;
;
break;}
case 411:
-#line 2823 "Gmsh.y"
+#line 2975 "Gmsh.y"
{
- for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[0].v[i];
+ for(i = 0; i < 5; i++) yyval.v[i] = yyvsp[0].v[i];
;
break;}
case 412:
-#line 2827 "Gmsh.y"
+#line 2979 "Gmsh.y"
{
- for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[-2].v[i] - yyvsp[0].v[i] ;
+ for(i = 0; i < 5; i++) yyval.v[i] = yyvsp[-2].v[i] - yyvsp[0].v[i] ;
;
break;}
case 413:
-#line 2831 "Gmsh.y"
+#line 2983 "Gmsh.y"
{
- for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[-2].v[i] + yyvsp[0].v[i] ;
+ for(i = 0; i < 5; i++) yyval.v[i] = yyvsp[-2].v[i] + yyvsp[0].v[i] ;
;
break;}
case 414:
-#line 2838 "Gmsh.y"
+#line 2990 "Gmsh.y"
{
- yyval.v[0]=yyvsp[-9].d; yyval.v[1]=yyvsp[-7].d; yyval.v[2]=yyvsp[-5].d; yyval.v[3]=yyvsp[-3].d; yyval.v[4]=yyvsp[-1].d;
+ yyval.v[0] = yyvsp[-9].d; yyval.v[1] = yyvsp[-7].d; yyval.v[2] = yyvsp[-5].d; yyval.v[3] = yyvsp[-3].d; yyval.v[4] = yyvsp[-1].d;
;
break;}
case 415:
-#line 2842 "Gmsh.y"
+#line 2994 "Gmsh.y"
{
- yyval.v[0]=yyvsp[-7].d; yyval.v[1]=yyvsp[-5].d; yyval.v[2]=yyvsp[-3].d; yyval.v[3]=yyvsp[-1].d; yyval.v[4]=1.0;
+ yyval.v[0] = yyvsp[-7].d; yyval.v[1] = yyvsp[-5].d; yyval.v[2] = yyvsp[-3].d; yyval.v[3] = yyvsp[-1].d; yyval.v[4] = 1.0;
;
break;}
case 416:
-#line 2846 "Gmsh.y"
+#line 2998 "Gmsh.y"
{
- yyval.v[0]=yyvsp[-5].d; yyval.v[1]=yyvsp[-3].d; yyval.v[2]=yyvsp[-1].d; yyval.v[3]=0.0; yyval.v[4]=1.0;
+ yyval.v[0] = yyvsp[-5].d; yyval.v[1] = yyvsp[-3].d; yyval.v[2] = yyvsp[-1].d; yyval.v[3] = 0.0; yyval.v[4] = 1.0;
;
break;}
case 417:
-#line 2850 "Gmsh.y"
+#line 3002 "Gmsh.y"
{
- yyval.v[0]=yyvsp[-5].d; yyval.v[1]=yyvsp[-3].d; yyval.v[2]=yyvsp[-1].d; yyval.v[3]=0.0; yyval.v[4]=1.0;
+ yyval.v[0] = yyvsp[-5].d; yyval.v[1] = yyvsp[-3].d; yyval.v[2] = yyvsp[-1].d; yyval.v[3] = 0.0; yyval.v[4] = 1.0;
;
break;}
case 418:
-#line 2857 "Gmsh.y"
+#line 3009 "Gmsh.y"
{
;
break;}
case 419:
-#line 2860 "Gmsh.y"
+#line 3012 "Gmsh.y"
{
;
break;}
case 420:
-#line 2866 "Gmsh.y"
+#line 3018 "Gmsh.y"
{
;
break;}
case 421:
-#line 2869 "Gmsh.y"
+#line 3021 "Gmsh.y"
{
;
break;}
case 422:
-#line 2875 "Gmsh.y"
+#line 3027 "Gmsh.y"
{
;
break;}
case 423:
-#line 2878 "Gmsh.y"
+#line 3030 "Gmsh.y"
{
- yyval.l=yyvsp[-1].l;
+ yyval.l = yyvsp[-1].l;
;
break;}
case 424:
-#line 2882 "Gmsh.y"
+#line 3034 "Gmsh.y"
{
- yyval.l=yyvsp[-1].l;
+ yyval.l = yyvsp[-1].l;
;
break;}
case 425:
-#line 2889 "Gmsh.y"
+#line 3041 "Gmsh.y"
{
- yyval.l = List_Create(2,1,sizeof(List_T*)) ;
+ yyval.l = List_Create(2, 1, sizeof(List_T*)) ;
List_Add(yyval.l, &(yyvsp[0].l)) ;
;
break;}
case 426:
-#line 2894 "Gmsh.y"
+#line 3046 "Gmsh.y"
{
List_Add(yyval.l, &(yyvsp[0].l)) ;
;
break;}
case 427:
-#line 2902 "Gmsh.y"
+#line 3054 "Gmsh.y"
{
- yyval.l = List_Create(2,1,sizeof(double)) ;
+ yyval.l = List_Create(2, 1, sizeof(double)) ;
List_Add(yyval.l, &(yyvsp[0].d)) ;
;
break;}
case 428:
-#line 2907 "Gmsh.y"
+#line 3059 "Gmsh.y"
{
yyval.l = yyvsp[0].l ;
;
break;}
case 429:
-#line 2911 "Gmsh.y"
+#line 3063 "Gmsh.y"
{
- yyval.l=yyvsp[-1].l;
+ yyval.l = yyvsp[-1].l;
;
break;}
case 430:
-#line 2915 "Gmsh.y"
+#line 3067 "Gmsh.y"
{
- yyval.l=yyvsp[-1].l;
- for(i=0 ; i<List_Nbr(yyval.l) ; i++){
+ yyval.l = yyvsp[-1].l;
+ for(i = 0; i < List_Nbr(yyval.l); i++){
pd = (double*)List_Pointer(yyval.l, i);
(*pd) = - (*pd);
}
;
break;}
case 431:
-#line 2938 "Gmsh.y"
+#line 3078 "Gmsh.y"
{
- yyval.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.))
+ yyval.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(yyval.l, &d) ;
;
break;}
case 432:
-#line 2944 "Gmsh.y"
+#line 3084 "Gmsh.y"
{
- yyval.l = List_Create(2,1,sizeof(double)) ;
- if(!yyvsp[0].d || (yyvsp[-4].d<yyvsp[-2].d && yyvsp[0].d<0) || (yyvsp[-4].d>yyvsp[-2].d && yyvsp[0].d>0)){
+ yyval.l = List_Create(2, 1, sizeof(double)) ;
+ if(!yyvsp[0].d || (yyvsp[-4].d < yyvsp[-2].d && yyvsp[0].d < 0) || (yyvsp[-4].d > yyvsp[-2].d && yyvsp[0].d > 0)){
yymsg(GERROR, "Wrong increment in '%g:%g:%g'", yyvsp[-4].d, yyvsp[-2].d, yyvsp[0].d) ;
List_Add(yyval.l, &(yyvsp[-4].d)) ;
}
else
- for(d=yyvsp[-4].d ; (yyvsp[0].d>0)?(d<=yyvsp[-2].d):(d>=yyvsp[-2].d) ; d+=yyvsp[0].d)
+ for(d = yyvsp[-4].d; (yyvsp[0].d > 0) ? (d <= yyvsp[-2].d) : (d >= yyvsp[-2].d); d += yyvsp[0].d)
List_Add(yyval.l, &d) ;
;
break;}
case 433:
-#line 2979 "Gmsh.y"
+#line 3095 "Gmsh.y"
+{
+ // Returns the coordinates of a point and fills a list with it.
+ // This allows to ensure e.g. that relative point positions are
+ // always conserved
+ Vertex *v = FindPoint((int)yyvsp[-1].d, THEM);
+ yyval.l = List_Create(3, 1, sizeof(double)) ;
+ if(!v) {
+ yymsg(GERROR, "Unknown point '%d'", (int) yyvsp[-1].d) ;
+ double d = 0.0 ;
+ List_Add(yyval.l, &d);
+ List_Add(yyval.l, &d);
+ List_Add(yyval.l, &d);
+ }
+ else{
+ List_Add(yyval.l, &v->Pos.X) ;
+ List_Add(yyval.l, &v->Pos.Y) ;
+ List_Add(yyval.l, &v->Pos.Z) ;
+ }
+ ;
+ break;}
+case 434:
+#line 3115 "Gmsh.y"
+{
+ yyval.l = List_Create(List_Nbr(yyvsp[0].l), 1, sizeof(double)) ;
+ for(int i = 0; i < List_Nbr(yyvsp[0].l); i++){
+ Shape *s = (Shape*) List_Pointer(yyvsp[0].l, i);
+ double d = s->Num;
+ List_Add(yyval.l, &d);
+ }
+ ;
+ break;}
+case 435:
+#line 3124 "Gmsh.y"
+{
+ yyval.l = List_Create(List_Nbr(yyvsp[0].l), 1, sizeof(double)) ;
+ for(int i = 0; i < List_Nbr(yyvsp[0].l); i++){
+ Shape *s = (Shape*) List_Pointer(yyvsp[0].l, i);
+ double d = s->Num;
+ List_Add(yyval.l, &d);
+ }
+ ;
+ break;}
+case 436:
+#line 3133 "Gmsh.y"
+{
+ yyval.l = List_Create(List_Nbr(yyvsp[0].l), 1, sizeof(double)) ;
+ for(int i = 0; i < List_Nbr(yyvsp[0].l); i++){
+ Shape *s = (Shape*) List_Pointer(yyvsp[0].l, i);
+ double d = s->Num;
+ List_Add(yyval.l, &d);
+ }
+ ;
+ break;}
+case 437:
+#line 3142 "Gmsh.y"
{
- yyval.l = List_Create(2,1,sizeof(double)) ;
+ yyval.l = List_Create(2, 1, sizeof(double)) ;
TheSymbol.Name = yyvsp[-2].c ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", yyvsp[-2].c) ;
d = 0.0 ;
List_Add(yyval.l, &d);
}
else{
- for(i = 0 ; i < List_Nbr(pSymbol->val) ; i++)
+ for(i = 0; i < List_Nbr(pSymbol->val); i++)
List_Add(yyval.l, (double*)List_Pointer_Fast(pSymbol->val, i)) ;
}
;
break;}
-case 434:
-#line 2993 "Gmsh.y"
+case 438:
+#line 3156 "Gmsh.y"
{
- yyval.l = List_Create(2,1,sizeof(double)) ;
+ yyval.l = List_Create(2, 1, sizeof(double)) ;
TheSymbol.Name = yyvsp[-2].c ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", yyvsp[-2].c) ;
d = 0.0 ;
List_Add(yyval.l, &d);
}
else{
- for(i = 0 ; i < List_Nbr(pSymbol->val) ; i++){
+ for(i = 0; i < List_Nbr(pSymbol->val); i++){
d = - *(double*)List_Pointer_Fast(pSymbol->val, i);
List_Add(yyval.l, &d) ;
}
}
;
break;}
-case 435:
-#line 3009 "Gmsh.y"
+case 439:
+#line 3172 "Gmsh.y"
{
- yyval.l = List_Create(2,1,sizeof(double)) ;
+ yyval.l = List_Create(2, 1, sizeof(double)) ;
TheSymbol.Name = yyvsp[-5].c ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", yyvsp[-5].c) ;
d = 0.0 ;
List_Add(yyval.l, &d);
}
else{
- for(i = 0 ; i < List_Nbr(yyvsp[-2].l) ; i++){
+ for(i = 0; i < List_Nbr(yyvsp[-2].l); i++){
j = (int)(*(double*)List_Pointer_Fast(yyvsp[-2].l, i));
if((pd = (double*)List_Pointer_Test(pSymbol->val, j)))
List_Add(yyval.l, pd) ;
@@ -7724,18 +7929,18 @@ case 435:
List_Delete(yyvsp[-2].l);
;
break;}
-case 436:
-#line 3029 "Gmsh.y"
+case 440:
+#line 3192 "Gmsh.y"
{
- yyval.l = List_Create(2,1,sizeof(double)) ;
+ yyval.l = List_Create(2, 1, sizeof(double)) ;
TheSymbol.Name = yyvsp[-5].c ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", yyvsp[-5].c) ;
d = 0.0 ;
List_Add(yyval.l, &d);
}
else{
- for(i = 0 ; i < List_Nbr(yyvsp[-2].l) ; i++){
+ for(i = 0; i < List_Nbr(yyvsp[-2].l); i++){
j = (int)(*(double*)List_Pointer_Fast(yyvsp[-2].l, i));
if((pd = (double*)List_Pointer_Test(pSymbol->val, j))){
d = - *pd;
@@ -7748,56 +7953,56 @@ case 436:
List_Delete(yyvsp[-2].l);
;
break;}
-case 437:
-#line 3054 "Gmsh.y"
+case 441:
+#line 3217 "Gmsh.y"
{
- yyval.l = List_Create(2,1,sizeof(double)) ;
+ yyval.l = List_Create(2, 1, sizeof(double)) ;
List_Add(yyval.l, &(yyvsp[0].d)) ;
;
break;}
-case 438:
-#line 3059 "Gmsh.y"
+case 442:
+#line 3222 "Gmsh.y"
{
yyval.l = yyvsp[0].l ;
;
break;}
-case 439:
-#line 3063 "Gmsh.y"
+case 443:
+#line 3226 "Gmsh.y"
{
List_Add(yyval.l, &(yyvsp[0].d)) ;
;
break;}
-case 440:
-#line 3067 "Gmsh.y"
+case 444:
+#line 3230 "Gmsh.y"
{
- for(i=0 ; i<List_Nbr(yyvsp[0].l) ; i++){
+ for(i = 0; i < List_Nbr(yyvsp[0].l); i++){
List_Read(yyvsp[0].l, i, &d) ;
List_Add(yyval.l, &d) ;
}
List_Delete(yyvsp[0].l);
;
break;}
-case 441:
-#line 3079 "Gmsh.y"
+case 445:
+#line 3242 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-7].d, (int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d);
;
break;}
-case 442:
-#line 3083 "Gmsh.y"
+case 446:
+#line 3246 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d, 255);
;
break;}
-case 443:
-#line 3094 "Gmsh.y"
+case 447:
+#line 3257 "Gmsh.y"
{
yyval.u = Get_ColorForString(ColorString, -1, yyvsp[0].c, &flag);
if(flag) yymsg(GERROR, "Unknown color '%s'", yyvsp[0].c);
;
break;}
-case 444:
-#line 3099 "Gmsh.y"
+case 448:
+#line 3262 "Gmsh.y"
{
if(!(pColCat = Get_ColorOptionCategory(yyvsp[-4].c))){
yymsg(GERROR, "Unknown color option class '%s'", yyvsp[-4].c);
@@ -7809,51 +8014,51 @@ case 444:
yyval.u = 0 ;
}
else{
- yyval.u = pColOpt(0,GMSH_GET,0) ;
+ yyval.u = pColOpt(0, GMSH_GET, 0) ;
}
}
;
break;}
-case 445:
-#line 3118 "Gmsh.y"
+case 449:
+#line 3281 "Gmsh.y"
{
yyval.l = yyvsp[-1].l;
;
break;}
-case 446:
-#line 3122 "Gmsh.y"
+case 450:
+#line 3285 "Gmsh.y"
{
- yyval.l = List_Create(256,10,sizeof(unsigned int)) ;
+ yyval.l = List_Create(256, 10, sizeof(unsigned int)) ;
GmshColorTable *ct = Get_ColorTable((int)yyvsp[-3].d);
if(!ct)
yymsg(GERROR, "View[%d] does not exist", (int)yyvsp[-3].d);
else{
- for(i=0 ; i<ct->size ; i++)
+ for(i = 0; i < ct->size; i++)
List_Add(yyval.l, &ct->table[i]);
}
;
break;}
-case 447:
-#line 3136 "Gmsh.y"
+case 451:
+#line 3299 "Gmsh.y"
{
- yyval.l = List_Create(256,10,sizeof(unsigned int)) ;
+ yyval.l = List_Create(256, 10, sizeof(unsigned int)) ;
List_Add(yyval.l, &(yyvsp[0].u)) ;
;
break;}
-case 448:
-#line 3141 "Gmsh.y"
+case 452:
+#line 3304 "Gmsh.y"
{
List_Add(yyval.l, &(yyvsp[0].u)) ;
;
break;}
-case 449:
-#line 3148 "Gmsh.y"
+case 453:
+#line 3311 "Gmsh.y"
{
yyval.c = yyvsp[0].c;
;
break;}
-case 450:
-#line 3152 "Gmsh.y"
+case 454:
+#line 3315 "Gmsh.y"
{
yyval.c = (char *)Malloc((strlen(yyvsp[-3].c)+strlen(yyvsp[-1].c)+1)*sizeof(char)) ;
strcpy(yyval.c, yyvsp[-3].c) ;
@@ -7862,37 +8067,37 @@ case 450:
Free(yyvsp[-1].c);
;
break;}
-case 451:
-#line 3160 "Gmsh.y"
+case 455:
+#line 3323 "Gmsh.y"
{
yyval.c = (char *)Malloc((strlen(yyvsp[-1].c)+1)*sizeof(char)) ;
- for(i=strlen(yyvsp[-1].c)-1; i>=0; i--){
+ for(i = strlen(yyvsp[-1].c)-1; i >= 0; i--){
if(yyvsp[-1].c[i] == '.'){
- strncpy(yyval.c,yyvsp[-1].c,i);
+ strncpy(yyval.c, yyvsp[-1].c, i);
yyval.c[i]='\0';
break;
}
}
- if(i<=0) strcpy(yyval.c,yyvsp[-1].c);
+ if(i <= 0) strcpy(yyval.c, yyvsp[-1].c);
Free(yyvsp[-1].c);
;
break;}
-case 452:
-#line 3173 "Gmsh.y"
+case 456:
+#line 3336 "Gmsh.y"
{
yyval.c = yyvsp[-1].c;
;
break;}
-case 453:
-#line 3177 "Gmsh.y"
+case 457:
+#line 3340 "Gmsh.y"
{
- i = PrintListOfDouble(yyvsp[-3].c,yyvsp[-1].l,tmpstring);
- if(i<0){
+ i = PrintListOfDouble(yyvsp[-3].c, yyvsp[-1].l, tmpstring);
+ if(i < 0){
yymsg(GERROR, "Too few arguments in Sprintf");
yyval.c = yyvsp[-3].c;
}
- else if(i>0){
- yymsg(GERROR, "Too many arguments (%d) in Sprintf", i);
+ else if(i > 0){
+ yymsg(GERROR, "%d extra argument%s in Sprintf", i, (i>1)?"s":"");
yyval.c = yyvsp[-3].c;
}
else{
@@ -7903,8 +8108,8 @@ case 453:
List_Delete(yyvsp[-1].l);
;
break;}
-case 454:
-#line 3195 "Gmsh.y"
+case 458:
+#line 3358 "Gmsh.y"
{
if(!(pStrCat = Get_StringOptionCategory(yyvsp[-3].c)))
yymsg(GERROR, "Unknown string option class '%s'", yyvsp[-3].c);
@@ -7912,15 +8117,15 @@ case 454:
if(!(pStrOpt = (char *(*) (int, int, char *))Get_StringOption(yyvsp[-1].c, pStrCat)))
yymsg(GERROR, "Unknown string option '%s.%s'", yyvsp[-3].c, yyvsp[-1].c);
else{
- str = pStrOpt(0,GMSH_GET,NULL) ;
+ str = pStrOpt(0, GMSH_GET, NULL) ;
yyval.c = (char*)Malloc((strlen(str)+1)*sizeof(char));
strcpy(yyval.c, str);
}
}
;
break;}
-case 455:
-#line 3209 "Gmsh.y"
+case 459:
+#line 3372 "Gmsh.y"
{
if(!(pStrCat = Get_StringOptionCategory(yyvsp[-6].c)))
yymsg(GERROR, "Unknown string option class '%s'", yyvsp[-6].c);
@@ -7928,7 +8133,7 @@ case 455:
if(!(pStrOpt = (char *(*) (int, int, char *))Get_StringOption(yyvsp[-1].c, pStrCat)))
yymsg(GERROR, "Unknown string option '%s[%d].%s'", yyvsp[-6].c, (int)yyvsp[-4].d, yyvsp[-1].c);
else{
- str = pStrOpt((int)yyvsp[-4].d,GMSH_GET,NULL) ;
+ str = pStrOpt((int)yyvsp[-4].d, GMSH_GET, NULL) ;
yyval.c = (char*)Malloc((strlen(str)+1)*sizeof(char));
strcpy(yyval.c, str);
}
@@ -8157,7 +8362,7 @@ yyerrhandle:
}
return 1;
}
-#line 3224 "Gmsh.y"
+#line 3387 "Gmsh.y"
void DeleteSymbol(void *a, void *b){
@@ -8167,7 +8372,7 @@ void DeleteSymbol(void *a, void *b){
}
int CompareSymbols (const void *a, const void *b){
- return(strcmp(((Symbol*)a)->Name,((Symbol*)b)->Name));
+ return(strcmp(((Symbol*)a)->Name, ((Symbol*)b)->Name));
}
void InitSymbols(void){
@@ -8183,28 +8388,27 @@ int PrintListOfDouble(char *format, List_T *list, char *buffer){
char tmp1[256], tmp2[256];
j=0;
- while(format[j]!='%') j++;
+ while(j < strlen(format) && format[j]!='%') j++;
strncpy(buffer, format, j);
buffer[j]='\0';
- for(i = 0 ; i<List_Nbr(list) ; i++){
+ for(i = 0; i < List_Nbr(list); i++){
k = j;
j++;
- if(j<(int)strlen(format)){
- if(format[j]=='%'){
+ if(j < (int)strlen(format)){
+ if(format[j] == '%'){
strcat(buffer, "%");
j++;
}
- while(format[j]!='%' && j<(int)strlen(format)) j++;
+ while(format[j] != '%' && j < (int)strlen(format)) j++;
if(k != j){
- strncpy(tmp1, &(format[k]),j-k);
+ strncpy(tmp1, &(format[k]), j-k);
tmp1[j-k]='\0';
- sprintf(tmp2, tmp1, *(double*)List_Pointer(list,i));
+ sprintf(tmp2, tmp1, *(double*)List_Pointer(list, i));
strcat(buffer, tmp2);
}
}
else{
return List_Nbr(list)-i;
- break ;
}
}
if(j != (int)strlen(format))
@@ -8213,7 +8417,7 @@ int PrintListOfDouble(char *format, List_T *list, char *buffer){
}
void yyerror(char *s){
- Msg(GERROR, "'%s', line %d : %s (%s)",yyname,yylineno-1,s,yytext);
+ Msg(GERROR, "'%s', line %d : %s (%s)", yyname, yylineno-1, s, yytext);
yyerrorstate=1;
}
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index c26a776b71..39ea24cf31 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,6 +1,5 @@
%{
-
-// $Id: Gmsh.y,v 1.141 2003-09-17 18:00:54 geuzaine Exp $
+// $Id: Gmsh.y,v 1.142 2003-09-19 17:22:26 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
@@ -141,7 +140,7 @@ int PrintListOfDouble (char *format, List_T *list, char *buffer);
%type <l> FExpr_Multi ListOfDouble RecursiveListOfDouble
%type <l> ListOfListOfDouble RecursiveListOfListOfDouble
%type <l> ListOfColor RecursiveListOfColor
-%type <l> ListOfShapes Duplicata Transform MultipleShape
+%type <l> ListOfShapes Duplicata Transform Extrude MultipleShape
%type <l> ListOfStrings
%type <s> Shape
@@ -185,7 +184,7 @@ STLFormatItem :
tSolid
{
yymsg(INFO, "STL file format");
- STL_Surf = Create_Surface(1,MSH_SURF_STL);
+ STL_Surf = Create_Surface(1, MSH_SURF_STL);
STL_Surf->STL = new STL_Data;
return 1;
}
@@ -256,7 +255,7 @@ StepHeaderItem :
StepDataItem :
tDOUBLE tAFFECT tCARTESIAN_POINT '(' tBIGSTR ',' VExpr ')' tEND
{
- Add_Cartesian_Point((int)$1,$5,$7[0],$7[1],$7[2]);
+ Add_Cartesian_Point((int)$1, $5, $7[0], $7[1], $7[2]);
}
| tDOUBLE tAFFECT tB_SPLINE_CURVE_WITH_KNOTS
'(' tBIGSTR ',' FExpr ',' ListOfDouble ',' BoolExpr ',' BoolExpr ','
@@ -279,31 +278,31 @@ StepDataItem :
}
| tDOUBLE tAFFECT tFACE_OUTER_BOUND '(' tBIGSTR ',' tDOUBLE ',' BoolExpr ')' tEND
{
- Add_Face_Outer_Bound((int)$1,$5,(int)$7,$9,1);
+ Add_Face_Outer_Bound((int)$1, $5, (int)$7, $9, 1);
}
| tDOUBLE tAFFECT tFACE_BOUND '(' tBIGSTR ',' tDOUBLE ',' BoolExpr ')' tEND
{
// check the norm! Face_Bound : hole outside surface!
yymsg(INFO, "Found a face bound");
- Add_Face_Outer_Bound((int)$1,$5,(int)$7,$9,0);
+ Add_Face_Outer_Bound((int)$1, $5, (int)$7, $9, 0);
}
| tDOUBLE tAFFECT tORIENTED_EDGE '(' tBIGSTR ',' '*' ',' '*' ',' FExpr ','
BoolExpr ')' tEND
{
- Add_Oriented_Edge((int)$1,$5,(int)$11,$13);
+ Add_Oriented_Edge((int)$1, $5, (int)$11, $13);
}
| tDOUBLE tAFFECT tEDGE_LOOP '(' tBIGSTR ',' ListOfDouble ')' tEND
{
- Add_Edge_Loop((int)$1,$5,$7);
+ Add_Edge_Loop((int)$1, $5, $7);
}
| tDOUBLE tAFFECT tADVANCED_FACE '(' tBIGSTR ',' ListOfDouble ','
tDOUBLE ',' BoolExpr ')' tEND
{
- Add_Advanced_Face((int)$1,$5,$7,(int)$9,$11);
+ Add_Advanced_Face((int)$1, $5, $7, (int)$9, $11);
}
| tDOUBLE tAFFECT tVERTEX_POINT '(' tBIGSTR ',' tDOUBLE ')' tEND
{
- Add_Vertex_Point((int)$1,$5,(int)$7);
+ Add_Vertex_Point((int)$1, $5, (int)$7);
}
| tDOUBLE tAFFECT tVECTOR '(' tBIGSTR ',' tDOUBLE ',' FExpr ')' tEND
{
@@ -319,7 +318,7 @@ StepDataItem :
}
| tDOUBLE tAFFECT tPLANE '(' tBIGSTR ',' tDOUBLE ')' tEND
{
- Add_Plane((int)$1,$5,(int)$7);
+ Add_Plane((int)$1, $5, (int)$7);
}
| tDOUBLE tAFFECT tLine '(' tBIGSTR ',' tDOUBLE ',' tDOUBLE ')' tEND
{
@@ -343,11 +342,11 @@ StepDataItem :
}
| tDOUBLE tAFFECT tCONICAL_SURFACE '(' tBIGSTR ',' tDOUBLE ',' FExpr ',' FExpr ')' tEND
{
- Add_Cone ((int)$1, $5 , (int)$7, $9,$11);
+ Add_Cone ((int)$1, $5 , (int)$7, $9, $11);
}
| tDOUBLE tAFFECT tTOROIDAL_SURFACE '(' tBIGSTR ',' tDOUBLE ',' FExpr ',' FExpr ')' tEND
{
- Add_Torus ((int)$1, $5 , (int)$7, $9,$11);
+ Add_Torus ((int)$1, $5 , (int)$7, $9, $11);
}
| tDOUBLE tAFFECT tCIRCLE '(' tBIGSTR ',' tDOUBLE ',' FExpr ')' tEND
{
@@ -418,11 +417,11 @@ Printf :
}
| tPrintf '(' tBIGSTR ',' RecursiveListOfDouble ')' tEND
{
- i = PrintListOfDouble($3,$5,tmpstring);
- if(i<0)
+ i = PrintListOfDouble($3, $5, tmpstring);
+ if(i < 0)
yymsg(GERROR, "Too few arguments in Printf");
- else if(i>0)
- yymsg(GERROR, "Too many arguments (%d) in Printf", i);
+ else if(i > 0)
+ yymsg(GERROR, "%d extra argument%s in Printf", i, (i>1)?"s":"");
else
Msg(DIRECT, tmpstring);
List_Delete($5);
@@ -1120,12 +1119,12 @@ TensorPyramid :
Text2DValues :
StringExpr
{
- for(i=0; i<(int)strlen($1)+1; i++) List_Add(View->T2C, &$1[i]) ;
+ for(i = 0; i < (int)strlen($1)+1; i++) List_Add(View->T2C, &$1[i]) ;
Free($1);
}
| Text2DValues ',' StringExpr
{
- for(i=0; i<(int)strlen($3)+1; i++) List_Add(View->T2C, &$3[i]) ;
+ for(i = 0; i < (int)strlen($3)+1; i++) List_Add(View->T2C, &$3[i]) ;
Free($3);
}
;
@@ -1147,12 +1146,12 @@ Text2D :
Text3DValues :
StringExpr
{
- for(i=0; i<(int)strlen($1)+1; i++) List_Add(View->T3C, &$1[i]) ;
+ for(i = 0; i < (int)strlen($1)+1; i++) List_Add(View->T3C, &$1[i]) ;
Free($1);
}
| Text3DValues ',' StringExpr
{
- for(i=0; i<(int)strlen($3)+1; i++) List_Add(View->T3C, &$3[i]) ;
+ for(i = 0; i < (int)strlen($3)+1; i++) List_Add(View->T3C, &$3[i]) ;
Free($3);
}
;
@@ -1194,8 +1193,8 @@ Affectation :
tSTRING NumericAffectation FExpr tEND
{
TheSymbol.Name = $1;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(1,1,sizeof(double));
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(1, 1, sizeof(double));
if(!$2){
List_Put(TheSymbol.val, 0, &$3);
Tree_Add(Symbol_T, &TheSymbol);
@@ -1221,8 +1220,8 @@ Affectation :
| tSTRING '[' FExpr ']' NumericAffectation FExpr tEND
{
TheSymbol.Name = $1;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(5,5,sizeof(double));
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(5, 5, sizeof(double));
if(!$5){
List_Put(TheSymbol.val, (int)$3, &$6);
Tree_Add(Symbol_T, &TheSymbol);
@@ -1258,12 +1257,12 @@ Affectation :
yymsg(GERROR, "Incompatible array dimensions in affectation");
else{
TheSymbol.Name = $1;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(5,5,sizeof(double));
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(5, 5, sizeof(double));
if(!$7){
- for(i=0 ; i<List_Nbr($4) ; i++){
- List_Put(TheSymbol.val, (int)(*(double*)List_Pointer($4,i)),
- (double*)List_Pointer($8,i));
+ for(i = 0; i < List_Nbr($4); i++){
+ List_Put(TheSymbol.val, (int)(*(double*)List_Pointer($4, i)),
+ (double*)List_Pointer($8, i));
}
Tree_Add(Symbol_T, &TheSymbol);
}
@@ -1271,9 +1270,9 @@ Affectation :
yymsg(GERROR, "Unknown variable '%s'", $1) ;
}
else{
- for(i=0 ; i<List_Nbr($4) ; i++){
- j = (int)(*(double*)List_Pointer($4,i)) ;
- d = *(double*)List_Pointer($8,i) ;
+ for(i = 0; i < List_Nbr($4); i++){
+ j = (int)(*(double*)List_Pointer($4, i)) ;
+ d = *(double*)List_Pointer($8, i) ;
if((pd = (double*)List_Pointer_Test(pSymbol->val, j))){
switch($7){
case 0 : *pd = d; break ;
@@ -1302,9 +1301,9 @@ Affectation :
| tSTRING '[' ']' tAFFECT ListOfDouble tEND
{
TheSymbol.Name = $1;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(5,5,sizeof(double));
- List_Copy($5,TheSymbol.val);
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(5, 5, sizeof(double));
+ List_Copy($5, TheSymbol.val);
Tree_Add(Symbol_T, &TheSymbol);
}
else{
@@ -1317,7 +1316,7 @@ Affectation :
| tSTRING NumericIncrement tEND
{
TheSymbol.Name = $1;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol)))
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol)))
yymsg(GERROR, "Unknown variable '%s'", $1) ;
else
*(double*)List_Pointer_Fast(pSymbol->val, 0) += $2;
@@ -1326,7 +1325,7 @@ Affectation :
| tSTRING '[' FExpr ']' NumericIncrement tEND
{
TheSymbol.Name = $1 ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol)))
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol)))
yymsg(GERROR, "Unknown variable '%s'", $1) ;
else{
if((pd = (double*)List_Pointer_Test(pSymbol->val, (int)$3)))
@@ -1346,7 +1345,7 @@ Affectation :
if(!(pStrOpt = (char *(*) (int, int, char *))Get_StringOption($3, pStrCat)))
yymsg(GERROR, "Unknown string option '%s.%s'", $1, $3);
else
- pStrOpt(0,GMSH_SET|GMSH_GUI,$5) ;
+ pStrOpt(0, GMSH_SET|GMSH_GUI, $5) ;
}
}
@@ -1358,7 +1357,7 @@ Affectation :
if(!(pStrOpt = (char *(*) (int, int, char *))Get_StringOption($6, pStrCat)))
yymsg(GERROR, "Unknown string option '%s[%d].%s'", $1, (int)$3, $6);
else
- pStrOpt((int)$3,GMSH_SET|GMSH_GUI,$8) ;
+ pStrOpt((int)$3, GMSH_SET|GMSH_GUI, $8) ;
}
}
@@ -1374,15 +1373,15 @@ Affectation :
else{
switch($4){
case 0 : d = $5 ; break ;
- case 1 : d = pNumOpt(0,GMSH_GET,0) + $5 ; break ;
- case 2 : d = pNumOpt(0,GMSH_GET,0) - $5 ; break ;
- case 3 : d = pNumOpt(0,GMSH_GET,0) * $5 ; break ;
+ case 1 : d = pNumOpt(0, GMSH_GET, 0) + $5 ; break ;
+ case 2 : d = pNumOpt(0, GMSH_GET, 0) - $5 ; break ;
+ case 3 : d = pNumOpt(0, GMSH_GET, 0) * $5 ; break ;
case 4 :
- if($5) d = pNumOpt(0,GMSH_GET,0) / $5 ;
+ if($5) d = pNumOpt(0, GMSH_GET, 0) / $5 ;
else yymsg(GERROR, "Division by zero in '%s.%s /= %g'", $1, $3, $5);
break;
}
- pNumOpt(0,GMSH_SET|GMSH_GUI, d) ;
+ pNumOpt(0, GMSH_SET|GMSH_GUI, d) ;
}
}
}
@@ -1397,16 +1396,16 @@ Affectation :
else{
switch($7){
case 0 : d = $8; break ;
- case 1 : d = pNumOpt((int)$3,GMSH_GET,0) + $8 ; break ;
- case 2 : d = pNumOpt((int)$3,GMSH_GET,0) - $8 ; break ;
- case 3 : d = pNumOpt((int)$3,GMSH_GET,0) * $8 ; break ;
+ case 1 : d = pNumOpt((int)$3, GMSH_GET, 0) + $8 ; break ;
+ case 2 : d = pNumOpt((int)$3, GMSH_GET, 0) - $8 ; break ;
+ case 3 : d = pNumOpt((int)$3, GMSH_GET, 0) * $8 ; break ;
case 4 :
- if($8) d = pNumOpt((int)$3,GMSH_GET,0) / $8 ;
+ if($8) d = pNumOpt((int)$3, GMSH_GET, 0) / $8 ;
else yymsg(GERROR, "Division by zero in '%s[%d].%s /= %g'",
$1, (int)$3, $6, $8);
break;
}
- pNumOpt((int)$3,GMSH_SET|GMSH_GUI,d) ;
+ pNumOpt((int)$3, GMSH_SET|GMSH_GUI, d) ;
}
}
}
@@ -1419,7 +1418,7 @@ Affectation :
if(!(pNumOpt = (double (*) (int, int, double))Get_NumberOption($3, pNumCat)))
yymsg(GERROR, "Unknown numeric option '%s.%s'", $1, $3);
else
- pNumOpt(0,GMSH_SET|GMSH_GUI,pNumOpt(0,GMSH_GET,0)+$4) ;
+ pNumOpt(0, GMSH_SET|GMSH_GUI, pNumOpt(0, GMSH_GET, 0)+$4) ;
}
}
@@ -1431,7 +1430,7 @@ Affectation :
if(!(pNumOpt = (double (*) (int, int, double))Get_NumberOption($6, pNumCat)))
yymsg(GERROR, "Unknown numeric option '%s[%d].%s'", $1, (int)$3, $6);
else
- pNumOpt((int)$3,GMSH_SET|GMSH_GUI,pNumOpt((int)$3,GMSH_GET,0)+$7) ;
+ pNumOpt((int)$3, GMSH_SET|GMSH_GUI, pNumOpt((int)$3, GMSH_GET, 0)+$7) ;
}
}
@@ -1445,7 +1444,7 @@ Affectation :
if(!(pColOpt = (unsigned int (*) (int, int, unsigned int))Get_ColorOption($5, pColCat)))
yymsg(GERROR, "Unknown color option '%s.Color.%s'", $1, $5);
else
- pColOpt(0,GMSH_SET|GMSH_GUI,$7) ;
+ pColOpt(0, GMSH_SET|GMSH_GUI, $7) ;
}
}
@@ -1457,7 +1456,7 @@ Affectation :
if(!(pColOpt = (unsigned int (*) (int, int, unsigned int))Get_ColorOption($8, pColCat)))
yymsg(GERROR, "Unknown color option '%s[%d].Color.%s'", $1, (int)$3, $8);
else
- pColOpt((int)$3,GMSH_SET|GMSH_GUI,$10) ;
+ pColOpt((int)$3, GMSH_SET|GMSH_GUI, $10) ;
}
}
@@ -1474,7 +1473,7 @@ Affectation :
yymsg(GERROR, "Too many (%d>%d) colors in View[%d].ColorTable",
ct->size, COLORTABLE_NBMAX_COLOR, 0);
else
- for(i=0 ; i<ct->size ; i++) List_Read($5, i, &ct->table[i]);
+ for(i = 0; i < ct->size; i++) List_Read($5, i, &ct->table[i]);
if(ct->size == 1){
ct->size = 2;
ct->table[1] = ct->table[0];
@@ -1494,7 +1493,7 @@ Affectation :
yymsg(GERROR, "Too many (%d>%d) colors in View[%d].ColorTable",
ct->size, COLORTABLE_NBMAX_COLOR, (int)$3);
else
- for(i=0 ; i<ct->size ; i++) List_Read($8, i, &ct->table[i]);
+ for(i = 0; i < ct->size; i++) List_Read($8, i, &ct->table[i]);
if(ct->size == 1){
ct->size = 2;
ct->table[1] = ct->table[0];
@@ -1509,10 +1508,10 @@ Affectation :
{
if(CTX.default_plugins){
try {
- GMSH_PluginManager::Instance()->SetPluginOption($3,$6,$8);
+ GMSH_PluginManager::Instance()->SetPluginOption($3, $6, $8);
}
catch (...) {
- yymsg(WARNING, "Unknown option '%s' or plugin '%s'",$6,$3);
+ yymsg(WARNING, "Unknown option '%s' or plugin '%s'", $6, $3);
}
}
}
@@ -1521,10 +1520,10 @@ Affectation :
{
if(CTX.default_plugins){
try {
- GMSH_PluginManager::Instance()->SetPluginOption($3,$6,$8);
+ GMSH_PluginManager::Instance()->SetPluginOption($3, $6, $8);
}
catch (...) {
- yymsg(WARNING, "Unknown option '%s' or plugin '%s'",$6,$3);
+ yymsg(WARNING, "Unknown option '%s' or plugin '%s'", $6, $3);
}
}
}
@@ -1539,14 +1538,14 @@ Shape :
tPoint '(' FExpr ')' tAFFECT VExpr tEND
{
- Cdbpts101((int)$3,$6[0],$6[1],$6[2],$6[3],$6[4]);
+ Cdbpts101((int)$3, $6[0], $6[1], $6[2], $6[3], $6[4]);
$$.Type = MSH_POINT;
$$.Num = (int)$3;
}
| tPhysical tPoint '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbz101((int)$4,MSH_PHYSICAL_POINT,0,0,0,0,0,NULL,$7,NULL);
+ Cdbz101((int)$4, MSH_PHYSICAL_POINT, 0, 0, 0, 0, 0, NULL, $7, NULL);
$$.Type = MSH_PHYSICAL_POINT;
$$.Num = (int)$4;
}
@@ -1556,24 +1555,24 @@ Shape :
Attractor *a;
double p;
int ip;
- for(int i=0;i<List_Nbr($3);i++){
- List_Read($3,i,&p);
+ for(int i = 0; i < List_Nbr($3); i++){
+ List_Read($3, i, &p);
ip = (int)p;
- v = FindPoint(ip,THEM);
+ v = FindPoint(ip, THEM);
if(!v)
yymsg(WARNING, "Unknown Point %d", ip);
else{
a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1,
- $6,$8,$10,v,NULL,NULL);
- List_Add(THEM->Metric->Attractors,&a);
+ $6, $8, $10, v, NULL, NULL);
+ List_Add(THEM->Metric->Attractors, &a);
}
}
}
| tCharacteristic tLength ListOfDouble tAFFECT FExpr tEND
{
- for(i=0;i<List_Nbr($3);i++){
- List_Read($3,i,&d);
- Vertex *v = FindPoint((int)d,THEM);
+ for(i = 0; i < List_Nbr($3); i++){
+ List_Read($3, i, &d);
+ Vertex *v = FindPoint((int)d, THEM);
if(!v)
yymsg(WARNING, "Unknown Point %d", (int)d);
else
@@ -1585,13 +1584,13 @@ Shape :
| tLine '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbseg101((int)$3,MSH_SEGM_LINE,1,$6,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ Cdbseg101((int)$3, MSH_SEGM_LINE, 1, $6, NULL, -1, -1, 0., 1., NULL, NULL, NULL);
$$.Type = MSH_SEGM_LINE;
$$.Num = (int)$3;
}
| tSpline '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbseg101((int)$3,MSH_SEGM_SPLN,3,$6,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ Cdbseg101((int)$3, MSH_SEGM_SPLN, 3, $6, NULL, -1, -1, 0., 1., NULL, NULL, NULL);
$$.Type = MSH_SEGM_SPLN;
$$.Num = (int)$3;
}
@@ -1601,41 +1600,41 @@ Shape :
Attractor *a;
double p;
int ip;
- for(int i=0;i<List_Nbr($3);i++){
- List_Read($3,i,&p);
+ for(int i = 0; i < List_Nbr($3); i++){
+ List_Read($3, i, &p);
ip = (int)p;
- c = FindCurve(ip,THEM);
+ c = FindCurve(ip, THEM);
if(!c)
yymsg(WARNING, "Unknown Curve %d", ip);
else{
a = Create_Attractor(List_Nbr(THEM->Metric->Attractors)+1,
- $6,$8,$10,NULL,c,NULL);
- List_Add(THEM->Metric->Attractors,&a);
+ $6, $8, $10, NULL, c, NULL);
+ List_Add(THEM->Metric->Attractors, &a);
}
}
}
| tCircle '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbseg101((int)$3,MSH_SEGM_CIRC,2,$6,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ Cdbseg101((int)$3, MSH_SEGM_CIRC, 2, $6, NULL, -1, -1, 0., 1., NULL, NULL, NULL);
$$.Type = MSH_SEGM_CIRC ;
$$.Num = (int)$3;
}
| tEllipse '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbseg101((int)$3,MSH_SEGM_ELLI,2,$6,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ Cdbseg101((int)$3, MSH_SEGM_ELLI, 2, $6, NULL, -1, -1, 0., 1., NULL, NULL, NULL);
$$.Type = MSH_SEGM_ELLI ;
$$.Num = (int)$3;
}
| tCircle '(' FExpr ')' tAFFECT ListOfDouble tPlane VExpr tEND
{
List_T *temp;
- int i,j;
+ int i, j;
double d;
- temp = List_Create(List_Nbr($6),1,sizeof(int));
- for(i=0;i<List_Nbr($6);i++){
- List_Read($6,i,&d);
+ temp = List_Create(List_Nbr($6), 1, sizeof(int));
+ for(i = 0; i < List_Nbr($6); i++){
+ List_Read($6, i, &d);
j = (int)d;
- List_Add(temp,&j);
+ List_Add(temp, &j);
}
AddCircleInDataBase ((int) $3, MSH_SEGM_CIRC, temp, $8);
List_Delete(temp);
@@ -1645,26 +1644,26 @@ Shape :
| tParametric '(' FExpr ')' tAFFECT
'{' FExpr ',' FExpr ',' tBIGSTR ',' tBIGSTR ',' tBIGSTR '}' tEND
{
- Cdbseg101((int)$3,MSH_SEGM_PARAMETRIC,2,NULL,NULL,-1,-1,$7,$9,$11,$13,$15);
+ Cdbseg101((int)$3, MSH_SEGM_PARAMETRIC, 2, NULL, NULL, -1, -1, $7, $9, $11, $13, $15);
$$.Type = MSH_SEGM_PARAMETRIC ;
$$.Num = (int)$3;
}
| tPhysical tLine '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbz101((int)$4,MSH_PHYSICAL_LINE,0,0,0,0,0,NULL,$7,NULL);
+ Cdbz101((int)$4, MSH_PHYSICAL_LINE, 0, 0, 0, 0, 0, NULL, $7, NULL);
$$.Type = MSH_PHYSICAL_LINE;
$$.Num = (int)$4;
}
| tLine tLoop '(' FExpr ')' tAFFECT ListOfDouble tEND
{
$$.Type = MSH_SEGM_LOOP;
- Cdbz101((int)$4,$$.Type,0,0,0,0,0,NULL,$7,NULL);
+ Cdbz101((int)$4, $$.Type, 0, 0, 0, 0, 0, NULL, $7, NULL);
$$.Num = (int)$4;
}
| tBSpline '(' FExpr ')' tAFFECT ListOfDouble tEND
{
if(List_Nbr($6) > 3){
- Cdbseg101((int)$3,MSH_SEGM_BSPLN,2,$6,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ Cdbseg101((int)$3, MSH_SEGM_BSPLN, 2, $6, NULL, -1, -1, 0., 1., NULL, NULL, NULL);
$$.Type = MSH_SEGM_BSPLN;
$$.Num = (int)$3;
}
@@ -1675,7 +1674,7 @@ Shape :
| tBezier '(' FExpr ')' tAFFECT ListOfDouble tEND
{
if(List_Nbr($6) > 3){
- Cdbseg101((int)$3,MSH_SEGM_BEZIER,2,$6,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
+ Cdbseg101((int)$3, MSH_SEGM_BEZIER, 2, $6, NULL, -1, -1, 0., 1., NULL, NULL, NULL);
$$.Type = MSH_SEGM_BSPLN;
$$.Num = (int)$3;
}
@@ -1695,13 +1694,13 @@ Shape :
List_Nbr($8), List_Nbr($6), (int)$10, List_Nbr($6) + (int)$10 + 1);
}
else{
- Temp = List_Create(List_Nbr($6),1,sizeof(int));
- for(i=0;i<List_Nbr($6);i++) {
- List_Read($6,i,&d);
+ Temp = List_Create(List_Nbr($6), 1, sizeof(int));
+ for(i = 0; i < List_Nbr($6); i++) {
+ List_Read($6, i, &d);
j = (int)d;
- List_Add(Temp,&j);
+ List_Add(Temp, &j);
}
- AddCurveInDataBase ((int)$3,MSH_SEGM_NURBS,(int)$10,Temp,$8,-1,-1,0.,1.);
+ AddCurveInDataBase ((int)$3, MSH_SEGM_NURBS, (int)$10, Temp, $8, -1, -1, 0., 1.);
List_Delete(Temp);
}
}
@@ -1710,19 +1709,19 @@ Shape :
| tPlane tSurface '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbz101((int)$4,MSH_SURF_PLAN,0,0,0,0,0,NULL,$7,NULL);
+ Cdbz101((int)$4, MSH_SURF_PLAN, 0, 0, 0, 0, 0, NULL, $7, NULL);
$$.Type = MSH_SURF_PLAN;
$$.Num = (int)$4;
}
| tTrimmed tSurface '(' FExpr ')' tAFFECT '{' FExpr ',' ListOfDouble '}' tEND
{
Surface *s,*support;
- support = FindSurface((int)$8,THEM);
+ support = FindSurface((int)$8, THEM);
if(!support)
yymsg(GERROR, "Unknown Surface %d", (int)$8);
else{
- Cdbz101((int)$4,MSH_SURF_PLAN,0,0,0,0,0,NULL,$10,NULL);
- s = FindSurface((int)$4,THEM);
+ Cdbz101((int)$4, MSH_SURF_PLAN, 0, 0, 0, 0, 0, NULL, $10, NULL);
+ s = FindSurface((int)$4, THEM);
if(!s)
yymsg(GERROR, "Unknown Surface %d", (int)$4);
else{
@@ -1735,9 +1734,9 @@ Shape :
}
| tRuled tSurface '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- List_Read($7,0,&d);
+ List_Read($7, 0, &d);
i = (int)d;
- EdgeLoop *el = FindEdgeLoop(i,THEM);
+ EdgeLoop *el = FindEdgeLoop(i, THEM);
if(!el)
yymsg(GERROR, "Unknown Line Loop %d", i);
else{
@@ -1745,19 +1744,19 @@ Shape :
if(j==4)
$$.Type = MSH_SURF_REGL;
else if(j==3)
- $$.Type = MSH_SURF_TRIC;
+ $$.Type = MSH_SURF_TRIC;
else
yymsg(GERROR, "Wrong definition of Ruled Surface %d: "
"%d borders instead of 3 or 4",
(int)$4, j);
- Cdbz101((int)$4,$$.Type,0,0,0,0,0,NULL,$7,NULL);
+ Cdbz101((int)$4, $$.Type, 0, 0, 0, 0, 0, NULL, $7, NULL);
$$.Num = (int)$4;
}
}
| tTriangulation tSurface '(' FExpr ')' tAFFECT '(' FExpr ',' FExpr ')' ListOfDouble ListOfDouble tEND
{
- AddTriangulationToSurface ((int) $4, (int) $8, (int) $10,$12,$13);
+ AddTriangulationToSurface ((int) $4, (int) $8, (int) $10, $12, $13);
$$.Num = (int)$4;
}
@@ -1766,7 +1765,7 @@ Shape :
tOrder '{' FExpr ',' FExpr '}' tEND
{
CreateNurbsSurface ( (int) $6 , (int)$18 , (int)$20 , $9, $12, $14);
- $$.Type = MSH_SURF_NURBS;
+ $$.Type = MSH_SURF_NURBS;
$$.Num = (int)$6;
}
| tNurbs tSurface '(' FExpr ')' tAFFECT
@@ -1777,13 +1776,13 @@ Shape :
}
| tPhysical tSurface '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbz101((int)$4,MSH_PHYSICAL_SURFACE,0,0,0,0,0,NULL,$7,NULL);
+ Cdbz101((int)$4, MSH_PHYSICAL_SURFACE, 0, 0, 0, 0, 0, NULL, $7, NULL);
$$.Type = MSH_PHYSICAL_SURFACE;
$$.Num = (int)$4;
}
| tSurface tLoop '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbz101((int)$4,MSH_SURF_LOOP,0,0,0,0,0,NULL,$7,NULL);
+ Cdbz101((int)$4, MSH_SURF_LOOP, 0, 0, 0, 0, 0, NULL, $7, NULL);
$$.Type = MSH_SURF_LOOP;
$$.Num = (int)$4;
}
@@ -1792,19 +1791,19 @@ Shape :
| tComplex tVolume '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbz101((int)$4,MSH_VOLUME,0,0,0,0,0,NULL,$7,NULL);
+ Cdbz101((int)$4, MSH_VOLUME, 0, 0, 0, 0, 0, NULL, $7, NULL);
$$.Type = MSH_VOLUME;
$$.Num = (int)$4;
}
| tVolume '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbz101((int)$3,MSH_VOLUME,0,0,0,0,0,NULL,$6,NULL);
+ Cdbz101((int)$3, MSH_VOLUME, 0, 0, 0, 0, 0, NULL, $6, NULL);
$$.Type = MSH_VOLUME;
$$.Num = (int)$3;
}
| tPhysical tVolume '(' FExpr ')' tAFFECT ListOfDouble tEND
{
- Cdbz101((int)$4,MSH_PHYSICAL_VOLUME,0,0,0,0,0,NULL,$7,NULL);
+ Cdbz101((int)$4, MSH_PHYSICAL_VOLUME, 0, 0, 0, 0, 0, NULL, $7, NULL);
$$.Type = MSH_PHYSICAL_VOLUME;
$$.Num = (int)$4;
}
@@ -1815,22 +1814,22 @@ Shape :
Transform :
tTranslate VExpr '{' MultipleShape '}'
{
- TranslateShapes ($2[0],$2[1],$2[2],$4,1);
+ TranslateShapes ($2[0], $2[1], $2[2], $4, 1);
$$ = $4;
}
| tRotate '{' VExpr ',' VExpr ',' FExpr '}' '{' MultipleShape '}'
{
- RotateShapes($3[0],$3[1],$3[2],$5[0],$5[1],$5[2],$7,$10,1);
+ RotateShapes($3[0], $3[1], $3[2], $5[0], $5[1], $5[2], $7, $10, 1);
$$ = $10;
}
| tSymmetry VExpr '{' MultipleShape '}'
{
- SymmetryShapes($2[0],$2[1],$2[2],$2[3],$4,1);
+ SymmetryShapes($2[0], $2[1], $2[2], $2[3], $4, 1);
$$ = $4;
}
| tDilate '{' VExpr ',' FExpr '}' '{' MultipleShape '}'
{
- DilatShapes($3[0],$3[1],$3[2],$5,$8,1);
+ DilatShapes($3[0], $3[1], $3[2], $5, $8, 1);
$$ = $8;
}
;
@@ -1844,57 +1843,53 @@ MultipleShape :
ListOfShapes :
/* none */
{
- $$ = List_Create(3,3,sizeof(Shape));
+ $$ = List_Create(3, 3, sizeof(Shape));
}
| ListOfShapes Shape
{
- List_Add($$,&$2);
- $$ = $1;
+ List_Add($$, &$2);
}
| ListOfShapes tPoint '{' RecursiveListOfDouble '}' tEND
{
- for(i=0;i<List_Nbr($4);i++){
+ for(i = 0; i < List_Nbr($4); i++){
List_Read($4, i, &d);
TheShape.Num = (int)d;
- Vertex *v = FindPoint(TheShape.Num,THEM);
+ Vertex *v = FindPoint(TheShape.Num, THEM);
if(!v)
yymsg(WARNING, "Unknown Point %d", TheShape.Num);
else{
TheShape.Type = MSH_POINT;
- List_Add($$,&TheShape);
+ List_Add($$, &TheShape);
}
}
- $$ = $1;
}
| ListOfShapes tLine '{' RecursiveListOfDouble '}' tEND
{
- for(i=0;i<List_Nbr($4);i++){
+ for(i = 0; i < List_Nbr($4); i++){
List_Read($4, i, &d);
TheShape.Num = (int)d;
- Curve *c = FindCurve(TheShape.Num,THEM);
+ Curve *c = FindCurve(TheShape.Num, THEM);
if(!c)
yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
else{
TheShape.Type = c->Typ;
- List_Add($$,&TheShape);
+ List_Add($$, &TheShape);
}
}
- $$ = $1;
}
| ListOfShapes tSurface '{' RecursiveListOfDouble '}' tEND
{
- for(i=0;i<List_Nbr($4);i++){
+ for(i = 0; i < List_Nbr($4); i++){
List_Read($4, i, &d);
TheShape.Num = (int)d;
- Surface *s = FindSurface(TheShape.Num,THEM);
+ Surface *s = FindSurface(TheShape.Num, THEM);
if(!s)
yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
else{
TheShape.Type = s->Typ;
- List_Add($$,&TheShape);
+ List_Add($$, &TheShape);
}
}
- $$ = $1;
}
;
@@ -1903,17 +1898,18 @@ ListOfShapes :
Duplicata :
tDuplicata '{' ListOfShapes '}'
{
- $$ = List_Create(3,3,sizeof(Shape));
- for(i=0;i<List_Nbr($3);i++){
- List_Read ($3,i,&TheShape);
- CopyShape(TheShape.Type,TheShape.Num,&j);
+ $$ = List_Create(3, 3, sizeof(Shape));
+ for(i = 0; i < List_Nbr($3); i++){
+ List_Read ($3, i, &TheShape);
+ CopyShape(TheShape.Type, TheShape.Num, &j);
TheShape.Num = j;
- List_Add($$,&TheShape);
+ List_Add($$, &TheShape);
}
}
| tDuplicata tSTRING '[' FExpr ']' tEND
{
- if(!strcmp($2, "View")) DuplicateView((int)$4,0);
+ if(!strcmp($2, "View")) DuplicateView((int)$4, 0);
+ $$ = NULL;
}
;
@@ -1923,9 +1919,9 @@ Duplicata :
Delete :
tDelete '{' ListOfShapes '}'
{
- for(i=0;i<List_Nbr($3);i++){
- List_Read ($3,i,&TheShape);
- DeleteShape(TheShape.Type,TheShape.Num);
+ for(i = 0; i < List_Nbr($3); i++){
+ List_Read ($3, i, &TheShape);
+ DeleteShape(TheShape.Type, TheShape.Num);
}
}
| tDelete tSTRING '[' FExpr ']' tEND
@@ -1943,9 +1939,9 @@ Delete :
Colorify :
tColor ColorExpr '{' ListOfShapes '}'
{
- for(i=0;i<List_Nbr($4);i++){
- List_Read ($4,i,&TheShape);
- ColorShape(TheShape.Type,TheShape.Num,$2);
+ for(i = 0; i < List_Nbr($4); i++){
+ List_Read ($4, i, &TheShape);
+ ColorShape(TheShape.Type, TheShape.Num, $2);
}
}
;
@@ -1974,18 +1970,19 @@ Command :
if((yyin = fopen(tmpstring,"r"))){
Msg(INFO, "Including '%s'", tmpstring);
- strcpy(yynameTab[RecursionLevel-1],yyname);
- yylinenoTab[RecursionLevel-1]=yylineno;
- yylineno=1;
- strcpy(yyname,tmpstring);
+ strcpy(yynameTab[RecursionLevel-1], yyname);
+ yylinenoTab[RecursionLevel-1] = yylineno;
+ yylineno = 1;
+ strcpy(yyname, tmpstring);
while(!feof(yyin)){
yyparse();
}
- // FIXME: If we do fclose, we cannot call a Function defined
- // in another file...
+ // warning, warning... If we close the stream, we cannot
+ // call a Function defined in another file... So we just
+ // leave it open (arghhh)
//fclose(yyin);
yyin = yyinTab[--RecursionLevel];
- strcpy(yyname,yynameTab[RecursionLevel]);
+ strcpy(yyname, yynameTab[RecursionLevel]);
yylineno = yylinenoTab[RecursionLevel];
}
else{
@@ -2047,7 +2044,7 @@ Command :
else if(!strcmp($1, "Mesh")){
//Maillage_Dimension_0(THEM);
- //mai3d(THEM,(int)$2);
+ //mai3d(THEM, (int)$2);
yymsg(GERROR, "Mesh directives are not (yet) allowed in scripts");
}
@@ -2057,7 +2054,7 @@ Command :
| tPlugin '(' tSTRING ')' '.' tSTRING tEND
{
if(CTX.default_plugins)
- GMSH_PluginManager::Instance()->Action($3,$6,0);
+ GMSH_PluginManager::Instance()->Action($3, $6, 0);
}
| tExit tEND
{
@@ -2113,8 +2110,8 @@ Loop :
LoopControlVariablesNameTab[ImbricatedLoop] = $2 ;
TheSymbol.Name = $2;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(1,1,sizeof(double));
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(1, 1, sizeof(double));
List_Put(TheSymbol.val, 0, &$5);
Tree_Add(Symbol_T, &TheSymbol);
}
@@ -2134,8 +2131,8 @@ Loop :
LoopControlVariablesNameTab[ImbricatedLoop] = $2 ;
TheSymbol.Name = $2;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
- TheSymbol.val = List_Create(1,1,sizeof(double));
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))){
+ TheSymbol.val = List_Create(1, 1, sizeof(double));
List_Put(TheSymbol.val, 0, &$5);
Tree_Add(Symbol_T, &TheSymbol);
}
@@ -2170,19 +2167,19 @@ Loop :
}
| tFunction tSTRING
{
- if(!FunctionManager::Instance()->createFunction($2,yyin,yyname,yylineno))
- yymsg(GERROR, "Redefinition of function %s",$2);
+ if(!FunctionManager::Instance()->createFunction($2, yyin, yyname, yylineno))
+ yymsg(GERROR, "Redefinition of function %s", $2);
skip_until(NULL, "Return");
}
| tReturn
{
- if(!FunctionManager::Instance()->leaveFunction(&yyin,yyname,yylineno))
+ if(!FunctionManager::Instance()->leaveFunction(&yyin, yyname, yylineno))
yymsg(GERROR, "Error while exiting function");
}
| tCall tSTRING tEND
{
- if(!FunctionManager::Instance()->enterFunction($2,&yyin,yyname,yylineno))
- yymsg(GERROR, "Unknown function %s",$2);
+ if(!FunctionManager::Instance()->enterFunction($2, &yyin, yyname, yylineno))
+ yymsg(GERROR, "Unknown function %s", $2);
}
| tIf '(' FExpr ')'
{
@@ -2199,27 +2196,35 @@ Loop :
Extrude :
// Points
-
tExtrude tPoint '{' FExpr ',' VExpr '}' tEND
{
Curve *pc, *prc;
- Extrude_ProtudePoint(TRANSLATE,(int)$4,$6[0],$6[1],$6[2],
- 0.,0.,0.,0.,0.,0.,0.,
- &pc,&prc,1,NULL);
+ TheShape.Num = Extrude_ProtudePoint(TRANSLATE, (int)$4, $6[0], $6[1], $6[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ &pc, &prc, 1, NULL);
+ TheShape.Type = MSH_POINT;
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tPoint '{' FExpr ',' VExpr ',' VExpr ',' FExpr '}' tEND
{
Curve *pc, *prc;
- Extrude_ProtudePoint(ROTATE,(int)$4,0.,0.,0.,
- $6[0],$6[1],$6[2],$8[0],$8[1],$8[2],$10,
- &pc,&prc,1,NULL);
+ TheShape.Num = Extrude_ProtudePoint(ROTATE, (int)$4, 0., 0., 0.,
+ $6[0], $6[1], $6[2], $8[0], $8[1], $8[2], $10,
+ &pc, &prc, 1, NULL);
+ TheShape.Type = MSH_POINT;
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tPoint '{' FExpr ',' VExpr ',' VExpr ',' VExpr ',' FExpr'}' tEND
{
Curve *pc, *prc;
- Extrude_ProtudePoint(TRANSLATE_ROTATE,(int)$4,$6[0],$6[1],$6[2],
- $8[0],$8[1],$8[2],$10[0],$10[1],$10[2],$12,
- &pc,&prc,1,NULL);
+ TheShape.Num = Extrude_ProtudePoint(TRANSLATE_ROTATE, (int)$4, $6[0], $6[1], $6[2],
+ $8[0], $8[1], $8[2], $10[0], $10[1], $10[2], $12,
+ &pc, &prc, 1, NULL);
+ TheShape.Type = MSH_POINT;
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tPoint '{' FExpr ',' VExpr '}'
{
@@ -2229,9 +2234,12 @@ Extrude :
'{' ExtrudeParameters '}' tEND
{
Curve *pc, *prc;
- Extrude_ProtudePoint(TRANSLATE,(int)$4,$6[0],$6[1],$6[2],
- 0.,0.,0.,0.,0.,0.,0.,
- &pc,&prc,1,&extr);
+ TheShape.Num = Extrude_ProtudePoint(TRANSLATE, (int)$4, $6[0], $6[1], $6[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ &pc, &prc, 1, &extr);
+ TheShape.Type = MSH_POINT;
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tPoint '{' FExpr ',' VExpr ',' VExpr ',' FExpr '}'
{
@@ -2241,9 +2249,12 @@ Extrude :
'{' ExtrudeParameters '}' tEND
{
Curve *pc, *prc;
- Extrude_ProtudePoint(ROTATE,(int)$4,0.,0.,0.,
- $6[0],$6[1],$6[2],$8[0],$8[1],$8[2],$10,
- &pc,&prc,1,&extr);
+ TheShape.Num = Extrude_ProtudePoint(ROTATE, (int)$4, 0., 0., 0.,
+ $6[0], $6[1], $6[2], $8[0], $8[1], $8[2], $10,
+ &pc, &prc, 1, &extr);
+ TheShape.Type = MSH_POINT;
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tPoint '{' FExpr ',' VExpr ',' VExpr ',' VExpr ',' FExpr'}'
{
@@ -2253,27 +2264,66 @@ Extrude :
'{' ExtrudeParameters '}' tEND
{
Curve *pc, *prc;
- Extrude_ProtudePoint(TRANSLATE_ROTATE,(int)$4,$6[0],$6[1],$6[2],
- $8[0],$8[1],$8[2],$10[0],$10[1],$10[2],$12,
- &pc,&prc,1,&extr);
+ TheShape.Num = Extrude_ProtudePoint(TRANSLATE_ROTATE, (int)$4, $6[0], $6[1], $6[2],
+ $8[0], $8[1], $8[2], $10[0], $10[1], $10[2], $12,
+ &pc, &prc, 1, &extr);
+ TheShape.Type = MSH_POINT;
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
// Lines
| tExtrude tLine '{' FExpr ',' VExpr '}' tEND
{
- Extrude_ProtudeCurve(TRANSLATE,(int)$4,$6[0],$6[1],$6[2],
- 0.,0.,0.,0.,0.,0.,0.,1,NULL);
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(TRANSLATE, (int)$4, $6[0], $6[1], $6[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ &ps, 1, NULL);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tLine '{' FExpr ',' VExpr ',' VExpr ',' FExpr '}' tEND
{
- Extrude_ProtudeCurve(ROTATE,(int)$4,0.,0.,0.,
- $6[0],$6[1],$6[2],$8[0],$8[1],$8[2],$10,1,NULL);
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(ROTATE, (int)$4, 0., 0., 0.,
+ $6[0], $6[1], $6[2], $8[0], $8[1], $8[2], $10,
+ &ps, 1, NULL);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tLine '{' FExpr ',' VExpr ',' VExpr ',' VExpr ',' FExpr '}' tEND
{
- Extrude_ProtudeCurve(TRANSLATE_ROTATE,(int)$4,$6[0],$6[1],$6[2],
- $8[0],$8[1],$8[2],$10[0],$10[1],$10[2],$12,1,NULL);
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(TRANSLATE_ROTATE, (int)$4, $6[0], $6[1], $6[2],
+ $8[0], $8[1], $8[2], $10[0], $10[1], $10[2], $12,
+ &ps, 1, NULL);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tLine '{' FExpr ',' VExpr '}'
{
@@ -2282,8 +2332,20 @@ Extrude :
}
'{' ExtrudeParameters '}' tEND
{
- Extrude_ProtudeCurve(TRANSLATE,(int)$4,$6[0],$6[1],$6[2],
- 0.,0.,0.,0.,0.,0.,0.,1,&extr);
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(TRANSLATE, (int)$4, $6[0], $6[1], $6[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ &ps, 1, &extr);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tLine '{' FExpr ',' VExpr ',' VExpr ',' FExpr '}'
{
@@ -2292,8 +2354,20 @@ Extrude :
}
'{' ExtrudeParameters '}' tEND
{
- Extrude_ProtudeCurve(ROTATE,(int)$4,0.,0.,0.,
- $6[0],$6[1],$6[2],$8[0],$8[1],$8[2],$10,1,&extr);
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(ROTATE, (int)$4, 0., 0., 0.,
+ $6[0], $6[1], $6[2], $8[0], $8[1], $8[2], $10,
+ &ps, 1, &extr);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tLine '{' FExpr ',' VExpr ',' VExpr ',' VExpr ',' FExpr '}'
{
@@ -2302,26 +2376,71 @@ Extrude :
}
'{' ExtrudeParameters '}' tEND
{
- Extrude_ProtudeCurve(TRANSLATE_ROTATE,(int)$4,$6[0],$6[1],$6[2],
- $8[0],$8[1],$8[2],$10[0],$10[1],$10[2],$12,1,&extr);
+ Surface *ps;
+ TheShape.Num = Extrude_ProtudeCurve(TRANSLATE_ROTATE, (int)$4, $6[0], $6[1], $6[2],
+ $8[0], $8[1], $8[2], $10[0], $10[1], $10[2], $12,
+ &ps, 1, &extr);
+ Curve *c = FindCurve(TheShape.Num, THEM);
+ if(!c){
+ yymsg(WARNING, "Unknown Curve %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = c->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
// Surfaces
| tExtrude tSurface '{' FExpr ',' VExpr '}' tEND
{
- Extrude_ProtudeSurface(TRANSLATE,(int)$4,$6[0],$6[1],$6[2],
- 0.,0.,0.,0.,0.,0.,0.,0,NULL);
+ TheShape.Num = Extrude_ProtudeSurface(TRANSLATE, (int)$4, $6[0], $6[1], $6[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ 0, NULL);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tSurface '{' FExpr ',' VExpr ',' VExpr ',' FExpr '}' tEND
{
- Extrude_ProtudeSurface(ROTATE,(int)$4,0.,0.,0.,
- $6[0],$6[1],$6[2],$8[0],$8[1],$8[2],$10,0,NULL);
+ TheShape.Num = Extrude_ProtudeSurface(ROTATE, (int)$4, 0., 0., 0.,
+ $6[0], $6[1], $6[2], $8[0], $8[1], $8[2], $10,
+ 0, NULL);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tSurface '{' FExpr ',' VExpr ',' VExpr ',' VExpr ',' FExpr '}' tEND
{
- Extrude_ProtudeSurface(TRANSLATE_ROTATE,(int)$4,$6[0],$6[1],$6[2],
- $8[0],$8[1],$8[2],$10[0],$10[1],$10[2],$12,0,NULL);
+ TheShape.Num = Extrude_ProtudeSurface(TRANSLATE_ROTATE, (int)$4, $6[0], $6[1], $6[2],
+ $8[0], $8[1], $8[2], $10[0], $10[1], $10[2], $12,
+ 0, NULL);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tSurface '{' FExpr ',' VExpr '}'
{
@@ -2331,8 +2450,19 @@ Extrude :
'{' ExtrudeParameters '}' tEND
{
int vol = NEWREG();
- Extrude_ProtudeSurface(TRANSLATE,(int)$4,$6[0],$6[1],$6[2],
- 0.,0.,0.,0.,0.,0.,0.,vol,&extr);
+ TheShape.Num = Extrude_ProtudeSurface(TRANSLATE, (int)$4, $6[0], $6[1], $6[2],
+ 0., 0., 0., 0., 0., 0., 0.,
+ vol, &extr);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tSurface '{' FExpr ',' VExpr ',' VExpr ',' FExpr '}'
{
@@ -2343,8 +2473,19 @@ Extrude :
'{' ExtrudeParameters '}'tEND
{
int vol = NEWREG();
- Extrude_ProtudeSurface(ROTATE,(int)$4,0.,0.,0.,
- $6[0],$6[1],$6[2],$8[0],$8[1],$8[2],$10,vol,&extr);
+ TheShape.Num = Extrude_ProtudeSurface(ROTATE, (int)$4, 0., 0., 0.,
+ $6[0], $6[1], $6[2], $8[0], $8[1], $8[2], $10,
+ vol, &extr);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
| tExtrude tSurface '{' FExpr ',' VExpr ',' VExpr ',' VExpr ',' FExpr '}'
{
@@ -2355,8 +2496,19 @@ Extrude :
'{' ExtrudeParameters '}'tEND
{
int vol = NEWREG();
- Extrude_ProtudeSurface(TRANSLATE_ROTATE,(int)$4,$6[0],$6[1],$6[2],
- $8[0],$8[1],$8[2],$10[0],$10[1],$10[2],$12,vol,&extr);
+ TheShape.Num = Extrude_ProtudeSurface(TRANSLATE_ROTATE, (int)$4, $6[0], $6[1], $6[2],
+ $8[0], $8[1], $8[2], $10[0], $10[1], $10[2], $12,
+ vol, &extr);
+ Surface *s = FindSurface(TheShape.Num, THEM);
+ if(!s){
+ yymsg(WARNING, "Unknown Surface %d", TheShape.Num);
+ TheShape.Type = 0;
+ }
+ else{
+ TheShape.Type = s->Typ;
+ }
+ $$ = List_Create(1, 1, sizeof(Shape));
+ List_Add($$, &TheShape);
}
;
@@ -2379,12 +2531,12 @@ ExtrudeParameter :
extr.mesh.NbElmLayer = (int*)Malloc(extr.mesh.NbLayer*sizeof(int));
extr.mesh.ZonLayer = (int*)Malloc(extr.mesh.NbLayer*sizeof(int));
extr.mesh.hLayer = (double*)Malloc(extr.mesh.NbLayer*sizeof(double));
- for(int i=0;i<List_Nbr($3);i++){
- List_Read($3,i,&d);
+ for(int i = 0; i < List_Nbr($3); i++){
+ List_Read($3, i, &d);
extr.mesh.NbElmLayer[i] = (d>0)?(int)d:1;
- List_Read($5,i,&d);
+ List_Read($5, i, &d);
extr.mesh.ZonLayer[i] = (int)d;
- List_Read($7,i,&d);
+ List_Read($7, i, &d);
extr.mesh.hLayer[i] = d;
}
}
@@ -2405,11 +2557,11 @@ ExtrudeParameter :
extr.mesh.NbElmLayer = (int*)Malloc(extr.mesh.NbLayer*sizeof(int));
extr.mesh.ZonLayer = (int*)Malloc(extr.mesh.NbLayer*sizeof(int));
extr.mesh.hLayer = (double*)Malloc(extr.mesh.NbLayer*sizeof(double));
- for(int i=0;i<List_Nbr($3);i++){
- List_Read($3,i,&d);
+ for(int i = 0; i < List_Nbr($3); i++){
+ List_Read($3, i, &d);
extr.mesh.NbElmLayer[i] = (d>0)?(int)d:1;
extr.mesh.ZonLayer[i] = 0;
- List_Read($5,i,&d);
+ List_Read($5, i, &d);
extr.mesh.hLayer[i] = d;
}
}
@@ -2432,10 +2584,10 @@ Transfini :
tTransfinite tLine ListOfDouble tAFFECT FExpr tEND
{
Curve *c;
- for(i=0;i<List_Nbr($3);i++){
- List_Read($3,i,&d);
+ for(i = 0; i < List_Nbr($3); i++){
+ List_Read($3, i, &d);
j = (int)fabs(d);
- c = FindCurve(j,THEM);
+ c = FindCurve(j, THEM);
if(!c)
yymsg(WARNING, "Unknown Curve %d", j);
else{
@@ -2450,10 +2602,10 @@ Transfini :
| tTransfinite tLine ListOfDouble tAFFECT FExpr tUsing tProgression FExpr tEND
{
Curve *c;
- for(i=0;i<List_Nbr($3);i++){
- List_Read($3,i,&d);
+ for(i = 0; i < List_Nbr($3); i++){
+ List_Read($3, i, &d);
j = (int)fabs(d);
- c = FindCurve(j,THEM);
+ c = FindCurve(j, THEM);
if(!c)
yymsg(WARNING, "Unknown Curve %d", j);
else{
@@ -2468,10 +2620,10 @@ Transfini :
| tTransfinite tLine ListOfDouble tAFFECT FExpr tUsing tBump FExpr tEND
{
Curve *c;
- for(i=0;i<List_Nbr($3);i++){
- List_Read($3,i,&d);
+ for(i = 0; i < List_Nbr($3); i++){
+ List_Read($3, i, &d);
j = (int)fabs(d);
- c = FindCurve(j,THEM);
+ c = FindCurve(j, THEM);
if(!c)
yymsg(WARNING, "Unknown Curve %d", j);
else{
@@ -2485,7 +2637,7 @@ Transfini :
}
| tTransfinite tSurface '{' FExpr '}' tAFFECT ListOfDouble tEND
{
- Surface *s = FindSurface((int)$4,THEM);
+ Surface *s = FindSurface((int)$4, THEM);
if(!s)
yymsg(WARNING, "Unknown Surface %d", (int)$4);
else{
@@ -2496,8 +2648,8 @@ Transfini :
"%d points instead of 3 or 4" , $4, k) ;
}
else{
- for(i=0;i<k;i++){
- List_Read($7,i,&d);
+ for(i = 0; i < k; i++){
+ List_Read($7, i, &d);
j = (int)fabs(d);
s->ipar[i] = j;
}
@@ -2507,7 +2659,7 @@ Transfini :
}
| tElliptic tSurface '{' FExpr '}' tAFFECT ListOfDouble tEND
{
- Surface *s = FindSurface((int)$4,THEM);
+ Surface *s = FindSurface((int)$4, THEM);
if(!s)
yymsg(WARNING, "Unknown Surface %d", (int)$4);
else{
@@ -2517,8 +2669,8 @@ Transfini :
yymsg(GERROR, "Wrong definition of Elliptic Surface %d: "
"%d points instead of 4" , $4, k) ;
else{
- for(i=0;i<k;i++){
- List_Read($7,i,&d);
+ for(i = 0; i < k; i++){
+ List_Read($7, i, &d);
j = (int)fabs(d);
s->ipar[i] = j;
}
@@ -2528,18 +2680,18 @@ Transfini :
}
| tTransfinite tVolume '{' FExpr '}' tAFFECT ListOfDouble tEND
{
- Volume *v = FindVolume((int)$4,THEM);
+ Volume *v = FindVolume((int)$4, THEM);
if(!v)
yymsg(WARNING, "Unknown Volume %d", (int)$4);
else{
v->Method = TRANSFINI;
k = List_Nbr($7);
- if(k!=6 && k!=8)
+ if(k != 6 && k != 8)
yymsg(GERROR, "Wrong definition of Transfinite Volume %d: "
"%d points instead of 6 or 8" , $4, k) ;
else{
- for(i=0;i<k;i++){
- List_Read($7,i,&d);
+ for(i = 0; i < k; i++){
+ List_Read($7, i, &d);
j = (int)fabs(d);
v->ipar[i] = j;
}
@@ -2550,10 +2702,10 @@ Transfini :
| tRecombine tSurface ListOfDouble tAFFECT FExpr tEND
{
Surface *s;
- for(i=0;i<List_Nbr($3);i++){
- List_Read($3,i,&d);
+ for(i = 0; i < List_Nbr($3); i++){
+ List_Read($3, i, &d);
j = (int)d;
- s = FindSurface(j,THEM);
+ s = FindSurface(j, THEM);
if(s){
s->Recombine = 1;
s->RecombineAngle = ($5 > 0 && $5 < 90) ? $5 : 90;
@@ -2564,10 +2716,10 @@ Transfini :
| tRecombine tSurface ListOfDouble tEND
{
Surface *s;
- for(i=0;i<List_Nbr($3);i++){
- List_Read($3,i,&d);
+ for(i = 0; i < List_Nbr($3); i++){
+ List_Read($3, i, &d);
j = (int)d;
- s = FindSurface(j,THEM);
+ s = FindSurface(j, THEM);
if(s){
s->Recombine = 1;
s->RecombineAngle = 30.;
@@ -2619,7 +2771,7 @@ FExpr :
$$ = $1 / $3 ;
}
| FExpr '%' FExpr { $$ = (int)$1 % (int)$3 ; }
- | FExpr '^' FExpr { $$ = pow($1,$3) ; }
+ | FExpr '^' FExpr { $$ = pow($1, $3) ; }
| FExpr '<' FExpr { $$ = $1 < $3 ; }
| FExpr '>' FExpr { $$ = $1 > $3 ; }
| FExpr tLESSOREQUAL FExpr { $$ = $1 <= $3 ; }
@@ -2639,15 +2791,15 @@ FExpr :
| tAcos '(' FExpr ')' { $$ = acos($3); }
| tTan '(' FExpr ')' { $$ = tan($3); }
| tAtan '(' FExpr ')' { $$ = atan($3); }
- | tAtan2 '(' FExpr ',' FExpr ')' { $$ = atan2($3,$5); }
+ | tAtan2 '(' FExpr ',' FExpr ')' { $$ = atan2($3, $5); }
| tSinh '(' FExpr ')' { $$ = sinh($3); }
| tCosh '(' FExpr ')' { $$ = cosh($3); }
| tTanh '(' FExpr ')' { $$ = tanh($3); }
| tFabs '(' FExpr ')' { $$ = fabs($3); }
| tFloor '(' FExpr ')' { $$ = floor($3); }
| tCeil '(' FExpr ')' { $$ = ceil($3); }
- | tFmod '(' FExpr ',' FExpr ')' { $$ = fmod($3,$5); }
- | tModulo '(' FExpr ',' FExpr ')' { $$ = fmod($3,$5); }
+ | tFmod '(' FExpr ',' FExpr ')' { $$ = fmod($3, $5); }
+ | tModulo '(' FExpr ',' FExpr ')' { $$ = fmod($3, $5); }
| tHypot '(' FExpr ',' FExpr ')' { $$ = sqrt($3*$3+$5*$5); }
| tRand '(' FExpr ')' { $$ = $3*(double)rand()/(double)RAND_MAX; }
// The following is for GetDP compatibility
@@ -2661,15 +2813,15 @@ FExpr :
| tAcos '[' FExpr ']' { $$ = acos($3); }
| tTan '[' FExpr ']' { $$ = tan($3); }
| tAtan '[' FExpr ']' { $$ = atan($3); }
- | tAtan2 '[' FExpr ',' FExpr ']' { $$ = atan2($3,$5); }
+ | tAtan2 '[' FExpr ',' FExpr ']' { $$ = atan2($3, $5); }
| tSinh '[' FExpr ']' { $$ = sinh($3); }
| tCosh '[' FExpr ']' { $$ = cosh($3); }
| tTanh '[' FExpr ']' { $$ = tanh($3); }
| tFabs '[' FExpr ']' { $$ = fabs($3); }
| tFloor '[' FExpr ']' { $$ = floor($3); }
| tCeil '[' FExpr ']' { $$ = ceil($3); }
- | tFmod '[' FExpr ',' FExpr ']' { $$ = fmod($3,$5); }
- | tModulo '[' FExpr ',' FExpr ']' { $$ = fmod($3,$5); }
+ | tFmod '[' FExpr ',' FExpr ']' { $$ = fmod($3, $5); }
+ | tModulo '[' FExpr ',' FExpr ']' { $$ = fmod($3, $5); }
| tHypot '[' FExpr ',' FExpr ']' { $$ = sqrt($3*$3+$5*$5); }
| tRand '[' FExpr ']' { $$ = $3*(double)rand()/(double)RAND_MAX; }
;
@@ -2690,7 +2842,7 @@ FExpr_Single :
| tSTRING
{
TheSymbol.Name = $1 ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", $1) ;
$$ = 0. ;
}
@@ -2701,7 +2853,7 @@ FExpr_Single :
| tSTRING '[' FExpr ']'
{
TheSymbol.Name = $1 ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", $1) ;
$$ = 0. ;
}
@@ -2718,7 +2870,7 @@ FExpr_Single :
| tSTRING NumericIncrement
{
TheSymbol.Name = $1 ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", $1) ;
$$ = 0. ;
}
@@ -2729,7 +2881,7 @@ FExpr_Single :
| tSTRING '[' FExpr ']' NumericIncrement
{
TheSymbol.Name = $1 ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", $1) ;
$$ = 0. ;
}
@@ -2817,38 +2969,38 @@ VExpr :
}
| '-' VExpr %prec UNARYPREC
{
- for(i=0 ; i<5 ; i++) $$[i] = -$2[i] ;
+ for(i = 0; i < 5; i++) $$[i] = -$2[i] ;
}
| '+' VExpr %prec UNARYPREC
{
- for(i=0 ; i<5 ; i++) $$[i] = $2[i];
+ for(i = 0; i < 5; i++) $$[i] = $2[i];
}
| VExpr '-' VExpr
{
- for(i=0 ; i<5 ; i++) $$[i] = $1[i] - $3[i] ;
+ for(i = 0; i < 5; i++) $$[i] = $1[i] - $3[i] ;
}
| VExpr '+' VExpr
{
- for(i=0 ; i<5 ; i++) $$[i] = $1[i] + $3[i] ;
+ for(i = 0; i < 5; i++) $$[i] = $1[i] + $3[i] ;
}
;
VExpr_Single :
'{' FExpr ',' FExpr ',' FExpr ',' FExpr ',' FExpr '}'
{
- $$[0]=$2; $$[1]=$4; $$[2]=$6; $$[3]=$8; $$[4]=$10;
+ $$[0] = $2; $$[1] = $4; $$[2] = $6; $$[3] = $8; $$[4] = $10;
}
| '{' FExpr ',' FExpr ',' FExpr ',' FExpr '}'
{
- $$[0]=$2; $$[1]=$4; $$[2]=$6; $$[3]=$8; $$[4]=1.0;
+ $$[0] = $2; $$[1] = $4; $$[2] = $6; $$[3] = $8; $$[4] = 1.0;
}
| '{' FExpr ',' FExpr ',' FExpr '}'
{
- $$[0]=$2; $$[1]=$4; $$[2]=$6; $$[3]=0.0; $$[4]=1.0;
+ $$[0] = $2; $$[1] = $4; $$[2] = $6; $$[3] = 0.0; $$[4] = 1.0;
}
| '(' FExpr ',' FExpr ',' FExpr ')'
{
- $$[0]=$2; $$[1]=$4; $$[2]=$6; $$[3]=0.0; $$[4]=1.0;
+ $$[0] = $2; $$[1] = $4; $$[2] = $6; $$[3] = 0.0; $$[4] = 1.0;
}
;
@@ -2876,18 +3028,18 @@ ListOfListOfDouble :
}
| '{' RecursiveListOfListOfDouble '}'
{
- $$=$2;
+ $$ = $2;
}
| '(' RecursiveListOfListOfDouble ')'
{
- $$=$2;
+ $$ = $2;
}
;
RecursiveListOfListOfDouble :
ListOfDouble
{
- $$ = List_Create(2,1,sizeof(List_T*)) ;
+ $$ = List_Create(2, 1, sizeof(List_T*)) ;
List_Add($$, &($1)) ;
}
| RecursiveListOfListOfDouble ',' ListOfDouble
@@ -2900,7 +3052,7 @@ RecursiveListOfListOfDouble :
ListOfDouble :
FExpr
{
- $$ = List_Create(2,1,sizeof(double)) ;
+ $$ = List_Create(2, 1, sizeof(double)) ;
List_Add($$, &($1)) ;
}
| FExpr_Multi
@@ -2909,59 +3061,44 @@ ListOfDouble :
}
| '{' RecursiveListOfDouble '}'
{
- $$=$2;
+ $$ = $2;
}
| '-' '{' RecursiveListOfDouble '}'
{
- $$=$3;
- for(i=0 ; i<List_Nbr($$) ; i++){
+ $$ = $3;
+ for(i = 0; i < List_Nbr($$); i++){
pd = (double*)List_Pointer($$, i);
(*pd) = - (*pd);
}
}
-/* FIXME: removed until we clean up the syntax, sorry
- | MultipleShape
- {
- $$ = List_Create(List_Nbr($1),1,sizeof(double)) ;
- for (int i=0;i<List_Nbr($1);i++)
- {
- Shape *s = (Shape*) List_Pointer($1,i);
- double d = s->Num;
- List_Add($$,&d);
- }
- }
-*/
;
FExpr_Multi :
FExpr tDOTS FExpr
{
- $$ = List_Create(2,1,sizeof(double)) ;
- for(d=$1 ; ($1<$3)?(d<=$3):(d>=$3) ; ($1<$3)?(d+=1.):(d-=1.))
+ $$ = List_Create(2, 1, sizeof(double)) ;
+ for(d = $1; ($1 < $3) ? (d <= $3) : (d >= $3); ($1 < $3) ? (d += 1.) : (d -= 1.))
List_Add($$, &d) ;
}
| FExpr tDOTS FExpr tDOTS FExpr
- {
- $$ = List_Create(2,1,sizeof(double)) ;
- if(!$5 || ($1<$3 && $5<0) || ($1>$3 && $5>0)){
+ {
+ $$ = List_Create(2, 1, sizeof(double)) ;
+ if(!$5 || ($1 < $3 && $5 < 0) || ($1 > $3 && $5 > 0)){
yymsg(GERROR, "Wrong increment in '%g:%g:%g'", $1, $3, $5) ;
List_Add($$, &($1)) ;
}
else
- for(d=$1 ; ($5>0)?(d<=$3):(d>=$3) ; d+=$5)
+ for(d = $1; ($5 > 0) ? (d <= $3) : (d >= $3); d += $5)
List_Add($$, &d) ;
}
-/* FIXME: removed until we clean up the syntax, sorry
| tPoint '{' FExpr '}'
{
- /// JF Remacle, sept. 2003
- /// returns the coordinates of a point
- /// and fills a list with it
- /// This allows to ensure e.g. that relative
- /// point positions are always conserved
- Vertex *v = FindPoint((int)$3,THEM);
- $$ = List_Create(3,1,sizeof(double)) ;
- if (!v) {
+ // Returns the coordinates of a point and fills a list with it.
+ // This allows to ensure e.g. that relative point positions are
+ // always conserved
+ Vertex *v = FindPoint((int)$3, THEM);
+ $$ = List_Create(3, 1, sizeof(double)) ;
+ if(!v) {
yymsg(GERROR, "Unknown point '%d'", (int) $3) ;
double d = 0.0 ;
List_Add($$, &d);
@@ -2974,32 +3111,58 @@ FExpr_Multi :
List_Add($$, &v->Pos.Z) ;
}
}
-*/
+ | Transform
+ {
+ $$ = List_Create(List_Nbr($1), 1, sizeof(double)) ;
+ for(int i = 0; i < List_Nbr($1); i++){
+ Shape *s = (Shape*) List_Pointer($1, i);
+ double d = s->Num;
+ List_Add($$, &d);
+ }
+ }
+ | Duplicata
+ {
+ $$ = List_Create(List_Nbr($1), 1, sizeof(double)) ;
+ for(int i = 0; i < List_Nbr($1); i++){
+ Shape *s = (Shape*) List_Pointer($1, i);
+ double d = s->Num;
+ List_Add($$, &d);
+ }
+ }
+ | Extrude
+ {
+ $$ = List_Create(List_Nbr($1), 1, sizeof(double)) ;
+ for(int i = 0; i < List_Nbr($1); i++){
+ Shape *s = (Shape*) List_Pointer($1, i);
+ double d = s->Num;
+ List_Add($$, &d);
+ }
+ }
| tSTRING '[' ']'
{
- $$ = List_Create(2,1,sizeof(double)) ;
+ $$ = List_Create(2, 1, sizeof(double)) ;
TheSymbol.Name = $1 ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", $1) ;
d = 0.0 ;
List_Add($$, &d);
}
else{
- for(i = 0 ; i < List_Nbr(pSymbol->val) ; i++)
+ for(i = 0; i < List_Nbr(pSymbol->val); i++)
List_Add($$, (double*)List_Pointer_Fast(pSymbol->val, i)) ;
}
}
| '-' tSTRING '[' ']'
{
- $$ = List_Create(2,1,sizeof(double)) ;
+ $$ = List_Create(2, 1, sizeof(double)) ;
TheSymbol.Name = $2 ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", $2) ;
d = 0.0 ;
List_Add($$, &d);
}
else{
- for(i = 0 ; i < List_Nbr(pSymbol->val) ; i++){
+ for(i = 0; i < List_Nbr(pSymbol->val); i++){
d = - *(double*)List_Pointer_Fast(pSymbol->val, i);
List_Add($$, &d) ;
}
@@ -3007,15 +3170,15 @@ FExpr_Multi :
}
| tSTRING '[' '{' RecursiveListOfDouble '}' ']'
{
- $$ = List_Create(2,1,sizeof(double)) ;
+ $$ = List_Create(2, 1, sizeof(double)) ;
TheSymbol.Name = $1 ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", $1) ;
d = 0.0 ;
List_Add($$, &d);
}
else{
- for(i = 0 ; i < List_Nbr($4) ; i++){
+ for(i = 0; i < List_Nbr($4); i++){
j = (int)(*(double*)List_Pointer_Fast($4, i));
if((pd = (double*)List_Pointer_Test(pSymbol->val, j)))
List_Add($$, pd) ;
@@ -3027,15 +3190,15 @@ FExpr_Multi :
}
| '-' tSTRING '[' '{' RecursiveListOfDouble '}' ']'
{
- $$ = List_Create(2,1,sizeof(double)) ;
+ $$ = List_Create(2, 1, sizeof(double)) ;
TheSymbol.Name = $2 ;
- if (!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
+ if(!(pSymbol = (Symbol*)Tree_PQuery(Symbol_T, &TheSymbol))) {
yymsg(GERROR, "Unknown variable '%s'", $2) ;
d = 0.0 ;
List_Add($$, &d);
}
else{
- for(i = 0 ; i < List_Nbr($5) ; i++){
+ for(i = 0; i < List_Nbr($5); i++){
j = (int)(*(double*)List_Pointer_Fast($5, i));
if((pd = (double*)List_Pointer_Test(pSymbol->val, j))){
d = - *pd;
@@ -3052,7 +3215,7 @@ FExpr_Multi :
RecursiveListOfDouble :
FExpr
{
- $$ = List_Create(2,1,sizeof(double)) ;
+ $$ = List_Create(2, 1, sizeof(double)) ;
List_Add($$, &($1)) ;
}
| FExpr_Multi
@@ -3065,7 +3228,7 @@ RecursiveListOfDouble :
}
| RecursiveListOfDouble ',' FExpr_Multi
{
- for(i=0 ; i<List_Nbr($3) ; i++){
+ for(i = 0; i < List_Nbr($3); i++){
List_Read($3, i, &d) ;
List_Add($$, &d) ;
}
@@ -3107,7 +3270,7 @@ ColorExpr :
$$ = 0 ;
}
else{
- $$ = pColOpt(0,GMSH_GET,0) ;
+ $$ = pColOpt(0, GMSH_GET, 0) ;
}
}
}
@@ -3120,12 +3283,12 @@ ListOfColor :
}
| tSTRING '[' FExpr ']' '.' tColorTable
{
- $$ = List_Create(256,10,sizeof(unsigned int)) ;
+ $$ = List_Create(256, 10, sizeof(unsigned int)) ;
GmshColorTable *ct = Get_ColorTable((int)$3);
if(!ct)
yymsg(GERROR, "View[%d] does not exist", (int)$3);
else{
- for(i=0 ; i<ct->size ; i++)
+ for(i = 0; i < ct->size; i++)
List_Add($$, &ct->table[i]);
}
}
@@ -3134,7 +3297,7 @@ ListOfColor :
RecursiveListOfColor :
ColorExpr
{
- $$ = List_Create(256,10,sizeof(unsigned int)) ;
+ $$ = List_Create(256, 10, sizeof(unsigned int)) ;
List_Add($$, &($1)) ;
}
| RecursiveListOfColor ',' ColorExpr
@@ -3159,14 +3322,14 @@ StringExpr :
| tStrPrefix '(' StringExpr ')'
{
$$ = (char *)Malloc((strlen($3)+1)*sizeof(char)) ;
- for(i=strlen($3)-1; i>=0; i--){
+ for(i = strlen($3)-1; i >= 0; i--){
if($3[i] == '.'){
- strncpy($$,$3,i);
+ strncpy($$, $3, i);
$$[i]='\0';
break;
}
}
- if(i<=0) strcpy($$,$3);
+ if(i <= 0) strcpy($$, $3);
Free($3);
}
| tSprintf '(' StringExpr ')'
@@ -3175,13 +3338,13 @@ StringExpr :
}
| tSprintf '(' StringExpr ',' RecursiveListOfDouble ')'
{
- i = PrintListOfDouble($3,$5,tmpstring);
- if(i<0){
+ i = PrintListOfDouble($3, $5, tmpstring);
+ if(i < 0){
yymsg(GERROR, "Too few arguments in Sprintf");
$$ = $3;
}
- else if(i>0){
- yymsg(GERROR, "Too many arguments (%d) in Sprintf", i);
+ else if(i > 0){
+ yymsg(GERROR, "%d extra argument%s in Sprintf", i, (i>1)?"s":"");
$$ = $3;
}
else{
@@ -3199,7 +3362,7 @@ StringExpr :
if(!(pStrOpt = (char *(*) (int, int, char *))Get_StringOption($5, pStrCat)))
yymsg(GERROR, "Unknown string option '%s.%s'", $3, $5);
else{
- str = pStrOpt(0,GMSH_GET,NULL) ;
+ str = pStrOpt(0, GMSH_GET, NULL) ;
$$ = (char*)Malloc((strlen(str)+1)*sizeof(char));
strcpy($$, str);
}
@@ -3213,7 +3376,7 @@ StringExpr :
if(!(pStrOpt = (char *(*) (int, int, char *))Get_StringOption($8, pStrCat)))
yymsg(GERROR, "Unknown string option '%s[%d].%s'", $3, (int)$5, $8);
else{
- str = pStrOpt((int)$5,GMSH_GET,NULL) ;
+ str = pStrOpt((int)$5, GMSH_GET, NULL) ;
$$ = (char*)Malloc((strlen(str)+1)*sizeof(char));
strcpy($$, str);
}
@@ -3230,7 +3393,7 @@ void DeleteSymbol(void *a, void *b){
}
int CompareSymbols (const void *a, const void *b){
- return(strcmp(((Symbol*)a)->Name,((Symbol*)b)->Name));
+ return(strcmp(((Symbol*)a)->Name, ((Symbol*)b)->Name));
}
void InitSymbols(void){
@@ -3246,28 +3409,27 @@ int PrintListOfDouble(char *format, List_T *list, char *buffer){
char tmp1[256], tmp2[256];
j=0;
- while(format[j]!='%') j++;
+ while(j < strlen(format) && format[j]!='%') j++;
strncpy(buffer, format, j);
buffer[j]='\0';
- for(i = 0 ; i<List_Nbr(list) ; i++){
+ for(i = 0; i < List_Nbr(list); i++){
k = j;
j++;
- if(j<(int)strlen(format)){
- if(format[j]=='%'){
+ if(j < (int)strlen(format)){
+ if(format[j] == '%'){
strcat(buffer, "%");
j++;
}
- while(format[j]!='%' && j<(int)strlen(format)) j++;
+ while(format[j] != '%' && j < (int)strlen(format)) j++;
if(k != j){
- strncpy(tmp1, &(format[k]),j-k);
+ strncpy(tmp1, &(format[k]), j-k);
tmp1[j-k]='\0';
- sprintf(tmp2, tmp1, *(double*)List_Pointer(list,i));
+ sprintf(tmp2, tmp1, *(double*)List_Pointer(list, i));
strcat(buffer, tmp2);
}
}
else{
return List_Nbr(list)-i;
- break ;
}
}
if(j != (int)strlen(format))
@@ -3276,7 +3438,7 @@ int PrintListOfDouble(char *format, List_T *list, char *buffer){
}
void yyerror(char *s){
- Msg(GERROR, "'%s', line %d : %s (%s)",yyname,yylineno-1,s,yytext);
+ Msg(GERROR, "'%s', line %d : %s (%s)", yyname, yylineno-1, s, yytext);
yyerrorstate=1;
}
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index e2465b6ac9..c0212bf910 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.160 2003-09-17 18:00:56 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.161 2003-09-19 17:22:27 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -1013,7 +1013,7 @@ char *yytext;
#define INITIAL 0
#line 2 "Gmsh.l"
-// $Id: Gmsh.yy.cpp,v 1.160 2003-09-17 18:00:56 geuzaine Exp $
+// $Id: Gmsh.yy.cpp,v 1.161 2003-09-19 17:22:27 geuzaine Exp $
//
// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
//
diff --git a/doc/VERSIONS b/doc/VERSIONS
index 9a60781e5a..f4c0ffe04c 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,6 +1,8 @@
-$Id: VERSIONS,v 1.155 2003-08-27 01:45:09 geuzaine Exp $
+$Id: VERSIONS,v 1.156 2003-09-19 17:22:27 geuzaine Exp $
-New since 1.46: fix extrusion of surfaces defined by only two curves;
+New in 1.47: fix extrusion of surfaces defined by only two curves;
+new syntax to retrieve point coordinates and indices of entities
+created through geometrical transformations; new PDF output format;
New in 1.46: fix crash for very long command lines; new options for
setting the displacement factor and Triangle's parameters + renamed a
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index 7d72648f4d..0441ae2fd0 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
-@c $Id: gmsh.texi,v 1.80 2003-08-22 05:52:43 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.81 2003-09-19 17:22:27 geuzaine Exp $
@c
@c Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
@c
@@ -29,8 +29,7 @@
@c Indexing:
@c
@c * @cindex = concept index, e.g. "File formats"
-@c * @tindex + @findex = type + function index (= reserved keywords),
-@c e.g. "Spline"
+@c * @tindex + @findex = type + function index, e.g. "Sqrt(expression)"
@c
@c Before release, run C-u C-c C-u C-a in GNU Emacs. This updates all node
@c pointers and menus.
@@ -46,8 +45,8 @@
@c =========================================================================
@c %**start of header
@setfilename gmsh.info
-@set EDITION 1.12
-@set GMSH-VERSION 1.46
+@set EDITION 1.13
+@set GMSH-VERSION 1.47
@set GMSH-WEB @uref{http://www.geuz.org/gmsh/}
@set COPYRIGHT @copyright{} 1997-2003 Christophe Geuzaine, Jean-Fran@,{c}ois Remacle
@c
@@ -457,13 +456,13 @@ Multiple post-processing scalar, vector or tensor maps can be loaded and
manipulated (globally or individually) along with the geometry and the
mesh. Scalar fields are represented by iso-value lines/surfaces or color
maps, while vector and tensor fields are represented by three-dimensional
-arrows or displacement maps. Post-processing functions include arbitrary
-section computation, offset, elevation, boundary extraction, color map and
-range modification, animation, vector graphic output, etc. All
+arrows or displacement maps. Post-processing functions include section
+computation of scalar views, offset, elevation, boundary extraction, color
+map and range modification, animation, vector graphic output, etc. All
post-processing options can be accessed either interactively or through the
input ASCII text files. Scripting permits to automate all post-processing
-operations, e.g.@: for the creation of animations. User-defined operations can
-also be performed on post-processing views through dynamically loadable
+operations, e.g.@: for the creation of animations. User-defined operations
+can also be performed on post-processing views through dynamically loadable
plugins.
@c -------------------------------------------------------------------------
@@ -748,7 +747,11 @@ List of expressions are also widely used, and are defined as:
@var{expression} : @var{expression} |
@var{expression} : @var{expression} : @var{expression} |
@var{string} [ ] |
- @var{string} [ @{ @var{expression-list} @} ]
+ @var{string} [ @{ @var{expression-list} @} ] |
+ Point @{ @var{expression} @} |
+ @var{transform} |
+ @var{extrude}
+@c @var{duplicata} - already implemented: should we explain this?
@end example
The second case in this last definition permits to create a list containing
@@ -757,14 +760,18 @@ unit incrementation step. The third case also permits to create a list
containing the range of numbers comprised between two @w{@var{expression}s},
but with a positive or negative incrementation step equal to the third
@var{expression}. The fourth case permits to reference an expression list.
-The last case permits to reference an expression sublist (whose elements are
-those corresponding to the indices provided by the
-@var{expression-list}). To see the practical use of such expressions, have a
-look at the first couple of examples in @ref{Tutorial}.
-
-Note that, in order to lighten the syntax, you can always omit the braces
-@code{@{@}} enclosing an @var{expression-list} if this @var{expression-list}
-only contains a single item.
+The fifth case permits to reference an expression sublist (whose elements
+are those corresponding to the indices provided by the
+@var{expression-list}). The sixth case permits to retrieve the coordinates
+of a given geometry point (@pxref{Points}). The last two cases permit to
+retreive the indices of entities created through geometrical transformations
+(see @ref{Transformations}, and @ref{Extrusions}).
+
+To see the practical use of such expressions, have a look at the first
+couple of examples in @ref{Tutorial}. Note that, in order to lighten the
+syntax, you can always omit the braces @code{@{@}} enclosing an
+@var{expression-list} if this @var{expression-list} only contains a single
+item.
@c .........................................................................
@c Character expressions
@@ -848,6 +855,12 @@ See @ref{t3.geo}, for an example of the use of color expressions.
@cindex Unary operators
@cindex Binary operators
@cindex Ternary operators
+@findex @var{operator-unary-left}
+@findex @var{operator-unary-right}
+@findex @var{operator-binary}
+@findex @var{operator-unary-left}
+@findex @var{operator-ternary-left}
+@findex @var{operator-ternary-right}
Gmsh's operators are similar to the corresponding operators in C and
C++. Here is the list of the unary, binary and ternary operators currently
@@ -956,6 +969,7 @@ evaluation:
@section Built-in functions
@cindex Functions, built-in
+@findex @var{build-in-function}
A built-in function is composed of an identifier followed by a pair of
parentheses containing an @var{expression-list} (the list of its
@@ -1605,12 +1619,14 @@ volume.
@cindex Extrusion, geometry
@cindex Geometry, extrusion
+@findex @var{extrude}
Lines, surfaces and volumes can also be created through extrusion of points,
lines and surfaces, respectively. Here is the syntax of the geometrical
extrusion commands (go to @ref{Structured grids}, to see how these commands
can be extended in order to also extrude the mesh):
+@var{extrude}:
@ftable @code
@item Extrude Point | Line | Surface @{ @var{expression}, @{ @var{expression-list} @} @} ;
Extrudes the @var{expression}-th point, line or surface using a
@@ -1650,6 +1666,7 @@ giving the X, Y and Z components of any point on this axis; the last
@cindex Scale
@cindex Symmetry
@cindex Translation
+@findex @var{transform}
Geometrical transformations can be applied to elementary entities, or to
copies of geometrical entities (using the @code{Duplicata} command: see
diff --git a/tutorial/t2.geo b/tutorial/t2.geo
index 5babbbcf07..894dc82a3d 100644
--- a/tutorial/t2.geo
+++ b/tutorial/t2.geo
@@ -27,7 +27,11 @@ Translate {-0.05,0,0} { Point{3}; }
// The resulting point can also be duplicated and translated by 0.1
// along the y axis:
-Translate {0,0.1,0} { Duplicata{ Point{3}; } }
+newpt[] = Translate {0,0.1,0} { Duplicata{ Point{3}; } } ;
+
+// In this case, we assign the result of the Translate command to a
+// list, so that we can retrieve the number of the newly created point
+// later.
// Of course, these transformation commands not only apply to points,
// but also to lines and surfaces. The following command extrudes the
@@ -37,8 +41,8 @@ Translate {0,0.1,0} { Duplicata{ Point{3}; } }
h = 0.12;
Extrude Surface { 6, {0, 0, h} };
-Line(7) = {3, 6};
-Line(8) = {6,5};
+Line(7) = {3,newpt[0]};
+Line(8) = {newpt[0],5};
Line Loop(10) = {5,-8,-7,3};
Plane Surface(11) = {10};
@@ -49,7 +53,7 @@ Extrude Surface { 11, {0, 0, h} };
// elementary entities. The following command permits to manually
// specify a characteristic length for some of the new points:
-Characteristic Length {6, 22, 2, 3, 16, 12} = lc * 2;
+Characteristic Length {newpt[0], 22, 2, 3, 16, 12} = lc * 2;
// Note that, if the transformation tools are handy to create complex
// geometries, it is also sometimes useful to generate the `flat'
--
GitLab