diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 04c78ee52f554f59d97bf1c7dedf4d73f2b7c01e..acf6e194f56e98cbecc1b64989873bdc45f530fd 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -1,173 +1,172 @@
/* A Bison parser, made from Gmsh.y
- by GNU Bison version 1.25
- */
+ by GNU Bison version 1.28 */
#define YYBISON 1 /* Identify Bison output. */
-#define tDOUBLE 258
-#define tSTRING 259
-#define tBIGSTR 260
-#define tEND 261
-#define tAFFECT 262
-#define tDOTS 263
-#define tPi 264
-#define tExp 265
-#define tLog 266
-#define tLog10 267
-#define tSqrt 268
-#define tSin 269
-#define tAsin 270
-#define tCos 271
-#define tAcos 272
-#define tTan 273
-#define tRand 274
-#define tAtan 275
-#define tAtan2 276
-#define tSinh 277
-#define tCosh 278
-#define tTanh 279
-#define tFabs 280
-#define tFloor 281
-#define tCeil 282
-#define tFmod 283
-#define tModulo 284
-#define tHypot 285
-#define tPrintf 286
-#define tSprintf 287
-#define tDraw 288
-#define tPoint 289
-#define tCircle 290
-#define tEllipsis 291
-#define tLine 292
-#define tSurface 293
-#define tSpline 294
-#define tVolume 295
-#define tCharacteristic 296
-#define tLength 297
-#define tParametric 298
-#define tElliptic 299
-#define tPlane 300
-#define tRuled 301
-#define tTransfinite 302
-#define tComplex 303
-#define tPhysical 304
-#define tUsing 305
-#define tBump 306
-#define tProgression 307
-#define tRotate 308
-#define tTranslate 309
-#define tSymmetry 310
-#define tDilate 311
-#define tExtrude 312
-#define tDuplicata 313
-#define tLoop 314
-#define tRecombine 315
-#define tDelete 316
-#define tCoherence 317
-#define tView 318
-#define tAttractor 319
-#define tLayers 320
-#define tScalarTetrahedron 321
-#define tVectorTetrahedron 322
-#define tTensorTetrahedron 323
-#define tScalarTriangle 324
-#define tVectorTriangle 325
-#define tTensorTriangle 326
-#define tScalarLine 327
-#define tVectorLine 328
-#define tTensorLine 329
-#define tScalarPoint 330
-#define tVectorPoint 331
-#define tTensorPoint 332
-#define tBSpline 333
-#define tNurbs 334
-#define tOrder 335
-#define tWith 336
-#define tBounds 337
-#define tKnots 338
-#define tColor 339
-#define tFor 340
-#define tIn 341
-#define tEndFor 342
-#define tIf 343
-#define tEndIf 344
-#define tExit 345
-#define tMerge 346
-#define tReturn 347
-#define tCall 348
-#define tFunction 349
-#define tB_SPLINE_SURFACE_WITH_KNOTS 350
-#define tB_SPLINE_CURVE_WITH_KNOTS 351
-#define tCARTESIAN_POINT 352
-#define tTRUE 353
-#define tFALSE 354
-#define tUNSPECIFIED 355
-#define tU 356
-#define tV 357
-#define tEDGE_CURVE 358
-#define tVERTEX_POINT 359
-#define tORIENTED_EDGE 360
-#define tPLANE 361
-#define tFACE_OUTER_BOUND 362
-#define tEDGE_LOOP 363
-#define tADVANCED_FACE 364
-#define tVECTOR 365
-#define tDIRECTION 366
-#define tAXIS2_PLACEMENT_3D 367
-#define tISO 368
-#define tENDISO 369
-#define tENDSEC 370
-#define tDATA 371
-#define tHEADER 372
-#define tFILE_DESCRIPTION 373
-#define tFILE_SCHEMA 374
-#define tFILE_NAME 375
-#define tMANIFOLD_SOLID_BREP 376
-#define tCLOSED_SHELL 377
-#define tADVANCED_BREP_SHAPE_REPRESENTATION 378
-#define tFACE_BOUND 379
-#define tCYLINDRICAL_SURFACE 380
-#define tCONICAL_SURFACE 381
-#define tCIRCLE 382
-#define tTRIMMED_CURVE 383
-#define tGEOMETRIC_SET 384
-#define tCOMPOSITE_CURVE_SEGMENT 385
-#define tCONTINUOUS 386
-#define tCOMPOSITE_CURVE 387
-#define tTOROIDAL_SURFACE 388
-#define tPRODUCT_DEFINITION 389
-#define tPRODUCT_DEFINITION_SHAPE 390
-#define tSHAPE_DEFINITION_REPRESENTATION 391
-#define tELLIPSE 392
-#define tTrimmed 393
-#define tSolid 394
-#define tEndSolid 395
-#define tVertex 396
-#define tFacet 397
-#define tNormal 398
-#define tOuter 399
-#define tLoopSTL 400
-#define tEndLoop 401
-#define tEndFacet 402
-#define tAFFECTPLUS 403
-#define tAFFECTMINUS 404
-#define tAFFECTTIMES 405
-#define tAFFECTDIVIDE 406
-#define tOR 407
-#define tAND 408
-#define tEQUAL 409
-#define tNOTEQUAL 410
-#define tAPPROXEQUAL 411
-#define tLESSOREQUAL 412
-#define tGREATEROREQUAL 413
-#define tCROSSPRODUCT 414
-#define tPLUSPLUS 415
-#define tMINUSMINUS 416
-#define UNARYPREC 417
+#define tDOUBLE 257
+#define tSTRING 258
+#define tBIGSTR 259
+#define tEND 260
+#define tAFFECT 261
+#define tDOTS 262
+#define tPi 263
+#define tExp 264
+#define tLog 265
+#define tLog10 266
+#define tSqrt 267
+#define tSin 268
+#define tAsin 269
+#define tCos 270
+#define tAcos 271
+#define tTan 272
+#define tRand 273
+#define tAtan 274
+#define tAtan2 275
+#define tSinh 276
+#define tCosh 277
+#define tTanh 278
+#define tFabs 279
+#define tFloor 280
+#define tCeil 281
+#define tFmod 282
+#define tModulo 283
+#define tHypot 284
+#define tPrintf 285
+#define tSprintf 286
+#define tDraw 287
+#define tPoint 288
+#define tCircle 289
+#define tEllipsis 290
+#define tLine 291
+#define tSurface 292
+#define tSpline 293
+#define tVolume 294
+#define tCharacteristic 295
+#define tLength 296
+#define tParametric 297
+#define tElliptic 298
+#define tPlane 299
+#define tRuled 300
+#define tTransfinite 301
+#define tComplex 302
+#define tPhysical 303
+#define tUsing 304
+#define tBump 305
+#define tProgression 306
+#define tRotate 307
+#define tTranslate 308
+#define tSymmetry 309
+#define tDilate 310
+#define tExtrude 311
+#define tDuplicata 312
+#define tLoop 313
+#define tRecombine 314
+#define tDelete 315
+#define tCoherence 316
+#define tView 317
+#define tAttractor 318
+#define tLayers 319
+#define tScalarTetrahedron 320
+#define tVectorTetrahedron 321
+#define tTensorTetrahedron 322
+#define tScalarTriangle 323
+#define tVectorTriangle 324
+#define tTensorTriangle 325
+#define tScalarLine 326
+#define tVectorLine 327
+#define tTensorLine 328
+#define tScalarPoint 329
+#define tVectorPoint 330
+#define tTensorPoint 331
+#define tBSpline 332
+#define tNurbs 333
+#define tOrder 334
+#define tWith 335
+#define tBounds 336
+#define tKnots 337
+#define tColor 338
+#define tFor 339
+#define tIn 340
+#define tEndFor 341
+#define tIf 342
+#define tEndIf 343
+#define tExit 344
+#define tMerge 345
+#define tReturn 346
+#define tCall 347
+#define tFunction 348
+#define tB_SPLINE_SURFACE_WITH_KNOTS 349
+#define tB_SPLINE_CURVE_WITH_KNOTS 350
+#define tCARTESIAN_POINT 351
+#define tTRUE 352
+#define tFALSE 353
+#define tUNSPECIFIED 354
+#define tU 355
+#define tV 356
+#define tEDGE_CURVE 357
+#define tVERTEX_POINT 358
+#define tORIENTED_EDGE 359
+#define tPLANE 360
+#define tFACE_OUTER_BOUND 361
+#define tEDGE_LOOP 362
+#define tADVANCED_FACE 363
+#define tVECTOR 364
+#define tDIRECTION 365
+#define tAXIS2_PLACEMENT_3D 366
+#define tISO 367
+#define tENDISO 368
+#define tENDSEC 369
+#define tDATA 370
+#define tHEADER 371
+#define tFILE_DESCRIPTION 372
+#define tFILE_SCHEMA 373
+#define tFILE_NAME 374
+#define tMANIFOLD_SOLID_BREP 375
+#define tCLOSED_SHELL 376
+#define tADVANCED_BREP_SHAPE_REPRESENTATION 377
+#define tFACE_BOUND 378
+#define tCYLINDRICAL_SURFACE 379
+#define tCONICAL_SURFACE 380
+#define tCIRCLE 381
+#define tTRIMMED_CURVE 382
+#define tGEOMETRIC_SET 383
+#define tCOMPOSITE_CURVE_SEGMENT 384
+#define tCONTINUOUS 385
+#define tCOMPOSITE_CURVE 386
+#define tTOROIDAL_SURFACE 387
+#define tPRODUCT_DEFINITION 388
+#define tPRODUCT_DEFINITION_SHAPE 389
+#define tSHAPE_DEFINITION_REPRESENTATION 390
+#define tELLIPSE 391
+#define tTrimmed 392
+#define tSolid 393
+#define tEndSolid 394
+#define tVertex 395
+#define tFacet 396
+#define tNormal 397
+#define tOuter 398
+#define tLoopSTL 399
+#define tEndLoop 400
+#define tEndFacet 401
+#define tAFFECTPLUS 402
+#define tAFFECTMINUS 403
+#define tAFFECTTIMES 404
+#define tAFFECTDIVIDE 405
+#define tOR 406
+#define tAND 407
+#define tEQUAL 408
+#define tNOTEQUAL 409
+#define tAPPROXEQUAL 410
+#define tLESSOREQUAL 411
+#define tGREATEROREQUAL 412
+#define tCROSSPRODUCT 413
+#define tPLUSPLUS 414
+#define tMINUSMINUS 415
+#define UNARYPREC 416
#line 1 "Gmsh.y"
- /* $Id: Gmsh.tab.cpp,v 1.44 2000-12-11 16:23:14 geuzaine Exp $ */
+ /* $Id: Gmsh.tab.cpp,v 1.45 2000-12-11 19:39:14 geuzaine Exp $ */
#include <stdarg.h>
@@ -206,6 +205,7 @@ static double LoopControlVariablesTab[MAX_OPEN_FILES][3];
static char* LoopControlVariablesNameTab[MAX_OPEN_FILES];
static char yynameTab[MAX_OPEN_FILES][NAME_STR_L];
static char tmpstring[NAME_STR_L];
+static char tmpstring2[NAME_STR_L], tmpstring3[NAME_STR_L];
static Symbol TheSymbol, *pSymbol;
static Surface *STL_Surf;
static Shape TheShape;
@@ -215,7 +215,7 @@ static double d, *pd;
static ExtrudeParams extr;
static List_T *ListOfDouble_L,*ListOfDouble2_L;
static List_T *ListOfListOfDouble_L, *ListOfColor_L=NULL;
-
+static char *str;
static void *pNumOpt, *pArrOpt;
static char **pStrOpt, *pStrViewOpt;
static unsigned int *pColOpt;
@@ -229,7 +229,7 @@ void vyyerror (char *fmt, ...);
void skip_until (char *until);
-#line 64 "Gmsh.y"
+#line 65 "Gmsh.y"
typedef union {
char *c;
int i;
@@ -253,7 +253,7 @@ typedef union {
#define YYFLAG -32768
#define YYNTBASE 181
-#define YYTRANSLATE(x) ((unsigned)(x) <= 417 ? yytranslate[x] : 259)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 416 ? yytranslate[x] : 259)
static const short yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -281,23 +281,23 @@ static const short yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 1, 2, 3, 4, 5,
- 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 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, 98, 99, 100, 101, 102, 103, 104, 105,
- 106, 107, 108, 109, 110, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
- 136, 137, 138, 139, 140, 141, 142, 143, 144, 145,
- 146, 147, 148, 149, 150, 151, 153, 154, 155, 156,
- 157, 159, 161, 167, 169, 170, 171
+ 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
+ 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 68, 69, 70, 71, 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, 98, 99, 100, 101, 102, 103, 104, 105, 106,
+ 107, 108, 109, 110, 111, 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, 135, 136,
+ 137, 138, 139, 140, 141, 142, 143, 144, 145, 146,
+ 147, 148, 149, 150, 151, 153, 154, 155, 156, 157,
+ 159, 161, 167, 169, 170, 171
};
#if YYDEBUG != 0
@@ -393,7 +393,7 @@ static const short yyrhs[] = { 183,
0, 230, 0, 231, 0, 234, 0, 235, 0, 238,
0, 241, 0, 242, 0, 237, 0, 236, 0, 1,
6, 0, 31, 173, 5, 174, 6, 0, 31, 173,
- 5, 178, 244, 174, 6, 0, 63, 5, 179, 192,
+ 5, 178, 254, 174, 6, 0, 63, 5, 179, 192,
180, 6, 0, 63, 5, 4, 247, 179, 192, 180,
6, 0, 0, 192, 194, 0, 192, 197, 0, 192,
200, 0, 192, 203, 0, 192, 206, 0, 192, 209,
@@ -571,7 +571,7 @@ static const short yyrhs[] = { 183,
0, 4, 0, 4, 177, 84, 177, 4, 0, 179,
257, 180, 0, 4, 177, 63, 175, 244, 176, 177,
84, 0, 255, 0, 257, 178, 255, 0, 5, 0,
- 32, 173, 5, 174, 0, 32, 173, 5, 178, 244,
+ 32, 173, 5, 174, 0, 32, 173, 5, 178, 254,
174, 0
};
@@ -579,41 +579,41 @@ static const short yyrhs[] = { 183,
#if YYDEBUG != 0
static const short yyrline[] = { 0,
- 143, 145, 146, 153, 161, 175, 187, 189, 192, 194,
- 195, 196, 199, 205, 210, 211, 212, 215, 219, 222,
- 228, 233, 239, 247, 252, 256, 262, 267, 271, 276,
- 280, 283, 288, 292, 296, 300, 305, 309, 312, 316,
- 320, 324, 328, 332, 336, 339, 343, 346, 350, 353,
- 362, 366, 372, 374, 375, 376, 377, 378, 379, 380,
- 381, 382, 383, 385, 386, 389, 394, 404, 409, 415,
- 420, 421, 422, 423, 424, 425, 426, 427, 428, 429,
- 430, 431, 434, 437, 441, 447, 453, 456, 460, 466,
- 472, 475, 479, 485, 491, 494, 498, 506, 512, 515,
- 519, 527, 533, 536, 540, 548, 554, 557, 561, 573,
- 579, 582, 586, 598, 604, 607, 611, 623, 629, 632,
- 636, 649, 655, 658, 662, 675, 681, 684, 688, 701,
- 713, 729, 741, 750, 762, 770, 782, 790, 802, 810,
- 822, 830, 842, 854, 873, 886, 904, 921, 942, 959,
- 980, 997, 1018, 1035, 1056, 1077, 1103, 1120, 1141, 1158,
- 1181, 1206, 1235, 1260, 1289, 1314, 1345, 1358, 1383, 1394,
- 1400, 1419, 1430, 1438, 1444, 1450, 1469, 1475, 1491, 1498,
- 1504, 1510, 1516, 1522, 1541, 1553, 1559, 1578, 1599, 1607,
- 1613, 1619, 1625, 1637, 1643, 1649, 1661, 1667, 1672, 1677,
- 1684, 1686, 1687, 1690, 1695, 1706, 1724, 1739, 1811, 1831,
- 1835, 1854, 1870, 1884, 1909, 1934, 1960, 1965, 1970, 1977,
- 1981, 1991, 1997, 2003, 2007, 2011, 2015, 2019, 2024, 2031,
- 2035, 2040, 2058, 2068, 2086, 2103, 2120, 2141, 2161, 2181,
- 2198, 2222, 2235, 2237, 2238, 2239, 2240, 2243, 2245, 2246,
- 2247, 2248, 2249, 2250, 2251, 2252, 2259, 2260, 2261, 2262,
- 2263, 2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2272,
- 2273, 2274, 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2282,
- 2283, 2284, 2285, 2286, 2287, 2288, 2289, 2290, 2295, 2300,
- 2304, 2316, 2334, 2346, 2364, 2376, 2396, 2417, 2441, 2462,
- 2486, 2507, 2532, 2539, 2552, 2559, 2563, 2567, 2571, 2576,
- 2581, 2585, 2589, 2593, 2625, 2662, 2666, 2671, 2675, 2680,
- 2684, 2688, 2694, 2700, 2706, 2710, 2716, 2731, 2738, 2744,
- 2753, 2765, 2769, 2777, 2790, 2795, 2799, 2804, 2809, 2828,
- 2833, 2854, 2863, 2869, 2874, 2878
+ 144, 146, 147, 154, 162, 176, 188, 190, 193, 195,
+ 196, 197, 200, 206, 211, 212, 213, 216, 220, 223,
+ 229, 234, 240, 248, 253, 257, 263, 268, 272, 277,
+ 281, 284, 289, 293, 297, 301, 306, 310, 313, 317,
+ 321, 325, 329, 333, 337, 340, 344, 347, 351, 354,
+ 363, 367, 373, 375, 376, 377, 378, 379, 380, 381,
+ 382, 383, 384, 385, 386, 389, 394, 423, 428, 434,
+ 439, 440, 441, 442, 443, 444, 445, 446, 447, 448,
+ 449, 450, 453, 456, 460, 466, 472, 475, 479, 485,
+ 491, 494, 498, 504, 510, 513, 517, 525, 531, 534,
+ 538, 546, 552, 555, 559, 567, 573, 576, 580, 592,
+ 598, 601, 605, 617, 623, 626, 630, 642, 648, 651,
+ 655, 668, 674, 677, 681, 694, 700, 703, 707, 720,
+ 732, 748, 760, 769, 781, 789, 801, 809, 821, 829,
+ 841, 849, 861, 873, 892, 905, 923, 940, 961, 978,
+ 999, 1016, 1037, 1054, 1075, 1096, 1122, 1139, 1160, 1177,
+ 1200, 1225, 1254, 1279, 1308, 1333, 1364, 1377, 1402, 1413,
+ 1419, 1438, 1449, 1457, 1463, 1469, 1488, 1494, 1510, 1517,
+ 1523, 1529, 1535, 1541, 1560, 1572, 1578, 1597, 1618, 1626,
+ 1632, 1638, 1644, 1656, 1662, 1668, 1680, 1686, 1691, 1696,
+ 1703, 1705, 1706, 1709, 1714, 1725, 1743, 1758, 1830, 1850,
+ 1854, 1873, 1889, 1903, 1928, 1953, 1979, 1984, 1989, 1996,
+ 2000, 2010, 2016, 2022, 2026, 2030, 2034, 2038, 2043, 2050,
+ 2054, 2059, 2077, 2087, 2105, 2122, 2139, 2160, 2180, 2200,
+ 2217, 2241, 2254, 2256, 2257, 2258, 2259, 2262, 2264, 2265,
+ 2266, 2267, 2268, 2269, 2270, 2271, 2278, 2279, 2280, 2281,
+ 2282, 2283, 2284, 2285, 2286, 2287, 2288, 2289, 2290, 2291,
+ 2292, 2293, 2294, 2295, 2296, 2297, 2298, 2299, 2300, 2301,
+ 2302, 2303, 2304, 2305, 2306, 2307, 2308, 2309, 2314, 2319,
+ 2323, 2335, 2353, 2365, 2383, 2395, 2415, 2436, 2460, 2481,
+ 2505, 2526, 2551, 2558, 2571, 2578, 2582, 2586, 2590, 2595,
+ 2600, 2604, 2608, 2612, 2644, 2681, 2685, 2690, 2694, 2699,
+ 2703, 2707, 2713, 2719, 2725, 2729, 2735, 2750, 2757, 2763,
+ 2772, 2784, 2788, 2796, 2809, 2814, 2818, 2823, 2828, 2847,
+ 2852, 2873, 2882, 2888, 2893, 2897
};
#endif
@@ -912,342 +912,342 @@ static const short yydefgoto[] = { 1565,
static const short yypact[] = { 432,
-32768,-32768, -115,-32768, 44, 2780, 1830, 50, 52, 104,
- 135, 144, 159, 164, -73, -52, 34,-32768,-32768,-32768,
--32768, 218, 1572, 59, 264, -87, 82, 105, -37, -39,
- 121, 129, 8, 138, 285, 286, 290, 272, 330, 370,
- 202, 94, 94, 214, 357, 219, 295, 246, 369, 425,
- 249, 261, -30, 2,-32768, 265,-32768, 435,-32768, 451,
- 460, 429,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768, 254,-32768, 302, 327,
- 331, 338, 348, 359, 366, 367, 387, 389, 393, 394,
- 395, 396, 400, 402, 403, 407, 418, 433, 434, 1830,
+ 159, 164, 170, 172, -73, -52, -17,-32768,-32768,-32768,
+-32768, 201, 1572, 51, 226, -87, 82, 97, -37, -38,
+ 105, 110, 260, 138, 285, 295, 320, 272, 319, 370,
+ 191, 94, 94, 202, 357, 214, 337, 219, 400, 406,
+ 323, 255, -30, 2,-32768, 261,-32768, 419,-32768, 434,
+ 437, 417,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768, 254,-32768, 291, 302,
+ 338, 348, 362, 369, 394, 396, 402, 403, 407, 418,
+ 433, 435, 436, 443, 444, 445, 446, 447, 448, 1830,
1830, 1830, 1830, 1664,-32768,-32768, 2818,-32768,-32768,-32768,
--32768,-32768, 436, 436, 537,-32768,-32768, 1830, 443, 1830,
- 1830, 1830, 1830, 590, 602, 1830, 17, 1029, 606, 538,
--32768, 1830, 1830, 1830, 1830, 444, 1830, 1830, 445, 1830,
- 1830, 1830, 778, 1830, 440, 447, 448, 778, 446, 449,
- 450, 453, 456, 457, 458, 94, 468, 94, 94, 1830,
- 1830, -133,-32768, -100, 94, 469, 471, 472,-32768, 778,
--32768,-32768, -2, 778, 778, 1830, -68, 1830, 536, 1830,
- 1830,-32768, 618,-32768, 479,-32768,-32768, 1830, 10, 1830,
+-32768,-32768, 449, 449, 462,-32768,-32768, 1830, 450, 1830,
+ 1830, 1830, 1830, 537, 590, 1830, 19, 1029, 601, 568,
+-32768, 1830, 1830, 1830, 1830, 451, 1830, 1830, 452, 1830,
+ 1830, 1830, 778, 1830, 466, 453, 455, 778, 469, 471,
+ 456, 457, 458, 478, 479, 94, 476, 94, 94, 1830,
+ 1830, -133,-32768, -100, 94, 477, 481, 482,-32768, 778,
+-32768,-32768, -2, 778, 778, 1830, -68, 1830, 526, 1830,
+ 1830,-32768, 649,-32768, 489,-32768,-32768, 1830, 10, 1830,
1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830,
1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830,
- 481, 481, 481, 5757, 1830, 1830, 1830, 1830, 1830, 1830,
+ 491, 491, 491, 5757, 1830, 1830, 1830, 1830, 1830, 1830,
1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1664,
- 482, 487, 488, 489, 490, 494, 495, 496, 501, 502,
- 525, 529, 530, 531, 554, 555, 556, 557, 558, 559,
- 561, 563, 564, 565, 566, 568, 569, 570, 571, 572,
- 651, 562, 576, 573, 1117, 747, 1162, 1368, 1552, 1599,
--32768,-32768, 5582, 111, 578, 577,-32768, 1830, 1830,-32768,
- -75, 5780, 2862, 5803, 5826, 1830, 5849, 2885, 1830, 2908,
- 5872, 5895, 273, 1877, 7275, 748, 5918, 1830, 1830, 1830,
- 761, 1830, 1830, 1830, 1830, 1830, 1830, 1830, -96, 13,
--32768,-32768, 3341, 3362, 94, 94, 424, 424, -93, 1830,
- 1830, 1830, 2711, 31, 2728, 94,-32768, 762, 763, 5941,
- 689, 1830, 5964, 593, 1311, 5987,-32768, 1830, 5607, 236,
- 598, 6010, 6033, 6056, 6079, 6102, 6125, 6148, 6171, 6194,
+ 494, 495, 496, 501, 502, 525, 529, 530, 531, 554,
+ 555, 556, 557, 558, 559, 561, 563, 564, 565, 566,
+ 569, 570, 571, 572, 577, 578, 579, 580, 581, 582,
+ 735, 591, 594, 592, 1117, 736, 1162, 1368, 1552, 1599,
+-32768,-32768, 5582, 111, 596, 595,-32768, 1830, 1830,-32768,
+ -6, 5780, 2862, 5803, 5826, 1830, 5849, 2885, 1830, 2908,
+ 5872, 5895, 273, 1877, 7229, 766, 5918, 1830, 1830, 1830,
+ 767, 1830, 1830, 1830, 1830, 1830, 1830, 1830, -93, 13,
+-32768,-32768, 3341, 3362, 94, 94, 424, 424, -91, 1830,
+ 1830, 1830, 2711, 31, 2728, 94,-32768, 770, 772, 5941,
+ 698, 1830, 5964, 604, 1311, 5987,-32768, 1830, 5607, 315,
+ 610, 6010, 6033, 6056, 6079, 6102, 6125, 6148, 6171, 6194,
6217, 6240, 3383, 6263, 6286, 6309, 6332, 6355, 6378, 3404,
3425, 3446,-32768, 2465, 1278, 423, 439, 439, 155, 155,
- 155, 155, -145, -131, 481, 481, 481, 481, 2931, 769,
- 772, 774, 775, 780, 781, 804, 805, 806, 807, 808,
- 809, 810, 811, 812, 813, 814, 816, 817, 818, 819,
- 820, 821, 652, 822, 823, 826, 828, 833, 832,-32768,
- -26, 834, 835, 837,-32768, -6,-32768,-32768,-32768,-32768,
- 115, 667, 984, 984, 1830, 1830, 841, 842, 1830, 839,
- 281, 281, 843, 1830, 831, 846, 847, 848, 6401, 849,
- 851, 6424, 854, 855, 859, 326, 282, 2499,-32768, -103,
- 1830, 860, 2946, 6447, 6470, 1830, 2969, 2992, 6493, 6516,
- 6539, 6562, 6585, 94,-32768, 678, 1830, 1830,-32768,-32768,
--32768, 688, 2841,-32768, 690, 1830, 3467, 3488, 3509,-32768,
--32768,-32768, 1830,-32768, -98, 567, 692, 693, 866, 701,
- 6608, 869, 1830, 1830,-32768, 6631, 315,-32768,-32768, 1830,
+ 155, 155, -138, -27, 491, 491, 491, 491, 2931, 781,
+ 804, 805, 806, 807, 808, 809, 810, 811, 812, 813,
+ 814, 816, 817, 818, 819, 820, 821, 822, 823, 826,
+ 828, 831, 706, 833, 834, 836, 837, 840, 842,-32768,
+ 116, 843, 846, 844,-32768, 148,-32768,-32768,-32768,-32768,
+ 115, 667, 984, 984, 1830, 1830, 847, 848, 1830, 851,
+ 281, 281, 850, 1877, 853, 856, 859, 860, 6401, 861,
+ 864, 6424, 865, 866, 867, 326, 282, 2499,-32768, -130,
+ 1830, 869, 2946, 6447, 6470, 1830, 2969, 2992, 6493, 6516,
+ 6539, 6562, 6585, 94,-32768, 682, 1830, 1830,-32768,-32768,
+-32768, 692, 2841,-32768, 697, 1830, 3467, 3488, 3509,-32768,
+-32768,-32768, 1830,-32768, -98, 567, 699, 700, 873, 708,
+ 6608, 875, 1830, 1830,-32768, 6631, 331,-32768,-32768, 1830,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
-32768, 1830,-32768,-32768,-32768,-32768,-32768,-32768, 1830, 1830,
- 1830, 1830, 732, 700, 702, 703, 704, 707, 708, 709,
- 710, 711, 712, 713, 714, 715, 716, 718, 720, 721,
- 723, 724, 725, 726, 727, 728, 730, 731, 733, 734,
- 735, 739, 740,-32768, 874, 736,-32768, 741,-32768, 1830,
- 1830, 1830, 1830, 1830, 1830, 914, 916, 293, 917, 984,
+ 1830, 1830, 740, 709, 710, 711, 712, 713, 714, 715,
+ 716, 718, 720, 721, 723, 724, 725, 726, 727, 728,
+ 730, 731, 732, 733, 734, 739, 741, 742, 744, 745,
+ 746, 748, 750,-32768, 881, 755,-32768, 752,-32768, 1877,
+ 1830, 1830, 1830, 1830, 1830, 907, 912, 293, 925, 984,
984, 1830, 1855, 4, 1870, 43, 1958, 68, 1973, 1988,
--32768,-32768, 5632, 919,-32768, 6654, 94,-32768, 778, 778,
- 921, 778,-32768, 922,-32768, 778, 778,-32768, 1606, 1830,
- 1905,-32768, 2031, 745, 923, 924, 925, 894, 926, 927,
- 928, 929, 930, 931, 935, -91, 1830, 3530, 3551,-32768,
--32768, 3015, 94, 94, 94, 2046,-32768, 770, 776, 777,
- 783, 785, 786, 787, 788, 789, 790, 791, 792, 939,
+-32768,-32768, 5632, 926,-32768, 150, 94,-32768, 778, 778,
+ 927, 778,-32768, 928,-32768, 778, 778,-32768, 1606, 1830,
+ 1905,-32768, 2031, 753, 929, 930, 931, 894, 935, 936,
+ 938, 940, 941, 942, 943, -79, 1830, 3530, 3551,-32768,
+-32768, 3015, 94, 94, 94, 2046,-32768, 780, 783, 785,
+ 786, 787, 788, 789, 790, 791, 792, 845, 858, 948,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768, 1830, 1830, 778, 1830, 940, 778, 2557, 944,
- 941,-32768,-32768, 5657, 6677, 6700, 6723, 6746, 7275, 838,
- 950, 1830, 1830, 94, 951, 975, 825, 977, 978, 778,
- 778, 979, 94, 980, 981, 778, 778, 982, 987, 989,
- 1012, 1013, 778, 408, 778, 1014, 1015, 1026, 1016, 1033,
--32768, 1031, 436, 6769, 2068, 2083, 2098, 2149, 2164,-32768,
--32768, 21,-32768, 3314,-32768,-32768,-32768,-32768,-32768,-32768,
--32768,-32768, 861, 0, 1034, 106, 9, 1035, 778, 1036,
- 778, 1045, 1055,-32768, 2572, 296, 2499,-32768,-32768, 1830,
- 778, 778, 778,-32768, 483, 778, 778, 778, 778, 778,
- 778, 778, 1830, 5682, 1830, 1830, 853, -127, -123, -120,
+-32768,-32768, 1830, 1830, 778, 1830, 971, 778, 2557, 944,
+ 972,-32768,-32768, 5657, 6654, 6677, 6700, 6723, 7229, 839,
+ 978, 1830, 1830, 94, 979, 980, 825, 981, 982, 778,
+ 778, 987, 94, 989, 1012, 778, 778, 1013, 1014, 1016,
+ 1017, 1033, 778, 408, 778, 1034, 1027, 1035, 1036, 1038,
+-32768, 1032, 449, 231, 2068, 2083, 2098, 2149, 2164,-32768,
+-32768, 14,-32768, 3314,-32768,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768, 874, 0, 1055, 106, 9, 1058, 778, 1059,
+ 778, 1061, 1062,-32768, 2572, 296, 2499,-32768,-32768, 1830,
+ 778, 778, 778,-32768, 39, 778, 778, 778, 778, 778,
+ 778, 778, 1830, 5682, 1830, 1830, 863, -127, -123, -120,
-32768, 1188, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830,
- 1830, 1830, 1830, 1830,-32768, 3572, 3593, 1058, 6792, -56,
- 956, 1830, 1830,-32768, 1830, 888,-32768,-32768,-32768,-32768,
- 1830, 840, 3614, 3635, -72, 889, 896, 890, 897, 899,
- 898, 900, 904, -18, 905, 901, 910, 907, 908, 911,
- 912, 913, 915, 920,-32768,-32768,-32768,-32768,-32768, 933,
- 934, 936, 937, 942, 945, 943,-32768, 946,-32768,-32768,
--32768,-32768,-32768,-32768, 236, 938, 22, 948, 1933, 1082,
--32768,-32768,-32768, 94,-32768, 1095,-32768, 1116,-32768,-32768,
- 1830, 1634, 3656, 1132, 1134, 1135, 1830, 1830, 1137, 1138,
- 1142, 1143, 1144, 1145, 1147, 3038, 983, 6815, 1044, 424,
- 94, 1148, 94, 1149, 94, 3, 1150, 3677, 3698, 3719,
+ 1830, 1830, 1830, 1830,-32768, 3572, 3593, 1064, 6746, -50,
+ 988, 1830, 1830,-32768, 1830, 895,-32768,-32768,-32768,-32768,
+ 1830, 897, 3614, 3635, -96, 899, 904, 905, 908, 906,
+ 911, 910, 913, 112, 915, 916, 920, 923, 933, 934,
+ 937, 946, 947, 939,-32768,-32768,-32768,-32768,-32768, 960,
+ 962, 963, 965, 966, 945, 970,-32768, 973,-32768,-32768,
+-32768,-32768,-32768,-32768, 315, 914, 22, 909, 1933, 1108,
+-32768,-32768,-32768, 94,-32768, 1114,-32768, 1115,-32768,-32768,
+ 1830, 1634, 3656, 1116, 1143, 1144, 1830, 1830, 1147, 1148,
+ 1149, 1150, 1152, 1153, 1154, 3038, 985, 6769, 1044, 424,
+ 94, 1155, 94, 1160, 94, 3, 1161, 3677, 3698, 3719,
3740, 3761, 3782, 3803, 3824, 3845, 3866, 3887, 3908, 1830,
- 1830,-32768, 1151, 778, 778, 1076, 778, 364, 6838, 224,
- 1157, 1664, 1159, 1830, 778, 1160, 1164, 1163, 1008, 1167,
- 408, 1168, 1172, 1830, 1170, 1175, 1174, 1205, 1211, 408,
- 1830, 1830, 1830, 778, 1212, 1214, 408, 1830, 1216, 1217,
- 1215, 1830, 436, 1830, 251, 1221, 1139, 196, 3929,-32768,
- 114,-32768,-32768, 7275,-32768, 1830,-32768,-32768,-32768, 2207,
- 2259,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 1050, 1242,
--32768, 1830,-32768, 1067, -74,-32768, -54,-32768, 112,-32768,
- 18,-32768, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830,
- 1830, 1830, 1830, 1830, 3950, 3971, -56, 148,-32768, 154,
- 1069, 1169, 1830,-32768,-32768, 1244, 368, 1664, 1077, 3992,
- 1074,-32768, 1089,-32768, 1096,-32768, 1110,-32768, 1107, 6861,
--32768, 1108,-32768,-32768, 1113, 1114, 6884, 4013, 6907, 1112,
--32768, 1118, 1119, 4034, 1120, 1121,-32768, 4055, 1133, 5707,
- 696, 984, 984, 1830, 1830, 1830, 1830, 1, 1152, 1830,
+ 1830,-32768, 1165, 778, 778, 1086, 778, 364, 6792, 224,
+ 1169, 1664, 1171, 1830, 778, 1170, 1172, 1174, 1047, 1208,
+ 408, 1211, 1175, 1830, 1212, 1216, 1214, 1215, 1220, 408,
+ 1830, 1830, 1830, 778, 1222, 1226, 408, 1830, 1243, 1244,
+ 1242, 1830, 449, 1830, 251, 1245, 1166, 196, 3929,-32768,
+ 114,-32768,-32768, 7229,-32768, 1830,-32768,-32768,-32768, 2207,
+ 2259,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 1070, 1247,
+-32768, 1830,-32768, 1087, -74,-32768, -61,-32768, -54,-32768,
+ 15,-32768, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830,
+ 1830, 1830, 1830, 1830, 3950, 3971, -50, 252,-32768, 154,
+ 1095, 1204, 1830,-32768,-32768, 1279, 334, 1664, 1112, 3992,
+ 1109,-32768, 1110,-32768, 1113,-32768, 1118,-32768, 1119, 6815,
+-32768, 1120,-32768,-32768, 1121, 1122, 6838, 4013, 6861, 1133,
+-32768, 1138, 1156, 4034, 1151, 1157,-32768, 4055, 1158, 5707,
+ 696, 984, 984, 1830, 1830, 1830, 1830, 1, 1163, 1830,
1830,-32768, 4076,-32768,-32768, 424,-32768, 2804,-32768, 1830,
- 1830, 1830, 1285, 1115, -42,-32768, 4097, 4118, 4139, 4160,
+ 1830, 1830, 1284, 1159, -41,-32768, 4097, 4118, 4139, 4160,
4181, 4202, 4223, 4244, 4265, 4286, 4307, 4328, 1830, 1830,
- 1213,-32768, 778,-32768, 778, 1830, 3061,-32768,-32768,-32768,
- 2435, 1291, -56, 408, 1309, 1830, 1324, 408, 1325, 1329,
- 1327, 1330, 1331, 1830, 1332, 778, 1333, 1334, 1830, 1340,
- 1338, 1830, 1341, 1158, 1339, 2274, 126, 2289, 141, 2325,
- 145, 2340, 2368, 2383, 2398, 1171, 0, 1343, 1356, 3084,
- 4349, 1342, 1182, 1830,-32768, 3107, 3130, 3153,-32768, 778,
- 1358,-32768, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830,
- 1830, 1830, 1830, 1830, 3176, 3199, 1186,-32768, 1191, 2450,
--32768, 1830,-32768, 1192, 1193, 1194, 4370,-32768, 1199,-32768,
- 1201,-32768,-32768,-32768, 6930,-32768, 1198,-32768,-32768, 6953,
- 1203,-32768, 6976, 1200, 1362,-32768,-32768,-32768,-32768,-32768,
--32768,-32768,-32768,-32768,-32768,-32768, 1316,-32768, 179,-32768,
--32768,-32768, 1830, 1202,-32768, 3222, 1376, 1377, 25, 1207,
+ 1210,-32768, 778,-32768, 778, 1830, 3061,-32768,-32768,-32768,
+ 2435, 1288, -50, 408, 1329, 1830, 1327, 408, 1331, 1332,
+ 1333, 1337, 1338, 1830, 1339, 778, 1340, 1341, 1830, 1345,
+ 1343, 1830, 1355, 1185, 1358, 2274, 126, 2289, 141, 2325,
+ 145, 2340, 2368, 2383, 2398, 1189, 0, 1359, 1365, 3084,
+ 4349, 1366, 1190, 1830,-32768, 3107, 3130, 3153,-32768, 778,
+ 1367,-32768, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830,
+ 1830, 1830, 1830, 1830, 3176, 3199, 1193,-32768, 1197, 2450,
+-32768, 1830,-32768, 1198, 1199, 1200, 4370,-32768, 1205,-32768,
+ 1206,-32768,-32768,-32768, 6884,-32768, 1207,-32768,-32768, 6907,
+ 1209,-32768, 6930, 1223, 1378,-32768,-32768,-32768,-32768,-32768,
+-32768,-32768,-32768,-32768,-32768,-32768, 1323,-32768, 189,-32768,
+-32768,-32768, 1830, 1224,-32768, 3222, 1381, 1382, 25, 1225,
-32768, 4391, 4412, 4433, 4454, 4475, 4496, 4517, 4538, 4559,
- 6999, 7022, 7045, 1380, 1381, 778, 778,-32768, 1664, 408,
- 408, 408, 408, 1382, 1386, 1387, 408, 1388, 1395, 1396,
- 1398, 368, 1229, 0,-32768, 2833, 1400,-32768,-32768,-32768,
--32768, 18, 778, 1830, 1830, 1830, 1830, 1830, 1830, 1830,
- 1830, 1830,-32768,-32768,-32768,-32768,-32768, 1228, 1227, 1664,
- 1231, 1232, 1237, 1238,-32768,-32768,-32768, 1235,-32768,-32768,
--32768, 1236, 1830,-32768, 1830,-32768, 1239, -41, 1241, 4580,
- 4601, 4622, 4643, 4664, 4685, 4706, 4727, 4748, 1243, 1256,
- 1266, 778, 1335, 2525, 408, 408, 1410, 1414, 408, 1416,
- 5732, 3245, 1441, 1442, 778, 1830, 1830, 1830, 1830, 1830,
- 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1267, 1270, 1830,
- 1280, 1282,-32768,-32768, 1288, 1294, 1301,-32768, 1302,-32768,
- 1304, 4769, 4790, 4811, 4832, 4853, 4874, 4895, 4916, 4937,
- 180, 7275, 189, 7275, 231, 7275, 1405, 1830, 1664, 408,
- 778, 1480, 1481, 1404, 1483, 1484, 1830, 1830, 1830, 1830,
- 1830, 1830, 1830, 1830, 1830, 1830, 1485, 1830, 1486, 1830,
- 1493, 1321, 4958, 1664, 1323, 1326,-32768,-32768,-32768,-32768,
--32768, 4979, 5000, 5021, 5042, 5063, 5084, 7068, 7091, 7114,
- 7275,-32768, 7275,-32768, 7275,-32768, 1830, 1830, 5105, 408,
+ 6953, 6976, 6999, 1386, 1387, 778, 778,-32768, 1664, 408,
+ 408, 408, 408, 1388, 1398, 1399, 408, 1400, 1401, 1403,
+ 1405, 334, 1236, 0,-32768, 2833, 1407,-32768,-32768,-32768,
+-32768, 15, 778, 1830, 1830, 1830, 1830, 1830, 1830, 1830,
+ 1830, 1830,-32768,-32768,-32768,-32768,-32768, 1235, 1234, 1664,
+ 1237, 1238, 1246, 1248,-32768,-32768,-32768, 1239,-32768,-32768,
+-32768, 1241, 1830,-32768, 1830,-32768, 1257, -40, 1267, 4580,
+ 4601, 4622, 4643, 4664, 4685, 4706, 4727, 4748, 1268, 1269,
+ 1270, 778, 1380, 2525, 408, 408, 1415, 1440, 408, 1453,
+ 5732, 3245, 1457, 1462, 778, 1830, 1830, 1830, 1830, 1830,
+ 1830, 1830, 1830, 1830, 1830, 1830, 1830, 1298, 1303, 1830,
+ 1306, 1307,-32768,-32768, 1312, 1313, 1314,-32768, 1308,-32768,
+ 1309, 4769, 4790, 4811, 4832, 4853, 4874, 4895, 4916, 4937,
+ 278, 7229, 294, 7229, 303, 7229, 1410, 1830, 1664, 408,
+ 778, 1486, 1493, 1416, 1495, 1496, 1830, 1830, 1830, 1830,
+ 1830, 1830, 1830, 1830, 1830, 1830, 1497, 1830, 1498, 1830,
+ 1499, 1328, 4958, 1664, 1330, 1336,-32768,-32768,-32768,-32768,
+-32768, 4979, 5000, 5021, 5042, 5063, 5084, 7022, 7045, 7068,
+ 7229,-32768, 7229,-32768, 7229,-32768, 1830, 1830, 5105, 408,
778, 1830, 1830, 1830, 1830, 1830, 1830,-32768,-32768,-32768,
- 5120, 3268, 1355, 1328, 1336, 5141, 5162, 5183, 5204, 5225,
- 5246, 1337, 1346, 1357, 1830, 1497,-32768, 778, 408, 1830,
+ 5120, 3268, 1362, 1347, 1357, 5141, 5162, 5183, 5204, 5225,
+ 5246, 1363, 1364, 1370, 1830, 1500,-32768, 778, 408, 1830,
1830, 1830, 1830, 1830, 1830, 1830, 1830, 1830, 3291,-32768,
- 1363, 1344, 5267, 5288, 5309, 5330, 5351, 5372, 248, 7275,
- 278, 7275, 294, 7275, 1499, 778, 1501, 1830, 1830, 1830,
- 1830, 1830, 1830, 1830, 1502, 1830, 1503, 1830, 1513,-32768,
- 1364,-32768, 5393, 5414, 5435, 7137, 7160, 7183, 7275,-32768,
- 7275,-32768, 7275,-32768, 778, 1830, 1830, 1830,-32768,-32768,
--32768, 1365, 5456, 5477, 5498, 1366, 1370, 1372, 778, 1830,
- 1830, 1830, 1830, 1830, 1830, 1369, 5519, 5540, 5561, 303,
- 7275, 312, 7275, 317, 7275, 408, 1830, 1830, 1830, 1830,
- 1529, 1830, 1538, 1830, 1546, 1379, 7206, 7229, 7252, 7275,
--32768, 7275,-32768, 7275,-32768, 1548,-32768,-32768,-32768,-32768,
- 1383, 1384, 1385, 1830, 1830, 1830, 318, 7275, 323, 7275,
- 353, 7275, 1830, 1549, 1830, 1550, 1830, 1554, 7275,-32768,
- 7275,-32768, 7275,-32768, 1561, 1565,-32768
+ 1369, 1342, 5267, 5288, 5309, 5330, 5351, 5372, 312, 7229,
+ 317, 7229, 318, 7229, 1512, 778, 1513, 1830, 1830, 1830,
+ 1830, 1830, 1830, 1830, 1530, 1830, 1535, 1830, 1538,-32768,
+ 1373,-32768, 5393, 5414, 5435, 7091, 7114, 7137, 7229,-32768,
+ 7229,-32768, 7229,-32768, 778, 1830, 1830, 1830,-32768,-32768,
+-32768, 1374, 5456, 5477, 5498, 1375, 1376, 1377, 778, 1830,
+ 1830, 1830, 1830, 1830, 1830, 1383, 5519, 5540, 5561, 353,
+ 7229, 354, 7229, 359, 7229, 408, 1830, 1830, 1830, 1830,
+ 1539, 1830, 1547, 1830, 1554, 1389, 7160, 7183, 7206, 7229,
+-32768, 7229,-32768, 7229,-32768, 1556,-32768,-32768,-32768,-32768,
+ 1385, 1390, 1391, 1830, 1830, 1830, 360, 7229, 382, 7229,
+ 388, 7229, 1830, 1559, 1830, 1560, 1830, 1561, 7229,-32768,
+ 7229,-32768, 7229,-32768, 1568, 1571,-32768
};
static const short yypgoto[] = {-32768,
-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
- 947,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768,
+ 951,-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, 1560, 1562,
- -311, 7, 1563,-32768,-32768,-32768,-32768, 325, -1052,-32768,
--32768, -859, -7,-32768, 969, -10,-32768, -113,-32768, -976,
- 676, 484,-32768, -1105,-32768,-32768,-32768
+-32768,-32768,-32768,-32768,-32768,-32768,-32768,-32768, 1566, 1567,
+ -311, -21, 1597,-32768,-32768,-32768,-32768, 332, -1052,-32768,
+-32768, -859, -7,-32768, 1005, -10,-32768, -113,-32768, -976,
+ 717, 484, -422, -1090,-32768,-32768,-32768
};
-#define YYLAST 7447
+#define YYLAST 7401
static const short yytable[] = { 104,
263, 326, 1132, 838, 1116, 179, 475, 177, 970, 716,
- 1071, 1188, 331, 340, 843, 128, 465, 1053, 1053, 139,
- 274, 136, 1054, 1054, 835, 935, 229, 7, 315, 316,
- 1241, 162, 164, -254, 315, 316, 482, 483, 315, 316,
- 229, 315, 316, -1, 8, 317, 9, -253, 718, 143,
+ 1071, 586, 331, 340, 843, 128, 465, 835, 1053, 1053,
+ 139, 136, 274, 1054, 1054, 935, 1188, 7, 315, 316,
+ 1241, 162, 164, 229, 315, 316, 482, 483, 315, 316,
+ -254, 315, 316, -1, 8, 317, 9, 601, 718, 602,
871, 1007, 872, 844, 873, 106, 874, 875, 107, 876,
1016, 315, 316, 315, 316, 315, 316, 1023, 315, 316,
- 315, 316, 341, 720, 601, 466, 602, 1053, 318, 275,
- 627, 464, 1054, 836, 476, 132, 753, 315, 316, 315,
- 316, 133, 211, 212, 213, 214, 230, 157, 433, 113,
- 276, 906, 434, 1050, 332, 936, 1154, 315, 316, 108,
- 265, 842, 267, 268, 269, 270, 894, 422, 273, 1042,
- 114, 561, 895, 1051, 282, 283, 284, 285, 1274, 287,
- 288, 1178, 290, 291, 292, 137, 297, 1131, 1304, 140,
- 109, 138, 178, 315, 316, 309, 1180, 554, 312, 110,
- 1182, 555, 313, 314, 319, 915, 10, 11, 12, 13,
- 14, 15, 16, 17, 111, 315, 316, 559, 330, 112,
- 333, 560, 335, 336, 180, 323, 327, 325, 839, 1117,
+ 315, 316, 341, 720, 1053, 466, 836, 906, 318, 1054,
+ 627, 275, 315, 316, 464, 132, 476, 315, 316, 857,
+ 858, 133, 211, 212, 213, 214, 230, 157, 753, 113,
+ 315, 316, 276, 1050, 332, 936, 1154, 315, 316, 108,
+ 265, 842, 267, 268, 269, 270, 1051, 422, 273, 1042,
+ 114, 561, 894, 1052, 282, 283, 284, 285, 895, 287,
+ 288, 1178, 290, 291, 292, 137, 297, 704, 1131, 1304,
+ 140, 138, 178, 1274, 229, 309, 1180, 323, 312, 325,
+ 1182, -253, 313, 314, 319, 115, 10, 11, 12, 13,
+ 14, 15, 16, 17, 109, 315, 316, 433, 330, 110,
+ 333, 434, 335, 336, 180, 111, 327, 112, 839, 1117,
339, 971, 342, 343, 344, 345, 346, 347, 348, 349,
350, 351, 352, 353, 354, 355, 356, 357, 358, 359,
- 360, 361, 362, 1242, 315, 316, 115, 364, 365, 366,
+ 360, 361, 362, 1242, 315, 316, 116, 364, 365, 366,
367, 368, 369, 370, 371, 372, 373, 374, 375, 376,
- 377, 378, 379, 116, 1155, 1132, 76, 293, 1159, 315,
- 316, 130, 78, 79, 80, 81, 82, 83, 84, 85,
+ 377, 378, 379, 130, 1155, 1132, 76, 293, 1159, 315,
+ 316, 131, 78, 79, 80, 81, 82, 83, 84, 85,
86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
96, 97, 98, 99, 134, 158, 159, 1031, 423, 424,
- 425, 426, 562, 563, 564, 565, 160, 315, 316, 131,
- 431, 432, 161, 315, 316, 315, 316, 135, 439, 427,
- 428, 442, 174, 566, 567, 175, 448, 315, 316, 1052,
- 453, 454, 455, 141, 457, 458, 459, 460, 461, 462,
- 463, 142, 315, 316, 469, 470, 315, 316, 148, 149,
+ 425, 426, 562, 563, 564, 565, 160, 315, 316, 135,
+ 431, 432, 161, 315, 316, 315, 316, 141, 439, 427,
+ 428, 442, 142, 566, 567, 915, 448, 315, 316, 554,
+ 453, 454, 455, 555, 457, 458, 459, 460, 461, 462,
+ 463, 143, 315, 316, 469, 470, 315, 316, 148, 149,
144, 150, 477, 478, 479, 485, 278, 279, 226, 227,
- 228, 1072, 145, 146, 491, 1073, 229, 147, 76, 77,
- 496, 1073, 170, 1074, 78, 79, 80, 81, 82, 83,
+ 228, 559, 145, 725, 491, 560, 229, 601, 76, 77,
+ 496, 1073, 146, 1074, 78, 79, 80, 81, 82, 83,
84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
- 94, 95, 96, 97, 98, 99, 1234, 1366, 1235, 1367,
- 1261, 1262, 1263, 1264, 186, 187, 1368, 1268, 1369, 151,
- 188, 993, 189, 1040, 172, 215, 216, 217, 218, 219,
- 156, 220, 221, 222, 223, 224, 225, 226, 227, 228,
- 166, 102, 165, 167, 168, 229, 103, 169, 1032, 1033,
- 1034, 1035, 294, 152, 498, 499, 153, 154, 1370, 155,
- 1371, 574, 576, 578, 573, 575, 577, 579, 580, 1036,
- 1037, 583, 186, 187, 171, 1464, 586, 1465, 188, 173,
- 189, -7, -7, 176, -7, 1321, 1322, 181, 339, 1325,
- 182, 186, 187, 603, 226, 227, 228, 446, 608, 189,
- 186, 187, 229, 616, 183, 1466, 599, 1467, 189, 618,
- 619, 186, 187, 184, 186, 187, 185, 188, 622, 712,
- 852, 1468, 189, 1469, 190, 626, 41, 42, 43, 44,
- 1520, 46, 1521, 662, 663, 659, 660, 100, 101, 1522,
- 1375, 1523, 664, 102, 1524, 1553, 1525, 1554, 103, 191,
- 1555, 598, 1556, 192, 665, 815, 816, 817, 818, 819,
- 193, 666, 667, 668, 669, 215, 216, 217, 218, 219,
- 194, 220, 221, 222, 223, 278, 279, 226, 227, 228,
- 1557, 195, 1558, 857, 858, 229, 1079, 1080, 196, 197,
- 1414, 264, 281, 994, -7, -7, -7, -7, -7, -7,
- -7, -7, 704, 705, 706, 707, 708, 709, 964, 198,
- 312, 199, 211, 212, 714, 200, 201, 202, 203, 1442,
- 1, 2, 204, 3, 205, 206, 726, 218, 219, 207,
+ 94, 95, 96, 97, 98, 99, 174, 147, 151, 175,
+ 1261, 1262, 1263, 1264, 186, 187, 1234, 1268, 1235, 156,
+ 188, 993, 189, 1040, 170, 215, 216, 217, 218, 219,
+ 165, 220, 221, 222, 223, 224, 225, 226, 227, 228,
+ 166, 102, 169, 167, 168, 229, 103, 171, 1032, 1033,
+ 1034, 1035, 294, 152, 829, 172, 153, 154, 601, 155,
+ 173, 574, 576, 578, 573, 575, 577, 579, 580, 1036,
+ 1037, 583, 186, 187, 182, 1072, 448, 176, 188, 1073,
+ 189, -7, -7, 181, -7, 1321, 1322, 183, 339, 1325,
+ 184, 186, 187, 603, 226, 227, 228, 446, 608, 189,
+ 186, 187, 229, 616, 185, 1366, 599, 1367, 189, 618,
+ 619, 186, 187, 190, 186, 187, 264, 188, 622, 712,
+ 852, 1368, 189, 1369, 191, 626, 41, 42, 43, 44,
+ 1370, 46, 1371, 498, 499, 659, 660, 100, 101, 1464,
+ 1375, 1465, 664, 102, 1466, 1468, 1467, 1469, 103, 662,
+ 663, 598, 1079, 1080, 665, 815, 816, 817, 818, 819,
+ 192, 666, 667, 668, 669, 215, 216, 217, 218, 219,
+ 193, 220, 221, 222, 223, 278, 279, 226, 227, 228,
+ 1520, 1522, 1521, 1523, 194, 229, 1524, 1553, 1525, 1554,
+ 1414, 195, 271, 994, -7, -7, -7, -7, -7, -7,
+ -7, -7, 448, 705, 706, 707, 708, 709, 964, 1555,
+ 312, 1556, 211, 212, 714, 1557, 196, 1558, 197, 1442,
+ 1, 2, 281, 3, 198, 199, 726, 218, 219, 200,
220, 221, 222, 223, 278, 279, 226, 227, 228, 828,
- 208, 339, 735, 737, 229, 271, 220, 221, 222, 223,
- 278, 279, 226, 227, 228, 209, 210, 272, 261, 754,
- 229, 280, 758, 759, 760, 266, 286, 289, 298, 299,
- 300, 334, 304, 337, 302, 305, 296, 303, 306, 307,
- 308, 301, 628, 629, 630, 631, 632, 633, 634, 635,
- 636, 637, 638, 639, 310, 776, 777, 320, 779, 321,
- 322, 338, 229, 324, 380, 410, 1526, 328, 329, 381,
- 382, 383, 384, 795, 793, 794, 385, 386, 387, 76,
- 568, 569, 804, 388, 389, 78, 79, 80, 81, 82,
+ 201, 339, 735, 737, 229, 272, 220, 221, 222, 223,
+ 278, 279, 226, 227, 228, 202, 280, 203, 204, 754,
+ 229, 334, 758, 759, 760, 205, 206, 207, 208, 209,
+ 210, 261, 266, 286, 289, 299, 296, 300, 304, 305,
+ 306, 301, 628, 629, 630, 631, 632, 633, 634, 635,
+ 636, 637, 638, 639, 298, 776, 777, 302, 779, 303,
+ 307, 308, 310, 324, 337, 320, 1526, 328, 329, 321,
+ 322, 338, 229, 795, 793, 794, 380, 381, 382, 76,
+ 568, 569, 804, 383, 384, 78, 79, 80, 81, 82,
83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
- 93, 94, 95, 96, 97, 98, 99, 390, 76, 568,
- 1105, 391, 392, 393, 78, 79, 80, 81, 82, 83,
+ 93, 94, 95, 96, 97, 98, 99, 385, 76, 568,
+ 1105, 386, 387, 388, 78, 79, 80, 81, 82, 83,
84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
- 94, 95, 96, 97, 98, 99, 394, 395, 396, 397,
- 398, 399, 853, 400, 1123, 401, 402, 403, 404, 412,
- 405, 406, 407, 408, 409, 866, 640, 868, 869, 413,
- 414, 416, 429, 430, 451, 878, 879, 880, 881, 882,
- 883, 884, 885, 886, 887, 888, 889, 456, 487, 488,
- 490, 493, 500, 524, 898, 899, 525, 900, 526, 527,
- 76, 293, 547, 902, 528, 529, 78, 79, 80, 81,
+ 94, 95, 96, 97, 98, 99, 389, 390, 391, 392,
+ 393, 394, 853, 395, 1123, 396, 397, 398, 399, 410,
+ 416, 400, 401, 402, 403, 866, 640, 868, 869, 404,
+ 405, 406, 407, 408, 409, 878, 879, 880, 881, 882,
+ 883, 884, 885, 886, 887, 888, 889, 413, 412, 414,
+ 429, 430, 451, 456, 898, 899, 487, 900, 488, 490,
+ 76, 293, 493, 902, 500, 524, 78, 79, 80, 81,
82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 95, 96, 97, 98, 99, 530, 531,
- 532, 533, 534, 535, 536, 537, 538, 539, 540, 1029,
- 541, 542, 543, 544, 545, 546, 548, 549, 570, 571,
- 550, 939, 551, 941, 102, 552, 553, 587, 556, 572,
- 557, 558, 584, 944, 339, 161, 581, 582, 585, 950,
- 951, 588, 617, 589, 590, 592, 593, 570, 571, 595,
- 965, 596, 967, 102, 969, 597, 604, 620, 572, 621,
- 653, 654, 655, 656, 161, 658, 670, 671, 701, 672,
- 673, 674, 985, 986, 675, 676, 677, 678, 679, 680,
- 681, 682, 683, 684, 998, 685, 1000, 686, 687, 744,
- 688, 689, 690, 691, 692, 693, 1010, 694, 695, 702,
- 696, 697, 698, 1017, 1018, 1019, 699, 700, 703, 710,
- 1024, 711, 713, 740, 1028, 724, 1030, 729, 731, 741,
- 742, 743, 746, 747, 748, 749, 750, 751, 1043, 100,
- 101, 752, 763, 745, 775, 102, 780, 785, 764, 765,
- 103, 783, 792, 796, 1048, 766, 294, 767, 768, 769,
- 770, 771, 772, 773, 774, 1057, 1058, 1059, 1060, 1061,
- 1062, 1063, 1064, 1065, 1066, 1067, 1068, 797, 791, 799,
- 800, 803, 805, 806, 809, 1077, 76, 568, 798, 810,
- 1081, 811, 78, 79, 80, 81, 82, 83, 84, 85,
+ 92, 93, 94, 95, 96, 97, 98, 99, 525, 526,
+ 527, 528, 529, 530, 531, 532, 533, 534, 535, 1029,
+ 536, 537, 538, 539, 540, 541, 542, 543, 570, 571,
+ 544, 939, 545, 941, 102, 546, 547, 548, 549, 572,
+ 550, 551, 552, 944, 339, 161, 553, 556, 558, 950,
+ 951, 557, 581, 582, 584, 585, 617, 570, 571, 587,
+ 965, 588, 967, 102, 969, 589, 590, 592, 572, 593,
+ 595, 620, 596, 597, 161, 604, 621, 653, 654, 655,
+ 656, 658, 985, 986, 670, 701, 671, 672, 673, 674,
+ 675, 676, 677, 678, 998, 679, 1000, 680, 681, 744,
+ 682, 683, 684, 685, 686, 687, 1010, 688, 689, 690,
+ 691, 692, 710, 1017, 1018, 1019, 693, 711, 694, 695,
+ 1024, 696, 697, 698, 1028, 699, 1030, 700, 702, 703,
+ 713, 740, 724, 729, 731, 741, 742, 743, 1043, 100,
+ 101, 746, 747, 745, 748, 102, 749, 750, 751, 752,
+ 103, 783, 763, 775, 1048, 764, 294, 765, 766, 767,
+ 768, 769, 770, 771, 772, 1057, 1058, 1059, 1060, 1061,
+ 1062, 1063, 1064, 1065, 1066, 1067, 1068, 780, 785, 791,
+ 792, 796, 797, 799, 800, 1077, 76, 568, 798, 803,
+ 1081, 805, 78, 79, 80, 81, 82, 83, 84, 85,
86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 812, 813, 822, 903, 825, 823,
+ 96, 97, 98, 99, 806, 809, 810, 773, 811, 812,
1107, 1109, 1111, 1106, 1108, 1110, 1112, 1113, 1114, 1115,
- 824, 870, 1120, 1121, 277, 826, 827, 837, 897, 841,
- 845, 847, 1126, 1127, 1128, 215, 216, 217, 218, 219,
- 849, 220, 221, 222, 223, 278, 279, 226, 227, 228,
- 850, 1145, 1146, 892, 901, 229, 907, 909, 1150, 908,
- 910, 912, 727, 728, 917, 730, 911, 913, 1157, 732,
- 733, 914, 916, 918, 919, 920, 1165, 940, 921, 922,
- 923, 1170, 924, 925, 1173, 215, 216, 217, 218, 219,
- 942, 220, 221, 222, 223, 278, 279, 226, 227, 228,
- 926, 927, 934, 928, 929, 229, 1196, 784, 931, 930,
- 932, 943, 415, 933, 937, 1202, 1203, 1204, 1205, 1206,
- 1207, 1208, 1209, 1210, 1211, 1212, 1213, 947, 778, 948,
- 949, 781, 952, 953, 1219, 570, 571, 954, 955, 956,
- 957, 102, 958, 966, 968, 972, 572, 987, 991, 960,
- 997, 999, 161, 801, 802, 1002, 1003, 417, 1004, 807,
- 808, 1005, 1006, 1008, 1009, 1011, 814, 1012, 821, 1013,
+ 774, 823, 1120, 1121, 277, 813, 822, 827, 825, 824,
+ 826, 870, 1126, 1127, 1128, 215, 216, 217, 218, 219,
+ 837, 220, 221, 222, 223, 278, 279, 226, 227, 228,
+ 841, 1145, 1146, 845, 847, 229, 849, 850, 1150, 892,
+ 897, 901, 727, 728, 903, 730, 907, 908, 1157, 732,
+ 733, 910, 909, 911, 912, 937, 1165, 913, 934, 917,
+ 914, 1170, 916, 918, 1173, 215, 216, 217, 218, 219,
+ 919, 220, 221, 222, 223, 278, 279, 226, 227, 228,
+ 920, 921, 925, 940, 922, 229, 1196, 784, 931, 942,
+ 943, 947, 415, 923, 924, 1202, 1203, 1204, 1205, 1206,
+ 1207, 1208, 1209, 1210, 1211, 1212, 1213, 926, 778, 927,
+ 928, 781, 929, 930, 1219, 570, 571, 932, 948, 949,
+ 933, 102, 952, 953, 954, 955, 572, 956, 957, 958,
+ 966, 960, 161, 801, 802, 968, 972, 417, 991, 807,
+ 808, 987, 997, 999, 1003, 1002, 814, 1009, 821, 1004,
215, 216, 217, 218, 219, 1236, 220, 221, 222, 223,
278, 279, 226, 227, 228, 215, 216, 217, 218, 219,
229, 220, 221, 222, 223, 278, 279, 226, 227, 228,
- 1014, 1260, 846, 1015, 848, 229, 1022, 1021, 1025, 1026,
- 1027, 962, 1039, 963, 854, 855, 856, 1038, 1046, 859,
+ 1005, 1260, 846, 1006, 848, 229, 1008, 1011, 1012, 1013,
+ 1014, 962, 1015, 963, 854, 855, 856, 1021, 1022, 859,
860, 861, 862, 863, 864, 865, 1280, 1281, 1282, 1283,
- 1284, 1285, 1286, 1287, 1288, 1047, 1049, 1075, 1076, 1078,
- 1082, 1084, 1294, 628, 629, 630, 631, 632, 633, 634,
- 635, 636, 637, 638, 639, 1301, 1085, 1302, 215, 216,
- 217, 218, 219, 1086, 220, 221, 222, 223, 278, 279,
- 226, 227, 228, 1087, 1088, 1090, 1091, 1092, 229, 1096,
- 1129, 1097, 1098, 1130, 1101, 1147, 1153, 1100, 1332, 1333,
+ 1284, 1285, 1286, 1287, 1288, 1025, 1026, 1027, 1046, 1039,
+ 1047, 1038, 1294, 628, 629, 630, 631, 632, 633, 634,
+ 635, 636, 637, 638, 639, 1301, 1049, 1302, 215, 216,
+ 217, 218, 219, 1075, 220, 221, 222, 223, 278, 279,
+ 226, 227, 228, 1076, 1078, 1082, 1084, 1085, 229, 1129,
+ 1086, 1087, 1147, 1153, 1091, 1092, 1088, 1090, 1332, 1333,
1334, 1335, 1336, 1337, 1338, 1339, 1340, 1342, 1344, 1346,
- 1103, 1156, 1349, 215, 216, 217, 218, 219, 494, 220,
- 221, 222, 223, 278, 279, 226, 227, 228, 1119, 1158,
- 1160, 1161, 1162, 229, 1175, 1163, 1164, 1166, 1168, 1169,
- 1373, 1374, 1171, 1172, 1176, 1174, 1194, 1187, 1190, 1382,
- 1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1191,
- 1393, 1195, 1395, 1201, 1216, 1232, 1399, 877, 1217, 1220,
- 1221, 1222, 1224, 418, 1225, 1227, 1229, 1231, 1233, 1237,
- 992, 1239, 1240, 996, 1243, 1256, 1257, 1265, 1001, 1411,
- 1412, 1266, 1267, 1269, 1416, 1417, 1418, 1419, 1420, 1421,
- 1270, 1271, 1272, 1273, 1277, 1292, 1293, 1020, 1295, 1296,
- 1297, 1298, 1299, 1300, 1319, 1323, 1303, 1439, 1305, 1324,
- 1326, 1315, 1443, 1444, 1445, 1446, 1447, 1448, 1450, 1452,
- 1454, 217, 218, 219, 1316, 220, 221, 222, 223, 278,
- 279, 226, 227, 228, 1317, 1329, 1347, 1330, 1348, 229,
- 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1350, 1481, 1351,
- 1483, 1352, 215, 216, 217, 218, 219, 1353, 220, 221,
- 222, 223, 278, 279, 226, 227, 228, 1354, 1493, 1494,
- 1495, 1355, 229, 1356, 1372, 1377, 1378, 1379, 1380, 1381,
- 1392, 1394, 1507, 1508, 1509, 1511, 1513, 1515, 1396, 1397,
- 1400, 1427, 1440, 1401, 1470, 1428, 1472, 1480, 1482, 1527,
- 1528, 1529, 1530, 1429, 1532, 1436, 1534, 1457, 1484, 215,
- 216, 217, 218, 219, 1437, 220, 221, 222, 223, 278,
- 279, 226, 227, 228, 1531, 1438, 1548, 1550, 1552, 229,
- 1456, 1485, 1499, 1533, 1503, 1559, 1516, 1561, 1504, 1563,
- 1505, 1535, 1536, 1540, 1560, 1562, 1148, 419, 1149, 1564,
- 1566, 1544, 1545, 1546, 1567, 67, 1278, 68, 69, 738,
- 990, 0, 0, 762, 76, 77, 117, 0, 118, 1167,
+ 1096, 1097, 1349, 215, 216, 217, 218, 219, 494, 220,
+ 221, 222, 223, 278, 279, 226, 227, 228, 1100, 1098,
+ 1101, 1156, 1158, 229, 1161, 1103, 1160, 1130, 1162, 1119,
+ 1373, 1374, 1163, 1164, 1166, 1168, 1169, 1171, 1172, 1382,
+ 1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1174,
+ 1393, 1175, 1395, 1176, 1190, 1187, 1399, 877, 1191, 1195,
+ 1194, 1216, 1201, 418, 1217, 1220, 1221, 1222, 1224, 1225,
+ 992, 1232, 1229, 996, 1227, 1233, 1239, 1240, 1001, 1411,
+ 1412, 1256, 1257, 1265, 1416, 1417, 1418, 1419, 1420, 1421,
+ 1231, 1237, 1243, 1266, 1267, 1269, 1270, 1020, 1271, 1272,
+ 1273, 1277, 1292, 1293, 1295, 1296, 1299, 1439, 1300, 1297,
+ 1323, 1298, 1443, 1444, 1445, 1446, 1447, 1448, 1450, 1452,
+ 1454, 217, 218, 219, 1303, 220, 221, 222, 223, 278,
+ 279, 226, 227, 228, 1305, 1324, 1315, 1316, 1317, 229,
+ 1473, 1474, 1475, 1476, 1477, 1478, 1479, 1326, 1481, 1319,
+ 1483, 1329, 215, 216, 217, 218, 219, 1330, 220, 221,
+ 222, 223, 278, 279, 226, 227, 228, 1347, 1493, 1494,
+ 1495, 1348, 229, 1350, 1351, 1352, 1353, 1355, 1356, 1372,
+ 1354, 1377, 1507, 1508, 1509, 1511, 1513, 1515, 1378, 1379,
+ 1380, 1381, 1392, 1394, 1396, 1440, 1397, 1400, 1427, 1527,
+ 1528, 1529, 1530, 1401, 1532, 1457, 1534, 1470, 1472, 215,
+ 216, 217, 218, 219, 1428, 220, 221, 222, 223, 278,
+ 279, 226, 227, 228, 1429, 1480, 1548, 1550, 1552, 229,
+ 1482, 1436, 1437, 1484, 1531, 1559, 1456, 1561, 1438, 1563,
+ 1485, 1499, 1533, 1503, 1504, 1505, 1148, 419, 1149, 1535,
+ 1516, 1540, 1536, 1544, 1560, 1562, 1564, 1566, 1545, 1546,
+ 1567, 67, 68, 1278, 76, 77, 117, 762, 118, 1167,
78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
- 98, 99, 0, 119, 420, 0, 0, 0, 76, 77,
- 0, 0, 0, 1200, 78, 79, 80, 81, 82, 83,
+ 98, 99, 69, 119, 420, 738, 0, 0, 76, 77,
+ 0, 990, 0, 1200, 78, 79, 80, 81, 82, 83,
84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
94, 95, 96, 97, 98, 99, 76, 77, 0, 0,
0, 0, 78, 79, 80, 81, 82, 83, 84, 85,
@@ -1768,234 +1768,230 @@ static const short yytable[] = { 104,
222, 223, 278, 279, 226, 227, 228, 0, 0, 0,
0, 0, 229, 0, 661, 215, 216, 217, 218, 219,
0, 220, 221, 222, 223, 278, 279, 226, 227, 228,
- 0, 0, 0, 0, 0, 229, 0, 725, 215, 216,
+ 0, 0, 0, 0, 0, 229, 0, 787, 215, 216,
217, 218, 219, 0, 220, 221, 222, 223, 278, 279,
226, 227, 228, 0, 0, 0, 0, 0, 229, 0,
- 787, 215, 216, 217, 218, 219, 0, 220, 221, 222,
+ 788, 215, 216, 217, 218, 219, 0, 220, 221, 222,
223, 278, 279, 226, 227, 228, 0, 0, 0, 0,
- 0, 229, 0, 788, 215, 216, 217, 218, 219, 0,
+ 0, 229, 0, 789, 215, 216, 217, 218, 219, 0,
220, 221, 222, 223, 278, 279, 226, 227, 228, 0,
- 0, 0, 0, 0, 229, 0, 789, 215, 216, 217,
+ 0, 0, 0, 0, 229, 0, 790, 215, 216, 217,
218, 219, 0, 220, 221, 222, 223, 278, 279, 226,
- 227, 228, 0, 0, 0, 0, 0, 229, 0, 790,
+ 227, 228, 0, 0, 0, 0, 0, 229, 0, 893,
215, 216, 217, 218, 219, 0, 220, 221, 222, 223,
278, 279, 226, 227, 228, 0, 0, 0, 0, 0,
- 229, 0, 829, 215, 216, 217, 218, 219, 0, 220,
+ 229, 0, 961, 215, 216, 217, 218, 219, 0, 220,
221, 222, 223, 278, 279, 226, 227, 228, 0, 0,
- 0, 0, 0, 229, 0, 893, 215, 216, 217, 218,
+ 0, 0, 0, 229, 0, 995, 215, 216, 217, 218,
219, 0, 220, 221, 222, 223, 278, 279, 226, 227,
- 228, 0, 0, 0, 0, 0, 229, 0, 961, 215,
+ 228, 0, 0, 0, 0, 0, 229, 0, 1089, 215,
216, 217, 218, 219, 0, 220, 221, 222, 223, 278,
279, 226, 227, 228, 0, 0, 0, 0, 0, 229,
- 0, 995, 215, 216, 217, 218, 219, 0, 220, 221,
+ 0, 1093, 215, 216, 217, 218, 219, 0, 220, 221,
222, 223, 278, 279, 226, 227, 228, 0, 0, 0,
- 0, 0, 229, 0, 1089, 215, 216, 217, 218, 219,
+ 0, 0, 229, 0, 1095, 215, 216, 217, 218, 219,
0, 220, 221, 222, 223, 278, 279, 226, 227, 228,
- 0, 0, 0, 0, 0, 229, 0, 1093, 215, 216,
+ 0, 0, 0, 0, 0, 229, 0, 1226, 215, 216,
217, 218, 219, 0, 220, 221, 222, 223, 278, 279,
226, 227, 228, 0, 0, 0, 0, 0, 229, 0,
- 1095, 215, 216, 217, 218, 219, 0, 220, 221, 222,
+ 1228, 215, 216, 217, 218, 219, 0, 220, 221, 222,
223, 278, 279, 226, 227, 228, 0, 0, 0, 0,
- 0, 229, 0, 1226, 215, 216, 217, 218, 219, 0,
+ 0, 229, 0, 1230, 215, 216, 217, 218, 219, 0,
220, 221, 222, 223, 278, 279, 226, 227, 228, 0,
- 0, 0, 0, 0, 229, 0, 1228, 215, 216, 217,
+ 0, 0, 0, 0, 229, 0, 1253, 215, 216, 217,
218, 219, 0, 220, 221, 222, 223, 278, 279, 226,
- 227, 228, 0, 0, 0, 0, 0, 229, 0, 1230,
+ 227, 228, 0, 0, 0, 0, 0, 229, 0, 1254,
215, 216, 217, 218, 219, 0, 220, 221, 222, 223,
278, 279, 226, 227, 228, 0, 0, 0, 0, 0,
- 229, 0, 1253, 215, 216, 217, 218, 219, 0, 220,
+ 229, 0, 1255, 215, 216, 217, 218, 219, 0, 220,
221, 222, 223, 278, 279, 226, 227, 228, 0, 0,
- 0, 0, 0, 229, 0, 1254, 215, 216, 217, 218,
+ 0, 0, 0, 229, 0, 1408, 215, 216, 217, 218,
219, 0, 220, 221, 222, 223, 278, 279, 226, 227,
- 228, 0, 0, 0, 0, 0, 229, 0, 1255, 215,
+ 228, 0, 0, 0, 0, 0, 229, 0, 1409, 215,
216, 217, 218, 219, 0, 220, 221, 222, 223, 278,
279, 226, 227, 228, 0, 0, 0, 0, 0, 229,
- 0, 1408, 215, 216, 217, 218, 219, 0, 220, 221,
+ 0, 1410, 215, 216, 217, 218, 219, 0, 220, 221,
222, 223, 278, 279, 226, 227, 228, 0, 0, 0,
- 0, 0, 229, 0, 1409, 215, 216, 217, 218, 219,
+ 0, 0, 229, 0, 1489, 215, 216, 217, 218, 219,
0, 220, 221, 222, 223, 278, 279, 226, 227, 228,
- 0, 0, 0, 0, 0, 229, 0, 1410, 215, 216,
+ 0, 0, 0, 0, 0, 229, 0, 1490, 215, 216,
217, 218, 219, 0, 220, 221, 222, 223, 278, 279,
226, 227, 228, 0, 0, 0, 0, 0, 229, 0,
- 1489, 215, 216, 217, 218, 219, 0, 220, 221, 222,
+ 1491, 215, 216, 217, 218, 219, 0, 220, 221, 222,
223, 278, 279, 226, 227, 228, 0, 0, 0, 0,
- 0, 229, 0, 1490, 215, 216, 217, 218, 219, 0,
+ 0, 229, 0, 1537, 215, 216, 217, 218, 219, 0,
220, 221, 222, 223, 278, 279, 226, 227, 228, 0,
- 0, 0, 0, 0, 229, 0, 1491, 215, 216, 217,
+ 0, 0, 0, 0, 229, 0, 1538, 215, 216, 217,
218, 219, 0, 220, 221, 222, 223, 278, 279, 226,
- 227, 228, 0, 0, 0, 0, 0, 229, 0, 1537,
+ 227, 228, 0, 0, 0, 0, 0, 229, 0, 1539,
215, 216, 217, 218, 219, 0, 220, 221, 222, 223,
278, 279, 226, 227, 228, 0, 0, 0, 0, 0,
- 229, 0, 1538, 215, 216, 217, 218, 219, 0, 220,
- 221, 222, 223, 278, 279, 226, 227, 228, 0, 0,
- 0, 0, 0, 229, 0, 1539, 215, 216, 217, 218,
- 219, 0, 220, 221, 222, 223, 278, 279, 226, 227,
- 228, 0, 0, 0, 0, 0, 229
+ 229
};
static const short yycheck[] = { 7,
114, 4, 1055, 4, 4, 4, 318, 38, 6, 6,
- 987, 1117, 81, 4, 6, 23, 4, 60, 60, 59,
- 4, 59, 65, 65, 4, 4, 172, 143, 162, 163,
- 6, 42, 43, 179, 162, 163, 6, 7, 162, 163,
- 172, 162, 163, 0, 1, 179, 3, 179, 6, 42,
+ 987, 434, 81, 4, 6, 23, 4, 4, 60, 60,
+ 59, 59, 4, 65, 65, 4, 1117, 143, 162, 163,
+ 6, 42, 43, 172, 162, 163, 6, 7, 162, 163,
+ 179, 162, 163, 0, 1, 179, 3, 178, 6, 180,
178, 911, 180, 45, 178, 6, 180, 178, 7, 180,
920, 162, 163, 162, 163, 162, 163, 927, 162, 163,
- 162, 163, 63, 6, 178, 63, 180, 60, 179, 63,
- 179, 178, 65, 63, 178, 173, 178, 162, 163, 162,
- 163, 179, 100, 101, 102, 103, 104, 4, 174, 173,
- 84, 174, 178, 178, 173, 84, 1083, 162, 163, 6,
- 118, 6, 120, 121, 122, 123, 173, 7, 126, 6,
- 173, 7, 179, 178, 132, 133, 134, 135, 1234, 137,
- 138, 6, 140, 141, 142, 173, 144, 180, 180, 179,
- 6, 179, 173, 162, 163, 156, 6, 174, 159, 6,
- 6, 178, 160, 161, 165, 174, 113, 114, 115, 116,
+ 162, 163, 63, 6, 60, 63, 63, 174, 179, 65,
+ 179, 63, 162, 163, 178, 173, 178, 162, 163, 51,
+ 52, 179, 100, 101, 102, 103, 104, 4, 178, 173,
+ 162, 163, 84, 178, 173, 84, 1083, 162, 163, 6,
+ 118, 6, 120, 121, 122, 123, 178, 7, 126, 6,
+ 173, 7, 173, 178, 132, 133, 134, 135, 179, 137,
+ 138, 6, 140, 141, 142, 173, 144, 560, 180, 180,
+ 179, 179, 173, 1234, 172, 156, 6, 169, 159, 171,
+ 6, 179, 160, 161, 165, 173, 113, 114, 115, 116,
117, 118, 119, 120, 6, 162, 163, 174, 176, 6,
- 178, 178, 180, 181, 173, 169, 179, 171, 179, 179,
+ 178, 178, 180, 181, 173, 6, 179, 6, 179, 179,
188, 179, 190, 191, 192, 193, 194, 195, 196, 197,
198, 199, 200, 201, 202, 203, 204, 205, 206, 207,
- 208, 209, 210, 179, 162, 163, 173, 215, 216, 217,
+ 208, 209, 210, 179, 162, 163, 6, 215, 216, 217,
218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
- 228, 229, 230, 6, 1084, 1278, 3, 4, 1088, 162,
- 163, 173, 9, 10, 11, 12, 13, 14, 15, 16,
+ 228, 229, 230, 173, 1084, 1278, 3, 4, 1088, 162,
+ 163, 6, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
27, 28, 29, 30, 173, 162, 163, 7, 148, 149,
- 150, 151, 148, 149, 150, 151, 173, 162, 163, 6,
+ 150, 151, 148, 149, 150, 151, 173, 162, 163, 173,
278, 279, 179, 162, 163, 162, 163, 173, 286, 169,
- 170, 289, 34, 169, 170, 37, 294, 162, 163, 178,
- 298, 299, 300, 173, 302, 303, 304, 305, 306, 307,
- 308, 173, 162, 163, 315, 316, 162, 163, 37, 38,
+ 170, 289, 173, 169, 170, 174, 294, 162, 163, 174,
+ 298, 299, 300, 178, 302, 303, 304, 305, 306, 307,
+ 308, 42, 162, 163, 315, 316, 162, 163, 37, 38,
173, 40, 320, 321, 322, 326, 162, 163, 164, 165,
- 166, 174, 38, 38, 332, 178, 172, 38, 3, 4,
+ 166, 174, 38, 174, 332, 178, 172, 178, 3, 4,
338, 178, 38, 180, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 178, 178, 180, 180,
- 1220, 1221, 1222, 1223, 169, 170, 178, 1227, 180, 40,
- 175, 8, 177, 178, 6, 152, 153, 154, 155, 156,
+ 25, 26, 27, 28, 29, 30, 34, 38, 40, 37,
+ 1220, 1221, 1222, 1223, 169, 170, 178, 1227, 180, 179,
+ 175, 8, 177, 178, 38, 152, 153, 154, 155, 156,
179, 158, 159, 160, 161, 162, 163, 164, 165, 166,
34, 168, 179, 37, 38, 172, 173, 179, 148, 149,
- 150, 151, 179, 34, 169, 170, 37, 38, 178, 40,
- 180, 422, 423, 424, 422, 423, 424, 425, 426, 169,
- 170, 429, 169, 170, 179, 178, 434, 180, 175, 5,
- 177, 0, 1, 173, 3, 1295, 1296, 173, 446, 1299,
- 6, 169, 170, 451, 164, 165, 166, 175, 456, 177,
- 169, 170, 172, 464, 4, 178, 175, 180, 177, 467,
- 468, 169, 170, 4, 169, 170, 38, 175, 476, 177,
+ 150, 151, 179, 34, 174, 6, 37, 38, 178, 40,
+ 5, 422, 423, 424, 422, 423, 424, 425, 426, 169,
+ 170, 429, 169, 170, 6, 174, 434, 173, 175, 178,
+ 177, 0, 1, 173, 3, 1295, 1296, 4, 446, 1299,
+ 4, 169, 170, 451, 164, 165, 166, 175, 456, 177,
+ 169, 170, 172, 464, 38, 178, 175, 180, 177, 467,
+ 468, 169, 170, 173, 169, 170, 5, 175, 476, 177,
175, 178, 177, 180, 173, 483, 53, 54, 55, 56,
178, 58, 180, 169, 170, 493, 494, 162, 163, 178,
- 1350, 180, 500, 168, 178, 178, 180, 180, 173, 173,
- 178, 176, 180, 173, 512, 98, 99, 100, 101, 102,
+ 1350, 180, 500, 168, 178, 178, 180, 180, 173, 169,
+ 170, 176, 169, 170, 512, 98, 99, 100, 101, 102,
173, 519, 520, 521, 522, 152, 153, 154, 155, 156,
173, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 178, 173, 180, 51, 52, 172, 169, 170, 173, 173,
- 1400, 5, 5, 180, 113, 114, 115, 116, 117, 118,
- 119, 120, 560, 561, 562, 563, 564, 565, 870, 173,
- 571, 173, 570, 571, 572, 173, 173, 173, 173, 1429,
- 139, 140, 173, 142, 173, 173, 587, 155, 156, 173,
+ 178, 178, 180, 180, 173, 172, 178, 178, 180, 180,
+ 1400, 173, 6, 180, 113, 114, 115, 116, 117, 118,
+ 119, 120, 560, 561, 562, 563, 564, 565, 870, 178,
+ 571, 180, 570, 571, 572, 178, 173, 180, 173, 1429,
+ 139, 140, 5, 142, 173, 173, 587, 155, 156, 173,
158, 159, 160, 161, 162, 163, 164, 165, 166, 703,
173, 599, 600, 601, 172, 6, 158, 159, 160, 161,
- 162, 163, 164, 165, 166, 173, 173, 6, 173, 617,
- 172, 6, 623, 624, 625, 173, 173, 173, 179, 173,
- 173, 86, 173, 6, 179, 173, 143, 179, 173, 173,
+ 162, 163, 164, 165, 166, 173, 6, 173, 173, 617,
+ 172, 86, 623, 624, 625, 173, 173, 173, 173, 173,
+ 173, 173, 173, 173, 173, 173, 143, 173, 173, 173,
173, 148, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, 75, 76, 77, 177, 653, 654, 179, 656, 179,
- 179, 173, 172, 170, 173, 5, 1516, 174, 175, 173,
- 173, 173, 173, 674, 672, 673, 173, 173, 173, 3,
+ 74, 75, 76, 77, 179, 653, 654, 179, 656, 179,
+ 173, 173, 177, 170, 6, 179, 1516, 174, 175, 179,
+ 179, 173, 172, 674, 672, 673, 173, 173, 173, 3,
4, 5, 683, 173, 173, 9, 10, 11, 12, 13,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 173, 3, 4,
5, 173, 173, 173, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 173, 173, 173, 173,
- 173, 173, 740, 173, 1046, 173, 173, 173, 173, 178,
- 173, 173, 173, 173, 173, 753, 180, 755, 756, 174,
- 178, 5, 175, 177, 7, 763, 764, 765, 766, 767,
- 768, 769, 770, 771, 772, 773, 774, 7, 7, 7,
- 82, 179, 175, 5, 782, 783, 5, 785, 5, 5,
- 3, 4, 131, 791, 5, 5, 9, 10, 11, 12,
+ 173, 173, 740, 173, 1046, 173, 173, 173, 173, 5,
+ 5, 173, 173, 173, 173, 753, 180, 755, 756, 173,
+ 173, 173, 173, 173, 173, 763, 764, 765, 766, 767,
+ 768, 769, 770, 771, 772, 773, 774, 174, 178, 178,
+ 175, 177, 7, 7, 782, 783, 7, 785, 7, 82,
+ 3, 4, 179, 791, 175, 5, 9, 10, 11, 12,
13, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 933,
5, 5, 5, 5, 5, 5, 5, 5, 162, 163,
- 5, 839, 5, 844, 168, 3, 5, 7, 5, 173,
- 6, 5, 4, 851, 852, 179, 6, 6, 6, 857,
- 858, 6, 175, 7, 7, 7, 6, 162, 163, 6,
- 871, 7, 873, 168, 875, 7, 7, 180, 173, 180,
- 179, 179, 7, 173, 179, 7, 145, 178, 5, 178,
- 178, 178, 890, 891, 178, 178, 178, 178, 178, 178,
+ 5, 839, 5, 844, 168, 5, 131, 5, 5, 173,
+ 5, 5, 3, 851, 852, 179, 5, 5, 5, 857,
+ 858, 6, 6, 6, 4, 6, 175, 162, 163, 7,
+ 871, 6, 873, 168, 875, 7, 7, 7, 173, 6,
+ 6, 180, 7, 7, 179, 7, 180, 179, 179, 7,
+ 173, 7, 890, 891, 145, 5, 178, 178, 178, 178,
178, 178, 178, 178, 902, 178, 904, 178, 178, 6,
- 178, 178, 178, 178, 178, 178, 914, 178, 178, 174,
- 178, 178, 178, 921, 922, 923, 178, 178, 178, 6,
- 928, 6, 6, 179, 932, 7, 934, 7, 7, 7,
- 7, 7, 7, 7, 7, 7, 7, 7, 946, 162,
- 163, 7, 173, 50, 6, 168, 7, 7, 173, 173,
- 173, 8, 3, 3, 962, 173, 179, 173, 173, 173,
+ 178, 178, 178, 178, 178, 178, 914, 178, 178, 178,
+ 178, 178, 6, 921, 922, 923, 178, 6, 178, 178,
+ 928, 178, 178, 178, 932, 178, 934, 178, 174, 178,
+ 6, 179, 7, 7, 7, 7, 7, 7, 946, 162,
+ 163, 7, 7, 50, 7, 168, 7, 7, 7, 7,
+ 173, 8, 173, 6, 962, 173, 179, 173, 173, 173,
173, 173, 173, 173, 173, 973, 974, 975, 976, 977,
- 978, 979, 980, 981, 982, 983, 984, 3, 141, 3,
+ 978, 979, 980, 981, 982, 983, 984, 7, 7, 141,
3, 3, 3, 3, 3, 993, 3, 4, 164, 3,
998, 3, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 3, 3, 3, 178, 3, 5,
+ 27, 28, 29, 30, 3, 3, 3, 173, 3, 3,
1031, 1032, 1033, 1031, 1032, 1033, 1034, 1035, 1036, 1037,
- 5, 179, 1040, 1041, 6, 3, 6, 177, 83, 6,
- 6, 6, 1050, 1051, 1052, 152, 153, 154, 155, 156,
- 6, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 6, 1069, 1070, 6, 177, 172, 178, 178, 1076, 174,
- 174, 174, 589, 590, 174, 592, 178, 178, 1086, 596,
- 597, 178, 178, 174, 178, 178, 1094, 6, 178, 178,
+ 173, 5, 1040, 1041, 6, 3, 3, 6, 3, 5,
+ 3, 179, 1050, 1051, 1052, 152, 153, 154, 155, 156,
+ 177, 158, 159, 160, 161, 162, 163, 164, 165, 166,
+ 6, 1069, 1070, 6, 6, 172, 6, 6, 1076, 6,
+ 83, 177, 589, 590, 178, 592, 178, 174, 1086, 596,
+ 597, 174, 178, 178, 174, 177, 1094, 178, 175, 174,
178, 1099, 178, 174, 1102, 152, 153, 154, 155, 156,
- 6, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 178, 178, 175, 178, 178, 172, 1124, 174, 174, 178,
- 178, 6, 6, 178, 177, 1133, 1134, 1135, 1136, 1137,
- 1138, 1139, 1140, 1141, 1142, 1143, 1144, 6, 655, 6,
- 6, 658, 6, 6, 1152, 162, 163, 6, 6, 6,
- 6, 168, 6, 6, 6, 6, 173, 7, 83, 177,
- 4, 3, 179, 680, 681, 6, 3, 6, 6, 686,
- 687, 164, 6, 6, 3, 6, 693, 3, 695, 6,
+ 178, 158, 159, 160, 161, 162, 163, 164, 165, 166,
+ 178, 178, 174, 6, 178, 172, 1124, 174, 174, 6,
+ 6, 6, 6, 178, 178, 1133, 1134, 1135, 1136, 1137,
+ 1138, 1139, 1140, 1141, 1142, 1143, 1144, 178, 655, 178,
+ 178, 658, 178, 178, 1152, 162, 163, 178, 6, 6,
+ 178, 168, 6, 6, 6, 6, 173, 6, 6, 6,
+ 6, 177, 179, 680, 681, 6, 6, 6, 83, 686,
+ 687, 7, 4, 3, 3, 6, 693, 3, 695, 6,
152, 153, 154, 155, 156, 1193, 158, 159, 160, 161,
162, 163, 164, 165, 166, 152, 153, 154, 155, 156,
172, 158, 159, 160, 161, 162, 163, 164, 165, 166,
- 6, 1219, 729, 3, 731, 172, 3, 6, 3, 3,
- 6, 178, 84, 180, 741, 742, 743, 7, 179, 746,
+ 164, 1219, 729, 6, 731, 172, 6, 6, 3, 6,
+ 6, 178, 3, 180, 741, 742, 743, 6, 3, 746,
747, 748, 749, 750, 751, 752, 1244, 1245, 1246, 1247,
- 1248, 1249, 1250, 1251, 1252, 4, 180, 179, 80, 6,
- 174, 178, 1260, 66, 67, 68, 69, 70, 71, 72,
- 73, 74, 75, 76, 77, 1273, 178, 1275, 152, 153,
- 154, 155, 156, 178, 158, 159, 160, 161, 162, 163,
- 164, 165, 166, 174, 178, 178, 174, 174, 172, 178,
- 6, 174, 174, 179, 174, 83, 6, 178, 1306, 1307,
+ 1248, 1249, 1250, 1251, 1252, 3, 3, 6, 179, 84,
+ 4, 7, 1260, 66, 67, 68, 69, 70, 71, 72,
+ 73, 74, 75, 76, 77, 1273, 180, 1275, 152, 153,
+ 154, 155, 156, 179, 158, 159, 160, 161, 162, 163,
+ 164, 165, 166, 80, 6, 174, 178, 178, 172, 6,
+ 178, 174, 83, 6, 174, 174, 178, 178, 1306, 1307,
1308, 1309, 1310, 1311, 1312, 1313, 1314, 1315, 1316, 1317,
- 178, 3, 1320, 152, 153, 154, 155, 156, 8, 158,
- 159, 160, 161, 162, 163, 164, 165, 166, 177, 6,
- 6, 3, 6, 172, 177, 6, 6, 6, 6, 6,
- 1348, 1349, 3, 6, 6, 5, 5, 177, 6, 1357,
- 1358, 1359, 1360, 1361, 1362, 1363, 1364, 1365, 1366, 4,
- 1368, 180, 1370, 6, 179, 4, 1374, 180, 178, 178,
- 178, 178, 174, 6, 174, 178, 174, 178, 63, 178,
- 897, 6, 6, 900, 178, 6, 6, 6, 905, 1397,
+ 178, 174, 1320, 152, 153, 154, 155, 156, 8, 158,
+ 159, 160, 161, 162, 163, 164, 165, 166, 178, 174,
+ 174, 3, 6, 172, 3, 178, 6, 179, 6, 177,
+ 1348, 1349, 6, 6, 6, 6, 6, 3, 6, 1357,
+ 1358, 1359, 1360, 1361, 1362, 1363, 1364, 1365, 1366, 5,
+ 1368, 177, 1370, 6, 6, 177, 1374, 180, 4, 180,
+ 5, 179, 6, 6, 178, 178, 178, 178, 174, 174,
+ 897, 4, 174, 900, 178, 63, 6, 6, 905, 1397,
1398, 6, 6, 6, 1402, 1403, 1404, 1405, 1406, 1407,
- 6, 6, 5, 175, 5, 178, 180, 924, 178, 178,
- 174, 174, 178, 178, 80, 6, 178, 1425, 178, 6,
- 5, 179, 1430, 1431, 1432, 1433, 1434, 1435, 1436, 1437,
- 1438, 154, 155, 156, 179, 158, 159, 160, 161, 162,
- 163, 164, 165, 166, 179, 5, 180, 6, 179, 172,
- 1458, 1459, 1460, 1461, 1462, 1463, 1464, 178, 1466, 178,
- 1468, 174, 152, 153, 154, 155, 156, 174, 158, 159,
- 160, 161, 162, 163, 164, 165, 166, 177, 1486, 1487,
- 1488, 180, 172, 180, 80, 6, 6, 84, 6, 6,
- 6, 6, 1500, 1501, 1502, 1503, 1504, 1505, 6, 179,
- 178, 147, 6, 178, 6, 178, 6, 6, 6, 1517,
- 1518, 1519, 1520, 178, 1522, 179, 1524, 174, 6, 152,
- 153, 154, 155, 156, 179, 158, 159, 160, 161, 162,
- 163, 164, 165, 166, 6, 179, 1544, 1545, 1546, 172,
- 178, 178, 178, 6, 179, 1553, 178, 1555, 179, 1557,
- 179, 6, 174, 6, 6, 6, 1073, 6, 1075, 6,
- 0, 179, 179, 179, 0, 6, 1242, 6, 6, 601,
- 895, -1, -1, 627, 3, 4, 5, -1, 7, 1096,
+ 178, 178, 178, 6, 6, 6, 6, 924, 6, 5,
+ 175, 5, 178, 180, 178, 178, 178, 1425, 178, 174,
+ 6, 174, 1430, 1431, 1432, 1433, 1434, 1435, 1436, 1437,
+ 1438, 154, 155, 156, 178, 158, 159, 160, 161, 162,
+ 163, 164, 165, 166, 178, 6, 179, 179, 179, 172,
+ 1458, 1459, 1460, 1461, 1462, 1463, 1464, 5, 1466, 80,
+ 1468, 5, 152, 153, 154, 155, 156, 6, 158, 159,
+ 160, 161, 162, 163, 164, 165, 166, 180, 1486, 1487,
+ 1488, 179, 172, 178, 178, 174, 174, 180, 180, 80,
+ 177, 6, 1500, 1501, 1502, 1503, 1504, 1505, 6, 84,
+ 6, 6, 6, 6, 6, 6, 179, 178, 147, 1517,
+ 1518, 1519, 1520, 178, 1522, 174, 1524, 6, 6, 152,
+ 153, 154, 155, 156, 178, 158, 159, 160, 161, 162,
+ 163, 164, 165, 166, 178, 6, 1544, 1545, 1546, 172,
+ 6, 179, 179, 6, 6, 1553, 178, 1555, 179, 1557,
+ 178, 178, 6, 179, 179, 179, 1073, 6, 1075, 6,
+ 178, 6, 174, 179, 6, 6, 6, 0, 179, 179,
+ 0, 6, 6, 1242, 3, 4, 5, 627, 7, 1096,
9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, -1, 32, 6, -1, -1, -1, 3, 4,
- -1, -1, -1, 1130, 9, 10, 11, 12, 13, 14,
+ 29, 30, 6, 32, 6, 601, -1, -1, 3, 4,
+ -1, 895, -1, 1130, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 3, 4, -1, -1,
-1, -1, 9, 10, 11, 12, 13, 14, 15, 16,
@@ -2574,14 +2570,11 @@ static const short yycheck[] = { 7,
165, 166, -1, -1, -1, -1, -1, 172, -1, 174,
152, 153, 154, 155, 156, -1, 158, 159, 160, 161,
162, 163, 164, 165, 166, -1, -1, -1, -1, -1,
- 172, -1, 174, 152, 153, 154, 155, 156, -1, 158,
- 159, 160, 161, 162, 163, 164, 165, 166, -1, -1,
- -1, -1, -1, 172, -1, 174, 152, 153, 154, 155,
- 156, -1, 158, 159, 160, 161, 162, 163, 164, 165,
- 166, -1, -1, -1, -1, -1, 172
+ 172
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/local/share/bison.simple"
+#line 3 "/usr/lib/bison.simple"
+/* This file comes from bison-1.28. */
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -2598,46 +2591,66 @@ static const short yycheck[] = { 7,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
-#ifndef alloca
+/* This is the parser code that is written into each bison parser
+ when the %semantic_parser declaration is not specified in the grammar.
+ It was written by Richard Stallman by simplifying the hairy parser
+ used when %semantic_parser is specified. */
+
+#ifndef YYSTACK_USE_ALLOCA
+#ifdef alloca
+#define YYSTACK_USE_ALLOCA
+#else /* alloca not defined */
#ifdef __GNUC__
+#define YYSTACK_USE_ALLOCA
#define alloca __builtin_alloca
#else /* not GNU C. */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#define YYSTACK_USE_ALLOCA
#include <alloca.h>
#else /* not sparc */
-#if defined (MSDOS) && !defined (__TURBOC__)
+/* We think this test detects Watcom and Microsoft C. */
+/* This used to test MSDOS, but that is a bad idea
+ since that symbol is in the user namespace. */
+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if 0 /* No need for malloc.h, which pollutes the namespace;
+ instead, just don't use alloca. */
#include <malloc.h>
+#endif
#else /* not MSDOS, or __TURBOC__ */
#if defined(_AIX)
-#include <malloc.h>
+/* I don't know what this was needed for, but it pollutes the namespace.
+ So I turned it off. rms, 2 May 1997. */
+/* #include <malloc.h> */
#pragma alloca
-#else /* not MSDOS, __TURBOC__, or _AIX */
-#ifdef __hpux
-#ifdef __cplusplus
-extern "C" {
-void *alloca (unsigned int);
-};
-#else /* not __cplusplus */
-void *alloca ();
-#endif /* not __cplusplus */
+#define YYSTACK_USE_ALLOCA
+#else /* not MSDOS, or __TURBOC__, or _AIX */
+#if 0
+#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
+ and on HPUX 10. Eventually we can turn this on. */
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
#endif /* __hpux */
+#endif
#endif /* not _AIX */
#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc. */
-#endif /* not GNU C. */
-#endif /* alloca not defined. */
+#endif /* not sparc */
+#endif /* not GNU C */
+#endif /* alloca not defined */
+#endif /* YYSTACK_USE_ALLOCA not defined */
-/* This is the parser code that is written into each bison parser
- when the %semantic_parser declaration is not specified in the grammar.
- It was written by Richard Stallman by simplifying the hairy parser
- used when %semantic_parser is specified. */
+#ifdef YYSTACK_USE_ALLOCA
+#define YYSTACK_ALLOC alloca
+#else
+#define YYSTACK_ALLOC malloc
+#endif
/* Note: there must be only one dollar sign in this file.
It is replaced by the list of actions, each action
@@ -2647,8 +2660,8 @@ void *alloca ();
#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY -2
#define YYEOF 0
-#define YYACCEPT return(0)
-#define YYABORT return(1)
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
#define YYERROR goto yyerrlab1
/* Like YYERROR except do call yyerror.
This remains here temporarily to ease the
@@ -2729,12 +2742,12 @@ int yydebug; /* nonzero means print parse trace */
#ifndef YYMAXDEPTH
#define YYMAXDEPTH 10000
#endif
-
-/* Prevent warning if -Wstrict-prototypes. */
-#ifdef __GNUC__
-int yyparse (void);
-#endif
+/* Define __yy_memcpy. Note that the size argument
+ should be passed with type unsigned int, because that is what the non-GCC
+ definitions require. With GCC, __builtin_memcpy takes an arg
+ of type size_t, but it can handle unsigned int. */
+
#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
#else /* not GNU C or C++ */
@@ -2746,7 +2759,7 @@ static void
__yy_memcpy (to, from, count)
char *to;
char *from;
- int count;
+ unsigned int count;
{
register char *f = from;
register char *t = to;
@@ -2761,10 +2774,10 @@ __yy_memcpy (to, from, count)
/* This is the most reliable way to avoid incompatibilities
in available built-in functions on various systems. */
static void
-__yy_memcpy (char *to, char *from, int count)
+__yy_memcpy (char *to, char *from, unsigned int count)
{
- register char *f = from;
register char *t = to;
+ register char *f = from;
register int i = count;
while (i-- > 0)
@@ -2774,7 +2787,7 @@ __yy_memcpy (char *to, char *from, int count)
#endif
#endif
-#line 196 "/usr/local/share/bison.simple"
+#line 217 "/usr/lib/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
@@ -2795,6 +2808,15 @@ __yy_memcpy (char *to, char *from, int count)
#define YYPARSE_PARAM_DECL
#endif /* not YYPARSE_PARAM */
+/* Prevent warning if -Wstrict-prototypes. */
+#ifdef __GNUC__
+#ifdef YYPARSE_PARAM
+int yyparse (void *);
+#else
+int yyparse (void);
+#endif
+#endif
+
int
yyparse(YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
@@ -2823,6 +2845,7 @@ yyparse(YYPARSE_PARAM_ARG)
#endif
int yystacksize = YYINITDEPTH;
+ int yyfree_stacks = 0;
#ifdef YYPURE
int yychar;
@@ -2907,18 +2930,32 @@ yynewstate:
if (yystacksize >= YYMAXDEPTH)
{
yyerror("parser stack overflow");
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
return 2;
}
yystacksize *= 2;
if (yystacksize > YYMAXDEPTH)
yystacksize = YYMAXDEPTH;
- yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
- __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
- yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
- __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
+#ifndef YYSTACK_USE_ALLOCA
+ yyfree_stacks = 1;
+#endif
+ yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+ __yy_memcpy ((char *)yyss, (char *)yyss1,
+ size * (unsigned int) sizeof (*yyssp));
+ yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+ __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+ size * (unsigned int) sizeof (*yyvsp));
#ifdef YYLSP_NEEDED
- yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
- __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
+ yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+ __yy_memcpy ((char *)yyls, (char *)yyls1,
+ size * (unsigned int) sizeof (*yylsp));
#endif
#endif /* no yyoverflow */
@@ -3079,7 +3116,7 @@ yyreduce:
switch (yyn) {
case 4:
-#line 155 "Gmsh.y"
+#line 156 "Gmsh.y"
{
Msg(PARSER_INFO,"STL File Format");
STL_Surf = Create_Surface(1,MSH_SURF_STL,1);
@@ -3088,7 +3125,7 @@ case 4:
;
break;}
case 5:
-#line 169 "Gmsh.y"
+#line 170 "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,
@@ -3097,7 +3134,7 @@ case 5:
;
break;}
case 6:
-#line 176 "Gmsh.y"
+#line 177 "Gmsh.y"
{
Msg(PARSER_INFO,"STL File Format Read");
Tree_Add(THEM->Surfaces, &STL_Surf);
@@ -3105,83 +3142,83 @@ case 6:
;
break;}
case 9:
-#line 193 "Gmsh.y"
+#line 194 "Gmsh.y"
{ return 1; ;
break;}
case 10:
-#line 194 "Gmsh.y"
+#line 195 "Gmsh.y"
{ return 1; ;
break;}
case 11:
-#line 195 "Gmsh.y"
+#line 196 "Gmsh.y"
{ return 1; ;
break;}
case 12:
-#line 196 "Gmsh.y"
+#line 197 "Gmsh.y"
{ yyerrok ; return 1; ;
break;}
case 13:
-#line 201 "Gmsh.y"
+#line 202 "Gmsh.y"
{
Msg(PARSER_INFO,"Step Iso-10303-21 File Format");
Create_Step_Solid_BRep();
;
break;}
case 14:
-#line 206 "Gmsh.y"
+#line 207 "Gmsh.y"
{
Msg(PARSER_INFO,"Step Iso-10303-21 File Format Read");
Resolve_BREP ();
;
break;}
case 18:
-#line 217 "Gmsh.y"
+#line 218 "Gmsh.y"
{
;
break;}
case 19:
-#line 220 "Gmsh.y"
+#line 221 "Gmsh.y"
{
;
break;}
case 20:
-#line 224 "Gmsh.y"
+#line 225 "Gmsh.y"
{
;
break;}
case 21:
-#line 230 "Gmsh.y"
+#line 231 "Gmsh.y"
{
Add_Cartesian_Point((int)yyvsp[-8].d,yyvsp[-4].c,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2]);
;
break;}
case 22:
-#line 236 "Gmsh.y"
+#line 237 "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 23:
-#line 243 "Gmsh.y"
+#line 244 "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 24:
-#line 249 "Gmsh.y"
+#line 250 "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 25:
-#line 253 "Gmsh.y"
+#line 254 "Gmsh.y"
{
Add_Face_Outer_Bound((int)yyvsp[-10].d,yyvsp[-6].c,(int)yyvsp[-4].d,yyvsp[-2].i,1);
;
break;}
case 26:
-#line 257 "Gmsh.y"
+#line 258 "Gmsh.y"
{
/* La je dois voir la norme ! Face_Bound : trou externe a la surface ! */
Msg(PARSER_INFO,"Found a Face Bound");
@@ -3189,194 +3226,194 @@ case 26:
;
break;}
case 27:
-#line 264 "Gmsh.y"
+#line 265 "Gmsh.y"
{
Add_Oriented_Edge((int)yyvsp[-14].d,yyvsp[-10].c,(int)yyvsp[-4].d,yyvsp[-2].i);
;
break;}
case 28:
-#line 268 "Gmsh.y"
+#line 269 "Gmsh.y"
{
Add_Edge_Loop((int)yyvsp[-8].d,yyvsp[-4].c,yyvsp[-2].l);
;
break;}
case 29:
-#line 273 "Gmsh.y"
+#line 274 "Gmsh.y"
{
Add_Advanced_Face((int)yyvsp[-12].d,yyvsp[-8].c,yyvsp[-6].l,(int)yyvsp[-4].d,yyvsp[-2].i);
;
break;}
case 30:
-#line 277 "Gmsh.y"
+#line 278 "Gmsh.y"
{
Add_Vertex_Point((int)yyvsp[-8].d,yyvsp[-4].c,(int)yyvsp[-2].d);
;
break;}
case 31:
-#line 281 "Gmsh.y"
+#line 282 "Gmsh.y"
{
;
break;}
case 32:
-#line 285 "Gmsh.y"
+#line 286 "Gmsh.y"
{
Add_Axis2_Placement3D ( (int)yyvsp[-12].d, (int)yyvsp[-4].d, (int)yyvsp[-2].d, (int)yyvsp[-6].d);
;
break;}
case 33:
-#line 289 "Gmsh.y"
+#line 290 "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 34:
-#line 293 "Gmsh.y"
+#line 294 "Gmsh.y"
{
Add_Plane((int)yyvsp[-8].d,yyvsp[-4].c,(int)yyvsp[-2].d);
;
break;}
case 35:
-#line 297 "Gmsh.y"
+#line 298 "Gmsh.y"
{
Add_Line ((int)yyvsp[-10].d, yyvsp[-6].c , (int) yyvsp[-4].d, (int)yyvsp[-2].d);
;
break;}
case 36:
-#line 301 "Gmsh.y"
+#line 302 "Gmsh.y"
{
Msg(PARSER_INFO,"Found a Closed shell");
Add_Closed_Shell((int)yyvsp[-8].d, yyvsp[-4].c , yyvsp[-2].l);
;
break;}
case 37:
-#line 307 "Gmsh.y"
+#line 308 "Gmsh.y"
{
;
break;}
case 38:
-#line 310 "Gmsh.y"
+#line 311 "Gmsh.y"
{
;
break;}
case 39:
-#line 313 "Gmsh.y"
+#line 314 "Gmsh.y"
{
Add_Cylinder ((int)yyvsp[-10].d, yyvsp[-6].c , (int)yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 40:
-#line 317 "Gmsh.y"
+#line 318 "Gmsh.y"
{
Add_Cone ((int)yyvsp[-12].d, yyvsp[-8].c , (int)yyvsp[-6].d, yyvsp[-4].d,yyvsp[-2].d);
;
break;}
case 41:
-#line 321 "Gmsh.y"
+#line 322 "Gmsh.y"
{
Add_Torus ((int)yyvsp[-12].d, yyvsp[-8].c , (int)yyvsp[-6].d, yyvsp[-4].d,yyvsp[-2].d);
;
break;}
case 42:
-#line 325 "Gmsh.y"
+#line 326 "Gmsh.y"
{
Add_Circle((int) yyvsp[-10].d, yyvsp[-6].c, (int) yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 43:
-#line 329 "Gmsh.y"
+#line 330 "Gmsh.y"
{
Add_Ellipsis((int) yyvsp[-12].d, yyvsp[-8].c, (int) yyvsp[-6].d, yyvsp[-4].d, yyvsp[-2].d);
;
break;}
case 44:
-#line 334 "Gmsh.y"
+#line 335 "Gmsh.y"
{
;
break;}
case 45:
-#line 337 "Gmsh.y"
+#line 338 "Gmsh.y"
{
;
break;}
case 46:
-#line 341 "Gmsh.y"
+#line 342 "Gmsh.y"
{
;
break;}
case 47:
-#line 344 "Gmsh.y"
+#line 345 "Gmsh.y"
{
;
break;}
case 48:
-#line 348 "Gmsh.y"
+#line 349 "Gmsh.y"
{
;
break;}
case 49:
-#line 351 "Gmsh.y"
+#line 352 "Gmsh.y"
{
;
break;}
case 50:
-#line 354 "Gmsh.y"
+#line 355 "Gmsh.y"
{
;
break;}
case 51:
-#line 364 "Gmsh.y"
+#line 365 "Gmsh.y"
{
;
break;}
case 52:
-#line 367 "Gmsh.y"
+#line 368 "Gmsh.y"
{
Msg(PARSER_INFO,"Gmsh File Format Read");
;
break;}
case 53:
-#line 373 "Gmsh.y"
+#line 374 "Gmsh.y"
{ return 1; ;
break;}
case 54:
-#line 374 "Gmsh.y"
+#line 375 "Gmsh.y"
{ return 1; ;
break;}
case 55:
-#line 375 "Gmsh.y"
+#line 376 "Gmsh.y"
{ return 1; ;
break;}
case 56:
-#line 376 "Gmsh.y"
+#line 377 "Gmsh.y"
{ return 1; ;
break;}
case 57:
-#line 377 "Gmsh.y"
+#line 378 "Gmsh.y"
{ return 1; ;
break;}
case 58:
-#line 378 "Gmsh.y"
+#line 379 "Gmsh.y"
{ return 1; ;
break;}
case 59:
-#line 379 "Gmsh.y"
+#line 380 "Gmsh.y"
{ return 1; ;
break;}
case 60:
-#line 380 "Gmsh.y"
+#line 381 "Gmsh.y"
{ return 1; ;
break;}
case 61:
-#line 381 "Gmsh.y"
+#line 382 "Gmsh.y"
{ return 1; ;
break;}
case 62:
-#line 382 "Gmsh.y"
+#line 383 "Gmsh.y"
{ return 1; ;
break;}
case 63:
-#line 383 "Gmsh.y"
-{return 1;;
+#line 384 "Gmsh.y"
+{ return 1; ;
break;}
case 64:
#line 385 "Gmsh.y"
@@ -3389,106 +3426,125 @@ case 65:
case 66:
#line 391 "Gmsh.y"
{
- Msg(PARSER_INFO, yyvsp[-2].c);
+ fprintf(stderr, yyvsp[-2].c);
;
break;}
case 67:
#line 395 "Gmsh.y"
{
- Msg(PARSER_INFO, yyvsp[-4].c, yyvsp[-2].d);
+ for(i = 0 ; i<List_Nbr(ListOfDouble_L) ; i++){
+ if(!i){
+ str = strtok(yyvsp[-4].c, "%");
+ fprintf(stderr, str);
+ }
+ str = strtok(NULL, "%");
+ if(str){
+ strcpy(tmpstring, "%");
+ strcat(tmpstring, str);
+ fprintf(stderr, tmpstring, *(double*)List_Pointer(ListOfDouble_L,i));
+ }
+ else{
+ fprintf(stderr, "\n");
+ vyyerror("Missing %d Parameter(s) in Printf Format",
+ List_Nbr(ListOfDouble_L)-i);
+ break ;
+ }
+ }
+ if(!yyerrorstate)
+ fprintf(stderr, "\n");
;
break;}
case 68:
-#line 406 "Gmsh.y"
+#line 425 "Gmsh.y"
{
EndView(1, Force_ViewNumber,yyname,yyvsp[-4].c,0.,0.,0.);
;
break;}
case 69:
-#line 410 "Gmsh.y"
+#line 429 "Gmsh.y"
{
EndView(1, Force_ViewNumber,yyname,yyvsp[-6].c,yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2]);
;
break;}
case 70:
-#line 417 "Gmsh.y"
+#line 436 "Gmsh.y"
{
BeginView(1);
;
break;}
case 83:
-#line 436 "Gmsh.y"
+#line 455 "Gmsh.y"
{ List_Add(ActualView->SP, &yyvsp[0].d) ; ;
break;}
case 84:
-#line 438 "Gmsh.y"
+#line 457 "Gmsh.y"
{ List_Add(ActualView->SP, &yyvsp[0].d) ; ;
break;}
case 85:
-#line 443 "Gmsh.y"
+#line 462 "Gmsh.y"
{
List_Add(ActualView->SP, &yyvsp[-5].d); List_Add(ActualView->SP, &yyvsp[-3].d);
List_Add(ActualView->SP, &yyvsp[-1].d);
;
break;}
case 86:
-#line 448 "Gmsh.y"
+#line 467 "Gmsh.y"
{
ActualView->NbSP++ ;
;
break;}
case 87:
-#line 455 "Gmsh.y"
+#line 474 "Gmsh.y"
{ List_Add(ActualView->VP, &yyvsp[0].d) ; ;
break;}
case 88:
-#line 457 "Gmsh.y"
+#line 476 "Gmsh.y"
{ List_Add(ActualView->VP, &yyvsp[0].d) ; ;
break;}
case 89:
-#line 462 "Gmsh.y"
+#line 481 "Gmsh.y"
{
List_Add(ActualView->VP, &yyvsp[-5].d); List_Add(ActualView->VP, &yyvsp[-3].d);
List_Add(ActualView->VP, &yyvsp[-1].d);
;
break;}
case 90:
-#line 467 "Gmsh.y"
+#line 486 "Gmsh.y"
{
ActualView->NbVP++ ;
;
break;}
case 91:
-#line 474 "Gmsh.y"
+#line 493 "Gmsh.y"
{ List_Add(ActualView->TP, &yyvsp[0].d) ; ;
break;}
case 92:
-#line 476 "Gmsh.y"
+#line 495 "Gmsh.y"
{ List_Add(ActualView->TP, &yyvsp[0].d) ; ;
break;}
case 93:
-#line 481 "Gmsh.y"
+#line 500 "Gmsh.y"
{
List_Add(ActualView->TP, &yyvsp[-5].d); List_Add(ActualView->TP, &yyvsp[-3].d);
List_Add(ActualView->TP, &yyvsp[-1].d);
;
break;}
case 94:
-#line 486 "Gmsh.y"
+#line 505 "Gmsh.y"
{
ActualView->NbTP++ ;
;
break;}
case 95:
-#line 493 "Gmsh.y"
+#line 512 "Gmsh.y"
{ List_Add(ActualView->SL, &yyvsp[0].d) ; ;
break;}
case 96:
-#line 495 "Gmsh.y"
+#line 514 "Gmsh.y"
{ List_Add(ActualView->SL, &yyvsp[0].d) ; ;
break;}
case 97:
-#line 501 "Gmsh.y"
+#line 520 "Gmsh.y"
{
List_Add(ActualView->SL, &yyvsp[-11].d); List_Add(ActualView->SL, &yyvsp[-5].d);
List_Add(ActualView->SL, &yyvsp[-9].d); List_Add(ActualView->SL, &yyvsp[-3].d);
@@ -3496,21 +3552,21 @@ case 97:
;
break;}
case 98:
-#line 507 "Gmsh.y"
+#line 526 "Gmsh.y"
{
ActualView->NbSL++ ;
;
break;}
case 99:
-#line 514 "Gmsh.y"
+#line 533 "Gmsh.y"
{ List_Add(ActualView->VL, &yyvsp[0].d) ; ;
break;}
case 100:
-#line 516 "Gmsh.y"
+#line 535 "Gmsh.y"
{ List_Add(ActualView->VL, &yyvsp[0].d) ; ;
break;}
case 101:
-#line 522 "Gmsh.y"
+#line 541 "Gmsh.y"
{
List_Add(ActualView->SL, &yyvsp[-11].d); List_Add(ActualView->SL, &yyvsp[-5].d);
List_Add(ActualView->SL, &yyvsp[-9].d); List_Add(ActualView->SL, &yyvsp[-3].d);
@@ -3518,21 +3574,21 @@ case 101:
;
break;}
case 102:
-#line 528 "Gmsh.y"
+#line 547 "Gmsh.y"
{
ActualView->NbVL++ ;
;
break;}
case 103:
-#line 535 "Gmsh.y"
+#line 554 "Gmsh.y"
{ List_Add(ActualView->TL, &yyvsp[0].d) ; ;
break;}
case 104:
-#line 537 "Gmsh.y"
+#line 556 "Gmsh.y"
{ List_Add(ActualView->TL, &yyvsp[0].d) ; ;
break;}
case 105:
-#line 543 "Gmsh.y"
+#line 562 "Gmsh.y"
{
List_Add(ActualView->SL, &yyvsp[-11].d); List_Add(ActualView->SL, &yyvsp[-5].d);
List_Add(ActualView->SL, &yyvsp[-9].d); List_Add(ActualView->SL, &yyvsp[-3].d);
@@ -3540,21 +3596,21 @@ case 105:
;
break;}
case 106:
-#line 549 "Gmsh.y"
+#line 568 "Gmsh.y"
{
ActualView->NbTL++ ;
;
break;}
case 107:
-#line 556 "Gmsh.y"
+#line 575 "Gmsh.y"
{ List_Add(ActualView->ST, &yyvsp[0].d) ; ;
break;}
case 108:
-#line 558 "Gmsh.y"
+#line 577 "Gmsh.y"
{ List_Add(ActualView->ST, &yyvsp[0].d) ; ;
break;}
case 109:
-#line 565 "Gmsh.y"
+#line 584 "Gmsh.y"
{
List_Add(ActualView->ST, &yyvsp[-17].d); List_Add(ActualView->ST, &yyvsp[-11].d);
List_Add(ActualView->ST, &yyvsp[-5].d);
@@ -3565,21 +3621,21 @@ case 109:
;
break;}
case 110:
-#line 574 "Gmsh.y"
+#line 593 "Gmsh.y"
{
ActualView->NbST++ ;
;
break;}
case 111:
-#line 581 "Gmsh.y"
+#line 600 "Gmsh.y"
{ List_Add(ActualView->VT, &yyvsp[0].d) ; ;
break;}
case 112:
-#line 583 "Gmsh.y"
+#line 602 "Gmsh.y"
{ List_Add(ActualView->VT, &yyvsp[0].d) ; ;
break;}
case 113:
-#line 590 "Gmsh.y"
+#line 609 "Gmsh.y"
{
List_Add(ActualView->VT, &yyvsp[-17].d); List_Add(ActualView->VT, &yyvsp[-11].d);
List_Add(ActualView->VT, &yyvsp[-5].d);
@@ -3590,21 +3646,21 @@ case 113:
;
break;}
case 114:
-#line 599 "Gmsh.y"
+#line 618 "Gmsh.y"
{
ActualView->NbVT++ ;
;
break;}
case 115:
-#line 606 "Gmsh.y"
+#line 625 "Gmsh.y"
{ List_Add(ActualView->TT, &yyvsp[0].d) ; ;
break;}
case 116:
-#line 608 "Gmsh.y"
+#line 627 "Gmsh.y"
{ List_Add(ActualView->TT, &yyvsp[0].d) ; ;
break;}
case 117:
-#line 615 "Gmsh.y"
+#line 634 "Gmsh.y"
{
List_Add(ActualView->TT, &yyvsp[-17].d); List_Add(ActualView->TT, &yyvsp[-11].d);
List_Add(ActualView->TT, &yyvsp[-5].d);
@@ -3615,21 +3671,21 @@ case 117:
;
break;}
case 118:
-#line 624 "Gmsh.y"
+#line 643 "Gmsh.y"
{
ActualView->NbTT++ ;
;
break;}
case 119:
-#line 631 "Gmsh.y"
+#line 650 "Gmsh.y"
{ List_Add(ActualView->SS, &yyvsp[0].d) ; ;
break;}
case 120:
-#line 633 "Gmsh.y"
+#line 652 "Gmsh.y"
{ List_Add(ActualView->SS, &yyvsp[0].d) ; ;
break;}
case 121:
-#line 641 "Gmsh.y"
+#line 660 "Gmsh.y"
{
List_Add(ActualView->SS, &yyvsp[-23].d); List_Add(ActualView->SS, &yyvsp[-17].d);
List_Add(ActualView->SS, &yyvsp[-11].d); List_Add(ActualView->SS, &yyvsp[-5].d);
@@ -3640,21 +3696,21 @@ case 121:
;
break;}
case 122:
-#line 650 "Gmsh.y"
+#line 669 "Gmsh.y"
{
ActualView->NbSS++ ;
;
break;}
case 123:
-#line 657 "Gmsh.y"
+#line 676 "Gmsh.y"
{ List_Add(ActualView->VS, &yyvsp[0].d) ; ;
break;}
case 124:
-#line 659 "Gmsh.y"
+#line 678 "Gmsh.y"
{ List_Add(ActualView->VS, &yyvsp[0].d) ; ;
break;}
case 125:
-#line 667 "Gmsh.y"
+#line 686 "Gmsh.y"
{
List_Add(ActualView->VS, &yyvsp[-23].d); List_Add(ActualView->VS, &yyvsp[-17].d);
List_Add(ActualView->VS, &yyvsp[-11].d); List_Add(ActualView->VS, &yyvsp[-5].d);
@@ -3665,21 +3721,21 @@ case 125:
;
break;}
case 126:
-#line 676 "Gmsh.y"
+#line 695 "Gmsh.y"
{
ActualView->NbVS++ ;
;
break;}
case 127:
-#line 683 "Gmsh.y"
+#line 702 "Gmsh.y"
{ List_Add(ActualView->TS, &yyvsp[0].d) ; ;
break;}
case 128:
-#line 685 "Gmsh.y"
+#line 704 "Gmsh.y"
{ List_Add(ActualView->TS, &yyvsp[0].d) ; ;
break;}
case 129:
-#line 693 "Gmsh.y"
+#line 712 "Gmsh.y"
{
List_Add(ActualView->TS, &yyvsp[-23].d); List_Add(ActualView->TS, &yyvsp[-17].d);
List_Add(ActualView->TS, &yyvsp[-11].d); List_Add(ActualView->TS, &yyvsp[-5].d);
@@ -3690,13 +3746,13 @@ case 129:
;
break;}
case 130:
-#line 702 "Gmsh.y"
+#line 721 "Gmsh.y"
{
ActualView->NbTS++ ;
;
break;}
case 131:
-#line 718 "Gmsh.y"
+#line 737 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))){
@@ -3710,7 +3766,7 @@ case 131:
;
break;}
case 132:
-#line 730 "Gmsh.y"
+#line 749 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-6].c;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))){
@@ -3724,7 +3780,7 @@ case 132:
;
break;}
case 133:
-#line 742 "Gmsh.y"
+#line 761 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-2].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3735,7 +3791,7 @@ case 133:
;
break;}
case 134:
-#line 751 "Gmsh.y"
+#line 770 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-5].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3749,7 +3805,7 @@ case 134:
;
break;}
case 135:
-#line 763 "Gmsh.y"
+#line 782 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-2].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3759,7 +3815,7 @@ case 135:
;
break;}
case 136:
-#line 771 "Gmsh.y"
+#line 790 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-5].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3773,7 +3829,7 @@ case 136:
;
break;}
case 137:
-#line 783 "Gmsh.y"
+#line 802 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3783,7 +3839,7 @@ case 137:
;
break;}
case 138:
-#line 791 "Gmsh.y"
+#line 810 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-6].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3797,7 +3853,7 @@ case 138:
;
break;}
case 139:
-#line 803 "Gmsh.y"
+#line 822 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3807,7 +3863,7 @@ case 139:
;
break;}
case 140:
-#line 811 "Gmsh.y"
+#line 830 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-6].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3821,7 +3877,7 @@ case 140:
;
break;}
case 141:
-#line 823 "Gmsh.y"
+#line 842 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3831,7 +3887,7 @@ case 141:
;
break;}
case 142:
-#line 831 "Gmsh.y"
+#line 850 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-6].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols)))
@@ -3845,7 +3901,7 @@ case 142:
;
break;}
case 143:
-#line 843 "Gmsh.y"
+#line 862 "Gmsh.y"
{
if(!yyvsp[-1].d)
vyyerror("Division by Zero in '%s /= %g'", yyvsp[-3].c, yyvsp[-1].d);
@@ -3859,7 +3915,7 @@ case 143:
;
break;}
case 144:
-#line 855 "Gmsh.y"
+#line 874 "Gmsh.y"
{
if(!yyvsp[-1].d)
vyyerror("Division by Zero in '%s[%d] /= %g'", yyvsp[-6].c, (int)yyvsp[-4].d, yyvsp[-1].d);
@@ -3877,7 +3933,7 @@ case 144:
;
break;}
case 145:
-#line 874 "Gmsh.y"
+#line 893 "Gmsh.y"
{
if(!(pStrCat = Get_StringOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown String Option Class '%s'", yyvsp[-5].c);
@@ -3891,7 +3947,7 @@ case 145:
;
break;}
case 146:
-#line 887 "Gmsh.y"
+#line 906 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -3908,7 +3964,7 @@ case 146:
;
break;}
case 147:
-#line 905 "Gmsh.y"
+#line 924 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -3927,7 +3983,7 @@ case 147:
;
break;}
case 148:
-#line 922 "Gmsh.y"
+#line 941 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -3949,7 +4005,7 @@ case 148:
;
break;}
case 149:
-#line 943 "Gmsh.y"
+#line 962 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -3968,7 +4024,7 @@ case 149:
;
break;}
case 150:
-#line 960 "Gmsh.y"
+#line 979 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -3990,7 +4046,7 @@ case 150:
;
break;}
case 151:
-#line 981 "Gmsh.y"
+#line 1000 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -4009,7 +4065,7 @@ case 151:
;
break;}
case 152:
-#line 998 "Gmsh.y"
+#line 1017 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4031,7 +4087,7 @@ case 152:
;
break;}
case 153:
-#line 1019 "Gmsh.y"
+#line 1038 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-5].c);
@@ -4050,7 +4106,7 @@ case 153:
;
break;}
case 154:
-#line 1036 "Gmsh.y"
+#line 1055 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4072,7 +4128,7 @@ case 154:
;
break;}
case 155:
-#line 1057 "Gmsh.y"
+#line 1076 "Gmsh.y"
{
if(!yyvsp[-1].d)
vyyerror("Division by Zero in '%s.%s /= %g'", yyvsp[-5].c, yyvsp[-3].c, yyvsp[-1].d);
@@ -4095,7 +4151,7 @@ case 155:
;
break;}
case 156:
-#line 1078 "Gmsh.y"
+#line 1097 "Gmsh.y"
{
if(!yyvsp[-1].d)
vyyerror("Division by Zero in '%s.View[%d].%s /= %g'",
@@ -4122,7 +4178,7 @@ case 156:
;
break;}
case 157:
-#line 1104 "Gmsh.y"
+#line 1123 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-4].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-4].c);
@@ -4141,7 +4197,7 @@ case 157:
;
break;}
case 158:
-#line 1121 "Gmsh.y"
+#line 1140 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4163,7 +4219,7 @@ case 158:
;
break;}
case 159:
-#line 1142 "Gmsh.y"
+#line 1161 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-4].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-4].c);
@@ -4182,7 +4238,7 @@ case 159:
;
break;}
case 160:
-#line 1159 "Gmsh.y"
+#line 1178 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4204,7 +4260,7 @@ case 160:
;
break;}
case 161:
-#line 1182 "Gmsh.y"
+#line 1201 "Gmsh.y"
{
if(!(pArrCat = Get_ArrayOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Array Option Class '%s'", yyvsp[-5].c);
@@ -4231,7 +4287,7 @@ case 161:
;
break;}
case 162:
-#line 1207 "Gmsh.y"
+#line 1226 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4261,7 +4317,7 @@ case 162:
;
break;}
case 163:
-#line 1236 "Gmsh.y"
+#line 1255 "Gmsh.y"
{
if(!(pArrCat = Get_ArrayOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Array Option Class '%s'", yyvsp[-5].c);
@@ -4288,7 +4344,7 @@ case 163:
;
break;}
case 164:
-#line 1261 "Gmsh.y"
+#line 1280 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4318,7 +4374,7 @@ case 164:
;
break;}
case 165:
-#line 1290 "Gmsh.y"
+#line 1309 "Gmsh.y"
{
if(!(pArrCat = Get_ArrayOptionCategory(yyvsp[-5].c)))
vyyerror("Unknown Array Option Class '%s'", yyvsp[-5].c);
@@ -4345,7 +4401,7 @@ case 165:
;
break;}
case 166:
-#line 1315 "Gmsh.y"
+#line 1334 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4375,7 +4431,7 @@ case 166:
;
break;}
case 167:
-#line 1346 "Gmsh.y"
+#line 1365 "Gmsh.y"
{
if(!(pColCat = Get_ColorOptionCategory(yyvsp[-7].c)))
vyyerror("Unknown Color Option Class '%s'", yyvsp[-7].c);
@@ -4389,7 +4445,7 @@ case 167:
;
break;}
case 168:
-#line 1359 "Gmsh.y"
+#line 1378 "Gmsh.y"
{
if(strcmp(yyvsp[-10].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-10].c);
@@ -4409,7 +4465,7 @@ case 168:
;
break;}
case 169:
-#line 1388 "Gmsh.y"
+#line 1407 "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]);
yyval.s.Type = MSH_POINT;
@@ -4417,7 +4473,7 @@ case 169:
;
break;}
case 170:
-#line 1395 "Gmsh.y"
+#line 1414 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_POINT,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_PHYSICAL_POINT;
@@ -4425,7 +4481,7 @@ case 170:
;
break;}
case 171:
-#line 1401 "Gmsh.y"
+#line 1420 "Gmsh.y"
{
Vertex *v;
Attractor *a;
@@ -4446,7 +4502,7 @@ case 171:
;
break;}
case 172:
-#line 1420 "Gmsh.y"
+#line 1439 "Gmsh.y"
{
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
List_Read(yyvsp[-3].l,i,&d);
@@ -4459,14 +4515,14 @@ case 172:
;
break;}
case 173:
-#line 1431 "Gmsh.y"
+#line 1450 "Gmsh.y"
{
yyval.s.Type = MSH_POINT;
yyval.s.Num = (int)yyvsp[-2].d;
;
break;}
case 174:
-#line 1439 "Gmsh.y"
+#line 1458 "Gmsh.y"
{
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;
@@ -4474,7 +4530,7 @@ case 174:
;
break;}
case 175:
-#line 1445 "Gmsh.y"
+#line 1464 "Gmsh.y"
{
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;
@@ -4482,7 +4538,7 @@ case 175:
;
break;}
case 176:
-#line 1451 "Gmsh.y"
+#line 1470 "Gmsh.y"
{
Curve *c;
Attractor *a;
@@ -4503,7 +4559,7 @@ case 176:
;
break;}
case 177:
-#line 1470 "Gmsh.y"
+#line 1489 "Gmsh.y"
{
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 ;
@@ -4511,7 +4567,7 @@ case 177:
;
break;}
case 178:
-#line 1476 "Gmsh.y"
+#line 1495 "Gmsh.y"
{
List_T *temp;
int i,j;
@@ -4529,7 +4585,7 @@ case 178:
;
break;}
case 179:
-#line 1493 "Gmsh.y"
+#line 1512 "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);
yyval.s.Type = MSH_SEGM_PARAMETRIC ;
@@ -4537,7 +4593,7 @@ case 179:
;
break;}
case 180:
-#line 1499 "Gmsh.y"
+#line 1518 "Gmsh.y"
{
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 ;
@@ -4545,7 +4601,7 @@ case 180:
;
break;}
case 181:
-#line 1505 "Gmsh.y"
+#line 1524 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_LINE,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_PHYSICAL_LINE;
@@ -4553,7 +4609,7 @@ case 181:
;
break;}
case 182:
-#line 1511 "Gmsh.y"
+#line 1530 "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);
@@ -4561,7 +4617,7 @@ case 182:
;
break;}
case 183:
-#line 1517 "Gmsh.y"
+#line 1536 "Gmsh.y"
{
Cdbseg101((int)yyvsp[-4].d,MSH_SEGM_BSPLN,2,yyvsp[-1].l,NULL,-1,-1,0.,1.,NULL,NULL,NULL);
yyval.s.Type = MSH_SEGM_BSPLN;
@@ -4569,7 +4625,7 @@ case 183:
;
break;}
case 184:
-#line 1523 "Gmsh.y"
+#line 1542 "Gmsh.y"
{
List_T *Temp;
int i;
@@ -4590,7 +4646,7 @@ case 184:
;
break;}
case 185:
-#line 1542 "Gmsh.y"
+#line 1561 "Gmsh.y"
{
yyval.s.Num = (int)yyvsp[-2].d;
Curve *c = FindCurve(yyval.s.Num,THEM);
@@ -4601,7 +4657,7 @@ case 185:
;
break;}
case 186:
-#line 1554 "Gmsh.y"
+#line 1573 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_SURF_PLAN,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_SURF_PLAN;
@@ -4609,7 +4665,7 @@ case 186:
;
break;}
case 187:
-#line 1560 "Gmsh.y"
+#line 1579 "Gmsh.y"
{
Surface *s,*support;
support = FindSurface((int)yyvsp[-2].d,THEM);
@@ -4630,7 +4686,7 @@ case 187:
;
break;}
case 188:
-#line 1579 "Gmsh.y"
+#line 1598 "Gmsh.y"
{
List_Read(yyvsp[-1].l,0,&d);
i = (int)d;
@@ -4653,7 +4709,7 @@ case 188:
;
break;}
case 189:
-#line 1602 "Gmsh.y"
+#line 1621 "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;
@@ -4661,13 +4717,13 @@ case 189:
;
break;}
case 190:
-#line 1610 "Gmsh.y"
+#line 1629 "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 191:
-#line 1614 "Gmsh.y"
+#line 1633 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_SURFACE,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_PHYSICAL_SURFACE;
@@ -4675,7 +4731,7 @@ case 191:
;
break;}
case 192:
-#line 1620 "Gmsh.y"
+#line 1639 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_SURF_LOOP,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_SURF_LOOP;
@@ -4683,7 +4739,7 @@ case 192:
;
break;}
case 193:
-#line 1626 "Gmsh.y"
+#line 1645 "Gmsh.y"
{
yyval.s.Num = (int)yyvsp[-2].d;
Surface *s = FindSurface(yyval.s.Num,THEM);
@@ -4694,7 +4750,7 @@ case 193:
;
break;}
case 194:
-#line 1638 "Gmsh.y"
+#line 1657 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_VOLUME,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_VOLUME;
@@ -4702,7 +4758,7 @@ case 194:
;
break;}
case 195:
-#line 1644 "Gmsh.y"
+#line 1663 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_VOLUME,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_VOLUME;
@@ -4710,7 +4766,7 @@ case 195:
;
break;}
case 196:
-#line 1650 "Gmsh.y"
+#line 1669 "Gmsh.y"
{
Cdbz101((int)yyvsp[-4].d,MSH_PHYSICAL_VOLUME,0,0,0,0,0,NULL,yyvsp[-1].l,NULL);
yyval.s.Type = MSH_PHYSICAL_VOLUME;
@@ -4718,60 +4774,60 @@ case 196:
;
break;}
case 197:
-#line 1663 "Gmsh.y"
+#line 1682 "Gmsh.y"
{
TranslateShapes (yyvsp[-3].v[0],yyvsp[-3].v[1],yyvsp[-3].v[2],yyvsp[-1].l,1);
yyval.l = yyvsp[-1].l;
;
break;}
case 198:
-#line 1668 "Gmsh.y"
+#line 1687 "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);
yyval.l = yyvsp[-1].l;
;
break;}
case 199:
-#line 1673 "Gmsh.y"
+#line 1692 "Gmsh.y"
{
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 200:
-#line 1678 "Gmsh.y"
+#line 1697 "Gmsh.y"
{
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 201:
-#line 1685 "Gmsh.y"
+#line 1704 "Gmsh.y"
{ yyval.l = yyvsp[0].l; ;
break;}
case 202:
-#line 1686 "Gmsh.y"
+#line 1705 "Gmsh.y"
{ yyval.l = yyvsp[0].l; ;
break;}
case 203:
-#line 1687 "Gmsh.y"
+#line 1706 "Gmsh.y"
{ yyval.l = yyvsp[0].l; ;
break;}
case 204:
-#line 1692 "Gmsh.y"
+#line 1711 "Gmsh.y"
{
yyval.l = List_Create(3,3,sizeof(Shape));
;
break;}
case 205:
-#line 1696 "Gmsh.y"
+#line 1715 "Gmsh.y"
{
List_Add(yyval.l,&yyvsp[0].s);
yyval.l = yyvsp[-1].l;
;
break;}
case 206:
-#line 1708 "Gmsh.y"
+#line 1727 "Gmsh.y"
{
yyval.l = List_Create(3,3,sizeof(Shape));
for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
@@ -4783,7 +4839,7 @@ case 206:
;
break;}
case 207:
-#line 1726 "Gmsh.y"
+#line 1745 "Gmsh.y"
{
for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
List_Read (yyvsp[-1].l,i,&TheShape);
@@ -4792,7 +4848,7 @@ case 207:
;
break;}
case 208:
-#line 1741 "Gmsh.y"
+#line 1760 "Gmsh.y"
{
if(!strcmp(yyvsp[-2].c, "Include")){
@@ -4865,7 +4921,7 @@ case 208:
;
break;}
case 209:
-#line 1812 "Gmsh.y"
+#line 1831 "Gmsh.y"
{
if(!strcmp(yyvsp[-2].c, "Sleep")){
@@ -4887,13 +4943,13 @@ case 209:
;
break;}
case 210:
-#line 1832 "Gmsh.y"
+#line 1851 "Gmsh.y"
{
exit(0);
;
break;}
case 211:
-#line 1836 "Gmsh.y"
+#line 1855 "Gmsh.y"
{
if(!CTX.interactive){ // we're in interactive mode
if(Tree_Nbr(THEM->Points) != Last_NumberOfPoints){
@@ -4908,7 +4964,7 @@ case 211:
;
break;}
case 212:
-#line 1857 "Gmsh.y"
+#line 1876 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4924,7 +4980,7 @@ case 212:
;
break;}
case 213:
-#line 1871 "Gmsh.y"
+#line 1890 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4940,7 +4996,7 @@ case 213:
;
break;}
case 214:
-#line 1885 "Gmsh.y"
+#line 1904 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4967,7 +5023,7 @@ case 214:
;
break;}
case 215:
-#line 1910 "Gmsh.y"
+#line 1929 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4994,7 +5050,7 @@ case 215:
;
break;}
case 216:
-#line 1935 "Gmsh.y"
+#line 1954 "Gmsh.y"
{
if(LoopControlVariablesTab[ImbricatedLoop-1][1] >
LoopControlVariablesTab[ImbricatedLoop-1][0]){
@@ -5022,21 +5078,21 @@ case 216:
;
break;}
case 217:
-#line 1961 "Gmsh.y"
+#line 1980 "Gmsh.y"
{
if(!FunctionManager::Instance()->leaveFunction(&yyin,yylineno))
vyyerror("Error while exiting function");
;
break;}
case 218:
-#line 1966 "Gmsh.y"
+#line 1985 "Gmsh.y"
{
if(!FunctionManager::Instance()->enterFunction(yyvsp[-1].c,&yyin,yylineno))
vyyerror("Unknown Function %s",yyvsp[-1].c);
;
break;}
case 219:
-#line 1971 "Gmsh.y"
+#line 1990 "Gmsh.y"
{
// skip everything until return is found
if(!FunctionManager::Instance()->createFunction(yyvsp[0].c,yyin,yylineno))
@@ -5045,25 +5101,25 @@ case 219:
;
break;}
case 220:
-#line 1978 "Gmsh.y"
+#line 1997 "Gmsh.y"
{
if(!yyvsp[-1].d) skip_until("EndIf");
;
break;}
case 221:
-#line 1982 "Gmsh.y"
+#line 2001 "Gmsh.y"
{
;
break;}
case 222:
-#line 1993 "Gmsh.y"
+#line 2012 "Gmsh.y"
{
Curve *pc, *prc;
Extrude_ProtudePoint(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,&pc,&prc,NULL);
;
break;}
case 223:
-#line 1998 "Gmsh.y"
+#line 2017 "Gmsh.y"
{
Curve *pc, *prc;
Extrude_ProtudePoint(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d,
@@ -5071,55 +5127,55 @@ case 223:
;
break;}
case 224:
-#line 2004 "Gmsh.y"
+#line 2023 "Gmsh.y"
{
Extrude_ProtudeCurve(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,NULL);
;
break;}
case 225:
-#line 2008 "Gmsh.y"
+#line 2027 "Gmsh.y"
{
Extrude_ProtudeCurve(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d,NULL);
;
break;}
case 226:
-#line 2012 "Gmsh.y"
+#line 2031 "Gmsh.y"
{
Extrude_ProtudeSurface(1,(int)yyvsp[-4].d,yyvsp[-2].v[0],yyvsp[-2].v[1],yyvsp[-2].v[2],0.,0.,0.,0.,0,NULL);
;
break;}
case 227:
-#line 2016 "Gmsh.y"
+#line 2035 "Gmsh.y"
{
Extrude_ProtudeSurface(0,(int)yyvsp[-8].d,yyvsp[-6].v[0],yyvsp[-6].v[1],yyvsp[-6].v[2],yyvsp[-4].v[0],yyvsp[-4].v[1],yyvsp[-4].v[2],yyvsp[-2].d,0,NULL);
;
break;}
case 228:
-#line 2020 "Gmsh.y"
+#line 2039 "Gmsh.y"
{
int vol = NEWREG();
Extrude_ProtudeSurface(1,(int)yyvsp[-7].d,yyvsp[-5].v[0],yyvsp[-5].v[1],yyvsp[-5].v[2],0.,0.,0.,0.,vol,&extr);
;
break;}
case 229:
-#line 2025 "Gmsh.y"
+#line 2044 "Gmsh.y"
{
int vol = NEWREG();
Extrude_ProtudeSurface(0,(int)yyvsp[-11].d,yyvsp[-9].v[0],yyvsp[-9].v[1],yyvsp[-9].v[2],yyvsp[-7].v[0],yyvsp[-7].v[1],yyvsp[-7].v[2],yyvsp[-5].d,vol,&extr);
;
break;}
case 230:
-#line 2033 "Gmsh.y"
+#line 2052 "Gmsh.y"
{
;
break;}
case 231:
-#line 2036 "Gmsh.y"
+#line 2055 "Gmsh.y"
{
;
break;}
case 232:
-#line 2042 "Gmsh.y"
+#line 2061 "Gmsh.y"
{
double d;
int j;
@@ -5138,13 +5194,13 @@ case 232:
;
break;}
case 233:
-#line 2059 "Gmsh.y"
+#line 2078 "Gmsh.y"
{
extr.mesh.Recombine = true;
;
break;}
case 234:
-#line 2070 "Gmsh.y"
+#line 2089 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
@@ -5163,7 +5219,7 @@ case 234:
;
break;}
case 235:
-#line 2087 "Gmsh.y"
+#line 2106 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
@@ -5182,7 +5238,7 @@ case 235:
;
break;}
case 236:
-#line 2104 "Gmsh.y"
+#line 2123 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
@@ -5201,7 +5257,7 @@ case 236:
;
break;}
case 237:
-#line 2121 "Gmsh.y"
+#line 2140 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
if(!s)
@@ -5224,7 +5280,7 @@ case 237:
;
break;}
case 238:
-#line 2142 "Gmsh.y"
+#line 2161 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
if(!s)
@@ -5246,7 +5302,7 @@ case 238:
;
break;}
case 239:
-#line 2162 "Gmsh.y"
+#line 2181 "Gmsh.y"
{
Volume *v = FindVolume((int)yyvsp[-4].d,THEM);
if(!v)
@@ -5268,7 +5324,7 @@ case 239:
;
break;}
case 240:
-#line 2182 "Gmsh.y"
+#line 2201 "Gmsh.y"
{
Surface *s;
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
@@ -5287,7 +5343,7 @@ case 240:
;
break;}
case 241:
-#line 2199 "Gmsh.y"
+#line 2218 "Gmsh.y"
{
Surface *s;
for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
@@ -5306,65 +5362,65 @@ case 241:
;
break;}
case 242:
-#line 2224 "Gmsh.y"
+#line 2243 "Gmsh.y"
{
Coherence_PS();
;
break;}
case 243:
-#line 2236 "Gmsh.y"
+#line 2255 "Gmsh.y"
{yyval.i = 1;;
break;}
case 244:
-#line 2237 "Gmsh.y"
+#line 2256 "Gmsh.y"
{yyval.i = 0;;
break;}
case 245:
-#line 2238 "Gmsh.y"
+#line 2257 "Gmsh.y"
{yyval.i = -1;;
break;}
case 246:
-#line 2239 "Gmsh.y"
+#line 2258 "Gmsh.y"
{yyval.i = -1;;
break;}
case 247:
-#line 2240 "Gmsh.y"
+#line 2259 "Gmsh.y"
{yyval.i = -1;;
break;}
case 248:
-#line 2244 "Gmsh.y"
+#line 2263 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 249:
-#line 2245 "Gmsh.y"
+#line 2264 "Gmsh.y"
{ yyval.d = yyvsp[-1].d ; ;
break;}
case 250:
-#line 2246 "Gmsh.y"
+#line 2265 "Gmsh.y"
{ yyval.d = -yyvsp[0].d ; ;
break;}
case 251:
-#line 2247 "Gmsh.y"
+#line 2266 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 252:
-#line 2248 "Gmsh.y"
+#line 2267 "Gmsh.y"
{ yyval.d = !yyvsp[0].d ; ;
break;}
case 253:
-#line 2249 "Gmsh.y"
+#line 2268 "Gmsh.y"
{ yyval.d = yyvsp[-2].d - yyvsp[0].d ; ;
break;}
case 254:
-#line 2250 "Gmsh.y"
+#line 2269 "Gmsh.y"
{ yyval.d = yyvsp[-2].d + yyvsp[0].d ; ;
break;}
case 255:
-#line 2251 "Gmsh.y"
+#line 2270 "Gmsh.y"
{ yyval.d = yyvsp[-2].d * yyvsp[0].d ; ;
break;}
case 256:
-#line 2253 "Gmsh.y"
+#line 2272 "Gmsh.y"
{
if(!yyvsp[0].d)
vyyerror("Division by Zero in '%g / %g'", yyvsp[-2].d, yyvsp[0].d);
@@ -5373,143 +5429,143 @@ case 256:
;
break;}
case 257:
-#line 2259 "Gmsh.y"
+#line 2278 "Gmsh.y"
{ yyval.d = (int)yyvsp[-2].d % (int)yyvsp[0].d ; ;
break;}
case 258:
-#line 2260 "Gmsh.y"
+#line 2279 "Gmsh.y"
{ yyval.d = pow(yyvsp[-2].d,yyvsp[0].d) ; ;
break;}
case 259:
-#line 2261 "Gmsh.y"
+#line 2280 "Gmsh.y"
{ yyval.d = yyvsp[-2].d < yyvsp[0].d ; ;
break;}
case 260:
-#line 2262 "Gmsh.y"
+#line 2281 "Gmsh.y"
{ yyval.d = yyvsp[-2].d > yyvsp[0].d ; ;
break;}
case 261:
-#line 2263 "Gmsh.y"
+#line 2282 "Gmsh.y"
{ yyval.d = yyvsp[-2].d <= yyvsp[0].d ; ;
break;}
case 262:
-#line 2264 "Gmsh.y"
+#line 2283 "Gmsh.y"
{ yyval.d = yyvsp[-2].d >= yyvsp[0].d ; ;
break;}
case 263:
-#line 2265 "Gmsh.y"
+#line 2284 "Gmsh.y"
{ yyval.d = yyvsp[-2].d == yyvsp[0].d ; ;
break;}
case 264:
-#line 2266 "Gmsh.y"
+#line 2285 "Gmsh.y"
{ yyval.d = yyvsp[-2].d != yyvsp[0].d ; ;
break;}
case 265:
-#line 2267 "Gmsh.y"
+#line 2286 "Gmsh.y"
{ yyval.d = yyvsp[-2].d && yyvsp[0].d ; ;
break;}
case 266:
-#line 2268 "Gmsh.y"
+#line 2287 "Gmsh.y"
{ yyval.d = yyvsp[-2].d || yyvsp[0].d ; ;
break;}
case 267:
-#line 2269 "Gmsh.y"
+#line 2288 "Gmsh.y"
{ yyval.d = yyvsp[-4].d? yyvsp[-2].d : yyvsp[0].d ; ;
break;}
case 268:
-#line 2270 "Gmsh.y"
+#line 2289 "Gmsh.y"
{ yyval.d = exp(yyvsp[-1].d); ;
break;}
case 269:
-#line 2271 "Gmsh.y"
+#line 2290 "Gmsh.y"
{ yyval.d = log(yyvsp[-1].d); ;
break;}
case 270:
-#line 2272 "Gmsh.y"
+#line 2291 "Gmsh.y"
{ yyval.d = log10(yyvsp[-1].d); ;
break;}
case 271:
-#line 2273 "Gmsh.y"
+#line 2292 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-1].d); ;
break;}
case 272:
-#line 2274 "Gmsh.y"
+#line 2293 "Gmsh.y"
{ yyval.d = sin(yyvsp[-1].d); ;
break;}
case 273:
-#line 2275 "Gmsh.y"
+#line 2294 "Gmsh.y"
{ yyval.d = asin(yyvsp[-1].d); ;
break;}
case 274:
-#line 2276 "Gmsh.y"
+#line 2295 "Gmsh.y"
{ yyval.d = cos(yyvsp[-1].d); ;
break;}
case 275:
-#line 2277 "Gmsh.y"
+#line 2296 "Gmsh.y"
{ yyval.d = acos(yyvsp[-1].d); ;
break;}
case 276:
-#line 2278 "Gmsh.y"
+#line 2297 "Gmsh.y"
{ yyval.d = tan(yyvsp[-1].d); ;
break;}
case 277:
-#line 2279 "Gmsh.y"
+#line 2298 "Gmsh.y"
{ yyval.d = atan(yyvsp[-1].d); ;
break;}
case 278:
-#line 2280 "Gmsh.y"
+#line 2299 "Gmsh.y"
{ yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 279:
-#line 2281 "Gmsh.y"
+#line 2300 "Gmsh.y"
{ yyval.d = sinh(yyvsp[-1].d); ;
break;}
case 280:
-#line 2282 "Gmsh.y"
+#line 2301 "Gmsh.y"
{ yyval.d = cosh(yyvsp[-1].d); ;
break;}
case 281:
-#line 2283 "Gmsh.y"
+#line 2302 "Gmsh.y"
{ yyval.d = tanh(yyvsp[-1].d); ;
break;}
case 282:
-#line 2284 "Gmsh.y"
+#line 2303 "Gmsh.y"
{ yyval.d = fabs(yyvsp[-1].d); ;
break;}
case 283:
-#line 2285 "Gmsh.y"
+#line 2304 "Gmsh.y"
{ yyval.d = floor(yyvsp[-1].d); ;
break;}
case 284:
-#line 2286 "Gmsh.y"
+#line 2305 "Gmsh.y"
{ yyval.d = ceil(yyvsp[-1].d); ;
break;}
case 285:
-#line 2287 "Gmsh.y"
+#line 2306 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 286:
-#line 2288 "Gmsh.y"
+#line 2307 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 287:
-#line 2289 "Gmsh.y"
+#line 2308 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
break;}
case 288:
-#line 2290 "Gmsh.y"
+#line 2309 "Gmsh.y"
{ yyval.d = yyvsp[-1].d*(double)rand()/(double)RAND_MAX; ;
break;}
case 289:
-#line 2299 "Gmsh.y"
+#line 2318 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 290:
-#line 2300 "Gmsh.y"
+#line 2319 "Gmsh.y"
{ yyval.d = 3.141592653589793; ;
break;}
case 291:
-#line 2305 "Gmsh.y"
+#line 2324 "Gmsh.y"
{
TheSymbol.Name = yyvsp[0].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5523,7 +5579,7 @@ case 291:
;
break;}
case 292:
-#line 2317 "Gmsh.y"
+#line 2336 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-3].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5542,7 +5598,7 @@ case 292:
;
break;}
case 293:
-#line 2335 "Gmsh.y"
+#line 2354 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-1].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5556,7 +5612,7 @@ case 293:
;
break;}
case 294:
-#line 2347 "Gmsh.y"
+#line 2366 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-4].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5575,7 +5631,7 @@ case 294:
;
break;}
case 295:
-#line 2365 "Gmsh.y"
+#line 2384 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-1].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5589,7 +5645,7 @@ case 295:
;
break;}
case 296:
-#line 2377 "Gmsh.y"
+#line 2396 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-4].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -5608,7 +5664,7 @@ case 296:
;
break;}
case 297:
-#line 2397 "Gmsh.y"
+#line 2416 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-2].c))){
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-2].c);
@@ -5631,7 +5687,7 @@ case 297:
;
break;}
case 298:
-#line 2418 "Gmsh.y"
+#line 2437 "Gmsh.y"
{
if(strcmp(yyvsp[-7].c, "PostProcessing")){
vyyerror("Unknown View Option Class '%s'", yyvsp[-7].c);
@@ -5656,7 +5712,7 @@ case 298:
;
break;}
case 299:
-#line 2442 "Gmsh.y"
+#line 2461 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-3].c))){
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-3].c);
@@ -5679,7 +5735,7 @@ case 299:
;
break;}
case 300:
-#line 2463 "Gmsh.y"
+#line 2482 "Gmsh.y"
{
if(strcmp(yyvsp[-8].c, "PostProcessing")){
vyyerror("Unknown View Option Class '%s'", yyvsp[-8].c);
@@ -5704,7 +5760,7 @@ case 300:
;
break;}
case 301:
-#line 2487 "Gmsh.y"
+#line 2506 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-3].c))){
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-3].c);
@@ -5727,7 +5783,7 @@ case 301:
;
break;}
case 302:
-#line 2508 "Gmsh.y"
+#line 2527 "Gmsh.y"
{
if(strcmp(yyvsp[-8].c, "PostProcessing")){
vyyerror("Unknown View Option Class '%s'", yyvsp[-8].c);
@@ -5752,7 +5808,7 @@ case 302:
;
break;}
case 303:
-#line 2534 "Gmsh.y"
+#line 2553 "Gmsh.y"
{
ListOfDouble2_L = List_Create(2,1,sizeof(double)) ;
for(d=yyvsp[-2].d ; (yyvsp[-2].d<yyvsp[0].d)?(d<=yyvsp[0].d):(d>=yyvsp[0].d) ; (yyvsp[-2].d<yyvsp[0].d)?(d+=1.):(d-=1.))
@@ -5760,7 +5816,7 @@ case 303:
;
break;}
case 304:
-#line 2540 "Gmsh.y"
+#line 2559 "Gmsh.y"
{
ListOfDouble2_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)){
@@ -5773,7 +5829,7 @@ case 304:
;
break;}
case 305:
-#line 2554 "Gmsh.y"
+#line 2573 "Gmsh.y"
{
memcpy(yyval.v, yyvsp[0].v, 5*sizeof(double)) ;
//??? Avec ce qui suit, bison se plante sur DEC
@@ -5781,55 +5837,55 @@ case 305:
;
break;}
case 306:
-#line 2560 "Gmsh.y"
+#line 2579 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = -yyvsp[0].v[i] ;
;
break;}
case 307:
-#line 2564 "Gmsh.y"
+#line 2583 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[0].v[i];
;
break;}
case 308:
-#line 2568 "Gmsh.y"
+#line 2587 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[-2].v[i] - yyvsp[0].v[i] ;
;
break;}
case 309:
-#line 2572 "Gmsh.y"
+#line 2591 "Gmsh.y"
{
for(i=0 ; i<5 ; i++) yyval.v[i] = yyvsp[-2].v[i] + yyvsp[0].v[i] ;
;
break;}
case 310:
-#line 2578 "Gmsh.y"
+#line 2597 "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;
;
break;}
case 311:
-#line 2582 "Gmsh.y"
+#line 2601 "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;
;
break;}
case 312:
-#line 2586 "Gmsh.y"
+#line 2605 "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;
;
break;}
case 313:
-#line 2590 "Gmsh.y"
+#line 2609 "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;
;
break;}
case 314:
-#line 2594 "Gmsh.y"
+#line 2613 "Gmsh.y"
{
if(!(pArrCat = Get_ArrayOptionCategory(yyvsp[-2].c))){
vyyerror("Unknown Array Option Class '%s'", yyvsp[-2].c);
@@ -5863,7 +5919,7 @@ case 314:
;
break;}
case 315:
-#line 2626 "Gmsh.y"
+#line 2645 "Gmsh.y"
{
if(strcmp(yyvsp[-7].c, "PostProcessing")){
vyyerror("Unknown View Option Class '%s'", yyvsp[-7].c);
@@ -5900,62 +5956,62 @@ case 315:
;
break;}
case 316:
-#line 2664 "Gmsh.y"
+#line 2683 "Gmsh.y"
{
;
break;}
case 317:
-#line 2667 "Gmsh.y"
+#line 2686 "Gmsh.y"
{
;
break;}
case 318:
-#line 2673 "Gmsh.y"
+#line 2692 "Gmsh.y"
{
;
break;}
case 319:
-#line 2676 "Gmsh.y"
+#line 2695 "Gmsh.y"
{
;
break;}
case 320:
-#line 2682 "Gmsh.y"
+#line 2701 "Gmsh.y"
{
;
break;}
case 321:
-#line 2685 "Gmsh.y"
+#line 2704 "Gmsh.y"
{
yyval.l=ListOfListOfDouble_L;
;
break;}
case 322:
-#line 2689 "Gmsh.y"
+#line 2708 "Gmsh.y"
{
yyval.l=ListOfListOfDouble_L;
;
break;}
case 323:
-#line 2696 "Gmsh.y"
+#line 2715 "Gmsh.y"
{
ListOfListOfDouble_L = List_Create(2,1,sizeof(List_T*)) ;
List_Add(ListOfListOfDouble_L, &(yyvsp[0].l)) ;
;
break;}
case 324:
-#line 2701 "Gmsh.y"
+#line 2720 "Gmsh.y"
{
List_Add(ListOfListOfDouble_L, &(yyvsp[0].l)) ;
;
break;}
case 325:
-#line 2708 "Gmsh.y"
+#line 2727 "Gmsh.y"
{
;
break;}
case 326:
-#line 2711 "Gmsh.y"
+#line 2730 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
@@ -5963,7 +6019,7 @@ case 326:
;
break;}
case 327:
-#line 2717 "Gmsh.y"
+#line 2736 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
TheSymbol.Name = yyvsp[-2].c ;
@@ -5980,20 +6036,20 @@ case 327:
;
break;}
case 328:
-#line 2732 "Gmsh.y"
+#line 2751 "Gmsh.y"
{
yyval.l=ListOfDouble_L;
;
break;}
case 329:
-#line 2740 "Gmsh.y"
+#line 2759 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
;
break;}
case 330:
-#line 2745 "Gmsh.y"
+#line 2764 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
for(i=0 ; i<List_Nbr(ListOfDouble2_L) ; i++){
@@ -6004,7 +6060,7 @@ case 330:
;
break;}
case 331:
-#line 2754 "Gmsh.y"
+#line 2773 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
TheSymbol.Name = yyvsp[-2].c ;
@@ -6018,13 +6074,13 @@ case 331:
;
break;}
case 332:
-#line 2766 "Gmsh.y"
+#line 2785 "Gmsh.y"
{
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
;
break;}
case 333:
-#line 2770 "Gmsh.y"
+#line 2789 "Gmsh.y"
{
for(i=0 ; i<List_Nbr(ListOfDouble2_L) ; i++){
List_Read(ListOfDouble2_L, i, &d) ;
@@ -6034,7 +6090,7 @@ case 333:
;
break;}
case 334:
-#line 2778 "Gmsh.y"
+#line 2797 "Gmsh.y"
{
TheSymbol.Name = yyvsp[-2].c ;
if (!(pSymbol = (Symbol*)List_PQuery(Symbol_L, &TheSymbol, CompareSymbols))) {
@@ -6047,33 +6103,33 @@ case 334:
;
break;}
case 335:
-#line 2792 "Gmsh.y"
+#line 2811 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-7].d, (int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d);
;
break;}
case 336:
-#line 2796 "Gmsh.y"
+#line 2815 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d, 255);
;
break;}
case 337:
-#line 2800 "Gmsh.y"
+#line 2819 "Gmsh.y"
{
yyval.u = Get_ColorForString(ColorString, (int)yyvsp[-1].d, yyvsp[-3].c, &flag);
if(flag) vyyerror("Unknown Color '%s'", yyvsp[-3].c);
;
break;}
case 338:
-#line 2805 "Gmsh.y"
+#line 2824 "Gmsh.y"
{
yyval.u = Get_ColorForString(ColorString, -1, yyvsp[0].c, &flag);
if(flag) vyyerror("Unknown Color '%s'", yyvsp[0].c);
;
break;}
case 339:
-#line 2810 "Gmsh.y"
+#line 2829 "Gmsh.y"
{
if(!(pColCat = Get_ColorOptionCategory(yyvsp[-4].c))){
vyyerror("Unknown Color Option Class '%s'", yyvsp[-4].c);
@@ -6091,13 +6147,13 @@ case 339:
;
break;}
case 340:
-#line 2830 "Gmsh.y"
+#line 2849 "Gmsh.y"
{
yyval.l = ListOfColor_L;
;
break;}
case 341:
-#line 2834 "Gmsh.y"
+#line 2853 "Gmsh.y"
{
if(!ListOfColor_L)
ListOfColor_L = List_Create(256,10,sizeof(unsigned int)) ;
@@ -6118,7 +6174,7 @@ case 341:
;
break;}
case 342:
-#line 2856 "Gmsh.y"
+#line 2875 "Gmsh.y"
{
if(!ListOfColor_L)
ListOfColor_L = List_Create(256,10,sizeof(unsigned int)) ;
@@ -6128,34 +6184,51 @@ case 342:
;
break;}
case 343:
-#line 2864 "Gmsh.y"
+#line 2883 "Gmsh.y"
{
List_Add(ListOfColor_L, &(yyvsp[0].u)) ;
;
break;}
case 344:
-#line 2871 "Gmsh.y"
+#line 2890 "Gmsh.y"
{
yyval.c = yyvsp[0].c;
;
break;}
case 345:
-#line 2875 "Gmsh.y"
+#line 2894 "Gmsh.y"
{
yyval.c = yyvsp[-1].c;
;
break;}
case 346:
-#line 2879 "Gmsh.y"
+#line 2898 "Gmsh.y"
{
- sprintf(tmpstring, yyvsp[-3].c, yyvsp[-1].d);
+ for(i = 0 ; i<List_Nbr(ListOfDouble_L) ; i++){
+ if(!i){
+ str = strtok(yyvsp[-3].c, "%");
+ strcpy(tmpstring, str);
+ }
+ str = strtok(NULL, "%");
+ if(str){
+ strcpy(tmpstring2, "%");
+ strcat(tmpstring2, str);
+ sprintf(tmpstring3, tmpstring2, *(double*)List_Pointer(ListOfDouble_L,i));
+ strcat(tmpstring, tmpstring3);
+ }
+ else{
+ vyyerror("Missing %d Parameter(s) in Sprintf Format",
+ List_Nbr(ListOfDouble_L)-i);
+ break ;
+ }
+ }
yyval.c = (char*)Malloc(strlen(tmpstring));
strcpy(yyval.c, tmpstring);
;
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/local/share/bison.simple"
+#line 543 "/usr/lib/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;
@@ -6350,8 +6423,32 @@ yyerrhandle:
yystate = yyn;
goto yynewstate;
+
+ yyacceptlab:
+ /* YYACCEPT comes here. */
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
+ return 0;
+
+ yyabortlab:
+ /* YYABORT comes here. */
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
+ return 1;
}
-#line 2886 "Gmsh.y"
+#line 2922 "Gmsh.y"
void InitSymbols(void){
diff --git a/Parser/Gmsh.tab.cpp.h b/Parser/Gmsh.tab.cpp.h
index cbf95a15385bc908c0bbab1d7e79d3d734f33395..84546d718039f72a2de3e0e686c43651730116e9 100644
--- a/Parser/Gmsh.tab.cpp.h
+++ b/Parser/Gmsh.tab.cpp.h
@@ -7,166 +7,166 @@ typedef union {
Shape s;
List_T *l;
} YYSTYPE;
-#define tDOUBLE 258
-#define tSTRING 259
-#define tBIGSTR 260
-#define tEND 261
-#define tAFFECT 262
-#define tDOTS 263
-#define tPi 264
-#define tExp 265
-#define tLog 266
-#define tLog10 267
-#define tSqrt 268
-#define tSin 269
-#define tAsin 270
-#define tCos 271
-#define tAcos 272
-#define tTan 273
-#define tRand 274
-#define tAtan 275
-#define tAtan2 276
-#define tSinh 277
-#define tCosh 278
-#define tTanh 279
-#define tFabs 280
-#define tFloor 281
-#define tCeil 282
-#define tFmod 283
-#define tModulo 284
-#define tHypot 285
-#define tPrintf 286
-#define tSprintf 287
-#define tDraw 288
-#define tPoint 289
-#define tCircle 290
-#define tEllipsis 291
-#define tLine 292
-#define tSurface 293
-#define tSpline 294
-#define tVolume 295
-#define tCharacteristic 296
-#define tLength 297
-#define tParametric 298
-#define tElliptic 299
-#define tPlane 300
-#define tRuled 301
-#define tTransfinite 302
-#define tComplex 303
-#define tPhysical 304
-#define tUsing 305
-#define tBump 306
-#define tProgression 307
-#define tRotate 308
-#define tTranslate 309
-#define tSymmetry 310
-#define tDilate 311
-#define tExtrude 312
-#define tDuplicata 313
-#define tLoop 314
-#define tRecombine 315
-#define tDelete 316
-#define tCoherence 317
-#define tView 318
-#define tAttractor 319
-#define tLayers 320
-#define tScalarTetrahedron 321
-#define tVectorTetrahedron 322
-#define tTensorTetrahedron 323
-#define tScalarTriangle 324
-#define tVectorTriangle 325
-#define tTensorTriangle 326
-#define tScalarLine 327
-#define tVectorLine 328
-#define tTensorLine 329
-#define tScalarPoint 330
-#define tVectorPoint 331
-#define tTensorPoint 332
-#define tBSpline 333
-#define tNurbs 334
-#define tOrder 335
-#define tWith 336
-#define tBounds 337
-#define tKnots 338
-#define tColor 339
-#define tFor 340
-#define tIn 341
-#define tEndFor 342
-#define tIf 343
-#define tEndIf 344
-#define tExit 345
-#define tMerge 346
-#define tReturn 347
-#define tCall 348
-#define tFunction 349
-#define tB_SPLINE_SURFACE_WITH_KNOTS 350
-#define tB_SPLINE_CURVE_WITH_KNOTS 351
-#define tCARTESIAN_POINT 352
-#define tTRUE 353
-#define tFALSE 354
-#define tUNSPECIFIED 355
-#define tU 356
-#define tV 357
-#define tEDGE_CURVE 358
-#define tVERTEX_POINT 359
-#define tORIENTED_EDGE 360
-#define tPLANE 361
-#define tFACE_OUTER_BOUND 362
-#define tEDGE_LOOP 363
-#define tADVANCED_FACE 364
-#define tVECTOR 365
-#define tDIRECTION 366
-#define tAXIS2_PLACEMENT_3D 367
-#define tISO 368
-#define tENDISO 369
-#define tENDSEC 370
-#define tDATA 371
-#define tHEADER 372
-#define tFILE_DESCRIPTION 373
-#define tFILE_SCHEMA 374
-#define tFILE_NAME 375
-#define tMANIFOLD_SOLID_BREP 376
-#define tCLOSED_SHELL 377
-#define tADVANCED_BREP_SHAPE_REPRESENTATION 378
-#define tFACE_BOUND 379
-#define tCYLINDRICAL_SURFACE 380
-#define tCONICAL_SURFACE 381
-#define tCIRCLE 382
-#define tTRIMMED_CURVE 383
-#define tGEOMETRIC_SET 384
-#define tCOMPOSITE_CURVE_SEGMENT 385
-#define tCONTINUOUS 386
-#define tCOMPOSITE_CURVE 387
-#define tTOROIDAL_SURFACE 388
-#define tPRODUCT_DEFINITION 389
-#define tPRODUCT_DEFINITION_SHAPE 390
-#define tSHAPE_DEFINITION_REPRESENTATION 391
-#define tELLIPSE 392
-#define tTrimmed 393
-#define tSolid 394
-#define tEndSolid 395
-#define tVertex 396
-#define tFacet 397
-#define tNormal 398
-#define tOuter 399
-#define tLoopSTL 400
-#define tEndLoop 401
-#define tEndFacet 402
-#define tAFFECTPLUS 403
-#define tAFFECTMINUS 404
-#define tAFFECTTIMES 405
-#define tAFFECTDIVIDE 406
-#define tOR 407
-#define tAND 408
-#define tEQUAL 409
-#define tNOTEQUAL 410
-#define tAPPROXEQUAL 411
-#define tLESSOREQUAL 412
-#define tGREATEROREQUAL 413
-#define tCROSSPRODUCT 414
-#define tPLUSPLUS 415
-#define tMINUSMINUS 416
-#define UNARYPREC 417
+#define tDOUBLE 257
+#define tSTRING 258
+#define tBIGSTR 259
+#define tEND 260
+#define tAFFECT 261
+#define tDOTS 262
+#define tPi 263
+#define tExp 264
+#define tLog 265
+#define tLog10 266
+#define tSqrt 267
+#define tSin 268
+#define tAsin 269
+#define tCos 270
+#define tAcos 271
+#define tTan 272
+#define tRand 273
+#define tAtan 274
+#define tAtan2 275
+#define tSinh 276
+#define tCosh 277
+#define tTanh 278
+#define tFabs 279
+#define tFloor 280
+#define tCeil 281
+#define tFmod 282
+#define tModulo 283
+#define tHypot 284
+#define tPrintf 285
+#define tSprintf 286
+#define tDraw 287
+#define tPoint 288
+#define tCircle 289
+#define tEllipsis 290
+#define tLine 291
+#define tSurface 292
+#define tSpline 293
+#define tVolume 294
+#define tCharacteristic 295
+#define tLength 296
+#define tParametric 297
+#define tElliptic 298
+#define tPlane 299
+#define tRuled 300
+#define tTransfinite 301
+#define tComplex 302
+#define tPhysical 303
+#define tUsing 304
+#define tBump 305
+#define tProgression 306
+#define tRotate 307
+#define tTranslate 308
+#define tSymmetry 309
+#define tDilate 310
+#define tExtrude 311
+#define tDuplicata 312
+#define tLoop 313
+#define tRecombine 314
+#define tDelete 315
+#define tCoherence 316
+#define tView 317
+#define tAttractor 318
+#define tLayers 319
+#define tScalarTetrahedron 320
+#define tVectorTetrahedron 321
+#define tTensorTetrahedron 322
+#define tScalarTriangle 323
+#define tVectorTriangle 324
+#define tTensorTriangle 325
+#define tScalarLine 326
+#define tVectorLine 327
+#define tTensorLine 328
+#define tScalarPoint 329
+#define tVectorPoint 330
+#define tTensorPoint 331
+#define tBSpline 332
+#define tNurbs 333
+#define tOrder 334
+#define tWith 335
+#define tBounds 336
+#define tKnots 337
+#define tColor 338
+#define tFor 339
+#define tIn 340
+#define tEndFor 341
+#define tIf 342
+#define tEndIf 343
+#define tExit 344
+#define tMerge 345
+#define tReturn 346
+#define tCall 347
+#define tFunction 348
+#define tB_SPLINE_SURFACE_WITH_KNOTS 349
+#define tB_SPLINE_CURVE_WITH_KNOTS 350
+#define tCARTESIAN_POINT 351
+#define tTRUE 352
+#define tFALSE 353
+#define tUNSPECIFIED 354
+#define tU 355
+#define tV 356
+#define tEDGE_CURVE 357
+#define tVERTEX_POINT 358
+#define tORIENTED_EDGE 359
+#define tPLANE 360
+#define tFACE_OUTER_BOUND 361
+#define tEDGE_LOOP 362
+#define tADVANCED_FACE 363
+#define tVECTOR 364
+#define tDIRECTION 365
+#define tAXIS2_PLACEMENT_3D 366
+#define tISO 367
+#define tENDISO 368
+#define tENDSEC 369
+#define tDATA 370
+#define tHEADER 371
+#define tFILE_DESCRIPTION 372
+#define tFILE_SCHEMA 373
+#define tFILE_NAME 374
+#define tMANIFOLD_SOLID_BREP 375
+#define tCLOSED_SHELL 376
+#define tADVANCED_BREP_SHAPE_REPRESENTATION 377
+#define tFACE_BOUND 378
+#define tCYLINDRICAL_SURFACE 379
+#define tCONICAL_SURFACE 380
+#define tCIRCLE 381
+#define tTRIMMED_CURVE 382
+#define tGEOMETRIC_SET 383
+#define tCOMPOSITE_CURVE_SEGMENT 384
+#define tCONTINUOUS 385
+#define tCOMPOSITE_CURVE 386
+#define tTOROIDAL_SURFACE 387
+#define tPRODUCT_DEFINITION 388
+#define tPRODUCT_DEFINITION_SHAPE 389
+#define tSHAPE_DEFINITION_REPRESENTATION 390
+#define tELLIPSE 391
+#define tTrimmed 392
+#define tSolid 393
+#define tEndSolid 394
+#define tVertex 395
+#define tFacet 396
+#define tNormal 397
+#define tOuter 398
+#define tLoopSTL 399
+#define tEndLoop 400
+#define tEndFacet 401
+#define tAFFECTPLUS 402
+#define tAFFECTMINUS 403
+#define tAFFECTTIMES 404
+#define tAFFECTDIVIDE 405
+#define tOR 406
+#define tAND 407
+#define tEQUAL 408
+#define tNOTEQUAL 409
+#define tAPPROXEQUAL 410
+#define tLESSOREQUAL 411
+#define tGREATEROREQUAL 412
+#define tCROSSPRODUCT 413
+#define tPLUSPLUS 414
+#define tMINUSMINUS 415
+#define UNARYPREC 416
extern YYSTYPE yylval;
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 0feb6b21ff37d0dc268a8280af3bbfa09cffe9af..7699232529bbffdfce408fede54e998046b6bad6 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,4 +1,4 @@
-%{ /* $Id: Gmsh.y,v 1.40 2000-12-11 16:23:15 geuzaine Exp $ */
+%{ /* $Id: Gmsh.y,v 1.41 2000-12-11 19:39:15 geuzaine Exp $ */
#include <stdarg.h>
@@ -37,6 +37,7 @@ static double LoopControlVariablesTab[MAX_OPEN_FILES][3];
static char* LoopControlVariablesNameTab[MAX_OPEN_FILES];
static char yynameTab[MAX_OPEN_FILES][NAME_STR_L];
static char tmpstring[NAME_STR_L];
+static char tmpstring2[NAME_STR_L], tmpstring3[NAME_STR_L];
static Symbol TheSymbol, *pSymbol;
static Surface *STL_Surf;
static Shape TheShape;
@@ -46,7 +47,7 @@ static double d, *pd;
static ExtrudeParams extr;
static List_T *ListOfDouble_L,*ListOfDouble2_L;
static List_T *ListOfListOfDouble_L, *ListOfColor_L=NULL;
-
+static char *str;
static void *pNumOpt, *pArrOpt;
static char **pStrOpt, *pStrViewOpt;
static unsigned int *pColOpt;
@@ -380,8 +381,7 @@ GeomFormat :
| Extrude { return 1; }
| Transfini { return 1; }
| Coherence { return 1; }
- | Loop {return 1;}
-/* | Script { return 1; }*/
+ | Loop { return 1; }
| Command { return 1; }
| error tEND { yyerrok; return 1;}
;
@@ -389,11 +389,30 @@ GeomFormat :
Printf :
tPrintf '(' tBIGSTR ')' tEND
{
- Msg(PARSER_INFO, $3);
+ fprintf(stderr, $3);
}
- | tPrintf '(' tBIGSTR ',' FExpr ')' tEND
+ | tPrintf '(' tBIGSTR ',' RecursiveListOfDouble ')' tEND
{
- Msg(PARSER_INFO, $3, $5);
+ for(i = 0 ; i<List_Nbr(ListOfDouble_L) ; i++){
+ if(!i){
+ str = strtok($3, "%");
+ fprintf(stderr, str);
+ }
+ str = strtok(NULL, "%");
+ if(str){
+ strcpy(tmpstring, "%");
+ strcat(tmpstring, str);
+ fprintf(stderr, tmpstring, *(double*)List_Pointer(ListOfDouble_L,i));
+ }
+ else{
+ fprintf(stderr, "\n");
+ vyyerror("Missing %d Parameter(s) in Printf Format",
+ List_Nbr(ListOfDouble_L)-i);
+ break ;
+ }
+ }
+ if(!yyerrorstate)
+ fprintf(stderr, "\n");
}
;
@@ -2875,9 +2894,26 @@ StringExpr :
{
$$ = $3;
}
- | tSprintf '(' tBIGSTR ',' FExpr ')'
+ | tSprintf '(' tBIGSTR ',' RecursiveListOfDouble ')'
{
- sprintf(tmpstring, $3, $5);
+ for(i = 0 ; i<List_Nbr(ListOfDouble_L) ; i++){
+ if(!i){
+ str = strtok($3, "%");
+ strcpy(tmpstring, str);
+ }
+ str = strtok(NULL, "%");
+ if(str){
+ strcpy(tmpstring2, "%");
+ strcat(tmpstring2, str);
+ sprintf(tmpstring3, tmpstring2, *(double*)List_Pointer(ListOfDouble_L,i));
+ strcat(tmpstring, tmpstring3);
+ }
+ else{
+ vyyerror("Missing %d Parameter(s) in Sprintf Format",
+ List_Nbr(ListOfDouble_L)-i);
+ break ;
+ }
+ }
$$ = (char*)Malloc(strlen(tmpstring));
strcpy($$, tmpstring);
}
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index b4abc69899b14f649680a6cc2e67b917ed52b6bb..b9edc72fa249b28c6548cf33ffdf5be292fc4941 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.44 2000-12-11 16:23:15 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.45 2000-12-11 19:39:15 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -1160,7 +1160,7 @@ YY_MALLOC_DECL
YY_DECL
{
register yy_state_type yy_current_state;
- register char *yy_cp, *yy_bp;
+ register char *yy_cp = NULL, *yy_bp = NULL;
register int yy_act;
#line 60 "Gmsh.l"
diff --git a/tutorial/t5.geo b/tutorial/t5.geo
index 01eec19642c9b3dcb7e602db8e9fec0b3acab1d0..3b81d9e93160fa8df53f3520c2749046a8c6e5ca 100644
--- a/tutorial/t5.geo
+++ b/tutorial/t5.geo
@@ -136,9 +136,15 @@ For t In {1:5}
Physical Volume (t) = thehole ;
// The Printf function permits to print the value of variables on the
-// terminal:
+// terminal, in a way similar to the 'printf' C function:
- Printf("The cheese hole has number %g!", thehole) ;
+ Printf("The cheese hole %g (center = {%g,%g,%g}, radius = %g) has number %g!",
+ t, x, y, z, r, thehole) ;
+
+// Note: All Gmsh variables are treated internally as double precision
+// numbers. The format string should thus only contain valid double
+// precision number format specifiers (see the C or C++ language
+// reference for more details).
EndFor
diff --git a/tutorial/t8.geo b/tutorial/t8.geo
index f58ab3f85bf83cb89abe77c03bcee984d4b8063e..d145f8357e101326d9e3ddbaf7a61441994874f6 100644
--- a/tutorial/t8.geo
+++ b/tutorial/t8.geo
@@ -73,6 +73,11 @@ For num In {1:255}
If (!(num % 20))
+// The Sprintf function permits to create complex strings using
+// variables (since all Gmsh variables are treated internally as
+// double precision numbers, the format should only contain valid
+// double precision number format specifiers):
+
Print Sprintf("t8-%g.gif", num); // print the scene in a gif file
EndIf