diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index c7148c411bc95e1fb9a8d4d9fd030440a3f0703f..353a510d1e4f4730aaa517740d18d4dde018eaba 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -1,172 +1,173 @@
/* A Bison parser, made from Gmsh.y
- by GNU Bison version 1.28 */
+ by GNU Bison version 1.25
+ */
#define YYBISON 1 /* Identify Bison output. */
-#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 tAND 402
-#define tOR 403
-#define tNOTEQUAL 404
-#define tEQUAL 405
-#define tAPPROXEQUAL 406
-#define tAFFECTPLUS 407
-#define tAFFECTMINUS 408
-#define tAFFECTTIMES 409
-#define tAFFECTDIVIDE 410
-#define tLESSOREQUAL 411
-#define tGREATEROREQUAL 412
-#define tCROSSPRODUCT 413
-#define UNARYPREC 414
-#define tPLUSPLUS 415
-#define tMINUSMINUS 416
+#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 tAND 403
+#define tOR 404
+#define tNOTEQUAL 405
+#define tEQUAL 406
+#define tAPPROXEQUAL 407
+#define tAFFECTPLUS 408
+#define tAFFECTMINUS 409
+#define tAFFECTTIMES 410
+#define tAFFECTDIVIDE 411
+#define tLESSOREQUAL 412
+#define tGREATEROREQUAL 413
+#define tCROSSPRODUCT 414
+#define UNARYPREC 415
+#define tPLUSPLUS 416
+#define tMINUSMINUS 417
#line 1 "Gmsh.y"
- /* $Id: Gmsh.tab.cpp,v 1.39 2000-12-09 22:26:12 geuzaine Exp $ */
+ /* $Id: Gmsh.tab.cpp,v 1.40 2000-12-10 13:21:31 geuzaine Exp $ */
#include <stdarg.h>
@@ -252,7 +253,7 @@ typedef union {
#define YYFLAG -32768
#define YYNTBASE 181
-#define YYTRANSLATE(x) ((unsigned)(x) <= 416 ? yytranslate[x] : 259)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 417 ? yytranslate[x] : 259)
static const short yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -280,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, 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, 149, 150, 151, 152, 153, 154, 155, 156, 157,
- 160, 161, 167, 168, 171, 172
+ 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, 149, 150, 151, 152, 153, 154, 155, 156,
+ 157, 160, 161, 167, 168, 171, 172
};
#if YYDEBUG != 0
@@ -588,20 +589,20 @@ static const short yyrline[] = { 0,
1369, 1385, 1392, 1398, 1404, 1410, 1416, 1435, 1447, 1453,
1472, 1493, 1501, 1507, 1513, 1519, 1531, 1537, 1543, 1555,
1561, 1566, 1571, 1578, 1580, 1581, 1584, 1589, 1600, 1618,
- 1633, 1702, 1722, 1726, 1745, 1761, 1775, 1797, 1819, 1844,
- 1849, 1854, 1861, 1865, 1875, 1881, 1887, 1891, 1895, 1899,
- 1903, 1908, 1915, 1919, 1924, 1942, 1952, 1970, 1987, 2004,
- 2025, 2045, 2065, 2082, 2106, 2119, 2121, 2122, 2123, 2124,
- 2127, 2129, 2130, 2131, 2132, 2133, 2134, 2135, 2136, 2137,
- 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147,
- 2148, 2149, 2150, 2151, 2152, 2153, 2154, 2155, 2156, 2157,
- 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165, 2166, 2167,
- 2168, 2171, 2173, 2174, 2183, 2200, 2221, 2238, 2259, 2276,
- 2298, 2305, 2318, 2323, 2327, 2331, 2335, 2340, 2345, 2349,
- 2353, 2357, 2383, 2415, 2419, 2424, 2428, 2433, 2437, 2441,
- 2447, 2453, 2459, 2463, 2469, 2476, 2482, 2491, 2495, 2505,
- 2510, 2514, 2519, 2524, 2539, 2544, 2565, 2574, 2580, 2585,
- 2589
+ 1633, 1705, 1725, 1729, 1748, 1764, 1778, 1800, 1822, 1847,
+ 1852, 1857, 1864, 1868, 1878, 1884, 1890, 1894, 1898, 1902,
+ 1906, 1911, 1918, 1922, 1927, 1945, 1955, 1973, 1990, 2007,
+ 2028, 2048, 2068, 2085, 2109, 2122, 2124, 2125, 2126, 2127,
+ 2130, 2132, 2133, 2134, 2135, 2136, 2137, 2138, 2139, 2140,
+ 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149, 2150,
+ 2151, 2152, 2153, 2154, 2155, 2156, 2157, 2158, 2159, 2160,
+ 2161, 2162, 2163, 2164, 2165, 2166, 2167, 2168, 2169, 2170,
+ 2171, 2174, 2176, 2177, 2186, 2203, 2224, 2241, 2262, 2279,
+ 2301, 2308, 2321, 2327, 2331, 2335, 2339, 2344, 2349, 2353,
+ 2357, 2361, 2387, 2419, 2423, 2428, 2432, 2437, 2441, 2445,
+ 2451, 2457, 2463, 2467, 2473, 2480, 2486, 2495, 2499, 2509,
+ 2514, 2518, 2523, 2528, 2543, 2548, 2569, 2578, 2584, 2589,
+ 2593
};
#endif
@@ -2655,8 +2656,7 @@ static const short yycheck[] = { 7,
164, 165, 166, -1, -1, -1, 170
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/lib/bison.simple"
-/* This file comes from bison-1.28. */
+#line 3 "/usr/local/share/bison.simple"
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -2673,66 +2673,46 @@ 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., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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. */
-/* 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 */
+#ifndef alloca
#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) || (defined (__sun) && defined (__i386))
-#define YYSTACK_USE_ALLOCA
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
#include <alloca.h>
#else /* not sparc */
-/* 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. */
+#if defined (MSDOS) && !defined (__TURBOC__)
#include <malloc.h>
-#endif
#else /* not MSDOS, or __TURBOC__ */
#if defined(_AIX)
-/* 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> */
+#include <malloc.h>
#pragma alloca
-#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
+#else /* not MSDOS, __TURBOC__, or _AIX */
+#ifdef __hpux
+#ifdef __cplusplus
+extern "C" {
+void *alloca (unsigned int);
+};
+#else /* not __cplusplus */
+void *alloca ();
+#endif /* not __cplusplus */
#endif /* __hpux */
-#endif
#endif /* not _AIX */
#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc */
-#endif /* not GNU C */
-#endif /* alloca not defined */
-#endif /* YYSTACK_USE_ALLOCA not defined */
+#endif /* not sparc. */
+#endif /* not GNU C. */
+#endif /* alloca not defined. */
-#ifdef YYSTACK_USE_ALLOCA
-#define YYSTACK_ALLOC alloca
-#else
-#define YYSTACK_ALLOC malloc
-#endif
+/* 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. */
/* Note: there must be only one dollar sign in this file.
It is replaced by the list of actions, each action
@@ -2742,8 +2722,8 @@ static const short yycheck[] = { 7,
#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY -2
#define YYEOF 0
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
+#define YYACCEPT return(0)
+#define YYABORT return(1)
#define YYERROR goto yyerrlab1
/* Like YYERROR except do call yyerror.
This remains here temporarily to ease the
@@ -2824,12 +2804,12 @@ int yydebug; /* nonzero means print parse trace */
#ifndef YYMAXDEPTH
#define YYMAXDEPTH 10000
#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. */
+/* Prevent warning if -Wstrict-prototypes. */
+#ifdef __GNUC__
+int yyparse (void);
+#endif
+
#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++ */
@@ -2841,7 +2821,7 @@ static void
__yy_memcpy (to, from, count)
char *to;
char *from;
- unsigned int count;
+ int count;
{
register char *f = from;
register char *t = to;
@@ -2856,10 +2836,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, unsigned int count)
+__yy_memcpy (char *to, char *from, int count)
{
- register char *t = to;
register char *f = from;
+ register char *t = to;
register int i = count;
while (i-- > 0)
@@ -2869,7 +2849,7 @@ __yy_memcpy (char *to, char *from, unsigned int count)
#endif
#endif
-#line 217 "/usr/lib/bison.simple"
+#line 196 "/usr/local/share/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 *.
@@ -2890,15 +2870,6 @@ __yy_memcpy (char *to, char *from, unsigned 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
@@ -2927,7 +2898,6 @@ yyparse(YYPARSE_PARAM_ARG)
#endif
int yystacksize = YYINITDEPTH;
- int yyfree_stacks = 0;
#ifdef YYPURE
int yychar;
@@ -3012,32 +2982,18 @@ 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;
-#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));
+ 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));
#ifdef YYLSP_NEEDED
- yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
- __yy_memcpy ((char *)yyls, (char *)yyls1,
- size * (unsigned int) sizeof (*yylsp));
+ yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
+ __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
#endif
#endif /* no yyoverflow */
@@ -4839,6 +4795,9 @@ case 201:
CreateImage(yyvsp[-1].c,fp);
fclose(fp);
}
+ else{
+ vyyerror("Unable to Open File '%s'", yyvsp[-1].c);
+ }
}
}
@@ -4859,7 +4818,7 @@ case 201:
;
break;}
case 202:
-#line 1703 "Gmsh.y"
+#line 1706 "Gmsh.y"
{
if(!strcmp(yyvsp[-2].c, "Sleep")){
@@ -4881,13 +4840,13 @@ case 202:
;
break;}
case 203:
-#line 1723 "Gmsh.y"
+#line 1726 "Gmsh.y"
{
exit(0);
;
break;}
case 204:
-#line 1727 "Gmsh.y"
+#line 1730 "Gmsh.y"
{
if(!CTX.interactive){ // we're in interactive mode
if(Tree_Nbr(THEM->Points) != Last_NumberOfPoints){
@@ -4902,7 +4861,7 @@ case 204:
;
break;}
case 205:
-#line 1748 "Gmsh.y"
+#line 1751 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4918,7 +4877,7 @@ case 205:
;
break;}
case 206:
-#line 1762 "Gmsh.y"
+#line 1765 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4934,7 +4893,7 @@ case 206:
;
break;}
case 207:
-#line 1776 "Gmsh.y"
+#line 1779 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4958,7 +4917,7 @@ case 207:
;
break;}
case 208:
-#line 1798 "Gmsh.y"
+#line 1801 "Gmsh.y"
{
FILE* ff;
if(RecursionLevel)
@@ -4982,7 +4941,7 @@ case 208:
;
break;}
case 209:
-#line 1820 "Gmsh.y"
+#line 1823 "Gmsh.y"
{
if(LoopControlVariablesTab[ImbricatedLoop-1][1] >
LoopControlVariablesTab[ImbricatedLoop-1][0]){
@@ -5009,21 +4968,21 @@ case 209:
;
break;}
case 210:
-#line 1845 "Gmsh.y"
+#line 1848 "Gmsh.y"
{
if(!FunctionManager::Instance()->leaveFunction(&yyin,yylineno))
vyyerror("Error while exiting function");
;
break;}
case 211:
-#line 1850 "Gmsh.y"
+#line 1853 "Gmsh.y"
{
if(!FunctionManager::Instance()->enterFunction(yyvsp[-1].c,&yyin,yylineno))
vyyerror("Unknown Function %s",yyvsp[-1].c);
;
break;}
case 212:
-#line 1855 "Gmsh.y"
+#line 1858 "Gmsh.y"
{
// skip everything until return is found
if(!FunctionManager::Instance()->createFunction(yyvsp[0].c,yyin,yylineno))
@@ -5032,25 +4991,25 @@ case 212:
;
break;}
case 213:
-#line 1862 "Gmsh.y"
+#line 1865 "Gmsh.y"
{
if(!yyvsp[-1].d) skip_until("EndIf");
;
break;}
case 214:
-#line 1866 "Gmsh.y"
+#line 1869 "Gmsh.y"
{
;
break;}
case 215:
-#line 1877 "Gmsh.y"
+#line 1880 "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 216:
-#line 1882 "Gmsh.y"
+#line 1885 "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,
@@ -5058,55 +5017,55 @@ case 216:
;
break;}
case 217:
-#line 1888 "Gmsh.y"
+#line 1891 "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 218:
-#line 1892 "Gmsh.y"
+#line 1895 "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 219:
-#line 1896 "Gmsh.y"
+#line 1899 "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 220:
-#line 1900 "Gmsh.y"
+#line 1903 "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 221:
-#line 1904 "Gmsh.y"
+#line 1907 "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 222:
-#line 1909 "Gmsh.y"
+#line 1912 "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 223:
-#line 1917 "Gmsh.y"
+#line 1920 "Gmsh.y"
{
;
break;}
case 224:
-#line 1920 "Gmsh.y"
+#line 1923 "Gmsh.y"
{
;
break;}
case 225:
-#line 1926 "Gmsh.y"
+#line 1929 "Gmsh.y"
{
double d;
int j;
@@ -5125,13 +5084,13 @@ case 225:
;
break;}
case 226:
-#line 1943 "Gmsh.y"
+#line 1946 "Gmsh.y"
{
extr.mesh.Recombine = true;
;
break;}
case 227:
-#line 1954 "Gmsh.y"
+#line 1957 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
@@ -5150,7 +5109,7 @@ case 227:
;
break;}
case 228:
-#line 1971 "Gmsh.y"
+#line 1974 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
@@ -5169,7 +5128,7 @@ case 228:
;
break;}
case 229:
-#line 1988 "Gmsh.y"
+#line 1991 "Gmsh.y"
{
Curve *c;
for(i=0;i<List_Nbr(yyvsp[-6].l);i++){
@@ -5188,7 +5147,7 @@ case 229:
;
break;}
case 230:
-#line 2005 "Gmsh.y"
+#line 2008 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
if(!s)
@@ -5211,7 +5170,7 @@ case 230:
;
break;}
case 231:
-#line 2026 "Gmsh.y"
+#line 2029 "Gmsh.y"
{
Surface *s = FindSurface((int)yyvsp[-4].d,THEM);
if(!s)
@@ -5233,7 +5192,7 @@ case 231:
;
break;}
case 232:
-#line 2046 "Gmsh.y"
+#line 2049 "Gmsh.y"
{
Volume *v = FindVolume((int)yyvsp[-4].d,THEM);
if(!v)
@@ -5255,7 +5214,7 @@ case 232:
;
break;}
case 233:
-#line 2066 "Gmsh.y"
+#line 2069 "Gmsh.y"
{
Surface *s;
for(i=0;i<List_Nbr(yyvsp[-3].l);i++){
@@ -5274,7 +5233,7 @@ case 233:
;
break;}
case 234:
-#line 2083 "Gmsh.y"
+#line 2086 "Gmsh.y"
{
Surface *s;
for(i=0;i<List_Nbr(yyvsp[-1].l);i++){
@@ -5293,205 +5252,205 @@ case 234:
;
break;}
case 235:
-#line 2108 "Gmsh.y"
+#line 2111 "Gmsh.y"
{
Coherence_PS();
;
break;}
case 236:
-#line 2120 "Gmsh.y"
+#line 2123 "Gmsh.y"
{yyval.i = 1;;
break;}
case 237:
-#line 2121 "Gmsh.y"
+#line 2124 "Gmsh.y"
{yyval.i = 0;;
break;}
case 238:
-#line 2122 "Gmsh.y"
+#line 2125 "Gmsh.y"
{yyval.i = -1;;
break;}
case 239:
-#line 2123 "Gmsh.y"
+#line 2126 "Gmsh.y"
{yyval.i = -1;;
break;}
case 240:
-#line 2124 "Gmsh.y"
+#line 2127 "Gmsh.y"
{yyval.i = -1;;
break;}
case 241:
-#line 2128 "Gmsh.y"
+#line 2131 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 242:
-#line 2129 "Gmsh.y"
+#line 2132 "Gmsh.y"
{ yyval.d = yyvsp[-1].d ; ;
break;}
case 243:
-#line 2130 "Gmsh.y"
+#line 2133 "Gmsh.y"
{ yyval.d = -yyvsp[0].d ; ;
break;}
case 244:
-#line 2131 "Gmsh.y"
+#line 2134 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 245:
-#line 2132 "Gmsh.y"
+#line 2135 "Gmsh.y"
{ yyval.d = !yyvsp[0].d ; ;
break;}
case 246:
-#line 2133 "Gmsh.y"
+#line 2136 "Gmsh.y"
{ yyval.d = yyvsp[-2].d - yyvsp[0].d ; ;
break;}
case 247:
-#line 2134 "Gmsh.y"
+#line 2137 "Gmsh.y"
{ yyval.d = yyvsp[-2].d + yyvsp[0].d ; ;
break;}
case 248:
-#line 2135 "Gmsh.y"
+#line 2138 "Gmsh.y"
{ yyval.d = yyvsp[-2].d * yyvsp[0].d ; ;
break;}
case 249:
-#line 2136 "Gmsh.y"
+#line 2139 "Gmsh.y"
{ yyval.d = yyvsp[-2].d / yyvsp[0].d ; ;
break;}
case 250:
-#line 2137 "Gmsh.y"
+#line 2140 "Gmsh.y"
{ yyval.d = (int)yyvsp[-2].d % (int)yyvsp[0].d ; ;
break;}
case 251:
-#line 2138 "Gmsh.y"
+#line 2141 "Gmsh.y"
{ yyval.d = pow(yyvsp[-2].d,yyvsp[0].d) ; ;
break;}
case 252:
-#line 2139 "Gmsh.y"
+#line 2142 "Gmsh.y"
{ yyval.d = yyvsp[-2].d < yyvsp[0].d ; ;
break;}
case 253:
-#line 2140 "Gmsh.y"
+#line 2143 "Gmsh.y"
{ yyval.d = yyvsp[-2].d > yyvsp[0].d ; ;
break;}
case 254:
-#line 2141 "Gmsh.y"
+#line 2144 "Gmsh.y"
{ yyval.d = yyvsp[-2].d <= yyvsp[0].d ; ;
break;}
case 255:
-#line 2142 "Gmsh.y"
+#line 2145 "Gmsh.y"
{ yyval.d = yyvsp[-2].d >= yyvsp[0].d ; ;
break;}
case 256:
-#line 2143 "Gmsh.y"
+#line 2146 "Gmsh.y"
{ yyval.d = yyvsp[-2].d == yyvsp[0].d ; ;
break;}
case 257:
-#line 2144 "Gmsh.y"
+#line 2147 "Gmsh.y"
{ yyval.d = yyvsp[-2].d != yyvsp[0].d ; ;
break;}
case 258:
-#line 2145 "Gmsh.y"
+#line 2148 "Gmsh.y"
{ yyval.d = yyvsp[-2].d && yyvsp[0].d ; ;
break;}
case 259:
-#line 2146 "Gmsh.y"
+#line 2149 "Gmsh.y"
{ yyval.d = yyvsp[-2].d || yyvsp[0].d ; ;
break;}
case 260:
-#line 2147 "Gmsh.y"
+#line 2150 "Gmsh.y"
{ yyval.d = yyvsp[-4].d? yyvsp[-2].d : yyvsp[0].d ; ;
break;}
case 261:
-#line 2148 "Gmsh.y"
+#line 2151 "Gmsh.y"
{ yyval.d = exp(yyvsp[-1].d); ;
break;}
case 262:
-#line 2149 "Gmsh.y"
+#line 2152 "Gmsh.y"
{ yyval.d = log(yyvsp[-1].d); ;
break;}
case 263:
-#line 2150 "Gmsh.y"
+#line 2153 "Gmsh.y"
{ yyval.d = log10(yyvsp[-1].d); ;
break;}
case 264:
-#line 2151 "Gmsh.y"
+#line 2154 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-1].d); ;
break;}
case 265:
-#line 2152 "Gmsh.y"
+#line 2155 "Gmsh.y"
{ yyval.d = sin(yyvsp[-1].d); ;
break;}
case 266:
-#line 2153 "Gmsh.y"
+#line 2156 "Gmsh.y"
{ yyval.d = asin(yyvsp[-1].d); ;
break;}
case 267:
-#line 2154 "Gmsh.y"
+#line 2157 "Gmsh.y"
{ yyval.d = cos(yyvsp[-1].d); ;
break;}
case 268:
-#line 2155 "Gmsh.y"
+#line 2158 "Gmsh.y"
{ yyval.d = acos(yyvsp[-1].d); ;
break;}
case 269:
-#line 2156 "Gmsh.y"
+#line 2159 "Gmsh.y"
{ yyval.d = tan(yyvsp[-1].d); ;
break;}
case 270:
-#line 2157 "Gmsh.y"
+#line 2160 "Gmsh.y"
{ yyval.d = atan(yyvsp[-1].d); ;
break;}
case 271:
-#line 2158 "Gmsh.y"
+#line 2161 "Gmsh.y"
{ yyval.d = atan2(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 272:
-#line 2159 "Gmsh.y"
+#line 2162 "Gmsh.y"
{ yyval.d = sinh(yyvsp[-1].d); ;
break;}
case 273:
-#line 2160 "Gmsh.y"
+#line 2163 "Gmsh.y"
{ yyval.d = cosh(yyvsp[-1].d); ;
break;}
case 274:
-#line 2161 "Gmsh.y"
+#line 2164 "Gmsh.y"
{ yyval.d = tanh(yyvsp[-1].d); ;
break;}
case 275:
-#line 2162 "Gmsh.y"
+#line 2165 "Gmsh.y"
{ yyval.d = fabs(yyvsp[-1].d); ;
break;}
case 276:
-#line 2163 "Gmsh.y"
+#line 2166 "Gmsh.y"
{ yyval.d = floor(yyvsp[-1].d); ;
break;}
case 277:
-#line 2164 "Gmsh.y"
+#line 2167 "Gmsh.y"
{ yyval.d = ceil(yyvsp[-1].d); ;
break;}
case 278:
-#line 2165 "Gmsh.y"
+#line 2168 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 279:
-#line 2166 "Gmsh.y"
+#line 2169 "Gmsh.y"
{ yyval.d = fmod(yyvsp[-3].d,yyvsp[-1].d); ;
break;}
case 280:
-#line 2167 "Gmsh.y"
+#line 2170 "Gmsh.y"
{ yyval.d = sqrt(yyvsp[-3].d*yyvsp[-3].d+yyvsp[-1].d*yyvsp[-1].d); ;
break;}
case 281:
-#line 2168 "Gmsh.y"
+#line 2171 "Gmsh.y"
{ yyval.d = yyvsp[-1].d*(double)rand()/(double)RAND_MAX; ;
break;}
case 282:
-#line 2172 "Gmsh.y"
+#line 2175 "Gmsh.y"
{ yyval.d = yyvsp[0].d; ;
break;}
case 283:
-#line 2173 "Gmsh.y"
+#line 2176 "Gmsh.y"
{ yyval.d = 3.141592653589793; ;
break;}
case 284:
-#line 2175 "Gmsh.y"
+#line 2178 "Gmsh.y"
{
TheSymbol.Name = yyvsp[0].c ;
if (!List_Query(Symbol_L, &TheSymbol, CompareSymbols)) {
@@ -5502,7 +5461,7 @@ case 284:
;
break;}
case 285:
-#line 2184 "Gmsh.y"
+#line 2187 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-2].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-2].c);
@@ -5521,7 +5480,7 @@ case 285:
;
break;}
case 286:
-#line 2201 "Gmsh.y"
+#line 2204 "Gmsh.y"
{
if(strcmp(yyvsp[-7].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-7].c);
@@ -5543,7 +5502,7 @@ case 286:
;
break;}
case 287:
-#line 2222 "Gmsh.y"
+#line 2225 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-3].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-3].c);
@@ -5562,7 +5521,7 @@ case 287:
;
break;}
case 288:
-#line 2239 "Gmsh.y"
+#line 2242 "Gmsh.y"
{
if(strcmp(yyvsp[-8].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-8].c);
@@ -5584,7 +5543,7 @@ case 288:
;
break;}
case 289:
-#line 2260 "Gmsh.y"
+#line 2263 "Gmsh.y"
{
if(!(pNumCat = Get_NumberOptionCategory(yyvsp[-3].c)))
vyyerror("Unknown Numeric Option Class '%s'", yyvsp[-3].c);
@@ -5603,7 +5562,7 @@ case 289:
;
break;}
case 290:
-#line 2277 "Gmsh.y"
+#line 2280 "Gmsh.y"
{
if(strcmp(yyvsp[-8].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-8].c);
@@ -5625,7 +5584,7 @@ case 290:
;
break;}
case 291:
-#line 2300 "Gmsh.y"
+#line 2303 "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.))
@@ -5633,7 +5592,7 @@ case 291:
;
break;}
case 292:
-#line 2306 "Gmsh.y"
+#line 2309 "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)){
@@ -5646,61 +5605,62 @@ case 292:
;
break;}
case 293:
-#line 2320 "Gmsh.y"
+#line 2323 "Gmsh.y"
{
- for(i=0 ; i<6 ; i++) yyval.v[i] = yyvsp[0].v[i];
+ yyval.v = yyvsp[0].v ;
+ //for(i=0 ; i<6 ; i++) $$[i] = $1[i];
;
break;}
case 294:
-#line 2324 "Gmsh.y"
+#line 2328 "Gmsh.y"
{
for(i=0 ; i<6 ; i++) yyval.v[i] = -yyvsp[0].v[i] ;
;
break;}
case 295:
-#line 2328 "Gmsh.y"
+#line 2332 "Gmsh.y"
{
for(i=0 ; i<6 ; i++) yyval.v[i] = yyvsp[0].v[i];
;
break;}
case 296:
-#line 2332 "Gmsh.y"
+#line 2336 "Gmsh.y"
{
for(i=0 ; i<6 ; i++) yyval.v[i] = yyvsp[-2].v[i] - yyvsp[0].v[i] ;
;
break;}
case 297:
-#line 2336 "Gmsh.y"
+#line 2340 "Gmsh.y"
{
for(i=0 ; i<6 ; i++) yyval.v[i] = yyvsp[-2].v[i] + yyvsp[0].v[i] ;
;
break;}
case 298:
-#line 2342 "Gmsh.y"
+#line 2346 "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 299:
-#line 2346 "Gmsh.y"
+#line 2350 "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 300:
-#line 2350 "Gmsh.y"
+#line 2354 "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 301:
-#line 2354 "Gmsh.y"
+#line 2358 "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 302:
-#line 2358 "Gmsh.y"
+#line 2362 "Gmsh.y"
{
if(!(pArrCat = Get_ArrayOptionCategory(yyvsp[-2].c)))
vyyerror("Unknown Array Option Class '%s'", yyvsp[-2].c);
@@ -5728,7 +5688,7 @@ case 302:
;
break;}
case 303:
-#line 2384 "Gmsh.y"
+#line 2388 "Gmsh.y"
{
if(strcmp(yyvsp[-7].c, "PostProcessing"))
vyyerror("Unknown View Option Class '%s'", yyvsp[-7].c);
@@ -5760,62 +5720,62 @@ case 303:
;
break;}
case 304:
-#line 2417 "Gmsh.y"
+#line 2421 "Gmsh.y"
{
;
break;}
case 305:
-#line 2420 "Gmsh.y"
+#line 2424 "Gmsh.y"
{
;
break;}
case 306:
-#line 2426 "Gmsh.y"
+#line 2430 "Gmsh.y"
{
;
break;}
case 307:
-#line 2429 "Gmsh.y"
+#line 2433 "Gmsh.y"
{
;
break;}
case 308:
-#line 2435 "Gmsh.y"
+#line 2439 "Gmsh.y"
{
;
break;}
case 309:
-#line 2438 "Gmsh.y"
+#line 2442 "Gmsh.y"
{
yyval.l=ListOfListOfDouble_L;
;
break;}
case 310:
-#line 2442 "Gmsh.y"
+#line 2446 "Gmsh.y"
{
yyval.l=ListOfListOfDouble_L;
;
break;}
case 311:
-#line 2449 "Gmsh.y"
+#line 2453 "Gmsh.y"
{
ListOfListOfDouble_L = List_Create(2,1,sizeof(List_T*)) ;
List_Add(ListOfListOfDouble_L, &(yyvsp[0].l)) ;
;
break;}
case 312:
-#line 2454 "Gmsh.y"
+#line 2458 "Gmsh.y"
{
List_Add(ListOfListOfDouble_L, &(yyvsp[0].l)) ;
;
break;}
case 313:
-#line 2461 "Gmsh.y"
+#line 2465 "Gmsh.y"
{
;
break;}
case 314:
-#line 2464 "Gmsh.y"
+#line 2468 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
@@ -5823,20 +5783,20 @@ case 314:
;
break;}
case 315:
-#line 2470 "Gmsh.y"
+#line 2474 "Gmsh.y"
{
yyval.l=ListOfDouble_L;
;
break;}
case 316:
-#line 2478 "Gmsh.y"
+#line 2482 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
;
break;}
case 317:
-#line 2483 "Gmsh.y"
+#line 2487 "Gmsh.y"
{
ListOfDouble_L = List_Create(2,1,sizeof(double)) ;
for(i=0 ; i<List_Nbr(ListOfDouble2_L) ; i++){
@@ -5847,13 +5807,13 @@ case 317:
;
break;}
case 318:
-#line 2492 "Gmsh.y"
+#line 2496 "Gmsh.y"
{
List_Add(ListOfDouble_L, &(yyvsp[0].d)) ;
;
break;}
case 319:
-#line 2496 "Gmsh.y"
+#line 2500 "Gmsh.y"
{
for(i=0 ; i<List_Nbr(ListOfDouble2_L) ; i++){
List_Read(ListOfDouble2_L, i, &d) ;
@@ -5863,33 +5823,33 @@ case 319:
;
break;}
case 320:
-#line 2507 "Gmsh.y"
+#line 2511 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-7].d, (int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d);
;
break;}
case 321:
-#line 2511 "Gmsh.y"
+#line 2515 "Gmsh.y"
{
yyval.u = PACK_COLOR((int)yyvsp[-5].d, (int)yyvsp[-3].d, (int)yyvsp[-1].d, 255);
;
break;}
case 322:
-#line 2515 "Gmsh.y"
+#line 2519 "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 323:
-#line 2520 "Gmsh.y"
+#line 2524 "Gmsh.y"
{
yyval.u = Get_ColorForString(ColorString, -1, yyvsp[0].c, &flag);
if(flag) vyyerror("Unknown Color '%s'", yyvsp[0].c);
;
break;}
case 324:
-#line 2525 "Gmsh.y"
+#line 2529 "Gmsh.y"
{
if(!(pColCat = Get_ColorOptionCategory(yyvsp[-4].c)))
vyyerror("Unknown Color Option Class '%s'", yyvsp[-4].c);
@@ -5903,13 +5863,13 @@ case 324:
;
break;}
case 325:
-#line 2541 "Gmsh.y"
+#line 2545 "Gmsh.y"
{
yyval.l = ListOfColor_L;
;
break;}
case 326:
-#line 2545 "Gmsh.y"
+#line 2549 "Gmsh.y"
{
if(!ListOfColor_L)
ListOfColor_L = List_Create(256,10,sizeof(unsigned int)) ;
@@ -5930,7 +5890,7 @@ case 326:
;
break;}
case 327:
-#line 2567 "Gmsh.y"
+#line 2571 "Gmsh.y"
{
if(!ListOfColor_L)
ListOfColor_L = List_Create(256,10,sizeof(unsigned int)) ;
@@ -5940,25 +5900,25 @@ case 327:
;
break;}
case 328:
-#line 2575 "Gmsh.y"
+#line 2579 "Gmsh.y"
{
List_Add(ListOfColor_L, &(yyvsp[0].u)) ;
;
break;}
case 329:
-#line 2582 "Gmsh.y"
+#line 2586 "Gmsh.y"
{
yyval.c = yyvsp[0].c;
;
break;}
case 330:
-#line 2586 "Gmsh.y"
+#line 2590 "Gmsh.y"
{
yyval.c = yyvsp[-1].c;
;
break;}
case 331:
-#line 2590 "Gmsh.y"
+#line 2594 "Gmsh.y"
{
sprintf(tmpstring, yyvsp[-3].c, yyvsp[-1].d);
yyval.c = (char*)Malloc(strlen(tmpstring));
@@ -5967,7 +5927,7 @@ case 331:
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 543 "/usr/lib/bison.simple"
+#line 498 "/usr/local/share/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;
@@ -6162,32 +6122,8 @@ 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 2597 "Gmsh.y"
+#line 2601 "Gmsh.y"
void InitSymbols(void){
diff --git a/Parser/Gmsh.tab.cpp.h b/Parser/Gmsh.tab.cpp.h
index 4af43ae30d3184476027b7ec8495c0d718d5f19e..fd2234b83985ace8a3fef36e63d430edbcffa114 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 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 tAND 402
-#define tOR 403
-#define tNOTEQUAL 404
-#define tEQUAL 405
-#define tAPPROXEQUAL 406
-#define tAFFECTPLUS 407
-#define tAFFECTMINUS 408
-#define tAFFECTTIMES 409
-#define tAFFECTDIVIDE 410
-#define tLESSOREQUAL 411
-#define tGREATEROREQUAL 412
-#define tCROSSPRODUCT 413
-#define UNARYPREC 414
-#define tPLUSPLUS 415
-#define tMINUSMINUS 416
+#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 tAND 403
+#define tOR 404
+#define tNOTEQUAL 405
+#define tEQUAL 406
+#define tAPPROXEQUAL 407
+#define tAFFECTPLUS 408
+#define tAFFECTMINUS 409
+#define tAFFECTTIMES 410
+#define tAFFECTDIVIDE 411
+#define tLESSOREQUAL 412
+#define tGREATEROREQUAL 413
+#define tCROSSPRODUCT 414
+#define UNARYPREC 415
+#define tPLUSPLUS 416
+#define tMINUSMINUS 417
extern YYSTYPE yylval;
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index c3a8e67463c57c75752cf613939e3bdba9c1d738..1628f29bdd055a691adf8d9e71dc85e84473aefe 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1,4 +1,4 @@
-%{ /* $Id: Gmsh.y,v 1.35 2000-12-09 22:26:12 geuzaine Exp $ */
+%{ /* $Id: Gmsh.y,v 1.36 2000-12-10 13:21:31 geuzaine Exp $ */
#include <stdarg.h>
@@ -2321,7 +2321,9 @@ FExpr_Range :
VExpr :
VExpr_Single
{
- for(i=0 ; i<6 ; i++) $$[i] = $1[i];
+ $$ = $1 ;
+ //??? Avec ce qui siut (qui est correct), bison se plante sur DEC
+ //for(i=0 ; i<6 ; i++) $$[i] = $1[i];
}
| '-' VExpr %prec UNARYPREC
{
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 0a87b4ded016c425bde88f6a291d6f5874277e8f..d86aeb491a9dd5a6f8c26f9a8aa02f434a3094d3 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.39 2000-12-09 22:26:13 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.40 2000-12-10 13:21:31 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 = NULL, *yy_bp = NULL;
+ register char *yy_cp, *yy_bp;
register int yy_act;
#line 60 "Gmsh.l"