diff --git a/Geo/Cell.h b/Geo/Cell.h
index 5058c79d67d5e6db97d2c3358fdaa44610da4180..61c70611d4697e86ab7305be674f13ccc3b83ec0 100644
--- a/Geo/Cell.h
+++ b/Geo/Cell.h
@@ -19,14 +19,6 @@
#include <queue>
#include "CellComplex.h"
#include "MElement.h"
-#include "MPoint.h"
-#include "MLine.h"
-#include "MTriangle.h"
-#include "MQuadrangle.h"
-#include "MHexahedron.h"
-#include "MPrism.h"
-#include "MPyramid.h"
-#include "MTetrahedron.h"
#include "GModel.h"
class Cell;
diff --git a/Geo/CellComplex.cpp b/Geo/CellComplex.cpp
index 136e386d45c89a2fa663b992dc60be5cf9731d17..55d4ac65775c7a1b05a78cca80a16308510b9004 100644
--- a/Geo/CellComplex.cpp
+++ b/Geo/CellComplex.cpp
@@ -7,6 +7,7 @@
#include "CellComplex.h"
#include "OS.h"
+#include "Context.h"
#if defined(HAVE_KBIPACK)
@@ -28,6 +29,7 @@ CellComplex::CellComplex( std::vector<GEntity*> domain,
if(dim != entity->dim()){
_multidim = true;
Msg::Warning("Domain is not a manifold.");
+ break;
}
}
@@ -124,21 +126,29 @@ void CellComplex::insert_cells(bool subdomain, bool boundary)
else domain = _domain;
std::vector<MVertex*> vertices;
-
std::pair<citer, bool> insertInfo;
// add highest dimensional cells
for(unsigned int j=0; j < domain.size(); j++) {
for(unsigned int i=0; i < domain.at(j)->getNumMeshElements(); i++){
vertices.clear();
-
- for(int k=0; k < domain.at(j)->getMeshElement(i)->getNumVertices(); k++){
- MVertex* vertex = domain.at(j)->getMeshElement(i)->getVertex(k);
+ MElement* element = domain.at(j)->getMeshElement(i);
+
+ for(int k=0; k < element->getNumVertices(); k++){
+ MVertex* vertex = element->getVertex(k);
vertices.push_back(vertex);
}
- int dim = domain.at(j)->getMeshElement(i)->getDim();
- int type = domain.at(j)->getMeshElement(i)->getTypeForMSH();
+ int dim = element->getDim();
+ int type = element->getTypeForMSH();
+
+ if(CTX::instance()->mesh.radiusSup){
+ double max = CTX::instance()->mesh.radiusSup;
+ double min = CTX::instance()->mesh.radiusInf;
+ double r = element->maxEdge();
+ if(r < min || r > max) continue;
+ }
+
Cell* cell;
// simplex types
if(type == MSH_LIN_2 || type == MSH_TRI_3 || type == MSH_TET_4
@@ -149,25 +159,28 @@ void CellComplex::insert_cells(bool subdomain, bool boundary)
|| type == MSH_LIN_6 || type == MSH_TET_20 || type == MSH_TET_35
|| type == MSH_TET_56
|| type == MSH_TET_34 || type == MSH_TET_52 ){
- cell = new Cell(domain.at(j)->getMeshElement(i), subdomain, boundary);
+ cell = new Cell(element, subdomain, boundary);
}
else if(type == MSH_QUA_4 || type == MSH_QUA_8 || type == MSH_QUA_9){
- cell = new Cell(domain.at(j)->getMeshElement(i), subdomain, boundary);
+ cell = new Cell(element, subdomain, boundary);
_simplicial = false;
}
else if(type == MSH_HEX_8 || type == MSH_HEX_27 || type == MSH_HEX_20){
- cell = new Cell(domain.at(j)->getMeshElement(i), subdomain, boundary);
+ cell = new Cell(element, subdomain, boundary);
_simplicial = false;
}/* FIXME: no getFaceInfo methods for these MElements
else if(type == MSH_PRI_6 || type == MSH_PRI_18 || type == MSH_PRI_15){
- cell = new Cell(domain.at(j)->getMeshElement(i), subdomain, boundary);
+ cell = new Cell(element, subdomain, boundary);
_simplicial = false;
}
else if(type == MSH_PYR_5 || type == MSH_PYR_14 || type == MSH_PYR_13){
- cell = new Cell(domain.at(j)->getMeshElement(i), subdomain, boundary);
+ cell = new Cell(element, subdomain, boundary);
_simplicial = false;
}*/
- else Msg::Error("Error: mesh element %d not implemented yet! \n", type);
+ else {
+ Msg::Error("Error: mesh element %d not implemented yet! \n", type);
+ continue;
+ }
cell->setImmune(false);
insertInfo = _cells[dim].insert(cell);
if(!insertInfo.second) delete cell;
@@ -507,21 +520,18 @@ int CellComplex::coreduceComplex()
void CellComplex::computeBettiNumbers()
{
- removeSubdomain();
-
for(int i = 0; i < 4; i++){
- if (getSize(i) != 0) _betti[i] = -1;
- else _betti[i] = 0;
+ _betti[i] = 0;
Msg::Debug("Betti number computation process: step %d of 4 \n", i+1);
while (getSize(i) != 0){
citer cit = firstCell(i);
Cell* cell = *cit;
- /*while(!cell->inSubdomain() && cit != lastCell(i)){
+ while(!cell->inSubdomain() && cit != lastCell(i)){
cell = *cit;
cit++;
}
- if(!cell->inSubdomain())*/ _betti[i] = _betti[i] + 1;
+ if(!cell->inSubdomain()) _betti[i] = _betti[i] + 1;
removeCell(cell, false);
coreduction(cell);
}
@@ -796,4 +806,25 @@ void CellComplex::makeDualComplex()
}
}
+bool CellComplex::writeBettiNumbers(std::string fileName)
+{
+ if(fileName.empty()) return false;
+ FILE *fp = fopen(fileName.c_str(), "w");
+ if(!fp){
+ Msg::Error("Unable to open file '%s'", fileName.c_str());
+ return false;
+ }
+
+ fprintf(fp, "$BettiNumbers\n");
+ fprintf(fp, "H0 %d \n", getBettiNumber(0));
+ fprintf(fp, "H1 %d \n", getBettiNumber(1));
+ fprintf(fp, "H2 %d \n", getBettiNumber(2));
+ fprintf(fp, "H3 %d \n", getBettiNumber(3));
+ fprintf(fp, "$EndBettiNumbers\n");
+
+ fclose(fp);
+ Msg::Info("Wrote Betti numbers to %s.", fileName.c_str());
+ return true;
+}
+
#endif
diff --git a/Geo/CellComplex.h b/Geo/CellComplex.h
index f859d2d5c9a8f8a1458ede2df8b2e459b33c2b86..3f1464acff94641392645378518e936ff687c02c 100644
--- a/Geo/CellComplex.h
+++ b/Geo/CellComplex.h
@@ -19,11 +19,6 @@
#include <queue>
#include "Cell.h"
#include "MElement.h"
-#include "GModel.h"
-#include "GEntity.h"
-#include "GRegion.h"
-#include "GFace.h"
-#include "GVertex.h"
class Cell;
@@ -144,7 +139,8 @@ class CellComplex
void computeBettiNumbers();
int getBettiNumber(int i) {
if(i > -1 && i < 4) return _betti[i]; else return 0; }
-
+ bool writeBettiNumbers(std::string fileName);
+
// check whether all boundary cells of a cell has this cell
// as coboundary cell and vice versa
// also check whether all (co)boundary cells of a cell
diff --git a/Geo/Homology.cpp b/Geo/Homology.cpp
index e8f39cd4b6fa7edb32d21532b64a96f568beeaef..b30aedc1368116059539517fddabf2ffabe76564 100644
--- a/Geo/Homology.cpp
+++ b/Geo/Homology.cpp
@@ -18,47 +18,58 @@ Homology::Homology(GModel* model, std::vector<int> physicalDomain,
_model = model;
_domain = physicalDomain;
_subdomain = physicalSubdomain;
+ _fileName = "";
Msg::Info("Creating a Cell Complex...");
Msg::StatusBar(1, false, "Cell Complex...");
Msg::StatusBar(2, false, "");
double t1 = Cpu();
+ std::vector<GEntity*> domainEntities;
+ std::vector<GEntity*> subdomainEntities;
+
+ // default to the whole model
+ if(_domain.empty()){
+ //_model->getEntities(domainEntities);
+ int dim = _model->getDim();
+ std::vector<GEntity*> entities;
+ _model->getEntities(entities);
+ for(std::vector<GEntity*>::iterator it = entities.begin();
+ it != entities.end(); it++){
+ if((*it)->dim() == dim) domainEntities.push_back(*it);
+ }
+ }
+
std::map<int, std::vector<GEntity*> > groups[4];
model->getPhysicalGroups(groups);
-
std::map<int, std::vector<GEntity*> >::iterator it;
- std::vector<GEntity*> domainEntities;
- std::vector<GEntity*> subdomainEntities;
-
- for(unsigned int i = 0; i < physicalDomain.size(); i++){
+
+ for(unsigned int i = 0; i < _domain.size(); i++){
for(int j = 0; j < 4; j++){
- it = groups[j].find(physicalDomain.at(i));
+ it = groups[j].find(_domain.at(i));
if(it != groups[j].end()){
- std::vector<GEntity*> physicalGroup = (*it).second;
- for(unsigned int k = 0; k < physicalGroup.size(); k++){
- domainEntities.push_back(physicalGroup.at(k));
- }
+ std::vector<GEntity*> physicalGroup = (*it).second;
+ for(unsigned int k = 0; k < physicalGroup.size(); k++){
+ domainEntities.push_back(physicalGroup.at(k));
+ }
}
}
}
- for(unsigned int i = 0; i < physicalSubdomain.size(); i++){
+ for(unsigned int i = 0; i < _subdomain.size(); i++){
for(int j = 0; j < 4; j++){
- it = groups[j].find(physicalSubdomain.at(i));
+ it = groups[j].find(_subdomain.at(i));
if(it != groups[j].end()){
- std::vector<GEntity*> physicalGroup = (*it).second;
- for(unsigned int k = 0; k < physicalGroup.size(); k++){
- subdomainEntities.push_back(physicalGroup.at(k));
- }
-
+ std::vector<GEntity*> physicalGroup = (*it).second;
+ for(unsigned int k = 0; k < physicalGroup.size(); k++){
+ subdomainEntities.push_back(physicalGroup.at(k));
+ }
}
}
}
- if(domainEntities.empty()) Msg::Warning("Domain is empty.");
+ if(domainEntities.empty()) Msg::Error("Domain is empty.");
if(subdomainEntities.empty()) Msg::Info("Subdomain is empty.");
-
_cellComplex = new CellComplex(domainEntities, subdomainEntities);
if(_cellComplex->getSize(0) == 0){
@@ -88,7 +99,7 @@ Homology::~Homology(){
}
}
-void Homology::findGenerators(std::string fileName)
+void Homology::findGenerators()
{
Msg::Info("Reducing the Cell Complex...");
Msg::StatusBar(1, false, "Reducing...");
@@ -166,7 +177,7 @@ void Homology::findGenerators(std::string fileName)
}
createPViews();
- if(fileName != "") writeGeneratorsMSH(fileName);
+ if(_fileName != "") writeGeneratorsMSH();
Msg::Info("Ranks of homology spaces for primal cell complex:");
Msg::Info("H0 = %d", HRank[0]);
@@ -189,7 +200,7 @@ void Homology::findGenerators(std::string fileName)
return;
}
-void Homology::findDualGenerators(std::string fileName)
+void Homology::findDualGenerators()
{
Msg::Info("Reducing Cell Complex...");
Msg::StatusBar(1, false, "Reducing...");
@@ -268,7 +279,7 @@ void Homology::findDualGenerators(std::string fileName)
}
createPViews();
- if(fileName != "") writeGeneratorsMSH(fileName);
+ if(_fileName != "") writeGeneratorsMSH();
Msg::Info("Ranks of homology spaces for the dual cell complex:");
Msg::Info("H0* = %d", HRank[0]);
@@ -311,6 +322,8 @@ void Homology::computeBettiNumbers()
_cellComplex->getBettiNumber(1),
_cellComplex->getBettiNumber(2),
_cellComplex->getBettiNumber(3));
+
+ if(_fileName != "") writeBettiNumbers();
return;
}
@@ -323,19 +336,21 @@ void Homology::restoreHomology()
std::string Homology::getDomainString()
{
std::string domainString = "({";
- for(unsigned int i = 0; i < _domain.size(); i++){
- std::string temp = "";
- convert(_domain.at(i),temp);
- domainString += temp;
- if (_domain.size()-1 > i){
- domainString += ", ";
+ if(_domain.empty()) domainString += "0";
+ else{
+ for(unsigned int i = 0; i < _domain.size(); i++){
+ std::string temp = "";
+ convert(_domain.at(i),temp);
+ domainString += temp;
+ if (_domain.size()-1 > i){
+ domainString += ", ";
+ }
}
}
domainString += "}";
if(!_subdomain.empty()){
- domainString += ", {";
-
+ domainString += ", {";
for(unsigned int i = 0; i < _subdomain.size(); i++){
std::string temp = "";
convert(_subdomain.at(i),temp);
@@ -345,7 +360,6 @@ std::string Homology::getDomainString()
}
}
domainString += "}";
-
}
domainString += ") ";
return domainString;
@@ -361,12 +375,11 @@ void Homology::createPViews()
}
}
-bool Homology::writeGeneratorsMSH(std::string fileName, bool binary)
+bool Homology::writeGeneratorsMSH(bool binary)
{
- if(!_model->writeMSH(fileName, 2.0, binary)) return false;
- Msg::Info("Wrote homology computation results to %s.", fileName.c_str());
- Msg::Debug("Wrote homology computation results to %s. \n",
- fileName.c_str());
+ if(_fileName.empty()) return false;
+ if(!_model->writeMSH(_fileName, 2.0, binary)) return false;
+ Msg::Info("Wrote homology computation results to %s.", _fileName.c_str());
return true;
}
diff --git a/Geo/Homology.h b/Geo/Homology.h
index b72918dd771cfe6978837d600d6a5006638fe4d5..3547f08bbd592dec8c3532ce9bad183ed6bd30f4 100644
--- a/Geo/Homology.h
+++ b/Geo/Homology.h
@@ -37,17 +37,21 @@ class Homology
// generator chains
std::vector<Chain*> _generators[4];
-
+
+ std::string _fileName;
+
public:
Homology(GModel* model, std::vector<int> physicalDomain,
std::vector<int> physicalSubdomain);
~Homology();
+ void setFileName(std::string fileName) { _fileName = fileName; }
+
// Find the generators/duals of homology spaces,
// or just compute the ranks of homology spaces
- void findGenerators(std::string fileName);
- void findDualGenerators(std::string fileName);
+ void findGenerators();
+ void findDualGenerators();
void computeBettiNumbers();
bool swapSubdomain() { return _cellComplex->swapSubdomain(); }
@@ -62,8 +66,10 @@ class Homology
// to the mesh of the model
void createPViews();
// write the generators to a file
- bool writeGeneratorsMSH(std::string fileName, bool binary=false);
-
+ bool writeGeneratorsMSH(bool binary=false);
+ bool writeBettiNumbers() {
+ return _cellComplex->writeBettiNumbers(_fileName); }
+
};
#endif
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 79af15834df23c747612d59a16a404027741b5c4..dad7fe2e0fec6bad4215e9d6e76592c1cf165fb8 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3. */
-/* Skeleton implementation for Bison's Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1. */
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
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
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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
@@ -29,7 +28,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
@@ -47,7 +46,7 @@
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "2.3"
+#define YYBISON_VERSION "2.4.1"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -55,17 +54,133 @@
/* Pure parsers. */
#define YYPURE 0
+/* Push parsers. */
+#define YYPUSH 0
+
+/* Pull parsers. */
+#define YYPULL 1
+
/* Using locations. */
#define YYLSP_NEEDED 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
+#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
+
+
+/* Copy the first part of user declarations. */
+
+/* Line 189 of yacc.c */
+#line 1 "Gmsh.y"
+
+// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
+//
+// See the LICENSE.txt file for license information. Please report all
+// bugs and problems to <gmsh@geuz.org>.
+
+#include <string.h>
+#include <stdarg.h>
+#include <time.h>
+#include "GmshConfig.h"
+#include "GmshMessage.h"
+#include "fullMatrix.h"
+#include "MallocUtils.h"
+#include "ListUtils.h"
+#include "TreeUtils.h"
+#include "StringUtils.h"
+#include "Numeric.h"
+#include "Context.h"
+#include "GModel.h"
+#include "Geo.h"
+#include "GeoInterpolation.h"
+#include "Options.h"
+#include "Colors.h"
+#include "Parser.h"
+#include "OpenFile.h"
+#include "CommandLine.h"
+#include "FunctionManager.h"
+#include "ColorTable.h"
+#include "OS.h"
+#include "CreateFile.h"
+#include "gmshSurface.h"
+#include "gmshLevelset.h"
+
+#if defined(HAVE_MESH)
+#include "Generator.h"
+#include "Field.h"
+#include "BackgroundMesh.h"
+#endif
+
+#if defined(HAVE_POST)
+#include "PView.h"
+#include "PViewDataList.h"
+#include "PluginManager.h"
+#endif
+
+#if defined(HAVE_OPENGL)
+#include "drawContext.h"
+#endif
+
+#if defined(HAVE_KBIPACK)
+#include "Homology.h"
+#endif
+
+// Global parser variables
+std::string gmsh_yyname;
+int gmsh_yyerrorstate = 0;
+int gmsh_yyviewindex = 0;
+std::map<std::string, std::vector<double> > gmsh_yysymbols;
+
+// Static parser variables (accessible only in this file)
+static std::map<std::string, std::string > gmsh_yystringsymbols;
+#if defined(HAVE_POST)
+static PViewDataList *ViewData;
+#endif
+static std::vector<double> ViewCoord;
+static std::vector<double> *ViewValueList = 0;
+static int *ViewNumList = 0;
+static ExtrudeParams extr;
+static int curPhysDim = 0;
+static gmshSurface *myGmshSurface = 0;
+#define MAX_RECUR_LOOPS 100
+static int ImbricatedLoop = 0;
+static fpos_t yyposImbricatedLoopsTab[MAX_RECUR_LOOPS];
+static int yylinenoImbricatedLoopsTab[MAX_RECUR_LOOPS];
+static double LoopControlVariablesTab[MAX_RECUR_LOOPS][3];
+static const char *LoopControlVariablesNameTab[MAX_RECUR_LOOPS];
+
+void yyerror(const char *s);
+void yymsg(int level, const char *fmt, ...);
+void skip_until(const char *skip, const char *until);
+int PrintListOfDouble(char *format, List_T *list, char *buffer);
+fullMatrix<double> ListOfListOfDouble2Matrix(List_T *list);
+
+
+/* Line 189 of yacc.c */
+#line 166 "Gmsh.tab.cpp"
+
+/* Enabling traces. */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages. */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table. */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
/* Tokens. */
@@ -203,246 +318,16 @@
tPLUSPLUS = 384
};
#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 tExp 269
-#define tLog 270
-#define tLog10 271
-#define tSqrt 272
-#define tSin 273
-#define tAsin 274
-#define tCos 275
-#define tAcos 276
-#define tTan 277
-#define tRand 278
-#define tAtan 279
-#define tAtan2 280
-#define tSinh 281
-#define tCosh 282
-#define tTanh 283
-#define tFabs 284
-#define tFloor 285
-#define tCeil 286
-#define tFmod 287
-#define tModulo 288
-#define tHypot 289
-#define tPrintf 290
-#define tSprintf 291
-#define tStrCat 292
-#define tStrPrefix 293
-#define tStrRelative 294
-#define tBoundingBox 295
-#define tDraw 296
-#define tToday 297
-#define tSyncModel 298
-#define tCreateTopology 299
-#define tDistanceFunction 300
-#define tPoint 301
-#define tCircle 302
-#define tEllipse 303
-#define tLine 304
-#define tSphere 305
-#define tPolarSphere 306
-#define tSurface 307
-#define tSpline 308
-#define tVolume 309
-#define tCharacteristic 310
-#define tLength 311
-#define tParametric 312
-#define tElliptic 313
-#define tPlane 314
-#define tRuled 315
-#define tTransfinite 316
-#define tComplex 317
-#define tPhysical 318
-#define tCompound 319
-#define tUsing 320
-#define tPlugin 321
-#define tDegenerated 322
-#define tOCCShape 323
-#define tRotate 324
-#define tTranslate 325
-#define tSymmetry 326
-#define tDilate 327
-#define tExtrude 328
-#define tLevelset 329
-#define tLoop 330
-#define tRecombine 331
-#define tSmoother 332
-#define tSplit 333
-#define tDelete 334
-#define tCoherence 335
-#define tIntersect 336
-#define tLayers 337
-#define tHole 338
-#define tAlias 339
-#define tAliasWithOptions 340
-#define tText2D 341
-#define tText3D 342
-#define tInterpolationScheme 343
-#define tTime 344
-#define tCombine 345
-#define tBSpline 346
-#define tBezier 347
-#define tNurbs 348
-#define tNurbsOrder 349
-#define tNurbsKnots 350
-#define tColor 351
-#define tColorTable 352
-#define tFor 353
-#define tIn 354
-#define tEndFor 355
-#define tIf 356
-#define tEndIf 357
-#define tExit 358
-#define tField 359
-#define tReturn 360
-#define tCall 361
-#define tFunction 362
-#define tShow 363
-#define tHide 364
-#define tGetValue 365
-#define tGMSH_MAJOR_VERSION 366
-#define tGMSH_MINOR_VERSION 367
-#define tGMSH_PATCH_VERSION 368
-#define tHomRank 369
-#define tHomGen 370
-#define tHomCut 371
-#define tAFFECTDIVIDE 372
-#define tAFFECTTIMES 373
-#define tAFFECTMINUS 374
-#define tAFFECTPLUS 375
-#define tOR 376
-#define tAND 377
-#define tNOTEQUAL 378
-#define tEQUAL 379
-#define tGREATEROREQUAL 380
-#define tLESSOREQUAL 381
-#define UNARYPREC 382
-#define tMINUSMINUS 383
-#define tPLUSPLUS 384
-
-
-
-
-/* Copy the first part of user declarations. */
-#line 1 "Gmsh.y"
-
-// Gmsh - Copyright (C) 1997-2010 C. Geuzaine, J.-F. Remacle
-//
-// See the LICENSE.txt file for license information. Please report all
-// bugs and problems to <gmsh@geuz.org>.
-
-#include <string.h>
-#include <stdarg.h>
-#include <time.h>
-#include "GmshConfig.h"
-#include "GmshMessage.h"
-#include "fullMatrix.h"
-#include "MallocUtils.h"
-#include "ListUtils.h"
-#include "TreeUtils.h"
-#include "StringUtils.h"
-#include "Numeric.h"
-#include "Context.h"
-#include "GModel.h"
-#include "Geo.h"
-#include "GeoInterpolation.h"
-#include "Options.h"
-#include "Colors.h"
-#include "Parser.h"
-#include "OpenFile.h"
-#include "CommandLine.h"
-#include "FunctionManager.h"
-#include "ColorTable.h"
-#include "OS.h"
-#include "CreateFile.h"
-#include "gmshSurface.h"
-#include "gmshLevelset.h"
-
-#if defined(HAVE_MESH)
-#include "Generator.h"
-#include "Field.h"
-#include "BackgroundMesh.h"
-#endif
-
-#if defined(HAVE_POST)
-#include "PView.h"
-#include "PViewDataList.h"
-#include "PluginManager.h"
-#endif
-#if defined(HAVE_OPENGL)
-#include "drawContext.h"
-#endif
-#if defined(HAVE_KBIPACK)
-#include "Homology.h"
-#endif
-
-// Global parser variables
-std::string gmsh_yyname;
-int gmsh_yyerrorstate = 0;
-int gmsh_yyviewindex = 0;
-std::map<std::string, std::vector<double> > gmsh_yysymbols;
-
-// Static parser variables (accessible only in this file)
-static std::map<std::string, std::string > gmsh_yystringsymbols;
-#if defined(HAVE_POST)
-static PViewDataList *ViewData;
-#endif
-static std::vector<double> ViewCoord;
-static std::vector<double> *ViewValueList = 0;
-static int *ViewNumList = 0;
-static ExtrudeParams extr;
-static int curPhysDim = 0;
-static gmshSurface *myGmshSurface = 0;
-#define MAX_RECUR_LOOPS 100
-static int ImbricatedLoop = 0;
-static fpos_t yyposImbricatedLoopsTab[MAX_RECUR_LOOPS];
-static int yylinenoImbricatedLoopsTab[MAX_RECUR_LOOPS];
-static double LoopControlVariablesTab[MAX_RECUR_LOOPS][3];
-static const char *LoopControlVariablesNameTab[MAX_RECUR_LOOPS];
-
-void yyerror(const char *s);
-void yymsg(int level, const char *fmt, ...);
-void skip_until(const char *skip, const char *until);
-int PrintListOfDouble(char *format, List_T *list, char *buffer);
-fullMatrix<double> ListOfListOfDouble2Matrix(List_T *list);
-
-
-/* Enabling traces. */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages. */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table. */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
-#endif
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 85 "Gmsh.y"
{
+
+/* Line 214 of yacc.c */
+#line 85 "Gmsh.y"
+
char *c;
int i;
unsigned int u;
@@ -450,22 +335,23 @@ typedef union YYSTYPE
double v[5];
Shape s;
List_T *l;
-}
-/* Line 193 of yacc.c. */
-#line 456 "Gmsh.tab.cpp"
- YYSTYPE;
+
+
+
+/* Line 214 of yacc.c */
+#line 343 "Gmsh.tab.cpp"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
#endif
-
/* Copy the second part of user declarations. */
-/* Line 216 of yacc.c. */
-#line 469 "Gmsh.tab.cpp"
+/* Line 264 of yacc.c */
+#line 355 "Gmsh.tab.cpp"
#ifdef short
# undef short
@@ -515,7 +401,7 @@ typedef short int yytype_int16;
#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
# if ENABLE_NLS
# include <libintl.h> /* INFRINGES ON USER NAME SPACE */
# define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -540,14 +426,14 @@ typedef short int yytype_int16;
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static int
-YYID (int i)
+YYID (int yyi)
#else
static int
-YYID (i)
- int i;
+YYID (yyi)
+ int yyi;
#endif
{
- return i;
+ return yyi;
}
#endif
@@ -628,9 +514,9 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
/* 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)
@@ -664,12 +550,12 @@ union yyalloc
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) \
+# define YYSTACK_RELOCATE(Stack_alloc, Stack) \
do \
{ \
YYSIZE_T yynewbytes; \
- YYCOPY (&yyptr->Stack, Stack, yysize); \
- Stack = &yyptr->Stack; \
+ YYCOPY (&yyptr->Stack_alloc, Stack, yysize); \
+ Stack = &yyptr->Stack_alloc; \
yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
yyptr += yynewbytes / sizeof (*yyptr); \
} \
@@ -680,7 +566,7 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 5
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 6642
+#define YYLAST 6594
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 150
@@ -689,7 +575,7 @@ union yyalloc
/* YYNRULES -- Number of rules. */
#define YYNRULES 383
/* YYNRULES -- Number of states. */
-#define YYNSTATES 1358
+#define YYNSTATES 1362
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -772,20 +658,20 @@ static const yytype_uint16 yyprhs[] =
1413, 1432, 1434, 1437, 1443, 1451, 1461, 1464, 1474, 1475,
1477, 1478, 1482, 1483, 1485, 1486, 1489, 1490, 1493, 1501,
1508, 1517, 1523, 1529, 1536, 1547, 1558, 1569, 1580, 1583,
- 1587, 1595, 1607, 1619, 1621, 1625, 1628, 1631, 1634, 1638,
- 1642, 1646, 1650, 1654, 1658, 1662, 1666, 1670, 1674, 1678,
- 1682, 1686, 1690, 1696, 1701, 1706, 1711, 1716, 1721, 1726,
- 1731, 1736, 1741, 1746, 1753, 1758, 1763, 1768, 1773, 1778,
- 1783, 1790, 1797, 1804, 1809, 1814, 1819, 1824, 1829, 1834,
- 1839, 1844, 1849, 1854, 1859, 1866, 1871, 1876, 1881, 1886,
- 1891, 1896, 1903, 1910, 1917, 1922, 1924, 1926, 1928, 1930,
- 1932, 1934, 1936, 1938, 1944, 1949, 1954, 1957, 1963, 1967,
- 1974, 1979, 1987, 1994, 1996, 1999, 2002, 2006, 2010, 2022,
- 2032, 2040, 2048, 2050, 2054, 2056, 2058, 2061, 2065, 2070,
- 2076, 2078, 2080, 2083, 2087, 2091, 2097, 2102, 2104, 2106,
- 2110, 2117, 2119, 2121, 2125, 2129, 2139, 2147, 2149, 2155,
- 2159, 2166, 2168, 2172, 2174, 2176, 2180, 2187, 2189, 2191,
- 2198, 2203, 2208, 2213
+ 1587, 1599, 1611, 1623, 1625, 1629, 1632, 1635, 1638, 1642,
+ 1646, 1650, 1654, 1658, 1662, 1666, 1670, 1674, 1678, 1682,
+ 1686, 1690, 1694, 1700, 1705, 1710, 1715, 1720, 1725, 1730,
+ 1735, 1740, 1745, 1750, 1757, 1762, 1767, 1772, 1777, 1782,
+ 1787, 1794, 1801, 1808, 1813, 1818, 1823, 1828, 1833, 1838,
+ 1843, 1848, 1853, 1858, 1863, 1870, 1875, 1880, 1885, 1890,
+ 1895, 1900, 1907, 1914, 1921, 1926, 1928, 1930, 1932, 1934,
+ 1936, 1938, 1940, 1942, 1948, 1953, 1958, 1961, 1967, 1971,
+ 1978, 1983, 1991, 1998, 2000, 2003, 2006, 2010, 2014, 2026,
+ 2036, 2044, 2052, 2054, 2058, 2060, 2062, 2065, 2069, 2074,
+ 2080, 2082, 2084, 2087, 2091, 2095, 2101, 2106, 2108, 2110,
+ 2114, 2121, 2123, 2125, 2129, 2133, 2143, 2151, 2153, 2159,
+ 2163, 2170, 2172, 2176, 2178, 2180, 2184, 2191, 2193, 2195,
+ 2202, 2207, 2212, 2217
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -949,70 +835,71 @@ static const yytype_int16 yyrhs[] =
148, 99, 52, 147, 217, 148, 6, -1, 49, 147,
225, 148, 99, 54, 147, 217, 148, 6, -1, 52,
147, 225, 148, 99, 54, 147, 217, 148, 6, -1,
- 80, 6, -1, 80, 4, 6, -1, 114, 147, 222,
- 146, 222, 148, 6, -1, 115, 140, 229, 141, 7,
- 147, 222, 146, 222, 148, 6, -1, 116, 140, 229,
- 141, 7, 147, 222, 146, 222, 148, 6, -1, 218,
- -1, 140, 217, 141, -1, 131, 217, -1, 130, 217,
- -1, 135, 217, -1, 217, 131, 217, -1, 217, 130,
- 217, -1, 217, 132, 217, -1, 217, 133, 217, -1,
- 217, 134, 217, -1, 217, 139, 217, -1, 217, 126,
- 217, -1, 217, 127, 217, -1, 217, 129, 217, -1,
- 217, 128, 217, -1, 217, 125, 217, -1, 217, 124,
- 217, -1, 217, 123, 217, -1, 217, 122, 217, -1,
- 217, 121, 217, 8, 217, -1, 14, 140, 217, 141,
- -1, 15, 140, 217, 141, -1, 16, 140, 217, 141,
- -1, 17, 140, 217, 141, -1, 18, 140, 217, 141,
- -1, 19, 140, 217, 141, -1, 20, 140, 217, 141,
- -1, 21, 140, 217, 141, -1, 22, 140, 217, 141,
- -1, 24, 140, 217, 141, -1, 25, 140, 217, 146,
- 217, 141, -1, 26, 140, 217, 141, -1, 27, 140,
- 217, 141, -1, 28, 140, 217, 141, -1, 29, 140,
- 217, 141, -1, 30, 140, 217, 141, -1, 31, 140,
- 217, 141, -1, 32, 140, 217, 146, 217, 141, -1,
- 33, 140, 217, 146, 217, 141, -1, 34, 140, 217,
- 146, 217, 141, -1, 23, 140, 217, 141, -1, 14,
- 142, 217, 143, -1, 15, 142, 217, 143, -1, 16,
- 142, 217, 143, -1, 17, 142, 217, 143, -1, 18,
- 142, 217, 143, -1, 19, 142, 217, 143, -1, 20,
- 142, 217, 143, -1, 21, 142, 217, 143, -1, 22,
- 142, 217, 143, -1, 24, 142, 217, 143, -1, 25,
- 142, 217, 146, 217, 143, -1, 26, 142, 217, 143,
- -1, 27, 142, 217, 143, -1, 28, 142, 217, 143,
- -1, 29, 142, 217, 143, -1, 30, 142, 217, 143,
- -1, 31, 142, 217, 143, -1, 32, 142, 217, 146,
- 217, 143, -1, 33, 142, 217, 146, 217, 143, -1,
- 34, 142, 217, 146, 217, 143, -1, 23, 142, 217,
- 143, -1, 3, -1, 9, -1, 10, -1, 11, -1,
- 111, -1, 112, -1, 113, -1, 4, -1, 4, 149,
- 147, 217, 148, -1, 4, 142, 217, 143, -1, 145,
- 4, 142, 143, -1, 4, 173, -1, 4, 142, 217,
- 143, 173, -1, 4, 144, 4, -1, 4, 142, 217,
- 143, 144, 4, -1, 4, 144, 4, 173, -1, 4,
- 142, 217, 143, 144, 4, 173, -1, 110, 140, 5,
- 146, 217, 141, -1, 220, -1, 131, 219, -1, 130,
- 219, -1, 219, 131, 219, -1, 219, 130, 219, -1,
- 147, 217, 146, 217, 146, 217, 146, 217, 146, 217,
- 148, -1, 147, 217, 146, 217, 146, 217, 146, 217,
- 148, -1, 147, 217, 146, 217, 146, 217, 148, -1,
- 140, 217, 146, 217, 146, 217, 141, -1, 222, -1,
- 221, 146, 222, -1, 217, -1, 224, -1, 147, 148,
- -1, 147, 225, 148, -1, 131, 147, 225, 148, -1,
- 217, 132, 147, 225, 148, -1, 222, -1, 5, -1,
- 131, 224, -1, 217, 132, 224, -1, 217, 8, 217,
- -1, 217, 8, 217, 8, 217, -1, 46, 147, 217,
- 148, -1, 183, -1, 192, -1, 4, 142, 143, -1,
- 4, 142, 147, 225, 148, 143, -1, 217, -1, 224,
- -1, 225, 146, 217, -1, 225, 146, 224, -1, 147,
- 217, 146, 217, 146, 217, 146, 217, 148, -1, 147,
- 217, 146, 217, 146, 217, 148, -1, 4, -1, 4,
- 144, 96, 144, 4, -1, 147, 228, 148, -1, 4,
- 142, 217, 143, 144, 97, -1, 226, -1, 228, 146,
- 226, -1, 230, -1, 4, -1, 4, 144, 4, -1,
- 4, 142, 217, 143, 144, 4, -1, 5, -1, 42,
- -1, 37, 140, 229, 146, 229, 141, -1, 38, 140,
- 229, 141, -1, 39, 140, 229, 141, -1, 36, 140,
- 229, 141, -1, 36, 140, 229, 146, 225, 141, -1
+ 80, 6, -1, 80, 4, 6, -1, 114, 140, 229,
+ 141, 7, 147, 222, 146, 222, 148, 6, -1, 115,
+ 140, 229, 141, 7, 147, 222, 146, 222, 148, 6,
+ -1, 116, 140, 229, 141, 7, 147, 222, 146, 222,
+ 148, 6, -1, 218, -1, 140, 217, 141, -1, 131,
+ 217, -1, 130, 217, -1, 135, 217, -1, 217, 131,
+ 217, -1, 217, 130, 217, -1, 217, 132, 217, -1,
+ 217, 133, 217, -1, 217, 134, 217, -1, 217, 139,
+ 217, -1, 217, 126, 217, -1, 217, 127, 217, -1,
+ 217, 129, 217, -1, 217, 128, 217, -1, 217, 125,
+ 217, -1, 217, 124, 217, -1, 217, 123, 217, -1,
+ 217, 122, 217, -1, 217, 121, 217, 8, 217, -1,
+ 14, 140, 217, 141, -1, 15, 140, 217, 141, -1,
+ 16, 140, 217, 141, -1, 17, 140, 217, 141, -1,
+ 18, 140, 217, 141, -1, 19, 140, 217, 141, -1,
+ 20, 140, 217, 141, -1, 21, 140, 217, 141, -1,
+ 22, 140, 217, 141, -1, 24, 140, 217, 141, -1,
+ 25, 140, 217, 146, 217, 141, -1, 26, 140, 217,
+ 141, -1, 27, 140, 217, 141, -1, 28, 140, 217,
+ 141, -1, 29, 140, 217, 141, -1, 30, 140, 217,
+ 141, -1, 31, 140, 217, 141, -1, 32, 140, 217,
+ 146, 217, 141, -1, 33, 140, 217, 146, 217, 141,
+ -1, 34, 140, 217, 146, 217, 141, -1, 23, 140,
+ 217, 141, -1, 14, 142, 217, 143, -1, 15, 142,
+ 217, 143, -1, 16, 142, 217, 143, -1, 17, 142,
+ 217, 143, -1, 18, 142, 217, 143, -1, 19, 142,
+ 217, 143, -1, 20, 142, 217, 143, -1, 21, 142,
+ 217, 143, -1, 22, 142, 217, 143, -1, 24, 142,
+ 217, 143, -1, 25, 142, 217, 146, 217, 143, -1,
+ 26, 142, 217, 143, -1, 27, 142, 217, 143, -1,
+ 28, 142, 217, 143, -1, 29, 142, 217, 143, -1,
+ 30, 142, 217, 143, -1, 31, 142, 217, 143, -1,
+ 32, 142, 217, 146, 217, 143, -1, 33, 142, 217,
+ 146, 217, 143, -1, 34, 142, 217, 146, 217, 143,
+ -1, 23, 142, 217, 143, -1, 3, -1, 9, -1,
+ 10, -1, 11, -1, 111, -1, 112, -1, 113, -1,
+ 4, -1, 4, 149, 147, 217, 148, -1, 4, 142,
+ 217, 143, -1, 145, 4, 142, 143, -1, 4, 173,
+ -1, 4, 142, 217, 143, 173, -1, 4, 144, 4,
+ -1, 4, 142, 217, 143, 144, 4, -1, 4, 144,
+ 4, 173, -1, 4, 142, 217, 143, 144, 4, 173,
+ -1, 110, 140, 5, 146, 217, 141, -1, 220, -1,
+ 131, 219, -1, 130, 219, -1, 219, 131, 219, -1,
+ 219, 130, 219, -1, 147, 217, 146, 217, 146, 217,
+ 146, 217, 146, 217, 148, -1, 147, 217, 146, 217,
+ 146, 217, 146, 217, 148, -1, 147, 217, 146, 217,
+ 146, 217, 148, -1, 140, 217, 146, 217, 146, 217,
+ 141, -1, 222, -1, 221, 146, 222, -1, 217, -1,
+ 224, -1, 147, 148, -1, 147, 225, 148, -1, 131,
+ 147, 225, 148, -1, 217, 132, 147, 225, 148, -1,
+ 222, -1, 5, -1, 131, 224, -1, 217, 132, 224,
+ -1, 217, 8, 217, -1, 217, 8, 217, 8, 217,
+ -1, 46, 147, 217, 148, -1, 183, -1, 192, -1,
+ 4, 142, 143, -1, 4, 142, 147, 225, 148, 143,
+ -1, 217, -1, 224, -1, 225, 146, 217, -1, 225,
+ 146, 224, -1, 147, 217, 146, 217, 146, 217, 146,
+ 217, 148, -1, 147, 217, 146, 217, 146, 217, 148,
+ -1, 4, -1, 4, 144, 96, 144, 4, -1, 147,
+ 228, 148, -1, 4, 142, 217, 143, 144, 97, -1,
+ 226, -1, 228, 146, 226, -1, 230, -1, 4, -1,
+ 4, 144, 4, -1, 4, 142, 217, 143, 144, 4,
+ -1, 5, -1, 42, -1, 37, 140, 229, 146, 229,
+ 141, -1, 38, 140, 229, 141, -1, 39, 140, 229,
+ 141, -1, 36, 140, 229, 141, -1, 36, 140, 229,
+ 146, 225, 141, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -1043,20 +930,20 @@ static const yytype_uint16 yyrline[] =
2781, 2796, 2799, 2805, 2814, 2834, 2857, 2861, 2885, 2888,
2904, 2907, 2923, 2926, 2939, 2942, 2948, 2951, 2958, 3014,
3084, 3089, 3156, 3199, 3225, 3248, 3271, 3274, 3283, 3287,
- 3304, 3337, 3371, 3409, 3410, 3411, 3412, 3413, 3414, 3415,
- 3416, 3417, 3424, 3425, 3426, 3427, 3428, 3429, 3430, 3431,
- 3432, 3433, 3434, 3435, 3436, 3437, 3438, 3439, 3440, 3441,
- 3442, 3443, 3444, 3445, 3446, 3447, 3448, 3449, 3450, 3451,
- 3452, 3453, 3454, 3455, 3457, 3458, 3459, 3460, 3461, 3462,
- 3463, 3464, 3465, 3466, 3467, 3468, 3469, 3470, 3471, 3472,
- 3473, 3474, 3475, 3476, 3477, 3486, 3487, 3488, 3489, 3490,
- 3491, 3492, 3496, 3509, 3521, 3536, 3546, 3556, 3574, 3579,
- 3584, 3594, 3604, 3612, 3616, 3620, 3624, 3628, 3635, 3639,
- 3643, 3647, 3654, 3659, 3666, 3671, 3675, 3680, 3684, 3692,
- 3703, 3707, 3719, 3727, 3735, 3742, 3753, 3773, 3783, 3793,
- 3803, 3823, 3828, 3832, 3836, 3848, 3852, 3864, 3871, 3881,
- 3885, 3900, 3905, 3912, 3916, 3929, 3937, 3948, 3952, 3960,
- 3968, 3982, 3996, 4000
+ 3304, 3341, 3377, 3417, 3418, 3419, 3420, 3421, 3422, 3423,
+ 3424, 3425, 3432, 3433, 3434, 3435, 3436, 3437, 3438, 3439,
+ 3440, 3441, 3442, 3443, 3444, 3445, 3446, 3447, 3448, 3449,
+ 3450, 3451, 3452, 3453, 3454, 3455, 3456, 3457, 3458, 3459,
+ 3460, 3461, 3462, 3463, 3465, 3466, 3467, 3468, 3469, 3470,
+ 3471, 3472, 3473, 3474, 3475, 3476, 3477, 3478, 3479, 3480,
+ 3481, 3482, 3483, 3484, 3485, 3494, 3495, 3496, 3497, 3498,
+ 3499, 3500, 3504, 3517, 3529, 3544, 3554, 3564, 3582, 3587,
+ 3592, 3602, 3612, 3620, 3624, 3628, 3632, 3636, 3643, 3647,
+ 3651, 3655, 3662, 3667, 3674, 3679, 3683, 3688, 3692, 3700,
+ 3711, 3715, 3727, 3735, 3743, 3750, 3761, 3781, 3791, 3801,
+ 3811, 3831, 3836, 3840, 3844, 3856, 3860, 3872, 3879, 3889,
+ 3893, 3908, 3913, 3920, 3924, 3937, 3945, 3956, 3960, 3968,
+ 3976, 3990, 4004, 4008
};
#endif
@@ -1091,15 +978,15 @@ static const char *const yytname[] =
"'!'", "UNARYPREC", "tMINUSMINUS", "tPLUSPLUS", "'^'", "'('", "')'",
"'['", "']'", "'.'", "'#'", "','", "'{'", "'}'", "'~'", "$accept", "All",
"GeoFormatItems", "GeoFormatItem", "SendToFile", "Printf", "View",
- "Views", "ElementCoords", "ElementValues", "Element", "@1", "@2",
- "Text2DValues", "Text2D", "@3", "Text3DValues", "Text3D", "@4",
- "InterpolationMatrix", "Time", "@5", "NumericAffectation",
+ "Views", "ElementCoords", "ElementValues", "Element", "$@1", "$@2",
+ "Text2DValues", "Text2D", "$@3", "Text3DValues", "Text3D", "$@4",
+ "InterpolationMatrix", "Time", "$@5", "NumericAffectation",
"NumericIncrement", "Affectation", "PhysicalId", "InSphereCenter",
- "CircleOptions", "Shape", "@6", "@7", "@8", "@9", "Transform",
+ "CircleOptions", "Shape", "$@6", "$@7", "$@8", "$@9", "Transform",
"MultipleShape", "ListOfShapes", "LevelSet", "Delete", "Colorify",
- "Visibility", "Command", "Loop", "Extrude", "@10", "@11", "@12", "@13",
- "@14", "@15", "@16", "@17", "@18", "@19", "@20", "@21", "@22",
- "ExtrudeParameters", "ExtrudeParameter", "CompoundMap",
+ "Visibility", "Command", "Loop", "Extrude", "$@10", "$@11", "$@12",
+ "$@13", "$@14", "$@15", "$@16", "$@17", "$@18", "$@19", "$@20", "$@21",
+ "$@22", "ExtrudeParameters", "ExtrudeParameter", "CompoundMap",
"TransfiniteType", "TransfiniteArrangement", "TransfiniteCorners",
"RecombineAngle", "Transfinite", "Embedding", "Coherence", "Homology",
"FExpr", "FExpr_Single", "VExpr", "VExpr_Single",
@@ -1204,7 +1091,7 @@ static const yytype_uint8 yyr2[] =
18, 1, 2, 5, 7, 9, 2, 9, 0, 1,
0, 3, 0, 1, 0, 2, 0, 2, 7, 6,
8, 5, 5, 6, 10, 10, 10, 10, 2, 3,
- 7, 11, 11, 1, 3, 2, 2, 2, 3, 3,
+ 11, 11, 11, 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,
@@ -1267,7 +1154,7 @@ static const yytype_uint16 yydefact[] =
0, 0, 0, 0, 236, 0, 0, 0, 154, 0,
0, 0, 249, 0, 0, 0, 166, 0, 0, 0,
0, 0, 137, 0, 0, 0, 0, 180, 157, 0,
- 158, 0, 0, 374, 0, 373, 0, 0, 0, 328,
+ 158, 0, 374, 0, 373, 0, 0, 0, 0, 328,
0, 0, 70, 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,
@@ -1303,7 +1190,7 @@ static const yytype_uint16 yydefact[] =
130, 0, 0, 0, 0, 0, 0, 0, 0, 221,
0, 183, 0, 0, 0, 0, 0, 237, 242, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 156, 0, 0, 0, 0, 0, 0, 375, 0,
+ 0, 156, 0, 0, 0, 0, 0, 375, 0, 0,
0, 0, 0, 327, 0, 323, 0, 0, 0, 0,
0, 28, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 324, 66, 67, 0, 0, 0, 0,
@@ -1327,7 +1214,7 @@ static const yytype_uint16 yydefact[] =
0, 137, 0, 203, 0, 205, 0, 207, 344, 0,
0, 0, 0, 187, 0, 0, 0, 0, 0, 0,
0, 0, 103, 104, 0, 0, 0, 0, 82, 0,
- 250, 0, 0, 0, 331, 0, 37, 0, 0, 0,
+ 0, 0, 0, 0, 331, 0, 37, 0, 0, 0,
0, 0, 39, 0, 0, 0, 76, 0, 0, 77,
0, 372, 139, 140, 141, 142, 0, 0, 360, 0,
93, 101, 102, 106, 0, 0, 117, 0, 0, 240,
@@ -1336,202 +1223,204 @@ static const yytype_uint16 yydefact[] =
0, 0, 194, 0, 0, 195, 0, 0, 196, 0,
0, 0, 0, 0, 0, 148, 0, 0, 147, 0,
0, 143, 0, 0, 0, 0, 366, 0, 175, 174,
- 0, 0, 0, 376, 0, 0, 42, 0, 0, 0,
- 343, 0, 0, 0, 65, 72, 74, 0, 80, 0,
- 27, 0, 0, 0, 0, 0, 0, 0, 111, 96,
- 109, 121, 127, 0, 118, 86, 87, 124, 137, 0,
- 131, 0, 0, 0, 0, 0, 0, 223, 0, 0,
- 137, 0, 0, 0, 0, 134, 133, 0, 0, 0,
- 0, 83, 84, 0, 0, 0, 38, 0, 0, 0,
- 40, 55, 0, 370, 0, 244, 245, 246, 247, 114,
- 0, 0, 0, 0, 339, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 188, 0, 0,
- 0, 0, 0, 365, 176, 0, 0, 0, 0, 0,
- 0, 0, 78, 0, 0, 228, 129, 0, 209, 0,
- 0, 211, 0, 0, 213, 0, 0, 0, 224, 0,
- 184, 0, 137, 0, 0, 0, 105, 85, 251, 252,
- 0, 46, 0, 52, 0, 0, 91, 229, 0, 338,
- 197, 0, 0, 204, 198, 0, 0, 206, 199, 0,
- 0, 208, 0, 0, 0, 190, 0, 146, 0, 0,
- 0, 0, 0, 0, 0, 119, 0, 215, 0, 217,
- 0, 219, 225, 227, 189, 185, 0, 0, 0, 0,
- 43, 0, 50, 0, 0, 0, 200, 0, 0, 201,
- 0, 0, 202, 0, 0, 150, 0, 144, 0, 44,
- 0, 0, 170, 0, 0, 0, 0, 0, 0, 191,
- 0, 0, 0, 0, 0, 210, 0, 212, 0, 214,
- 0, 145, 45, 47, 0, 48, 0, 0, 0, 0,
- 0, 0, 53, 216, 218, 220, 49, 51
+ 0, 0, 0, 376, 0, 0, 0, 42, 0, 0,
+ 0, 343, 0, 0, 0, 65, 72, 74, 0, 80,
+ 0, 27, 0, 0, 0, 0, 0, 0, 0, 111,
+ 96, 109, 121, 127, 0, 118, 86, 87, 124, 137,
+ 0, 131, 0, 0, 0, 0, 0, 0, 223, 0,
+ 0, 137, 0, 0, 0, 0, 134, 133, 0, 0,
+ 0, 0, 83, 84, 0, 0, 0, 0, 38, 0,
+ 0, 0, 40, 55, 0, 370, 0, 244, 245, 246,
+ 247, 114, 0, 0, 0, 0, 339, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 188,
+ 0, 0, 0, 0, 0, 365, 176, 0, 0, 0,
+ 0, 0, 0, 0, 0, 78, 0, 0, 228, 129,
+ 0, 209, 0, 0, 211, 0, 0, 213, 0, 0,
+ 0, 224, 0, 184, 0, 137, 0, 0, 0, 105,
+ 85, 250, 251, 252, 0, 46, 0, 52, 0, 0,
+ 91, 229, 0, 338, 197, 0, 0, 204, 198, 0,
+ 0, 206, 199, 0, 0, 208, 0, 0, 0, 190,
+ 0, 146, 0, 0, 0, 0, 0, 0, 0, 119,
+ 0, 215, 0, 217, 0, 219, 225, 227, 189, 185,
+ 0, 0, 0, 0, 43, 0, 50, 0, 0, 0,
+ 200, 0, 0, 201, 0, 0, 202, 0, 0, 150,
+ 0, 144, 0, 44, 0, 0, 170, 0, 0, 0,
+ 0, 0, 0, 191, 0, 0, 0, 0, 0, 210,
+ 0, 212, 0, 214, 0, 145, 45, 47, 0, 48,
+ 0, 0, 0, 0, 0, 0, 53, 216, 218, 220,
+ 49, 51
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
-1, 2, 3, 68, 697, 69, 70, 431, 1025, 1031,
- 620, 796, 1175, 1318, 621, 1281, 1344, 622, 1320, 623,
+ 620, 796, 1177, 1322, 621, 1285, 1348, 622, 1324, 623,
624, 800, 137, 235, 71, 735, 1062, 958, 498, 361,
362, 363, 364, 330, 301, 302, 74, 75, 76, 77,
- 78, 79, 331, 762, 1241, 1296, 575, 1083, 1086, 1089,
- 1261, 1265, 1269, 1307, 1310, 1313, 758, 759, 1071, 863,
+ 78, 79, 331, 762, 1244, 1300, 575, 1083, 1086, 1089,
+ 1265, 1269, 1273, 1311, 1314, 1317, 758, 759, 1071, 863,
732, 550, 583, 81, 82, 83, 84, 348, 140, 373,
- 188, 920, 921, 357, 350, 541, 216, 688, 827, 424,
- 425
+ 188, 920, 921, 357, 350, 541, 216, 688, 827, 423,
+ 424
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -1114
+#define YYPACT_NINF -1118
static const yytype_int16 yypact[] =
{
- 3316, 35, 28, 3398, -1114, -1114, 1736, 63, 47, -60,
- 1, 79, 97, 108, -104, -4, 41, -61, 53, 64,
- -46, 84, 88, 61, 116, 247, 263, 270, 76, 289,
- 689, 143, 222, 316, 252, 227, 296, 296, 253, 415,
- 271, 381, 396, 395, 11, 345, 400, 450, 451, 458,
- 323, 331, 332, 18, 29, -1114, 336, -1114, 489, 339,
- -1114, 505, 509, 26, 30, 379, 387, 390, -1114, -1114,
- -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114,
- -1114, -1114, -1114, -1114, -1114, -1114, 22, 388, 33, -1114,
- -1114, -1114, 351, 358, 368, 399, 437, 447, 482, 508,
- 511, 533, 537, 549, 550, 553, 569, 576, 587, 588,
- 597, 600, 622, 394, 412, 417, 420, -1114, 544, 443,
- -1114, -1114, -1114, -1114, -1114, -1114, -1114, 3153, 3153, 3153,
- -1114, -1114, 3153, 2698, 9, 536, 38, 3153, 557, 929,
- -1114, 593, 598, 3153, 606, -1114, 3153, -1114, -1114, -1114,
- 3153, 3080, 3153, 3153, 499, 3153, 3080, 3153, 3153, 514,
- 3080, 3153, 3153, 2069, 521, 518, 529, 530, 1791, 1791,
- 1791, 542, -1114, -1114, -1114, -1114, 570, 581, 596, 718,
- 2069, 741, 296, 296, 296, 3153, 3153, -69, -1114, 208,
- 296, 624, 625, 643, 2941, 241, -96, 607, 674, 1791,
- 2069, 692, 19, 687, -1114, 830, -1114, 690, 712, 737,
- 852, 3153, 3153, 3153, 715, 3153, 729, 784, 3153, 3153,
- -1114, 3153, 881, -1114, 903, -1114, 932, -1114, 2069, 441,
- 441, 797, 3153, 936, 795, -1114, -1114, -1114, 937, 3153,
- 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153,
- 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153,
- 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153,
- 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153,
- 3153, 441, 441, 441, 441, 3153, 939, 582, 806, 806,
- 806, 5390, 52, 3080, 4654, 215, 802, 941, 807, 804,
- -1114, 805, 2930, 1146, -1114, -1114, 3153, 3153, 3153, 3153,
- 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153, 3153,
- 3153, -1114, -1114, 1180, -3, 3952, 5411, 534, 808, 3080,
- -1114, -1114, 1785, -1114, 434, 5432, 5453, 3153, 5474, 617,
- 5495, 5516, 3153, 621, 5537, 5558, 2208, 1576, 2276, 945,
- -1114, 3153, 3153, 3153, 3153, -1114, -1114, 947, 951, 951,
- 3153, 820, 822, 823, 824, 3153, 3153, 3153, 825, 959,
- 827, -35, -1114, -1114, 3978, 4004, 296, 296, 38, 38,
- 198, 3153, 3153, 3153, 2941, 2941, 3153, 2930, 343, -1114,
- 3153, 3153, 3153, 3153, 961, 963, 3153, 965, -1114, 3153,
- 3153, 793, -1114, 3080, 3153, 3153, -1114, 5579, 5600, 5621,
- 879, 4030, -1114, 831, 2415, 5642, 4677, -1114, -1114, 1143,
- -1114, 1966, 833, 626, 836, -1114, 845, 3153, 4700, 153,
- 3153, 5, -1114, 5663, 4723, 5684, 4746, 5705, 4769, 5726,
- 4792, 5747, 4815, 5768, 4838, 5789, 4861, 5810, 4884, 5831,
- 4907, 5852, 4930, 5873, 4953, 4056, 4082, 5894, 4976, 5915,
- 4999, 5936, 5022, 5957, 5045, 5978, 5068, 5999, 5091, 4108,
- 4134, 4160, 4186, 4212, 4238, 136, 843, 849, 850, 1203,
- 846, 3153, -1114, 2069, 2069, 647, 83, 33, 3153, 989,
- 992, 20, 854, -1114, -82, -27, -23, -43, -1114, -1114,
- 2552, 794, 573, 763, 763, 513, 513, 513, 513, 234,
- 234, 806, 806, 806, 806, -1114, 6, 3080, 3153, 993,
- 2903, 3153, 806, -1114, 3153, 3080, 3080, 902, 996, 997,
- 6020, 999, 908, 1001, 1002, 6041, 911, 1004, 1005, 3080,
- -1114, 651, 2347, 3153, 6062, 2934, 6083, 6104, 3153, 2069,
- 1011, 1010, 6125, 3213, 3213, 3213, 3213, 6146, 6167, 6188,
- 873, -1114, 2069, 296, 3153, 3153, -1114, -1114, 870, 871,
- 3153, 4264, 4290, 4316, 3926, 313, 296, 2105, 6209, 3006,
- 6230, 6251, 3153, 1014, 3153, 6272, -1114, 5114, 5137, -1114,
- 652, 5160, 5183, 1016, 1017, 1018, 882, 3153, 2244, 3153,
- 3153, -1114, 32, -1114, -1114, 2069, 3153, 1026, 1025, 1027,
- 5206, 45, -1114, 3073, -1114, 893, 895, 889, -1114, 1031,
- -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114,
- -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114,
- -1114, -1114, -1114, -1114, -1114, -1114, -1114, 3153, 3153, -1114,
- -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114,
- -1114, 3153, 3153, 3153, 3153, 3153, 3153, -1114, 3080, 441,
- -1114, -1114, -1114, 3153, 5229, 1032, 1033, 897, -1114, 94,
- 3153, 1036, 1037, 1344, -1114, 1038, 904, 18, 1041, -1114,
- 3080, 3080, 3080, 3080, 3153, -1114, 917, 441, 148, 4342,
- 296, -1114, 3080, 3146, 2619, 806, -1114, 1785, -1114, 1012,
- 2069, 2069, 1058, 2069, 749, 2069, 2069, 1059, 994, 2069,
- 2069, 656, -1114, 3080, 1380, 1060, 1062, 1063, 1064, 1766,
- -1114, -1114, 1068, -1114, 1069, 934, 6503, -1114, 938, 940,
- 942, 1070, 1071, 1075, 1080, 943, 355, 4368, 4394, -1114,
- -1114, 3179, 296, 296, 296, 1079, 944, 946, -36, -1114,
- 375, -1114, 313, 1085, 1081, 1086, 1088, 6503, -1114, 1419,
- 949, 1091, 1092, 1048, 1096, 1100, 2069, 2069, 2069, 1104,
- 4420, -1114, 2691, 655, 1105, 1106, 964, 5252, -1114, 966,
- 967, 1109, 1113, -1114, 1112, -1114, 979, 3153, 3153, 2069,
- 973, -1114, 6293, 5275, 6314, 5298, 6335, 5321, 6356, 5344,
- 196, 980, 6377, 180, -1114, -1114, 67, 320, 981, 1116,
- 1439, -1114, -1114, -1114, 18, 3153, -1114, 661, -1114, 664,
- 667, 672, 675, 6503, -1114, 1118, 15, 3153, 4, 676,
- -1114, 3153, 982, 1067, 1067, 2069, 1121, 983, 985, 1122,
- 1128, 2069, 990, 1130, 1132, -1114, 679, -1114, 1134, 2069,
- 2069, 2069, 1136, 1135, -1114, 2069, 1139, 1141, 1147, 1151,
- 2069, 2069, 2069, 411, 1138, 3153, 3153, 3153, 1006, 68,
- 150, 322, -1114, 2069, 3153, -1114, -1114, 2941, -19, 1930,
- -1114, 1019, 2486, -1114, 3080, -1114, -1114, 1020, -1114, -1114,
- 1153, 1157, 1073, -1114, 3153, 3153, 3153, -1114, 1158, 1162,
- 1159, 1029, 2069, 2069, -1114, 153, -1114, 3153, 4446, 4472,
- 680, -1114, 3153, -1114, -1114, -1114, -1114, -1114, -1114, -1114,
- -1114, -1114, -1114, -1114, 2069, 33, 3153, 1164, 1170, 20,
- -1114, 1169, 5367, 18, -1114, 1171, 1173, 1174, 1175, -1114,
- -1114, 441, 4498, -1114, 1039, 6503, 3153, 296, 1177, 1182,
- 1193, -1114, 3153, 3153, -1114, -1114, 1195, 3153, -1114, -1114,
- -1114, 1199, 1202, 1207, 1077, 3153, -1114, 1208, 2069, 2069,
- 2069, 2069, 1210, 1213, 1212, -1114, 3213, 1078, 3394, 6398,
- 2725, 38, 296, 1214, 296, 1215, 296, 1216, 280, 1082,
- 6419, 3422, 386, -1114, 1218, 1351, 1221, 296, 1351, 1224,
- 703, 3153, -1114, -1114, 2069, 2757, 627, 6440, -1114, 2764,
- -1114, 1227, 1094, 1095, -1114, 274, 6503, 3153, 3153, 2069,
- 1097, 716, 6503, 1226, 1232, 1551, -1114, 1235, 1237, -1114,
- 1101, -1114, -1114, -1114, -1114, -1114, 1241, 3153, -1114, 3450,
- 299, -1114, -1114, -1114, 3478, 3506, -1114, 3534, 1243, -1114,
- -1114, 1200, 1245, 6503, -1114, 1246, 1247, 1248, 1251, -1114,
- 1115, 1253, -1114, 1658, 1257, 1260, 1137, -1114, 3153, -1114,
- 1133, 392, -1114, 1140, 398, -1114, 1142, 423, -1114, 1148,
- 1276, 2069, 1279, 1150, 3153, -1114, 2625, 440, -1114, 442,
- 444, -1114, 1277, 3562, 1194, 3153, -1114, 3153, -1114, -1114,
- 3080, 1859, 1284, -1114, 2069, 2069, -1114, 3153, 4524, 4550,
- -1114, 2069, 3153, 1287, -1114, -1114, -1114, 18, -1114, 1197,
- -1114, 4576, 1292, 1294, 1309, 1310, 1311, 1191, -1114, -1114,
- -1114, -1114, -1114, 2069, -1114, -1114, -1114, -1114, 38, 2878,
- -1114, 2941, 313, 2941, 313, 2941, 313, -1114, 717, 2069,
- -1114, 3590, 296, 3080, 296, -1114, -1114, 3153, 3618, 3646,
- 720, -1114, -1114, 1172, 1192, 1196, 6503, 3153, 3153, 726,
- 6503, -1114, 1312, -1114, 3153, -1114, -1114, -1114, -1114, -1114,
- 3153, 727, 1198, 3153, -1114, 3674, 466, -16, 3702, 472,
- 135, 3730, 475, 147, 2069, 1333, 1280, 2383, 1201, 483,
- 734, 485, 1998, -1114, -1114, 1335, 1338, 1341, 3153, 6461,
- 4602, 31, -1114, 4628, 3758, 1345, -1114, 3786, 1346, 3153,
- 1347, 1350, 3153, 1352, 1353, 3153, 1357, 1209, -1114, 3153,
- -1114, 313, -1114, 3080, 1358, 2625, -1114, -1114, -1114, -1114,
- 755, -1114, 3153, -1114, 2069, 3153, -1114, -1114, 1382, -1114,
- -1114, 1204, 3814, -1114, -1114, 1242, 3842, -1114, -1114, 1244,
- 3870, -1114, 1386, 2137, 149, 2522, 758, -1114, 503, 759,
- 1387, 1252, 6482, 762, 3898, -1114, 313, 1388, 313, 1389,
- 313, 1392, -1114, -1114, -1114, -1114, 313, 1394, 3080, 1396,
- -1114, 441, -1114, 1256, 1401, 202, -1114, 1261, 210, -1114,
- 1262, 243, -1114, 1264, 287, -1114, 766, -1114, 767, -1114,
- 1265, 2069, -1114, 1407, 313, 1408, 313, 1412, 313, -1114,
- 1413, 441, 1420, 441, 783, -1114, 340, -1114, 349, -1114,
- 383, -1114, -1114, -1114, 786, -1114, 1421, 1424, 1425, 1427,
- 441, 1429, -1114, -1114, -1114, -1114, -1114, -1114
+ 3350, 49, 70, 3432, -1118, -1118, 1680, 82, 60, -42,
+ 30, 114, 132, 183, -102, 76, 150, -51, 159, 188,
+ -47, 198, 199, 286, 303, 331, 340, 361, 226, 334,
+ 275, 239, 256, 371, 290, 326, -68, -68, 345, 64,
+ 69, 439, 443, 378, 11, 181, 460, 495, 509, 513,
+ 382, 386, 387, 14, 29, -1118, 392, -1118, 529, 396,
+ -1118, 542, 553, 20, 25, 401, 474, 475, -1118, -1118,
+ -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118,
+ -1118, -1118, -1118, -1118, -1118, -1118, 22, 418, 280, -1118,
+ -1118, -1118, 276, 283, 291, 320, 325, 336, 344, 362,
+ 368, 428, 437, 440, 450, 456, 465, 470, 537, 574,
+ 580, 581, 586, 485, 514, 524, 549, -1118, 622, 555,
+ -1118, -1118, -1118, -1118, -1118, -1118, -1118, 3187, 3187, 3187,
+ -1118, -1118, 3187, 2732, 95, 671, 36, 3187, 693, 952,
+ -1118, 709, 713, 3187, 742, -1118, 3187, -1118, -1118, -1118,
+ 3187, 3114, 3187, 3187, 585, 3187, 3114, 3187, 3187, 608,
+ 3114, 3187, 3187, 2103, 636, 655, 645, 649, 1825, 1825,
+ 1825, 668, -1118, -1118, -1118, -1118, 672, 673, 689, 829,
+ 2103, 831, -68, -68, -68, 3187, 3187, -83, -1118, -50,
+ -68, 700, 702, 705, 2975, 151, -71, 716, 717, 1825,
+ 2103, 725, 6, 733, -1118, 873, -1118, 750, 738, 753,
+ 895, 3187, 3187, 3187, 758, 3187, 756, 805, 3187, 3187,
+ -1118, 3187, 899, -1118, 900, -1118, 901, -1118, 492, 492,
+ 492, 766, 3187, 905, 763, -1118, -1118, -1118, 907, 3187,
+ 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187,
+ 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187,
+ 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187,
+ 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187,
+ 3187, 492, 492, 492, 492, 3187, 909, 489, 776, 776,
+ 776, 5342, 53, 3114, 4606, 215, 773, 924, 790, 788,
+ -1118, 792, 2834, 1134, -1118, -1118, 3187, 3187, 3187, 3187,
+ 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187, 3187,
+ 3187, -1118, -1118, 1337, -85, 3904, 5363, 425, 789, 3114,
+ -1118, -1118, 1161, -1118, 590, 5384, 5405, 3187, 5426, 591,
+ 5447, 5468, 3187, 594, 5489, 5510, 2242, 1534, 2236, 931,
+ -1118, 3187, 3187, 3187, 3187, -1118, -1118, 934, 935, 935,
+ 3187, 803, 804, 806, 807, 3187, 3187, 3187, 808, 939,
+ 802, -56, -1118, -1118, 3930, 3956, -68, -68, 36, 36,
+ 328, 3187, 3187, 3187, 2975, 2975, 3187, 2834, 333, -1118,
+ 3187, 3187, 3187, 3187, 944, 945, 3187, 947, -1118, 3187,
+ 3187, 791, -1118, 3114, 3187, 3187, -1118, 5531, 5552, 5573,
+ 858, 3982, -1118, 812, 2308, 5594, 4629, -1118, -1118, 1154,
+ -1118, 1257, 601, 814, -1118, 819, 821, 3187, 4652, -8,
+ 3187, 5, -1118, 5615, 4675, 5636, 4698, 5657, 4721, 5678,
+ 4744, 5699, 4767, 5720, 4790, 5741, 4813, 5762, 4836, 5783,
+ 4859, 5804, 4882, 5825, 4905, 4008, 4034, 5846, 4928, 5867,
+ 4951, 5888, 4974, 5909, 4997, 5930, 5020, 5951, 5043, 4060,
+ 4086, 4112, 4138, 4164, 4190, 148, 817, 823, 824, 1360,
+ 820, 3187, -1118, 2103, 2103, 598, 80, 280, 3187, 961,
+ 966, 18, 828, -1118, -22, -36, -46, 63, -1118, -1118,
+ 2342, 795, 1202, 667, 667, 539, 539, 539, 539, 558,
+ 558, 776, 776, 776, 776, -1118, 15, 3114, 3187, 968,
+ 2937, 3187, 776, -1118, 3187, 3114, 3114, 874, 970, 971,
+ 5972, 972, 882, 975, 976, 5993, 887, 982, 983, 3114,
+ -1118, 603, 2381, 3187, 6014, 2585, 6035, 6056, 3187, 2103,
+ 987, 986, 6077, 3247, 3247, 3247, 3247, 6098, 6119, 6140,
+ 849, -1118, 2103, -68, 3187, 3187, -1118, -1118, 847, 848,
+ 3187, 4216, 4242, 4268, 2727, -41, -68, 1575, 6161, 2930,
+ 6182, 6203, 3187, 991, 3187, 6224, -1118, 5066, 5089, -1118,
+ 606, 5112, 5135, 993, 994, 997, 854, 3187, 1861, 3187,
+ 3187, -1118, 24, -1118, -1118, 3187, 1002, 1000, 1001, 1003,
+ 5158, 46, -1118, 2968, -1118, 869, 871, 865, -1118, 1008,
+ -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118,
+ -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118,
+ -1118, -1118, -1118, -1118, -1118, -1118, -1118, 3187, 3187, -1118,
+ -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118,
+ -1118, 3187, 3187, 3187, 3187, 3187, 3187, -1118, 3114, 492,
+ -1118, -1118, -1118, 3187, 5181, 1010, 1012, 876, -1118, 105,
+ 3187, 1014, 1017, 1396, -1118, 1018, 884, 14, 1021, -1118,
+ 3114, 3114, 3114, 3114, 3187, -1118, 897, 492, 174, 4294,
+ -68, -1118, 3114, 3040, 2375, 776, -1118, 1161, -1118, 977,
+ 2103, 2103, 1023, 2103, 701, 2103, 2103, 1024, 974, 2103,
+ 2103, 610, -1118, 3114, 1603, 1025, 1026, 1027, 1028, 2490,
+ -1118, -1118, 1030, -1118, 1035, 902, 6455, -1118, 906, 910,
+ 912, 1039, 1041, 1043, 1050, 913, 370, 4320, 4346, -1118,
+ -1118, 3107, -68, -68, -68, 1049, 911, 916, -24, -1118,
+ 375, -1118, -41, 1053, 1055, 1056, 1057, 6455, -1118, 1625,
+ 915, 1059, 1060, 1015, 1062, 1063, 2103, 2103, 2103, 1067,
+ 4372, -1118, 2447, 641, 1083, 1088, 5204, -1118, 946, 948,
+ 949, 1091, 1090, -1118, 1092, -1118, 960, 3187, 3187, 2103,
+ 955, -1118, 6245, 5227, 6266, 5250, 6287, 5273, 6308, 5296,
+ 184, 962, 6329, 506, -1118, -1118, 16, 351, 963, 1098,
+ 1647, -1118, -1118, -1118, 14, 3187, -1118, 611, -1118, 631,
+ 635, 638, 642, 6455, -1118, 1100, 48, 3187, 51, 659,
+ -1118, 3187, 964, 1054, 1054, 2103, 1102, 967, 969, 1103,
+ 1109, 2103, 973, 1112, 1116, -1118, 663, -1118, 1119, 2103,
+ 2103, 2103, 1121, 1120, -1118, 2103, 1122, 1123, 1124, 1126,
+ 2103, 2103, 2103, 397, 1130, 3187, 3187, 3187, 980, 220,
+ 243, 271, -1118, 2103, 3187, -1118, -1118, 2975, -5, 1964,
+ -1118, 981, 2520, -1118, 3114, -1118, -1118, 990, -1118, -1118,
+ 1136, 1138, 1052, -1118, 3187, 3187, 3187, -1118, 1143, 1144,
+ 1009, 2103, 2103, 2103, -1118, -8, -1118, 3187, 4398, 4424,
+ 669, -1118, 3187, -1118, -1118, -1118, -1118, -1118, -1118, -1118,
+ -1118, -1118, -1118, -1118, 2103, 280, 3187, 1148, 1151, 18,
+ -1118, 1150, 5319, 14, -1118, 1153, 1155, 1157, 1158, -1118,
+ -1118, 492, 4450, -1118, 1022, 6455, 3187, -68, 1162, 1164,
+ 1165, -1118, 3187, 3187, -1118, -1118, 1166, 3187, -1118, -1118,
+ -1118, 1152, 1169, 1170, 1061, 3187, -1118, 1171, 2103, 2103,
+ 2103, 2103, 1172, 1175, 1176, -1118, 3247, 1040, 3180, 6350,
+ 2513, 36, -68, 1177, -68, 1178, -68, 1179, 318, 1042,
+ 6371, 3213, 409, -1118, 1181, 1367, 1184, -68, 1367, 1185,
+ 670, 3187, -1118, -1118, 2103, 2652, 579, 6392, -1118, 2798,
+ 1188, 1047, 1048, 1051, -1118, 221, 6455, 3187, 3187, 2103,
+ 1065, 674, 6455, 1190, 1192, 1754, -1118, 1203, 1193, -1118,
+ 1075, -1118, -1118, -1118, -1118, -1118, 1214, 3187, -1118, 3428,
+ 97, -1118, -1118, -1118, 3456, 3484, -1118, 3512, 1218, -1118,
+ -1118, 1174, 1219, 6455, -1118, 1221, 1224, 1225, 1227, -1118,
+ 1087, 1229, -1118, 1893, 1231, 1232, 1096, -1118, 3187, -1118,
+ 1101, 414, -1118, 1097, 458, -1118, 1104, 471, -1118, 1105,
+ 1233, 2103, 1241, 1107, 3187, -1118, 2659, 488, -1118, 491,
+ 493, -1118, 1269, 3540, 1204, 3187, -1118, 3187, -1118, -1118,
+ 3114, 2032, 1272, -1118, 2103, 2103, 2103, -1118, 3187, 4476,
+ 4502, -1118, 2103, 3187, 1273, -1118, -1118, -1118, 14, -1118,
+ 1200, -1118, 4528, 1293, 1295, 1307, 1309, 1312, 1195, -1118,
+ -1118, -1118, -1118, -1118, 2103, -1118, -1118, -1118, -1118, 36,
+ 2889, -1118, 2975, -41, 2975, -41, 2975, -41, -1118, 675,
+ 2103, -1118, 3568, -68, 3114, -68, -1118, -1118, 3187, 3596,
+ 3624, 678, -1118, -1118, 1196, 1197, 1198, 1206, 6455, 3187,
+ 3187, 679, 6455, -1118, 1316, -1118, 3187, -1118, -1118, -1118,
+ -1118, -1118, 3187, 682, 1199, 3187, -1118, 3652, 505, 138,
+ 3680, 515, 147, 3708, 517, 149, 2103, 1317, 1275, 2000,
+ 1207, 522, 686, 535, 2171, -1118, -1118, 1345, 1350, 1351,
+ 1352, 3187, 6413, 4554, 31, -1118, 4580, 3736, 1355, -1118,
+ 3764, 1354, 3187, 1356, 1357, 3187, 1358, 1359, 3187, 1361,
+ 1213, -1118, 3187, -1118, -41, -1118, 3114, 1362, 2659, -1118,
+ -1118, -1118, -1118, -1118, 714, -1118, 3187, -1118, 2103, 3187,
+ -1118, -1118, 1363, -1118, -1118, 1226, 3792, -1118, -1118, 1228,
+ 3820, -1118, -1118, 1256, 3848, -1118, 1366, 2203, 201, 2139,
+ 715, -1118, 552, 720, 1368, 1260, 6434, 728, 3876, -1118,
+ -41, 1373, -41, 1374, -41, 1398, -1118, -1118, -1118, -1118,
+ -41, 1402, 3114, 1403, -1118, 492, -1118, 1263, 1405, 261,
+ -1118, 1267, 287, -1118, 1268, 289, -1118, 1270, 324, -1118,
+ 739, -1118, 744, -1118, 1271, 2103, -1118, 1410, -41, 1413,
+ -41, 1417, -41, -1118, 1418, 492, 1419, 492, 745, -1118,
+ 329, -1118, 332, -1118, 346, -1118, -1118, -1118, 748, -1118,
+ 1421, 1422, 1423, 1424, 492, 1428, -1118, -1118, -1118, -1118,
+ -1118, -1118
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -1114, -1114, -1114, -1114, 602, -1114, -1114, -1114, -1114, 218,
- -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114, -1114,
- -1114, -1114, -292, 21, -1114, -52, -1114, 595, 1437, -1114,
- -1114, -1114, -1114, 3, -374, -193, -1114, -1114, -1114, -1114,
- -1114, -1114, 1438, -1114, -1114, -1114, -1114, -1114, -1114, -1114,
- -1114, -1114, -1114, -1114, -1114, -1114, -660, -713, 217, -1114,
- -1114, 1084, -1114, -1114, -1114, -1114, -1114, -6, -1114, -20,
- -1114, -1113, 545, -81, 291, -83, -667, 507, -1114, -228,
- 12
+ -1118, -1118, -1118, -1118, 599, -1118, -1118, -1118, -1118, 225,
+ -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118, -1118,
+ -1118, -1118, -293, -3, -1118, -100, -1118, 597, 1439, -1118,
+ -1118, -1118, -1118, 3, -371, -193, -1118, -1118, -1118, -1118,
+ -1118, -1118, 1444, -1118, -1118, -1118, -1118, -1118, -1118, -1118,
+ -1118, -1118, -1118, -1118, -1118, -1118, -719, -712, 223, -1118,
+ -1118, 1093, -1118, -1118, -1118, -1118, -1118, -6, -1118, -20,
+ -1118, -1117, 561, -67, 347, -107, -667, 510, -1118, -216,
+ -2
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -1541,366 +1430,361 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -5
static const yytype_int16 yytable[] =
{
- 139, 387, 426, 488, 568, 569, 73, 145, 1179, 614,
- 953, 401, 695, 295, 154, 202, 187, 189, 141, 195,
- 826, 950, 214, 397, 686, 398, 231, 138, 5, 159,
- 1191, 224, 419, 217, 421, 226, 150, 1253, 237, 784,
- 755, 4, 299, 151, 390, 886, 756, 757, 154, 423,
- 237, 391, 159, 475, 476, 477, 478, 755, 150, 483,
- 755, 376, 377, 756, 757, 690, 756, 757, 334, 113,
- 114, 115, 116, 339, 678, 117, 142, 343, 378, 155,
- 144, 113, 114, 115, 116, 147, 156, 117, 358, 359,
- 678, 615, 616, 617, 618, 376, 377, 162, 817, 143,
- 238, 160, 888, 148, 693, 296, 297, 35, 36, 37,
- 38, 563, 885, 155, 149, 203, 43, 163, 394, 46,
- 691, 288, 289, 290, 692, 168, 291, 294, 169, 1003,
- 170, 303, 1230, 696, 376, 377, 152, 323, 516, 300,
- 325, 1283, 696, 517, 326, 332, 335, 336, 146, 338,
+ 139, 387, 488, 138, 141, 1181, 73, 568, 569, 614,
+ 397, 401, 398, 425, 426, 202, 187, 189, 214, 195,
+ 826, 695, 686, 678, 154, 224, 231, 1193, 159, 159,
+ 226, 784, 419, 217, 421, 755, 145, 1257, 150, 154,
+ 299, 756, 757, 888, 334, 151, 886, 376, 377, 339,
+ 422, 237, 755, 343, 950, 4, 516, 953, 756, 757,
+ 483, 517, 183, 184, 378, 475, 476, 477, 478, 390,
+ 5, 755, 185, 196, 376, 377, 391, 756, 757, 186,
+ 376, 377, 113, 114, 115, 116, 238, 678, 117, 155,
+ 563, 615, 616, 617, 618, 142, 156, 379, 144, 295,
+ 160, 692, 358, 359, 155, 35, 36, 37, 38, 817,
+ 191, 691, 143, 192, 43, 203, 193, 46, 150, 197,
+ 147, 288, 289, 290, 885, 690, 291, 294, 198, 130,
+ 131, 303, 394, 123, 124, 125, 126, 323, 148, 300,
+ 325, 1287, 696, 1003, 326, 332, 335, 336, 399, 338,
332, 340, 341, 619, 332, 344, 345, 941, 204, 130,
- 131, 399, 371, 372, 232, 215, 233, 687, 164, 218,
- 380, 234, 484, 225, 388, 886, 785, 227, 1254, 374,
- 375, 153, 130, 131, 123, 124, 125, 126, 375, 792,
- 818, 819, 176, 157, 680, 177, 577, 178, 376, 377,
- 123, 124, 125, 126, 158, 407, 408, 409, 1334, 411,
- 485, 755, 414, 415, 992, 416, 993, 756, 757, 598,
- 130, 131, 487, 755, 161, 755, 428, 679, 162, 756,
+ 131, 215, 371, 372, 232, 687, 233, 225, 785, 218,
+ 380, 234, 227, 484, 388, 696, 886, 146, 1258, 374,
+ 375, 376, 377, 130, 131, 205, 485, 206, 375, 149,
+ 792, 296, 297, 680, 183, 184, 577, 123, 124, 125,
+ 126, 818, 819, 162, 185, 407, 408, 409, 1338, 411,
+ 693, 194, 414, 415, 755, 416, 152, 130, 131, 598,
+ 756, 757, 487, 755, 679, 755, 428, 376, 377, 756,
757, 756, 757, 433, 434, 435, 436, 437, 438, 439,
440, 441, 442, 443, 444, 445, 446, 447, 448, 449,
450, 451, 452, 453, 454, 455, 456, 457, 458, 459,
460, 461, 462, 463, 464, 465, 466, 467, 468, 469,
- 470, 471, 472, 473, 474, 196, 1041, 667, 755, 479,
- 376, 377, 668, 1233, 756, 757, 755, 332, 524, 836,
- 130, 131, 756, 757, 526, 1236, 994, 1294, 995, 165,
+ 470, 471, 472, 473, 474, 168, 1041, 755, 169, 479,
+ 170, 376, 377, 756, 757, 237, 1233, 332, 176, 667,
+ 153, 177, 489, 178, 668, 1236, 590, 1239, 389, 157,
500, 501, 502, 503, 504, 505, 506, 507, 508, 509,
- 510, 511, 512, 513, 514, 166, 489, 130, 131, 755,
- 590, 197, 167, 522, 792, 756, 757, 935, 376, 377,
- 198, 530, 123, 124, 125, 126, 535, 931, 376, 377,
- 522, 332, 526, 171, 570, 544, 545, 546, 547, 205,
- 1323, 206, 130, 131, 552, 379, 566, 567, 1325, 557,
- 558, 559, 179, 755, 372, 180, 317, 318, 319, 756,
- 757, 376, 377, 320, 182, 571, 572, 573, 288, 289,
- 574, 300, 300, 794, 578, 579, 580, 581, 389, 755,
- 585, 1327, 181, 587, 588, 756, 757, 332, 591, 592,
- 190, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 315, 316, 542, 318, 319, 1116, 755, 985, 986, 320,
- 1117, 610, 756, 757, 613, 755, 183, 184, 1090, 376,
- 377, 756, 757, 199, 698, 1329, 185, 123, 124, 125,
- 126, 811, 333, 186, 201, 423, 237, 333, 200, 207,
- 612, 333, 376, 377, 208, 209, 721, 130, 131, 755,
- 1182, 191, 210, 211, 192, 756, 757, 193, 996, 835,
- 997, 212, 213, 376, 377, 674, 219, 113, 114, 115,
- 116, 221, 683, 117, 886, 376, 377, 886, 1347, 576,
- 886, 239, 1197, 240, 1200, 220, 1203, 1348, 241, 682,
- 242, 875, 738, 739, 740, 376, 377, 681, 243, 222,
- 244, 332, 699, 223, 674, 703, 376, 377, 704, 705,
- 707, 887, 376, 377, 934, 936, 228, 229, 376, 377,
- 230, 1349, 1094, 332, 281, 236, 705, 724, 1151, 245,
- 298, 246, 729, 746, 1153, 183, 184, 736, 736, 736,
- 736, 285, 282, 376, 377, 185, 760, 283, 747, 748,
- 284, 886, 194, 304, 751, 737, 737, 737, 737, 1155,
- 376, 377, 376, 377, 376, 377, 767, 247, 769, 248,
- 526, 1274, 527, 286, 333, 810, 1162, 249, 1163, 250,
- 1164, 780, 886, 782, 783, 886, 376, 377, 886, 321,
- 787, 886, 376, 377, 322, 376, 377, 829, 830, 831,
- 832, 324, 1229, 376, 377, 376, 377, 1080, 1232, 839,
- 523, 1235, 251, 886, 252, 886, 1305, 886, 1308, 1243,
- 1311, 1245, 793, 376, 377, 1107, 1314, 523, 333, 337,
- 856, 802, 803, 315, 316, 317, 318, 319, 253, 1298,
- 254, 255, 320, 256, 342, 804, 805, 806, 807, 808,
- 809, 351, 332, 906, 1336, 352, 1338, 812, 1340, 353,
- 354, 130, 131, 257, 820, 258, 520, 259, 233, 260,
- 838, 136, 360, 234, 332, 332, 332, 332, 833, 261,
- 263, 262, 264, 265, 333, 266, 332, 309, 310, 311,
- 312, 313, 314, 315, 316, 317, 318, 319, 349, 267,
- 365, 268, 320, 356, 356, 356, 269, 332, 270, 130,
- 131, 366, 368, 1046, 481, 369, 233, 271, 273, 272,
- 274, 234, 879, 880, 881, 172, 367, 275, 173, 276,
- 277, 174, 278, 175, 356, 395, 370, 392, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 279, 526, 280, 532, 320, 526, 606, 536,
- 607, 381, 382, 422, 1192, 1108, 306, 307, 308, 309,
- 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 383, 918, 919, 526, 320, 677, 907, 526, 526, 722,
- 773, 847, 526, 848, 855, 7, 8, 943, 333, 944,
- 526, 1010, 945, 526, 393, 946, 706, 708, 526, 942,
- 947, 526, 526, 948, 954, 526, 1029, 970, 1030, 400,
- 333, 952, 396, 706, 793, 955, 402, 403, 937, 494,
- 15, 16, 495, 18, 19, 496, 21, 497, 23, 526,
- 24, 1102, 26, 27, 404, 29, 30, 31, 406, 410,
- 33, 34, 1122, 1204, 1123, 1205, 526, 1002, 1215, 988,
- 989, 990, 1029, 1029, 1221, 1225, 412, 998, 1000, 405,
- 526, 1001, 1244, 413, 50, 51, 52, 417, 332, 311,
- 312, 313, 314, 315, 316, 317, 318, 319, 1015, 1016,
- 1017, 1122, 320, 1280, 526, 526, 1297, 1299, 1029, 418,
- 1303, 1026, 526, 1331, 1330, 1332, 1032, 308, 309, 310,
- 311, 312, 313, 314, 315, 316, 317, 318, 319, 1029,
- 1035, 1346, 1350, 320, 1351, 305, 1024, 1050, 420, 427,
- 429, 589, 430, 432, 480, 320, 490, 1034, 491, 492,
- 1049, 136, 543, 493, 548, 521, 1054, 1055, 549, 333,
- 553, 1057, 554, 555, 556, 561, 560, 1207, 582, 1063,
- 584, 586, 1081, 562, 1084, 596, 1087, 608, 599, 605,
- 1073, 333, 333, 333, 333, 1097, 609, 1099, 1100, 669,
- 670, 671, 673, 333, 300, 684, 685, 689, 1074, 332,
- 700, 709, 332, 710, 711, 1103, 713, 714, 715, 716,
- 718, 719, 720, 1111, 333, 731, 733, 744, 749, 750,
- 768, 1118, 1119, 776, 777, 778, 779, 1170, 675, 676,
- 788, 1112, 789, 797, 790, 798, 799, 801, 814, 815,
- 816, 1131, 821, 822, 834, 824, 825, 828, 852, 1275,
+ 510, 511, 512, 513, 514, 836, 113, 114, 115, 116,
+ 526, 172, 117, 522, 173, 931, 524, 174, 158, 175,
+ 526, 530, 123, 124, 125, 126, 535, 755, 161, 162,
+ 522, 332, 163, 756, 757, 544, 545, 546, 547, 1298,
+ 376, 377, 130, 131, 552, 164, 566, 567, 935, 557,
+ 558, 559, 1117, 755, 372, 755, 992, 1118, 993, 756,
+ 757, 756, 757, 376, 377, 571, 572, 573, 288, 289,
+ 574, 300, 300, 165, 578, 579, 580, 581, 171, 994,
+ 585, 995, 166, 587, 588, 794, 179, 332, 591, 592,
+ 755, 376, 377, 985, 986, 755, 756, 757, 755, 1327,
+ 698, 756, 757, 167, 756, 757, 239, 996, 240, 997,
+ 180, 610, 755, 241, 613, 242, 612, 201, 756, 757,
+ 181, 243, 721, 244, 1199, 1329, 1202, 1331, 1205, 306,
+ 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
+ 542, 318, 319, 811, 738, 739, 740, 320, 376, 377,
+ 245, 1184, 246, 376, 377, 247, 1090, 248, 123, 124,
+ 125, 126, 1333, 182, 570, 674, 249, 1351, 250, 576,
+ 1352, 835, 683, 681, 251, 682, 252, 886, 130, 131,
+ 886, 199, 190, 886, 1353, 200, 422, 237, 333, 208,
+ 376, 377, 253, 333, 254, 376, 377, 333, 255, 207,
+ 256, 332, 699, 209, 674, 703, 875, 210, 704, 705,
+ 707, 887, 211, 934, 936, 1278, 212, 213, 113, 114,
+ 115, 116, 219, 332, 117, 220, 705, 724, 221, 376,
+ 377, 228, 729, 746, 376, 377, 222, 736, 736, 736,
+ 736, 737, 737, 737, 737, 1094, 760, 223, 747, 748,
+ 1152, 810, 130, 131, 751, 236, 886, 520, 257, 233,
+ 258, 1309, 136, 1312, 234, 1315, 767, 259, 769, 260,
+ 261, 1318, 262, 829, 830, 831, 832, 1107, 376, 377,
+ 263, 780, 264, 782, 783, 839, 265, 886, 266, 786,
+ 886, 376, 377, 886, 1154, 267, 886, 268, 793, 1340,
+ 269, 1342, 270, 1344, 229, 230, 856, 1156, 376, 377,
+ 1080, 376, 377, 376, 377, 281, 130, 131, 886, 285,
+ 886, 481, 886, 233, 1163, 376, 377, 1164, 234, 1165,
+ 333, 802, 803, 130, 131, 376, 377, 376, 377, 906,
+ 792, 1232, 376, 377, 282, 804, 805, 806, 807, 808,
+ 809, 1235, 332, 1238, 283, 376, 377, 812, 1246, 315,
+ 316, 317, 318, 319, 820, 298, 523, 271, 320, 272,
+ 838, 1248, 376, 377, 332, 332, 332, 332, 833, 284,
+ 317, 318, 319, 523, 333, 286, 332, 320, 1302, 304,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
- 316, 317, 318, 319, 842, 845, 851, 858, 320, 859,
- 860, 861, 1149, 1319, 864, 866, 865, 870, 871, 867,
- 1210, 868, 872, 869, 873, 882, 884, 890, 1161, 874,
- 522, 883, 889, 891, 730, 892, 894, 895, 896, 1168,
- 897, 1169, 898, 1342, 332, 1345, 899, 745, 903, 908,
- 909, 1176, 910, 912, 913, 914, 1180, 915, 916, 917,
- 922, 932, 1356, 939, 949, 938, 957, 961, 964, 956,
- 962, 1196, 963, 1199, 965, 1202, 968, 967, 969, 971,
- 975, 976, 1209, 987, 1211, 1195, 978, 1198, 979, 1201,
- 786, 300, 499, 991, 980, 7, 8, 332, 981, 1012,
- 1276, 1212, 1279, 1013, 1018, 1020, 1007, 1011, 1014, 1019,
- 1036, 1219, 1220, 1021, 1037, 1039, 1061, 1042, 1223, 1043,
- 1044, 1045, 1048, 1051, 1224, 333, 515, 1227, 1052, 494,
- 15, 16, 495, 18, 19, 496, 21, 497, 23, 1053,
- 24, 1056, 26, 27, 1058, 29, 30, 31, 1059, 672,
- 33, 34, 1032, 1060, 1064, 1316, 1069, 1070, 1072, 1075,
- 1082, 1085, 1088, 1262, 1095, 1278, 1266, 1098, 1091, 1270,
- 1101, 1113, 1124, 1273, 50, 51, 52, 332, 1125, 332,
- 1114, 1115, 1127, 1128, 1121, 1129, 1282, 1130, 1136, 1284,
- 1137, 1138, 1139, 1140, 1141, 843, 844, 1142, 846, 1144,
- 849, 850, 1143, 1146, 853, 854, 1147, 306, 307, 308,
+ 316, 317, 318, 319, 273, 321, 274, 332, 320, 322,
+ 275, 277, 276, 278, 349, 337, 279, 1108, 280, 356,
+ 356, 356, 879, 880, 881, 1046, 526, 526, 527, 532,
+ 526, 369, 536, 605, 526, 606, 677, 324, 342, 526,
+ 333, 722, 526, 847, 773, 848, 526, 943, 855, 944,
+ 356, 395, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 315, 316, 317, 318, 319, 351, 526, 1194, 945,
+ 320, 526, 907, 946, 526, 353, 947, 1010, 526, 354,
+ 948, 918, 919, 311, 312, 313, 314, 315, 316, 317,
+ 318, 319, 352, 7, 8, 526, 320, 954, 360, 526,
+ 793, 970, 365, 366, 937, 1029, 526, 1030, 1102, 942,
+ 1123, 1206, 1124, 1207, 526, 1029, 1217, 1224, 1029, 367,
+ 1228, 952, 526, 368, 1247, 955, 370, 494, 15, 16,
+ 495, 18, 19, 496, 21, 497, 23, 381, 24, 382,
+ 26, 27, 383, 29, 30, 31, 392, 393, 33, 34,
+ 1123, 526, 1284, 1301, 333, 396, 526, 1002, 1303, 988,
+ 989, 990, 706, 708, 1029, 400, 1307, 998, 1000, 402,
+ 404, 1001, 50, 51, 52, 526, 333, 1334, 332, 706,
+ 1335, 1029, 1336, 1350, 1354, 405, 1355, 403, 1015, 1016,
+ 1017, 406, 410, 412, 413, 417, 418, 420, 427, 429,
+ 430, 1026, 1024, 432, 480, 320, 1032, 490, 308, 309,
+ 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
+ 1035, 491, 492, 1034, 320, 136, 521, 1050, 543, 589,
+ 493, 548, 549, 553, 554, 561, 555, 556, 562, 560,
+ 1049, 582, 584, 586, 596, 607, 1054, 1055, 305, 599,
+ 608, 1057, 609, 669, 670, 671, 673, 684, 1209, 1063,
+ 685, 689, 1081, 709, 1084, 700, 1087, 710, 711, 713,
+ 1073, 714, 715, 716, 1074, 1097, 718, 1099, 1100, 719,
+ 720, 731, 733, 744, 300, 749, 750, 768, 779, 332,
+ 776, 777, 332, 1171, 778, 1103, 787, 788, 789, 797,
+ 790, 798, 799, 1111, 801, 333, 814, 1112, 815, 816,
+ 821, 1119, 1120, 822, 834, 824, 825, 828, 852, 842,
+ 845, 851, 858, 859, 860, 861, 864, 333, 333, 333,
+ 333, 1132, 865, 866, 675, 676, 870, 867, 871, 333,
+ 872, 868, 1279, 869, 873, 882, 884, 1212, 883, 874,
+ 889, 890, 894, 891, 892, 895, 896, 897, 898, 899,
+ 333, 903, 1150, 306, 307, 308, 309, 310, 311, 312,
+ 313, 314, 315, 316, 317, 318, 319, 908, 1162, 1323,
+ 522, 320, 909, 911, 915, 912, 913, 914, 916, 1169,
+ 917, 1170, 922, 932, 332, 939, 949, 938, 961, 964,
+ 730, 956, 1178, 957, 962, 965, 963, 1182, 968, 1346,
+ 967, 1349, 969, 745, 971, 975, 976, 991, 1007, 978,
+ 979, 980, 1198, 981, 1201, 987, 1204, 1011, 1360, 1280,
+ 499, 1283, 1012, 1211, 1013, 1213, 1197, 1014, 1200, 1018,
+ 1203, 1019, 300, 1020, 1036, 1037, 1039, 1058, 332, 1042,
+ 1061, 1043, 1214, 1044, 1045, 1048, 7, 8, 1051, 524,
+ 1052, 1053, 1056, 1222, 1223, 1059, 1060, 1064, 1069, 1070,
+ 1226, 1075, 1072, 1082, 1085, 1088, 1227, 1095, 1091, 1230,
+ 1098, 1101, 1113, 1114, 1115, 1320, 1125, 1116, 1126, 1129,
+ 494, 15, 16, 495, 18, 19, 496, 21, 497, 23,
+ 1128, 24, 1122, 26, 27, 1032, 29, 30, 31, 1130,
+ 1131, 33, 34, 1137, 1138, 1139, 1266, 1140, 1282, 1270,
+ 1141, 1142, 1274, 1143, 1144, 1145, 1277, 1147, 1148, 1158,
+ 332, 333, 332, 1149, 1153, 50, 51, 52, 1160, 1151,
+ 1286, 1155, 1157, 1288, 1161, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 315, 316, 317, 318, 319, 7,
+ 8, 843, 844, 320, 846, 1166, 849, 850, 1173, 1183,
+ 853, 854, 306, 307, 308, 309, 310, 311, 312, 313,
+ 314, 315, 316, 525, 318, 319, 332, 1185, 1168, 1187,
+ 320, 1188, 603, 494, 15, 16, 495, 18, 19, 496,
+ 21, 497, 23, 1189, 24, 1190, 26, 27, 1191, 29,
+ 30, 31, 1225, 1241, 33, 34, 309, 310, 311, 312,
+ 313, 314, 315, 316, 317, 318, 319, 900, 901, 902,
+ 1242, 320, 1192, 515, 1218, 1219, 1220, 1229, 50, 51,
+ 52, 1250, 333, 1221, 1245, 333, 1251, 1252, 1253, 1261,
+ 1264, 1276, 1267, 1268, 1271, 1272, 672, 1275, 1281, 1289,
+ 85, 327, 1296, 1290, 1304, 1292, 89, 90, 91, 1310,
+ 1313, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+ 111, 112, 823, 1294, 1316, 604, 960, 1305, 1319, 1321,
+ 1325, 1326, 966, 328, 1328, 1330, 1339, 1332, 1337, 1341,
+ 972, 973, 974, 1343, 1345, 1347, 977, 1356, 1357, 1358,
+ 1359, 982, 983, 984, 1361, 951, 35, 36, 37, 38,
+ 39, 959, 72, 523, 999, 43, 1254, 80, 46, 1038,
+ 1006, 1262, 551, 1009, 0, 0, 0, 333, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
+ 318, 319, 1021, 1022, 1023, 0, 320, 119, 120, 121,
+ 122, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 315, 316, 317, 318, 319, 1033, 0, 384, 1096, 320,
+ 0, 0, 129, 0, 0, 0, 0, 386, 0, 0,
+ 0, 333, 135, 0, 186, 540, 0, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 1150, 1157, 1165, 1148, 320, 1159, 1152, 1167, 1154,
- 1172, 603, 332, 1181, 1183, 1156, 333, 1160, 1185, 333,
- 1186, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 315, 316, 317, 318, 319, 1187, 1188, 1189, 1222, 320,
- 1216, 900, 901, 902, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 315, 316, 317, 318, 319, 1190, 1238,
- 1217, 1247, 320, 1218, 1248, 1239, 1226, 1249, 1242, 1257,
- 823, 1286, 1260, 1263, 85, 327, 1264, 1272, 1267, 1268,
- 89, 90, 91, 1271, 1277, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 857, 523, 1285, 1288,
- 960, 1290, 1292, 1300, 1306, 1309, 966, 328, 1312, 1301,
- 1315, 333, 1317, 1321, 972, 973, 974, 1322, 1324, 1326,
- 977, 1328, 1333, 1335, 1337, 982, 983, 984, 1339, 1341,
- 35, 36, 37, 38, 39, 893, 1343, 1352, 999, 43,
- 1353, 1354, 46, 1355, 1006, 1357, 1250, 1009, 951, 959,
- 72, 80, 1258, 551, 0, 940, 1038, 0, 0, 0,
- 0, 0, 0, 0, 333, 0, 0, 1022, 1023, 0,
- 0, 119, 120, 121, 122, 306, 307, 308, 309, 310,
- 311, 312, 313, 314, 315, 316, 317, 318, 319, 1033,
- 0, 384, 1096, 320, 0, 0, 129, 0, 0, 0,
- 0, 386, 0, 0, 0, 0, 135, 0, 186, 540,
- 0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
- 315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 1065, 1066, 1067, 1068, 0, 0, 0,
- 0, 0, 0, 0, 333, 0, 333, 0, 0, 0,
- 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
- 316, 317, 318, 319, 0, 0, 0, 1126, 320, 1104,
- 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
- 316, 317, 318, 319, 1120, 0, 0, 0, 320, 85,
- 327, 0, 0, 0, 0, 89, 90, 91, 0, 333,
- 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 328, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 1158, 0, 0, 0,
- 0, 0, 0, 0, 0, 35, 36, 37, 38, 39,
- 0, 0, 0, 0, 43, 0, 0, 46, 0, 1173,
- 1174, 0, 0, 0, 1145, 0, 0, 0, 0, 0,
+ 319, 0, 0, 0, 0, 320, 0, 85, 327, 1065,
+ 1066, 1067, 1068, 89, 90, 91, 0, 0, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 0,
+ 0, 0, 0, 0, 0, 1104, 0, 0, 0, 0,
+ 328, 0, 0, 0, 0, 0, 0, 7, 8, 0,
+ 1121, 0, 0, 333, 0, 333, 0, 0, 0, 0,
+ 0, 0, 0, 35, 36, 37, 38, 39, 0, 857,
+ 0, 0, 43, 0, 0, 46, 0, 0, 0, 0,
+ 0, 494, 15, 16, 495, 18, 19, 496, 21, 497,
+ 23, 893, 24, 0, 26, 27, 0, 29, 30, 31,
+ 0, 0, 33, 34, 119, 120, 121, 122, 0, 333,
+ 0, 0, 1159, 940, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 127, 329, 50, 51, 52, 129,
+ 0, 0, 0, 0, 132, 1174, 1175, 1176, 0, 135,
+ 0, 0, 540, 85, 86, 87, 0, 88, 0, 89,
+ 90, 91, 0, 0, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, 110, 111, 112, 0, 113, 114, 115, 116,
+ 0, 1208, 117, 761, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
+ 0, 0, 320, 0, 0, 0, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
+ 1127, 0, 0, 0, 320, 0, 0, 1240, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
+ 318, 319, 0, 0, 118, 0, 320, 0, 0, 0,
+ 119, 120, 121, 122, 0, 0, 0, 123, 124, 125,
+ 126, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 127, 128, 0, 0, 0, 129, 0, 130, 131, 0,
+ 132, 0, 133, 0, 134, 135, 0, 136, 85, 327,
+ 355, 0, 0, 0, 89, 90, 91, 0, 0, 92,
+ 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
+ 103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 328, 0, 7, 8, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
+ 0, 0, 0, 320, 35, 36, 37, 38, 39, 1146,
+ 0, 0, 0, 43, 0, 0, 46, 494, 15, 16,
+ 495, 18, 19, 496, 21, 497, 23, 0, 24, 0,
+ 26, 27, 0, 29, 30, 31, 0, 0, 33, 34,
+ 0, 0, 0, 0, 0, 119, 120, 121, 122, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 50, 51, 52, 127, 346, 0, 0, 0,
+ 129, 0, 0, 0, 0, 132, 0, 85, 327, 1004,
+ 135, 0, 347, 89, 90, 91, 0, 0, 92, 93,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
+ 104, 105, 106, 107, 108, 109, 110, 111, 112, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 781,
+ 328, 0, 7, 8, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
+ 0, 0, 320, 35, 36, 37, 38, 39, 1172, 0,
+ 0, 0, 43, 0, 0, 46, 494, 15, 16, 495,
+ 18, 19, 496, 21, 497, 23, 0, 24, 0, 26,
+ 27, 0, 29, 30, 31, 0, 0, 33, 34, 0,
+ 0, 0, 0, 0, 119, 120, 121, 122, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 50, 51, 52, 127, 346, 0, 0, 0, 129,
+ 0, 0, 0, 0, 132, 0, 85, 327, 0, 135,
+ 0, 1005, 89, 90, 91, 0, 0, 92, 93, 94,
+ 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
+ 105, 106, 107, 108, 109, 110, 111, 112, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1243, 328,
+ 0, 7, 8, 306, 307, 308, 309, 310, 311, 312,
+ 313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
+ 0, 320, 35, 36, 37, 38, 39, 1249, 0, 0,
+ 0, 43, 0, 0, 46, 494, 15, 16, 495, 18,
+ 19, 496, 21, 497, 23, 0, 24, 0, 26, 27,
+ 0, 29, 30, 31, 0, 0, 33, 34, 0, 1297,
+ 0, 0, 0, 119, 120, 121, 122, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 50, 51, 52, 127, 346, 0, 0, 0, 129, 0,
+ 0, 0, 0, 132, 524, 85, 327, 0, 135, 0,
+ 347, 89, 90, 91, 0, 0, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1299, 328, 0,
0, 0, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 315, 316, 317, 318, 319, 119, 120, 121, 122,
- 320, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 1206, 0, 127, 329, 0, 0,
- 0, 129, 0, 0, 0, 0, 132, 0, 0, 0,
- 0, 135, 0, 0, 540, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 85,
- 86, 87, 0, 88, 0, 89, 90, 91, 0, 1237,
- 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 0, 113, 114, 115, 116, 0, 0, 117, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 524, 85, 327, 355, 320, 0, 0,
+ 314, 315, 316, 317, 318, 319, 0, 0, 0, 0,
+ 320, 35, 36, 37, 38, 39, 600, 0, 0, 0,
+ 43, 0, 0, 46, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
+ 0, 0, 320, 0, 0, 0, 0, 0, 0, 0,
+ 694, 0, 119, 120, 121, 122, 0, 306, 307, 308,
+ 309, 310, 311, 312, 313, 314, 315, 316, 542, 318,
+ 319, 0, 127, 329, 0, 320, 0, 129, 0, 0,
+ 0, 0, 132, 841, 85, 327, 0, 135, 0, 539,
89, 90, 91, 0, 0, 92, 93, 94, 95, 96,
97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
107, 108, 109, 110, 111, 112, 0, 0, 0, 0,
- 0, 862, 0, 0, 0, 0, 0, 328, 0, 0,
- 118, 0, 0, 0, 0, 0, 119, 120, 121, 122,
- 0, 0, 0, 123, 124, 125, 126, 0, 0, 0,
- 35, 36, 37, 38, 39, 1171, 127, 128, 0, 43,
- 0, 129, 46, 130, 131, 0, 132, 0, 133, 0,
- 134, 135, 0, 136, 0, 0, 0, 306, 307, 308,
- 309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 119, 120, 121, 122, 320, 306, 307, 308, 309,
- 310, 311, 312, 313, 314, 315, 316, 525, 318, 319,
- 0, 127, 346, 0, 320, 0, 129, 0, 0, 0,
- 0, 132, 0, 85, 327, 1004, 135, 0, 347, 89,
+ 0, 0, 0, 0, 0, 0, 0, 328, 0, 306,
+ 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
+ 317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
+ 35, 36, 37, 38, 39, 905, 0, 0, 0, 43,
+ 0, 0, 46, 306, 307, 308, 309, 310, 311, 312,
+ 313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
+ 0, 320, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 119, 120, 121, 122, 0, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
+ 0, 127, 329, 0, 320, 0, 129, 0, 0, 0,
+ 0, 132, 0, 85, 327, 0, 135, 0, 723, 89,
90, 91, 0, 0, 92, 93, 94, 95, 96, 97,
98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
- 108, 109, 110, 111, 112, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 328, 0, 7, 8,
- 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
- 316, 317, 318, 319, 0, 0, 0, 0, 320, 35,
- 36, 37, 38, 39, 1246, 0, 0, 0, 43, 0,
- 0, 46, 494, 15, 16, 495, 18, 19, 496, 21,
- 497, 23, 0, 24, 0, 26, 27, 0, 29, 30,
- 31, 0, 0, 33, 34, 0, 0, 0, 0, 0,
- 119, 120, 121, 122, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 50, 51, 52,
- 127, 346, 0, 0, 0, 129, 0, 0, 0, 0,
- 132, 0, 85, 327, 0, 135, 0, 1005, 89, 90,
+ 108, 109, 110, 111, 112, 862, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 328, 0, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
+ 318, 319, 0, 0, 0, 0, 320, 0, 0, 35,
+ 36, 37, 38, 39, 0, 0, 0, 0, 43, 0,
+ 0, 46, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
+ 119, 120, 121, 122, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
+ 127, 346, 320, 0, 0, 129, 0, 0, 0, 1078,
+ 132, 1079, 85, 327, 0, 135, 0, 1008, 89, 90,
91, 0, 0, 92, 93, 94, 95, 96, 97, 98,
99, 100, 101, 102, 103, 104, 105, 106, 107, 108,
109, 110, 111, 112, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 604, 328, 0, 7, 8, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 0, 0, 0, 0, 320, 35, 36,
- 37, 38, 39, 1293, 0, 0, 0, 43, 0, 0,
- 46, 494, 15, 16, 495, 18, 19, 496, 21, 497,
- 23, 0, 24, 0, 26, 27, 0, 29, 30, 31,
- 0, 0, 33, 34, 0, 0, 0, 0, 0, 119,
- 120, 121, 122, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 50, 51, 52, 127,
- 346, 0, 0, 0, 129, 0, 0, 0, 0, 132,
- 0, 85, 327, 0, 135, 0, 347, 89, 90, 91,
+ 0, 0, 0, 0, 0, 328, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
+ 0, 0, 0, 0, 320, 0, 0, 0, 35, 36,
+ 37, 38, 39, 726, 0, 85, 287, 43, 0, 0,
+ 46, 89, 90, 91, 0, 0, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+ 106, 107, 108, 109, 110, 111, 112, 0, 0, 119,
+ 120, 121, 122, 306, 307, 308, 309, 310, 311, 312,
+ 313, 314, 315, 316, 317, 318, 319, 0, 0, 384,
+ 1096, 320, 0, 0, 129, 0, 0, 0, 1105, 386,
+ 1106, 85, 287, 237, 135, 0, 186, 89, 90, 91,
0, 0, 92, 93, 94, 95, 96, 97, 98, 99,
100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
- 110, 111, 112, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 761, 328, 0, 7, 8, 306, 307,
+ 110, 111, 112, 0, 113, 114, 115, 116, 0, 0,
+ 117, 0, 119, 120, 121, 122, 7, 8, 306, 307,
308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 0, 0, 0, 0, 320, 35, 36, 37,
- 38, 39, 0, 0, 524, 0, 43, 0, 0, 46,
+ 318, 319, 127, 128, 0, 0, 320, 129, 482, 0,
+ 0, 0, 132, 564, 0, 292, 0, 135, 0, 293,
494, 15, 16, 495, 18, 19, 496, 21, 497, 23,
0, 24, 0, 26, 27, 0, 29, 30, 31, 0,
0, 33, 34, 0, 0, 0, 0, 0, 119, 120,
121, 122, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 50, 51, 52, 127, 329,
+ 0, 0, 0, 0, 0, 50, 51, 52, 127, 128,
0, 0, 0, 129, 0, 0, 0, 0, 132, 0,
- 85, 327, 0, 135, 0, 539, 89, 90, 91, 0,
+ 85, 287, 0, 135, 0, 1110, 89, 90, 91, 0,
0, 92, 93, 94, 95, 96, 97, 98, 99, 100,
101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
- 111, 112, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 781, 328, 0, 7, 8, 306, 307, 308,
- 309, 310, 311, 312, 313, 314, 315, 316, 542, 318,
- 319, 0, 0, 0, 0, 320, 35, 36, 37, 38,
- 39, 0, 0, 600, 0, 43, 0, 0, 46, 494,
- 15, 16, 495, 18, 19, 496, 21, 497, 23, 0,
- 24, 0, 26, 27, 0, 29, 30, 31, 0, 0,
- 33, 34, 0, 0, 0, 0, 0, 119, 120, 121,
- 122, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 50, 51, 52, 127, 329, 0,
- 0, 0, 129, 0, 0, 0, 0, 132, 0, 85,
- 327, 0, 135, 0, 723, 89, 90, 91, 0, 0,
- 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
- 112, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 1240, 328, 0, 7, 8, 306, 307, 308, 309,
- 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 0, 0, 0, 0, 320, 35, 36, 37, 38, 39,
- 694, 0, 0, 0, 43, 0, 0, 46, 494, 15,
- 16, 495, 18, 19, 496, 21, 497, 23, 0, 24,
- 0, 26, 27, 0, 29, 30, 31, 0, 0, 33,
- 34, 0, 0, 0, 0, 0, 119, 120, 121, 122,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 50, 51, 52, 127, 346, 0, 0,
- 0, 129, 0, 0, 0, 0, 132, 841, 85, 327,
- 0, 135, 0, 1008, 89, 90, 91, 0, 0, 92,
+ 111, 112, 0, 0, 0, 0, 0, 0, 85, 287,
+ 0, 0, 0, 0, 89, 90, 91, 0, 0, 92,
93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
103, 104, 105, 106, 107, 108, 109, 110, 111, 112,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 1295, 328, 0, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 0, 35, 36, 37, 38, 39, 905,
- 0, 85, 287, 43, 0, 0, 46, 89, 90, 91,
- 0, 0, 92, 93, 94, 95, 96, 97, 98, 99,
- 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
- 110, 111, 112, 0, 0, 119, 120, 121, 122, 0,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
- 316, 317, 318, 319, 0, 384, 1096, 0, 320, 0,
- 129, 0, 0, 0, 0, 386, 0, 85, 287, 237,
+ 316, 317, 318, 319, 0, 0, 0, 0, 320, 0,
+ 0, 0, 0, 0, 0, 1195, 0, 1196, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 119, 120, 121,
+ 122, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 315, 316, 317, 318, 319, 0, 0, 127, 128, 320,
+ 0, 0, 129, 0, 0, 0, 0, 132, 764, 0,
+ 701, 0, 135, 0, 702, 119, 120, 121, 122, 306,
+ 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
+ 317, 318, 319, 0, 0, 384, 385, 320, 0, 0,
+ 129, 0, 0, 0, 0, 386, 795, 85, 327, 0,
135, 0, 186, 89, 90, 91, 0, 0, 92, 93,
94, 95, 96, 97, 98, 99, 100, 101, 102, 103,
104, 105, 106, 107, 108, 109, 110, 111, 112, 0,
- 113, 114, 115, 116, 0, 0, 117, 0, 119, 120,
- 121, 122, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 315, 316, 317, 318, 319, 0, 0, 127, 128,
- 320, 0, 0, 129, 0, 0, 0, 0, 132, 0,
- 0, 292, 0, 135, 0, 293, 306, 307, 308, 309,
- 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 0, 0, 0, 0, 320, 0, 0, 0, 0, 0,
- 0, 1078, 0, 1079, 119, 120, 121, 122, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 0, 0, 127, 128, 320, 0, 0, 129,
- 0, 0, 0, 1105, 132, 1106, 85, 287, 0, 135,
- 0, 1110, 89, 90, 91, 0, 0, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 0, 0,
- 0, 0, 7, 8, 85, 287, 0, 0, 0, 0,
- 89, 90, 91, 0, 0, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 103, 104, 105, 106,
- 107, 108, 109, 110, 111, 112, 494, 15, 16, 495,
- 18, 19, 496, 21, 497, 23, 0, 24, 0, 26,
- 27, 0, 29, 30, 31, 0, 0, 33, 34, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 119, 120, 121, 122, 320, 0, 0,
- 0, 50, 51, 52, 1193, 0, 1194, 0, 0, 0,
- 0, 0, 0, 127, 128, 0, 0, 0, 129, 0,
- 0, 0, 0, 132, 0, 0, 701, 0, 135, 0,
- 702, 119, 120, 121, 122, 306, 307, 308, 309, 310,
- 311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
- 0, 384, 385, 320, 0, 0, 129, 0, 0, 0,
- 0, 386, 726, 85, 327, 0, 135, 0, 186, 89,
- 90, 91, 0, 0, 92, 93, 94, 95, 96, 97,
- 98, 99, 100, 101, 102, 103, 104, 105, 106, 107,
- 108, 109, 110, 111, 112, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 328, 306, 307, 308,
- 309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 0, 0, 0, 0, 320, 0, 0, 0, 35,
- 36, 37, 38, 39, 764, 0, 85, 287, 43, 0,
- 0, 46, 89, 90, 91, 0, 0, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 0, 0,
- 119, 120, 121, 122, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
- 127, 329, 320, 0, 0, 129, 85, 287, 237, 0,
- 132, 795, 89, 90, 91, 135, 0, 92, 93, 94,
- 95, 96, 97, 98, 99, 100, 101, 102, 103, 104,
- 105, 106, 107, 108, 109, 110, 111, 112, 0, 113,
- 114, 115, 116, 0, 0, 117, 0, 0, 0, 0,
- 0, 0, 0, 119, 120, 121, 122, 306, 307, 308,
- 309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 0, 0, 127, 128, 320, 0, 0, 129, 0,
- 0, 0, 0, 132, 840, 0, 0, 0, 135, 0,
- 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
- 316, 317, 318, 319, 0, 0, -4, 1, 320, 0,
- -4, 0, 0, 119, 120, 121, 122, 878, -4, -4,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 127, 128, 0, 0, 0, 129, 0,
- 0, -4, 0, 132, 0, 0, -4, -4, 135, -4,
- -4, 0, -4, -4, -4, -4, -4, -4, -4, -4,
- -4, -4, 0, -4, -4, -4, -4, -4, -4, -4,
- -4, 0, -4, -4, -4, -4, -4, -4, -4, -4,
- -4, 0, -4, -4, -4, -4, -4, -4, 0, 0,
- -4, -4, 6, 0, 0, 0, -4, -4, -4, -4,
- 7, 8, -4, 0, -4, 0, -4, -4, -4, -4,
- -4, -4, -4, -4, -4, -4, 0, 0, 0, 0,
- -4, -4, -4, 9, 0, 0, 0, 0, 10, 11,
- 0, 12, 13, 0, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 0, 24, 25, 26, 27, 28,
- 29, 30, 31, 0, 32, 33, 34, 35, 36, 37,
- 38, 39, 40, 0, 41, 42, 43, 44, 45, 46,
- 0, 0, 47, 48, 0, 0, 0, 0, 49, 50,
- 51, 52, 0, 0, 53, 0, 54, 0, 55, 56,
- 57, 58, 59, 60, 61, 62, 63, 64, 0, 0,
- 0, 0, 65, 66, 67, 306, 307, 308, 309, 310,
- 311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
- 0, 0, 0, 320, 0, 0, 0, 0, 0, 0,
- 0, 0, 1076, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 0, 0, 0, 0, 0, 0, 0,
- 1093, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 328, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 0, 0, 0, 0, 0, 1132, 306,
+ 0, 0, 0, 35, 36, 37, 38, 39, 840, 0,
+ 85, 287, 43, 0, 0, 46, 89, 90, 91, 0,
+ 0, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+ 111, 112, 0, 0, 119, 120, 121, 122, 306, 307,
+ 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
+ 318, 319, 0, 0, 127, 329, 320, 0, 0, 129,
+ 85, 287, 237, 0, 132, 878, 89, 90, 91, 135,
+ 0, 92, 93, 94, 95, 96, 97, 98, 99, 100,
+ 101, 102, 103, 104, 105, 106, 107, 108, 109, 110,
+ 111, 112, 0, 113, 114, 115, 116, 0, 0, 117,
+ 0, 0, 0, 0, 0, 0, 0, 119, 120, 121,
+ 122, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 315, 316, 317, 318, 319, 0, 0, 127, 128, 320,
+ 0, 0, 129, 0, 0, 0, 0, 132, 1076, 0,
+ 0, 0, 135, 0, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
+ -4, 1, 320, 0, -4, 0, 0, 119, 120, 121,
+ 122, 1093, -4, -4, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 127, 128, 0,
+ 0, 0, 129, 0, 0, -4, 0, 132, 0, 0,
+ -4, -4, 135, -4, -4, 0, -4, -4, -4, -4,
+ -4, -4, -4, -4, -4, -4, 0, -4, -4, -4,
+ -4, -4, -4, -4, -4, 0, -4, -4, -4, -4,
+ -4, -4, -4, -4, -4, 0, -4, -4, -4, -4,
+ -4, -4, 0, 0, -4, -4, 6, 0, 0, 0,
+ -4, -4, -4, -4, 7, 8, -4, 0, -4, 0,
+ -4, -4, -4, -4, -4, -4, -4, -4, -4, -4,
+ 0, 0, 0, 0, -4, -4, -4, 9, 0, 0,
+ 0, 0, 10, 11, 0, 12, 13, 0, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 0, 24,
+ 25, 26, 27, 28, 29, 30, 31, 0, 32, 33,
+ 34, 35, 36, 37, 38, 39, 40, 0, 41, 42,
+ 43, 44, 45, 46, 0, 0, 47, 48, 0, 0,
+ 0, 0, 49, 50, 51, 52, 0, 0, 53, 0,
+ 54, 0, 55, 56, 57, 58, 59, 60, 61, 62,
+ 63, 64, 0, 0, 0, 0, 65, 66, 67, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
0, 0, 0, 0, 0, 0, 1133, 306, 307, 308,
@@ -1912,18 +1796,18 @@ static const yytype_int16 yytable[] =
0, 0, 1135, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
0, 320, 0, 0, 0, 0, 0, 0, 0, 0,
- 1166, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1136, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 0, 0, 0, 0, 0, 1208, 306,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1167, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 0, 0, 0, 0, 0, 1213, 306, 307, 308,
+ 0, 0, 0, 0, 0, 0, 1210, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
319, 0, 0, 0, 0, 320, 0, 0, 0, 0,
- 0, 0, 0, 0, 1214, 306, 307, 308, 309, 310,
+ 0, 0, 0, 0, 1215, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
0, 0, 0, 320, 0, 0, 0, 0, 0, 0,
- 0, 0, 1228, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 1216, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
0, 320, 0, 0, 0, 0, 0, 0, 0, 0,
1231, 306, 307, 308, 309, 310, 311, 312, 313, 314,
@@ -1931,514 +1815,573 @@ static const yytype_int16 yytable[] =
0, 0, 0, 0, 0, 0, 0, 0, 1234, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 0, 0, 0, 0, 0, 1256, 306, 307, 308,
+ 0, 0, 0, 0, 0, 0, 1237, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
319, 0, 0, 0, 0, 320, 0, 0, 0, 0,
- 0, 0, 0, 0, 1259, 306, 307, 308, 309, 310,
+ 0, 0, 0, 0, 1260, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
0, 0, 0, 320, 0, 0, 0, 0, 0, 0,
- 0, 0, 1287, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 1263, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
0, 320, 0, 0, 0, 0, 0, 0, 0, 0,
- 1289, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1291, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 0, 0, 0, 0, 0, 1291, 306,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1293, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 0, 0, 0, 0, 0, 1304, 306, 307, 308,
+ 0, 0, 0, 0, 0, 0, 1295, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 0, 0, 0, 0, 320, 0, 482, 0, 0,
- 0, 0, 564, 306, 307, 308, 309, 310, 311, 312,
- 313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 0, 0, 0, 0, 0, 518, 306,
- 307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 0, 0, 0, 564, 306, 307, 308, 309, 310,
+ 319, 0, 0, 0, 0, 320, 0, 0, 0, 0,
+ 0, 0, 0, 0, 1308, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
0, 0, 0, 320, 0, 0, 0, 0, 0, 0,
- 565, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 518, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 0, 0, 0, 597, 306, 307, 308,
+ 0, 0, 0, 0, 0, 0, 564, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
319, 0, 0, 0, 0, 320, 0, 0, 0, 0,
- 0, 0, 647, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 565, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 0, 0, 0, 0, 0, 648, 306,
+ 0, 320, 0, 0, 0, 0, 0, 0, 597, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 0, 0, 0, 661, 306, 307, 308, 309, 310,
+ 0, 0, 0, 0, 647, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
0, 0, 0, 320, 0, 0, 0, 0, 0, 0,
- 662, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 648, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 0, 0, 0, 663, 306, 307, 308,
+ 0, 0, 0, 0, 0, 0, 661, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
319, 0, 0, 0, 0, 320, 0, 0, 0, 0,
- 0, 0, 664, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 662, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 0, 0, 0, 0, 0, 665, 306,
+ 0, 320, 0, 0, 0, 0, 0, 0, 663, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 0, 0, 0, 666, 306, 307, 308, 309, 310,
+ 0, 0, 0, 0, 664, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
0, 0, 0, 320, 0, 0, 0, 0, 0, 0,
- 752, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 665, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 0, 0, 0, 753, 306, 307, 308,
+ 0, 0, 0, 0, 0, 0, 666, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
319, 0, 0, 0, 0, 320, 0, 0, 0, 0,
- 0, 0, 754, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 752, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 0, 0, 0, 0, 0, 837, 306,
+ 0, 320, 0, 0, 0, 0, 0, 0, 753, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 0, 0, 0, 876, 306, 307, 308, 309, 310,
+ 0, 0, 0, 0, 754, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
0, 0, 0, 320, 0, 0, 0, 0, 0, 0,
- 877, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 837, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 0, 0, 0, 904, 306, 307, 308,
+ 0, 0, 0, 0, 0, 0, 876, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
319, 0, 0, 0, 0, 320, 0, 0, 0, 0,
- 0, 0, 1027, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 877, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 0, 0, 0, 0, 0, 1028, 306,
+ 0, 320, 0, 0, 0, 0, 0, 0, 904, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 0, 0, 0, 1047, 306, 307, 308, 309, 310,
+ 0, 0, 0, 0, 1027, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
0, 0, 0, 320, 0, 0, 0, 0, 0, 0,
- 1177, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 1028, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 0, 0, 0, 1178, 306, 307, 308,
+ 0, 0, 0, 0, 0, 0, 1047, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
319, 0, 0, 0, 0, 320, 0, 0, 0, 0,
- 0, 0, 1184, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 1179, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 0, 0, 0, 0, 0, 1252, 306,
+ 0, 320, 0, 0, 0, 0, 0, 0, 1180, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 0, 0, 0, 1255, 306, 307, 308, 309, 310,
+ 0, 0, 0, 0, 1186, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
- 0, 0, 0, 320, 0, 0, 0, 486, 306, 307,
- 308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 0, 0, 0, 0, 320, 0, 0, 0,
- 602, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 0, 0, 0, 320, 0, 0, 0, 0, 0, 0,
+ 1256, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 611, 306, 307, 308, 309, 310, 311,
- 312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
- 0, 0, 320, 0, 0, 0, 626, 306, 307, 308,
+ 0, 0, 0, 0, 0, 0, 1259, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 0, 0, 0, 0, 320, 0, 0, 0, 628,
+ 319, 0, 0, 0, 0, 320, 0, 0, 0, 486,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
316, 317, 318, 319, 0, 0, 0, 0, 320, 0,
- 0, 0, 630, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 602, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 0, 0, 632, 306, 307, 308, 309,
+ 0, 320, 0, 0, 0, 611, 306, 307, 308, 309,
310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 0, 0, 0, 0, 320, 0, 0, 0, 634, 306,
+ 0, 0, 0, 0, 320, 0, 0, 0, 626, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 636, 306, 307, 308, 309, 310, 311, 312, 313,
+ 0, 628, 306, 307, 308, 309, 310, 311, 312, 313,
314, 315, 316, 317, 318, 319, 0, 0, 0, 0,
- 320, 0, 0, 0, 638, 306, 307, 308, 309, 310,
+ 320, 0, 0, 0, 630, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
- 0, 0, 0, 320, 0, 0, 0, 640, 306, 307,
+ 0, 0, 0, 320, 0, 0, 0, 632, 306, 307,
308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
318, 319, 0, 0, 0, 0, 320, 0, 0, 0,
- 642, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 634, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 644, 306, 307, 308, 309, 310, 311,
+ 0, 0, 0, 636, 306, 307, 308, 309, 310, 311,
312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
- 0, 0, 320, 0, 0, 0, 646, 306, 307, 308,
+ 0, 0, 320, 0, 0, 0, 638, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 0, 0, 0, 0, 320, 0, 0, 0, 650,
+ 319, 0, 0, 0, 0, 320, 0, 0, 0, 640,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
316, 317, 318, 319, 0, 0, 0, 0, 320, 0,
- 0, 0, 652, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 642, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 0, 0, 654, 306, 307, 308, 309,
+ 0, 320, 0, 0, 0, 644, 306, 307, 308, 309,
310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 0, 0, 0, 0, 320, 0, 0, 0, 656, 306,
+ 0, 0, 0, 0, 320, 0, 0, 0, 646, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 658, 306, 307, 308, 309, 310, 311, 312, 313,
+ 0, 650, 306, 307, 308, 309, 310, 311, 312, 313,
314, 315, 316, 317, 318, 319, 0, 0, 0, 0,
- 320, 0, 0, 0, 660, 306, 307, 308, 309, 310,
+ 320, 0, 0, 0, 652, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
- 0, 0, 0, 320, 0, 0, 0, 771, 306, 307,
+ 0, 0, 0, 320, 0, 0, 0, 654, 306, 307,
308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
318, 319, 0, 0, 0, 0, 320, 0, 0, 0,
- 772, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 656, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 0, 0, 774, 306, 307, 308, 309, 310, 311,
+ 0, 0, 0, 658, 306, 307, 308, 309, 310, 311,
312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
- 0, 0, 320, 0, 0, 0, 775, 306, 307, 308,
+ 0, 0, 320, 0, 0, 0, 660, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 0, 0, 0, 0, 320, 0, 0, 0, 791,
+ 319, 0, 0, 0, 0, 320, 0, 0, 0, 771,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
316, 317, 318, 319, 0, 0, 0, 0, 320, 0,
- 0, 0, 813, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 772, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 0, 0, 911, 306, 307, 308, 309,
+ 0, 320, 0, 0, 0, 774, 306, 307, 308, 309,
310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 0, 0, 0, 0, 320, 0, 0, 0, 924, 306,
+ 0, 0, 0, 0, 320, 0, 0, 0, 775, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
317, 318, 319, 0, 0, 0, 0, 320, 0, 0,
- 0, 926, 306, 307, 308, 309, 310, 311, 312, 313,
+ 0, 791, 306, 307, 308, 309, 310, 311, 312, 313,
314, 315, 316, 317, 318, 319, 0, 0, 0, 0,
- 320, 0, 0, 0, 928, 306, 307, 308, 309, 310,
+ 320, 0, 0, 0, 813, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
- 0, 0, 0, 320, 0, 0, 0, 930, 306, 307,
+ 0, 0, 0, 320, 0, 0, 0, 910, 306, 307,
308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
318, 319, 0, 0, 0, 0, 320, 0, 0, 0,
- 1040, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 924, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 482, 306, 307, 308, 309, 310, 311, 312, 313,
- 314, 315, 316, 317, 318, 319, 0, 0, 0, 0,
- 320, 0, 519, 306, 307, 308, 309, 310, 311, 312,
+ 0, 0, 0, 926, 306, 307, 308, 309, 310, 311,
+ 312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
+ 0, 0, 320, 0, 0, 0, 928, 306, 307, 308,
+ 309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
+ 319, 0, 0, 0, 0, 320, 0, 0, 0, 930,
+ 306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
+ 316, 317, 318, 319, 0, 0, 0, 0, 320, 0,
+ 0, 0, 1040, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 528, 306, 307, 308, 309, 310, 311,
+ 0, 320, 0, 482, 306, 307, 308, 309, 310, 311,
312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
- 0, 0, 320, 0, 529, 306, 307, 308, 309, 310,
+ 0, 0, 320, 0, 519, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
- 0, 0, 0, 320, 0, 531, 306, 307, 308, 309,
+ 0, 0, 0, 320, 0, 528, 306, 307, 308, 309,
310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 0, 0, 0, 0, 320, 0, 533, 306, 307, 308,
+ 0, 0, 0, 0, 320, 0, 529, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 0, 0, 0, 0, 320, 0, 534, 306, 307,
+ 319, 0, 0, 0, 0, 320, 0, 531, 306, 307,
308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 0, 0, 0, 0, 320, 0, 537, 306,
+ 318, 319, 0, 0, 0, 0, 320, 0, 533, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 0, 0, 0, 0, 320, 0, 538,
+ 317, 318, 319, 0, 0, 0, 0, 320, 0, 534,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
316, 317, 318, 319, 0, 0, 0, 0, 320, 0,
- 593, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 537, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 594, 306, 307, 308, 309, 310, 311, 312, 313,
+ 0, 538, 306, 307, 308, 309, 310, 311, 312, 313,
314, 315, 316, 317, 318, 319, 0, 0, 0, 0,
- 320, 0, 595, 306, 307, 308, 309, 310, 311, 312,
+ 320, 0, 593, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 601, 306, 307, 308, 309, 310, 311,
+ 0, 320, 0, 594, 306, 307, 308, 309, 310, 311,
312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
- 0, 0, 320, 0, 625, 306, 307, 308, 309, 310,
+ 0, 0, 320, 0, 595, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
- 0, 0, 0, 320, 0, 627, 306, 307, 308, 309,
+ 0, 0, 0, 320, 0, 601, 306, 307, 308, 309,
310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 0, 0, 0, 0, 320, 0, 629, 306, 307, 308,
+ 0, 0, 0, 0, 320, 0, 625, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 0, 0, 0, 0, 320, 0, 631, 306, 307,
+ 319, 0, 0, 0, 0, 320, 0, 627, 306, 307,
308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 0, 0, 0, 0, 320, 0, 633, 306,
+ 318, 319, 0, 0, 0, 0, 320, 0, 629, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 0, 0, 0, 0, 320, 0, 635,
+ 317, 318, 319, 0, 0, 0, 0, 320, 0, 631,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
316, 317, 318, 319, 0, 0, 0, 0, 320, 0,
- 637, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 633, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 639, 306, 307, 308, 309, 310, 311, 312, 313,
+ 0, 635, 306, 307, 308, 309, 310, 311, 312, 313,
314, 315, 316, 317, 318, 319, 0, 0, 0, 0,
- 320, 0, 641, 306, 307, 308, 309, 310, 311, 312,
+ 320, 0, 637, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 643, 306, 307, 308, 309, 310, 311,
+ 0, 320, 0, 639, 306, 307, 308, 309, 310, 311,
312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
- 0, 0, 320, 0, 645, 306, 307, 308, 309, 310,
+ 0, 0, 320, 0, 641, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
- 0, 0, 0, 320, 0, 649, 306, 307, 308, 309,
+ 0, 0, 0, 320, 0, 643, 306, 307, 308, 309,
310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 0, 0, 0, 0, 320, 0, 651, 306, 307, 308,
+ 0, 0, 0, 0, 320, 0, 645, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 0, 0, 0, 0, 320, 0, 653, 306, 307,
+ 319, 0, 0, 0, 0, 320, 0, 649, 306, 307,
308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 0, 0, 0, 0, 320, 0, 655, 306,
+ 318, 319, 0, 0, 0, 0, 320, 0, 651, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 0, 0, 0, 0, 320, 0, 657,
+ 317, 318, 319, 0, 0, 0, 0, 320, 0, 653,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
316, 317, 318, 319, 0, 0, 0, 0, 320, 0,
- 659, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 655, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 712, 306, 307, 308, 309, 310, 311, 312, 313,
+ 0, 657, 306, 307, 308, 309, 310, 311, 312, 313,
314, 315, 316, 317, 318, 319, 0, 0, 0, 0,
- 320, 0, 717, 306, 307, 308, 309, 310, 311, 312,
+ 320, 0, 659, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 725, 306, 307, 308, 309, 310, 311,
+ 0, 320, 0, 712, 306, 307, 308, 309, 310, 311,
312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
- 0, 0, 320, 0, 727, 306, 307, 308, 309, 310,
+ 0, 0, 320, 0, 717, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
- 0, 0, 0, 320, 0, 728, 306, 307, 308, 309,
+ 0, 0, 0, 320, 0, 725, 306, 307, 308, 309,
310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 0, 0, 0, 0, 320, 0, 734, 306, 307, 308,
+ 0, 0, 0, 0, 320, 0, 727, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 0, 0, 0, 0, 320, 0, 741, 306, 307,
+ 319, 0, 0, 0, 0, 320, 0, 728, 306, 307,
308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 0, 0, 0, 0, 320, 0, 742, 306,
+ 318, 319, 0, 0, 0, 0, 320, 0, 734, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 0, 0, 0, 0, 320, 0, 743,
+ 317, 318, 319, 0, 0, 0, 0, 320, 0, 741,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
316, 317, 318, 319, 0, 0, 0, 0, 320, 0,
- 763, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 742, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 765, 306, 307, 308, 309, 310, 311, 312, 313,
+ 0, 743, 306, 307, 308, 309, 310, 311, 312, 313,
314, 315, 316, 317, 318, 319, 0, 0, 0, 0,
- 320, 0, 766, 306, 307, 308, 309, 310, 311, 312,
+ 320, 0, 763, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 770, 306, 307, 308, 309, 310, 311,
+ 0, 320, 0, 765, 306, 307, 308, 309, 310, 311,
312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
- 0, 0, 320, 0, 923, 306, 307, 308, 309, 310,
+ 0, 0, 320, 0, 766, 306, 307, 308, 309, 310,
311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
- 0, 0, 0, 320, 0, 925, 306, 307, 308, 309,
+ 0, 0, 0, 320, 0, 770, 306, 307, 308, 309,
310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
- 0, 0, 0, 0, 320, 0, 927, 306, 307, 308,
+ 0, 0, 0, 0, 320, 0, 923, 306, 307, 308,
309, 310, 311, 312, 313, 314, 315, 316, 317, 318,
- 319, 0, 0, 0, 0, 320, 0, 929, 306, 307,
+ 319, 0, 0, 0, 0, 320, 0, 925, 306, 307,
308, 309, 310, 311, 312, 313, 314, 315, 316, 317,
- 318, 319, 0, 0, 0, 0, 320, 0, 933, 306,
+ 318, 319, 0, 0, 0, 0, 320, 0, 927, 306,
307, 308, 309, 310, 311, 312, 313, 314, 315, 316,
- 317, 318, 319, 0, 0, 0, 0, 320, 0, 1077,
+ 317, 318, 319, 0, 0, 0, 0, 320, 0, 929,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
316, 317, 318, 319, 0, 0, 0, 0, 320, 0,
- 1092, 306, 307, 308, 309, 310, 311, 312, 313, 314,
+ 933, 306, 307, 308, 309, 310, 311, 312, 313, 314,
315, 316, 317, 318, 319, 0, 0, 0, 0, 320,
- 0, 1109, 306, 307, 308, 309, 310, 311, 312, 313,
+ 0, 1077, 306, 307, 308, 309, 310, 311, 312, 313,
314, 315, 316, 317, 318, 319, 0, 0, 0, 0,
- 320, 0, 1251, 306, 307, 308, 309, 310, 311, 312,
+ 320, 0, 1092, 306, 307, 308, 309, 310, 311, 312,
313, 314, 315, 316, 317, 318, 319, 0, 0, 0,
- 0, 320, 0, 1302, 306, 307, 308, 309, 310, 311,
+ 0, 320, 0, 1109, 306, 307, 308, 309, 310, 311,
312, 313, 314, 315, 316, 317, 318, 319, 0, 0,
- 0, 0, 320
+ 0, 0, 320, 0, 1255, 306, 307, 308, 309, 310,
+ 311, 312, 313, 314, 315, 316, 317, 318, 319, 0,
+ 0, 0, 0, 320, 0, 1306, 306, 307, 308, 309,
+ 310, 311, 312, 313, 314, 315, 316, 317, 318, 319,
+ 0, 0, 0, 0, 320
};
static const yytype_int16 yycheck[] =
{
- 6, 194, 230, 295, 378, 379, 3, 6, 1121, 4,
- 6, 204, 6, 4, 75, 4, 36, 37, 6, 39,
- 687, 6, 4, 4, 4, 6, 4, 6, 0, 75,
- 1143, 5, 225, 4, 227, 5, 140, 6, 5, 7,
- 76, 6, 4, 147, 140, 758, 82, 83, 75, 4,
- 5, 147, 75, 281, 282, 283, 284, 76, 140, 7,
- 76, 130, 131, 82, 83, 147, 82, 83, 151, 36,
- 37, 38, 39, 156, 7, 42, 13, 160, 147, 140,
- 140, 36, 37, 38, 39, 6, 147, 42, 169, 170,
- 7, 86, 87, 88, 89, 130, 131, 140, 4, 52,
- 88, 147, 762, 6, 147, 96, 97, 69, 70, 71,
- 72, 146, 148, 140, 6, 104, 78, 56, 199, 81,
- 147, 127, 128, 129, 147, 49, 132, 133, 52, 148,
- 54, 137, 148, 127, 130, 131, 140, 143, 141, 136,
- 146, 1254, 127, 146, 150, 151, 152, 153, 147, 155,
+ 6, 194, 295, 6, 6, 1122, 3, 378, 379, 4,
+ 4, 204, 6, 229, 230, 4, 36, 37, 4, 39,
+ 687, 6, 4, 7, 75, 5, 4, 1144, 75, 75,
+ 5, 7, 225, 4, 227, 76, 6, 6, 140, 75,
+ 4, 82, 83, 762, 151, 147, 758, 130, 131, 156,
+ 4, 5, 76, 160, 6, 6, 141, 6, 82, 83,
+ 7, 146, 130, 131, 147, 281, 282, 283, 284, 140,
+ 0, 76, 140, 4, 130, 131, 147, 82, 83, 147,
+ 130, 131, 36, 37, 38, 39, 88, 7, 42, 140,
+ 146, 86, 87, 88, 89, 13, 147, 147, 140, 4,
+ 147, 147, 169, 170, 140, 69, 70, 71, 72, 4,
+ 46, 147, 52, 49, 78, 104, 52, 81, 140, 50,
+ 6, 127, 128, 129, 148, 147, 132, 133, 59, 137,
+ 138, 137, 199, 117, 118, 119, 120, 143, 6, 136,
+ 146, 1258, 127, 148, 150, 151, 152, 153, 142, 155,
156, 157, 158, 148, 160, 161, 162, 824, 147, 137,
- 138, 142, 182, 183, 142, 147, 144, 147, 52, 140,
- 190, 149, 120, 147, 194, 888, 144, 147, 147, 185,
- 186, 140, 137, 138, 117, 118, 119, 120, 194, 144,
- 96, 97, 49, 140, 486, 52, 389, 54, 130, 131,
- 117, 118, 119, 120, 140, 211, 212, 213, 1321, 215,
- 293, 76, 218, 219, 146, 221, 148, 82, 83, 412,
- 137, 138, 7, 76, 140, 76, 232, 144, 140, 82,
+ 138, 147, 182, 183, 142, 147, 144, 147, 144, 140,
+ 190, 149, 147, 120, 194, 127, 888, 147, 147, 185,
+ 186, 130, 131, 137, 138, 4, 293, 6, 194, 6,
+ 144, 96, 97, 486, 130, 131, 389, 117, 118, 119,
+ 120, 96, 97, 140, 140, 211, 212, 213, 1325, 215,
+ 147, 147, 218, 219, 76, 221, 140, 137, 138, 412,
+ 82, 83, 7, 76, 144, 76, 232, 130, 131, 82,
83, 82, 83, 239, 240, 241, 242, 243, 244, 245,
246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
256, 257, 258, 259, 260, 261, 262, 263, 264, 265,
266, 267, 268, 269, 270, 271, 272, 273, 274, 275,
- 276, 277, 278, 279, 280, 4, 943, 141, 76, 285,
- 130, 131, 146, 148, 82, 83, 76, 293, 8, 141,
- 137, 138, 82, 83, 146, 148, 146, 148, 148, 52,
+ 276, 277, 278, 279, 280, 49, 943, 76, 52, 285,
+ 54, 130, 131, 82, 83, 5, 148, 293, 49, 141,
+ 140, 52, 295, 54, 146, 148, 403, 148, 147, 140,
306, 307, 308, 309, 310, 311, 312, 313, 314, 315,
- 316, 317, 318, 319, 320, 52, 295, 137, 138, 76,
- 403, 50, 52, 329, 144, 82, 83, 7, 130, 131,
- 59, 337, 117, 118, 119, 120, 342, 141, 130, 131,
- 346, 347, 146, 54, 146, 351, 352, 353, 354, 4,
- 148, 6, 137, 138, 360, 147, 376, 377, 148, 365,
- 366, 367, 140, 76, 384, 49, 132, 133, 134, 82,
- 83, 130, 131, 139, 147, 381, 382, 383, 384, 385,
- 386, 378, 379, 611, 390, 391, 392, 393, 147, 76,
- 396, 148, 140, 399, 400, 82, 83, 403, 404, 405,
- 147, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, 134, 141, 76, 6, 7, 139,
- 146, 427, 82, 83, 430, 76, 130, 131, 148, 130,
- 131, 82, 83, 52, 517, 148, 140, 117, 118, 119,
- 120, 669, 151, 147, 49, 4, 5, 156, 52, 49,
- 429, 160, 130, 131, 4, 4, 539, 137, 138, 76,
- 1127, 46, 4, 140, 49, 82, 83, 52, 146, 697,
- 148, 140, 140, 130, 131, 481, 140, 36, 37, 38,
- 39, 142, 488, 42, 1197, 130, 131, 1200, 148, 146,
- 1203, 140, 1152, 142, 1154, 6, 1156, 148, 140, 487,
- 142, 146, 554, 555, 556, 130, 131, 486, 140, 4,
- 142, 517, 518, 4, 520, 521, 130, 131, 524, 525,
- 526, 146, 130, 131, 816, 817, 147, 140, 130, 131,
- 140, 148, 146, 539, 140, 147, 542, 543, 146, 140,
- 4, 142, 548, 563, 146, 130, 131, 553, 554, 555,
- 556, 7, 140, 130, 131, 140, 576, 140, 564, 565,
- 140, 1274, 147, 6, 570, 553, 554, 555, 556, 146,
- 130, 131, 130, 131, 130, 131, 582, 140, 584, 142,
- 146, 1241, 148, 140, 293, 668, 146, 140, 146, 142,
- 146, 597, 1305, 599, 600, 1308, 130, 131, 1311, 6,
- 606, 1314, 130, 131, 6, 130, 131, 690, 691, 692,
- 693, 5, 146, 130, 131, 130, 131, 991, 146, 702,
- 329, 146, 140, 1336, 142, 1338, 1286, 1340, 1288, 146,
- 1290, 146, 611, 130, 131, 8, 1296, 346, 347, 140,
- 723, 647, 648, 130, 131, 132, 133, 134, 140, 146,
- 142, 140, 139, 142, 140, 661, 662, 663, 664, 665,
- 666, 140, 668, 8, 1324, 147, 1326, 673, 1328, 140,
- 140, 137, 138, 140, 680, 142, 142, 140, 144, 142,
- 700, 147, 140, 149, 690, 691, 692, 693, 694, 140,
- 140, 142, 142, 140, 403, 142, 702, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 163, 140,
- 140, 142, 139, 168, 169, 170, 140, 723, 142, 137,
- 138, 140, 4, 951, 142, 180, 144, 140, 140, 142,
- 142, 149, 752, 753, 754, 46, 140, 140, 49, 142,
- 140, 52, 142, 54, 199, 200, 5, 140, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, 134, 140, 146, 142, 148, 139, 146, 142, 148,
- 144, 147, 147, 228, 1148, 148, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- 147, 797, 798, 146, 139, 148, 141, 146, 146, 148,
- 148, 52, 146, 54, 148, 12, 13, 146, 517, 148,
- 146, 894, 148, 146, 140, 148, 525, 526, 146, 825,
- 148, 146, 146, 148, 148, 146, 146, 148, 148, 142,
- 539, 837, 140, 542, 813, 841, 6, 147, 817, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 146,
- 57, 148, 59, 60, 142, 62, 63, 64, 6, 144,
- 67, 68, 146, 146, 148, 148, 146, 887, 148, 875,
- 876, 877, 146, 146, 148, 148, 147, 883, 884, 142,
- 146, 887, 148, 99, 91, 92, 93, 6, 894, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 904, 905,
- 906, 146, 139, 148, 146, 146, 148, 148, 146, 6,
- 148, 917, 146, 146, 148, 148, 922, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, 146,
- 936, 148, 146, 139, 148, 6, 915, 957, 6, 142,
- 4, 148, 147, 6, 5, 139, 144, 935, 7, 142,
- 956, 147, 7, 148, 7, 147, 962, 963, 7, 668,
- 140, 967, 140, 140, 140, 6, 141, 1160, 7, 975,
- 7, 6, 992, 146, 994, 96, 996, 141, 147, 146,
- 986, 690, 691, 692, 693, 1005, 141, 1007, 1008, 146,
- 141, 141, 146, 702, 991, 6, 4, 143, 986, 1005,
- 7, 99, 1008, 7, 7, 1011, 7, 99, 7, 7,
- 99, 7, 7, 1019, 723, 4, 6, 144, 148, 148,
- 6, 1027, 1028, 7, 7, 7, 144, 1110, 483, 484,
- 4, 1019, 7, 140, 7, 140, 147, 6, 6, 6,
- 143, 1047, 6, 6, 127, 7, 142, 6, 54, 1242,
+ 316, 317, 318, 319, 320, 141, 36, 37, 38, 39,
+ 146, 46, 42, 329, 49, 141, 8, 52, 140, 54,
+ 146, 337, 117, 118, 119, 120, 342, 76, 140, 140,
+ 346, 347, 56, 82, 83, 351, 352, 353, 354, 148,
+ 130, 131, 137, 138, 360, 52, 376, 377, 7, 365,
+ 366, 367, 141, 76, 384, 76, 146, 146, 148, 82,
+ 83, 82, 83, 130, 131, 381, 382, 383, 384, 385,
+ 386, 378, 379, 52, 390, 391, 392, 393, 54, 146,
+ 396, 148, 52, 399, 400, 611, 140, 403, 404, 405,
+ 76, 130, 131, 6, 7, 76, 82, 83, 76, 148,
+ 517, 82, 83, 52, 82, 83, 140, 146, 142, 148,
+ 49, 427, 76, 140, 430, 142, 429, 49, 82, 83,
+ 140, 140, 539, 142, 1153, 148, 1155, 148, 1157, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, 669, 554, 555, 556, 139, 130, 131,
+ 140, 1128, 142, 130, 131, 140, 148, 142, 117, 118,
+ 119, 120, 148, 147, 146, 481, 140, 148, 142, 146,
+ 148, 697, 488, 486, 140, 487, 142, 1199, 137, 138,
+ 1202, 52, 147, 1205, 148, 52, 4, 5, 151, 4,
+ 130, 131, 140, 156, 142, 130, 131, 160, 140, 49,
+ 142, 517, 518, 4, 520, 521, 146, 4, 524, 525,
+ 526, 146, 140, 816, 817, 1244, 140, 140, 36, 37,
+ 38, 39, 140, 539, 42, 6, 542, 543, 142, 130,
+ 131, 140, 548, 563, 130, 131, 4, 553, 554, 555,
+ 556, 553, 554, 555, 556, 146, 576, 4, 564, 565,
+ 146, 668, 137, 138, 570, 147, 1278, 142, 140, 144,
+ 142, 1290, 147, 1292, 149, 1294, 582, 140, 584, 142,
+ 140, 1300, 142, 690, 691, 692, 693, 8, 130, 131,
+ 140, 597, 142, 599, 600, 702, 140, 1309, 142, 605,
+ 1312, 130, 131, 1315, 146, 140, 1318, 142, 611, 1328,
+ 140, 1330, 142, 1332, 140, 140, 723, 146, 130, 131,
+ 991, 130, 131, 130, 131, 140, 137, 138, 1340, 7,
+ 1342, 142, 1344, 144, 146, 130, 131, 146, 149, 146,
+ 293, 647, 648, 137, 138, 130, 131, 130, 131, 8,
+ 144, 146, 130, 131, 140, 661, 662, 663, 664, 665,
+ 666, 146, 668, 146, 140, 130, 131, 673, 146, 130,
+ 131, 132, 133, 134, 680, 4, 329, 140, 139, 142,
+ 700, 146, 130, 131, 690, 691, 692, 693, 694, 140,
+ 132, 133, 134, 346, 347, 140, 702, 139, 146, 6,
121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 134, 52, 7, 7, 7, 139, 7,
- 7, 7, 1078, 1301, 6, 141, 7, 7, 7, 141,
- 1163, 141, 7, 141, 4, 6, 140, 6, 1094, 146,
- 1096, 147, 7, 7, 549, 7, 147, 6, 6, 1105,
- 52, 1107, 6, 1331, 1110, 1333, 6, 562, 4, 4,
- 4, 1117, 148, 147, 147, 6, 1122, 4, 6, 140,
- 147, 141, 1350, 7, 6, 144, 59, 6, 6, 147,
- 147, 1151, 147, 1153, 6, 1155, 6, 147, 6, 5,
- 4, 6, 1162, 5, 1164, 1151, 7, 1153, 7, 1155,
- 605, 1148, 6, 147, 7, 12, 13, 1163, 7, 6,
- 1243, 1167, 1245, 6, 6, 6, 147, 147, 95, 7,
- 6, 1177, 1178, 144, 4, 6, 99, 6, 1184, 6,
- 6, 6, 143, 6, 1190, 894, 6, 1193, 6, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, 6,
- 57, 6, 59, 60, 5, 62, 63, 64, 6, 6,
- 67, 68, 1218, 6, 6, 1298, 6, 4, 6, 141,
- 6, 6, 6, 1229, 6, 1245, 1232, 6, 146, 1235,
- 6, 4, 6, 1239, 91, 92, 93, 1243, 6, 1245,
- 146, 146, 7, 6, 147, 144, 1252, 6, 5, 1255,
- 50, 6, 6, 6, 6, 710, 711, 6, 713, 6,
- 715, 716, 147, 6, 719, 720, 6, 121, 122, 123,
+ 131, 132, 133, 134, 140, 6, 142, 723, 139, 6,
+ 140, 140, 142, 142, 163, 140, 140, 148, 142, 168,
+ 169, 170, 752, 753, 754, 951, 146, 146, 148, 148,
+ 146, 180, 148, 142, 146, 144, 148, 5, 140, 146,
+ 403, 148, 146, 52, 148, 54, 146, 146, 148, 148,
+ 199, 200, 121, 122, 123, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, 134, 140, 146, 1149, 148,
+ 139, 146, 141, 148, 146, 140, 148, 894, 146, 140,
+ 148, 797, 798, 126, 127, 128, 129, 130, 131, 132,
+ 133, 134, 147, 12, 13, 146, 139, 148, 140, 146,
+ 813, 148, 140, 140, 817, 146, 146, 148, 148, 825,
+ 146, 146, 148, 148, 146, 146, 148, 148, 146, 140,
+ 148, 837, 146, 4, 148, 841, 5, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, 147, 57, 147,
+ 59, 60, 147, 62, 63, 64, 140, 140, 67, 68,
+ 146, 146, 148, 148, 517, 140, 146, 887, 148, 875,
+ 876, 877, 525, 526, 146, 142, 148, 883, 884, 6,
+ 142, 887, 91, 92, 93, 146, 539, 148, 894, 542,
+ 146, 146, 148, 148, 146, 142, 148, 147, 904, 905,
+ 906, 6, 144, 147, 99, 6, 6, 6, 142, 4,
+ 147, 917, 915, 6, 5, 139, 922, 144, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 936, 7, 142, 935, 139, 147, 147, 957, 7, 148,
+ 148, 7, 7, 140, 140, 6, 140, 140, 146, 141,
+ 956, 7, 7, 6, 96, 141, 962, 963, 6, 147,
+ 141, 967, 141, 146, 141, 141, 146, 6, 1161, 975,
+ 4, 143, 992, 99, 994, 7, 996, 7, 7, 7,
+ 986, 99, 7, 7, 986, 1005, 99, 1007, 1008, 7,
+ 7, 4, 6, 144, 991, 148, 148, 6, 144, 1005,
+ 7, 7, 1008, 1110, 7, 1011, 4, 7, 7, 140,
+ 7, 140, 147, 1019, 6, 668, 6, 1019, 6, 143,
+ 6, 1027, 1028, 6, 127, 7, 142, 6, 54, 52,
+ 7, 7, 7, 7, 7, 7, 6, 690, 691, 692,
+ 693, 1047, 7, 141, 483, 484, 7, 141, 7, 702,
+ 7, 141, 1245, 141, 4, 6, 140, 1164, 147, 146,
+ 7, 6, 147, 7, 7, 6, 6, 52, 6, 6,
+ 723, 4, 1078, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 4, 1094, 1305,
+ 1096, 139, 4, 147, 4, 147, 147, 6, 6, 1105,
+ 140, 1107, 147, 141, 1110, 7, 6, 144, 6, 6,
+ 549, 147, 1118, 59, 147, 6, 147, 1123, 6, 1335,
+ 147, 1337, 6, 562, 5, 4, 6, 147, 147, 7,
+ 7, 7, 1152, 7, 1154, 5, 1156, 147, 1354, 1246,
+ 6, 1248, 6, 1163, 6, 1165, 1152, 95, 1154, 6,
+ 1156, 7, 1149, 144, 6, 4, 6, 5, 1164, 6,
+ 99, 6, 1168, 6, 6, 143, 12, 13, 6, 8,
+ 6, 6, 6, 1179, 1180, 6, 6, 6, 6, 4,
+ 1186, 141, 6, 6, 6, 6, 1192, 6, 146, 1195,
+ 6, 6, 4, 146, 146, 1302, 6, 146, 6, 6,
+ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
+ 7, 57, 147, 59, 60, 1221, 62, 63, 64, 144,
+ 6, 67, 68, 5, 50, 6, 1232, 6, 1248, 1235,
+ 6, 6, 1238, 6, 147, 6, 1242, 6, 6, 6,
+ 1246, 894, 1248, 147, 147, 91, 92, 93, 7, 148,
+ 1256, 147, 147, 1259, 147, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, 12,
+ 13, 710, 711, 139, 713, 6, 715, 716, 6, 6,
+ 719, 720, 121, 122, 123, 124, 125, 126, 127, 128,
+ 129, 130, 131, 132, 133, 134, 1302, 97, 94, 6,
+ 139, 6, 148, 46, 47, 48, 49, 50, 51, 52,
+ 53, 54, 55, 6, 57, 6, 59, 60, 6, 62,
+ 63, 64, 6, 6, 67, 68, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, 776, 777, 778,
+ 65, 139, 147, 6, 148, 148, 148, 148, 91, 92,
+ 93, 6, 1005, 147, 147, 1008, 6, 6, 6, 4,
+ 6, 148, 6, 6, 6, 6, 6, 6, 6, 6,
+ 3, 4, 6, 147, 6, 147, 9, 10, 11, 6,
+ 6, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, 6, 147, 6, 148, 845, 147, 6, 6,
+ 147, 6, 851, 46, 147, 147, 6, 147, 147, 6,
+ 859, 860, 861, 6, 6, 6, 865, 6, 6, 6,
+ 6, 870, 871, 872, 6, 836, 69, 70, 71, 72,
+ 73, 844, 3, 1096, 883, 78, 1221, 3, 81, 939,
+ 889, 1228, 359, 892, -1, -1, -1, 1110, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, 134, 911, 912, 913, -1, 139, 110, 111, 112,
+ 113, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, 934, -1, 130, 131, 139,
+ -1, -1, 135, -1, -1, -1, -1, 140, -1, -1,
+ -1, 1164, 145, -1, 147, 148, -1, 121, 122, 123,
124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 148, 6, 6, 147, 139, 7, 147, 94, 147,
- 6, 148, 1298, 6, 97, 147, 1005, 147, 6, 1008,
- 6, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, 134, 6, 6, 6, 6, 139,
- 148, 776, 777, 778, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, 147, 6,
- 148, 6, 139, 147, 6, 65, 148, 6, 147, 4,
- 6, 147, 6, 6, 3, 4, 6, 148, 6, 6,
- 9, 10, 11, 6, 6, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 6, 1096, 6, 147,
- 845, 147, 6, 6, 6, 6, 851, 46, 6, 147,
- 6, 1110, 6, 147, 859, 860, 861, 6, 147, 147,
- 865, 147, 147, 6, 6, 870, 871, 872, 6, 6,
- 69, 70, 71, 72, 73, 6, 6, 6, 883, 78,
- 6, 6, 81, 6, 889, 6, 1218, 892, 836, 844,
- 3, 3, 1225, 359, -1, 6, 939, -1, -1, -1,
- -1, -1, -1, -1, 1163, -1, -1, 912, 913, -1,
- -1, 110, 111, 112, 113, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, 934,
- -1, 130, 131, 139, -1, -1, 135, -1, -1, -1,
- -1, 140, -1, -1, -1, -1, 145, -1, 147, 148,
- -1, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, 134, -1, -1, -1, -1, 139,
- -1, -1, -1, 978, 979, 980, 981, -1, -1, -1,
- -1, -1, -1, -1, 1243, -1, 1245, -1, -1, -1,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 134, -1, -1, -1, 6, 139, 1014,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 134, 1029, -1, -1, -1, 139, 3,
- 4, -1, -1, -1, -1, 9, 10, 11, -1, 1298,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 46, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 1091, -1, -1, -1,
- -1, -1, -1, -1, -1, 69, 70, 71, 72, 73,
- -1, -1, -1, -1, 78, -1, -1, 81, -1, 1114,
- 1115, -1, -1, -1, 6, -1, -1, -1, -1, -1,
+ 134, -1, -1, -1, -1, 139, -1, 3, 4, 978,
+ 979, 980, 981, 9, 10, 11, -1, -1, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, -1,
+ -1, -1, -1, -1, -1, 1014, -1, -1, -1, -1,
+ 46, -1, -1, -1, -1, -1, -1, 12, 13, -1,
+ 1029, -1, -1, 1246, -1, 1248, -1, -1, -1, -1,
+ -1, -1, -1, 69, 70, 71, 72, 73, -1, 6,
+ -1, -1, 78, -1, -1, 81, -1, -1, -1, -1,
+ -1, 46, 47, 48, 49, 50, 51, 52, 53, 54,
+ 55, 6, 57, -1, 59, 60, -1, 62, 63, 64,
+ -1, -1, 67, 68, 110, 111, 112, 113, -1, 1302,
+ -1, -1, 1091, 6, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 130, 131, 91, 92, 93, 135,
+ -1, -1, -1, -1, 140, 1114, 1115, 1116, -1, 145,
+ -1, -1, 148, 3, 4, 5, -1, 7, -1, 9,
+ 10, 11, -1, -1, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 33, 34, -1, 36, 37, 38, 39,
+ -1, 1160, 42, 148, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, -1, -1,
+ -1, -1, 139, -1, -1, -1, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 6, -1, -1, -1, 139, -1, -1, 1206, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, 134, -1, -1, 104, -1, 139, -1, -1, -1,
+ 110, 111, 112, 113, -1, -1, -1, 117, 118, 119,
+ 120, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 130, 131, -1, -1, -1, 135, -1, 137, 138, -1,
+ 140, -1, 142, -1, 144, 145, -1, 147, 3, 4,
+ 5, -1, -1, -1, 9, 10, 11, -1, -1, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 46, -1, 12, 13, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, -1,
+ -1, -1, -1, 139, 69, 70, 71, 72, 73, 6,
+ -1, -1, -1, 78, -1, -1, 81, 46, 47, 48,
+ 49, 50, 51, 52, 53, 54, 55, -1, 57, -1,
+ 59, 60, -1, 62, 63, 64, -1, -1, 67, 68,
+ -1, -1, -1, -1, -1, 110, 111, 112, 113, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 91, 92, 93, 130, 131, -1, -1, -1,
+ 135, -1, -1, -1, -1, 140, -1, 3, 4, 5,
+ 145, -1, 147, 9, 10, 11, -1, -1, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 148,
+ 46, -1, 12, 13, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, -1, -1,
+ -1, -1, 139, 69, 70, 71, 72, 73, 6, -1,
+ -1, -1, 78, -1, -1, 81, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, -1, 57, -1, 59,
+ 60, -1, 62, 63, 64, -1, -1, 67, 68, -1,
+ -1, -1, -1, -1, 110, 111, 112, 113, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 91, 92, 93, 130, 131, -1, -1, -1, 135,
+ -1, -1, -1, -1, 140, -1, 3, 4, -1, 145,
+ -1, 147, 9, 10, 11, -1, -1, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 148, 46,
+ -1, 12, 13, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, -1, -1, -1,
+ -1, 139, 69, 70, 71, 72, 73, 6, -1, -1,
+ -1, 78, -1, -1, 81, 46, 47, 48, 49, 50,
+ 51, 52, 53, 54, 55, -1, 57, -1, 59, 60,
+ -1, 62, 63, 64, -1, -1, 67, 68, -1, 6,
+ -1, -1, -1, 110, 111, 112, 113, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 91, 92, 93, 130, 131, -1, -1, -1, 135, -1,
+ -1, -1, -1, 140, 8, 3, 4, -1, 145, -1,
+ 147, 9, 10, 11, -1, -1, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 148, 46, -1,
-1, -1, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, 110, 111, 112, 113,
- 139, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 1159, -1, 130, 131, -1, -1,
- -1, 135, -1, -1, -1, -1, 140, -1, -1, -1,
- -1, 145, -1, -1, 148, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, 3,
- 4, 5, -1, 7, -1, 9, 10, 11, -1, 1204,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, -1, 36, 37, 38, 39, -1, -1, 42, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 8, 3, 4, 5, 139, -1, -1,
+ 129, 130, 131, 132, 133, 134, -1, -1, -1, -1,
+ 139, 69, 70, 71, 72, 73, 8, -1, -1, -1,
+ 78, -1, -1, 81, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, -1, -1,
+ -1, -1, 139, -1, -1, -1, -1, -1, -1, -1,
+ 8, -1, 110, 111, 112, 113, -1, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 134, -1, 130, 131, -1, 139, -1, 135, -1, -1,
+ -1, -1, 140, 8, 3, 4, -1, 145, -1, 147,
9, 10, 11, -1, -1, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
29, 30, 31, 32, 33, 34, -1, -1, -1, -1,
- -1, 65, -1, -1, -1, -1, -1, 46, -1, -1,
- 104, -1, -1, -1, -1, -1, 110, 111, 112, 113,
- -1, -1, -1, 117, 118, 119, 120, -1, -1, -1,
- 69, 70, 71, 72, 73, 6, 130, 131, -1, 78,
- -1, 135, 81, 137, 138, -1, 140, -1, 142, -1,
- 144, 145, -1, 147, -1, -1, -1, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, 110, 111, 112, 113, 139, 121, 122, 123, 124,
+ -1, -1, -1, -1, -1, -1, -1, 46, -1, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, -1, -1, -1, -1, 139, -1, -1,
+ 69, 70, 71, 72, 73, 8, -1, -1, -1, 78,
+ -1, -1, 81, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, -1, -1, -1,
+ -1, 139, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 110, 111, 112, 113, -1, 121, 122, 123, 124,
125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
-1, 130, 131, -1, 139, -1, 135, -1, -1, -1,
- -1, 140, -1, 3, 4, 5, 145, -1, 147, 9,
+ -1, 140, -1, 3, 4, -1, 145, -1, 147, 9,
10, 11, -1, -1, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 46, -1, 12, 13,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 134, -1, -1, -1, -1, 139, 69,
- 70, 71, 72, 73, 6, -1, -1, -1, 78, -1,
- -1, 81, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, -1, 57, -1, 59, 60, -1, 62, 63,
- 64, -1, -1, 67, 68, -1, -1, -1, -1, -1,
- 110, 111, 112, 113, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 91, 92, 93,
- 130, 131, -1, -1, -1, 135, -1, -1, -1, -1,
- 140, -1, 3, 4, -1, 145, -1, 147, 9, 10,
+ 30, 31, 32, 33, 34, 65, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, 46, -1, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 133, 134, -1, -1, -1, -1, 139, -1, -1, 69,
+ 70, 71, 72, 73, -1, -1, -1, -1, 78, -1,
+ -1, 81, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, -1, -1, -1, -1, 139,
+ 110, 111, 112, 113, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, -1, -1,
+ 130, 131, 139, -1, -1, 135, -1, -1, -1, 146,
+ 140, 148, 3, 4, -1, 145, -1, 147, 9, 10,
11, -1, -1, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
31, 32, 33, 34, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 148, 46, -1, 12, 13, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, -1, -1, -1, -1, 139, 69, 70,
- 71, 72, 73, 6, -1, -1, -1, 78, -1, -1,
- 81, 46, 47, 48, 49, 50, 51, 52, 53, 54,
- 55, -1, 57, -1, 59, 60, -1, 62, 63, 64,
- -1, -1, 67, 68, -1, -1, -1, -1, -1, 110,
- 111, 112, 113, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 91, 92, 93, 130,
- 131, -1, -1, -1, 135, -1, -1, -1, -1, 140,
- -1, 3, 4, -1, 145, -1, 147, 9, 10, 11,
+ -1, -1, -1, -1, -1, 46, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ -1, -1, -1, -1, 139, -1, -1, -1, 69, 70,
+ 71, 72, 73, 148, -1, 3, 4, 78, -1, -1,
+ 81, 9, 10, 11, -1, -1, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 33, 34, -1, -1, 110,
+ 111, 112, 113, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 133, 134, -1, -1, 130,
+ 131, 139, -1, -1, 135, -1, -1, -1, 146, 140,
+ 148, 3, 4, 5, 145, -1, 147, 9, 10, 11,
-1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 148, 46, -1, 12, 13, 121, 122,
+ 32, 33, 34, -1, 36, 37, 38, 39, -1, -1,
+ 42, -1, 110, 111, 112, 113, 12, 13, 121, 122,
123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, 134, -1, -1, -1, -1, 139, 69, 70, 71,
- 72, 73, -1, -1, 8, -1, 78, -1, -1, 81,
+ 133, 134, 130, 131, -1, -1, 139, 135, 141, -1,
+ -1, -1, 140, 146, -1, 143, -1, 145, -1, 147,
46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
-1, 57, -1, 59, 60, -1, 62, 63, 64, -1,
-1, 67, 68, -1, -1, -1, -1, -1, 110, 111,
@@ -2448,128 +2391,64 @@ static const yytype_int16 yycheck[] =
3, 4, -1, 145, -1, 147, 9, 10, 11, -1,
-1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 33, 34, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, 148, 46, -1, 12, 13, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, -1, -1, -1, -1, 139, 69, 70, 71, 72,
- 73, -1, -1, 8, -1, 78, -1, -1, 81, 46,
- 47, 48, 49, 50, 51, 52, 53, 54, 55, -1,
- 57, -1, 59, 60, -1, 62, 63, 64, -1, -1,
- 67, 68, -1, -1, -1, -1, -1, 110, 111, 112,
- 113, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, 91, 92, 93, 130, 131, -1,
- -1, -1, 135, -1, -1, -1, -1, 140, -1, 3,
- 4, -1, 145, -1, 147, 9, 10, 11, -1, -1,
- 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
- 24, 25, 26, 27, 28, 29, 30, 31, 32, 33,
- 34, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, 148, 46, -1, 12, 13, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- -1, -1, -1, -1, 139, 69, 70, 71, 72, 73,
- 8, -1, -1, -1, 78, -1, -1, 81, 46, 47,
- 48, 49, 50, 51, 52, 53, 54, 55, -1, 57,
- -1, 59, 60, -1, 62, 63, 64, -1, -1, 67,
- 68, -1, -1, -1, -1, -1, 110, 111, 112, 113,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 91, 92, 93, 130, 131, -1, -1,
- -1, 135, -1, -1, -1, -1, 140, 8, 3, 4,
- -1, 145, -1, 147, 9, 10, 11, -1, -1, 14,
+ 33, 34, -1, -1, -1, -1, -1, -1, 3, 4,
+ -1, -1, -1, -1, 9, 10, 11, -1, -1, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, 33, 34,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 148, 46, -1, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, -1, -1, -1,
- -1, 139, -1, -1, 69, 70, 71, 72, 73, 8,
- -1, 3, 4, 78, -1, -1, 81, 9, 10, 11,
- -1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, 33, 34, -1, -1, 110, 111, 112, 113, -1,
121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 134, -1, 130, 131, -1, 139, -1,
- 135, -1, -1, -1, -1, 140, -1, 3, 4, 5,
+ 131, 132, 133, 134, -1, -1, -1, -1, 139, -1,
+ -1, -1, -1, -1, -1, 146, -1, 148, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 110, 111, 112,
+ 113, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, -1, -1, 130, 131, 139,
+ -1, -1, 135, -1, -1, -1, -1, 140, 148, -1,
+ 143, -1, 145, -1, 147, 110, 111, 112, 113, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 133, 134, -1, -1, 130, 131, 139, -1, -1,
+ 135, -1, -1, -1, -1, 140, 148, 3, 4, -1,
145, -1, 147, 9, 10, 11, -1, -1, 14, 15,
16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
26, 27, 28, 29, 30, 31, 32, 33, 34, -1,
- 36, 37, 38, 39, -1, -1, 42, -1, 110, 111,
- 112, 113, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, -1, -1, 130, 131,
- 139, -1, -1, 135, -1, -1, -1, -1, 140, -1,
- -1, 143, -1, 145, -1, 147, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
- -1, -1, -1, -1, 139, -1, -1, -1, -1, -1,
- -1, 146, -1, 148, 110, 111, 112, 113, 121, 122,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ 46, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, -1, -1, -1, -1, 139,
+ -1, -1, -1, 69, 70, 71, 72, 73, 148, -1,
+ 3, 4, 78, -1, -1, 81, 9, 10, 11, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, -1, -1, 110, 111, 112, 113, 121, 122,
123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
133, 134, -1, -1, 130, 131, 139, -1, -1, 135,
- -1, -1, -1, 146, 140, 148, 3, 4, -1, 145,
- -1, 147, 9, 10, 11, -1, -1, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, -1, -1,
- -1, -1, 12, 13, 3, 4, -1, -1, -1, -1,
- 9, 10, 11, -1, -1, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 46, 47, 48, 49,
- 50, 51, 52, 53, 54, 55, -1, 57, -1, 59,
- 60, -1, 62, 63, 64, -1, -1, 67, 68, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, 110, 111, 112, 113, 139, -1, -1,
- -1, 91, 92, 93, 146, -1, 148, -1, -1, -1,
- -1, -1, -1, 130, 131, -1, -1, -1, 135, -1,
- -1, -1, -1, 140, -1, -1, 143, -1, 145, -1,
- 147, 110, 111, 112, 113, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, -1,
- -1, 130, 131, 139, -1, -1, 135, -1, -1, -1,
- -1, 140, 148, 3, 4, -1, 145, -1, 147, 9,
- 10, 11, -1, -1, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, 33, 34, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 46, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, -1, -1, -1, -1, 139, -1, -1, -1, 69,
- 70, 71, 72, 73, 148, -1, 3, 4, 78, -1,
- -1, 81, 9, 10, 11, -1, -1, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, -1, -1,
- 110, 111, 112, 113, 121, 122, 123, 124, 125, 126,
+ 3, 4, 5, -1, 140, 148, 9, 10, 11, 145,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ 33, 34, -1, 36, 37, 38, 39, -1, -1, 42,
+ -1, -1, -1, -1, -1, -1, -1, 110, 111, 112,
+ 113, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 133, 134, -1, -1, 130, 131, 139,
+ -1, -1, 135, -1, -1, -1, -1, 140, 148, -1,
+ -1, -1, 145, -1, 121, 122, 123, 124, 125, 126,
127, 128, 129, 130, 131, 132, 133, 134, -1, -1,
- 130, 131, 139, -1, -1, 135, 3, 4, 5, -1,
- 140, 148, 9, 10, 11, 145, -1, 14, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 33, 34, -1, 36,
- 37, 38, 39, -1, -1, 42, -1, -1, -1, -1,
- -1, -1, -1, 110, 111, 112, 113, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, -1, -1, 130, 131, 139, -1, -1, 135, -1,
- -1, -1, -1, 140, 148, -1, -1, -1, 145, -1,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
- 131, 132, 133, 134, -1, -1, 0, 1, 139, -1,
- 4, -1, -1, 110, 111, 112, 113, 148, 12, 13,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 130, 131, -1, -1, -1, 135, -1,
- -1, 35, -1, 140, -1, -1, 40, 41, 145, 43,
- 44, -1, 46, 47, 48, 49, 50, 51, 52, 53,
- 54, 55, -1, 57, 58, 59, 60, 61, 62, 63,
- 64, -1, 66, 67, 68, 69, 70, 71, 72, 73,
- 74, -1, 76, 77, 78, 79, 80, 81, -1, -1,
- 84, 85, 4, -1, -1, -1, 90, 91, 92, 93,
- 12, 13, 96, -1, 98, -1, 100, 101, 102, 103,
- 104, 105, 106, 107, 108, 109, -1, -1, -1, -1,
- 114, 115, 116, 35, -1, -1, -1, -1, 40, 41,
- -1, 43, 44, -1, 46, 47, 48, 49, 50, 51,
- 52, 53, 54, 55, -1, 57, 58, 59, 60, 61,
- 62, 63, 64, -1, 66, 67, 68, 69, 70, 71,
- 72, 73, 74, -1, 76, 77, 78, 79, 80, 81,
- -1, -1, 84, 85, -1, -1, -1, -1, 90, 91,
- 92, 93, -1, -1, 96, -1, 98, -1, 100, 101,
- 102, 103, 104, 105, 106, 107, 108, 109, -1, -1,
- -1, -1, 114, 115, 116, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 130, 131, 132, 133, 134, -1,
- -1, -1, -1, 139, -1, -1, -1, -1, -1, -1,
- -1, -1, 148, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, -1, -1, -1,
- -1, 139, -1, -1, -1, -1, -1, -1, -1, -1,
- 148, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 130, 131, 132, 133, 134, -1, -1, -1, -1, 139,
- -1, -1, -1, -1, -1, -1, -1, -1, 148, 121,
+ 0, 1, 139, -1, 4, -1, -1, 110, 111, 112,
+ 113, 148, 12, 13, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, 130, 131, -1,
+ -1, -1, 135, -1, -1, 35, -1, 140, -1, -1,
+ 40, 41, 145, 43, 44, -1, 46, 47, 48, 49,
+ 50, 51, 52, 53, 54, 55, -1, 57, 58, 59,
+ 60, 61, 62, 63, 64, -1, 66, 67, 68, 69,
+ 70, 71, 72, 73, 74, -1, 76, 77, 78, 79,
+ 80, 81, -1, -1, 84, 85, 4, -1, -1, -1,
+ 90, 91, 92, 93, 12, 13, 96, -1, 98, -1,
+ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,
+ -1, -1, -1, -1, 114, 115, 116, 35, -1, -1,
+ -1, -1, 40, 41, -1, 43, 44, -1, 46, 47,
+ 48, 49, 50, 51, 52, 53, 54, 55, -1, 57,
+ 58, 59, 60, 61, 62, 63, 64, -1, 66, 67,
+ 68, 69, 70, 71, 72, 73, 74, -1, 76, 77,
+ 78, 79, 80, 81, -1, -1, 84, 85, -1, -1,
+ -1, -1, 90, 91, 92, 93, -1, -1, 96, -1,
+ 98, -1, 100, 101, 102, 103, 104, 105, 106, 107,
+ 108, 109, -1, -1, -1, -1, 114, 115, 116, 121,
122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
132, 133, 134, -1, -1, -1, -1, 139, -1, -1,
-1, -1, -1, -1, -1, -1, 148, 121, 122, 123,
@@ -2616,13 +2495,8 @@ static const yytype_int16 yycheck[] =
132, 133, 134, -1, -1, -1, -1, 139, -1, -1,
-1, -1, -1, -1, -1, -1, 148, 121, 122, 123,
124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
- 134, -1, -1, -1, -1, 139, -1, 141, -1, -1,
- -1, -1, 146, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 130, 131, 132, 133, 134, -1, -1, -1,
- -1, 139, -1, -1, -1, -1, -1, -1, 146, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
- 132, 133, 134, -1, -1, -1, -1, 139, -1, -1,
- -1, -1, -1, -1, 146, 121, 122, 123, 124, 125,
+ 134, -1, -1, -1, -1, 139, -1, -1, -1, -1,
+ -1, -1, -1, -1, 148, 121, 122, 123, 124, 125,
126, 127, 128, 129, 130, 131, 132, 133, 134, -1,
-1, -1, -1, 139, -1, -1, -1, -1, -1, -1,
146, 121, 122, 123, 124, 125, 126, 127, 128, 129,
@@ -2689,14 +2563,10 @@ static const yytype_int16 yycheck[] =
132, 133, 134, -1, -1, -1, -1, 139, -1, -1,
-1, -1, -1, -1, 146, 121, 122, 123, 124, 125,
126, 127, 128, 129, 130, 131, 132, 133, 134, -1,
- -1, -1, -1, 139, -1, -1, -1, 143, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
- 133, 134, -1, -1, -1, -1, 139, -1, -1, -1,
- 143, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ -1, -1, -1, 139, -1, -1, -1, -1, -1, -1,
+ 146, 121, 122, 123, 124, 125, 126, 127, 128, 129,
130, 131, 132, 133, 134, -1, -1, -1, -1, 139,
- -1, -1, -1, 143, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 130, 131, 132, 133, 134, -1, -1,
- -1, -1, 139, -1, -1, -1, 143, 121, 122, 123,
+ -1, -1, -1, -1, -1, -1, 146, 121, 122, 123,
124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
134, -1, -1, -1, -1, 139, -1, -1, -1, 143,
121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
@@ -2763,9 +2633,14 @@ static const yytype_int16 yycheck[] =
133, 134, -1, -1, -1, -1, 139, -1, -1, -1,
143, 121, 122, 123, 124, 125, 126, 127, 128, 129,
130, 131, 132, 133, 134, -1, -1, -1, -1, 139,
- -1, 141, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 130, 131, 132, 133, 134, -1, -1, -1, -1,
- 139, -1, 141, 121, 122, 123, 124, 125, 126, 127,
+ -1, -1, -1, 143, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 133, 134, -1, -1,
+ -1, -1, 139, -1, -1, -1, 143, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 133,
+ 134, -1, -1, -1, -1, 139, -1, -1, -1, 143,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 133, 134, -1, -1, -1, -1, 139, -1,
+ -1, -1, 143, 121, 122, 123, 124, 125, 126, 127,
128, 129, 130, 131, 132, 133, 134, -1, -1, -1,
-1, 139, -1, 141, 121, 122, 123, 124, 125, 126,
127, 128, 129, 130, 131, 132, 133, 134, -1, -1,
@@ -2874,7 +2749,11 @@ static const yytype_int16 yycheck[] =
128, 129, 130, 131, 132, 133, 134, -1, -1, -1,
-1, 139, -1, 141, 121, 122, 123, 124, 125, 126,
127, 128, 129, 130, 131, 132, 133, 134, -1, -1,
- -1, -1, 139
+ -1, -1, 139, -1, 141, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 133, 134, -1,
+ -1, -1, -1, 139, -1, 141, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ -1, -1, -1, -1, 139
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2903,7 +2782,7 @@ static const yytype_uint8 yystos[] =
147, 46, 49, 52, 147, 219, 4, 50, 59, 52,
52, 49, 4, 104, 147, 4, 6, 49, 4, 4,
4, 140, 140, 140, 4, 147, 226, 4, 140, 140,
- 6, 142, 4, 4, 5, 147, 5, 147, 147, 140,
+ 6, 142, 4, 4, 5, 147, 5, 147, 140, 140,
140, 4, 142, 144, 149, 173, 147, 5, 230, 140,
142, 140, 142, 140, 142, 140, 142, 140, 142, 140,
142, 140, 142, 140, 142, 140, 142, 140, 142, 140,
@@ -2923,7 +2802,7 @@ static const yytype_uint8 yystos[] =
140, 147, 140, 140, 223, 222, 140, 4, 6, 142,
142, 185, 6, 147, 142, 142, 6, 217, 217, 217,
144, 217, 147, 99, 217, 217, 217, 6, 6, 185,
- 6, 185, 222, 4, 229, 230, 229, 142, 217, 4,
+ 6, 185, 4, 229, 230, 229, 229, 142, 217, 4,
147, 157, 6, 217, 217, 217, 217, 217, 217, 217,
217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
217, 217, 217, 217, 217, 217, 217, 217, 217, 217,
@@ -2941,7 +2820,7 @@ static const yytype_uint8 yystos[] =
146, 217, 217, 217, 217, 196, 146, 185, 217, 217,
217, 217, 7, 212, 7, 217, 6, 217, 217, 148,
225, 217, 217, 141, 141, 141, 96, 146, 185, 147,
- 8, 141, 143, 148, 148, 146, 142, 144, 141, 141,
+ 8, 141, 143, 148, 148, 142, 144, 141, 141, 141,
217, 143, 173, 217, 4, 86, 87, 88, 89, 148,
160, 164, 167, 169, 170, 141, 143, 141, 143, 141,
143, 141, 143, 141, 143, 141, 143, 141, 143, 141,
@@ -2959,7 +2838,7 @@ static const yytype_uint8 yystos[] =
148, 217, 146, 146, 146, 76, 82, 83, 206, 207,
219, 148, 193, 141, 148, 141, 141, 217, 6, 217,
141, 143, 143, 148, 143, 143, 7, 7, 7, 144,
- 217, 148, 217, 217, 7, 144, 222, 217, 4, 7,
+ 217, 148, 217, 217, 7, 144, 217, 4, 7, 7,
7, 143, 144, 173, 229, 148, 161, 140, 140, 147,
171, 6, 217, 217, 217, 217, 217, 217, 217, 217,
225, 229, 217, 143, 6, 6, 143, 4, 96, 97,
@@ -2972,7 +2851,7 @@ static const yytype_uint8 yystos[] =
219, 219, 6, 147, 140, 148, 207, 146, 206, 7,
6, 7, 7, 6, 147, 6, 6, 52, 6, 6,
222, 222, 222, 4, 146, 8, 8, 141, 4, 4,
- 148, 143, 147, 147, 6, 4, 6, 140, 217, 217,
+ 143, 147, 147, 147, 6, 4, 6, 140, 217, 217,
221, 222, 147, 141, 143, 141, 143, 141, 143, 141,
143, 141, 141, 141, 172, 7, 172, 173, 144, 7,
6, 226, 217, 146, 148, 148, 148, 148, 148, 6,
@@ -2983,7 +2862,7 @@ static const yytype_uint8 yystos[] =
217, 147, 146, 148, 146, 148, 146, 148, 217, 222,
217, 217, 219, 148, 5, 147, 222, 147, 147, 222,
225, 147, 6, 6, 95, 217, 217, 217, 6, 7,
- 6, 144, 222, 222, 173, 158, 217, 146, 146, 146,
+ 144, 222, 222, 222, 173, 158, 217, 146, 146, 146,
148, 159, 217, 222, 230, 217, 6, 4, 227, 6,
143, 226, 6, 6, 6, 6, 229, 146, 143, 217,
219, 6, 6, 6, 217, 217, 6, 217, 5, 6,
@@ -2992,31 +2871,32 @@ static const yytype_uint8 yystos[] =
184, 219, 6, 197, 219, 6, 198, 219, 6, 199,
148, 146, 141, 148, 146, 6, 131, 219, 6, 219,
219, 6, 148, 217, 222, 146, 148, 8, 148, 141,
- 147, 217, 230, 4, 146, 146, 141, 146, 217, 217,
- 222, 147, 146, 148, 6, 6, 6, 7, 6, 144,
- 6, 217, 148, 148, 148, 148, 5, 50, 6, 6,
- 6, 6, 6, 147, 6, 6, 6, 6, 147, 217,
- 148, 146, 147, 146, 147, 146, 147, 6, 222, 7,
- 147, 217, 146, 146, 146, 6, 148, 94, 217, 217,
- 225, 6, 6, 222, 222, 162, 217, 146, 146, 221,
- 217, 6, 226, 97, 146, 6, 6, 6, 6, 6,
- 147, 221, 184, 146, 148, 217, 219, 206, 217, 219,
- 206, 217, 219, 206, 146, 148, 222, 185, 148, 219,
- 225, 219, 217, 148, 148, 148, 148, 148, 147, 217,
- 217, 148, 6, 217, 217, 148, 148, 217, 148, 146,
- 148, 148, 146, 148, 148, 146, 148, 222, 6, 65,
- 148, 194, 147, 146, 148, 146, 6, 6, 6, 6,
- 159, 141, 146, 6, 147, 146, 148, 4, 208, 148,
- 6, 200, 217, 6, 6, 201, 217, 6, 6, 202,
- 217, 6, 148, 217, 206, 185, 225, 6, 219, 225,
- 148, 165, 217, 221, 217, 6, 147, 148, 147, 148,
- 147, 148, 6, 6, 148, 148, 195, 148, 146, 148,
- 6, 147, 141, 148, 148, 206, 6, 203, 206, 6,
- 204, 206, 6, 205, 206, 6, 225, 6, 163, 229,
- 168, 147, 6, 148, 147, 148, 147, 148, 147, 148,
- 148, 146, 148, 147, 221, 6, 206, 6, 206, 6,
- 206, 6, 229, 6, 166, 229, 148, 148, 148, 148,
- 146, 148, 6, 6, 6, 6, 229, 6
+ 147, 217, 230, 4, 146, 146, 146, 141, 146, 217,
+ 217, 222, 147, 146, 148, 6, 6, 6, 7, 6,
+ 144, 6, 217, 148, 148, 148, 148, 5, 50, 6,
+ 6, 6, 6, 6, 147, 6, 6, 6, 6, 147,
+ 217, 148, 146, 147, 146, 147, 146, 147, 6, 222,
+ 7, 147, 217, 146, 146, 146, 6, 148, 94, 217,
+ 217, 225, 6, 6, 222, 222, 222, 162, 217, 146,
+ 146, 221, 217, 6, 226, 97, 146, 6, 6, 6,
+ 6, 6, 147, 221, 184, 146, 148, 217, 219, 206,
+ 217, 219, 206, 217, 219, 206, 146, 148, 222, 185,
+ 148, 219, 225, 219, 217, 148, 148, 148, 148, 148,
+ 148, 147, 217, 217, 148, 6, 217, 217, 148, 148,
+ 217, 148, 146, 148, 148, 146, 148, 148, 146, 148,
+ 222, 6, 65, 148, 194, 147, 146, 148, 146, 6,
+ 6, 6, 6, 6, 159, 141, 146, 6, 147, 146,
+ 148, 4, 208, 148, 6, 200, 217, 6, 6, 201,
+ 217, 6, 6, 202, 217, 6, 148, 217, 206, 185,
+ 225, 6, 219, 225, 148, 165, 217, 221, 217, 6,
+ 147, 148, 147, 148, 147, 148, 6, 6, 148, 148,
+ 195, 148, 146, 148, 6, 147, 141, 148, 148, 206,
+ 6, 203, 206, 6, 204, 206, 6, 205, 206, 6,
+ 225, 6, 163, 229, 168, 147, 6, 148, 147, 148,
+ 147, 148, 147, 148, 148, 146, 148, 147, 221, 6,
+ 206, 6, 206, 6, 206, 6, 229, 6, 166, 229,
+ 148, 148, 148, 148, 146, 148, 6, 6, 6, 6,
+ 229, 6
};
#define yyerrok (yyerrstatus = 0)
@@ -3090,7 +2970,7 @@ while (YYID (0))
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
+# if YYLTYPE_IS_TRIVIAL
# define YY_LOCATION_PRINT(File, Loc) \
fprintf (File, "%d.%d-%d.%d", \
(Loc).first_line, (Loc).first_column, \
@@ -3201,17 +3081,20 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
#if (defined __STDC__ || defined __C99__FUNC__ \
|| defined __cplusplus || defined _MSC_VER)
static void
-yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
#else
static void
-yy_stack_print (bottom, top)
- yytype_int16 *bottom;
- yytype_int16 *top;
+yy_stack_print (yybottom, yytop)
+ yytype_int16 *yybottom;
+ yytype_int16 *yytop;
#endif
{
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");
}
@@ -3245,11 +3128,11 @@ yy_reduce_print (yyvsp, yyrule)
/* The symbols being reduced. */
for (yyi = 0; yyi < yynrhs; yyi++)
{
- fprintf (stderr, " $%d = ", yyi + 1);
+ YYFPRINTF (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
&(yyvsp[(yyi + 1) - (yynrhs)])
);
- fprintf (stderr, "\n");
+ YYFPRINTF (stderr, "\n");
}
}
@@ -3529,10 +3412,8 @@ yydestruct (yymsg, yytype, yyvaluep)
break;
}
}
-
/* Prevent warnings from -Wmissing-prototypes. */
-
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int yyparse (void *YYPARSE_PARAM);
@@ -3548,11 +3429,10 @@ int yyparse ();
#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. */
@@ -3560,9 +3440,9 @@ int yynerrs;
-/*----------.
-| yyparse. |
-`----------*/
+/*-------------------------.
+| yyparse or yypush_parse. |
+`-------------------------*/
#ifdef YYPARSE_PARAM
#if (defined __STDC__ || defined __C99__FUNC__ \
@@ -3586,66 +3466,68 @@ yyparse ()
#endif
#endif
{
-
- int yystate;
- int yyn;
- int yyresult;
- /* Number of tokens to shift before error messages enabled. */
- int yyerrstatus;
- /* Look-ahead token as an internal (translated) token number. */
- int yytoken = 0;
-#if YYERROR_VERBOSE
- /* Buffer for error messages, and its allocated size. */
- char yymsgbuf[128];
- char *yymsg = yymsgbuf;
- 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;
+ int yystate;
+ /* Number of tokens to shift before error messages enabled. */
+ int yyerrstatus;
- /* The semantic value stack. */
- YYSTYPE yyvsa[YYINITDEPTH];
- YYSTYPE *yyvs = yyvsa;
- YYSTYPE *yyvsp;
+ /* The stacks and their tools:
+ `yyss': related to states.
+ `yyvs': related to semantic values.
+ Refer to the stacks thru separate pointers, to allow yyoverflow
+ to reallocate them elsewhere. */
+ /* The state stack. */
+ yytype_int16 yyssa[YYINITDEPTH];
+ yytype_int16 *yyss;
+ yytype_int16 *yyssp;
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+ /* The semantic value stack. */
+ YYSTYPE yyvsa[YYINITDEPTH];
+ YYSTYPE *yyvs;
+ YYSTYPE *yyvsp;
- YYSIZE_T yystacksize = YYINITDEPTH;
+ YYSIZE_T yystacksize;
+ int yyn;
+ int yyresult;
+ /* Lookahead token as an internal (translated) token number. */
+ int yytoken;
/* 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];
+ char *yymsg = yymsgbuf;
+ YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
/* The number of symbols on the RHS of the reduced rule.
Keep to zero when no symbol should be popped. */
int yylen = 0;
+ yytoken = 0;
+ yyss = yyssa;
+ yyvs = yyvsa;
+ yystacksize = YYINITDEPTH;
+
YYDPRINTF ((stderr, "Starting parse\n"));
yystate = 0;
yyerrstatus = 0;
yynerrs = 0;
- yychar = YYEMPTY; /* Cause a token to be read. */
+ 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;
@@ -3675,7 +3557,6 @@ yyparse ()
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
@@ -3683,7 +3564,6 @@ yyparse ()
yyoverflow (YY_("memory exhausted"),
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
-
&yystacksize);
yyss = yyss1;
@@ -3706,9 +3586,8 @@ yyparse ()
(union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
- YYSTACK_RELOCATE (yyss);
- YYSTACK_RELOCATE (yyvs);
-
+ YYSTACK_RELOCATE (yyss_alloc, yyss);
+ YYSTACK_RELOCATE (yyvs_alloc, yyvs);
# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
@@ -3719,7 +3598,6 @@ yyparse ()
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
-
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
(unsigned long int) yystacksize));
@@ -3729,6 +3607,9 @@ yyparse ()
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+ if (yystate == YYFINAL)
+ YYACCEPT;
+
goto yybackup;
/*-----------.
@@ -3737,16 +3618,16 @@ 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)
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: "));
@@ -3778,20 +3659,16 @@ yybackup:
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;
*++yyvsp = yylval;
@@ -3831,91 +3708,127 @@ yyreduce:
switch (yyn)
{
case 3:
+
+/* Line 1455 of yacc.c */
#line 157 "Gmsh.y"
{ yyerrok; return 1; ;}
break;
case 6:
+
+/* Line 1455 of yacc.c */
#line 168 "Gmsh.y"
{ return 1; ;}
break;
case 7:
+
+/* Line 1455 of yacc.c */
#line 169 "Gmsh.y"
{ return 1; ;}
break;
case 8:
+
+/* Line 1455 of yacc.c */
#line 170 "Gmsh.y"
{ return 1; ;}
break;
case 9:
+
+/* Line 1455 of yacc.c */
#line 171 "Gmsh.y"
{ return 1; ;}
break;
case 10:
+
+/* Line 1455 of yacc.c */
#line 172 "Gmsh.y"
{ List_Delete((yyvsp[(1) - (1)].l)); return 1; ;}
break;
case 11:
+
+/* Line 1455 of yacc.c */
#line 173 "Gmsh.y"
{ return 1; ;}
break;
case 12:
+
+/* Line 1455 of yacc.c */
#line 174 "Gmsh.y"
{ return 1; ;}
break;
case 13:
+
+/* Line 1455 of yacc.c */
#line 175 "Gmsh.y"
{ return 1; ;}
break;
case 14:
+
+/* Line 1455 of yacc.c */
#line 176 "Gmsh.y"
{ List_Delete((yyvsp[(1) - (1)].l)); return 1; ;}
break;
case 15:
+
+/* Line 1455 of yacc.c */
#line 177 "Gmsh.y"
{ return 1; ;}
break;
case 16:
+
+/* Line 1455 of yacc.c */
#line 178 "Gmsh.y"
{ return 1; ;}
break;
case 17:
+
+/* Line 1455 of yacc.c */
#line 179 "Gmsh.y"
{ return 1; ;}
break;
case 18:
+
+/* Line 1455 of yacc.c */
#line 180 "Gmsh.y"
{ return 1; ;}
break;
case 19:
+
+/* Line 1455 of yacc.c */
#line 181 "Gmsh.y"
{ return 1; ;}
break;
case 20:
+
+/* Line 1455 of yacc.c */
#line 182 "Gmsh.y"
{ return 1; ;}
break;
case 21:
+
+/* Line 1455 of yacc.c */
#line 183 "Gmsh.y"
{ return 1; ;}
break;
case 22:
+
+/* Line 1455 of yacc.c */
#line 188 "Gmsh.y"
{
(yyval.c) = (char*)"w";
@@ -3923,6 +3836,8 @@ yyreduce:
break;
case 23:
+
+/* Line 1455 of yacc.c */
#line 192 "Gmsh.y"
{
(yyval.c) = (char*)"a";
@@ -3930,6 +3845,8 @@ yyreduce:
break;
case 24:
+
+/* Line 1455 of yacc.c */
#line 199 "Gmsh.y"
{
Msg::Direct((yyvsp[(3) - (5)].c));
@@ -3938,6 +3855,8 @@ yyreduce:
break;
case 25:
+
+/* Line 1455 of yacc.c */
#line 204 "Gmsh.y"
{
std::string tmp = FixRelativePath(gmsh_yyname, (yyvsp[(6) - (7)].c));
@@ -3955,6 +3874,8 @@ yyreduce:
break;
case 26:
+
+/* Line 1455 of yacc.c */
#line 218 "Gmsh.y"
{
char tmpstring[1024];
@@ -3971,6 +3892,8 @@ yyreduce:
break;
case 27:
+
+/* Line 1455 of yacc.c */
#line 231 "Gmsh.y"
{
char tmpstring[1024];
@@ -3997,6 +3920,8 @@ yyreduce:
break;
case 28:
+
+/* Line 1455 of yacc.c */
#line 259 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4014,6 +3939,8 @@ yyreduce:
break;
case 29:
+
+/* Line 1455 of yacc.c */
#line 273 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4028,6 +3955,8 @@ yyreduce:
break;
case 30:
+
+/* Line 1455 of yacc.c */
#line 284 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4042,6 +3971,8 @@ yyreduce:
break;
case 31:
+
+/* Line 1455 of yacc.c */
#line 298 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4051,26 +3982,36 @@ yyreduce:
break;
case 37:
+
+/* Line 1455 of yacc.c */
#line 312 "Gmsh.y"
{ ViewCoord.push_back((yyvsp[(1) - (1)].d)); ;}
break;
case 38:
+
+/* Line 1455 of yacc.c */
#line 314 "Gmsh.y"
{ ViewCoord.push_back((yyvsp[(3) - (3)].d)); ;}
break;
case 39:
+
+/* Line 1455 of yacc.c */
#line 319 "Gmsh.y"
{ if(ViewValueList) ViewValueList->push_back((yyvsp[(1) - (1)].d)); ;}
break;
case 40:
+
+/* Line 1455 of yacc.c */
#line 321 "Gmsh.y"
{ if(ViewValueList) ViewValueList->push_back((yyvsp[(3) - (3)].d)); ;}
break;
case 41:
+
+/* Line 1455 of yacc.c */
#line 326 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4178,6 +4119,8 @@ yyreduce:
break;
case 42:
+
+/* Line 1455 of yacc.c */
#line 430 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4191,6 +4134,8 @@ yyreduce:
break;
case 43:
+
+/* Line 1455 of yacc.c */
#line 440 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4200,6 +4145,8 @@ yyreduce:
break;
case 44:
+
+/* Line 1455 of yacc.c */
#line 449 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4210,6 +4157,8 @@ yyreduce:
break;
case 45:
+
+/* Line 1455 of yacc.c */
#line 456 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4220,6 +4169,8 @@ yyreduce:
break;
case 46:
+
+/* Line 1455 of yacc.c */
#line 466 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4232,6 +4183,8 @@ yyreduce:
break;
case 47:
+
+/* Line 1455 of yacc.c */
#line 475 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4241,6 +4194,8 @@ yyreduce:
break;
case 48:
+
+/* Line 1455 of yacc.c */
#line 484 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4251,6 +4206,8 @@ yyreduce:
break;
case 49:
+
+/* Line 1455 of yacc.c */
#line 491 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4261,6 +4218,8 @@ yyreduce:
break;
case 50:
+
+/* Line 1455 of yacc.c */
#line 501 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4272,6 +4231,8 @@ yyreduce:
break;
case 51:
+
+/* Line 1455 of yacc.c */
#line 509 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4281,6 +4242,8 @@ yyreduce:
break;
case 52:
+
+/* Line 1455 of yacc.c */
#line 519 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4300,6 +4263,8 @@ yyreduce:
break;
case 53:
+
+/* Line 1455 of yacc.c */
#line 538 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4319,6 +4284,8 @@ yyreduce:
break;
case 54:
+
+/* Line 1455 of yacc.c */
#line 557 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4328,47 +4295,65 @@ yyreduce:
break;
case 55:
+
+/* Line 1455 of yacc.c */
#line 563 "Gmsh.y"
{
;}
break;
case 56:
+
+/* Line 1455 of yacc.c */
#line 570 "Gmsh.y"
{ (yyval.i) = 0; ;}
break;
case 57:
+
+/* Line 1455 of yacc.c */
#line 571 "Gmsh.y"
{ (yyval.i) = 1; ;}
break;
case 58:
+
+/* Line 1455 of yacc.c */
#line 572 "Gmsh.y"
{ (yyval.i) = 2; ;}
break;
case 59:
+
+/* Line 1455 of yacc.c */
#line 573 "Gmsh.y"
{ (yyval.i) = 3; ;}
break;
case 60:
+
+/* Line 1455 of yacc.c */
#line 574 "Gmsh.y"
{ (yyval.i) = 4; ;}
break;
case 61:
+
+/* Line 1455 of yacc.c */
#line 578 "Gmsh.y"
{ (yyval.i) = 1; ;}
break;
case 62:
+
+/* Line 1455 of yacc.c */
#line 579 "Gmsh.y"
{ (yyval.i) = -1; ;}
break;
case 63:
+
+/* Line 1455 of yacc.c */
#line 587 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c))){
@@ -4394,6 +4379,8 @@ yyreduce:
break;
case 64:
+
+/* Line 1455 of yacc.c */
#line 609 "Gmsh.y"
{
int index = (int)(yyvsp[(3) - (7)].d);
@@ -4424,6 +4411,8 @@ yyreduce:
break;
case 65:
+
+/* Line 1455 of yacc.c */
#line 636 "Gmsh.y"
{
if(List_Nbr((yyvsp[(4) - (9)].l)) != List_Nbr((yyvsp[(8) - (9)].l))){
@@ -4467,6 +4456,8 @@ yyreduce:
break;
case 66:
+
+/* Line 1455 of yacc.c */
#line 676 "Gmsh.y"
{
if(gmsh_yysymbols.count((yyvsp[(1) - (6)].c)))
@@ -4480,6 +4471,8 @@ yyreduce:
break;
case 67:
+
+/* Line 1455 of yacc.c */
#line 686 "Gmsh.y"
{
// appends to the list
@@ -4491,6 +4484,8 @@ yyreduce:
break;
case 68:
+
+/* Line 1455 of yacc.c */
#line 694 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (3)].c)))
@@ -4502,6 +4497,8 @@ yyreduce:
break;
case 69:
+
+/* Line 1455 of yacc.c */
#line 702 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (6)].c)))
@@ -4517,6 +4514,8 @@ yyreduce:
break;
case 70:
+
+/* Line 1455 of yacc.c */
#line 714 "Gmsh.y"
{
gmsh_yystringsymbols[(yyvsp[(1) - (4)].c)] = std::string((yyvsp[(3) - (4)].c));
@@ -4526,6 +4525,8 @@ yyreduce:
break;
case 71:
+
+/* Line 1455 of yacc.c */
#line 723 "Gmsh.y"
{
std::string tmp((yyvsp[(5) - (6)].c));
@@ -4535,6 +4536,8 @@ yyreduce:
break;
case 72:
+
+/* Line 1455 of yacc.c */
#line 729 "Gmsh.y"
{
std::string tmp((yyvsp[(8) - (9)].c));
@@ -4544,6 +4547,8 @@ yyreduce:
break;
case 73:
+
+/* Line 1455 of yacc.c */
#line 738 "Gmsh.y"
{
double d = 0.;
@@ -4565,6 +4570,8 @@ yyreduce:
break;
case 74:
+
+/* Line 1455 of yacc.c */
#line 756 "Gmsh.y"
{
double d = 0.;
@@ -4586,6 +4593,8 @@ yyreduce:
break;
case 75:
+
+/* Line 1455 of yacc.c */
#line 774 "Gmsh.y"
{
double d = 0.;
@@ -4598,6 +4607,8 @@ yyreduce:
break;
case 76:
+
+/* Line 1455 of yacc.c */
#line 783 "Gmsh.y"
{
double d = 0.;
@@ -4610,6 +4621,8 @@ yyreduce:
break;
case 77:
+
+/* Line 1455 of yacc.c */
#line 795 "Gmsh.y"
{
ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (8)].c), 0, (yyvsp[(5) - (8)].c), (yyvsp[(7) - (8)].u));
@@ -4618,6 +4631,8 @@ yyreduce:
break;
case 78:
+
+/* Line 1455 of yacc.c */
#line 800 "Gmsh.y"
{
ColorOption(GMSH_SET|GMSH_GUI, (yyvsp[(1) - (11)].c), (int)(yyvsp[(3) - (11)].d), (yyvsp[(8) - (11)].c), (yyvsp[(10) - (11)].u));
@@ -4626,6 +4641,8 @@ yyreduce:
break;
case 79:
+
+/* Line 1455 of yacc.c */
#line 808 "Gmsh.y"
{
GmshColorTable *ct = GetColorTable(0);
@@ -4649,6 +4666,8 @@ yyreduce:
break;
case 80:
+
+/* Line 1455 of yacc.c */
#line 828 "Gmsh.y"
{
GmshColorTable *ct = GetColorTable((int)(yyvsp[(3) - (9)].d));
@@ -4672,6 +4691,8 @@ yyreduce:
break;
case 81:
+
+/* Line 1455 of yacc.c */
#line 851 "Gmsh.y"
{
#if defined(HAVE_MESH)
@@ -4684,6 +4705,8 @@ yyreduce:
break;
case 82:
+
+/* Line 1455 of yacc.c */
#line 860 "Gmsh.y"
{
#if defined(HAVE_MESH)
@@ -4695,6 +4718,8 @@ yyreduce:
break;
case 83:
+
+/* Line 1455 of yacc.c */
#line 868 "Gmsh.y"
{
#if defined(HAVE_MESH)
@@ -4720,6 +4745,8 @@ yyreduce:
break;
case 84:
+
+/* Line 1455 of yacc.c */
#line 890 "Gmsh.y"
{
#if defined(HAVE_MESH)
@@ -4746,6 +4773,8 @@ yyreduce:
break;
case 85:
+
+/* Line 1455 of yacc.c */
#line 913 "Gmsh.y"
{
#if defined(HAVE_MESH)
@@ -4774,6 +4803,8 @@ yyreduce:
break;
case 86:
+
+/* Line 1455 of yacc.c */
#line 941 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4789,6 +4820,8 @@ yyreduce:
break;
case 87:
+
+/* Line 1455 of yacc.c */
#line 953 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -4804,6 +4837,8 @@ yyreduce:
break;
case 88:
+
+/* Line 1455 of yacc.c */
#line 970 "Gmsh.y"
{
(yyval.i) = (int)(yyvsp[(1) - (1)].d);
@@ -4811,6 +4846,8 @@ yyreduce:
break;
case 89:
+
+/* Line 1455 of yacc.c */
#line 974 "Gmsh.y"
{
(yyval.i) = GModel::current()->setPhysicalName
@@ -4821,6 +4858,8 @@ yyreduce:
break;
case 90:
+
+/* Line 1455 of yacc.c */
#line 984 "Gmsh.y"
{
(yyval.l) = 0;
@@ -4828,6 +4867,8 @@ yyreduce:
break;
case 91:
+
+/* Line 1455 of yacc.c */
#line 988 "Gmsh.y"
{
(yyval.l) = List_Create(1, 1, sizeof(Vertex*));
@@ -4841,6 +4882,8 @@ yyreduce:
break;
case 92:
+
+/* Line 1455 of yacc.c */
#line 1000 "Gmsh.y"
{
for(int i = 0; i < 4; i++) (yyval.v)[i] = 0.;
@@ -4848,6 +4891,8 @@ yyreduce:
break;
case 93:
+
+/* Line 1455 of yacc.c */
#line 1004 "Gmsh.y"
{
for(int i = 0; i < 4; i++) (yyval.v)[i] = (yyvsp[(2) - (2)].v)[i];
@@ -4855,6 +4900,8 @@ yyreduce:
break;
case 94:
+
+/* Line 1455 of yacc.c */
#line 1014 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
@@ -4881,6 +4928,8 @@ yyreduce:
break;
case 95:
+
+/* Line 1455 of yacc.c */
#line 1037 "Gmsh.y"
{
curPhysDim = 0;
@@ -4888,6 +4937,8 @@ yyreduce:
break;
case 96:
+
+/* Line 1455 of yacc.c */
#line 1041 "Gmsh.y"
{
int num = (int)(yyvsp[(5) - (9)].i);
@@ -4907,6 +4958,8 @@ yyreduce:
break;
case 97:
+
+/* Line 1455 of yacc.c */
#line 1057 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
@@ -4929,6 +4982,8 @@ yyreduce:
break;
case 98:
+
+/* Line 1455 of yacc.c */
#line 1079 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
@@ -4950,6 +5005,8 @@ yyreduce:
break;
case 99:
+
+/* Line 1455 of yacc.c */
#line 1097 "Gmsh.y"
{
for (int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
@@ -4974,6 +5031,8 @@ yyreduce:
break;
case 100:
+
+/* Line 1455 of yacc.c */
#line 1119 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
@@ -4995,6 +5054,8 @@ yyreduce:
break;
case 101:
+
+/* Line 1455 of yacc.c */
#line 1137 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (8)].d);
@@ -5028,6 +5089,8 @@ yyreduce:
break;
case 102:
+
+/* Line 1455 of yacc.c */
#line 1167 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (8)].d);
@@ -5061,6 +5124,8 @@ yyreduce:
break;
case 103:
+
+/* Line 1455 of yacc.c */
#line 1197 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
@@ -5082,6 +5147,8 @@ yyreduce:
break;
case 104:
+
+/* Line 1455 of yacc.c */
#line 1215 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
@@ -5103,6 +5170,8 @@ yyreduce:
break;
case 105:
+
+/* Line 1455 of yacc.c */
#line 1233 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (11)].d);
@@ -5132,6 +5201,8 @@ yyreduce:
break;
case 106:
+
+/* Line 1455 of yacc.c */
#line 1259 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
@@ -5152,6 +5223,8 @@ yyreduce:
break;
case 107:
+
+/* Line 1455 of yacc.c */
#line 1276 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
@@ -5171,6 +5244,8 @@ yyreduce:
break;
case 108:
+
+/* Line 1455 of yacc.c */
#line 1292 "Gmsh.y"
{
curPhysDim = 1;
@@ -5178,6 +5253,8 @@ yyreduce:
break;
case 109:
+
+/* Line 1455 of yacc.c */
#line 1296 "Gmsh.y"
{
int num = (int)(yyvsp[(5) - (9)].i);
@@ -5197,6 +5274,8 @@ yyreduce:
break;
case 110:
+
+/* Line 1455 of yacc.c */
#line 1315 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
@@ -5218,6 +5297,8 @@ yyreduce:
break;
case 111:
+
+/* Line 1455 of yacc.c */
#line 1333 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (9)].d), type = 0;
@@ -5260,6 +5341,8 @@ yyreduce:
break;
case 112:
+
+/* Line 1455 of yacc.c */
#line 1372 "Gmsh.y"
{
myGmshSurface = 0;
@@ -5269,6 +5352,8 @@ yyreduce:
break;
case 113:
+
+/* Line 1455 of yacc.c */
#line 1378 "Gmsh.y"
{
myGmshSurface = gmshSurface::getSurface((int)(yyvsp[(3) - (4)].d));
@@ -5278,6 +5363,8 @@ yyreduce:
break;
case 114:
+
+/* Line 1455 of yacc.c */
#line 1384 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (10)].d);
@@ -5288,6 +5375,8 @@ yyreduce:
break;
case 115:
+
+/* Line 1455 of yacc.c */
#line 1391 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
@@ -5316,6 +5405,8 @@ yyreduce:
break;
case 116:
+
+/* Line 1455 of yacc.c */
#line 1416 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
@@ -5344,6 +5435,8 @@ yyreduce:
break;
case 117:
+
+/* Line 1455 of yacc.c */
#line 1441 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
@@ -5363,6 +5456,8 @@ yyreduce:
break;
case 118:
+
+/* Line 1455 of yacc.c */
#line 1457 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (9)].d);
@@ -5384,6 +5479,8 @@ yyreduce:
break;
case 119:
+
+/* Line 1455 of yacc.c */
#line 1476 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (13)].d);
@@ -5418,6 +5515,8 @@ yyreduce:
break;
case 120:
+
+/* Line 1455 of yacc.c */
#line 1507 "Gmsh.y"
{
curPhysDim = 2;
@@ -5425,6 +5524,8 @@ yyreduce:
break;
case 121:
+
+/* Line 1455 of yacc.c */
#line 1511 "Gmsh.y"
{
int num = (int)(yyvsp[(5) - (9)].i);
@@ -5444,6 +5545,8 @@ yyreduce:
break;
case 122:
+
+/* Line 1455 of yacc.c */
#line 1531 "Gmsh.y"
{
yymsg(0, "'Complex Volume' command is deprecated: use 'Volume' instead");
@@ -5465,6 +5568,8 @@ yyreduce:
break;
case 123:
+
+/* Line 1455 of yacc.c */
#line 1549 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
@@ -5485,6 +5590,8 @@ yyreduce:
break;
case 124:
+
+/* Line 1455 of yacc.c */
#line 1567 "Gmsh.y"
{
#if defined(HAVE_OCC)
@@ -5501,6 +5608,8 @@ yyreduce:
break;
case 125:
+
+/* Line 1455 of yacc.c */
#line 1580 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].d);
@@ -5520,6 +5629,8 @@ yyreduce:
break;
case 126:
+
+/* Line 1455 of yacc.c */
#line 1596 "Gmsh.y"
{
curPhysDim = 3;
@@ -5527,6 +5638,8 @@ yyreduce:
break;
case 127:
+
+/* Line 1455 of yacc.c */
#line 1600 "Gmsh.y"
{
int num = (int)(yyvsp[(5) - (9)].i);
@@ -5546,6 +5659,8 @@ yyreduce:
break;
case 128:
+
+/* Line 1455 of yacc.c */
#line 1622 "Gmsh.y"
{
TranslateShapes((yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], (yyvsp[(4) - (5)].l));
@@ -5554,6 +5669,8 @@ yyreduce:
break;
case 129:
+
+/* Line 1455 of yacc.c */
#line 1627 "Gmsh.y"
{
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));
@@ -5562,6 +5679,8 @@ yyreduce:
break;
case 130:
+
+/* Line 1455 of yacc.c */
#line 1632 "Gmsh.y"
{
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));
@@ -5570,6 +5689,8 @@ yyreduce:
break;
case 131:
+
+/* Line 1455 of yacc.c */
#line 1637 "Gmsh.y"
{
DilatShapes((yyvsp[(3) - (9)].v)[0], (yyvsp[(3) - (9)].v)[1], (yyvsp[(3) - (9)].v)[2], (yyvsp[(5) - (9)].d), (yyvsp[(8) - (9)].l));
@@ -5578,6 +5699,8 @@ yyreduce:
break;
case 132:
+
+/* Line 1455 of yacc.c */
#line 1642 "Gmsh.y"
{
(yyval.l) = List_Create(3, 3, sizeof(Shape));
@@ -5601,6 +5724,8 @@ yyreduce:
break;
case 133:
+
+/* Line 1455 of yacc.c */
#line 1662 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -5610,6 +5735,8 @@ yyreduce:
break;
case 134:
+
+/* Line 1455 of yacc.c */
#line 1668 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape*));
@@ -5621,16 +5748,22 @@ yyreduce:
break;
case 135:
+
+/* Line 1455 of yacc.c */
#line 1678 "Gmsh.y"
{ (yyval.l) = (yyvsp[(1) - (1)].l); ;}
break;
case 136:
+
+/* Line 1455 of yacc.c */
#line 1679 "Gmsh.y"
{ (yyval.l) = (yyvsp[(1) - (1)].l); ;}
break;
case 137:
+
+/* Line 1455 of yacc.c */
#line 1684 "Gmsh.y"
{
(yyval.l) = List_Create(3, 3, sizeof(Shape));
@@ -5638,6 +5771,8 @@ yyreduce:
break;
case 138:
+
+/* Line 1455 of yacc.c */
#line 1688 "Gmsh.y"
{
List_Add((yyval.l), &(yyvsp[(2) - (2)].s));
@@ -5645,6 +5780,8 @@ yyreduce:
break;
case 139:
+
+/* Line 1455 of yacc.c */
#line 1692 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
@@ -5671,6 +5808,8 @@ yyreduce:
break;
case 140:
+
+/* Line 1455 of yacc.c */
#line 1715 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
@@ -5697,6 +5836,8 @@ yyreduce:
break;
case 141:
+
+/* Line 1455 of yacc.c */
#line 1738 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
@@ -5723,6 +5864,8 @@ yyreduce:
break;
case 142:
+
+/* Line 1455 of yacc.c */
#line 1761 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
@@ -5749,6 +5892,8 @@ yyreduce:
break;
case 143:
+
+/* Line 1455 of yacc.c */
#line 1789 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
@@ -5773,6 +5918,8 @@ yyreduce:
break;
case 144:
+
+/* Line 1455 of yacc.c */
#line 1811 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
@@ -5796,6 +5943,8 @@ yyreduce:
break;
case 145:
+
+/* Line 1455 of yacc.c */
#line 1832 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
@@ -5820,6 +5969,8 @@ yyreduce:
break;
case 146:
+
+/* Line 1455 of yacc.c */
#line 1853 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
@@ -5843,6 +5994,8 @@ yyreduce:
break;
case 147:
+
+/* Line 1455 of yacc.c */
#line 1873 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
@@ -5958,6 +6111,8 @@ yyreduce:
break;
case 148:
+
+/* Line 1455 of yacc.c */
#line 1985 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
@@ -5980,6 +6135,8 @@ yyreduce:
break;
case 149:
+
+/* Line 1455 of yacc.c */
#line 2004 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
@@ -6003,6 +6160,8 @@ yyreduce:
break;
case 150:
+
+/* Line 1455 of yacc.c */
#line 2025 "Gmsh.y"
{
#if defined(HAVE_DINTEGRATION)
@@ -6109,6 +6268,8 @@ yyreduce:
break;
case 151:
+
+/* Line 1455 of yacc.c */
#line 2133 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
@@ -6121,6 +6282,8 @@ yyreduce:
break;
case 152:
+
+/* Line 1455 of yacc.c */
#line 2142 "Gmsh.y"
{
#if defined(HAVE_MESH)
@@ -6130,6 +6293,8 @@ yyreduce:
break;
case 153:
+
+/* Line 1455 of yacc.c */
#line 2148 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -6148,6 +6313,8 @@ yyreduce:
break;
case 154:
+
+/* Line 1455 of yacc.c */
#line 2163 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (3)].c), "Meshes") || !strcmp((yyvsp[(2) - (3)].c), "All")){
@@ -6179,6 +6346,8 @@ yyreduce:
break;
case 155:
+
+/* Line 1455 of yacc.c */
#line 2191 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -6194,6 +6363,8 @@ yyreduce:
break;
case 156:
+
+/* Line 1455 of yacc.c */
#line 2208 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
@@ -6206,6 +6377,8 @@ yyreduce:
break;
case 157:
+
+/* Line 1455 of yacc.c */
#line 2222 "Gmsh.y"
{
for(int i = 0; i < 4; i++)
@@ -6215,6 +6388,8 @@ yyreduce:
break;
case 158:
+
+/* Line 1455 of yacc.c */
#line 2228 "Gmsh.y"
{
for(int i = 0; i < 4; i++)
@@ -6224,6 +6399,8 @@ yyreduce:
break;
case 159:
+
+/* Line 1455 of yacc.c */
#line 2234 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
@@ -6236,6 +6413,8 @@ yyreduce:
break;
case 160:
+
+/* Line 1455 of yacc.c */
#line 2243 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
@@ -6248,6 +6427,8 @@ yyreduce:
break;
case 161:
+
+/* Line 1455 of yacc.c */
#line 2257 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (3)].c), "Include")){
@@ -6291,6 +6472,8 @@ yyreduce:
break;
case 162:
+
+/* Line 1455 of yacc.c */
#line 2297 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -6311,6 +6494,8 @@ yyreduce:
break;
case 163:
+
+/* Line 1455 of yacc.c */
#line 2314 "Gmsh.y"
{
#if defined(HAVE_POST) && defined(HAVE_MESH)
@@ -6329,6 +6514,8 @@ yyreduce:
break;
case 164:
+
+/* Line 1455 of yacc.c */
#line 2329 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (3)].c), "Sleep")){
@@ -6351,6 +6538,8 @@ yyreduce:
break;
case 165:
+
+/* Line 1455 of yacc.c */
#line 2348 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -6366,6 +6555,8 @@ yyreduce:
break;
case 166:
+
+/* Line 1455 of yacc.c */
#line 2360 "Gmsh.y"
{
#if defined(HAVE_POST)
@@ -6393,6 +6584,8 @@ yyreduce:
break;
case 167:
+
+/* Line 1455 of yacc.c */
#line 2384 "Gmsh.y"
{
exit(0);
@@ -6400,6 +6593,8 @@ yyreduce:
break;
case 168:
+
+/* Line 1455 of yacc.c */
#line 2388 "Gmsh.y"
{
// FIXME: this is a hack to force a transfer from the old DB to
@@ -6410,6 +6605,8 @@ yyreduce:
break;
case 169:
+
+/* Line 1455 of yacc.c */
#line 2395 "Gmsh.y"
{
CTX::instance()->forcedBBox = 0;
@@ -6419,6 +6616,8 @@ yyreduce:
break;
case 170:
+
+/* Line 1455 of yacc.c */
#line 2401 "Gmsh.y"
{
CTX::instance()->forcedBBox = 1;
@@ -6427,6 +6626,8 @@ yyreduce:
break;
case 171:
+
+/* Line 1455 of yacc.c */
#line 2406 "Gmsh.y"
{
#if defined(HAVE_OPENGL)
@@ -6436,6 +6637,8 @@ yyreduce:
break;
case 172:
+
+/* Line 1455 of yacc.c */
#line 2412 "Gmsh.y"
{
GModel::current()->createTopologyFromMesh();
@@ -6443,6 +6646,8 @@ yyreduce:
break;
case 173:
+
+/* Line 1455 of yacc.c */
#line 2422 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (6)].d);
@@ -6463,6 +6668,8 @@ yyreduce:
break;
case 174:
+
+/* Line 1455 of yacc.c */
#line 2439 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (8)].d);
@@ -6483,6 +6690,8 @@ yyreduce:
break;
case 175:
+
+/* Line 1455 of yacc.c */
#line 2456 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (8)].d);
@@ -6505,6 +6714,8 @@ yyreduce:
break;
case 176:
+
+/* Line 1455 of yacc.c */
#line 2475 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (10)].d);
@@ -6527,6 +6738,8 @@ yyreduce:
break;
case 177:
+
+/* Line 1455 of yacc.c */
#line 2494 "Gmsh.y"
{
if(ImbricatedLoop <= 0){
@@ -6560,6 +6773,8 @@ yyreduce:
break;
case 178:
+
+/* Line 1455 of yacc.c */
#line 2524 "Gmsh.y"
{
if(!FunctionManager::Instance()->createFunction
@@ -6571,6 +6786,8 @@ yyreduce:
break;
case 179:
+
+/* Line 1455 of yacc.c */
#line 2532 "Gmsh.y"
{
if(!FunctionManager::Instance()->leaveFunction
@@ -6580,6 +6797,8 @@ yyreduce:
break;
case 180:
+
+/* Line 1455 of yacc.c */
#line 2538 "Gmsh.y"
{
if(!FunctionManager::Instance()->enterFunction
@@ -6590,6 +6809,8 @@ yyreduce:
break;
case 181:
+
+/* Line 1455 of yacc.c */
#line 2545 "Gmsh.y"
{
if(!(yyvsp[(3) - (4)].d)) skip_until("If", "EndIf");
@@ -6597,12 +6818,16 @@ yyreduce:
break;
case 182:
+
+/* Line 1455 of yacc.c */
#line 2549 "Gmsh.y"
{
;}
break;
case 183:
+
+/* Line 1455 of yacc.c */
#line 2558 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6614,6 +6839,8 @@ yyreduce:
break;
case 184:
+
+/* Line 1455 of yacc.c */
#line 2566 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6625,6 +6852,8 @@ yyreduce:
break;
case 185:
+
+/* Line 1455 of yacc.c */
#line 2574 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6636,6 +6865,8 @@ yyreduce:
break;
case 186:
+
+/* Line 1455 of yacc.c */
#line 2582 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6643,6 +6874,8 @@ yyreduce:
break;
case 187:
+
+/* Line 1455 of yacc.c */
#line 2586 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6654,6 +6887,8 @@ yyreduce:
break;
case 188:
+
+/* Line 1455 of yacc.c */
#line 2594 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6661,6 +6896,8 @@ yyreduce:
break;
case 189:
+
+/* Line 1455 of yacc.c */
#line 2598 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6672,6 +6909,8 @@ yyreduce:
break;
case 190:
+
+/* Line 1455 of yacc.c */
#line 2606 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6679,6 +6918,8 @@ yyreduce:
break;
case 191:
+
+/* Line 1455 of yacc.c */
#line 2610 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6690,6 +6931,8 @@ yyreduce:
break;
case 192:
+
+/* Line 1455 of yacc.c */
#line 2618 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6697,6 +6940,8 @@ yyreduce:
break;
case 193:
+
+/* Line 1455 of yacc.c */
#line 2622 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6707,6 +6952,8 @@ yyreduce:
break;
case 194:
+
+/* Line 1455 of yacc.c */
#line 2631 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6717,6 +6964,8 @@ yyreduce:
break;
case 195:
+
+/* Line 1455 of yacc.c */
#line 2638 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6727,6 +6976,8 @@ yyreduce:
break;
case 196:
+
+/* Line 1455 of yacc.c */
#line 2645 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6737,6 +6988,8 @@ yyreduce:
break;
case 197:
+
+/* Line 1455 of yacc.c */
#line 2652 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6747,6 +7000,8 @@ yyreduce:
break;
case 198:
+
+/* Line 1455 of yacc.c */
#line 2659 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6757,6 +7012,8 @@ yyreduce:
break;
case 199:
+
+/* Line 1455 of yacc.c */
#line 2666 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6767,6 +7024,8 @@ yyreduce:
break;
case 200:
+
+/* Line 1455 of yacc.c */
#line 2673 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6777,6 +7036,8 @@ yyreduce:
break;
case 201:
+
+/* Line 1455 of yacc.c */
#line 2680 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6787,6 +7048,8 @@ yyreduce:
break;
case 202:
+
+/* Line 1455 of yacc.c */
#line 2687 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6797,6 +7060,8 @@ yyreduce:
break;
case 203:
+
+/* Line 1455 of yacc.c */
#line 2694 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6804,6 +7069,8 @@ yyreduce:
break;
case 204:
+
+/* Line 1455 of yacc.c */
#line 2698 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6814,6 +7081,8 @@ yyreduce:
break;
case 205:
+
+/* Line 1455 of yacc.c */
#line 2705 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6821,6 +7090,8 @@ yyreduce:
break;
case 206:
+
+/* Line 1455 of yacc.c */
#line 2709 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6831,6 +7102,8 @@ yyreduce:
break;
case 207:
+
+/* Line 1455 of yacc.c */
#line 2716 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6838,6 +7111,8 @@ yyreduce:
break;
case 208:
+
+/* Line 1455 of yacc.c */
#line 2720 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6848,6 +7123,8 @@ yyreduce:
break;
case 209:
+
+/* Line 1455 of yacc.c */
#line 2727 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6855,6 +7132,8 @@ yyreduce:
break;
case 210:
+
+/* Line 1455 of yacc.c */
#line 2731 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6865,6 +7144,8 @@ yyreduce:
break;
case 211:
+
+/* Line 1455 of yacc.c */
#line 2738 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6872,6 +7153,8 @@ yyreduce:
break;
case 212:
+
+/* Line 1455 of yacc.c */
#line 2742 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6882,6 +7165,8 @@ yyreduce:
break;
case 213:
+
+/* Line 1455 of yacc.c */
#line 2749 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6889,6 +7174,8 @@ yyreduce:
break;
case 214:
+
+/* Line 1455 of yacc.c */
#line 2753 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6899,6 +7186,8 @@ yyreduce:
break;
case 215:
+
+/* Line 1455 of yacc.c */
#line 2760 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6906,6 +7195,8 @@ yyreduce:
break;
case 216:
+
+/* Line 1455 of yacc.c */
#line 2764 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6916,6 +7207,8 @@ yyreduce:
break;
case 217:
+
+/* Line 1455 of yacc.c */
#line 2771 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6923,6 +7216,8 @@ yyreduce:
break;
case 218:
+
+/* Line 1455 of yacc.c */
#line 2775 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6933,6 +7228,8 @@ yyreduce:
break;
case 219:
+
+/* Line 1455 of yacc.c */
#line 2782 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
@@ -6940,6 +7237,8 @@ yyreduce:
break;
case 220:
+
+/* Line 1455 of yacc.c */
#line 2786 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
@@ -6950,18 +7249,24 @@ yyreduce:
break;
case 221:
+
+/* Line 1455 of yacc.c */
#line 2797 "Gmsh.y"
{
;}
break;
case 222:
+
+/* Line 1455 of yacc.c */
#line 2800 "Gmsh.y"
{
;}
break;
case 223:
+
+/* Line 1455 of yacc.c */
#line 2806 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = true;
@@ -6974,6 +7279,8 @@ yyreduce:
break;
case 224:
+
+/* Line 1455 of yacc.c */
#line 2815 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = true;
@@ -6997,6 +7304,8 @@ yyreduce:
break;
case 225:
+
+/* Line 1455 of yacc.c */
#line 2835 "Gmsh.y"
{
yymsg(0, "Explicit region numbers in layers are deprecated");
@@ -7023,6 +7332,8 @@ yyreduce:
break;
case 226:
+
+/* Line 1455 of yacc.c */
#line 2858 "Gmsh.y"
{
extr.mesh.Recombine = true;
@@ -7030,6 +7341,8 @@ yyreduce:
break;
case 227:
+
+/* Line 1455 of yacc.c */
#line 2862 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (9)].d);
@@ -7052,6 +7365,8 @@ yyreduce:
break;
case 228:
+
+/* Line 1455 of yacc.c */
#line 2885 "Gmsh.y"
{
(yyval.i) = 1; // harmonic
@@ -7059,6 +7374,8 @@ yyreduce:
break;
case 229:
+
+/* Line 1455 of yacc.c */
#line 2889 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (1)].c), "Harmonic"))
@@ -7074,6 +7391,8 @@ yyreduce:
break;
case 230:
+
+/* Line 1455 of yacc.c */
#line 2904 "Gmsh.y"
{
(yyval.v)[0] = (yyval.v)[1] = 1.;
@@ -7081,6 +7400,8 @@ yyreduce:
break;
case 231:
+
+/* Line 1455 of yacc.c */
#line 2908 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (3)].c), "Progression") || !strcmp((yyvsp[(2) - (3)].c), "Power"))
@@ -7097,6 +7418,8 @@ yyreduce:
break;
case 232:
+
+/* Line 1455 of yacc.c */
#line 2923 "Gmsh.y"
{
(yyval.i) = -1; // left
@@ -7104,6 +7427,8 @@ yyreduce:
break;
case 233:
+
+/* Line 1455 of yacc.c */
#line 2927 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (1)].c), "Right"))
@@ -7117,6 +7442,8 @@ yyreduce:
break;
case 234:
+
+/* Line 1455 of yacc.c */
#line 2939 "Gmsh.y"
{
(yyval.l) = List_Create(1, 1, sizeof(double));
@@ -7124,6 +7451,8 @@ yyreduce:
break;
case 235:
+
+/* Line 1455 of yacc.c */
#line 2943 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (2)].l);
@@ -7131,6 +7460,8 @@ yyreduce:
break;
case 236:
+
+/* Line 1455 of yacc.c */
#line 2948 "Gmsh.y"
{
(yyval.i) = 45;
@@ -7138,6 +7469,8 @@ yyreduce:
break;
case 237:
+
+/* Line 1455 of yacc.c */
#line 2952 "Gmsh.y"
{
(yyval.i) = (int)(yyvsp[(2) - (2)].d);
@@ -7145,6 +7478,8 @@ yyreduce:
break;
case 238:
+
+/* Line 1455 of yacc.c */
#line 2959 "Gmsh.y"
{
int type = (int)(yyvsp[(6) - (7)].v)[0];
@@ -7204,6 +7539,8 @@ yyreduce:
break;
case 239:
+
+/* Line 1455 of yacc.c */
#line 3015 "Gmsh.y"
{
int k = List_Nbr((yyvsp[(4) - (6)].l));
@@ -7277,6 +7614,8 @@ yyreduce:
break;
case 240:
+
+/* Line 1455 of yacc.c */
#line 3085 "Gmsh.y"
{
yymsg(1, "Elliptic Surface is deprecated: use Transfinite instead (with smoothing)");
@@ -7285,6 +7624,8 @@ yyreduce:
break;
case 241:
+
+/* Line 1455 of yacc.c */
#line 3090 "Gmsh.y"
{
int k = List_Nbr((yyvsp[(4) - (5)].l));
@@ -7355,6 +7696,8 @@ yyreduce:
break;
case 242:
+
+/* Line 1455 of yacc.c */
#line 3157 "Gmsh.y"
{
if(!(yyvsp[(3) - (5)].l)){
@@ -7401,6 +7744,8 @@ yyreduce:
break;
case 243:
+
+/* Line 1455 of yacc.c */
#line 3200 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
@@ -7424,6 +7769,8 @@ yyreduce:
break;
case 244:
+
+/* Line 1455 of yacc.c */
#line 3226 "Gmsh.y"
{
Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
@@ -7450,6 +7797,8 @@ yyreduce:
break;
case 245:
+
+/* Line 1455 of yacc.c */
#line 3249 "Gmsh.y"
{
Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
@@ -7476,18 +7825,24 @@ yyreduce:
break;
case 246:
+
+/* Line 1455 of yacc.c */
#line 3272 "Gmsh.y"
{
;}
break;
case 247:
+
+/* Line 1455 of yacc.c */
#line 3275 "Gmsh.y"
{
;}
break;
case 248:
+
+/* Line 1455 of yacc.c */
#line 3284 "Gmsh.y"
{
ReplaceAllDuplicates();
@@ -7495,6 +7850,8 @@ yyreduce:
break;
case 249:
+
+/* Line 1455 of yacc.c */
#line 3288 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (3)].c), "Geometry"))
@@ -7508,10 +7865,12 @@ yyreduce:
break;
case 250:
+
+/* Line 1455 of yacc.c */
#line 3305 "Gmsh.y"
{
- List_T *temp = ListOfDouble2ListOfInt((yyvsp[(3) - (7)].l));
+ List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (11)].l));
std::vector<int> domain;
for (int i = 0; i < List_Nbr(temp); i++){
@@ -7519,21 +7878,25 @@ yyreduce:
List_Read(temp, i, &item);
domain.push_back(item);
}
- List_Delete((yyvsp[(3) - (7)].l));
+ List_Delete((yyvsp[(7) - (11)].l));
List_Delete(temp);
- List_T *temp2 = ListOfDouble2ListOfInt((yyvsp[(5) - (7)].l));
+ List_T *temp2 = ListOfDouble2ListOfInt((yyvsp[(9) - (11)].l));
std::vector<int> subdomain;
for (int i = 0; i < List_Nbr(temp2); i++){
int item = 0;
List_Read(temp2, i, &item);
subdomain.push_back(item);
}
- List_Delete((yyvsp[(5) - (7)].l));
+ List_Delete((yyvsp[(9) - (11)].l));
List_Delete(temp2);
+ std::string fileName = "";
+ fileName = (yyvsp[(3) - (11)].c);
+
#if defined(HAVE_KBIPACK)
Homology* homology = new Homology(GModel::current(), domain, subdomain);
+ homology->setFileName(fileName);
homology->computeBettiNumbers();
delete homology;
#else
@@ -7543,7 +7906,9 @@ yyreduce:
break;
case 251:
-#line 3338 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3342 "Gmsh.y"
{
List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (11)].l));
std::vector<int> domain;
@@ -7566,11 +7931,13 @@ yyreduce:
List_Delete((yyvsp[(9) - (11)].l));
List_Delete(temp2);
- std::string fileName = (yyvsp[(3) - (11)].c);
+ std::string fileName = "";
+ fileName = (yyvsp[(3) - (11)].c);
#if defined(HAVE_KBIPACK)
Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->findGenerators(fileName);
+ homology->setFileName(fileName);
+ homology->findGenerators();
delete homology;
#else
yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation.");
@@ -7579,7 +7946,9 @@ yyreduce:
break;
case 252:
-#line 3372 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3378 "Gmsh.y"
{
List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (11)].l));
std::vector<int> domain;
@@ -7602,11 +7971,13 @@ yyreduce:
List_Delete((yyvsp[(9) - (11)].l));
List_Delete(temp2);
- std::string fileName = (yyvsp[(3) - (11)].c);
+ std::string fileName = "";
+ fileName = (yyvsp[(3) - (11)].c);
#if defined(HAVE_KBIPACK)
Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->findDualGenerators(fileName);
+ homology->setFileName(fileName);
+ homology->findDualGenerators();
delete homology;
#else
yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation.");
@@ -7615,47 +7986,65 @@ yyreduce:
break;
case 253:
-#line 3409 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3417 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (1)].d); ;}
break;
case 254:
-#line 3410 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3418 "Gmsh.y"
{ (yyval.d) = (yyvsp[(2) - (3)].d); ;}
break;
case 255:
-#line 3411 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3419 "Gmsh.y"
{ (yyval.d) = -(yyvsp[(2) - (2)].d); ;}
break;
case 256:
-#line 3412 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3420 "Gmsh.y"
{ (yyval.d) = (yyvsp[(2) - (2)].d); ;}
break;
case 257:
-#line 3413 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3421 "Gmsh.y"
{ (yyval.d) = !(yyvsp[(2) - (2)].d); ;}
break;
case 258:
-#line 3414 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3422 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) - (yyvsp[(3) - (3)].d); ;}
break;
case 259:
-#line 3415 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3423 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) + (yyvsp[(3) - (3)].d); ;}
break;
case 260:
-#line 3416 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3424 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) * (yyvsp[(3) - (3)].d); ;}
break;
case 261:
-#line 3418 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3426 "Gmsh.y"
{
if(!(yyvsp[(3) - (3)].d))
yymsg(0, "Division by zero in '%g / %g'", (yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d));
@@ -7665,307 +8054,429 @@ yyreduce:
break;
case 262:
-#line 3424 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3432 "Gmsh.y"
{ (yyval.d) = (int)(yyvsp[(1) - (3)].d) % (int)(yyvsp[(3) - (3)].d); ;}
break;
case 263:
-#line 3425 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3433 "Gmsh.y"
{ (yyval.d) = pow((yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d)); ;}
break;
case 264:
-#line 3426 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3434 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d); ;}
break;
case 265:
-#line 3427 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3435 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) > (yyvsp[(3) - (3)].d); ;}
break;
case 266:
-#line 3428 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3436 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) <= (yyvsp[(3) - (3)].d); ;}
break;
case 267:
-#line 3429 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3437 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) >= (yyvsp[(3) - (3)].d); ;}
break;
case 268:
-#line 3430 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3438 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) == (yyvsp[(3) - (3)].d); ;}
break;
case 269:
-#line 3431 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3439 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) != (yyvsp[(3) - (3)].d); ;}
break;
case 270:
-#line 3432 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3440 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) && (yyvsp[(3) - (3)].d); ;}
break;
case 271:
-#line 3433 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3441 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) || (yyvsp[(3) - (3)].d); ;}
break;
case 272:
-#line 3434 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3442 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (5)].d) ? (yyvsp[(3) - (5)].d) : (yyvsp[(5) - (5)].d); ;}
break;
case 273:
-#line 3435 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3443 "Gmsh.y"
{ (yyval.d) = exp((yyvsp[(3) - (4)].d)); ;}
break;
case 274:
-#line 3436 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3444 "Gmsh.y"
{ (yyval.d) = log((yyvsp[(3) - (4)].d)); ;}
break;
case 275:
-#line 3437 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3445 "Gmsh.y"
{ (yyval.d) = log10((yyvsp[(3) - (4)].d)); ;}
break;
case 276:
-#line 3438 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3446 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (4)].d)); ;}
break;
case 277:
-#line 3439 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3447 "Gmsh.y"
{ (yyval.d) = sin((yyvsp[(3) - (4)].d)); ;}
break;
case 278:
-#line 3440 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3448 "Gmsh.y"
{ (yyval.d) = asin((yyvsp[(3) - (4)].d)); ;}
break;
case 279:
-#line 3441 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3449 "Gmsh.y"
{ (yyval.d) = cos((yyvsp[(3) - (4)].d)); ;}
break;
case 280:
-#line 3442 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3450 "Gmsh.y"
{ (yyval.d) = acos((yyvsp[(3) - (4)].d)); ;}
break;
case 281:
-#line 3443 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3451 "Gmsh.y"
{ (yyval.d) = tan((yyvsp[(3) - (4)].d)); ;}
break;
case 282:
-#line 3444 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3452 "Gmsh.y"
{ (yyval.d) = atan((yyvsp[(3) - (4)].d)); ;}
break;
case 283:
-#line 3445 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3453 "Gmsh.y"
{ (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));;}
break;
case 284:
-#line 3446 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3454 "Gmsh.y"
{ (yyval.d) = sinh((yyvsp[(3) - (4)].d)); ;}
break;
case 285:
-#line 3447 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3455 "Gmsh.y"
{ (yyval.d) = cosh((yyvsp[(3) - (4)].d)); ;}
break;
case 286:
-#line 3448 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3456 "Gmsh.y"
{ (yyval.d) = tanh((yyvsp[(3) - (4)].d)); ;}
break;
case 287:
-#line 3449 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3457 "Gmsh.y"
{ (yyval.d) = fabs((yyvsp[(3) - (4)].d)); ;}
break;
case 288:
-#line 3450 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3458 "Gmsh.y"
{ (yyval.d) = floor((yyvsp[(3) - (4)].d)); ;}
break;
case 289:
-#line 3451 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3459 "Gmsh.y"
{ (yyval.d) = ceil((yyvsp[(3) - (4)].d)); ;}
break;
case 290:
-#line 3452 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3460 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 291:
-#line 3453 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3461 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 292:
-#line 3454 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3462 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (6)].d) * (yyvsp[(3) - (6)].d) + (yyvsp[(5) - (6)].d) * (yyvsp[(5) - (6)].d)); ;}
break;
case 293:
-#line 3455 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3463 "Gmsh.y"
{ (yyval.d) = (yyvsp[(3) - (4)].d) * (double)rand() / (double)RAND_MAX; ;}
break;
case 294:
-#line 3457 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3465 "Gmsh.y"
{ (yyval.d) = exp((yyvsp[(3) - (4)].d)); ;}
break;
case 295:
-#line 3458 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3466 "Gmsh.y"
{ (yyval.d) = log((yyvsp[(3) - (4)].d)); ;}
break;
case 296:
-#line 3459 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3467 "Gmsh.y"
{ (yyval.d) = log10((yyvsp[(3) - (4)].d)); ;}
break;
case 297:
-#line 3460 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3468 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (4)].d)); ;}
break;
case 298:
-#line 3461 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3469 "Gmsh.y"
{ (yyval.d) = sin((yyvsp[(3) - (4)].d)); ;}
break;
case 299:
-#line 3462 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3470 "Gmsh.y"
{ (yyval.d) = asin((yyvsp[(3) - (4)].d)); ;}
break;
case 300:
-#line 3463 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3471 "Gmsh.y"
{ (yyval.d) = cos((yyvsp[(3) - (4)].d)); ;}
break;
case 301:
-#line 3464 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3472 "Gmsh.y"
{ (yyval.d) = acos((yyvsp[(3) - (4)].d)); ;}
break;
case 302:
-#line 3465 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3473 "Gmsh.y"
{ (yyval.d) = tan((yyvsp[(3) - (4)].d)); ;}
break;
case 303:
-#line 3466 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3474 "Gmsh.y"
{ (yyval.d) = atan((yyvsp[(3) - (4)].d)); ;}
break;
case 304:
-#line 3467 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3475 "Gmsh.y"
{ (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));;}
break;
case 305:
-#line 3468 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3476 "Gmsh.y"
{ (yyval.d) = sinh((yyvsp[(3) - (4)].d)); ;}
break;
case 306:
-#line 3469 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3477 "Gmsh.y"
{ (yyval.d) = cosh((yyvsp[(3) - (4)].d)); ;}
break;
case 307:
-#line 3470 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3478 "Gmsh.y"
{ (yyval.d) = tanh((yyvsp[(3) - (4)].d)); ;}
break;
case 308:
-#line 3471 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3479 "Gmsh.y"
{ (yyval.d) = fabs((yyvsp[(3) - (4)].d)); ;}
break;
case 309:
-#line 3472 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3480 "Gmsh.y"
{ (yyval.d) = floor((yyvsp[(3) - (4)].d)); ;}
break;
case 310:
-#line 3473 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3481 "Gmsh.y"
{ (yyval.d) = ceil((yyvsp[(3) - (4)].d)); ;}
break;
case 311:
-#line 3474 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3482 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 312:
-#line 3475 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3483 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 313:
-#line 3476 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3484 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (6)].d) * (yyvsp[(3) - (6)].d) + (yyvsp[(5) - (6)].d) * (yyvsp[(5) - (6)].d)); ;}
break;
case 314:
-#line 3477 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3485 "Gmsh.y"
{ (yyval.d) = (yyvsp[(3) - (4)].d) * (double)rand() / (double)RAND_MAX; ;}
break;
case 315:
-#line 3486 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3494 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (1)].d); ;}
break;
case 316:
-#line 3487 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3495 "Gmsh.y"
{ (yyval.d) = 3.141592653589793; ;}
break;
case 317:
-#line 3488 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3496 "Gmsh.y"
{ (yyval.d) = Msg::GetCommRank(); ;}
break;
case 318:
-#line 3489 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3497 "Gmsh.y"
{ (yyval.d) = Msg::GetCommSize(); ;}
break;
case 319:
-#line 3490 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3498 "Gmsh.y"
{ (yyval.d) = GetGmshMajorVersion(); ;}
break;
case 320:
-#line 3491 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3499 "Gmsh.y"
{ (yyval.d) = GetGmshMinorVersion(); ;}
break;
case 321:
-#line 3492 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3500 "Gmsh.y"
{ (yyval.d) = GetGmshPatchVersion(); ;}
break;
case 322:
-#line 3497 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3505 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (1)].c))){
yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (1)].c));
@@ -7978,7 +8489,9 @@ yyreduce:
break;
case 323:
-#line 3510 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3518 "Gmsh.y"
{
char tmpstring[1024];
sprintf(tmpstring, "%s_%d", (yyvsp[(1) - (5)].c), (int)(yyvsp[(4) - (5)].d)) ;
@@ -7993,7 +8506,9 @@ yyreduce:
break;
case 324:
-#line 3522 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3530 "Gmsh.y"
{
int index = (int)(yyvsp[(3) - (4)].d);
if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c))){
@@ -8011,7 +8526,9 @@ yyreduce:
break;
case 325:
-#line 3537 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3545 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(2) - (4)].c))){
yymsg(0, "Unknown variable '%s'", (yyvsp[(2) - (4)].c));
@@ -8024,7 +8541,9 @@ yyreduce:
break;
case 326:
-#line 3547 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3555 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (2)].c))){
yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (2)].c));
@@ -8037,7 +8556,9 @@ yyreduce:
break;
case 327:
-#line 3557 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3565 "Gmsh.y"
{
int index = (int)(yyvsp[(3) - (5)].d);
if(!gmsh_yysymbols.count((yyvsp[(1) - (5)].c))){
@@ -8055,7 +8576,9 @@ yyreduce:
break;
case 328:
-#line 3575 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3583 "Gmsh.y"
{
NumberOption(GMSH_GET, (yyvsp[(1) - (3)].c), 0, (yyvsp[(3) - (3)].c), (yyval.d));
Free((yyvsp[(1) - (3)].c)); Free((yyvsp[(3) - (3)].c));
@@ -8063,7 +8586,9 @@ yyreduce:
break;
case 329:
-#line 3580 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3588 "Gmsh.y"
{
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));
@@ -8071,7 +8596,9 @@ yyreduce:
break;
case 330:
-#line 3585 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3593 "Gmsh.y"
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[(1) - (4)].c), 0, (yyvsp[(3) - (4)].c), d)){
@@ -8084,7 +8611,9 @@ yyreduce:
break;
case 331:
-#line 3595 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3603 "Gmsh.y"
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c), d)){
@@ -8097,7 +8626,9 @@ yyreduce:
break;
case 332:
-#line 3605 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3613 "Gmsh.y"
{
(yyval.d) = Msg::GetValue((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].d));
Free((yyvsp[(3) - (6)].c));
@@ -8105,70 +8636,90 @@ yyreduce:
break;
case 333:
-#line 3613 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3621 "Gmsh.y"
{
memcpy((yyval.v), (yyvsp[(1) - (1)].v), 5*sizeof(double));
;}
break;
case 334:
-#line 3617 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3625 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = -(yyvsp[(2) - (2)].v)[i];
;}
break;
case 335:
-#line 3621 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3629 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(2) - (2)].v)[i];
;}
break;
case 336:
-#line 3625 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3633 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] - (yyvsp[(3) - (3)].v)[i];
;}
break;
case 337:
-#line 3629 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3637 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] + (yyvsp[(3) - (3)].v)[i];
;}
break;
case 338:
-#line 3636 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3644 "Gmsh.y"
{
(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);
;}
break;
case 339:
-#line 3640 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3648 "Gmsh.y"
{
(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;
;}
break;
case 340:
-#line 3644 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3652 "Gmsh.y"
{
(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;
;}
break;
case 341:
-#line 3648 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3656 "Gmsh.y"
{
(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;
;}
break;
case 342:
-#line 3655 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3663 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(List_T*));
List_Add((yyval.l), &((yyvsp[(1) - (1)].l)));
@@ -8176,14 +8727,18 @@ yyreduce:
break;
case 343:
-#line 3660 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3668 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].l)));
;}
break;
case 344:
-#line 3667 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3675 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
@@ -8191,14 +8746,18 @@ yyreduce:
break;
case 345:
-#line 3672 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3680 "Gmsh.y"
{
(yyval.l) = (yyvsp[(1) - (1)].l);
;}
break;
case 346:
-#line 3676 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3684 "Gmsh.y"
{
// creates an empty list
(yyval.l) = List_Create(2, 1, sizeof(double));
@@ -8206,14 +8765,18 @@ yyreduce:
break;
case 347:
-#line 3681 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3689 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (3)].l);
;}
break;
case 348:
-#line 3685 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3693 "Gmsh.y"
{
(yyval.l) = (yyvsp[(3) - (4)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -8224,7 +8787,9 @@ yyreduce:
break;
case 349:
-#line 3693 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3701 "Gmsh.y"
{
(yyval.l) = (yyvsp[(4) - (5)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -8235,14 +8800,18 @@ yyreduce:
break;
case 350:
-#line 3704 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3712 "Gmsh.y"
{
(yyval.l) = (yyvsp[(1) - (1)].l);
;}
break;
case 351:
-#line 3708 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3716 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (1)].c), "*") || !strcmp((yyvsp[(1) - (1)].c), "all"))
(yyval.l) = 0;
@@ -8254,7 +8823,9 @@ yyreduce:
break;
case 352:
-#line 3720 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3728 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (2)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -8265,7 +8836,9 @@ yyreduce:
break;
case 353:
-#line 3728 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3736 "Gmsh.y"
{
(yyval.l) = (yyvsp[(3) - (3)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -8276,7 +8849,9 @@ yyreduce:
break;
case 354:
-#line 3736 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3744 "Gmsh.y"
{
(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));
@@ -8286,7 +8861,9 @@ yyreduce:
break;
case 355:
-#line 3743 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3751 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
if(!(yyvsp[(5) - (5)].d) || ((yyvsp[(1) - (5)].d) < (yyvsp[(3) - (5)].d) && (yyvsp[(5) - (5)].d) < 0) || ((yyvsp[(1) - (5)].d) > (yyvsp[(3) - (5)].d) && (yyvsp[(5) - (5)].d) > 0)){
@@ -8300,7 +8877,9 @@ yyreduce:
break;
case 356:
-#line 3754 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3762 "Gmsh.y"
{
// Returns the coordinates of a point and fills a list with it.
// This allows to ensure e.g. that relative point positions are
@@ -8323,7 +8902,9 @@ yyreduce:
break;
case 357:
-#line 3774 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3782 "Gmsh.y"
{
(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++){
@@ -8336,7 +8917,9 @@ yyreduce:
break;
case 358:
-#line 3784 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3792 "Gmsh.y"
{
(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++){
@@ -8349,7 +8932,9 @@ yyreduce:
break;
case 359:
-#line 3794 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3802 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
if(!gmsh_yysymbols.count((yyvsp[(1) - (3)].c)))
@@ -8362,7 +8947,9 @@ yyreduce:
break;
case 360:
-#line 3804 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3812 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
if(!gmsh_yysymbols.count((yyvsp[(1) - (6)].c)))
@@ -8382,7 +8969,9 @@ yyreduce:
break;
case 361:
-#line 3824 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3832 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
@@ -8390,21 +8979,27 @@ yyreduce:
break;
case 362:
-#line 3829 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3837 "Gmsh.y"
{
(yyval.l) = (yyvsp[(1) - (1)].l);
;}
break;
case 363:
-#line 3833 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3841 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].d)));
;}
break;
case 364:
-#line 3837 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3845 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (3)].l)); i++){
double d;
@@ -8416,21 +9011,27 @@ yyreduce:
break;
case 365:
-#line 3849 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3857 "Gmsh.y"
{
(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));
;}
break;
case 366:
-#line 3853 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3861 "Gmsh.y"
{
(yyval.u) = CTX::instance()->packColor((int)(yyvsp[(2) - (7)].d), (int)(yyvsp[(4) - (7)].d), (int)(yyvsp[(6) - (7)].d), 255);
;}
break;
case 367:
-#line 3865 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3873 "Gmsh.y"
{
int flag;
(yyval.u) = GetColorForString(ColorString, -1, (yyvsp[(1) - (1)].c), &flag);
@@ -8440,7 +9041,9 @@ yyreduce:
break;
case 368:
-#line 3872 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3880 "Gmsh.y"
{
unsigned int val = 0;
ColorOption(GMSH_GET, (yyvsp[(1) - (5)].c), 0, (yyvsp[(5) - (5)].c), val);
@@ -8450,14 +9053,18 @@ yyreduce:
break;
case 369:
-#line 3882 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3890 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (3)].l);
;}
break;
case 370:
-#line 3886 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3894 "Gmsh.y"
{
(yyval.l) = List_Create(256, 10, sizeof(unsigned int));
GmshColorTable *ct = GetColorTable((int)(yyvsp[(3) - (6)].d));
@@ -8472,7 +9079,9 @@ yyreduce:
break;
case 371:
-#line 3901 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3909 "Gmsh.y"
{
(yyval.l) = List_Create(256, 10, sizeof(unsigned int));
List_Add((yyval.l), &((yyvsp[(1) - (1)].u)));
@@ -8480,21 +9089,27 @@ yyreduce:
break;
case 372:
-#line 3906 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3914 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].u)));
;}
break;
case 373:
-#line 3913 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3921 "Gmsh.y"
{
(yyval.c) = (yyvsp[(1) - (1)].c);
;}
break;
case 374:
-#line 3917 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3925 "Gmsh.y"
{
if(!gmsh_yystringsymbols.count((yyvsp[(1) - (1)].c))){
yymsg(0, "Unknown string variable '%s'", (yyvsp[(1) - (1)].c));
@@ -8510,7 +9125,9 @@ yyreduce:
break;
case 375:
-#line 3930 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3938 "Gmsh.y"
{
std::string out;
StringOption(GMSH_GET, (yyvsp[(1) - (3)].c), 0, (yyvsp[(3) - (3)].c), out);
@@ -8521,7 +9138,9 @@ yyreduce:
break;
case 376:
-#line 3938 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3946 "Gmsh.y"
{
std::string out;
StringOption(GMSH_GET, (yyvsp[(1) - (6)].c), (int)(yyvsp[(3) - (6)].d), (yyvsp[(6) - (6)].c), out);
@@ -8532,14 +9151,18 @@ yyreduce:
break;
case 377:
-#line 3949 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3957 "Gmsh.y"
{
(yyval.c) = (yyvsp[(1) - (1)].c);
;}
break;
case 378:
-#line 3953 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3961 "Gmsh.y"
{
(yyval.c) = (char *)Malloc(32 * sizeof(char));
time_t now;
@@ -8550,7 +9173,9 @@ yyreduce:
break;
case 379:
-#line 3961 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3969 "Gmsh.y"
{
(yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (6)].c)) + strlen((yyvsp[(5) - (6)].c)) + 1) * sizeof(char));
strcpy((yyval.c), (yyvsp[(3) - (6)].c));
@@ -8561,7 +9186,9 @@ yyreduce:
break;
case 380:
-#line 3969 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3977 "Gmsh.y"
{
(yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c)) + 1) * sizeof(char));
int i;
@@ -8578,7 +9205,9 @@ yyreduce:
break;
case 381:
-#line 3983 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 3991 "Gmsh.y"
{
(yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c)) + 1) * sizeof(char));
int i;
@@ -8595,14 +9224,18 @@ yyreduce:
break;
case 382:
-#line 3997 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 4005 "Gmsh.y"
{
(yyval.c) = (yyvsp[(3) - (4)].c);
;}
break;
case 383:
-#line 4001 "Gmsh.y"
+
+/* Line 1455 of yacc.c */
+#line 4009 "Gmsh.y"
{
char tmpstring[1024];
int i = PrintListOfDouble((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].l), tmpstring);
@@ -8624,8 +9257,9 @@ yyreduce:
break;
-/* Line 1267 of yacc.c. */
-#line 8629 "Gmsh.tab.cpp"
+
+/* Line 1455 of yacc.c */
+#line 9263 "Gmsh.tab.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -8636,7 +9270,6 @@ yyreduce:
*++yyvsp = yyval;
-
/* 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. */
@@ -8701,7 +9334,7 @@ yyerrlab:
if (yyerrstatus == 3)
{
- /* If just tried and failed to reuse look-ahead token after an
+ /* If just tried and failed to reuse lookahead token after an
error, discard it. */
if (yychar <= YYEOF)
@@ -8718,7 +9351,7 @@ yyerrlab:
}
}
- /* 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;
@@ -8775,9 +9408,6 @@ yyerrlab1:
YY_STACK_PRINT (yyss, yyssp);
}
- if (yyn == YYFINAL)
- YYACCEPT;
-
*++yyvsp = yylval;
@@ -8802,7 +9432,7 @@ yyabortlab:
yyresult = 1;
goto yyreturn;
-#ifndef yyoverflow
+#if !defined(yyoverflow) || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
`-------------------------------------------------*/
@@ -8813,7 +9443,7 @@ yyexhaustedlab:
#endif
yyreturn:
- if (yychar != YYEOF && yychar != YYEMPTY)
+ if (yychar != YYEMPTY)
yydestruct ("Cleanup: discarding lookahead",
yytoken, &yylval);
/* Do not reclaim the symbols of the rule which action triggered
@@ -8839,7 +9469,9 @@ yyreturn:
}
-#line 4021 "Gmsh.y"
+
+/* Line 1675 of yacc.c */
+#line 4029 "Gmsh.y"
int PrintListOfDouble(char *format, List_T *list, char *buffer)
diff --git a/Parser/Gmsh.tab.hpp b/Parser/Gmsh.tab.hpp
index 66eeb7d93f7d97f26269d1d4f8e13357a82a684b..aeac7c5a11e3515ffc789f3b86ef7d56147e21cf 100644
--- a/Parser/Gmsh.tab.hpp
+++ b/Parser/Gmsh.tab.hpp
@@ -1,24 +1,23 @@
-/* A Bison parser, made by GNU Bison 2.3. */
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1. */
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+ Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
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
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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
@@ -29,10 +28,11 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
+
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
@@ -168,142 +168,16 @@
tPLUSPLUS = 384
};
#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 tExp 269
-#define tLog 270
-#define tLog10 271
-#define tSqrt 272
-#define tSin 273
-#define tAsin 274
-#define tCos 275
-#define tAcos 276
-#define tTan 277
-#define tRand 278
-#define tAtan 279
-#define tAtan2 280
-#define tSinh 281
-#define tCosh 282
-#define tTanh 283
-#define tFabs 284
-#define tFloor 285
-#define tCeil 286
-#define tFmod 287
-#define tModulo 288
-#define tHypot 289
-#define tPrintf 290
-#define tSprintf 291
-#define tStrCat 292
-#define tStrPrefix 293
-#define tStrRelative 294
-#define tBoundingBox 295
-#define tDraw 296
-#define tToday 297
-#define tSyncModel 298
-#define tCreateTopology 299
-#define tDistanceFunction 300
-#define tPoint 301
-#define tCircle 302
-#define tEllipse 303
-#define tLine 304
-#define tSphere 305
-#define tPolarSphere 306
-#define tSurface 307
-#define tSpline 308
-#define tVolume 309
-#define tCharacteristic 310
-#define tLength 311
-#define tParametric 312
-#define tElliptic 313
-#define tPlane 314
-#define tRuled 315
-#define tTransfinite 316
-#define tComplex 317
-#define tPhysical 318
-#define tCompound 319
-#define tUsing 320
-#define tPlugin 321
-#define tDegenerated 322
-#define tOCCShape 323
-#define tRotate 324
-#define tTranslate 325
-#define tSymmetry 326
-#define tDilate 327
-#define tExtrude 328
-#define tLevelset 329
-#define tLoop 330
-#define tRecombine 331
-#define tSmoother 332
-#define tSplit 333
-#define tDelete 334
-#define tCoherence 335
-#define tIntersect 336
-#define tLayers 337
-#define tHole 338
-#define tAlias 339
-#define tAliasWithOptions 340
-#define tText2D 341
-#define tText3D 342
-#define tInterpolationScheme 343
-#define tTime 344
-#define tCombine 345
-#define tBSpline 346
-#define tBezier 347
-#define tNurbs 348
-#define tNurbsOrder 349
-#define tNurbsKnots 350
-#define tColor 351
-#define tColorTable 352
-#define tFor 353
-#define tIn 354
-#define tEndFor 355
-#define tIf 356
-#define tEndIf 357
-#define tExit 358
-#define tField 359
-#define tReturn 360
-#define tCall 361
-#define tFunction 362
-#define tShow 363
-#define tHide 364
-#define tGetValue 365
-#define tGMSH_MAJOR_VERSION 366
-#define tGMSH_MINOR_VERSION 367
-#define tGMSH_PATCH_VERSION 368
-#define tHomRank 369
-#define tHomGen 370
-#define tHomCut 371
-#define tAFFECTDIVIDE 372
-#define tAFFECTTIMES 373
-#define tAFFECTMINUS 374
-#define tAFFECTPLUS 375
-#define tOR 376
-#define tAND 377
-#define tNOTEQUAL 378
-#define tEQUAL 379
-#define tGREATEROREQUAL 380
-#define tLESSOREQUAL 381
-#define UNARYPREC 382
-#define tMINUSMINUS 383
-#define tPLUSPLUS 384
-
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef union YYSTYPE
-#line 85 "Gmsh.y"
{
+
+/* Line 1676 of yacc.c */
+#line 85 "Gmsh.y"
+
char *c;
int i;
unsigned int u;
@@ -311,14 +185,17 @@ typedef union YYSTYPE
double v[5];
Shape s;
List_T *l;
-}
-/* Line 1529 of yacc.c. */
-#line 317 "Gmsh.tab.hpp"
- YYSTYPE;
+
+
+
+/* Line 1676 of yacc.c */
+#line 193 "Gmsh.tab.hpp"
+} YYSTYPE;
+# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
# define YYSTYPE_IS_DECLARED 1
-# define YYSTYPE_IS_TRIVIAL 1
#endif
extern YYSTYPE gmsh_yylval;
+
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 4aa09c6a8f61f454c450ee2bf74c56ac99406c5c..f8b93083de3ca301f126167d3b496b9f197b72f0 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -3301,10 +3301,10 @@ Coherence :
Homology :
- tHomRank '{' ListOfDouble ',' ListOfDouble '}' tEND
+ tHomRank '(' StringExprVar ')' tAFFECT '{' ListOfDouble ',' ListOfDouble '}' tEND
{
- List_T *temp = ListOfDouble2ListOfInt($3);
+ List_T *temp = ListOfDouble2ListOfInt($7);
std::vector<int> domain;
for (int i = 0; i < List_Nbr(temp); i++){
@@ -3312,27 +3312,31 @@ Homology :
List_Read(temp, i, &item);
domain.push_back(item);
}
- List_Delete($3);
+ List_Delete($7);
List_Delete(temp);
- List_T *temp2 = ListOfDouble2ListOfInt($5);
+ List_T *temp2 = ListOfDouble2ListOfInt($9);
std::vector<int> subdomain;
for (int i = 0; i < List_Nbr(temp2); i++){
int item = 0;
List_Read(temp2, i, &item);
subdomain.push_back(item);
}
- List_Delete($5);
+ List_Delete($9);
List_Delete(temp2);
+ std::string fileName = "";
+ fileName = $3;
+
#if defined(HAVE_KBIPACK)
Homology* homology = new Homology(GModel::current(), domain, subdomain);
+ homology->setFileName(fileName);
homology->computeBettiNumbers();
delete homology;
#else
yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation.");
#endif
- }
+ }
| tHomGen '(' StringExprVar ')' tAFFECT '{' ListOfDouble ',' ListOfDouble '}' tEND
{
@@ -3357,11 +3361,13 @@ Homology :
List_Delete($9);
List_Delete(temp2);
- std::string fileName = $3;
+ std::string fileName = "";
+ fileName = $3;
#if defined(HAVE_KBIPACK)
Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->findGenerators(fileName);
+ homology->setFileName(fileName);
+ homology->findGenerators();
delete homology;
#else
yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation.");
@@ -3391,11 +3397,13 @@ Homology :
List_Delete($9);
List_Delete(temp2);
- std::string fileName = $3;
+ std::string fileName = "";
+ fileName = $3;
#if defined(HAVE_KBIPACK)
Homology* homology = new Homology(GModel::current(), domain, subdomain);
- homology->findDualGenerators(fileName);
+ homology->setFileName(fileName);
+ homology->findDualGenerators();
delete homology;
#else
yymsg(0, "Gmsh needs to be configured with option Kbipack to use homology computation.");
diff --git a/Parser/Gmsh.yy.cpp b/Parser/Gmsh.yy.cpp
index 8dd9c8f32f7af5e0b2843b8c9b98011c4b417f77..b2924bdae7d47b7c94225ebac99ac7b20309529e 100644
--- a/Parser/Gmsh.yy.cpp
+++ b/Parser/Gmsh.yy.cpp
@@ -73,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
@@ -104,6 +103,8 @@ typedef unsigned int flex_uint32_t;
#define UINT32_MAX (4294967295U)
#endif
+#endif /* ! C99 */
+
#endif /* ! FLEXINT_H */
#ifdef __cplusplus
@@ -160,7 +161,15 @@ typedef unsigned int flex_uint32_t;
/* Size of default input buffer. */
#ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
#define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
#endif
/* The state buf must be large enough to hold one state per character in the main buffer.
@@ -172,12 +181,7 @@ typedef unsigned int flex_uint32_t;
typedef struct yy_buffer_state *YY_BUFFER_STATE;
#endif
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
-extern yy_size_t gmsh_yyleng;
+extern int gmsh_yyleng;
extern FILE *gmsh_yyin, *gmsh_yyout;
@@ -203,6 +207,11 @@ extern FILE *gmsh_yyin, *gmsh_yyout;
#define unput(c) yyunput( c, (yytext_ptr) )
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
@@ -220,7 +229,7 @@ struct yy_buffer_state
/* Number of characters read into yy_ch_buf, not including EOB
* characters.
*/
- yy_size_t yy_n_chars;
+ int yy_n_chars;
/* Whether we "own" the buffer - i.e., we know we created it,
* and can realloc() it to grow it, and should free() it to
@@ -290,8 +299,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
/* yy_hold_char holds the character lost when gmsh_yytext is formed. */
static char yy_hold_char;
-static yy_size_t yy_n_chars; /* number of characters read into yy_ch_buf */
-yy_size_t gmsh_yyleng;
+static int yy_n_chars; /* number of characters read into yy_ch_buf */
+int gmsh_yyleng;
/* Points to current character in buffer. */
static char *yy_c_buf_p = (char *) 0;
@@ -319,7 +328,7 @@ static void gmsh_yy_init_buffer (YY_BUFFER_STATE b,FILE *file );
YY_BUFFER_STATE gmsh_yy_scan_buffer (char *base,yy_size_t size );
YY_BUFFER_STATE gmsh_yy_scan_string (yyconst char *yy_str );
-YY_BUFFER_STATE gmsh_yy_scan_bytes (yyconst char *bytes,yy_size_t len );
+YY_BUFFER_STATE gmsh_yy_scan_bytes (yyconst char *bytes,int len );
void *gmsh_yyalloc (yy_size_t );
void *gmsh_yyrealloc (void *,yy_size_t );
@@ -903,7 +912,7 @@ void skipline(void);
#define YY_NO_UNISTD_H
#endif
-#line 907 "Gmsh.yy.cpp"
+#line 916 "Gmsh.yy.cpp"
#define INITIAL 0
@@ -942,7 +951,7 @@ FILE *gmsh_yyget_out (void );
void gmsh_yyset_out (FILE * out_str );
-yy_size_t gmsh_yyget_leng (void );
+int gmsh_yyget_leng (void );
char *gmsh_yyget_text (void );
@@ -984,7 +993,12 @@ static int input (void );
/* Amount of stuff to slurp up with each read. */
#ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
#define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
#endif
/* Copy whatever the last rule matched to the standard output. */
@@ -992,7 +1006,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,
@@ -1003,7 +1017,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; \
@@ -1088,7 +1102,7 @@ YY_DECL
#line 49 "Gmsh.l"
-#line 1092 "Gmsh.yy.cpp"
+#line 1106 "Gmsh.yy.cpp"
if ( !(yy_init) )
{
@@ -1913,7 +1927,7 @@ YY_RULE_SETUP
#line 224 "Gmsh.l"
ECHO;
YY_BREAK
-#line 1917 "Gmsh.yy.cpp"
+#line 1931 "Gmsh.yy.cpp"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -2099,7 +2113,7 @@ static int yy_get_next_buffer (void)
else
{
- yy_size_t num_to_read =
+ int num_to_read =
YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
while ( num_to_read <= 0 )
@@ -2113,7 +2127,7 @@ static int yy_get_next_buffer (void)
if ( b->yy_is_our_buffer )
{
- yy_size_t new_size = b->yy_buf_size * 2;
+ int new_size = b->yy_buf_size * 2;
if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8;
@@ -2144,7 +2158,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
- (yy_n_chars), num_to_read );
+ (yy_n_chars), (size_t) num_to_read );
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
}
@@ -2254,7 +2268,7 @@ static int yy_get_next_buffer (void)
if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
{ /* need to shift things up to make room */
/* +2 for EOB chars. */
- register yy_size_t number_to_move = (yy_n_chars) + 2;
+ register int number_to_move = (yy_n_chars) + 2;
register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
register char *source =
@@ -2303,7 +2317,7 @@ static int yy_get_next_buffer (void)
else
{ /* need more input */
- yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+ int offset = (yy_c_buf_p) - (yytext_ptr);
++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) )
@@ -2327,7 +2341,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;
@@ -2579,7 +2593,7 @@ void gmsh_yypop_buffer_state (void)
*/
static void gmsh_yyensure_buffer_stack (void)
{
- yy_size_t num_to_alloc;
+ int num_to_alloc;
if (!(yy_buffer_stack)) {
@@ -2671,16 +2685,17 @@ 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.
*/
-YY_BUFFER_STATE gmsh_yy_scan_bytes (yyconst char * yybytes, yy_size_t _yybytes_len )
+YY_BUFFER_STATE gmsh_yy_scan_bytes (yyconst char * yybytes, int _yybytes_len )
{
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;
@@ -2762,7 +2777,7 @@ FILE *gmsh_yyget_out (void)
/** Get the length of the current token.
*
*/
-yy_size_t gmsh_yyget_leng (void)
+int gmsh_yyget_leng (void)
{
return gmsh_yyleng;
}
diff --git a/Plugin/HomologyComputation.cpp b/Plugin/HomologyComputation.cpp
index 092ef7f0856af3fcb710c91e0860818973dda34e..7027f294c8174101095937e323c2eb4d0449b8f7 100644
--- a/Plugin/HomologyComputation.cpp
+++ b/Plugin/HomologyComputation.cpp
@@ -10,7 +10,6 @@
#include "GmshConfig.h"
#include "GModel.h"
#include "Homology.h"
-#include "PViewDataGModel.h"
#include "HomologyComputation.h"
#if defined(HAVE_KBIPACK)
@@ -21,8 +20,8 @@ StringXNumber HomologyComputationOptions_Number[] = {
{GMSH_FULLRC, "PhysicalGroupForSubdomain1", NULL, 0.},
{GMSH_FULLRC, "PhysicalGroupForSubdomain2", NULL, 0.},
{GMSH_FULLRC, "ComputeGenerators", NULL, 1.},
- {GMSH_FULLRC, "ComputeDualGenerators", NULL, 0.},
- {GMSH_FULLRC, "ComputeBettiNumbers", NULL, 0.},
+ {GMSH_FULLRC, "ComputeCuts", NULL, 0.},
+ {GMSH_FULLRC, "ComputeRanks", NULL, 0.},
};
StringXString HomologyComputationOptions_String[] = {
@@ -39,9 +38,16 @@ extern "C"
std::string GMSH_HomologyComputationPlugin::getHelp() const
{
- return "Plugin(Homology) computes generators for "
- "(relative) homology groups and their thick cuts.\n\n"
- "Plugin(Homology) creates new views.";
+ return "Plugin(Homology) computes ranks and generators of "
+ "(relative) homology spaces and their thick cuts.\n\n"
+
+ "Define physical groups in order to specify the computation "
+ "domain and the relative subdomain. Otherwise the whole mesh "
+ "is the domain and the relative subdomain is empty. \n\n"
+
+ "Plugin(Homology) creates new views, one for each generator found. "
+ "The resulting generator chains together with the mesh are saved to "
+ "the file given.";
}
int GMSH_HomologyComputationPlugin::getNbOptions() const
@@ -67,34 +73,44 @@ StringXString *GMSH_HomologyComputationPlugin::getOptionStr(int iopt)
PView *GMSH_HomologyComputationPlugin::execute(PView *v)
{
std::string fileName = HomologyComputationOptions_String[0].def;
- if(fileName.empty()) {
- Msg::Error("Filename not given!");
- return 0;
- }
std::vector<int> domain;
std::vector<int> subdomain;
- domain.push_back((int)HomologyComputationOptions_Number[0].def);
- domain.push_back((int)HomologyComputationOptions_Number[1].def);
- subdomain.push_back((int)HomologyComputationOptions_Number[2].def);
- subdomain.push_back((int)HomologyComputationOptions_Number[3].def);
+ int d1 = (int)HomologyComputationOptions_Number[0].def;
+ int d2 = (int)HomologyComputationOptions_Number[1].def;
+ if(d1 > 0) domain.push_back(d1);
+ if(d2 > 0) domain.push_back(d2);
+ d1 = (int)HomologyComputationOptions_Number[2].def;
+ d2 = (int)HomologyComputationOptions_Number[3].def;
+ if(d1 > 0) subdomain.push_back(d1);
+ if(d2 > 0) subdomain.push_back(d2);
+
int gens = (int)HomologyComputationOptions_Number[4].def;
int cuts = (int)HomologyComputationOptions_Number[5].def;
- int betti = (int)HomologyComputationOptions_Number[6].def;
+ int rank = (int)HomologyComputationOptions_Number[6].def;
GModel *m = GModel::current();
- Homology* homology = new Homology(m, domain, subdomain);
-
- if(gens == 1 && cuts != 1 && betti != 1) homology->findGenerators(fileName);
- else if(cuts == 1 && gens != 1 && betti != 1) homology->findDualGenerators(fileName);
- else if(cuts != 1 && gens != 1 && betti == 1) homology->computeBettiNumbers();
- else Msg::Error("Choose either generators, dual generators or Betti numbers to compute.");
-
-
- delete homology;
+ if(gens != 0){
+ Homology* homology = new Homology(m, domain, subdomain);
+ homology->setFileName(fileName);
+ homology->findGenerators();
+ delete homology;
+ }
+ if(cuts != 0){
+ Homology* homology = new Homology(m, domain, subdomain);
+ homology->setFileName(fileName);
+ homology->findDualGenerators();
+ delete homology;
+ }
+ if(rank != 0){
+ Homology* homology = new Homology(m, domain, subdomain);
+ homology->setFileName(fileName);
+ homology->computeBettiNumbers();
+ delete homology;
+ }
return 0;
}
diff --git a/tutorial/t10.geo b/tutorial/t10.geo
index 16d061d1bded8a13cf448169c729b8aef9e7830e..5c32ee9b3692fae7b19c59e9447b5503b3b863de 100644
--- a/tutorial/t10.geo
+++ b/tutorial/t10.geo
@@ -142,14 +142,14 @@ HomGen("t10_hom.msh") = {{69}, {75}};
// Find the corresponding thick cuts.
// Save the cut chains to t10_hom.msh.
- HomCut("t10_hom.msh") = {{69}, {70, 71, 72, 73}};
+HomCut("t10_hom.msh") = {{69}, {70, 71, 72, 73}};
-// Only find and print the ranks of the relative homology spaces
-// (Betti numbers).
-HomRank {{69},{70, 71, 72, 73}};
+// Only find and save the ranks of the relative homology spaces
+// (Betti numbers) to t10_homrank.txt. Does not find generators.
+HomRank("t10_hom.txt") = {{69},{70, 71, 72, 73}};
// More examples (uncomment):
-// HomGen("t10_homgen.msh_1") = {{69}, {}};
-// HomGen("t10_homgen.msh_2") = {{69}, {74}};
-
-
+// HomGen("t10_hom.msh") = {{69}, {}};
+// HomGen("t10_hom.msh") = {{}, {}};
+// HomGen("t10_hom.msh") = {{69}, {74}};
+// HomGen("t10_hom.msh") = {{}, {74}};