suppressed tmerge

Parser/Gmsh.tab.cpp.h

@@ -7,96 +7,95 @@ 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	tIntersect	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	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	tIntersect	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	tIn	342
+#define	tEndFor	343
+#define	tIf	344
+#define	tEndIf	345
+#define	tExit	346
 #define	tReturn	347
 #define	tCall	348
 #define	tFunction	349

Parser/Gmsh.y

-%{ /* $Id: Gmsh.y,v 1.43 2000-12-13 22:27:45 geuzaine Exp $ */
+%{ /* $Id: Gmsh.y,v 1.44 2000-12-14 12:25:15 geuzaine Exp $ */
 
 #include <stdarg.h>
 
@@ -90,7 +90,7 @@ void skip_until (char *until);
 %token tScalarLine tVectorLine tTensorLine
 %token tScalarPoint tVectorPoint tTensorPoint
 %token tBSpline tNurbs tOrder tWith tBounds tKnots
-%token tColor tFor tIn tEndFor tIf tEndIf tExit tMerge
+%token tColor tFor tIn tEndFor tIf tEndIf tExit
 %token tReturn tCall tFunction
 
 %token tB_SPLINE_SURFACE_WITH_KNOTS

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.47 2000-12-13 22:27:45 geuzaine Exp $
+ * $Header: /cvsroot/gmsh/Parser/Gmsh.yy.cpp,v 1.48 2000-12-14 12:25:15 geuzaine Exp $
  */
 
 #define FLEX_SCANNER
@@ -1163,7 +1163,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"