From f28bb3a5308d0d203b2cb5ffee7f68558a7d7d9e Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 8 Dec 2000 22:34:53 +0000
Subject: [PATCH] *** empty log message ***
---
Makefile | 4 +-
Parser/Gmsh.tab.cpp.h | 318 +++++++++++++++++++++---------------------
Parser/Gmsh.yy.cpp | 39 ++----
3 files changed, 172 insertions(+), 189 deletions(-)
diff --git a/Makefile b/Makefile
index ef4f58823f..76a64a63cc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.16 2000-12-08 15:06:08 geuzaine Exp $
+# $Id: Makefile,v 1.17 2000-12-08 22:34:53 geuzaine Exp $
# ----------------------------------------------------------------------
# Makefile for Gmsh
# ----------------------------------------------------------------------
@@ -188,7 +188,7 @@ bbn: tag
sgi: tag
@for i in $(GMSH_DIR); do (cd $$i && $(MAKE) \
"CC=CC" \
- "C_FLAGS=-O2 -o32" \
+ "C_FLAGS=-O2 -o32 -Olimit 3000" \
"RANLIB=true"\
"OS_FLAGS=-D_UNIX" \
"VERSION_FLAGS=" \
diff --git a/Parser/Gmsh.tab.cpp.h b/Parser/Gmsh.tab.cpp.h
index 9a9f530bbb..3dbfd324b0 100644
--- a/Parser/Gmsh.tab.cpp.h
+++ b/Parser/Gmsh.tab.cpp.h
@@ -7,165 +7,165 @@ 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 tDraw 287
-#define tSleep 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 tInclude 315
-#define tRecombine 316
-#define tDelete 317
-#define tCoherence 318
-#define tView 319
-#define tAttractor 320
-#define tLayers 321
-#define tScalarTetrahedron 322
-#define tVectorTetrahedron 323
-#define tTensorTetrahedron 324
-#define tScalarTriangle 325
-#define tVectorTriangle 326
-#define tTensorTriangle 327
-#define tScalarLine 328
-#define tVectorLine 329
-#define tTensorLine 330
-#define tScalarPoint 331
-#define tVectorPoint 332
-#define tTensorPoint 333
-#define tBSpline 334
-#define tNurbs 335
-#define tOrder 336
-#define tWith 337
-#define tBounds 338
-#define tKnots 339
-#define tColor 340
-#define tFor 341
-#define tEndFor 342
-#define tScript 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 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 tDraw 286
+#define tSleep 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 tInclude 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 tEndFor 341
+#define tScript 342
+#define tExit 343
+#define tMerge 344
+#define tReturn 345
+#define tCall 346
+#define tFunction 347
+#define tB_SPLINE_SURFACE_WITH_KNOTS 348
+#define tB_SPLINE_CURVE_WITH_KNOTS 349
+#define tCARTESIAN_POINT 350
+#define tTRUE 351
+#define tFALSE 352
+#define tUNSPECIFIED 353
+#define tU 354
+#define tV 355
+#define tEDGE_CURVE 356
+#define tVERTEX_POINT 357
+#define tORIENTED_EDGE 358
+#define tPLANE 359
+#define tFACE_OUTER_BOUND 360
+#define tEDGE_LOOP 361
+#define tADVANCED_FACE 362
+#define tVECTOR 363
+#define tDIRECTION 364
+#define tAXIS2_PLACEMENT_3D 365
+#define tISO 366
+#define tENDISO 367
+#define tENDSEC 368
+#define tDATA 369
+#define tHEADER 370
+#define tFILE_DESCRIPTION 371
+#define tFILE_SCHEMA 372
+#define tFILE_NAME 373
+#define tMANIFOLD_SOLID_BREP 374
+#define tCLOSED_SHELL 375
+#define tADVANCED_BREP_SHAPE_REPRESENTATION 376
+#define tFACE_BOUND 377
+#define tCYLINDRICAL_SURFACE 378
+#define tCONICAL_SURFACE 379
+#define tCIRCLE 380
+#define tTRIMMED_CURVE 381
+#define tGEOMETRIC_SET 382
+#define tCOMPOSITE_CURVE_SEGMENT 383
+#define tCONTINUOUS 384
+#define tCOMPOSITE_CURVE 385
+#define tTOROIDAL_SURFACE 386
+#define tPRODUCT_DEFINITION 387
+#define tPRODUCT_DEFINITION_SHAPE 388
+#define tSHAPE_DEFINITION_REPRESENTATION 389
+#define tELLIPSE 390
+#define tTrimmed 391
+#define tSolid 392
+#define tEndSolid 393
+#define tVertex 394
+#define tFacet 395
+#define tNormal 396
+#define tOuter 397
+#define tLoopSTL 398
+#define tEndLoop 399
+#define tEndFacet 400
+#define tAND 401
+#define tOR 402
+#define tNOTEQUAL 403
+#define tEQUAL 404
+#define tAPPROXEQUAL 405
+#define tAFFECTPLUS 406
+#define tAFFECTMINUS 407
+#define tAFFECTTIMES 408
+#define tAFFECTDIVIDE 409
+#define tLESSOREQUAL 410
+#define tGREATEROREQUAL 411
+#define tCROSSPRODUCT 412
+#define UNARYPREC 413
+#define tPLUSPLUS 414
+#define tMINUSMINUS 415
extern YYSTYPE yylval;
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index cca4365d9e..07acccbdec 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.33 2000-12-08 22:29:50 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.34 2000-12-08 22:31:19 geuzaine Exp $
*/
#define FLEX_SCANNER
@@ -1166,7 +1166,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"
@@ -2530,20 +2530,6 @@ static int input()
#endif
{
int c;
- static int _xpg = -1;
-
- if (_xpg == -1)
- {
- char *_xpgenv = getenv("_XPG");
- if (_xpgenv == NULL)
- _xpg = 0;
- else
- {
- _xpg = atoi(_xpgenv);
- if (_xpg < 0)
- _xpg = 0;
- }
- }
*yy_c_buf_p = yy_hold_char;
@@ -2581,21 +2567,18 @@ static int input()
/* fall through */
case EOB_ACT_END_OF_FILE:
- if (_xpg)
- return 0;
- else
- {
- if ( yywrap() )
- return 0;
-
- if ( ! yy_did_buffer_switch_on_eof )
- YY_NEW_FILE;
+ {
+ if ( yywrap() )
+ return EOF;
+
+ if ( ! yy_did_buffer_switch_on_eof )
+ YY_NEW_FILE;
#ifdef __cplusplus
- return yyinput();
+ return yyinput();
#else
- return input();
+ return input();
#endif
- }
+ }
case EOB_ACT_CONTINUE_SCAN:
yy_c_buf_p = yytext_ptr + offset;
--
GitLab