Syntax unification of Point, Line, Surface, and Volume, possible replaced by GeoEntity{dim}

af35bd9d · Patrick Dular · 85d7da95 · af35bd9d · af35bd9d · af35bd9d
Commit af35bd9d authored 7 years ago by Patrick Dular
--- a/Parser/Gmsh.l
+++ b/Parser/Gmsh.l
@@ -202,6 +202,7 @@ Function                return tMacro;
 GMSH_MAJOR_VERSION      return tGMSH_MAJOR_VERSION;
 GMSH_MINOR_VERSION      return tGMSH_MINOR_VERSION;
 GMSH_PATCH_VERSION      return tGMSH_PATCH_VERSION;
+GeoEntity               return tGeoEntity;
 GetEnv                  return tGetEnv;
 GetForced               return tGetForced;
 GetForcedStr            return tGetForcedStr;

--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
--- a/Parser/Gmsh.tab.hpp
+++ b/Parser/Gmsh.tab.hpp
@@ -146,122 +146,123 @@
     tRectangle = 362,
     tDisk = 363,
     tWire = 364,
-     tCharacteristic = 365,
+     tGeoEntity = 365,
-     tLength = 366,
+     tCharacteristic = 366,
-     tParametric = 367,
+     tLength = 367,
-     tElliptic = 368,
+     tParametric = 368,
-     tRefineMesh = 369,
+     tElliptic = 369,
-     tAdaptMesh = 370,
+     tRefineMesh = 370,
-     tRelocateMesh = 371,
+     tAdaptMesh = 371,
-     tSetFactory = 372,
+     tRelocateMesh = 372,
-     tThruSections = 373,
+     tSetFactory = 373,
-     tWedge = 374,
+     tThruSections = 374,
-     tFillet = 375,
+     tWedge = 375,
-     tChamfer = 376,
+     tFillet = 376,
-     tPlane = 377,
+     tChamfer = 377,
-     tRuled = 378,
+     tPlane = 378,
-     tTransfinite = 379,
+     tRuled = 379,
-     tPhysical = 380,
+     tTransfinite = 380,
-     tCompound = 381,
+     tPhysical = 381,
-     tPeriodic = 382,
+     tCompound = 382,
-     tUsing = 383,
+     tPeriodic = 383,
-     tPlugin = 384,
+     tUsing = 384,
-     tDegenerated = 385,
+     tPlugin = 385,
-     tRecursive = 386,
+     tDegenerated = 386,
-     tRotate = 387,
+     tRecursive = 387,
-     tTranslate = 388,
+     tRotate = 388,
-     tSymmetry = 389,
+     tTranslate = 389,
-     tDilate = 390,
+     tSymmetry = 390,
-     tExtrude = 391,
+     tDilate = 391,
-     tLevelset = 392,
+     tExtrude = 392,
-     tAffine = 393,
+     tLevelset = 393,
-     tBooleanUnion = 394,
+     tAffine = 394,
-     tBooleanIntersection = 395,
+     tBooleanUnion = 395,
-     tBooleanDifference = 396,
+     tBooleanIntersection = 396,
-     tBooleanSection = 397,
+     tBooleanDifference = 397,
-     tBooleanFragments = 398,
+     tBooleanSection = 398,
-     tThickSolid = 399,
+     tBooleanFragments = 399,
-     tRecombine = 400,
+     tThickSolid = 400,
-     tSmoother = 401,
+     tRecombine = 401,
-     tSplit = 402,
+     tSmoother = 402,
-     tDelete = 403,
+     tSplit = 403,
-     tCoherence = 404,
+     tDelete = 404,
-     tIntersect = 405,
+     tCoherence = 405,
-     tMeshAlgorithm = 406,
+     tIntersect = 406,
-     tReverse = 407,
+     tMeshAlgorithm = 407,
-     tLayers = 408,
+     tReverse = 408,
-     tScaleLast = 409,
+     tLayers = 409,
-     tHole = 410,
+     tScaleLast = 410,
-     tAlias = 411,
+     tHole = 411,
-     tAliasWithOptions = 412,
+     tAlias = 412,
-     tCopyOptions = 413,
+     tAliasWithOptions = 413,
-     tQuadTriAddVerts = 414,
+     tCopyOptions = 414,
-     tQuadTriNoNewVerts = 415,
+     tQuadTriAddVerts = 415,
-     tRecombLaterals = 416,
+     tQuadTriNoNewVerts = 416,
-     tTransfQuadTri = 417,
+     tRecombLaterals = 417,
-     tText2D = 418,
+     tTransfQuadTri = 418,
-     tText3D = 419,
+     tText2D = 419,
-     tInterpolationScheme = 420,
+     tText3D = 420,
-     tTime = 421,
+     tInterpolationScheme = 421,
-     tCombine = 422,
+     tTime = 422,
-     tBSpline = 423,
+     tCombine = 423,
-     tBezier = 424,
+     tBSpline = 424,
-     tNurbs = 425,
+     tBezier = 425,
-     tNurbsOrder = 426,
+     tNurbs = 426,
-     tNurbsKnots = 427,
+     tNurbsOrder = 427,
-     tColor = 428,
+     tNurbsKnots = 428,
-     tColorTable = 429,
+     tColor = 429,
-     tFor = 430,
+     tColorTable = 430,
-     tIn = 431,
+     tFor = 431,
-     tEndFor = 432,
+     tIn = 432,
-     tIf = 433,
+     tEndFor = 433,
-     tElseIf = 434,
+     tIf = 434,
-     tElse = 435,
+     tElseIf = 435,
-     tEndIf = 436,
+     tElse = 436,
-     tExit = 437,
+     tEndIf = 437,
-     tAbort = 438,
+     tExit = 438,
-     tField = 439,
+     tAbort = 439,
-     tReturn = 440,
+     tField = 440,
-     tCall = 441,
+     tReturn = 441,
-     tSlide = 442,
+     tCall = 442,
-     tMacro = 443,
+     tSlide = 443,
-     tShow = 444,
+     tMacro = 444,
-     tHide = 445,
+     tShow = 445,
-     tGetValue = 446,
+     tHide = 446,
-     tGetStringValue = 447,
+     tGetValue = 447,
-     tGetEnv = 448,
+     tGetStringValue = 448,
-     tGetString = 449,
+     tGetEnv = 449,
-     tGetNumber = 450,
+     tGetString = 450,
-     tUnique = 451,
+     tGetNumber = 451,
-     tHomology = 452,
+     tUnique = 452,
-     tCohomology = 453,
+     tHomology = 453,
-     tBetti = 454,
+     tCohomology = 454,
-     tExists = 455,
+     tBetti = 455,
-     tFileExists = 456,
+     tExists = 456,
-     tGetForced = 457,
+     tFileExists = 457,
-     tGetForcedStr = 458,
+     tGetForced = 458,
-     tGMSH_MAJOR_VERSION = 459,
+     tGetForcedStr = 459,
-     tGMSH_MINOR_VERSION = 460,
+     tGMSH_MAJOR_VERSION = 460,
-     tGMSH_PATCH_VERSION = 461,
+     tGMSH_MINOR_VERSION = 461,
-     tGmshExecutableName = 462,
+     tGMSH_PATCH_VERSION = 462,
-     tSetPartition = 463,
+     tGmshExecutableName = 463,
-     tNameToString = 464,
+     tSetPartition = 464,
-     tStringToName = 465,
+     tNameToString = 465,
-     tAFFECTDIVIDE = 466,
+     tStringToName = 466,
-     tAFFECTTIMES = 467,
+     tAFFECTDIVIDE = 467,
-     tAFFECTMINUS = 468,
+     tAFFECTTIMES = 468,
-     tAFFECTPLUS = 469,
+     tAFFECTMINUS = 469,
-     tOR = 470,
+     tAFFECTPLUS = 470,
-     tAND = 471,
+     tOR = 471,
-     tNOTEQUAL = 472,
+     tAND = 472,
-     tEQUAL = 473,
+     tNOTEQUAL = 473,
-     tGREATERGREATER = 474,
+     tEQUAL = 474,
-     tLESSLESS = 475,
+     tGREATERGREATER = 475,
-     tGREATEROREQUAL = 476,
+     tLESSLESS = 476,
-     tLESSOREQUAL = 477,
+     tGREATEROREQUAL = 477,
-     UNARYPREC = 478,
+     tLESSOREQUAL = 478,
-     tMINUSMINUS = 479,
+     UNARYPREC = 479,
-     tPLUSPLUS = 480
+     tMINUSMINUS = 480,
+     tPLUSPLUS = 481
   };
 #endif
 /* Tokens.  */
