tPrint -> tPrintf (provisoire)

Makefile

-# $Id: Makefile,v 1.12 2000-12-06 18:28:30 remacle Exp $
+# $Id: Makefile,v 1.13 2000-12-06 22:25:24 geuzaine Exp $
 # ----------------------------------------------------------------------
 #  Makefile for Gmsh  
 # ----------------------------------------------------------------------
@@ -21,8 +21,8 @@
  MESA_STATIC_LIB = $(HOME)/SOURCES/Mesa-3.0-static/lib/libGLw.a\
                    $(HOME)/SOURCES/Mesa-3.0-static/lib/libGLU.a\
                    $(HOME)/SOURCES/Mesa-3.0-static/lib/libGL.a
-       MOTIF_LIB = /usr/local/lib/libXm.so.2
-//       MOTIF_LIB = -L/usr/local/lib -L/usr/X11R6/LessTif/Motif1.2/lib -lXm 
+//       MOTIF_LIB = /usr/local/lib/libXm.so.2
+       MOTIF_LIB = -L/usr/local/lib -L/usr/X11R6/LessTif/Motif1.2/lib -lXm 
            X_LIB = -L/usr/X11R6/lib -lXt -lX11 -lXext
       THREAD_LIB = -L/usr/lib -lpthread
 

Parser/Gmsh.tab.cpp.h

 typedef union {
   char    *c;
   int      i;
+  unsigned int u;
   double   d;
   double   v[5];
   Shape    s;
@@ -33,126 +34,134 @@ typedef union {
 #define	tFmod	281
 #define	tModulo	282
 #define	tHypot	283
-#define	tPoint	284
-#define	tCircle	285
-#define	tEllipsis	286
-#define	tLine	287
-#define	tSurface	288
-#define	tSpline	289
-#define	tVolume	290
-#define	tCharacteristic	291
-#define	tLength	292
-#define	tParametric	293
-#define	tElliptic	294
-#define	tPlane	295
-#define	tRuled	296
-#define	tTransfinite	297
-#define	tComplex	298
-#define	tPhysical	299
-#define	tUsing	300
-#define	tPower	301
+#define	tPrintf	284
+#define	tPoint	285
+#define	tCircle	286
+#define	tEllipsis	287
+#define	tLine	288
+#define	tSurface	289
+#define	tSpline	290
+#define	tVolume	291
+#define	tCharacteristic	292
+#define	tLength	293
+#define	tParametric	294
+#define	tElliptic	295
+#define	tPlane	296
+#define	tRuled	297
+#define	tTransfinite	298
+#define	tComplex	299
+#define	tPhysical	300
+#define	tUsing	301
 #define	tBump	302
 #define	tProgression	303
-#define	tAssociation	304
-#define	tRotate	305
-#define	tTranslate	306
-#define	tSymmetry	307
-#define	tDilate	308
-#define	tExtrude	309
-#define	tDuplicata	310
-#define	tLoop	311
-#define	tInclude	312
-#define	tRecombine	313
-#define	tDelete	314
-#define	tCoherence	315
-#define	tView	316
-#define	tOffset	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	tOptions	339
-#define	tFor	340
-#define	tEndFor	341
-#define	tScript	342
-#define	tExit	343
-#define	tMerge	344
-#define	tGeneral	345
-#define	tGeometry	346
-#define	tMesh	347
-#define	tPostProcessing	348
-#define	tPrint	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	UMINUS	403
+#define	tRotate	304
+#define	tTranslate	305
+#define	tSymmetry	306
+#define	tDilate	307
+#define	tExtrude	308
+#define	tDuplicata	309
+#define	tLoop	310
+#define	tInclude	311
+#define	tRecombine	312
+#define	tDelete	313
+#define	tCoherence	314
+#define	tView	315
+#define	tOffset	316
+#define	tAttractor	317
+#define	tLayers	318
+#define	tScalarTetrahedron	319
+#define	tVectorTetrahedron	320
+#define	tTensorTetrahedron	321
+#define	tScalarTriangle	322
+#define	tVectorTriangle	323
+#define	tTensorTriangle	324
+#define	tScalarLine	325
+#define	tVectorLine	326
+#define	tTensorLine	327
+#define	tScalarPoint	328
+#define	tVectorPoint	329
+#define	tTensorPoint	330
+#define	tBSpline	331
+#define	tNurbs	332
+#define	tOrder	333
+#define	tWith	334
+#define	tBounds	335
+#define	tKnots	336
+#define	tColor	337
+#define	tOptions	338
+#define	tFor	339
+#define	tEndFor	340
+#define	tScript	341
+#define	tExit	342
+#define	tMerge	343
+#define	tB_SPLINE_SURFACE_WITH_KNOTS	344
+#define	tB_SPLINE_CURVE_WITH_KNOTS	345
+#define	tCARTESIAN_POINT	346
+#define	tTRUE	347
+#define	tFALSE	348
+#define	tUNSPECIFIED	349
+#define	tU	350
+#define	tV	351
+#define	tEDGE_CURVE	352
+#define	tVERTEX_POINT	353
+#define	tORIENTED_EDGE	354
+#define	tPLANE	355
+#define	tFACE_OUTER_BOUND	356
+#define	tEDGE_LOOP	357
+#define	tADVANCED_FACE	358
+#define	tVECTOR	359
+#define	tDIRECTION	360
+#define	tAXIS2_PLACEMENT_3D	361
+#define	tISO	362
+#define	tENDISO	363
+#define	tENDSEC	364
+#define	tDATA	365
+#define	tHEADER	366
+#define	tFILE_DESCRIPTION	367
+#define	tFILE_SCHEMA	368
+#define	tFILE_NAME	369
+#define	tMANIFOLD_SOLID_BREP	370
+#define	tCLOSED_SHELL	371
+#define	tADVANCED_BREP_SHAPE_REPRESENTATION	372
+#define	tFACE_BOUND	373
+#define	tCYLINDRICAL_SURFACE	374
+#define	tCONICAL_SURFACE	375
+#define	tCIRCLE	376
+#define	tTRIMMED_CURVE	377
+#define	tGEOMETRIC_SET	378
+#define	tCOMPOSITE_CURVE_SEGMENT	379
+#define	tCONTINUOUS	380
+#define	tCOMPOSITE_CURVE	381
+#define	tTOROIDAL_SURFACE	382
+#define	tPRODUCT_DEFINITION	383
+#define	tPRODUCT_DEFINITION_SHAPE	384
+#define	tSHAPE_DEFINITION_REPRESENTATION	385
+#define	tELLIPSE	386
+#define	tTrimmed	387
+#define	tSolid	388
+#define	tEndSolid	389
+#define	tVertex	390
+#define	tFacet	391
+#define	tNormal	392
+#define	tOuter	393
+#define	tLoopSTL	394
+#define	tEndLoop	395
+#define	tEndFacet	396
+#define	tAFFECTPLUS	397
+#define	tAFFECTMINUS	398
+#define	tAFFECTTIMES	399
+#define	tAFFECTDIVIDE	400
+#define	tAND	401
+#define	tOR	402
+#define	tNOTEQUAL	403
+#define	tEQUAL	404
+#define	tAPPROXEQUAL	405
+#define	tLESSOREQUAL	406
+#define	tGREATEROREQUAL	407
+#define	tCROSSPRODUCT	408
+#define	UNARYPREC	409
+#define	tPLUSPLUS	410
+#define	tMINUSMINUS	411
 
 
 extern YYSTYPE yylval;

Parser/Gmsh.y

-%{ /* $Id: Gmsh.y,v 1.17 2000-12-06 22:09:53 geuzaine Exp $ */
+%{ /* $Id: Gmsh.y,v 1.18 2000-12-06 22:25:24 geuzaine Exp $ */
 
 #include <stdarg.h>
 
@@ -1100,7 +1100,7 @@ Macro :
    ----------------- */
 
 Command :
-   tPrint tBIGSTR tEND
+   tPrintf tBIGSTR tEND
    {
      char ext[6];
      strcpy(ext,$2+(strlen($2)-4));