From a0bd295bd481e369e14a3b6caa2f1df4bb7f0530 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 20 Feb 2016 08:03:47 +0000
Subject: [PATCH] revert EOF fix for now (breaks e.g. t7.geo)

---
 Parser/Gmsh.l       |    5 +-
 Parser/Gmsh.tab.cpp | 8778 +++++++++++++++++++++----------------------
 Parser/Gmsh.tab.hpp |  615 ++-
 Parser/Gmsh.yy.cpp  |  466 ++-
 4 files changed, 4780 insertions(+), 5084 deletions(-)

diff --git a/Parser/Gmsh.l b/Parser/Gmsh.l
index 975f6b7c92..6487989c67 100644
--- a/Parser/Gmsh.l
+++ b/Parser/Gmsh.l
@@ -49,9 +49,6 @@ void   skipline(void);
 	 buf[n++] = (char) c;                                           \
 	 yylineno++;							\
        }                                                                \
-       else if ( c == EOF ){                                            \
-	 buf[n++] = '\0';                                               \
-       }								\
        if ( c == EOF && ferror( yyin ) )				\
 	 Msg::Fatal("Input in flex scanner failed");			\
        result = n;							\
@@ -342,7 +339,7 @@ void parsestring(char endchar)
   // etc.) "as is" in the output string: see yyinput() above
   int i = 0;
   while ((c = yyinput()) != endchar) {
-    if(c=='\0'){
+    if(gmsheof(yyin)){ // FIXME: this is not correct
       Msg::Error("End of file in string");
       break;
     }
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 8b6cec2b97..f89ebfe523 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -1,14 +1,13 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* Bison implementation for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +15,7 @@
    GNU General Public License for more details.
 
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -47,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "3.0.4"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -55,402 +52,25 @@
 /* Pure parsers.  */
 #define YYPURE 0
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
+/* Push parsers.  */
+#define YYPUSH 0
 
-/* Substitute the variable and function names.  */
-#define yyparse gmsh_yyparse
-#define yylex   gmsh_yylex
-#define yyerror gmsh_yyerror
-#define yylval  gmsh_yylval
-#define yychar  gmsh_yychar
-#define yydebug gmsh_yydebug
-#define yynerrs gmsh_yynerrs
-
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     tDOUBLE = 258,
-     tSTRING = 259,
-     tBIGSTR = 260,
-     tEND = 261,
-     tAFFECT = 262,
-     tDOTS = 263,
-     tPi = 264,
-     tMPI_Rank = 265,
-     tMPI_Size = 266,
-     tEuclidian = 267,
-     tCoordinates = 268,
-     tTestLevel = 269,
-     tExp = 270,
-     tLog = 271,
-     tLog10 = 272,
-     tSqrt = 273,
-     tSin = 274,
-     tAsin = 275,
-     tCos = 276,
-     tAcos = 277,
-     tTan = 278,
-     tRand = 279,
-     tAtan = 280,
-     tAtan2 = 281,
-     tSinh = 282,
-     tCosh = 283,
-     tTanh = 284,
-     tFabs = 285,
-     tFloor = 286,
-     tCeil = 287,
-     tRound = 288,
-     tFmod = 289,
-     tModulo = 290,
-     tHypot = 291,
-     tList = 292,
-     tPrintf = 293,
-     tError = 294,
-     tStr = 295,
-     tSprintf = 296,
-     tStrCat = 297,
-     tStrPrefix = 298,
-     tStrRelative = 299,
-     tStrReplace = 300,
-     tFind = 301,
-     tStrFind = 302,
-     tStrCmp = 303,
-     tStrChoice = 304,
-     tUpperCase = 305,
-     tLowerCase = 306,
-     tLowerCaseIn = 307,
-     tTextAttributes = 308,
-     tBoundingBox = 309,
-     tDraw = 310,
-     tSetChanged = 311,
-     tToday = 312,
-     tFixRelativePath = 313,
-     tCurrentDirectory = 314,
-     tSyncModel = 315,
-     tNewModel = 316,
-     tOnelabAction = 317,
-     tOnelabRun = 318,
-     tCpu = 319,
-     tMemory = 320,
-     tTotalMemory = 321,
-     tCreateTopology = 322,
-     tCreateTopologyNoHoles = 323,
-     tDistanceFunction = 324,
-     tDefineConstant = 325,
-     tUndefineConstant = 326,
-     tDefineNumber = 327,
-     tDefineString = 328,
-     tSetNumber = 329,
-     tSetString = 330,
-     tPoint = 331,
-     tCircle = 332,
-     tEllipse = 333,
-     tLine = 334,
-     tSphere = 335,
-     tPolarSphere = 336,
-     tSurface = 337,
-     tSpline = 338,
-     tVolume = 339,
-     tCharacteristic = 340,
-     tLength = 341,
-     tParametric = 342,
-     tElliptic = 343,
-     tRefineMesh = 344,
-     tAdaptMesh = 345,
-     tRelocateMesh = 346,
-     tPlane = 347,
-     tRuled = 348,
-     tTransfinite = 349,
-     tComplex = 350,
-     tPhysical = 351,
-     tCompound = 352,
-     tPeriodic = 353,
-     tUsing = 354,
-     tPlugin = 355,
-     tDegenerated = 356,
-     tRecursive = 357,
-     tRotate = 358,
-     tTranslate = 359,
-     tSymmetry = 360,
-     tDilate = 361,
-     tExtrude = 362,
-     tLevelset = 363,
-     tAffine = 364,
-     tRecombine = 365,
-     tSmoother = 366,
-     tSplit = 367,
-     tDelete = 368,
-     tCoherence = 369,
-     tIntersect = 370,
-     tMeshAlgorithm = 371,
-     tReverse = 372,
-     tLayers = 373,
-     tScaleLast = 374,
-     tHole = 375,
-     tAlias = 376,
-     tAliasWithOptions = 377,
-     tCopyOptions = 378,
-     tQuadTriAddVerts = 379,
-     tQuadTriNoNewVerts = 380,
-     tQuadTriSngl = 381,
-     tQuadTriDbl = 382,
-     tRecombLaterals = 383,
-     tTransfQuadTri = 384,
-     tText2D = 385,
-     tText3D = 386,
-     tInterpolationScheme = 387,
-     tTime = 388,
-     tCombine = 389,
-     tBSpline = 390,
-     tBezier = 391,
-     tNurbs = 392,
-     tNurbsOrder = 393,
-     tNurbsKnots = 394,
-     tColor = 395,
-     tColorTable = 396,
-     tFor = 397,
-     tIn = 398,
-     tEndFor = 399,
-     tIf = 400,
-     tElseIf = 401,
-     tElse = 402,
-     tEndIf = 403,
-     tExit = 404,
-     tAbort = 405,
-     tField = 406,
-     tReturn = 407,
-     tCall = 408,
-     tMacro = 409,
-     tShow = 410,
-     tHide = 411,
-     tGetValue = 412,
-     tGetStringValue = 413,
-     tGetEnv = 414,
-     tGetString = 415,
-     tGetNumber = 416,
-     tHomology = 417,
-     tCohomology = 418,
-     tBetti = 419,
-     tExists = 420,
-     tFileExists = 421,
-     tGMSH_MAJOR_VERSION = 422,
-     tGMSH_MINOR_VERSION = 423,
-     tGMSH_PATCH_VERSION = 424,
-     tGmshExecutableName = 425,
-     tSetPartition = 426,
-     tNameToString = 427,
-     tStringToName = 428,
-     tAFFECTDIVIDE = 429,
-     tAFFECTTIMES = 430,
-     tAFFECTMINUS = 431,
-     tAFFECTPLUS = 432,
-     tOR = 433,
-     tAND = 434,
-     tNOTEQUAL = 435,
-     tEQUAL = 436,
-     tGREATEROREQUAL = 437,
-     tLESSOREQUAL = 438,
-     UNARYPREC = 439,
-     tMINUSMINUS = 440,
-     tPLUSPLUS = 441
-   };
-#endif
-/* Tokens.  */
-#define tDOUBLE 258
-#define tSTRING 259
-#define tBIGSTR 260
-#define tEND 261
-#define tAFFECT 262
-#define tDOTS 263
-#define tPi 264
-#define tMPI_Rank 265
-#define tMPI_Size 266
-#define tEuclidian 267
-#define tCoordinates 268
-#define tTestLevel 269
-#define tExp 270
-#define tLog 271
-#define tLog10 272
-#define tSqrt 273
-#define tSin 274
-#define tAsin 275
-#define tCos 276
-#define tAcos 277
-#define tTan 278
-#define tRand 279
-#define tAtan 280
-#define tAtan2 281
-#define tSinh 282
-#define tCosh 283
-#define tTanh 284
-#define tFabs 285
-#define tFloor 286
-#define tCeil 287
-#define tRound 288
-#define tFmod 289
-#define tModulo 290
-#define tHypot 291
-#define tList 292
-#define tPrintf 293
-#define tError 294
-#define tStr 295
-#define tSprintf 296
-#define tStrCat 297
-#define tStrPrefix 298
-#define tStrRelative 299
-#define tStrReplace 300
-#define tFind 301
-#define tStrFind 302
-#define tStrCmp 303
-#define tStrChoice 304
-#define tUpperCase 305
-#define tLowerCase 306
-#define tLowerCaseIn 307
-#define tTextAttributes 308
-#define tBoundingBox 309
-#define tDraw 310
-#define tSetChanged 311
-#define tToday 312
-#define tFixRelativePath 313
-#define tCurrentDirectory 314
-#define tSyncModel 315
-#define tNewModel 316
-#define tOnelabAction 317
-#define tOnelabRun 318
-#define tCpu 319
-#define tMemory 320
-#define tTotalMemory 321
-#define tCreateTopology 322
-#define tCreateTopologyNoHoles 323
-#define tDistanceFunction 324
-#define tDefineConstant 325
-#define tUndefineConstant 326
-#define tDefineNumber 327
-#define tDefineString 328
-#define tSetNumber 329
-#define tSetString 330
-#define tPoint 331
-#define tCircle 332
-#define tEllipse 333
-#define tLine 334
-#define tSphere 335
-#define tPolarSphere 336
-#define tSurface 337
-#define tSpline 338
-#define tVolume 339
-#define tCharacteristic 340
-#define tLength 341
-#define tParametric 342
-#define tElliptic 343
-#define tRefineMesh 344
-#define tAdaptMesh 345
-#define tRelocateMesh 346
-#define tPlane 347
-#define tRuled 348
-#define tTransfinite 349
-#define tComplex 350
-#define tPhysical 351
-#define tCompound 352
-#define tPeriodic 353
-#define tUsing 354
-#define tPlugin 355
-#define tDegenerated 356
-#define tRecursive 357
-#define tRotate 358
-#define tTranslate 359
-#define tSymmetry 360
-#define tDilate 361
-#define tExtrude 362
-#define tLevelset 363
-#define tAffine 364
-#define tRecombine 365
-#define tSmoother 366
-#define tSplit 367
-#define tDelete 368
-#define tCoherence 369
-#define tIntersect 370
-#define tMeshAlgorithm 371
-#define tReverse 372
-#define tLayers 373
-#define tScaleLast 374
-#define tHole 375
-#define tAlias 376
-#define tAliasWithOptions 377
-#define tCopyOptions 378
-#define tQuadTriAddVerts 379
-#define tQuadTriNoNewVerts 380
-#define tQuadTriSngl 381
-#define tQuadTriDbl 382
-#define tRecombLaterals 383
-#define tTransfQuadTri 384
-#define tText2D 385
-#define tText3D 386
-#define tInterpolationScheme 387
-#define tTime 388
-#define tCombine 389
-#define tBSpline 390
-#define tBezier 391
-#define tNurbs 392
-#define tNurbsOrder 393
-#define tNurbsKnots 394
-#define tColor 395
-#define tColorTable 396
-#define tFor 397
-#define tIn 398
-#define tEndFor 399
-#define tIf 400
-#define tElseIf 401
-#define tElse 402
-#define tEndIf 403
-#define tExit 404
-#define tAbort 405
-#define tField 406
-#define tReturn 407
-#define tCall 408
-#define tMacro 409
-#define tShow 410
-#define tHide 411
-#define tGetValue 412
-#define tGetStringValue 413
-#define tGetEnv 414
-#define tGetString 415
-#define tGetNumber 416
-#define tHomology 417
-#define tCohomology 418
-#define tBetti 419
-#define tExists 420
-#define tFileExists 421
-#define tGMSH_MAJOR_VERSION 422
-#define tGMSH_MINOR_VERSION 423
-#define tGMSH_PATCH_VERSION 424
-#define tGmshExecutableName 425
-#define tSetPartition 426
-#define tNameToString 427
-#define tStringToName 428
-#define tAFFECTDIVIDE 429
-#define tAFFECTTIMES 430
-#define tAFFECTMINUS 431
-#define tAFFECTPLUS 432
-#define tOR 433
-#define tAND 434
-#define tNOTEQUAL 435
-#define tEQUAL 436
-#define tGREATEROREQUAL 437
-#define tLESSOREQUAL 438
-#define UNARYPREC 439
-#define tMINUSMINUS 440
-#define tPLUSPLUS 441
+/* Pull parsers.  */
+#define YYPULL 1
 
 
+/* Substitute the variable and function names.  */
+#define yyparse         gmsh_yyparse
+#define yylex           gmsh_yylex
+#define yyerror         gmsh_yyerror
+#define yydebug         gmsh_yydebug
+#define yynerrs         gmsh_yynerrs
 
+#define yylval          gmsh_yylval
+#define yychar          gmsh_yychar
 
 /* Copy the first part of user declarations.  */
-#line 1 "Gmsh.y"
+#line 1 "Gmsh.y" /* yacc.c:339  */
 
 // Gmsh - Copyright (C) 1997-2016 C. Geuzaine, J.-F. Remacle
 //
@@ -558,11 +178,15 @@ struct doubleXstring{
 };
 
 
+#line 182 "Gmsh.tab.cpp" /* yacc.c:339  */
 
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -572,15 +196,217 @@ struct doubleXstring{
 # define YYERROR_VERBOSE 0
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+   by #include "Gmsh.tab.hpp".  */
+#ifndef YY_GMSH_YY_GMSH_TAB_HPP_INCLUDED
+# define YY_GMSH_YY_GMSH_TAB_HPP_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int gmsh_yydebug;
+#endif
+
+/* Token type.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+  enum yytokentype
+  {
+    tDOUBLE = 258,
+    tSTRING = 259,
+    tBIGSTR = 260,
+    tEND = 261,
+    tAFFECT = 262,
+    tDOTS = 263,
+    tPi = 264,
+    tMPI_Rank = 265,
+    tMPI_Size = 266,
+    tEuclidian = 267,
+    tCoordinates = 268,
+    tTestLevel = 269,
+    tExp = 270,
+    tLog = 271,
+    tLog10 = 272,
+    tSqrt = 273,
+    tSin = 274,
+    tAsin = 275,
+    tCos = 276,
+    tAcos = 277,
+    tTan = 278,
+    tRand = 279,
+    tAtan = 280,
+    tAtan2 = 281,
+    tSinh = 282,
+    tCosh = 283,
+    tTanh = 284,
+    tFabs = 285,
+    tFloor = 286,
+    tCeil = 287,
+    tRound = 288,
+    tFmod = 289,
+    tModulo = 290,
+    tHypot = 291,
+    tList = 292,
+    tPrintf = 293,
+    tError = 294,
+    tStr = 295,
+    tSprintf = 296,
+    tStrCat = 297,
+    tStrPrefix = 298,
+    tStrRelative = 299,
+    tStrReplace = 300,
+    tFind = 301,
+    tStrFind = 302,
+    tStrCmp = 303,
+    tStrChoice = 304,
+    tUpperCase = 305,
+    tLowerCase = 306,
+    tLowerCaseIn = 307,
+    tTextAttributes = 308,
+    tBoundingBox = 309,
+    tDraw = 310,
+    tSetChanged = 311,
+    tToday = 312,
+    tFixRelativePath = 313,
+    tCurrentDirectory = 314,
+    tSyncModel = 315,
+    tNewModel = 316,
+    tOnelabAction = 317,
+    tOnelabRun = 318,
+    tCpu = 319,
+    tMemory = 320,
+    tTotalMemory = 321,
+    tCreateTopology = 322,
+    tCreateTopologyNoHoles = 323,
+    tDistanceFunction = 324,
+    tDefineConstant = 325,
+    tUndefineConstant = 326,
+    tDefineNumber = 327,
+    tDefineString = 328,
+    tSetNumber = 329,
+    tSetString = 330,
+    tPoint = 331,
+    tCircle = 332,
+    tEllipse = 333,
+    tLine = 334,
+    tSphere = 335,
+    tPolarSphere = 336,
+    tSurface = 337,
+    tSpline = 338,
+    tVolume = 339,
+    tCharacteristic = 340,
+    tLength = 341,
+    tParametric = 342,
+    tElliptic = 343,
+    tRefineMesh = 344,
+    tAdaptMesh = 345,
+    tRelocateMesh = 346,
+    tPlane = 347,
+    tRuled = 348,
+    tTransfinite = 349,
+    tComplex = 350,
+    tPhysical = 351,
+    tCompound = 352,
+    tPeriodic = 353,
+    tUsing = 354,
+    tPlugin = 355,
+    tDegenerated = 356,
+    tRecursive = 357,
+    tRotate = 358,
+    tTranslate = 359,
+    tSymmetry = 360,
+    tDilate = 361,
+    tExtrude = 362,
+    tLevelset = 363,
+    tAffine = 364,
+    tRecombine = 365,
+    tSmoother = 366,
+    tSplit = 367,
+    tDelete = 368,
+    tCoherence = 369,
+    tIntersect = 370,
+    tMeshAlgorithm = 371,
+    tReverse = 372,
+    tLayers = 373,
+    tScaleLast = 374,
+    tHole = 375,
+    tAlias = 376,
+    tAliasWithOptions = 377,
+    tCopyOptions = 378,
+    tQuadTriAddVerts = 379,
+    tQuadTriNoNewVerts = 380,
+    tQuadTriSngl = 381,
+    tQuadTriDbl = 382,
+    tRecombLaterals = 383,
+    tTransfQuadTri = 384,
+    tText2D = 385,
+    tText3D = 386,
+    tInterpolationScheme = 387,
+    tTime = 388,
+    tCombine = 389,
+    tBSpline = 390,
+    tBezier = 391,
+    tNurbs = 392,
+    tNurbsOrder = 393,
+    tNurbsKnots = 394,
+    tColor = 395,
+    tColorTable = 396,
+    tFor = 397,
+    tIn = 398,
+    tEndFor = 399,
+    tIf = 400,
+    tElseIf = 401,
+    tElse = 402,
+    tEndIf = 403,
+    tExit = 404,
+    tAbort = 405,
+    tField = 406,
+    tReturn = 407,
+    tCall = 408,
+    tMacro = 409,
+    tShow = 410,
+    tHide = 411,
+    tGetValue = 412,
+    tGetStringValue = 413,
+    tGetEnv = 414,
+    tGetString = 415,
+    tGetNumber = 416,
+    tHomology = 417,
+    tCohomology = 418,
+    tBetti = 419,
+    tExists = 420,
+    tFileExists = 421,
+    tGMSH_MAJOR_VERSION = 422,
+    tGMSH_MINOR_VERSION = 423,
+    tGMSH_PATCH_VERSION = 424,
+    tGmshExecutableName = 425,
+    tSetPartition = 426,
+    tNameToString = 427,
+    tStringToName = 428,
+    tAFFECTPLUS = 429,
+    tAFFECTMINUS = 430,
+    tAFFECTTIMES = 431,
+    tAFFECTDIVIDE = 432,
+    tOR = 433,
+    tAND = 434,
+    tEQUAL = 435,
+    tNOTEQUAL = 436,
+    tLESSOREQUAL = 437,
+    tGREATEROREQUAL = 438,
+    tPLUSPLUS = 439,
+    tMINUSMINUS = 440,
+    UNARYPREC = 441
+  };
 #endif
 
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 109 "Gmsh.y"
+
+union YYSTYPE
 {
+#line 109 "Gmsh.y" /* yacc.c:355  */
+
   char *c;
   int i;
   unsigned int u;
@@ -588,22 +414,25 @@ typedef union YYSTYPE
   double v[5];
   Shape s;
   List_T *l;
-}
-/* Line 193 of yacc.c.  */
-#line 594 "Gmsh.tab.cpp"
-	YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+
+#line 419 "Gmsh.tab.cpp" /* yacc.c:355  */
+};
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
 
+extern YYSTYPE gmsh_yylval;
 
-/* Copy the second part of user declarations.  */
+int gmsh_yyparse (void);
 
+#endif /* !YY_GMSH_YY_GMSH_TAB_HPP_INCLUDED  */
 
-/* Line 216 of yacc.c.  */
-#line 607 "Gmsh.tab.cpp"
+/* Copy the second part of user declarations.  */
+
+#line 436 "Gmsh.tab.cpp" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -617,11 +446,8 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
 #else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -641,8 +467,7 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -656,38 +481,67 @@ typedef short int yytype_int16;
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int i)
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
 #else
-static int
-YYID (i)
-    int i;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return i;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
 #endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
+#endif
+
 
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
@@ -706,11 +560,11 @@ YYID (i)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -718,8 +572,8 @@ YYID (i)
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
@@ -733,25 +587,23 @@ YYID (i)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -761,14 +613,14 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
 {
-  yytype_int16 yyss;
-  YYSTYPE yyvs;
-  };
+  yytype_int16 yyss_alloc;
+  YYSTYPE yyvs_alloc;
+};
 
 /* The size of the maximum gap between one aligned stack and the next.  */
 # define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
@@ -779,42 +631,46 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack)					\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack, Stack, yysize);				\
-	Stack = &yyptr->Stack;						\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  5
 /* YYLAST -- Last index in YYTABLE.  */
@@ -826,17 +682,19 @@ union yyalloc
 #define YYNNTS  98
 /* YYNRULES -- Number of rules.  */
 #define YYNRULES  522
-/* YYNRULES -- Number of states.  */
+/* YYNSTATES -- Number of states.  */
 #define YYNSTATES  1849
 
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
 #define YYMAXUTOK   441
 
-#define YYTRANSLATE(YYX)						\
+#define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -845,7 +703,7 @@ static const yytype_uint8 yytranslate[] =
        2,     2,     2,   192,     2,   202,     2,   191,     2,     2,
      197,   198,   189,   187,   203,   188,   201,   190,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     183,     2,   184,   178,     2,     2,     2,     2,     2,     2,
+     183,     2,   185,   178,     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,   199,     2,   200,   196,     2,     2,     2,     2,     2,
@@ -882,374 +740,12 @@ static const yytype_uint8 yytranslate[] =
      145,   146,   147,   148,   149,   150,   151,   152,   153,   154,
      155,   156,   157,   158,   159,   160,   161,   162,   163,   164,
      165,   166,   167,   168,   169,   170,   171,   172,   173,   174,
-     175,   176,   177,   179,   180,   181,   182,   185,   186,   193,
+     175,   176,   177,   179,   180,   181,   182,   184,   186,   193,
      194,   195
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     5,     8,     9,    12,    14,    16,    18,
-      20,    22,    24,    26,    28,    30,    32,    34,    36,    38,
-      40,    42,    44,    46,    49,    55,    61,    69,    77,    85,
-      95,   102,   109,   116,   125,   126,   129,   132,   135,   138,
-     141,   143,   147,   149,   153,   154,   155,   166,   168,   172,
-     173,   187,   189,   193,   194,   210,   219,   234,   235,   242,
-     244,   246,   248,   250,   252,   254,   256,   258,   260,   262,
-     264,   270,   276,   284,   292,   297,   304,   311,   319,   327,
-     335,   343,   353,   363,   367,   374,   381,   388,   395,   400,
-     407,   417,   424,   434,   440,   449,   458,   470,   477,   487,
-     493,   501,   511,   521,   533,   541,   551,   561,   562,   564,
-     565,   569,   575,   576,   586,   592,   593,   603,   604,   608,
-     612,   618,   619,   622,   626,   632,   636,   637,   640,   644,
-     648,   652,   658,   660,   662,   666,   668,   670,   674,   676,
-     678,   682,   684,   686,   690,   691,   697,   698,   701,   709,
-     718,   725,   733,   738,   746,   755,   764,   772,   780,   792,
-     801,   810,   819,   828,   838,   842,   847,   858,   866,   874,
-     883,   892,   905,   914,   923,   931,   940,   949,   955,   967,
-     973,   983,   993,   998,  1008,  1018,  1020,  1022,  1023,  1026,
-    1033,  1040,  1047,  1054,  1063,  1074,  1089,  1106,  1119,  1128,
-    1137,  1144,  1159,  1164,  1171,  1178,  1182,  1187,  1193,  1200,
-    1206,  1210,  1214,  1219,  1225,  1230,  1236,  1240,  1246,  1254,
-    1262,  1266,  1274,  1278,  1281,  1284,  1287,  1290,  1293,  1309,
-    1312,  1315,  1318,  1321,  1324,  1341,  1348,  1357,  1366,  1377,
-    1379,  1382,  1385,  1387,  1391,  1395,  1400,  1405,  1407,  1409,
-    1415,  1427,  1441,  1442,  1450,  1451,  1465,  1466,  1482,  1483,
-    1490,  1499,  1508,  1517,  1530,  1543,  1556,  1571,  1586,  1601,
-    1602,  1615,  1616,  1629,  1630,  1643,  1644,  1661,  1662,  1679,
-    1680,  1697,  1698,  1717,  1718,  1737,  1738,  1757,  1759,  1762,
-    1768,  1776,  1786,  1789,  1792,  1795,  1799,  1802,  1806,  1809,
-    1813,  1816,  1820,  1830,  1837,  1838,  1842,  1843,  1845,  1846,
-    1849,  1850,  1853,  1854,  1857,  1865,  1872,  1881,  1887,  1891,
-    1900,  1906,  1911,  1918,  1930,  1942,  1961,  1980,  1993,  2006,
-    2019,  2030,  2041,  2052,  2063,  2074,  2079,  2084,  2089,  2094,
-    2099,  2102,  2106,  2113,  2115,  2117,  2119,  2122,  2128,  2136,
-    2147,  2149,  2153,  2156,  2159,  2162,  2166,  2170,  2174,  2178,
-    2182,  2186,  2190,  2194,  2198,  2202,  2206,  2210,  2214,  2218,
-    2224,  2229,  2234,  2239,  2244,  2249,  2254,  2259,  2264,  2269,
-    2274,  2281,  2286,  2291,  2296,  2301,  2306,  2311,  2316,  2323,
-    2330,  2337,  2342,  2344,  2346,  2348,  2350,  2352,  2354,  2356,
-    2358,  2360,  2362,  2364,  2365,  2372,  2377,  2384,  2386,  2391,
-    2396,  2401,  2406,  2411,  2416,  2421,  2424,  2430,  2436,  2442,
-    2448,  2452,  2459,  2464,  2472,  2479,  2486,  2493,  2500,  2505,
-    2507,  2510,  2513,  2517,  2521,  2533,  2543,  2551,  2559,  2561,
-    2565,  2567,  2569,  2572,  2576,  2581,  2587,  2589,  2591,  2594,
-    2598,  2602,  2608,  2613,  2616,  2619,  2622,  2625,  2629,  2633,
-    2637,  2641,  2647,  2653,  2659,  2665,  2682,  2699,  2716,  2733,
-    2735,  2737,  2741,  2745,  2750,  2757,  2764,  2766,  2768,  2772,
-    2776,  2786,  2794,  2796,  2802,  2806,  2813,  2815,  2819,  2821,
-    2823,  2827,  2834,  2836,  2841,  2843,  2845,  2847,  2852,  2859,
-    2864,  2871,  2876,  2881,  2886,  2895,  2900,  2905,  2910,  2915,
-    2924,  2929,  2936,  2941,  2943,  2944,  2951,  2953,  2957,  2963,
-    2969,  2971,  2973
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int16 yyrhs[] =
-{
-     208,     0,    -1,   209,    -1,     1,     6,    -1,    -1,   209,
-     210,    -1,   213,    -1,   212,    -1,   233,    -1,   250,    -1,
-     251,    -1,   255,    -1,   256,    -1,   257,    -1,   258,    -1,
-     261,    -1,   282,    -1,   283,    -1,   260,    -1,   259,    -1,
-     254,    -1,   285,    -1,   184,    -1,   184,   184,    -1,    38,
-     197,   299,   198,     6,    -1,    39,   197,   299,   198,     6,
-      -1,    38,   197,   299,   198,   211,   299,     6,    -1,    38,
-     197,   299,   203,   295,   198,     6,    -1,    39,   197,   299,
-     203,   295,   198,     6,    -1,    38,   197,   299,   203,   295,
-     198,   211,   299,     6,    -1,     4,   299,   204,   214,   205,
-       6,    -1,   121,     4,   199,   286,   200,     6,    -1,   122,
-       4,   199,   286,   200,     6,    -1,   123,     4,   199,   286,
-     203,   286,   200,     6,    -1,    -1,   214,   217,    -1,   214,
-     221,    -1,   214,   224,    -1,   214,   226,    -1,   214,   227,
-      -1,   286,    -1,   215,   203,   286,    -1,   286,    -1,   216,
-     203,   286,    -1,    -1,    -1,     4,   218,   197,   215,   198,
-     219,   204,   216,   205,     6,    -1,   299,    -1,   220,   203,
-     299,    -1,    -1,   130,   197,   286,   203,   286,   203,   286,
-     198,   222,   204,   220,   205,     6,    -1,   299,    -1,   223,
-     203,   299,    -1,    -1,   131,   197,   286,   203,   286,   203,
-     286,   203,   286,   198,   225,   204,   223,   205,     6,    -1,
-     132,   204,   291,   205,   204,   291,   205,     6,    -1,   132,
-     204,   291,   205,   204,   291,   205,   204,   291,   205,   204,
-     291,   205,     6,    -1,    -1,   133,   228,   204,   216,   205,
-       6,    -1,     7,    -1,   177,    -1,   176,    -1,   175,    -1,
-     174,    -1,   195,    -1,   194,    -1,   197,    -1,   199,    -1,
-     198,    -1,   200,    -1,    70,   199,   235,   200,     6,    -1,
-      71,   199,   238,   200,     6,    -1,    74,   231,   300,   203,
-     286,   232,     6,    -1,    75,   231,   304,   203,   300,   232,
-       6,    -1,   304,   229,   292,     6,    -1,     4,   231,   232,
-     229,   292,     6,    -1,   303,   231,   232,   229,   292,     6,
-      -1,     4,   199,   286,   200,   229,   286,     6,    -1,     4,
-     197,   286,   198,   229,   286,     6,    -1,   303,   199,   286,
-     200,   229,   286,     6,    -1,   303,   197,   286,   198,   229,
-     286,     6,    -1,     4,   231,   204,   295,   205,   232,   229,
-     292,     6,    -1,   303,   231,   204,   295,   205,   232,   229,
-     292,     6,    -1,   304,   230,     6,    -1,     4,   199,   286,
-     200,   230,     6,    -1,     4,   197,   286,   198,   230,     6,
-      -1,   303,   199,   286,   200,   230,     6,    -1,   303,   197,
-     286,   198,   230,     6,    -1,   304,     7,   300,     6,    -1,
-       4,   201,     4,     7,   300,     6,    -1,     4,   199,   286,
-     200,   201,     4,     7,   300,     6,    -1,     4,   201,     4,
-     229,   286,     6,    -1,     4,   199,   286,   200,   201,     4,
-     229,   286,     6,    -1,     4,   201,     4,   230,     6,    -1,
-       4,   199,   286,   200,   201,     4,   230,     6,    -1,     4,
-     201,   140,   201,     4,     7,   296,     6,    -1,     4,   199,
-     286,   200,   201,   140,   201,     4,     7,   296,     6,    -1,
-       4,   201,   141,     7,   297,     6,    -1,     4,   199,   286,
-     200,   201,   141,     7,   297,     6,    -1,     4,   151,     7,
-     286,     6,    -1,   151,   199,   286,   200,     7,     4,     6,
-      -1,   151,   199,   286,   200,   201,     4,     7,   286,     6,
-      -1,   151,   199,   286,   200,   201,     4,     7,   300,     6,
-      -1,   151,   199,   286,   200,   201,     4,     7,   204,   295,
-     205,     6,    -1,   151,   199,   286,   200,   201,     4,     6,
-      -1,   100,   197,     4,   198,   201,     4,     7,   286,     6,
-      -1,   100,   197,     4,   198,   201,     4,     7,   300,     6,
-      -1,    -1,   203,    -1,    -1,   235,   234,   304,    -1,   235,
-     234,   304,     7,   286,    -1,    -1,   235,   234,   304,     7,
-     204,   292,   236,   240,   205,    -1,   235,   234,   304,     7,
-     300,    -1,    -1,   235,   234,   304,     7,   204,   300,   237,
-     242,   205,    -1,    -1,   238,   234,   299,    -1,   286,     7,
-     300,    -1,   239,   203,   286,     7,   300,    -1,    -1,   240,
-     241,    -1,   203,     4,   292,    -1,   203,     4,   204,   239,
-     205,    -1,   203,     4,   300,    -1,    -1,   242,   243,    -1,
-     203,     4,   286,    -1,   203,     4,   300,    -1,   203,   154,
-     300,    -1,   203,     4,   204,   302,   205,    -1,   286,    -1,
-     300,    -1,   300,   203,   286,    -1,   286,    -1,   300,    -1,
-     300,   203,   286,    -1,   286,    -1,   300,    -1,   300,   203,
-     286,    -1,   286,    -1,   300,    -1,   300,   203,   286,    -1,
-      -1,   143,    80,   204,   286,   205,    -1,    -1,    92,   289,
-      -1,    76,   197,   286,   198,     7,   289,     6,    -1,    96,
-      76,   197,   244,   198,   229,   292,     6,    -1,    85,    86,
-     292,     7,   286,     6,    -1,    79,   197,   286,   198,     7,
-     292,     6,    -1,   101,    79,   292,     6,    -1,    83,   197,
-     286,   198,     7,   292,     6,    -1,    77,   197,   286,   198,
-       7,   292,   249,     6,    -1,    78,   197,   286,   198,     7,
-     292,   249,     6,    -1,   135,   197,   286,   198,     7,   292,
-       6,    -1,   136,   197,   286,   198,     7,   292,     6,    -1,
-     137,   197,   286,   198,     7,   292,   139,   292,   138,   286,
-       6,    -1,    79,     4,   197,   286,   198,     7,   292,     6,
-      -1,    97,    79,   197,   286,   198,     7,   292,     6,    -1,
-      96,    79,   197,   245,   198,   229,   292,     6,    -1,    92,
-      82,   197,   286,   198,     7,   292,     6,    -1,    93,    82,
-     197,   286,   198,     7,   292,   248,     6,    -1,    12,    13,
-       6,    -1,    13,    82,   286,     6,    -1,    87,    82,   197,
-     286,   198,     7,     5,     5,     5,     6,    -1,    80,   197,
-     286,   198,     7,   292,     6,    -1,    81,   197,   286,   198,
-       7,   292,     6,    -1,    82,     4,   197,   286,   198,     7,
-     292,     6,    -1,    97,    82,   197,   286,   198,     7,   292,
-       6,    -1,    97,    82,   197,   286,   198,     7,   292,     4,
-     204,   291,   205,     6,    -1,    96,    82,   197,   246,   198,
-     229,   292,     6,    -1,    95,    84,   197,   286,   198,     7,
-     292,     6,    -1,    84,   197,   286,   198,     7,   292,     6,
-      -1,    97,    84,   197,   286,   198,     7,   292,     6,    -1,
-      96,    84,   197,   247,   198,   229,   292,     6,    -1,   104,
-     289,   204,   252,   205,    -1,   103,   204,   289,   203,   289,
-     203,   286,   205,   204,   252,   205,    -1,   105,   289,   204,
-     252,   205,    -1,   106,   204,   289,   203,   286,   205,   204,
-     252,   205,    -1,   106,   204,   289,   203,   289,   205,   204,
-     252,   205,    -1,     4,   204,   252,   205,    -1,   115,    79,
-     204,   295,   205,    82,   204,   286,   205,    -1,   112,    79,
-     197,   286,   198,   204,   295,   205,     6,    -1,   253,    -1,
-     251,    -1,    -1,   253,   250,    -1,   253,    76,   204,   295,
-     205,     6,    -1,   253,    79,   204,   295,   205,     6,    -1,
-     253,    82,   204,   295,   205,     6,    -1,   253,    84,   204,
-     295,   205,     6,    -1,   108,    92,   197,   286,   198,     7,
-     292,     6,    -1,   108,    76,   197,   286,   198,     7,   204,
-     291,   205,     6,    -1,   108,    92,   197,   286,   198,     7,
-     204,   289,   203,   289,   203,   295,   205,     6,    -1,   108,
-      92,   197,   286,   198,     7,   204,   289,   203,   289,   203,
-     289,   203,   295,   205,     6,    -1,   108,    80,   197,   286,
-     198,     7,   204,   289,   203,   295,   205,     6,    -1,   108,
-       4,   197,   286,   198,     7,   292,     6,    -1,   108,     4,
-     197,   286,   198,     7,     5,     6,    -1,   108,     4,   204,
-     286,   205,     6,    -1,   108,     4,   197,   286,   198,     7,
-     204,   289,   203,   289,   203,   295,   205,     6,    -1,   113,
-     204,   253,   205,    -1,   113,   151,   199,   286,   200,     6,
-      -1,   113,     4,   199,   286,   200,     6,    -1,   113,   304,
-       6,    -1,   113,     4,     4,     6,    -1,   140,   296,   204,
-     253,   205,    -1,   102,   140,   296,   204,   253,   205,    -1,
-     171,   286,   204,   253,   205,    -1,   155,     5,     6,    -1,
-     156,     5,     6,    -1,   155,   204,   253,   205,    -1,   102,
-     155,   204,   253,   205,    -1,   156,   204,   253,   205,    -1,
-     102,   156,   204,   253,   205,    -1,     4,   300,     6,    -1,
-      63,   197,   302,   198,     6,    -1,     4,     4,   199,   286,
-     200,   299,     6,    -1,     4,     4,     4,   199,   286,   200,
-       6,    -1,     4,   286,     6,    -1,   100,   197,     4,   198,
-     201,     4,     6,    -1,   134,     4,     6,    -1,   149,     6,
-      -1,   150,     6,    -1,    60,     6,    -1,    61,     6,    -1,
-      54,     6,    -1,    54,   204,   286,   203,   286,   203,   286,
-     203,   286,   203,   286,   203,   286,   205,     6,    -1,    55,
-       6,    -1,    56,     6,    -1,    67,     6,    -1,    68,     6,
-      -1,    89,     6,    -1,    90,   204,   295,   205,   204,   295,
-     205,   204,   291,   205,   204,   286,   203,   286,   205,     6,
-      -1,   142,   197,   286,     8,   286,   198,    -1,   142,   197,
-     286,     8,   286,     8,   286,   198,    -1,   142,     4,   143,
-     204,   286,     8,   286,   205,    -1,   142,     4,   143,   204,
-     286,     8,   286,     8,   286,   205,    -1,   144,    -1,   154,
-       4,    -1,   154,   300,    -1,   152,    -1,   153,   304,     6,
-      -1,   153,   300,     6,    -1,   145,   197,   286,   198,    -1,
-     146,   197,   286,   198,    -1,   147,    -1,   148,    -1,   107,
-     289,   204,   253,   205,    -1,   107,   204,   289,   203,   289,
-     203,   286,   205,   204,   253,   205,    -1,   107,   204,   289,
-     203,   289,   203,   289,   203,   286,   205,   204,   253,   205,
-      -1,    -1,   107,   289,   204,   253,   262,   275,   205,    -1,
-      -1,   107,   204,   289,   203,   289,   203,   286,   205,   204,
-     253,   263,   275,   205,    -1,    -1,   107,   204,   289,   203,
-     289,   203,   289,   203,   286,   205,   204,   253,   264,   275,
-     205,    -1,    -1,   107,   204,   253,   265,   275,   205,    -1,
-     107,    76,   204,   286,   203,   289,   205,     6,    -1,   107,
-      79,   204,   286,   203,   289,   205,     6,    -1,   107,    82,
-     204,   286,   203,   289,   205,     6,    -1,   107,    76,   204,
-     286,   203,   289,   203,   289,   203,   286,   205,     6,    -1,
-     107,    79,   204,   286,   203,   289,   203,   289,   203,   286,
-     205,     6,    -1,   107,    82,   204,   286,   203,   289,   203,
-     289,   203,   286,   205,     6,    -1,   107,    76,   204,   286,
-     203,   289,   203,   289,   203,   289,   203,   286,   205,     6,
-      -1,   107,    79,   204,   286,   203,   289,   203,   289,   203,
-     289,   203,   286,   205,     6,    -1,   107,    82,   204,   286,
-     203,   289,   203,   289,   203,   289,   203,   286,   205,     6,
-      -1,    -1,   107,    76,   204,   286,   203,   289,   205,   266,
-     204,   275,   205,     6,    -1,    -1,   107,    79,   204,   286,
-     203,   289,   205,   267,   204,   275,   205,     6,    -1,    -1,
-     107,    82,   204,   286,   203,   289,   205,   268,   204,   275,
-     205,     6,    -1,    -1,   107,    76,   204,   286,   203,   289,
-     203,   289,   203,   286,   205,   269,   204,   275,   205,     6,
-      -1,    -1,   107,    79,   204,   286,   203,   289,   203,   289,
-     203,   286,   205,   270,   204,   275,   205,     6,    -1,    -1,
-     107,    82,   204,   286,   203,   289,   203,   289,   203,   286,
-     205,   271,   204,   275,   205,     6,    -1,    -1,   107,    76,
-     204,   286,   203,   289,   203,   289,   203,   289,   203,   286,
-     205,   272,   204,   275,   205,     6,    -1,    -1,   107,    79,
-     204,   286,   203,   289,   203,   289,   203,   289,   203,   286,
-     205,   273,   204,   275,   205,     6,    -1,    -1,   107,    82,
-     204,   286,   203,   289,   203,   289,   203,   289,   203,   286,
-     205,   274,   204,   275,   205,     6,    -1,   276,    -1,   275,
-     276,    -1,   118,   204,   286,   205,     6,    -1,   118,   204,
-     292,   203,   292,   205,     6,    -1,   118,   204,   292,   203,
-     292,   203,   292,   205,     6,    -1,   119,     6,    -1,   110,
-       6,    -1,   126,     6,    -1,   126,   128,     6,    -1,   127,
-       6,    -1,   127,   128,     6,    -1,   124,     6,    -1,   124,
-     128,     6,    -1,   125,     6,    -1,   125,   128,     6,    -1,
-     120,   197,   286,   198,     7,   292,    99,   286,     6,    -1,
-      99,     4,   199,   286,   200,     6,    -1,    -1,    99,     4,
-     286,    -1,    -1,     4,    -1,    -1,     7,   292,    -1,    -1,
-       7,   286,    -1,    -1,   109,   292,    -1,    94,    79,   293,
-       7,   286,   277,     6,    -1,    94,    82,   293,   279,   278,
-       6,    -1,    88,    82,   204,   286,   205,     7,   292,     6,
-      -1,    94,    84,   293,   279,     6,    -1,   129,   293,     6,
-      -1,   116,    82,   204,   295,   205,     7,   286,     6,    -1,
-     110,    82,   293,   280,     6,    -1,   110,    84,   293,     6,
-      -1,   111,    82,   292,     7,   286,     6,    -1,    98,    79,
-     204,   295,   205,     7,   204,   295,   205,   281,     6,    -1,
-      98,    82,   204,   295,   205,     7,   204,   295,   205,   281,
-       6,    -1,    98,    79,   204,   295,   205,     7,   204,   295,
-     205,   103,   204,   289,   203,   289,   203,   286,   205,     6,
-      -1,    98,    82,   204,   295,   205,     7,   204,   295,   205,
-     103,   204,   289,   203,   289,   203,   286,   205,     6,    -1,
-      98,    79,   204,   295,   205,     7,   204,   295,   205,   104,
-     289,     6,    -1,    98,    82,   204,   295,   205,     7,   204,
-     295,   205,   104,   289,     6,    -1,    98,    82,   286,   204,
-     295,   205,     7,   286,   204,   295,   205,     6,    -1,    76,
-     204,   295,   205,   143,    82,   204,   286,   205,     6,    -1,
-      79,   204,   295,   205,   143,    82,   204,   286,   205,     6,
-      -1,    76,   204,   295,   205,   143,    84,   204,   286,   205,
-       6,    -1,    79,   204,   295,   205,   143,    84,   204,   286,
-     205,     6,    -1,    82,   204,   295,   205,   143,    84,   204,
-     286,   205,     6,    -1,   117,    82,   293,     6,    -1,   117,
-      79,   293,     6,    -1,    91,    76,   293,     6,    -1,    91,
-      79,   293,     6,    -1,    91,    82,   293,     6,    -1,   114,
-       6,    -1,   114,     4,     6,    -1,   114,    76,   204,   295,
-     205,     6,    -1,   162,    -1,   163,    -1,   164,    -1,   284,
-       6,    -1,   284,   204,   292,   205,     6,    -1,   284,   204,
-     292,   203,   292,   205,     6,    -1,   284,   197,   292,   198,
-     204,   292,   203,   292,   205,     6,    -1,   287,    -1,   197,
-     286,   198,    -1,   188,   286,    -1,   187,   286,    -1,   192,
-     286,    -1,   286,   188,   286,    -1,   286,   187,   286,    -1,
-     286,   189,   286,    -1,   286,   190,   286,    -1,   286,   191,
-     286,    -1,   286,   196,   286,    -1,   286,   183,   286,    -1,
-     286,   184,   286,    -1,   286,   186,   286,    -1,   286,   185,
-     286,    -1,   286,   182,   286,    -1,   286,   181,   286,    -1,
-     286,   180,   286,    -1,   286,   179,   286,    -1,   286,   178,
-     286,     8,   286,    -1,    15,   231,   286,   232,    -1,    16,
-     231,   286,   232,    -1,    17,   231,   286,   232,    -1,    18,
-     231,   286,   232,    -1,    19,   231,   286,   232,    -1,    20,
-     231,   286,   232,    -1,    21,   231,   286,   232,    -1,    22,
-     231,   286,   232,    -1,    23,   231,   286,   232,    -1,    25,
-     231,   286,   232,    -1,    26,   231,   286,   203,   286,   232,
-      -1,    27,   231,   286,   232,    -1,    28,   231,   286,   232,
-      -1,    29,   231,   286,   232,    -1,    30,   231,   286,   232,
-      -1,    31,   231,   286,   232,    -1,    32,   231,   286,   232,
-      -1,    33,   231,   286,   232,    -1,    34,   231,   286,   203,
-     286,   232,    -1,    35,   231,   286,   203,   286,   232,    -1,
-      36,   231,   286,   203,   286,   232,    -1,    24,   231,   286,
-     232,    -1,     3,    -1,     9,    -1,    14,    -1,    10,    -1,
-      11,    -1,   167,    -1,   168,    -1,   169,    -1,    64,    -1,
-      65,    -1,    66,    -1,    -1,    72,   231,   286,   288,   240,
-     232,    -1,   161,   231,   299,   232,    -1,   161,   231,   299,
-     203,   286,   232,    -1,   304,    -1,     4,   199,   286,   200,
-      -1,     4,   197,   286,   198,    -1,   303,   199,   286,   200,
-      -1,   303,   197,   286,   198,    -1,   165,   197,   304,   198,
-      -1,   166,   197,   300,   198,    -1,   202,   304,   231,   232,
-      -1,   304,   230,    -1,     4,   199,   286,   200,   230,    -1,
-       4,   197,   286,   198,   230,    -1,   303,   199,   286,   200,
-     230,    -1,   303,   197,   286,   198,   230,    -1,     4,   201,
-       4,    -1,     4,   199,   286,   200,   201,     4,    -1,     4,
-     201,     4,   230,    -1,     4,   199,   286,   200,   201,     4,
-     230,    -1,   157,   197,   299,   203,   286,   198,    -1,    46,
-     197,   292,   203,   292,   198,    -1,    47,   197,   299,   203,
-     299,   198,    -1,    48,   197,   299,   203,   299,   198,    -1,
-      53,   197,   302,   198,    -1,   290,    -1,   188,   289,    -1,
-     187,   289,    -1,   289,   188,   289,    -1,   289,   187,   289,
-      -1,   204,   286,   203,   286,   203,   286,   203,   286,   203,
-     286,   205,    -1,   204,   286,   203,   286,   203,   286,   203,
-     286,   205,    -1,   204,   286,   203,   286,   203,   286,   205,
-      -1,   197,   286,   203,   286,   203,   286,   198,    -1,   292,
-      -1,   291,   203,   292,    -1,   286,    -1,   294,    -1,   204,
-     205,    -1,   204,   295,   205,    -1,   188,   204,   295,   205,
-      -1,   286,   189,   204,   295,   205,    -1,   292,    -1,     5,
-      -1,   188,   294,    -1,   286,   189,   294,    -1,   286,     8,
-     286,    -1,   286,     8,   286,     8,   286,    -1,    76,   204,
-     286,   205,    -1,    76,     5,    -1,    79,     5,    -1,    82,
-       5,    -1,    84,     5,    -1,    96,    76,     5,    -1,    96,
-      79,     5,    -1,    96,    82,     5,    -1,    96,    84,     5,
-      -1,    96,    76,   204,   295,   205,    -1,    96,    79,   204,
-     295,   205,    -1,    96,    82,   204,   295,   205,    -1,    96,
-      84,   204,   295,   205,    -1,    76,   143,    54,   204,   286,
-     203,   286,   203,   286,   203,   286,   203,   286,   203,   286,
-     205,    -1,    79,   143,    54,   204,   286,   203,   286,   203,
-     286,   203,   286,   203,   286,   203,   286,   205,    -1,    82,
-     143,    54,   204,   286,   203,   286,   203,   286,   203,   286,
-     203,   286,   203,   286,   205,    -1,    84,   143,    54,   204,
-     286,   203,   286,   203,   286,   203,   286,   203,   286,   203,
-     286,   205,    -1,   251,    -1,   261,    -1,     4,   231,   232,
-      -1,   303,   231,   232,    -1,    37,   199,   304,   200,    -1,
-       4,   231,   204,   295,   205,   232,    -1,   303,   231,   204,
-     295,   205,   232,    -1,   286,    -1,   294,    -1,   295,   203,
-     286,    -1,   295,   203,   294,    -1,   204,   286,   203,   286,
-     203,   286,   203,   286,   205,    -1,   204,   286,   203,   286,
-     203,   286,   205,    -1,   304,    -1,     4,   201,   140,   201,
-       4,    -1,   204,   298,   205,    -1,     4,   199,   286,   200,
-     201,   141,    -1,   296,    -1,   298,   203,   296,    -1,   300,
-      -1,   304,    -1,     4,   201,     4,    -1,     4,   199,   286,
-     200,   201,     4,    -1,     5,    -1,   172,   199,   304,   200,
-      -1,    57,    -1,   170,    -1,    62,    -1,   159,   197,   299,
-     198,    -1,   158,   197,   299,   203,   299,   198,    -1,   160,
-     231,   299,   232,    -1,   160,   231,   299,   203,   299,   232,
-      -1,    42,   231,   302,   232,    -1,    43,   197,   299,   198,
-      -1,    44,   197,   299,   198,    -1,    45,   197,   299,   203,
-     299,   203,   299,   198,    -1,    40,   231,   302,   232,    -1,
-      50,   231,   299,   232,    -1,    51,   231,   299,   232,    -1,
-      52,   231,   299,   232,    -1,    49,   231,   286,   203,   300,
-     203,   300,   232,    -1,    41,   231,   299,   232,    -1,    41,
-     231,   299,   203,   295,   232,    -1,    58,   231,   299,   232,
-      -1,    59,    -1,    -1,    73,   231,   300,   301,   242,   232,
-      -1,   299,    -1,   302,   203,   299,    -1,     4,   206,   204,
-     286,   205,    -1,   303,   206,   204,   286,   205,    -1,     4,
-      -1,   303,    -1,   173,   199,   299,   200,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
        0,   197,   197,   198,   203,   205,   209,   210,   211,   212,
@@ -1308,7 +804,7 @@ static const yytype_uint16 yyrline[] =
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -1345,38 +841,38 @@ static const char *const yytname[] =
   "tGetStringValue", "tGetEnv", "tGetString", "tGetNumber", "tHomology",
   "tCohomology", "tBetti", "tExists", "tFileExists", "tGMSH_MAJOR_VERSION",
   "tGMSH_MINOR_VERSION", "tGMSH_PATCH_VERSION", "tGmshExecutableName",
-  "tSetPartition", "tNameToString", "tStringToName", "tAFFECTDIVIDE",
-  "tAFFECTTIMES", "tAFFECTMINUS", "tAFFECTPLUS", "'?'", "tOR", "tAND",
-  "tNOTEQUAL", "tEQUAL", "'<'", "'>'", "tGREATEROREQUAL", "tLESSOREQUAL",
-  "'+'", "'-'", "'*'", "'/'", "'%'", "'!'", "UNARYPREC", "tMINUSMINUS",
-  "tPLUSPLUS", "'^'", "'('", "')'", "'['", "']'", "'.'", "'#'", "','",
+  "tSetPartition", "tNameToString", "tStringToName", "tAFFECTPLUS",
+  "tAFFECTMINUS", "tAFFECTTIMES", "tAFFECTDIVIDE", "'?'", "tOR", "tAND",
+  "tEQUAL", "tNOTEQUAL", "'<'", "tLESSOREQUAL", "'>'", "tGREATEROREQUAL",
+  "'+'", "'-'", "'*'", "'/'", "'%'", "'!'", "tPLUSPLUS", "tMINUSMINUS",
+  "UNARYPREC", "'^'", "'('", "')'", "'['", "']'", "'.'", "'#'", "','",
   "'{'", "'}'", "'~'", "$accept", "All", "GeoFormatItems", "GeoFormatItem",
   "SendToFile", "Printf", "View", "Views", "ElementCoords",
-  "ElementValues", "Element", "@1", "@2", "Text2DValues", "Text2D", "@3",
-  "Text3DValues", "Text3D", "@4", "InterpolationMatrix", "Time", "@5",
-  "NumericAffectation", "NumericIncrement", "LP", "RP", "Affectation",
-  "Comma", "DefineConstants", "@6", "@7", "UndefineConstants",
-  "Enumeration", "FloatParameterOptions", "FloatParameterOption",
-  "CharParameterOptions", "CharParameterOption", "PhysicalId0",
-  "PhysicalId1", "PhysicalId2", "PhysicalId3", "InSphereCenter",
-  "CircleOptions", "Shape", "Transform", "MultipleShape", "ListOfShapes",
-  "LevelSet", "Delete", "Colorify", "SetPartition", "Visibility",
-  "Command", "Loop", "Extrude", "@8", "@9", "@10", "@11", "@12", "@13",
-  "@14", "@15", "@16", "@17", "@18", "@19", "@20", "ExtrudeParameters",
-  "ExtrudeParameter", "TransfiniteType", "TransfiniteArrangement",
-  "TransfiniteCorners", "RecombineAngle", "PeriodicTransform",
-  "Constraints", "Coherence", "HomologyCommand", "Homology", "FExpr",
-  "FExpr_Single", "@21", "VExpr", "VExpr_Single",
+  "ElementValues", "Element", "$@1", "$@2", "Text2DValues", "Text2D",
+  "$@3", "Text3DValues", "Text3D", "$@4", "InterpolationMatrix", "Time",
+  "$@5", "NumericAffectation", "NumericIncrement", "LP", "RP",
+  "Affectation", "Comma", "DefineConstants", "$@6", "$@7",
+  "UndefineConstants", "Enumeration", "FloatParameterOptions",
+  "FloatParameterOption", "CharParameterOptions", "CharParameterOption",
+  "PhysicalId0", "PhysicalId1", "PhysicalId2", "PhysicalId3",
+  "InSphereCenter", "CircleOptions", "Shape", "Transform", "MultipleShape",
+  "ListOfShapes", "LevelSet", "Delete", "Colorify", "SetPartition",
+  "Visibility", "Command", "Loop", "Extrude", "$@8", "$@9", "$@10", "$@11",
+  "$@12", "$@13", "$@14", "$@15", "$@16", "$@17", "$@18", "$@19", "$@20",
+  "ExtrudeParameters", "ExtrudeParameter", "TransfiniteType",
+  "TransfiniteArrangement", "TransfiniteCorners", "RecombineAngle",
+  "PeriodicTransform", "Constraints", "Coherence", "HomologyCommand",
+  "Homology", "FExpr", "FExpr_Single", "$@21", "VExpr", "VExpr_Single",
   "RecursiveListOfListOfDouble", "ListOfDouble", "ListOfDoubleOrAll",
   "FExpr_Multi", "RecursiveListOfDouble", "ColorExpr", "ListOfColor",
-  "RecursiveListOfColor", "StringExprVar", "StringExpr", "@22",
-  "RecursiveListOfStringExprVar", "StringIndex", "String__Index", 0
+  "RecursiveListOfColor", "StringExprVar", "StringExpr", "$@22",
+  "RecursiveListOfStringExprVar", "StringIndex", "String__Index", YY_NULLPTR
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
@@ -1397,131 +893,216 @@ static const yytype_uint16 yytoknum[] =
      405,   406,   407,   408,   409,   410,   411,   412,   413,   414,
      415,   416,   417,   418,   419,   420,   421,   422,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   432,    63,   433,
-     434,   435,   436,    60,    62,   437,   438,    43,    45,    42,
+     434,   435,   436,    60,   437,    62,   438,    43,    45,    42,
       47,    37,    33,   439,   440,   441,    94,    40,    41,    91,
       93,    46,    35,    44,   123,   125,   126
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint16 yyr1[] =
-{
-       0,   207,   208,   208,   209,   209,   210,   210,   210,   210,
-     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
-     210,   210,   211,   211,   212,   212,   212,   212,   212,   212,
-     213,   213,   213,   213,   214,   214,   214,   214,   214,   214,
-     215,   215,   216,   216,   218,   219,   217,   220,   220,   222,
-     221,   223,   223,   225,   224,   226,   226,   228,   227,   229,
-     229,   229,   229,   229,   230,   230,   231,   231,   232,   232,
-     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
-     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
-     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
-     233,   233,   233,   233,   233,   233,   233,   234,   234,   235,
-     235,   235,   236,   235,   235,   237,   235,   238,   238,   239,
-     239,   240,   240,   241,   241,   241,   242,   242,   243,   243,
-     243,   243,   244,   244,   244,   245,   245,   245,   246,   246,
-     246,   247,   247,   247,   248,   248,   249,   249,   250,   250,
-     250,   250,   250,   250,   250,   250,   250,   250,   250,   250,
-     250,   250,   250,   250,   250,   250,   250,   250,   250,   250,
-     250,   250,   250,   250,   250,   250,   250,   251,   251,   251,
-     251,   251,   251,   251,   251,   252,   252,   253,   253,   253,
-     253,   253,   253,   254,   254,   254,   254,   254,   254,   254,
-     254,   254,   255,   255,   255,   255,   255,   256,   256,   257,
-     258,   258,   258,   258,   258,   258,   259,   259,   259,   259,
-     259,   259,   259,   259,   259,   259,   259,   259,   259,   259,
-     259,   259,   259,   259,   259,   260,   260,   260,   260,   260,
-     260,   260,   260,   260,   260,   260,   260,   260,   260,   261,
-     261,   261,   262,   261,   263,   261,   264,   261,   265,   261,
-     261,   261,   261,   261,   261,   261,   261,   261,   261,   266,
-     261,   267,   261,   268,   261,   269,   261,   270,   261,   271,
-     261,   272,   261,   273,   261,   274,   261,   275,   275,   276,
-     276,   276,   276,   276,   276,   276,   276,   276,   276,   276,
-     276,   276,   276,   276,   277,   277,   278,   278,   279,   279,
-     280,   280,   281,   281,   282,   282,   282,   282,   282,   282,
-     282,   282,   282,   282,   282,   282,   282,   282,   282,   282,
-     282,   282,   282,   282,   282,   282,   282,   282,   282,   282,
-     283,   283,   283,   284,   284,   284,   285,   285,   285,   285,
-     286,   286,   286,   286,   286,   286,   286,   286,   286,   286,
-     286,   286,   286,   286,   286,   286,   286,   286,   286,   286,
-     286,   286,   286,   286,   286,   286,   286,   286,   286,   286,
-     286,   286,   286,   286,   286,   286,   286,   286,   286,   286,
-     286,   286,   287,   287,   287,   287,   287,   287,   287,   287,
-     287,   287,   287,   288,   287,   287,   287,   287,   287,   287,
-     287,   287,   287,   287,   287,   287,   287,   287,   287,   287,
-     287,   287,   287,   287,   287,   287,   287,   287,   287,   289,
-     289,   289,   289,   289,   290,   290,   290,   290,   291,   291,
-     292,   292,   292,   292,   292,   292,   293,   293,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
-     294,   294,   294,   294,   294,   294,   295,   295,   295,   295,
-     296,   296,   296,   296,   297,   297,   298,   298,   299,   299,
-     299,   299,   300,   300,   300,   300,   300,   300,   300,   300,
-     300,   300,   300,   300,   300,   300,   300,   300,   300,   300,
-     300,   300,   300,   300,   301,   300,   302,   302,   303,   303,
-     304,   304,   304
-};
+#define YYPACT_NINF -1343
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-1343)))
+
+#define YYTABLE_NINF -492
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
 {
-       0,     2,     1,     2,     0,     2,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     2,     5,     5,     7,     7,     7,     9,
-       6,     6,     6,     8,     0,     2,     2,     2,     2,     2,
-       1,     3,     1,     3,     0,     0,    10,     1,     3,     0,
-      13,     1,     3,     0,    15,     8,    14,     0,     6,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       5,     5,     7,     7,     4,     6,     6,     7,     7,     7,
-       7,     9,     9,     3,     6,     6,     6,     6,     4,     6,
-       9,     6,     9,     5,     8,     8,    11,     6,     9,     5,
-       7,     9,     9,    11,     7,     9,     9,     0,     1,     0,
-       3,     5,     0,     9,     5,     0,     9,     0,     3,     3,
-       5,     0,     2,     3,     5,     3,     0,     2,     3,     3,
-       3,     5,     1,     1,     3,     1,     1,     3,     1,     1,
-       3,     1,     1,     3,     0,     5,     0,     2,     7,     8,
-       6,     7,     4,     7,     8,     8,     7,     7,    11,     8,
-       8,     8,     8,     9,     3,     4,    10,     7,     7,     8,
-       8,    12,     8,     8,     7,     8,     8,     5,    11,     5,
-       9,     9,     4,     9,     9,     1,     1,     0,     2,     6,
-       6,     6,     6,     8,    10,    14,    16,    12,     8,     8,
-       6,    14,     4,     6,     6,     3,     4,     5,     6,     5,
-       3,     3,     4,     5,     4,     5,     3,     5,     7,     7,
-       3,     7,     3,     2,     2,     2,     2,     2,    15,     2,
-       2,     2,     2,     2,    16,     6,     8,     8,    10,     1,
-       2,     2,     1,     3,     3,     4,     4,     1,     1,     5,
-      11,    13,     0,     7,     0,    13,     0,    15,     0,     6,
-       8,     8,     8,    12,    12,    12,    14,    14,    14,     0,
-      12,     0,    12,     0,    12,     0,    16,     0,    16,     0,
-      16,     0,    18,     0,    18,     0,    18,     1,     2,     5,
-       7,     9,     2,     2,     2,     3,     2,     3,     2,     3,
-       2,     3,     9,     6,     0,     3,     0,     1,     0,     2,
-       0,     2,     0,     2,     7,     6,     8,     5,     3,     8,
-       5,     4,     6,    11,    11,    18,    18,    12,    12,    12,
-      10,    10,    10,    10,    10,     4,     4,     4,     4,     4,
-       2,     3,     6,     1,     1,     1,     2,     5,     7,    10,
-       1,     3,     2,     2,     2,     3,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     3,     3,     5,
-       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
-       6,     4,     4,     4,     4,     4,     4,     4,     6,     6,
-       6,     4,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     0,     6,     4,     6,     1,     4,     4,
-       4,     4,     4,     4,     4,     2,     5,     5,     5,     5,
-       3,     6,     4,     7,     6,     6,     6,     6,     4,     1,
-       2,     2,     3,     3,    11,     9,     7,     7,     1,     3,
-       1,     1,     2,     3,     4,     5,     1,     1,     2,     3,
-       3,     5,     4,     2,     2,     2,     2,     3,     3,     3,
-       3,     5,     5,     5,     5,    16,    16,    16,    16,     1,
-       1,     3,     3,     4,     6,     6,     1,     1,     3,     3,
-       9,     7,     1,     5,     3,     6,     1,     3,     1,     1,
-       3,     6,     1,     4,     1,     1,     1,     4,     6,     4,
-       6,     4,     4,     4,     8,     4,     4,     4,     4,     8,
-       4,     6,     4,     1,     0,     6,     1,     3,     5,     5,
-       1,     1,     4
+    7148,   126,    86,  7268, -1343, -1343,  3752,   127,    70,   -37,
+     -13,    36,   267,   332,   342,   348,    72,   384,   391,    12,
+     202,  -167,  -167,   -86,   210,   227,    18,   230,   234,    17,
+     244,   285,   418,   352,   425,   531,   311,   405,   445,   475,
+     370,   474,   654,   454,   205,   371,   508,   -36,   395,  -123,
+    -123,   398,   215,    67,   252,   513,   524,    24,    53,   555,
+     560,   232,   639,   651,   661,  5256,   673,   472,   495,   503,
+      29,    41, -1343,   511,   519, -1343, -1343,   726,   729,   485,
+   -1343,  5337,  5724,    19,    32, -1343, -1343, -1343,  7008,   545,
+   -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343,
+   -1343, -1343, -1343, -1343, -1343, -1343,    50, -1343,   161,    85,
+   -1343,    13, -1343, -1343, -1343, -1343, -1343,  -167,  -167,  -167,
+    -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,
+    -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,
+    -167,  -167,   528,   557,   558,   573,   580,   588,  -167,  -167,
+    -167,  -167,   594, -1343,  -167, -1343, -1343, -1343, -1343, -1343,
+    -167,  -167,   794,   623,   626,   630,  -167,  -167,   637,   644,
+   -1343, -1343, -1343, -1343,   646,  7008,  7008,  7008,  7008,  7008,
+      40,     9,    62,   648,   -74,  1131, -1343,   649,   840,   162,
+    -121,   857,  7008,  5533,  5533, -1343,  7008, -1343, -1343, -1343,
+   -1343,  5533, -1343, -1343, -1343, -1343, -1343, -1343,  5920,     9,
+    7008,  6818,  7008,  7008,   688,  7008,  6818,  7008,  7008,   715,
+    6818,  7008,  7008,  5648,   721,   746, -1343,  6818,  5256,  5256,
+    5256,   733,   736,  5256,  5256,  5256,   744,   756,   757,   765,
+     766,   769,   770,   774,   784,  3428,   871,  5648,    29,   785,
+     799,  -123,  -123,  -123,  7008,  7008,  -127, -1343,   -65,  -123,
+     824,   828,   836,  3662,   -42,   -49,   803,   848,   868,  5256,
+    5256,  5648,   875,     1,   797, -1343,   804,  1015,  1074, -1343,
+     886,   890,   893,  5256,  5256,   903,   906,   914,   516, -1343,
+     922,    14,    15,    20,    26,   658,  5844,  7008,  4171, -1343,
+   -1343,  2819, -1343,  1120, -1343,   214,    11,  1121,  7008,  7008,
+    7008,  -107,  7008,   930, -1343,   992,  7008,  7008,  7008, -1343,
+   -1343,  7008,   934,  1136,  1137, -1343, -1343,  1139, -1343,  1140,
+   -1343,   522,  8020,  5533, -1343,  5648,  5648,  7008,  7008,   944,
+     324,  5920, -1343, -1343, -1343, -1343, -1343, -1343,  5648,  1143,
+     952,  7008,  7008,  1150,  7008,  7008,  7008,  7008,  7008,  7008,
+    7008,  7008,  7008,  7008,  7008,  7008,  7008,  7008,  7008,  7008,
+    7008,  7008,  7008,  7008,  7008,  7008,  5533,  5533,  5533,  5533,
+    5533,  5533,  5648,  5533,  5533,  7008,  5533,  5533,  5533,  5533,
+    5533,  7008,  5920,  7008,  5533,  5533,  5533,  5533,  5533,     9,
+    5920,     9,   959,   959,   959,  9645,  6002,   124,   955,  1152,
+    -167,   957, -1343,   958,  5102,  7008, -1343, -1343,  6818,    -4,
+   -1343,  7008,  7008,  7008,  7008,  7008,  7008,  7008,  7008,  7008,
+    7008,  7008,  7008,  7008,  7008,  7008, -1343, -1343,  7008,  7008,
+   -1343, -1343,  1242,   345,   -82, -1343, -1343,    -2,  8127, -1343,
+     287,  -157,   169,   962,   979,  9666,  6818,  4346, -1343,    80,
+    9687,  9708,  7008,  9729,   211,  9750,  9771,  7008,   237,  9792,
+    9813,  1178,  7008,  7008,   344,  1180,  1181,  1185,  7008,  7008,
+    1191,  1203,  1203,  7008,  6628,  6628,  6628,  6628,  7008,  7008,
+    7008,  6818,  6818,  8047,  1013,  1209,  1012, -1343, -1343,  -135,
+   -1343, -1343,  8153,  8179,  -123,  -123,    62,    62,    89,  7008,
+    7008,  7008,  3662,  3662,  7008,  5102,   101, -1343,  7008,  7008,
+    7008,  7008,  7008,  1215,  1217,  1220,  7008,  1224,  7008,  7008,
+    1452, -1343, -1343,  6818,  6818,  6818,  1225,  1226,  7008,  7008,
+    7008,  7008,  7008,  1229,   426,     9, -1343,  1183,  7008, -1343,
+    1186, -1343,  1187, -1343,  1188,    33,    35,    42,    44,  6818,
+     959, -1343,  9834, -1343,   361,  7008,  6040, -1343,  7008,  7008,
+     482, -1343,  9855,  9876,  9897,  1095,  8205, -1343,  1030,  4366,
+    9918,  9939,  9323, -1343, -1343, -1343,  1489, -1343,  1583,  7008,
+   -1343,  1043,  1046,   362,  9960,  9346,  7008,  6818,    -4,  1239,
+    1240, -1343,  7008,  9981,  9369,   -43,  1525,  1525,  1525,  1525,
+    1525,  1525,  1525,  1525,  1525,  1525,  1525,  8231,  1525,  1525,
+    1525,  1525,  1525,  1525,  1525,  8257,  8283,  8309,   575,   586,
+     575,  1049,  1051,  1047,  1048,  1052,  1053,  8335,   509,   509,
+     509,   456,   509, 10443, -1343,  1300,  1054,  1055,  1056,   590,
+     599,  1063,  1064,  1065,   131,    81,  5920,  7008,  1246,  1259,
+      25,   509, -1343,    68,    37,    31,   105, -1343,  6524,   430,
+   -1343,  5648,  4550,  2083,  2328,   987,   987,   402,   402,   402,
+     402,   175,   175,   959,   959,   959,   959,     4, 10002,  9392,
+   -1343,  7008,  1260,     3,  6818,  1264,  6818,  7008,  1265,  5533,
+    1266, -1343,     9,  1267,  5533,  7008,  5920,  1269,  6818,  6818,
+    1123,  1271,  1272, 10023,  1274,  1141,  1275,  1278, 10044,  1145,
+    1279,  1282,  7008, 10065,  6552,  1086, -1343, -1343, -1343, 10086,
+   10107,  7008,  5648,  1270,  1285, 10128,  1096, 10443,  1092,  1099,
+   10443,  1097,  1100, 10443,  1098,  1104, 10443,  1101, 10149, 10170,
+   10191,   521,   614,  6818,  1107, -1343, -1343,  1745,  1921,  -123,
+    7008,  7008, -1343, -1343,  1118,  1119,  3662,  8361,  8387,  8413,
+    8101,   -12,  -123,  2141, 10212,  6585, 10233, 10254, 10275,  7008,
+    1319, -1343,  7008, 10296, -1343,  9415,  9438, -1343,   634,   656,
+     665, -1343, -1343,  9461,  9484,  8439,  9507,    11,  6818, -1343,
+    1126,  1124,  6756,  1125,  1127,  1132, -1343,  6818, -1343,  6818,
+   -1343,  6818, -1343,  6818,   671, -1343, -1343,  4962,  6818,   959,
+   -1343,  6818, -1343,  1323,  1328,  1330,  1138,  7008,  2317,  7008,
+    7008, -1343, -1343,    51, -1343, -1343,  2407, -1343,  1134,  5648,
+    1334,   131,   131,  6903,   681,  5648, -1343, -1343,  9530,    11,
+    1066, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343,
+   -1343, -1343, -1343,  7008, -1343, -1343, -1343, -1343, -1343, -1343,
+   -1343,  7008,  7008,  7008, -1343,  6818, -1343, -1343, -1343, -1343,
+    5533,  5648,  5533,  5533,  5920, -1343, -1343, -1343, -1343, -1343,
+   -1343, -1343, -1343,  7008,  5533, -1343,  5533, -1343,  7008, -1343,
+   -1343, -1343, -1343,  7008,  1335,    46,  7008,  1336,  1337,  1949,
+   -1343,  1341,  1153,    29,  1338, -1343,  6818,  6818,  6818,  6818,
+   -1343,   509,  1343,  7008, -1343,  1156,  1157,  1151, -1343,  1350,
+   -1343, -1343, -1343, -1343, -1343,    11,    11,  9553, -1343, -1343,
+    1173,  5533,   549, -1343,   602,  8465, -1343, -1343, -1343,  1352,
+   -1343, -1343,  1525,   509,  -123,  4346, -1343,   812,  5648,  5648,
+    1354,  5648,   813,  5648,  5648,  1356,  1284,  5648,  5648,  2107,
+    1362,  1363,  6818,  1368,  1369,  5982, -1343, -1343,  1371, -1343,
+    1373,    -4,  7008,    -4,  7008,    -4,  7008,    -4,  7008,  1374,
+    1375,  1376,  1377,  1378,   695,  1383,  2485, -1343, -1343,   125,
+    8491,  8517, -1343, -1343,  6931,   -78,  -123,  -123,  -123,  1384,
+    1385,  1189,  1386,  1192,     5,    21,    28,    57,   435, -1343,
+     132, -1343,   -12,  1390,  1392,  1393,  1394,  1396, 10443, -1343,
+    2251,  1200,  1402,  1403,  1404,  1329,  1405,  1407,  1409,  7008,
+     128,   698, -1343,  7008, -1343,  7008,  7008,  7008,   699,   702,
+     703,   706, -1343,  7008,   714,   718,  5648,  5648,  5648,  1412,
+    8543, -1343,  4981,   795,  1413,  1415, -1343,  5648,  1231, -1343,
+    7008,  1428,  7008,  1434, -1343,   509,  1436,  1437, -1343,  1440,
+   -1343,  1439,  1525,  1525,  1525,  1525,   609,  1243,  1249,  1250,
+    1251,  1248,   613,   632, 10317,  1252,   509,  1525,  2522, -1343,
+     303,  1253,  1446,  2800, -1343, -1343, -1343,    29,  7008, -1343,
+     719, -1343,   722,   723,   731,   734,    -4, -1343, 10443,  1263,
+    7008,  7008,  5648,  1257, -1343, -1343, -1343,  1256, -1343,  1456,
+      10,  1457,  7008,  4799,  1460,  1461,     6,  1268,  1273,  1381,
+    1381,  5648,  1462,  1288,  1289,  1463,  1464,  5648,  1290,  1468,
+    1469, -1343,  1490,  5648,   737,  5648,  5648,  1494,  1497, -1343,
+    5648,  5648, 10443,  5648, 10443,  5648, 10443,  5648, 10443,  5648,
+    5648,  5648,  1296,  1301,  1499,   411, -1343,  7008,  7008,  7008,
+    1304,  1305,  -112,  -108,  -103,  1312, -1343,  5648, -1343,  7008,
+   -1343,  1506, -1343,  1508, -1343,  1509, -1343,  1510, -1343, -1343,
+    3662,   526,  5452, -1343,  1313,  1317,  6236, -1343,  6818, -1343,
+   -1343, -1343,  1339,  7008, -1343, -1343,  9576,  1519,   509,  8569,
+    8595,  8621,  8647, -1343, -1343, -1343, -1343, 10443, -1343,   509,
+    1534,  1536,  1411, -1343,  7008,  7008,  7008, -1343,  1540,   466,
+    1348,  1546,  2855, -1343,  3149, -1343,    -4, -1343, -1343,   -40,
+   -1343, -1343, -1343, -1343, -1343, -1343,  5533, -1343, -1343, -1343,
+    5920,  1551, -1343, -1343,    22, -1343, -1343, -1343, -1343, -1343,
+   -1343, -1343,  5920,  7008,  1550,  1554,    25, -1343,  1555,  9599,
+      29, -1343,  1557,  1558,  1569,  1571,  5648,  7008,  8673,  8699,
+     743, -1343,  7008,  1556, -1343, -1343,  5533, -1343,  8725,  4407,
+   10443, -1343, -1343, -1343, -1343,  7008,  7008,  -123,  1572,  1573,
+    1574, -1343,  7008,  7008, -1343, -1343,  1577,  7008, -1343, -1343,
+    1587,  1588,  1389,  1591,  1455,  7008, -1343,  1593,  1594,  1595,
+    1597,  1600,  1601,   943,  1602,  6818,  6818,  7008, -1343,  6628,
+    7264, 10338,  3375,    62,    62,  -123,  1603,  -123,  1607,  -123,
+    1608,  7008,   278,  1417, 10359, -1343, -1343, -1343, -1343,  7292,
+     139, -1343,  1609,  3963,  1615,  5648,  -123,  3963,  1616,   754,
+    7008,  3182,  1621,    11, -1343,  7008,  7008,  7008,  7008, -1343,
+   -1343, -1343,  5648,  6174,   578, 10380, -1343, -1343,  4864,  5648,
+   -1343, -1343, -1343,  5648, -1343,  1430,   509,  4603,  5060,  5920,
+    1623,  3201, -1343,  1624,  1627, -1343,  1429, -1343, -1343, -1343,
+   -1343, -1343,  1628,   635, 10443,  7008,  7008,  5648,  1431,   789,
+   10443, -1343,  1630,  7008, -1343, -1343,  7320,  7348,   263, -1343,
+   -1343, -1343,  7376,  7404, -1343,  7432,  1632, -1343,  5648, -1343,
+    1559,  1634, 10443, -1343, -1343, -1343, -1343, -1343, -1343,  1438,
+   -1343, -1343,   792,   796,  8074,  3563,  1638,  1442, -1343,  7008,
+   -1343,  1443,  1444,   153, -1343,  1447,   159, -1343,  1448,   201,
+   -1343,  1449,  9622,  1644,  5648,  1649,  1465,  7008, -1343,  6432,
+     218, -1343,   806,   222,   235, -1343,  1665,  7460, -1343, -1343,
+    8751,  8777,  8803,  8829,  1535,  7008, -1343,  7008, -1343, -1343,
+    6818,  3693,  1666,  1472,  1668, -1343, -1343,  4171, -1343, -1343,
+    5533, 10443, -1343, -1343, -1343, -1343,    29, -1343,  1541, -1343,
+   -1343,  7008,  8855,  8881, -1343,  5648,  7008,  1679, -1343,  8907,
+   -1343, -1343,  1680,  1681,  1682,  1683,  1684,  1685,   814,  1488,
+   -1343,  5648,   642,   678,  6818, -1343, -1343,    62,  6370, -1343,
+   -1343,  3662,   -12,  3662,   -12,  3662,   -12,  1687, -1343,   817,
+    5648, -1343,  7488,  -123,  1689,  6818,  -123, -1343, -1343,  7008,
+    7008,  7008,  7008,  7008,  7516,  7544,   821, -1343, -1343,  1693,
+   -1343,   822,  4202,   826,  1694, -1343,  1513, 10443,  7008,  7008,
+     833, 10443, -1343,  7008,   834,   853, -1343, -1343, -1343, -1343,
+   -1343, -1343,  1518,  7008,   854,  1520,  -123,  5648,  1695,  1522,
+    -123,  1721,   870,  1528,  7008, -1343,  7572,   283,   730,  7600,
+     288,   763,  7628,   338,   888, -1343,  5648,  1728,  1636,  2562,
+    1532,   413, -1343,   873,   444,  8933,  8959,  8985,  9011,  3901,
+   -1343, -1343,  1731, -1343,  7008, -1343,  5920, -1343, -1343,  7008,
+   10401,  9037,    45,  9063, -1343, -1343,  7008,  7656,  1732,  -123,
+      63, -1343, -1343,  -123,    76, -1343,  1733, -1343,  7684,  1734,
+    7008,  1735,  1737,  7008,  1738,  1740,  7008,  1741,  1543, -1343,
+    7008, -1343,   -12, -1343,  6818,  1744,  6432,  7008,  7008,  7008,
+    7008, -1343, -1343,   392, -1343,   874, -1343,  7008, -1343,  5648,
+    7008,  9089, -1343, -1343,   484, -1343,   487, -1343, -1343, -1343,
+   -1343,  1549,  7712, -1343, -1343,  1552,  7740, -1343, -1343,  1563,
+    7768, -1343,  1748,  4117,   924,  2667,   883, -1343,   501,   884,
+    9115,  9141,  9167,  9193,  5920,  1753,  1568, 10422,   898,  7796,
+    7008,  -123,  -123,   -12,  1755,   -12,  1756,   -12,  1770, -1343,
+   -1343, -1343, -1343,   -12,  1771,  6818,  1773,  7008,  7008,  7008,
+    7008, -1343, -1343,  5533, -1343,  1578,  1775,  7824,   507,   515,
+     942, -1343,  1579,  1070, -1343,  1580,  1082, -1343,  1581,  1094,
+   -1343,   909, -1343,  9219,  9245,  9271,  9297,   917, -1343,  1582,
+    5648, -1343,  1783,  7008,  7008,  1784,   -12,  1785,   -12,  1786,
+     -12, -1343,  1787,  7008,  7008,  7008,  7008,  5533,  1788,  5533,
+     927, -1343,  7852,  7880, -1343,  1247, -1343,  1400, -1343,  1492,
+   -1343,  7908,  7936,  7964,  7992, -1343, -1343,   928, -1343,  1789,
+    1790,  1791,  1793,  1794,  1795, -1343, -1343, -1343, -1343,  5533,
+    1796, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
        0,     0,     0,     2,     3,     1,   520,     0,     0,     0,
@@ -1558,7 +1139,7 @@ static const yytype_uint16 yydefact[] =
        0,   520,     0,     0,   482,     0,     0,     0,     0,   223,
      224,     0,   520,     0,     0,   240,   241,     0,   187,     0,
      187,   520,     0,     0,   346,     0,     0,    66,    67,     0,
-       0,    59,    63,    62,    61,    60,    65,    64,     0,     0,
+       0,    59,    60,    61,    62,    63,    64,    65,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1591,8 +1172,8 @@ static const yytype_uint16 yydefact[] =
        0,     0,     0,   403,   514,     0,     0,     0,     0,     0,
        0,     0,     0,     0,   351,     0,    59,     0,     0,     0,
        0,     0,   182,     0,     0,     0,     0,   188,     0,     0,
-      59,     0,     0,   368,   367,   366,   365,   361,   362,   364,
-     363,   356,   355,   357,   358,   359,   360,     0,     0,     0,
+      59,     0,     0,   368,   367,   365,   366,   361,   363,   362,
+     364,   356,   355,   357,   358,   359,   360,     0,     0,     0,
      165,     0,     0,     0,     0,     0,     0,     0,     0,     0,
        0,   108,     0,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -1711,7 +1292,22 @@ static const yytype_uint16 yydefact[] =
        0,    56,   325,   326,   282,   284,   286,    52,    54
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
+{
+   -1343, -1343, -1343, -1343,   675, -1343, -1343, -1343, -1343,   154,
+   -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343,
+   -1343, -1343,  -302,   -70,  2048,    -1, -1343,  1357, -1343, -1343,
+   -1343, -1343, -1343,   280, -1343,   282, -1343, -1343, -1343, -1343,
+   -1343, -1343,   674,  1808,     7,  -500,  -227, -1343, -1343, -1343,
+   -1343, -1343, -1343, -1343,  1812, -1343, -1343, -1343, -1343, -1343,
+   -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1004,  -948,
+   -1343, -1343,  1349, -1343,   274, -1343, -1343, -1343, -1343,  1553,
+   -1343, -1343,    92, -1343, -1342,  2114,   428,  2598,  2729,  -247,
+     542, -1343,    49,     8, -1343,  -374,    -3,   122
+};
+
+  /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
       -1,     2,     3,    90,   941,    91,    92,   687,  1413,  1419,
@@ -1726,406 +1322,197 @@ static const yytype_int16 yydefgoto[] =
      914,  1110,   449,   445,   891,   450,   189,   306
 };
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -1343
-static const yytype_int16 yypact[] =
-{
-    7148,    96,   112,  7268, -1343, -1343,  3752,   119,   -32,   -13,
-      62,    36,   154,   199,   263,   296,    94,   308,   318,   169,
-     191,  -167,  -167,  -151,   145,   200,    18,   206,   210,    17,
-     227,   234,   327,   359,   390,   475,   300,   465,   425,   433,
-     598,   452,   511,   691,   256,   354,   513,   -80,   395,   -77,
-     -77,   398,   283,    39,   -11,   551,   576,    24,    53,   590,
-     583,   290,   688,   696,   709,  5256,   773,   585,   591,   596,
-      29,    41, -1343,   604,   623, -1343, -1343,   827,   828,   624,
-   -1343,  5337,  5724,    19,    32, -1343, -1343, -1343,  7008,   628,
-   -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343,
-   -1343, -1343, -1343, -1343, -1343, -1343,    50, -1343,  -125,   123,
-   -1343,    13, -1343, -1343, -1343, -1343, -1343,  -167,  -167,  -167,
-    -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,
-    -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,  -167,
-    -167,  -167,   641,   644,   648,   649,   655,   666,  -167,  -167,
-    -167,  -167,   678, -1343,  -167, -1343, -1343, -1343, -1343, -1343,
-    -167,  -167,   846,   708,   715,   721,  -167,  -167,   733,   736,
-   -1343, -1343, -1343, -1343,   686,  7008,  7008,  7008,  7008,  7008,
-      21,     9,   207,   690,    79,  1131, -1343,   707,   935,  -102,
-     -18,   944,  7008,  5533,  5533, -1343,  7008, -1343, -1343, -1343,
-   -1343,  5533, -1343, -1343, -1343, -1343, -1343, -1343,  5920,     9,
-    7008,  6818,  7008,  7008,   756,  7008,  6818,  7008,  7008,   757,
-    6818,  7008,  7008,  5648,   765,   759, -1343,  6818,  5256,  5256,
-    5256,   769,   770,  5256,  5256,  5256,   774,   791,   799,   803,
-     813,   824,   831,   835,   785,  3428,   999,  5648,    29,   836,
-     841,   -77,   -77,   -77,  7008,  7008,  -104, -1343,   -41,   -77,
-     861,   868,   876,  3662,   -37,  -136,   893,   897,   900,  5256,
-    5256,  5648,   905,     1,   906, -1343,   907,  1114,  1115, -1343,
-     918,   922,   923,  5256,  5256,   931,   932,   934,   536, -1343,
-     936,    14,    15,    22,    26,   702,  5844,  7008,  4171, -1343,
-   -1343,  2819, -1343,  1126, -1343,   243,   360,  1128,  7008,  7008,
-    7008,   -88,  7008,   938, -1343,   997,  7008,  7008,  7008, -1343,
-   -1343,  7008,   937,  1139,  1140, -1343, -1343,  1142, -1343,  1143,
-   -1343,   285,  8020,  5533, -1343,  5648,  5648,  7008,  7008,   947,
-     216,  5920, -1343, -1343, -1343, -1343, -1343, -1343,  5648,  1148,
-     956,  7008,  7008,  1152,  7008,  7008,  7008,  7008,  7008,  7008,
-    7008,  7008,  7008,  7008,  7008,  7008,  7008,  7008,  7008,  7008,
-    7008,  7008,  7008,  7008,  7008,  7008,  5533,  5533,  5533,  5533,
-    5533,  5533,  5648,  5533,  5533,  7008,  5533,  5533,  5533,  5533,
-    5533,  7008,  5920,  7008,  5533,  5533,  5533,  5533,  5533,     9,
-    5920,     9,   963,   963,   963,  9645,  6002,   131,   960,  1156,
-    -167,   961, -1343,   977,  5102,  7008, -1343, -1343,  6818,    -4,
-   -1343,  7008,  7008,  7008,  7008,  7008,  7008,  7008,  7008,  7008,
-    7008,  7008,  7008,  7008,  7008,  7008, -1343, -1343,  7008,  7008,
-   -1343, -1343,  1242,   165,   -44, -1343, -1343,    -2,  8127, -1343,
-     287,   101,   251,   982,   983,  9666,  6818,  4346, -1343,   -82,
-    9687,  9708,  7008,  9729,   -60,  9750,  9771,  7008,   143,  9792,
-    9813,  1180,  7008,  7008,   247,  1185,  1192,  1204,  7008,  7008,
-    1208,  1209,  1209,  7008,  6628,  6628,  6628,  6628,  7008,  7008,
-    7008,  6818,  6818,  8047,  1013,  1216,  1019, -1343, -1343,   -48,
-   -1343, -1343,  8153,  8179,   -77,   -77,   207,   207,   -39,  7008,
-    7008,  7008,  3662,  3662,  7008,  5102,   -35, -1343,  7008,  7008,
-    7008,  7008,  7008,  1220,  1224,  1225,  7008,  1227,  7008,  7008,
-    1452, -1343, -1343,  6818,  6818,  6818,  1228,  1229,  7008,  7008,
-    7008,  7008,  7008,  1233,   364,     9, -1343,  1186,  7008, -1343,
-    1187, -1343,  1189, -1343,  1190,    33,    35,    42,    44,  6818,
-     963, -1343,  9834, -1343,   270,  7008,  6040, -1343,  7008,  7008,
-     426, -1343,  9855,  9876,  9897,  1105,  8205, -1343,  1042,  4366,
-    9918,  9939,  9323, -1343, -1343, -1343,  1489, -1343,  1583,  7008,
-   -1343,  1047,  1051,   319,  9960,  9346,  7008,  6818,    -4,  1248,
-    1249, -1343,  7008,  9981,  9369,    70,  1525,  1525,  1525,  1525,
-    1525,  1525,  1525,  1525,  1525,  1525,  1525,  8231,  1525,  1525,
-    1525,  1525,  1525,  1525,  1525,  8257,  8283,  8309,    89,   587,
-      89,  1064,  1065,  1061,  1062,  1063,  1067,  8335,   367,   367,
-     367,   400,   367, 10443, -1343,  1300,  1068,  1069,  1075,   602,
-     609,  1076,  1078,  1079,   302,    81,  5920,  7008,  1272,  1277,
-      25,   367, -1343,    -9,    37,    31,   150, -1343,  6524,   386,
-   -1343,  5648,  4550,  2083,   534,   987,   987,   370,   370,   370,
-     370,   138,   138,   963,   963,   963,   963,     4, 10002,  9392,
-   -1343,  7008,  1278,     3,  6818,  1279,  6818,  7008,  1280,  5533,
-    1282, -1343,     9,  1283,  5533,  7008,  5920,  1284,  6818,  6818,
-    1141,  1287,  1288, 10023,  1290,  1147,  1291,  1293, 10044,  1158,
-    1295,  1297,  7008, 10065,  6552,  1104, -1343, -1343, -1343, 10086,
-   10107,  7008,  5648,  1319,  1318, 10128,  1127, 10443,  1123,  1130,
-   10443,  1133,  1137, 10443,  1135,  1144, 10443,  1136, 10149, 10170,
-   10191,   481,   504,  6818,  1129, -1343, -1343,  1745,  1921,   -77,
-    7008,  7008, -1343, -1343,  1124,  1138,  3662,  8361,  8387,  8413,
-    8101,   -33,   -77,  2141, 10212,  6585, 10233, 10254, 10275,  7008,
-    1325, -1343,  7008, 10296, -1343,  9415,  9438, -1343,   523,   529,
-     533, -1343, -1343,  9461,  9484,  8439,  9507,   360,  6818, -1343,
-    1149,  1150,  6756,  1151,  1154,  1155, -1343,  6818, -1343,  6818,
-   -1343,  6818, -1343,  6818,   586, -1343, -1343,  4962,  6818,   963,
-   -1343,  6818, -1343,  1333,  1334,  1337,  1160,  7008,  2317,  7008,
-    7008, -1343, -1343,    51, -1343, -1343,  2407, -1343,  1159,  5648,
-    1342,   302,   302,  6903,   594,  5648, -1343, -1343,  9530,   360,
-    1066, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343,
-   -1343, -1343, -1343,  7008, -1343, -1343, -1343, -1343, -1343, -1343,
-   -1343,  7008,  7008,  7008, -1343,  6818, -1343, -1343, -1343, -1343,
-    5533,  5648,  5533,  5533,  5920, -1343, -1343, -1343, -1343, -1343,
-   -1343, -1343, -1343,  7008,  5533, -1343,  5533, -1343,  7008, -1343,
-   -1343, -1343, -1343,  7008,  1346,    40,  7008,  1347,  1350,  1949,
-   -1343,  1361,  1170,    29,  1364, -1343,  6818,  6818,  6818,  6818,
-   -1343,   367,  1369,  7008, -1343,  1179,  1183,  1173, -1343,  1375,
-   -1343, -1343, -1343, -1343, -1343,   360,   360,  9553, -1343, -1343,
-    1198,  5533,   456, -1343,   548,  8465, -1343, -1343, -1343,  1376,
-   -1343, -1343,  1525,   367,   -77,  4346, -1343,   735,  5648,  5648,
-    1377,  5648,   755,  5648,  5648,  1378,  1303,  5648,  5648,  2107,
-    1381,  1382,  6818,  1384,  1385,  5982, -1343, -1343,  1387, -1343,
-    1390,    -4,  7008,    -4,  7008,    -4,  7008,    -4,  7008,  1391,
-    1393,  1394,  1396,  1397,   656,  1404,  2485, -1343, -1343,    75,
-    8491,  8517, -1343, -1343,  6931,   -79,   -77,   -77,   -77,  1405,
-    1406,  1206,  1407,  1214,     5,    28,    46,    57,   526, -1343,
-      85, -1343,   -33,  1408,  1410,  1412,  1427,  1429, 10443, -1343,
-    2251,  1213,  1434,  1436,  1437,  1362,  1438,  1440,  1441,  7008,
-     166,   665, -1343,  7008, -1343,  7008,  7008,  7008,   671,   681,
-     693,   698, -1343,  7008,   699,   703,  5648,  5648,  5648,  1444,
-    8543, -1343,  4981,   795,  1445,  1446, -1343,  5648,  1246, -1343,
-    7008,  1447,  7008,  1448, -1343,   367,  1451,  1454, -1343,  1457,
-   -1343,  1456,  1525,  1525,  1525,  1525,   613,  1260,  1268,  1269,
-    1270,  1266,   632,   697, 10317,  1274,   367,  1525,  2522, -1343,
-     351,  1273,  1463,  2800, -1343, -1343, -1343,    29,  7008, -1343,
-     704, -1343,   714,   718,   719,   722,    -4, -1343, 10443,  1276,
-    7008,  7008,  5648,  1271, -1343, -1343, -1343,  1292, -1343,  1471,
-      20,  1486,  7008,  4799,  1488,  1494,     6,  1294,  1299,  1403,
-    1403,  5648,  1499,  1302,  1304,  1503,  1505,  5648,  1308,  1508,
-    1509, -1343,  1511,  5648,   723,  5648,  5648,  1513,  1515, -1343,
-    5648,  5648, 10443,  5648, 10443,  5648, 10443,  5648, 10443,  5648,
-    5648,  5648,  1336,  1338,  1516,   636, -1343,  7008,  7008,  7008,
-    1339,  1348,  -123,   -89,   -81,  1351, -1343,  5648, -1343,  7008,
-   -1343,  1540, -1343,  1545, -1343,  1549, -1343,  1550, -1343, -1343,
-    3662,   730,  5452, -1343,  1354,  1356,  6236, -1343,  6818, -1343,
-   -1343, -1343,  1357,  7008, -1343, -1343,  9576,  1559,   367,  8569,
-    8595,  8621,  8647, -1343, -1343, -1343, -1343, 10443, -1343,   367,
-    1558,  1569,  1439, -1343,  7008,  7008,  7008, -1343,  1571,   738,
-    1380,  1573,  2855, -1343,  3149, -1343,    -4, -1343, -1343,    90,
-   -1343, -1343, -1343, -1343, -1343, -1343,  5533, -1343, -1343, -1343,
-    5920,  1576, -1343, -1343,    12, -1343, -1343, -1343, -1343, -1343,
-   -1343, -1343,  5920,  7008,  1586,  1589,    25, -1343,  1588,  9599,
-      29, -1343,  1591,  1592,  1593,  1594,  5648,  7008,  8673,  8699,
-     731, -1343,  7008,  1597, -1343, -1343,  5533, -1343,  8725,  4407,
-   10443, -1343, -1343, -1343, -1343,  7008,  7008,   -77,  1600,  1601,
-    1602, -1343,  7008,  7008, -1343, -1343,  1603,  7008, -1343, -1343,
-    1598,  1607,  1411,  1608,  1477,  7008, -1343,  1615,  1616,  1621,
-    1622,  1623,  1624,   933,  1625,  6818,  6818,  7008, -1343,  6628,
-    7264, 10338,  3375,   207,   207,   -77,  1627,   -77,  1628,   -77,
-    1629,  7008,   278,  1433, 10359, -1343, -1343, -1343, -1343,  7292,
-     133, -1343,  1631,  3963,  1633,  5648,   -77,  3963,  1634,   737,
-    7008,  3182,  1636,   360, -1343,  7008,  7008,  7008,  7008, -1343,
-   -1343, -1343,  5648,  6174,   578, 10380, -1343, -1343,  4864,  5648,
-   -1343, -1343, -1343,  5648, -1343,  1450,   367,  4603,  5060,  5920,
-    1638,  3201, -1343,  1639,  1643, -1343,  1449, -1343, -1343, -1343,
-   -1343, -1343,  1645,   549, 10443,  7008,  7008,  5648,  1465,   743,
-   10443, -1343,  1646,  7008, -1343, -1343,  7320,  7348,   567, -1343,
-   -1343, -1343,  7376,  7404, -1343,  7432,  1648, -1343,  5648, -1343,
-    1605,  1650, 10443, -1343, -1343, -1343, -1343, -1343, -1343,  1467,
-   -1343, -1343,   744,   754,  8074,  3563,  1666,  1469, -1343,  7008,
-   -1343,  1472,  1481,   153, -1343,  1470,   201, -1343,  1478,   214,
-   -1343,  1483,  9622,  1682,  5648,  1683,  1485,  7008, -1343,  6432,
-     218, -1343,   789,   222,   224, -1343,  1685,  7460, -1343, -1343,
-    8751,  8777,  8803,  8829,  1554,  7008, -1343,  7008, -1343, -1343,
-    6818,  3693,  1687,  1490,  1693, -1343, -1343,  4171, -1343, -1343,
-    5533, 10443, -1343, -1343, -1343, -1343,    29, -1343,  1560, -1343,
-   -1343,  7008,  8855,  8881, -1343,  5648,  7008,  1694, -1343,  8907,
-   -1343, -1343,  1711,  1716,  1718,  1720,  1721,  1727,   792,  1530,
-   -1343,  5648,   531,   599,  6818, -1343, -1343,   207,  6370, -1343,
-   -1343,  3662,   -33,  3662,   -33,  3662,   -33,  1729, -1343,   796,
-    5648, -1343,  7488,   -77,  1730,  6818,   -77, -1343, -1343,  7008,
-    7008,  7008,  7008,  7008,  7516,  7544,   806, -1343, -1343,  1731,
-   -1343,   814,  4202,   817,  1732, -1343,  1535, 10443,  7008,  7008,
-     821, 10443, -1343,  7008,   822,   826, -1343, -1343, -1343, -1343,
-   -1343, -1343,  1536,  7008,   833,  1537,   -77,  5648,  1737,  1542,
-     -77,  1738,   834,  1543,  7008, -1343,  7572,   231,   763,  7600,
-     235,   888,  7628,   346,   924, -1343,  5648,  1741,  1651,  2562,
-    1552,   350, -1343,   853,   413,  8933,  8959,  8985,  9011,  3901,
-   -1343, -1343,  1747, -1343,  7008, -1343,  5920, -1343, -1343,  7008,
-   10401,  9037,    45,  9063, -1343, -1343,  7008,  7656,  1748,   -77,
-      63, -1343, -1343,   -77,    73, -1343,  1753, -1343,  7684,  1755,
-    7008,  1756,  1761,  7008,  1766,  1770,  7008,  1771,  1574, -1343,
-    7008, -1343,   -33, -1343,  6818,  1775,  6432,  7008,  7008,  7008,
-    7008, -1343, -1343,   392, -1343,   854, -1343,  7008, -1343,  5648,
-    7008,  9089, -1343, -1343,   444, -1343,   484, -1343, -1343, -1343,
-   -1343,  1578,  7712, -1343, -1343,  1579,  7740, -1343, -1343,  1580,
-    7768, -1343,  1779,  4117,   942,  2667,   870, -1343,   487,   873,
-    9115,  9141,  9167,  9193,  5920,  1780,  1585, 10422,   874,  7796,
-    7008,   -77,   -77,   -33,  1784,   -33,  1785,   -33,  1786, -1343,
-   -1343, -1343, -1343,   -33,  1787,  6818,  1788,  7008,  7008,  7008,
-    7008, -1343, -1343,  5533, -1343,  1595,  1789,  7824,   501,   507,
-    1070, -1343,  1596,  1082, -1343,  1599,  1094, -1343,  1606,  1132,
-   -1343,   883, -1343,  9219,  9245,  9271,  9297,   884, -1343,  1609,
-    5648, -1343,  1790,  7008,  7008,  1791,   -33,  1795,   -33,  1796,
-     -33, -1343,  1799,  7008,  7008,  7008,  7008,  5533,  1803,  5533,
-     898, -1343,  7852,  7880, -1343,  1247, -1343,  1400, -1343,  1492,
-   -1343,  7908,  7936,  7964,  7992, -1343, -1343,   909, -1343,  1805,
-    1808,  1809,  1811,  1812,  1813, -1343, -1343, -1343, -1343,  5533,
-    1814, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343
-};
-
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
-{
-   -1343, -1343, -1343, -1343,   701, -1343, -1343, -1343, -1343,   186,
-   -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343,
-   -1343, -1343,  -302,   -70,  2048,    -1, -1343,  1392, -1343, -1343,
-   -1343, -1343, -1343,   309, -1343,   312, -1343, -1343, -1343, -1343,
-   -1343, -1343,   705,  1844,     7,  -500,  -227, -1343, -1343, -1343,
-   -1343, -1343, -1343, -1343,  1845, -1343, -1343, -1343, -1343, -1343,
-   -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1343, -1004,  -948,
-   -1343, -1343,  1370, -1343,   310, -1343, -1343, -1343, -1343,  1553,
-   -1343, -1343,    92, -1343, -1342,  2114,   428,  2598,  2729,  -247,
-     579, -1343,    49,     8, -1343,  -374,    -3,   122
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -492
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
      108,   496,   628,   670,   630,   527,   764,   765,   924,   939,
-      95,  1190,  1304,   322,   188,   641,  1398,   350,  1201,   546,
-     549,   219,   214,  1482,   327,   407,  1295,   551,   273,   912,
-     206,   553,   207,   311,  1192,   219,   515,   329,   806,   349,
-     808,   214,   195,   265,  1100,   315,   210,   810,   530,   812,
-     192,  1698,  1194,   211,   276,   187,   334,   278,  1064,   279,
-     248,   518,   305,  1196,   504,   505,  1009,   276,   519,  1705,
-    1199,   269,   337,   270,   338,   249,   250,  1010,   276,  1707,
-    1345,   339,  1346,   504,   505,  1011,  1012,  1013,   670,   323,
-     326,  1014,  1015,  1016,  1017,   438,  1538,   439,   504,   505,
-     506,   586,     4,   588,   339,   657,   504,   505,   504,   505,
-     252,   253,     5,   575,  1347,   266,  1348,   671,   183,   267,
-     254,   709,  1349,   710,  1350,   109,  1181,   255,   190,   280,
-     341,   268,   191,  1191,   925,   926,   927,   928,   656,   504,
-     505,   256,   258,   709,   264,   715,   504,   505,   504,   505,
-     504,   505,   504,   505,   693,   759,  1193,   547,   550,   694,
-     197,   408,   409,   507,   766,   552,  1399,   517,   772,   554,
-     342,   343,   344,   345,  1195,   274,   346,   347,   276,   277,
-    1101,  1102,    89,  1590,   193,  1197,  -489,   940,   210,   412,
-     276,   276,   314,   504,   505,   916,   695,    89,   276,  1604,
-     528,   696,    89,   324,   940,   198,   276,   183,   305,   929,
-     351,   411,   352,   305,   353,   215,   453,   305,   548,   183,
+      95,  1190,  1304,   322,   188,   641,  1295,   350,  1201,   546,
+     549,   219,   214,  1482,   327,   551,  1398,  1192,   273,   912,
+     206,   553,   207,   311,  1194,   219,   515,   329,   806,   349,
+     808,   214,   195,   700,   407,   315,   701,   810,   530,   812,
+    1100,  1698,   504,   505,   276,   187,   334,   278,  1064,   279,
+     504,   505,   305,  1196,   252,   253,   411,   276,   759,  1705,
+    1199,   265,   346,   347,   254,   504,   505,   506,   276,   504,
+     505,   255,  1707,  -489,   504,   505,     5,  1009,   670,   323,
+     326,  1345,   341,  1346,   575,  1347,  1538,  1348,  1010,   183,
+    1349,   586,  1350,   588,   248,   657,  1011,  1012,  1013,   504,
+     505,   210,  1014,  1015,  1016,  1017,   693,   671,   211,   249,
+     250,   694,   504,   505,   416,   109,   417,  1181,   190,   280,
+     418,   656,     4,  1191,   925,   926,   927,   928,   670,   507,
+     191,   256,   258,   266,   264,   504,   505,   267,   518,  1193,
+     346,   347,   192,   346,   347,   519,  1195,   547,   550,   268,
+     193,  -490,   517,   552,  -491,    48,    49,    50,    51,   554,
+     342,   343,   344,   345,    56,   274,  1399,    59,   276,   277,
+     408,   409,    89,  1590,   194,  1197,  1101,  1102,   940,   412,
+     276,   276,   314,   504,   505,   940,   695,    89,   276,  1604,
+     528,   696,    89,   324,   346,   347,   276,   183,   305,   929,
+     351,   204,   352,   305,   353,   215,   453,   305,   548,   183,
      305,   220,   216,   328,   305,   305,   305,   305,   275,   913,
      305,   305,   305,   312,   215,   918,   330,   807,   316,   809,
      196,   917,   444,   447,   305,   276,   811,   335,   813,  1699,
-     504,   505,  1065,  1199,   336,   342,   343,   344,   345,   194,
-     504,   505,   504,   505,   346,   347,   305,   305,   305,   199,
-     757,   758,   504,   505,  -490,   346,   347,   416,  1177,   417,
-     305,   305,   905,   418,   346,   347,   565,   416,  1200,   417,
-     773,   201,   699,   305,  -491,   305,   845,   342,   343,   344,
-     345,   700,   200,   410,   701,   342,   343,   344,   345,   670,
-      48,    49,    50,    51,   202,   446,   446,   346,   347,    56,
-     504,   505,    59,   446,   203,   346,   347,   432,   433,   434,
-     276,   454,   305,   305,   435,   244,  1477,   658,   245,   598,
-     504,   505,   212,   499,   500,   305,   709,   222,   719,   599,
-     828,   508,   903,   906,   919,   516,  1551,  1738,  1272,   260,
-     346,   347,   261,   836,   691,   262,   692,  1217,   204,   283,
-     314,   183,   284,   276,   276,   276,   276,   276,   276,   305,
+     504,   505,  1065,  1199,   336,   342,   343,   344,   345,   342,
+     343,   344,   345,   504,   505,   210,   305,   305,   305,   201,
+     757,   758,   916,   197,   346,   347,   504,   505,   346,   347,
+     305,   305,   905,   709,   244,   710,   565,   245,   504,   505,
+     773,   260,   766,   305,   261,   305,   845,   262,   342,   343,
+     344,   345,   222,   410,   772,   342,   343,   344,   345,   919,
+    1272,   283,   504,   505,   284,   446,   446,   346,   347,   504,
+     505,   346,   347,   446,   346,   347,   504,   505,  1177,  1217,
+     276,   454,   305,   305,   269,  1200,   270,   658,   198,   598,
+     504,   505,  1477,   499,   500,   305,   504,   505,   199,   599,
+     828,   508,   903,   906,   200,   516,  1551,  1738,   337,   438,
+     338,   439,  1553,   836,   432,   433,   434,   339,   339,   703,
+     314,   435,   701,   276,   276,   276,   276,   276,   276,   305,
      276,   276,   591,   276,   276,   276,   276,   276,   504,   505,
-     205,   276,   276,   276,   276,   276,   276,   213,   276,  1734,
-     644,   504,   505,   217,  1553,   504,   505,   218,   652,   504,
-     505,   504,   505,   223,   416,   305,   417,  1555,   504,   505,
-     597,  1563,   504,   505,   221,  1565,   629,  1566,   631,   632,
-     633,   222,   635,   636,  1670,   638,   639,   640,  1673,   642,
-     568,   224,   569,   646,   647,   648,   649,   650,  1810,   339,
-     709,   703,   725,   305,   701,   446,   421,   422,   423,   424,
+     202,   276,   276,   276,   276,   276,   276,   203,   276,  1734,
+     644,   205,   252,   253,  1555,   504,   505,   212,   652,   504,
+     505,   568,   254,   569,   709,   305,   715,  1338,  1339,   263,
+     339,  1563,   504,   505,   213,  1565,   629,   217,   631,   632,
+     633,   218,   635,   636,   224,   638,   639,   640,  1566,   642,
+     709,   221,   719,   646,   647,   648,   649,   650,  1810,   233,
+     504,   505,   234,   305,   235,   446,   421,   422,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   566,   433,   434,
-     252,   253,   225,   709,   435,   816,   342,   343,   344,   345,
-     254,   226,   351,  1473,   589,   698,   543,   263,   305,   305,
-     699,   183,   738,   741,   744,   747,   346,   347,   446,   446,
-     446,   446,   446,   446,   227,   446,   446,   231,   446,   446,
-     446,   446,   446,   412,   412,   232,   446,   446,   446,   446,
-     446,   651,   839,   653,   840,   342,   343,   344,   345,   996,
-     305,   305,   305,   504,   505,   851,   236,   504,   505,  1070,
-    1072,   228,   276,   799,   229,   346,   347,   230,  1618,  1676,
-    1621,   246,  1624,  1684,   346,   347,   305,   430,   431,   432,
-     433,   434,   416,   305,   417,   416,   435,   417,   798,   822,
+     504,   505,  1387,  1388,   435,   504,   505,   342,   343,   344,
+     345,   228,   222,  1473,   229,   698,  1670,   230,   305,   305,
+     699,  1673,   738,   741,   744,   747,   346,   347,   446,   446,
+     446,   446,   446,   446,   223,   446,   446,   225,   446,   446,
+     446,   446,   446,   412,   412,   227,   446,   446,   446,   446,
+     446,   651,   416,   653,   417,   504,   505,   231,   597,   996,
+     305,   305,   305,   241,  1009,   851,   242,   226,   243,  1070,
+    1072,  1676,   276,   799,   691,  1010,   692,   709,  1618,   725,
+    1621,   183,  1624,  1011,  1012,  1013,   305,   232,   236,  1014,
+    1015,  1016,  1017,   305,   709,   839,   816,   840,   246,   822,
      421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,   904,   907,  1497,   237,   435,   709,
-     238,   921,   247,   239,   305,   240,   762,   763,   888,   251,
-     504,   505,   259,   699,   500,   852,   853,   854,   855,   856,
-     857,   858,   859,   860,   861,   862,  1686,   864,   865,   866,
+     431,   432,   433,   434,   904,   907,  1497,   247,   435,   430,
+     431,   432,   433,   434,   305,   271,   762,   763,   435,   251,
+     504,   505,   259,   272,   500,   852,   853,   854,   855,   856,
+     857,   858,   859,   860,   861,   862,  1684,   864,   865,   866,
      867,   868,   869,   870,   416,  1009,   417,   874,   876,   877,
-     821,   504,   505,   271,  1605,  1606,  1010,   885,   886,   887,
-    1607,   889,  1338,  1339,  1011,  1012,  1013,  1741,   897,   899,
-    1014,  1015,  1016,  1017,  1130,   272,   475,   476,   477,   709,
-     915,   480,   481,   482,   908,   282,  1109,   800,   305,   281,
-    1199,   504,   505,  1199,   504,   505,  1199,   233,  1724,  1161,
-     234,  1163,   235,  1165,   709,  1167,   992,  1742,   504,   505,
-    1755,   305,   285,   305,   504,   505,   276,   523,   524,   276,
-     286,   276,  1609,  1610,  1793,   305,   305,   709,  1607,   993,
-    1794,   536,   537,   287,   953,   424,   425,   426,   427,   428,
-     429,   430,   431,   432,   433,   434,   709,   851,  1034,   305,
-     435,  1198,   709,   541,  1035,   542,   709,   543,  1036,  1770,
-     182,  1773,   183,  1776,  1387,  1388,  1131,  1520,   947,  1779,
-     305,   709,  1521,   951,   504,   505,   421,   422,   423,   424,
+     798,   504,   505,   709,   281,   921,  1010,   885,   886,   887,
+    1198,   889,   282,   285,  1011,  1012,  1013,  1686,   897,   899,
+    1014,  1015,  1016,  1017,   888,   286,   475,   476,   477,   699,
+     915,   480,   481,   482,   908,   287,  1109,   800,   305,   308,
+    1199,   504,   505,  1199,   504,   505,  1199,   307,  1724,  1161,
+     416,  1163,   417,  1165,   321,  1167,   821,  1741,   504,   505,
+    1742,   305,   309,   305,   504,   505,   276,   523,   524,   276,
+     310,   276,   504,   505,  1755,   305,   305,   416,   317,   417,
+    1793,   536,   537,   541,   953,   542,   318,   543,  1794,   351,
+     182,   589,   183,   543,   709,   379,   992,   851,   183,   305,
+     237,  1361,   319,   238,   555,   320,   239,   556,   240,  1770,
+     557,  1773,   558,  1776,   333,  1605,  1606,  1130,   947,  1779,
+     305,  1607,   709,   951,   380,   381,   421,   422,   423,   424,
      425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
-     241,  1071,  1073,   242,   435,   243,  1199,   307,   555,  1078,
-    1080,   556,   308,  1498,   557,   416,   558,   417,   309,   709,
-     875,  1052,  1815,   310,  1817,   305,  1819,   709,  1273,  1075,
-     416,   317,   417,  1236,   305,   896,   305,   416,   305,   417,
-     305,   416,   898,   417,  1286,   305,   709,  1137,   305,  1138,
-     318,   446,  1199,   321,   949,  1199,   446,   333,  1199,  1009,
-     416,  1199,   417,   319,   320,  1261,   305,  1143,   379,  1144,
-    1010,   380,   305,  1461,  1462,   381,   382,   276,  1011,  1012,
-    1013,   999,   383,   393,  1014,  1015,  1016,  1017,  1005,   709,
-    1278,  1174,  1009,   384,  1020,  1125,  1126,  1199,   709,  1199,
-    1218,  1199,   305,  1010,   709,   389,  1223,   276,   305,   276,
-     276,  1011,  1012,  1013,   709,   401,  1224,  1014,  1015,  1016,
-    1017,   276,  1091,   276,   415,   416,   709,   417,  1225,  1081,
-    1264,   709,   709,  1226,  1228,   394,   709,  1280,  1229,  1281,
-     276,   436,   395,   305,   305,   305,   305,   709,   396,  1282,
-    1116,   709,   709,  1283,  1284,   709,   709,  1285,  1322,  1087,
-     399,  1089,  1090,   400,  1417,  1361,  1418,  1449,   276,  1450,
-     709,   437,  1486,  1095,  1393,  1096,  1526,   709,  1527,  1542,
-     441,  1134,  1135,   462,   467,   305,   305,   709,   305,  1543,
-     305,   305,   472,   473,   305,   305,   478,   479,  1671,   305,
-    1080,   483,   446,   421,   422,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,  1009,   484,   491,
-    1129,   435,  1417,  1237,  1564,  1417,   485,  1602,  1010,  1626,
-     486,  1627,   446,   494,   446,   446,  1011,  1012,  1013,   709,
-     487,  1642,  1014,  1015,  1016,  1017,   446,  1644,   446,  1645,
-     699,   488,  1647,  1009,  1417,  1261,  1652,  1654,   489,  1264,
-    1274,  1655,   490,  1407,  1010,   314,  1417,   709,  1658,  1666,
-     497,  1009,  1011,  1012,  1013,   498,  1136,  1613,  1014,  1015,
-    1016,  1017,  1010,   305,   305,   305,   709,  1526,  1685,  1735,
-    1011,  1012,  1013,   446,   305,   509,  1014,  1015,  1016,  1017,
-     443,   112,   510,   709,  1246,  1754,   709,  1417,  1756,  1765,
-     511,  1251,  1252,  1253,  1254,  1255,   709,  1807,  1802,  1808,
-     520,  1262,  1265,  1674,   521,  1269,  1270,   522,  1182,  1183,
-    1184,  1417,   526,  1829,   276,   529,   139,   140,   141,   142,
-     143,   144,  1839,   339,  1840,   148,   149,   150,   151,   305,
-     531,   532,   533,   153,   154,   155,   534,   535,   156,  1677,
-     538,   539,   567,   540,   571,   545,  1583,   420,   305,   161,
-     578,  1301,   577,   183,   305,   583,   584,  1751,   585,   587,
-     305,   596,   305,   305,   601,   602,   605,   305,   305,   435,
-     305,   659,   305,   660,   305,   182,   305,   305,   305,  1009,
+     382,  1071,  1073,   416,   435,   417,  1199,   383,   699,  1078,
+    1080,  1609,  1610,  1498,   416,   384,   417,  1607,   416,   875,
+     417,   389,  1815,   896,  1817,   305,  1819,   416,  1273,   417,
+    1131,   393,   898,  1236,   305,   709,   305,   416,   305,   417,
+     305,   416,   709,   417,  1286,   305,  1261,   709,   305,   993,
+     394,   446,  1199,   395,   949,  1199,   446,   396,  1199,  1009,
+     416,  1199,   417,  1520,   399,  1264,   305,   709,  1521,  1034,
+    1010,   400,   305,  1461,  1462,   401,   437,   276,  1011,  1012,
+    1013,   999,   415,   436,  1014,  1015,  1016,  1017,  1005,   709,
+    1278,  1035,  1009,   441,  1020,  1125,  1126,  1199,   709,  1199,
+    1036,  1199,   305,  1010,   709,   494,  1052,   276,   305,   276,
+     276,  1011,  1012,  1013,   709,   462,  1075,  1014,  1015,  1016,
+    1017,   276,  1091,   276,  1137,  1143,  1138,  1144,   709,  1081,
+    1174,   709,   709,  1218,  1223,   709,   709,  1224,  1225,   709,
+     276,  1226,   467,   305,   305,   305,   305,   709,   472,  1228,
+    1116,   709,  1280,  1229,  1281,   709,   709,  1282,  1283,  1087,
+     478,  1089,  1090,   479,   709,  1671,  1284,   709,   276,  1285,
+     709,   483,  1322,  1095,  1393,  1096,  1417,  1449,  1418,  1450,
+     473,  1134,  1135,   484,   485,   305,   305,   709,   305,  1486,
+     305,   305,   486,   487,   305,   305,   488,   489,  1674,   305,
+    1080,   490,   446,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,  1009,   491,   497,
+    1129,   435,  1526,  1237,  1527,   709,   529,  1542,  1010,   709,
+     520,  1543,   446,   498,   446,   446,  1011,  1012,  1013,  1417,
+     339,  1564,  1014,  1015,  1016,  1017,   446,  1417,   446,  1602,
+    1626,   531,  1627,  1009,   709,  1644,  1642,  1645,   509,   699,
+    1274,  1647,   510,  1407,  1010,   314,  1417,  1261,  1652,  1654,
+     511,  1009,  1011,  1012,  1013,   521,  1136,  1613,  1014,  1015,
+    1016,  1017,  1010,   305,   305,   305,  1264,  1417,  1655,  1658,
+    1011,  1012,  1013,   446,   305,   522,  1014,  1015,  1016,  1017,
+     443,   112,   526,   709,  1246,  1666,   709,  1526,  1685,  1735,
+     532,  1251,  1252,  1253,  1254,  1255,   709,   709,  1754,  1756,
+     533,  1262,  1265,  1677,   534,  1269,  1270,   535,  1182,  1183,
+    1184,  1417,   538,  1765,   276,   539,   139,   140,   141,   142,
+     143,   144,   709,   540,  1802,   148,   149,   150,   151,   305,
+    1807,   545,  1808,   153,   154,   155,   567,   571,   156,  1751,
+    1417,  1839,  1829,  1840,   577,   578,  1583,   420,   305,   161,
+     183,  1301,   583,   584,   305,   585,   587,  1795,   596,   601,
+     305,   602,   305,   305,   605,   435,   659,   305,   305,   660,
+     305,   182,   305,   662,   305,   705,   305,   305,   305,  1009,
      426,   427,   428,   429,   430,   431,   432,   433,   434,  1394,
-    1010,  1009,   662,   435,   305,   705,   706,   722,  1011,  1012,
-    1013,   726,  1010,  1009,  1014,  1015,  1016,  1017,   727,   305,
+    1010,  1009,   706,   435,   305,   722,   726,   727,  1011,  1012,
+    1013,   728,  1010,  1009,  1014,  1015,  1016,  1017,   731,   305,
     1011,  1012,  1013,   305,  1010,   305,  1014,  1015,  1016,  1017,
-     728,   754,  1011,  1012,  1013,   731,   732,  1374,  1014,  1015,
-    1016,  1017,   755,   756,   164,   165,   166,   779,  1379,   314,
-     781,  1009,   782,   784,   791,   792,   173,   797,   174,    89,
-     801,   803,  1010,   804,   805,   826,   829,   837,   690,   838,
-    1011,  1012,  1013,   276,   846,   847,  1014,  1015,  1016,  1017,
-     346,   347,   878,   879,   880,   881,   882,  1079,  1396,  1584,
-     883,   893,   894,   895,   900,  1795,   901,   276,   910,   902,
-    1400,   911,   938,   305,   957,   943,   946,  1797,   948,   950,
-     962,   954,  1360,   276,   958,   959,   305,   961,   963,  1799,
-     964,   966,   967,  1394,   968,  1395,   892,  1425,   972,   421,
+     732,   754,  1011,  1012,  1013,   755,   756,  1374,  1014,  1015,
+    1016,  1017,   779,   781,   164,   165,   166,   782,  1379,   314,
+     784,   791,   792,   797,   829,   826,   173,   801,   174,    89,
+     803,   804,   805,   837,   838,   846,   847,   878,   690,   879,
+     880,   881,   910,   276,   895,   882,   883,   893,   894,   346,
+     347,   900,   901,   911,   938,   902,   957,  1079,  1396,  1584,
+     943,   946,   948,   950,   977,  1797,   954,   276,   958,   959,
+    1400,   961,   963,   305,   962,   964,   967,  1799,   966,   968,
+     972,   979,  1360,   276,   981,   982,   305,   983,   985,  1801,
+     984,   986,   987,  1394,   988,  1395,   892,  1425,   995,   421,
      422,   423,   424,   425,   426,   427,   428,   429,   430,   431,
-     432,   433,   434,   977,   979,   981,   982,   435,   983,  1002,
-     995,  1029,   305,   305,  1629,   985,   984,  1801,   986,   988,
-    1056,  1057,   987,  1003,  1058,  1422,  1009,  1456,  1069,  1042,
-     412,   412,  1099,  1104,  1043,  1045,  1105,  1010,  1046,  1047,
-     305,  1059,   305,  1067,   305,  1011,  1012,  1013,  1107,  1108,
-    1111,  1014,  1015,  1016,  1017,  1117,  1120,  1122,   446,   305,
-    1121,  1124,  1128,  1133,  1141,  1147,   305,  1148,  1152,  1153,
-     305,  1155,  1156,  1159,   305,  1506,  1502,  1160,  1169,  1428,
-    1170,  1171,   314,  1172,  1173,  1509,  1512,  1513,  1175,  1185,
-    1187,  1189,  1186,  1188,   305,  1202,  1203,  1208,   446,  1204,
+     432,   433,   434,  1002,  1003,  1029,  1042,   435,  1043,  1045,
+    1056,  1046,   305,   305,  1629,  1057,  1047,  1058,  1067,  1059,
+    1069,  1099,  1104,  1105,  1111,  1422,  1009,  1456,  1107,  1117,
+     412,   412,  1108,  1120,  1121,  1122,  1124,  1010,  1128,  1133,
+     305,  1141,   305,  1147,   305,  1011,  1012,  1013,  1148,  1152,
+    1153,  1014,  1015,  1016,  1017,  1155,  1156,  1159,   446,   305,
+    1160,  1169,  1170,  1171,  1172,  1173,   305,  1175,  1185,  1189,
+     305,  1186,  1188,  1187,   305,  1506,  1502,  1202,  1203,  1428,
+    1204,  1205,   314,  1206,  1208,  1509,  1512,  1513,  1209,  1210,
+    1211,  1212,  1213,  1214,   305,  1215,  1233,  1238,   446,  1239,
      421,   422,   423,   424,   425,   426,   427,   428,   429,   430,
-     431,   432,   433,   434,  1205,   305,  1206,  1463,   435,  1466,
-    1209,  1469,  1210,  1211,  1212,  1213,  1214,  1215,  1233,  1238,
-    1239,  1241,  1832,  1243,  1245,  1480,  1725,  1247,  1483,  1484,
-    1248,  1249,  1250,  1256,     7,     8,  1257,  1258,  1259,  1260,
-    1276,   305,  1268,  1287,  1275,  1292,   305,  1294,   421,   422,
+     431,   432,   433,   434,  1243,   305,  1241,  1463,   435,  1466,
+    1245,  1469,  1247,  1248,  1249,  1250,  1256,  1257,  1258,  1259,
+    1268,  1260,  1832,  1276,  1275,  1480,  1725,  1293,  1483,  1484,
+    1287,  1292,  1294,  1297,     7,     8,  1302,  1303,  1311,  1314,
+    1315,   305,  1305,  1307,  1318,  1319,   305,  1306,   421,   422,
      423,   424,   425,   426,   427,   428,   429,   430,   431,   432,
-     433,   434,  1297,  1293,  1302,  1307,   435,   305,  1305,  1009,
-    1303,     7,     8,  1306,   305,  1311,  1312,   276,  1313,  1314,
-    1010,  1315,  1317,   276,  1318,  1319,  1320,  1325,  1011,  1012,
-    1013,  1326,   305,  1337,  1014,  1015,  1016,  1017,   663,    24,
+     433,   434,  1312,  1313,  1317,  1320,   435,   305,  1325,  1009,
+    1335,     7,     8,  1326,   305,  1336,  1337,   276,  1343,  1344,
+    1010,  1351,  1355,   276,  1356,  1357,  1358,  1365,  1011,  1012,
+    1013,  1366,   305,  1373,  1014,  1015,  1016,  1017,   663,    24,
       25,   664,    27,    28,   665,    30,   666,    32,   305,    33,
-    1335,   305,  1336,  1343,    38,    39,  1355,    41,    42,    43,
-    1351,  1356,  1344,    46,   412,  1357,  1358,   305,  1365,   185,
-    1366,  1370,   305,  1373,  1380,   663,    24,    25,   664,    27,
-      28,   665,    30,   666,    32,  1381,    33,  1386,  1382,  1390,
-    1397,    38,    39,  1389,    41,    42,    43,    67,    68,    69,
-      46,  1009,  1402,  1403,  1405,     7,     8,  1408,  1409,  1410,
-    1411,  1421,  1010,  1436,   305,  1833,  1429,  1430,  1431,  1434,
-    1011,  1012,  1013,  1437,  1439,  1438,  1014,  1015,  1016,  1017,
-    1440,  1443,  1444,   305,    67,    68,    69,  1445,  1446,  1447,
-    1448,  1451,   446,  1464,  1467,  1470,  1474,  1478,   314,  1481,
-    1485,   332,  1489,  1617,  1514,  1620,  1516,  1623,  1505,  1517,
-    1518,  1519,  1528,  1537,  1694,  1631,  1540,   787,  1634,   663,
-      24,    25,   664,    27,    28,   665,    30,   666,    32,  1525,
-      33,  1541,  1546,  1547,  1552,    38,    39,  1549,    41,    42,
-      43,   305,  1554,   305,    46,  1539,  1550,  1556,  1558,  1561,
-    1560,  1567,  1573,  1578,   834,  1579,   305,  1834,  1660,  1580,
-    1592,  1585,  1664,   421,   422,   423,   424,   425,   426,   427,
-     428,   429,   430,   431,   432,   433,   434,  1596,    67,    68,
-      69,   435,  1597,   416,  1598,   417,  1599,  1600,   402,   403,
-     404,   405,   406,  1601,  1603,  1625,  1632,  1643,  1648,  1649,
-    1656,  1659,  1761,  1662,  1665,   442,  1663,  1679,  1667,   448,
-    1680,  1704,   305,  1692,  1703,  1706,  1683,     7,     8,  1708,
-     276,  1710,  1713,   455,   457,   460,   461,  1714,   463,   457,
-     465,   466,  1717,   457,   469,   470,  1718,  1721,  1728,  1722,
-     457,  1727,  1743,  1745,  1747,  1749,  1762,   305,   835,  1763,
-    1771,  1774,  1777,  1780,  1782,  1791,  1811,  1814,   493,  1790,
-    1796,  1816,  1818,  1798,   276,  1820,   276,   502,   503,  1826,
-    1800,  1841,  1788,  1809,  1842,  1843,   503,  1844,  1845,  1846,
-    1848,   663,    24,    25,   664,    27,    28,   665,    30,   666,
-      32,  1296,    33,  1768,  1769,  1695,   276,    38,    39,  1594,
-      41,    42,    43,  1595,   704,  1309,    46,    94,   103,   560,
-     562,   457,   734,  1611,     0,  1404,  1825,     0,  1828,     0,
+    1380,   305,  1381,  1370,    38,    39,  1386,    41,    42,    43,
+    1382,  1389,  1390,    46,   412,  1397,  1402,   305,  1403,   185,
+    1421,  1405,   305,  1408,  1409,   663,    24,    25,   664,    27,
+      28,   665,    30,   666,    32,  1410,    33,  1411,  1429,  1430,
+    1431,    38,    39,  1434,    41,    42,    43,    67,    68,    69,
+      46,  1009,  1436,  1438,  1437,     7,     8,  1439,  1440,  1443,
+    1444,  1445,  1010,  1446,   305,  1833,  1447,  1448,  1451,  1464,
+    1011,  1012,  1013,  1467,  1470,  1478,  1014,  1015,  1016,  1017,
+    1474,  1481,  1485,   305,    67,    68,    69,  1489,  1505,  1514,
+    1518,  1516,   446,  1517,  1519,  1525,  1528,  1537,   314,  1539,
+    1540,   332,  1541,  1617,  1546,  1620,  1547,  1623,  1549,  1550,
+    1558,  1552,  1554,  1556,  1694,  1631,  1560,   787,  1634,   663,
+      24,    25,   664,    27,    28,   665,    30,   666,    32,  1561,
+      33,  1567,  1578,  1573,  1580,    38,    39,  1579,    41,    42,
+      43,   305,  1585,   305,    46,  1592,  1596,  1597,  1598,  1599,
+    1600,  1601,  1603,  1625,   834,  1632,   305,  1834,  1660,  1643,
+    1648,  1662,  1664,   421,   422,   423,   424,   425,   426,   427,
+     428,   429,   430,   431,   432,   433,   434,  1649,    67,    68,
+      69,   435,  1656,   416,  1659,   417,  1663,  1665,   402,   403,
+     404,   405,   406,  1667,  1679,  1680,  1683,  1692,  1703,  1708,
+    1710,  1713,  1761,  1714,  1717,   442,  1718,  1721,  1722,   448,
+    1727,  1704,   305,  1743,  1749,  1706,  1745,     7,     8,  1762,
+     276,  1771,  1774,   455,   457,   460,   461,  1747,   463,   457,
+     465,   466,  1763,   457,   469,   470,  1777,  1780,  1728,  1782,
+     457,  1791,  1790,  1796,  1798,  1800,  1809,   305,   835,  1811,
+    1814,  1816,  1818,  1820,  1826,  1841,  1842,  1843,   493,  1844,
+    1845,  1846,  1848,  1695,   276,  1296,   276,   502,   503,   704,
+    1594,    94,  1788,  1595,  1309,   103,   503,  1611,  1404,     0,
+       0,   663,    24,    25,   664,    27,    28,   665,    30,   666,
+      32,   734,    33,  1768,  1769,     0,   276,    38,    39,     0,
+      41,    42,    43,     0,     0,     0,    46,     0,     0,   560,
+     562,   457,     0,     0,     0,     0,  1825,     0,  1828,     0,
        0,   572,   573,   574,     0,   576,     0,     0,     0,   579,
      580,   581,     0,     0,   582,     0,     0,     0,     0,     0,
       67,    68,    69,     0,     0,   446,     0,     0,  1847,     0,
@@ -2190,9 +1577,9 @@ static const yytype_int16 yytable[] =
      457,   457,   457,     0,     0,     0,  1118,     0,     0,     0,
        0,     0,     0,   663,    24,    25,   664,    27,    28,   665,
       30,   666,    32,     0,    33,     0,   634,     7,     8,    38,
-      39,     0,    41,    42,    43,     0,     0,     0,    46,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1061,     0,     0,   457,     0,     0,  1271,     0,
+      39,     0,    41,    42,    43,     0,     0,     0,    46,   424,
+     425,   426,   427,   428,   429,   430,   431,   432,   433,   434,
+       0,     0,  1061,     0,   435,   457,     0,     0,  1271,     0,
        0,     0,     0,     0,     0,  1162,     0,  1164,     0,  1166,
        0,  1168,    67,    68,    69,     0,     0,     0,     0,     0,
        0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
@@ -3009,191 +2396,191 @@ static const yytype_int16 yytable[] =
 static const yytype_int16 yycheck[] =
 {
        3,   248,   376,     7,   378,     4,   506,   507,     4,     6,
-       3,     6,     6,     4,     6,   389,     4,     4,  1022,     5,
-       5,     4,     4,  1365,     5,     4,     6,     5,     4,     4,
+       3,     6,     6,     4,     6,   389,     6,     4,  1022,     5,
+       5,     4,     4,  1365,     5,     5,     4,     6,     4,     4,
      197,     5,   199,     4,     6,     4,   263,     5,     5,   109,
-       5,     4,     6,     4,     4,     4,   197,     5,   275,     5,
-      82,     6,     6,   204,    57,     6,     6,     4,     7,     6,
-     140,   197,    65,     6,   187,   188,    99,    70,   204,     6,
-    1018,    82,   197,    84,   199,   155,   156,   110,    81,     6,
-     203,   206,   205,   187,   188,   118,   119,   120,     7,    81,
-      82,   124,   125,   126,   127,   197,  1438,   199,   187,   188,
-     204,   328,     6,   330,   206,   407,   187,   188,   187,   188,
-     187,   188,     0,   201,   203,    76,   205,   419,   206,    80,
-     197,   203,   203,   205,   205,     3,   205,   204,     6,    76,
-       7,    92,    13,   128,   130,   131,   132,   133,     7,   187,
-     188,    49,    50,   203,    52,   205,   187,   188,   187,   188,
-     187,   188,   187,   188,   198,   203,   128,   143,   143,   203,
-       6,   140,   141,   204,   203,   143,   154,   204,   203,   143,
-     174,   175,   176,   177,   128,   151,   194,   195,   181,    57,
-     140,   141,   173,  1525,   197,   128,   204,   184,   197,   182,
-     193,   194,    70,   187,   188,   204,   198,   173,   201,  1541,
-     199,   203,   173,    81,   184,     6,   209,   206,   211,   205,
-     197,     4,   199,   216,   201,   197,   208,   220,   204,   206,
+       5,     4,     6,   200,     4,     4,   203,     5,   275,     5,
+       4,     6,   187,   188,    57,     6,     6,     4,     7,     6,
+     187,   188,    65,     6,   187,   188,     4,    70,   203,     6,
+    1018,     4,   193,   194,   197,   187,   188,   204,    81,   187,
+     188,   204,     6,   204,   187,   188,     0,    99,     7,    81,
+      82,   203,     7,   205,   201,   203,  1438,   205,   110,   206,
+     203,   328,   205,   330,   140,   407,   118,   119,   120,   187,
+     188,   197,   124,   125,   126,   127,   198,   419,   204,   155,
+     156,   203,   187,   188,   198,     3,   200,   205,     6,    76,
+     204,     7,     6,   128,   130,   131,   132,   133,     7,   204,
+      13,    49,    50,    76,    52,   187,   188,    80,   197,   128,
+     193,   194,    82,   193,   194,   204,   128,   143,   143,    92,
+     197,   204,   204,   143,   204,   103,   104,   105,   106,   143,
+     174,   175,   176,   177,   112,   151,   154,   115,   181,    57,
+     140,   141,   173,  1525,   197,   128,   140,   141,   185,   182,
+     193,   194,    70,   187,   188,   185,   198,   173,   201,  1541,
+     199,   203,   173,    81,   193,   194,   209,   206,   211,   205,
+     197,   199,   199,   216,   201,   197,   208,   220,   204,   206,
      223,   204,   204,   204,   227,   228,   229,   230,   204,   204,
      233,   234,   235,   204,   197,   204,   204,   204,   197,   204,
      204,   204,   193,   194,   247,   248,   204,   197,   204,   204,
-     187,   188,   201,  1201,   204,   174,   175,   176,   177,   197,
-     187,   188,   187,   188,   194,   195,   269,   270,   271,     6,
-     497,   498,   187,   188,   204,   194,   195,   198,   203,   200,
-     283,   284,   201,   204,   194,   195,     8,   198,   203,   200,
-     517,   197,   203,   296,   204,   298,   598,   174,   175,   176,
-     177,   200,     6,   181,   203,   174,   175,   176,   177,     7,
-     103,   104,   105,   106,     6,   193,   194,   194,   195,   112,
-     187,   188,   115,   201,     6,   194,   195,   189,   190,   191,
-     333,   209,   335,   336,   196,    79,   203,   407,    82,   340,
-     187,   188,   197,   251,   252,   348,   203,   197,   205,   341,
-     577,   259,   654,   655,   204,   263,   203,  1699,     7,    76,
-     194,   195,    79,   590,   199,    82,   201,   201,   199,    79,
-     248,   206,    82,   376,   377,   378,   379,   380,   381,   382,
+     187,   188,   201,  1201,   204,   174,   175,   176,   177,   174,
+     175,   176,   177,   187,   188,   197,   269,   270,   271,   197,
+     497,   498,   204,     6,   193,   194,   187,   188,   193,   194,
+     283,   284,   201,   203,    79,   205,     8,    82,   187,   188,
+     517,    76,   203,   296,    79,   298,   598,    82,   174,   175,
+     176,   177,   197,   181,   203,   174,   175,   176,   177,   204,
+       7,    79,   187,   188,    82,   193,   194,   193,   194,   187,
+     188,   193,   194,   201,   193,   194,   187,   188,   203,   201,
+     333,   209,   335,   336,    82,   203,    84,   407,     6,   340,
+     187,   188,   203,   251,   252,   348,   187,   188,     6,   341,
+     577,   259,   654,   655,     6,   263,   203,  1699,   197,   197,
+     199,   199,   203,   590,   189,   190,   191,   206,   206,   200,
+     248,   196,   203,   376,   377,   378,   379,   380,   381,   382,
      383,   384,   333,   386,   387,   388,   389,   390,   187,   188,
-     199,   394,   395,   396,   397,   398,   399,   197,   401,     7,
-     392,   187,   188,   197,   203,   187,   188,   197,   400,   187,
-     188,   187,   188,    86,   198,   418,   200,   203,   187,   188,
-     204,   203,   187,   188,   197,   203,   377,   203,   379,   380,
-     381,   197,   383,   384,   203,   386,   387,   388,   203,   390,
-     197,    82,   199,   394,   395,   396,   397,   398,  1790,   206,
-     203,   200,   205,   456,   203,   333,   178,   179,   180,   181,
+       6,   394,   395,   396,   397,   398,   399,     6,   401,     7,
+     392,   199,   187,   188,   203,   187,   188,   197,   400,   187,
+     188,   197,   197,   199,   203,   418,   205,     6,     7,   204,
+     206,   203,   187,   188,   197,   203,   377,   197,   379,   380,
+     381,   197,   383,   384,    82,   386,   387,   388,   203,   390,
+     203,   197,   205,   394,   395,   396,   397,   398,  1790,    79,
+     187,   188,    82,   456,    84,   333,   178,   179,   180,   181,
      182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     187,   188,    82,   203,   196,   205,   174,   175,   176,   177,
-     197,     6,   197,   205,   199,   198,   201,   204,   491,   492,
-     203,   206,   484,   485,   486,   487,   194,   195,   376,   377,
-     378,   379,   380,   381,   204,   383,   384,    82,   386,   387,
-     388,   389,   390,   506,   507,    82,   394,   395,   396,   397,
-     398,   399,   203,   401,   205,   174,   175,   176,   177,   756,
-     533,   534,   535,   187,   188,   605,    84,   187,   188,   841,
-     842,    76,   545,   544,    79,   194,   195,    82,  1552,   203,
-    1554,   197,  1556,   203,   194,   195,   559,   187,   188,   189,
-     190,   191,   198,   566,   200,   198,   196,   200,   204,   570,
+     187,   188,     6,     7,   196,   187,   188,   174,   175,   176,
+     177,    76,   197,   205,    79,   198,   203,    82,   491,   492,
+     203,   203,   484,   485,   486,   487,   193,   194,   376,   377,
+     378,   379,   380,   381,    86,   383,   384,    82,   386,   387,
+     388,   389,   390,   506,   507,   204,   394,   395,   396,   397,
+     398,   399,   198,   401,   200,   187,   188,    82,   204,   756,
+     533,   534,   535,    79,    99,   605,    82,     6,    84,   841,
+     842,   203,   545,   544,   199,   110,   201,   203,  1552,   205,
+    1554,   206,  1556,   118,   119,   120,   559,    82,    84,   124,
+     125,   126,   127,   566,   203,   203,   205,   205,   197,   570,
      178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,   189,   190,   191,   654,   655,     8,    76,   196,   203,
-      79,   205,    79,    82,   597,    84,   504,   505,   198,   204,
-     187,   188,   204,   203,   512,   606,   607,   608,   609,   610,
+     188,   189,   190,   191,   654,   655,     8,    79,   196,   187,
+     188,   189,   190,   191,   597,    82,   504,   505,   196,   204,
+     187,   188,   204,    79,   512,   606,   607,   608,   609,   610,
      611,   612,   613,   614,   615,   616,   203,   618,   619,   620,
      621,   622,   623,   624,   198,    99,   200,   628,   629,   630,
-     204,   187,   188,    82,   103,   104,   110,   638,   639,   640,
-     109,   642,     6,     7,   118,   119,   120,   203,   649,   650,
-     124,   125,   126,   127,   198,    79,   228,   229,   230,   203,
-     661,   233,   234,   235,   656,    82,   913,   545,   671,    79,
-    1618,   187,   188,  1621,   187,   188,  1624,    79,  1682,   981,
-      82,   983,    84,   985,   203,   987,   205,   203,   187,   188,
-     203,   694,     4,   696,   187,   188,   699,   269,   270,   702,
-       4,   704,   103,   104,   203,   708,   709,   203,   109,   205,
-     203,   283,   284,     4,   706,   181,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   203,   797,   205,   732,
-     196,   205,   203,   197,   205,   199,   203,   201,   205,  1743,
-     204,  1745,   206,  1747,     6,     7,   198,   198,   699,  1753,
-     753,   203,   203,   704,   187,   188,   178,   179,   180,   181,
+     204,   187,   188,   203,    79,   205,   110,   638,   639,   640,
+     205,   642,    82,     4,   118,   119,   120,   203,   649,   650,
+     124,   125,   126,   127,   198,     4,   228,   229,   230,   203,
+     661,   233,   234,   235,   656,     4,   913,   545,   671,   197,
+    1618,   187,   188,  1621,   187,   188,  1624,     4,  1682,   981,
+     198,   983,   200,   985,   199,   987,   204,   203,   187,   188,
+     203,   694,   197,   696,   187,   188,   699,   269,   270,   702,
+     197,   704,   187,   188,   203,   708,   709,   198,   197,   200,
+     203,   283,   284,   197,   706,   199,   197,   201,   203,   197,
+     204,   199,   206,   201,   203,   197,   205,   797,   206,   732,
+      76,   205,     6,    79,    76,     6,    82,    79,    84,  1743,
+      82,  1745,    84,  1747,   199,   103,   104,   198,   699,  1753,
+     753,   109,   203,   704,   197,   197,   178,   179,   180,   181,
      182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-      79,   841,   842,    82,   196,    84,  1724,     4,    76,   849,
-     850,    79,   197,   205,    82,   198,    84,   200,   197,   203,
-     203,   205,  1796,   197,  1798,   798,  1800,   203,  1100,   205,
-     198,   197,   200,     8,   807,   203,   809,   198,   811,   200,
-     813,   198,   203,   200,  1116,   818,   203,    82,   821,    84,
-     197,   699,  1770,   199,   702,  1773,   704,   199,  1776,    99,
-     198,  1779,   200,     6,     6,   203,   839,    82,   197,    84,
-     110,   197,   845,  1343,  1344,   197,   197,   850,   118,   119,
-     120,   759,   197,     7,   124,   125,   126,   127,   766,   203,
-    1107,   205,    99,   197,   772,   935,   936,  1815,   203,  1817,
-     205,  1819,   875,   110,   203,   197,   205,   880,   881,   882,
-     883,   118,   119,   120,   203,   199,   205,   124,   125,   126,
-     127,   894,   884,   896,   204,   198,   203,   200,   205,   850,
-     203,   203,   203,   205,   205,   197,   203,   203,   205,   205,
-     913,   204,   197,   916,   917,   918,   919,   203,   197,   205,
+     197,   841,   842,   198,   196,   200,  1724,   197,   203,   849,
+     850,   103,   104,   205,   198,   197,   200,   109,   198,   203,
+     200,   197,  1796,   203,  1798,   798,  1800,   198,  1100,   200,
+     198,     7,   203,     8,   807,   203,   809,   198,   811,   200,
+     813,   198,   203,   200,  1116,   818,   203,   203,   821,   205,
+     197,   699,  1770,   197,   702,  1773,   704,   197,  1776,    99,
+     198,  1779,   200,   198,   197,   203,   839,   203,   203,   205,
+     110,   197,   845,  1343,  1344,   199,     6,   850,   118,   119,
+     120,   759,   204,   204,   124,   125,   126,   127,   766,   203,
+    1107,   205,    99,     6,   772,   935,   936,  1815,   203,  1817,
+     205,  1819,   875,   110,   203,     4,   205,   880,   881,   882,
+     883,   118,   119,   120,   203,   197,   205,   124,   125,   126,
+     127,   894,   884,   896,    82,    82,    84,    84,   203,   850,
+     205,   203,   203,   205,   205,   203,   203,   205,   205,   203,
+     913,   205,   197,   916,   917,   918,   919,   203,   197,   205,
      921,   203,   203,   205,   205,   203,   203,   205,   205,   880,
-     197,   882,   883,   197,   203,   205,   205,     4,   941,     6,
-     203,     6,   205,   894,  1246,   896,   203,   203,   205,   205,
-       6,   952,   953,   197,   197,   958,   959,   203,   961,   205,
-     963,   964,   197,   204,   967,   968,   197,   197,   205,   972,
+     197,   882,   883,   197,   203,   205,   205,   203,   941,   205,
+     203,   197,   205,   894,  1246,   896,   203,     4,   205,     6,
+     204,   952,   953,   197,   197,   958,   959,   203,   961,   205,
+     963,   964,   197,   197,   967,   968,   197,   197,   205,   972,
     1040,   197,   850,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,    99,   197,   204,
-     941,   196,   203,   198,   205,   203,   197,   205,   110,   203,
-     197,   205,   880,     4,   882,   883,   118,   119,   120,   203,
-     197,   205,   124,   125,   126,   127,   894,   203,   896,   205,
-     203,   197,   205,    99,   203,   203,   205,   205,   197,   203,
-    1100,   205,   197,  1280,   110,   913,   203,   203,   205,   205,
-     204,    99,   118,   119,   120,   204,   954,  1547,   124,   125,
+     185,   186,   187,   188,   189,   190,   191,    99,   204,   204,
+     941,   196,   203,   198,   205,   203,   199,   205,   110,   203,
+     197,   205,   880,   204,   882,   883,   118,   119,   120,   203,
+     206,   205,   124,   125,   126,   127,   894,   203,   896,   205,
+     203,     6,   205,    99,   203,   203,   205,   205,   204,   203,
+    1100,   205,   204,  1280,   110,   913,   203,   203,   205,   205,
+     204,    99,   118,   119,   120,   197,   954,  1547,   124,   125,
      126,   127,   110,  1056,  1057,  1058,   203,   203,   205,   205,
-     118,   119,   120,   941,  1067,   204,   124,   125,   126,   127,
-       4,     5,   204,   203,  1075,   205,   203,   203,   205,   205,
-     204,  1082,  1083,  1084,  1085,  1086,   203,   203,   205,   205,
-     197,  1092,  1093,   205,   197,  1096,  1097,   197,  1006,  1007,
-    1008,   203,   197,   205,  1107,   199,    40,    41,    42,    43,
-      44,    45,   203,   206,   205,    49,    50,    51,    52,  1122,
-       6,     6,   204,    57,    58,    59,   204,   204,    62,   205,
-     199,   199,     6,   199,     6,   199,  1510,     6,  1141,    73,
-     143,  1133,   204,   206,  1147,     6,     6,   205,     6,     6,
-    1153,   204,  1155,  1156,     6,   199,     4,  1160,  1161,   196,
-    1163,   201,  1165,     7,  1167,   204,  1169,  1170,  1171,    99,
+     118,   119,   120,   941,  1067,   197,   124,   125,   126,   127,
+       4,     5,   197,   203,  1075,   205,   203,   203,   205,   205,
+       6,  1082,  1083,  1084,  1085,  1086,   203,   203,   205,   205,
+     204,  1092,  1093,   205,   204,  1096,  1097,   204,  1006,  1007,
+    1008,   203,   199,   205,  1107,   199,    40,    41,    42,    43,
+      44,    45,   203,   199,   205,    49,    50,    51,    52,  1122,
+     203,   199,   205,    57,    58,    59,     6,     6,    62,   205,
+     203,   203,   205,   205,   204,   143,  1510,     6,  1141,    73,
+     206,  1133,     6,     6,  1147,     6,     6,   205,   204,     6,
+    1153,   199,  1155,  1156,     4,   196,   201,  1160,  1161,     7,
+    1163,   204,  1165,   205,  1167,   203,  1169,  1170,  1171,    99,
      183,   184,   185,   186,   187,   188,   189,   190,   191,  1249,
-     110,    99,   205,   196,  1187,   203,   203,     7,   118,   119,
-     120,     6,   110,    99,   124,   125,   126,   127,     6,  1202,
+     110,    99,   203,   196,  1187,     7,     6,     6,   118,   119,
+     120,     6,   110,    99,   124,   125,   126,   127,     7,  1202,
      118,   119,   120,  1206,   110,  1208,   124,   125,   126,   127,
-       6,   198,   118,   119,   120,     7,     7,  1218,   124,   125,
-     126,   127,     6,   204,   158,   159,   160,     7,  1229,  1107,
-       6,    99,     7,     6,     6,     6,   170,     4,   172,   173,
-      54,    54,   110,    54,    54,   140,   204,   200,     6,   198,
-     118,   119,   120,  1256,     6,     6,   124,   125,   126,   127,
-     194,   195,   198,   198,   203,   203,   203,   201,  1260,  1516,
-     203,   203,   203,   198,   198,   205,   198,  1280,     6,   200,
-    1272,     4,     4,  1286,   143,     6,     6,   205,     6,     6,
-     143,     7,  1200,  1296,     7,     7,  1299,     7,     7,   205,
-       7,   143,     7,  1373,     7,  1256,     6,  1299,   204,   178,
+       7,   198,   118,   119,   120,     6,   204,  1218,   124,   125,
+     126,   127,     7,     6,   158,   159,   160,     7,  1229,  1107,
+       6,     6,     6,     4,   204,   140,   170,    54,   172,   173,
+      54,    54,    54,   200,   198,     6,     6,   198,     6,   198,
+     203,   203,     6,  1256,   198,   203,   203,   203,   203,   193,
+     194,   198,   198,     4,     4,   200,   143,   201,  1260,  1516,
+       6,     6,     6,     6,     4,   205,     7,  1280,     7,     7,
+    1272,     7,     7,  1286,   143,     7,     7,   205,   143,     7,
+     204,     6,  1200,  1296,   198,   203,  1299,   198,   198,   205,
+     203,   203,   198,  1373,   203,  1256,     6,  1299,   201,   178,
      179,   180,   181,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,     4,     6,   198,   203,   196,   198,   205,
-     201,     6,  1335,  1336,  1561,   198,   203,   205,   203,   203,
-       7,     7,   198,   205,     7,  1296,    99,  1339,     6,   200,
-    1343,  1344,     6,     6,   204,   204,     6,   110,   204,   204,
-    1363,   201,  1365,   204,  1367,   118,   119,   120,     7,   199,
-       6,   124,   125,   126,   127,     6,   197,   204,  1256,  1382,
-     197,     6,   184,     7,     7,     7,  1389,    84,     7,     7,
-    1393,     7,     7,     6,  1397,  1396,  1388,     7,     7,  1307,
-       7,     7,  1280,     7,     7,  1397,  1398,  1399,     4,     4,
-     204,   197,     6,     6,  1417,     7,     6,   204,  1296,     7,
+     189,   190,   191,   205,   205,     6,   200,   196,   204,   204,
+       7,   204,  1335,  1336,  1561,     7,   204,     7,   204,   201,
+       6,     6,     6,     6,     6,  1296,    99,  1339,     7,     6,
+    1343,  1344,   199,   197,   197,   204,     6,   110,   185,     7,
+    1363,     7,  1365,     7,  1367,   118,   119,   120,    84,     7,
+       7,   124,   125,   126,   127,     7,     7,     6,  1256,  1382,
+       7,     7,     7,     7,     7,     7,  1389,     4,     4,   197,
+    1393,     6,     6,   204,  1397,  1396,  1388,     7,     6,  1307,
+       7,     7,  1280,     7,   204,  1397,  1398,  1399,     6,     6,
+       6,    82,     7,     6,  1417,     6,     4,     4,  1296,     4,
      178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,   189,   190,   191,     7,  1438,     7,  1345,   196,  1347,
-       6,  1349,     6,     6,    82,     7,     6,     6,     4,     4,
-       4,   205,   205,     6,     6,  1363,  1683,     6,  1366,  1367,
-       6,     4,     6,   203,    12,    13,   198,   198,   198,   203,
-       7,  1474,   198,   197,   201,   204,  1479,     6,   178,   179,
+     188,   189,   190,   191,     6,  1438,   205,  1345,   196,  1347,
+       6,  1349,     6,     6,     4,     6,   203,   198,   198,   198,
+     198,   203,   205,     7,   201,  1363,  1683,   201,  1366,  1367,
+     197,   204,     6,     6,    12,    13,     6,     6,     6,     6,
+       6,  1474,   204,    92,     6,     6,  1479,   204,   178,   179,
      180,   181,   182,   183,   184,   185,   186,   187,   188,   189,
-     190,   191,     6,   201,     6,    92,   196,  1500,   204,    99,
-       6,    12,    13,   204,  1507,     6,   204,  1510,   204,     6,
-     110,     6,   204,  1516,     6,     6,     5,     4,   118,   119,
-     120,     6,  1525,     7,   124,   125,   126,   127,    76,    77,
+     190,   191,   204,   204,   204,     5,   196,  1500,     4,    99,
+     204,    12,    13,     6,  1507,   204,     7,  1510,   204,   204,
+     110,   199,     6,  1516,     6,     6,     6,   204,   118,   119,
+     120,   204,  1525,     4,   124,   125,   126,   127,    76,    77,
       78,    79,    80,    81,    82,    83,    84,    85,  1541,    87,
-     204,  1544,   204,   204,    92,    93,     6,    95,    96,    97,
-     199,     6,   204,   101,  1547,     6,     6,  1560,   204,     6,
-     204,   204,  1565,     4,     6,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,     6,    87,     6,   139,     6,
-       4,    92,    93,   203,    95,    96,    97,   135,   136,   137,
-     101,    99,     6,     4,     6,    12,    13,     6,     6,     6,
-       6,     4,   110,     5,  1607,   205,     6,     6,     6,     6,
-     118,   119,   120,     6,     6,   204,   124,   125,   126,   127,
-     143,     6,     6,  1626,   135,   136,   137,     6,     6,     6,
-       6,     6,  1510,     6,     6,     6,   203,     6,  1516,     6,
-       6,    88,     6,  1551,     6,  1553,     7,  1555,   198,     6,
-     201,     6,     6,     5,  1646,  1563,     6,   205,  1566,    76,
+       6,  1544,     6,   204,    92,    93,     6,    95,    96,    97,
+     139,   203,     6,   101,  1547,     4,     6,  1560,     4,     6,
+       4,     6,  1565,     6,     6,    76,    77,    78,    79,    80,
+      81,    82,    83,    84,    85,     6,    87,     6,     6,     6,
+       6,    92,    93,     6,    95,    96,    97,   135,   136,   137,
+     101,    99,     5,   204,     6,    12,    13,     6,   143,     6,
+       6,     6,   110,     6,  1607,   205,     6,     6,     6,     6,
+     118,   119,   120,     6,     6,     6,   124,   125,   126,   127,
+     203,     6,     6,  1626,   135,   136,   137,     6,   198,     6,
+     201,     7,  1510,     6,     6,   204,     6,     5,  1516,    80,
+       6,    88,   204,  1551,     6,  1553,   204,  1555,   205,   205,
+       6,   204,   204,   204,  1646,  1563,     7,   205,  1566,    76,
       77,    78,    79,    80,    81,    82,    83,    84,    85,   204,
-      87,   204,     6,   204,   204,    92,    93,   205,    95,    96,
-      97,  1684,   204,  1686,   101,    80,   205,   204,     6,   204,
-       7,     6,   138,     6,   205,   205,  1699,   205,  1606,     6,
-       6,   141,  1610,   178,   179,   180,   181,   182,   183,   184,
-     185,   186,   187,   188,   189,   190,   191,     6,   135,   136,
-     137,   196,     6,   198,     6,   200,     6,     6,   175,   176,
-     177,   178,   179,     6,   204,     6,     6,     6,     6,   204,
-     204,   204,  1734,     6,     6,   192,   204,     6,   205,   196,
-      99,  1659,  1755,     6,     6,  1663,   204,    12,    13,     6,
-    1763,     6,     6,   210,   211,   212,   213,     6,   215,   216,
-     217,   218,     6,   220,   221,   222,     6,     6,  1686,   205,
-     227,     6,   204,   204,   204,     6,     6,  1790,   205,   204,
-       6,     6,     6,     6,     6,     6,     6,     6,   245,   204,
-     204,     6,     6,   204,  1807,     6,  1809,   254,   255,     6,
-     204,     6,  1763,   204,     6,     6,   263,     6,     6,     6,
-       6,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,  1130,    87,  1741,  1742,  1649,  1839,    92,    93,  1530,
-      95,    96,    97,  1531,   452,  1140,   101,     3,     3,   296,
-     297,   298,   482,  1543,    -1,  1276,  1807,    -1,  1809,    -1,
+      87,     6,     6,   138,     6,    92,    93,   205,    95,    96,
+      97,  1684,   141,  1686,   101,     6,     6,     6,     6,     6,
+       6,     6,   204,     6,   205,     6,  1699,   205,  1606,     6,
+       6,     6,  1610,   178,   179,   180,   181,   182,   183,   184,
+     185,   186,   187,   188,   189,   190,   191,   204,   135,   136,
+     137,   196,   204,   198,   204,   200,   204,     6,   175,   176,
+     177,   178,   179,   205,     6,    99,   204,     6,     6,     6,
+       6,     6,  1734,     6,     6,   192,     6,     6,   205,   196,
+       6,  1659,  1755,   204,     6,  1663,   204,    12,    13,     6,
+    1763,     6,     6,   210,   211,   212,   213,   204,   215,   216,
+     217,   218,   204,   220,   221,   222,     6,     6,  1686,     6,
+     227,     6,   204,   204,   204,   204,   204,  1790,   205,     6,
+       6,     6,     6,     6,     6,     6,     6,     6,   245,     6,
+       6,     6,     6,  1649,  1807,  1130,  1809,   254,   255,   452,
+    1530,     3,  1763,  1531,  1140,     3,   263,  1543,  1276,    -1,
+      -1,    76,    77,    78,    79,    80,    81,    82,    83,    84,
+      85,   482,    87,  1741,  1742,    -1,  1839,    92,    93,    -1,
+      95,    96,    97,    -1,    -1,    -1,   101,    -1,    -1,   296,
+     297,   298,    -1,    -1,    -1,    -1,  1807,    -1,  1809,    -1,
       -1,   308,   309,   310,    -1,   312,    -1,    -1,    -1,   316,
      317,   318,    -1,    -1,   321,    -1,    -1,    -1,    -1,    -1,
      135,   136,   137,    -1,    -1,  1763,    -1,    -1,  1839,    -1,
@@ -3258,9 +2645,9 @@ static const yytype_int16 yycheck[] =
      917,   918,   919,    -1,    -1,    -1,   923,    -1,    -1,    -1,
       -1,    -1,    -1,    76,    77,    78,    79,    80,    81,    82,
       83,    84,    85,    -1,    87,    -1,   382,    12,    13,    92,
-      93,    -1,    95,    96,    97,    -1,    -1,    -1,   101,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   205,    -1,    -1,   972,    -1,    -1,     6,    -1,
+      93,    -1,    95,    96,    97,    -1,    -1,    -1,   101,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+      -1,    -1,   205,    -1,   196,   972,    -1,    -1,     6,    -1,
       -1,    -1,    -1,    -1,    -1,   982,    -1,   984,    -1,   986,
       -1,   988,   135,   136,   137,    -1,    -1,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -4074,8 +3461,8 @@ static const yytype_int16 yycheck[] =
      187,   188,   189,   190,   191,    -1,    -1,    -1,    -1,   196
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
        0,     1,   208,   209,     6,     0,     4,    12,    13,    38,
@@ -4112,7 +3499,7 @@ static const yytype_uint16 yystos[] =
      197,     4,   204,   296,   304,     4,   197,   197,   197,     6,
        6,   199,     4,   300,   304,     4,   300,     5,   204,     5,
      204,     4,   286,   199,     6,   197,   204,   197,   199,   206,
-     231,     7,   174,   175,   176,   177,   194,   195,   229,   230,
+     231,     7,   174,   175,   176,   177,   193,   194,   229,   230,
        4,   197,   199,   201,   231,   231,   231,   231,   231,   231,
      231,   231,   231,   231,   231,   231,   231,   231,   231,   231,
      231,   231,   231,   231,   231,   231,   231,   231,   231,   197,
@@ -4172,7 +3559,7 @@ static const yytype_uint16 yystos[] =
        6,     4,     4,   204,   297,   232,   204,   204,   204,   204,
      205,   205,   292,     8,     4,   130,   131,   132,   133,   205,
      217,   221,   224,   226,   227,   198,   200,   286,     4,     6,
-     184,   211,   295,     6,   295,   286,     6,   299,     6,   304,
+     185,   211,   295,     6,   295,   286,     6,   299,     6,   304,
        6,   299,   286,   300,     7,   286,   294,   143,     7,     7,
      198,     7,   143,     7,     7,   198,   143,     7,     7,   286,
      198,   205,   204,   198,   198,   286,   292,     4,   278,     6,
@@ -4190,7 +3577,7 @@ static const yytype_uint16 yystos[] =
      299,   300,   240,   242,   286,   299,   299,   286,   286,     6,
        4,   140,   141,   286,     6,     6,     6,     7,   199,   296,
      298,     6,   295,   295,   295,   295,   232,     6,   286,   218,
-     197,   197,   204,   228,     6,   230,   230,   200,   184,   299,
+     197,   197,   204,   228,     6,   230,   230,   200,   185,   299,
      198,   198,   203,     7,   232,   232,   289,    82,    84,   292,
      292,     7,   292,    82,    84,   292,   292,     7,    84,   292,
      292,     6,     7,     7,   295,     7,     7,    99,   277,     6,
@@ -4265,96 +3652,158 @@ static const yytype_uint16 yystos[] =
      205,     6,     6,     6,     6,     6,     6,   299,     6
 };
 
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint16 yyr1[] =
+{
+       0,   207,   208,   208,   209,   209,   210,   210,   210,   210,
+     210,   210,   210,   210,   210,   210,   210,   210,   210,   210,
+     210,   210,   211,   211,   212,   212,   212,   212,   212,   212,
+     213,   213,   213,   213,   214,   214,   214,   214,   214,   214,
+     215,   215,   216,   216,   218,   219,   217,   220,   220,   222,
+     221,   223,   223,   225,   224,   226,   226,   228,   227,   229,
+     229,   229,   229,   229,   230,   230,   231,   231,   232,   232,
+     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
+     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
+     233,   233,   233,   233,   233,   233,   233,   233,   233,   233,
+     233,   233,   233,   233,   233,   233,   233,   234,   234,   235,
+     235,   235,   236,   235,   235,   237,   235,   238,   238,   239,
+     239,   240,   240,   241,   241,   241,   242,   242,   243,   243,
+     243,   243,   244,   244,   244,   245,   245,   245,   246,   246,
+     246,   247,   247,   247,   248,   248,   249,   249,   250,   250,
+     250,   250,   250,   250,   250,   250,   250,   250,   250,   250,
+     250,   250,   250,   250,   250,   250,   250,   250,   250,   250,
+     250,   250,   250,   250,   250,   250,   250,   251,   251,   251,
+     251,   251,   251,   251,   251,   252,   252,   253,   253,   253,
+     253,   253,   253,   254,   254,   254,   254,   254,   254,   254,
+     254,   254,   255,   255,   255,   255,   255,   256,   256,   257,
+     258,   258,   258,   258,   258,   258,   259,   259,   259,   259,
+     259,   259,   259,   259,   259,   259,   259,   259,   259,   259,
+     259,   259,   259,   259,   259,   260,   260,   260,   260,   260,
+     260,   260,   260,   260,   260,   260,   260,   260,   260,   261,
+     261,   261,   262,   261,   263,   261,   264,   261,   265,   261,
+     261,   261,   261,   261,   261,   261,   261,   261,   261,   266,
+     261,   267,   261,   268,   261,   269,   261,   270,   261,   271,
+     261,   272,   261,   273,   261,   274,   261,   275,   275,   276,
+     276,   276,   276,   276,   276,   276,   276,   276,   276,   276,
+     276,   276,   276,   276,   277,   277,   278,   278,   279,   279,
+     280,   280,   281,   281,   282,   282,   282,   282,   282,   282,
+     282,   282,   282,   282,   282,   282,   282,   282,   282,   282,
+     282,   282,   282,   282,   282,   282,   282,   282,   282,   282,
+     283,   283,   283,   284,   284,   284,   285,   285,   285,   285,
+     286,   286,   286,   286,   286,   286,   286,   286,   286,   286,
+     286,   286,   286,   286,   286,   286,   286,   286,   286,   286,
+     286,   286,   286,   286,   286,   286,   286,   286,   286,   286,
+     286,   286,   286,   286,   286,   286,   286,   286,   286,   286,
+     286,   286,   287,   287,   287,   287,   287,   287,   287,   287,
+     287,   287,   287,   288,   287,   287,   287,   287,   287,   287,
+     287,   287,   287,   287,   287,   287,   287,   287,   287,   287,
+     287,   287,   287,   287,   287,   287,   287,   287,   287,   289,
+     289,   289,   289,   289,   290,   290,   290,   290,   291,   291,
+     292,   292,   292,   292,   292,   292,   293,   293,   294,   294,
+     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
+     294,   294,   294,   294,   294,   294,   294,   294,   294,   294,
+     294,   294,   294,   294,   294,   294,   295,   295,   295,   295,
+     296,   296,   296,   296,   297,   297,   298,   298,   299,   299,
+     299,   299,   300,   300,   300,   300,   300,   300,   300,   300,
+     300,   300,   300,   300,   300,   300,   300,   300,   300,   300,
+     300,   300,   300,   300,   301,   300,   302,   302,   303,   303,
+     304,   304,   304
+};
 
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     2,     0,     2,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     2,     5,     5,     7,     7,     7,     9,
+       6,     6,     6,     8,     0,     2,     2,     2,     2,     2,
+       1,     3,     1,     3,     0,     0,    10,     1,     3,     0,
+      13,     1,     3,     0,    15,     8,    14,     0,     6,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       5,     5,     7,     7,     4,     6,     6,     7,     7,     7,
+       7,     9,     9,     3,     6,     6,     6,     6,     4,     6,
+       9,     6,     9,     5,     8,     8,    11,     6,     9,     5,
+       7,     9,     9,    11,     7,     9,     9,     0,     1,     0,
+       3,     5,     0,     9,     5,     0,     9,     0,     3,     3,
+       5,     0,     2,     3,     5,     3,     0,     2,     3,     3,
+       3,     5,     1,     1,     3,     1,     1,     3,     1,     1,
+       3,     1,     1,     3,     0,     5,     0,     2,     7,     8,
+       6,     7,     4,     7,     8,     8,     7,     7,    11,     8,
+       8,     8,     8,     9,     3,     4,    10,     7,     7,     8,
+       8,    12,     8,     8,     7,     8,     8,     5,    11,     5,
+       9,     9,     4,     9,     9,     1,     1,     0,     2,     6,
+       6,     6,     6,     8,    10,    14,    16,    12,     8,     8,
+       6,    14,     4,     6,     6,     3,     4,     5,     6,     5,
+       3,     3,     4,     5,     4,     5,     3,     5,     7,     7,
+       3,     7,     3,     2,     2,     2,     2,     2,    15,     2,
+       2,     2,     2,     2,    16,     6,     8,     8,    10,     1,
+       2,     2,     1,     3,     3,     4,     4,     1,     1,     5,
+      11,    13,     0,     7,     0,    13,     0,    15,     0,     6,
+       8,     8,     8,    12,    12,    12,    14,    14,    14,     0,
+      12,     0,    12,     0,    12,     0,    16,     0,    16,     0,
+      16,     0,    18,     0,    18,     0,    18,     1,     2,     5,
+       7,     9,     2,     2,     2,     3,     2,     3,     2,     3,
+       2,     3,     9,     6,     0,     3,     0,     1,     0,     2,
+       0,     2,     0,     2,     7,     6,     8,     5,     3,     8,
+       5,     4,     6,    11,    11,    18,    18,    12,    12,    12,
+      10,    10,    10,    10,    10,     4,     4,     4,     4,     4,
+       2,     3,     6,     1,     1,     1,     2,     5,     7,    10,
+       1,     3,     2,     2,     2,     3,     3,     3,     3,     3,
+       3,     3,     3,     3,     3,     3,     3,     3,     3,     5,
+       4,     4,     4,     4,     4,     4,     4,     4,     4,     4,
+       6,     4,     4,     4,     4,     4,     4,     4,     6,     6,
+       6,     4,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     0,     6,     4,     6,     1,     4,     4,
+       4,     4,     4,     4,     4,     2,     5,     5,     5,     5,
+       3,     6,     4,     7,     6,     6,     6,     6,     4,     1,
+       2,     2,     3,     3,    11,     9,     7,     7,     1,     3,
+       1,     1,     2,     3,     4,     5,     1,     1,     2,     3,
+       3,     5,     4,     2,     2,     2,     2,     3,     3,     3,
+       3,     5,     5,     5,     5,    16,    16,    16,    16,     1,
+       1,     3,     3,     4,     6,     6,     1,     1,     3,     3,
+       9,     7,     1,     5,     3,     6,     1,     3,     1,     1,
+       3,     6,     1,     4,     1,     1,     1,     4,     6,     4,
+       6,     4,     4,     4,     8,     4,     4,     4,     4,     8,
+       4,     6,     4,     1,     0,     6,     1,     3,     5,     5,
+       1,     1,     4
+};
 
 
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
 
-#define YYFAIL		goto yyerrlab
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK (1);						\
-      goto yybackup;						\
-    }								\
-  else								\
-    {								\
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
-while (YYID (0))
-
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (YYID (N))                                                    \
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (YYID (0))
-#endif
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
 
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
-#ifndef YY_LOCATION_PRINT
-# if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
 
 
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (YYLEX_PARAM)
-#else
-# define YYLEX yylex ()
-#endif
-
 /* Enable debugging if requested.  */
 #if YYDEBUG
 
@@ -4363,54 +3812,46 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (YYID (0))
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
+  YYUSE (yytype);
 }
 
 
@@ -4418,22 +3859,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
   yy_symbol_value_print (yyoutput, yytype, yyvaluep);
   YYFPRINTF (yyoutput, ")");
@@ -4444,66 +3874,54 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
-#else
-static void
-yy_stack_print (bottom, top)
-    yytype_int16 *bottom;
-    yytype_int16 *top;
-#endif
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
 {
   YYFPRINTF (stderr, "Stack now");
-  for (; bottom <= top; ++bottom)
-    YYFPRINTF (stderr, " %d", *bottom);
+  for (; yybottom <= yytop; yybottom++)
+    {
+      int yybot = *yybottom;
+      YYFPRINTF (stderr, " %d", yybot);
+    }
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
 static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
+  unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
-      fprintf (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
-      fprintf (stderr, "\n");
+      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
+      YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -4517,7 +3935,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -4532,7 +3950,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
 
 #if YYERROR_VERBOSE
 
@@ -4541,15 +3958,8 @@ int yydebug;
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
@@ -4565,16 +3975,8 @@ yystrlen (yystr)
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
 {
   char *yyd = yydest;
   const char *yys = yysrc;
@@ -4604,242 +4006,240 @@ yytnamerr (char *yyres, const char *yystr)
       char const *yyp = yystr;
 
       for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
 
-  if (! yyres)
-    return yystrlen (yystr);
-
-  return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
+{
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
+
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
-{
-  int yyn = yypact[yystate];
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
+  if (*yymsg_alloc < yysize)
     {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
-
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
-
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
-
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  switch (yytype)
-    {
-
-      default:
-	break;
-    }
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
-
 
-/* Prevent warnings from -Wmissing-prototypes.  */
-
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
 
 
 
-/* The look-ahead symbol.  */
+/* The lookahead symbol.  */
 int yychar;
 
-/* The semantic value of the look-ahead symbol.  */
+/* The semantic value of the lookahead symbol.  */
 YYSTYPE yylval;
-
 /* Number of syntax errors so far.  */
 int yynerrs;
 
 
-
 /*----------.
 | yyparse.  |
 `----------*/
 
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
 {
-  
-  int yystate;
+    int yystate;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+
+    /* The stacks and their tools:
+       'yyss': related to states.
+       'yyvs': related to semantic values.
+
+       Refer to the stacks through separate pointers, to allow yyoverflow
+       to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16 *yyss;
+    yytype_int16 *yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE *yyvs;
+    YYSTYPE *yyvsp;
+
+    YYSIZE_T yystacksize;
+
   int yyn;
   int yyresult;
-  /* Number of tokens to shift before error messages enabled.  */
-  int yyerrstatus;
-  /* Look-ahead token as an internal (translated) token number.  */
+  /* Lookahead token as an internal (translated) token number.  */
   int yytoken = 0;
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+
 #if YYERROR_VERBOSE
   /* Buffer for error messages, and its allocated size.  */
   char yymsgbuf[128];
@@ -4847,54 +4247,22 @@ yyparse ()
   YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
 #endif
 
-  /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-  /* The state stack.  */
-  yytype_int16 yyssa[YYINITDEPTH];
-  yytype_int16 *yyss = yyssa;
-  yytype_int16 *yyssp;
-
-  /* The semantic value stack.  */
-  YYSTYPE yyvsa[YYINITDEPTH];
-  YYSTYPE *yyvs = yyvsa;
-  YYSTYPE *yyvsp;
-
-
-
 #define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
 
-  YYSIZE_T yystacksize = YYINITDEPTH;
-
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
-
   /* The number of symbols on the RHS of the reduced rule.
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
+  yystacksize = YYINITDEPTH;
+
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yystate = 0;
   yyerrstatus = 0;
   yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss;
-  yyvsp = yyvs;
-
+  yychar = YYEMPTY; /* Cause a token to be read.  */
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -4915,25 +4283,23 @@ yyparse ()
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack.  Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
@@ -4941,23 +4307,22 @@ yyparse ()
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss);
-	YYSTACK_RELOCATE (yyvs);
-
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -4965,16 +4330,18 @@ yyparse ()
       yyssp = yyss + yysize - 1;
       yyvsp = yyvs + yysize - 1;
 
-
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
+        YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
 
+  if (yystate == YYFINAL)
+    YYACCEPT;
+
   goto yybackup;
 
 /*-----------.
@@ -4983,20 +4350,20 @@ yyparse ()
 yybackup:
 
   /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
+     lookahead token if we need one and don't already have one.  */
 
-  /* First try to decide what to do without reference to look-ahead token.  */
+  /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
-  /* Not known => get a look-ahead token if don't already have one.  */
+  /* Not known => get a lookahead token if don't already have one.  */
 
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex ();
     }
 
   if (yychar <= YYEOF)
@@ -5018,29 +4385,27 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
   /* Count tokens shifted since error; after three, turn off error
      status.  */
   if (yyerrstatus)
     yyerrstatus--;
 
-  /* Shift the look-ahead token.  */
+  /* Shift the lookahead token.  */
   YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
 
-  /* Discard the shifted token unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
+  /* Discard the shifted token.  */
+  yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -5063,7 +4428,7 @@ yyreduce:
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+     '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison
@@ -5077,181 +4442,205 @@ yyreduce:
   switch (yyn)
     {
         case 3:
-#line 198 "Gmsh.y"
-    { yyerrok; return 1; ;}
+#line 198 "Gmsh.y" /* yacc.c:1646  */
+    { yyerrok; return 1; }
+#line 4448 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 209 "Gmsh.y"
-    { return 1; ;}
+#line 209 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4454 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 210 "Gmsh.y"
-    { return 1; ;}
+#line 210 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4460 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 211 "Gmsh.y"
-    { return 1; ;}
+#line 211 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4466 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 212 "Gmsh.y"
-    { return 1; ;}
+#line 212 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4472 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 213 "Gmsh.y"
-    { List_Delete((yyvsp[(1) - (1)].l)); return 1; ;}
+#line 213 "Gmsh.y" /* yacc.c:1646  */
+    { List_Delete((yyvsp[0].l)); return 1; }
+#line 4478 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 214 "Gmsh.y"
-    { return 1; ;}
+#line 214 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4484 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 215 "Gmsh.y"
-    { return 1; ;}
+#line 215 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4490 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 216 "Gmsh.y"
-    { return 1; ;}
+#line 216 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4496 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 217 "Gmsh.y"
-    { return 1; ;}
+#line 217 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4502 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 218 "Gmsh.y"
-    { List_Delete((yyvsp[(1) - (1)].l)); return 1; ;}
+#line 218 "Gmsh.y" /* yacc.c:1646  */
+    { List_Delete((yyvsp[0].l)); return 1; }
+#line 4508 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 219 "Gmsh.y"
-    { return 1; ;}
+#line 219 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4514 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 220 "Gmsh.y"
-    { return 1; ;}
+#line 220 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4520 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 221 "Gmsh.y"
-    { return 1; ;}
+#line 221 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4526 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 222 "Gmsh.y"
-    { return 1; ;}
+#line 222 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4532 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 223 "Gmsh.y"
-    { return 1; ;}
+#line 223 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4538 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 224 "Gmsh.y"
-    { return 1; ;}
+#line 224 "Gmsh.y" /* yacc.c:1646  */
+    { return 1; }
+#line 4544 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 229 "Gmsh.y"
+#line 229 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.c) = (char*)"w";
-    ;}
+    }
+#line 4552 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 233 "Gmsh.y"
+#line 233 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.c) = (char*)"a";
-    ;}
+    }
+#line 4560 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 240 "Gmsh.y"
+#line 240 "Gmsh.y" /* yacc.c:1646  */
     {
-      Msg::Direct((yyvsp[(3) - (5)].c));
-      Free((yyvsp[(3) - (5)].c));
-    ;}
+      Msg::Direct((yyvsp[-2].c));
+      Free((yyvsp[-2].c));
+    }
+#line 4569 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 245 "Gmsh.y"
+#line 245 "Gmsh.y" /* yacc.c:1646  */
     {
-      Msg::Error((yyvsp[(3) - (5)].c));
-      Free((yyvsp[(3) - (5)].c));
-    ;}
+      Msg::Error((yyvsp[-2].c));
+      Free((yyvsp[-2].c));
+    }
+#line 4578 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 26:
-#line 250 "Gmsh.y"
+#line 250 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(6) - (7)].c));
-      FILE *fp = Fopen(tmp.c_str(), (yyvsp[(5) - (7)].c));
+      std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
+      FILE *fp = Fopen(tmp.c_str(), (yyvsp[-2].c));
       if(!fp){
 	yymsg(0, "Unable to open file '%s'", tmp.c_str());
       }
       else{
-	fprintf(fp, "%s\n", (yyvsp[(3) - (7)].c));
+	fprintf(fp, "%s\n", (yyvsp[-4].c));
 	fclose(fp);
       }
-      Free((yyvsp[(3) - (7)].c));
-      Free((yyvsp[(6) - (7)].c));
-    ;}
+      Free((yyvsp[-4].c));
+      Free((yyvsp[-1].c));
+    }
+#line 4596 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 264 "Gmsh.y"
+#line 264 "Gmsh.y" /* yacc.c:1646  */
     {
       char tmpstring[5000];
-      int i = PrintListOfDouble((yyvsp[(3) - (7)].c), (yyvsp[(5) - (7)].l), tmpstring);
+      int i = PrintListOfDouble((yyvsp[-4].c), (yyvsp[-2].l), tmpstring);
       if(i < 0)
 	yymsg(0, "Too few arguments in Printf");
       else if(i > 0)
 	yymsg(0, "%d extra argument%s in Printf", i, (i > 1) ? "s" : "");
       else
 	Msg::Direct(tmpstring);
-      Free((yyvsp[(3) - (7)].c));
-      List_Delete((yyvsp[(5) - (7)].l));
-    ;}
+      Free((yyvsp[-4].c));
+      List_Delete((yyvsp[-2].l));
+    }
+#line 4613 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 277 "Gmsh.y"
+#line 277 "Gmsh.y" /* yacc.c:1646  */
     {
       char tmpstring[5000];
-      int i = PrintListOfDouble((yyvsp[(3) - (7)].c), (yyvsp[(5) - (7)].l), tmpstring);
+      int i = PrintListOfDouble((yyvsp[-4].c), (yyvsp[-2].l), tmpstring);
       if(i < 0)
 	yymsg(0, "Too few arguments in Error");
       else if(i > 0)
 	yymsg(0, "%d extra argument%s in Error", i, (i > 1) ? "s" : "");
       else
 	Msg::Error(tmpstring);
-      Free((yyvsp[(3) - (7)].c));
-      List_Delete((yyvsp[(5) - (7)].l));
-    ;}
+      Free((yyvsp[-4].c));
+      List_Delete((yyvsp[-2].l));
+    }
+#line 4630 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 29:
-#line 290 "Gmsh.y"
+#line 290 "Gmsh.y" /* yacc.c:1646  */
     {
       char tmpstring[5000];
-      int i = PrintListOfDouble((yyvsp[(3) - (9)].c), (yyvsp[(5) - (9)].l), tmpstring);
+      int i = PrintListOfDouble((yyvsp[-6].c), (yyvsp[-4].l), tmpstring);
       if(i < 0)
 	yymsg(0, "Too few arguments in Printf");
       else if(i > 0)
 	yymsg(0, "%d extra argument%s in Printf", i, (i > 1) ? "s" : "");
       else{
-        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(8) - (9)].c));
-	FILE *fp = Fopen(tmp.c_str(), (yyvsp[(7) - (9)].c));
+        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
+	FILE *fp = Fopen(tmp.c_str(), (yyvsp[-2].c));
 	if(!fp){
 	  yymsg(0, "Unable to open file '%s'", tmp.c_str());
 	}
@@ -5260,18 +4649,19 @@ yyreduce:
 	  fclose(fp);
 	}
       }
-      Free((yyvsp[(3) - (9)].c));
-      Free((yyvsp[(8) - (9)].c));
-      List_Delete((yyvsp[(5) - (9)].l));
-    ;}
+      Free((yyvsp[-6].c));
+      Free((yyvsp[-1].c));
+      List_Delete((yyvsp[-4].l));
+    }
+#line 4657 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 318 "Gmsh.y"
+#line 318 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      if(!strcmp((yyvsp[(1) - (6)].c), "View") && ViewData->finalize()){
-	ViewData->setName((yyvsp[(2) - (6)].c));
+      if(!strcmp((yyvsp[-5].c), "View") && ViewData->finalize()){
+	ViewData->setName((yyvsp[-4].c));
 	ViewData->setFileName(gmsh_yyname);
 	ViewData->setFileIndex(gmsh_yyviewindex++);
 	new PView(ViewData);
@@ -5279,48 +4669,51 @@ yyreduce:
       else
 	delete ViewData;
 #endif
-      Free((yyvsp[(1) - (6)].c)); Free((yyvsp[(2) - (6)].c));
-    ;}
+      Free((yyvsp[-5].c)); Free((yyvsp[-4].c));
+    }
+#line 4675 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 332 "Gmsh.y"
+#line 332 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      if(!strcmp((yyvsp[(2) - (6)].c), "View")){
-	int index = (int)(yyvsp[(4) - (6)].d);
+      if(!strcmp((yyvsp[-4].c), "View")){
+	int index = (int)(yyvsp[-2].d);
 	if(index >= 0 && index < (int)PView::list.size())
 	  new PView(PView::list[index], false);
         else
 	  yymsg(0, "Unknown view %d", index);
       }
 #endif
-      Free((yyvsp[(2) - (6)].c));
-    ;}
+      Free((yyvsp[-4].c));
+    }
+#line 4692 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 345 "Gmsh.y"
+#line 345 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      if(!strcmp((yyvsp[(2) - (6)].c), "View")){
-	int index = (int)(yyvsp[(4) - (6)].d);
+      if(!strcmp((yyvsp[-4].c), "View")){
+	int index = (int)(yyvsp[-2].d);
 	if(index >= 0 && index < (int)PView::list.size())
 	  new PView(PView::list[index], true);
         else
 	  yymsg(0, "Unknown view %d", index);
       }
 #endif
-      Free((yyvsp[(2) - (6)].c));
-    ;}
+      Free((yyvsp[-4].c));
+    }
+#line 4709 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 358 "Gmsh.y"
+#line 358 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      if(!strcmp((yyvsp[(2) - (8)].c), "View")){
-	int index = (int)(yyvsp[(4) - (8)].d), index2 = (int)(yyvsp[(6) - (8)].d);
+      if(!strcmp((yyvsp[-6].c), "View")){
+	int index = (int)(yyvsp[-4].d), index2 = (int)(yyvsp[-2].d);
 	if(index >= 0 && index < (int)PView::list.size() &&
            index2 >= 0 && index2 < (int)PView::list.size()){
           PView::list[index2]->setOptions(PView::list[index]->getOptions());
@@ -5329,148 +4722,155 @@ yyreduce:
 	  yymsg(0, "Unknown view %d or %d", index, index2);
       }
 #endif
-      Free((yyvsp[(2) - (8)].c));
-    ;}
+      Free((yyvsp[-6].c));
+    }
+#line 4728 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 376 "Gmsh.y"
+#line 376 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
       ViewData = new PViewDataList();
 #endif
-    ;}
+    }
+#line 4738 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 40:
-#line 390 "Gmsh.y"
-    { ViewCoord.push_back((yyvsp[(1) - (1)].d)); ;}
+#line 390 "Gmsh.y" /* yacc.c:1646  */
+    { ViewCoord.push_back((yyvsp[0].d)); }
+#line 4744 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 41:
-#line 392 "Gmsh.y"
-    { ViewCoord.push_back((yyvsp[(3) - (3)].d)); ;}
+#line 392 "Gmsh.y" /* yacc.c:1646  */
+    { ViewCoord.push_back((yyvsp[0].d)); }
+#line 4750 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 397 "Gmsh.y"
-    { if(ViewValueList) ViewValueList->push_back((yyvsp[(1) - (1)].d)); ;}
+#line 397 "Gmsh.y" /* yacc.c:1646  */
+    { if(ViewValueList) ViewValueList->push_back((yyvsp[0].d)); }
+#line 4756 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 399 "Gmsh.y"
-    { if(ViewValueList) ViewValueList->push_back((yyvsp[(3) - (3)].d)); ;}
+#line 399 "Gmsh.y" /* yacc.c:1646  */
+    { if(ViewValueList) ViewValueList->push_back((yyvsp[0].d)); }
+#line 4762 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 404 "Gmsh.y"
+#line 404 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      if(!strncmp((yyvsp[(1) - (1)].c), "SP", 2)){
+      if(!strncmp((yyvsp[0].c), "SP", 2)){
 	ViewValueList = &ViewData->SP; ViewNumList = &ViewData->NbSP;
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "VP", 2)){
+      else if(!strncmp((yyvsp[0].c), "VP", 2)){
 	ViewValueList = &ViewData->VP; ViewNumList = &ViewData->NbVP;
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "TP", 2)){
+      else if(!strncmp((yyvsp[0].c), "TP", 2)){
 	ViewValueList = &ViewData->TP; ViewNumList = &ViewData->NbTP;
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "SL", 2)){
+      else if(!strncmp((yyvsp[0].c), "SL", 2)){
 	ViewValueList = &ViewData->SL; ViewNumList = &ViewData->NbSL;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_LIN);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_LIN);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "VL", 2)){
+      else if(!strncmp((yyvsp[0].c), "VL", 2)){
 	ViewValueList = &ViewData->VL; ViewNumList = &ViewData->NbVL;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_LIN);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_LIN);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "TL", 2)){
+      else if(!strncmp((yyvsp[0].c), "TL", 2)){
 	ViewValueList = &ViewData->TL; ViewNumList = &ViewData->NbTL;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_LIN);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_LIN);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "ST", 2)){
+      else if(!strncmp((yyvsp[0].c), "ST", 2)){
 	ViewValueList = &ViewData->ST; ViewNumList = &ViewData->NbST;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TRI);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TRI);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "VT", 2)){
+      else if(!strncmp((yyvsp[0].c), "VT", 2)){
 	ViewValueList = &ViewData->VT; ViewNumList = &ViewData->NbVT;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TRI);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TRI);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "TT", 2)){
+      else if(!strncmp((yyvsp[0].c), "TT", 2)){
 	ViewValueList = &ViewData->TT; ViewNumList = &ViewData->NbTT;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TRI);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TRI);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "SQ", 2)){
+      else if(!strncmp((yyvsp[0].c), "SQ", 2)){
 	ViewValueList = &ViewData->SQ; ViewNumList = &ViewData->NbSQ;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_QUA);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_QUA);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "VQ", 2)){
+      else if(!strncmp((yyvsp[0].c), "VQ", 2)){
 	ViewValueList = &ViewData->VQ; ViewNumList = &ViewData->NbVQ;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_QUA);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_QUA);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "TQ", 2)){
+      else if(!strncmp((yyvsp[0].c), "TQ", 2)){
 	ViewValueList = &ViewData->TQ; ViewNumList = &ViewData->NbTQ;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_QUA);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_QUA);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "SS", 2)){
+      else if(!strncmp((yyvsp[0].c), "SS", 2)){
 	ViewValueList = &ViewData->SS; ViewNumList = &ViewData->NbSS;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TET);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TET);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "VS", 2)){
+      else if(!strncmp((yyvsp[0].c), "VS", 2)){
 	ViewValueList = &ViewData->VS; ViewNumList = &ViewData->NbVS;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TET);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TET);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "TS", 2)){
+      else if(!strncmp((yyvsp[0].c), "TS", 2)){
 	ViewValueList = &ViewData->TS; ViewNumList = &ViewData->NbTS;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_TET);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_TET);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "SH", 2)){
+      else if(!strncmp((yyvsp[0].c), "SH", 2)){
 	ViewValueList = &ViewData->SH; ViewNumList = &ViewData->NbSH;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_HEX);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_HEX);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "VH", 2)){
+      else if(!strncmp((yyvsp[0].c), "VH", 2)){
 	ViewValueList = &ViewData->VH; ViewNumList = &ViewData->NbVH;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_HEX);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_HEX);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "TH", 2)){
+      else if(!strncmp((yyvsp[0].c), "TH", 2)){
 	ViewValueList = &ViewData->TH; ViewNumList = &ViewData->NbTH;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_HEX);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_HEX);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "SI", 2)){
+      else if(!strncmp((yyvsp[0].c), "SI", 2)){
 	ViewValueList = &ViewData->SI; ViewNumList = &ViewData->NbSI;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PRI);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PRI);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "VI", 2)){
+      else if(!strncmp((yyvsp[0].c), "VI", 2)){
 	ViewValueList = &ViewData->VI; ViewNumList = &ViewData->NbVI;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PRI);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PRI);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "TI", 2)){
+      else if(!strncmp((yyvsp[0].c), "TI", 2)){
 	ViewValueList = &ViewData->TI; ViewNumList = &ViewData->NbTI;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PRI);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PRI);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "SY", 2)){
+      else if(!strncmp((yyvsp[0].c), "SY", 2)){
 	ViewValueList = &ViewData->SY; ViewNumList = &ViewData->NbSY;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PYR);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PYR);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "VY", 2)){
+      else if(!strncmp((yyvsp[0].c), "VY", 2)){
 	ViewValueList = &ViewData->VY; ViewNumList = &ViewData->NbVY;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PYR);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PYR);
       }
-      else if(!strncmp((yyvsp[(1) - (1)].c), "TY", 2)){
+      else if(!strncmp((yyvsp[0].c), "TY", 2)){
 	ViewValueList = &ViewData->TY; ViewNumList = &ViewData->NbTY;
-        if(strlen((yyvsp[(1) - (1)].c)) > 2) ViewData->setOrder2(TYPE_PYR);
+        if(strlen((yyvsp[0].c)) > 2) ViewData->setOrder2(TYPE_PYR);
       }
       else{
-	yymsg(0, "Unknown element type '%s'", (yyvsp[(1) - (1)].c));
+	yymsg(0, "Unknown element type '%s'", (yyvsp[0].c));
 	ViewValueList = 0; ViewNumList = 0;
       }
 #endif
       ViewCoord.clear();
-      Free((yyvsp[(1) - (1)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 4870 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 45:
-#line 508 "Gmsh.y"
+#line 508 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
       if(ViewValueList){
@@ -5479,101 +4879,111 @@ yyreduce:
 	    ViewValueList->push_back(ViewCoord[3 * j + i]);
       }
 #endif
-    ;}
+    }
+#line 4884 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 518 "Gmsh.y"
+#line 518 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
       if(ViewValueList) (*ViewNumList)++;
 #endif
-    ;}
+    }
+#line 4894 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 527 "Gmsh.y"
+#line 527 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      for(int i = 0; i < (int)strlen((yyvsp[(1) - (1)].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[(1) - (1)].c)[i]);
+      for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[0].c)[i]);
 #endif
-      Free((yyvsp[(1) - (1)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 4905 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 48:
-#line 534 "Gmsh.y"
+#line 534 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      for(int i = 0; i < (int)strlen((yyvsp[(3) - (3)].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[(3) - (3)].c)[i]);
+      for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T2C.push_back((yyvsp[0].c)[i]);
 #endif
-      Free((yyvsp[(3) - (3)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 4916 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 49:
-#line 544 "Gmsh.y"
+#line 544 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      ViewData->T2D.push_back((yyvsp[(3) - (8)].d));
-      ViewData->T2D.push_back((yyvsp[(5) - (8)].d));
-      ViewData->T2D.push_back((yyvsp[(7) - (8)].d));
+      ViewData->T2D.push_back((yyvsp[-5].d));
+      ViewData->T2D.push_back((yyvsp[-3].d));
+      ViewData->T2D.push_back((yyvsp[-1].d));
       ViewData->T2D.push_back(ViewData->T2C.size());
 #endif
-    ;}
+    }
+#line 4929 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 50:
-#line 553 "Gmsh.y"
+#line 553 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
       ViewData->NbT2++;
 #endif
-    ;}
+    }
+#line 4939 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 51:
-#line 562 "Gmsh.y"
+#line 562 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      for(int i = 0; i < (int)strlen((yyvsp[(1) - (1)].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[(1) - (1)].c)[i]);
+      for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[0].c)[i]);
 #endif
-      Free((yyvsp[(1) - (1)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 4950 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 52:
-#line 569 "Gmsh.y"
+#line 569 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      for(int i = 0; i < (int)strlen((yyvsp[(3) - (3)].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[(3) - (3)].c)[i]);
+      for(int i = 0; i < (int)strlen((yyvsp[0].c)) + 1; i++) ViewData->T3C.push_back((yyvsp[0].c)[i]);
 #endif
-      Free((yyvsp[(3) - (3)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 4961 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 53:
-#line 579 "Gmsh.y"
+#line 579 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      ViewData->T3D.push_back((yyvsp[(3) - (10)].d)); ViewData->T3D.push_back((yyvsp[(5) - (10)].d));
-      ViewData->T3D.push_back((yyvsp[(7) - (10)].d)); ViewData->T3D.push_back((yyvsp[(9) - (10)].d));
+      ViewData->T3D.push_back((yyvsp[-7].d)); ViewData->T3D.push_back((yyvsp[-5].d));
+      ViewData->T3D.push_back((yyvsp[-3].d)); ViewData->T3D.push_back((yyvsp[-1].d));
       ViewData->T3D.push_back(ViewData->T3C.size());
 #endif
-    ;}
+    }
+#line 4973 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 54:
-#line 587 "Gmsh.y"
+#line 587 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
       ViewData->NbT3++;
 #endif
-    ;}
+    }
+#line 4983 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 55:
-#line 597 "Gmsh.y"
+#line 597 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
       int type =
@@ -5585,14 +4995,15 @@ yyreduce:
 	(ViewData->NbSI || ViewData->NbVI) ? TYPE_PRI :
       	(ViewData->NbSH || ViewData->NbVH) ? TYPE_HEX :
 	0;
-      ViewData->setInterpolationMatrices(type, ListOfListOfDouble2Matrix((yyvsp[(3) - (8)].l)),
-                                         ListOfListOfDouble2Matrix((yyvsp[(6) - (8)].l)));
+      ViewData->setInterpolationMatrices(type, ListOfListOfDouble2Matrix((yyvsp[-5].l)),
+                                         ListOfListOfDouble2Matrix((yyvsp[-2].l)));
 #endif
-    ;}
+    }
+#line 5003 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 56:
-#line 616 "Gmsh.y"
+#line 616 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
       int type =
@@ -5602,148 +5013,164 @@ yyreduce:
 	(ViewData->NbSS || ViewData->NbVS) ? TYPE_TET :
       	(ViewData->NbSH || ViewData->NbVH) ? TYPE_HEX :
 	0;
-      ViewData->setInterpolationMatrices(type, ListOfListOfDouble2Matrix((yyvsp[(3) - (14)].l)),
-                                         ListOfListOfDouble2Matrix((yyvsp[(6) - (14)].l)),
-                                         ListOfListOfDouble2Matrix((yyvsp[(9) - (14)].l)),
-                                         ListOfListOfDouble2Matrix((yyvsp[(12) - (14)].l)));
+      ViewData->setInterpolationMatrices(type, ListOfListOfDouble2Matrix((yyvsp[-11].l)),
+                                         ListOfListOfDouble2Matrix((yyvsp[-8].l)),
+                                         ListOfListOfDouble2Matrix((yyvsp[-5].l)),
+                                         ListOfListOfDouble2Matrix((yyvsp[-2].l)));
 #endif
-    ;}
+    }
+#line 5023 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 57:
-#line 635 "Gmsh.y"
+#line 635 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
       ViewValueList = &ViewData->Time;
 #endif
-    ;}
+    }
+#line 5033 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 58:
-#line 641 "Gmsh.y"
+#line 641 "Gmsh.y" /* yacc.c:1646  */
     {
-    ;}
+    }
+#line 5040 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 59:
-#line 648 "Gmsh.y"
-    { (yyval.i) = 0; ;}
+#line 648 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.i) = 0; }
+#line 5046 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 60:
-#line 649 "Gmsh.y"
-    { (yyval.i) = 1; ;}
+#line 649 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.i) = 1; }
+#line 5052 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 61:
-#line 650 "Gmsh.y"
-    { (yyval.i) = 2; ;}
+#line 650 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.i) = 2; }
+#line 5058 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 651 "Gmsh.y"
-    { (yyval.i) = 3; ;}
+#line 651 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.i) = 3; }
+#line 5064 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 63:
-#line 652 "Gmsh.y"
-    { (yyval.i) = 4; ;}
+#line 652 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.i) = 4; }
+#line 5070 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 656 "Gmsh.y"
-    { (yyval.i) = 1; ;}
+#line 656 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.i) = 1; }
+#line 5076 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 65:
-#line 657 "Gmsh.y"
-    { (yyval.i) = -1; ;}
+#line 657 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.i) = -1; }
+#line 5082 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 66:
-#line 663 "Gmsh.y"
-    { (yyval.c) = (char*)"("; ;}
+#line 663 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.c) = (char*)"("; }
+#line 5088 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 67:
-#line 663 "Gmsh.y"
-    { (yyval.c) = (char*)"["; ;}
+#line 663 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.c) = (char*)"["; }
+#line 5094 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 68:
-#line 664 "Gmsh.y"
-    { (yyval.c) = (char*)")"; ;}
+#line 664 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.c) = (char*)")"; }
+#line 5100 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 69:
-#line 664 "Gmsh.y"
-    { (yyval.c) = (char*)"]"; ;}
+#line 664 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.c) = (char*)"]"; }
+#line 5106 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 72:
-#line 673 "Gmsh.y"
+#line 673 "Gmsh.y" /* yacc.c:1646  */
     {
-      Msg::SetOnelabNumber((yyvsp[(3) - (7)].c), (yyvsp[(5) - (7)].d));
-      Free((yyvsp[(3) - (7)].c));
-    ;}
+      Msg::SetOnelabNumber((yyvsp[-4].c), (yyvsp[-2].d));
+      Free((yyvsp[-4].c));
+    }
+#line 5115 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 73:
-#line 678 "Gmsh.y"
+#line 678 "Gmsh.y" /* yacc.c:1646  */
     {
-      Msg::SetOnelabString((yyvsp[(3) - (7)].c), (yyvsp[(5) - (7)].c));
-      Free((yyvsp[(3) - (7)].c));
-      Free((yyvsp[(5) - (7)].c));
-    ;}
+      Msg::SetOnelabString((yyvsp[-4].c), (yyvsp[-2].c));
+      Free((yyvsp[-4].c));
+      Free((yyvsp[-2].c));
+    }
+#line 5125 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 74:
-#line 684 "Gmsh.y"
+#line 684 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c)) && (yyvsp[(2) - (4)].i) && List_Nbr((yyvsp[(3) - (4)].l)) == 1){
-        yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (4)].c));
+      if(!gmsh_yysymbols.count((yyvsp[-3].c)) && (yyvsp[-2].i) && List_Nbr((yyvsp[-1].l)) == 1){
+        yymsg(0, "Unknown variable '%s'", (yyvsp[-3].c));
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (4)].c)]);
-        if(!(yyvsp[(2) - (4)].i)) s.list = (List_Nbr((yyvsp[(3) - (4)].l)) != 1); // list if 0 or > 1 elements
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-3].c)]);
+        if(!(yyvsp[-2].i)) s.list = (List_Nbr((yyvsp[-1].l)) != 1); // list if 0 or > 1 elements
         if(!s.list){ // single expression
-          if(List_Nbr((yyvsp[(3) - (4)].l)) != 1){
-            yymsg(0, "Cannot assign list to variable '%s'", (yyvsp[(1) - (4)].c));
+          if(List_Nbr((yyvsp[-1].l)) != 1){
+            yymsg(0, "Cannot assign list to variable '%s'", (yyvsp[-3].c));
           }
           else{
             double d;
-            List_Read((yyvsp[(3) - (4)].l), 0, &d);
+            List_Read((yyvsp[-1].l), 0, &d);
             if(s.value.empty()){
-              if((yyvsp[(2) - (4)].i)) yymsg(1, "Uninitialized variable '%s'", (yyvsp[(1) - (4)].c));
+              if((yyvsp[-2].i)) yymsg(1, "Uninitialized variable '%s'", (yyvsp[-3].c));
               s.value.resize(1, 0.);
             }
-            switch((yyvsp[(2) - (4)].i)){
+            switch((yyvsp[-2].i)){
             case 0 : s.value[0] = d; break;
             case 1 : s.value[0] += d; break;
             case 2 : s.value[0] -= d; break;
             case 3 : s.value[0] *= d; break;
             case 4 :
               if(d) s.value[0] /= d;
-              else yymsg(0, "Division by zero in '%s /= %g'", (yyvsp[(1) - (4)].c), d);
+              else yymsg(0, "Division by zero in '%s /= %g'", (yyvsp[-3].c), d);
               break;
             }
           }
         }
         else{ // list of expressions
-          switch((yyvsp[(2) - (4)].i)){
+          switch((yyvsp[-2].i)){
           case 0: // affect
             s.value.clear(); // fall-through
           case 1: // append
-            for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+            for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
               double d;
-              List_Read((yyvsp[(3) - (4)].l), i, &d);
+              List_Read((yyvsp[-1].l), i, &d);
               s.value.push_back(d);
             }
             break;
           case 2: // remove
-            for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+            for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
               double d;
-              List_Read((yyvsp[(3) - (4)].l), i, &d);
+              List_Read((yyvsp[-1].l), i, &d);
               std::vector<double>::iterator it = std::find(s.value.begin(),
                                                            s.value.end(), d);
               if(it != s.value.end()) s.value.erase(it);
@@ -5755,29 +5182,30 @@ yyreduce:
           }
         }
       }
-      Free((yyvsp[(1) - (4)].c));
-      List_Delete((yyvsp[(3) - (4)].l));
-    ;}
+      Free((yyvsp[-3].c));
+      List_Delete((yyvsp[-1].l));
+    }
+#line 5189 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 75:
-#line 744 "Gmsh.y"
+#line 744 "Gmsh.y" /* yacc.c:1646  */
     {
-      gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (6)].c)]);
+      gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-5].c)]);
       s.list = true;
       double d;
-      switch((yyvsp[(4) - (6)].i)){
+      switch((yyvsp[-2].i)){
       case 0: // affect
         s.value.clear(); // fall-through
       case 1: // append
-        for(int i = 0; i < List_Nbr((yyvsp[(5) - (6)].l)); i++){
-          List_Read((yyvsp[(5) - (6)].l), i, &d);
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
+          List_Read((yyvsp[-1].l), i, &d);
           s.value.push_back(d);
         }
         break;
       case 2: // remove
-        for(int i = 0; i < List_Nbr((yyvsp[(5) - (6)].l)); i++){
-          List_Read((yyvsp[(5) - (6)].l), i, &d);
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
+          List_Read((yyvsp[-1].l), i, &d);
           std::vector<double>::iterator it = std::find(s.value.begin(),
                                                        s.value.end(), d);
           if(it != s.value.end()) s.value.erase(it);
@@ -5787,29 +5215,30 @@ yyreduce:
         yymsg(0, "Operators *= and /= not available for lists");
         break;
       }
-      Free((yyvsp[(1) - (6)].c));
-      List_Delete((yyvsp[(5) - (6)].l));
-    ;}
+      Free((yyvsp[-5].c));
+      List_Delete((yyvsp[-1].l));
+    }
+#line 5222 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 76:
-#line 773 "Gmsh.y"
+#line 773 "Gmsh.y" /* yacc.c:1646  */
     {
-      gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (6)].c)]);
+      gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-5].c)]);
       s.list = true;
       double d;
-      switch((yyvsp[(4) - (6)].i)){
+      switch((yyvsp[-2].i)){
       case 0: // affect
         s.value.clear(); // fall-through
       case 1: // append
-        for(int i = 0; i < List_Nbr((yyvsp[(5) - (6)].l)); i++){
-          List_Read((yyvsp[(5) - (6)].l), i, &d);
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
+          List_Read((yyvsp[-1].l), i, &d);
           s.value.push_back(d);
         }
         break;
       case 2: // remove
-        for(int i = 0; i < List_Nbr((yyvsp[(5) - (6)].l)); i++){
-          List_Read((yyvsp[(5) - (6)].l), i, &d);
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
+          List_Read((yyvsp[-1].l), i, &d);
           std::vector<double>::iterator it = std::find(s.value.begin(),
                                                        s.value.end(), d);
           if(it != s.value.end()) s.value.erase(it);
@@ -5819,759 +5248,823 @@ yyreduce:
         yymsg(0, "Operators *= and /= not available for lists");
         break;
       }
-      Free((yyvsp[(1) - (6)].c));
-      List_Delete((yyvsp[(5) - (6)].l));
-    ;}
+      Free((yyvsp[-5].c));
+      List_Delete((yyvsp[-1].l));
+    }
+#line 5255 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 77:
-#line 802 "Gmsh.y"
+#line 802 "Gmsh.y" /* yacc.c:1646  */
     {
-      assignVariable((yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(5) - (7)].i), (yyvsp[(6) - (7)].d));
-      Free((yyvsp[(1) - (7)].c));
-    ;}
+      assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
+      Free((yyvsp[-6].c));
+    }
+#line 5264 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 78:
-#line 807 "Gmsh.y"
+#line 807 "Gmsh.y" /* yacc.c:1646  */
     {
-      assignVariable((yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(5) - (7)].i), (yyvsp[(6) - (7)].d));
-      Free((yyvsp[(1) - (7)].c));
-    ;}
+      assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
+      Free((yyvsp[-6].c));
+    }
+#line 5273 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 79:
-#line 812 "Gmsh.y"
+#line 812 "Gmsh.y" /* yacc.c:1646  */
     {
-      assignVariable((yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(5) - (7)].i), (yyvsp[(6) - (7)].d));
-      Free((yyvsp[(1) - (7)].c));
-    ;}
+      assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
+      Free((yyvsp[-6].c));
+    }
+#line 5282 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 80:
-#line 817 "Gmsh.y"
+#line 817 "Gmsh.y" /* yacc.c:1646  */
     {
-      assignVariable((yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(5) - (7)].i), (yyvsp[(6) - (7)].d));
-      Free((yyvsp[(1) - (7)].c));
-    ;}
+      assignVariable((yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-2].i), (yyvsp[-1].d));
+      Free((yyvsp[-6].c));
+    }
+#line 5291 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 81:
-#line 822 "Gmsh.y"
+#line 822 "Gmsh.y" /* yacc.c:1646  */
     {
-      assignVariables((yyvsp[(1) - (9)].c), (yyvsp[(4) - (9)].l), (yyvsp[(7) - (9)].i), (yyvsp[(8) - (9)].l));
-      Free((yyvsp[(1) - (9)].c));
-      List_Delete((yyvsp[(4) - (9)].l));
-      List_Delete((yyvsp[(8) - (9)].l));
-    ;}
+      assignVariables((yyvsp[-8].c), (yyvsp[-5].l), (yyvsp[-2].i), (yyvsp[-1].l));
+      Free((yyvsp[-8].c));
+      List_Delete((yyvsp[-5].l));
+      List_Delete((yyvsp[-1].l));
+    }
+#line 5302 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 82:
-#line 829 "Gmsh.y"
+#line 829 "Gmsh.y" /* yacc.c:1646  */
     {
-      assignVariables((yyvsp[(1) - (9)].c), (yyvsp[(4) - (9)].l), (yyvsp[(7) - (9)].i), (yyvsp[(8) - (9)].l));
-      Free((yyvsp[(1) - (9)].c));
-      List_Delete((yyvsp[(4) - (9)].l));
-      List_Delete((yyvsp[(8) - (9)].l));
-    ;}
+      assignVariables((yyvsp[-8].c), (yyvsp[-5].l), (yyvsp[-2].i), (yyvsp[-1].l));
+      Free((yyvsp[-8].c));
+      List_Delete((yyvsp[-5].l));
+      List_Delete((yyvsp[-1].l));
+    }
+#line 5313 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 83:
-#line 836 "Gmsh.y"
+#line 836 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (3)].c)))
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (3)].c));
+      if(!gmsh_yysymbols.count((yyvsp[-2].c)))
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-2].c));
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (3)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-2].c)]);
         if(!s.list && s.value.empty())
-          yymsg(0, "Uninitialized variable '%s'", (yyvsp[(1) - (3)].c));
+          yymsg(0, "Uninitialized variable '%s'", (yyvsp[-2].c));
         else if(!s.list)
-          s.value[0] += (yyvsp[(2) - (3)].i);
+          s.value[0] += (yyvsp[-1].i);
         else
-          yymsg(0, "Variable '%s' is a list", (yyvsp[(1) - (3)].c));
+          yymsg(0, "Variable '%s' is a list", (yyvsp[-2].c));
       }
-      Free((yyvsp[(1) - (3)].c));
-    ;}
+      Free((yyvsp[-2].c));
+    }
+#line 5332 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 84:
-#line 851 "Gmsh.y"
+#line 851 "Gmsh.y" /* yacc.c:1646  */
     {
-      incrementVariable((yyvsp[(1) - (6)].c), (yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].i));
-      Free((yyvsp[(1) - (6)].c));
-    ;}
+      incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
+      Free((yyvsp[-5].c));
+    }
+#line 5341 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 85:
-#line 856 "Gmsh.y"
+#line 856 "Gmsh.y" /* yacc.c:1646  */
     {
-      incrementVariable((yyvsp[(1) - (6)].c), (yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].i));
-      Free((yyvsp[(1) - (6)].c));
-    ;}
+      incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
+      Free((yyvsp[-5].c));
+    }
+#line 5350 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 86:
-#line 861 "Gmsh.y"
+#line 861 "Gmsh.y" /* yacc.c:1646  */
     {
-      incrementVariable((yyvsp[(1) - (6)].c), (yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].i));
-      Free((yyvsp[(1) - (6)].c));
-    ;}
+      incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
+      Free((yyvsp[-5].c));
+    }
+#line 5359 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 87:
-#line 866 "Gmsh.y"
+#line 866 "Gmsh.y" /* yacc.c:1646  */
     {
-      incrementVariable((yyvsp[(1) - (6)].c), (yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].i));
-      Free((yyvsp[(1) - (6)].c));
-    ;}
+      incrementVariable((yyvsp[-5].c), (yyvsp[-3].d), (yyvsp[-1].i));
+      Free((yyvsp[-5].c));
+    }
+#line 5368 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 88:
-#line 871 "Gmsh.y"
+#line 871 "Gmsh.y" /* yacc.c:1646  */
     {
-      gmsh_yystringsymbols[(yyvsp[(1) - (4)].c)] = std::string((yyvsp[(3) - (4)].c));
-      Free((yyvsp[(1) - (4)].c));
-      Free((yyvsp[(3) - (4)].c));
-    ;}
+      gmsh_yystringsymbols[(yyvsp[-3].c)] = std::string((yyvsp[-1].c));
+      Free((yyvsp[-3].c));
+      Free((yyvsp[-1].c));
+    }
+#line 5378 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 89:
-#line 880 "Gmsh.y"
+#line 880 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string tmp((yyvsp[(5) - (6)].c));
-      StringOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (6)].c), 0, (yyvsp[(3) - (6)].c), tmp);
-      Free((yyvsp[(1) - (6)].c)); Free((yyvsp[(3) - (6)].c)); Free((yyvsp[(5) - (6)].c));
-    ;}
+      std::string tmp((yyvsp[-1].c));
+      StringOption(GMSH_SET|GMSH_GUI, (yyvsp[-5].c), 0, (yyvsp[-3].c), tmp);
+      Free((yyvsp[-5].c)); Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
+    }
+#line 5388 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 90:
-#line 886 "Gmsh.y"
+#line 886 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string tmp((yyvsp[(8) - (9)].c));
-      StringOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (9)].c), (int)(yyvsp[(3) - (9)].d), (yyvsp[(6) - (9)].c), tmp);
-      Free((yyvsp[(1) - (9)].c)); Free((yyvsp[(6) - (9)].c)); Free((yyvsp[(8) - (9)].c));
-    ;}
+      std::string tmp((yyvsp[-1].c));
+      StringOption(GMSH_SET|GMSH_GUI, (yyvsp[-8].c), (int)(yyvsp[-6].d), (yyvsp[-3].c), tmp);
+      Free((yyvsp[-8].c)); Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
+    }
+#line 5398 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 895 "Gmsh.y"
+#line 895 "Gmsh.y" /* yacc.c:1646  */
     {
       double d = 0.;
-      if(NumberOption(GMSH_GET, (yyvsp[(1) - (6)].c), 0, (yyvsp[(3) - (6)].c), d)){
-	switch((yyvsp[(4) - (6)].i)){
-	case 0 : d = (yyvsp[(5) - (6)].d); break;
-	case 1 : d += (yyvsp[(5) - (6)].d); break;
-	case 2 : d -= (yyvsp[(5) - (6)].d); break;
-	case 3 : d *= (yyvsp[(5) - (6)].d); break;
+      if(NumberOption(GMSH_GET, (yyvsp[-5].c), 0, (yyvsp[-3].c), d)){
+	switch((yyvsp[-2].i)){
+	case 0 : d = (yyvsp[-1].d); break;
+	case 1 : d += (yyvsp[-1].d); break;
+	case 2 : d -= (yyvsp[-1].d); break;
+	case 3 : d *= (yyvsp[-1].d); break;
 	case 4 :
-	  if((yyvsp[(5) - (6)].d)) d /= (yyvsp[(5) - (6)].d);
-	  else yymsg(0, "Division by zero in '%s.%s /= %g'", (yyvsp[(1) - (6)].c), (yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].d));
+	  if((yyvsp[-1].d)) d /= (yyvsp[-1].d);
+	  else yymsg(0, "Division by zero in '%s.%s /= %g'", (yyvsp[-5].c), (yyvsp[-3].c), (yyvsp[-1].d));
 	  break;
 	}
-	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (6)].c), 0, (yyvsp[(3) - (6)].c), d);
+	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-5].c), 0, (yyvsp[-3].c), d);
       }
-      Free((yyvsp[(1) - (6)].c)); Free((yyvsp[(3) - (6)].c));
-    ;}
+      Free((yyvsp[-5].c)); Free((yyvsp[-3].c));
+    }
+#line 5420 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 92:
-#line 913 "Gmsh.y"
+#line 913 "Gmsh.y" /* yacc.c:1646  */
     {
       double d = 0.;
-      if(NumberOption(GMSH_GET, (yyvsp[(1) - (9)].c), (int)(yyvsp[(3) - (9)].d), (yyvsp[(6) - (9)].c), d)){
-	switch((yyvsp[(7) - (9)].i)){
-	case 0 : d = (yyvsp[(8) - (9)].d); break;
-	case 1 : d += (yyvsp[(8) - (9)].d); break;
-	case 2 : d -= (yyvsp[(8) - (9)].d); break;
-	case 3 : d *= (yyvsp[(8) - (9)].d); break;
+      if(NumberOption(GMSH_GET, (yyvsp[-8].c), (int)(yyvsp[-6].d), (yyvsp[-3].c), d)){
+	switch((yyvsp[-2].i)){
+	case 0 : d = (yyvsp[-1].d); break;
+	case 1 : d += (yyvsp[-1].d); break;
+	case 2 : d -= (yyvsp[-1].d); break;
+	case 3 : d *= (yyvsp[-1].d); break;
 	case 4 :
-	  if((yyvsp[(8) - (9)].d)) d /= (yyvsp[(8) - (9)].d);
-	  else yymsg(0, "Division by zero in '%s[%d].%s /= %g'", (yyvsp[(1) - (9)].c), (int)(yyvsp[(3) - (9)].d), (yyvsp[(6) - (9)].c), (yyvsp[(8) - (9)].d));
+	  if((yyvsp[-1].d)) d /= (yyvsp[-1].d);
+	  else yymsg(0, "Division by zero in '%s[%d].%s /= %g'", (yyvsp[-8].c), (int)(yyvsp[-6].d), (yyvsp[-3].c), (yyvsp[-1].d));
 	  break;
 	}
-	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (9)].c), (int)(yyvsp[(3) - (9)].d), (yyvsp[(6) - (9)].c), d);
+	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-8].c), (int)(yyvsp[-6].d), (yyvsp[-3].c), d);
       }
-      Free((yyvsp[(1) - (9)].c)); Free((yyvsp[(6) - (9)].c));
-    ;}
+      Free((yyvsp[-8].c)); Free((yyvsp[-3].c));
+    }
+#line 5442 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 93:
-#line 931 "Gmsh.y"
+#line 931 "Gmsh.y" /* yacc.c:1646  */
     {
       double d = 0.;
-      if(NumberOption(GMSH_GET, (yyvsp[(1) - (5)].c), 0, (yyvsp[(3) - (5)].c), d)){
-	d += (yyvsp[(4) - (5)].i);
-	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (5)].c), 0, (yyvsp[(3) - (5)].c), d);
+      if(NumberOption(GMSH_GET, (yyvsp[-4].c), 0, (yyvsp[-2].c), d)){
+	d += (yyvsp[-1].i);
+	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-4].c), 0, (yyvsp[-2].c), d);
       }
-      Free((yyvsp[(1) - (5)].c)); Free((yyvsp[(3) - (5)].c));
-    ;}
+      Free((yyvsp[-4].c)); Free((yyvsp[-2].c));
+    }
+#line 5455 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 94:
-#line 940 "Gmsh.y"
+#line 940 "Gmsh.y" /* yacc.c:1646  */
     {
       double d = 0.;
-      if(NumberOption(GMSH_GET, (yyvsp[(1) - (8)].c), (int)(yyvsp[(3) - (8)].d), (yyvsp[(6) - (8)].c), d)){
-	d += (yyvsp[(7) - (8)].i);
-	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (8)].c), (int)(yyvsp[(3) - (8)].d), (yyvsp[(6) - (8)].c), d);
+      if(NumberOption(GMSH_GET, (yyvsp[-7].c), (int)(yyvsp[-5].d), (yyvsp[-2].c), d)){
+	d += (yyvsp[-1].i);
+	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-7].c), (int)(yyvsp[-5].d), (yyvsp[-2].c), d);
       }
-      Free((yyvsp[(1) - (8)].c)); Free((yyvsp[(6) - (8)].c));
-    ;}
+      Free((yyvsp[-7].c)); Free((yyvsp[-2].c));
+    }
+#line 5468 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 95:
-#line 952 "Gmsh.y"
+#line 952 "Gmsh.y" /* yacc.c:1646  */
     {
-      ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (8)].c), 0, (yyvsp[(5) - (8)].c), (yyvsp[(7) - (8)].u));
-      Free((yyvsp[(1) - (8)].c)); Free((yyvsp[(5) - (8)].c));
-    ;}
+      ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[-7].c), 0, (yyvsp[-3].c), (yyvsp[-1].u));
+      Free((yyvsp[-7].c)); Free((yyvsp[-3].c));
+    }
+#line 5477 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 96:
-#line 957 "Gmsh.y"
+#line 957 "Gmsh.y" /* yacc.c:1646  */
     {
-      ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (11)].c), (int)(yyvsp[(3) - (11)].d), (yyvsp[(8) - (11)].c), (yyvsp[(10) - (11)].u));
-      Free((yyvsp[(1) - (11)].c)); Free((yyvsp[(8) - (11)].c));
-    ;}
+      ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[-10].c), (int)(yyvsp[-8].d), (yyvsp[-3].c), (yyvsp[-1].u));
+      Free((yyvsp[-10].c)); Free((yyvsp[-3].c));
+    }
+#line 5486 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 97:
-#line 965 "Gmsh.y"
+#line 965 "Gmsh.y" /* yacc.c:1646  */
     {
       GmshColorTable *ct = GetColorTable(0);
       if(!ct)
 	yymsg(0, "View[%d] does not exist", 0);
       else{
-	ct->size = List_Nbr((yyvsp[(5) - (6)].l));
+	ct->size = List_Nbr((yyvsp[-1].l));
 	if(ct->size > COLORTABLE_NBMAX_COLOR)
 	  yymsg(0, "Too many (%d>%d) colors in View[%d].ColorTable",
 		ct->size, COLORTABLE_NBMAX_COLOR, 0);
 	else
-	  for(int i = 0; i < ct->size; i++) List_Read((yyvsp[(5) - (6)].l), i, &ct->table[i]);
+	  for(int i = 0; i < ct->size; i++) List_Read((yyvsp[-1].l), i, &ct->table[i]);
 	if(ct->size == 1){
 	  ct->size = 2;
 	  ct->table[1] = ct->table[0];
 	}
       }
-      Free((yyvsp[(1) - (6)].c));
-      List_Delete((yyvsp[(5) - (6)].l));
-    ;}
+      Free((yyvsp[-5].c));
+      List_Delete((yyvsp[-1].l));
+    }
+#line 5510 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 98:
-#line 985 "Gmsh.y"
+#line 985 "Gmsh.y" /* yacc.c:1646  */
     {
-      GmshColorTable *ct = GetColorTable((int)(yyvsp[(3) - (9)].d));
+      GmshColorTable *ct = GetColorTable((int)(yyvsp[-6].d));
       if(!ct)
-	yymsg(0, "View[%d] does not exist", (int)(yyvsp[(3) - (9)].d));
+	yymsg(0, "View[%d] does not exist", (int)(yyvsp[-6].d));
       else{
-	ct->size = List_Nbr((yyvsp[(8) - (9)].l));
+	ct->size = List_Nbr((yyvsp[-1].l));
 	if(ct->size > COLORTABLE_NBMAX_COLOR)
 	  yymsg(0, "Too many (%d>%d) colors in View[%d].ColorTable",
-		   ct->size, COLORTABLE_NBMAX_COLOR, (int)(yyvsp[(3) - (9)].d));
+		   ct->size, COLORTABLE_NBMAX_COLOR, (int)(yyvsp[-6].d));
 	else
-	  for(int i = 0; i < ct->size; i++) List_Read((yyvsp[(8) - (9)].l), i, &ct->table[i]);
+	  for(int i = 0; i < ct->size; i++) List_Read((yyvsp[-1].l), i, &ct->table[i]);
 	if(ct->size == 1){
 	  ct->size = 2;
 	  ct->table[1] = ct->table[0];
 	}
       }
-      Free((yyvsp[(1) - (9)].c));
-      List_Delete((yyvsp[(8) - (9)].l));
-    ;}
+      Free((yyvsp[-8].c));
+      List_Delete((yyvsp[-1].l));
+    }
+#line 5534 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 99:
-#line 1008 "Gmsh.y"
+#line 1008 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_MESH)
-      if(!strcmp((yyvsp[(1) - (5)].c),"Background"))
-	GModel::current()->getFields()->setBackgroundFieldId((int)(yyvsp[(4) - (5)].d));
-      else if(!strcmp((yyvsp[(1) - (5)].c),"BoundaryLayer"))
-	GModel::current()->getFields()->setBoundaryLayerFieldId((int)(yyvsp[(4) - (5)].d));
+      if(!strcmp((yyvsp[-4].c),"Background"))
+	GModel::current()->getFields()->setBackgroundFieldId((int)(yyvsp[-1].d));
+      else if(!strcmp((yyvsp[-4].c),"BoundaryLayer"))
+	GModel::current()->getFields()->setBoundaryLayerFieldId((int)(yyvsp[-1].d));
       else
-	yymsg(0, "Unknown command %s Field", (yyvsp[(1) - (5)].c));
+	yymsg(0, "Unknown command %s Field", (yyvsp[-4].c));
 #endif
-    ;}
+    }
+#line 5549 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 100:
-#line 1019 "Gmsh.y"
+#line 1019 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_MESH)
-      if(!GModel::current()->getFields()->newField((int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c)))
-	yymsg(0, "Cannot create field %i of type '%s'", (int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c));
+      if(!GModel::current()->getFields()->newField((int)(yyvsp[-4].d), (yyvsp[-1].c)))
+	yymsg(0, "Cannot create field %i of type '%s'", (int)(yyvsp[-4].d), (yyvsp[-1].c));
 #endif
-      Free((yyvsp[(6) - (7)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 5561 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 101:
-#line 1027 "Gmsh.y"
+#line 1027 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_MESH)
-      Field *field = GModel::current()->getFields()->get((int)(yyvsp[(3) - (9)].d));
+      Field *field = GModel::current()->getFields()->get((int)(yyvsp[-6].d));
       if(field){
-	FieldOption *option = field->options[(yyvsp[(6) - (9)].c)];
+	FieldOption *option = field->options[(yyvsp[-3].c)];
 	if(option){
-	  try { option->numericalValue((yyvsp[(8) - (9)].d)); }
+	  try { option->numericalValue((yyvsp[-1].d)); }
 	  catch(...){
 	    yymsg(0, "Cannot assign a numerical value to option '%s' "
-		  "in field %i of type '%s'", (yyvsp[(6) - (9)].c), (int)(yyvsp[(3) - (9)].d), field->getName());
+		  "in field %i of type '%s'", (yyvsp[-3].c), (int)(yyvsp[-6].d), field->getName());
 	  }
 	}
 	else
 	  yymsg(0, "Unknown option '%s' in field %i of type '%s'",
-		(yyvsp[(6) - (9)].c), (int)(yyvsp[(3) - (9)].d), field->getName());
+		(yyvsp[-3].c), (int)(yyvsp[-6].d), field->getName());
       }
       else
-	yymsg(0, "No field with id %i", (int)(yyvsp[(3) - (9)].d));
+	yymsg(0, "No field with id %i", (int)(yyvsp[-6].d));
 #endif
-      Free((yyvsp[(6) - (9)].c));
-    ;}
+      Free((yyvsp[-3].c));
+    }
+#line 5587 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 102:
-#line 1049 "Gmsh.y"
+#line 1049 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_MESH)
-      Field *field = GModel::current()->getFields()->get((int)(yyvsp[(3) - (9)].d));
+      Field *field = GModel::current()->getFields()->get((int)(yyvsp[-6].d));
       if(field){
-	FieldOption *option = field->options[(yyvsp[(6) - (9)].c)];
+	FieldOption *option = field->options[(yyvsp[-3].c)];
 	if(option){
-	  try { option->string((yyvsp[(8) - (9)].c)); }
+	  try { option->string((yyvsp[-1].c)); }
 	  catch (...){
 	    yymsg(0, "Cannot assign a string value to  option '%s' "
-		  "in field %i of type '%s'", (yyvsp[(6) - (9)].c), (int)(yyvsp[(3) - (9)].d), field->getName());
+		  "in field %i of type '%s'", (yyvsp[-3].c), (int)(yyvsp[-6].d), field->getName());
 	  }
 	}
 	else
 	  yymsg(0, "Unknown option '%s' in field %i of type '%s'",
-		(yyvsp[(6) - (9)].c), (int)(yyvsp[(3) - (9)].d), field->getName());
+		(yyvsp[-3].c), (int)(yyvsp[-6].d), field->getName());
       }
       else
-	yymsg(0, "No field with id %i", (int)(yyvsp[(3) - (9)].d));
+	yymsg(0, "No field with id %i", (int)(yyvsp[-6].d));
 #endif
-      Free((yyvsp[(6) - (9)].c));
-      Free((yyvsp[(8) - (9)].c));
-    ;}
+      Free((yyvsp[-3].c));
+      Free((yyvsp[-1].c));
+    }
+#line 5614 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 103:
-#line 1072 "Gmsh.y"
+#line 1072 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_MESH)
-      Field *field = GModel::current()->getFields()->get((int)(yyvsp[(3) - (11)].d));
+      Field *field = GModel::current()->getFields()->get((int)(yyvsp[-8].d));
       if(field){
-	FieldOption *option = field->options[(yyvsp[(6) - (11)].c)];
+	FieldOption *option = field->options[(yyvsp[-5].c)];
 	if(option){
 	  std::list<int> vl = option->list();
 	  vl.clear();
-	  for(int i = 0; i < List_Nbr((yyvsp[(9) - (11)].l)); i++){
+	  for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
 	    double id;
-	    List_Read((yyvsp[(9) - (11)].l), i, &id);
+	    List_Read((yyvsp[-2].l), i, &id);
 	    vl.push_back((int)id);
 	  }
           option->list(vl);
 	}
 	else
 	  yymsg(0, "Unknown option '%s' in field %i of type '%s'",
-		(yyvsp[(6) - (11)].c), (int)(yyvsp[(3) - (11)].d), field->getName());
+		(yyvsp[-5].c), (int)(yyvsp[-8].d), field->getName());
       }
       else
-	yymsg(0, "No field with id %i", (int)(yyvsp[(3) - (11)].d));
+	yymsg(0, "No field with id %i", (int)(yyvsp[-8].d));
 #endif
-      Free((yyvsp[(6) - (11)].c));
-      List_Delete((yyvsp[(9) - (11)].l));
-    ;}
+      Free((yyvsp[-5].c));
+      List_Delete((yyvsp[-2].l));
+    }
+#line 5644 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 104:
-#line 1098 "Gmsh.y"
+#line 1098 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_MESH)
-      Field *field = GModel::current()->getFields()->get((int)(yyvsp[(3) - (7)].d));
+      Field *field = GModel::current()->getFields()->get((int)(yyvsp[-4].d));
       if(field){
-        FieldCallback *callback = field->callbacks[(yyvsp[(6) - (7)].c)];
+        FieldCallback *callback = field->callbacks[(yyvsp[-1].c)];
         if(callback) {
           callback->run();
         }
         else
           yymsg(0, "Unknown callback '%s' in field %i of type '%s'",
-              (yyvsp[(6) - (7)].c), (int)(yyvsp[(3) - (7)].d), field->getName());
+              (yyvsp[-1].c), (int)(yyvsp[-4].d), field->getName());
       }
       else
-	yymsg(0, "No field with id %i", (int)(yyvsp[(3) - (7)].d));
+	yymsg(0, "No field with id %i", (int)(yyvsp[-4].d));
 #endif
-      Free((yyvsp[(6) - (7)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 5666 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 105:
-#line 1119 "Gmsh.y"
+#line 1119 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_PLUGINS)
       try {
-	PluginManager::instance()->setPluginOption((yyvsp[(3) - (9)].c), (yyvsp[(6) - (9)].c), (yyvsp[(8) - (9)].d));
+	PluginManager::instance()->setPluginOption((yyvsp[-6].c), (yyvsp[-3].c), (yyvsp[-1].d));
       }
       catch (...) {
-	yymsg(0, "Unknown option '%s' or plugin '%s'", (yyvsp[(6) - (9)].c), (yyvsp[(3) - (9)].c));
+	yymsg(0, "Unknown option '%s' or plugin '%s'", (yyvsp[-3].c), (yyvsp[-6].c));
       }
 #endif
-      Free((yyvsp[(3) - (9)].c)); Free((yyvsp[(6) - (9)].c));
-    ;}
+      Free((yyvsp[-6].c)); Free((yyvsp[-3].c));
+    }
+#line 5682 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 106:
-#line 1131 "Gmsh.y"
+#line 1131 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_PLUGINS)
       try {
-	PluginManager::instance()->setPluginOption((yyvsp[(3) - (9)].c), (yyvsp[(6) - (9)].c), (yyvsp[(8) - (9)].c));
+	PluginManager::instance()->setPluginOption((yyvsp[-6].c), (yyvsp[-3].c), (yyvsp[-1].c));
       }
       catch (...) {
-	yymsg(0, "Unknown option '%s' or plugin '%s'", (yyvsp[(6) - (9)].c), (yyvsp[(3) - (9)].c));
+	yymsg(0, "Unknown option '%s' or plugin '%s'", (yyvsp[-3].c), (yyvsp[-6].c));
       }
 #endif
-      Free((yyvsp[(3) - (9)].c)); Free((yyvsp[(6) - (9)].c)); Free((yyvsp[(8) - (9)].c));
-    ;}
+      Free((yyvsp[-6].c)); Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
+    }
+#line 5698 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 110:
-#line 1149 "Gmsh.y"
+#line 1149 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string key((yyvsp[(3) - (3)].c));
+      std::string key((yyvsp[0].c));
       std::vector<double> val(1, 0.);
       if(!gmsh_yysymbols.count(key)){
         gmsh_yysymbols[key].value = val;
       }
-      Free((yyvsp[(3) - (3)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 5711 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 111:
-#line 1158 "Gmsh.y"
+#line 1158 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string key((yyvsp[(3) - (5)].c));
-      std::vector<double> val(1, (yyvsp[(5) - (5)].d));
+      std::string key((yyvsp[-2].c));
+      std::vector<double> val(1, (yyvsp[0].d));
       if(!gmsh_yysymbols.count(key)){
         gmsh_yysymbols[key].value = val;
       }
-      Free((yyvsp[(3) - (5)].c));
-    ;}
+      Free((yyvsp[-2].c));
+    }
+#line 5724 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 112:
-#line 1167 "Gmsh.y"
-    { floatOptions.clear(); charOptions.clear(); ;}
+#line 1167 "Gmsh.y" /* yacc.c:1646  */
+    { floatOptions.clear(); charOptions.clear(); }
+#line 5730 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 113:
-#line 1169 "Gmsh.y"
+#line 1169 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string key((yyvsp[(3) - (9)].c));
+      std::string key((yyvsp[-6].c));
       std::vector<double> val;
-      for(int i = 0; i < List_Nbr((yyvsp[(6) - (9)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
         double d;
-        List_Read((yyvsp[(6) - (9)].l), i, &d);
+        List_Read((yyvsp[-3].l), i, &d);
         val.push_back(d);
       }
       if(!gmsh_yysymbols.count(key)){
         Msg::ExchangeOnelabParameter(key, val, floatOptions, charOptions);
         gmsh_yysymbols[key].value = val;
       }
-      Free((yyvsp[(3) - (9)].c));
-      Free((yyvsp[(6) - (9)].l));
-    ;}
+      Free((yyvsp[-6].c));
+      Free((yyvsp[-3].l));
+    }
+#line 5750 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 114:
-#line 1185 "Gmsh.y"
+#line 1185 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string key((yyvsp[(3) - (5)].c)), val((yyvsp[(5) - (5)].c));
+      std::string key((yyvsp[-2].c)), val((yyvsp[0].c));
       if(!gmsh_yystringsymbols.count(key)){
         gmsh_yystringsymbols[key] = val;
       }
-      Free((yyvsp[(3) - (5)].c));
-      Free((yyvsp[(5) - (5)].c));
-    ;}
+      Free((yyvsp[-2].c));
+      Free((yyvsp[0].c));
+    }
+#line 5763 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 115:
-#line 1194 "Gmsh.y"
-    { floatOptions.clear(); charOptions.clear(); ;}
+#line 1194 "Gmsh.y" /* yacc.c:1646  */
+    { floatOptions.clear(); charOptions.clear(); }
+#line 5769 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 116:
-#line 1196 "Gmsh.y"
+#line 1196 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string key((yyvsp[(3) - (9)].c)), val((yyvsp[(6) - (9)].c));
+      std::string key((yyvsp[-6].c)), val((yyvsp[-3].c));
       if(!gmsh_yysymbols.count(key)){
         Msg::ExchangeOnelabParameter(key, val, floatOptions, charOptions);
         gmsh_yystringsymbols[key] = val;
       }
-      Free((yyvsp[(3) - (9)].c));
-      Free((yyvsp[(6) - (9)].c));
-    ;}
+      Free((yyvsp[-6].c));
+      Free((yyvsp[-3].c));
+    }
+#line 5783 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 118:
-#line 1210 "Gmsh.y"
+#line 1210 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string name((yyvsp[(3) - (3)].c));
+      std::string name((yyvsp[0].c));
       Msg::UndefineOnelabParameter(name);
-      Free((yyvsp[(3) - (3)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 5793 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 119:
-#line 1218 "Gmsh.y"
+#line 1218 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(20,20,sizeof(doubleXstring));
-      doubleXstring v = {(yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].c)};
+      doubleXstring v = {(yyvsp[-2].d), (yyvsp[0].c)};
       List_Add((yyval.l), &v);
-    ;}
+    }
+#line 5803 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 120:
-#line 1224 "Gmsh.y"
+#line 1224 "Gmsh.y" /* yacc.c:1646  */
     {
-      doubleXstring v = {(yyvsp[(3) - (5)].d), (yyvsp[(5) - (5)].c)};
+      doubleXstring v = {(yyvsp[-2].d), (yyvsp[0].c)};
       List_Add((yyval.l), &v);
-    ;}
+    }
+#line 5812 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 123:
-#line 1236 "Gmsh.y"
+#line 1236 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string key((yyvsp[(2) - (3)].c));
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (3)].l)); i++){
+      std::string key((yyvsp[-1].c));
+      for(int i = 0; i < List_Nbr((yyvsp[0].l)); i++){
         double v;
-        List_Read((yyvsp[(3) - (3)].l), i, &v);
+        List_Read((yyvsp[0].l), i, &v);
         floatOptions[key].push_back(v);
       }
-      Free((yyvsp[(2) - (3)].c));
-      List_Delete((yyvsp[(3) - (3)].l));
-    ;}
+      Free((yyvsp[-1].c));
+      List_Delete((yyvsp[0].l));
+    }
+#line 5827 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 124:
-#line 1247 "Gmsh.y"
+#line 1247 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string key((yyvsp[(2) - (5)].c));
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+      std::string key((yyvsp[-3].c));
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
         doubleXstring v;
-        List_Read((yyvsp[(4) - (5)].l), i, &v);
+        List_Read((yyvsp[-1].l), i, &v);
         floatOptions[key].push_back(v.d);
         charOptions[key].push_back(v.s);
       }
-      Free((yyvsp[(2) - (5)].c));
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++)
-        Free(((doubleXstring*)List_Pointer((yyvsp[(4) - (5)].l), i))->s);
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      Free((yyvsp[-3].c));
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+        Free(((doubleXstring*)List_Pointer((yyvsp[-1].l), i))->s);
+      List_Delete((yyvsp[-1].l));
+    }
+#line 5845 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 125:
-#line 1262 "Gmsh.y"
+#line 1262 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string key((yyvsp[(2) - (3)].c));
-      std::string val((yyvsp[(3) - (3)].c));
+      std::string key((yyvsp[-1].c));
+      std::string val((yyvsp[0].c));
       charOptions[key].push_back(val);
-      Free((yyvsp[(2) - (3)].c));
-      Free((yyvsp[(3) - (3)].c));
-    ;}
+      Free((yyvsp[-1].c));
+      Free((yyvsp[0].c));
+    }
+#line 5857 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 128:
-#line 1278 "Gmsh.y"
+#line 1278 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string key((yyvsp[(2) - (3)].c));
-      double val = (yyvsp[(3) - (3)].d);
+      std::string key((yyvsp[-1].c));
+      double val = (yyvsp[0].d);
       floatOptions[key].push_back(val);
-      Free((yyvsp[(2) - (3)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 5868 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 129:
-#line 1286 "Gmsh.y"
+#line 1286 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string key((yyvsp[(2) - (3)].c));
-      std::string val((yyvsp[(3) - (3)].c));
+      std::string key((yyvsp[-1].c));
+      std::string val((yyvsp[0].c));
       charOptions[key].push_back(val);
-      Free((yyvsp[(2) - (3)].c));
-      Free((yyvsp[(3) - (3)].c));
-    ;}
+      Free((yyvsp[-1].c));
+      Free((yyvsp[0].c));
+    }
+#line 5880 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 130:
-#line 1295 "Gmsh.y"
+#line 1295 "Gmsh.y" /* yacc.c:1646  */
     {
       std::string key("Macro");
-      std::string val((yyvsp[(3) - (3)].c));
+      std::string val((yyvsp[0].c));
       charOptions[key].push_back(val);
-      Free((yyvsp[(3) - (3)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 5891 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 131:
-#line 1303 "Gmsh.y"
+#line 1303 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string key((yyvsp[(2) - (5)].c));
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+      std::string key((yyvsp[-3].c));
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
         char *s;
-        List_Read((yyvsp[(4) - (5)].l), i, &s);
+        List_Read((yyvsp[-1].l), i, &s);
         std::string val(s);
         Free(s);
         charOptions[key].push_back(val);
       }
-      Free((yyvsp[(2) - (5)].c));
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      Free((yyvsp[-3].c));
+      List_Delete((yyvsp[-1].l));
+    }
+#line 5908 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 132:
-#line 1321 "Gmsh.y"
+#line 1321 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.i) = (int)(yyvsp[(1) - (1)].d);
-    ;}
+      (yyval.i) = (int)(yyvsp[0].d);
+    }
+#line 5916 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 133:
-#line 1325 "Gmsh.y"
+#line 1325 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.i) = GModel::current()->setPhysicalName
-        (std::string((yyvsp[(1) - (1)].c)), 0, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
-      Free((yyvsp[(1) - (1)].c));
-    ;}
+        (std::string((yyvsp[0].c)), 0, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
+      Free((yyvsp[0].c));
+    }
+#line 5926 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 134:
-#line 1331 "Gmsh.y"
+#line 1331 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[(1) - (3)].c)), 0, (yyvsp[(3) - (3)].d));
-      Free((yyvsp[(1) - (3)].c));
-    ;}
+      (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[-2].c)), 0, (yyvsp[0].d));
+      Free((yyvsp[-2].c));
+    }
+#line 5935 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 135:
-#line 1339 "Gmsh.y"
+#line 1339 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.i) = (int)(yyvsp[(1) - (1)].d);
-    ;}
+      (yyval.i) = (int)(yyvsp[0].d);
+    }
+#line 5943 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 136:
-#line 1343 "Gmsh.y"
+#line 1343 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.i) = GModel::current()->setPhysicalName
-        (std::string((yyvsp[(1) - (1)].c)), 1, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
-      Free((yyvsp[(1) - (1)].c));
-    ;}
+        (std::string((yyvsp[0].c)), 1, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
+      Free((yyvsp[0].c));
+    }
+#line 5953 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 137:
-#line 1349 "Gmsh.y"
+#line 1349 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[(1) - (3)].c)), 1, (yyvsp[(3) - (3)].d));
-      Free((yyvsp[(1) - (3)].c));
-    ;}
+      (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[-2].c)), 1, (yyvsp[0].d));
+      Free((yyvsp[-2].c));
+    }
+#line 5962 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 138:
-#line 1357 "Gmsh.y"
+#line 1357 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.i) = (int)(yyvsp[(1) - (1)].d);
-    ;}
+      (yyval.i) = (int)(yyvsp[0].d);
+    }
+#line 5970 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 139:
-#line 1361 "Gmsh.y"
+#line 1361 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.i) = GModel::current()->setPhysicalName
-        (std::string((yyvsp[(1) - (1)].c)), 2, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
-      Free((yyvsp[(1) - (1)].c));
-    ;}
+        (std::string((yyvsp[0].c)), 2, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
+      Free((yyvsp[0].c));
+    }
+#line 5980 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 140:
-#line 1367 "Gmsh.y"
+#line 1367 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[(1) - (3)].c)), 2, (yyvsp[(3) - (3)].d));
-      Free((yyvsp[(1) - (3)].c));
-    ;}
+      (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[-2].c)), 2, (yyvsp[0].d));
+      Free((yyvsp[-2].c));
+    }
+#line 5989 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 141:
-#line 1375 "Gmsh.y"
+#line 1375 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.i) = (int)(yyvsp[(1) - (1)].d);
-    ;}
+      (yyval.i) = (int)(yyvsp[0].d);
+    }
+#line 5997 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 142:
-#line 1379 "Gmsh.y"
+#line 1379 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.i) = GModel::current()->setPhysicalName
-        (std::string((yyvsp[(1) - (1)].c)), 3, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
-      Free((yyvsp[(1) - (1)].c));
-    ;}
+        (std::string((yyvsp[0].c)), 3, ++GModel::current()->getGEOInternals()->MaxPhysicalNum);
+      Free((yyvsp[0].c));
+    }
+#line 6007 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 143:
-#line 1385 "Gmsh.y"
+#line 1385 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[(1) - (3)].c)), 3, (yyvsp[(3) - (3)].d));
-      Free((yyvsp[(1) - (3)].c));
-    ;}
+      (yyval.i) = GModel::current()->setPhysicalName(std::string((yyvsp[-2].c)), 3, (yyvsp[0].d));
+      Free((yyvsp[-2].c));
+    }
+#line 6016 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 144:
-#line 1393 "Gmsh.y"
+#line 1393 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = 0;
-    ;}
+    }
+#line 6024 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 145:
-#line 1397 "Gmsh.y"
+#line 1397 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(1, 1, sizeof(Vertex*));
-      Vertex *v = FindPoint((int)(yyvsp[(4) - (5)].d));
+      Vertex *v = FindPoint((int)(yyvsp[-1].d));
       if(!v)
-	yymsg(0, "Unknown point %d", (int)(yyvsp[(4) - (5)].d));
+	yymsg(0, "Unknown point %d", (int)(yyvsp[-1].d));
       else{
 	List_Add((yyval.l), &v);
       }
-    ;}
+    }
+#line 6038 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 146:
-#line 1409 "Gmsh.y"
+#line 1409 "Gmsh.y" /* yacc.c:1646  */
     {
       for(int i = 0; i < 4; i++) (yyval.v)[i] = 0.;
-    ;}
+    }
+#line 6046 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 147:
-#line 1413 "Gmsh.y"
+#line 1413 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < 4; i++) (yyval.v)[i] = (yyvsp[(2) - (2)].v)[i];
-    ;}
+      for(int i = 0; i < 4; i++) (yyval.v)[i] = (yyvsp[0].v)[i];
+    }
+#line 6054 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 148:
-#line 1423 "Gmsh.y"
+#line 1423 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (7)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindPoint(num)){
 	yymsg(0, "Point %d already exists", num);
       }
       else{
-	double x = CTX::instance()->geom.scalingFactor * (yyvsp[(6) - (7)].v)[0];
-	double y = CTX::instance()->geom.scalingFactor * (yyvsp[(6) - (7)].v)[1];
-	double z = CTX::instance()->geom.scalingFactor * (yyvsp[(6) - (7)].v)[2];
-	double lc = CTX::instance()->geom.scalingFactor * (yyvsp[(6) - (7)].v)[3];
+	double x = CTX::instance()->geom.scalingFactor * (yyvsp[-1].v)[0];
+	double y = CTX::instance()->geom.scalingFactor * (yyvsp[-1].v)[1];
+	double z = CTX::instance()->geom.scalingFactor * (yyvsp[-1].v)[2];
+	double lc = CTX::instance()->geom.scalingFactor * (yyvsp[-1].v)[3];
 	if(lc == 0.) lc = MAX_LC; // no mesh size given at the point
 	Vertex *v;
 	if(!myGmshSurface)
@@ -6583,14 +6076,15 @@ yyreduce:
       }
       (yyval.s).Type = MSH_POINT;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6081 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 149:
-#line 1446 "Gmsh.y"
+#line 1446 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (8)].i);
-      int op = (yyvsp[(6) - (8)].i);
+      int num = (int)(yyvsp[-4].i);
+      int op = (yyvsp[-2].i);
       PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_POINT);
       if(p && op == 0){
 	yymsg(0, "Physical point %d already exists", num);
@@ -6599,23 +6093,23 @@ yyreduce:
 	yymsg(0, "Physical point %d does not exist", num);
       }
       else if(op == 0){
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (8)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	p = Create_PhysicalGroup(num, MSH_PHYSICAL_POINT, temp);
 	List_Delete(temp);
 	List_Add(GModel::current()->getGEOInternals()->PhysicalGroups, &p);
       }
       else if(op == 1){
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(7) - (8)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           int j = (int)d;
           List_Add(p->Entities, &j);
         }
       }
       else if(op == 2){
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(7) - (8)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           int j = (int)d;
           List_Suppress(p->Entities, &j, fcmp_int);
         }
@@ -6623,62 +6117,65 @@ yyreduce:
       else{
 	yymsg(0, "Unsupported operation on physical point %d", num);
       }
-      List_Delete((yyvsp[(7) - (8)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_PHYSICAL_POINT;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6125 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 150:
-#line 1486 "Gmsh.y"
+#line 1486 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
 	double d;
-	List_Read((yyvsp[(3) - (6)].l), i, &d);
+	List_Read((yyvsp[-3].l), i, &d);
 	Vertex *v = FindPoint((int)d);
 	if(v){
-	  v->lc = (yyvsp[(5) - (6)].d);
+	  v->lc = (yyvsp[-1].d);
         }
 	else{
 	  GVertex *gv = GModel::current()->getVertexByTag((int)d);
 	  if(gv)
-	    gv->setPrescribedMeshSizeAtVertex((yyvsp[(5) - (6)].d));
+	    gv->setPrescribedMeshSizeAtVertex((yyvsp[-1].d));
 	}
       }
-      List_Delete((yyvsp[(3) - (6)].l));
+      List_Delete((yyvsp[-3].l));
       // dummy values
       (yyval.s).Type = 0;
       (yyval.s).Num = 0;
-    ;}
+    }
+#line 6149 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 151:
-#line 1509 "Gmsh.y"
+#line 1509 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (7)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindCurve(num)){
 	yymsg(0, "Curve %d already exists", num);
       }
       else{
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(6) - (7)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	Curve *c = Create_Curve(num, MSH_SEGM_LINE, 1, temp, NULL,
 				-1, -1, 0., 1.);
 	Tree_Add(GModel::current()->getGEOInternals()->Curves, &c);
 	CreateReversedCurve(c);
 	List_Delete(temp);
       }
-      List_Delete((yyvsp[(6) - (7)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_SEGM_LINE;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6171 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 152:
-#line 1527 "Gmsh.y"
+#line 1527 "Gmsh.y" /* yacc.c:1646  */
     {
-      for (int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+      for (int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
 	double dnum;
-	List_Read((yyvsp[(3) - (4)].l), i, &dnum);
+	List_Read((yyvsp[-1].l), i, &dnum);
 	int num = (int) fabs(dnum);
 	Curve *c = FindCurve(num);
 	if (c){
@@ -6694,214 +6191,223 @@ yyreduce:
 	  }
 	}
       }
-    ;}
+    }
+#line 6196 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 153:
-#line 1548 "Gmsh.y"
+#line 1548 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (7)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindCurve(num)){
 	yymsg(0, "Curve %d already exists", num);
       }
       else{
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(6) - (7)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	Curve *c = Create_Curve(num, MSH_SEGM_SPLN, 3, temp, NULL,
 				-1, -1, 0., 1.);
 	Tree_Add(GModel::current()->getGEOInternals()->Curves, &c);
 	CreateReversedCurve(c);
 	List_Delete(temp);
       }
-      List_Delete((yyvsp[(6) - (7)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_SEGM_SPLN;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6218 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 154:
-#line 1566 "Gmsh.y"
+#line 1566 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (8)].d);
+      int num = (int)(yyvsp[-5].d);
       if(FindCurve(num)){
 	yymsg(0, "Curve %d already exists", num);
       }
       else{
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(6) - (8)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-2].l));
 	Curve *c = Create_Curve(num, MSH_SEGM_CIRC, 2, temp, NULL,
 				-1, -1, 0., 1.);
-        if((yyvsp[(7) - (8)].v)[0] || (yyvsp[(7) - (8)].v)[1] || (yyvsp[(7) - (8)].v)[2]){
-          c->Circle.n[0] = (yyvsp[(7) - (8)].v)[0];
-          c->Circle.n[1] = (yyvsp[(7) - (8)].v)[1];
-          c->Circle.n[2] = (yyvsp[(7) - (8)].v)[2];
+        if((yyvsp[-1].v)[0] || (yyvsp[-1].v)[1] || (yyvsp[-1].v)[2]){
+          c->Circle.n[0] = (yyvsp[-1].v)[0];
+          c->Circle.n[1] = (yyvsp[-1].v)[1];
+          c->Circle.n[2] = (yyvsp[-1].v)[2];
           End_Curve(c);
         }
 	Tree_Add(GModel::current()->getGEOInternals()->Curves, &c);
 	Curve *rc = CreateReversedCurve(c);
-        if((yyvsp[(7) - (8)].v)[0] || (yyvsp[(7) - (8)].v)[1] || (yyvsp[(7) - (8)].v)[2]){
-          rc->Circle.n[0] = (yyvsp[(7) - (8)].v)[0];
-          rc->Circle.n[1] = (yyvsp[(7) - (8)].v)[1];
-          rc->Circle.n[2] = (yyvsp[(7) - (8)].v)[2];
+        if((yyvsp[-1].v)[0] || (yyvsp[-1].v)[1] || (yyvsp[-1].v)[2]){
+          rc->Circle.n[0] = (yyvsp[-1].v)[0];
+          rc->Circle.n[1] = (yyvsp[-1].v)[1];
+          rc->Circle.n[2] = (yyvsp[-1].v)[2];
           End_Curve(rc);
         }
 	List_Delete(temp);
       }
-      List_Delete((yyvsp[(6) - (8)].l));
+      List_Delete((yyvsp[-2].l));
       (yyval.s).Type = MSH_SEGM_CIRC;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6252 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 155:
-#line 1596 "Gmsh.y"
+#line 1596 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (8)].d);
+      int num = (int)(yyvsp[-5].d);
       if(FindCurve(num)){
 	yymsg(0, "Curve %d already exists", num);
       }
       else{
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(6) - (8)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-2].l));
 	Curve *c = Create_Curve(num, MSH_SEGM_ELLI, 2, temp, NULL,
 				-1, -1, 0., 1.);
-        if((yyvsp[(7) - (8)].v)[0] || (yyvsp[(7) - (8)].v)[1] || (yyvsp[(7) - (8)].v)[2]){
-          c->Circle.n[0] = (yyvsp[(7) - (8)].v)[0];
-          c->Circle.n[1] = (yyvsp[(7) - (8)].v)[1];
-          c->Circle.n[2] = (yyvsp[(7) - (8)].v)[2];
+        if((yyvsp[-1].v)[0] || (yyvsp[-1].v)[1] || (yyvsp[-1].v)[2]){
+          c->Circle.n[0] = (yyvsp[-1].v)[0];
+          c->Circle.n[1] = (yyvsp[-1].v)[1];
+          c->Circle.n[2] = (yyvsp[-1].v)[2];
           End_Curve(c);
         }
 	Tree_Add(GModel::current()->getGEOInternals()->Curves, &c);
 	Curve *rc = CreateReversedCurve(c);
-        if((yyvsp[(7) - (8)].v)[0] || (yyvsp[(7) - (8)].v)[1] || (yyvsp[(7) - (8)].v)[2]){
-          rc->Circle.n[0] = (yyvsp[(7) - (8)].v)[0];
-          rc->Circle.n[1] = (yyvsp[(7) - (8)].v)[1];
-          rc->Circle.n[2] = (yyvsp[(7) - (8)].v)[2];
+        if((yyvsp[-1].v)[0] || (yyvsp[-1].v)[1] || (yyvsp[-1].v)[2]){
+          rc->Circle.n[0] = (yyvsp[-1].v)[0];
+          rc->Circle.n[1] = (yyvsp[-1].v)[1];
+          rc->Circle.n[2] = (yyvsp[-1].v)[2];
           End_Curve(rc);
         }
 	List_Delete(temp);
       }
-      List_Delete((yyvsp[(6) - (8)].l));
+      List_Delete((yyvsp[-2].l));
       (yyval.s).Type = MSH_SEGM_ELLI;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6286 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 156:
-#line 1626 "Gmsh.y"
+#line 1626 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (7)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindCurve(num)){
 	yymsg(0, "Curve %d already exists", num);
       }
       else{
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(6) - (7)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	Curve *c = Create_Curve(num, MSH_SEGM_BSPLN, 2, temp, NULL,
 				-1, -1, 0., 1.);
 	Tree_Add(GModel::current()->getGEOInternals()->Curves, &c);
 	CreateReversedCurve(c);
 	List_Delete(temp);
       }
-      List_Delete((yyvsp[(6) - (7)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_SEGM_BSPLN;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6308 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 157:
-#line 1644 "Gmsh.y"
+#line 1644 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (7)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindCurve(num)){
 	yymsg(0, "Curve %d already exists", num);
       }
       else{
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(6) - (7)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	Curve *c = Create_Curve(num, MSH_SEGM_BEZIER, 2, temp, NULL,
 				-1, -1, 0., 1.);
 	Tree_Add(GModel::current()->getGEOInternals()->Curves, &c);
 	CreateReversedCurve(c);
 	List_Delete(temp);
       }
-      List_Delete((yyvsp[(6) - (7)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_SEGM_BEZIER;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6330 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 158:
-#line 1663 "Gmsh.y"
+#line 1663 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (11)].d);
-      if(List_Nbr((yyvsp[(6) - (11)].l)) + (int)(yyvsp[(10) - (11)].d) + 1 != List_Nbr((yyvsp[(8) - (11)].l))){
+      int num = (int)(yyvsp[-8].d);
+      if(List_Nbr((yyvsp[-5].l)) + (int)(yyvsp[-1].d) + 1 != List_Nbr((yyvsp[-3].l))){
 	yymsg(0, "Wrong definition of Nurbs Curve %d: "
 	      "got %d knots, need N + D + 1 = %d + %d + 1 = %d",
-	      (int)(yyvsp[(3) - (11)].d), List_Nbr((yyvsp[(8) - (11)].l)), List_Nbr((yyvsp[(6) - (11)].l)), (int)(yyvsp[(10) - (11)].d), List_Nbr((yyvsp[(6) - (11)].l)) + (int)(yyvsp[(10) - (11)].d) + 1);
+	      (int)(yyvsp[-8].d), List_Nbr((yyvsp[-3].l)), List_Nbr((yyvsp[-5].l)), (int)(yyvsp[-1].d), List_Nbr((yyvsp[-5].l)) + (int)(yyvsp[-1].d) + 1);
       }
       else{
 	if(FindCurve(num)){
 	  yymsg(0, "Curve %d already exists", num);
 	}
 	else{
-	  List_T *temp = ListOfDouble2ListOfInt((yyvsp[(6) - (11)].l));
-	  Curve *c = Create_Curve(num, MSH_SEGM_NURBS, (int)(yyvsp[(10) - (11)].d), temp, (yyvsp[(8) - (11)].l),
+	  List_T *temp = ListOfDouble2ListOfInt((yyvsp[-5].l));
+	  Curve *c = Create_Curve(num, MSH_SEGM_NURBS, (int)(yyvsp[-1].d), temp, (yyvsp[-3].l),
 				  -1, -1, 0., 1.);
 	  Tree_Add(GModel::current()->getGEOInternals()->Curves, &c);
 	  CreateReversedCurve(c);
 	  List_Delete(temp);
 	}
       }
-      List_Delete((yyvsp[(6) - (11)].l));
-      List_Delete((yyvsp[(8) - (11)].l));
+      List_Delete((yyvsp[-5].l));
+      List_Delete((yyvsp[-3].l));
       (yyval.s).Type = MSH_SEGM_NURBS;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6360 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 159:
-#line 1689 "Gmsh.y"
+#line 1689 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (8)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindEdgeLoop(num)){
 	yymsg(0, "Line loop %d already exists", num);
       }
       else{
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (8)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	sortEdgesInLoop(num, temp);
 	EdgeLoop *l = Create_EdgeLoop(num, temp);
 	Tree_Add(GModel::current()->getGEOInternals()->EdgeLoops, &l);
 	List_Delete(temp);
       }
-      List_Delete((yyvsp[(7) - (8)].l));
-      Free((yyvsp[(2) - (8)].c));
+      List_Delete((yyvsp[-1].l));
+      Free((yyvsp[-6].c));
       (yyval.s).Type = MSH_SEGM_LOOP;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6382 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 160:
-#line 1707 "Gmsh.y"
+#line 1707 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (8)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindCurve(num)){
 	yymsg(0, "Curve %d already exists", num);
       }
       else{
         Curve *c = Create_Curve(num, MSH_SEGM_COMPOUND, 1, NULL, NULL, -1, -1, 0., 1.);
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++)
-          c->compound.push_back((int)*(double*)List_Pointer((yyvsp[(7) - (8)].l), i));
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+          c->compound.push_back((int)*(double*)List_Pointer((yyvsp[-1].l), i));
 	End_Curve(c);
 	Tree_Add(GModel::current()->getGEOInternals()->Curves, &c);
 	CreateReversedCurve(c);
       }
-      List_Delete((yyvsp[(7) - (8)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_SEGM_COMPOUND;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6404 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 161:
-#line 1725 "Gmsh.y"
+#line 1725 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (8)].i);
-      int op = (yyvsp[(6) - (8)].i);
+      int num = (int)(yyvsp[-4].i);
+      int op = (yyvsp[-2].i);
       PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_LINE);
       if(p && op == 0){
 	yymsg(0, "Physical line %d already exists", num);
@@ -6910,23 +6416,23 @@ yyreduce:
 	yymsg(0, "Physical line %d does not exist", num);
       }
       else if(op == 0){
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (8)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	p = Create_PhysicalGroup(num, MSH_PHYSICAL_LINE, temp);
 	List_Delete(temp);
 	List_Add(GModel::current()->getGEOInternals()->PhysicalGroups, &p);
       }
       else if(op == 1){
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(7) - (8)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           int j = (int)d;
           List_Add(p->Entities, &j);
         }
       }
       else if(op == 2){
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(7) - (8)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           int j = (int)d;
           List_Suppress(p->Entities, &j, fcmp_int);
         }
@@ -6934,43 +6440,45 @@ yyreduce:
       else{
 	yymsg(0, "Unsupported operation on physical line %d", num);
       }
-      List_Delete((yyvsp[(7) - (8)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_PHYSICAL_LINE;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6448 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 162:
-#line 1768 "Gmsh.y"
+#line 1768 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (8)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindSurface(num)){
 	yymsg(0, "Surface %d already exists", num);
       }
       else{
 	Surface *s = Create_Surface(num, MSH_SURF_PLAN);
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (8)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	setSurfaceGeneratrices(s, temp);
 	List_Delete(temp);
 	End_Surface(s);
 	Tree_Add(GModel::current()->getGEOInternals()->Surfaces, &s);
       }
-      List_Delete((yyvsp[(7) - (8)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_SURF_PLAN;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6470 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 163:
-#line 1786 "Gmsh.y"
+#line 1786 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (9)].d), type = 0;
+      int num = (int)(yyvsp[-5].d), type = 0;
       if(FindSurface(num)){
 	yymsg(0, "Surface %d already exists", num);
       }
       else{
 	double d;
-	List_Read((yyvsp[(7) - (9)].l), 0, &d);
+	List_Read((yyvsp[-2].l), 0, &d);
 	EdgeLoop *el = FindEdgeLoop((int)fabs(d));
 	if(!el){
 	  yymsg(0, "Unknown line loop %d", (int)d);
@@ -6989,60 +6497,64 @@ yyreduce:
 	    type = MSH_SURF_PLAN;
 	  }
 	  Surface *s = Create_Surface(num, type);
-	  List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (9)].l));
+	  List_T *temp = ListOfDouble2ListOfInt((yyvsp[-2].l));
 	  setSurfaceGeneratrices(s, temp);
 	  List_Delete(temp);
 	  End_Surface(s);
-	  s->InSphereCenter = (yyvsp[(8) - (9)].l);
+	  s->InSphereCenter = (yyvsp[-1].l);
 	  Tree_Add(GModel::current()->getGEOInternals()->Surfaces, &s);
 	}
       }
-      List_Delete((yyvsp[(7) - (9)].l));
+      List_Delete((yyvsp[-2].l));
       (yyval.s).Type = type;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6513 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 164:
-#line 1825 "Gmsh.y"
+#line 1825 "Gmsh.y" /* yacc.c:1646  */
     {
       myGmshSurface = 0;
       (yyval.s).Type = 0;
       (yyval.s).Num = 0;
-    ;}
+    }
+#line 6523 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 165:
-#line 1831 "Gmsh.y"
+#line 1831 "Gmsh.y" /* yacc.c:1646  */
     {
-      myGmshSurface = gmshSurface::getSurface((int)(yyvsp[(3) - (4)].d));
+      myGmshSurface = gmshSurface::getSurface((int)(yyvsp[-1].d));
       (yyval.s).Type = 0;
       (yyval.s).Num = 0;
-    ;}
+    }
+#line 6533 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 166:
-#line 1837 "Gmsh.y"
+#line 1837 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (10)].d);
-      myGmshSurface = gmshParametricSurface::NewParametricSurface(num, (yyvsp[(7) - (10)].c), (yyvsp[(8) - (10)].c), (yyvsp[(9) - (10)].c));
+      int num = (int)(yyvsp[-6].d);
+      myGmshSurface = gmshParametricSurface::NewParametricSurface(num, (yyvsp[-3].c), (yyvsp[-2].c), (yyvsp[-1].c));
       (yyval.s).Type = 0;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6544 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 167:
-#line 1844 "Gmsh.y"
+#line 1844 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (7)].d);
-      if (List_Nbr((yyvsp[(6) - (7)].l)) != 2){
+      int num = (int)(yyvsp[-4].d);
+      if (List_Nbr((yyvsp[-1].l)) != 2){
 	yymsg(0, "Sphere %d has to be defined using 2 points (center + "
-	      "any point) and not %d", num, List_Nbr((yyvsp[(6) - (7)].l)));
+	      "any point) and not %d", num, List_Nbr((yyvsp[-1].l)));
       }
       else{
 	double p1,p2;
-	List_Read((yyvsp[(6) - (7)].l), 0, &p1);
-	List_Read((yyvsp[(6) - (7)].l), 1, &p2);
+	List_Read((yyvsp[-1].l), 0, &p1);
+	List_Read((yyvsp[-1].l), 1, &p2);
 	Vertex *v1 = FindPoint((int)p1);
 	Vertex *v2 = FindPoint((int)p2);
 	if(!v1) yymsg(0, "Sphere %d : unknown point %d", num, (int)p1);
@@ -7056,21 +6568,22 @@ yyreduce:
       }
       (yyval.s).Type = 0;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6573 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 168:
-#line 1869 "Gmsh.y"
+#line 1869 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (7)].d);
-      if (List_Nbr((yyvsp[(6) - (7)].l)) != 2){
+      int num = (int)(yyvsp[-4].d);
+      if (List_Nbr((yyvsp[-1].l)) != 2){
 	yymsg(0, "PolarSphere %d has to be defined using 2 points (center + "
-	      "any point) and not %d", num, List_Nbr((yyvsp[(6) - (7)].l)));
+	      "any point) and not %d", num, List_Nbr((yyvsp[-1].l)));
       }
       else{
 	double p1,p2;
-	List_Read((yyvsp[(6) - (7)].l), 0, &p1);
-	List_Read((yyvsp[(6) - (7)].l), 1, &p2);
+	List_Read((yyvsp[-1].l), 0, &p1);
+	List_Read((yyvsp[-1].l), 1, &p2);
 	Vertex *v1 = FindPoint((int)p1);
 	Vertex *v2 = FindPoint((int)p2);
 	if(!v1) yymsg(0, "PolarSphere %d : unknown point %d", num, (int)p1);
@@ -7084,68 +6597,71 @@ yyreduce:
       }
       (yyval.s).Type = 0;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6602 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 169:
-#line 1894 "Gmsh.y"
+#line 1894 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (8)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindSurfaceLoop(num)){
 	yymsg(0, "Surface loop %d already exists", num);
       }
       else{
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (8)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	SurfaceLoop *l = Create_SurfaceLoop(num, temp);
 	Tree_Add(GModel::current()->getGEOInternals()->SurfaceLoops, &l);
 	List_Delete(temp);
       }
-      List_Delete((yyvsp[(7) - (8)].l));
-      Free((yyvsp[(2) - (8)].c));
+      List_Delete((yyvsp[-1].l));
+      Free((yyvsp[-6].c));
       (yyval.s).Type = MSH_SURF_LOOP;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6623 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 170:
-#line 1911 "Gmsh.y"
+#line 1911 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (8)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindSurface(num)){
 	yymsg(0, "Surface %d already exists", num);
       }
       else{
 	Surface *s = Create_Surface(num, MSH_SURF_COMPOUND);
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++){
-          s->compound.push_back((int)*(double*)List_Pointer((yyvsp[(7) - (8)].l), i));
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
+          s->compound.push_back((int)*(double*)List_Pointer((yyvsp[-1].l), i));
 	}
         // Added by Trevor Strickler
 	setSurfaceGeneratrices(s, (List_T*) 0 );
 	Tree_Add(GModel::current()->getGEOInternals()->Surfaces, &s);
       }
-      List_Delete((yyvsp[(7) - (8)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_SURF_COMPOUND;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6646 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 171:
-#line 1931 "Gmsh.y"
+#line 1931 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (12)].d);
+      int num = (int)(yyvsp[-8].d);
       if(FindSurface(num)){
 	yymsg(0, "Surface %d already exists", num);
       }
       else{
         Surface *s = Create_Surface(num, MSH_SURF_COMPOUND);
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (12)].l)); i++)
-          s->compound.push_back((int)*(double*)List_Pointer((yyvsp[(7) - (12)].l), i));
-	for (int i = 0; i < List_Nbr((yyvsp[(10) - (12)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-5].l)); i++)
+          s->compound.push_back((int)*(double*)List_Pointer((yyvsp[-5].l), i));
+	for (int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
           if(i > 3){
             yymsg(0, "Too many boundary specifiers in compound surface");
             break;
           }
-	  List_T *l = *(List_T**)List_Pointer((yyvsp[(10) - (12)].l), i);
+	  List_T *l = *(List_T**)List_Pointer((yyvsp[-2].l), i);
           for (int j = 0; j < List_Nbr(l); j++){
             s->compoundBoundary[i].push_back((int)*(double*)List_Pointer(l, j));
 	  }
@@ -7155,21 +6671,22 @@ yyreduce:
 
 	Tree_Add(GModel::current()->getGEOInternals()->Surfaces, &s);
       }
-      List_Delete((yyvsp[(7) - (12)].l));
-      for (int i = 0; i < List_Nbr((yyvsp[(10) - (12)].l)); i++)
-        List_Delete(*(List_T**)List_Pointer((yyvsp[(10) - (12)].l), i));
-      List_Delete((yyvsp[(10) - (12)].l));
-      Free((yyvsp[(8) - (12)].c));
+      List_Delete((yyvsp[-5].l));
+      for (int i = 0; i < List_Nbr((yyvsp[-2].l)); i++)
+        List_Delete(*(List_T**)List_Pointer((yyvsp[-2].l), i));
+      List_Delete((yyvsp[-2].l));
+      Free((yyvsp[-4].c));
       (yyval.s).Type = MSH_SURF_COMPOUND;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6683 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 172:
-#line 1964 "Gmsh.y"
+#line 1964 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (8)].i);
-      int op = (yyvsp[(6) - (8)].i);
+      int num = (int)(yyvsp[-4].i);
+      int op = (yyvsp[-2].i);
       PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_SURFACE);
       if(p && op == 0){
 	yymsg(0, "Physical surface %d already exists", num);
@@ -7178,23 +6695,23 @@ yyreduce:
 	yymsg(0, "Physical surface %d does not exist", num);
       }
       else if(op == 0){
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (8)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	p = Create_PhysicalGroup(num, MSH_PHYSICAL_SURFACE, temp);
 	List_Delete(temp);
 	List_Add(GModel::current()->getGEOInternals()->PhysicalGroups, &p);
       }
       else if(op == 1){
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(7) - (8)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           int j = (int)d;
           List_Add(p->Entities, &j);
         }
       }
       else if(op == 2){
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(7) - (8)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           int j = (int)d;
           List_Suppress(p->Entities, &j, fcmp_int);
         }
@@ -7202,77 +6719,81 @@ yyreduce:
       else{
 	yymsg(0, "Unsupported operation on physical surface %d", num);
       }
-      List_Delete((yyvsp[(7) - (8)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_PHYSICAL_SURFACE;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6727 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 173:
-#line 2008 "Gmsh.y"
+#line 2008 "Gmsh.y" /* yacc.c:1646  */
     {
       yymsg(0, "'Complex Volume' command is deprecated: use 'Volume' instead");
-      int num = (int)(yyvsp[(4) - (8)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindVolume(num)){
 	yymsg(0, "Volume %d already exists", num);
       }
       else{
 	Volume *v = Create_Volume(num, MSH_VOLUME);
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (8)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	setVolumeSurfaces(v, temp);
 	List_Delete(temp);
 	Tree_Add(GModel::current()->getGEOInternals()->Volumes, &v);
       }
-      List_Delete((yyvsp[(7) - (8)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_VOLUME;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6749 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 174:
-#line 2026 "Gmsh.y"
+#line 2026 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (7)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindVolume(num)){
 	yymsg(0, "Volume %d already exists", num);
       }
       else{
 	Volume *v = Create_Volume(num, MSH_VOLUME);
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(6) - (7)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	setVolumeSurfaces(v, temp);
 	List_Delete(temp);
 	Tree_Add(GModel::current()->getGEOInternals()->Volumes, &v);
       }
-      List_Delete((yyvsp[(6) - (7)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_VOLUME;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6770 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 175:
-#line 2043 "Gmsh.y"
+#line 2043 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (8)].d);
+      int num = (int)(yyvsp[-4].d);
       if(FindVolume(num)){
 	yymsg(0, "Volume %d already exists", num);
       }
       else{
 	Volume *v = Create_Volume(num, MSH_VOLUME_COMPOUND);
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++)
-          v->compound.push_back((int)*(double*)List_Pointer((yyvsp[(7) - (8)].l), i));
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+          v->compound.push_back((int)*(double*)List_Pointer((yyvsp[-1].l), i));
 	Tree_Add(GModel::current()->getGEOInternals()->Volumes, &v);
       }
-      List_Delete((yyvsp[(7) - (8)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_VOLUME_COMPOUND;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6790 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 176:
-#line 2059 "Gmsh.y"
+#line 2059 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(4) - (8)].i);
-      int op = (yyvsp[(6) - (8)].i);
+      int num = (int)(yyvsp[-4].i);
+      int op = (yyvsp[-2].i);
       PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_VOLUME);
       if(p && op == 0){
 	yymsg(0, "Physical volume %d already exists", num);
@@ -7281,23 +6802,23 @@ yyreduce:
 	yymsg(0, "Physical volume %d does not exist", num);
       }
       else if(op == 0){
-	List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (8)].l));
+	List_T *temp = ListOfDouble2ListOfInt((yyvsp[-1].l));
 	p = Create_PhysicalGroup(num, MSH_PHYSICAL_VOLUME, temp);
 	List_Delete(temp);
 	List_Add(GModel::current()->getGEOInternals()->PhysicalGroups, &p);
       }
       else if(op == 1){
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(7) - (8)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           int j = (int)d;
           List_Add(p->Entities, &j);
         }
       }
       else if(op == 2){
-        for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(7) - (8)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           int j = (int)d;
           List_Suppress(p->Entities, &j, fcmp_int);
         }
@@ -7305,128 +6826,141 @@ yyreduce:
       else{
 	yymsg(0, "Unsupported operation on physical volume %d", num);
       }
-      List_Delete((yyvsp[(7) - (8)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.s).Type = MSH_PHYSICAL_VOLUME;
       (yyval.s).Num = num;
-    ;}
+    }
+#line 6834 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 177:
-#line 2104 "Gmsh.y"
+#line 2104 "Gmsh.y" /* yacc.c:1646  */
     {
-      TranslateShapes((yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], (yyvsp[(4) - (5)].l));
-      (yyval.l) = (yyvsp[(4) - (5)].l);
-    ;}
+      TranslateShapes((yyvsp[-3].v)[0], (yyvsp[-3].v)[1], (yyvsp[-3].v)[2], (yyvsp[-1].l));
+      (yyval.l) = (yyvsp[-1].l);
+    }
+#line 6843 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 178:
-#line 2109 "Gmsh.y"
+#line 2109 "Gmsh.y" /* yacc.c:1646  */
     {
-      RotateShapes((yyvsp[(3) - (11)].v)[0], (yyvsp[(3) - (11)].v)[1], (yyvsp[(3) - (11)].v)[2], (yyvsp[(5) - (11)].v)[0], (yyvsp[(5) - (11)].v)[1], (yyvsp[(5) - (11)].v)[2], (yyvsp[(7) - (11)].d), (yyvsp[(10) - (11)].l));
-      (yyval.l) = (yyvsp[(10) - (11)].l);
-    ;}
+      RotateShapes((yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d), (yyvsp[-1].l));
+      (yyval.l) = (yyvsp[-1].l);
+    }
+#line 6852 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 179:
-#line 2114 "Gmsh.y"
+#line 2114 "Gmsh.y" /* yacc.c:1646  */
     {
-      SymmetryShapes((yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], (yyvsp[(2) - (5)].v)[3], (yyvsp[(4) - (5)].l));
-      (yyval.l) = (yyvsp[(4) - (5)].l);
-    ;}
+      SymmetryShapes((yyvsp[-3].v)[0], (yyvsp[-3].v)[1], (yyvsp[-3].v)[2], (yyvsp[-3].v)[3], (yyvsp[-1].l));
+      (yyval.l) = (yyvsp[-1].l);
+    }
+#line 6861 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 180:
-#line 2119 "Gmsh.y"
+#line 2119 "Gmsh.y" /* yacc.c:1646  */
     {
-      DilatShapes((yyvsp[(3) - (9)].v)[0], (yyvsp[(3) - (9)].v)[1], (yyvsp[(3) - (9)].v)[2], (yyvsp[(5) - (9)].d), (yyvsp[(5) - (9)].d), (yyvsp[(5) - (9)].d), (yyvsp[(8) - (9)].l));
-      (yyval.l) = (yyvsp[(8) - (9)].l);
-    ;}
+      DilatShapes((yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d), (yyvsp[-4].d), (yyvsp[-4].d), (yyvsp[-1].l));
+      (yyval.l) = (yyvsp[-1].l);
+    }
+#line 6870 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 181:
-#line 2124 "Gmsh.y"
+#line 2124 "Gmsh.y" /* yacc.c:1646  */
     {
-      DilatShapes((yyvsp[(3) - (9)].v)[0], (yyvsp[(3) - (9)].v)[1], (yyvsp[(3) - (9)].v)[2], (yyvsp[(5) - (9)].v)[0], (yyvsp[(5) - (9)].v)[1], (yyvsp[(5) - (9)].v)[2], (yyvsp[(8) - (9)].l));
-      (yyval.l) = (yyvsp[(8) - (9)].l);
-    ;}
+      DilatShapes((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[-1].l));
+      (yyval.l) = (yyvsp[-1].l);
+    }
+#line 6879 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 182:
-#line 2129 "Gmsh.y"
+#line 2129 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(3, 3, sizeof(Shape));
-      if(!strcmp((yyvsp[(1) - (4)].c), "Duplicata")){
-        for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+      if(!strcmp((yyvsp[-3].c), "Duplicata")){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           Shape TheShape;
-          List_Read((yyvsp[(3) - (4)].l), i, &TheShape);
+          List_Read((yyvsp[-1].l), i, &TheShape);
           CopyShape(TheShape.Type, TheShape.Num, &TheShape.Num);
           List_Add((yyval.l), &TheShape);
         }
       }
-      else if(!strcmp((yyvsp[(1) - (4)].c), "Boundary")){
-        BoundaryShapes((yyvsp[(3) - (4)].l), (yyval.l), false);
+      else if(!strcmp((yyvsp[-3].c), "Boundary")){
+        BoundaryShapes((yyvsp[-1].l), (yyval.l), false);
       }
-      else if(!strcmp((yyvsp[(1) - (4)].c), "CombinedBoundary")){
-        BoundaryShapes((yyvsp[(3) - (4)].l), (yyval.l), true);
+      else if(!strcmp((yyvsp[-3].c), "CombinedBoundary")){
+        BoundaryShapes((yyvsp[-1].l), (yyval.l), true);
       }
       else{
-        yymsg(0, "Unknown command on multiple shapes: '%s'", (yyvsp[(1) - (4)].c));
+        yymsg(0, "Unknown command on multiple shapes: '%s'", (yyvsp[-3].c));
       }
-      Free((yyvsp[(1) - (4)].c));
-      List_Delete((yyvsp[(3) - (4)].l));
-    ;}
+      Free((yyvsp[-3].c));
+      List_Delete((yyvsp[-1].l));
+    }
+#line 6906 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 183:
-#line 2152 "Gmsh.y"
+#line 2152 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      IntersectCurvesWithSurface((yyvsp[(4) - (9)].l), (int)(yyvsp[(8) - (9)].d), (yyval.l));
-      List_Delete((yyvsp[(4) - (9)].l));
-    ;}
+      IntersectCurvesWithSurface((yyvsp[-5].l), (int)(yyvsp[-1].d), (yyval.l));
+      List_Delete((yyvsp[-5].l));
+    }
+#line 6916 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 184:
-#line 2158 "Gmsh.y"
+#line 2158 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape*));
-      List_T *tmp = ListOfDouble2ListOfInt((yyvsp[(7) - (9)].l));
-      List_Delete((yyvsp[(7) - (9)].l));
-      SplitCurve((int)(yyvsp[(4) - (9)].d), tmp, (yyval.l));
+      List_T *tmp = ListOfDouble2ListOfInt((yyvsp[-2].l));
+      List_Delete((yyvsp[-2].l));
+      SplitCurve((int)(yyvsp[-5].d), tmp, (yyval.l));
       List_Delete(tmp);
-    ;}
+    }
+#line 6928 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 185:
-#line 2168 "Gmsh.y"
-    { (yyval.l) = (yyvsp[(1) - (1)].l); ;}
+#line 2168 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.l) = (yyvsp[0].l); }
+#line 6934 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 186:
-#line 2169 "Gmsh.y"
-    { (yyval.l) = (yyvsp[(1) - (1)].l); ;}
+#line 2169 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.l) = (yyvsp[0].l); }
+#line 6940 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 187:
-#line 2174 "Gmsh.y"
+#line 2174 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(3, 3, sizeof(Shape));
-    ;}
+    }
+#line 6948 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 188:
-#line 2178 "Gmsh.y"
+#line 2178 "Gmsh.y" /* yacc.c:1646  */
     {
-      List_Add((yyval.l), &(yyvsp[(2) - (2)].s));
-    ;}
+      List_Add((yyval.l), &(yyvsp[0].s));
+    }
+#line 6956 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 189:
-#line 2182 "Gmsh.y"
+#line 2182 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
 	double d;
-	List_Read((yyvsp[(4) - (6)].l), i, &d);
+	List_Read((yyvsp[-2].l), i, &d);
 	Shape TheShape;
 	TheShape.Num = (int)d;
 	Vertex *v = FindPoint(std::abs(TheShape.Num));
@@ -7444,15 +6978,16 @@ yyreduce:
 	    yymsg(1, "Unknown point %d", TheShape.Num);
 	}
       }
-    ;}
+    }
+#line 6983 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 190:
-#line 2205 "Gmsh.y"
+#line 2205 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
 	double d;
-	List_Read((yyvsp[(4) - (6)].l), i, &d);
+	List_Read((yyvsp[-2].l), i, &d);
 	Shape TheShape;
 	TheShape.Num = (int)d;
 	Curve *c = FindCurve(std::abs(TheShape.Num));
@@ -7470,15 +7005,16 @@ yyreduce:
 	    yymsg(1, "Unknown curve %d", TheShape.Num);
 	}
       }
-    ;}
+    }
+#line 7010 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 191:
-#line 2228 "Gmsh.y"
+#line 2228 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
 	double d;
-	List_Read((yyvsp[(4) - (6)].l), i, &d);
+	List_Read((yyvsp[-2].l), i, &d);
 	Shape TheShape;
 	TheShape.Num = (int)d;
 	Surface *s = FindSurface(std::abs(TheShape.Num));
@@ -7496,15 +7032,16 @@ yyreduce:
 	    yymsg(1, "Unknown surface %d", TheShape.Num);
 	}
       }
-    ;}
+    }
+#line 7037 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 192:
-#line 2251 "Gmsh.y"
+#line 2251 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
 	double d;
-	List_Read((yyvsp[(4) - (6)].l), i, &d);
+	List_Read((yyvsp[-2].l), i, &d);
 	Shape TheShape;
 	TheShape.Num = (int)d;
 	Volume *v = FindVolume(std::abs(TheShape.Num));
@@ -7522,46 +7059,48 @@ yyreduce:
 	    yymsg(1, "Unknown volume %d", TheShape.Num);
 	}
       }
-    ;}
+    }
+#line 7064 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 193:
-#line 2279 "Gmsh.y"
+#line 2279 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_DINTEGRATION)
-      if(List_Nbr((yyvsp[(7) - (8)].l)) == 4){
-        int t = (int)(yyvsp[(4) - (8)].d);
+      if(List_Nbr((yyvsp[-1].l)) == 4){
+        int t = (int)(yyvsp[-4].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           double d[4];
           for(int i = 0; i < 4; i++)
-            List_Read((yyvsp[(7) - (8)].l), i, &d[i]);
+            List_Read((yyvsp[-1].l), i, &d[i]);
           gLevelset *ls = new gLevelsetPlane(d[0], d[1], d[2], d[3], t);
           LevelSet *l = Create_LevelSet(ls->getTag(), ls);
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
       else
-        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (8)].d));
+        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-4].d));
 #endif
-    ;}
+    }
+#line 7089 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 194:
-#line 2300 "Gmsh.y"
+#line 2300 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_DINTEGRATION)
-      int t = (int)(yyvsp[(4) - (10)].d);
+      int t = (int)(yyvsp[-6].d);
       if(FindLevelSet(t)){
 	yymsg(0, "Levelset %d already exists", t);
       }
       else {
 	//Msg::Info("nb = %d \n",List_Nbr($8) );
-	fullMatrix<double> centers(List_Nbr((yyvsp[(8) - (10)].l)),3);
-	for (int i = 0; i < List_Nbr((yyvsp[(8) - (10)].l)); i++){
-	  List_T *l = *(List_T**)List_Pointer((yyvsp[(8) - (10)].l), i);
+	fullMatrix<double> centers(List_Nbr((yyvsp[-2].l)),3);
+	for (int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
+	  List_T *l = *(List_T**)List_Pointer((yyvsp[-2].l), i);
 	  for (int j = 0; j < List_Nbr(l); j++){
 	    //Msg::Info("nb j = %d \n",List_Nbr(l) );
 	    centers(i,j) = (double)(*(double*)List_Pointer(l, j));
@@ -7571,96 +7110,100 @@ yyreduce:
         LevelSet *l = Create_LevelSet(ls->getTag(), ls);
         Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
       }
-      for(int i = 0; i < List_Nbr((yyvsp[(8) - (10)].l)); i++)
-        List_Delete(*(List_T**)List_Pointer((yyvsp[(8) - (10)].l), i));
-      List_Delete((yyvsp[(8) - (10)].l));
+      for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++)
+        List_Delete(*(List_T**)List_Pointer((yyvsp[-2].l), i));
+      List_Delete((yyvsp[-2].l));
 #endif
-    ;}
+    }
+#line 7119 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 195:
-#line 2327 "Gmsh.y"
+#line 2327 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_DINTEGRATION)
-      if(List_Nbr((yyvsp[(12) - (14)].l)) == 0){
-        int t = (int)(yyvsp[(4) - (14)].d);
+      if(List_Nbr((yyvsp[-2].l)) == 0){
+        int t = (int)(yyvsp[-10].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
-          double pt[3] = {(yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2]};
-          double n[3] = {(yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2]};
+          double pt[3] = {(yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2]};
+          double n[3] = {(yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2]};
           gLevelset *ls = new gLevelsetPlane(pt, n, t);
           LevelSet *l = Create_LevelSet(ls->getTag(), ls);
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
       else
-        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (14)].d));
+        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-10].d));
 #endif
-    ;}
+    }
+#line 7143 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 196:
-#line 2348 "Gmsh.y"
+#line 2348 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_DINTEGRATION)
-      if(List_Nbr((yyvsp[(14) - (16)].l)) == 0){
-        int t = (int)(yyvsp[(4) - (16)].d);
+      if(List_Nbr((yyvsp[-2].l)) == 0){
+        int t = (int)(yyvsp[-12].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
-          double pt1[3] = {(yyvsp[(8) - (16)].v)[0], (yyvsp[(8) - (16)].v)[1], (yyvsp[(8) - (16)].v)[2]};
-          double pt2[3] = {(yyvsp[(10) - (16)].v)[0], (yyvsp[(10) - (16)].v)[1], (yyvsp[(10) - (16)].v)[2]};
-          double pt3[3] = {(yyvsp[(12) - (16)].v)[0], (yyvsp[(12) - (16)].v)[1], (yyvsp[(12) - (16)].v)[2]};
+          double pt1[3] = {(yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2]};
+          double pt2[3] = {(yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2]};
+          double pt3[3] = {(yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2]};
           gLevelset *ls = new gLevelsetPlane(pt1, pt2, pt3, t);
           LevelSet *l = Create_LevelSet(ls->getTag(), ls);
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
       else
-        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (16)].d));
+        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-12].d));
 #endif
-    ;}
+    }
+#line 7168 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 197:
-#line 2369 "Gmsh.y"
+#line 2369 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_DINTEGRATION)
-      if(List_Nbr((yyvsp[(10) - (12)].l)) == 1){
-        int t = (int)(yyvsp[(4) - (12)].d);
+      if(List_Nbr((yyvsp[-2].l)) == 1){
+        int t = (int)(yyvsp[-8].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           double d;
-          List_Read((yyvsp[(10) - (12)].l), 0, &d);
-          gLevelset *ls = new gLevelsetSphere((yyvsp[(8) - (12)].v)[0], (yyvsp[(8) - (12)].v)[1], (yyvsp[(8) - (12)].v)[2], d, t);
+          List_Read((yyvsp[-2].l), 0, &d);
+          gLevelset *ls = new gLevelsetSphere((yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2], d, t);
           LevelSet *l = Create_LevelSet(ls->getTag(), ls);
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
       else
-        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (12)].d));
+        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-8].d));
 #endif
-    ;}
+    }
+#line 7192 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 198:
-#line 2389 "Gmsh.y"
+#line 2389 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_DINTEGRATION)
-      if(!strcmp((yyvsp[(2) - (8)].c), "Union")){
-        int t = (int)(yyvsp[(4) - (8)].d);
+      if(!strcmp((yyvsp[-6].c), "Union")){
+        int t = (int)(yyvsp[-4].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           std::vector<gLevelset *> vl;
-          for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++) {
-            double d; List_Read((yyvsp[(7) - (8)].l), i, &d);
+          for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++) {
+            double d; List_Read((yyvsp[-1].l), i, &d);
             LevelSet *pl = FindLevelSet((int)d);
 	    if(!pl) yymsg(0, "Levelset Union %d : unknown levelset %d", t, (int)d);
             else vl.push_back(pl->ls);
@@ -7670,15 +7213,15 @@ yyreduce:
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
-      else if(!strcmp((yyvsp[(2) - (8)].c), "Intersection")){
-        int t = (int)(yyvsp[(4) - (8)].d);
+      else if(!strcmp((yyvsp[-6].c), "Intersection")){
+        int t = (int)(yyvsp[-4].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           std::vector<gLevelset *> vl;
-          for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++) {
-            double d; List_Read((yyvsp[(7) - (8)].l), i, &d);
+          for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++) {
+            double d; List_Read((yyvsp[-1].l), i, &d);
             LevelSet *pl = FindLevelSet((int)d);
 	    if(!pl) yymsg(0, "Levelset Intersection %d : unknown levelset %d", t, (int)d);
             else vl.push_back(pl->ls);
@@ -7688,15 +7231,15 @@ yyreduce:
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
-      else if(!strcmp((yyvsp[(2) - (8)].c), "Cut")){
-        int t = (int)(yyvsp[(4) - (8)].d);
+      else if(!strcmp((yyvsp[-6].c), "Cut")){
+        int t = (int)(yyvsp[-4].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           std::vector<gLevelset *> vl;
-          for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++) {
-            double d; List_Read((yyvsp[(7) - (8)].l), i, &d);
+          for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++) {
+            double d; List_Read((yyvsp[-1].l), i, &d);
             LevelSet *pl = FindLevelSet((int)d);
 	    if(!pl) yymsg(0, "Levelset Cut %d : unknown levelset %d", t, (int)d);
             else vl.push_back(pl->ls);
@@ -7706,15 +7249,15 @@ yyreduce:
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
-      else if(!strcmp((yyvsp[(2) - (8)].c), "Crack")){
-        int t = (int)(yyvsp[(4) - (8)].d);
+      else if(!strcmp((yyvsp[-6].c), "Crack")){
+        int t = (int)(yyvsp[-4].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           std::vector<gLevelset *> vl;
-          for(int i = 0; i < List_Nbr((yyvsp[(7) - (8)].l)); i++) {
-            double d; List_Read((yyvsp[(7) - (8)].l), i, &d);
+          for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++) {
+            double d; List_Read((yyvsp[-1].l), i, &d);
             LevelSet *pl = FindLevelSet((int)d);
 	    if(!pl) yymsg(0, "Levelset Crack %d : unknown levelset %d", t, (int)d);
             else vl.push_back(pl->ls);
@@ -7724,14 +7267,14 @@ yyreduce:
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
-      else if(!strcmp((yyvsp[(2) - (8)].c), "Reverse")){
-        int t = (int)(yyvsp[(4) - (8)].d);
+      else if(!strcmp((yyvsp[-6].c), "Reverse")){
+        int t = (int)(yyvsp[-4].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           double d;
-          List_Read((yyvsp[(7) - (8)].l), 0, &d);
+          List_Read((yyvsp[-1].l), 0, &d);
           LevelSet *pl = FindLevelSet((int)d);
           gLevelset *ls = NULL;
           if(!pl) yymsg(0, "Levelset Reverse %d : unknown levelset %d", t, (int)d);
@@ -7741,14 +7284,14 @@ yyreduce:
         }
       }
 #if defined(HAVE_POST)
-      else if(!strcmp((yyvsp[(2) - (8)].c), "PostView")){
-        int t = (int)(yyvsp[(4) - (8)].d);
+      else if(!strcmp((yyvsp[-6].c), "PostView")){
+        int t = (int)(yyvsp[-4].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
-          if(List_Nbr((yyvsp[(7) - (8)].l)) > 0){
-            double d; List_Read((yyvsp[(7) - (8)].l), 0, &d);
+          if(List_Nbr((yyvsp[-1].l)) > 0){
+            double d; List_Read((yyvsp[-1].l), 0, &d);
             gLevelset *ls = new gLevelsetPostView((int)d, t);
             LevelSet *l = Create_LevelSet(ls->getTag(), ls);
             Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
@@ -7757,40 +7300,42 @@ yyreduce:
       }
 #endif
       else
-        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (8)].d));
-      Free((yyvsp[(2) - (8)].c));
+        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-4].d));
+      Free((yyvsp[-6].c));
 #endif
-    ;}
+    }
+#line 7308 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 199:
-#line 2501 "Gmsh.y"
+#line 2501 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_DINTEGRATION)
-      if(!strcmp((yyvsp[(2) - (8)].c), "MathEval")){
-        int t = (int)(yyvsp[(4) - (8)].d);
+      if(!strcmp((yyvsp[-6].c), "MathEval")){
+        int t = (int)(yyvsp[-4].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
-          gLevelset *ls = new gLevelsetMathEval((yyvsp[(7) - (8)].c), t);
+          gLevelset *ls = new gLevelsetMathEval((yyvsp[-1].c), t);
           LevelSet *l = Create_LevelSet(ls->getTag(), ls);
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
       else
         yymsg(0, "Wrong levelset definition");
-      Free((yyvsp[(2) - (8)].c)); Free((yyvsp[(7) - (8)].c));
+      Free((yyvsp[-6].c)); Free((yyvsp[-1].c));
 #endif
-    ;}
+    }
+#line 7331 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 200:
-#line 2520 "Gmsh.y"
+#line 2520 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_DINTEGRATION)
-      if(!strcmp((yyvsp[(2) - (6)].c), "CutMesh")){
-        int t = (int)(yyvsp[(4) - (6)].d);
+      if(!strcmp((yyvsp[-4].c), "CutMesh")){
+        int t = (int)(yyvsp[-2].d);
         GModel *GM = GModel::current();
         if(FindLevelSet(t)){
           GM->buildCutGModel(FindLevelSet(t)->ls, true, false);
@@ -7799,8 +7344,8 @@ yyreduce:
         else
           yymsg(0, "Unknown levelset (%d)", t);
       }
-      else if(!strcmp((yyvsp[(2) - (6)].c), "CutMeshTri")){
-        int t = (int)(yyvsp[(4) - (6)].d);
+      else if(!strcmp((yyvsp[-4].c), "CutMeshTri")){
+        int t = (int)(yyvsp[-2].d);
         GModel *GM = GModel::current();
         if(FindLevelSet(t)){
           GM->buildCutGModel(FindLevelSet(t)->ls, true, true);
@@ -7809,8 +7354,8 @@ yyreduce:
         else
           yymsg(0, "Unknown levelset (%d)", t);
       }
-      else if(!strcmp((yyvsp[(2) - (6)].c), "SplitMesh")){
-        int t = (int)(yyvsp[(4) - (6)].d);
+      else if(!strcmp((yyvsp[-4].c), "SplitMesh")){
+        int t = (int)(yyvsp[-2].d);
         GModel *GM = GModel::current();
         if(FindLevelSet(t)){
           GM->buildCutGModel(FindLevelSet(t)->ls, false, true);
@@ -7821,104 +7366,105 @@ yyreduce:
       }
       else
         yymsg(0, "Wrong levelset definition");
-      Free((yyvsp[(2) - (6)].c));
+      Free((yyvsp[-4].c));
 #endif
-    ;}
+    }
+#line 7373 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 201:
-#line 2559 "Gmsh.y"
+#line 2559 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_DINTEGRATION)
-      if(!strcmp((yyvsp[(2) - (14)].c), "Cylinder") && List_Nbr((yyvsp[(12) - (14)].l)) == 1){
-        int t = (int)(yyvsp[(4) - (14)].d);
+      if(!strcmp((yyvsp[-12].c), "Cylinder") && List_Nbr((yyvsp[-2].l)) == 1){
+        int t = (int)(yyvsp[-10].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           double d;
-          List_Read((yyvsp[(12) - (14)].l), 0, &d);
-          double pt[3] = {(yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2]};
-          double dir[3] = {(yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2]};
+          List_Read((yyvsp[-2].l), 0, &d);
+          double pt[3] = {(yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2]};
+          double dir[3] = {(yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2]};
           gLevelset *ls = new gLevelsetGenCylinder(pt, dir, d, t);
           LevelSet *l = Create_LevelSet(ls->getTag(), ls);
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
-      else if(!strcmp((yyvsp[(2) - (14)].c), "Cone") && List_Nbr((yyvsp[(12) - (14)].l)) == 1){
-        int t = (int)(yyvsp[(4) - (14)].d);
+      else if(!strcmp((yyvsp[-12].c), "Cone") && List_Nbr((yyvsp[-2].l)) == 1){
+        int t = (int)(yyvsp[-10].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           double d;
-          List_Read((yyvsp[(12) - (14)].l), 0, &d);
-          double pt[3] = {(yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2]};
-          double dir[3] = {(yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2]};
+          List_Read((yyvsp[-2].l), 0, &d);
+          double pt[3] = {(yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2]};
+          double dir[3] = {(yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2]};
           gLevelset *ls = new gLevelsetCone(pt, dir, d, t);
           LevelSet *l = Create_LevelSet(ls->getTag(), ls);
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
-      else if(!strcmp((yyvsp[(2) - (14)].c), "Cylinder") && List_Nbr((yyvsp[(12) - (14)].l)) == 2){
-        int t = (int)(yyvsp[(4) - (14)].d);
+      else if(!strcmp((yyvsp[-12].c), "Cylinder") && List_Nbr((yyvsp[-2].l)) == 2){
+        int t = (int)(yyvsp[-10].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           double d[2];
           for(int i = 0; i < 2; i++)
-            List_Read((yyvsp[(12) - (14)].l), i, &d[i]);
-          double pt[3] = {(yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2]};
-          double dir[3] = {(yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2]};
+            List_Read((yyvsp[-2].l), i, &d[i]);
+          double pt[3] = {(yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2]};
+          double dir[3] = {(yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2]};
           gLevelset *ls = new gLevelsetCylinder(pt, dir, d[0], d[1], t);
           LevelSet *l = Create_LevelSet(ls->getTag(), ls);
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
-      else if(!strcmp((yyvsp[(2) - (14)].c), "Cylinder") && List_Nbr((yyvsp[(12) - (14)].l)) == 3){
-        int t = (int)(yyvsp[(4) - (14)].d);
+      else if(!strcmp((yyvsp[-12].c), "Cylinder") && List_Nbr((yyvsp[-2].l)) == 3){
+        int t = (int)(yyvsp[-10].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           double d[3];
           for(int i = 0; i < 3; i++)
-            List_Read((yyvsp[(12) - (14)].l), i, &d[i]);
-          double pt[3] = {(yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2]};
-          double dir[3] = {(yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2]};
+            List_Read((yyvsp[-2].l), i, &d[i]);
+          double pt[3] = {(yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2]};
+          double dir[3] = {(yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2]};
           gLevelset *ls = new gLevelsetCylinder(pt, dir, d[0], d[1], d[2], t);
           LevelSet *l = Create_LevelSet(ls->getTag(), ls);
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
-      else if(!strcmp((yyvsp[(2) - (14)].c), "Ellipsoid") && List_Nbr((yyvsp[(12) - (14)].l)) == 3){
-        int t = (int)(yyvsp[(4) - (14)].d);
+      else if(!strcmp((yyvsp[-12].c), "Ellipsoid") && List_Nbr((yyvsp[-2].l)) == 3){
+        int t = (int)(yyvsp[-10].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           double d[3];
           for(int i = 0; i < 3; i++)
-            List_Read((yyvsp[(12) - (14)].l), i, &d[i]);
-          double pt[3] = {(yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2]};
-          double dir[3] = {(yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2]};
+            List_Read((yyvsp[-2].l), i, &d[i]);
+          double pt[3] = {(yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2]};
+          double dir[3] = {(yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2]};
           gLevelset *ls = new gLevelsetEllipsoid(pt, dir, d[0], d[1], d[2], t);
           LevelSet *l = Create_LevelSet(ls->getTag(), ls);
           Tree_Add(GModel::current()->getGEOInternals()->LevelSets, &l);
         }
       }
-      else if(!strcmp((yyvsp[(2) - (14)].c), "Quadric") && List_Nbr((yyvsp[(12) - (14)].l)) == 5){
-        int t = (int)(yyvsp[(4) - (14)].d);
+      else if(!strcmp((yyvsp[-12].c), "Quadric") && List_Nbr((yyvsp[-2].l)) == 5){
+        int t = (int)(yyvsp[-10].d);
         if(FindLevelSet(t)){
 	  yymsg(0, "Levelset %d already exists", t);
         }
         else {
           double d[5];
           for(int i = 0; i < 5; i++)
-            List_Read((yyvsp[(12) - (14)].l), i, &d[i]);
-          double pt[3] = {(yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2]};
-          double dir[3] = {(yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2]};
+            List_Read((yyvsp[-2].l), i, &d[i]);
+          double pt[3] = {(yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2]};
+          double dir[3] = {(yyvsp[-4].v)[0], (yyvsp[-4].v)[1], (yyvsp[-4].v)[2]};
           gLevelset *ls = new gLevelsetGeneralQuadric(pt, dir, d[0], d[1],
                                                       d[2], d[3], d[4], t);
           LevelSet *l = Create_LevelSet(ls->getTag(), ls);
@@ -7926,204 +7472,219 @@ yyreduce:
         }
       }
       else
-        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[(4) - (14)].d));
-      Free((yyvsp[(2) - (14)].c));
+        yymsg(0, "Wrong levelset definition (%d)", (yyvsp[-10].d));
+      Free((yyvsp[-12].c));
 #endif
-    ;}
+    }
+#line 7480 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 202:
-#line 2667 "Gmsh.y"
+#line 2667 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
 	Shape TheShape;
-	List_Read((yyvsp[(3) - (4)].l), i, &TheShape);
+	List_Read((yyvsp[-1].l), i, &TheShape);
 	DeleteShape(TheShape.Type, TheShape.Num);
       }
-      List_Delete((yyvsp[(3) - (4)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 7493 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 203:
-#line 2676 "Gmsh.y"
+#line 2676 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_MESH)
-      GModel::current()->getFields()->deleteField((int)(yyvsp[(4) - (6)].d));
+      GModel::current()->getFields()->deleteField((int)(yyvsp[-2].d));
 #endif
-    ;}
+    }
+#line 7503 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 204:
-#line 2682 "Gmsh.y"
+#line 2682 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      if(!strcmp((yyvsp[(2) - (6)].c), "View")){
-	int index = (int)(yyvsp[(4) - (6)].d);
+      if(!strcmp((yyvsp[-4].c), "View")){
+	int index = (int)(yyvsp[-2].d);
 	if(index >= 0 && index < (int)PView::list.size())
 	  delete PView::list[index];
 	else
 	  yymsg(0, "Unknown view %d", index);
       }
       else
-	yymsg(0, "Unknown command 'Delete %s'", (yyvsp[(2) - (6)].c));
+	yymsg(0, "Unknown command 'Delete %s'", (yyvsp[-4].c));
 #endif
-      Free((yyvsp[(2) - (6)].c));
-    ;}
+      Free((yyvsp[-4].c));
+    }
+#line 7522 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 205:
-#line 2697 "Gmsh.y"
+#line 2697 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!strcmp((yyvsp[(2) - (3)].c), "Meshes") || !strcmp((yyvsp[(2) - (3)].c), "All")){
+      if(!strcmp((yyvsp[-1].c), "Meshes") || !strcmp((yyvsp[-1].c), "All")){
         ClearProject();
       }
-      else if(!strcmp((yyvsp[(2) - (3)].c), "Model")){
+      else if(!strcmp((yyvsp[-1].c), "Model")){
 	GModel::current()->destroy(true); // destroy, but keep name/filename
 	GModel::current()->getGEOInternals()->destroy();
       }
-      else if(!strcmp((yyvsp[(2) - (3)].c), "Physicals")){
+      else if(!strcmp((yyvsp[-1].c), "Physicals")){
 	GModel::current()->getGEOInternals()->reset_physicals();
 	GModel::current()->deletePhysicalGroups();
       }
-      else if(!strcmp((yyvsp[(2) - (3)].c), "Variables")){
+      else if(!strcmp((yyvsp[-1].c), "Variables")){
 	gmsh_yysymbols.clear();
       }
-      else if(!strcmp((yyvsp[(2) - (3)].c), "Options")){
+      else if(!strcmp((yyvsp[-1].c), "Options")){
         ReInitOptions(0);
         InitOptionsGUI(0);
       }
       else{
-	if(gmsh_yysymbols.count((yyvsp[(2) - (3)].c)))
-	  gmsh_yysymbols.erase((yyvsp[(2) - (3)].c));
+	if(gmsh_yysymbols.count((yyvsp[-1].c)))
+	  gmsh_yysymbols.erase((yyvsp[-1].c));
 	else
-	  yymsg(0, "Unknown object or expression to delete '%s'", (yyvsp[(2) - (3)].c));
+	  yymsg(0, "Unknown object or expression to delete '%s'", (yyvsp[-1].c));
       }
-      Free((yyvsp[(2) - (3)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 7554 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 206:
-#line 2725 "Gmsh.y"
+#line 2725 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      if(!strcmp((yyvsp[(2) - (4)].c), "Empty") && !strcmp((yyvsp[(3) - (4)].c), "Views")){
+      if(!strcmp((yyvsp[-2].c), "Empty") && !strcmp((yyvsp[-1].c), "Views")){
 	for(int i = PView::list.size() - 1; i >= 0; i--)
 	  if(PView::list[i]->getData()->empty()) delete PView::list[i];
       }
       else
-	yymsg(0, "Unknown command 'Delete %s %s'", (yyvsp[(2) - (4)].c), (yyvsp[(3) - (4)].c));
+	yymsg(0, "Unknown command 'Delete %s %s'", (yyvsp[-2].c), (yyvsp[-1].c));
 #endif
-      Free((yyvsp[(2) - (4)].c)); Free((yyvsp[(3) - (4)].c));
-    ;}
+      Free((yyvsp[-2].c)); Free((yyvsp[-1].c));
+    }
+#line 7570 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 207:
-#line 2742 "Gmsh.y"
+#line 2742 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
 	Shape TheShape;
-	List_Read((yyvsp[(4) - (5)].l), i, &TheShape);
-	ColorShape(TheShape.Type, TheShape.Num, (yyvsp[(2) - (5)].u), false);
+	List_Read((yyvsp[-1].l), i, &TheShape);
+	ColorShape(TheShape.Type, TheShape.Num, (yyvsp[-3].u), false);
       }
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 7583 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 208:
-#line 2751 "Gmsh.y"
+#line 2751 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(5) - (6)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
 	Shape TheShape;
-	List_Read((yyvsp[(5) - (6)].l), i, &TheShape);
-	ColorShape(TheShape.Type, TheShape.Num, (yyvsp[(3) - (6)].u), true);
+	List_Read((yyvsp[-1].l), i, &TheShape);
+	ColorShape(TheShape.Type, TheShape.Num, (yyvsp[-3].u), true);
       }
-      List_Delete((yyvsp[(5) - (6)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 7596 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 209:
-#line 2765 "Gmsh.y"
+#line 2765 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
 	Shape TheShape;
-	List_Read((yyvsp[(4) - (5)].l), i, &TheShape);
-	SetPartition(TheShape.Type, TheShape.Num, (yyvsp[(2) - (5)].d));
+	List_Read((yyvsp[-1].l), i, &TheShape);
+	SetPartition(TheShape.Type, TheShape.Num, (yyvsp[-3].d));
       }
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 7609 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 210:
-#line 2779 "Gmsh.y"
+#line 2779 "Gmsh.y" /* yacc.c:1646  */
     {
       for(int i = 0; i < 4; i++)
-	VisibilityShape((yyvsp[(2) - (3)].c), i, 1, false);
-      Free((yyvsp[(2) - (3)].c));
-    ;}
+	VisibilityShape((yyvsp[-1].c), i, 1, false);
+      Free((yyvsp[-1].c));
+    }
+#line 7619 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 211:
-#line 2785 "Gmsh.y"
+#line 2785 "Gmsh.y" /* yacc.c:1646  */
     {
       for(int i = 0; i < 4; i++)
-	VisibilityShape((yyvsp[(2) - (3)].c), i, 0, false);
-      Free((yyvsp[(2) - (3)].c));
-    ;}
+	VisibilityShape((yyvsp[-1].c), i, 0, false);
+      Free((yyvsp[-1].c));
+    }
+#line 7629 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 212:
-#line 2791 "Gmsh.y"
+#line 2791 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
 	Shape TheShape;
-	List_Read((yyvsp[(3) - (4)].l), i, &TheShape);
+	List_Read((yyvsp[-1].l), i, &TheShape);
 	VisibilityShape(TheShape.Type, TheShape.Num, 1, false);
       }
-      List_Delete((yyvsp[(3) - (4)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 7642 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 213:
-#line 2800 "Gmsh.y"
+#line 2800 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
 	Shape TheShape;
-	List_Read((yyvsp[(4) - (5)].l), i, &TheShape);
+	List_Read((yyvsp[-1].l), i, &TheShape);
 	VisibilityShape(TheShape.Type, TheShape.Num, 1, true);
       }
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 7655 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 214:
-#line 2809 "Gmsh.y"
+#line 2809 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
 	Shape TheShape;
-	List_Read((yyvsp[(3) - (4)].l), i, &TheShape);
+	List_Read((yyvsp[-1].l), i, &TheShape);
 	VisibilityShape(TheShape.Type, TheShape.Num, 0, false);
       }
-      List_Delete((yyvsp[(3) - (4)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 7668 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 215:
-#line 2818 "Gmsh.y"
+#line 2818 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
 	Shape TheShape;
-	List_Read((yyvsp[(4) - (5)].l), i, &TheShape);
+	List_Read((yyvsp[-1].l), i, &TheShape);
 	VisibilityShape(TheShape.Type, TheShape.Num, 0, true);
       }
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 7681 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 216:
-#line 2832 "Gmsh.y"
+#line 2832 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!strcmp((yyvsp[(1) - (3)].c), "Include")){
-        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(2) - (3)].c));
+      if(!strcmp((yyvsp[-2].c), "Include")){
+        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
 	Msg::StatusBar(true, "Reading '%s'...", tmp.c_str());
 	// Warning: we explicitly ask ParseFile not to fclose() the included
         // file, in order to allow user functions definitions in these files.
@@ -8137,281 +7698,299 @@ yyreduce:
 	SetBoundingBox();
 	Msg::StatusBar(true, "Done reading '%s'", tmp.c_str());
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "Print")){
+      else if(!strcmp((yyvsp[-2].c), "Print")){
 	// make sure we have the latest data from GEO_Internals in GModel
 	// (fixes bug where we would have no geometry in the picture if
 	// the print command is in the same file as the geometry)
 	GModel::current()->importGEOInternals();
-        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(2) - (3)].c));
+        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
 	CreateOutputFile(tmp, CTX::instance()->print.fileFormat);
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "Save")){
+      else if(!strcmp((yyvsp[-2].c), "Save")){
 	GModel::current()->importGEOInternals();
-        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(2) - (3)].c));
+        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
 	CreateOutputFile(tmp, CTX::instance()->mesh.fileFormat);
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "Merge") || !strcmp((yyvsp[(1) - (3)].c), "MergeWithBoundingBox")){
+      else if(!strcmp((yyvsp[-2].c), "Merge") || !strcmp((yyvsp[-2].c), "MergeWithBoundingBox")){
 	// MergeWithBoundingBox is deprecated
-        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(2) - (3)].c));
+        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
 	MergeFile(tmp, true);
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "NonBlockingSystemCall")){
-	SystemCall((yyvsp[(2) - (3)].c));
+      else if(!strcmp((yyvsp[-2].c), "NonBlockingSystemCall")){
+	SystemCall((yyvsp[-1].c));
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "System") || !strcmp((yyvsp[(1) - (3)].c), "SystemCall")){
-	SystemCall((yyvsp[(2) - (3)].c), true);
+      else if(!strcmp((yyvsp[-2].c), "System") || !strcmp((yyvsp[-2].c), "SystemCall")){
+	SystemCall((yyvsp[-1].c), true);
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "SetName")){
-	GModel::current()->setName((yyvsp[(2) - (3)].c));
+      else if(!strcmp((yyvsp[-2].c), "SetName")){
+	GModel::current()->setName((yyvsp[-1].c));
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "CreateDir")){
-        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(2) - (3)].c));
+      else if(!strcmp((yyvsp[-2].c), "CreateDir")){
+        std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
 	CreateSingleDir(tmp);
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "OnelabRun")){
-        Msg::RunOnelabClient((yyvsp[(2) - (3)].c));
+      else if(!strcmp((yyvsp[-2].c), "OnelabRun")){
+        Msg::RunOnelabClient((yyvsp[-1].c));
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "OptimizeMesh")){
-        GModel::current()->optimizeMesh((yyvsp[(2) - (3)].c));
+      else if(!strcmp((yyvsp[-2].c), "OptimizeMesh")){
+        GModel::current()->optimizeMesh((yyvsp[-1].c));
       }
       else{
-	yymsg(0, "Unknown command '%s'", (yyvsp[(1) - (3)].c));
+	yymsg(0, "Unknown command '%s'", (yyvsp[-2].c));
       }
-      Free((yyvsp[(1) - (3)].c)); Free((yyvsp[(2) - (3)].c));
-    ;}
+      Free((yyvsp[-2].c)); Free((yyvsp[-1].c));
+    }
+#line 7744 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 217:
-#line 2891 "Gmsh.y"
+#line 2891 "Gmsh.y" /* yacc.c:1646  */
     {
-      int n = List_Nbr((yyvsp[(3) - (5)].l));
+      int n = List_Nbr((yyvsp[-2].l));
       if(n == 1){
-        char *s; List_Read((yyvsp[(3) - (5)].l), 0, &s);
+        char *s; List_Read((yyvsp[-2].l), 0, &s);
         Msg::RunOnelabClient(s);
         Free(s);
       }
       else if(n == 2){
-        char *s, *t; List_Read((yyvsp[(3) - (5)].l), 0, &s); List_Read((yyvsp[(3) - (5)].l), 1, &t);
+        char *s, *t; List_Read((yyvsp[-2].l), 0, &s); List_Read((yyvsp[-2].l), 1, &t);
         Msg::RunOnelabClient(s, t);
         Free(s); Free(t);
       }
       else{
         yymsg(0, "OnelabRun takes one or two arguments");
       }
-      List_Delete((yyvsp[(3) - (5)].l));
-    ;}
+      List_Delete((yyvsp[-2].l));
+    }
+#line 7766 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 218:
-#line 2909 "Gmsh.y"
+#line 2909 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      if(!strcmp((yyvsp[(1) - (7)].c), "Save") && !strcmp((yyvsp[(2) - (7)].c), "View")){
-	int index = (int)(yyvsp[(4) - (7)].d);
+      if(!strcmp((yyvsp[-6].c), "Save") && !strcmp((yyvsp[-5].c), "View")){
+	int index = (int)(yyvsp[-3].d);
 	if(index >= 0 && index < (int)PView::list.size()){
-          std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(6) - (7)].c));
+          std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
 	  PView::list[index]->write(tmp, CTX::instance()->post.fileFormat);
 	}
 	else
 	  yymsg(0, "Unknown view %d", index);
       }
       else
-	yymsg(0, "Unknown command '%s'", (yyvsp[(1) - (7)].c));
+	yymsg(0, "Unknown command '%s'", (yyvsp[-6].c));
 #endif
-      Free((yyvsp[(1) - (7)].c)); Free((yyvsp[(2) - (7)].c)); Free((yyvsp[(6) - (7)].c));
-    ;}
+      Free((yyvsp[-6].c)); Free((yyvsp[-5].c)); Free((yyvsp[-1].c));
+    }
+#line 7787 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 219:
-#line 2926 "Gmsh.y"
+#line 2926 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST) && defined(HAVE_MESH)
-      if(!strcmp((yyvsp[(1) - (7)].c), "Background") && !strcmp((yyvsp[(2) - (7)].c), "Mesh")  && !strcmp((yyvsp[(3) - (7)].c), "View")){
-	int index = (int)(yyvsp[(5) - (7)].d);
+      if(!strcmp((yyvsp[-6].c), "Background") && !strcmp((yyvsp[-5].c), "Mesh")  && !strcmp((yyvsp[-4].c), "View")){
+	int index = (int)(yyvsp[-2].d);
 	if(index >= 0 && index < (int)PView::list.size())
 	  GModel::current()->getFields()->setBackgroundMesh(index);
 	else
 	  yymsg(0, "Unknown view %d", index);
       }
       else
-	yymsg(0, "Unknown command '%s'", (yyvsp[(1) - (7)].c));
+	yymsg(0, "Unknown command '%s'", (yyvsp[-6].c));
 #endif
-      Free((yyvsp[(1) - (7)].c)); Free((yyvsp[(2) - (7)].c)); Free((yyvsp[(3) - (7)].c));
-    ;}
+      Free((yyvsp[-6].c)); Free((yyvsp[-5].c)); Free((yyvsp[-4].c));
+    }
+#line 7806 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 220:
-#line 2941 "Gmsh.y"
+#line 2941 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!strcmp((yyvsp[(1) - (3)].c), "Sleep")){
-	SleepInSeconds((yyvsp[(2) - (3)].d));
+      if(!strcmp((yyvsp[-2].c), "Sleep")){
+	SleepInSeconds((yyvsp[-1].d));
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "Remesh")){
+      else if(!strcmp((yyvsp[-2].c), "Remesh")){
 	yymsg(0, "Surface remeshing must be reinterfaced");
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "Mesh")){
+      else if(!strcmp((yyvsp[-2].c), "Mesh")){
 	int lock = CTX::instance()->lock;
 	CTX::instance()->lock = 0;
 	GModel::current()->importGEOInternals();
-	GModel::current()->mesh((int)(yyvsp[(2) - (3)].d));
+	GModel::current()->mesh((int)(yyvsp[-1].d));
 	CTX::instance()->lock = lock;
       }
-      else if(!strcmp((yyvsp[(1) - (3)].c), "SetOrder")){
+      else if(!strcmp((yyvsp[-2].c), "SetOrder")){
 #if defined(HAVE_MESH)
-        SetOrderN(GModel::current(), (yyvsp[(2) - (3)].d), CTX::instance()->mesh.secondOrderLinear,
+        SetOrderN(GModel::current(), (yyvsp[-1].d), CTX::instance()->mesh.secondOrderLinear,
                   CTX::instance()->mesh.secondOrderIncomplete,
                   CTX::instance()->mesh.meshOnlyVisible);
 #endif
       }
       else
-	yymsg(0, "Unknown command '%s'", (yyvsp[(1) - (3)].c));
-      Free((yyvsp[(1) - (3)].c));
-    ;}
+	yymsg(0, "Unknown command '%s'", (yyvsp[-2].c));
+      Free((yyvsp[-2].c));
+    }
+#line 7836 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 221:
-#line 2967 "Gmsh.y"
+#line 2967 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_PLUGINS)
        try {
-	 PluginManager::instance()->action((yyvsp[(3) - (7)].c), (yyvsp[(6) - (7)].c), 0);
+	 PluginManager::instance()->action((yyvsp[-4].c), (yyvsp[-1].c), 0);
        }
        catch(...) {
-	 yymsg(0, "Unknown action '%s' or plugin '%s'", (yyvsp[(6) - (7)].c), (yyvsp[(3) - (7)].c));
+	 yymsg(0, "Unknown action '%s' or plugin '%s'", (yyvsp[-1].c), (yyvsp[-4].c));
        }
 #endif
-       Free((yyvsp[(3) - (7)].c)); Free((yyvsp[(6) - (7)].c));
-     ;}
+       Free((yyvsp[-4].c)); Free((yyvsp[-1].c));
+     }
+#line 7852 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 222:
-#line 2979 "Gmsh.y"
+#line 2979 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_POST)
-      if(!strcmp((yyvsp[(2) - (3)].c), "ElementsFromAllViews"))
+      if(!strcmp((yyvsp[-1].c), "ElementsFromAllViews"))
 	PView::combine(false, 1, CTX::instance()->post.combineRemoveOrig);
-      else if(!strcmp((yyvsp[(2) - (3)].c), "ElementsFromVisibleViews"))
+      else if(!strcmp((yyvsp[-1].c), "ElementsFromVisibleViews"))
 	PView::combine(false, 0, CTX::instance()->post.combineRemoveOrig);
-      else if(!strcmp((yyvsp[(2) - (3)].c), "ElementsByViewName"))
+      else if(!strcmp((yyvsp[-1].c), "ElementsByViewName"))
 	PView::combine(false, 2, CTX::instance()->post.combineRemoveOrig);
-      else if(!strcmp((yyvsp[(2) - (3)].c), "TimeStepsFromAllViews"))
+      else if(!strcmp((yyvsp[-1].c), "TimeStepsFromAllViews"))
 	PView::combine(true, 1, CTX::instance()->post.combineRemoveOrig);
-      else if(!strcmp((yyvsp[(2) - (3)].c), "TimeStepsFromVisibleViews"))
+      else if(!strcmp((yyvsp[-1].c), "TimeStepsFromVisibleViews"))
 	PView::combine(true, 0, CTX::instance()->post.combineRemoveOrig);
-      else if(!strcmp((yyvsp[(2) - (3)].c), "TimeStepsByViewName"))
+      else if(!strcmp((yyvsp[-1].c), "TimeStepsByViewName"))
 	PView::combine(true, 2, CTX::instance()->post.combineRemoveOrig);
-      else if(!strcmp((yyvsp[(2) - (3)].c), "Views"))
+      else if(!strcmp((yyvsp[-1].c), "Views"))
 	PView::combine(false, 1, CTX::instance()->post.combineRemoveOrig);
-      else if(!strcmp((yyvsp[(2) - (3)].c), "TimeSteps"))
+      else if(!strcmp((yyvsp[-1].c), "TimeSteps"))
 	PView::combine(true, 2, CTX::instance()->post.combineRemoveOrig);
       else
 	yymsg(0, "Unknown 'Combine' command");
 #endif
-      Free((yyvsp[(2) - (3)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 7880 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 223:
-#line 3003 "Gmsh.y"
+#line 3003 "Gmsh.y" /* yacc.c:1646  */
     {
       Msg::Exit(0);
-    ;}
+    }
+#line 7888 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 224:
-#line 3007 "Gmsh.y"
+#line 3007 "Gmsh.y" /* yacc.c:1646  */
     {
       gmsh_yyerrorstate = 999; // this will be checked when yyparse returns
       YYABORT;
-    ;}
+    }
+#line 7897 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 225:
-#line 3012 "Gmsh.y"
+#line 3012 "Gmsh.y" /* yacc.c:1646  */
     {
       // FIXME: this is a hack to force a transfer from the old DB to
       // the new DB. This will become unnecessary if/when we fill the
       // GModel directly during parsing.
       GModel::current()->importGEOInternals();
-    ;}
+    }
+#line 7908 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 226:
-#line 3019 "Gmsh.y"
+#line 3019 "Gmsh.y" /* yacc.c:1646  */
     {
       new GModel();
       GModel::current(GModel::list.size() - 1);
-    ;}
+    }
+#line 7917 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 227:
-#line 3024 "Gmsh.y"
+#line 3024 "Gmsh.y" /* yacc.c:1646  */
     {
       CTX::instance()->forcedBBox = 0;
       GModel::current()->importGEOInternals();
       SetBoundingBox();
-    ;}
+    }
+#line 7927 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 228:
-#line 3030 "Gmsh.y"
+#line 3030 "Gmsh.y" /* yacc.c:1646  */
     {
       CTX::instance()->forcedBBox = 1;
-      SetBoundingBox((yyvsp[(3) - (15)].d), (yyvsp[(5) - (15)].d), (yyvsp[(7) - (15)].d), (yyvsp[(9) - (15)].d), (yyvsp[(11) - (15)].d), (yyvsp[(13) - (15)].d));
-    ;}
+      SetBoundingBox((yyvsp[-12].d), (yyvsp[-10].d), (yyvsp[-8].d), (yyvsp[-6].d), (yyvsp[-4].d), (yyvsp[-2].d));
+    }
+#line 7936 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 229:
-#line 3035 "Gmsh.y"
+#line 3035 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_OPENGL)
       drawContext::global()->draw();
 #endif
-    ;}
+    }
+#line 7946 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 230:
-#line 3041 "Gmsh.y"
+#line 3041 "Gmsh.y" /* yacc.c:1646  */
     {
 #if defined(HAVE_OPENGL)
      CTX::instance()->mesh.changed = ENT_ALL;
      for(unsigned int index = 0; index < PView::list.size(); index++)
        PView::list[index]->setChanged(true);
 #endif
-    ;}
+    }
+#line 7958 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 231:
-#line 3049 "Gmsh.y"
+#line 3049 "Gmsh.y" /* yacc.c:1646  */
     {
       GModel::current()->createTopologyFromMesh();
-    ;}
+    }
+#line 7966 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 232:
-#line 3053 "Gmsh.y"
+#line 3053 "Gmsh.y" /* yacc.c:1646  */
     {
       GModel::current()->createTopologyFromMesh(1);
-    ;}
+    }
+#line 7974 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 233:
-#line 3057 "Gmsh.y"
+#line 3057 "Gmsh.y" /* yacc.c:1646  */
     {
       GModel::current()->importGEOInternals();
       GModel::current()->refineMesh(CTX::instance()->mesh.secondOrderLinear);
-    ;}
+    }
+#line 7983 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 234:
-#line 3063 "Gmsh.y"
+#line 3063 "Gmsh.y" /* yacc.c:1646  */
     {
       int lock = CTX::instance()->lock;
       CTX::instance()->lock = 0;
       std::vector<int> technique;
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (16)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-13].l)); i++){
         double d;
-        List_Read((yyvsp[(3) - (16)].l), i, &d);
+        List_Read((yyvsp[-13].l), i, &d);
         technique.push_back((int)d);
       }
       if(technique.empty()){
@@ -8419,9 +7998,9 @@ yyreduce:
       }
       else{
         std::vector<simpleFunction<double>*> f;
-        for(int i = 0; i < List_Nbr((yyvsp[(6) - (16)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-10].l)); i++){
           double d;
-          List_Read((yyvsp[(6) - (16)].l), i, &d);
+          List_Read((yyvsp[-10].l), i, &d);
           LevelSet *l = FindLevelSet((int)d);
           if(l) f.push_back(l->ls);
           else yymsg(0, "Unknown Levelset %d", (int)d);
@@ -8430,46 +8009,47 @@ yyreduce:
           yyerror("Number of techniques != number of levelsets");
         }
         else{
-          if(List_Nbr((yyvsp[(9) - (16)].l)) != (int)f.size()){
+          if(List_Nbr((yyvsp[-7].l)) != (int)f.size()){
             yyerror("Number of parameters != number of levelsets");
           }
           else{
             std::vector<std::vector<double> > parameters;
-            parameters.resize(List_Nbr((yyvsp[(9) - (16)].l)));
-            for(int i = 0; i < List_Nbr((yyvsp[(9) - (16)].l)); i++){
-              List_T *l = *(List_T**)List_Pointer((yyvsp[(9) - (16)].l), i);
+            parameters.resize(List_Nbr((yyvsp[-7].l)));
+            for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
+              List_T *l = *(List_T**)List_Pointer((yyvsp[-7].l), i);
               for(int j = 0; j < List_Nbr(l); j++){
                 double d;
                 List_Read(l, j, &d);
                 parameters[i].push_back(d);
               }
             }
-            int niter = (int)(yyvsp[(12) - (16)].d);
-            bool meshAll = ((yyvsp[(14) - (16)].d) == 0) ? false : true;
+            int niter = (int)(yyvsp[-4].d);
+            bool meshAll = ((yyvsp[-2].d) == 0) ? false : true;
             GModel::current()->importGEOInternals();
             GModel::current()->adaptMesh(technique, f, parameters, niter, meshAll);
           }
         }
       }
-      List_Delete((yyvsp[(3) - (16)].l));
-      List_Delete((yyvsp[(6) - (16)].l));
-      for(int i = 0; i < List_Nbr((yyvsp[(9) - (16)].l)); i++)
-        List_Delete(*(List_T**)List_Pointer((yyvsp[(9) - (16)].l), i));
-      List_Delete((yyvsp[(9) - (16)].l));
+      List_Delete((yyvsp[-13].l));
+      List_Delete((yyvsp[-10].l));
+      for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++)
+        List_Delete(*(List_T**)List_Pointer((yyvsp[-7].l), i));
+      List_Delete((yyvsp[-7].l));
       CTX::instance()->lock = lock;
-    ;}
+    }
+#line 8041 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 235:
-#line 3122 "Gmsh.y"
+#line 3122 "Gmsh.y" /* yacc.c:1646  */
     {
-      LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (6)].d);
-      LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(5) - (6)].d);
+      LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[-3].d);
+      LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[-1].d);
       LoopControlVariablesTab[ImbricatedLoop][2] = 1.0;
       LoopControlVariablesNameTab[ImbricatedLoop] = "";
       gmshgetpos(gmsh_yyin, &yyposImbricatedLoopsTab[ImbricatedLoop]);
       yylinenoImbricatedLoopsTab[ImbricatedLoop] = gmsh_yylineno;
-      if((yyvsp[(3) - (6)].d) > (yyvsp[(5) - (6)].d))
+      if((yyvsp[-3].d) > (yyvsp[-1].d))
 	skip_until("For", "EndFor");
       else
 	ImbricatedLoop++;
@@ -8477,19 +8057,20 @@ yyreduce:
 	yymsg(0, "Reached maximum number of imbricated loops");
 	ImbricatedLoop = MAX_RECUR_LOOPS - 1;
       }
-    ;}
+    }
+#line 8062 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 236:
-#line 3139 "Gmsh.y"
+#line 3139 "Gmsh.y" /* yacc.c:1646  */
     {
-      LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (8)].d);
-      LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(5) - (8)].d);
-      LoopControlVariablesTab[ImbricatedLoop][2] = (yyvsp[(7) - (8)].d);
+      LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[-5].d);
+      LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[-3].d);
+      LoopControlVariablesTab[ImbricatedLoop][2] = (yyvsp[-1].d);
       LoopControlVariablesNameTab[ImbricatedLoop] = "";
       gmshgetpos(gmsh_yyin, &yyposImbricatedLoopsTab[ImbricatedLoop]);
       yylinenoImbricatedLoopsTab[ImbricatedLoop] = gmsh_yylineno;
-      if(((yyvsp[(7) - (8)].d) > 0. && (yyvsp[(3) - (8)].d) > (yyvsp[(5) - (8)].d)) || ((yyvsp[(7) - (8)].d) < 0. && (yyvsp[(3) - (8)].d) < (yyvsp[(5) - (8)].d)))
+      if(((yyvsp[-1].d) > 0. && (yyvsp[-5].d) > (yyvsp[-3].d)) || ((yyvsp[-1].d) < 0. && (yyvsp[-5].d) < (yyvsp[-3].d)))
 	skip_until("For", "EndFor");
       else
 	ImbricatedLoop++;
@@ -8497,23 +8078,24 @@ yyreduce:
 	yymsg(0, "Reached maximum number of imbricated loops");
 	ImbricatedLoop = MAX_RECUR_LOOPS - 1;
       }
-    ;}
+    }
+#line 8083 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 237:
-#line 3156 "Gmsh.y"
+#line 3156 "Gmsh.y" /* yacc.c:1646  */
     {
-      LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (8)].d);
-      LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(7) - (8)].d);
+      LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[-3].d);
+      LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[-1].d);
       LoopControlVariablesTab[ImbricatedLoop][2] = 1.0;
-      LoopControlVariablesNameTab[ImbricatedLoop] = (yyvsp[(2) - (8)].c);
-      gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(2) - (8)].c)]);
+      LoopControlVariablesNameTab[ImbricatedLoop] = (yyvsp[-6].c);
+      gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-6].c)]);
       s.list = false;
       s.value.resize(1);
-      s.value[0] = (yyvsp[(5) - (8)].d);
+      s.value[0] = (yyvsp[-3].d);
       gmshgetpos(gmsh_yyin, &yyposImbricatedLoopsTab[ImbricatedLoop]);
       yylinenoImbricatedLoopsTab[ImbricatedLoop] = gmsh_yylineno;
-      if((yyvsp[(5) - (8)].d) > (yyvsp[(7) - (8)].d))
+      if((yyvsp[-3].d) > (yyvsp[-1].d))
 	skip_until("For", "EndFor");
       else
 	ImbricatedLoop++;
@@ -8521,24 +8103,25 @@ yyreduce:
 	yymsg(0, "Reached maximum number of imbricated loops");
 	ImbricatedLoop = MAX_RECUR_LOOPS - 1;
       }
-      Free((yyvsp[(2) - (8)].c));
-    ;}
+      Free((yyvsp[-6].c));
+    }
+#line 8109 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 238:
-#line 3178 "Gmsh.y"
+#line 3178 "Gmsh.y" /* yacc.c:1646  */
     {
-      LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (10)].d);
-      LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(7) - (10)].d);
-      LoopControlVariablesTab[ImbricatedLoop][2] = (yyvsp[(9) - (10)].d);
-      LoopControlVariablesNameTab[ImbricatedLoop] = (yyvsp[(2) - (10)].c);
-      gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(2) - (10)].c)]);
+      LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[-5].d);
+      LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[-3].d);
+      LoopControlVariablesTab[ImbricatedLoop][2] = (yyvsp[-1].d);
+      LoopControlVariablesNameTab[ImbricatedLoop] = (yyvsp[-8].c);
+      gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-8].c)]);
       s.list = false;
       s.value.resize(1);
-      s.value[0] = (yyvsp[(5) - (10)].d);
+      s.value[0] = (yyvsp[-5].d);
       gmshgetpos(gmsh_yyin, &yyposImbricatedLoopsTab[ImbricatedLoop]);
       yylinenoImbricatedLoopsTab[ImbricatedLoop] = gmsh_yylineno;
-      if(((yyvsp[(9) - (10)].d) > 0. && (yyvsp[(5) - (10)].d) > (yyvsp[(7) - (10)].d)) || ((yyvsp[(9) - (10)].d) < 0. && (yyvsp[(5) - (10)].d) < (yyvsp[(7) - (10)].d)))
+      if(((yyvsp[-1].d) > 0. && (yyvsp[-5].d) > (yyvsp[-3].d)) || ((yyvsp[-1].d) < 0. && (yyvsp[-5].d) < (yyvsp[-3].d)))
 	skip_until("For", "EndFor");
       else
 	ImbricatedLoop++;
@@ -8546,12 +8129,13 @@ yyreduce:
 	yymsg(0, "Reached maximum number of imbricated loops");
 	ImbricatedLoop = MAX_RECUR_LOOPS - 1;
       }
-      Free((yyvsp[(2) - (10)].c));
-    ;}
+      Free((yyvsp[-8].c));
+    }
+#line 8135 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 239:
-#line 3200 "Gmsh.y"
+#line 3200 "Gmsh.y" /* yacc.c:1646  */
     {
       if(ImbricatedLoop <= 0){
 	yymsg(0, "Invalid For/EndFor loop");
@@ -8585,62 +8169,68 @@ yyreduce:
 	else
 	  ImbricatedLoop--;
       }
-    ;}
+    }
+#line 8174 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 240:
-#line 3235 "Gmsh.y"
+#line 3235 "Gmsh.y" /* yacc.c:1646  */
     {
       if(!FunctionManager::Instance()->createFunction
-         (std::string((yyvsp[(2) - (2)].c)), gmsh_yyin, gmsh_yyname, gmsh_yylineno))
-	yymsg(0, "Redefinition of function %s", (yyvsp[(2) - (2)].c));
+         (std::string((yyvsp[0].c)), gmsh_yyin, gmsh_yyname, gmsh_yylineno))
+	yymsg(0, "Redefinition of function %s", (yyvsp[0].c));
       skip_until(NULL, "Return");
-      Free((yyvsp[(2) - (2)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 8186 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 241:
-#line 3243 "Gmsh.y"
+#line 3243 "Gmsh.y" /* yacc.c:1646  */
     {
       if(!FunctionManager::Instance()->createFunction
-         (std::string((yyvsp[(2) - (2)].c)), gmsh_yyin, gmsh_yyname, gmsh_yylineno))
-	yymsg(0, "Redefinition of function %s", (yyvsp[(2) - (2)].c));
+         (std::string((yyvsp[0].c)), gmsh_yyin, gmsh_yyname, gmsh_yylineno))
+	yymsg(0, "Redefinition of function %s", (yyvsp[0].c));
       skip_until(NULL, "Return");
-      Free((yyvsp[(2) - (2)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 8198 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 242:
-#line 3251 "Gmsh.y"
+#line 3251 "Gmsh.y" /* yacc.c:1646  */
     {
       if(!FunctionManager::Instance()->leaveFunction
          (&gmsh_yyin, gmsh_yyname, gmsh_yylineno))
 	yymsg(0, "Error while exiting function");
-    ;}
+    }
+#line 8208 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 243:
-#line 3257 "Gmsh.y"
+#line 3257 "Gmsh.y" /* yacc.c:1646  */
     {
       if(!FunctionManager::Instance()->enterFunction
-         (std::string((yyvsp[(2) - (3)].c)), &gmsh_yyin, gmsh_yyname, gmsh_yylineno))
-	yymsg(0, "Unknown function %s", (yyvsp[(2) - (3)].c));
-      Free((yyvsp[(2) - (3)].c));
-    ;}
+         (std::string((yyvsp[-1].c)), &gmsh_yyin, gmsh_yyname, gmsh_yylineno))
+	yymsg(0, "Unknown function %s", (yyvsp[-1].c));
+      Free((yyvsp[-1].c));
+    }
+#line 8219 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 244:
-#line 3264 "Gmsh.y"
+#line 3264 "Gmsh.y" /* yacc.c:1646  */
     {
       if(!FunctionManager::Instance()->enterFunction
-         (std::string((yyvsp[(2) - (3)].c)), &gmsh_yyin, gmsh_yyname, gmsh_yylineno))
-	yymsg(0, "Unknown function %s", (yyvsp[(2) - (3)].c));
-      Free((yyvsp[(2) - (3)].c));
-    ;}
+         (std::string((yyvsp[-1].c)), &gmsh_yyin, gmsh_yyname, gmsh_yylineno))
+	yymsg(0, "Unknown function %s", (yyvsp[-1].c));
+      Free((yyvsp[-1].c));
+    }
+#line 8230 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 245:
-#line 3271 "Gmsh.y"
+#line 3271 "Gmsh.y" /* yacc.c:1646  */
     {
       ImbricatedTest++;
       if(ImbricatedTest > MAX_RECUR_TESTS-1){
@@ -8648,7 +8238,7 @@ yyreduce:
         ImbricatedTest = MAX_RECUR_TESTS-1;
       }
 
-      if((yyvsp[(3) - (4)].d)){
+      if((yyvsp[-1].d)){
         // Current test is true
         statusImbricatedTests[ImbricatedTest] = 1;
       }
@@ -8659,11 +8249,12 @@ yyreduce:
         skip_until_test("If", "EndIf", "ElseIf", 4, &type_until2);
         if(!type_until2) ImbricatedTest--; // EndIf reached
       }
-    ;}
+    }
+#line 8254 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 246:
-#line 3291 "Gmsh.y"
+#line 3291 "Gmsh.y" /* yacc.c:1646  */
     {
       if(ImbricatedTest > 0){
         if (statusImbricatedTests[ImbricatedTest]){
@@ -8673,7 +8264,7 @@ yyreduce:
         }
         else{
           // Previous test(s) (If and ElseIf) not yet true
-          if((yyvsp[(3) - (4)].d)){
+          if((yyvsp[-1].d)){
             statusImbricatedTests[ImbricatedTest] = 1;
           }
           else{
@@ -8688,11 +8279,12 @@ yyreduce:
       else{
 	yymsg(0, "Orphan ElseIf");
       }
-    ;}
+    }
+#line 8284 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 247:
-#line 3317 "Gmsh.y"
+#line 3317 "Gmsh.y" /* yacc.c:1646  */
     {
       if(ImbricatedTest > 0){
         if(statusImbricatedTests[ImbricatedTest]){
@@ -8703,676 +8295,743 @@ yyreduce:
       else{
 	yymsg(0, "Orphan Else");
       }
-    ;}
+    }
+#line 8300 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 248:
-#line 3329 "Gmsh.y"
+#line 3329 "Gmsh.y" /* yacc.c:1646  */
     {
       ImbricatedTest--;
       if(ImbricatedTest < 0)
         yymsg(1, "Orphan EndIf");
-    ;}
+    }
+#line 8310 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 249:
-#line 3341 "Gmsh.y"
+#line 3341 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShapes(TRANSLATE, (yyvsp[(4) - (5)].l),
-		    (yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+      ExtrudeShapes(TRANSLATE, (yyvsp[-1].l),
+		    (yyvsp[-3].v)[0], (yyvsp[-3].v)[1], (yyvsp[-3].v)[2], 0., 0., 0., 0., 0., 0., 0.,
 		    NULL, (yyval.l));
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 8322 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 250:
-#line 3349 "Gmsh.y"
+#line 3349 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShapes(ROTATE, (yyvsp[(10) - (11)].l),
-		    0., 0., 0., (yyvsp[(3) - (11)].v)[0], (yyvsp[(3) - (11)].v)[1], (yyvsp[(3) - (11)].v)[2], (yyvsp[(5) - (11)].v)[0], (yyvsp[(5) - (11)].v)[1], (yyvsp[(5) - (11)].v)[2], (yyvsp[(7) - (11)].d),
+      ExtrudeShapes(ROTATE, (yyvsp[-1].l),
+		    0., 0., 0., (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d),
 		    NULL, (yyval.l));
-      List_Delete((yyvsp[(10) - (11)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 8334 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 251:
-#line 3357 "Gmsh.y"
+#line 3357 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[(12) - (13)].l),
-		    (yyvsp[(3) - (13)].v)[0], (yyvsp[(3) - (13)].v)[1], (yyvsp[(3) - (13)].v)[2], (yyvsp[(5) - (13)].v)[0], (yyvsp[(5) - (13)].v)[1], (yyvsp[(5) - (13)].v)[2], (yyvsp[(7) - (13)].v)[0], (yyvsp[(7) - (13)].v)[1], (yyvsp[(7) - (13)].v)[2], (yyvsp[(9) - (13)].d),
+      ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[-1].l),
+		    (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], (yyvsp[-4].d),
 		    NULL, (yyval.l));
-      List_Delete((yyvsp[(12) - (13)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 8346 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 252:
-#line 3365 "Gmsh.y"
+#line 3365 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8356 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 253:
-#line 3371 "Gmsh.y"
+#line 3371 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShapes(TRANSLATE, (yyvsp[(4) - (7)].l),
-		    (yyvsp[(2) - (7)].v)[0], (yyvsp[(2) - (7)].v)[1], (yyvsp[(2) - (7)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+      ExtrudeShapes(TRANSLATE, (yyvsp[-3].l),
+		    (yyvsp[-5].v)[0], (yyvsp[-5].v)[1], (yyvsp[-5].v)[2], 0., 0., 0., 0., 0., 0., 0.,
 		    &extr, (yyval.l));
-      List_Delete((yyvsp[(4) - (7)].l));
-    ;}
+      List_Delete((yyvsp[-3].l));
+    }
+#line 8368 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 254:
-#line 3379 "Gmsh.y"
+#line 3379 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8378 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 255:
-#line 3385 "Gmsh.y"
+#line 3385 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShapes(ROTATE, (yyvsp[(10) - (13)].l),
-		    0., 0., 0., (yyvsp[(3) - (13)].v)[0], (yyvsp[(3) - (13)].v)[1], (yyvsp[(3) - (13)].v)[2], (yyvsp[(5) - (13)].v)[0], (yyvsp[(5) - (13)].v)[1], (yyvsp[(5) - (13)].v)[2], (yyvsp[(7) - (13)].d),
+      ExtrudeShapes(ROTATE, (yyvsp[-3].l),
+		    0., 0., 0., (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
 		    &extr, (yyval.l));
-      List_Delete((yyvsp[(10) - (13)].l));
-    ;}
+      List_Delete((yyvsp[-3].l));
+    }
+#line 8390 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 256:
-#line 3393 "Gmsh.y"
+#line 3393 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8400 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 257:
-#line 3399 "Gmsh.y"
+#line 3399 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[(12) - (15)].l),
-		    (yyvsp[(3) - (15)].v)[0], (yyvsp[(3) - (15)].v)[1], (yyvsp[(3) - (15)].v)[2], (yyvsp[(5) - (15)].v)[0], (yyvsp[(5) - (15)].v)[1], (yyvsp[(5) - (15)].v)[2], (yyvsp[(7) - (15)].v)[0], (yyvsp[(7) - (15)].v)[1], (yyvsp[(7) - (15)].v)[2], (yyvsp[(9) - (15)].d),
+      ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[-3].l),
+		    (yyvsp[-12].v)[0], (yyvsp[-12].v)[1], (yyvsp[-12].v)[2], (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
 		    &extr, (yyval.l));
-      List_Delete((yyvsp[(12) - (15)].l));
-    ;}
+      List_Delete((yyvsp[-3].l));
+    }
+#line 8412 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 258:
-#line 3407 "Gmsh.y"
+#line 3407 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8422 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 259:
-#line 3413 "Gmsh.y"
+#line 3413 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShapes(BOUNDARY_LAYER, (yyvsp[(3) - (6)].l), 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,
+      ExtrudeShapes(BOUNDARY_LAYER, (yyvsp[-3].l), 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,
 		    &extr, (yyval.l));
-      List_Delete((yyvsp[(3) - (6)].l));
-    ;}
+      List_Delete((yyvsp[-3].l));
+    }
+#line 8433 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 260:
-#line 3421 "Gmsh.y"
+#line 3421 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[(4) - (8)].d),
-		   (yyvsp[(6) - (8)].v)[0], (yyvsp[(6) - (8)].v)[1], (yyvsp[(6) - (8)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+      ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[-4].d),
+		   (yyvsp[-2].v)[0], (yyvsp[-2].v)[1], (yyvsp[-2].v)[2], 0., 0., 0., 0., 0., 0., 0.,
 		   NULL, (yyval.l));
-    ;}
+    }
+#line 8444 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 261:
-#line 3428 "Gmsh.y"
+#line 3428 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (8)].d),
-		   (yyvsp[(6) - (8)].v)[0], (yyvsp[(6) - (8)].v)[1], (yyvsp[(6) - (8)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+      ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[-4].d),
+		   (yyvsp[-2].v)[0], (yyvsp[-2].v)[1], (yyvsp[-2].v)[2], 0., 0., 0., 0., 0., 0., 0.,
 		   NULL, (yyval.l));
-    ;}
+    }
+#line 8455 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 262:
-#line 3435 "Gmsh.y"
+#line 3435 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (8)].d),
-		   (yyvsp[(6) - (8)].v)[0], (yyvsp[(6) - (8)].v)[1], (yyvsp[(6) - (8)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+      ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[-4].d),
+		   (yyvsp[-2].v)[0], (yyvsp[-2].v)[1], (yyvsp[-2].v)[2], 0., 0., 0., 0., 0., 0., 0.,
 		   NULL, (yyval.l));
-    ;}
+    }
+#line 8466 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 263:
-#line 3442 "Gmsh.y"
+#line 3442 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[(4) - (12)].d),
-		   0., 0., 0., (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], (yyvsp[(8) - (12)].v)[0], (yyvsp[(8) - (12)].v)[1], (yyvsp[(8) - (12)].v)[2], (yyvsp[(10) - (12)].d),
+      ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[-8].d),
+		   0., 0., 0., (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, (yyval.l));
-    ;}
+    }
+#line 8477 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 264:
-#line 3449 "Gmsh.y"
+#line 3449 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (12)].d),
-		   0., 0., 0., (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], (yyvsp[(8) - (12)].v)[0], (yyvsp[(8) - (12)].v)[1], (yyvsp[(8) - (12)].v)[2], (yyvsp[(10) - (12)].d),
+      ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[-8].d),
+		   0., 0., 0., (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, (yyval.l));
-    ;}
+    }
+#line 8488 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 265:
-#line 3456 "Gmsh.y"
+#line 3456 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (12)].d),
-		   0., 0., 0., (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], (yyvsp[(8) - (12)].v)[0], (yyvsp[(8) - (12)].v)[1], (yyvsp[(8) - (12)].v)[2], (yyvsp[(10) - (12)].d),
+      ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[-8].d),
+		   0., 0., 0., (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, (yyval.l));
-    ;}
+    }
+#line 8499 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 266:
-#line 3463 "Gmsh.y"
+#line 3463 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[(4) - (14)].d),
-		   (yyvsp[(6) - (14)].v)[0], (yyvsp[(6) - (14)].v)[1], (yyvsp[(6) - (14)].v)[2], (yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2], (yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2], (yyvsp[(12) - (14)].d),
+      ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[-10].d),
+		   (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (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, (yyval.l));
-    ;}
+    }
+#line 8510 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 267:
-#line 3470 "Gmsh.y"
+#line 3470 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (14)].d),
-		   (yyvsp[(6) - (14)].v)[0], (yyvsp[(6) - (14)].v)[1], (yyvsp[(6) - (14)].v)[2], (yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2], (yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2], (yyvsp[(12) - (14)].d),
+      ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[-10].d),
+		   (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (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, (yyval.l));
-    ;}
+    }
+#line 8521 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 268:
-#line 3477 "Gmsh.y"
+#line 3477 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (14)].d),
-		   (yyvsp[(6) - (14)].v)[0], (yyvsp[(6) - (14)].v)[1], (yyvsp[(6) - (14)].v)[2], (yyvsp[(8) - (14)].v)[0], (yyvsp[(8) - (14)].v)[1], (yyvsp[(8) - (14)].v)[2], (yyvsp[(10) - (14)].v)[0], (yyvsp[(10) - (14)].v)[1], (yyvsp[(10) - (14)].v)[2], (yyvsp[(12) - (14)].d),
+      ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[-10].d),
+		   (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (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, (yyval.l));
-    ;}
+    }
+#line 8532 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 269:
-#line 3484 "Gmsh.y"
+#line 3484 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8542 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 270:
-#line 3490 "Gmsh.y"
+#line 3490 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[(4) - (12)].d),
-		   (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+      ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[-8].d),
+		   (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], 0., 0., 0., 0., 0., 0., 0.,
 		   &extr, (yyval.l));
-    ;}
+    }
+#line 8553 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 271:
-#line 3497 "Gmsh.y"
+#line 3497 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8563 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 272:
-#line 3503 "Gmsh.y"
+#line 3503 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (12)].d),
-		   (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+      ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[-8].d),
+		   (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], 0., 0., 0., 0., 0., 0., 0.,
 		   &extr, (yyval.l));
-    ;}
+    }
+#line 8574 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 273:
-#line 3510 "Gmsh.y"
+#line 3510 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8584 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 274:
-#line 3516 "Gmsh.y"
+#line 3516 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (12)].d),
-		   (yyvsp[(6) - (12)].v)[0], (yyvsp[(6) - (12)].v)[1], (yyvsp[(6) - (12)].v)[2], 0., 0., 0., 0., 0., 0., 0.,
+      ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[-8].d),
+		   (yyvsp[-6].v)[0], (yyvsp[-6].v)[1], (yyvsp[-6].v)[2], 0., 0., 0., 0., 0., 0., 0.,
 		   &extr, (yyval.l));
-    ;}
+    }
+#line 8595 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 275:
-#line 3523 "Gmsh.y"
+#line 3523 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8605 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 276:
-#line 3529 "Gmsh.y"
+#line 3529 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[(4) - (16)].d),
-		   0., 0., 0., (yyvsp[(6) - (16)].v)[0], (yyvsp[(6) - (16)].v)[1], (yyvsp[(6) - (16)].v)[2], (yyvsp[(8) - (16)].v)[0], (yyvsp[(8) - (16)].v)[1], (yyvsp[(8) - (16)].v)[2], (yyvsp[(10) - (16)].d),
+      ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[-12].d),
+		   0., 0., 0., (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
 		   &extr, (yyval.l));
-    ;}
+    }
+#line 8616 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 277:
-#line 3536 "Gmsh.y"
+#line 3536 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8626 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 278:
-#line 3542 "Gmsh.y"
+#line 3542 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (16)].d),
-		   0., 0., 0., (yyvsp[(6) - (16)].v)[0], (yyvsp[(6) - (16)].v)[1], (yyvsp[(6) - (16)].v)[2], (yyvsp[(8) - (16)].v)[0], (yyvsp[(8) - (16)].v)[1], (yyvsp[(8) - (16)].v)[2], (yyvsp[(10) - (16)].d),
+      ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[-12].d),
+		   0., 0., 0., (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
 		   &extr, (yyval.l));
-    ;}
+    }
+#line 8637 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 279:
-#line 3549 "Gmsh.y"
+#line 3549 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8647 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 280:
-#line 3555 "Gmsh.y"
+#line 3555 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (16)].d),
-		   0., 0., 0., (yyvsp[(6) - (16)].v)[0], (yyvsp[(6) - (16)].v)[1], (yyvsp[(6) - (16)].v)[2], (yyvsp[(8) - (16)].v)[0], (yyvsp[(8) - (16)].v)[1], (yyvsp[(8) - (16)].v)[2], (yyvsp[(10) - (16)].d),
+      ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[-12].d),
+		   0., 0., 0., (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
 		   &extr, (yyval.l));
-    ;}
+    }
+#line 8658 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 281:
-#line 3562 "Gmsh.y"
+#line 3562 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8668 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 282:
-#line 3568 "Gmsh.y"
+#line 3568 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[(4) - (18)].d),
-		   (yyvsp[(6) - (18)].v)[0], (yyvsp[(6) - (18)].v)[1], (yyvsp[(6) - (18)].v)[2], (yyvsp[(8) - (18)].v)[0], (yyvsp[(8) - (18)].v)[1], (yyvsp[(8) - (18)].v)[2], (yyvsp[(10) - (18)].v)[0], (yyvsp[(10) - (18)].v)[1], (yyvsp[(10) - (18)].v)[2], (yyvsp[(12) - (18)].d),
+      ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[-14].d),
+		   (yyvsp[-12].v)[0], (yyvsp[-12].v)[1], (yyvsp[-12].v)[2], (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
 		   &extr, (yyval.l));
-    ;}
+    }
+#line 8679 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 283:
-#line 3575 "Gmsh.y"
+#line 3575 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8689 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 284:
-#line 3581 "Gmsh.y"
+#line 3581 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (18)].d),
-		   (yyvsp[(6) - (18)].v)[0], (yyvsp[(6) - (18)].v)[1], (yyvsp[(6) - (18)].v)[2], (yyvsp[(8) - (18)].v)[0], (yyvsp[(8) - (18)].v)[1], (yyvsp[(8) - (18)].v)[2], (yyvsp[(10) - (18)].v)[0], (yyvsp[(10) - (18)].v)[1], (yyvsp[(10) - (18)].v)[2], (yyvsp[(12) - (18)].d),
+      ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[-14].d),
+		   (yyvsp[-12].v)[0], (yyvsp[-12].v)[1], (yyvsp[-12].v)[2], (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
 		   &extr, (yyval.l));
-    ;}
+    }
+#line 8700 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 285:
-#line 3588 "Gmsh.y"
+#line 3588 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
       extr.mesh.QuadToTri = NO_QUADTRI;
       extr.mesh.ScaleLast = false;
-    ;}
+    }
+#line 8710 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 286:
-#line 3594 "Gmsh.y"
+#line 3594 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(Shape));
-      ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (18)].d),
-		   (yyvsp[(6) - (18)].v)[0], (yyvsp[(6) - (18)].v)[1], (yyvsp[(6) - (18)].v)[2], (yyvsp[(8) - (18)].v)[0], (yyvsp[(8) - (18)].v)[1], (yyvsp[(8) - (18)].v)[2], (yyvsp[(10) - (18)].v)[0], (yyvsp[(10) - (18)].v)[1], (yyvsp[(10) - (18)].v)[2], (yyvsp[(12) - (18)].d),
+      ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[-14].d),
+		   (yyvsp[-12].v)[0], (yyvsp[-12].v)[1], (yyvsp[-12].v)[2], (yyvsp[-10].v)[0], (yyvsp[-10].v)[1], (yyvsp[-10].v)[2], (yyvsp[-8].v)[0], (yyvsp[-8].v)[1], (yyvsp[-8].v)[2], (yyvsp[-6].d),
 		   &extr, (yyval.l));
-    ;}
+    }
+#line 8721 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 287:
-#line 3605 "Gmsh.y"
+#line 3605 "Gmsh.y" /* yacc.c:1646  */
     {
-    ;}
+    }
+#line 8728 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 288:
-#line 3608 "Gmsh.y"
+#line 3608 "Gmsh.y" /* yacc.c:1646  */
     {
-    ;}
+    }
+#line 8735 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 289:
-#line 3614 "Gmsh.y"
+#line 3614 "Gmsh.y" /* yacc.c:1646  */
     {
-      int n = (int)fabs((yyvsp[(3) - (5)].d));
+      int n = (int)fabs((yyvsp[-2].d));
       if(n){ // we accept n==0 to easily disable layers
         extr.mesh.ExtrudeMesh = true;
         extr.mesh.NbLayer = 1;
         extr.mesh.NbElmLayer.clear();
         extr.mesh.hLayer.clear();
-        extr.mesh.NbElmLayer.push_back((int)fabs((yyvsp[(3) - (5)].d)));
+        extr.mesh.NbElmLayer.push_back((int)fabs((yyvsp[-2].d)));
         extr.mesh.hLayer.push_back(1.);
       }
-    ;}
+    }
+#line 8751 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 290:
-#line 3626 "Gmsh.y"
+#line 3626 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ExtrudeMesh = true;
-      extr.mesh.NbLayer = List_Nbr((yyvsp[(3) - (7)].l));
-      if(List_Nbr((yyvsp[(3) - (7)].l)) == List_Nbr((yyvsp[(5) - (7)].l))){
+      extr.mesh.NbLayer = List_Nbr((yyvsp[-4].l));
+      if(List_Nbr((yyvsp[-4].l)) == List_Nbr((yyvsp[-2].l))){
 	extr.mesh.NbElmLayer.clear();
 	extr.mesh.hLayer.clear();
-	for(int i = 0; i < List_Nbr((yyvsp[(3) - (7)].l)); i++){
+	for(int i = 0; i < List_Nbr((yyvsp[-4].l)); i++){
 	  double d;
-	  List_Read((yyvsp[(3) - (7)].l), i, &d);
+	  List_Read((yyvsp[-4].l), i, &d);
 	  extr.mesh.NbElmLayer.push_back((d > 0) ? (int)d : 1);
-	  List_Read((yyvsp[(5) - (7)].l), i, &d);
+	  List_Read((yyvsp[-2].l), i, &d);
 	  extr.mesh.hLayer.push_back(d);
 	}
       }
       else
-	yymsg(0, "Wrong layer definition {%d, %d}", List_Nbr((yyvsp[(3) - (7)].l)), List_Nbr((yyvsp[(5) - (7)].l)));
-      List_Delete((yyvsp[(3) - (7)].l));
-      List_Delete((yyvsp[(5) - (7)].l));
-    ;}
+	yymsg(0, "Wrong layer definition {%d, %d}", List_Nbr((yyvsp[-4].l)), List_Nbr((yyvsp[-2].l)));
+      List_Delete((yyvsp[-4].l));
+      List_Delete((yyvsp[-2].l));
+    }
+#line 8775 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 291:
-#line 3646 "Gmsh.y"
+#line 3646 "Gmsh.y" /* yacc.c:1646  */
     {
       yymsg(0, "Explicit region numbers in layers are deprecated");
       extr.mesh.ExtrudeMesh = true;
-      extr.mesh.NbLayer = List_Nbr((yyvsp[(3) - (9)].l));
-      if(List_Nbr((yyvsp[(3) - (9)].l)) == List_Nbr((yyvsp[(5) - (9)].l)) && List_Nbr((yyvsp[(3) - (9)].l)) == List_Nbr((yyvsp[(7) - (9)].l))){
+      extr.mesh.NbLayer = List_Nbr((yyvsp[-6].l));
+      if(List_Nbr((yyvsp[-6].l)) == List_Nbr((yyvsp[-4].l)) && List_Nbr((yyvsp[-6].l)) == List_Nbr((yyvsp[-2].l))){
 	extr.mesh.NbElmLayer.clear();
 	extr.mesh.hLayer.clear();
-	for(int i = 0; i < List_Nbr((yyvsp[(3) - (9)].l)); i++){
+	for(int i = 0; i < List_Nbr((yyvsp[-6].l)); i++){
 	  double d;
-	  List_Read((yyvsp[(3) - (9)].l), i, &d);
+	  List_Read((yyvsp[-6].l), i, &d);
 	  extr.mesh.NbElmLayer.push_back((d > 0) ? (int)d : 1);
-	  List_Read((yyvsp[(7) - (9)].l), i, &d);
+	  List_Read((yyvsp[-2].l), i, &d);
 	  extr.mesh.hLayer.push_back(d);
 	}
       }
       else
-	yymsg(0, "Wrong layer definition {%d, %d, %d}", List_Nbr((yyvsp[(3) - (9)].l)),
-	      List_Nbr((yyvsp[(5) - (9)].l)), List_Nbr((yyvsp[(7) - (9)].l)));
-      List_Delete((yyvsp[(3) - (9)].l));
-      List_Delete((yyvsp[(5) - (9)].l));
-      List_Delete((yyvsp[(7) - (9)].l));
-    ;}
+	yymsg(0, "Wrong layer definition {%d, %d, %d}", List_Nbr((yyvsp[-6].l)),
+	      List_Nbr((yyvsp[-4].l)), List_Nbr((yyvsp[-2].l)));
+      List_Delete((yyvsp[-6].l));
+      List_Delete((yyvsp[-4].l));
+      List_Delete((yyvsp[-2].l));
+    }
+#line 8802 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 292:
-#line 3670 "Gmsh.y"
+#line 3670 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.ScaleLast = true;
-    ;}
+    }
+#line 8810 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 293:
-#line 3674 "Gmsh.y"
+#line 3674 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.Recombine = true;
-    ;}
+    }
+#line 8818 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 294:
-#line 3678 "Gmsh.y"
+#line 3678 "Gmsh.y" /* yacc.c:1646  */
     {
       yymsg(0, "Keyword 'QuadTriSngl' deprecated. Use 'QuadTriNoNewVerts' instead.");
-    ;}
+    }
+#line 8826 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 295:
-#line 3682 "Gmsh.y"
+#line 3682 "Gmsh.y" /* yacc.c:1646  */
     {
       yymsg(0, "Keyword 'QuadTriSngl' deprecated. Use 'QuadTriNoNewVerts' instead.");
-    ;}
+    }
+#line 8834 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 296:
-#line 3686 "Gmsh.y"
+#line 3686 "Gmsh.y" /* yacc.c:1646  */
     {
       yymsg(0, "Method 'QuadTriDbl' deprecated. Use 'QuadTriAddVerts' instead, "
             "which has no requirement for the number of extrusion layers and meshes "
             "with body-centered vertices.");
-    ;}
+    }
+#line 8844 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 297:
-#line 3692 "Gmsh.y"
+#line 3692 "Gmsh.y" /* yacc.c:1646  */
     {
       yymsg(0, "Method 'QuadTriDbl' deprecated. Use 'QuadTriAddVerts' instead, "
             "which has no requirement for the number of extrusion layers and meshes "
             "with body-centered vertices.");
-    ;}
+    }
+#line 8854 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 298:
-#line 3698 "Gmsh.y"
+#line 3698 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.QuadToTri = QUADTRI_ADDVERTS_1;
-    ;}
+    }
+#line 8862 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 299:
-#line 3702 "Gmsh.y"
+#line 3702 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.QuadToTri = QUADTRI_ADDVERTS_1_RECOMB;
-    ;}
+    }
+#line 8870 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 300:
-#line 3706 "Gmsh.y"
+#line 3706 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.QuadToTri = QUADTRI_NOVERTS_1;
-    ;}
+    }
+#line 8878 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 301:
-#line 3710 "Gmsh.y"
+#line 3710 "Gmsh.y" /* yacc.c:1646  */
     {
       extr.mesh.QuadToTri = QUADTRI_NOVERTS_1_RECOMB;
-    ;}
+    }
+#line 8886 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 302:
-#line 3714 "Gmsh.y"
+#line 3714 "Gmsh.y" /* yacc.c:1646  */
     {
-      int num = (int)(yyvsp[(3) - (9)].d);
+      int num = (int)(yyvsp[-6].d);
       if(FindSurface(num)){
 	yymsg(0, "Surface %d already exists", num);
       }
       else{
 	Surface *s = Create_Surface(num, MSH_SURF_DISCRETE);
 	Tree_Add(GModel::current()->getGEOInternals()->Surfaces, &s);
-	extr.mesh.Holes[num].first = (yyvsp[(8) - (9)].d);
+	extr.mesh.Holes[num].first = (yyvsp[-1].d);
 	extr.mesh.Holes[num].second.clear();
-	for(int i = 0; i < List_Nbr((yyvsp[(6) - (9)].l)); i++){
+	for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
 	  double d;
-	  List_Read((yyvsp[(6) - (9)].l), i, &d);
+	  List_Read((yyvsp[-3].l), i, &d);
 	  extr.mesh.Holes[num].second.push_back((int)d);
 	}
       }
-      List_Delete((yyvsp[(6) - (9)].l));
-    ;}
+      List_Delete((yyvsp[-3].l));
+    }
+#line 8909 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 303:
-#line 3733 "Gmsh.y"
+#line 3733 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!strcmp((yyvsp[(2) - (6)].c), "Index"))
-        extr.mesh.BoundaryLayerIndex = (yyvsp[(4) - (6)].d);
-      else if(!strcmp((yyvsp[(2) - (6)].c), "View"))
-        extr.mesh.ViewIndex = (yyvsp[(4) - (6)].d);
-      Free((yyvsp[(2) - (6)].c));
-    ;}
+      if(!strcmp((yyvsp[-4].c), "Index"))
+        extr.mesh.BoundaryLayerIndex = (yyvsp[-2].d);
+      else if(!strcmp((yyvsp[-4].c), "View"))
+        extr.mesh.ViewIndex = (yyvsp[-2].d);
+      Free((yyvsp[-4].c));
+    }
+#line 8921 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 304:
-#line 3745 "Gmsh.y"
+#line 3745 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.v)[0] = (yyval.v)[1] = 1.;
-    ;}
+    }
+#line 8929 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 305:
-#line 3749 "Gmsh.y"
+#line 3749 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!strcmp((yyvsp[(2) - (3)].c), "Progression") || !strcmp((yyvsp[(2) - (3)].c), "Power"))
+      if(!strcmp((yyvsp[-1].c), "Progression") || !strcmp((yyvsp[-1].c), "Power"))
         (yyval.v)[0] = 1.;
-      else if(!strcmp((yyvsp[(2) - (3)].c), "Bump"))
+      else if(!strcmp((yyvsp[-1].c), "Bump"))
         (yyval.v)[0] = 2.;
       else{
         yymsg(0, "Unknown transfinite mesh type");
         (yyval.v)[0] = 1.;
       }
-      (yyval.v)[1] = (yyvsp[(3) - (3)].d);
-      Free((yyvsp[(2) - (3)].c));
-    ;}
+      (yyval.v)[1] = (yyvsp[0].d);
+      Free((yyvsp[-1].c));
+    }
+#line 8946 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 306:
-#line 3764 "Gmsh.y"
+#line 3764 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.i) = -1; // left
-    ;}
+    }
+#line 8954 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 307:
-#line 3768 "Gmsh.y"
+#line 3768 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!strcmp((yyvsp[(1) - (1)].c), "Right"))
+      if(!strcmp((yyvsp[0].c), "Right"))
         (yyval.i) = 1;
-      else if(!strcmp((yyvsp[(1) - (1)].c), "Left"))
+      else if(!strcmp((yyvsp[0].c), "Left"))
 	(yyval.i) = -1;
-      else if(!strcmp((yyvsp[(1) - (1)].c), "AlternateRight"))
+      else if(!strcmp((yyvsp[0].c), "AlternateRight"))
 	(yyval.i) = 2;
-      else if(!strcmp((yyvsp[(1) - (1)].c), "AlternateLeft"))
+      else if(!strcmp((yyvsp[0].c), "AlternateLeft"))
 	(yyval.i) = -2;
       else // "Alternate" -> "Alternate Right"
 	(yyval.i) = 2;
-      Free((yyvsp[(1) - (1)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 8972 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 308:
-#line 3784 "Gmsh.y"
+#line 3784 "Gmsh.y" /* yacc.c:1646  */
     {
      (yyval.l) = List_Create(1, 1, sizeof(double));
-   ;}
+   }
+#line 8980 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 309:
-#line 3788 "Gmsh.y"
+#line 3788 "Gmsh.y" /* yacc.c:1646  */
     {
-     (yyval.l) = (yyvsp[(2) - (2)].l);
-   ;}
+     (yyval.l) = (yyvsp[0].l);
+   }
+#line 8988 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 310:
-#line 3793 "Gmsh.y"
+#line 3793 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.i) = 45;
-    ;}
+    }
+#line 8996 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 311:
-#line 3797 "Gmsh.y"
+#line 3797 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.i) = (int)(yyvsp[(2) - (2)].d);
-    ;}
+      (yyval.i) = (int)(yyvsp[0].d);
+    }
+#line 9004 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 312:
-#line 3803 "Gmsh.y"
+#line 3803 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(1, 1, sizeof(double));
-    ;}
+    }
+#line 9012 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 313:
-#line 3807 "Gmsh.y"
+#line 3807 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = (yyvsp[(2) - (2)].l);
-    ;}
+      (yyval.l) = (yyvsp[0].l);
+    }
+#line 9020 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 314:
-#line 3814 "Gmsh.y"
+#line 3814 "Gmsh.y" /* yacc.c:1646  */
     {
-      int type = (int)(yyvsp[(6) - (7)].v)[0];
-      double coef = fabs((yyvsp[(6) - (7)].v)[1]);
-      if(!(yyvsp[(3) - (7)].l)){
+      int type = (int)(yyvsp[-1].v)[0];
+      double coef = fabs((yyvsp[-1].v)[1]);
+      if(!(yyvsp[-4].l)){
         List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Curves);
         if(List_Nbr(tmp)){
           for(int i = 0; i < List_Nbr(tmp); i++){
             Curve *c;
             List_Read(tmp, i, &c);
             c->Method = MESH_TRANSFINITE;
-            c->nbPointsTransfinite = ((yyvsp[(5) - (7)].d) > 2) ? (int)(yyvsp[(5) - (7)].d) : 2;
+            c->nbPointsTransfinite = ((yyvsp[-2].d) > 2) ? (int)(yyvsp[-2].d) : 2;
             c->typeTransfinite = type;
             c->coeffTransfinite = coef;
           }
@@ -9381,7 +9040,7 @@ yyreduce:
           for(GModel::eiter it = GModel::current()->firstEdge();
               it != GModel::current()->lastEdge(); it++){
             (*it)->meshAttributes.method = MESH_TRANSFINITE;
-            (*it)->meshAttributes.nbPointsTransfinite = ((yyvsp[(5) - (7)].d) > 2) ? (int)(yyvsp[(5) - (7)].d) : 2;
+            (*it)->meshAttributes.nbPointsTransfinite = ((yyvsp[-2].d) > 2) ? (int)(yyvsp[-2].d) : 2;
             (*it)->meshAttributes.typeTransfinite = type;
             (*it)->meshAttributes.coeffTransfinite = coef;
           }
@@ -9389,15 +9048,15 @@ yyreduce:
         List_Delete(tmp);
       }
       else{
-        for(int i = 0; i < List_Nbr((yyvsp[(3) - (7)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-4].l)); i++){
           double d;
-          List_Read((yyvsp[(3) - (7)].l), i, &d);
+          List_Read((yyvsp[-4].l), i, &d);
           int j = (int)fabs(d);
           for(int sign = -1; sign <= 1; sign += 2){
             Curve *c = FindCurve(sign * j);
             if(c){
               c->Method = MESH_TRANSFINITE;
-              c->nbPointsTransfinite = ((yyvsp[(5) - (7)].d) > 2) ? (int)(yyvsp[(5) - (7)].d) : 2;
+              c->nbPointsTransfinite = ((yyvsp[-2].d) > 2) ? (int)(yyvsp[-2].d) : 2;
               c->typeTransfinite = type * sign(d);
               c->coeffTransfinite = coef;
             }
@@ -9405,7 +9064,7 @@ yyreduce:
               GEdge *ge = GModel::current()->getEdgeByTag(sign * j);
               if(ge){
                 ge->meshAttributes.method = MESH_TRANSFINITE;
-                ge->meshAttributes.nbPointsTransfinite = ((yyvsp[(5) - (7)].d) > 2) ? (int)(yyvsp[(5) - (7)].d) : 2;
+                ge->meshAttributes.nbPointsTransfinite = ((yyvsp[-2].d) > 2) ? (int)(yyvsp[-2].d) : 2;
                 ge->meshAttributes.typeTransfinite = type * sign(d);
                 ge->meshAttributes.coeffTransfinite = coef;
               }
@@ -9414,27 +9073,28 @@ yyreduce:
             }
           }
         }
-        List_Delete((yyvsp[(3) - (7)].l));
+        List_Delete((yyvsp[-4].l));
       }
-    ;}
+    }
+#line 9080 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 315:
-#line 3870 "Gmsh.y"
+#line 3870 "Gmsh.y" /* yacc.c:1646  */
     {
-      int k = List_Nbr((yyvsp[(4) - (6)].l));
+      int k = List_Nbr((yyvsp[-2].l));
       if(k != 0 && k != 3 && k != 4){
         yymsg(0, "Wrong definition of Transfinite Surface: 0, 3 or 4 points needed");
       }
       else{
-        if(!(yyvsp[(3) - (6)].l)){
+        if(!(yyvsp[-3].l)){
           List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Surfaces);
           if(List_Nbr(tmp)){
             for(int i = 0; i < List_Nbr(tmp); i++){
               Surface *s;
               List_Read(tmp, i, &s);
               s->Method = MESH_TRANSFINITE;
-              s->Recombine_Dir = (yyvsp[(5) - (6)].i);
+              s->Recombine_Dir = (yyvsp[-1].i);
               List_Reset(s->TrsfPoints);
             }
           }
@@ -9442,23 +9102,23 @@ yyreduce:
             for(GModel::fiter it = GModel::current()->firstFace();
                 it != GModel::current()->lastFace(); it++){
               (*it)->meshAttributes.method = MESH_TRANSFINITE;
-              (*it)->meshAttributes.transfiniteArrangement = (yyvsp[(5) - (6)].i);
+              (*it)->meshAttributes.transfiniteArrangement = (yyvsp[-1].i);
             }
           }
           List_Delete(tmp);
         }
         else{
-          for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
+          for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
             double d;
-            List_Read((yyvsp[(3) - (6)].l), i, &d);
+            List_Read((yyvsp[-3].l), i, &d);
             Surface *s = FindSurface((int)d);
             if(s){
               s->Method = MESH_TRANSFINITE;
-              s->Recombine_Dir = (yyvsp[(5) - (6)].i);
+              s->Recombine_Dir = (yyvsp[-1].i);
               List_Reset(s->TrsfPoints);
               for(int j = 0; j < k; j++){
                 double p;
-                List_Read((yyvsp[(4) - (6)].l), j, &p);
+                List_Read((yyvsp[-2].l), j, &p);
                 Vertex *v = FindPoint((int)fabs(p));
                 if(v)
                   List_Add(s->TrsfPoints, &v);
@@ -9470,10 +9130,10 @@ yyreduce:
               GFace *gf = GModel::current()->getFaceByTag((int)d);
               if(gf){
                 gf->meshAttributes.method = MESH_TRANSFINITE;
-                gf->meshAttributes.transfiniteArrangement = (yyvsp[(5) - (6)].i);
+                gf->meshAttributes.transfiniteArrangement = (yyvsp[-1].i);
                 for(int j = 0; j < k; j++){
                   double p;
-                  List_Read((yyvsp[(4) - (6)].l), j, &p);
+                  List_Read((yyvsp[-2].l), j, &p);
                   GVertex *gv = GModel::current()->getVertexByTag((int)fabs(p));
                   if(gv)
                     gf->meshAttributes.corners.push_back(gv);
@@ -9485,31 +9145,33 @@ yyreduce:
                 yymsg(0, "Unknown surface %d", (int)d);
             }
           }
-          List_Delete((yyvsp[(3) - (6)].l));
+          List_Delete((yyvsp[-3].l));
         }
       }
-      List_Delete((yyvsp[(4) - (6)].l));
-    ;}
+      List_Delete((yyvsp[-2].l));
+    }
+#line 9154 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 316:
-#line 3940 "Gmsh.y"
+#line 3940 "Gmsh.y" /* yacc.c:1646  */
     {
       yymsg(1, "Elliptic Surface is deprecated: use Transfinite instead (with smoothing)");
-      List_Delete((yyvsp[(7) - (8)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 9163 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 317:
-#line 3945 "Gmsh.y"
+#line 3945 "Gmsh.y" /* yacc.c:1646  */
     {
-      int k = List_Nbr((yyvsp[(4) - (5)].l));
+      int k = List_Nbr((yyvsp[-1].l));
       if(k != 0 && k != 6 && k != 8){
         yymsg(0, "Wrong definition of Transfinite Volume: "
               "%d points instead of 6 or 8", k);
       }
       else{
-        if(!(yyvsp[(3) - (5)].l)){
+        if(!(yyvsp[-2].l)){
           List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Volumes);
           if(List_Nbr(tmp)){
             for(int i = 0; i < List_Nbr(tmp); i++){
@@ -9528,16 +9190,16 @@ yyreduce:
           List_Delete(tmp);
         }
         else{
-          for(int i = 0; i < List_Nbr((yyvsp[(3) - (5)].l)); i++){
+          for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
             double d;
-            List_Read((yyvsp[(3) - (5)].l), i, &d);
+            List_Read((yyvsp[-2].l), i, &d);
             Volume *v = FindVolume((int)d);
             if(v){
               v->Method = MESH_TRANSFINITE;
               List_Reset(v->TrsfPoints);
               for(int i = 0; i < k; i++){
                 double p;
-                List_Read((yyvsp[(4) - (5)].l), i, &p);
+                List_Read((yyvsp[-1].l), i, &p);
                 Vertex *vert = FindPoint((int)fabs(p));
                 if(vert)
                   List_Add(v->TrsfPoints, &vert);
@@ -9551,7 +9213,7 @@ yyreduce:
                 gr->meshAttributes.method = MESH_TRANSFINITE;
                 for(int i = 0; i < k; i++){
                   double p;
-                  List_Read((yyvsp[(4) - (5)].l), i, &p);
+                  List_Read((yyvsp[-1].l), i, &p);
                   GVertex *gv = GModel::current()->getVertexByTag((int)fabs(p));
                   if(gv)
                     gr->meshAttributes.corners.push_back(gv);
@@ -9563,17 +9225,18 @@ yyreduce:
                 yymsg(0, "Unknown volume %d", (int)d);
             }
           }
-          List_Delete((yyvsp[(3) - (5)].l));
+          List_Delete((yyvsp[-2].l));
         }
       }
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 9234 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 318:
-#line 4012 "Gmsh.y"
+#line 4012 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!(yyvsp[(2) - (3)].l)){
+      if(!(yyvsp[-1].l)){
   	  List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Volumes);
         if(List_Nbr(tmp)){
           for(int i = 0; i < List_Nbr(tmp); i++){
@@ -9590,9 +9253,9 @@ yyreduce:
         List_Delete(tmp);
       }
       else{
-        for(int i = 0; i < List_Nbr((yyvsp[(2) - (3)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(2) - (3)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           Volume *v = FindVolume((int)d);
           if(v)
             v->QuadTri = TRANSFINITE_QUADTRI_1;
@@ -9604,72 +9267,75 @@ yyreduce:
               yymsg(1, "Unknown volume %d", (int)d);
           }
         }
-        List_Delete((yyvsp[(2) - (3)].l));
+        List_Delete((yyvsp[-1].l));
       }
-    ;}
+    }
+#line 9274 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 319:
-#line 4048 "Gmsh.y"
+#line 4048 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (8)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-4].l)); i++){
 	double d;
-	List_Read((yyvsp[(4) - (8)].l), i, &d);
-	CTX::instance()->mesh.algo2d_per_face[(int)d] = (int)(yyvsp[(7) - (8)].d);
+	List_Read((yyvsp[-4].l), i, &d);
+	CTX::instance()->mesh.algo2d_per_face[(int)d] = (int)(yyvsp[-1].d);
       }
-    ;}
+    }
+#line 9286 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 320:
-#line 4056 "Gmsh.y"
+#line 4056 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!(yyvsp[(3) - (5)].l)){
+      if(!(yyvsp[-2].l)){
 	List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Surfaces);
         if(List_Nbr(tmp)){
           for(int i = 0; i < List_Nbr(tmp); i++){
             Surface *s;
             List_Read(tmp, i, &s);
             s->Recombine = 1;
-            s->RecombineAngle = (yyvsp[(4) - (5)].i);
+            s->RecombineAngle = (yyvsp[-1].i);
           }
         }
         else{
           for(GModel::fiter it = GModel::current()->firstFace();
               it != GModel::current()->lastFace(); it++){
             (*it)->meshAttributes.recombine = 1;
-            (*it)->meshAttributes.recombineAngle = (yyvsp[(4) - (5)].i);
+            (*it)->meshAttributes.recombineAngle = (yyvsp[-1].i);
           }
         }
         List_Delete(tmp);
       }
       else{
-        for(int i = 0; i < List_Nbr((yyvsp[(3) - (5)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
           double d;
-          List_Read((yyvsp[(3) - (5)].l), i, &d);
+          List_Read((yyvsp[-2].l), i, &d);
           Surface *s = FindSurface((int)d);
           if(s){
             s->Recombine = 1;
-            s->RecombineAngle = (yyvsp[(4) - (5)].i);
+            s->RecombineAngle = (yyvsp[-1].i);
           }
           else{
             GFace *gf = GModel::current()->getFaceByTag((int)d);
             if(gf){
               gf->meshAttributes.recombine = 1;
-              gf->meshAttributes.recombineAngle = (yyvsp[(4) - (5)].i);
+              gf->meshAttributes.recombineAngle = (yyvsp[-1].i);
             }
             else
               yymsg(1, "Unknown surface %d", (int)d);
           }
         }
-        List_Delete((yyvsp[(3) - (5)].l));
+        List_Delete((yyvsp[-2].l));
       }
-    ;}
+    }
+#line 9333 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 321:
-#line 4099 "Gmsh.y"
+#line 4099 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!(yyvsp[(3) - (4)].l)){
+      if(!(yyvsp[-1].l)){
 	List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Volumes);
         if(List_Nbr(tmp)){
           for(int i = 0; i < List_Nbr(tmp); i++){
@@ -9687,9 +9353,9 @@ yyreduce:
         List_Delete(tmp);
       }
       else{
-        for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(3) - (4)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           Volume *v = FindVolume((int)d);
           if(v){
             v->Recombine3D = 1;
@@ -9703,246 +9369,255 @@ yyreduce:
               yymsg(1, "Unknown volume %d", (int)d);
           }
         }
-        List_Delete((yyvsp[(3) - (4)].l));
+        List_Delete((yyvsp[-1].l));
       }
-    ;}
+    }
+#line 9376 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 322:
-#line 4138 "Gmsh.y"
+#line 4138 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
         double d;
-        List_Read((yyvsp[(3) - (6)].l), i, &d);
+        List_Read((yyvsp[-3].l), i, &d);
         int j = (int)d;
         Surface *s = FindSurface(j);
         if(s){
-          s->TransfiniteSmoothing = (int)(yyvsp[(5) - (6)].d);
+          s->TransfiniteSmoothing = (int)(yyvsp[-1].d);
         }
         else{
           GFace *gf = GModel::current()->getFaceByTag(j);
           if(gf)
-            gf->meshAttributes.transfiniteSmoothing = (int)(yyvsp[(5) - (6)].d);
+            gf->meshAttributes.transfiniteSmoothing = (int)(yyvsp[-1].d);
           else
-            yymsg(1, "Unknown surface %d", (int)(yyvsp[(5) - (6)].d));
+            yymsg(1, "Unknown surface %d", (int)(yyvsp[-1].d));
         }
       }
-      List_Delete((yyvsp[(3) - (6)].l));
-    ;}
+      List_Delete((yyvsp[-3].l));
+    }
+#line 9400 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 323:
-#line 4159 "Gmsh.y"
+#line 4159 "Gmsh.y" /* yacc.c:1646  */
     {
-      if (List_Nbr((yyvsp[(4) - (11)].l)) != List_Nbr((yyvsp[(8) - (11)].l))){
+      if (List_Nbr((yyvsp[-7].l)) != List_Nbr((yyvsp[-3].l))){
         yymsg(0, "Number of master lines (%d) different from number of "
-              "slaves (%d) ", List_Nbr((yyvsp[(8) - (11)].l)), List_Nbr((yyvsp[(4) - (11)].l)));
+              "slaves (%d) ", List_Nbr((yyvsp[-3].l)), List_Nbr((yyvsp[-7].l)));
       }
       else{
         std::vector<double> transfo;
-        if(List_Nbr((yyvsp[(10) - (11)].l)) != 0) {
-          if (List_Nbr((yyvsp[(10) - (11)].l)) < 12){
+        if(List_Nbr((yyvsp[-1].l)) != 0) {
+          if (List_Nbr((yyvsp[-1].l)) < 12){
             yymsg(0, "Affine transformation requires at least 12 entries (we have %d)",
-                  List_Nbr((yyvsp[(10) - (11)].l)));
+                  List_Nbr((yyvsp[-1].l)));
           }
           else {
-            transfo.resize(List_Nbr((yyvsp[(10) - (11)].l)));
-            for(int i = 0; i < List_Nbr((yyvsp[(10) - (11)].l)); i++)
-              List_Read((yyvsp[(10) - (11)].l), i, &transfo[i]);
+            transfo.resize(List_Nbr((yyvsp[-1].l)));
+            for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+              List_Read((yyvsp[-1].l), i, &transfo[i]);
           }
         }
-        for(int i = 0; i < List_Nbr((yyvsp[(4) - (11)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
           double d_master, d_slave;
-          List_Read((yyvsp[(8) - (11)].l), i, &d_master);
-          List_Read((yyvsp[(4) - (11)].l), i, &d_slave);
+          List_Read((yyvsp[-3].l), i, &d_master);
+          List_Read((yyvsp[-7].l), i, &d_slave);
           int j_master = (int)d_master;
           int j_slave  = (int)d_slave;
           addPeriodicEdge(j_slave, j_master, transfo);
         }
       }
-      List_Delete((yyvsp[(4) - (11)].l));
-      List_Delete((yyvsp[(8) - (11)].l));
-    ;}
+      List_Delete((yyvsp[-7].l));
+      List_Delete((yyvsp[-3].l));
+    }
+#line 9435 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 324:
-#line 4191 "Gmsh.y"
+#line 4191 "Gmsh.y" /* yacc.c:1646  */
     {
-      if (List_Nbr((yyvsp[(4) - (11)].l)) != List_Nbr((yyvsp[(8) - (11)].l))){
+      if (List_Nbr((yyvsp[-7].l)) != List_Nbr((yyvsp[-3].l))){
         yymsg(0, "Number of master faces (%d) different from number of "
-              "slaves (%d) ", List_Nbr((yyvsp[(8) - (11)].l)), List_Nbr((yyvsp[(4) - (11)].l)));
+              "slaves (%d) ", List_Nbr((yyvsp[-3].l)), List_Nbr((yyvsp[-7].l)));
       }
       else{
-        if (List_Nbr((yyvsp[(10) - (11)].l)) < 12){
+        if (List_Nbr((yyvsp[-1].l)) < 12){
           // FIXME full automatic case here if List_Nbr($10) == 0)
           yymsg(0, "Affine transformation requires at least 12 entries");
         }
         else {
           std::vector<double> transfo(16,0);
-          for(int i = 0; i < List_Nbr((yyvsp[(10) - (11)].l)); i++)
-            List_Read((yyvsp[(10) - (11)].l), i, &transfo[i]);
-          for(int i = 0; i < List_Nbr((yyvsp[(4) - (11)].l)); i++){
+          for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+            List_Read((yyvsp[-1].l), i, &transfo[i]);
+          for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
             double d_master, d_slave;
-            List_Read((yyvsp[(8) - (11)].l), i, &d_master);
-            List_Read((yyvsp[(4) - (11)].l), i, &d_slave);
+            List_Read((yyvsp[-3].l), i, &d_master);
+            List_Read((yyvsp[-7].l), i, &d_slave);
             addPeriodicFace(d_slave, d_master, transfo);
           }
         }
       }
-      List_Delete((yyvsp[(4) - (11)].l));
-      List_Delete((yyvsp[(8) - (11)].l));
-    ;}
+      List_Delete((yyvsp[-7].l));
+      List_Delete((yyvsp[-3].l));
+    }
+#line 9465 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 325:
-#line 4218 "Gmsh.y"
+#line 4218 "Gmsh.y" /* yacc.c:1646  */
     {
-      if (List_Nbr((yyvsp[(4) - (18)].l)) != List_Nbr((yyvsp[(8) - (18)].l))){
+      if (List_Nbr((yyvsp[-14].l)) != List_Nbr((yyvsp[-10].l))){
         yymsg(0, "Number of master edges (%d) different from number of "
-              "slaves (%d) ", List_Nbr((yyvsp[(8) - (18)].l)), List_Nbr((yyvsp[(4) - (18)].l)));
+              "slaves (%d) ", List_Nbr((yyvsp[-10].l)), List_Nbr((yyvsp[-14].l)));
       }
       else{
-        SPoint3 axis((yyvsp[(12) - (18)].v)[0],(yyvsp[(12) - (18)].v)[1],(yyvsp[(12) - (18)].v)[2]);
-        SPoint3 origin((yyvsp[(14) - (18)].v)[0],(yyvsp[(14) - (18)].v)[1],(yyvsp[(14) - (18)].v)[2]);
-        double  angle((yyvsp[(16) - (18)].d));
+        SPoint3 axis((yyvsp[-6].v)[0],(yyvsp[-6].v)[1],(yyvsp[-6].v)[2]);
+        SPoint3 origin((yyvsp[-4].v)[0],(yyvsp[-4].v)[1],(yyvsp[-4].v)[2]);
+        double  angle((yyvsp[-2].d));
         SPoint3 translation(0,0,0);
 
         std::vector<double> transfo;
         computeAffineTransformation(origin,axis,angle,translation,transfo);
 
-        for(int i = 0; i < List_Nbr((yyvsp[(4) - (18)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-14].l)); i++){
           double d_master, d_slave;
-          List_Read((yyvsp[(8) - (18)].l), i, &d_master);
-          List_Read((yyvsp[(4) - (18)].l), i, &d_slave);
+          List_Read((yyvsp[-10].l), i, &d_master);
+          List_Read((yyvsp[-14].l), i, &d_slave);
           addPeriodicEdge(d_slave,d_master,transfo);
         }
       }
-      List_Delete((yyvsp[(4) - (18)].l));
-      List_Delete((yyvsp[(8) - (18)].l));
-    ;}
+      List_Delete((yyvsp[-14].l));
+      List_Delete((yyvsp[-10].l));
+    }
+#line 9494 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 326:
-#line 4244 "Gmsh.y"
+#line 4244 "Gmsh.y" /* yacc.c:1646  */
     {
-      if (List_Nbr((yyvsp[(4) - (18)].l)) != List_Nbr((yyvsp[(8) - (18)].l))){
+      if (List_Nbr((yyvsp[-14].l)) != List_Nbr((yyvsp[-10].l))){
         yymsg(0, "Number of master faces (%d) different from number of "
-              "slaves (%d) ", List_Nbr((yyvsp[(8) - (18)].l)), List_Nbr((yyvsp[(4) - (18)].l)));
+              "slaves (%d) ", List_Nbr((yyvsp[-10].l)), List_Nbr((yyvsp[-14].l)));
       }
       else{
-        SPoint3 origin((yyvsp[(14) - (18)].v)[0],(yyvsp[(14) - (18)].v)[1],(yyvsp[(14) - (18)].v)[2]);
-        SPoint3 axis((yyvsp[(12) - (18)].v)[0],(yyvsp[(12) - (18)].v)[1],(yyvsp[(12) - (18)].v)[2]);
-        double  angle((yyvsp[(16) - (18)].d));
+        SPoint3 origin((yyvsp[-4].v)[0],(yyvsp[-4].v)[1],(yyvsp[-4].v)[2]);
+        SPoint3 axis((yyvsp[-6].v)[0],(yyvsp[-6].v)[1],(yyvsp[-6].v)[2]);
+        double  angle((yyvsp[-2].d));
         SPoint3 translation(0,0,0);
 
         std::vector<double> transfo;
         computeAffineTransformation(origin,axis,angle,translation,transfo);
 
-        for(int i = 0; i < List_Nbr((yyvsp[(4) - (18)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-14].l)); i++){
           double d_master, d_slave;
-          List_Read((yyvsp[(8) - (18)].l), i, &d_master);
-          List_Read((yyvsp[(4) - (18)].l), i, &d_slave);
+          List_Read((yyvsp[-10].l), i, &d_master);
+          List_Read((yyvsp[-14].l), i, &d_slave);
           addPeriodicFace(d_slave, d_master, transfo);
         }
       }
-      List_Delete((yyvsp[(4) - (18)].l));
-      List_Delete((yyvsp[(8) - (18)].l));
-    ;}
+      List_Delete((yyvsp[-14].l));
+      List_Delete((yyvsp[-10].l));
+    }
+#line 9523 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 327:
-#line 4270 "Gmsh.y"
+#line 4270 "Gmsh.y" /* yacc.c:1646  */
     {
-      if (List_Nbr((yyvsp[(4) - (12)].l)) != List_Nbr((yyvsp[(8) - (12)].l))){
+      if (List_Nbr((yyvsp[-8].l)) != List_Nbr((yyvsp[-4].l))){
         yymsg(0, "Number of master edges (%d) different from number of "
-              "slaves (%d) ", List_Nbr((yyvsp[(8) - (12)].l)), List_Nbr((yyvsp[(4) - (12)].l)));
+              "slaves (%d) ", List_Nbr((yyvsp[-4].l)), List_Nbr((yyvsp[-8].l)));
       }
       else{
         SPoint3 origin(0,0,0);
         SPoint3 axis(0,0,0);
         double  angle(0);
-        SPoint3 translation((yyvsp[(11) - (12)].v)[0],(yyvsp[(11) - (12)].v)[1],(yyvsp[(11) - (12)].v)[2]);
+        SPoint3 translation((yyvsp[-1].v)[0],(yyvsp[-1].v)[1],(yyvsp[-1].v)[2]);
 
         std::vector<double> transfo;
         computeAffineTransformation(origin,axis,angle,translation,transfo);
 
-        for(int i = 0; i < List_Nbr((yyvsp[(4) - (12)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-8].l)); i++){
           double d_master, d_slave;
-          List_Read((yyvsp[(8) - (12)].l), i, &d_master);
-          List_Read((yyvsp[(4) - (12)].l), i, &d_slave);
+          List_Read((yyvsp[-4].l), i, &d_master);
+          List_Read((yyvsp[-8].l), i, &d_slave);
           addPeriodicEdge(d_slave,d_master,transfo);
         }
       }
-      List_Delete((yyvsp[(4) - (12)].l));
-      List_Delete((yyvsp[(8) - (12)].l));
-    ;}
+      List_Delete((yyvsp[-8].l));
+      List_Delete((yyvsp[-4].l));
+    }
+#line 9552 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 328:
-#line 4296 "Gmsh.y"
+#line 4296 "Gmsh.y" /* yacc.c:1646  */
     {
-      if (List_Nbr((yyvsp[(4) - (12)].l)) != List_Nbr((yyvsp[(8) - (12)].l))){
+      if (List_Nbr((yyvsp[-8].l)) != List_Nbr((yyvsp[-4].l))){
         yymsg(0, "Number of master faces (%d) different from number of "
-              "slaves (%d) ", List_Nbr((yyvsp[(8) - (12)].l)), List_Nbr((yyvsp[(4) - (12)].l)));
+              "slaves (%d) ", List_Nbr((yyvsp[-4].l)), List_Nbr((yyvsp[-8].l)));
       }
       else{
         SPoint3 origin(0,0,0);
         SPoint3 axis(0,0,0);
         double  angle(0);
-        SPoint3 translation((yyvsp[(11) - (12)].v)[0],(yyvsp[(11) - (12)].v)[1],(yyvsp[(11) - (12)].v)[2]);
+        SPoint3 translation((yyvsp[-1].v)[0],(yyvsp[-1].v)[1],(yyvsp[-1].v)[2]);
 
         std::vector<double> transfo;
         computeAffineTransformation(origin,axis,angle,translation,transfo);
 
-        for(int i = 0; i < List_Nbr((yyvsp[(4) - (12)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-8].l)); i++){
           double d_master, d_slave;
-          List_Read((yyvsp[(8) - (12)].l), i, &d_master);
-          List_Read((yyvsp[(4) - (12)].l), i, &d_slave);
+          List_Read((yyvsp[-4].l), i, &d_master);
+          List_Read((yyvsp[-8].l), i, &d_slave);
           addPeriodicFace(d_slave, d_master, transfo);
         }
       }
-      List_Delete((yyvsp[(4) - (12)].l));
-      List_Delete((yyvsp[(8) - (12)].l));
-    ;}
+      List_Delete((yyvsp[-8].l));
+      List_Delete((yyvsp[-4].l));
+    }
+#line 9581 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 329:
-#line 4322 "Gmsh.y"
+#line 4322 "Gmsh.y" /* yacc.c:1646  */
     {
-      if (List_Nbr((yyvsp[(5) - (12)].l)) != List_Nbr((yyvsp[(10) - (12)].l))){
+      if (List_Nbr((yyvsp[-7].l)) != List_Nbr((yyvsp[-2].l))){
         yymsg(0, "Number of master surface edges (%d) different from number of "
-              "slave (%d) edges", List_Nbr((yyvsp[(10) - (12)].l)), List_Nbr((yyvsp[(5) - (12)].l)));
+              "slave (%d) edges", List_Nbr((yyvsp[-2].l)), List_Nbr((yyvsp[-7].l)));
       }
       else{
-        int j_master = (int)(yyvsp[(8) - (12)].d);
-        int j_slave = (int)(yyvsp[(3) - (12)].d);
+        int j_master = (int)(yyvsp[-4].d);
+        int j_slave = (int)(yyvsp[-9].d);
         std::map<int,int> edgeCounterParts;
-        for (int i = 0; i < List_Nbr((yyvsp[(5) - (12)].l)); i++){
+        for (int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
           double ds,dm;
-          List_Read((yyvsp[(5) - (12)].l),i,&ds);
-          List_Read((yyvsp[(10) - (12)].l),i,&dm);
+          List_Read((yyvsp[-7].l),i,&ds);
+          List_Read((yyvsp[-2].l),i,&dm);
           edgeCounterParts[(int) ds] = (int) dm;
         }
         addPeriodicFace(j_slave, j_master, edgeCounterParts);
       }
-      List_Delete((yyvsp[(5) - (12)].l));
-      List_Delete((yyvsp[(10) - (12)].l));
-    ;}
+      List_Delete((yyvsp[-7].l));
+      List_Delete((yyvsp[-2].l));
+    }
+#line 9606 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 330:
-#line 4343 "Gmsh.y"
+#line 4343 "Gmsh.y" /* yacc.c:1646  */
     {
-      Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
+      Surface *s = FindSurface((int)(yyvsp[-2].d));
       if(s){
-	setSurfaceEmbeddedPoints(s, (yyvsp[(3) - (10)].l));
+	setSurfaceEmbeddedPoints(s, (yyvsp[-7].l));
       }
       else{
-        GFace *gf = GModel::current()->getFaceByTag((int)(yyvsp[(8) - (10)].d));
+        GFace *gf = GModel::current()->getFaceByTag((int)(yyvsp[-2].d));
         if(gf){
-          for(int i = 0; i < List_Nbr((yyvsp[(3) - (10)].l)); i++){
+          for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
             double d;
-            List_Read((yyvsp[(3) - (10)].l), i, &d);
+            List_Read((yyvsp[-7].l), i, &d);
             int iPoint = (int)d;
             GVertex *gv = GModel::current()->getVertexByTag(iPoint);
             if(!gv){ // sync model in case the embedded point is a .geo point
@@ -9956,24 +9631,25 @@ yyreduce:
           }
         }
         else
-          yymsg(0, "Unknown surface %d", (int)(yyvsp[(8) - (10)].d));
+          yymsg(0, "Unknown surface %d", (int)(yyvsp[-2].d));
       }
-    ;}
+    }
+#line 9638 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 331:
-#line 4371 "Gmsh.y"
+#line 4371 "Gmsh.y" /* yacc.c:1646  */
     {
-      Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
+      Surface *s = FindSurface((int)(yyvsp[-2].d));
       if(s){
-	setSurfaceEmbeddedCurves(s, (yyvsp[(3) - (10)].l));
+	setSurfaceEmbeddedCurves(s, (yyvsp[-7].l));
       }
       else{
-        GFace *gf = GModel::current()->getFaceByTag((int)(yyvsp[(8) - (10)].d));
+        GFace *gf = GModel::current()->getFaceByTag((int)(yyvsp[-2].d));
         if(gf){
-          for(int i = 0; i < List_Nbr((yyvsp[(3) - (10)].l)); i++){
+          for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
             double d;
-            List_Read((yyvsp[(3) - (10)].l), i, &d);
+            List_Read((yyvsp[-7].l), i, &d);
             int iCurve = (int)d;
             GEdge *ge = GModel::current()->getEdgeByTag(iCurve);
             if(!ge){ // sync model in case the embedded line is a .geo line
@@ -9987,38 +9663,41 @@ yyreduce:
           }
         }
         else
-          yymsg(0, "Unknown surface %d", (int)(yyvsp[(8) - (10)].d));
+          yymsg(0, "Unknown surface %d", (int)(yyvsp[-2].d));
       }
-    ;}
+    }
+#line 9670 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 332:
-#line 4399 "Gmsh.y"
+#line 4399 "Gmsh.y" /* yacc.c:1646  */
     {
       Msg::Error("Point in Volume not implemented yet");
-    ;}
+    }
+#line 9678 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 333:
-#line 4403 "Gmsh.y"
+#line 4403 "Gmsh.y" /* yacc.c:1646  */
     {
       Msg::Error("Line in Volume not implemented yet");
-    ;}
+    }
+#line 9686 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 334:
-#line 4407 "Gmsh.y"
+#line 4407 "Gmsh.y" /* yacc.c:1646  */
     {
-      Volume *v = FindVolume((int)(yyvsp[(8) - (10)].d));
+      Volume *v = FindVolume((int)(yyvsp[-2].d));
       if(v){
-	setVolumeEmbeddedSurfaces(v, (yyvsp[(3) - (10)].l));
+	setVolumeEmbeddedSurfaces(v, (yyvsp[-7].l));
       }
       else{
-        GRegion *gr = GModel::current()->getRegionByTag((int)(yyvsp[(8) - (10)].d));
+        GRegion *gr = GModel::current()->getRegionByTag((int)(yyvsp[-2].d));
         if(gr){
-          for(int i = 0; i < List_Nbr((yyvsp[(3) - (10)].l)); i++){
+          for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
             double d;
-            List_Read((yyvsp[(3) - (10)].l), i, &d);
+            List_Read((yyvsp[-7].l), i, &d);
             int iSurface = (int)d;
             GFace *gf = GModel::current()->getFaceByTag(iSurface);
             if(!gf){ // sync model in case the embedded face is a .geo face
@@ -10032,15 +9711,16 @@ yyreduce:
           }
         }
         else
-          yymsg(0, "Unknown volume %d", (int)(yyvsp[(8) - (10)].d));
+          yymsg(0, "Unknown volume %d", (int)(yyvsp[-2].d));
       }
-    ;}
+    }
+#line 9718 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 335:
-#line 4435 "Gmsh.y"
+#line 4435 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!(yyvsp[(3) - (4)].l)){
+      if(!(yyvsp[-1].l)){
 	List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Surfaces);
         if(List_Nbr(tmp)){
           for(int i = 0; i < List_Nbr(tmp); i++){
@@ -10058,9 +9738,9 @@ yyreduce:
         List_Delete(tmp);
       }
       else{
-        for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(3) - (4)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           Surface *s = FindSurface((int)d);
           if(s){
             s->ReverseMesh = 1;
@@ -10074,15 +9754,16 @@ yyreduce:
               yymsg(1, "Unknown surface %d", (int)d);
           }
         }
-        List_Delete((yyvsp[(3) - (4)].l));
+        List_Delete((yyvsp[-1].l));
       }
-    ;}
+    }
+#line 9761 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 336:
-#line 4474 "Gmsh.y"
+#line 4474 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!(yyvsp[(3) - (4)].l)){
+      if(!(yyvsp[-1].l)){
 	List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Curves);
         if(List_Nbr(tmp)){
           for(int i = 0; i < List_Nbr(tmp); i++){
@@ -10100,9 +9781,9 @@ yyreduce:
         List_Delete(tmp);
       }
       else{
-        for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(3) - (4)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           Curve *c = FindCurve((int)d);
           if(c){
             c->ReverseMesh = 1;
@@ -10116,23 +9797,24 @@ yyreduce:
               yymsg(1, "Unknown line %d", (int)d);
           }
         }
-        List_Delete((yyvsp[(3) - (4)].l));
+        List_Delete((yyvsp[-1].l));
       }
-    ;}
+    }
+#line 9804 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 337:
-#line 4513 "Gmsh.y"
+#line 4513 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!(yyvsp[(3) - (4)].l)){
+      if(!(yyvsp[-1].l)){
         for(GModel::viter it = GModel::current()->firstVertex();
             it != GModel::current()->lastVertex(); it++)
           (*it)->relocateMeshVertices();
       }
       else{
-        for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(3) - (4)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           GVertex *gv = GModel::current()->getVertexByTag((int)d);
           if(gv){
             gv->relocateMeshVertices();
@@ -10140,23 +9822,24 @@ yyreduce:
           else
             yymsg(1, "Unknown point %d", (int)d);
         }
-        List_Delete((yyvsp[(3) - (4)].l));
+        List_Delete((yyvsp[-1].l));
       }
-    ;}
+    }
+#line 9829 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 338:
-#line 4534 "Gmsh.y"
+#line 4534 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!(yyvsp[(3) - (4)].l)){
+      if(!(yyvsp[-1].l)){
         for(GModel::eiter it = GModel::current()->firstEdge();
             it != GModel::current()->lastEdge(); it++)
           (*it)->relocateMeshVertices();
       }
       else{
-        for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(3) - (4)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           GEdge *ge = GModel::current()->getEdgeByTag((int)d);
           if(ge){
             ge->relocateMeshVertices();
@@ -10164,23 +9847,24 @@ yyreduce:
           else
             yymsg(1, "Unknown line %d", (int)d);
         }
-        List_Delete((yyvsp[(3) - (4)].l));
+        List_Delete((yyvsp[-1].l));
       }
-    ;}
+    }
+#line 9854 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 339:
-#line 4555 "Gmsh.y"
+#line 4555 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!(yyvsp[(3) - (4)].l)){
+      if(!(yyvsp[-1].l)){
         for(GModel::fiter it = GModel::current()->firstFace();
             it != GModel::current()->lastFace(); it++)
           (*it)->relocateMeshVertices();
       }
       else{
-        for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+        for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
           double d;
-          List_Read((yyvsp[(3) - (4)].l), i, &d);
+          List_Read((yyvsp[-1].l), i, &d);
           GFace *gf = GModel::current()->getFaceByTag((int)d);
           if(gf){
             gf->relocateMeshVertices();
@@ -10188,44 +9872,47 @@ yyreduce:
           else
             yymsg(1, "Unknown surface %d", (int)d);
         }
-        List_Delete((yyvsp[(3) - (4)].l));
+        List_Delete((yyvsp[-1].l));
       }
-    ;}
+    }
+#line 9879 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 340:
-#line 4582 "Gmsh.y"
+#line 4582 "Gmsh.y" /* yacc.c:1646  */
     {
       ReplaceAllDuplicates();
-    ;}
+    }
+#line 9887 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 341:
-#line 4586 "Gmsh.y"
+#line 4586 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!strcmp((yyvsp[(2) - (3)].c), "Geometry"))
+      if(!strcmp((yyvsp[-1].c), "Geometry"))
         ReplaceAllDuplicates();
-      else if(!strcmp((yyvsp[(2) - (3)].c), "Mesh"))
+      else if(!strcmp((yyvsp[-1].c), "Mesh"))
         GModel::current()->removeDuplicateMeshVertices(CTX::instance()->geom.tolerance);
       else
         yymsg(0, "Unknown coherence command");
-      Free((yyvsp[(2) - (3)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 9901 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 342:
-#line 4596 "Gmsh.y"
+#line 4596 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(List_Nbr((yyvsp[(4) - (6)].l)) >= 2){
+      if(List_Nbr((yyvsp[-2].l)) >= 2){
         double d;
-        List_Read((yyvsp[(4) - (6)].l), 0, &d);
+        List_Read((yyvsp[-2].l), 0, &d);
         Vertex *target = FindPoint((int)d);
         if(!target)
           yymsg(0, "Could not find Point %d", (int)d);
         else{
           double x = target->Pos.X, y = target->Pos.Y, z = target->Pos.Z;
-          for(int i = 1; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
-            List_Read((yyvsp[(4) - (6)].l), i, &d);
+          for(int i = 1; i < List_Nbr((yyvsp[-2].l)); i++){
+            List_Read((yyvsp[-2].l), i, &d);
             Vertex *source = FindPoint((int)d);
             if(!source) yymsg(0, "Could not find Point %d", (int)d);
             if(target && source){
@@ -10242,730 +9929,816 @@ yyreduce:
       else
         yymsg(0, "Need at least two points to merge");
       ReplaceAllDuplicates();
-      List_Delete((yyvsp[(4) - (6)].l));
-    ;}
+      List_Delete((yyvsp[-2].l));
+    }
+#line 9935 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 343:
-#line 4630 "Gmsh.y"
-    { (yyval.c) = (char*)"Homology"; ;}
+#line 4630 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.c) = (char*)"Homology"; }
+#line 9941 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 344:
-#line 4631 "Gmsh.y"
-    { (yyval.c) = (char*)"Cohomology"; ;}
+#line 4631 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.c) = (char*)"Cohomology"; }
+#line 9947 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 345:
-#line 4632 "Gmsh.y"
-    { (yyval.c) = (char*)"Betti"; ;}
+#line 4632 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.c) = (char*)"Betti"; }
+#line 9953 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 346:
-#line 4637 "Gmsh.y"
+#line 4637 "Gmsh.y" /* yacc.c:1646  */
     {
       std::vector<int> domain, subdomain, dim;
       for(int i = 0; i < 4; i++) dim.push_back(i);
-      GModel::current()->addHomologyRequest((yyvsp[(1) - (2)].c), domain, subdomain, dim);
-    ;}
+      GModel::current()->addHomologyRequest((yyvsp[-1].c), domain, subdomain, dim);
+    }
+#line 9963 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 347:
-#line 4643 "Gmsh.y"
+#line 4643 "Gmsh.y" /* yacc.c:1646  */
     {
       std::vector<int> domain, subdomain, dim;
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (5)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
         double d;
-        List_Read((yyvsp[(3) - (5)].l), i, &d);
+        List_Read((yyvsp[-2].l), i, &d);
         domain.push_back((int)d);
       }
       for(int i = 0; i < 4; i++) dim.push_back(i);
-      GModel::current()->addHomologyRequest((yyvsp[(1) - (5)].c), domain, subdomain, dim);
-      List_Delete((yyvsp[(3) - (5)].l));
-    ;}
+      GModel::current()->addHomologyRequest((yyvsp[-4].c), domain, subdomain, dim);
+      List_Delete((yyvsp[-2].l));
+    }
+#line 9979 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 348:
-#line 4655 "Gmsh.y"
+#line 4655 "Gmsh.y" /* yacc.c:1646  */
     {
       std::vector<int> domain, subdomain, dim;
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (7)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-4].l)); i++){
         double d;
-        List_Read((yyvsp[(3) - (7)].l), i, &d);
+        List_Read((yyvsp[-4].l), i, &d);
         domain.push_back((int)d);
       }
-      for(int i = 0; i < List_Nbr((yyvsp[(5) - (7)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
         double d;
-        List_Read((yyvsp[(5) - (7)].l), i, &d);
+        List_Read((yyvsp[-2].l), i, &d);
         subdomain.push_back((int)d);
       }
       for(int i = 0; i < 4; i++) dim.push_back(i);
-      GModel::current()->addHomologyRequest((yyvsp[(1) - (7)].c), domain, subdomain, dim);
-      List_Delete((yyvsp[(3) - (7)].l));
-      List_Delete((yyvsp[(5) - (7)].l));
-    ;}
+      GModel::current()->addHomologyRequest((yyvsp[-6].c), domain, subdomain, dim);
+      List_Delete((yyvsp[-4].l));
+      List_Delete((yyvsp[-2].l));
+    }
+#line 10001 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 349:
-#line 4673 "Gmsh.y"
+#line 4673 "Gmsh.y" /* yacc.c:1646  */
     {
       std::vector<int> domain, subdomain, dim;
-      for(int i = 0; i < List_Nbr((yyvsp[(6) - (10)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-4].l)); i++){
         double d;
-        List_Read((yyvsp[(6) - (10)].l), i, &d);
+        List_Read((yyvsp[-4].l), i, &d);
         domain.push_back((int)d);
       }
-      for(int i = 0; i < List_Nbr((yyvsp[(8) - (10)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
         double d;
-        List_Read((yyvsp[(8) - (10)].l), i, &d);
+        List_Read((yyvsp[-2].l), i, &d);
         subdomain.push_back((int)d);
       }
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (10)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-7].l)); i++){
         double d;
-        List_Read((yyvsp[(3) - (10)].l), i, &d);
+        List_Read((yyvsp[-7].l), i, &d);
         dim.push_back((int)d);
       }
-      GModel::current()->addHomologyRequest((yyvsp[(1) - (10)].c), domain, subdomain, dim);
-      List_Delete((yyvsp[(6) - (10)].l));
-      List_Delete((yyvsp[(8) - (10)].l));
-      List_Delete((yyvsp[(3) - (10)].l));
-    ;}
+      GModel::current()->addHomologyRequest((yyvsp[-9].c), domain, subdomain, dim);
+      List_Delete((yyvsp[-4].l));
+      List_Delete((yyvsp[-2].l));
+      List_Delete((yyvsp[-7].l));
+    }
+#line 10028 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 350:
-#line 4700 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (1)].d);           ;}
+#line 4700 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[0].d);           }
+#line 10034 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 351:
-#line 4701 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(2) - (3)].d);           ;}
+#line 4701 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-1].d);           }
+#line 10040 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 352:
-#line 4702 "Gmsh.y"
-    { (yyval.d) = -(yyvsp[(2) - (2)].d);          ;}
+#line 4702 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = -(yyvsp[0].d);          }
+#line 10046 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 353:
-#line 4703 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(2) - (2)].d);           ;}
+#line 4703 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[0].d);           }
+#line 10052 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 354:
-#line 4704 "Gmsh.y"
-    { (yyval.d) = !(yyvsp[(2) - (2)].d);          ;}
+#line 4704 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = !(yyvsp[0].d);          }
+#line 10058 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 355:
-#line 4705 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (3)].d) - (yyvsp[(3) - (3)].d);      ;}
+#line 4705 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-2].d) - (yyvsp[0].d);      }
+#line 10064 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 356:
-#line 4706 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (3)].d) + (yyvsp[(3) - (3)].d);      ;}
+#line 4706 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-2].d) + (yyvsp[0].d);      }
+#line 10070 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 357:
-#line 4707 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (3)].d) * (yyvsp[(3) - (3)].d);      ;}
+#line 4707 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-2].d) * (yyvsp[0].d);      }
+#line 10076 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 358:
-#line 4709 "Gmsh.y"
+#line 4709 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!(yyvsp[(3) - (3)].d))
-	yymsg(0, "Division by zero in '%g / %g'", (yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d));
+      if(!(yyvsp[0].d))
+	yymsg(0, "Division by zero in '%g / %g'", (yyvsp[-2].d), (yyvsp[0].d));
       else
-	(yyval.d) = (yyvsp[(1) - (3)].d) / (yyvsp[(3) - (3)].d);
-    ;}
+	(yyval.d) = (yyvsp[-2].d) / (yyvsp[0].d);
+    }
+#line 10087 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 359:
-#line 4715 "Gmsh.y"
-    { (yyval.d) = (int)(yyvsp[(1) - (3)].d) % (int)(yyvsp[(3) - (3)].d);  ;}
+#line 4715 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (int)(yyvsp[-2].d) % (int)(yyvsp[0].d);  }
+#line 10093 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 360:
-#line 4716 "Gmsh.y"
-    { (yyval.d) = pow((yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d));  ;}
+#line 4716 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = pow((yyvsp[-2].d), (yyvsp[0].d));  }
+#line 10099 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 361:
-#line 4717 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d);      ;}
+#line 4717 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-2].d) < (yyvsp[0].d);      }
+#line 10105 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 362:
-#line 4718 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (3)].d) > (yyvsp[(3) - (3)].d);      ;}
+#line 4718 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-2].d) > (yyvsp[0].d);      }
+#line 10111 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 363:
-#line 4719 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (3)].d) <= (yyvsp[(3) - (3)].d);     ;}
+#line 4719 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-2].d) <= (yyvsp[0].d);     }
+#line 10117 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 364:
-#line 4720 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (3)].d) >= (yyvsp[(3) - (3)].d);     ;}
+#line 4720 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-2].d) >= (yyvsp[0].d);     }
+#line 10123 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 365:
-#line 4721 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (3)].d) == (yyvsp[(3) - (3)].d);     ;}
+#line 4721 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-2].d) == (yyvsp[0].d);     }
+#line 10129 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 366:
-#line 4722 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (3)].d) != (yyvsp[(3) - (3)].d);     ;}
+#line 4722 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-2].d) != (yyvsp[0].d);     }
+#line 10135 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 367:
-#line 4723 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (3)].d) && (yyvsp[(3) - (3)].d);     ;}
+#line 4723 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-2].d) && (yyvsp[0].d);     }
+#line 10141 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 368:
-#line 4724 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (3)].d) || (yyvsp[(3) - (3)].d);     ;}
+#line 4724 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-2].d) || (yyvsp[0].d);     }
+#line 10147 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 369:
-#line 4725 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (5)].d) ? (yyvsp[(3) - (5)].d) : (yyvsp[(5) - (5)].d); ;}
+#line 4725 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-4].d) ? (yyvsp[-2].d) : (yyvsp[0].d); }
+#line 10153 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 370:
-#line 4726 "Gmsh.y"
-    { (yyval.d) = exp((yyvsp[(3) - (4)].d));      ;}
+#line 4726 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = exp((yyvsp[-1].d));      }
+#line 10159 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 371:
-#line 4727 "Gmsh.y"
-    { (yyval.d) = log((yyvsp[(3) - (4)].d));      ;}
+#line 4727 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = log((yyvsp[-1].d));      }
+#line 10165 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 372:
-#line 4728 "Gmsh.y"
-    { (yyval.d) = log10((yyvsp[(3) - (4)].d));    ;}
+#line 4728 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = log10((yyvsp[-1].d));    }
+#line 10171 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 373:
-#line 4729 "Gmsh.y"
-    { (yyval.d) = sqrt((yyvsp[(3) - (4)].d));     ;}
+#line 4729 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = sqrt((yyvsp[-1].d));     }
+#line 10177 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 374:
-#line 4730 "Gmsh.y"
-    { (yyval.d) = sin((yyvsp[(3) - (4)].d));      ;}
+#line 4730 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = sin((yyvsp[-1].d));      }
+#line 10183 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 375:
-#line 4731 "Gmsh.y"
-    { (yyval.d) = asin((yyvsp[(3) - (4)].d));     ;}
+#line 4731 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = asin((yyvsp[-1].d));     }
+#line 10189 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 376:
-#line 4732 "Gmsh.y"
-    { (yyval.d) = cos((yyvsp[(3) - (4)].d));      ;}
+#line 4732 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = cos((yyvsp[-1].d));      }
+#line 10195 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 377:
-#line 4733 "Gmsh.y"
-    { (yyval.d) = acos((yyvsp[(3) - (4)].d));     ;}
+#line 4733 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = acos((yyvsp[-1].d));     }
+#line 10201 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 378:
-#line 4734 "Gmsh.y"
-    { (yyval.d) = tan((yyvsp[(3) - (4)].d));      ;}
+#line 4734 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = tan((yyvsp[-1].d));      }
+#line 10207 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 379:
-#line 4735 "Gmsh.y"
-    { (yyval.d) = atan((yyvsp[(3) - (4)].d));     ;}
+#line 4735 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = atan((yyvsp[-1].d));     }
+#line 10213 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 380:
-#line 4736 "Gmsh.y"
-    { (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));;}
+#line 4736 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = atan2((yyvsp[-3].d), (yyvsp[-1].d));}
+#line 10219 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 381:
-#line 4737 "Gmsh.y"
-    { (yyval.d) = sinh((yyvsp[(3) - (4)].d));     ;}
+#line 4737 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = sinh((yyvsp[-1].d));     }
+#line 10225 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 382:
-#line 4738 "Gmsh.y"
-    { (yyval.d) = cosh((yyvsp[(3) - (4)].d));     ;}
+#line 4738 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = cosh((yyvsp[-1].d));     }
+#line 10231 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 383:
-#line 4739 "Gmsh.y"
-    { (yyval.d) = tanh((yyvsp[(3) - (4)].d));     ;}
+#line 4739 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = tanh((yyvsp[-1].d));     }
+#line 10237 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 384:
-#line 4740 "Gmsh.y"
-    { (yyval.d) = fabs((yyvsp[(3) - (4)].d));     ;}
+#line 4740 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = fabs((yyvsp[-1].d));     }
+#line 10243 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 385:
-#line 4741 "Gmsh.y"
-    { (yyval.d) = floor((yyvsp[(3) - (4)].d));    ;}
+#line 4741 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = floor((yyvsp[-1].d));    }
+#line 10249 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 386:
-#line 4742 "Gmsh.y"
-    { (yyval.d) = ceil((yyvsp[(3) - (4)].d));     ;}
+#line 4742 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = ceil((yyvsp[-1].d));     }
+#line 10255 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 387:
-#line 4743 "Gmsh.y"
-    { (yyval.d) = floor((yyvsp[(3) - (4)].d) + 0.5); ;}
+#line 4743 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = floor((yyvsp[-1].d) + 0.5); }
+#line 10261 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 388:
-#line 4744 "Gmsh.y"
-    { (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
+#line 4744 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = fmod((yyvsp[-3].d), (yyvsp[-1].d)); }
+#line 10267 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 389:
-#line 4745 "Gmsh.y"
-    { (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
+#line 4745 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = fmod((yyvsp[-3].d), (yyvsp[-1].d)); }
+#line 10273 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 390:
-#line 4746 "Gmsh.y"
-    { (yyval.d) = sqrt((yyvsp[(3) - (6)].d) * (yyvsp[(3) - (6)].d) + (yyvsp[(5) - (6)].d) * (yyvsp[(5) - (6)].d)); ;}
+#line 4746 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = sqrt((yyvsp[-3].d) * (yyvsp[-3].d) + (yyvsp[-1].d) * (yyvsp[-1].d)); }
+#line 10279 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 391:
-#line 4747 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(3) - (4)].d) * (double)rand() / (double)RAND_MAX; ;}
+#line 4747 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[-1].d) * (double)rand() / (double)RAND_MAX; }
+#line 10285 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 392:
-#line 4756 "Gmsh.y"
-    { (yyval.d) = (yyvsp[(1) - (1)].d); ;}
+#line 4756 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (yyvsp[0].d); }
+#line 10291 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 393:
-#line 4757 "Gmsh.y"
-    { (yyval.d) = 3.141592653589793; ;}
+#line 4757 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = 3.141592653589793; }
+#line 10297 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 394:
-#line 4758 "Gmsh.y"
-    { (yyval.d) = (double)ImbricatedTest; ;}
+#line 4758 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = (double)ImbricatedTest; }
+#line 10303 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 395:
-#line 4759 "Gmsh.y"
-    { (yyval.d) = Msg::GetCommRank(); ;}
+#line 4759 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = Msg::GetCommRank(); }
+#line 10309 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 396:
-#line 4760 "Gmsh.y"
-    { (yyval.d) = Msg::GetCommSize(); ;}
+#line 4760 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = Msg::GetCommSize(); }
+#line 10315 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 397:
-#line 4761 "Gmsh.y"
-    { (yyval.d) = GetGmshMajorVersion(); ;}
+#line 4761 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = GetGmshMajorVersion(); }
+#line 10321 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 398:
-#line 4762 "Gmsh.y"
-    { (yyval.d) = GetGmshMinorVersion(); ;}
+#line 4762 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = GetGmshMinorVersion(); }
+#line 10327 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 399:
-#line 4763 "Gmsh.y"
-    { (yyval.d) = GetGmshPatchVersion(); ;}
+#line 4763 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = GetGmshPatchVersion(); }
+#line 10333 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 400:
-#line 4764 "Gmsh.y"
-    { (yyval.d) = Cpu(); ;}
+#line 4764 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = Cpu(); }
+#line 10339 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 401:
-#line 4765 "Gmsh.y"
-    { (yyval.d) = GetMemoryUsage()/1024./1024.; ;}
+#line 4765 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = GetMemoryUsage()/1024./1024.; }
+#line 10345 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 402:
-#line 4766 "Gmsh.y"
-    { (yyval.d) = TotalRam(); ;}
+#line 4766 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.d) = TotalRam(); }
+#line 10351 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 403:
-#line 4771 "Gmsh.y"
-    { floatOptions.clear(); charOptions.clear(); ;}
+#line 4771 "Gmsh.y" /* yacc.c:1646  */
+    { floatOptions.clear(); charOptions.clear(); }
+#line 10357 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 404:
-#line 4773 "Gmsh.y"
+#line 4773 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::vector<double> val(1, (yyvsp[(3) - (6)].d));
+      std::vector<double> val(1, (yyvsp[-3].d));
       Msg::ExchangeOnelabParameter("", val, floatOptions, charOptions);
       (yyval.d) = val[0];
-    ;}
+    }
+#line 10367 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 405:
-#line 4779 "Gmsh.y"
+#line 4779 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.d) = Msg::GetOnelabNumber((yyvsp[(3) - (4)].c));
-      Free((yyvsp[(3) - (4)].c));
-    ;}
+      (yyval.d) = Msg::GetOnelabNumber((yyvsp[-1].c));
+      Free((yyvsp[-1].c));
+    }
+#line 10376 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 406:
-#line 4784 "Gmsh.y"
+#line 4784 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.d) = Msg::GetOnelabNumber((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].d));
-      Free((yyvsp[(3) - (6)].c));
-    ;}
+      (yyval.d) = Msg::GetOnelabNumber((yyvsp[-3].c), (yyvsp[-1].d));
+      Free((yyvsp[-3].c));
+    }
+#line 10385 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 407:
-#line 4789 "Gmsh.y"
+#line 4789 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (1)].c))){
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (1)].c));
+      if(!gmsh_yysymbols.count((yyvsp[0].c))){
+	yymsg(0, "Unknown variable '%s'", (yyvsp[0].c));
 	(yyval.d) = 0.;
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (1)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[0].c)]);
         if(s.value.empty()){
-          yymsg(0, "Uninitialized variable '%s'", (yyvsp[(1) - (1)].c));
+          yymsg(0, "Uninitialized variable '%s'", (yyvsp[0].c));
           (yyval.d) = 0.;
         }
         else
           (yyval.d) = s.value[0];
       }
-      Free((yyvsp[(1) - (1)].c));
-    ;}
+      Free((yyvsp[0].c));
+    }
+#line 10406 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 408:
-#line 4806 "Gmsh.y"
+#line 4806 "Gmsh.y" /* yacc.c:1646  */
     {
-      int index = (int)(yyvsp[(3) - (4)].d);
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c))){
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (4)].c));
+      int index = (int)(yyvsp[-1].d);
+      if(!gmsh_yysymbols.count((yyvsp[-3].c))){
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-3].c));
 	(yyval.d) = 0.;
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (4)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-3].c)]);
         if((int)s.value.size() < index + 1){
-          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (4)].c), index);
+          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-3].c), index);
           (yyval.d) = 0.;
         }
         else
           (yyval.d) = s.value[index];
       }
-      Free((yyvsp[(1) - (4)].c));
-    ;}
+      Free((yyvsp[-3].c));
+    }
+#line 10428 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 409:
-#line 4824 "Gmsh.y"
+#line 4824 "Gmsh.y" /* yacc.c:1646  */
     {
-      int index = (int)(yyvsp[(3) - (4)].d);
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c))){
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (4)].c));
+      int index = (int)(yyvsp[-1].d);
+      if(!gmsh_yysymbols.count((yyvsp[-3].c))){
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-3].c));
 	(yyval.d) = 0.;
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (4)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-3].c)]);
         if((int)s.value.size() < index + 1){
-          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (4)].c), index);
+          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-3].c), index);
           (yyval.d) = 0.;
         }
         else
           (yyval.d) = s.value[index];
       }
-      Free((yyvsp[(1) - (4)].c));
-    ;}
+      Free((yyvsp[-3].c));
+    }
+#line 10450 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 410:
-#line 4842 "Gmsh.y"
+#line 4842 "Gmsh.y" /* yacc.c:1646  */
     {
-      int index = (int)(yyvsp[(3) - (4)].d);
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c))){
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (4)].c));
+      int index = (int)(yyvsp[-1].d);
+      if(!gmsh_yysymbols.count((yyvsp[-3].c))){
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-3].c));
 	(yyval.d) = 0.;
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (4)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-3].c)]);
         if((int)s.value.size() < index + 1){
-          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (4)].c), index);
+          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-3].c), index);
           (yyval.d) = 0.;
         }
         else
           (yyval.d) = s.value[index];
       }
-      Free((yyvsp[(1) - (4)].c));
-    ;}
+      Free((yyvsp[-3].c));
+    }
+#line 10472 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 411:
-#line 4860 "Gmsh.y"
+#line 4860 "Gmsh.y" /* yacc.c:1646  */
     {
-      int index = (int)(yyvsp[(3) - (4)].d);
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c))){
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (4)].c));
+      int index = (int)(yyvsp[-1].d);
+      if(!gmsh_yysymbols.count((yyvsp[-3].c))){
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-3].c));
 	(yyval.d) = 0.;
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (4)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-3].c)]);
         if((int)s.value.size() < index + 1){
-          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (4)].c), index);
+          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-3].c), index);
           (yyval.d) = 0.;
         }
         else
           (yyval.d) = s.value[index];
       }
-      Free((yyvsp[(1) - (4)].c));
-    ;}
+      Free((yyvsp[-3].c));
+    }
+#line 10494 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 412:
-#line 4878 "Gmsh.y"
+#line 4878 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.d) = gmsh_yysymbols.count((yyvsp[(3) - (4)].c));
-      Free((yyvsp[(3) - (4)].c));
-    ;}
+      (yyval.d) = gmsh_yysymbols.count((yyvsp[-1].c));
+      Free((yyvsp[-1].c));
+    }
+#line 10503 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 413:
-#line 4883 "Gmsh.y"
+#line 4883 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(3) - (4)].c));
+      std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
       (yyval.d) = !StatFile(tmp);
-      Free((yyvsp[(3) - (4)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 10513 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 414:
-#line 4889 "Gmsh.y"
+#line 4889 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!gmsh_yysymbols.count((yyvsp[(2) - (4)].c))){
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(2) - (4)].c));
+      if(!gmsh_yysymbols.count((yyvsp[-2].c))){
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-2].c));
 	(yyval.d) = 0.;
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(2) - (4)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-2].c)]);
 	(yyval.d) = s.value.size();
       }
-      Free((yyvsp[(2) - (4)].c));
-    ;}
+      Free((yyvsp[-2].c));
+    }
+#line 10529 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 415:
-#line 4901 "Gmsh.y"
+#line 4901 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (2)].c))){
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (2)].c));
+      if(!gmsh_yysymbols.count((yyvsp[-1].c))){
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-1].c));
 	(yyval.d) = 0.;
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (2)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-1].c)]);
         if(s.value.empty()){
-          yymsg(0, "Uninitialized variable '%s'", (yyvsp[(1) - (2)].c));
+          yymsg(0, "Uninitialized variable '%s'", (yyvsp[-1].c));
           (yyval.d) = 0.;
         }
         else
-          (yyval.d) = (s.value[0] += (yyvsp[(2) - (2)].i));
+          (yyval.d) = (s.value[0] += (yyvsp[0].i));
       }
-      Free((yyvsp[(1) - (2)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 10550 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 416:
-#line 4918 "Gmsh.y"
+#line 4918 "Gmsh.y" /* yacc.c:1646  */
     {
-      int index = (int)(yyvsp[(3) - (5)].d);
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (5)].c))){
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (5)].c));
+      int index = (int)(yyvsp[-2].d);
+      if(!gmsh_yysymbols.count((yyvsp[-4].c))){
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-4].c));
 	(yyval.d) = 0.;
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (5)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-4].c)]);
         if((int)s.value.size() < index + 1){
-          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (5)].c), index);
+          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-4].c), index);
           (yyval.d) = 0.;
         }
         else
-          (yyval.d) = (s.value[index] += (yyvsp[(5) - (5)].i));
+          (yyval.d) = (s.value[index] += (yyvsp[0].i));
       }
-      Free((yyvsp[(1) - (5)].c));
-    ;}
+      Free((yyvsp[-4].c));
+    }
+#line 10572 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 417:
-#line 4936 "Gmsh.y"
+#line 4936 "Gmsh.y" /* yacc.c:1646  */
     {
-      int index = (int)(yyvsp[(3) - (5)].d);
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (5)].c))){
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (5)].c));
+      int index = (int)(yyvsp[-2].d);
+      if(!gmsh_yysymbols.count((yyvsp[-4].c))){
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-4].c));
 	(yyval.d) = 0.;
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (5)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-4].c)]);
         if((int)s.value.size() < index + 1){
-          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (5)].c), index);
+          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-4].c), index);
           (yyval.d) = 0.;
         }
         else
-          (yyval.d) = (s.value[index] += (yyvsp[(5) - (5)].i));
+          (yyval.d) = (s.value[index] += (yyvsp[0].i));
       }
-      Free((yyvsp[(1) - (5)].c));
-    ;}
+      Free((yyvsp[-4].c));
+    }
+#line 10594 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 418:
-#line 4954 "Gmsh.y"
+#line 4954 "Gmsh.y" /* yacc.c:1646  */
     {
-      int index = (int)(yyvsp[(3) - (5)].d);
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (5)].c))){
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (5)].c));
+      int index = (int)(yyvsp[-2].d);
+      if(!gmsh_yysymbols.count((yyvsp[-4].c))){
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-4].c));
 	(yyval.d) = 0.;
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (5)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-4].c)]);
         if((int)s.value.size() < index + 1){
-          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (5)].c), index);
+          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-4].c), index);
           (yyval.d) = 0.;
         }
         else
-          (yyval.d) = (s.value[index] += (yyvsp[(5) - (5)].i));
+          (yyval.d) = (s.value[index] += (yyvsp[0].i));
       }
-      Free((yyvsp[(1) - (5)].c));
-    ;}
+      Free((yyvsp[-4].c));
+    }
+#line 10616 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 419:
-#line 4972 "Gmsh.y"
+#line 4972 "Gmsh.y" /* yacc.c:1646  */
     {
-      int index = (int)(yyvsp[(3) - (5)].d);
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (5)].c))){
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (5)].c));
+      int index = (int)(yyvsp[-2].d);
+      if(!gmsh_yysymbols.count((yyvsp[-4].c))){
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-4].c));
 	(yyval.d) = 0.;
       }
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (5)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-4].c)]);
         if((int)s.value.size() < index + 1){
-          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (5)].c), index);
+          yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-4].c), index);
           (yyval.d) = 0.;
         }
         else
-          (yyval.d) = (s.value[index] += (yyvsp[(5) - (5)].i));
+          (yyval.d) = (s.value[index] += (yyvsp[0].i));
       }
-      Free((yyvsp[(1) - (5)].c));
-    ;}
+      Free((yyvsp[-4].c));
+    }
+#line 10638 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 420:
-#line 4993 "Gmsh.y"
+#line 4993 "Gmsh.y" /* yacc.c:1646  */
     {
-      NumberOption(GMSH_GET, (yyvsp[(1) - (3)].c), 0, (yyvsp[(3) - (3)].c), (yyval.d));
-      Free((yyvsp[(1) - (3)].c)); Free((yyvsp[(3) - (3)].c));
-    ;}
+      NumberOption(GMSH_GET, (yyvsp[-2].c), 0, (yyvsp[0].c), (yyval.d));
+      Free((yyvsp[-2].c)); Free((yyvsp[0].c));
+    }
+#line 10647 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 421:
-#line 4998 "Gmsh.y"
+#line 4998 "Gmsh.y" /* yacc.c:1646  */
     {
-      NumberOption(GMSH_GET, (yyvsp[(1) - (6)].c), (int)(yyvsp[(3) - (6)].d), (yyvsp[(6) - (6)].c), (yyval.d));
-      Free((yyvsp[(1) - (6)].c)); Free((yyvsp[(6) - (6)].c));
-    ;}
+      NumberOption(GMSH_GET, (yyvsp[-5].c), (int)(yyvsp[-3].d), (yyvsp[0].c), (yyval.d));
+      Free((yyvsp[-5].c)); Free((yyvsp[0].c));
+    }
+#line 10656 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 422:
-#line 5003 "Gmsh.y"
+#line 5003 "Gmsh.y" /* yacc.c:1646  */
     {
       double d = 0.;
-      if(NumberOption(GMSH_GET, (yyvsp[(1) - (4)].c), 0, (yyvsp[(3) - (4)].c), d)){
-	d += (yyvsp[(4) - (4)].i);
-	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (4)].c), 0, (yyvsp[(3) - (4)].c), d);
+      if(NumberOption(GMSH_GET, (yyvsp[-3].c), 0, (yyvsp[-1].c), d)){
+	d += (yyvsp[0].i);
+	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-3].c), 0, (yyvsp[-1].c), d);
 	(yyval.d) = d;
       }
-      Free((yyvsp[(1) - (4)].c)); Free((yyvsp[(3) - (4)].c));
-    ;}
+      Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
+    }
+#line 10670 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 423:
-#line 5013 "Gmsh.y"
+#line 5013 "Gmsh.y" /* yacc.c:1646  */
     {
       double d = 0.;
-      if(NumberOption(GMSH_GET, (yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c), d)){
-	d += (yyvsp[(7) - (7)].i);
-	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c), d);
+      if(NumberOption(GMSH_GET, (yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-1].c), d)){
+	d += (yyvsp[0].i);
+	NumberOption(GMSH_SET|GMSH_GUI, (yyvsp[-6].c), (int)(yyvsp[-4].d), (yyvsp[-1].c), d);
 	(yyval.d) = d;
       }
-      Free((yyvsp[(1) - (7)].c)); Free((yyvsp[(6) - (7)].c));
-    ;}
+      Free((yyvsp[-6].c)); Free((yyvsp[-1].c));
+    }
+#line 10684 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 424:
-#line 5023 "Gmsh.y"
+#line 5023 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.d) = Msg::GetValue((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].d));
-      Free((yyvsp[(3) - (6)].c));
-    ;}
+      (yyval.d) = Msg::GetValue((yyvsp[-3].c), (yyvsp[-1].d));
+      Free((yyvsp[-3].c));
+    }
+#line 10693 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 425:
-#line 5028 "Gmsh.y"
+#line 5028 "Gmsh.y" /* yacc.c:1646  */
     {
       int matches = 0;
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-3].l)); i++){
         double d;
-        List_Read((yyvsp[(3) - (6)].l), i, &d);
-        matches += List_Search((yyvsp[(5) - (6)].l), &d, fcmp_double);
+        List_Read((yyvsp[-3].l), i, &d);
+        matches += List_Search((yyvsp[-1].l), &d, fcmp_double);
       }
       (yyval.d) = matches;
-      Free((yyvsp[(3) - (6)].l)); Free((yyvsp[(5) - (6)].l));
-    ;}
+      Free((yyvsp[-3].l)); Free((yyvsp[-1].l));
+    }
+#line 10708 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 426:
-#line 5039 "Gmsh.y"
+#line 5039 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string s((yyvsp[(3) - (6)].c)), substr((yyvsp[(5) - (6)].c));
+      std::string s((yyvsp[-3].c)), substr((yyvsp[-1].c));
       if(s.find(substr) != std::string::npos)
         (yyval.d) = 1.;
       else
         (yyval.d) = 0.;
-      Free((yyvsp[(3) - (6)].c)); Free((yyvsp[(5) - (6)].c));
-    ;}
+      Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
+    }
+#line 10721 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 427:
-#line 5048 "Gmsh.y"
+#line 5048 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.d) = strcmp((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].c));
-      Free((yyvsp[(3) - (6)].c)); Free((yyvsp[(5) - (6)].c));
-    ;}
+      (yyval.d) = strcmp((yyvsp[-3].c), (yyvsp[-1].c));
+      Free((yyvsp[-3].c)); Free((yyvsp[-1].c));
+    }
+#line 10730 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 428:
-#line 5053 "Gmsh.y"
+#line 5053 "Gmsh.y" /* yacc.c:1646  */
     {
       int align = 0, font = 0, fontsize = CTX::instance()->glFontSize;
-      if(List_Nbr((yyvsp[(3) - (4)].l)) % 2){
+      if(List_Nbr((yyvsp[-1].l)) % 2){
         yyerror("Number of text attributes should be even");
       }
       else{
-        for(int i = 0 ; i < List_Nbr((yyvsp[(3) - (4)].l)); i += 2){
-          char *s1, *s2; List_Read((yyvsp[(3) - (4)].l), i, &s1); List_Read((yyvsp[(3) - (4)].l), i + 1, &s2);
+        for(int i = 0 ; i < List_Nbr((yyvsp[-1].l)); i += 2){
+          char *s1, *s2; List_Read((yyvsp[-1].l), i, &s1); List_Read((yyvsp[-1].l), i + 1, &s2);
           std::string key(s1), val(s2);
           Free(s1); Free(s2);
 #if defined(HAVE_OPENGL)
@@ -10978,215 +10751,239 @@ yyreduce:
 #endif
         }
       }
-      List_Delete((yyvsp[(3) - (4)].l));
+      List_Delete((yyvsp[-1].l));
       (yyval.d) = (double)((align<<16)|(font<<8)|(fontsize));
-    ;}
+    }
+#line 10758 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 429:
-#line 5080 "Gmsh.y"
+#line 5080 "Gmsh.y" /* yacc.c:1646  */
     {
-      memcpy((yyval.v), (yyvsp[(1) - (1)].v), 5*sizeof(double));
-    ;}
+      memcpy((yyval.v), (yyvsp[0].v), 5*sizeof(double));
+    }
+#line 10766 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 430:
-#line 5084 "Gmsh.y"
+#line 5084 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < 5; i++) (yyval.v)[i] = -(yyvsp[(2) - (2)].v)[i];
-    ;}
+      for(int i = 0; i < 5; i++) (yyval.v)[i] = -(yyvsp[0].v)[i];
+    }
+#line 10774 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 431:
-#line 5088 "Gmsh.y"
+#line 5088 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(2) - (2)].v)[i];
-    ;}
+      for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[0].v)[i];
+    }
+#line 10782 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 432:
-#line 5092 "Gmsh.y"
+#line 5092 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] - (yyvsp[(3) - (3)].v)[i];
-    ;}
+      for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[-2].v)[i] - (yyvsp[0].v)[i];
+    }
+#line 10790 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 433:
-#line 5096 "Gmsh.y"
+#line 5096 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] + (yyvsp[(3) - (3)].v)[i];
-    ;}
+      for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[-2].v)[i] + (yyvsp[0].v)[i];
+    }
+#line 10798 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 434:
-#line 5103 "Gmsh.y"
+#line 5103 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.v)[0] = (yyvsp[(2) - (11)].d);  (yyval.v)[1] = (yyvsp[(4) - (11)].d);  (yyval.v)[2] = (yyvsp[(6) - (11)].d);  (yyval.v)[3] = (yyvsp[(8) - (11)].d); (yyval.v)[4] = (yyvsp[(10) - (11)].d);
-    ;}
+      (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);
+    }
+#line 10806 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 435:
-#line 5107 "Gmsh.y"
+#line 5107 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.v)[0] = (yyvsp[(2) - (9)].d);  (yyval.v)[1] = (yyvsp[(4) - (9)].d);  (yyval.v)[2] = (yyvsp[(6) - (9)].d);  (yyval.v)[3] = (yyvsp[(8) - (9)].d); (yyval.v)[4] = 1.0;
-    ;}
+      (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;
+    }
+#line 10814 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 436:
-#line 5111 "Gmsh.y"
+#line 5111 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.v)[0] = (yyvsp[(2) - (7)].d);  (yyval.v)[1] = (yyvsp[(4) - (7)].d);  (yyval.v)[2] = (yyvsp[(6) - (7)].d);  (yyval.v)[3] = 0.0; (yyval.v)[4] = 1.0;
-    ;}
+      (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;
+    }
+#line 10822 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 437:
-#line 5115 "Gmsh.y"
+#line 5115 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.v)[0] = (yyvsp[(2) - (7)].d);  (yyval.v)[1] = (yyvsp[(4) - (7)].d);  (yyval.v)[2] = (yyvsp[(6) - (7)].d);  (yyval.v)[3] = 0.0; (yyval.v)[4] = 1.0;
-    ;}
+      (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;
+    }
+#line 10830 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 438:
-#line 5122 "Gmsh.y"
+#line 5122 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(List_T*));
-      List_Add((yyval.l), &((yyvsp[(1) - (1)].l)));
-    ;}
+      List_Add((yyval.l), &((yyvsp[0].l)));
+    }
+#line 10839 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 439:
-#line 5127 "Gmsh.y"
+#line 5127 "Gmsh.y" /* yacc.c:1646  */
     {
-      List_Add((yyval.l), &((yyvsp[(3) - (3)].l)));
-    ;}
+      List_Add((yyval.l), &((yyvsp[0].l)));
+    }
+#line 10847 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 440:
-#line 5134 "Gmsh.y"
+#line 5134 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(double));
-      List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
-    ;}
+      List_Add((yyval.l), &((yyvsp[0].d)));
+    }
+#line 10856 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 441:
-#line 5139 "Gmsh.y"
+#line 5139 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = (yyvsp[(1) - (1)].l);
-    ;}
+      (yyval.l) = (yyvsp[0].l);
+    }
+#line 10864 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 442:
-#line 5143 "Gmsh.y"
+#line 5143 "Gmsh.y" /* yacc.c:1646  */
     {
       // creates an empty list
       (yyval.l) = List_Create(2, 1, sizeof(double));
-    ;}
+    }
+#line 10873 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 443:
-#line 5148 "Gmsh.y"
+#line 5148 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = (yyvsp[(2) - (3)].l);
-    ;}
+      (yyval.l) = (yyvsp[-1].l);
+    }
+#line 10881 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 444:
-#line 5152 "Gmsh.y"
+#line 5152 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = (yyvsp[(3) - (4)].l);
+      (yyval.l) = (yyvsp[-1].l);
       for(int i = 0; i < List_Nbr((yyval.l)); i++){
 	double *pd = (double*)List_Pointer((yyval.l), i);
 	(*pd) = - (*pd);
       }
-    ;}
+    }
+#line 10893 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 445:
-#line 5160 "Gmsh.y"
+#line 5160 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = (yyvsp[(4) - (5)].l);
+      (yyval.l) = (yyvsp[-1].l);
       for(int i = 0; i < List_Nbr((yyval.l)); i++){
 	double *pd = (double*)List_Pointer((yyval.l), i);
-	(*pd) *= (yyvsp[(1) - (5)].d);
+	(*pd) *= (yyvsp[-4].d);
       }
-    ;}
+    }
+#line 10905 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 446:
-#line 5171 "Gmsh.y"
+#line 5171 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = (yyvsp[(1) - (1)].l);
-    ;}
+      (yyval.l) = (yyvsp[0].l);
+    }
+#line 10913 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 447:
-#line 5175 "Gmsh.y"
+#line 5175 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!strcmp((yyvsp[(1) - (1)].c), "*") || !strcmp((yyvsp[(1) - (1)].c), "all"))
+      if(!strcmp((yyvsp[0].c), "*") || !strcmp((yyvsp[0].c), "all"))
         (yyval.l) = 0;
       else{
         yyerror("Unknown special string for list replacement");
         (yyval.l) = List_Create(2, 1, sizeof(double));
       }
-    ;}
+    }
+#line 10926 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 448:
-#line 5187 "Gmsh.y"
+#line 5187 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = (yyvsp[(2) - (2)].l);
+      (yyval.l) = (yyvsp[0].l);
       for(int i = 0; i < List_Nbr((yyval.l)); i++){
 	double *pd = (double*)List_Pointer((yyval.l), i);
 	(*pd) = - (*pd);
       }
-    ;}
+    }
+#line 10938 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 449:
-#line 5195 "Gmsh.y"
+#line 5195 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = (yyvsp[(3) - (3)].l);
+      (yyval.l) = (yyvsp[0].l);
       for(int i = 0; i < List_Nbr((yyval.l)); i++){
 	double *pd = (double*)List_Pointer((yyval.l), i);
-	(*pd) *= (yyvsp[(1) - (3)].d);
+	(*pd) *= (yyvsp[-2].d);
       }
-    ;}
+    }
+#line 10950 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 450:
-#line 5203 "Gmsh.y"
+#line 5203 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(double));
-      for(double d = (yyvsp[(1) - (3)].d); ((yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d)) ? (d <= (yyvsp[(3) - (3)].d)) : (d >= (yyvsp[(3) - (3)].d));
-          ((yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d)) ? (d += 1.) : (d -= 1.))
+      for(double 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.))
 	List_Add((yyval.l), &d);
-    ;}
+    }
+#line 10961 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 451:
-#line 5210 "Gmsh.y"
+#line 5210 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(double));
-      if(!(yyvsp[(5) - (5)].d)){  //|| ($1 < $3 && $5 < 0) || ($1 > $3 && $5 > 0)
-        yymsg(0, "Wrong increment in '%g:%g:%g'", (yyvsp[(1) - (5)].d), (yyvsp[(3) - (5)].d), (yyvsp[(5) - (5)].d));
+      if(!(yyvsp[0].d)){  //|| ($1 < $3 && $5 < 0) || ($1 > $3 && $5 > 0)
+        yymsg(0, "Wrong increment in '%g:%g:%g'", (yyvsp[-4].d), (yyvsp[-2].d), (yyvsp[0].d));
       }
       else
-	for(double d = (yyvsp[(1) - (5)].d); ((yyvsp[(5) - (5)].d) > 0) ? (d <= (yyvsp[(3) - (5)].d)) : (d >= (yyvsp[(3) - (5)].d)); d += (yyvsp[(5) - (5)].d))
+	for(double d = (yyvsp[-4].d); ((yyvsp[0].d) > 0) ? (d <= (yyvsp[-2].d)) : (d >= (yyvsp[-2].d)); d += (yyvsp[0].d))
 	  List_Add((yyval.l), &d);
-   ;}
+   }
+#line 10975 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 452:
-#line 5220 "Gmsh.y"
+#line 5220 "Gmsh.y" /* yacc.c:1646  */
     {
       // Returns the coordinates of a point and fills a list with it.
       // This allows to ensure e.g. that relative point positions are
       // always conserved
-      Vertex *v = FindPoint((int)(yyvsp[(3) - (4)].d));
+      Vertex *v = FindPoint((int)(yyvsp[-1].d));
       (yyval.l) = List_Create(3, 1, sizeof(double));
       if(!v) {
-        GVertex *gv = GModel::current()->getVertexByTag((int)(yyvsp[(3) - (4)].d));
+        GVertex *gv = GModel::current()->getVertexByTag((int)(yyvsp[-1].d));
         if(gv){
           double x = gv->x(), y = gv->y(), z = gv->z();
           List_Add((yyval.l), &x);
@@ -11194,7 +10991,7 @@ yyreduce:
           List_Add((yyval.l), &z);
         }
         else{
-          yymsg(0, "Unknown point '%d'", (int)(yyvsp[(3) - (4)].d));
+          yymsg(0, "Unknown point '%d'", (int)(yyvsp[-1].d));
           double d = 0.0;
           List_Add((yyval.l), &d);
           List_Add((yyval.l), &d);
@@ -11206,72 +11003,81 @@ yyreduce:
 	List_Add((yyval.l), &v->Pos.Y);
 	List_Add((yyval.l), &v->Pos.Z);
       }
-    ;}
+    }
+#line 11008 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 453:
-#line 5249 "Gmsh.y"
+#line 5249 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = GetAllElementaryEntityNumbers(0);
-    ;}
+    }
+#line 11016 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 454:
-#line 5253 "Gmsh.y"
+#line 5253 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = GetAllElementaryEntityNumbers(1);
-    ;}
+    }
+#line 11024 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 455:
-#line 5257 "Gmsh.y"
+#line 5257 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = GetAllElementaryEntityNumbers(2);
-    ;}
+    }
+#line 11032 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 456:
-#line 5261 "Gmsh.y"
+#line 5261 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = GetAllElementaryEntityNumbers(3);
-    ;}
+    }
+#line 11040 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 457:
-#line 5265 "Gmsh.y"
+#line 5265 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = GetAllPhysicalEntityNumbers(0);
-    ;}
+    }
+#line 11048 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 458:
-#line 5269 "Gmsh.y"
+#line 5269 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = GetAllPhysicalEntityNumbers(1);
-    ;}
+    }
+#line 11056 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 459:
-#line 5273 "Gmsh.y"
+#line 5273 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = GetAllPhysicalEntityNumbers(2);
-    ;}
+    }
+#line 11064 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 460:
-#line 5277 "Gmsh.y"
+#line 5277 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = GetAllPhysicalEntityNumbers(3);
-    ;}
+    }
+#line 11072 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 461:
-#line 5281 "Gmsh.y"
+#line 5281 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(10, 1, sizeof(double));
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
         double num;
-        List_Read((yyvsp[(4) - (5)].l), i, &num);
+        List_Read((yyvsp[-1].l), i, &num);
         PhysicalGroup *p = FindPhysicalGroup((int)num, MSH_PHYSICAL_POINT);
         if(p){
           for(int j = 0; j < List_Nbr(p->Entities); j++){
@@ -11293,17 +11099,18 @@ yyreduce:
           }
         }
       }
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 11105 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 462:
-#line 5310 "Gmsh.y"
+#line 5310 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(10, 1, sizeof(double));
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
         double num;
-        List_Read((yyvsp[(4) - (5)].l), i, &num);
+        List_Read((yyvsp[-1].l), i, &num);
         PhysicalGroup *p = FindPhysicalGroup((int)num, MSH_PHYSICAL_LINE);
         if(p){
           for(int j = 0; j < List_Nbr(p->Entities); j++){
@@ -11325,17 +11132,18 @@ yyreduce:
           }
         }
       }
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 11138 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 463:
-#line 5339 "Gmsh.y"
+#line 5339 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(10, 1, sizeof(double));
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
         double num;
-        List_Read((yyvsp[(4) - (5)].l), i, &num);
+        List_Read((yyvsp[-1].l), i, &num);
         PhysicalGroup *p = FindPhysicalGroup((int)num, MSH_PHYSICAL_SURFACE);
         if(p){
           for(int j = 0; j < List_Nbr(p->Entities); j++){
@@ -11357,17 +11165,18 @@ yyreduce:
           }
         }
       }
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 11171 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 464:
-#line 5368 "Gmsh.y"
+#line 5368 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(10, 1, sizeof(double));
-      for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
         double num;
-        List_Read((yyvsp[(4) - (5)].l), i, &num);
+        List_Read((yyvsp[-1].l), i, &num);
         PhysicalGroup *p = FindPhysicalGroup((int)num, MSH_PHYSICAL_VOLUME);
         if(p){
           for(int j = 0; j < List_Nbr(p->Entities); j++){
@@ -11389,678 +11198,747 @@ yyreduce:
           }
         }
       }
-      List_Delete((yyvsp[(4) - (5)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 11204 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 465:
-#line 5398 "Gmsh.y"
+#line 5398 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(10, 1, sizeof(double));
       GModel::current()->importGEOInternals();
-      SBoundingBox3d box((yyvsp[(5) - (16)].d), (yyvsp[(7) - (16)].d), (yyvsp[(9) - (16)].d), (yyvsp[(11) - (16)].d), (yyvsp[(13) - (16)].d), (yyvsp[(15) - (16)].d));
+      SBoundingBox3d box((yyvsp[-11].d), (yyvsp[-9].d), (yyvsp[-7].d), (yyvsp[-5].d), (yyvsp[-3].d), (yyvsp[-1].d));
       std::vector<GEntity*> entities;
       GModel::current()->getEntitiesInBox(entities, box, 0);
       for(unsigned int i = 0; i < entities.size(); i++){
         double d = entities[i]->tag();
 	List_Add((yyval.l), &d);
       }
-    ;}
+    }
+#line 11220 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 466:
-#line 5411 "Gmsh.y"
+#line 5411 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(10, 1, sizeof(double));
       GModel::current()->importGEOInternals();
-      SBoundingBox3d box((yyvsp[(5) - (16)].d), (yyvsp[(7) - (16)].d), (yyvsp[(9) - (16)].d), (yyvsp[(11) - (16)].d), (yyvsp[(13) - (16)].d), (yyvsp[(15) - (16)].d));
+      SBoundingBox3d box((yyvsp[-11].d), (yyvsp[-9].d), (yyvsp[-7].d), (yyvsp[-5].d), (yyvsp[-3].d), (yyvsp[-1].d));
       std::vector<GEntity*> entities;
       GModel::current()->getEntitiesInBox(entities, box, 1);
       for(unsigned int i = 0; i < entities.size(); i++){
         double d = entities[i]->tag();
 	List_Add((yyval.l), &d);
       }
-    ;}
+    }
+#line 11236 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 467:
-#line 5424 "Gmsh.y"
+#line 5424 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(10, 1, sizeof(double));
       GModel::current()->importGEOInternals();
-      SBoundingBox3d box((yyvsp[(5) - (16)].d), (yyvsp[(7) - (16)].d), (yyvsp[(9) - (16)].d), (yyvsp[(11) - (16)].d), (yyvsp[(13) - (16)].d), (yyvsp[(15) - (16)].d));
+      SBoundingBox3d box((yyvsp[-11].d), (yyvsp[-9].d), (yyvsp[-7].d), (yyvsp[-5].d), (yyvsp[-3].d), (yyvsp[-1].d));
       std::vector<GEntity*> entities;
       GModel::current()->getEntitiesInBox(entities, box, 2);
       for(unsigned int i = 0; i < entities.size(); i++){
         double d = entities[i]->tag();
 	List_Add((yyval.l), &d);
       }
-    ;}
+    }
+#line 11252 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 468:
-#line 5437 "Gmsh.y"
+#line 5437 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(10, 1, sizeof(double));
       GModel::current()->importGEOInternals();
-      SBoundingBox3d box((yyvsp[(5) - (16)].d), (yyvsp[(7) - (16)].d), (yyvsp[(9) - (16)].d), (yyvsp[(11) - (16)].d), (yyvsp[(13) - (16)].d), (yyvsp[(15) - (16)].d));
+      SBoundingBox3d box((yyvsp[-11].d), (yyvsp[-9].d), (yyvsp[-7].d), (yyvsp[-5].d), (yyvsp[-3].d), (yyvsp[-1].d));
       std::vector<GEntity*> entities;
       GModel::current()->getEntitiesInBox(entities, box, 3);
       for(unsigned int i = 0; i < entities.size(); i++){
         double d = entities[i]->tag();
 	List_Add((yyval.l), &d);
       }
-    ;}
+    }
+#line 11268 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 469:
-#line 5449 "Gmsh.y"
+#line 5449 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = List_Create(List_Nbr((yyvsp[(1) - (1)].l)), 1, sizeof(double));
-      for(int i = 0; i < List_Nbr((yyvsp[(1) - (1)].l)); i++){
-	Shape *s = (Shape*) List_Pointer((yyvsp[(1) - (1)].l), i);
+      (yyval.l) = List_Create(List_Nbr((yyvsp[0].l)), 1, sizeof(double));
+      for(int i = 0; i < List_Nbr((yyvsp[0].l)); i++){
+	Shape *s = (Shape*) List_Pointer((yyvsp[0].l), i);
 	double d = s->Num;
 	List_Add((yyval.l), &d);
       }
-      List_Delete((yyvsp[(1) - (1)].l));
-    ;}
+      List_Delete((yyvsp[0].l));
+    }
+#line 11282 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 470:
-#line 5459 "Gmsh.y"
+#line 5459 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = List_Create(List_Nbr((yyvsp[(1) - (1)].l)), 1, sizeof(double));
-      for(int i = 0; i < List_Nbr((yyvsp[(1) - (1)].l)); i++){
-	Shape *s = (Shape*) List_Pointer((yyvsp[(1) - (1)].l), i);
+      (yyval.l) = List_Create(List_Nbr((yyvsp[0].l)), 1, sizeof(double));
+      for(int i = 0; i < List_Nbr((yyvsp[0].l)); i++){
+	Shape *s = (Shape*) List_Pointer((yyvsp[0].l), i);
 	double d = s->Num;
 	List_Add((yyval.l), &d);
       }
-      List_Delete((yyvsp[(1) - (1)].l));
-    ;}
+      List_Delete((yyvsp[0].l));
+    }
+#line 11296 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 471:
-#line 5469 "Gmsh.y"
+#line 5469 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(double));
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (3)].c)))
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (3)].c));
+      if(!gmsh_yysymbols.count((yyvsp[-2].c)))
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-2].c));
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (3)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-2].c)]);
 	for(unsigned int i = 0; i < s.value.size(); i++)
 	  List_Add((yyval.l), &s.value[i]);
       }
-      Free((yyvsp[(1) - (3)].c));
-    ;}
+      Free((yyvsp[-2].c));
+    }
+#line 11312 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 472:
-#line 5481 "Gmsh.y"
+#line 5481 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(double));
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (3)].c)))
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (3)].c));
+      if(!gmsh_yysymbols.count((yyvsp[-2].c)))
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-2].c));
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (3)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-2].c)]);
 	for(unsigned int i = 0; i < s.value.size(); i++)
 	  List_Add((yyval.l), &s.value[i]);
       }
-      Free((yyvsp[(1) - (3)].c));
-    ;}
+      Free((yyvsp[-2].c));
+    }
+#line 11328 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 473:
-#line 5494 "Gmsh.y"
+#line 5494 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(double));
-      if(!gmsh_yysymbols.count((yyvsp[(3) - (4)].c)))
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(3) - (4)].c));
+      if(!gmsh_yysymbols.count((yyvsp[-1].c)))
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-1].c));
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(3) - (4)].c)]);
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-1].c)]);
 	for(unsigned int i = 0; i < s.value.size(); i++)
 	  List_Add((yyval.l), &s.value[i]);
       }
-      Free((yyvsp[(3) - (4)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 11344 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 474:
-#line 5506 "Gmsh.y"
+#line 5506 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(double));
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (6)].c)))
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (6)].c));
+      if(!gmsh_yysymbols.count((yyvsp[-5].c)))
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-5].c));
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (6)].c)]);
-	for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
-	  int index = (int)(*(double*)List_Pointer_Fast((yyvsp[(4) - (6)].l), i));
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-5].c)]);
+	for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
+	  int index = (int)(*(double*)List_Pointer_Fast((yyvsp[-2].l), i));
 	  if((int)s.value.size() < index + 1)
-	    yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (6)].c), index);
+	    yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-5].c), index);
 	  else
 	    List_Add((yyval.l), &s.value[index]);
 	}
       }
-      Free((yyvsp[(1) - (6)].c));
-      List_Delete((yyvsp[(4) - (6)].l));
-    ;}
+      Free((yyvsp[-5].c));
+      List_Delete((yyvsp[-2].l));
+    }
+#line 11366 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 475:
-#line 5524 "Gmsh.y"
+#line 5524 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(double));
-      if(!gmsh_yysymbols.count((yyvsp[(1) - (6)].c)))
-	yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (6)].c));
+      if(!gmsh_yysymbols.count((yyvsp[-5].c)))
+	yymsg(0, "Unknown variable '%s'", (yyvsp[-5].c));
       else{
-        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[(1) - (6)].c)]);
-	for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
-	  int index = (int)(*(double*)List_Pointer_Fast((yyvsp[(4) - (6)].l), i));
+        gmsh_yysymbol &s(gmsh_yysymbols[(yyvsp[-5].c)]);
+	for(int i = 0; i < List_Nbr((yyvsp[-2].l)); i++){
+	  int index = (int)(*(double*)List_Pointer_Fast((yyvsp[-2].l), i));
 	  if((int)s.value.size() < index + 1)
-	    yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[(1) - (6)].c), index);
+	    yymsg(0, "Uninitialized variable '%s[%d]'", (yyvsp[-5].c), index);
 	  else
 	    List_Add((yyval.l), &s.value[index]);
 	}
       }
-      Free((yyvsp[(1) - (6)].c));
-      List_Delete((yyvsp[(4) - (6)].l));
-    ;}
+      Free((yyvsp[-5].c));
+      List_Delete((yyvsp[-2].l));
+    }
+#line 11388 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 476:
-#line 5545 "Gmsh.y"
+#line 5545 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(2, 1, sizeof(double));
-      List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
-    ;}
+      List_Add((yyval.l), &((yyvsp[0].d)));
+    }
+#line 11397 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 477:
-#line 5550 "Gmsh.y"
+#line 5550 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = (yyvsp[(1) - (1)].l);
-    ;}
+      (yyval.l) = (yyvsp[0].l);
+    }
+#line 11405 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 478:
-#line 5554 "Gmsh.y"
+#line 5554 "Gmsh.y" /* yacc.c:1646  */
     {
-      List_Add((yyval.l), &((yyvsp[(3) - (3)].d)));
-    ;}
+      List_Add((yyval.l), &((yyvsp[0].d)));
+    }
+#line 11413 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 479:
-#line 5558 "Gmsh.y"
+#line 5558 "Gmsh.y" /* yacc.c:1646  */
     {
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (3)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[0].l)); i++){
 	double d;
-	List_Read((yyvsp[(3) - (3)].l), i, &d);
+	List_Read((yyvsp[0].l), i, &d);
 	List_Add((yyval.l), &d);
       }
-      List_Delete((yyvsp[(3) - (3)].l));
-    ;}
+      List_Delete((yyvsp[0].l));
+    }
+#line 11426 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 480:
-#line 5570 "Gmsh.y"
+#line 5570 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.u) = CTX::instance()->packColor((int)(yyvsp[(2) - (9)].d), (int)(yyvsp[(4) - (9)].d), (int)(yyvsp[(6) - (9)].d), (int)(yyvsp[(8) - (9)].d));
-    ;}
+      (yyval.u) = CTX::instance()->packColor((int)(yyvsp[-7].d), (int)(yyvsp[-5].d), (int)(yyvsp[-3].d), (int)(yyvsp[-1].d));
+    }
+#line 11434 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 481:
-#line 5574 "Gmsh.y"
+#line 5574 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.u) = CTX::instance()->packColor((int)(yyvsp[(2) - (7)].d), (int)(yyvsp[(4) - (7)].d), (int)(yyvsp[(6) - (7)].d), 255);
-    ;}
+      (yyval.u) = CTX::instance()->packColor((int)(yyvsp[-5].d), (int)(yyvsp[-3].d), (int)(yyvsp[-1].d), 255);
+    }
+#line 11442 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 482:
-#line 5586 "Gmsh.y"
+#line 5586 "Gmsh.y" /* yacc.c:1646  */
     {
       int flag;
-      if(gmsh_yystringsymbols.count((yyvsp[(1) - (1)].c)))
-        (yyval.u) = GetColorForString(-1, gmsh_yystringsymbols[(yyvsp[(1) - (1)].c)].c_str(), &flag);
+      if(gmsh_yystringsymbols.count((yyvsp[0].c)))
+        (yyval.u) = GetColorForString(-1, gmsh_yystringsymbols[(yyvsp[0].c)].c_str(), &flag);
       else
-        (yyval.u) = GetColorForString(-1, (yyvsp[(1) - (1)].c), &flag);
-      if(flag) yymsg(0, "Unknown color '%s'", (yyvsp[(1) - (1)].c));
-      Free((yyvsp[(1) - (1)].c));
-    ;}
+        (yyval.u) = GetColorForString(-1, (yyvsp[0].c), &flag);
+      if(flag) yymsg(0, "Unknown color '%s'", (yyvsp[0].c));
+      Free((yyvsp[0].c));
+    }
+#line 11456 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 483:
-#line 5596 "Gmsh.y"
+#line 5596 "Gmsh.y" /* yacc.c:1646  */
     {
       unsigned int val = 0;
-      ColorOption(GMSH_GET, (yyvsp[(1) - (5)].c), 0, (yyvsp[(5) - (5)].c), val);
+      ColorOption(GMSH_GET, (yyvsp[-4].c), 0, (yyvsp[0].c), val);
       (yyval.u) = val;
-      Free((yyvsp[(1) - (5)].c)); Free((yyvsp[(5) - (5)].c));
-    ;}
+      Free((yyvsp[-4].c)); Free((yyvsp[0].c));
+    }
+#line 11467 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 484:
-#line 5606 "Gmsh.y"
+#line 5606 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.l) = (yyvsp[(2) - (3)].l);
-    ;}
+      (yyval.l) = (yyvsp[-1].l);
+    }
+#line 11475 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 485:
-#line 5610 "Gmsh.y"
+#line 5610 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(256, 10, sizeof(unsigned int));
-      GmshColorTable *ct = GetColorTable((int)(yyvsp[(3) - (6)].d));
+      GmshColorTable *ct = GetColorTable((int)(yyvsp[-3].d));
       if(!ct)
-	yymsg(0, "View[%d] does not exist", (int)(yyvsp[(3) - (6)].d));
+	yymsg(0, "View[%d] does not exist", (int)(yyvsp[-3].d));
       else{
 	for(int i = 0; i < ct->size; i++)
 	  List_Add((yyval.l), &ct->table[i]);
       }
-      Free((yyvsp[(1) - (6)].c));
-    ;}
+      Free((yyvsp[-5].c));
+    }
+#line 11491 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 486:
-#line 5625 "Gmsh.y"
+#line 5625 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(256, 10, sizeof(unsigned int));
-      List_Add((yyval.l), &((yyvsp[(1) - (1)].u)));
-    ;}
+      List_Add((yyval.l), &((yyvsp[0].u)));
+    }
+#line 11500 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 487:
-#line 5630 "Gmsh.y"
+#line 5630 "Gmsh.y" /* yacc.c:1646  */
     {
-      List_Add((yyval.l), &((yyvsp[(3) - (3)].u)));
-    ;}
+      List_Add((yyval.l), &((yyvsp[0].u)));
+    }
+#line 11508 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 488:
-#line 5637 "Gmsh.y"
+#line 5637 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.c) = (yyvsp[(1) - (1)].c);
-    ;}
+      (yyval.c) = (yyvsp[0].c);
+    }
+#line 11516 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 489:
-#line 5641 "Gmsh.y"
+#line 5641 "Gmsh.y" /* yacc.c:1646  */
     {
-      if(!gmsh_yystringsymbols.count((yyvsp[(1) - (1)].c))){
-	yymsg(0, "Unknown string variable '%s'", (yyvsp[(1) - (1)].c));
-	(yyval.c) = (yyvsp[(1) - (1)].c);
+      if(!gmsh_yystringsymbols.count((yyvsp[0].c))){
+	yymsg(0, "Unknown string variable '%s'", (yyvsp[0].c));
+	(yyval.c) = (yyvsp[0].c);
       }
       else{
-	std::string val = gmsh_yystringsymbols[(yyvsp[(1) - (1)].c)];
+	std::string val = gmsh_yystringsymbols[(yyvsp[0].c)];
 	(yyval.c) = (char *)Malloc((val.size() + 1) * sizeof(char));
 	strcpy((yyval.c), val.c_str());
-	Free((yyvsp[(1) - (1)].c));
+	Free((yyvsp[0].c));
       }
-    ;}
+    }
+#line 11533 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 490:
-#line 5654 "Gmsh.y"
+#line 5654 "Gmsh.y" /* yacc.c:1646  */
     {
       std::string out;
-      StringOption(GMSH_GET, (yyvsp[(1) - (3)].c), 0, (yyvsp[(3) - (3)].c), out);
+      StringOption(GMSH_GET, (yyvsp[-2].c), 0, (yyvsp[0].c), out);
       (yyval.c) = (char*)Malloc((out.size() + 1) * sizeof(char));
       strcpy((yyval.c), out.c_str());
-      Free((yyvsp[(1) - (3)].c)); Free((yyvsp[(3) - (3)].c));
-    ;}
+      Free((yyvsp[-2].c)); Free((yyvsp[0].c));
+    }
+#line 11545 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 491:
-#line 5662 "Gmsh.y"
+#line 5662 "Gmsh.y" /* yacc.c:1646  */
     {
       std::string out;
-      StringOption(GMSH_GET, (yyvsp[(1) - (6)].c), (int)(yyvsp[(3) - (6)].d), (yyvsp[(6) - (6)].c), out);
+      StringOption(GMSH_GET, (yyvsp[-5].c), (int)(yyvsp[-3].d), (yyvsp[0].c), out);
       (yyval.c) = (char*)Malloc((out.size() + 1) * sizeof(char));
       strcpy((yyval.c), out.c_str());
-      Free((yyvsp[(1) - (6)].c)); Free((yyvsp[(6) - (6)].c));
-    ;}
+      Free((yyvsp[-5].c)); Free((yyvsp[0].c));
+    }
+#line 11557 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 492:
-#line 5673 "Gmsh.y"
+#line 5673 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.c) = (yyvsp[(1) - (1)].c);
-    ;}
+      (yyval.c) = (yyvsp[0].c);
+    }
+#line 11565 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 493:
-#line 5677 "Gmsh.y"
+#line 5677 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.c) = (yyvsp[(3) - (4)].c);
-    ;}
+      (yyval.c) = (yyvsp[-1].c);
+    }
+#line 11573 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 494:
-#line 5681 "Gmsh.y"
+#line 5681 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.c) = (char *)Malloc(32 * sizeof(char));
       time_t now;
       time(&now);
       strcpy((yyval.c), ctime(&now));
       (yyval.c)[strlen((yyval.c)) - 1] = '\0';
-    ;}
+    }
+#line 11585 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 495:
-#line 5689 "Gmsh.y"
+#line 5689 "Gmsh.y" /* yacc.c:1646  */
     {
       std::string exe = Msg::GetExecutableName();
       (yyval.c) = (char *)Malloc(exe.size() + 1);
       strcpy((yyval.c), exe.c_str());
-    ;}
+    }
+#line 11595 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 496:
-#line 5695 "Gmsh.y"
+#line 5695 "Gmsh.y" /* yacc.c:1646  */
     {
       std::string action = Msg::GetOnelabAction();
       (yyval.c) = (char *)Malloc(action.size() + 1);
       strcpy((yyval.c), action.c_str());
-    ;}
+    }
+#line 11605 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 497:
-#line 5701 "Gmsh.y"
+#line 5701 "Gmsh.y" /* yacc.c:1646  */
     {
-      const char *env = GetEnvironmentVar((yyvsp[(3) - (4)].c));
+      const char *env = GetEnvironmentVar((yyvsp[-1].c));
       if(!env) env = "";
       (yyval.c) = (char *)Malloc((sizeof(env) + 1) * sizeof(char));
       strcpy((yyval.c), env);
-      Free((yyvsp[(3) - (4)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 11617 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 498:
-#line 5709 "Gmsh.y"
+#line 5709 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string s = Msg::GetString((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].c));
+      std::string s = Msg::GetString((yyvsp[-3].c), (yyvsp[-1].c));
       (yyval.c) = (char *)Malloc((s.size() + 1) * sizeof(char));
       strcpy((yyval.c), s.c_str());
-      Free((yyvsp[(3) - (6)].c));
-      Free((yyvsp[(5) - (6)].c));
-    ;}
+      Free((yyvsp[-3].c));
+      Free((yyvsp[-1].c));
+    }
+#line 11629 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 499:
-#line 5717 "Gmsh.y"
+#line 5717 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string s = Msg::GetOnelabString((yyvsp[(3) - (4)].c));
+      std::string s = Msg::GetOnelabString((yyvsp[-1].c));
       (yyval.c) = (char *)Malloc((s.size() + 1) * sizeof(char));
       strcpy((yyval.c), s.c_str());
-      Free((yyvsp[(3) - (4)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 11640 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 500:
-#line 5724 "Gmsh.y"
+#line 5724 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string s = Msg::GetOnelabString((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].c));
+      std::string s = Msg::GetOnelabString((yyvsp[-3].c), (yyvsp[-1].c));
       (yyval.c) = (char *)Malloc((s.size() + 1) * sizeof(char));
       strcpy((yyval.c), s.c_str());
-      Free((yyvsp[(3) - (6)].c));
-      Free((yyvsp[(5) - (6)].c));
-    ;}
+      Free((yyvsp[-3].c));
+      Free((yyvsp[-1].c));
+    }
+#line 11652 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 501:
-#line 5732 "Gmsh.y"
+#line 5732 "Gmsh.y" /* yacc.c:1646  */
     {
       int size = 1;
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++)
-        size += strlen(*(char**)List_Pointer((yyvsp[(3) - (4)].l), i)) + 1;
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+        size += strlen(*(char**)List_Pointer((yyvsp[-1].l), i)) + 1;
       (yyval.c) = (char*)Malloc(size * sizeof(char));
       (yyval.c)[0] = '\0';
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
         char *s;
-        List_Read((yyvsp[(3) - (4)].l), i, &s);
+        List_Read((yyvsp[-1].l), i, &s);
         strcat((yyval.c), s);
         Free(s);
       }
-      List_Delete((yyvsp[(3) - (4)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 11671 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 502:
-#line 5747 "Gmsh.y"
+#line 5747 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c)) + 1) * sizeof(char));
+      (yyval.c) = (char *)Malloc((strlen((yyvsp[-1].c)) + 1) * sizeof(char));
       int i;
-      for(i = strlen((yyvsp[(3) - (4)].c)) - 1; i >= 0; i--){
-	if((yyvsp[(3) - (4)].c)[i] == '.'){
-	  strncpy((yyval.c), (yyvsp[(3) - (4)].c), i);
+      for(i = strlen((yyvsp[-1].c)) - 1; i >= 0; i--){
+	if((yyvsp[-1].c)[i] == '.'){
+	  strncpy((yyval.c), (yyvsp[-1].c), i);
 	  (yyval.c)[i]='\0';
 	  break;
 	}
       }
-      if(i <= 0) strcpy((yyval.c), (yyvsp[(3) - (4)].c));
-      Free((yyvsp[(3) - (4)].c));
-    ;}
+      if(i <= 0) strcpy((yyval.c), (yyvsp[-1].c));
+      Free((yyvsp[-1].c));
+    }
+#line 11689 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 503:
-#line 5761 "Gmsh.y"
+#line 5761 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c)) + 1) * sizeof(char));
+      (yyval.c) = (char *)Malloc((strlen((yyvsp[-1].c)) + 1) * sizeof(char));
       int i;
-      for(i = strlen((yyvsp[(3) - (4)].c)) - 1; i >= 0; i--){
-	if((yyvsp[(3) - (4)].c)[i] == '/' || (yyvsp[(3) - (4)].c)[i] == '\\')
+      for(i = strlen((yyvsp[-1].c)) - 1; i >= 0; i--){
+	if((yyvsp[-1].c)[i] == '/' || (yyvsp[-1].c)[i] == '\\')
 	  break;
       }
       if(i <= 0)
-	strcpy((yyval.c), (yyvsp[(3) - (4)].c));
+	strcpy((yyval.c), (yyvsp[-1].c));
       else
-	strcpy((yyval.c), &(yyvsp[(3) - (4)].c)[i+1]);
-      Free((yyvsp[(3) - (4)].c));
-    ;}
+	strcpy((yyval.c), &(yyvsp[-1].c)[i+1]);
+      Free((yyvsp[-1].c));
+    }
+#line 11707 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 504:
-#line 5775 "Gmsh.y"
+#line 5775 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string input = (yyvsp[(3) - (8)].c);
-      std::string substr_old = (yyvsp[(5) - (8)].c);
-      std::string substr_new = (yyvsp[(7) - (8)].c);
+      std::string input = (yyvsp[-5].c);
+      std::string substr_old = (yyvsp[-3].c);
+      std::string substr_new = (yyvsp[-1].c);
       std::string ret = ReplaceSubString(substr_old, substr_new, input);
       (yyval.c) = (char *)Malloc((ret.size() + 1) * sizeof(char));
       strcpy((yyval.c), ret.c_str());
-      Free((yyvsp[(3) - (8)].c));
-      Free((yyvsp[(5) - (8)].c));
-      Free((yyvsp[(7) - (8)].c));
-    ;}
+      Free((yyvsp[-5].c));
+      Free((yyvsp[-3].c));
+      Free((yyvsp[-1].c));
+    }
+#line 11723 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 505:
-#line 5787 "Gmsh.y"
+#line 5787 "Gmsh.y" /* yacc.c:1646  */
     {
       int size = 1;
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++)
-        size += strlen(*(char**)List_Pointer((yyvsp[(3) - (4)].l), i)) + 1;
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++)
+        size += strlen(*(char**)List_Pointer((yyvsp[-1].l), i)) + 1;
       (yyval.c) = (char*)Malloc(size * sizeof(char));
       (yyval.c)[0] = '\0';
-      for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
+      for(int i = 0; i < List_Nbr((yyvsp[-1].l)); i++){
         char *s;
-        List_Read((yyvsp[(3) - (4)].l), i, &s);
+        List_Read((yyvsp[-1].l), i, &s);
         strcat((yyval.c), s);
         Free(s);
-        if(i != List_Nbr((yyvsp[(3) - (4)].l)) - 1) strcat((yyval.c), "\n");
+        if(i != List_Nbr((yyvsp[-1].l)) - 1) strcat((yyval.c), "\n");
       }
-      List_Delete((yyvsp[(3) - (4)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 11743 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 506:
-#line 5803 "Gmsh.y"
+#line 5803 "Gmsh.y" /* yacc.c:1646  */
     {
       int i = 0;
-      while ((yyvsp[(3) - (4)].c)[i]) {
-        (yyvsp[(3) - (4)].c)[i] = toupper((yyvsp[(3) - (4)].c)[i]);
+      while ((yyvsp[-1].c)[i]) {
+        (yyvsp[-1].c)[i] = toupper((yyvsp[-1].c)[i]);
         i++;
       }
-      (yyval.c) = (yyvsp[(3) - (4)].c);
-    ;}
+      (yyval.c) = (yyvsp[-1].c);
+    }
+#line 11756 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 507:
-#line 5812 "Gmsh.y"
+#line 5812 "Gmsh.y" /* yacc.c:1646  */
     {
       int i = 0;
-      while ((yyvsp[(3) - (4)].c)[i]) {
-        (yyvsp[(3) - (4)].c)[i] = tolower((yyvsp[(3) - (4)].c)[i]);
+      while ((yyvsp[-1].c)[i]) {
+        (yyvsp[-1].c)[i] = tolower((yyvsp[-1].c)[i]);
         i++;
       }
-      (yyval.c) = (yyvsp[(3) - (4)].c);
-    ;}
+      (yyval.c) = (yyvsp[-1].c);
+    }
+#line 11769 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 508:
-#line 5821 "Gmsh.y"
+#line 5821 "Gmsh.y" /* yacc.c:1646  */
     {
       int i = 0;
-      while ((yyvsp[(3) - (4)].c)[i]) {
-        if (i > 0 && (yyvsp[(3) - (4)].c)[i-1] != '_')
-          (yyvsp[(3) - (4)].c)[i] = tolower((yyvsp[(3) - (4)].c)[i]);
+      while ((yyvsp[-1].c)[i]) {
+        if (i > 0 && (yyvsp[-1].c)[i-1] != '_')
+          (yyvsp[-1].c)[i] = tolower((yyvsp[-1].c)[i]);
         i++;
       }
-      (yyval.c) = (yyvsp[(3) - (4)].c);
-    ;}
+      (yyval.c) = (yyvsp[-1].c);
+    }
+#line 11783 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 509:
-#line 5831 "Gmsh.y"
+#line 5831 "Gmsh.y" /* yacc.c:1646  */
     {
-      if((yyvsp[(3) - (8)].d)){
-        (yyval.c) = (yyvsp[(5) - (8)].c);
-        Free((yyvsp[(7) - (8)].c));
+      if((yyvsp[-5].d)){
+        (yyval.c) = (yyvsp[-3].c);
+        Free((yyvsp[-1].c));
       }
       else{
-        (yyval.c) = (yyvsp[(7) - (8)].c);
-        Free((yyvsp[(5) - (8)].c));
+        (yyval.c) = (yyvsp[-1].c);
+        Free((yyvsp[-3].c));
       }
-    ;}
+    }
+#line 11798 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 510:
-#line 5842 "Gmsh.y"
+#line 5842 "Gmsh.y" /* yacc.c:1646  */
     {
-      (yyval.c) = (yyvsp[(3) - (4)].c);
-    ;}
+      (yyval.c) = (yyvsp[-1].c);
+    }
+#line 11806 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 511:
-#line 5846 "Gmsh.y"
+#line 5846 "Gmsh.y" /* yacc.c:1646  */
     {
       char tmpstring[5000];
-      int i = PrintListOfDouble((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].l), tmpstring);
+      int i = PrintListOfDouble((yyvsp[-3].c), (yyvsp[-1].l), tmpstring);
       if(i < 0){
 	yymsg(0, "Too few arguments in Sprintf");
-	(yyval.c) = (yyvsp[(3) - (6)].c);
+	(yyval.c) = (yyvsp[-3].c);
       }
       else if(i > 0){
 	yymsg(0, "%d extra argument%s in Sprintf", i, (i > 1) ? "s" : "");
-	(yyval.c) = (yyvsp[(3) - (6)].c);
+	(yyval.c) = (yyvsp[-3].c);
       }
       else{
 	(yyval.c) = (char*)Malloc((strlen(tmpstring) + 1) * sizeof(char));
 	strcpy((yyval.c), tmpstring);
-	Free((yyvsp[(3) - (6)].c));
+	Free((yyvsp[-3].c));
       }
-      List_Delete((yyvsp[(5) - (6)].l));
-    ;}
+      List_Delete((yyvsp[-1].l));
+    }
+#line 11829 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 512:
-#line 5865 "Gmsh.y"
+#line 5865 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(3) - (4)].c));
+      std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[-1].c));
       (yyval.c) = (char*)Malloc((tmp.size() + 1) * sizeof(char));
       strcpy((yyval.c), tmp.c_str());
-      Free((yyvsp[(3) - (4)].c));
-    ;}
+      Free((yyvsp[-1].c));
+    }
+#line 11840 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 513:
-#line 5872 "Gmsh.y"
+#line 5872 "Gmsh.y" /* yacc.c:1646  */
     {
       std::string tmp = SplitFileName(GetAbsolutePath(gmsh_yyname))[0];
       (yyval.c) = (char*)Malloc((tmp.size() + 1) * sizeof(char));
       strcpy((yyval.c), tmp.c_str());
-    ;}
+    }
+#line 11850 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 514:
-#line 5878 "Gmsh.y"
-    { floatOptions.clear(); charOptions.clear(); ;}
+#line 5878 "Gmsh.y" /* yacc.c:1646  */
+    { floatOptions.clear(); charOptions.clear(); }
+#line 11856 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 515:
-#line 5880 "Gmsh.y"
+#line 5880 "Gmsh.y" /* yacc.c:1646  */
     {
-      std::string val((yyvsp[(3) - (6)].c));
+      std::string val((yyvsp[-3].c));
       Msg::ExchangeOnelabParameter("", val, floatOptions, charOptions);
       (yyval.c) = (char*)Malloc((val.size() + 1) * sizeof(char));
       strcpy((yyval.c), val.c_str());
-      Free((yyvsp[(3) - (6)].c));
-    ;}
+      Free((yyvsp[-3].c));
+    }
+#line 11868 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 516:
-#line 5891 "Gmsh.y"
+#line 5891 "Gmsh.y" /* yacc.c:1646  */
     {
       (yyval.l) = List_Create(20,20,sizeof(char*));
-      List_Add((yyval.l), &((yyvsp[(1) - (1)].c)));
-    ;}
+      List_Add((yyval.l), &((yyvsp[0].c)));
+    }
+#line 11877 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 517:
-#line 5896 "Gmsh.y"
-    { List_Add((yyval.l), &((yyvsp[(3) - (3)].c))); ;}
+#line 5896 "Gmsh.y" /* yacc.c:1646  */
+    { List_Add((yyval.l), &((yyvsp[0].c))); }
+#line 11883 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 518:
-#line 5902 "Gmsh.y"
+#line 5902 "Gmsh.y" /* yacc.c:1646  */
     {
       char tmpstr[256];
-      sprintf(tmpstr, "_%d", (int)(yyvsp[(4) - (5)].d));
-      (yyval.c) = (char *)Malloc((strlen((yyvsp[(1) - (5)].c))+strlen(tmpstr)+1)*sizeof(char));
-      strcpy((yyval.c), (yyvsp[(1) - (5)].c)); strcat((yyval.c), tmpstr);
-      Free((yyvsp[(1) - (5)].c));
-    ;}
+      sprintf(tmpstr, "_%d", (int)(yyvsp[-1].d));
+      (yyval.c) = (char *)Malloc((strlen((yyvsp[-4].c))+strlen(tmpstr)+1)*sizeof(char));
+      strcpy((yyval.c), (yyvsp[-4].c)); strcat((yyval.c), tmpstr);
+      Free((yyvsp[-4].c));
+    }
+#line 11895 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 519:
-#line 5911 "Gmsh.y"
+#line 5911 "Gmsh.y" /* yacc.c:1646  */
     {
       char tmpstr[256];
-      sprintf(tmpstr, "_%d", (int)(yyvsp[(4) - (5)].d));
-      (yyval.c) = (char *)Malloc((strlen((yyvsp[(1) - (5)].c))+strlen(tmpstr)+1)*sizeof(char)) ;
-      strcpy((yyval.c), (yyvsp[(1) - (5)].c)) ; strcat((yyval.c), tmpstr) ;
-      Free((yyvsp[(1) - (5)].c));
-    ;}
+      sprintf(tmpstr, "_%d", (int)(yyvsp[-1].d));
+      (yyval.c) = (char *)Malloc((strlen((yyvsp[-4].c))+strlen(tmpstr)+1)*sizeof(char)) ;
+      strcpy((yyval.c), (yyvsp[-4].c)) ; strcat((yyval.c), tmpstr) ;
+      Free((yyvsp[-4].c));
+    }
+#line 11907 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 520:
-#line 5924 "Gmsh.y"
-    { (yyval.c) = (yyvsp[(1) - (1)].c); ;}
+#line 5924 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.c) = (yyvsp[0].c); }
+#line 11913 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 521:
-#line 5927 "Gmsh.y"
-    { (yyval.c) = (yyvsp[(1) - (1)].c); ;}
+#line 5927 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.c) = (yyvsp[0].c); }
+#line 11919 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
   case 522:
-#line 5931 "Gmsh.y"
-    { (yyval.c) = (yyvsp[(3) - (4)].c); ;}
+#line 5931 "Gmsh.y" /* yacc.c:1646  */
+    { (yyval.c) = (yyvsp[-1].c); }
+#line 11925 "Gmsh.tab.cpp" /* yacc.c:1646  */
     break;
 
 
-/* Line 1267 of yacc.c.  */
-#line 12062 "Gmsh.tab.cpp"
+#line 11929 "Gmsh.tab.cpp" /* yacc.c:1646  */
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -12069,8 +11947,7 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-
-  /* Now `shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
 
@@ -12085,10 +11962,14 @@ yyreduce:
   goto yynewstate;
 
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -12096,37 +11977,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -12134,24 +12014,24 @@ yyerrlab:
 
   if (yyerrstatus == 3)
     {
-      /* If just tried and failed to reuse look-ahead token after an
-	 error, discard it.  */
+      /* If just tried and failed to reuse lookahead token after an
+         error, discard it.  */
 
       if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-	}
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
       else
-	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
-  /* Else will try to reuse look-ahead token after shifting the error
+  /* Else will try to reuse lookahead token after shifting the error
      token.  */
   goto yyerrlab1;
 
@@ -12167,7 +12047,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -12180,38 +12060,37 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-	YYABORT;
+        YYABORT;
 
 
       yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
+                  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -12235,7 +12114,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#ifndef yyoverflow
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -12246,17 +12125,22 @@ yyexhaustedlab:
 #endif
 
 yyreturn:
-  if (yychar != YYEOF && yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
-  /* Do not reclaim the symbols of the rule which action triggered
+  if (yychar != YYEMPTY)
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -12267,12 +12151,9 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-
-#line 5934 "Gmsh.y"
+#line 5934 "Gmsh.y" /* yacc.c:1906  */
 
 
 void assignVariable(const std::string &name, int index, int assignType,
@@ -12615,4 +12496,3 @@ void computeAffineTransformation(SPoint3& origin, SPoint3& axis,
   for (int i = 0; i < 4; i++) tfo[12+i] = 0;
   tfo[15] = 1;
 }
-
diff --git a/Parser/Gmsh.tab.hpp b/Parser/Gmsh.tab.hpp
index af76e6e0d9..bd1f4a5067 100644
--- a/Parser/Gmsh.tab.hpp
+++ b/Parser/Gmsh.tab.hpp
@@ -1,14 +1,13 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
+/* A Bison parser, made by GNU Bison 3.0.4.  */
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,9 +15,7 @@
    GNU General Public License for more details.
 
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -33,391 +30,215 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
-/* Tokens.  */
+#ifndef YY_GMSH_YY_GMSH_TAB_HPP_INCLUDED
+# define YY_GMSH_YY_GMSH_TAB_HPP_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+#if YYDEBUG
+extern int gmsh_yydebug;
+#endif
+
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     tDOUBLE = 258,
-     tSTRING = 259,
-     tBIGSTR = 260,
-     tEND = 261,
-     tAFFECT = 262,
-     tDOTS = 263,
-     tPi = 264,
-     tMPI_Rank = 265,
-     tMPI_Size = 266,
-     tEuclidian = 267,
-     tCoordinates = 268,
-     tTestLevel = 269,
-     tExp = 270,
-     tLog = 271,
-     tLog10 = 272,
-     tSqrt = 273,
-     tSin = 274,
-     tAsin = 275,
-     tCos = 276,
-     tAcos = 277,
-     tTan = 278,
-     tRand = 279,
-     tAtan = 280,
-     tAtan2 = 281,
-     tSinh = 282,
-     tCosh = 283,
-     tTanh = 284,
-     tFabs = 285,
-     tFloor = 286,
-     tCeil = 287,
-     tRound = 288,
-     tFmod = 289,
-     tModulo = 290,
-     tHypot = 291,
-     tList = 292,
-     tPrintf = 293,
-     tError = 294,
-     tStr = 295,
-     tSprintf = 296,
-     tStrCat = 297,
-     tStrPrefix = 298,
-     tStrRelative = 299,
-     tStrReplace = 300,
-     tFind = 301,
-     tStrFind = 302,
-     tStrCmp = 303,
-     tStrChoice = 304,
-     tUpperCase = 305,
-     tLowerCase = 306,
-     tLowerCaseIn = 307,
-     tTextAttributes = 308,
-     tBoundingBox = 309,
-     tDraw = 310,
-     tSetChanged = 311,
-     tToday = 312,
-     tFixRelativePath = 313,
-     tCurrentDirectory = 314,
-     tSyncModel = 315,
-     tNewModel = 316,
-     tOnelabAction = 317,
-     tOnelabRun = 318,
-     tCpu = 319,
-     tMemory = 320,
-     tTotalMemory = 321,
-     tCreateTopology = 322,
-     tCreateTopologyNoHoles = 323,
-     tDistanceFunction = 324,
-     tDefineConstant = 325,
-     tUndefineConstant = 326,
-     tDefineNumber = 327,
-     tDefineString = 328,
-     tSetNumber = 329,
-     tSetString = 330,
-     tPoint = 331,
-     tCircle = 332,
-     tEllipse = 333,
-     tLine = 334,
-     tSphere = 335,
-     tPolarSphere = 336,
-     tSurface = 337,
-     tSpline = 338,
-     tVolume = 339,
-     tCharacteristic = 340,
-     tLength = 341,
-     tParametric = 342,
-     tElliptic = 343,
-     tRefineMesh = 344,
-     tAdaptMesh = 345,
-     tRelocateMesh = 346,
-     tPlane = 347,
-     tRuled = 348,
-     tTransfinite = 349,
-     tComplex = 350,
-     tPhysical = 351,
-     tCompound = 352,
-     tPeriodic = 353,
-     tUsing = 354,
-     tPlugin = 355,
-     tDegenerated = 356,
-     tRecursive = 357,
-     tRotate = 358,
-     tTranslate = 359,
-     tSymmetry = 360,
-     tDilate = 361,
-     tExtrude = 362,
-     tLevelset = 363,
-     tAffine = 364,
-     tRecombine = 365,
-     tSmoother = 366,
-     tSplit = 367,
-     tDelete = 368,
-     tCoherence = 369,
-     tIntersect = 370,
-     tMeshAlgorithm = 371,
-     tReverse = 372,
-     tLayers = 373,
-     tScaleLast = 374,
-     tHole = 375,
-     tAlias = 376,
-     tAliasWithOptions = 377,
-     tCopyOptions = 378,
-     tQuadTriAddVerts = 379,
-     tQuadTriNoNewVerts = 380,
-     tQuadTriSngl = 381,
-     tQuadTriDbl = 382,
-     tRecombLaterals = 383,
-     tTransfQuadTri = 384,
-     tText2D = 385,
-     tText3D = 386,
-     tInterpolationScheme = 387,
-     tTime = 388,
-     tCombine = 389,
-     tBSpline = 390,
-     tBezier = 391,
-     tNurbs = 392,
-     tNurbsOrder = 393,
-     tNurbsKnots = 394,
-     tColor = 395,
-     tColorTable = 396,
-     tFor = 397,
-     tIn = 398,
-     tEndFor = 399,
-     tIf = 400,
-     tElseIf = 401,
-     tElse = 402,
-     tEndIf = 403,
-     tExit = 404,
-     tAbort = 405,
-     tField = 406,
-     tReturn = 407,
-     tCall = 408,
-     tMacro = 409,
-     tShow = 410,
-     tHide = 411,
-     tGetValue = 412,
-     tGetStringValue = 413,
-     tGetEnv = 414,
-     tGetString = 415,
-     tGetNumber = 416,
-     tHomology = 417,
-     tCohomology = 418,
-     tBetti = 419,
-     tExists = 420,
-     tFileExists = 421,
-     tGMSH_MAJOR_VERSION = 422,
-     tGMSH_MINOR_VERSION = 423,
-     tGMSH_PATCH_VERSION = 424,
-     tGmshExecutableName = 425,
-     tSetPartition = 426,
-     tNameToString = 427,
-     tStringToName = 428,
-     tAFFECTDIVIDE = 429,
-     tAFFECTTIMES = 430,
-     tAFFECTMINUS = 431,
-     tAFFECTPLUS = 432,
-     tOR = 433,
-     tAND = 434,
-     tNOTEQUAL = 435,
-     tEQUAL = 436,
-     tGREATEROREQUAL = 437,
-     tLESSOREQUAL = 438,
-     UNARYPREC = 439,
-     tMINUSMINUS = 440,
-     tPLUSPLUS = 441
-   };
+  enum yytokentype
+  {
+    tDOUBLE = 258,
+    tSTRING = 259,
+    tBIGSTR = 260,
+    tEND = 261,
+    tAFFECT = 262,
+    tDOTS = 263,
+    tPi = 264,
+    tMPI_Rank = 265,
+    tMPI_Size = 266,
+    tEuclidian = 267,
+    tCoordinates = 268,
+    tTestLevel = 269,
+    tExp = 270,
+    tLog = 271,
+    tLog10 = 272,
+    tSqrt = 273,
+    tSin = 274,
+    tAsin = 275,
+    tCos = 276,
+    tAcos = 277,
+    tTan = 278,
+    tRand = 279,
+    tAtan = 280,
+    tAtan2 = 281,
+    tSinh = 282,
+    tCosh = 283,
+    tTanh = 284,
+    tFabs = 285,
+    tFloor = 286,
+    tCeil = 287,
+    tRound = 288,
+    tFmod = 289,
+    tModulo = 290,
+    tHypot = 291,
+    tList = 292,
+    tPrintf = 293,
+    tError = 294,
+    tStr = 295,
+    tSprintf = 296,
+    tStrCat = 297,
+    tStrPrefix = 298,
+    tStrRelative = 299,
+    tStrReplace = 300,
+    tFind = 301,
+    tStrFind = 302,
+    tStrCmp = 303,
+    tStrChoice = 304,
+    tUpperCase = 305,
+    tLowerCase = 306,
+    tLowerCaseIn = 307,
+    tTextAttributes = 308,
+    tBoundingBox = 309,
+    tDraw = 310,
+    tSetChanged = 311,
+    tToday = 312,
+    tFixRelativePath = 313,
+    tCurrentDirectory = 314,
+    tSyncModel = 315,
+    tNewModel = 316,
+    tOnelabAction = 317,
+    tOnelabRun = 318,
+    tCpu = 319,
+    tMemory = 320,
+    tTotalMemory = 321,
+    tCreateTopology = 322,
+    tCreateTopologyNoHoles = 323,
+    tDistanceFunction = 324,
+    tDefineConstant = 325,
+    tUndefineConstant = 326,
+    tDefineNumber = 327,
+    tDefineString = 328,
+    tSetNumber = 329,
+    tSetString = 330,
+    tPoint = 331,
+    tCircle = 332,
+    tEllipse = 333,
+    tLine = 334,
+    tSphere = 335,
+    tPolarSphere = 336,
+    tSurface = 337,
+    tSpline = 338,
+    tVolume = 339,
+    tCharacteristic = 340,
+    tLength = 341,
+    tParametric = 342,
+    tElliptic = 343,
+    tRefineMesh = 344,
+    tAdaptMesh = 345,
+    tRelocateMesh = 346,
+    tPlane = 347,
+    tRuled = 348,
+    tTransfinite = 349,
+    tComplex = 350,
+    tPhysical = 351,
+    tCompound = 352,
+    tPeriodic = 353,
+    tUsing = 354,
+    tPlugin = 355,
+    tDegenerated = 356,
+    tRecursive = 357,
+    tRotate = 358,
+    tTranslate = 359,
+    tSymmetry = 360,
+    tDilate = 361,
+    tExtrude = 362,
+    tLevelset = 363,
+    tAffine = 364,
+    tRecombine = 365,
+    tSmoother = 366,
+    tSplit = 367,
+    tDelete = 368,
+    tCoherence = 369,
+    tIntersect = 370,
+    tMeshAlgorithm = 371,
+    tReverse = 372,
+    tLayers = 373,
+    tScaleLast = 374,
+    tHole = 375,
+    tAlias = 376,
+    tAliasWithOptions = 377,
+    tCopyOptions = 378,
+    tQuadTriAddVerts = 379,
+    tQuadTriNoNewVerts = 380,
+    tQuadTriSngl = 381,
+    tQuadTriDbl = 382,
+    tRecombLaterals = 383,
+    tTransfQuadTri = 384,
+    tText2D = 385,
+    tText3D = 386,
+    tInterpolationScheme = 387,
+    tTime = 388,
+    tCombine = 389,
+    tBSpline = 390,
+    tBezier = 391,
+    tNurbs = 392,
+    tNurbsOrder = 393,
+    tNurbsKnots = 394,
+    tColor = 395,
+    tColorTable = 396,
+    tFor = 397,
+    tIn = 398,
+    tEndFor = 399,
+    tIf = 400,
+    tElseIf = 401,
+    tElse = 402,
+    tEndIf = 403,
+    tExit = 404,
+    tAbort = 405,
+    tField = 406,
+    tReturn = 407,
+    tCall = 408,
+    tMacro = 409,
+    tShow = 410,
+    tHide = 411,
+    tGetValue = 412,
+    tGetStringValue = 413,
+    tGetEnv = 414,
+    tGetString = 415,
+    tGetNumber = 416,
+    tHomology = 417,
+    tCohomology = 418,
+    tBetti = 419,
+    tExists = 420,
+    tFileExists = 421,
+    tGMSH_MAJOR_VERSION = 422,
+    tGMSH_MINOR_VERSION = 423,
+    tGMSH_PATCH_VERSION = 424,
+    tGmshExecutableName = 425,
+    tSetPartition = 426,
+    tNameToString = 427,
+    tStringToName = 428,
+    tAFFECTPLUS = 429,
+    tAFFECTMINUS = 430,
+    tAFFECTTIMES = 431,
+    tAFFECTDIVIDE = 432,
+    tOR = 433,
+    tAND = 434,
+    tEQUAL = 435,
+    tNOTEQUAL = 436,
+    tLESSOREQUAL = 437,
+    tGREATEROREQUAL = 438,
+    tPLUSPLUS = 439,
+    tMINUSMINUS = 440,
+    UNARYPREC = 441
+  };
 #endif
-/* Tokens.  */
-#define tDOUBLE 258
-#define tSTRING 259
-#define tBIGSTR 260
-#define tEND 261
-#define tAFFECT 262
-#define tDOTS 263
-#define tPi 264
-#define tMPI_Rank 265
-#define tMPI_Size 266
-#define tEuclidian 267
-#define tCoordinates 268
-#define tTestLevel 269
-#define tExp 270
-#define tLog 271
-#define tLog10 272
-#define tSqrt 273
-#define tSin 274
-#define tAsin 275
-#define tCos 276
-#define tAcos 277
-#define tTan 278
-#define tRand 279
-#define tAtan 280
-#define tAtan2 281
-#define tSinh 282
-#define tCosh 283
-#define tTanh 284
-#define tFabs 285
-#define tFloor 286
-#define tCeil 287
-#define tRound 288
-#define tFmod 289
-#define tModulo 290
-#define tHypot 291
-#define tList 292
-#define tPrintf 293
-#define tError 294
-#define tStr 295
-#define tSprintf 296
-#define tStrCat 297
-#define tStrPrefix 298
-#define tStrRelative 299
-#define tStrReplace 300
-#define tFind 301
-#define tStrFind 302
-#define tStrCmp 303
-#define tStrChoice 304
-#define tUpperCase 305
-#define tLowerCase 306
-#define tLowerCaseIn 307
-#define tTextAttributes 308
-#define tBoundingBox 309
-#define tDraw 310
-#define tSetChanged 311
-#define tToday 312
-#define tFixRelativePath 313
-#define tCurrentDirectory 314
-#define tSyncModel 315
-#define tNewModel 316
-#define tOnelabAction 317
-#define tOnelabRun 318
-#define tCpu 319
-#define tMemory 320
-#define tTotalMemory 321
-#define tCreateTopology 322
-#define tCreateTopologyNoHoles 323
-#define tDistanceFunction 324
-#define tDefineConstant 325
-#define tUndefineConstant 326
-#define tDefineNumber 327
-#define tDefineString 328
-#define tSetNumber 329
-#define tSetString 330
-#define tPoint 331
-#define tCircle 332
-#define tEllipse 333
-#define tLine 334
-#define tSphere 335
-#define tPolarSphere 336
-#define tSurface 337
-#define tSpline 338
-#define tVolume 339
-#define tCharacteristic 340
-#define tLength 341
-#define tParametric 342
-#define tElliptic 343
-#define tRefineMesh 344
-#define tAdaptMesh 345
-#define tRelocateMesh 346
-#define tPlane 347
-#define tRuled 348
-#define tTransfinite 349
-#define tComplex 350
-#define tPhysical 351
-#define tCompound 352
-#define tPeriodic 353
-#define tUsing 354
-#define tPlugin 355
-#define tDegenerated 356
-#define tRecursive 357
-#define tRotate 358
-#define tTranslate 359
-#define tSymmetry 360
-#define tDilate 361
-#define tExtrude 362
-#define tLevelset 363
-#define tAffine 364
-#define tRecombine 365
-#define tSmoother 366
-#define tSplit 367
-#define tDelete 368
-#define tCoherence 369
-#define tIntersect 370
-#define tMeshAlgorithm 371
-#define tReverse 372
-#define tLayers 373
-#define tScaleLast 374
-#define tHole 375
-#define tAlias 376
-#define tAliasWithOptions 377
-#define tCopyOptions 378
-#define tQuadTriAddVerts 379
-#define tQuadTriNoNewVerts 380
-#define tQuadTriSngl 381
-#define tQuadTriDbl 382
-#define tRecombLaterals 383
-#define tTransfQuadTri 384
-#define tText2D 385
-#define tText3D 386
-#define tInterpolationScheme 387
-#define tTime 388
-#define tCombine 389
-#define tBSpline 390
-#define tBezier 391
-#define tNurbs 392
-#define tNurbsOrder 393
-#define tNurbsKnots 394
-#define tColor 395
-#define tColorTable 396
-#define tFor 397
-#define tIn 398
-#define tEndFor 399
-#define tIf 400
-#define tElseIf 401
-#define tElse 402
-#define tEndIf 403
-#define tExit 404
-#define tAbort 405
-#define tField 406
-#define tReturn 407
-#define tCall 408
-#define tMacro 409
-#define tShow 410
-#define tHide 411
-#define tGetValue 412
-#define tGetStringValue 413
-#define tGetEnv 414
-#define tGetString 415
-#define tGetNumber 416
-#define tHomology 417
-#define tCohomology 418
-#define tBetti 419
-#define tExists 420
-#define tFileExists 421
-#define tGMSH_MAJOR_VERSION 422
-#define tGMSH_MINOR_VERSION 423
-#define tGMSH_PATCH_VERSION 424
-#define tGmshExecutableName 425
-#define tSetPartition 426
-#define tNameToString 427
-#define tStringToName 428
-#define tAFFECTDIVIDE 429
-#define tAFFECTTIMES 430
-#define tAFFECTMINUS 431
-#define tAFFECTPLUS 432
-#define tOR 433
-#define tAND 434
-#define tNOTEQUAL 435
-#define tEQUAL 436
-#define tGREATEROREQUAL 437
-#define tLESSOREQUAL 438
-#define UNARYPREC 439
-#define tMINUSMINUS 440
-#define tPLUSPLUS 441
-
-
-
 
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 109 "Gmsh.y"
+
+union YYSTYPE
 {
+#line 109 "Gmsh.y" /* yacc.c:1909  */
+
   char *c;
   int i;
   unsigned int u;
@@ -425,14 +246,18 @@ typedef union YYSTYPE
   double v[5];
   Shape s;
   List_T *l;
-}
-/* Line 1529 of yacc.c.  */
-#line 431 "Gmsh.tab.hpp"
-	YYSTYPE;
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
-# define YYSTYPE_IS_DECLARED 1
+
+#line 251 "Gmsh.tab.hpp" /* yacc.c:1909  */
+};
+
+typedef union YYSTYPE YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
+# define YYSTYPE_IS_DECLARED 1
 #endif
 
+
 extern YYSTYPE gmsh_yylval;
 
+int gmsh_yyparse (void);
+
+#endif /* !YY_GMSH_YY_GMSH_TAB_HPP_INCLUDED  */
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 3899a8c926..0e8f68eeb8 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -28,7 +28,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_SUBMINOR_VERSION 37
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -66,7 +66,6 @@ typedef int16_t flex_int16_t;
 typedef uint16_t flex_uint16_t;
 typedef int32_t flex_int32_t;
 typedef uint32_t flex_uint32_t;
-typedef uint64_t flex_uint64_t;
 #else
 typedef signed char flex_int8_t;
 typedef short int flex_int16_t;
@@ -74,7 +73,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -105,6 +103,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -375,7 +375,7 @@ static void yy_fatal_error (yyconst char msg[]  );
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	gmsh_yyleng = (yy_size_t) (yy_cp - yy_bp); \
+	gmsh_yyleng = (size_t) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
@@ -1145,9 +1145,6 @@ void   skipline(void);
 	 buf[n++] = (char) c;                                           \
 	 gmsh_yylineno++;							\
        }                                                                \
-       else if ( c == EOF ){                                            \
-	 buf[n++] = '\0';                                               \
-       }								\
        if ( c == EOF && ferror( gmsh_yyin ) )				\
 	 Msg::Fatal("Input in flex scanner failed");			\
        result = n;							\
@@ -1159,7 +1156,7 @@ void   skipline(void);
 #define YY_NO_UNISTD_H
 #endif
 
-#line 1163 "Gmsh.yy.cpp"
+#line 1160 "Gmsh.yy.cpp"
 
 #define INITIAL 0
 
@@ -1248,7 +1245,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO fwrite( gmsh_yytext, gmsh_yyleng, 1, gmsh_yyout )
+#define ECHO do { if (fwrite( gmsh_yytext, gmsh_yyleng, 1, gmsh_yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1259,7 +1256,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		yy_size_t n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( gmsh_yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1341,10 +1338,10 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 75 "Gmsh.l"
+#line 72 "Gmsh.l"
 
 
-#line 1348 "Gmsh.yy.cpp"
+#line 1345 "Gmsh.yy.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -1430,1051 +1427,1051 @@ do_action:	/* This label is used only to access EOF actions. */
 case 1:
 /* rule 1 can match eol */
 YY_RULE_SETUP
-#line 77 "Gmsh.l"
+#line 74 "Gmsh.l"
 /* none */;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 78 "Gmsh.l"
+#line 75 "Gmsh.l"
 return tEND;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 79 "Gmsh.l"
+#line 76 "Gmsh.l"
 skipcomments();
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 80 "Gmsh.l"
+#line 77 "Gmsh.l"
 skipline();
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 81 "Gmsh.l"
+#line 78 "Gmsh.l"
 { parsestring('\"'); return tBIGSTR; }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 82 "Gmsh.l"
+#line 79 "Gmsh.l"
 { parsestring('\''); return tBIGSTR; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 83 "Gmsh.l"
+#line 80 "Gmsh.l"
 { gmsh_yylval.d = NEWREG(); return tDOUBLE; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 84 "Gmsh.l"
+#line 81 "Gmsh.l"
 { gmsh_yylval.d = NEWPOINT(); return tDOUBLE; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 85 "Gmsh.l"
+#line 82 "Gmsh.l"
 { gmsh_yylval.d = NEWLINE(); return tDOUBLE; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 86 "Gmsh.l"
+#line 83 "Gmsh.l"
 { gmsh_yylval.d = NEWLINE(); return tDOUBLE; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 87 "Gmsh.l"
+#line 84 "Gmsh.l"
 { gmsh_yylval.d = NEWLINELOOP(); return tDOUBLE; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 88 "Gmsh.l"
+#line 85 "Gmsh.l"
 { gmsh_yylval.d = NEWSURFACE(); return tDOUBLE; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 89 "Gmsh.l"
+#line 86 "Gmsh.l"
 { gmsh_yylval.d = NEWSURFACELOOP(); return tDOUBLE; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 90 "Gmsh.l"
+#line 87 "Gmsh.l"
 { gmsh_yylval.d = NEWVOLUME(); return tDOUBLE; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 91 "Gmsh.l"
+#line 88 "Gmsh.l"
 { gmsh_yylval.d = NEWFIELD(); return tDOUBLE; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 92 "Gmsh.l"
+#line 89 "Gmsh.l"
 return tAFFECT;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 93 "Gmsh.l"
+#line 90 "Gmsh.l"
 return tAFFECTPLUS;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 94 "Gmsh.l"
+#line 91 "Gmsh.l"
 return tAFFECTMINUS;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 95 "Gmsh.l"
+#line 92 "Gmsh.l"
 return tAFFECTTIMES;
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 96 "Gmsh.l"
+#line 93 "Gmsh.l"
 return tAFFECTDIVIDE;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 97 "Gmsh.l"
+#line 94 "Gmsh.l"
 return tDOTS;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 98 "Gmsh.l"
+#line 95 "Gmsh.l"
 return tDOTS;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 99 "Gmsh.l"
+#line 96 "Gmsh.l"
 return tOR;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 100 "Gmsh.l"
+#line 97 "Gmsh.l"
 return tAND;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 101 "Gmsh.l"
+#line 98 "Gmsh.l"
 return tPLUSPLUS;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 102 "Gmsh.l"
+#line 99 "Gmsh.l"
 return tMINUSMINUS;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 103 "Gmsh.l"
+#line 100 "Gmsh.l"
 return tEQUAL;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 104 "Gmsh.l"
+#line 101 "Gmsh.l"
 return tNOTEQUAL;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 105 "Gmsh.l"
+#line 102 "Gmsh.l"
 return tLESSOREQUAL;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 106 "Gmsh.l"
+#line 103 "Gmsh.l"
 return tGREATEROREQUAL;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 108 "Gmsh.l"
+#line 105 "Gmsh.l"
 return tAbort;
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 109 "Gmsh.l"
+#line 106 "Gmsh.l"
 return tAcos;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 110 "Gmsh.l"
+#line 107 "Gmsh.l"
 return tAdaptMesh;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 111 "Gmsh.l"
+#line 108 "Gmsh.l"
 return tAffine;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 112 "Gmsh.l"
+#line 109 "Gmsh.l"
 return tAcos;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 113 "Gmsh.l"
+#line 110 "Gmsh.l"
 return tAlias;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 114 "Gmsh.l"
+#line 111 "Gmsh.l"
 return tAliasWithOptions;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 115 "Gmsh.l"
+#line 112 "Gmsh.l"
 return tAsin;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 116 "Gmsh.l"
+#line 113 "Gmsh.l"
 return tAsin;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 117 "Gmsh.l"
+#line 114 "Gmsh.l"
 return tAtan;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 118 "Gmsh.l"
+#line 115 "Gmsh.l"
 return tAtan;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 119 "Gmsh.l"
+#line 116 "Gmsh.l"
 return tAtan2;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 120 "Gmsh.l"
+#line 117 "Gmsh.l"
 return tAtan2;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 122 "Gmsh.l"
+#line 119 "Gmsh.l"
 return tBetti;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 123 "Gmsh.l"
+#line 120 "Gmsh.l"
 return tBezier;
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 124 "Gmsh.l"
+#line 121 "Gmsh.l"
 return tBSpline;
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 125 "Gmsh.l"
+#line 122 "Gmsh.l"
 return tBoundingBox;
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 127 "Gmsh.l"
+#line 124 "Gmsh.l"
 return tCeil;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 128 "Gmsh.l"
+#line 125 "Gmsh.l"
 return tCircle;
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 129 "Gmsh.l"
+#line 126 "Gmsh.l"
 return tCopyOptions;
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 130 "Gmsh.l"
+#line 127 "Gmsh.l"
 return tCoherence;
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 131 "Gmsh.l"
+#line 128 "Gmsh.l"
 return tCohomology;
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 132 "Gmsh.l"
+#line 129 "Gmsh.l"
 return tCombine;
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 133 "Gmsh.l"
+#line 130 "Gmsh.l"
 return tCosh;
 	YY_BREAK
 case 55:
 YY_RULE_SETUP
-#line 134 "Gmsh.l"
+#line 131 "Gmsh.l"
 return tCos;
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 135 "Gmsh.l"
+#line 132 "Gmsh.l"
 return tCharacteristic;
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 136 "Gmsh.l"
+#line 133 "Gmsh.l"
 return tComplex;
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 137 "Gmsh.l"
+#line 134 "Gmsh.l"
 return tColor;
 	YY_BREAK
 case 59:
 YY_RULE_SETUP
-#line 138 "Gmsh.l"
+#line 135 "Gmsh.l"
 return tColorTable;
 	YY_BREAK
 case 60:
 YY_RULE_SETUP
-#line 139 "Gmsh.l"
+#line 136 "Gmsh.l"
 return tCompound;
 	YY_BREAK
 case 61:
 YY_RULE_SETUP
-#line 140 "Gmsh.l"
+#line 137 "Gmsh.l"
 return tCoordinates;
 	YY_BREAK
 case 62:
 YY_RULE_SETUP
-#line 141 "Gmsh.l"
+#line 138 "Gmsh.l"
 return tSpline;
 	YY_BREAK
 case 63:
 YY_RULE_SETUP
-#line 142 "Gmsh.l"
+#line 139 "Gmsh.l"
 return tCall;
 	YY_BREAK
 case 64:
 YY_RULE_SETUP
-#line 143 "Gmsh.l"
+#line 140 "Gmsh.l"
 return tCreateTopology;
 	YY_BREAK
 case 65:
 YY_RULE_SETUP
-#line 144 "Gmsh.l"
+#line 141 "Gmsh.l"
 return tCreateTopologyNoHoles;
 	YY_BREAK
 case 66:
 YY_RULE_SETUP
-#line 145 "Gmsh.l"
+#line 142 "Gmsh.l"
 return tCpu;
 	YY_BREAK
 case 67:
 YY_RULE_SETUP
-#line 146 "Gmsh.l"
+#line 143 "Gmsh.l"
 return tCurrentDirectory;
 	YY_BREAK
 case 68:
 YY_RULE_SETUP
-#line 147 "Gmsh.l"
+#line 144 "Gmsh.l"
 return tCurrentDirectory;
 	YY_BREAK
 case 69:
 YY_RULE_SETUP
-#line 149 "Gmsh.l"
+#line 146 "Gmsh.l"
 return tDefineConstant;
 	YY_BREAK
 case 70:
 YY_RULE_SETUP
-#line 150 "Gmsh.l"
+#line 147 "Gmsh.l"
 return tDefineNumber;
 	YY_BREAK
 case 71:
 YY_RULE_SETUP
-#line 151 "Gmsh.l"
+#line 148 "Gmsh.l"
 return tDefineString;
 	YY_BREAK
 case 72:
 YY_RULE_SETUP
-#line 152 "Gmsh.l"
+#line 149 "Gmsh.l"
 return tDelete;
 	YY_BREAK
 case 73:
 YY_RULE_SETUP
-#line 153 "Gmsh.l"
+#line 150 "Gmsh.l"
 return tDegenerated;
 	YY_BREAK
 case 74:
 YY_RULE_SETUP
-#line 154 "Gmsh.l"
+#line 151 "Gmsh.l"
 return tDilate;
 	YY_BREAK
 case 75:
 YY_RULE_SETUP
-#line 155 "Gmsh.l"
+#line 152 "Gmsh.l"
 return tDraw;
 	YY_BREAK
 case 76:
 YY_RULE_SETUP
-#line 156 "Gmsh.l"
+#line 153 "Gmsh.l"
 return tSetChanged;
 	YY_BREAK
 case 77:
 YY_RULE_SETUP
-#line 158 "Gmsh.l"
+#line 155 "Gmsh.l"
 return tExp;
 	YY_BREAK
 case 78:
 YY_RULE_SETUP
-#line 159 "Gmsh.l"
+#line 156 "Gmsh.l"
 return tEllipse;
 	YY_BREAK
 case 79:
 YY_RULE_SETUP
-#line 160 "Gmsh.l"
+#line 157 "Gmsh.l"
 return tEllipse;
 	YY_BREAK
 case 80:
 YY_RULE_SETUP
-#line 161 "Gmsh.l"
+#line 158 "Gmsh.l"
 return tElse;
 	YY_BREAK
 case 81:
 YY_RULE_SETUP
-#line 162 "Gmsh.l"
+#line 159 "Gmsh.l"
 return tElseIf;
 	YY_BREAK
 case 82:
 YY_RULE_SETUP
-#line 163 "Gmsh.l"
+#line 160 "Gmsh.l"
 return tExtrude;
 	YY_BREAK
 case 83:
 YY_RULE_SETUP
-#line 164 "Gmsh.l"
+#line 161 "Gmsh.l"
 return tElliptic;
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
-#line 165 "Gmsh.l"
+#line 162 "Gmsh.l"
 return tEndFor;
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
-#line 166 "Gmsh.l"
+#line 163 "Gmsh.l"
 return tEndIf;
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
-#line 167 "Gmsh.l"
+#line 164 "Gmsh.l"
 return tEuclidian;
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
-#line 168 "Gmsh.l"
+#line 165 "Gmsh.l"
 return tError;
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
-#line 169 "Gmsh.l"
+#line 166 "Gmsh.l"
 return tExit;
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
-#line 170 "Gmsh.l"
+#line 167 "Gmsh.l"
 return tExists;
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 172 "Gmsh.l"
+#line 169 "Gmsh.l"
 return tFabs;
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 173 "Gmsh.l"
+#line 170 "Gmsh.l"
 return tField;
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 174 "Gmsh.l"
+#line 171 "Gmsh.l"
 return tFind;
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 175 "Gmsh.l"
+#line 172 "Gmsh.l"
 return tFileExists;
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
-#line 176 "Gmsh.l"
+#line 173 "Gmsh.l"
 return tFixRelativePath;
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
-#line 177 "Gmsh.l"
+#line 174 "Gmsh.l"
 return tFloor;
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
-#line 178 "Gmsh.l"
+#line 175 "Gmsh.l"
 return tFmod;
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
-#line 179 "Gmsh.l"
+#line 176 "Gmsh.l"
 return tFor;
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
-#line 180 "Gmsh.l"
+#line 177 "Gmsh.l"
 return tMacro;
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
-#line 182 "Gmsh.l"
+#line 179 "Gmsh.l"
 return tGetEnv;
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
-#line 183 "Gmsh.l"
+#line 180 "Gmsh.l"
 return tGetString;
 	YY_BREAK
 case 101:
 YY_RULE_SETUP
-#line 184 "Gmsh.l"
+#line 181 "Gmsh.l"
 return tGetNumber;
 	YY_BREAK
 case 102:
 YY_RULE_SETUP
-#line 185 "Gmsh.l"
+#line 182 "Gmsh.l"
 return tGetValue;
 	YY_BREAK
 case 103:
 YY_RULE_SETUP
-#line 186 "Gmsh.l"
+#line 183 "Gmsh.l"
 return tGetStringValue;
 	YY_BREAK
 case 104:
 YY_RULE_SETUP
-#line 187 "Gmsh.l"
+#line 184 "Gmsh.l"
 return tGMSH_MAJOR_VERSION;
 	YY_BREAK
 case 105:
 YY_RULE_SETUP
-#line 188 "Gmsh.l"
+#line 185 "Gmsh.l"
 return tGMSH_MINOR_VERSION;
 	YY_BREAK
 case 106:
 YY_RULE_SETUP
-#line 189 "Gmsh.l"
+#line 186 "Gmsh.l"
 return tGMSH_PATCH_VERSION;
 	YY_BREAK
 case 107:
 YY_RULE_SETUP
-#line 190 "Gmsh.l"
+#line 187 "Gmsh.l"
 return tGmshExecutableName;
 	YY_BREAK
 case 108:
 YY_RULE_SETUP
-#line 192 "Gmsh.l"
+#line 189 "Gmsh.l"
 return tHide;
 	YY_BREAK
 case 109:
 YY_RULE_SETUP
-#line 193 "Gmsh.l"
+#line 190 "Gmsh.l"
 return tHole;
 	YY_BREAK
 case 110:
 YY_RULE_SETUP
-#line 194 "Gmsh.l"
+#line 191 "Gmsh.l"
 return tHomology;
 	YY_BREAK
 case 111:
 YY_RULE_SETUP
-#line 195 "Gmsh.l"
+#line 192 "Gmsh.l"
 return tHypot;
 	YY_BREAK
 case 112:
 YY_RULE_SETUP
-#line 197 "Gmsh.l"
+#line 194 "Gmsh.l"
 return tIn;
 	YY_BREAK
 case 113:
 YY_RULE_SETUP
-#line 198 "Gmsh.l"
+#line 195 "Gmsh.l"
 return tIf;
 	YY_BREAK
 case 114:
 YY_RULE_SETUP
-#line 199 "Gmsh.l"
+#line 196 "Gmsh.l"
 return tIntersect;
 	YY_BREAK
 case 115:
 YY_RULE_SETUP
-#line 200 "Gmsh.l"
+#line 197 "Gmsh.l"
 return tInterpolationScheme;
 	YY_BREAK
 case 116:
 YY_RULE_SETUP
-#line 202 "Gmsh.l"
+#line 199 "Gmsh.l"
 return tNurbsKnots;
 	YY_BREAK
 case 117:
 YY_RULE_SETUP
-#line 204 "Gmsh.l"
+#line 201 "Gmsh.l"
 return tLength;
 	YY_BREAK
 case 118:
 YY_RULE_SETUP
-#line 205 "Gmsh.l"
+#line 202 "Gmsh.l"
 return tLine;
 	YY_BREAK
 case 119:
 YY_RULE_SETUP
-#line 206 "Gmsh.l"
+#line 203 "Gmsh.l"
 return tList;
 	YY_BREAK
 case 120:
 YY_RULE_SETUP
-#line 207 "Gmsh.l"
+#line 204 "Gmsh.l"
 return tLog;
 	YY_BREAK
 case 121:
 YY_RULE_SETUP
-#line 208 "Gmsh.l"
+#line 205 "Gmsh.l"
 return tLog10;
 	YY_BREAK
 case 122:
 YY_RULE_SETUP
-#line 209 "Gmsh.l"
+#line 206 "Gmsh.l"
 return tLayers;
 	YY_BREAK
 case 123:
 YY_RULE_SETUP
-#line 210 "Gmsh.l"
+#line 207 "Gmsh.l"
 return tLevelset;
 	YY_BREAK
 case 124:
 YY_RULE_SETUP
-#line 212 "Gmsh.l"
+#line 209 "Gmsh.l"
 return tMacro;
 	YY_BREAK
 case 125:
 YY_RULE_SETUP
-#line 213 "Gmsh.l"
+#line 210 "Gmsh.l"
 return tMeshAlgorithm;
 	YY_BREAK
 case 126:
 YY_RULE_SETUP
-#line 214 "Gmsh.l"
+#line 211 "Gmsh.l"
 return tModulo;
 	YY_BREAK
 case 127:
 YY_RULE_SETUP
-#line 215 "Gmsh.l"
+#line 212 "Gmsh.l"
 return tMPI_Rank;
 	YY_BREAK
 case 128:
 YY_RULE_SETUP
-#line 216 "Gmsh.l"
+#line 213 "Gmsh.l"
 return tMPI_Size;
 	YY_BREAK
 case 129:
 YY_RULE_SETUP
-#line 217 "Gmsh.l"
+#line 214 "Gmsh.l"
 return tMemory;
 	YY_BREAK
 case 130:
 YY_RULE_SETUP
-#line 219 "Gmsh.l"
+#line 216 "Gmsh.l"
 return tNameToString;
 	YY_BREAK
 case 131:
 YY_RULE_SETUP
-#line 220 "Gmsh.l"
+#line 217 "Gmsh.l"
 return tNameToString;
 	YY_BREAK
 case 132:
 YY_RULE_SETUP
-#line 221 "Gmsh.l"
+#line 218 "Gmsh.l"
 return tNewModel;
 	YY_BREAK
 case 133:
 YY_RULE_SETUP
-#line 222 "Gmsh.l"
+#line 219 "Gmsh.l"
 return tNurbs;
 	YY_BREAK
 case 134:
 YY_RULE_SETUP
-#line 224 "Gmsh.l"
+#line 221 "Gmsh.l"
 return tOnelabAction;
 	YY_BREAK
 case 135:
 YY_RULE_SETUP
-#line 225 "Gmsh.l"
+#line 222 "Gmsh.l"
 return tOnelabRun;
 	YY_BREAK
 case 136:
 YY_RULE_SETUP
-#line 226 "Gmsh.l"
+#line 223 "Gmsh.l"
 return tNurbsOrder;
 	YY_BREAK
 case 137:
 YY_RULE_SETUP
-#line 228 "Gmsh.l"
+#line 225 "Gmsh.l"
 return tPeriodic;
 	YY_BREAK
 case 138:
 YY_RULE_SETUP
-#line 229 "Gmsh.l"
+#line 226 "Gmsh.l"
 return tPhysical;
 	YY_BREAK
 case 139:
 YY_RULE_SETUP
-#line 230 "Gmsh.l"
+#line 227 "Gmsh.l"
 return tPi;
 	YY_BREAK
 case 140:
 YY_RULE_SETUP
-#line 231 "Gmsh.l"
+#line 228 "Gmsh.l"
 return tPlane;
 	YY_BREAK
 case 141:
 YY_RULE_SETUP
-#line 232 "Gmsh.l"
+#line 229 "Gmsh.l"
 return tPoint;
 	YY_BREAK
 case 142:
 YY_RULE_SETUP
-#line 233 "Gmsh.l"
+#line 230 "Gmsh.l"
 return tParametric;
 	YY_BREAK
 case 143:
 YY_RULE_SETUP
-#line 234 "Gmsh.l"
+#line 231 "Gmsh.l"
 return tPolarSphere;
 	YY_BREAK
 case 144:
 YY_RULE_SETUP
-#line 235 "Gmsh.l"
+#line 232 "Gmsh.l"
 return tPrintf;
 	YY_BREAK
 case 145:
 YY_RULE_SETUP
-#line 236 "Gmsh.l"
+#line 233 "Gmsh.l"
 return tPlugin;
 	YY_BREAK
 case 146:
 YY_RULE_SETUP
-#line 238 "Gmsh.l"
+#line 235 "Gmsh.l"
 return tQuadTriAddVerts;
 	YY_BREAK
 case 147:
 YY_RULE_SETUP
-#line 239 "Gmsh.l"
+#line 236 "Gmsh.l"
 return tQuadTriNoNewVerts;
 	YY_BREAK
 case 148:
 YY_RULE_SETUP
-#line 241 "Gmsh.l"
+#line 238 "Gmsh.l"
 return tQuadTriDbl;
 	YY_BREAK
 case 149:
 YY_RULE_SETUP
-#line 242 "Gmsh.l"
+#line 239 "Gmsh.l"
 return tQuadTriSngl;
 	YY_BREAK
 case 150:
 YY_RULE_SETUP
-#line 244 "Gmsh.l"
+#line 241 "Gmsh.l"
 return tRecombine;
 	YY_BREAK
 case 151:
 YY_RULE_SETUP
-#line 245 "Gmsh.l"
+#line 242 "Gmsh.l"
 return tRecombLaterals;
 	YY_BREAK
 case 152:
 YY_RULE_SETUP
-#line 246 "Gmsh.l"
+#line 243 "Gmsh.l"
 return tRecursive;
 	YY_BREAK
 case 153:
 YY_RULE_SETUP
-#line 247 "Gmsh.l"
+#line 244 "Gmsh.l"
 return tRotate;
 	YY_BREAK
 case 154:
 YY_RULE_SETUP
-#line 248 "Gmsh.l"
+#line 245 "Gmsh.l"
 return tRound;
 	YY_BREAK
 case 155:
 YY_RULE_SETUP
-#line 249 "Gmsh.l"
+#line 246 "Gmsh.l"
 return tRuled;
 	YY_BREAK
 case 156:
 YY_RULE_SETUP
-#line 250 "Gmsh.l"
+#line 247 "Gmsh.l"
 return tRand;
 	YY_BREAK
 case 157:
 YY_RULE_SETUP
-#line 251 "Gmsh.l"
+#line 248 "Gmsh.l"
 return tRefineMesh;
 	YY_BREAK
 case 158:
 YY_RULE_SETUP
-#line 252 "Gmsh.l"
+#line 249 "Gmsh.l"
 return tRelocateMesh;
 	YY_BREAK
 case 159:
 YY_RULE_SETUP
-#line 253 "Gmsh.l"
+#line 250 "Gmsh.l"
 return tReturn;
 	YY_BREAK
 case 160:
 YY_RULE_SETUP
-#line 254 "Gmsh.l"
+#line 251 "Gmsh.l"
 return tReverse;
 	YY_BREAK
 case 161:
 YY_RULE_SETUP
-#line 256 "Gmsh.l"
+#line 253 "Gmsh.l"
 return tScaleLast;
 	YY_BREAK
 case 162:
 YY_RULE_SETUP
-#line 257 "Gmsh.l"
+#line 254 "Gmsh.l"
 return tSmoother;
 	YY_BREAK
 case 163:
 YY_RULE_SETUP
-#line 258 "Gmsh.l"
+#line 255 "Gmsh.l"
 return tSetNumber;
 	YY_BREAK
 case 164:
 YY_RULE_SETUP
-#line 259 "Gmsh.l"
+#line 256 "Gmsh.l"
 return tSetString;
 	YY_BREAK
 case 165:
 YY_RULE_SETUP
-#line 260 "Gmsh.l"
+#line 257 "Gmsh.l"
 return tSetPartition;
 	YY_BREAK
 case 166:
 YY_RULE_SETUP
-#line 261 "Gmsh.l"
+#line 258 "Gmsh.l"
 return tSqrt;
 	YY_BREAK
 case 167:
 YY_RULE_SETUP
-#line 262 "Gmsh.l"
+#line 259 "Gmsh.l"
 return tSin;
 	YY_BREAK
 case 168:
 YY_RULE_SETUP
-#line 263 "Gmsh.l"
+#line 260 "Gmsh.l"
 return tSinh;
 	YY_BREAK
 case 169:
 YY_RULE_SETUP
-#line 264 "Gmsh.l"
+#line 261 "Gmsh.l"
 return tSphere;
 	YY_BREAK
 case 170:
 YY_RULE_SETUP
-#line 265 "Gmsh.l"
+#line 262 "Gmsh.l"
 return tSpline;
 	YY_BREAK
 case 171:
 YY_RULE_SETUP
-#line 266 "Gmsh.l"
+#line 263 "Gmsh.l"
 return tSplit;
 	YY_BREAK
 case 172:
 YY_RULE_SETUP
-#line 267 "Gmsh.l"
+#line 264 "Gmsh.l"
 return tSurface;
 	YY_BREAK
 case 173:
 YY_RULE_SETUP
-#line 268 "Gmsh.l"
+#line 265 "Gmsh.l"
 return tStr;
 	YY_BREAK
 case 174:
 YY_RULE_SETUP
-#line 269 "Gmsh.l"
+#line 266 "Gmsh.l"
 return tStringToName;
 	YY_BREAK
 case 175:
 YY_RULE_SETUP
-#line 270 "Gmsh.l"
+#line 267 "Gmsh.l"
 return tStringToName;
 	YY_BREAK
 case 176:
 YY_RULE_SETUP
-#line 271 "Gmsh.l"
+#line 268 "Gmsh.l"
 return tSprintf;
 	YY_BREAK
 case 177:
 YY_RULE_SETUP
-#line 272 "Gmsh.l"
+#line 269 "Gmsh.l"
 return tStrCat;
 	YY_BREAK
 case 178:
 YY_RULE_SETUP
-#line 273 "Gmsh.l"
+#line 270 "Gmsh.l"
 return tStrReplace;
 	YY_BREAK
 case 179:
 YY_RULE_SETUP
-#line 274 "Gmsh.l"
+#line 271 "Gmsh.l"
 return tStrPrefix;
 	YY_BREAK
 case 180:
 YY_RULE_SETUP
-#line 275 "Gmsh.l"
+#line 272 "Gmsh.l"
 return tStrRelative;
 	YY_BREAK
 case 181:
 YY_RULE_SETUP
-#line 276 "Gmsh.l"
+#line 273 "Gmsh.l"
 return tStrFind;
 	YY_BREAK
 case 182:
 YY_RULE_SETUP
-#line 277 "Gmsh.l"
+#line 274 "Gmsh.l"
 return tStrCmp;
 	YY_BREAK
 case 183:
 YY_RULE_SETUP
-#line 278 "Gmsh.l"
+#line 275 "Gmsh.l"
 return tStrChoice;
 	YY_BREAK
 case 184:
 YY_RULE_SETUP
-#line 279 "Gmsh.l"
+#line 276 "Gmsh.l"
 return tShow;
 	YY_BREAK
 case 185:
 YY_RULE_SETUP
-#line 280 "Gmsh.l"
+#line 277 "Gmsh.l"
 return tSymmetry;
 	YY_BREAK
 case 186:
 YY_RULE_SETUP
-#line 281 "Gmsh.l"
+#line 278 "Gmsh.l"
 return tSyncModel;
 	YY_BREAK
 case 187:
 YY_RULE_SETUP
-#line 283 "Gmsh.l"
+#line 280 "Gmsh.l"
 return tText2D;
 	YY_BREAK
 case 188:
 YY_RULE_SETUP
-#line 284 "Gmsh.l"
+#line 281 "Gmsh.l"
 return tText3D;
 	YY_BREAK
 case 189:
 YY_RULE_SETUP
-#line 285 "Gmsh.l"
+#line 282 "Gmsh.l"
 return tTestLevel;
 	YY_BREAK
 case 190:
 YY_RULE_SETUP
-#line 286 "Gmsh.l"
+#line 283 "Gmsh.l"
 return tTextAttributes;
 	YY_BREAK
 case 191:
 YY_RULE_SETUP
-#line 287 "Gmsh.l"
+#line 284 "Gmsh.l"
 return tTime;
 	YY_BREAK
 case 192:
 YY_RULE_SETUP
-#line 288 "Gmsh.l"
+#line 285 "Gmsh.l"
 return tTransfinite;
 	YY_BREAK
 case 193:
 YY_RULE_SETUP
-#line 289 "Gmsh.l"
+#line 286 "Gmsh.l"
 return tTransfQuadTri;
 	YY_BREAK
 case 194:
 YY_RULE_SETUP
-#line 290 "Gmsh.l"
+#line 287 "Gmsh.l"
 return tTranslate;
 	YY_BREAK
 case 195:
 YY_RULE_SETUP
-#line 291 "Gmsh.l"
+#line 288 "Gmsh.l"
 return tTanh;
 	YY_BREAK
 case 196:
 YY_RULE_SETUP
-#line 292 "Gmsh.l"
+#line 289 "Gmsh.l"
 return tTan;
 	YY_BREAK
 case 197:
 YY_RULE_SETUP
-#line 293 "Gmsh.l"
+#line 290 "Gmsh.l"
 return tToday;
 	YY_BREAK
 case 198:
 YY_RULE_SETUP
-#line 294 "Gmsh.l"
+#line 291 "Gmsh.l"
 return tTotalMemory;
 	YY_BREAK
 case 199:
 YY_RULE_SETUP
-#line 296 "Gmsh.l"
+#line 293 "Gmsh.l"
 return tUndefineConstant;
 	YY_BREAK
 case 200:
 YY_RULE_SETUP
-#line 297 "Gmsh.l"
+#line 294 "Gmsh.l"
 return tUpperCase;
 	YY_BREAK
 case 201:
 YY_RULE_SETUP
-#line 298 "Gmsh.l"
+#line 295 "Gmsh.l"
 return tLowerCase;
 	YY_BREAK
 case 202:
 YY_RULE_SETUP
-#line 299 "Gmsh.l"
+#line 296 "Gmsh.l"
 return tLowerCaseIn;
 	YY_BREAK
 case 203:
 YY_RULE_SETUP
-#line 300 "Gmsh.l"
+#line 297 "Gmsh.l"
 return tUsing;
 	YY_BREAK
 case 204:
 YY_RULE_SETUP
-#line 302 "Gmsh.l"
+#line 299 "Gmsh.l"
 return tVolume;
 	YY_BREAK
 case 205:
-#line 305 "Gmsh.l"
+#line 302 "Gmsh.l"
 case 206:
-#line 306 "Gmsh.l"
+#line 303 "Gmsh.l"
 case 207:
-#line 307 "Gmsh.l"
+#line 304 "Gmsh.l"
 case 208:
 YY_RULE_SETUP
-#line 307 "Gmsh.l"
+#line 304 "Gmsh.l"
 { gmsh_yylval.d = atof((char *)gmsh_yytext); return tDOUBLE; }
 	YY_BREAK
 case 209:
 YY_RULE_SETUP
-#line 309 "Gmsh.l"
+#line 306 "Gmsh.l"
 { gmsh_yylval.c = strsave((char*)gmsh_yytext); return tSTRING; }
 	YY_BREAK
 case 210:
 YY_RULE_SETUP
-#line 311 "Gmsh.l"
+#line 308 "Gmsh.l"
 return gmsh_yytext[0];
 	YY_BREAK
 case 211:
 YY_RULE_SETUP
-#line 313 "Gmsh.l"
+#line 310 "Gmsh.l"
 ECHO;
 	YY_BREAK
-#line 2478 "Gmsh.yy.cpp"
+#line 2475 "Gmsh.yy.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
@@ -2667,7 +2664,7 @@ static int yy_get_next_buffer (void)
 			{ /* Not enough room in the buffer - grow it. */
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
 
 			int yy_c_buf_p_offset =
 				(int) ((yy_c_buf_p) - b->yy_ch_buf);
@@ -2800,7 +2797,7 @@ static int yy_get_next_buffer (void)
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 1058);
 
-	return yy_is_jam ? 0 : yy_current_state;
+		return yy_is_jam ? 0 : yy_current_state;
 }
 
     static void yyunput (int c, register char * yy_bp )
@@ -2888,7 +2885,7 @@ static int yy_get_next_buffer (void)
 				case EOB_ACT_END_OF_FILE:
 					{
 					if ( gmsh_yywrap( ) )
-						return 0;
+						return EOF;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -3024,10 +3021,6 @@ static void gmsh_yy_load_buffer_state  (void)
 	gmsh_yyfree((void *) b  );
 }
 
-#ifndef __cplusplus
-extern int isatty (int );
-#endif /* __cplusplus */
-    
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
  * such as during a gmsh_yyrestart() or at EOF.
@@ -3232,8 +3225,8 @@ YY_BUFFER_STATE gmsh_yy_scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to gmsh_yylex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
@@ -3241,7 +3234,8 @@ YY_BUFFER_STATE gmsh_yy_scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes
 {
 	YY_BUFFER_STATE b;
 	char *buf;
-	yy_size_t n, i;
+	yy_size_t n;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -3471,7 +3465,7 @@ void gmsh_yyfree (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 313 "Gmsh.l"
+#line 310 "Gmsh.l"
 
 
 
@@ -3505,7 +3499,7 @@ void parsestring(char endchar)
   // etc.) "as is" in the output string: see yyinput() above
   int i = 0;
   while ((c = yyinput()) != endchar) {
-    if(c=='\0'){
+    if(gmsheof(gmsh_yyin)){ // FIXME: this is not correct
       Msg::Error("End of file in string");
       break;
     }
-- 
GitLab