@@ -372,129 +373,130 @@
 #define tRectangle 362
 #define tDisk 363
 #define tWire 364
-#define tCharacteristic 365
+#define tGeoEntity 365
-#define tLength 366
+#define tCharacteristic 366
-#define tParametric 367
+#define tLength 367
-#define tElliptic 368
+#define tParametric 368
-#define tRefineMesh 369
+#define tElliptic 369
-#define tAdaptMesh 370
+#define tRefineMesh 370
-#define tRelocateMesh 371
+#define tAdaptMesh 371
-#define tSetFactory 372
+#define tRelocateMesh 372
-#define tThruSections 373
+#define tSetFactory 373
-#define tWedge 374
+#define tThruSections 374
-#define tFillet 375
+#define tWedge 375
-#define tChamfer 376
+#define tFillet 376
-#define tPlane 377
+#define tChamfer 377
-#define tRuled 378
+#define tPlane 378
-#define tTransfinite 379
+#define tRuled 379
-#define tPhysical 380
+#define tTransfinite 380
-#define tCompound 381
+#define tPhysical 381
-#define tPeriodic 382
+#define tCompound 382
-#define tUsing 383
+#define tPeriodic 383
-#define tPlugin 384
+#define tUsing 384
-#define tDegenerated 385
+#define tPlugin 385
-#define tRecursive 386
+#define tDegenerated 386
-#define tRotate 387
+#define tRecursive 387
-#define tTranslate 388
+#define tRotate 388
-#define tSymmetry 389
+#define tTranslate 389
-#define tDilate 390
+#define tSymmetry 390
-#define tExtrude 391
+#define tDilate 391
-#define tLevelset 392
+#define tExtrude 392
-#define tAffine 393
+#define tLevelset 393
-#define tBooleanUnion 394
+#define tAffine 394
-#define tBooleanIntersection 395
+#define tBooleanUnion 395
-#define tBooleanDifference 396
+#define tBooleanIntersection 396
-#define tBooleanSection 397
+#define tBooleanDifference 397
-#define tBooleanFragments 398
+#define tBooleanSection 398
-#define tThickSolid 399
+#define tBooleanFragments 399
-#define tRecombine 400
+#define tThickSolid 400
-#define tSmoother 401
+#define tRecombine 401
-#define tSplit 402
+#define tSmoother 402
-#define tDelete 403
+#define tSplit 403
-#define tCoherence 404
+#define tDelete 404
-#define tIntersect 405
+#define tCoherence 405
-#define tMeshAlgorithm 406
+#define tIntersect 406
-#define tReverse 407
+#define tMeshAlgorithm 407
-#define tLayers 408
+#define tReverse 408
-#define tScaleLast 409
+#define tLayers 409
-#define tHole 410
+#define tScaleLast 410
-#define tAlias 411
+#define tHole 411
-#define tAliasWithOptions 412
+#define tAlias 412
-#define tCopyOptions 413
+#define tAliasWithOptions 413
-#define tQuadTriAddVerts 414
+#define tCopyOptions 414
-#define tQuadTriNoNewVerts 415
+#define tQuadTriAddVerts 415
-#define tRecombLaterals 416
+#define tQuadTriNoNewVerts 416
-#define tTransfQuadTri 417
+#define tRecombLaterals 417
-#define tText2D 418
+#define tTransfQuadTri 418
-#define tText3D 419
+#define tText2D 419
-#define tInterpolationScheme 420
+#define tText3D 420
-#define tTime 421
+#define tInterpolationScheme 421
-#define tCombine 422
+#define tTime 422
-#define tBSpline 423
+#define tCombine 423
-#define tBezier 424
+#define tBSpline 424
-#define tNurbs 425
+#define tBezier 425
-#define tNurbsOrder 426
+#define tNurbs 426
-#define tNurbsKnots 427
+#define tNurbsOrder 427
-#define tColor 428
+#define tNurbsKnots 428
-#define tColorTable 429
+#define tColor 429
-#define tFor 430
+#define tColorTable 430
-#define tIn 431
+#define tFor 431
-#define tEndFor 432
+#define tIn 432
-#define tIf 433
+#define tEndFor 433
-#define tElseIf 434
+#define tIf 434
-#define tElse 435
+#define tElseIf 435
-#define tEndIf 436
+#define tElse 436
-#define tExit 437
+#define tEndIf 437
-#define tAbort 438
+#define tExit 438
-#define tField 439
+#define tAbort 439
-#define tReturn 440
+#define tField 440
-#define tCall 441
+#define tReturn 441
-#define tSlide 442
+#define tCall 442
-#define tMacro 443
+#define tSlide 443
-#define tShow 444
+#define tMacro 444
-#define tHide 445
+#define tShow 445
-#define tGetValue 446
+#define tHide 446
-#define tGetStringValue 447
+#define tGetValue 447
-#define tGetEnv 448
+#define tGetStringValue 448
-#define tGetString 449
+#define tGetEnv 449
-#define tGetNumber 450
+#define tGetString 450
-#define tUnique 451
+#define tGetNumber 451
-#define tHomology 452
+#define tUnique 452
-#define tCohomology 453
+#define tHomology 453
-#define tBetti 454
+#define tCohomology 454
-#define tExists 455
+#define tBetti 455
-#define tFileExists 456
+#define tExists 456
-#define tGetForced 457
+#define tFileExists 457
-#define tGetForcedStr 458
+#define tGetForced 458
-#define tGMSH_MAJOR_VERSION 459
+#define tGetForcedStr 459
-#define tGMSH_MINOR_VERSION 460
+#define tGMSH_MAJOR_VERSION 460
-#define tGMSH_PATCH_VERSION 461
+#define tGMSH_MINOR_VERSION 461
-#define tGmshExecutableName 462
+#define tGMSH_PATCH_VERSION 462
-#define tSetPartition 463
+#define tGmshExecutableName 463
-#define tNameToString 464
+#define tSetPartition 464
-#define tStringToName 465
+#define tNameToString 465
-#define tAFFECTDIVIDE 466
+#define tStringToName 466
-#define tAFFECTTIMES 467
+#define tAFFECTDIVIDE 467
-#define tAFFECTMINUS 468
+#define tAFFECTTIMES 468
-#define tAFFECTPLUS 469
+#define tAFFECTMINUS 469
-#define tOR 470
+#define tAFFECTPLUS 470
-#define tAND 471
+#define tOR 471
-#define tNOTEQUAL 472
+#define tAND 472
-#define tEQUAL 473
+#define tNOTEQUAL 473
-#define tGREATERGREATER 474
+#define tEQUAL 474
-#define tLESSLESS 475
+#define tGREATERGREATER 475
-#define tGREATEROREQUAL 476
+#define tLESSLESS 476
-#define tLESSOREQUAL 477
+#define tGREATEROREQUAL 477
-#define UNARYPREC 478
+#define tLESSOREQUAL 478
-#define tMINUSMINUS 479
+#define UNARYPREC 479
-#define tPLUSPLUS 480
+#define tMINUSMINUS 480
+#define tPLUSPLUS 481
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 163 "Gmsh.y"
+#line 164 "Gmsh.y"
 {
  char *c;
  int i;
@@ -506,7 +508,7 @@ typedef union YYSTYPE
  struct TwoChar c2;
 }
 /* Line 1529 of yacc.c.  */
-#line 510 "Gmsh.tab.hpp"
+#line 512 "Gmsh.tab.hpp"
 	YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1

--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp