remove tPoints token -- it conflicts with options ; use tPoint instead

Parser/Gmsh.l

@@ -176,7 +176,6 @@ Physical                return tPhysical;
 Pi                      return tPi;
 Plane                   return tPlane;
 Point                   return tPoint;
-Points                  return tPoints;
 Parametric		return tParametric;
 PolarSphere             return tPolarSphere;
 Printf                  return tPrintf;

Parser/Gmsh.tab.hpp

@@ -112,69 +112,68 @@
      tDilate = 329,
      tExtrude = 330,
      tLevelset = 331,
-     tPoints = 332,
-     tLoop = 333,
-     tRecombine = 334,
-     tSmoother = 335,
-     tSplit = 336,
-     tDelete = 337,
-     tCoherence = 338,
-     tIntersect = 339,
-     tLayers = 340,
-     tHole = 341,
-     tAlias = 342,
-     tAliasWithOptions = 343,
-     tQuadTriDbl = 344,
-     tQuadTriSngl = 345,
-     tRecombLaterals = 346,
-     tTransfQuadTri = 347,
-     tText2D = 348,
-     tText3D = 349,
-     tInterpolationScheme = 350,
-     tTime = 351,
-     tCombine = 352,
-     tBSpline = 353,
-     tBezier = 354,
-     tNurbs = 355,
-     tNurbsOrder = 356,
-     tNurbsKnots = 357,
-     tColor = 358,
-     tColorTable = 359,
-     tFor = 360,
-     tIn = 361,
-     tEndFor = 362,
-     tIf = 363,
-     tEndIf = 364,
-     tExit = 365,
-     tField = 366,
-     tReturn = 367,
-     tCall = 368,
-     tFunction = 369,
-     tShow = 370,
-     tHide = 371,
-     tGetValue = 372,
-     tGetEnv = 373,
-     tGetString = 374,
-     tGMSH_MAJOR_VERSION = 375,
-     tGMSH_MINOR_VERSION = 376,
-     tGMSH_PATCH_VERSION = 377,
-     tHomRank = 378,
-     tHomGen = 379,
-     tHomCut = 380,
-     tHomSeq = 381,
-     tAFFECTDIVIDE = 382,
-     tAFFECTTIMES = 383,
-     tAFFECTMINUS = 384,
-     tAFFECTPLUS = 385,
-     tOR = 386,
-     tAND = 387,
-     tNOTEQUAL = 388,
-     tEQUAL = 389,
-     tGREATEROREQUAL = 390,
-     tLESSOREQUAL = 391,
-     UNARYPREC = 392,
-     tMINUSMINUS = 393,
-     tPLUSPLUS = 394
+     tLoop = 332,
+     tRecombine = 333,
+     tSmoother = 334,
+     tSplit = 335,
+     tDelete = 336,
+     tCoherence = 337,
+     tIntersect = 338,
+     tLayers = 339,
+     tHole = 340,
+     tAlias = 341,
+     tAliasWithOptions = 342,
+     tQuadTriDbl = 343,
+     tQuadTriSngl = 344,
+     tRecombLaterals = 345,
+     tTransfQuadTri = 346,
+     tText2D = 347,
+     tText3D = 348,
+     tInterpolationScheme = 349,
+     tTime = 350,
+     tCombine = 351,
+     tBSpline = 352,
+     tBezier = 353,
+     tNurbs = 354,
+     tNurbsOrder = 355,
+     tNurbsKnots = 356,
+     tColor = 357,
+     tColorTable = 358,
+     tFor = 359,
+     tIn = 360,
+     tEndFor = 361,
+     tIf = 362,
+     tEndIf = 363,
+     tExit = 364,
+     tField = 365,
+     tReturn = 366,
+     tCall = 367,
+     tFunction = 368,
+     tShow = 369,
+     tHide = 370,
+     tGetValue = 371,
+     tGetEnv = 372,
+     tGetString = 373,
+     tGMSH_MAJOR_VERSION = 374,
+     tGMSH_MINOR_VERSION = 375,
+     tGMSH_PATCH_VERSION = 376,
+     tHomRank = 377,
+     tHomGen = 378,
+     tHomCut = 379,
+     tHomSeq = 380,
+     tAFFECTDIVIDE = 381,
+     tAFFECTTIMES = 382,
+     tAFFECTMINUS = 383,
+     tAFFECTPLUS = 384,
+     tOR = 385,
+     tAND = 386,
+     tNOTEQUAL = 387,
+     tEQUAL = 388,
+     tGREATEROREQUAL = 389,
+     tLESSOREQUAL = 390,
+     UNARYPREC = 391,
+     tMINUSMINUS = 392,
+     tPLUSPLUS = 393
    };
 #endif
 
@@ -198,7 +197,7 @@ typedef union YYSTYPE
 
 
 /* Line 1685 of yacc.c  */
-#line 202 "Gmsh.tab.hpp"
+#line 201 "Gmsh.tab.hpp"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

Parser/Gmsh.y

@@ -110,7 +110,7 @@ fullMatrix<double> ListOfListOfDouble2Matrix(List_T *list);
 %token tCharacteristic tLength tParametric tElliptic tRefineMesh
 %token tPlane tRuled tTransfinite tComplex tPhysical tCompound tPeriodic
 %token tUsing tPlugin tDegenerated
-%token tRotate tTranslate tSymmetry tDilate tExtrude tLevelset tPoints
+%token tRotate tTranslate tSymmetry tDilate tExtrude tLevelset
 %token tLoop tRecombine tSmoother tSplit tDelete tCoherence tIntersect
 %token tLayers tHole tAlias tAliasWithOptions
 %token tQuadTriDbl tQuadTriSngl tRecombLaterals tTransfQuadTri
@@ -1817,7 +1817,7 @@ LevelSet :
         yymsg(0, "Wrong levelset definition (%d)", $4);
 #endif
     }
-  | tLevelset tPoints '(' FExpr ')' tAFFECT '{' RecursiveListOfListOfDouble '}' tEND
+  | tLevelset tPoint '(' FExpr ')' tAFFECT '{' RecursiveListOfListOfDouble '}' tEND
     {
 #if defined(HAVE_DINTEGRATION)
       int t = (int)$4;