diff --git a/Geo/GEntity.h b/Geo/GEntity.h
index 78958893910eeee3bdeb161169e6d8bfbdec7f87..dfa1a7112ccf18fe1ffe5e0397bfba7280f4c62d 100644
--- a/Geo/GEntity.h
+++ b/Geo/GEntity.h
@@ -77,6 +77,7 @@ class GEntity {
Bezier,
ParametricCurve,
BoundaryLayerCurve,
+ CompoundCurve,
DiscreteCurve,
Plane,
Nurb,
@@ -116,6 +117,7 @@ class GEntity {
"Bezier",
"Parametric curve",
"Boundary layer curve",
+ "Compound curve",
"Discrete curve",
"Plane",
"Nurb",
diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp
index da632e375554d044a92a1569e9f96b757d951072..ec2349c55feb0e4572d051c9893ab8a745a9e720 100644
--- a/Geo/GModel.cpp
+++ b/Geo/GModel.cpp
@@ -874,14 +874,14 @@ int GModel::removeDuplicateMeshVertices(double tolerance)
MElement *e2 = factory.create(e->getTypeForMSH(), verts, e->getNum(),
e->getPartition());
switch(e2->getNumEdges()){
- case 0: elements[0][entities[i]->tag()].push_back(e2); break;
- case 1: elements[1][entities[i]->tag()].push_back(e2); break;
- case 3: elements[2][entities[i]->tag()].push_back(e2); break;
- case 4: elements[3][entities[i]->tag()].push_back(e2); break;
- case 6: elements[4][entities[i]->tag()].push_back(e2); break;
+ case 0: elements[0][entities[i]->tag()].push_back(e2); break;
+ case 1: elements[1][entities[i]->tag()].push_back(e2); break;
+ case 3: elements[2][entities[i]->tag()].push_back(e2); break;
+ case 4: elements[3][entities[i]->tag()].push_back(e2); break;
+ case 6: elements[4][entities[i]->tag()].push_back(e2); break;
case 12: elements[5][entities[i]->tag()].push_back(e2); break;
- case 9: elements[6][entities[i]->tag()].push_back(e2); break;
- case 8: elements[7][entities[i]->tag()].push_back(e2); break;
+ case 9: elements[6][entities[i]->tag()].push_back(e2); break;
+ case 8: elements[7][entities[i]->tag()].push_back(e2); break;
}
}
}
diff --git a/Geo/GModelIO_Geo.cpp b/Geo/GModelIO_Geo.cpp
index 2345fdb38dcfe97fc69fa9315044c4f881b2ded7..072ea30450b495e73883647deb9c67907f67e241 100644
--- a/Geo/GModelIO_Geo.cpp
+++ b/Geo/GModelIO_Geo.cpp
@@ -14,6 +14,7 @@
#include "gmshVertex.h"
#include "gmshFace.h"
#include "GFaceCompound.h"
+#include "GEdgeCompound.h"
#include "gmshEdge.h"
#include "gmshRegion.h"
#include "Field.h"
@@ -114,16 +115,20 @@ int GModel::importGEOInternals()
PhysicalGroup *p;
List_Read(_geo_internals->PhysicalGroups, i, &p);
std::list<GFace*>f_compound;
+ std::vector<GEdge*>e_compound;
for(int j = 0; j < List_Nbr(p->Entities); j++){
int num;
List_Read(p->Entities, j, &num);
GEntity *ge = 0;
switch(p->Typ){
case MSH_PHYSICAL_POINT: ge = getVertexByTag(abs(num)); break;
- case MSH_PHYSICAL_LINE: ge = getEdgeByTag(abs(num)); break;
+ case MSH_PHYSICAL_LINE:
+ ge = getEdgeByTag(abs(num));
+ e_compound.push_back(getEdgeByTag(abs(num)));
+ break;
case MSH_PHYSICAL_SURFACE:
+ ge = getFaceByTag(abs(num));
f_compound.push_back(getFaceByTag(abs(num)));
- ge = getFaceByTag(abs(num));
break;
case MSH_PHYSICAL_VOLUME: ge = getRegionByTag(abs(num)); break;
}
@@ -134,6 +139,18 @@ int GModel::importGEOInternals()
}
// the physical is a compound i.e. we allow the meshes
// not to conform internal MEdges of the compound
+ // the physical is a compound i.e. we allow the meshes
+ // not to conform internal MEdges of the compound
+
+ if (p->Typ == MSH_PHYSICAL_LINE && p->Boundaries[0]){
+ GEdge *ge = getEdgeByTag(abs(p->Num));
+ if (!ge){
+ GEdgeCompound *ge = new GEdgeCompound(this, p->Num, e_compound);
+ add(ge);
+ }
+ else
+ ge->resetMeshAttributes();
+ }
if (p->Typ == MSH_PHYSICAL_SURFACE && p->Boundaries[0]){
int i = 0;
List_T *bnd;
diff --git a/Geo/Geo.cpp b/Geo/Geo.cpp
index ff2e65047e9fc46cb35b47b0d88d29f9473b7e9d..3f1bbba3732603b15d1205044b0f3899e2852668 100644
--- a/Geo/Geo.cpp
+++ b/Geo/Geo.cpp
@@ -2898,17 +2898,55 @@ bool ProjectPointOnSurface(Surface *s, Vertex &p, double uv[2])
x(1) = uv[1];
PointSurface ps = {&p, s};
+ Vertex pp = InterpolateSurface(s, uv[0],uv[1], 0, 0);
+ double d2 = (pp.Pos.X - p.Pos.X)*(pp.Pos.X - p.Pos.X) +
+ (pp.Pos.Y - p.Pos.Y)*(pp.Pos.Y - p.Pos.Y) +
+ (pp.Pos.Z - p.Pos.Z)*(pp.Pos.Z - p.Pos.Z) ;
+ if (d2 < 1.e-12)return true;
+
+
double UMIN = 0.;
double UMAX = 1.;
double VMIN = 0.;
double VMAX = 1.;
+ int ITER = 0;
while(1) {
- newton_fd(projectPS, x, &ps);
- p = InterpolateSurface(s, x(0), x(1), 0, 0);
- if(x(0) >= UMIN && x(0) <= UMAX && x(1) >= VMIN && x(1) <= VMAX)
- break;
+ bool success = newton_fd(projectPS, x, &ps);
+ if(success && x(0) >= UMIN && x(0) <= UMAX && x(1) >= VMIN && x(1) <= VMAX){
+ p = InterpolateSurface(s, x(0), x(1), 0, 0);
+ uv[0] = x(0);
+ uv[1] = x(1);
+ if (ITER > 0)Msg::Info("ProjectPoint (%g,%g,%g) On Surface %d converged after %d iterations",p.Pos.X,p.Pos.Y,p.Pos.Z,s->Num,ITER);
+ return true;
+ }
x(0) = UMIN + (UMAX - UMIN) * ((rand() % 10000) / 10000.);
x(1) = VMIN + (VMAX - VMIN) * ((rand() % 10000) / 10000.);
+ if (ITER++ > 100)break;
+ }
+ {
+ int NSAMPLES = 500;
+ double uok,vok;
+ double dmin = 1.e22;
+ for (int i=0;i<NSAMPLES;i++){
+ const double U = i/(double)(NSAMPLES-1);
+ for (int j=0;j<NSAMPLES;j++){
+ const double V = j/(double)(NSAMPLES-1);
+ Vertex pp = InterpolateSurface(s, U, V, 0, 0);
+ double d2 = (pp.Pos.X - p.Pos.X)*(pp.Pos.X - p.Pos.X) +
+ (pp.Pos.Y - p.Pos.Y)*(pp.Pos.Y - p.Pos.Y) +
+ (pp.Pos.Z - p.Pos.Z)*(pp.Pos.Z - p.Pos.Z) ;
+ if (d2 < dmin) {
+ dmin = d2;
+ uok = U;
+ vok = V;
+ }
+ }
+ }
+ p = InterpolateSurface(s, uok, vok, 0, 0);
+ uv[0] = uok;
+ uv[1] = vok;
+ if (ITER > 0)Msg::Info("Brute force method used for projection of point (%g %g %g) on surface %d",p.Pos.X,p.Pos.Y,p.Pos.Z,s->Num);
+ return true;
}
return false;
}
@@ -3095,8 +3133,10 @@ void sortEdgesInLoop(int num, List_T *edges)
List_Read(edges, i, &j);
if((c = FindCurve(j)))
List_Add(temp, &c);
- else
+ else{
+ return;
Msg::Error("Unknown curve %d in line loop %d", j, num);
+ }
}
List_Reset(edges);
diff --git a/Geo/MElement.h b/Geo/MElement.h
index 3bfd5002f596ba58afbee2b25542572e2a5dbce8..876fe70b899e5b9bee5fa5168bd2800aa3cb4572 100644
--- a/Geo/MElement.h
+++ b/Geo/MElement.h
@@ -742,6 +742,7 @@ class MTriangleN : public MTriangle {
}
virtual int getTypeForMSH() const
{
+ if(_order == 2 && _vs.size() == 3) return MSH_TRI_6;
if(_order == 3 && _vs.size() == 6) return MSH_TRI_9;
if(_order == 3 && _vs.size() == 7) return MSH_TRI_10;
if(_order == 4 && _vs.size() == 9) return MSH_TRI_12;
diff --git a/Geo/Makefile b/Geo/Makefile
index 4b260b78fbd9f18be6d94c2ab9206cd5686eebea..9e99d4363732b3d116a49cfcf43f9f7a4442d53c 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -15,7 +15,7 @@ INC = ${DASH}I../Common ${DASH}I../Geo ${DASH}I../Mesh\
CFLAGS = ${OPTIM} ${FLAGS} ${INC} ${SYSINCLUDE}
SRC = GEntity.cpp\
- GVertex.cpp GEdge.cpp GEdgeLoop.cpp GFace.cpp GFaceCompound.cpp GRegion.cpp\
+ GVertex.cpp GEdge.cpp GEdgeLoop.cpp GFace.cpp GEdgeCompound.cpp GFaceCompound.cpp GRegion.cpp\
gmshVertex.cpp gmshEdge.cpp gmshFace.cpp gmshRegion.cpp gmshSurface.cpp\
OCCVertex.cpp OCCEdge.cpp OCCFace.cpp OCCRegion.cpp\
discreteEdge.cpp discreteFace.cpp discreteRegion.cpp\
@@ -93,6 +93,10 @@ GFace${OBJEXT}: GFace.cpp ../Common/GmshConfig.h ../Common/GmshMessage.h \
../Common/VertexArray.h ../Geo/SVector3.h ../Numeric/Numeric.h \
../Numeric/GmshMatrix.h ../Numeric/GaussLegendre1D.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/meshPartitionOptions.h
+GEdgeCompound${OBJEXT}: GEdgeCompound.cpp ../Common/GmshConfig.h GEdgeCompound.h \
+ GFace.h GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h \
+ GEdgeLoop.h GEdge.h GVertex.h SPoint2.h SVector3.h Pair.h \
+ ../Numeric/Numeric.h ../Numeric/GmshMatrix.h ../Common/GmshMessage.h
GFaceCompound${OBJEXT}: GFaceCompound.cpp ../Common/GmshConfig.h GFaceCompound.h \
GFace.h GEntity.h Range.h SPoint3.h SBoundingBox3d.h GPoint.h \
GEdgeLoop.h GEdge.h GVertex.h SPoint2.h SVector3.h Pair.h \
@@ -232,9 +236,9 @@ GModelIO_Geo${OBJEXT}: GModelIO_Geo.cpp ../Common/GmshConfig.h \
gmshSurface.h ../Numeric/Numeric.h ../Numeric/GmshMatrix.h \
../Common/ListUtils.h ../Common/TreeUtils.h ../Common/avl.h \
../Common/ListUtils.h ExtrudeParams.h ../Common/SmoothData.h \
- ../Common/OpenFile.h gmshVertex.h gmshFace.h GFaceCompound.h gmshEdge.h \
- gmshRegion.h ../Mesh/Field.h ../Post/PView.h ../Geo/SPoint3.h \
- ../Parser/Parser.h
+ ../Common/OpenFile.h gmshVertex.h gmshFace.h GFaceCompound.h \
+ GEdgeCompound.h gmshEdge.h gmshRegion.h ../Mesh/Field.h ../Post/PView.h \
+ ../Geo/SPoint3.h ../Parser/Parser.h
GModelIO_Mesh${OBJEXT}: GModelIO_Mesh.cpp GModel.h GVertex.h GEntity.h Range.h \
SPoint3.h SBoundingBox3d.h GPoint.h SPoint2.h GEdge.h SVector3.h \
GFace.h GEdgeLoop.h Pair.h GRegion.h ../Common/GmshDefines.h MElement.h \
diff --git a/Mesh/BackgroundMesh.cpp b/Mesh/BackgroundMesh.cpp
index 37f0230340f46e2bac13c2cbf42d86e2fe8037e4..6c05841e431306871c3b0c4079c52df6bde8703b 100644
--- a/Mesh/BackgroundMesh.cpp
+++ b/Mesh/BackgroundMesh.cpp
@@ -75,16 +75,16 @@ static double LC_MVertex_CURV(GEntity *ge, double U, double V)
double Crv = 0;
switch(ge->dim()){
case 0:
- // Crv = max_edge_curvature((const GVertex *)ge);
- // Crv = std::max(max_surf_curvature((const GVertex *)ge), Crv);
- Crv = max_surf_curvature((const GVertex *)ge);
+ Crv = max_edge_curvature((const GVertex *)ge);
+ Crv = std::max(max_surf_curvature((const GVertex *)ge), Crv);
+ //Crv = max_surf_curvature((const GVertex *)ge);
break;
case 1:
{
GEdge *ged = (GEdge *)ge;
- //Crv = ged->curvature(U);
- //Crv = std::max(Crv, max_surf_curvature(ged, U));
- Crv = max_surf_curvature(ged, U);
+ Crv = ged->curvature(U);
+ Crv = std::max(Crv, max_surf_curvature(ged, U));
+ //Crv = max_surf_curvature(ged, U);
}
break;
case 2:
diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index ce58393c77739d8d3d005890c4f330a7ad61f360..091531d6fea9effb214afd48749ef08c172802ce 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -1044,10 +1044,13 @@ void SetOrderN(GModel *m, int order, bool linear, bool incomplete)
// we do that model face by model face
std::vector<MElement*> bad;
double worst;
- if (displ2D){
+ if (1 || displ2D){
checkHighOrderTriangles(m, bad, worst);
for(GModel::fiter it = m->firstFace(); it != m->lastFace(); ++it)
- if ((*it)->geomType() == GEntity::Plane) displ2D->smooth(*it);
+ if ((*it)->geomType() == GEntity::Plane) {
+ gmshSwapHighOrderTriangles(*it);
+ if (displ2D)displ2D->smooth(*it);
+ }
// will have to smooth in the planar coordinates, using the metric
}
diff --git a/Mesh/gmshSmoothHighOrder.cpp b/Mesh/gmshSmoothHighOrder.cpp
index ef5e22824f30d117de512ece7efdbdcffccfe2d2..b7a7e8f9fe5b86c7f1164393290783a6287fc939 100644
--- a/Mesh/gmshSmoothHighOrder.cpp
+++ b/Mesh/gmshSmoothHighOrder.cpp
@@ -209,9 +209,210 @@ void gmshHighOrderSmoother::smooth ( std::vector<MElement*> & all)
delete lsys;
+}
+
+/*
+ n3 n23 n2
+ x-----x-------x
+ | /|
+ | t1 / |
+ | / |
+ x n13 x n12 x n24
+ | / |
+ | / t2 |
+ |/ |
+ x------x------x
+ n1 n14 n4
+*/
+
+static double surfaceTriangleUV(SPoint2 &v1, SPoint2 &v2, SPoint2 &v3)
+{
+ const double v12[2] = {v2.x() - v1.x(),v2.y() - v1.y()};
+ const double v13[2] = {v3.x() - v1.x(),v3.y() - v1.y()};
+ return 0.5 * fabs (v12[0] * v13[1] - v12[1] * v13[0]);
+}
+
+
+
+struct swap_triangles_p2
+{
+ MTriangle *t1, *t2;
+ MTriangle *t3, *t4;
+ double quality_old;
+ double quality_new;
+ double s_before,s_after;
+ MVertex *n1, *n2, *n3, *n4;
+ MVertex *n12, *n13, *n23, *n14, *n24;
+ MVertex *n34;
+ swap_triangles_p2(const MEdge &me, MTriangle *_t1, MTriangle *_t2, GFace *gf)
+ : t1(_t1), t2(_t2),n1(0),n2(0),n3(0),n12(0),n13(0), n23(0), n14(0), n24(0),n34(0)
+ {
+ n1 = me.getVertex(0);
+ n2 = me.getVertex(1);
+
+ if (t1->getVertex(0) != n1 && t1->getVertex(0) != n2) n3 = t1->getVertex(0);
+ else if (t1->getVertex(1) != n1 && t1->getVertex(1) != n2) n3 = t1->getVertex(1);
+ else if (t1->getVertex(2) != n1 && t1->getVertex(2) != n2) n3 = t1->getVertex(2);
+ int iStart = 0;
+ for (;iStart<3;iStart++)
+ if (t1->getVertex(iStart) == n1)
+ break;
+ if (n2 == t1->getVertex((iStart+1)%3)){
+ n12 = t1->getVertex((iStart+0)%3 + 3);
+ n23 = t1->getVertex((iStart+1)%3 + 3);
+ n13 = t1->getVertex((iStart+2)%3 + 3);
+ }
+ else{
+ n13 = t1->getVertex((iStart+0)%3 + 3);
+ n23 = t1->getVertex((iStart+1)%3 + 3);
+ n12 = t1->getVertex((iStart+2)%3 + 3);
+ }
+
+ if (t2->getVertex(0) != n1 && t2->getVertex(0) != n2) n4 = t2->getVertex(0);
+ else if (t2->getVertex(1) != n1 && t2->getVertex(1) != n2) n4 = t2->getVertex(1);
+ else if (t2->getVertex(2) != n1 && t2->getVertex(2) != n2) n4 = t2->getVertex(2);
+ iStart = 0;
+ for (;iStart<3;iStart++)
+ if (t2->getVertex(iStart) == n1)
+ break;
+ if (n2 == t2->getVertex((iStart+1)%3)){
+ n24 = t2->getVertex((iStart+1)%3 + 3);
+ n14 = t2->getVertex((iStart+2)%3 + 3);
+ }
+ else{
+ n14 = t2->getVertex((iStart+0)%3 + 3);
+ n24 = t2->getVertex((iStart+1)%3 + 3);
+ }
+
+ //printf("%p %p %p %p %p %p %p %p %p\n",n1,n2,n3,n4,n12,n23,n13,n24,n14);
+
+ SPoint2 p1,p2,p3,p4;
+ reparamMeshEdgeOnFace(n1,n2,gf,p1,p2);
+ reparamMeshEdgeOnFace(n3,n4,gf,p3,p4);
+
+ s_before = surfaceTriangleUV(p1,p2,p4) + surfaceTriangleUV(p1,p2,p3);
+ s_after = surfaceTriangleUV(p3,p4,p1) + surfaceTriangleUV(p3,p4,p2);
+
+ SPoint2 p34 = (p3+p4)*.5;
+ GPoint gp34 = gf->point(p34);
+ n34 = new MFaceVertex (gp34.x(),gp34.y(),gp34.z(),gf,p34.x(),p34.y());
+
+ const double qold1 = t1->distoShapeMeasure() * t1->gammaShapeMeasure();
+ const double qold2 = t2->distoShapeMeasure() * t2->gammaShapeMeasure();
+
+ std::vector<MVertex *>vv;
+ vv.push_back(n13);vv.push_back(n34);vv.push_back(n14);
+ t3 = new MTriangleN (n1,n3,n4,vv,2,t1->getNum(),t1->getPartition());
+ vv.clear();
+ vv.push_back(n34);vv.push_back(n23);vv.push_back(n24);
+ t4 = new MTriangleN (n4,n3,n2,vv,2,t2->getNum(),t2->getPartition());
+
+ const double qnew1 = t3->distoShapeMeasure() * t3->gammaShapeMeasure();
+ const double qnew2 = t4->distoShapeMeasure() * t4->gammaShapeMeasure();
+
+ quality_old = std::min(qold1,qold2);
+ quality_new = std::min(qnew1,qnew2);
+
+ }
+ bool operator < (const swap_triangles_p2 &other) const
+ {
+ return other.quality_new - other.quality_old < quality_new - quality_old;
+ }
+ void print() const{
+ printf("%d %d %d %d %d %d\n",t1->getVertex(0)->getNum(),t1->getVertex(1)->getNum(),t1->getVertex(2)->getNum(),
+ t1->getVertex(3)->getNum(),t1->getVertex(4)->getNum(),t1->getVertex(5)->getNum());
+ printf("%d %d %d %d %d %d\n",t2->getVertex(0)->getNum(),t2->getVertex(1)->getNum(),t2->getVertex(2)->getNum(),
+ t2->getVertex(3)->getNum(),t2->getVertex(4)->getNum(),t2->getVertex(5)->getNum());
+ printf("%d %d %d %d %d %d\n",t3->getVertex(0)->getNum(),t3->getVertex(1)->getNum(),t3->getVertex(2)->getNum(),
+ t3->getVertex(3)->getNum(),t3->getVertex(4)->getNum(),t3->getVertex(5)->getNum());
+ printf("%d %d %d %d %d %d\n",t4->getVertex(0)->getNum(),t4->getVertex(1)->getNum(),t4->getVertex(2)->getNum(),
+ t4->getVertex(3)->getNum(),t4->getVertex(4)->getNum(),t4->getVertex(5)->getNum());
+ printf("%d %d %d %d %d %d %d %d %d\n",n1->getNum(),
+ n2->getNum(),n3->getNum(),n4->getNum(),
+ n12->getNum(),n23->getNum(),n13->getNum(),n24->getNum(),n14->getNum());
+ }
+};
+
+
+static int _gmshSwapHighOrderTriangles(GFace *gf)
+{
+ e2t_cont adj;
+ buildEdgeToTriangle(gf->triangles, adj);
+
+ std::set<swap_triangles_p2> pairs;
+
+ for (e2t_cont::iterator it = adj.begin(); it!= adj.end(); ++it){
+ if (it->second.second)
+ pairs.insert(swap_triangles_p2(it->first,
+ dynamic_cast<MTriangle*>(it->second.first),
+ dynamic_cast<MTriangle*>(it->second.second),
+ gf));
+ }
+
+ int nbSwap = 0;
+
+ std::set<MTriangle*> t_removed;
+ std::set<MVertex*> v_removed;
+ std::set<swap_triangles_p2>::iterator itp = pairs.begin();
+
+ std::vector<MTriangle*> triangles2;
+ std::vector<MVertex*> mesh_vertices2;
+
+ while(itp != pairs.end()){
+ double diff = fabs(itp->s_before - itp->s_after);
+ if ( t_removed.find(itp->t1) == t_removed.end() &&
+ t_removed.find(itp->t2) == t_removed.end() &&
+ itp->quality_new - itp->quality_old > 0.01 &&
+ diff < 1.e-9){
+ t_removed.insert(itp->t1);
+ t_removed.insert(itp->t2);
+ v_removed.insert(itp->n12);
+ itp->print();
+ triangles2.push_back(itp->t3);
+ triangles2.push_back(itp->t4);
+ mesh_vertices2.push_back(itp->n34);
+ nbSwap++;
+ }
+ else{
+ delete itp->t3;
+ delete itp->t4;
+ delete itp->n34;
+ }
+ ++itp;
+ }
+
+
+ for (unsigned int i = 0; i < gf->mesh_vertices.size(); i++){
+ if (v_removed.find(gf->mesh_vertices[i]) == v_removed.end()){
+ mesh_vertices2.push_back(gf->mesh_vertices[i]);
+ }
+ else {
+ delete gf->mesh_vertices[i];
+ }
+ }
+ gf->mesh_vertices = mesh_vertices2;
+
+ for (unsigned int i = 0; i < gf->triangles.size(); i++){
+ if (t_removed.find(gf->triangles[i]) == t_removed.end()){
+ triangles2.push_back(gf->triangles[i]);
+ }
+ else {
+ delete gf->triangles[i];
+ }
+ }
+ // printf("replacing %d by %d\n",gf->triangles.size(),triangles2.size());
+ gf->triangles = triangles2;
+ return nbSwap;
+}
+
+void gmshSwapHighOrderTriangles(GFace *gf){
+ while(_gmshSwapHighOrderTriangles(gf));
+ // _gmshSwapHighOrderTriangles(gf);
}
+
+
////////////////////////////////////////////////////////////////////////////////
// OLD STUFF : STILL USED ?
////////////////////////////////////////////////////////////////////////////////
diff --git a/Mesh/gmshSmoothHighOrder.h b/Mesh/gmshSmoothHighOrder.h
index f927f8d701dcb001b8a2cf8ec2080dc7c7c0d792..91858db4b10411156fffbcf87d0db074e9c8c6f7 100644
--- a/Mesh/gmshSmoothHighOrder.h
+++ b/Mesh/gmshSmoothHighOrder.h
@@ -15,6 +15,8 @@ class MElement;
class GFace;
class GRegion;
+void gmshSwapHighOrderTriangles(GFace *gf);
+
class gmshHighOrderSmoother
{
const int _tag;
diff --git a/Mesh/meshGFace.cpp b/Mesh/meshGFace.cpp
index ababe01f6c214aa89b8736efd83a75d86960bca1..a2865db6abace8adcf79d4bf4874035f7e178e9b 100644
--- a/Mesh/meshGFace.cpp
+++ b/Mesh/meshGFace.cpp
@@ -364,7 +364,7 @@ static bool recover_medge_old(BDS_Mesh *m, GEdge *ge, std::set<EdgeToRecover> *e
// Builds An initial triangular mesh that respects the boundaries of
// the domain, including embedded points and surfaces
-static bool gmsh2DMeshGenerator(GFace *gf, int RECUR_ITER, bool debug = true)
+static bool gmsh2DMeshGenerator(GFace *gf, int RECUR_ITER, bool repairSelfIntersecting1dMesh, bool debug = true)
{
BDS_GeomEntity CLASS_F (1, 2);
typedef std::set<MVertex*> v_container;
@@ -573,7 +573,10 @@ static bool gmsh2DMeshGenerator(GFace *gf, int RECUR_ITER, bool debug = true)
}
std::list<GFace *> facesToRemesh;
- remeshUnrecoveredEdges(edgesNotRecovered, facesToRemesh);
+ if (repairSelfIntersecting1dMesh)
+ remeshUnrecoveredEdges(edgesNotRecovered, facesToRemesh);
+ else
+ throw edgesNotRecovered;
std::set<EdgeToRecover>::iterator itr = edgesNotRecovered.begin();
for (; itr != edgesNotRecovered.end(); ++itr){
int p1 = itr->p1;
@@ -586,7 +589,7 @@ static bool gmsh2DMeshGenerator(GFace *gf, int RECUR_ITER, bool debug = true)
delete [] U_;
delete [] V_;
if (RECUR_ITER < 10 && facesToRemesh.size() == 0)
- return gmsh2DMeshGenerator(gf, RECUR_ITER+1, debug);
+ return gmsh2DMeshGenerator(gf, RECUR_ITER+1, repairSelfIntersecting1dMesh, debug);
return false;
}
if(RECUR_ITER > 0)
@@ -1370,7 +1373,7 @@ void meshGFace::operator() (GFace *gf)
Msg::Debug("Generating the mesh");
if(noseam(gf) || gf->getNativeType() == GEntity::GmshModel || gf->edgeLoops.empty()){
//gmsh2DMeshGeneratorPeriodic(gf, debugSurface >= 0 || debugSurface == -100);
- gmsh2DMeshGenerator(gf, 0, debugSurface >= 0 || debugSurface == -100);
+ gmsh2DMeshGenerator(gf, 0, repairSelfIntersecting1dMesh, debugSurface >= 0 || debugSurface == -100);
}
else{
if(!gmsh2DMeshGeneratorPeriodic(gf, debugSurface >= 0 || debugSurface == -100))
diff --git a/Mesh/meshGFace.h b/Mesh/meshGFace.h
index cc6e56a127f1d6f3f6d11726dffda2c0761b56d5..1aa07c28741e634dc40bbf5c8a10dbdbb2785411 100644
--- a/Mesh/meshGFace.h
+++ b/Mesh/meshGFace.h
@@ -14,7 +14,9 @@ class MVertex;
// Create the mesh of the face
class meshGFace {
+ const bool repairSelfIntersecting1dMesh;
public :
+ meshGFace (bool r = true) : repairSelfIntersecting1dMesh(true) {}
void operator () (GFace *);
};
diff --git a/Mesh/meshGRegion.cpp b/Mesh/meshGRegion.cpp
index ce45e0900b4085e3f73ac45a3b9adbafbb6275ce..b387e5ac1ae8a795fb3be1920f735a837efabb01 100644
--- a/Mesh/meshGRegion.cpp
+++ b/Mesh/meshGRegion.cpp
@@ -200,10 +200,11 @@ void TransferTetgenMesh(GRegion *gr, tetgenio &in, tetgenio &out,
// To be safe, we should ensure that this mesh motion does not lead to an invalid mesh !!!!
//v1b = new MVertex(gp.x(),gp.y(),gp.z(),gf);
- if (gp.g()){
+ if (gp.g() ){
+ //v1b = new MFaceVertex(v[j]->x(), v[j]->y(), v[j]->z(),gf,gp.u(),gp.v());
v1b = new MFaceVertex(gp.x(),gp.y(),gp.z(),gf,gp.u(),gp.v());
- Msg::Info("The point has been projected back to the surface (%g %g %g) -> (%g %g %g)",
- v[j]->x(), v[j]->y(), v[j]->z(),gp.x(),gp.y(),gp.z());
+ // Msg::Info("The point has been projected back to the surface (%g %g %g) -> (%g %g %g)",
+ // v[j]->x(), v[j]->y(), v[j]->z(),gp.x(),gp.y(),gp.z());
}
else{
v1b = new MVertex(v[j]->x(), v[j]->y(), v[j]->z(),gf);
@@ -216,7 +217,7 @@ void TransferTetgenMesh(GRegion *gr, tetgenio &in, tetgenio &out,
gf->mesh_vertices.push_back(v1b);
numberedV[out.trifacelist[i * 3 + j] - 1] = v1b;
- delete v[j];
+ delete v[j];
v[j] = v1b;
}
}
diff --git a/Numeric/Numeric.cpp b/Numeric/Numeric.cpp
index 335e79ea7e7d4a48a99c1c2324482e62ffff516b..9b17a2c310ae8c44c9a6b31c3f921254575bdc78 100644
--- a/Numeric/Numeric.cpp
+++ b/Numeric/Numeric.cpp
@@ -509,6 +509,14 @@ bool newton_fd(void (*func)(gmshVector<double> &, gmshVector<double> &, void *),
if (N == 1)
dx(0) = f(0) / J(0, 0);
+ else if (N == -2){
+ const double det = J(0,0)*J(1,1) - J(1,0)*J(0,1);
+ if (det == 0.0)
+ printf("oops\n");
+ printf("oops\n");
+ dx(0) = (f(0)*J(1,1) - f(1)*J(0,1))/det;
+ dx(1) = -(f(0)*J(0,0) - f(1)*J(1,0))/det;
+ }
else
J.lu_solve(f, dx);
diff --git a/Numeric/gmshElasticity.cpp b/Numeric/gmshElasticity.cpp
index 79f95453fe9255b403ae1a61c0d119af2f637579..379e72d64b73cd5bda1413055dbc3858b0cef1f4 100644
--- a/Numeric/gmshElasticity.cpp
+++ b/Numeric/gmshElasticity.cpp
@@ -9,7 +9,7 @@
void gmshElasticityTerm::elementMatrix(MElement *e, gmshMatrix<double> &m) const
{
int nbNodes = e->getNumVertices();
- int integrationOrder = 2 * (e->getPolynomialOrder() - 1);
+ int integrationOrder = 3 * (e->getPolynomialOrder() - 1);
int npts;
IntPt *GP;
double jac[3][3];
diff --git a/Parser/Gmsh.tab.cpp b/Parser/Gmsh.tab.cpp
index 37b3ca182c92bf6dd0c143aa418647c9850e2c0f..a00bfa534740853eb82ea96b9a9cb97679b0d7cd 100644
--- a/Parser/Gmsh.tab.cpp
+++ b/Parser/Gmsh.tab.cpp
@@ -649,16 +649,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 5
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 6191
+#define YYLAST 6432
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 141
/* YYNNTS -- Number of nonterminals. */
#define YYNNTS 74
/* YYNRULES -- Number of rules. */
-#define YYNRULES 358
+#define YYNRULES 359
/* YYNRULES -- Number of states. */
-#define YYNSTATES 1250
+#define YYNSTATES 1257
/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX. */
#define YYUNDEFTOK 2
@@ -726,31 +726,31 @@ static const yytype_uint16 yyprhs[] =
375, 383, 393, 403, 415, 425, 435, 437, 439, 440,
446, 447, 450, 458, 467, 474, 482, 490, 499, 508,
526, 534, 542, 554, 563, 572, 581, 591, 595, 600,
- 611, 619, 627, 636, 645, 658, 667, 675, 684, 690,
- 702, 708, 718, 723, 733, 743, 745, 747, 748, 751,
- 758, 765, 772, 779, 784, 791, 798, 802, 807, 813,
- 817, 821, 826, 831, 835, 843, 851, 855, 863, 867,
- 870, 873, 889, 892, 899, 908, 917, 928, 930, 933,
- 935, 939, 944, 946, 952, 964, 978, 979, 987, 988,
- 1002, 1003, 1019, 1020, 1027, 1036, 1045, 1054, 1067, 1080,
- 1093, 1108, 1123, 1138, 1139, 1152, 1153, 1166, 1167, 1180,
- 1181, 1198, 1199, 1216, 1217, 1234, 1235, 1254, 1255, 1274,
- 1275, 1294, 1296, 1299, 1305, 1313, 1323, 1326, 1336, 1337,
- 1341, 1342, 1344, 1345, 1348, 1349, 1352, 1360, 1367, 1376,
- 1382, 1388, 1395, 1406, 1417, 1428, 1439, 1442, 1446, 1448,
- 1452, 1455, 1458, 1461, 1465, 1469, 1473, 1477, 1481, 1485,
- 1489, 1493, 1497, 1501, 1505, 1509, 1513, 1517, 1523, 1528,
- 1533, 1538, 1543, 1548, 1553, 1558, 1563, 1568, 1573, 1580,
- 1585, 1590, 1595, 1600, 1605, 1610, 1617, 1624, 1631, 1636,
- 1641, 1646, 1651, 1656, 1661, 1666, 1671, 1676, 1681, 1686,
- 1693, 1698, 1703, 1708, 1713, 1718, 1723, 1730, 1737, 1744,
- 1749, 1751, 1753, 1755, 1757, 1759, 1761, 1763, 1765, 1771,
- 1776, 1781, 1784, 1790, 1794, 1801, 1806, 1814, 1821, 1823,
- 1826, 1829, 1833, 1837, 1849, 1859, 1867, 1875, 1877, 1881,
- 1883, 1885, 1888, 1892, 1897, 1903, 1905, 1907, 1910, 1914,
- 1918, 1924, 1929, 1931, 1933, 1937, 1944, 1946, 1948, 1952,
- 1956, 1966, 1974, 1976, 1982, 1986, 1993, 1995, 1999, 2001,
- 2003, 2007, 2014, 2016, 2018, 2025, 2030, 2035, 2040
+ 611, 619, 627, 636, 645, 658, 667, 676, 684, 693,
+ 699, 711, 717, 727, 732, 742, 752, 754, 756, 757,
+ 760, 767, 774, 781, 788, 793, 800, 807, 811, 816,
+ 822, 826, 830, 835, 840, 844, 852, 860, 864, 872,
+ 876, 879, 882, 898, 901, 908, 917, 926, 937, 939,
+ 942, 944, 948, 953, 955, 961, 973, 987, 988, 996,
+ 997, 1011, 1012, 1028, 1029, 1036, 1045, 1054, 1063, 1076,
+ 1089, 1102, 1117, 1132, 1147, 1148, 1161, 1162, 1175, 1176,
+ 1189, 1190, 1207, 1208, 1225, 1226, 1243, 1244, 1263, 1264,
+ 1283, 1284, 1303, 1305, 1308, 1314, 1322, 1332, 1335, 1345,
+ 1346, 1350, 1351, 1353, 1354, 1357, 1358, 1361, 1369, 1376,
+ 1385, 1391, 1397, 1404, 1415, 1426, 1437, 1448, 1451, 1455,
+ 1457, 1461, 1464, 1467, 1470, 1474, 1478, 1482, 1486, 1490,
+ 1494, 1498, 1502, 1506, 1510, 1514, 1518, 1522, 1526, 1532,
+ 1537, 1542, 1547, 1552, 1557, 1562, 1567, 1572, 1577, 1582,
+ 1589, 1594, 1599, 1604, 1609, 1614, 1619, 1626, 1633, 1640,
+ 1645, 1650, 1655, 1660, 1665, 1670, 1675, 1680, 1685, 1690,
+ 1695, 1702, 1707, 1712, 1717, 1722, 1727, 1732, 1739, 1746,
+ 1753, 1758, 1760, 1762, 1764, 1766, 1768, 1770, 1772, 1774,
+ 1780, 1785, 1790, 1793, 1799, 1803, 1810, 1815, 1823, 1830,
+ 1832, 1835, 1838, 1842, 1846, 1858, 1868, 1876, 1884, 1886,
+ 1890, 1892, 1894, 1897, 1901, 1906, 1912, 1914, 1916, 1919,
+ 1923, 1927, 1933, 1938, 1940, 1942, 1946, 1953, 1955, 1957,
+ 1961, 1965, 1975, 1983, 1985, 1991, 1995, 2002, 2004, 2008,
+ 2010, 2012, 2016, 2023, 2025, 2027, 2034, 2039, 2044, 2049
};
/* YYRHS -- A `-1'-separated list of the rules' RHS. */
@@ -821,146 +821,147 @@ static const yytype_int16 yyrhs[] =
131, 201, 132, 7, 206, 6, -1, 49, 69, 131,
201, 132, 7, 206, 6, -1, 60, 49, 131, 166,
132, 7, 206, 6, -1, 61, 49, 131, 201, 132,
- 7, 206, 4, 138, 205, 139, 6, -1, 59, 51,
- 131, 201, 132, 7, 206, 6, -1, 51, 131, 201,
- 132, 7, 206, 6, -1, 60, 51, 131, 166, 132,
- 7, 206, 6, -1, 65, 203, 138, 171, 139, -1,
- 64, 138, 203, 137, 203, 137, 201, 139, 138, 171,
- 139, -1, 66, 203, 138, 171, 139, -1, 67, 138,
- 203, 137, 201, 139, 138, 171, 139, -1, 4, 138,
- 171, 139, -1, 75, 46, 138, 209, 139, 49, 138,
- 201, 139, -1, 72, 46, 131, 201, 132, 138, 209,
- 139, 6, -1, 172, -1, 170, -1, -1, 172, 169,
- -1, 172, 43, 138, 209, 139, 6, -1, 172, 46,
- 138, 209, 139, 6, -1, 172, 49, 138, 209, 139,
- 6, -1, 172, 51, 138, 209, 139, 6, -1, 73,
- 138, 172, 139, -1, 73, 98, 133, 201, 134, 6,
- -1, 73, 4, 133, 201, 134, 6, -1, 73, 4,
- 6, -1, 73, 4, 4, 6, -1, 90, 210, 138,
- 172, 139, -1, 102, 5, 6, -1, 103, 5, 6,
- -1, 102, 138, 172, 139, -1, 103, 138, 172, 139,
- -1, 4, 214, 6, -1, 4, 4, 133, 201, 134,
- 213, 6, -1, 4, 4, 4, 133, 201, 134, 6,
- -1, 4, 201, 6, -1, 63, 131, 4, 132, 135,
- 4, 6, -1, 84, 4, 6, -1, 97, 6, -1,
- 40, 6, -1, 40, 138, 201, 137, 201, 137, 201,
- 137, 201, 137, 201, 137, 201, 139, 6, -1, 41,
- 6, -1, 92, 131, 201, 8, 201, 132, -1, 92,
- 131, 201, 8, 201, 8, 201, 132, -1, 92, 4,
- 93, 138, 201, 8, 201, 139, -1, 92, 4, 93,
- 138, 201, 8, 201, 8, 201, 139, -1, 94, -1,
- 101, 4, -1, 99, -1, 100, 4, 6, -1, 95,
- 131, 201, 132, -1, 96, -1, 68, 203, 138, 172,
- 139, -1, 68, 138, 203, 137, 203, 137, 201, 139,
- 138, 172, 139, -1, 68, 138, 203, 137, 203, 137,
- 203, 137, 201, 139, 138, 172, 139, -1, -1, 68,
- 203, 138, 172, 179, 192, 139, -1, -1, 68, 138,
- 203, 137, 203, 137, 201, 139, 138, 172, 180, 192,
- 139, -1, -1, 68, 138, 203, 137, 203, 137, 203,
- 137, 201, 139, 138, 172, 181, 192, 139, -1, -1,
- 68, 138, 172, 182, 192, 139, -1, 68, 43, 138,
- 201, 137, 203, 139, 6, -1, 68, 46, 138, 201,
- 137, 203, 139, 6, -1, 68, 49, 138, 201, 137,
- 203, 139, 6, -1, 68, 43, 138, 201, 137, 203,
- 137, 203, 137, 201, 139, 6, -1, 68, 46, 138,
- 201, 137, 203, 137, 203, 137, 201, 139, 6, -1,
- 68, 49, 138, 201, 137, 203, 137, 203, 137, 201,
+ 7, 206, 4, 138, 205, 139, 6, -1, 61, 46,
+ 131, 201, 132, 7, 206, 6, -1, 59, 51, 131,
+ 201, 132, 7, 206, 6, -1, 51, 131, 201, 132,
+ 7, 206, 6, -1, 60, 51, 131, 166, 132, 7,
+ 206, 6, -1, 65, 203, 138, 171, 139, -1, 64,
+ 138, 203, 137, 203, 137, 201, 139, 138, 171, 139,
+ -1, 66, 203, 138, 171, 139, -1, 67, 138, 203,
+ 137, 201, 139, 138, 171, 139, -1, 4, 138, 171,
+ 139, -1, 75, 46, 138, 209, 139, 49, 138, 201,
+ 139, -1, 72, 46, 131, 201, 132, 138, 209, 139,
+ 6, -1, 172, -1, 170, -1, -1, 172, 169, -1,
+ 172, 43, 138, 209, 139, 6, -1, 172, 46, 138,
+ 209, 139, 6, -1, 172, 49, 138, 209, 139, 6,
+ -1, 172, 51, 138, 209, 139, 6, -1, 73, 138,
+ 172, 139, -1, 73, 98, 133, 201, 134, 6, -1,
+ 73, 4, 133, 201, 134, 6, -1, 73, 4, 6,
+ -1, 73, 4, 4, 6, -1, 90, 210, 138, 172,
+ 139, -1, 102, 5, 6, -1, 103, 5, 6, -1,
+ 102, 138, 172, 139, -1, 103, 138, 172, 139, -1,
+ 4, 214, 6, -1, 4, 4, 133, 201, 134, 213,
+ 6, -1, 4, 4, 4, 133, 201, 134, 6, -1,
+ 4, 201, 6, -1, 63, 131, 4, 132, 135, 4,
+ 6, -1, 84, 4, 6, -1, 97, 6, -1, 40,
+ 6, -1, 40, 138, 201, 137, 201, 137, 201, 137,
+ 201, 137, 201, 137, 201, 139, 6, -1, 41, 6,
+ -1, 92, 131, 201, 8, 201, 132, -1, 92, 131,
+ 201, 8, 201, 8, 201, 132, -1, 92, 4, 93,
+ 138, 201, 8, 201, 139, -1, 92, 4, 93, 138,
+ 201, 8, 201, 8, 201, 139, -1, 94, -1, 101,
+ 4, -1, 99, -1, 100, 4, 6, -1, 95, 131,
+ 201, 132, -1, 96, -1, 68, 203, 138, 172, 139,
+ -1, 68, 138, 203, 137, 203, 137, 201, 139, 138,
+ 172, 139, -1, 68, 138, 203, 137, 203, 137, 203,
+ 137, 201, 139, 138, 172, 139, -1, -1, 68, 203,
+ 138, 172, 179, 192, 139, -1, -1, 68, 138, 203,
+ 137, 203, 137, 201, 139, 138, 172, 180, 192, 139,
+ -1, -1, 68, 138, 203, 137, 203, 137, 203, 137,
+ 201, 139, 138, 172, 181, 192, 139, -1, -1, 68,
+ 138, 172, 182, 192, 139, -1, 68, 43, 138, 201,
+ 137, 203, 139, 6, -1, 68, 46, 138, 201, 137,
+ 203, 139, 6, -1, 68, 49, 138, 201, 137, 203,
139, 6, -1, 68, 43, 138, 201, 137, 203, 137,
- 203, 137, 203, 137, 201, 139, 6, -1, 68, 46,
- 138, 201, 137, 203, 137, 203, 137, 203, 137, 201,
- 139, 6, -1, 68, 49, 138, 201, 137, 203, 137,
- 203, 137, 203, 137, 201, 139, 6, -1, -1, 68,
- 43, 138, 201, 137, 203, 139, 183, 138, 192, 139,
- 6, -1, -1, 68, 46, 138, 201, 137, 203, 139,
- 184, 138, 192, 139, 6, -1, -1, 68, 49, 138,
- 201, 137, 203, 139, 185, 138, 192, 139, 6, -1,
- -1, 68, 43, 138, 201, 137, 203, 137, 203, 137,
- 201, 139, 186, 138, 192, 139, 6, -1, -1, 68,
- 46, 138, 201, 137, 203, 137, 203, 137, 201, 139,
- 187, 138, 192, 139, 6, -1, -1, 68, 49, 138,
- 201, 137, 203, 137, 203, 137, 201, 139, 188, 138,
- 192, 139, 6, -1, -1, 68, 43, 138, 201, 137,
- 203, 137, 203, 137, 203, 137, 201, 139, 189, 138,
- 192, 139, 6, -1, -1, 68, 46, 138, 201, 137,
- 203, 137, 203, 137, 203, 137, 201, 139, 190, 138,
- 192, 139, 6, -1, -1, 68, 49, 138, 201, 137,
- 203, 137, 203, 137, 203, 137, 201, 139, 191, 138,
- 192, 139, 6, -1, 193, -1, 192, 193, -1, 76,
- 138, 201, 139, 6, -1, 76, 138, 206, 137, 206,
- 139, 6, -1, 76, 138, 206, 137, 206, 137, 206,
- 139, 6, -1, 70, 6, -1, 77, 131, 201, 132,
- 7, 206, 62, 201, 6, -1, -1, 62, 4, 201,
- -1, -1, 4, -1, -1, 7, 206, -1, -1, 7,
- 201, -1, 58, 46, 207, 7, 201, 194, 6, -1,
- 58, 49, 207, 196, 195, 6, -1, 55, 49, 138,
- 201, 139, 7, 206, 6, -1, 58, 51, 207, 196,
- 6, -1, 70, 49, 207, 197, 6, -1, 71, 49,
- 206, 7, 201, 6, -1, 43, 138, 209, 139, 93,
+ 203, 137, 201, 139, 6, -1, 68, 46, 138, 201,
+ 137, 203, 137, 203, 137, 201, 139, 6, -1, 68,
+ 49, 138, 201, 137, 203, 137, 203, 137, 201, 139,
+ 6, -1, 68, 43, 138, 201, 137, 203, 137, 203,
+ 137, 203, 137, 201, 139, 6, -1, 68, 46, 138,
+ 201, 137, 203, 137, 203, 137, 203, 137, 201, 139,
+ 6, -1, 68, 49, 138, 201, 137, 203, 137, 203,
+ 137, 203, 137, 201, 139, 6, -1, -1, 68, 43,
+ 138, 201, 137, 203, 139, 183, 138, 192, 139, 6,
+ -1, -1, 68, 46, 138, 201, 137, 203, 139, 184,
+ 138, 192, 139, 6, -1, -1, 68, 49, 138, 201,
+ 137, 203, 139, 185, 138, 192, 139, 6, -1, -1,
+ 68, 43, 138, 201, 137, 203, 137, 203, 137, 201,
+ 139, 186, 138, 192, 139, 6, -1, -1, 68, 46,
+ 138, 201, 137, 203, 137, 203, 137, 201, 139, 187,
+ 138, 192, 139, 6, -1, -1, 68, 49, 138, 201,
+ 137, 203, 137, 203, 137, 201, 139, 188, 138, 192,
+ 139, 6, -1, -1, 68, 43, 138, 201, 137, 203,
+ 137, 203, 137, 203, 137, 201, 139, 189, 138, 192,
+ 139, 6, -1, -1, 68, 46, 138, 201, 137, 203,
+ 137, 203, 137, 203, 137, 201, 139, 190, 138, 192,
+ 139, 6, -1, -1, 68, 49, 138, 201, 137, 203,
+ 137, 203, 137, 203, 137, 201, 139, 191, 138, 192,
+ 139, 6, -1, 193, -1, 192, 193, -1, 76, 138,
+ 201, 139, 6, -1, 76, 138, 206, 137, 206, 139,
+ 6, -1, 76, 138, 206, 137, 206, 137, 206, 139,
+ 6, -1, 70, 6, -1, 77, 131, 201, 132, 7,
+ 206, 62, 201, 6, -1, -1, 62, 4, 201, -1,
+ -1, 4, -1, -1, 7, 206, -1, -1, 7, 201,
+ -1, 58, 46, 207, 7, 201, 194, 6, -1, 58,
+ 49, 207, 196, 195, 6, -1, 55, 49, 138, 201,
+ 139, 7, 206, 6, -1, 58, 51, 207, 196, 6,
+ -1, 70, 49, 207, 197, 6, -1, 71, 49, 206,
+ 7, 201, 6, -1, 43, 138, 209, 139, 93, 49,
+ 138, 201, 139, 6, -1, 46, 138, 209, 139, 93,
49, 138, 201, 139, 6, -1, 46, 138, 209, 139,
- 93, 49, 138, 201, 139, 6, -1, 46, 138, 209,
- 139, 93, 51, 138, 201, 139, 6, -1, 49, 138,
- 209, 139, 93, 51, 138, 201, 139, 6, -1, 74,
- 6, -1, 74, 4, 6, -1, 202, -1, 131, 201,
- 132, -1, 122, 201, -1, 121, 201, -1, 126, 201,
- -1, 201, 122, 201, -1, 201, 121, 201, -1, 201,
- 123, 201, -1, 201, 124, 201, -1, 201, 125, 201,
- -1, 201, 130, 201, -1, 201, 117, 201, -1, 201,
- 118, 201, -1, 201, 120, 201, -1, 201, 119, 201,
- -1, 201, 116, 201, -1, 201, 115, 201, -1, 201,
- 114, 201, -1, 201, 113, 201, -1, 201, 112, 201,
- 8, 201, -1, 14, 131, 201, 132, -1, 15, 131,
- 201, 132, -1, 16, 131, 201, 132, -1, 17, 131,
- 201, 132, -1, 18, 131, 201, 132, -1, 19, 131,
- 201, 132, -1, 20, 131, 201, 132, -1, 21, 131,
- 201, 132, -1, 22, 131, 201, 132, -1, 24, 131,
- 201, 132, -1, 25, 131, 201, 137, 201, 132, -1,
- 26, 131, 201, 132, -1, 27, 131, 201, 132, -1,
- 28, 131, 201, 132, -1, 29, 131, 201, 132, -1,
- 30, 131, 201, 132, -1, 31, 131, 201, 132, -1,
- 32, 131, 201, 137, 201, 132, -1, 33, 131, 201,
- 137, 201, 132, -1, 34, 131, 201, 137, 201, 132,
- -1, 23, 131, 201, 132, -1, 14, 133, 201, 134,
- -1, 15, 133, 201, 134, -1, 16, 133, 201, 134,
- -1, 17, 133, 201, 134, -1, 18, 133, 201, 134,
- -1, 19, 133, 201, 134, -1, 20, 133, 201, 134,
- -1, 21, 133, 201, 134, -1, 22, 133, 201, 134,
- -1, 24, 133, 201, 134, -1, 25, 133, 201, 137,
- 201, 134, -1, 26, 133, 201, 134, -1, 27, 133,
- 201, 134, -1, 28, 133, 201, 134, -1, 29, 133,
- 201, 134, -1, 30, 133, 201, 134, -1, 31, 133,
- 201, 134, -1, 32, 133, 201, 137, 201, 134, -1,
- 33, 133, 201, 137, 201, 134, -1, 34, 133, 201,
- 137, 201, 134, -1, 23, 133, 201, 134, -1, 3,
- -1, 9, -1, 10, -1, 11, -1, 105, -1, 106,
- -1, 107, -1, 4, -1, 4, 140, 138, 201, 139,
- -1, 4, 133, 201, 134, -1, 136, 4, 133, 134,
- -1, 4, 164, -1, 4, 133, 201, 134, 164, -1,
- 4, 135, 4, -1, 4, 133, 201, 134, 135, 4,
- -1, 4, 135, 4, 164, -1, 4, 133, 201, 134,
- 135, 4, 164, -1, 104, 131, 5, 137, 201, 132,
- -1, 204, -1, 122, 203, -1, 121, 203, -1, 203,
- 122, 203, -1, 203, 121, 203, -1, 138, 201, 137,
- 201, 137, 201, 137, 201, 137, 201, 139, -1, 138,
- 201, 137, 201, 137, 201, 137, 201, 139, -1, 138,
- 201, 137, 201, 137, 201, 139, -1, 131, 201, 137,
- 201, 137, 201, 132, -1, 206, -1, 205, 137, 206,
- -1, 201, -1, 208, -1, 138, 139, -1, 138, 209,
- 139, -1, 122, 138, 209, 139, -1, 201, 123, 138,
- 209, 139, -1, 206, -1, 5, -1, 122, 208, -1,
- 201, 123, 208, -1, 201, 8, 201, -1, 201, 8,
- 201, 8, 201, -1, 43, 138, 201, 139, -1, 170,
- -1, 178, -1, 4, 133, 134, -1, 4, 133, 138,
- 209, 139, 134, -1, 201, -1, 208, -1, 209, 137,
- 201, -1, 209, 137, 208, -1, 138, 201, 137, 201,
- 137, 201, 137, 201, 139, -1, 138, 201, 137, 201,
- 137, 201, 139, -1, 4, -1, 4, 135, 90, 135,
- 4, -1, 138, 212, 139, -1, 4, 133, 201, 134,
- 135, 91, -1, 210, -1, 212, 137, 210, -1, 214,
- -1, 4, -1, 4, 135, 4, -1, 4, 133, 201,
- 134, 135, 4, -1, 5, -1, 42, -1, 37, 131,
- 213, 137, 213, 132, -1, 38, 131, 213, 132, -1,
- 39, 131, 213, 132, -1, 36, 131, 213, 132, -1,
- 36, 131, 213, 137, 209, 132, -1
+ 93, 51, 138, 201, 139, 6, -1, 49, 138, 209,
+ 139, 93, 51, 138, 201, 139, 6, -1, 74, 6,
+ -1, 74, 4, 6, -1, 202, -1, 131, 201, 132,
+ -1, 122, 201, -1, 121, 201, -1, 126, 201, -1,
+ 201, 122, 201, -1, 201, 121, 201, -1, 201, 123,
+ 201, -1, 201, 124, 201, -1, 201, 125, 201, -1,
+ 201, 130, 201, -1, 201, 117, 201, -1, 201, 118,
+ 201, -1, 201, 120, 201, -1, 201, 119, 201, -1,
+ 201, 116, 201, -1, 201, 115, 201, -1, 201, 114,
+ 201, -1, 201, 113, 201, -1, 201, 112, 201, 8,
+ 201, -1, 14, 131, 201, 132, -1, 15, 131, 201,
+ 132, -1, 16, 131, 201, 132, -1, 17, 131, 201,
+ 132, -1, 18, 131, 201, 132, -1, 19, 131, 201,
+ 132, -1, 20, 131, 201, 132, -1, 21, 131, 201,
+ 132, -1, 22, 131, 201, 132, -1, 24, 131, 201,
+ 132, -1, 25, 131, 201, 137, 201, 132, -1, 26,
+ 131, 201, 132, -1, 27, 131, 201, 132, -1, 28,
+ 131, 201, 132, -1, 29, 131, 201, 132, -1, 30,
+ 131, 201, 132, -1, 31, 131, 201, 132, -1, 32,
+ 131, 201, 137, 201, 132, -1, 33, 131, 201, 137,
+ 201, 132, -1, 34, 131, 201, 137, 201, 132, -1,
+ 23, 131, 201, 132, -1, 14, 133, 201, 134, -1,
+ 15, 133, 201, 134, -1, 16, 133, 201, 134, -1,
+ 17, 133, 201, 134, -1, 18, 133, 201, 134, -1,
+ 19, 133, 201, 134, -1, 20, 133, 201, 134, -1,
+ 21, 133, 201, 134, -1, 22, 133, 201, 134, -1,
+ 24, 133, 201, 134, -1, 25, 133, 201, 137, 201,
+ 134, -1, 26, 133, 201, 134, -1, 27, 133, 201,
+ 134, -1, 28, 133, 201, 134, -1, 29, 133, 201,
+ 134, -1, 30, 133, 201, 134, -1, 31, 133, 201,
+ 134, -1, 32, 133, 201, 137, 201, 134, -1, 33,
+ 133, 201, 137, 201, 134, -1, 34, 133, 201, 137,
+ 201, 134, -1, 23, 133, 201, 134, -1, 3, -1,
+ 9, -1, 10, -1, 11, -1, 105, -1, 106, -1,
+ 107, -1, 4, -1, 4, 140, 138, 201, 139, -1,
+ 4, 133, 201, 134, -1, 136, 4, 133, 134, -1,
+ 4, 164, -1, 4, 133, 201, 134, 164, -1, 4,
+ 135, 4, -1, 4, 133, 201, 134, 135, 4, -1,
+ 4, 135, 4, 164, -1, 4, 133, 201, 134, 135,
+ 4, 164, -1, 104, 131, 5, 137, 201, 132, -1,
+ 204, -1, 122, 203, -1, 121, 203, -1, 203, 122,
+ 203, -1, 203, 121, 203, -1, 138, 201, 137, 201,
+ 137, 201, 137, 201, 137, 201, 139, -1, 138, 201,
+ 137, 201, 137, 201, 137, 201, 139, -1, 138, 201,
+ 137, 201, 137, 201, 139, -1, 131, 201, 137, 201,
+ 137, 201, 132, -1, 206, -1, 205, 137, 206, -1,
+ 201, -1, 208, -1, 138, 139, -1, 138, 209, 139,
+ -1, 122, 138, 209, 139, -1, 201, 123, 138, 209,
+ 139, -1, 206, -1, 5, -1, 122, 208, -1, 201,
+ 123, 208, -1, 201, 8, 201, -1, 201, 8, 201,
+ 8, 201, -1, 43, 138, 201, 139, -1, 170, -1,
+ 178, -1, 4, 133, 134, -1, 4, 133, 138, 209,
+ 139, 134, -1, 201, -1, 208, -1, 209, 137, 201,
+ -1, 209, 137, 208, -1, 138, 201, 137, 201, 137,
+ 201, 137, 201, 139, -1, 138, 201, 137, 201, 137,
+ 201, 139, -1, 4, -1, 4, 135, 90, 135, 4,
+ -1, 138, 212, 139, -1, 4, 133, 201, 134, 135,
+ 91, -1, 210, -1, 212, 137, 210, -1, 214, -1,
+ 4, -1, 4, 135, 4, -1, 4, 133, 201, 134,
+ 135, 4, -1, 5, -1, 42, -1, 37, 131, 213,
+ 137, 213, 132, -1, 38, 131, 213, 132, -1, 39,
+ 131, 213, 132, -1, 36, 131, 213, 132, -1, 36,
+ 131, 213, 137, 209, 132, -1
};
/* YYRLINE[YYN] -- source line where rule number YYN was defined. */
@@ -977,31 +978,31 @@ static const yytype_uint16 yyrline[] =
884, 890, 910, 931, 957, 969, 986, 990, 1000, 1003,
1016, 1019, 1029, 1052, 1068, 1090, 1108, 1126, 1156, 1186,
1206, 1224, 1242, 1268, 1285, 1304, 1322, 1361, 1367, 1373,
- 1380, 1405, 1430, 1446, 1462, 1493, 1511, 1528, 1549, 1554,
- 1559, 1564, 1569, 1589, 1595, 1606, 1607, 1612, 1615, 1619,
- 1642, 1665, 1688, 1716, 1725, 1729, 1744, 1771, 1788, 1802,
- 1808, 1814, 1823, 1837, 1885, 1903, 1918, 1937, 1949, 1973,
- 1977, 1982, 1987, 1998, 2015, 2032, 2051, 2070, 2098, 2106,
- 2112, 2119, 2123, 2132, 2140, 2148, 2157, 2156, 2169, 2168,
- 2181, 2180, 2193, 2192, 2205, 2212, 2219, 2226, 2233, 2240,
- 2247, 2254, 2261, 2269, 2268, 2280, 2279, 2291, 2290, 2302,
- 2301, 2313, 2312, 2324, 2323, 2335, 2334, 2346, 2345, 2357,
- 2356, 2371, 2374, 2380, 2389, 2409, 2432, 2436, 2460, 2463,
- 2479, 2482, 2495, 2498, 2504, 2507, 2514, 2568, 2638, 2643,
- 2710, 2753, 2779, 2802, 2825, 2828, 2837, 2841, 2857, 2858,
- 2859, 2860, 2861, 2862, 2863, 2864, 2865, 2872, 2873, 2874,
- 2875, 2876, 2877, 2878, 2879, 2880, 2881, 2882, 2883, 2884,
- 2885, 2886, 2887, 2888, 2889, 2890, 2891, 2892, 2893, 2894,
- 2895, 2896, 2897, 2898, 2899, 2900, 2901, 2902, 2903, 2905,
- 2906, 2907, 2908, 2909, 2910, 2911, 2912, 2913, 2914, 2915,
- 2916, 2917, 2918, 2919, 2920, 2921, 2922, 2923, 2924, 2925,
- 2934, 2935, 2936, 2937, 2938, 2939, 2940, 2944, 2957, 2969,
- 2984, 2994, 3004, 3022, 3027, 3032, 3042, 3052, 3060, 3064,
- 3068, 3072, 3076, 3083, 3087, 3091, 3095, 3102, 3107, 3114,
- 3119, 3123, 3128, 3132, 3140, 3151, 3155, 3167, 3175, 3183,
- 3190, 3201, 3221, 3231, 3241, 3251, 3271, 3276, 3280, 3284,
- 3296, 3300, 3312, 3319, 3329, 3333, 3348, 3353, 3360, 3364,
- 3377, 3385, 3396, 3400, 3408, 3416, 3430, 3444, 3448
+ 1380, 1405, 1430, 1446, 1462, 1490, 1510, 1528, 1545, 1566,
+ 1571, 1576, 1581, 1586, 1606, 1612, 1623, 1624, 1629, 1632,
+ 1636, 1659, 1682, 1705, 1733, 1742, 1746, 1761, 1788, 1805,
+ 1819, 1825, 1831, 1840, 1854, 1902, 1920, 1935, 1954, 1966,
+ 1990, 1994, 1999, 2004, 2015, 2032, 2049, 2068, 2087, 2115,
+ 2123, 2129, 2136, 2140, 2149, 2157, 2165, 2174, 2173, 2186,
+ 2185, 2198, 2197, 2210, 2209, 2222, 2229, 2236, 2243, 2250,
+ 2257, 2264, 2271, 2278, 2286, 2285, 2297, 2296, 2308, 2307,
+ 2319, 2318, 2330, 2329, 2341, 2340, 2352, 2351, 2363, 2362,
+ 2374, 2373, 2388, 2391, 2397, 2406, 2426, 2449, 2453, 2477,
+ 2480, 2496, 2499, 2512, 2515, 2521, 2524, 2531, 2585, 2655,
+ 2660, 2727, 2770, 2796, 2819, 2842, 2845, 2854, 2858, 2874,
+ 2875, 2876, 2877, 2878, 2879, 2880, 2881, 2882, 2889, 2890,
+ 2891, 2892, 2893, 2894, 2895, 2896, 2897, 2898, 2899, 2900,
+ 2901, 2902, 2903, 2904, 2905, 2906, 2907, 2908, 2909, 2910,
+ 2911, 2912, 2913, 2914, 2915, 2916, 2917, 2918, 2919, 2920,
+ 2922, 2923, 2924, 2925, 2926, 2927, 2928, 2929, 2930, 2931,
+ 2932, 2933, 2934, 2935, 2936, 2937, 2938, 2939, 2940, 2941,
+ 2942, 2951, 2952, 2953, 2954, 2955, 2956, 2957, 2961, 2974,
+ 2986, 3001, 3011, 3021, 3039, 3044, 3049, 3059, 3069, 3077,
+ 3081, 3085, 3089, 3093, 3100, 3104, 3108, 3112, 3119, 3124,
+ 3131, 3136, 3140, 3145, 3149, 3157, 3168, 3172, 3184, 3192,
+ 3200, 3207, 3218, 3238, 3248, 3258, 3268, 3288, 3293, 3297,
+ 3301, 3313, 3317, 3329, 3336, 3346, 3350, 3365, 3370, 3377,
+ 3381, 3394, 3402, 3413, 3417, 3425, 3433, 3447, 3461, 3465
};
#endif
@@ -1087,31 +1088,31 @@ static const yytype_uint8 yyr1[] =
165, 165, 165, 165, 165, 165, 166, 166, 167, 167,
168, 168, 169, 169, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
- 169, 169, 169, 169, 169, 169, 169, 169, 170, 170,
- 170, 170, 170, 170, 170, 171, 171, 172, 172, 172,
- 172, 172, 172, 173, 173, 173, 173, 173, 174, 175,
- 175, 175, 175, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 177, 177, 177, 177, 177, 177, 177,
- 177, 177, 177, 178, 178, 178, 179, 178, 180, 178,
- 181, 178, 182, 178, 178, 178, 178, 178, 178, 178,
- 178, 178, 178, 183, 178, 184, 178, 185, 178, 186,
- 178, 187, 178, 188, 178, 189, 178, 190, 178, 191,
- 178, 192, 192, 193, 193, 193, 193, 193, 194, 194,
- 195, 195, 196, 196, 197, 197, 198, 198, 198, 198,
- 198, 198, 199, 199, 199, 199, 200, 200, 201, 201,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 170,
+ 170, 170, 170, 170, 170, 170, 171, 171, 172, 172,
+ 172, 172, 172, 172, 173, 173, 173, 173, 173, 174,
+ 175, 175, 175, 175, 176, 176, 176, 176, 176, 176,
+ 176, 176, 176, 176, 177, 177, 177, 177, 177, 177,
+ 177, 177, 177, 177, 178, 178, 178, 179, 178, 180,
+ 178, 181, 178, 182, 178, 178, 178, 178, 178, 178,
+ 178, 178, 178, 178, 183, 178, 184, 178, 185, 178,
+ 186, 178, 187, 178, 188, 178, 189, 178, 190, 178,
+ 191, 178, 192, 192, 193, 193, 193, 193, 193, 194,
+ 194, 195, 195, 196, 196, 197, 197, 198, 198, 198,
+ 198, 198, 198, 199, 199, 199, 199, 200, 200, 201,
201, 201, 201, 201, 201, 201, 201, 201, 201, 201,
201, 201, 201, 201, 201, 201, 201, 201, 201, 201,
201, 201, 201, 201, 201, 201, 201, 201, 201, 201,
201, 201, 201, 201, 201, 201, 201, 201, 201, 201,
201, 201, 201, 201, 201, 201, 201, 201, 201, 201,
201, 201, 201, 201, 201, 201, 201, 201, 201, 201,
- 202, 202, 202, 202, 202, 202, 202, 202, 202, 202,
- 202, 202, 202, 202, 202, 202, 202, 202, 203, 203,
- 203, 203, 203, 204, 204, 204, 204, 205, 205, 206,
- 206, 206, 206, 206, 206, 207, 207, 208, 208, 208,
- 208, 208, 208, 208, 208, 208, 209, 209, 209, 209,
- 210, 210, 210, 210, 211, 211, 212, 212, 213, 213,
- 213, 213, 214, 214, 214, 214, 214, 214, 214
+ 201, 202, 202, 202, 202, 202, 202, 202, 202, 202,
+ 202, 202, 202, 202, 202, 202, 202, 202, 202, 203,
+ 203, 203, 203, 203, 204, 204, 204, 204, 205, 205,
+ 206, 206, 206, 206, 206, 206, 207, 207, 208, 208,
+ 208, 208, 208, 208, 208, 208, 208, 209, 209, 209,
+ 209, 210, 210, 210, 210, 211, 211, 212, 212, 213,
+ 213, 213, 213, 214, 214, 214, 214, 214, 214, 214
};
/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN. */
@@ -1128,31 +1129,31 @@ static const yytype_uint8 yyr2[] =
7, 9, 9, 11, 9, 9, 1, 1, 0, 5,
0, 2, 7, 8, 6, 7, 7, 8, 8, 17,
7, 7, 11, 8, 8, 8, 9, 3, 4, 10,
- 7, 7, 8, 8, 12, 8, 7, 8, 5, 11,
- 5, 9, 4, 9, 9, 1, 1, 0, 2, 6,
- 6, 6, 6, 4, 6, 6, 3, 4, 5, 3,
- 3, 4, 4, 3, 7, 7, 3, 7, 3, 2,
- 2, 15, 2, 6, 8, 8, 10, 1, 2, 1,
- 3, 4, 1, 5, 11, 13, 0, 7, 0, 13,
- 0, 15, 0, 6, 8, 8, 8, 12, 12, 12,
- 14, 14, 14, 0, 12, 0, 12, 0, 12, 0,
- 16, 0, 16, 0, 16, 0, 18, 0, 18, 0,
- 18, 1, 2, 5, 7, 9, 2, 9, 0, 3,
- 0, 1, 0, 2, 0, 2, 7, 6, 8, 5,
- 5, 6, 10, 10, 10, 10, 2, 3, 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, 6, 6, 6, 4, 4,
+ 7, 7, 8, 8, 12, 8, 8, 7, 8, 5,
+ 11, 5, 9, 4, 9, 9, 1, 1, 0, 2,
+ 6, 6, 6, 6, 4, 6, 6, 3, 4, 5,
+ 3, 3, 4, 4, 3, 7, 7, 3, 7, 3,
+ 2, 2, 15, 2, 6, 8, 8, 10, 1, 2,
+ 1, 3, 4, 1, 5, 11, 13, 0, 7, 0,
+ 13, 0, 15, 0, 6, 8, 8, 8, 12, 12,
+ 12, 14, 14, 14, 0, 12, 0, 12, 0, 12,
+ 0, 16, 0, 16, 0, 16, 0, 18, 0, 18,
+ 0, 18, 1, 2, 5, 7, 9, 2, 9, 0,
+ 3, 0, 1, 0, 2, 0, 2, 7, 6, 8,
+ 5, 5, 6, 10, 10, 10, 10, 2, 3, 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, 6, 6, 6, 4,
- 1, 1, 1, 1, 1, 1, 1, 1, 5, 4,
- 4, 2, 5, 3, 6, 4, 7, 6, 1, 2,
- 2, 3, 3, 11, 9, 7, 7, 1, 3, 1,
- 1, 2, 3, 4, 5, 1, 1, 2, 3, 3,
- 5, 4, 1, 1, 3, 6, 1, 1, 3, 3,
- 9, 7, 1, 5, 3, 6, 1, 3, 1, 1,
- 3, 6, 1, 1, 6, 4, 4, 4, 6
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+ 6, 4, 4, 4, 4, 4, 4, 6, 6, 6,
+ 4, 1, 1, 1, 1, 1, 1, 1, 1, 5,
+ 4, 4, 2, 5, 3, 6, 4, 7, 6, 1,
+ 2, 2, 3, 3, 11, 9, 7, 7, 1, 3,
+ 1, 1, 2, 3, 4, 5, 1, 1, 2, 3,
+ 3, 5, 4, 1, 1, 3, 6, 1, 1, 3,
+ 3, 9, 7, 1, 5, 3, 6, 1, 3, 1,
+ 1, 3, 6, 1, 1, 6, 4, 4, 4, 6
};
/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1165,284 +1166,286 @@ static const yytype_uint16 yydefact[] =
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 157, 0, 162, 0, 0, 159, 0, 0, 0, 0,
+ 158, 0, 163, 0, 0, 160, 0, 0, 0, 0,
5, 7, 6, 8, 9, 10, 11, 12, 13, 19,
- 18, 14, 15, 16, 17, 290, 297, 352, 54, 291,
- 292, 293, 0, 0, 0, 0, 0, 0, 0, 0,
+ 18, 14, 15, 16, 17, 291, 298, 353, 54, 292,
+ 293, 294, 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, 353, 0, 0,
- 294, 295, 296, 58, 57, 56, 55, 0, 0, 0,
- 60, 59, 0, 0, 0, 0, 127, 0, 0, 0,
- 228, 0, 0, 0, 0, 150, 0, 152, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 354, 0, 0,
+ 295, 296, 297, 58, 57, 56, 55, 0, 0, 0,
+ 60, 59, 0, 0, 0, 0, 128, 0, 0, 0,
+ 229, 0, 0, 0, 0, 151, 0, 153, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 308, 0, 0, 0, 0, 0, 127,
- 0, 0, 0, 0, 0, 0, 127, 0, 226, 0,
- 0, 0, 0, 0, 0, 0, 342, 0, 0, 0,
- 0, 0, 149, 0, 0, 158, 0, 127, 0, 127,
- 0, 0, 0, 0, 301, 29, 352, 0, 0, 0,
+ 0, 0, 0, 0, 309, 0, 0, 0, 0, 0,
+ 128, 0, 0, 0, 0, 0, 0, 128, 0, 227,
+ 0, 0, 0, 0, 0, 0, 0, 343, 0, 0,
+ 0, 0, 0, 150, 0, 0, 159, 0, 128, 0,
+ 128, 0, 0, 0, 0, 302, 29, 353, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 297, 231, 230, 232,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 126,
- 0, 125, 0, 66, 146, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 298, 232, 231,
+ 233, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 127, 0, 126, 0, 66, 147, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 143, 107, 0, 0, 0, 0, 297, 0, 0, 332,
- 333, 336, 337, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 319, 0, 320,
- 0, 0, 0, 0, 0, 326, 325, 0, 212, 212,
- 0, 0, 0, 0, 0, 0, 0, 0, 310, 309,
- 0, 0, 0, 0, 127, 127, 0, 0, 0, 0,
- 0, 0, 0, 172, 0, 127, 214, 0, 0, 0,
- 136, 0, 0, 0, 227, 0, 0, 0, 148, 0,
- 0, 0, 0, 0, 127, 0, 0, 0, 0, 160,
- 139, 0, 140, 0, 0, 0, 303, 0, 0, 68,
+ 0, 144, 107, 0, 0, 0, 0, 298, 0, 0,
+ 333, 334, 337, 338, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 320, 0,
+ 321, 0, 0, 0, 0, 0, 327, 326, 0, 213,
+ 213, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 311, 310, 0, 0, 0, 0, 128, 128, 0, 0,
+ 0, 0, 0, 0, 0, 173, 0, 128, 215, 0,
+ 0, 0, 137, 0, 0, 0, 228, 0, 0, 0,
+ 149, 0, 0, 0, 0, 0, 128, 0, 0, 0,
+ 0, 161, 140, 0, 141, 0, 0, 0, 304, 0,
+ 0, 68, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 350, 0, 349, 0, 0, 0,
+ 0, 0, 0, 230, 0, 0, 0, 0, 54, 0,
+ 0, 0, 0, 0, 123, 0, 0, 0, 0, 129,
+ 61, 0, 247, 246, 245, 244, 240, 241, 243, 242,
+ 235, 234, 236, 237, 238, 239, 108, 0, 0, 0,
+ 0, 0, 0, 231, 328, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 349, 0, 348, 0, 0, 0, 0, 0,
- 0, 229, 0, 0, 0, 0, 54, 0, 0, 0,
- 0, 0, 122, 0, 0, 0, 0, 128, 61, 0,
- 246, 245, 244, 243, 239, 240, 242, 241, 234, 233,
- 235, 236, 237, 238, 108, 0, 0, 0, 0, 0,
- 0, 230, 327, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 321,
+ 0, 322, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 211, 0, 0, 0, 86, 87, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 313, 312, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 167, 0,
+ 0, 0, 0, 138, 0, 0, 134, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 162, 0,
+ 142, 143, 0, 300, 306, 0, 39, 0, 0, 0,
+ 52, 0, 30, 31, 32, 33, 34, 249, 270, 250,
+ 271, 251, 272, 252, 273, 253, 274, 254, 275, 255,
+ 276, 256, 277, 257, 278, 269, 290, 258, 279, 0,
+ 0, 260, 281, 261, 282, 262, 283, 263, 284, 264,
+ 285, 265, 286, 0, 0, 0, 0, 0, 0, 0,
+ 0, 358, 0, 0, 356, 357, 79, 0, 0, 0,
+ 0, 0, 54, 0, 0, 0, 0, 0, 73, 0,
+ 0, 0, 0, 301, 0, 0, 0, 0, 0, 22,
+ 20, 0, 0, 0, 0, 335, 0, 0, 330, 236,
+ 329, 339, 340, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 323, 0, 0, 0,
+ 0, 0, 0, 0, 209, 214, 212, 0, 220, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 210, 0, 0, 0, 86, 87, 0, 0, 0, 0,
- 0, 0, 0, 0, 312, 311, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 166, 0, 0, 0, 0,
- 137, 0, 0, 133, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 161, 0, 141, 142, 0,
- 299, 305, 0, 39, 0, 0, 0, 52, 0, 30,
- 31, 32, 33, 34, 248, 269, 249, 270, 250, 271,
- 251, 272, 252, 273, 253, 274, 254, 275, 255, 276,
- 256, 277, 268, 289, 257, 278, 0, 0, 259, 280,
- 260, 281, 261, 282, 262, 283, 263, 284, 264, 285,
- 0, 0, 0, 0, 0, 0, 0, 0, 357, 0,
- 0, 355, 356, 79, 0, 0, 0, 0, 0, 54,
- 0, 0, 0, 0, 0, 73, 0, 0, 0, 0,
- 300, 0, 0, 0, 0, 0, 22, 20, 0, 0,
- 0, 0, 334, 0, 0, 329, 235, 328, 338, 339,
+ 119, 121, 0, 0, 0, 0, 0, 0, 0, 0,
+ 202, 0, 164, 0, 216, 221, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 139, 0,
+ 0, 0, 0, 0, 0, 303, 0, 299, 0, 0,
+ 0, 0, 0, 26, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 351, 0, 0, 0, 300, 64, 65,
+ 0, 0, 0, 0, 0, 67, 69, 71, 0, 0,
+ 347, 0, 77, 0, 0, 0, 0, 248, 21, 0,
+ 0, 0, 0, 0, 332, 0, 0, 90, 90, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 324,
+ 0, 94, 0, 0, 0, 0, 0, 0, 0, 218,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 322, 0, 0, 0, 0, 0, 0,
- 0, 208, 213, 211, 0, 219, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 118, 120, 0, 0,
- 0, 0, 0, 0, 0, 0, 201, 0, 163, 0,
- 215, 220, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 138, 0, 0, 0, 0, 0,
- 0, 302, 0, 298, 0, 0, 0, 0, 0, 26,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 350,
- 0, 0, 0, 299, 64, 65, 0, 0, 0, 0,
- 0, 67, 69, 71, 0, 0, 346, 0, 77, 0,
- 0, 0, 0, 247, 21, 0, 0, 0, 0, 0,
- 331, 0, 0, 90, 90, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 323, 0, 94, 0, 0,
- 0, 0, 0, 0, 0, 217, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 206, 0, 0, 173, 202, 0, 0, 221, 0, 135,
- 134, 0, 27, 28, 0, 0, 0, 343, 0, 0,
- 0, 153, 0, 0, 145, 304, 144, 0, 0, 0,
- 0, 317, 0, 258, 279, 265, 286, 266, 287, 267,
- 288, 0, 358, 354, 307, 0, 54, 0, 0, 0,
- 0, 62, 0, 0, 0, 344, 0, 0, 0, 0,
- 23, 24, 0, 0, 92, 0, 330, 0, 0, 0,
- 0, 0, 95, 0, 0, 110, 111, 0, 0, 96,
- 116, 324, 0, 0, 0, 0, 88, 0, 216, 0,
- 0, 0, 0, 0, 0, 147, 0, 0, 0, 0,
- 127, 0, 183, 0, 185, 0, 187, 319, 0, 0,
- 0, 0, 167, 0, 0, 100, 101, 0, 0, 0,
- 0, 80, 0, 306, 0, 35, 0, 0, 0, 0,
- 0, 37, 0, 0, 0, 0, 74, 0, 0, 75,
- 0, 347, 129, 130, 131, 132, 0, 0, 335, 0,
- 91, 97, 98, 103, 0, 0, 112, 0, 0, 0,
- 218, 105, 0, 0, 209, 115, 93, 104, 113, 117,
- 0, 0, 0, 0, 316, 0, 315, 0, 0, 174,
- 0, 0, 175, 0, 0, 176, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 341, 0, 155, 154,
- 0, 0, 0, 40, 0, 0, 0, 318, 0, 0,
- 0, 351, 63, 70, 72, 0, 78, 0, 25, 0,
- 0, 0, 0, 0, 0, 0, 0, 106, 0, 84,
- 85, 127, 0, 121, 0, 0, 0, 0, 0, 0,
- 203, 0, 0, 127, 0, 124, 123, 0, 0, 0,
- 0, 81, 82, 0, 36, 0, 0, 0, 38, 53,
- 0, 345, 0, 222, 223, 224, 225, 109, 0, 0,
- 0, 0, 0, 314, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 168, 0, 0, 340,
- 156, 0, 0, 0, 0, 0, 76, 0, 0, 0,
- 0, 119, 0, 189, 0, 0, 191, 0, 0, 193,
- 0, 0, 0, 204, 0, 164, 0, 127, 102, 83,
- 0, 44, 0, 50, 0, 0, 0, 89, 114, 313,
- 177, 0, 0, 184, 178, 0, 0, 186, 179, 0,
- 0, 188, 0, 0, 0, 170, 0, 0, 0, 0,
- 0, 0, 0, 195, 0, 197, 0, 199, 205, 207,
- 169, 165, 0, 41, 0, 48, 0, 0, 0, 0,
- 180, 0, 0, 181, 0, 0, 182, 0, 0, 0,
- 42, 0, 0, 151, 0, 0, 0, 0, 0, 0,
- 0, 171, 0, 0, 0, 0, 0, 190, 0, 192,
- 0, 194, 0, 43, 45, 0, 46, 0, 99, 0,
- 0, 0, 0, 0, 51, 196, 198, 200, 47, 49
+ 0, 0, 0, 0, 0, 207, 0, 0, 174, 203,
+ 0, 0, 222, 0, 136, 135, 0, 27, 28, 0,
+ 0, 0, 344, 0, 0, 0, 154, 0, 0, 146,
+ 305, 145, 0, 0, 0, 0, 318, 0, 259, 280,
+ 266, 287, 267, 288, 268, 289, 0, 359, 355, 308,
+ 0, 54, 0, 0, 0, 0, 62, 0, 0, 0,
+ 345, 0, 0, 0, 0, 23, 24, 0, 0, 92,
+ 0, 331, 0, 0, 0, 0, 0, 95, 0, 0,
+ 110, 111, 0, 0, 96, 117, 325, 0, 0, 0,
+ 0, 88, 0, 217, 0, 0, 0, 0, 0, 0,
+ 0, 148, 0, 0, 0, 0, 128, 0, 184, 0,
+ 186, 0, 188, 320, 0, 0, 0, 0, 168, 0,
+ 0, 100, 101, 0, 0, 0, 0, 80, 0, 307,
+ 0, 35, 0, 0, 0, 0, 0, 37, 0, 0,
+ 0, 0, 74, 0, 0, 75, 0, 348, 130, 131,
+ 132, 133, 0, 0, 336, 0, 91, 97, 98, 103,
+ 0, 0, 112, 0, 0, 0, 219, 105, 0, 0,
+ 210, 116, 93, 104, 113, 118, 115, 0, 0, 0,
+ 0, 317, 0, 316, 0, 0, 175, 0, 0, 176,
+ 0, 0, 177, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 342, 0, 156, 155, 0, 0, 0,
+ 40, 0, 0, 0, 319, 0, 0, 0, 352, 63,
+ 70, 72, 0, 78, 0, 25, 0, 0, 0, 0,
+ 0, 0, 0, 0, 106, 0, 84, 85, 128, 0,
+ 122, 0, 0, 0, 0, 0, 0, 204, 0, 0,
+ 128, 0, 125, 124, 0, 0, 0, 0, 81, 82,
+ 0, 36, 0, 0, 0, 38, 53, 0, 346, 0,
+ 223, 224, 225, 226, 109, 0, 0, 0, 0, 0,
+ 315, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 169, 0, 0, 341, 157, 0, 0,
+ 0, 0, 0, 76, 0, 0, 0, 0, 120, 0,
+ 190, 0, 0, 192, 0, 0, 194, 0, 0, 0,
+ 205, 0, 165, 0, 128, 102, 83, 0, 44, 0,
+ 50, 0, 0, 0, 89, 114, 314, 178, 0, 0,
+ 185, 179, 0, 0, 187, 180, 0, 0, 189, 0,
+ 0, 0, 171, 0, 0, 0, 0, 0, 0, 0,
+ 196, 0, 198, 0, 200, 206, 208, 170, 166, 0,
+ 41, 0, 48, 0, 0, 0, 0, 181, 0, 0,
+ 182, 0, 0, 183, 0, 0, 0, 42, 0, 0,
+ 152, 0, 0, 0, 0, 0, 0, 0, 172, 0,
+ 0, 0, 0, 0, 191, 0, 193, 0, 195, 0,
+ 43, 45, 0, 46, 0, 99, 0, 0, 0, 0,
+ 0, 51, 197, 199, 201, 47, 49
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- -1, 2, 3, 60, 658, 61, 62, 398, 954, 960,
- 579, 744, 1083, 1209, 580, 1177, 1235, 581, 1211, 582,
- 583, 748, 127, 214, 63, 523, 993, 899, 467, 309,
- 280, 281, 66, 67, 68, 69, 70, 310, 719, 1146,
- 1192, 543, 1010, 1013, 1016, 1161, 1165, 1169, 1201, 1204,
- 1207, 715, 716, 814, 694, 520, 547, 72, 73, 74,
- 327, 130, 348, 173, 860, 861, 337, 329, 313, 198,
- 649, 777, 443, 444
+ -1, 2, 3, 60, 661, 61, 62, 400, 960, 966,
+ 582, 748, 1090, 1216, 583, 1184, 1242, 584, 1218, 585,
+ 586, 752, 127, 215, 63, 525, 999, 904, 469, 310,
+ 281, 282, 66, 67, 68, 69, 70, 311, 723, 1153,
+ 1199, 546, 1017, 1020, 1023, 1168, 1172, 1176, 1208, 1211,
+ 1214, 719, 720, 818, 697, 522, 550, 72, 73, 74,
+ 328, 130, 350, 174, 865, 866, 338, 330, 314, 199,
+ 652, 781, 445, 446
};
/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
STATE-NUM. */
-#define YYPACT_NINF -1014
+#define YYPACT_NINF -1038
static const yytype_int16 yypact[] =
{
- 2725, 50, 78, 2801, -1014, -1014, 1281, 46, 33, -58,
- 21, 97, -105, -9, 55, 62, 65, 71, -32, 79,
- 130, 99, -48, 219, 248, 255, -8, 262, 418, 273,
- 198, 223, 242, 242, 240, 268, 318, 333, 341, 25,
- 253, 349, 399, 406, 411, 290, 310, 319, -2, 40,
- -1014, 326, -1014, 459, 339, -1014, 499, 503, 15, 19,
- -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014,
- -1014, -1014, -1014, -1014, -1014, -1014, 27, 340, 616, -1014,
- -1014, -1014, 59, 141, 176, 359, 362, 398, 408, 415,
- 449, 473, 478, 500, 508, 511, 565, 570, 574, 604,
- 614, 625, 633, 351, 373, 387, 390, -1014, 529, 421,
- -1014, -1014, -1014, -1014, -1014, -1014, -1014, 2254, 2254, 2254,
- -1014, -1014, 2254, 1886, 28, 545, 35, 2254, 550, 547,
- -1014, 602, 606, 2254, 617, -1014, 2254, -1014, 2254, 2187,
- 2254, 2254, 501, 2254, 2187, 2254, 2254, 512, 2187, 2254,
- 2254, 1459, 519, 2254, 518, 555, 556, 1329, 1329, 1329,
- 569, 573, 578, 579, 584, 591, 745, 242, 242, 242,
- 2254, 2254, -71, -1014, 63, 242, 596, 623, 642, 2057,
- 416, 1329, 1459, 640, 36, 650, -1014, 783, -1014, 670,
- 679, 683, 818, 2254, 2254, 2254, 692, 2254, 696, 756,
- 2254, 2254, -1014, 2254, 852, -1014, 889, -1014, 894, -1014,
- 770, 2254, 900, 767, -1014, -1014, -1014, 901, 2254, 2254,
- 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254,
- 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254,
- 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254,
- 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254,
- 588, 588, 588, 588, 2254, 903, 470, 776, 776, 776,
- 5032, 9, 2187, 4296, 167, 774, 906, 782, 778, -1014,
- 779, 2865, 1652, -1014, -1014, 2254, 2254, 2254, 2254, 2254,
- 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254, 2254,
- -1014, -1014, 1980, -114, 3542, 5053, -59, 781, 2187, -1014,
- -1014, 2499, -1014, 628, 5074, 5095, 2254, 5116, 631, 5137,
- 5158, 2254, 639, 5179, 5200, 1589, 1144, 2521, 910, -1014,
- 2254, 5221, 2254, 2254, 2254, -1014, -1014, 914, 915, 915,
- 2254, 2311, 2311, 2311, 2311, 2254, 791, 364, -1014, -1014,
- 3568, 3594, 242, 242, 35, 35, 452, 2254, 2254, 2254,
- 2057, 2057, 2254, 2865, 454, -1014, 917, 919, 2254, 921,
- -1014, 2254, 2254, 750, -1014, 2187, 2254, 2254, -1014, 5242,
- 5263, 5284, 839, 3620, -1014, 792, 2540, 5305, 4319, -1014,
- -1014, 944, -1014, 1054, 2254, 4342, 213, 2254, 11, -1014,
- 5326, 4365, 5347, 4388, 5368, 4411, 5389, 4434, 5410, 4457,
- 5431, 4480, 5452, 4503, 5473, 4526, 5494, 4549, 5515, 4572,
- 5536, 4595, 3646, 3672, 5557, 4618, 5578, 4641, 5599, 4664,
- 5620, 4687, 5641, 4710, 5662, 4733, 3698, 3724, 3750, 3776,
- 3802, 3828, 644, -60, -1014, 794, 800, 802, 2000, 798,
- 2254, -1014, 1459, 1459, 649, 314, 616, 2254, 931, 935,
- 13, 806, -1014, -84, 129, -12, 73, -1014, -1014, 2560,
- 1307, 1002, 763, 763, 630, 630, 630, 630, 251, 251,
- 776, 776, 776, 776, -1014, 7, 2187, 2254, 934, 2022,
- 2254, 776, -1014, 2254, 2187, 2187, 849, 936, 937, 5683,
- 938, 854, 941, 942, 5704, 859, 946, 948, 2187, -1014,
- 653, 1719, 2254, 5725, 951, 2628, 5746, 5767, 2254, 1459,
- 956, 955, 5788, 831, 6061, -1014, 833, 835, 836, 5809,
- 834, 242, 2254, 2254, -1014, -1014, 837, 838, 2254, 3854,
- 3880, 3906, 3516, 38, 242, 1177, 2254, 964, 2254, 5830,
- -1014, 4756, 4779, -1014, 676, 4802, 4825, 965, 966, 967,
- 840, 2254, 1492, 2254, 2254, -1014, 14, -1014, -1014, 4848,
- 48, -1014, 2900, -1014, 847, 850, 842, -1014, 976, -1014,
- -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014,
- -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014,
- -1014, -1014, -1014, -1014, -1014, -1014, 2254, 2254, -1014, -1014,
- -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014,
- 2254, 2254, 2254, 2254, 2254, 2254, 2254, 981, -1014, 2187,
- 588, -1014, -1014, -1014, 2254, 4871, 980, 991, 868, -1014,
- 91, 2254, 1000, 1001, 2283, -1014, 1003, 875, -2, 1005,
- -1014, 2187, 2187, 2187, 2187, 2254, -1014, 891, 588, -28,
- 3932, 242, -1014, 2187, 2928, 2579, 776, -1014, 2499, -1014,
- 963, 1459, 1459, 1006, 1459, 771, 1459, 1459, 1007, 971,
- 1459, 1459, 684, -1014, 2187, 2340, 1009, 879, 1011, 1016,
- 1018, 2119, -1014, -1014, 1020, -1014, 1025, 1027, 1028, 1030,
- 1031, 1032, 1023, 558, 3958, 3984, -1014, -1014, 2956, 242,
- 242, 242, 1034, 904, 913, -42, -1014, 560, -1014, 38,
- 6061, -1014, 2359, 908, 1035, 1042, 1004, 1043, 1044, 1459,
- 1459, 1459, 1047, 4010, -1014, 2598, 1683, 1050, 1051, 1053,
- 1052, -1014, 1055, -1014, 926, 2254, 2254, 1459, 925, -1014,
- 5851, 4894, 5872, 4917, 5893, 4940, 5914, 4963, 4986, -1014,
- 43, 933, 5935, 467, -1014, -1014, 98, 583, 939, 1061,
- 2378, -1014, -1014, -1014, -2, 2254, -1014, 691, -1014, 694,
- 701, 702, 708, 6061, -1014, 1063, 54, 2254, 57, 709,
- -1014, 2254, 932, 1017, 1017, 1459, 1066, 940, 943, 1069,
- 1070, 1459, 947, 1071, 1076, -1014, 713, -1014, 1079, 2254,
- 1459, 1459, 1459, 1083, 1082, -1014, 1459, 1459, 1459, 1459,
- 1459, 1459, 343, 2254, 2254, 2254, 952, 179, 331, 338,
- -1014, 1459, 2254, -1014, -1014, 2057, -15, -1014, 2187, -1014,
- -1014, 953, -1014, -1014, 1086, 1088, 1040, -1014, 2254, 2254,
- 2254, -1014, 1089, 1100, -1014, 213, -1014, 2254, 4036, 4062,
- 716, -1014, 2254, -1014, -1014, -1014, -1014, -1014, -1014, -1014,
- -1014, 954, -1014, -1014, -1014, 1459, 616, 2254, 1103, 1108,
- 13, -1014, 1124, 5009, -2, -1014, 1127, 1129, 1130, 1131,
- -1014, -1014, 588, 4088, -1014, 1008, 6061, 2254, 242, 1137,
- 1138, 1139, -1014, 2254, 2254, -1014, -1014, 1146, 2254, -1014,
- -1014, -1014, 1145, 4114, 1150, 1151, 1087, 2254, -1014, 1173,
- 1175, 1176, 1178, 1179, 1182, -1014, 2311, 2984, 5956, 2816,
- 35, 242, 1185, 242, 1186, 242, 1188, 315, 1046, 5977,
- 3012, 562, -1014, 720, 2254, -1014, -1014, 1459, 2844, 447,
- 5998, -1014, 1849, -1014, 171, 6061, 2254, 2254, 1459, 1057,
- 724, 6061, 1184, 1190, 1191, 2403, -1014, 1192, 1194, -1014,
- 1067, -1014, -1014, -1014, -1014, -1014, 1195, 2254, -1014, 3040,
- 377, -1014, -1014, -1014, 3068, 3096, -1014, 3124, 1193, 2254,
- -1014, -1014, 1156, 1198, 6061, -1014, -1014, -1014, -1014, -1014,
- 1068, 2422, 1199, 1075, -1014, 2254, -1014, 1078, 592, -1014,
- 1077, 599, -1014, 1080, 609, -1014, 1092, 1201, 1459, 1207,
- 1094, 2254, 1229, 3152, 1152, 2254, -1014, 2254, -1014, -1014,
- 2187, 2442, 1233, -1014, 2254, 4140, 4166, -1014, 1459, 2254,
- 1235, -1014, -1014, -1014, -1014, -2, -1014, 1153, -1014, 4192,
- 1236, 1237, 1239, 1240, 1241, 4218, 1114, -1014, 1459, -1014,
- -1014, 35, 2872, -1014, 2057, 38, 2057, 38, 2057, 38,
- -1014, 725, 1459, -1014, 3180, -1014, -1014, 2254, 3208, 3236,
- 729, -1014, -1014, 1115, 6061, 2254, 2254, 730, 6061, -1014,
- 1248, -1014, 2254, -1014, -1014, -1014, -1014, -1014, 1250, 2254,
- 733, 1117, 2254, -1014, 3264, 611, 186, 3292, 620, 194,
- 3320, 622, 229, 1459, 1251, 1196, 1622, 1121, 2461, -1014,
- -1014, 1254, 2254, 6019, 4244, 30, -1014, 4270, 1132, 3348,
- 1255, -1014, 3376, 1261, 2254, 1262, 1265, 2254, 1266, 1267,
- 2254, 1268, 1140, -1014, 2254, -1014, 38, -1014, -1014, -1014,
- 736, -1014, 2254, -1014, 1459, 2254, 1271, -1014, -1014, -1014,
- -1014, 1143, 3404, -1014, -1014, 1149, 3432, -1014, -1014, 1155,
- 3460, -1014, 1272, 2480, 307, 1880, 1276, 1183, 6040, 737,
- 3488, 1157, 38, 1283, 38, 1316, 38, 1318, -1014, -1014,
- -1014, -1014, 38, -1014, 588, -1014, 1187, 1320, 1322, 309,
- -1014, 1197, 332, -1014, 1203, 335, -1014, 1204, 337, 753,
- -1014, 1226, 1459, -1014, 1189, 1323, 38, 1324, 38, 1325,
- 38, -1014, 588, 1330, 588, 757, 1331, -1014, 386, -1014,
- 458, -1014, 474, -1014, -1014, 762, -1014, 1359, -1014, 1360,
- 1361, 1362, 588, 1363, -1014, -1014, -1014, -1014, -1014, -1014
+ 2945, 34, 62, 3021, -1038, -1038, 1352, 33, -15, -58,
+ 23, 71, -89, -43, -30, 231, -11, 44, -33, 54,
+ 60, 111, -40, 150, 158, 162, 32, 207, 258, 123,
+ 139, 157, 416, 416, 167, 253, 293, 303, 273, 20,
+ 65, 376, 423, 448, 463, 251, 314, 339, 15, -3,
+ -1038, 353, -1038, 482, 365, -1038, 505, 516, 10, 18,
+ -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038,
+ -1038, -1038, -1038, -1038, -1038, -1038, 17, 403, 474, -1038,
+ -1038, -1038, 77, 179, 184, 191, 199, 230, 283, 297,
+ 307, 329, 364, 400, 413, 418, 426, 436, 452, 502,
+ 509, 510, 513, 395, 422, 476, 479, -1038, 599, 484,
+ -1038, -1038, -1038, -1038, -1038, -1038, -1038, 2325, 2325, 2325,
+ -1038, -1038, 2325, 1957, 13, 612, 137, 2325, 619, 1723,
+ -1038, 623, 630, 2325, 648, -1038, 2325, -1038, 2325, 2258,
+ 2325, 2325, 514, 2325, 2258, 2325, 2325, 527, 2258, 2325,
+ 2325, 1530, 548, 2325, 492, 552, 555, 1400, 1400, 1400,
+ 556, 560, 572, 581, 634, 638, 650, 779, 416, 416,
+ 416, 2325, 2325, 46, -1038, 59, 416, 646, 649, 652,
+ 2128, 227, 1400, 1530, 655, 27, 658, -1038, 782, -1038,
+ 654, 661, 662, 787, 2325, 2325, 2325, 663, 2325, 659,
+ 703, 2325, 2325, -1038, 2325, 793, -1038, 794, -1038, 795,
+ -1038, 670, 2325, 800, 667, -1038, -1038, -1038, 802, 2325,
+ 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325,
+ 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325,
+ 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325,
+ 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325,
+ 2325, 405, 405, 405, 405, 2325, 801, 549, 679, 679,
+ 679, 5252, 11, 2258, 4516, 326, 675, 804, 680, 674,
+ -1038, 676, 3085, 1754, -1038, -1038, 2325, 2325, 2325, 2325,
+ 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325, 2325,
+ 2325, -1038, -1038, 2071, -35, 3762, 5273, 499, 681, 2258,
+ -1038, -1038, 2700, -1038, 294, 5294, 5315, 2325, 5336, 378,
+ 5357, 5378, 2325, 517, 5399, 5420, 1660, 1214, 2725, 807,
+ -1038, 2325, 5441, 2325, 2325, 2325, -1038, -1038, 811, 813,
+ 813, 2325, 2382, 2382, 2382, 2382, 2325, 2325, 689, -22,
+ -1038, -1038, 3788, 3814, 416, 416, 137, 137, 176, 2325,
+ 2325, 2325, 2128, 2128, 2325, 3085, 229, -1038, 818, 819,
+ 2325, 821, -1038, 2325, 2325, 1563, -1038, 2258, 2325, 2325,
+ -1038, 5462, 5483, 5504, 738, 3840, -1038, 691, 2746, 5525,
+ 4539, -1038, -1038, 1693, -1038, 1951, 2325, 4562, 147, 2325,
+ 12, -1038, 5546, 4585, 5567, 4608, 5588, 4631, 5609, 4654,
+ 5630, 4677, 5651, 4700, 5672, 4723, 5693, 4746, 5714, 4769,
+ 5735, 4792, 5756, 4815, 3866, 3892, 5777, 4838, 5798, 4861,
+ 5819, 4884, 5840, 4907, 5861, 4930, 5882, 4953, 3918, 3944,
+ 3970, 3996, 4022, 4048, 524, -1, -1038, 695, 701, 704,
+ 2432, 698, 2325, -1038, 1530, 1530, 551, 270, 474, 2325,
+ 833, 836, 21, 707, -1038, -87, 335, -24, -71, -1038,
+ -1038, 2766, 475, 546, 577, 577, 451, 451, 451, 451,
+ 550, 550, 679, 679, 679, 679, -1038, 5, 2258, 2325,
+ 835, 2093, 2325, 679, -1038, 2325, 2258, 2258, 750, 837,
+ 838, 5903, 839, 757, 847, 848, 5924, 764, 851, 852,
+ 2258, -1038, 567, 1790, 2325, 5945, 853, 2848, 5966, 5987,
+ 2325, 1530, 858, 857, 6008, 733, 6302, -1038, 734, 735,
+ 736, 6029, 6050, 737, 416, 2325, 2325, -1038, -1038, 730,
+ 731, 2325, 4074, 4100, 4126, 3736, 404, 416, 2121, 2325,
+ 865, 2325, 6071, -1038, 4976, 4999, -1038, 571, 5022, 5045,
+ 866, 867, 868, 742, 2325, 2424, 2325, 2325, -1038, 28,
+ -1038, -1038, 5068, 48, -1038, 3120, -1038, 747, 748, 743,
+ -1038, 874, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038,
+ -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038,
+ -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038, 2325,
+ 2325, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038,
+ -1038, -1038, -1038, 2325, 2325, 2325, 2325, 2325, 2325, 2325,
+ 879, -1038, 2258, 405, -1038, -1038, -1038, 2325, 5091, 878,
+ 880, 751, -1038, 35, 2325, 881, 882, 2487, -1038, 883,
+ 756, 15, 885, -1038, 2258, 2258, 2258, 2258, 2325, -1038,
+ 774, 405, 68, 4152, 416, -1038, 2258, 3148, 2799, 679,
+ -1038, 2700, -1038, 844, 1530, 1530, 887, 1530, 660, 1530,
+ 1530, 888, 846, 1530, 1530, 592, -1038, 2258, 2508, 891,
+ 761, 893, 894, 897, 2190, -1038, -1038, 899, -1038, 901,
+ 902, 903, 904, 907, 912, 913, 919, 266, 4178, 4204,
+ -1038, -1038, 3176, 416, 416, 416, 900, 786, 796, -50,
+ -1038, 381, -1038, 404, 6302, -1038, 2528, 791, 924, 925,
+ 876, 926, 928, 1530, 1530, 1530, 931, 4230, -1038, 2818,
+ 1178, 934, 936, 935, 938, -1038, 937, -1038, 814, 2325,
+ 2325, 1530, 808, -1038, 6092, 5114, 6113, 5137, 6134, 5160,
+ 6155, 5183, 5206, -1038, 129, 815, 6176, 257, -1038, -1038,
+ -2, 340, 820, 941, 2561, -1038, -1038, -1038, 15, 2325,
+ -1038, 593, -1038, 597, 598, 601, 602, 6302, -1038, 943,
+ 37, 2325, 57, 608, -1038, 2325, 816, 905, 905, 1530,
+ 952, 824, 825, 958, 959, 1530, 828, 961, 963, -1038,
+ 609, -1038, 965, 2325, 1530, 1530, 1530, 970, 969, -1038,
+ 1530, 1530, 1530, 1530, 1530, 1530, 1530, 450, 2325, 2325,
+ 2325, 842, -67, -63, -57, -1038, 1530, 2325, -1038, -1038,
+ 2128, -29, -1038, 2258, -1038, -1038, 849, -1038, -1038, 980,
+ 982, 906, -1038, 2325, 2325, 2325, -1038, 984, 985, -1038,
+ 147, -1038, 2325, 4256, 4282, 613, -1038, 2325, -1038, -1038,
+ -1038, -1038, -1038, -1038, -1038, -1038, 841, -1038, -1038, -1038,
+ 1530, 474, 2325, 987, 992, 21, -1038, 991, 5229, 15,
+ -1038, 994, 995, 996, 997, -1038, -1038, 405, 4308, -1038,
+ 864, 6302, 2325, 416, 998, 999, 1001, -1038, 2325, 2325,
+ -1038, -1038, 1002, 2325, -1038, -1038, -1038, 986, 4334, 1003,
+ 1004, 918, 2325, -1038, 1006, 1007, 1008, 1010, 1011, 1012,
+ 1015, -1038, 2382, 3204, 6197, 3036, 137, 416, 1014, 416,
+ 1017, 416, 1018, 603, 884, 6218, 3232, 384, -1038, 614,
+ 2325, -1038, -1038, 1530, 3064, 1060, 6239, -1038, 1920, -1038,
+ 141, 6302, 2325, 2325, 1530, 889, 617, 6302, 1021, 1023,
+ 1024, 2581, -1038, 1025, 1027, -1038, 909, -1038, -1038, -1038,
+ -1038, -1038, 1028, 2325, -1038, 3260, 286, -1038, -1038, -1038,
+ 3288, 3316, -1038, 3344, 1031, 2325, -1038, -1038, 1000, 1032,
+ 6302, -1038, -1038, -1038, -1038, -1038, -1038, 908, 2607, 1033,
+ 910, -1038, 2325, -1038, 911, 402, -1038, 917, 434, -1038,
+ 932, 441, -1038, 942, 1039, 1530, 1042, 944, 2325, 1045,
+ 3372, 968, 2325, -1038, 2325, -1038, -1038, 2258, 2628, 1051,
+ -1038, 2325, 4360, 4386, -1038, 1530, 2325, 1067, -1038, -1038,
+ -1038, -1038, 15, -1038, 975, -1038, 4412, 1070, 1075, 1077,
+ 1078, 1079, 4438, 950, -1038, 1530, -1038, -1038, 137, 3092,
+ -1038, 2128, 404, 2128, 404, 2128, 404, -1038, 618, 1530,
+ -1038, 3400, -1038, -1038, 2325, 3428, 3456, 621, -1038, -1038,
+ 951, 6302, 2325, 2325, 624, 6302, -1038, 1084, -1038, 2325,
+ -1038, -1038, -1038, -1038, -1038, 1086, 2325, 625, 953, 2325,
+ -1038, 3484, 443, -20, 3512, 465, 117, 3540, 487, 187,
+ 1530, 1092, 1037, 2479, 964, 2648, -1038, -1038, 1095, 2325,
+ 6260, 4464, 24, -1038, 4490, 967, 3568, 1099, -1038, 3596,
+ 1101, 2325, 1102, 1103, 2325, 1104, 1105, 2325, 1106, 974,
+ -1038, 2325, -1038, 404, -1038, -1038, -1038, 631, -1038, 2325,
+ -1038, 1530, 2325, 1109, -1038, -1038, -1038, -1038, 977, 3624,
+ -1038, -1038, 978, 3652, -1038, -1038, 979, 3680, -1038, 1113,
+ 2681, 192, 2529, 1114, 983, 6281, 635, 3708, 988, 404,
+ 1116, 404, 1118, 404, 1120, -1038, -1038, -1038, -1038, 404,
+ -1038, 405, -1038, 990, 1123, 1125, 195, -1038, 993, 300,
+ -1038, 1005, 324, -1038, 1009, 336, 639, -1038, 1013, 1530,
+ -1038, 1016, 1126, 404, 1127, 404, 1128, 404, -1038, 405,
+ 1130, 405, 640, 1131, -1038, 348, -1038, 388, -1038, 401,
+ -1038, -1038, 643, -1038, 1133, -1038, 1134, 1136, 1138, 405,
+ 1140, -1038, -1038, -1038, -1038, -1038, -1038
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -1014, -1014, -1014, -1014, 491, -1014, -1014, -1014, -1014, 249,
- -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014,
- -1014, -1014, -252, 24, -1014, 75, -1014, 576, 1370, 3,
- -345, -111, -1014, -1014, -1014, -1014, -1014, 1371, -1014, -1014,
- -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014, -1014,
- -1014, -673, -708, -1014, -1014, 1036, -1014, -1014, -1014, -1014,
- -6, -1014, -21, -1014, -1013, -93, -110, 22, 121, -629,
- 496, -1014, -258, 2
+ -1038, -1038, -1038, -1038, 358, -1038, -1038, -1038, -1038, 25,
+ -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038,
+ -1038, -1038, -271, 4, -1038, 269, -1038, 351, 1147, 3,
+ -354, -112, -1038, -1038, -1038, -1038, -1038, 1149, -1038, -1038,
+ -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038, -1038,
+ -1038, -657, -687, -1038, -1038, 817, -1038, -1038, -1038, -1038,
+ -6, -1038, 138, -1038, -1037, 238, -121, 440, 328, -629,
+ 274, -1038, -250, 1
};
/* YYTABLE[YYPACT[STATE-NUM]]. What to do in state STATE-NUM. If
@@ -1452,283 +1455,305 @@ static const yytype_int16 yypgoto[] =
#define YYTABLE_NINF -5
static const yytype_int16 yytable[] =
{
- 129, 152, 196, 445, 446, 447, 65, 834, 131, 536,
- 537, 172, 174, 656, 180, 573, 452, 647, 485, 776,
- 206, 737, 457, 486, 208, 1087, 138, 135, 712, 184,
- 128, 210, 274, 139, 713, 714, 1153, 147, 157, 278,
- 369, 158, 370, 159, 199, 1100, 836, 138, 338, 339,
- 352, 353, 442, 216, 651, 712, 4, 147, 328, 132,
- 891, 713, 714, 894, 336, 336, 336, 354, 363, 120,
- 121, 366, 628, 134, 489, 373, 212, 629, 5, 126,
- 217, 213, 133, 153, 103, 104, 105, 106, 336, 367,
- 107, 574, 575, 576, 577, 767, 391, 833, 393, 31,
- 32, 33, 34, 137, 786, 639, 148, 38, 712, 495,
- 41, 267, 268, 269, 713, 714, 270, 273, 275, 276,
- 453, 282, 140, 185, 942, 657, 653, 302, 834, 279,
- 304, 142, 305, 311, 314, 315, 197, 317, 311, 319,
- 320, 1179, 311, 323, 324, 882, 347, 331, 349, 738,
- 578, 648, 151, 207, 356, 120, 121, 209, 364, 136,
- 211, 312, 212, 186, 350, 351, 312, 213, 1154, 371,
- 312, 200, 657, 351, 456, 872, 120, 121, 352, 353,
- 495, 768, 769, 740, 352, 353, 141, 379, 380, 381,
- 218, 383, 219, 143, 386, 387, 145, 388, 142, 1225,
- 144, 355, 146, 641, 150, 395, 113, 114, 115, 116,
- 149, 654, 400, 401, 402, 403, 404, 405, 406, 407,
- 408, 409, 410, 411, 412, 413, 414, 415, 416, 417,
- 418, 419, 420, 421, 422, 423, 424, 425, 426, 427,
- 428, 429, 430, 431, 432, 433, 434, 435, 436, 437,
- 438, 439, 440, 441, 545, 971, 712, 187, 448, 188,
- 143, 150, 713, 714, 712, 318, 311, 652, 154, 322,
- 713, 714, 220, 562, 221, 113, 114, 115, 116, 469,
- 470, 471, 472, 473, 474, 475, 476, 477, 478, 479,
- 480, 481, 482, 483, 312, 120, 121, 155, 458, 712,
- 352, 353, 491, 1033, 156, 713, 714, 222, 1034, 223,
- 499, 176, 742, 160, 177, 504, 931, 178, 932, 491,
- 311, 639, 165, 493, 513, 1135, 515, 516, 517, 166,
- 492, 534, 535, 1138, 522, 524, 524, 524, 524, 529,
- 349, 120, 121, 525, 525, 525, 525, 492, 312, 925,
- 926, 539, 540, 541, 267, 268, 542, 279, 279, 636,
- 637, 167, 549, 168, 169, 551, 552, 181, 1141, 311,
- 555, 556, 761, 170, 296, 297, 298, 712, 175, 712,
- 171, 299, 182, 713, 714, 713, 714, 183, 569, 168,
- 169, 572, 1106, 454, 1109, 189, 1112, 312, 834, 170,
- 785, 834, 712, 190, 834, 712, 179, 712, 713, 714,
- 191, 713, 714, 713, 714, 192, 1090, 526, 527, 528,
- 571, 193, 113, 114, 115, 116, 692, 285, 286, 287,
- 288, 289, 290, 291, 292, 293, 294, 295, 511, 297,
- 298, 194, 120, 121, 635, 299, 1190, 510, 1215, 640,
- 195, 644, 352, 353, 1017, 1027, 712, 201, 643, 352,
- 353, 161, 713, 714, 162, 202, 834, 163, 933, 164,
- 934, 1217, 203, 1174, 1219, 935, 1221, 936, 215, 642,
- 311, 660, 260, 635, 664, 352, 353, 665, 666, 668,
- 224, 834, 225, 226, 834, 227, 554, 834, 352, 353,
- 834, 531, 311, 204, 261, 666, 685, 205, 312, 1199,
- 703, 1202, 691, 1205, 875, 877, 667, 669, 262, 1208,
- 834, 263, 834, 717, 834, 1239, 704, 705, 712, 228,
- 312, 229, 708, 667, 713, 714, 264, 352, 353, 230,
- 720, 231, 722, 1228, 712, 1230, 232, 1232, 233, 277,
- 713, 714, 265, 284, 365, 733, 283, 735, 736, 285,
- 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 352, 353, 352, 353, 299, 793, 794,
- 234, 796, 235, 799, 800, 1007, 1028, 803, 804, 538,
- 876, 544, 442, 216, 741, 120, 121, 1240, 120, 121,
- 750, 751, 740, 450, 236, 212, 237, 659, 300, 238,
- 213, 239, 301, 1241, 752, 753, 754, 755, 756, 757,
- 758, 216, 303, 311, 103, 104, 105, 106, 762, 682,
- 107, 240, 316, 241, 976, 770, 844, 845, 846, 242,
- 788, 243, 244, 321, 245, 311, 311, 311, 311, 783,
- 330, 312, 103, 104, 105, 106, 332, 311, 107, 285,
- 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 312, 312, 312, 312, 299, 311, 352,
- 353, 352, 353, 352, 353, 312, 333, 334, 827, 828,
- 829, 113, 114, 115, 116, 823, 246, 835, 247, 1021,
- 340, 248, 901, 249, 341, 250, 312, 251, 907, 342,
- 343, 120, 121, 352, 353, 344, 1101, 914, 915, 916,
- 352, 353, 345, 919, 920, 921, 922, 923, 924, 1064,
- 352, 353, 352, 353, 357, 252, 1066, 253, 938, 858,
- 859, 352, 353, 352, 353, 254, 1068, 255, 1134, 346,
- 760, 294, 295, 296, 297, 298, 256, 1137, 257, 1140,
- 299, 358, 7, 8, 258, 495, 259, 496, 495, 883,
- 501, 368, 779, 780, 781, 782, 495, 626, 505, 627,
- 359, 893, 963, 372, 789, 896, 495, 741, 638, 374,
- 495, 878, 683, 463, 13, 14, 464, 16, 17, 465,
- 19, 466, 21, 913, 22, 806, 24, 25, 375, 27,
- 28, 29, 376, 495, 941, 726, 377, 927, 928, 929,
- 797, 495, 798, 805, 378, 937, 939, 382, 884, 940,
- 885, 495, 311, 886, 384, 45, 46, 47, 495, 495,
- 887, 888, 948, 949, 950, 495, 495, 889, 895, 385,
- 495, 955, 911, 958, 1024, 959, 961, 495, 389, 1022,
- 312, 1039, 1113, 1040, 1114, 1037, 495, 958, 1121, 1125,
- 958, 965, 1130, 1039, 958, 1176, 1196, 980, 964, 953,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 553,
- 1222, 979, 1223, 299, 958, 390, 1237, 984, 985, 1242,
- 392, 1243, 987, 394, 396, 397, 299, 399, 449, 459,
- 1008, 994, 1011, 460, 1014, 461, 126, 512, 462, 490,
- 1001, 518, 519, 530, 546, 1071, 548, 550, 1002, 560,
- 563, 630, 631, 279, 632, 634, 1210, 645, 1023, 646,
- 650, 661, 670, 671, 672, 674, 1031, 675, 676, 677,
- 1035, 1036, 679, 680, 1032, 681, 7, 8, 687, 943,
- 693, 695, 1116, 697, 1233, 698, 1236, 699, 700, 702,
- 721, 1049, 729, 730, 731, 732, 706, 707, 745, 1115,
- 747, 746, 749, 1055, 1248, 759, 764, 463, 13, 14,
- 464, 16, 17, 465, 19, 466, 21, 765, 22, 1062,
- 24, 25, 766, 27, 28, 29, 771, 772, 775, 784,
- 774, 778, 792, 795, 801, 1074, 808, 809, 810, 1078,
- 1142, 1079, 802, 811, 311, 812, 815, 822, 1084, 45,
- 46, 47, 816, 1088, 817, 818, 1175, 819, 820, 821,
- 830, 839, 831, 1105, 832, 1108, 838, 1111, 840, 842,
- 843, 847, 312, 841, 852, 853, 855, 857, 1104, 854,
- 1107, 856, 1110, 862, 279, 873, 7, 8, 880, 890,
- 897, 1118, 902, 898, 879, 905, 906, 909, 903, 1123,
- 1124, 904, 910, 567, 912, 908, 1127, 917, 918, 962,
- 930, 944, 945, 1129, 946, 951, 1132, 463, 13, 14,
- 464, 16, 17, 465, 19, 466, 21, 952, 22, 966,
- 24, 25, 967, 27, 28, 29, 961, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 1162, 947,
- 969, 1166, 299, 972, 1170, 973, 974, 975, 1173, 45,
- 46, 47, 978, 981, 982, 983, 1178, 75, 306, 1180,
- 988, 1080, 986, 79, 80, 81, 990, 991, 82, 83,
+ 129, 200, 539, 540, 459, 642, 65, 131, 1094, 152,
+ 128, 659, 447, 448, 449, 207, 576, 275, 454, 197,
+ 716, 211, 780, 209, 185, 650, 717, 718, 1107, 135,
+ 1160, 371, 839, 372, 133, 741, 147, 339, 340, 771,
+ 4, 716, 138, 896, 138, 147, 132, 717, 718, 139,
+ 716, 654, 444, 217, 354, 355, 717, 718, 354, 355,
+ 150, 368, 5, 899, 354, 355, 841, 657, 365, 188,
+ 937, 189, 938, 134, 939, 375, 940, 137, 157, 218,
+ 941, 158, 942, 159, 103, 104, 105, 106, 140, 838,
+ 107, 153, 577, 578, 579, 580, 393, 487, 395, 354,
+ 355, 141, 488, 276, 277, 148, 113, 114, 115, 116,
+ 948, 268, 269, 270, 656, 534, 271, 274, 186, 1142,
+ 145, 283, 455, 660, 1186, 772, 773, 303, 201, 280,
+ 305, 631, 306, 312, 315, 316, 632, 318, 312, 320,
+ 321, 279, 312, 324, 325, 120, 121, 332, 208, 887,
+ 212, 581, 213, 198, 839, 660, 210, 214, 187, 651,
+ 373, 136, 1161, 742, 151, 352, 353, 354, 355, 165,
+ 173, 175, 166, 181, 353, 146, 120, 121, 354, 355,
+ 354, 355, 1232, 744, 356, 149, 644, 716, 381, 382,
+ 383, 150, 385, 717, 718, 388, 389, 357, 390, 154,
+ 790, 31, 32, 33, 34, 497, 397, 155, 219, 38,
+ 220, 156, 41, 402, 403, 404, 405, 406, 407, 408,
+ 409, 410, 411, 412, 413, 414, 415, 416, 417, 418,
+ 419, 420, 421, 422, 423, 424, 425, 426, 427, 428,
+ 429, 430, 431, 432, 433, 434, 435, 436, 437, 438,
+ 439, 440, 441, 442, 443, 548, 1145, 716, 160, 450,
+ 977, 877, 716, 717, 718, 716, 497, 312, 717, 718,
+ 167, 717, 718, 1040, 565, 120, 121, 642, 1041, 460,
+ 471, 472, 473, 474, 475, 476, 477, 478, 479, 480,
+ 481, 482, 483, 484, 485, 168, 177, 354, 355, 178,
+ 142, 161, 179, 493, 162, 176, 349, 163, 351, 164,
+ 221, 501, 222, 541, 358, 223, 506, 224, 366, 184,
+ 493, 312, 225, 746, 226, 515, 1148, 517, 518, 519,
+ 227, 1197, 228, 458, 1222, 524, 526, 526, 526, 526,
+ 531, 532, 182, 527, 527, 527, 527, 881, 354, 355,
+ 354, 355, 183, 542, 543, 544, 268, 269, 545, 280,
+ 280, 229, 143, 230, 552, 367, 547, 554, 555, 144,
+ 716, 312, 558, 559, 169, 170, 717, 718, 113, 114,
+ 115, 116, 194, 765, 171, 120, 121, 354, 355, 329,
+ 572, 180, 744, 575, 716, 337, 337, 337, 120, 121,
+ 717, 718, 574, 828, 142, 643, 716, 354, 355, 444,
+ 217, 789, 717, 718, 231, 1113, 232, 1116, 716, 1119,
+ 337, 369, 190, 1097, 717, 718, 839, 191, 233, 839,
+ 234, 497, 839, 498, 113, 114, 115, 116, 235, 1224,
+ 236, 103, 104, 105, 106, 195, 638, 107, 113, 114,
+ 115, 116, 192, 647, 120, 121, 931, 932, 716, 646,
+ 237, 645, 238, 1226, 717, 718, 143, 193, 120, 121,
+ 196, 716, 319, 655, 716, 1228, 323, 717, 718, 217,
+ 717, 718, 312, 663, 202, 638, 667, 1246, 203, 668,
+ 669, 671, 537, 538, 839, 239, 1181, 240, 204, 880,
+ 882, 351, 354, 355, 312, 354, 355, 669, 688, 205,
+ 103, 104, 105, 106, 694, 497, 107, 503, 840, 839,
+ 206, 1028, 839, 354, 355, 839, 261, 1247, 839, 708,
+ 709, 241, 1206, 242, 1209, 712, 1212, 169, 170, 1071,
+ 1248, 216, 1215, 724, 243, 726, 244, 171, 839, 245,
+ 839, 246, 839, 262, 172, 354, 355, 247, 737, 248,
+ 739, 740, 354, 355, 354, 355, 1235, 249, 1237, 250,
+ 1239, 1073, 295, 296, 297, 298, 299, 745, 1075, 313,
+ 1141, 300, 1014, 251, 313, 252, 354, 355, 313, 288,
+ 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
+ 299, 456, 1144, 754, 755, 300, 265, 263, 354, 355,
+ 264, 495, 528, 529, 530, 266, 278, 756, 757, 758,
+ 759, 760, 761, 762, 1147, 284, 312, 120, 121, 301,
+ 333, 766, 491, 253, 213, 254, 302, 126, 774, 214,
+ 255, 257, 256, 258, 259, 317, 260, 982, 312, 312,
+ 312, 312, 787, 304, 497, 512, 507, 629, 322, 630,
+ 312, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 707, 297, 298, 299, 300, 120, 121, 331,
+ 300, 312, 452, 334, 213, 721, 335, 341, 497, 214,
+ 641, 342, 639, 640, 291, 292, 293, 294, 295, 296,
+ 297, 298, 299, 343, 497, 557, 686, 300, 497, 801,
+ 730, 802, 344, 313, 1108, 286, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 513, 298, 299, 497,
+ 889, 809, 890, 300, 497, 497, 891, 892, 497, 497,
+ 893, 894, 1024, 863, 864, 497, 497, 900, 916, 494,
+ 964, 497, 965, 1029, 1046, 1120, 1047, 1121, 497, 695,
+ 1128, 964, 964, 1132, 1137, 345, 494, 313, 1046, 346,
+ 1183, 745, 964, 888, 1203, 883, 1229, 964, 1230, 1244,
+ 1249, 347, 1250, 348, 359, 898, 370, 360, 376, 901,
+ 361, 374, 377, 380, 378, 379, 387, 386, 384, 391,
+ 392, 394, 792, 396, 398, 399, 451, 918, 401, 300,
+ 461, 462, 126, 463, 514, 464, 662, 313, 520, 492,
+ 521, 533, 933, 934, 935, 549, 551, 553, 563, 566,
+ 943, 945, 633, 634, 946, 637, 635, 312, 685, 648,
+ 649, 653, 664, 673, 674, 675, 677, 954, 955, 956,
+ 678, 832, 833, 834, 679, 680, 961, 682, 683, 684,
+ 690, 967, 696, 698, 959, 700, 701, 702, 703, 710,
+ 711, 725, 706, 733, 734, 735, 971, 736, 749, 750,
+ 753, 751, 970, 763, 768, 770, 769, 775, 776, 779,
+ 778, 782, 788, 796, 799, 805, 985, 806, 812, 813,
+ 814, 815, 990, 991, 816, 819, 835, 993, 820, 821,
+ 822, 823, 797, 798, 824, 800, 1000, 803, 804, 825,
+ 826, 807, 808, 827, 836, 846, 1008, 837, 313, 843,
+ 844, 845, 847, 1009, 848, 852, 670, 672, 857, 280,
+ 858, 859, 860, 861, 1030, 862, 867, 878, 885, 895,
+ 313, 1217, 1038, 670, 902, 884, 1042, 1043, 907, 1039,
+ 764, 903, 908, 909, 910, 911, 913, 914, 1123, 915,
+ 917, 849, 850, 851, 922, 923, 968, 1056, 947, 1240,
+ 936, 1243, 783, 784, 785, 786, 951, 950, 952, 1062,
+ 957, 994, 958, 972, 793, 953, 973, 975, 984, 1255,
+ 978, 979, 980, 981, 987, 988, 1069, 989, 992, 996,
+ 997, 998, 1001, 1002, 1003, 810, 1004, 1005, 1006, 1007,
+ 1016, 1025, 1081, 1019, 1022, 1048, 1085, 1045, 1086, 1049,
+ 1050, 312, 1052, 1053, 1055, 1091, 1061, 906, 1064, 1067,
+ 1095, 986, 1182, 912, 1054, 1077, 1065, 1063, 1068, 1079,
+ 1070, 1082, 919, 920, 921, 1072, 1084, 1089, 924, 925,
+ 926, 927, 928, 929, 930, 1111, 1098, 1114, 1034, 1117,
+ 1074, 280, 313, 1096, 944, 1015, 1100, 1018, 1125, 1021,
+ 1076, 1101, 1080, 1102, 1103, 1104, 1130, 1131, 1106, 1129,
+ 1133, 1135, 1138, 1134, 313, 313, 313, 313, 1150, 1151,
+ 1136, 1156, 1154, 1139, 1163, 1165, 313, 1167, 1170, 1171,
+ 1174, 1175, 1178, 1179, 1188, 1189, 1191, 1193, 969, 1195,
+ 1200, 1201, 1207, 967, 1210, 1205, 1213, 313, 1219, 1220,
+ 1221, 1223, 1234, 1236, 1238, 1169, 1241, 1245, 1173, 1251,
+ 1252, 1177, 1253, 1225, 1254, 1180, 1256, 1227, 897, 905,
+ 64, 1231, 71, 1185, 1157, 1233, 1187, 523, 0, 974,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 949, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 855, 0, 0, 0,
+ 300, 1031, 0, 0, 0, 0, 0, 0, 0, 1035,
+ 0, 0, 1044, 0, 0, 0, 0, 0, 0, 1112,
+ 0, 1115, 0, 1118, 0, 0, 0, 75, 307, 0,
+ 0, 0, 0, 79, 80, 81, 0, 0, 82, 83,
84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
- 94, 95, 96, 97, 98, 99, 100, 101, 102, 995,
- 992, 996, 997, 1018, 998, 999, 1000, 307, 1041, 7,
- 8, 1009, 1012, 568, 1015, 1038, 1042, 1043, 1054, 1045,
- 1046, 1048, 1047, 1056, 1057, 1060, 1058, 1070, 31, 32,
- 33, 34, 35, 1061, 1072, 1065, 38, 1063, 1067, 41,
- 463, 13, 14, 464, 16, 17, 465, 19, 466, 21,
- 1069, 22, 1073, 24, 25, 1075, 27, 28, 29, 1082,
- 1077, 1089, 1093, 1094, 1091, 1095, 1096, 1097, 109, 110,
- 111, 112, 1099, 1122, 1126, 1128, 1131, 1143, 1144, 1147,
- 1149, 1158, 45, 46, 47, 117, 308, 1160, 1163, 1156,
- 119, 1164, 1167, 1168, 1171, 122, 1181, 892, 1188, 1172,
- 125, 1182, 1193, 509, 75, 76, 77, 1184, 78, 1200,
- 79, 80, 81, 1186, 1198, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 718, 103, 104, 105,
- 106, 1194, 1203, 107, 1206, 1212, 1213, 1214, 1226, 1227,
- 1229, 1231, 75, 306, 335, 1216, 1234, 1238, 79, 80,
- 81, 1218, 1220, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, 102, 1224, 1244, 1245, 1246, 1247, 1249,
- 900, 1150, 307, 64, 71, 521, 968, 0, 0, 108,
- 0, 0, 0, 0, 0, 109, 110, 111, 112, 113,
- 114, 115, 116, 31, 32, 33, 34, 35, 0, 0,
- 0, 38, 117, 118, 41, 0, 0, 119, 0, 120,
- 121, 0, 122, 0, 123, 0, 124, 125, 0, 126,
- 0, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 109, 110, 111, 112, 299, 0, 0,
+ 94, 95, 96, 97, 98, 99, 100, 101, 102, 0,
+ 0, 0, 0, 0, 0, 0, 0, 308, 0, 0,
+ 0, 0, 0, 1078, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 31, 32,
+ 33, 34, 35, 313, 0, 0, 38, 0, 0, 41,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 856, 0, 0, 0, 0, 0, 0, 1122, 109, 110,
+ 111, 112, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 117, 309, 0, 0, 0,
+ 119, 0, 0, 0, 0, 122, 0, 0, 0, 0,
+ 125, 0, 0, 511, 0, 75, 76, 77, 1149, 78,
+ 0, 79, 80, 81, 0, 1087, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 0, 103, 104,
+ 105, 106, 0, 0, 107, 0, 0, 0, 0, 0,
+ 0, 0, 0, 75, 307, 336, 0, 0, 0, 79,
+ 80, 81, 0, 0, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 0, 0, 0, 0, 0,
+ 0, 0, 0, 308, 0, 0, 0, 0, 0, 0,
+ 108, 0, 0, 0, 0, 0, 109, 110, 111, 112,
+ 113, 114, 115, 116, 31, 32, 33, 34, 35, 0,
+ 0, 0, 38, 117, 118, 41, 0, 313, 119, 0,
+ 120, 121, 0, 122, 0, 123, 0, 124, 125, 0,
+ 126, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 109, 110, 111, 112, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 117, 325, 0, 0, 0, 119, 0, 0, 0, 0,
- 122, 0, 75, 306, 0, 125, 0, 326, 79, 80,
- 81, 0, 0, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, 102, 0, 0, 0, 0, 0, 0,
- 0, 0, 307, 0, 7, 8, 0, 0, 0, 0,
+ 0, 117, 326, 0, 0, 0, 119, 0, 0, 0,
+ 0, 122, 0, 75, 307, 0, 125, 0, 327, 79,
+ 80, 81, 0, 0, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 0, 0, 0, 0, 0,
+ 0, 0, 0, 308, 0, 7, 8, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 31, 32, 33, 34, 35, 0, 0,
- 0, 38, 0, 0, 41, 463, 13, 14, 464, 16,
- 17, 465, 19, 466, 21, 0, 22, 0, 24, 25,
- 0, 27, 28, 29, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 109, 110, 111, 112, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 45, 46, 47,
- 117, 325, 0, 0, 0, 119, 0, 0, 0, 0,
- 122, 0, 75, 306, 0, 125, 0, 326, 79, 80,
- 81, 0, 0, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, 102, 0, 0, 0, 0, 0, 0,
- 0, 734, 307, 0, 7, 8, 0, 0, 0, 0,
+ 0, 0, 0, 0, 31, 32, 33, 34, 35, 0,
+ 0, 0, 38, 0, 0, 41, 465, 13, 14, 466,
+ 16, 17, 467, 19, 468, 21, 0, 22, 0, 24,
+ 25, 0, 27, 28, 29, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 109, 110, 111, 112, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 45, 46,
+ 47, 117, 326, 0, 0, 0, 119, 0, 0, 0,
+ 0, 122, 0, 75, 307, 0, 125, 0, 327, 79,
+ 80, 81, 0, 0, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 0, 0, 0, 0, 0,
+ 0, 0, 556, 308, 0, 7, 8, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 31, 32, 33, 34, 35, 468, 0,
- 0, 38, 0, 0, 41, 463, 13, 14, 464, 16,
- 17, 465, 19, 466, 21, 0, 22, 0, 24, 25,
- 0, 27, 28, 29, 0, 0, 0, 0, 0, 0,
- 0, 850, 0, 109, 110, 111, 112, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 45, 46, 47,
- 117, 308, 0, 0, 0, 119, 0, 0, 0, 0,
- 122, 0, 75, 306, 0, 125, 0, 508, 79, 80,
- 81, 0, 0, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, 102, 0, 0, 0, 0, 0, 0,
- 0, 1145, 307, 0, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 31, 32, 33, 34, 35, 0, 0,
- 0, 38, 0, 0, 41, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 0,
- 0, 0, 0, 299, 0, 851, 0, 0, 0, 0,
- 0, 0, 0, 109, 110, 111, 112, 0, 0, 0,
+ 0, 0, 0, 0, 31, 32, 33, 34, 35, 285,
+ 0, 0, 38, 0, 0, 41, 465, 13, 14, 466,
+ 16, 17, 467, 19, 468, 21, 0, 22, 0, 24,
+ 25, 0, 27, 28, 29, 0, 0, 0, 0, 0,
+ 470, 0, 0, 0, 109, 110, 111, 112, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 45, 46,
+ 47, 117, 309, 0, 0, 0, 119, 0, 0, 0,
+ 0, 122, 0, 75, 307, 0, 125, 0, 510, 79,
+ 80, 81, 0, 0, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 0, 0, 0, 0, 0,
+ 0, 0, 570, 308, 0, 286, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, 0,
+ 0, 0, 0, 300, 31, 32, 33, 34, 35, 0,
+ 0, 0, 38, 0, 0, 41, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 109, 110, 111, 112, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 117, 308, 0, 0, 0, 119, 0, 0, 0, 0,
- 122, 0, 75, 266, 216, 125, 0, 684, 79, 80,
- 81, 0, 0, 82, 83, 84, 85, 86, 87, 88,
- 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, 102, 0, 103, 104, 105, 106, 75,
- 266, 107, 7, 8, 0, 79, 80, 81, 0, 0,
- 82, 83, 84, 85, 86, 87, 88, 89, 90, 91,
- 92, 93, 94, 95, 96, 97, 98, 99, 100, 101,
- 102, 0, 0, 463, 13, 14, 464, 16, 17, 465,
- 19, 466, 21, 0, 22, 0, 24, 25, 0, 27,
- 28, 29, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 109, 110, 111, 112, 0, 0, 0,
- 0, 0, 0, 0, 0, 45, 46, 47, 0, 0,
- 117, 118, 0, 0, 0, 119, 0, 0, 0, 0,
- 122, 0, 0, 0, 0, 125, 484, 1030, 0, 0,
- 109, 110, 111, 112, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 633, 117, 118, 0,
- 0, 0, 119, 0, 0, 0, 0, 122, 0, 1191,
- 271, 0, 125, 0, 272, 75, 266, 0, 0, 0,
- 0, 79, 80, 81, 0, 0, 82, 83, 84, 85,
- 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
- 96, 97, 98, 99, 100, 101, 102, 0, 0, 0,
- 75, 266, 0, 0, 0, 0, 79, 80, 81, 0,
- 0, 82, 83, 84, 85, 86, 87, 88, 89, 90,
- 91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
- 101, 102, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 109, 110, 111, 112,
- 299, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 117, 118, 0, 0, 0, 119, 0,
- 0, 0, 0, 122, 0, 0, 662, 0, 125, 0,
- 663, 109, 110, 111, 112, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 360, 361,
- 0, 813, 0, 119, 0, 0, 0, 0, 362, 0,
- 75, 306, 0, 125, 0, 171, 79, 80, 81, 0,
+ 0, 117, 309, 0, 0, 0, 119, 0, 0, 0,
+ 0, 122, 0, 75, 267, 217, 125, 0, 687, 79,
+ 80, 81, 0, 0, 82, 83, 84, 85, 86, 87,
+ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97,
+ 98, 99, 100, 101, 102, 0, 103, 104, 105, 106,
+ 75, 267, 107, 7, 8, 0, 79, 80, 81, 0,
0, 82, 83, 84, 85, 86, 87, 88, 89, 90,
91, 92, 93, 94, 95, 96, 97, 98, 99, 100,
- 101, 102, 0, 0, 0, 0, 0, 0, 0, 0,
- 307, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 0, 0, 0, 299,
- 0, 31, 32, 33, 34, 35, 0, 75, 266, 38,
- 0, 0, 41, 79, 80, 81, 0, 0, 82, 83,
- 84, 85, 86, 87, 88, 89, 90, 91, 92, 93,
- 94, 95, 96, 97, 98, 99, 100, 101, 102, 773,
+ 101, 102, 0, 0, 465, 13, 14, 466, 16, 17,
+ 467, 19, 468, 21, 0, 22, 0, 24, 25, 0,
+ 27, 28, 29, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 109, 110, 111, 112, 0, 0,
+ 0, 0, 0, 0, 0, 0, 45, 46, 47, 0,
+ 0, 117, 118, 0, 0, 0, 119, 0, 0, 0,
+ 0, 122, 0, 0, 0, 0, 125, 0, 1037, 0,
0, 109, 110, 111, 112, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 117, 308,
- 0, 0, 0, 119, 75, 266, 216, 0, 122, 0,
- 79, 80, 81, 125, 0, 82, 83, 84, 85, 86,
- 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
- 97, 98, 99, 100, 101, 102, 807, 103, 104, 105,
- 106, 0, 0, 107, 0, 0, 0, 0, 109, 110,
- 111, 112, 0, 0, 0, 837, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 117, 118, 0, 0, 0,
- 119, 0, 0, 0, 881, 122, 0, 0, 0, 0,
- 125, 0, 0, 0, 0, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 1044,
- 0, 0, 0, 299, 0, 109, 110, 111, 112, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 1059, 0,
- 0, 0, 117, 118, 0, 0, 0, 119, 0, 0,
- 0, 0, 122, 0, 0, 0, 0, 125, 1081, 0,
- 0, 0, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 1148, 0, 0,
- 299, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 1189, 0, 0, 299,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 493, 299, 0,
- 0, 0, 0, 0, 0, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 493,
- 0, 0, 0, 299, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 564, 0,
- 0, 0, 299, 0, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 655, 0,
- 0, 0, 299, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 791, 0, 0,
- 0, 299, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 849, 0, 0, 0,
- 299, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 494, 297, 298, 0, 0, 0, 0, 299,
- 0, 0, 0, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 511, 297, 298, 0, 0, 0,
- 0, 299, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 0, 0, 0, 299,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, -4, 1, 0, 299, -4,
+ 0, 0, 0, 0, 0, 0, 0, 486, 117, 118,
+ 0, 0, 0, 119, 0, 0, 0, 0, 122, 0,
+ 571, 272, 0, 125, 0, 273, 75, 267, 0, 0,
+ 0, 0, 79, 80, 81, 0, 0, 82, 83, 84,
+ 85, 86, 87, 88, 89, 90, 91, 92, 93, 94,
+ 95, 96, 97, 98, 99, 100, 101, 102, 0, 0,
+ 0, 75, 267, 7, 8, 0, 0, 79, 80, 81,
+ 0, 0, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 0, 465, 13, 14, 466, 16, 17,
+ 467, 19, 468, 21, 0, 22, 0, 24, 25, 0,
+ 27, 28, 29, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 109, 110, 111,
+ 112, 300, 0, 0, 0, 0, 45, 46, 47, 0,
+ 0, 0, 0, 0, 117, 118, 0, 0, 0, 119,
+ 0, 0, 0, 0, 122, 0, 0, 665, 0, 125,
+ 0, 666, 109, 110, 111, 112, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 362,
+ 363, 0, 817, 0, 119, 0, 0, 0, 0, 364,
+ 722, 75, 307, 0, 125, 0, 172, 79, 80, 81,
+ 0, 0, 82, 83, 84, 85, 86, 87, 88, 89,
+ 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,
+ 100, 101, 102, 0, 0, 0, 0, 0, 0, 0,
+ 0, 308, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 31, 32, 33, 34, 35, 0, 75, 267,
+ 38, 0, 0, 41, 79, 80, 81, 0, 0, 82,
+ 83, 84, 85, 86, 87, 88, 89, 90, 91, 92,
+ 93, 94, 95, 96, 97, 98, 99, 100, 101, 102,
+ 0, 0, 109, 110, 111, 112, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 117,
+ 309, 0, 0, 0, 119, 75, 267, 217, 0, 122,
+ 0, 79, 80, 81, 125, 0, 82, 83, 84, 85,
+ 86, 87, 88, 89, 90, 91, 92, 93, 94, 95,
+ 96, 97, 98, 99, 100, 101, 102, 0, 103, 104,
+ 105, 106, 0, 0, 107, 0, 0, 0, 0, 109,
+ 110, 111, 112, 0, 0, 0, 7, 8, 636, 0,
+ 0, 0, 0, 0, 0, 0, 117, 118, 0, 0,
+ 0, 119, 0, 0, 0, 0, 122, 0, 0, 0,
+ 0, 125, 0, 0, 0, 0, 0, 465, 13, 14,
+ 466, 16, 17, 467, 19, 468, 21, 0, 22, 0,
+ 24, 25, 0, 27, 28, 29, 109, 110, 111, 112,
+ 0, 7, 8, 777, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 117, 118, 0, 0, 0, 119, 45,
+ 46, 47, 0, 122, 811, 0, 0, 0, 125, 0,
+ 0, 0, 465, 13, 14, 466, 16, 17, 467, 19,
+ 468, 21, 0, 22, 842, 24, 25, 0, 27, 28,
+ 29, 7, 8, 0, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 738, 45, 46, 47, 886, 0, 0,
+ 0, 0, 465, 13, 14, 466, 16, 17, 467, 19,
+ 468, 21, 0, 22, 0, 24, 25, 1051, 27, 28,
+ 29, 0, 0, 0, 0, 0, 0, 0, 0, 286,
+ 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
+ 297, 298, 299, 1066, 45, 46, 47, 300, 1152, 0,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 1088, 0, 0, 0, 300, 0,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 1155, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 1198, 0,
+ 0, 0, 0, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 1196, 0, 0,
+ 0, 300, 0, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 0, 495, 0,
+ 0, 300, 0, 0, 0, 0, 0, 0, 0, 286,
+ 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
+ 297, 298, 299, 495, 0, 0, 0, 300, 0, 0,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 567, 0, 0, 0, 300, 0,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 658, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 795, 0, 0,
+ 0, 300, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 496, 298, 299, 854, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 286, 287, 288,
+ 289, 290, 291, 292, 293, 294, 295, 296, 513, 298,
+ 299, 0, 0, 0, 0, 300, 0, 0, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 0, 0, 0, 0, 300,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, -4, 1, 0, 300, -4,
0, 0, 0, 0, 0, 0, 0, -4, -4, 0,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- -4, 0, 0, 0, 0, -4, -4, 688, -4, -4,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ -4, 0, 0, 0, 0, -4, -4, 691, -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, 0, -4, -4, -4, -4, -4,
@@ -1742,610 +1767,634 @@ static const yytype_int16 yytable[] =
0, 36, 37, 38, 39, 40, 41, 7, 8, 42,
43, 0, 0, 0, 0, 44, 45, 46, 47, 0,
0, 48, 0, 49, 0, 50, 51, 52, 53, 54,
- 55, 56, 57, 58, 59, 0, 0, 0, 463, 13,
- 14, 464, 16, 17, 465, 19, 466, 21, 0, 22,
- 0, 24, 25, 0, 27, 28, 29, 0, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 45, 46, 47, 1005, 0, 1006, 285, 286, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 0, 0,
- 0, 1025, 0, 1026, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 0, 0, 0, 1102,
- 0, 1103, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 0, 0, 0, 0, 0, 743,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 0, 0, 0, 0, 0, 790, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 0, 0, 0, 0, 0, 826, 285, 286, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 0, 0,
- 0, 0, 0, 1003, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 0, 0, 0, 0,
- 0, 1020, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 0, 0, 0, 0, 0, 1050,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 0, 0, 0, 0, 0, 1051, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 0, 0, 0, 0, 0, 1052, 285, 286, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 0, 0,
- 0, 0, 0, 1053, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 0, 0, 0, 0,
- 0, 1076, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 0, 0, 0, 0, 0, 1117,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 0, 0, 0, 0, 0, 1119, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 0, 0, 0, 0, 0, 1120, 285, 286, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 0, 0,
- 0, 0, 0, 1133, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 0, 0, 0, 0,
- 0, 1136, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 0, 0, 0, 0, 0, 1139,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 0, 0, 0, 0, 0, 1157, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 0, 0, 0, 0, 0, 1159, 285, 286, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 0, 0,
- 0, 0, 0, 1183, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 0, 0, 0, 0,
- 0, 1185, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 0, 0, 0, 0, 0, 1187,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 0, 0, 0, 0, 0, 1197, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 451, 0,
- 0, 0, 0, 532, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 0, 0, 0, 487,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 0, 0, 0, 532, 285, 286, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 0, 0,
- 0, 533, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 0, 0, 0, 561, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 0, 0, 0, 606, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 0, 0, 0, 607,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 0, 0, 0, 620, 285, 286, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 0, 0,
- 0, 621, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 0, 0, 0, 622, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 0, 0, 0, 623, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 0, 0, 0, 624,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 0, 0, 0, 625, 285, 286, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 0, 0,
- 0, 709, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 0, 0, 0, 710, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 0, 0, 0, 711, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 0, 0, 0, 787,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 0, 0, 0, 824, 285, 286, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 0, 0,
- 0, 825, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 0, 0, 0, 848, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 0, 0, 0, 956, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 0, 0, 0, 957,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 0, 0, 0, 977, 285, 286, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 0, 0,
- 0, 989, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 0, 0, 0, 1085, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 0, 0, 0, 1086, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 0, 0, 0, 1092,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 0, 0, 0, 1098, 285, 286, 287, 288,
- 289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 0, 0,
- 0, 1152, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 0, 0, 0, 1155, 285, 286,
- 287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 455, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 0, 0, 0, 299,
- 0, 0, 0, 566, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 570, 285, 286, 287,
+ 55, 56, 57, 58, 59, 0, 0, 0, 465, 13,
+ 14, 466, 16, 17, 467, 19, 468, 21, 0, 22,
+ 0, 24, 25, 0, 27, 28, 29, 0, 286, 287,
288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 0, 0, 0, 0, 299, 0, 0, 0, 585,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 587, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 0, 0, 0,
- 0, 299, 0, 0, 0, 589, 285, 286, 287, 288,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 45, 46, 47, 1012, 0, 1013, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 1032, 0, 1033, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 0, 0, 0, 1109,
+ 0, 1110, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 0, 0, 747,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 0, 0, 794, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 0, 0, 0, 0, 0, 831, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1010, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1027, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 0, 0, 1057,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1058, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1059, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1060, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1083, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 0, 0, 1124,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1126, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1127, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1140, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1143, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 0, 0, 1146,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1164, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 0, 0, 0, 0, 0, 1166, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 0, 0, 1190, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 0, 0, 0, 0,
+ 0, 1192, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 0, 0, 1194,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 0, 0, 1204, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 453, 0,
+ 0, 0, 0, 535, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 0, 0, 0, 489,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 535, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 536, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 564, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 0, 0, 0, 609, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 0, 0, 0, 610,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 623, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 624, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 625, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 0, 0, 0, 626, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 0, 0, 0, 627,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 628, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 713, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 714, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 0, 0, 0, 715, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 0, 0, 0, 791,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 829, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 830, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 853, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 0, 0, 0, 962, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 0, 0, 0, 963,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 983, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 995, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 1092, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 0, 0, 0, 1093, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 0, 0, 0, 1099,
+ 286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 0, 0, 0, 1105, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 0, 0,
+ 0, 1159, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 0, 0, 0, 1162, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 457, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 0, 0, 0, 0, 300,
+ 0, 0, 0, 569, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 573, 286, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 591, 285,
+ 299, 0, 0, 0, 0, 300, 0, 0, 0, 588,
286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 0, 0, 0, 0, 299, 0, 0,
- 0, 593, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 595, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 0,
- 0, 0, 0, 299, 0, 0, 0, 597, 285, 286,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 590, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 0, 0, 0,
+ 0, 300, 0, 0, 0, 592, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 594, 286,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 599, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 0, 0, 0, 299,
- 0, 0, 0, 601, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 603, 285, 286, 287,
+ 297, 298, 299, 0, 0, 0, 0, 300, 0, 0,
+ 0, 596, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 598, 286, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, 0,
+ 0, 0, 0, 300, 0, 0, 0, 600, 286, 287,
288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 0, 0, 0, 0, 299, 0, 0, 0, 605,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 609, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 0, 0, 0,
- 0, 299, 0, 0, 0, 611, 285, 286, 287, 288,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 602, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 0, 0, 0, 0, 300,
+ 0, 0, 0, 604, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 606, 286, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 613, 285,
+ 299, 0, 0, 0, 0, 300, 0, 0, 0, 608,
286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 0, 0, 0, 0, 299, 0, 0,
- 0, 615, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 617, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 0,
- 0, 0, 0, 299, 0, 0, 0, 619, 285, 286,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 612, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 0, 0, 0,
+ 0, 300, 0, 0, 0, 614, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 616, 286,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 724, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 0, 0, 0, 299,
- 0, 0, 0, 725, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 0, 0, 727, 285, 286, 287,
+ 297, 298, 299, 0, 0, 0, 0, 300, 0, 0,
+ 0, 618, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 620, 286, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, 0,
+ 0, 0, 0, 300, 0, 0, 0, 622, 286, 287,
288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 0, 0, 0, 0, 299, 0, 0, 0, 728,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 0, 0, 739, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 0, 0, 0,
- 0, 299, 0, 0, 0, 763, 285, 286, 287, 288,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 728, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 0, 0, 0, 0, 300,
+ 0, 0, 0, 729, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 0, 0, 731, 286, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 0, 0, 864, 285,
+ 299, 0, 0, 0, 0, 300, 0, 0, 0, 732,
286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 0, 0, 0, 0, 299, 0, 0,
- 0, 866, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 0, 0, 868, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 0,
- 0, 0, 0, 299, 0, 0, 0, 870, 285, 286,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 0, 0, 743, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 0, 0, 0,
+ 0, 300, 0, 0, 0, 767, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 0, 0, 869, 286,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 0, 0,
- 871, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 0, 0, 0, 299,
- 0, 0, 0, 970, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 451, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 0,
- 0, 0, 0, 299, 0, 488, 285, 286, 287, 288,
+ 297, 298, 299, 0, 0, 0, 0, 300, 0, 0,
+ 0, 871, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 0, 0, 873, 286, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, 0,
+ 0, 0, 0, 300, 0, 0, 0, 875, 286, 287,
+ 288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
+ 298, 299, 0, 0, 0, 0, 300, 0, 0, 0,
+ 876, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 0, 0, 0, 0, 300,
+ 0, 0, 0, 976, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 453, 286, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, 0,
+ 0, 0, 0, 300, 0, 490, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 499, 286, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 497, 285, 286, 287,
+ 299, 0, 0, 0, 0, 300, 0, 500, 286, 287,
288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 0, 0, 0, 0, 299, 0, 498, 285, 286,
+ 298, 299, 0, 0, 0, 0, 300, 0, 502, 286,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 500, 285,
+ 297, 298, 299, 0, 0, 0, 0, 300, 0, 504,
286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 0, 0, 0, 0, 299, 0, 502,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 503, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 0, 0, 0, 299,
- 0, 506, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 507, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 0, 0, 0,
- 0, 299, 0, 514, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 557, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 0,
- 0, 0, 0, 299, 0, 558, 285, 286, 287, 288,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 505, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 0, 0, 0, 0, 300,
+ 0, 508, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 509, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 0, 0, 0,
+ 0, 300, 0, 516, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 560, 286, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, 0,
+ 0, 0, 0, 300, 0, 561, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 562, 286, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 559, 285, 286, 287,
+ 299, 0, 0, 0, 0, 300, 0, 568, 286, 287,
288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 0, 0, 0, 0, 299, 0, 565, 285, 286,
+ 298, 299, 0, 0, 0, 0, 300, 0, 587, 286,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 584, 285,
+ 297, 298, 299, 0, 0, 0, 0, 300, 0, 589,
286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 0, 0, 0, 0, 299, 0, 586,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 588, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 0, 0, 0, 299,
- 0, 590, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 592, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 0, 0, 0,
- 0, 299, 0, 594, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 596, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 0,
- 0, 0, 0, 299, 0, 598, 285, 286, 287, 288,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 591, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 0, 0, 0, 0, 300,
+ 0, 593, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 595, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 0, 0, 0,
+ 0, 300, 0, 597, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 599, 286, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, 0,
+ 0, 0, 0, 300, 0, 601, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 603, 286, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 600, 285, 286, 287,
+ 299, 0, 0, 0, 0, 300, 0, 605, 286, 287,
288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 0, 0, 0, 0, 299, 0, 602, 285, 286,
+ 298, 299, 0, 0, 0, 0, 300, 0, 607, 286,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 604, 285,
+ 297, 298, 299, 0, 0, 0, 0, 300, 0, 611,
286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 0, 0, 0, 0, 299, 0, 608,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 610, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 0, 0, 0, 299,
- 0, 612, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 614, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 0, 0, 0,
- 0, 299, 0, 616, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 618, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 0,
- 0, 0, 0, 299, 0, 673, 285, 286, 287, 288,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 613, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 0, 0, 0, 0, 300,
+ 0, 615, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 617, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 0, 0, 0,
+ 0, 300, 0, 619, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 621, 286, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, 0,
+ 0, 0, 0, 300, 0, 676, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 681, 286, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 678, 285, 286, 287,
+ 299, 0, 0, 0, 0, 300, 0, 689, 286, 287,
288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 0, 0, 0, 0, 299, 0, 686, 285, 286,
+ 298, 299, 0, 0, 0, 0, 300, 0, 692, 286,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 689, 285,
+ 297, 298, 299, 0, 0, 0, 0, 300, 0, 693,
286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 0, 0, 0, 0, 299, 0, 690,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 696, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 0, 0, 0, 299,
- 0, 701, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 723, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 0, 0, 0,
- 0, 299, 0, 863, 285, 286, 287, 288, 289, 290,
- 291, 292, 293, 294, 295, 296, 297, 298, 0, 0,
- 0, 0, 299, 0, 865, 285, 286, 287, 288, 289,
- 290, 291, 292, 293, 294, 295, 296, 297, 298, 0,
- 0, 0, 0, 299, 0, 867, 285, 286, 287, 288,
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 699, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 0, 0, 0, 0, 300,
+ 0, 704, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 705, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 0, 0, 0,
+ 0, 300, 0, 727, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300, 0, 868, 286, 287, 288, 289, 290,
+ 291, 292, 293, 294, 295, 296, 297, 298, 299, 0,
+ 0, 0, 0, 300, 0, 870, 286, 287, 288, 289,
+ 290, 291, 292, 293, 294, 295, 296, 297, 298, 299,
+ 0, 0, 0, 0, 300, 0, 872, 286, 287, 288,
289, 290, 291, 292, 293, 294, 295, 296, 297, 298,
- 0, 0, 0, 0, 299, 0, 869, 285, 286, 287,
+ 299, 0, 0, 0, 0, 300, 0, 874, 286, 287,
288, 289, 290, 291, 292, 293, 294, 295, 296, 297,
- 298, 0, 0, 0, 0, 299, 0, 874, 285, 286,
+ 298, 299, 0, 0, 0, 0, 300, 0, 879, 286,
287, 288, 289, 290, 291, 292, 293, 294, 295, 296,
- 297, 298, 0, 0, 0, 0, 299, 0, 1004, 285,
+ 297, 298, 299, 0, 0, 0, 0, 300, 0, 1011,
286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 0, 0, 0, 0, 299, 0, 1019,
- 285, 286, 287, 288, 289, 290, 291, 292, 293, 294,
- 295, 296, 297, 298, 0, 0, 0, 0, 299, 0,
- 1029, 285, 286, 287, 288, 289, 290, 291, 292, 293,
- 294, 295, 296, 297, 298, 0, 0, 0, 0, 299,
- 0, 1151, 285, 286, 287, 288, 289, 290, 291, 292,
- 293, 294, 295, 296, 297, 298, 0, 0, 0, 0,
- 299, 0, 1195, 285, 286, 287, 288, 289, 290, 291,
- 292, 293, 294, 295, 296, 297, 298, 0, 0, 0,
- 0, 299
+ 296, 297, 298, 299, 0, 0, 0, 0, 300, 0,
+ 1026, 286, 287, 288, 289, 290, 291, 292, 293, 294,
+ 295, 296, 297, 298, 299, 0, 0, 0, 0, 300,
+ 0, 1036, 286, 287, 288, 289, 290, 291, 292, 293,
+ 294, 295, 296, 297, 298, 299, 0, 0, 0, 0,
+ 300, 0, 1158, 286, 287, 288, 289, 290, 291, 292,
+ 293, 294, 295, 296, 297, 298, 299, 0, 0, 0,
+ 0, 300, 0, 1202, 286, 287, 288, 289, 290, 291,
+ 292, 293, 294, 295, 296, 297, 298, 299, 0, 0,
+ 0, 0, 300
};
static const yytype_int16 yycheck[] =
{
- 6, 49, 4, 261, 262, 263, 3, 715, 6, 354,
- 355, 32, 33, 6, 35, 4, 7, 4, 132, 648,
- 5, 7, 274, 137, 5, 1038, 131, 6, 70, 4,
- 6, 4, 4, 138, 76, 77, 6, 69, 46, 4,
- 4, 49, 6, 51, 4, 1058, 719, 131, 158, 159,
- 121, 122, 4, 5, 138, 70, 6, 69, 151, 13,
- 6, 76, 77, 6, 157, 158, 159, 138, 179, 128,
- 129, 181, 132, 131, 133, 186, 135, 137, 0, 138,
- 78, 140, 49, 131, 36, 37, 38, 39, 181, 182,
- 42, 80, 81, 82, 83, 4, 207, 139, 209, 64,
- 65, 66, 67, 6, 132, 7, 138, 72, 70, 137,
- 75, 117, 118, 119, 76, 77, 122, 123, 90, 91,
- 111, 127, 131, 98, 139, 118, 138, 133, 836, 126,
- 136, 69, 138, 139, 140, 141, 138, 143, 144, 145,
- 146, 1154, 148, 149, 150, 774, 167, 153, 169, 135,
- 139, 138, 53, 138, 175, 128, 129, 138, 179, 138,
- 133, 139, 135, 138, 170, 171, 144, 140, 138, 133,
- 148, 131, 118, 179, 7, 132, 128, 129, 121, 122,
- 137, 90, 91, 135, 121, 122, 131, 193, 194, 195,
- 131, 197, 133, 131, 200, 201, 131, 203, 69, 1212,
- 138, 138, 131, 455, 131, 211, 108, 109, 110, 111,
- 131, 138, 218, 219, 220, 221, 222, 223, 224, 225,
+ 6, 4, 356, 357, 275, 7, 3, 6, 1045, 49,
+ 6, 6, 262, 263, 264, 5, 4, 4, 7, 4,
+ 70, 4, 651, 5, 4, 4, 76, 77, 1065, 6,
+ 6, 4, 719, 6, 49, 7, 69, 158, 159, 4,
+ 6, 70, 131, 6, 131, 69, 13, 76, 77, 138,
+ 70, 138, 4, 5, 121, 122, 76, 77, 121, 122,
+ 131, 182, 0, 6, 121, 122, 723, 138, 180, 4,
+ 137, 6, 139, 131, 137, 187, 139, 6, 46, 78,
+ 137, 49, 139, 51, 36, 37, 38, 39, 131, 139,
+ 42, 131, 80, 81, 82, 83, 208, 132, 210, 121,
+ 122, 131, 137, 90, 91, 138, 108, 109, 110, 111,
+ 139, 117, 118, 119, 138, 137, 122, 123, 98, 139,
+ 131, 127, 111, 118, 1161, 90, 91, 133, 131, 126,
+ 136, 132, 138, 139, 140, 141, 137, 143, 144, 145,
+ 146, 4, 148, 149, 150, 128, 129, 153, 138, 778,
+ 133, 139, 135, 138, 841, 118, 138, 140, 138, 138,
+ 133, 138, 138, 135, 53, 171, 172, 121, 122, 46,
+ 32, 33, 49, 35, 180, 131, 128, 129, 121, 122,
+ 121, 122, 1219, 135, 138, 131, 457, 70, 194, 195,
+ 196, 131, 198, 76, 77, 201, 202, 138, 204, 49,
+ 132, 64, 65, 66, 67, 137, 212, 49, 131, 72,
+ 133, 49, 75, 219, 220, 221, 222, 223, 224, 225,
226, 227, 228, 229, 230, 231, 232, 233, 234, 235,
236, 237, 238, 239, 240, 241, 242, 243, 244, 245,
246, 247, 248, 249, 250, 251, 252, 253, 254, 255,
- 256, 257, 258, 259, 365, 884, 70, 4, 264, 6,
- 131, 131, 76, 77, 70, 144, 272, 138, 49, 148,
- 76, 77, 131, 384, 133, 108, 109, 110, 111, 285,
+ 256, 257, 258, 259, 260, 367, 139, 70, 51, 265,
+ 889, 132, 70, 76, 77, 70, 137, 273, 76, 77,
+ 131, 76, 77, 132, 386, 128, 129, 7, 137, 275,
286, 287, 288, 289, 290, 291, 292, 293, 294, 295,
- 296, 297, 298, 299, 272, 128, 129, 49, 274, 70,
- 121, 122, 308, 132, 49, 76, 77, 131, 137, 133,
- 316, 43, 570, 51, 46, 321, 137, 49, 139, 325,
- 326, 7, 49, 8, 330, 139, 332, 333, 334, 131,
- 308, 352, 353, 139, 340, 341, 342, 343, 344, 345,
- 361, 128, 129, 341, 342, 343, 344, 325, 326, 6,
- 7, 357, 358, 359, 360, 361, 362, 354, 355, 452,
- 453, 138, 368, 121, 122, 371, 372, 49, 139, 375,
- 376, 377, 630, 131, 123, 124, 125, 70, 138, 70,
- 138, 130, 49, 76, 77, 76, 77, 46, 394, 121,
- 122, 397, 1065, 272, 1067, 46, 1069, 375, 1106, 131,
- 658, 1109, 70, 4, 1112, 70, 138, 70, 76, 77,
- 4, 76, 77, 76, 77, 4, 1045, 342, 343, 344,
- 396, 131, 108, 109, 110, 111, 519, 112, 113, 114,
+ 296, 297, 298, 299, 300, 138, 43, 121, 122, 46,
+ 69, 43, 49, 309, 46, 138, 168, 49, 170, 51,
+ 131, 317, 133, 137, 176, 131, 322, 133, 180, 46,
+ 326, 327, 131, 573, 133, 331, 139, 333, 334, 335,
+ 131, 139, 133, 7, 139, 341, 342, 343, 344, 345,
+ 346, 347, 49, 342, 343, 344, 345, 7, 121, 122,
+ 121, 122, 49, 359, 360, 361, 362, 363, 364, 356,
+ 357, 131, 131, 133, 370, 138, 137, 373, 374, 138,
+ 70, 377, 378, 379, 121, 122, 76, 77, 108, 109,
+ 110, 111, 131, 633, 131, 128, 129, 121, 122, 151,
+ 396, 138, 135, 399, 70, 157, 158, 159, 128, 129,
+ 76, 77, 398, 137, 69, 135, 70, 121, 122, 4,
+ 5, 661, 76, 77, 131, 1072, 133, 1074, 70, 1076,
+ 182, 183, 46, 1052, 76, 77, 1113, 4, 131, 1116,
+ 133, 137, 1119, 139, 108, 109, 110, 111, 131, 139,
+ 133, 36, 37, 38, 39, 131, 452, 42, 108, 109,
+ 110, 111, 4, 459, 128, 129, 6, 7, 70, 458,
+ 131, 457, 133, 139, 76, 77, 131, 4, 128, 129,
+ 131, 70, 144, 138, 70, 139, 148, 76, 77, 5,
+ 76, 77, 488, 489, 131, 491, 492, 139, 6, 495,
+ 496, 497, 354, 355, 1181, 131, 1153, 133, 133, 770,
+ 771, 363, 121, 122, 510, 121, 122, 513, 514, 4,
+ 36, 37, 38, 39, 520, 137, 42, 139, 137, 1206,
+ 4, 137, 1209, 121, 122, 1212, 131, 139, 1215, 535,
+ 536, 131, 1189, 133, 1191, 541, 1193, 121, 122, 137,
+ 139, 138, 1199, 549, 131, 551, 133, 131, 1235, 131,
+ 1237, 133, 1239, 131, 138, 121, 122, 131, 564, 133,
+ 566, 567, 121, 122, 121, 122, 1223, 131, 1225, 133,
+ 1227, 137, 121, 122, 123, 124, 125, 573, 137, 139,
+ 137, 130, 936, 131, 144, 133, 121, 122, 148, 114,
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 131, 128, 129, 450, 130, 139, 326, 139, 135,
- 131, 457, 121, 122, 139, 8, 70, 131, 456, 121,
- 122, 43, 76, 77, 46, 6, 1174, 49, 137, 51,
- 139, 139, 133, 1146, 139, 137, 139, 139, 138, 455,
- 486, 487, 131, 489, 490, 121, 122, 493, 494, 495,
- 131, 1199, 133, 131, 1202, 133, 375, 1205, 121, 122,
- 1208, 137, 508, 4, 131, 511, 512, 4, 486, 1182,
- 531, 1184, 518, 1186, 766, 767, 494, 495, 131, 1192,
- 1228, 131, 1230, 544, 1232, 139, 532, 533, 70, 131,
- 508, 133, 538, 511, 76, 77, 7, 121, 122, 131,
- 546, 133, 548, 1216, 70, 1218, 131, 1220, 133, 4,
- 76, 77, 131, 6, 138, 561, 6, 563, 564, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 121, 122, 121, 122, 130, 671, 672,
- 131, 674, 133, 676, 677, 930, 139, 680, 681, 137,
- 7, 137, 4, 5, 570, 128, 129, 139, 128, 129,
- 606, 607, 135, 133, 131, 135, 133, 486, 6, 131,
- 140, 133, 6, 139, 620, 621, 622, 623, 624, 625,
- 626, 5, 5, 629, 36, 37, 38, 39, 634, 508,
- 42, 131, 131, 133, 892, 641, 729, 730, 731, 131,
- 661, 133, 131, 131, 133, 651, 652, 653, 654, 655,
- 131, 629, 36, 37, 38, 39, 138, 663, 42, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 651, 652, 653, 654, 130, 684, 121,
- 122, 121, 122, 121, 122, 663, 131, 131, 709, 710,
- 711, 108, 109, 110, 111, 137, 131, 137, 133, 137,
- 131, 131, 795, 133, 131, 131, 684, 133, 801, 131,
- 131, 128, 129, 121, 122, 131, 1061, 810, 811, 812,
- 121, 122, 131, 816, 817, 818, 819, 820, 821, 137,
- 121, 122, 121, 122, 138, 131, 137, 133, 831, 745,
- 746, 121, 122, 121, 122, 131, 137, 133, 137, 4,
- 629, 121, 122, 123, 124, 125, 131, 137, 133, 137,
- 130, 138, 12, 13, 131, 137, 133, 139, 137, 775,
- 139, 131, 651, 652, 653, 654, 137, 133, 139, 135,
- 138, 787, 875, 133, 663, 791, 137, 763, 139, 6,
- 137, 767, 139, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, 809, 54, 684, 56, 57, 138, 59,
- 60, 61, 133, 137, 835, 139, 133, 823, 824, 825,
- 49, 137, 51, 139, 6, 831, 832, 135, 137, 835,
- 139, 137, 838, 139, 138, 85, 86, 87, 137, 137,
- 139, 139, 848, 849, 850, 137, 137, 139, 139, 93,
- 137, 857, 139, 137, 947, 139, 862, 137, 6, 139,
- 838, 137, 137, 139, 139, 958, 137, 137, 139, 139,
- 137, 877, 139, 137, 137, 139, 139, 898, 876, 855,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 139,
- 137, 897, 139, 130, 137, 6, 139, 903, 904, 137,
- 6, 139, 908, 133, 4, 138, 130, 6, 5, 135,
- 931, 917, 933, 7, 935, 133, 138, 7, 139, 138,
- 926, 7, 7, 132, 7, 1018, 7, 6, 926, 90,
- 138, 137, 132, 930, 132, 137, 1194, 6, 944, 4,
- 134, 7, 93, 7, 7, 7, 952, 93, 7, 7,
- 956, 957, 93, 7, 952, 7, 12, 13, 7, 838,
- 4, 6, 1073, 132, 1222, 132, 1224, 132, 132, 135,
- 6, 977, 7, 7, 7, 135, 139, 139, 131, 1072,
- 138, 131, 6, 989, 1242, 4, 6, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 6, 54, 1005,
- 56, 57, 134, 59, 60, 61, 6, 6, 133, 118,
- 7, 6, 49, 7, 7, 1021, 7, 138, 7, 1025,
- 1113, 1027, 51, 7, 1030, 7, 6, 4, 1034, 85,
- 86, 87, 7, 1039, 7, 7, 1147, 7, 7, 7,
- 6, 6, 138, 1064, 131, 1066, 138, 1068, 6, 6,
- 6, 4, 1030, 49, 4, 4, 4, 131, 1064, 6,
- 1066, 6, 1068, 138, 1061, 132, 12, 13, 7, 6,
- 138, 1077, 6, 56, 135, 6, 6, 6, 138, 1085,
- 1086, 138, 6, 139, 5, 138, 1092, 4, 6, 135,
- 138, 138, 6, 1099, 6, 6, 1102, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 7, 54, 6,
- 56, 57, 4, 59, 60, 61, 1122, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 1134, 89,
- 6, 1137, 130, 6, 1140, 6, 6, 6, 1144, 85,
- 86, 87, 134, 6, 6, 6, 1152, 3, 4, 1155,
- 5, 1030, 6, 9, 10, 11, 6, 6, 14, 15,
+ 125, 273, 137, 609, 610, 130, 7, 131, 121, 122,
+ 131, 8, 343, 344, 345, 131, 4, 623, 624, 625,
+ 626, 627, 628, 629, 137, 6, 632, 128, 129, 6,
+ 138, 637, 133, 131, 135, 133, 6, 138, 644, 140,
+ 131, 131, 133, 133, 131, 131, 133, 897, 654, 655,
+ 656, 657, 658, 5, 137, 327, 139, 133, 131, 135,
+ 666, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 534, 123, 124, 125, 130, 128, 129, 131,
+ 130, 687, 133, 131, 135, 547, 131, 131, 137, 140,
+ 139, 131, 454, 455, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 131, 137, 377, 139, 130, 137, 49,
+ 139, 51, 131, 273, 1068, 112, 113, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 137,
+ 137, 139, 139, 130, 137, 137, 139, 139, 137, 137,
+ 139, 139, 139, 749, 750, 137, 137, 139, 139, 309,
+ 137, 137, 139, 139, 137, 137, 139, 139, 137, 521,
+ 139, 137, 137, 139, 139, 131, 326, 327, 137, 131,
+ 139, 767, 137, 779, 139, 771, 137, 137, 139, 139,
+ 137, 131, 139, 4, 138, 791, 131, 138, 6, 795,
+ 138, 133, 138, 6, 133, 133, 93, 138, 135, 6,
+ 6, 6, 664, 133, 4, 138, 5, 813, 6, 130,
+ 135, 7, 138, 133, 7, 139, 488, 377, 7, 138,
+ 7, 132, 828, 829, 830, 7, 7, 6, 90, 138,
+ 836, 837, 137, 132, 840, 137, 132, 843, 510, 6,
+ 4, 134, 7, 93, 7, 7, 7, 853, 854, 855,
+ 93, 713, 714, 715, 7, 7, 862, 93, 7, 7,
+ 7, 867, 4, 6, 860, 132, 132, 132, 132, 139,
+ 139, 6, 135, 7, 7, 7, 882, 135, 131, 131,
+ 6, 138, 881, 4, 6, 134, 6, 6, 6, 133,
+ 7, 6, 118, 49, 7, 7, 902, 51, 7, 138,
+ 7, 7, 908, 909, 7, 6, 6, 913, 7, 7,
+ 7, 7, 674, 675, 7, 677, 922, 679, 680, 7,
+ 7, 683, 684, 4, 138, 49, 932, 131, 488, 138,
+ 6, 6, 6, 932, 6, 4, 496, 497, 4, 936,
+ 4, 6, 4, 6, 950, 131, 138, 132, 7, 6,
+ 510, 1201, 958, 513, 138, 135, 962, 963, 6, 958,
+ 632, 56, 138, 138, 6, 6, 138, 6, 1080, 6,
+ 5, 733, 734, 735, 4, 6, 135, 983, 840, 1229,
+ 138, 1231, 654, 655, 656, 657, 6, 138, 6, 995,
+ 6, 5, 7, 6, 666, 89, 4, 6, 134, 1249,
+ 6, 6, 6, 6, 6, 6, 1012, 6, 6, 6,
+ 6, 93, 6, 6, 6, 687, 6, 6, 6, 4,
+ 6, 137, 1028, 6, 6, 4, 1032, 138, 1034, 6,
+ 6, 1037, 7, 6, 6, 1041, 5, 799, 6, 6,
+ 1046, 903, 1154, 805, 135, 6, 138, 47, 138, 7,
+ 139, 6, 814, 815, 816, 138, 88, 6, 820, 821,
+ 822, 823, 824, 825, 826, 1071, 91, 1073, 8, 1075,
+ 138, 1068, 632, 6, 836, 937, 6, 939, 1084, 941,
+ 138, 6, 138, 6, 6, 6, 1092, 1093, 138, 138,
+ 6, 5, 139, 1099, 654, 655, 656, 657, 6, 62,
+ 1106, 6, 138, 1109, 137, 6, 666, 6, 6, 6,
+ 6, 6, 6, 139, 5, 138, 138, 138, 880, 6,
+ 6, 138, 6, 1129, 6, 137, 6, 687, 138, 6,
+ 5, 138, 6, 6, 6, 1141, 6, 6, 1144, 6,
+ 6, 1147, 6, 138, 6, 1151, 6, 138, 790, 798,
+ 3, 138, 3, 1159, 1129, 139, 1162, 340, -1, 885,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 843, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 8, -1, -1, -1,
+ 130, 953, -1, -1, -1, -1, -1, -1, -1, 139,
+ -1, -1, 964, -1, -1, -1, -1, -1, -1, 1071,
+ -1, 1073, -1, 1075, -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, 6,
- 93, 6, 6, 137, 6, 6, 4, 43, 4, 12,
- 13, 6, 6, 139, 6, 138, 6, 6, 5, 7,
- 6, 6, 135, 47, 6, 6, 138, 6, 64, 65,
- 66, 67, 68, 138, 7, 138, 72, 139, 138, 75,
- 43, 44, 45, 46, 47, 48, 49, 50, 51, 52,
- 138, 54, 138, 56, 57, 6, 59, 60, 61, 6,
- 88, 6, 6, 6, 91, 6, 6, 6, 104, 105,
- 106, 107, 138, 138, 6, 5, 139, 6, 62, 138,
- 6, 6, 85, 86, 87, 121, 122, 6, 6, 137,
- 126, 6, 6, 6, 6, 131, 5, 786, 6, 139,
- 136, 138, 6, 139, 3, 4, 5, 138, 7, 6,
- 9, 10, 11, 138, 137, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 139, 36, 37, 38,
- 39, 138, 6, 42, 6, 138, 6, 5, 139, 6,
- 6, 6, 3, 4, 5, 138, 6, 6, 9, 10,
- 11, 138, 138, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 33, 34, 138, 6, 6, 6, 6, 6,
- 794, 1122, 43, 3, 3, 339, 880, -1, -1, 98,
- -1, -1, -1, -1, -1, 104, 105, 106, 107, 108,
- 109, 110, 111, 64, 65, 66, 67, 68, -1, -1,
- -1, 72, 121, 122, 75, -1, -1, 126, -1, 128,
- 129, -1, 131, -1, 133, -1, 135, 136, -1, 138,
- -1, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 104, 105, 106, 107, 130, -1, -1,
+ 26, 27, 28, 29, 30, 31, 32, 33, 34, -1,
+ -1, -1, -1, -1, -1, -1, -1, 43, -1, -1,
+ -1, -1, -1, 1025, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 64, 65,
+ 66, 67, 68, 843, -1, -1, 72, -1, -1, 75,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, -1, -1, -1, -1, 130, -1,
+ 132, -1, -1, -1, -1, -1, -1, 1079, 104, 105,
+ 106, 107, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 121, 122, -1, -1, -1,
+ 126, -1, -1, -1, -1, 131, -1, -1, -1, -1,
+ 136, -1, -1, 139, -1, 3, 4, 5, 1120, 7,
+ -1, 9, 10, 11, -1, 1037, 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, -1, 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, 43, -1, -1, -1, -1, -1, -1,
+ 98, -1, -1, -1, -1, -1, 104, 105, 106, 107,
+ 108, 109, 110, 111, 64, 65, 66, 67, 68, -1,
+ -1, -1, 72, 121, 122, 75, -1, 1037, 126, -1,
+ 128, 129, -1, 131, -1, 133, -1, 135, 136, -1,
+ 138, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 104, 105, 106, 107, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 121, 122, -1, -1, -1, 126, -1, -1, -1, -1,
- 131, -1, 3, 4, -1, 136, -1, 138, 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, 43, -1, 12, 13, -1, -1, -1, -1,
+ -1, 121, 122, -1, -1, -1, 126, -1, -1, -1,
+ -1, 131, -1, 3, 4, -1, 136, -1, 138, 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, 43, -1, 12, 13, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 64, 65, 66, 67, 68, -1, -1,
- -1, 72, -1, -1, 75, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, -1, 54, -1, 56, 57,
- -1, 59, 60, 61, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 104, 105, 106, 107, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 85, 86, 87,
- 121, 122, -1, -1, -1, 126, -1, -1, -1, -1,
- 131, -1, 3, 4, -1, 136, -1, 138, 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, 139, 43, -1, 12, 13, -1, -1, -1, -1,
+ -1, -1, -1, -1, 64, 65, 66, 67, 68, -1,
+ -1, -1, 72, -1, -1, 75, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, -1, 54, -1, 56,
+ 57, -1, 59, 60, 61, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 104, 105, 106, 107, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 85, 86,
+ 87, 121, 122, -1, -1, -1, 126, -1, -1, -1,
+ -1, 131, -1, 3, 4, -1, 136, -1, 138, 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, 139, 43, -1, 12, 13, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 64, 65, 66, 67, 68, 6, -1,
- -1, 72, -1, -1, 75, 43, 44, 45, 46, 47,
- 48, 49, 50, 51, 52, -1, 54, -1, 56, 57,
- -1, 59, 60, 61, -1, -1, -1, -1, -1, -1,
- -1, 8, -1, 104, 105, 106, 107, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 85, 86, 87,
- 121, 122, -1, -1, -1, 126, -1, -1, -1, -1,
- 131, -1, 3, 4, -1, 136, -1, 138, 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, 139, 43, -1, 112, 113, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, -1, -1,
- -1, -1, 130, 64, 65, 66, 67, 68, -1, -1,
- -1, 72, -1, -1, 75, 112, 113, 114, 115, 116,
+ -1, -1, -1, -1, 64, 65, 66, 67, 68, 6,
+ -1, -1, 72, -1, -1, 75, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, -1, 54, -1, 56,
+ 57, -1, 59, 60, 61, -1, -1, -1, -1, -1,
+ 6, -1, -1, -1, 104, 105, 106, 107, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 85, 86,
+ 87, 121, 122, -1, -1, -1, 126, -1, -1, -1,
+ -1, 131, -1, 3, 4, -1, 136, -1, 138, 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, 139, 43, -1, 112, 113, 114, 115, 116,
117, 118, 119, 120, 121, 122, 123, 124, 125, -1,
- -1, -1, -1, 130, -1, 132, -1, -1, -1, -1,
- -1, -1, -1, 104, 105, 106, 107, -1, -1, -1,
+ -1, -1, -1, 130, 64, 65, 66, 67, 68, -1,
+ -1, -1, 72, -1, -1, 75, 112, 113, 114, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ -1, -1, -1, -1, 130, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 104, 105, 106, 107, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 121, 122, -1, -1, -1, 126, -1, -1, -1, -1,
- 131, -1, 3, 4, 5, 136, -1, 138, 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, 3,
- 4, 42, 12, 13, -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, 43, 44, 45, 46, 47, 48, 49,
- 50, 51, 52, -1, 54, -1, 56, 57, -1, 59,
- 60, 61, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 104, 105, 106, 107, -1, -1, -1,
- -1, -1, -1, -1, -1, 85, 86, 87, -1, -1,
- 121, 122, -1, -1, -1, 126, -1, -1, -1, -1,
- 131, -1, -1, -1, -1, 136, 6, 138, -1, -1,
- 104, 105, 106, 107, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, 6, 121, 122, -1,
- -1, -1, 126, -1, -1, -1, -1, 131, -1, 139,
- 134, -1, 136, -1, 138, 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,
- 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, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, -1, -1, -1, -1,
- 130, -1, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 104, 105, 106, 107,
- 130, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, 121, 122, -1, -1, -1, 126, -1,
- -1, -1, -1, 131, -1, -1, 134, -1, 136, -1,
- 138, 104, 105, 106, 107, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 121, 122,
- -1, 62, -1, 126, -1, -1, -1, -1, 131, -1,
- 3, 4, -1, 136, -1, 138, 9, 10, 11, -1,
+ -1, 121, 122, -1, -1, -1, 126, -1, -1, -1,
+ -1, 131, -1, 3, 4, 5, 136, -1, 138, 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,
+ 3, 4, 42, 12, 13, -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,
- 43, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, -1, -1, -1, -1, 130,
- -1, 64, 65, 66, 67, 68, -1, 3, 4, 72,
- -1, -1, 75, 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, 6,
+ 33, 34, -1, -1, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, -1, 54, -1, 56, 57, -1,
+ 59, 60, 61, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, 104, 105, 106, 107, -1, -1,
+ -1, -1, -1, -1, -1, -1, 85, 86, 87, -1,
+ -1, 121, 122, -1, -1, -1, 126, -1, -1, -1,
+ -1, 131, -1, -1, -1, -1, 136, -1, 138, -1,
-1, 104, 105, 106, 107, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 121, 122,
- -1, -1, -1, 126, 3, 4, 5, -1, 131, -1,
- 9, 10, 11, 136, -1, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 33, 34, 6, 36, 37, 38,
- 39, -1, -1, 42, -1, -1, -1, -1, 104, 105,
- 106, 107, -1, -1, -1, 6, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, 121, 122, -1, -1, -1,
- 126, -1, -1, -1, 6, 131, -1, -1, -1, -1,
- 136, -1, -1, -1, -1, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 6,
- -1, -1, -1, 130, -1, 104, 105, 106, 107, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 6, -1,
- -1, -1, 121, 122, -1, -1, -1, 126, -1, -1,
- -1, -1, 131, -1, -1, -1, -1, 136, 6, -1,
- -1, -1, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, -1, 6, -1, -1,
- 130, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, -1, 6, -1, -1, 130,
+ -1, -1, -1, -1, -1, -1, -1, 6, 121, 122,
+ -1, -1, -1, 126, -1, -1, -1, -1, 131, -1,
+ 139, 134, -1, 136, -1, 138, 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, 3, 4, 12, 13, -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, 43, 44, 45, 46, 47, 48,
+ 49, 50, 51, 52, -1, 54, -1, 56, 57, -1,
+ 59, 60, 61, 112, 113, 114, 115, 116, 117, 118,
+ 119, 120, 121, 122, 123, 124, 125, 104, 105, 106,
+ 107, 130, -1, -1, -1, -1, 85, 86, 87, -1,
+ -1, -1, -1, -1, 121, 122, -1, -1, -1, 126,
+ -1, -1, -1, -1, 131, -1, -1, 134, -1, 136,
+ -1, 138, 104, 105, 106, 107, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 121,
+ 122, -1, 62, -1, 126, -1, -1, -1, -1, 131,
+ 139, 3, 4, -1, 136, -1, 138, 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, 43, 112, 113, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, -1, -1, -1, -1,
+ 130, -1, 64, 65, 66, 67, 68, -1, 3, 4,
+ 72, -1, -1, 75, 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, 104, 105, 106, 107, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, 121,
+ 122, -1, -1, -1, 126, 3, 4, 5, -1, 131,
+ -1, 9, 10, 11, 136, -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, 104,
+ 105, 106, 107, -1, -1, -1, 12, 13, 6, -1,
+ -1, -1, -1, -1, -1, -1, 121, 122, -1, -1,
+ -1, 126, -1, -1, -1, -1, 131, -1, -1, -1,
+ -1, 136, -1, -1, -1, -1, -1, 43, 44, 45,
+ 46, 47, 48, 49, 50, 51, 52, -1, 54, -1,
+ 56, 57, -1, 59, 60, 61, 104, 105, 106, 107,
+ -1, 12, 13, 6, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 121, 122, -1, -1, -1, 126, 85,
+ 86, 87, -1, 131, 6, -1, -1, -1, 136, -1,
+ -1, -1, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, -1, 54, 6, 56, 57, -1, 59, 60,
+ 61, 12, 13, -1, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, -1, -1,
+ -1, -1, 130, 139, 85, 86, 87, 6, -1, -1,
+ -1, -1, 43, 44, 45, 46, 47, 48, 49, 50,
+ 51, 52, -1, 54, -1, 56, 57, 6, 59, 60,
+ 61, -1, -1, -1, -1, -1, -1, -1, -1, 112,
+ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 6, 85, 86, 87, 130, 139, -1,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 6, -1, -1, -1, 130, -1,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 6, -1, -1, -1, 130, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, 139, -1,
+ -1, -1, -1, 112, 113, 114, 115, 116, 117, 118,
+ 119, 120, 121, 122, 123, 124, 125, 6, -1, -1,
+ -1, 130, -1, 112, 113, 114, 115, 116, 117, 118,
+ 119, 120, 121, 122, 123, 124, 125, -1, 8, -1,
+ -1, 130, -1, -1, -1, -1, -1, -1, -1, 112,
+ 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 8, -1, -1, -1, 130, -1, -1,
+ 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 8, -1, -1, -1, 130, -1,
112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, -1, -1, -1, 8, 130, -1,
- -1, -1, -1, -1, -1, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 8,
- -1, -1, -1, 130, 112, 113, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 8, -1,
- -1, -1, 130, -1, 112, 113, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 8, -1,
- -1, -1, 130, 112, 113, 114, 115, 116, 117, 118,
+ 122, 123, 124, 125, 8, -1, -1, -1, 130, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 112, 113, 114, 115, 116, 117, 118,
119, 120, 121, 122, 123, 124, 125, 8, -1, -1,
-1, 130, 112, 113, 114, 115, 116, 117, 118, 119,
120, 121, 122, 123, 124, 125, 8, -1, -1, -1,
- 130, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, -1, -1, -1, -1, 130,
- -1, -1, -1, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, -1, -1, -1,
- -1, 130, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, -1, -1, -1, -1,
- 130, -1, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, -1, -1, -1, -1,
- 130, 112, 113, 114, 115, 116, 117, 118, 119, 120,
+ 130, -1, -1, -1, -1, -1, -1, 112, 113, 114,
+ 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, -1, -1, -1, -1, 130, -1, -1, 112, 113,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, -1, -1, -1, -1, 130, -1, 112, 113,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, -1, -1, -1, -1, 130, -1, -1, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, 112, 113, 114, 115, 116, 117, 118, 119, 120,
121, 122, 123, 124, 125, -1, -1, -1, -1, 130,
112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
122, 123, 124, 125, -1, 0, 1, -1, 130, 4,
@@ -2695,7 +2744,9 @@ static const yytype_int16 yycheck[] =
120, 121, 122, 123, 124, 125, -1, -1, -1, -1,
130, -1, 132, 112, 113, 114, 115, 116, 117, 118,
119, 120, 121, 122, 123, 124, 125, -1, -1, -1,
- -1, 130
+ -1, 130, -1, 132, 112, 113, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, -1, -1,
+ -1, -1, 130
};
/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -2718,115 +2769,116 @@ static const yytype_uint8 yystos[] =
202, 214, 13, 49, 131, 6, 138, 6, 131, 138,
131, 131, 69, 131, 138, 131, 131, 69, 138, 131,
131, 53, 49, 131, 49, 49, 49, 46, 49, 51,
- 51, 43, 46, 49, 51, 49, 131, 138, 121, 122,
- 131, 138, 203, 204, 203, 138, 43, 46, 49, 138,
- 203, 49, 49, 46, 4, 98, 138, 4, 6, 46,
- 4, 4, 4, 131, 131, 131, 4, 138, 210, 4,
- 131, 131, 6, 133, 4, 4, 5, 138, 5, 138,
- 4, 133, 135, 140, 164, 138, 5, 214, 131, 133,
- 131, 133, 131, 133, 131, 133, 131, 133, 131, 133,
- 131, 133, 131, 133, 131, 133, 131, 133, 131, 133,
- 131, 133, 131, 133, 131, 133, 131, 133, 131, 133,
- 131, 133, 131, 133, 131, 133, 131, 133, 131, 133,
- 131, 131, 131, 131, 7, 131, 4, 201, 201, 201,
- 201, 134, 138, 201, 4, 90, 91, 4, 4, 170,
- 171, 172, 201, 6, 6, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 130,
- 6, 6, 201, 5, 201, 201, 4, 43, 122, 170,
- 178, 201, 208, 209, 201, 201, 131, 201, 209, 201,
- 201, 131, 209, 201, 201, 122, 138, 201, 206, 208,
- 131, 201, 138, 131, 131, 5, 206, 207, 207, 207,
- 131, 131, 131, 131, 131, 131, 4, 203, 203, 203,
- 201, 201, 121, 122, 138, 138, 203, 138, 138, 138,
- 121, 122, 131, 172, 203, 138, 207, 206, 131, 4,
- 6, 133, 133, 172, 6, 138, 133, 133, 6, 201,
- 201, 201, 135, 201, 138, 93, 201, 201, 201, 6,
- 6, 172, 6, 172, 133, 201, 4, 138, 148, 6,
- 201, 201, 201, 201, 201, 201, 201, 201, 201, 201,
- 201, 201, 201, 201, 201, 201, 201, 201, 201, 201,
+ 51, 43, 46, 49, 51, 46, 49, 131, 138, 121,
+ 122, 131, 138, 203, 204, 203, 138, 43, 46, 49,
+ 138, 203, 49, 49, 46, 4, 98, 138, 4, 6,
+ 46, 4, 4, 4, 131, 131, 131, 4, 138, 210,
+ 4, 131, 131, 6, 133, 4, 4, 5, 138, 5,
+ 138, 4, 133, 135, 140, 164, 138, 5, 214, 131,
+ 133, 131, 133, 131, 133, 131, 133, 131, 133, 131,
+ 133, 131, 133, 131, 133, 131, 133, 131, 133, 131,
+ 133, 131, 133, 131, 133, 131, 133, 131, 133, 131,
+ 133, 131, 133, 131, 133, 131, 133, 131, 133, 131,
+ 133, 131, 131, 131, 131, 7, 131, 4, 201, 201,
+ 201, 201, 134, 138, 201, 4, 90, 91, 4, 4,
+ 170, 171, 172, 201, 6, 6, 112, 113, 114, 115,
+ 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ 130, 6, 6, 201, 5, 201, 201, 4, 43, 122,
+ 170, 178, 201, 208, 209, 201, 201, 131, 201, 209,
+ 201, 201, 131, 209, 201, 201, 122, 138, 201, 206,
+ 208, 131, 201, 138, 131, 131, 5, 206, 207, 207,
+ 207, 131, 131, 131, 131, 131, 131, 131, 4, 203,
+ 203, 203, 201, 201, 121, 122, 138, 138, 203, 138,
+ 138, 138, 121, 122, 131, 172, 203, 138, 207, 206,
+ 131, 4, 6, 133, 133, 172, 6, 138, 133, 133,
+ 6, 201, 201, 201, 135, 201, 138, 93, 201, 201,
+ 201, 6, 6, 172, 6, 172, 133, 201, 4, 138,
+ 148, 6, 201, 201, 201, 201, 201, 201, 201, 201,
201, 201, 201, 201, 201, 201, 201, 201, 201, 201,
201, 201, 201, 201, 201, 201, 201, 201, 201, 201,
- 201, 201, 4, 213, 214, 213, 213, 213, 201, 5,
- 133, 132, 7, 111, 209, 134, 7, 163, 164, 135,
- 7, 133, 139, 43, 46, 49, 51, 169, 6, 201,
201, 201, 201, 201, 201, 201, 201, 201, 201, 201,
- 201, 201, 201, 201, 6, 132, 137, 137, 132, 133,
- 138, 201, 208, 8, 123, 137, 139, 132, 132, 201,
- 132, 139, 132, 132, 201, 139, 132, 132, 138, 139,
- 209, 123, 7, 201, 132, 201, 201, 201, 7, 7,
- 196, 196, 201, 166, 201, 214, 166, 166, 166, 201,
- 132, 137, 137, 137, 203, 203, 171, 171, 137, 201,
- 201, 201, 201, 182, 137, 172, 7, 197, 7, 201,
- 6, 201, 201, 139, 209, 201, 201, 132, 132, 132,
- 90, 137, 172, 138, 8, 132, 134, 139, 139, 201,
- 134, 164, 201, 4, 80, 81, 82, 83, 139, 151,
- 155, 158, 160, 161, 132, 134, 132, 134, 132, 134,
- 132, 134, 132, 134, 132, 134, 132, 134, 132, 134,
- 132, 134, 132, 134, 132, 134, 137, 137, 132, 134,
- 132, 134, 132, 134, 132, 134, 132, 134, 132, 134,
- 137, 137, 137, 137, 137, 137, 133, 135, 132, 137,
- 137, 132, 132, 6, 137, 201, 206, 206, 139, 7,
- 135, 163, 164, 214, 201, 6, 4, 4, 138, 211,
- 134, 138, 138, 138, 138, 8, 6, 118, 145, 209,
- 201, 7, 134, 138, 201, 201, 201, 208, 201, 208,
- 93, 7, 7, 132, 7, 93, 7, 7, 132, 93,
- 7, 7, 209, 139, 138, 201, 132, 7, 139, 132,
- 132, 201, 206, 4, 195, 6, 132, 132, 132, 132,
- 132, 132, 135, 203, 201, 201, 139, 139, 201, 137,
- 137, 137, 70, 76, 77, 192, 193, 203, 139, 179,
- 201, 6, 201, 132, 134, 134, 139, 134, 134, 7,
- 7, 7, 135, 201, 139, 201, 201, 7, 135, 134,
- 135, 164, 213, 139, 152, 131, 131, 138, 162, 6,
- 201, 201, 201, 201, 201, 201, 201, 201, 201, 4,
- 209, 213, 201, 134, 6, 6, 134, 4, 90, 91,
- 201, 6, 6, 6, 7, 133, 210, 212, 6, 209,
- 209, 209, 209, 201, 118, 213, 132, 137, 203, 209,
- 139, 8, 49, 206, 206, 7, 206, 49, 51, 206,
- 206, 7, 51, 206, 206, 139, 209, 6, 7, 138,
- 7, 7, 7, 62, 194, 6, 7, 7, 7, 7,
- 7, 7, 4, 137, 137, 137, 139, 203, 203, 203,
- 6, 138, 131, 139, 193, 137, 192, 6, 138, 6,
- 6, 49, 6, 6, 206, 206, 206, 4, 137, 8,
- 8, 132, 4, 4, 6, 4, 6, 131, 201, 201,
- 205, 206, 138, 132, 134, 132, 134, 132, 134, 132,
- 134, 134, 132, 132, 132, 163, 7, 163, 164, 135,
- 7, 6, 210, 201, 137, 139, 139, 139, 139, 139,
- 6, 6, 145, 201, 6, 139, 201, 138, 56, 168,
- 168, 206, 6, 138, 138, 6, 6, 206, 138, 6,
- 6, 139, 5, 201, 206, 206, 206, 4, 6, 206,
- 206, 206, 206, 206, 206, 6, 7, 201, 201, 201,
- 138, 137, 139, 137, 139, 137, 139, 201, 206, 201,
- 201, 203, 139, 209, 138, 6, 6, 89, 201, 201,
- 201, 6, 7, 164, 149, 201, 137, 137, 137, 139,
- 150, 201, 135, 206, 214, 201, 6, 4, 211, 6,
- 134, 210, 6, 6, 6, 6, 213, 137, 134, 201,
- 203, 6, 6, 6, 201, 201, 6, 201, 5, 137,
- 6, 6, 93, 167, 201, 6, 6, 6, 6, 6,
- 4, 201, 214, 139, 132, 137, 139, 171, 203, 6,
- 183, 203, 6, 184, 203, 6, 185, 139, 137, 132,
- 139, 137, 139, 201, 206, 137, 139, 8, 139, 132,
- 138, 201, 214, 132, 137, 201, 201, 206, 138, 137,
- 139, 4, 6, 6, 6, 7, 6, 135, 6, 201,
- 139, 139, 139, 139, 5, 201, 47, 6, 138, 6,
- 6, 138, 201, 139, 137, 138, 137, 138, 137, 138,
- 6, 206, 7, 138, 201, 6, 139, 88, 201, 201,
- 209, 6, 6, 153, 201, 137, 137, 205, 201, 6,
- 210, 91, 137, 6, 6, 6, 6, 6, 137, 138,
- 205, 171, 137, 139, 201, 203, 192, 201, 203, 192,
- 201, 203, 192, 137, 139, 206, 172, 139, 201, 139,
- 139, 139, 138, 201, 201, 139, 6, 201, 5, 201,
- 139, 139, 201, 139, 137, 139, 139, 137, 139, 139,
- 137, 139, 206, 6, 62, 139, 180, 138, 6, 6,
- 150, 132, 137, 6, 138, 137, 137, 139, 6, 139,
- 6, 186, 201, 6, 6, 187, 201, 6, 6, 188,
- 201, 6, 139, 201, 192, 172, 139, 156, 201, 205,
- 201, 5, 138, 139, 138, 139, 138, 139, 6, 6,
- 139, 139, 181, 6, 138, 132, 139, 139, 137, 192,
- 6, 189, 192, 6, 190, 192, 6, 191, 192, 154,
- 213, 159, 138, 6, 5, 139, 138, 139, 138, 139,
- 138, 139, 137, 139, 138, 205, 139, 6, 192, 6,
- 192, 6, 192, 213, 6, 157, 213, 139, 6, 139,
- 139, 139, 137, 139, 6, 6, 6, 6, 213, 6
+ 201, 201, 201, 201, 4, 213, 214, 213, 213, 213,
+ 201, 5, 133, 132, 7, 111, 209, 134, 7, 163,
+ 164, 135, 7, 133, 139, 43, 46, 49, 51, 169,
+ 6, 201, 201, 201, 201, 201, 201, 201, 201, 201,
+ 201, 201, 201, 201, 201, 201, 6, 132, 137, 137,
+ 132, 133, 138, 201, 208, 8, 123, 137, 139, 132,
+ 132, 201, 132, 139, 132, 132, 201, 139, 132, 132,
+ 138, 139, 209, 123, 7, 201, 132, 201, 201, 201,
+ 7, 7, 196, 196, 201, 166, 201, 214, 166, 166,
+ 166, 201, 201, 132, 137, 137, 137, 203, 203, 171,
+ 171, 137, 201, 201, 201, 201, 182, 137, 172, 7,
+ 197, 7, 201, 6, 201, 201, 139, 209, 201, 201,
+ 132, 132, 132, 90, 137, 172, 138, 8, 132, 134,
+ 139, 139, 201, 134, 164, 201, 4, 80, 81, 82,
+ 83, 139, 151, 155, 158, 160, 161, 132, 134, 132,
+ 134, 132, 134, 132, 134, 132, 134, 132, 134, 132,
+ 134, 132, 134, 132, 134, 132, 134, 132, 134, 137,
+ 137, 132, 134, 132, 134, 132, 134, 132, 134, 132,
+ 134, 132, 134, 137, 137, 137, 137, 137, 137, 133,
+ 135, 132, 137, 137, 132, 132, 6, 137, 201, 206,
+ 206, 139, 7, 135, 163, 164, 214, 201, 6, 4,
+ 4, 138, 211, 134, 138, 138, 138, 138, 8, 6,
+ 118, 145, 209, 201, 7, 134, 138, 201, 201, 201,
+ 208, 201, 208, 93, 7, 7, 132, 7, 93, 7,
+ 7, 132, 93, 7, 7, 209, 139, 138, 201, 132,
+ 7, 139, 132, 132, 201, 206, 4, 195, 6, 132,
+ 132, 132, 132, 132, 132, 132, 135, 203, 201, 201,
+ 139, 139, 201, 137, 137, 137, 70, 76, 77, 192,
+ 193, 203, 139, 179, 201, 6, 201, 132, 134, 134,
+ 139, 134, 134, 7, 7, 7, 135, 201, 139, 201,
+ 201, 7, 135, 134, 135, 164, 213, 139, 152, 131,
+ 131, 138, 162, 6, 201, 201, 201, 201, 201, 201,
+ 201, 201, 201, 4, 209, 213, 201, 134, 6, 6,
+ 134, 4, 90, 91, 201, 6, 6, 6, 7, 133,
+ 210, 212, 6, 209, 209, 209, 209, 201, 118, 213,
+ 132, 137, 203, 209, 139, 8, 49, 206, 206, 7,
+ 206, 49, 51, 206, 206, 7, 51, 206, 206, 139,
+ 209, 6, 7, 138, 7, 7, 7, 62, 194, 6,
+ 7, 7, 7, 7, 7, 7, 7, 4, 137, 137,
+ 137, 139, 203, 203, 203, 6, 138, 131, 139, 193,
+ 137, 192, 6, 138, 6, 6, 49, 6, 6, 206,
+ 206, 206, 4, 137, 8, 8, 132, 4, 4, 6,
+ 4, 6, 131, 201, 201, 205, 206, 138, 132, 134,
+ 132, 134, 132, 134, 132, 134, 134, 132, 132, 132,
+ 163, 7, 163, 164, 135, 7, 6, 210, 201, 137,
+ 139, 139, 139, 139, 139, 6, 6, 145, 201, 6,
+ 139, 201, 138, 56, 168, 168, 206, 6, 138, 138,
+ 6, 6, 206, 138, 6, 6, 139, 5, 201, 206,
+ 206, 206, 4, 6, 206, 206, 206, 206, 206, 206,
+ 206, 6, 7, 201, 201, 201, 138, 137, 139, 137,
+ 139, 137, 139, 201, 206, 201, 201, 203, 139, 209,
+ 138, 6, 6, 89, 201, 201, 201, 6, 7, 164,
+ 149, 201, 137, 137, 137, 139, 150, 201, 135, 206,
+ 214, 201, 6, 4, 211, 6, 134, 210, 6, 6,
+ 6, 6, 213, 137, 134, 201, 203, 6, 6, 6,
+ 201, 201, 6, 201, 5, 137, 6, 6, 93, 167,
+ 201, 6, 6, 6, 6, 6, 6, 4, 201, 214,
+ 139, 132, 137, 139, 171, 203, 6, 183, 203, 6,
+ 184, 203, 6, 185, 139, 137, 132, 139, 137, 139,
+ 201, 206, 137, 139, 8, 139, 132, 138, 201, 214,
+ 132, 137, 201, 201, 206, 138, 137, 139, 4, 6,
+ 6, 6, 7, 6, 135, 6, 201, 139, 139, 139,
+ 139, 5, 201, 47, 6, 138, 6, 6, 138, 201,
+ 139, 137, 138, 137, 138, 137, 138, 6, 206, 7,
+ 138, 201, 6, 139, 88, 201, 201, 209, 6, 6,
+ 153, 201, 137, 137, 205, 201, 6, 210, 91, 137,
+ 6, 6, 6, 6, 6, 137, 138, 205, 171, 137,
+ 139, 201, 203, 192, 201, 203, 192, 201, 203, 192,
+ 137, 139, 206, 172, 139, 201, 139, 139, 139, 138,
+ 201, 201, 139, 6, 201, 5, 201, 139, 139, 201,
+ 139, 137, 139, 139, 137, 139, 139, 137, 139, 206,
+ 6, 62, 139, 180, 138, 6, 6, 150, 132, 137,
+ 6, 138, 137, 137, 139, 6, 139, 6, 186, 201,
+ 6, 6, 187, 201, 6, 6, 188, 201, 6, 139,
+ 201, 192, 172, 139, 156, 201, 205, 201, 5, 138,
+ 139, 138, 139, 138, 139, 6, 6, 139, 139, 181,
+ 6, 138, 132, 139, 139, 137, 192, 6, 189, 192,
+ 6, 190, 192, 6, 191, 192, 154, 213, 159, 138,
+ 6, 5, 139, 138, 139, 138, 139, 138, 139, 137,
+ 139, 138, 205, 139, 6, 192, 6, 192, 6, 192,
+ 213, 6, 157, 213, 139, 6, 139, 139, 139, 137,
+ 139, 6, 6, 6, 6, 213, 6
};
#define yyerrok (yyerrstatus = 0)
@@ -5211,7 +5263,27 @@ yyreduce:
break;
case 115:
-#line 1494 "Gmsh.y"
+#line 1491 "Gmsh.y"
+ {
+ int num = (int)(yyvsp[(4) - (8)].d);
+ if(FindPhysicalGroup(num, MSH_PHYSICAL_SURFACE)){
+ yymsg(0, "Physical surface %d already exists", num);
+ }
+ else{
+ List_T *temp = ListOfDouble2ListOfInt((yyvsp[(7) - (8)].l));
+ List_T *S[4] = {temp, 0, 0, 0};
+ PhysicalGroup *p = Create_PhysicalGroup(num, MSH_PHYSICAL_LINE, temp, S);
+ List_Delete(temp);
+ List_Add(GModel::current()->getGEOInternals()->PhysicalGroups, &p);
+ }
+ List_Delete((yyvsp[(7) - (8)].l));
+ (yyval.s).Type = MSH_PHYSICAL_LINE;
+ (yyval.s).Num = num;
+ ;}
+ break;
+
+ case 116:
+#line 1511 "Gmsh.y"
{
yymsg(0, "'Complex Volume' command is deprecated: use 'Volume' instead");
int num = (int)(yyvsp[(4) - (8)].d);
@@ -5231,8 +5303,8 @@ yyreduce:
;}
break;
- case 116:
-#line 1512 "Gmsh.y"
+ case 117:
+#line 1529 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (7)].d);
if(FindVolume(num)){
@@ -5251,8 +5323,8 @@ yyreduce:
;}
break;
- case 117:
-#line 1529 "Gmsh.y"
+ case 118:
+#line 1546 "Gmsh.y"
{
int num = (int)(yyvsp[(4) - (8)].i);
if(FindPhysicalGroup(num, MSH_PHYSICAL_VOLUME)){
@@ -5270,40 +5342,40 @@ yyreduce:
;}
break;
- case 118:
-#line 1550 "Gmsh.y"
+ case 119:
+#line 1567 "Gmsh.y"
{
TranslateShapes((yyvsp[(2) - (5)].v)[0], (yyvsp[(2) - (5)].v)[1], (yyvsp[(2) - (5)].v)[2], (yyvsp[(4) - (5)].l));
(yyval.l) = (yyvsp[(4) - (5)].l);
;}
break;
- case 119:
-#line 1555 "Gmsh.y"
+ case 120:
+#line 1572 "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));
(yyval.l) = (yyvsp[(10) - (11)].l);
;}
break;
- case 120:
-#line 1560 "Gmsh.y"
+ case 121:
+#line 1577 "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));
(yyval.l) = (yyvsp[(4) - (5)].l);
;}
break;
- case 121:
-#line 1565 "Gmsh.y"
+ case 122:
+#line 1582 "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));
(yyval.l) = (yyvsp[(8) - (9)].l);
;}
break;
- case 122:
-#line 1570 "Gmsh.y"
+ case 123:
+#line 1587 "Gmsh.y"
{
(yyval.l) = List_Create(3, 3, sizeof(Shape));
if(!strcmp((yyvsp[(1) - (4)].c), "Duplicata")){
@@ -5325,8 +5397,8 @@ yyreduce:
;}
break;
- case 123:
-#line 1590 "Gmsh.y"
+ case 124:
+#line 1607 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
IntersectCurvesWithSurface((yyvsp[(4) - (9)].l), (int)(yyvsp[(8) - (9)].d), (yyval.l));
@@ -5334,8 +5406,8 @@ yyreduce:
;}
break;
- case 124:
-#line 1596 "Gmsh.y"
+ case 125:
+#line 1613 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape*));
List_T *tmp = ListOfDouble2ListOfInt((yyvsp[(7) - (9)].l));
@@ -5345,32 +5417,32 @@ yyreduce:
;}
break;
- case 125:
-#line 1606 "Gmsh.y"
+ case 126:
+#line 1623 "Gmsh.y"
{ (yyval.l) = (yyvsp[(1) - (1)].l); ;}
break;
- case 126:
-#line 1607 "Gmsh.y"
+ case 127:
+#line 1624 "Gmsh.y"
{ (yyval.l) = (yyvsp[(1) - (1)].l); ;}
break;
- case 127:
-#line 1612 "Gmsh.y"
+ case 128:
+#line 1629 "Gmsh.y"
{
(yyval.l) = List_Create(3, 3, sizeof(Shape));
;}
break;
- case 128:
-#line 1616 "Gmsh.y"
+ case 129:
+#line 1633 "Gmsh.y"
{
List_Add((yyval.l), &(yyvsp[(2) - (2)].s));
;}
break;
- case 129:
-#line 1620 "Gmsh.y"
+ case 130:
+#line 1637 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -5395,8 +5467,8 @@ yyreduce:
;}
break;
- case 130:
-#line 1643 "Gmsh.y"
+ case 131:
+#line 1660 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -5421,8 +5493,8 @@ yyreduce:
;}
break;
- case 131:
-#line 1666 "Gmsh.y"
+ case 132:
+#line 1683 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -5447,8 +5519,8 @@ yyreduce:
;}
break;
- case 132:
-#line 1689 "Gmsh.y"
+ case 133:
+#line 1706 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (6)].l)); i++){
double d;
@@ -5473,8 +5545,8 @@ yyreduce:
;}
break;
- case 133:
-#line 1717 "Gmsh.y"
+ case 134:
+#line 1734 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
Shape TheShape;
@@ -5485,15 +5557,15 @@ yyreduce:
;}
break;
- case 134:
-#line 1726 "Gmsh.y"
+ case 135:
+#line 1743 "Gmsh.y"
{
GModel::current()->getFields()->deleteField((int)(yyvsp[(4) - (6)].d));
;}
break;
- case 135:
-#line 1730 "Gmsh.y"
+ case 136:
+#line 1747 "Gmsh.y"
{
#if !defined(HAVE_NO_POST)
if(!strcmp((yyvsp[(2) - (6)].c), "View")){
@@ -5510,8 +5582,8 @@ yyreduce:
;}
break;
- case 136:
-#line 1745 "Gmsh.y"
+ case 137:
+#line 1762 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (3)].c), "Meshes") || !strcmp((yyvsp[(2) - (3)].c), "All")){
for(unsigned int i = 0; i < GModel::list.size(); i++){
@@ -5540,8 +5612,8 @@ yyreduce:
;}
break;
- case 137:
-#line 1772 "Gmsh.y"
+ case 138:
+#line 1789 "Gmsh.y"
{
#if !defined(HAVE_NO_POST)
if(!strcmp((yyvsp[(2) - (4)].c), "Empty") && !strcmp((yyvsp[(3) - (4)].c), "Views")){
@@ -5555,8 +5627,8 @@ yyreduce:
;}
break;
- case 138:
-#line 1789 "Gmsh.y"
+ case 139:
+#line 1806 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(4) - (5)].l)); i++){
Shape TheShape;
@@ -5567,8 +5639,8 @@ yyreduce:
;}
break;
- case 139:
-#line 1803 "Gmsh.y"
+ case 140:
+#line 1820 "Gmsh.y"
{
for(int i = 0; i < 4; i++)
VisibilityShape((yyvsp[(2) - (3)].c), i, 1);
@@ -5576,8 +5648,8 @@ yyreduce:
;}
break;
- case 140:
-#line 1809 "Gmsh.y"
+ case 141:
+#line 1826 "Gmsh.y"
{
for(int i = 0; i < 4; i++)
VisibilityShape((yyvsp[(2) - (3)].c), i, 0);
@@ -5585,8 +5657,8 @@ yyreduce:
;}
break;
- case 141:
-#line 1815 "Gmsh.y"
+ case 142:
+#line 1832 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
Shape TheShape;
@@ -5597,8 +5669,8 @@ yyreduce:
;}
break;
- case 142:
-#line 1824 "Gmsh.y"
+ case 143:
+#line 1841 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (4)].l)); i++){
Shape TheShape;
@@ -5609,8 +5681,8 @@ yyreduce:
;}
break;
- case 143:
-#line 1838 "Gmsh.y"
+ case 144:
+#line 1855 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (3)].c), "Include")){
char tmpstring[1024];
@@ -5660,8 +5732,8 @@ yyreduce:
;}
break;
- case 144:
-#line 1886 "Gmsh.y"
+ case 145:
+#line 1903 "Gmsh.y"
{
#if !defined(HAVE_NO_POST)
if(!strcmp((yyvsp[(1) - (7)].c), "Save") && !strcmp((yyvsp[(2) - (7)].c), "View")){
@@ -5681,8 +5753,8 @@ yyreduce:
;}
break;
- case 145:
-#line 1904 "Gmsh.y"
+ case 146:
+#line 1921 "Gmsh.y"
{
#if !defined(HAVE_NO_POST)
if(!strcmp((yyvsp[(1) - (7)].c), "Background") && !strcmp((yyvsp[(2) - (7)].c), "Mesh") && !strcmp((yyvsp[(3) - (7)].c), "View")){
@@ -5699,8 +5771,8 @@ yyreduce:
;}
break;
- case 146:
-#line 1919 "Gmsh.y"
+ case 147:
+#line 1936 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (3)].c), "Sleep")){
SleepInSeconds((yyvsp[(2) - (3)].d));
@@ -5721,8 +5793,8 @@ yyreduce:
;}
break;
- case 147:
-#line 1938 "Gmsh.y"
+ case 148:
+#line 1955 "Gmsh.y"
{
#if !defined(HAVE_NO_POST)
try {
@@ -5736,8 +5808,8 @@ yyreduce:
;}
break;
- case 148:
-#line 1950 "Gmsh.y"
+ case 149:
+#line 1967 "Gmsh.y"
{
#if !defined(HAVE_NO_POST)
if(!strcmp((yyvsp[(2) - (3)].c), "ElementsFromAllViews"))
@@ -5763,31 +5835,31 @@ yyreduce:
;}
break;
- case 149:
-#line 1974 "Gmsh.y"
+ case 150:
+#line 1991 "Gmsh.y"
{
exit(0);
;}
break;
- case 150:
-#line 1978 "Gmsh.y"
+ case 151:
+#line 1995 "Gmsh.y"
{
CTX::instance()->forcedBBox = 0;
SetBoundingBox();
;}
break;
- case 151:
-#line 1983 "Gmsh.y"
+ case 152:
+#line 2000 "Gmsh.y"
{
CTX::instance()->forcedBBox = 1;
SetBoundingBox((yyvsp[(3) - (15)].d), (yyvsp[(5) - (15)].d), (yyvsp[(7) - (15)].d), (yyvsp[(9) - (15)].d), (yyvsp[(11) - (15)].d), (yyvsp[(13) - (15)].d));
;}
break;
- case 152:
-#line 1988 "Gmsh.y"
+ case 153:
+#line 2005 "Gmsh.y"
{
#if defined(HAVE_FLTK)
Draw();
@@ -5795,8 +5867,8 @@ yyreduce:
;}
break;
- case 153:
-#line 1999 "Gmsh.y"
+ case 154:
+#line 2016 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (6)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(5) - (6)].d);
@@ -5815,8 +5887,8 @@ yyreduce:
;}
break;
- case 154:
-#line 2016 "Gmsh.y"
+ case 155:
+#line 2033 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(3) - (8)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(5) - (8)].d);
@@ -5835,8 +5907,8 @@ yyreduce:
;}
break;
- case 155:
-#line 2033 "Gmsh.y"
+ case 156:
+#line 2050 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (8)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(7) - (8)].d);
@@ -5857,8 +5929,8 @@ yyreduce:
;}
break;
- case 156:
-#line 2052 "Gmsh.y"
+ case 157:
+#line 2069 "Gmsh.y"
{
LoopControlVariablesTab[ImbricatedLoop][0] = (yyvsp[(5) - (10)].d);
LoopControlVariablesTab[ImbricatedLoop][1] = (yyvsp[(7) - (10)].d);
@@ -5879,8 +5951,8 @@ yyreduce:
;}
break;
- case 157:
-#line 2071 "Gmsh.y"
+ case 158:
+#line 2088 "Gmsh.y"
{
if(ImbricatedLoop <= 0){
yymsg(0, "Invalid For/EndFor loop");
@@ -5910,8 +5982,8 @@ yyreduce:
;}
break;
- case 158:
-#line 2099 "Gmsh.y"
+ case 159:
+#line 2116 "Gmsh.y"
{
if(!FunctionManager::Instance()->createFunction
((yyvsp[(2) - (2)].c), gmsh_yyin, gmsh_yyname, gmsh_yylineno))
@@ -5921,8 +5993,8 @@ yyreduce:
;}
break;
- case 159:
-#line 2107 "Gmsh.y"
+ case 160:
+#line 2124 "Gmsh.y"
{
if(!FunctionManager::Instance()->leaveFunction
(&gmsh_yyin, gmsh_yyname, gmsh_yylineno))
@@ -5930,8 +6002,8 @@ yyreduce:
;}
break;
- case 160:
-#line 2113 "Gmsh.y"
+ case 161:
+#line 2130 "Gmsh.y"
{
if(!FunctionManager::Instance()->enterFunction
((yyvsp[(2) - (3)].c), &gmsh_yyin, gmsh_yyname, gmsh_yylineno))
@@ -5940,21 +6012,21 @@ yyreduce:
;}
break;
- case 161:
-#line 2120 "Gmsh.y"
+ case 162:
+#line 2137 "Gmsh.y"
{
if(!(yyvsp[(3) - (4)].d)) skip_until("If", "EndIf");
;}
break;
- case 162:
-#line 2124 "Gmsh.y"
+ case 163:
+#line 2141 "Gmsh.y"
{
;}
break;
- case 163:
-#line 2133 "Gmsh.y"
+ case 164:
+#line 2150 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE, (yyvsp[(4) - (5)].l),
@@ -5964,8 +6036,8 @@ yyreduce:
;}
break;
- case 164:
-#line 2141 "Gmsh.y"
+ case 165:
+#line 2158 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(ROTATE, (yyvsp[(10) - (11)].l),
@@ -5975,8 +6047,8 @@ yyreduce:
;}
break;
- case 165:
-#line 2149 "Gmsh.y"
+ case 166:
+#line 2166 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[(12) - (13)].l),
@@ -5986,15 +6058,15 @@ yyreduce:
;}
break;
- case 166:
-#line 2157 "Gmsh.y"
+ case 167:
+#line 2174 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 167:
-#line 2161 "Gmsh.y"
+ case 168:
+#line 2178 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE, (yyvsp[(4) - (7)].l),
@@ -6004,15 +6076,15 @@ yyreduce:
;}
break;
- case 168:
-#line 2169 "Gmsh.y"
+ case 169:
+#line 2186 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 169:
-#line 2173 "Gmsh.y"
+ case 170:
+#line 2190 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(ROTATE, (yyvsp[(10) - (13)].l),
@@ -6022,15 +6094,15 @@ yyreduce:
;}
break;
- case 170:
-#line 2181 "Gmsh.y"
+ case 171:
+#line 2198 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 171:
-#line 2185 "Gmsh.y"
+ case 172:
+#line 2202 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(TRANSLATE_ROTATE, (yyvsp[(12) - (15)].l),
@@ -6040,15 +6112,15 @@ yyreduce:
;}
break;
- case 172:
-#line 2193 "Gmsh.y"
+ case 173:
+#line 2210 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 173:
-#line 2197 "Gmsh.y"
+ case 174:
+#line 2214 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShapes(BOUNDARY_LAYER, (yyvsp[(3) - (6)].l), 0., 0., 0., 0., 0., 0., 0., 0., 0., 0.,
@@ -6057,8 +6129,8 @@ yyreduce:
;}
break;
- case 174:
-#line 2206 "Gmsh.y"
+ case 175:
+#line 2223 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[(4) - (8)].d),
@@ -6067,8 +6139,8 @@ yyreduce:
;}
break;
- case 175:
-#line 2213 "Gmsh.y"
+ case 176:
+#line 2230 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (8)].d),
@@ -6077,8 +6149,8 @@ yyreduce:
;}
break;
- case 176:
-#line 2220 "Gmsh.y"
+ case 177:
+#line 2237 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (8)].d),
@@ -6087,8 +6159,8 @@ yyreduce:
;}
break;
- case 177:
-#line 2227 "Gmsh.y"
+ case 178:
+#line 2244 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[(4) - (12)].d),
@@ -6097,8 +6169,8 @@ yyreduce:
;}
break;
- case 178:
-#line 2234 "Gmsh.y"
+ case 179:
+#line 2251 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (12)].d),
@@ -6107,8 +6179,8 @@ yyreduce:
;}
break;
- case 179:
-#line 2241 "Gmsh.y"
+ case 180:
+#line 2258 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (12)].d),
@@ -6117,8 +6189,8 @@ yyreduce:
;}
break;
- case 180:
-#line 2248 "Gmsh.y"
+ case 181:
+#line 2265 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[(4) - (14)].d),
@@ -6127,8 +6199,8 @@ yyreduce:
;}
break;
- case 181:
-#line 2255 "Gmsh.y"
+ case 182:
+#line 2272 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (14)].d),
@@ -6137,8 +6209,8 @@ yyreduce:
;}
break;
- case 182:
-#line 2262 "Gmsh.y"
+ case 183:
+#line 2279 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (14)].d),
@@ -6147,15 +6219,15 @@ yyreduce:
;}
break;
- case 183:
-#line 2269 "Gmsh.y"
+ case 184:
+#line 2286 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 184:
-#line 2273 "Gmsh.y"
+ case 185:
+#line 2290 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_POINT, (int)(yyvsp[(4) - (12)].d),
@@ -6164,15 +6236,15 @@ yyreduce:
;}
break;
- case 185:
-#line 2280 "Gmsh.y"
+ case 186:
+#line 2297 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 186:
-#line 2284 "Gmsh.y"
+ case 187:
+#line 2301 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (12)].d),
@@ -6181,15 +6253,15 @@ yyreduce:
;}
break;
- case 187:
-#line 2291 "Gmsh.y"
+ case 188:
+#line 2308 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 188:
-#line 2295 "Gmsh.y"
+ case 189:
+#line 2312 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (12)].d),
@@ -6198,15 +6270,15 @@ yyreduce:
;}
break;
- case 189:
-#line 2302 "Gmsh.y"
+ case 190:
+#line 2319 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 190:
-#line 2306 "Gmsh.y"
+ case 191:
+#line 2323 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_POINT, (int)(yyvsp[(4) - (16)].d),
@@ -6215,15 +6287,15 @@ yyreduce:
;}
break;
- case 191:
-#line 2313 "Gmsh.y"
+ case 192:
+#line 2330 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 192:
-#line 2317 "Gmsh.y"
+ case 193:
+#line 2334 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (16)].d),
@@ -6232,15 +6304,15 @@ yyreduce:
;}
break;
- case 193:
-#line 2324 "Gmsh.y"
+ case 194:
+#line 2341 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 194:
-#line 2328 "Gmsh.y"
+ case 195:
+#line 2345 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (16)].d),
@@ -6249,15 +6321,15 @@ yyreduce:
;}
break;
- case 195:
-#line 2335 "Gmsh.y"
+ case 196:
+#line 2352 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 196:
-#line 2339 "Gmsh.y"
+ case 197:
+#line 2356 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_POINT, (int)(yyvsp[(4) - (18)].d),
@@ -6266,15 +6338,15 @@ yyreduce:
;}
break;
- case 197:
-#line 2346 "Gmsh.y"
+ case 198:
+#line 2363 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 198:
-#line 2350 "Gmsh.y"
+ case 199:
+#line 2367 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SEGM_LINE, (int)(yyvsp[(4) - (18)].d),
@@ -6283,15 +6355,15 @@ yyreduce:
;}
break;
- case 199:
-#line 2357 "Gmsh.y"
+ case 200:
+#line 2374 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = extr.mesh.Recombine = false;
;}
break;
- case 200:
-#line 2361 "Gmsh.y"
+ case 201:
+#line 2378 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(Shape));
ExtrudeShape(TRANSLATE_ROTATE, MSH_SURF_PLAN, (int)(yyvsp[(4) - (18)].d),
@@ -6300,20 +6372,20 @@ yyreduce:
;}
break;
- case 201:
-#line 2372 "Gmsh.y"
+ case 202:
+#line 2389 "Gmsh.y"
{
;}
break;
- case 202:
-#line 2375 "Gmsh.y"
+ case 203:
+#line 2392 "Gmsh.y"
{
;}
break;
- case 203:
-#line 2381 "Gmsh.y"
+ case 204:
+#line 2398 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = true;
extr.mesh.NbLayer = 1;
@@ -6324,8 +6396,8 @@ yyreduce:
;}
break;
- case 204:
-#line 2390 "Gmsh.y"
+ case 205:
+#line 2407 "Gmsh.y"
{
extr.mesh.ExtrudeMesh = true;
extr.mesh.NbLayer = List_Nbr((yyvsp[(3) - (7)].l));
@@ -6347,8 +6419,8 @@ yyreduce:
;}
break;
- case 205:
-#line 2410 "Gmsh.y"
+ case 206:
+#line 2427 "Gmsh.y"
{
yymsg(0, "Explicit region numbers in layers are deprecated");
extr.mesh.ExtrudeMesh = true;
@@ -6373,15 +6445,15 @@ yyreduce:
;}
break;
- case 206:
-#line 2433 "Gmsh.y"
+ case 207:
+#line 2450 "Gmsh.y"
{
extr.mesh.Recombine = true;
;}
break;
- case 207:
-#line 2437 "Gmsh.y"
+ case 208:
+#line 2454 "Gmsh.y"
{
int num = (int)(yyvsp[(3) - (9)].d);
if(FindSurface(num)){
@@ -6402,15 +6474,15 @@ yyreduce:
;}
break;
- case 208:
-#line 2460 "Gmsh.y"
+ case 209:
+#line 2477 "Gmsh.y"
{
(yyval.v)[0] = (yyval.v)[1] = 1.;
;}
break;
- case 209:
-#line 2464 "Gmsh.y"
+ case 210:
+#line 2481 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (3)].c), "Progression") || !strcmp((yyvsp[(2) - (3)].c), "Power"))
(yyval.v)[0] = 1.;
@@ -6425,15 +6497,15 @@ yyreduce:
;}
break;
- case 210:
-#line 2479 "Gmsh.y"
+ case 211:
+#line 2496 "Gmsh.y"
{
(yyval.i) = -1; // left
;}
break;
- case 211:
-#line 2483 "Gmsh.y"
+ case 212:
+#line 2500 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (1)].c), "Right"))
(yyval.i) = 1;
@@ -6445,36 +6517,36 @@ yyreduce:
;}
break;
- case 212:
-#line 2495 "Gmsh.y"
+ case 213:
+#line 2512 "Gmsh.y"
{
(yyval.l) = List_Create(1, 1, sizeof(double));
;}
break;
- case 213:
-#line 2499 "Gmsh.y"
+ case 214:
+#line 2516 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (2)].l);
;}
break;
- case 214:
-#line 2504 "Gmsh.y"
+ case 215:
+#line 2521 "Gmsh.y"
{
(yyval.i) = 45;
;}
break;
- case 215:
-#line 2508 "Gmsh.y"
+ case 216:
+#line 2525 "Gmsh.y"
{
(yyval.i) = (int)(yyvsp[(2) - (2)].d);
;}
break;
- case 216:
-#line 2515 "Gmsh.y"
+ case 217:
+#line 2532 "Gmsh.y"
{
int type = (int)(yyvsp[(6) - (7)].v)[0];
double coef = fabs((yyvsp[(6) - (7)].v)[1]);
@@ -6530,8 +6602,8 @@ yyreduce:
;}
break;
- case 217:
-#line 2569 "Gmsh.y"
+ case 218:
+#line 2586 "Gmsh.y"
{
int k = List_Nbr((yyvsp[(4) - (6)].l));
if(k != 0 && k != 3 && k != 4){
@@ -6603,16 +6675,16 @@ yyreduce:
;}
break;
- case 218:
-#line 2639 "Gmsh.y"
+ case 219:
+#line 2656 "Gmsh.y"
{
yymsg(1, "Elliptic Surface is deprecated: use Transfinite instead (with smoothing)");
List_Delete((yyvsp[(7) - (8)].l));
;}
break;
- case 219:
-#line 2644 "Gmsh.y"
+ case 220:
+#line 2661 "Gmsh.y"
{
int k = List_Nbr((yyvsp[(4) - (5)].l));
if(k != 0 && k != 6 && k != 8){
@@ -6681,8 +6753,8 @@ yyreduce:
;}
break;
- case 220:
-#line 2711 "Gmsh.y"
+ case 221:
+#line 2728 "Gmsh.y"
{
if(!(yyvsp[(3) - (5)].l)){
List_T *tmp = Tree2List(GModel::current()->getGEOInternals()->Surfaces);
@@ -6727,8 +6799,8 @@ yyreduce:
;}
break;
- case 221:
-#line 2754 "Gmsh.y"
+ case 222:
+#line 2771 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (6)].l)); i++){
double d;
@@ -6750,8 +6822,8 @@ yyreduce:
;}
break;
- case 222:
-#line 2780 "Gmsh.y"
+ case 223:
+#line 2797 "Gmsh.y"
{
Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
if(s){
@@ -6776,8 +6848,8 @@ yyreduce:
;}
break;
- case 223:
-#line 2803 "Gmsh.y"
+ case 224:
+#line 2820 "Gmsh.y"
{
Surface *s = FindSurface((int)(yyvsp[(8) - (10)].d));
if(s){
@@ -6802,27 +6874,27 @@ yyreduce:
;}
break;
- case 224:
-#line 2826 "Gmsh.y"
+ case 225:
+#line 2843 "Gmsh.y"
{
;}
break;
- case 225:
-#line 2829 "Gmsh.y"
+ case 226:
+#line 2846 "Gmsh.y"
{
;}
break;
- case 226:
-#line 2838 "Gmsh.y"
+ case 227:
+#line 2855 "Gmsh.y"
{
ReplaceAllDuplicates();
;}
break;
- case 227:
-#line 2842 "Gmsh.y"
+ case 228:
+#line 2859 "Gmsh.y"
{
if(!strcmp((yyvsp[(2) - (3)].c), "Geometry"))
ReplaceAllDuplicates();
@@ -6834,48 +6906,48 @@ yyreduce:
;}
break;
- case 228:
-#line 2857 "Gmsh.y"
+ case 229:
+#line 2874 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (1)].d); ;}
break;
- case 229:
-#line 2858 "Gmsh.y"
+ case 230:
+#line 2875 "Gmsh.y"
{ (yyval.d) = (yyvsp[(2) - (3)].d); ;}
break;
- case 230:
-#line 2859 "Gmsh.y"
+ case 231:
+#line 2876 "Gmsh.y"
{ (yyval.d) = -(yyvsp[(2) - (2)].d); ;}
break;
- case 231:
-#line 2860 "Gmsh.y"
+ case 232:
+#line 2877 "Gmsh.y"
{ (yyval.d) = (yyvsp[(2) - (2)].d); ;}
break;
- case 232:
-#line 2861 "Gmsh.y"
+ case 233:
+#line 2878 "Gmsh.y"
{ (yyval.d) = !(yyvsp[(2) - (2)].d); ;}
break;
- case 233:
-#line 2862 "Gmsh.y"
+ case 234:
+#line 2879 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) - (yyvsp[(3) - (3)].d); ;}
break;
- case 234:
-#line 2863 "Gmsh.y"
+ case 235:
+#line 2880 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) + (yyvsp[(3) - (3)].d); ;}
break;
- case 235:
-#line 2864 "Gmsh.y"
+ case 236:
+#line 2881 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) * (yyvsp[(3) - (3)].d); ;}
break;
- case 236:
-#line 2866 "Gmsh.y"
+ case 237:
+#line 2883 "Gmsh.y"
{
if(!(yyvsp[(3) - (3)].d))
yymsg(0, "Division by zero in '%g / %g'", (yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d));
@@ -6884,308 +6956,308 @@ yyreduce:
;}
break;
- case 237:
-#line 2872 "Gmsh.y"
+ case 238:
+#line 2889 "Gmsh.y"
{ (yyval.d) = (int)(yyvsp[(1) - (3)].d) % (int)(yyvsp[(3) - (3)].d); ;}
break;
- case 238:
-#line 2873 "Gmsh.y"
+ case 239:
+#line 2890 "Gmsh.y"
{ (yyval.d) = pow((yyvsp[(1) - (3)].d), (yyvsp[(3) - (3)].d)); ;}
break;
- case 239:
-#line 2874 "Gmsh.y"
+ case 240:
+#line 2891 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) < (yyvsp[(3) - (3)].d); ;}
break;
- case 240:
-#line 2875 "Gmsh.y"
+ case 241:
+#line 2892 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) > (yyvsp[(3) - (3)].d); ;}
break;
- case 241:
-#line 2876 "Gmsh.y"
+ case 242:
+#line 2893 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) <= (yyvsp[(3) - (3)].d); ;}
break;
- case 242:
-#line 2877 "Gmsh.y"
+ case 243:
+#line 2894 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) >= (yyvsp[(3) - (3)].d); ;}
break;
- case 243:
-#line 2878 "Gmsh.y"
+ case 244:
+#line 2895 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) == (yyvsp[(3) - (3)].d); ;}
break;
- case 244:
-#line 2879 "Gmsh.y"
+ case 245:
+#line 2896 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) != (yyvsp[(3) - (3)].d); ;}
break;
- case 245:
-#line 2880 "Gmsh.y"
+ case 246:
+#line 2897 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) && (yyvsp[(3) - (3)].d); ;}
break;
- case 246:
-#line 2881 "Gmsh.y"
+ case 247:
+#line 2898 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (3)].d) || (yyvsp[(3) - (3)].d); ;}
break;
- case 247:
-#line 2882 "Gmsh.y"
+ case 248:
+#line 2899 "Gmsh.y"
{ (yyval.d) = (yyvsp[(1) - (5)].d) ? (yyvsp[(3) - (5)].d) : (yyvsp[(5) - (5)].d); ;}
break;
- case 248:
-#line 2883 "Gmsh.y"
+ case 249:
+#line 2900 "Gmsh.y"
{ (yyval.d) = exp((yyvsp[(3) - (4)].d)); ;}
break;
- case 249:
-#line 2884 "Gmsh.y"
+ case 250:
+#line 2901 "Gmsh.y"
{ (yyval.d) = log((yyvsp[(3) - (4)].d)); ;}
break;
- case 250:
-#line 2885 "Gmsh.y"
+ case 251:
+#line 2902 "Gmsh.y"
{ (yyval.d) = log10((yyvsp[(3) - (4)].d)); ;}
break;
- case 251:
-#line 2886 "Gmsh.y"
+ case 252:
+#line 2903 "Gmsh.y"
{ (yyval.d) = sqrt((yyvsp[(3) - (4)].d)); ;}
break;
- case 252:
-#line 2887 "Gmsh.y"
+ case 253:
+#line 2904 "Gmsh.y"
{ (yyval.d) = sin((yyvsp[(3) - (4)].d)); ;}
break;
- case 253:
-#line 2888 "Gmsh.y"
+ case 254:
+#line 2905 "Gmsh.y"
{ (yyval.d) = asin((yyvsp[(3) - (4)].d)); ;}
break;
- case 254:
-#line 2889 "Gmsh.y"
+ case 255:
+#line 2906 "Gmsh.y"
{ (yyval.d) = cos((yyvsp[(3) - (4)].d)); ;}
break;
- case 255:
-#line 2890 "Gmsh.y"
+ case 256:
+#line 2907 "Gmsh.y"
{ (yyval.d) = acos((yyvsp[(3) - (4)].d)); ;}
break;
- case 256:
-#line 2891 "Gmsh.y"
+ case 257:
+#line 2908 "Gmsh.y"
{ (yyval.d) = tan((yyvsp[(3) - (4)].d)); ;}
break;
- case 257:
-#line 2892 "Gmsh.y"
+ case 258:
+#line 2909 "Gmsh.y"
{ (yyval.d) = atan((yyvsp[(3) - (4)].d)); ;}
break;
- case 258:
-#line 2893 "Gmsh.y"
+ case 259:
+#line 2910 "Gmsh.y"
{ (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));;}
break;
- case 259:
-#line 2894 "Gmsh.y"
+ case 260:
+#line 2911 "Gmsh.y"
{ (yyval.d) = sinh((yyvsp[(3) - (4)].d)); ;}
break;
- case 260:
-#line 2895 "Gmsh.y"
- { (yyval.d) = cosh((yyvsp[(3) - (4)].d)); ;}
- break;
-
case 261:
-#line 2896 "Gmsh.y"
- { (yyval.d) = tanh((yyvsp[(3) - (4)].d)); ;}
+#line 2912 "Gmsh.y"
+ { (yyval.d) = cosh((yyvsp[(3) - (4)].d)); ;}
break;
case 262:
-#line 2897 "Gmsh.y"
- { (yyval.d) = fabs((yyvsp[(3) - (4)].d)); ;}
+#line 2913 "Gmsh.y"
+ { (yyval.d) = tanh((yyvsp[(3) - (4)].d)); ;}
break;
case 263:
-#line 2898 "Gmsh.y"
- { (yyval.d) = floor((yyvsp[(3) - (4)].d)); ;}
+#line 2914 "Gmsh.y"
+ { (yyval.d) = fabs((yyvsp[(3) - (4)].d)); ;}
break;
case 264:
-#line 2899 "Gmsh.y"
- { (yyval.d) = ceil((yyvsp[(3) - (4)].d)); ;}
+#line 2915 "Gmsh.y"
+ { (yyval.d) = floor((yyvsp[(3) - (4)].d)); ;}
break;
case 265:
-#line 2900 "Gmsh.y"
- { (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
+#line 2916 "Gmsh.y"
+ { (yyval.d) = ceil((yyvsp[(3) - (4)].d)); ;}
break;
case 266:
-#line 2901 "Gmsh.y"
+#line 2917 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 267:
-#line 2902 "Gmsh.y"
- { (yyval.d) = sqrt((yyvsp[(3) - (6)].d) * (yyvsp[(3) - (6)].d) + (yyvsp[(5) - (6)].d) * (yyvsp[(5) - (6)].d)); ;}
+#line 2918 "Gmsh.y"
+ { (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 268:
-#line 2903 "Gmsh.y"
- { (yyval.d) = (yyvsp[(3) - (4)].d) * (double)rand() / (double)RAND_MAX; ;}
+#line 2919 "Gmsh.y"
+ { (yyval.d) = sqrt((yyvsp[(3) - (6)].d) * (yyvsp[(3) - (6)].d) + (yyvsp[(5) - (6)].d) * (yyvsp[(5) - (6)].d)); ;}
break;
case 269:
-#line 2905 "Gmsh.y"
- { (yyval.d) = exp((yyvsp[(3) - (4)].d)); ;}
+#line 2920 "Gmsh.y"
+ { (yyval.d) = (yyvsp[(3) - (4)].d) * (double)rand() / (double)RAND_MAX; ;}
break;
case 270:
-#line 2906 "Gmsh.y"
- { (yyval.d) = log((yyvsp[(3) - (4)].d)); ;}
+#line 2922 "Gmsh.y"
+ { (yyval.d) = exp((yyvsp[(3) - (4)].d)); ;}
break;
case 271:
-#line 2907 "Gmsh.y"
- { (yyval.d) = log10((yyvsp[(3) - (4)].d)); ;}
+#line 2923 "Gmsh.y"
+ { (yyval.d) = log((yyvsp[(3) - (4)].d)); ;}
break;
case 272:
-#line 2908 "Gmsh.y"
- { (yyval.d) = sqrt((yyvsp[(3) - (4)].d)); ;}
+#line 2924 "Gmsh.y"
+ { (yyval.d) = log10((yyvsp[(3) - (4)].d)); ;}
break;
case 273:
-#line 2909 "Gmsh.y"
- { (yyval.d) = sin((yyvsp[(3) - (4)].d)); ;}
+#line 2925 "Gmsh.y"
+ { (yyval.d) = sqrt((yyvsp[(3) - (4)].d)); ;}
break;
case 274:
-#line 2910 "Gmsh.y"
- { (yyval.d) = asin((yyvsp[(3) - (4)].d)); ;}
+#line 2926 "Gmsh.y"
+ { (yyval.d) = sin((yyvsp[(3) - (4)].d)); ;}
break;
case 275:
-#line 2911 "Gmsh.y"
- { (yyval.d) = cos((yyvsp[(3) - (4)].d)); ;}
+#line 2927 "Gmsh.y"
+ { (yyval.d) = asin((yyvsp[(3) - (4)].d)); ;}
break;
case 276:
-#line 2912 "Gmsh.y"
- { (yyval.d) = acos((yyvsp[(3) - (4)].d)); ;}
+#line 2928 "Gmsh.y"
+ { (yyval.d) = cos((yyvsp[(3) - (4)].d)); ;}
break;
case 277:
-#line 2913 "Gmsh.y"
- { (yyval.d) = tan((yyvsp[(3) - (4)].d)); ;}
+#line 2929 "Gmsh.y"
+ { (yyval.d) = acos((yyvsp[(3) - (4)].d)); ;}
break;
case 278:
-#line 2914 "Gmsh.y"
- { (yyval.d) = atan((yyvsp[(3) - (4)].d)); ;}
+#line 2930 "Gmsh.y"
+ { (yyval.d) = tan((yyvsp[(3) - (4)].d)); ;}
break;
case 279:
-#line 2915 "Gmsh.y"
- { (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));;}
+#line 2931 "Gmsh.y"
+ { (yyval.d) = atan((yyvsp[(3) - (4)].d)); ;}
break;
case 280:
-#line 2916 "Gmsh.y"
- { (yyval.d) = sinh((yyvsp[(3) - (4)].d)); ;}
+#line 2932 "Gmsh.y"
+ { (yyval.d) = atan2((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d));;}
break;
case 281:
-#line 2917 "Gmsh.y"
- { (yyval.d) = cosh((yyvsp[(3) - (4)].d)); ;}
+#line 2933 "Gmsh.y"
+ { (yyval.d) = sinh((yyvsp[(3) - (4)].d)); ;}
break;
case 282:
-#line 2918 "Gmsh.y"
- { (yyval.d) = tanh((yyvsp[(3) - (4)].d)); ;}
+#line 2934 "Gmsh.y"
+ { (yyval.d) = cosh((yyvsp[(3) - (4)].d)); ;}
break;
case 283:
-#line 2919 "Gmsh.y"
- { (yyval.d) = fabs((yyvsp[(3) - (4)].d)); ;}
+#line 2935 "Gmsh.y"
+ { (yyval.d) = tanh((yyvsp[(3) - (4)].d)); ;}
break;
case 284:
-#line 2920 "Gmsh.y"
- { (yyval.d) = floor((yyvsp[(3) - (4)].d)); ;}
+#line 2936 "Gmsh.y"
+ { (yyval.d) = fabs((yyvsp[(3) - (4)].d)); ;}
break;
case 285:
-#line 2921 "Gmsh.y"
- { (yyval.d) = ceil((yyvsp[(3) - (4)].d)); ;}
+#line 2937 "Gmsh.y"
+ { (yyval.d) = floor((yyvsp[(3) - (4)].d)); ;}
break;
case 286:
-#line 2922 "Gmsh.y"
- { (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
+#line 2938 "Gmsh.y"
+ { (yyval.d) = ceil((yyvsp[(3) - (4)].d)); ;}
break;
case 287:
-#line 2923 "Gmsh.y"
+#line 2939 "Gmsh.y"
{ (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 288:
-#line 2924 "Gmsh.y"
- { (yyval.d) = sqrt((yyvsp[(3) - (6)].d) * (yyvsp[(3) - (6)].d) + (yyvsp[(5) - (6)].d) * (yyvsp[(5) - (6)].d)); ;}
+#line 2940 "Gmsh.y"
+ { (yyval.d) = fmod((yyvsp[(3) - (6)].d), (yyvsp[(5) - (6)].d)); ;}
break;
case 289:
-#line 2925 "Gmsh.y"
- { (yyval.d) = (yyvsp[(3) - (4)].d) * (double)rand() / (double)RAND_MAX; ;}
+#line 2941 "Gmsh.y"
+ { (yyval.d) = sqrt((yyvsp[(3) - (6)].d) * (yyvsp[(3) - (6)].d) + (yyvsp[(5) - (6)].d) * (yyvsp[(5) - (6)].d)); ;}
break;
case 290:
-#line 2934 "Gmsh.y"
- { (yyval.d) = (yyvsp[(1) - (1)].d); ;}
+#line 2942 "Gmsh.y"
+ { (yyval.d) = (yyvsp[(3) - (4)].d) * (double)rand() / (double)RAND_MAX; ;}
break;
case 291:
-#line 2935 "Gmsh.y"
- { (yyval.d) = 3.141592653589793; ;}
+#line 2951 "Gmsh.y"
+ { (yyval.d) = (yyvsp[(1) - (1)].d); ;}
break;
case 292:
-#line 2936 "Gmsh.y"
- { (yyval.d) = Msg::GetCommRank(); ;}
+#line 2952 "Gmsh.y"
+ { (yyval.d) = 3.141592653589793; ;}
break;
case 293:
-#line 2937 "Gmsh.y"
- { (yyval.d) = Msg::GetCommSize(); ;}
+#line 2953 "Gmsh.y"
+ { (yyval.d) = Msg::GetCommRank(); ;}
break;
case 294:
-#line 2938 "Gmsh.y"
- { (yyval.d) = GetGmshMajorVersion(); ;}
+#line 2954 "Gmsh.y"
+ { (yyval.d) = Msg::GetCommSize(); ;}
break;
case 295:
-#line 2939 "Gmsh.y"
- { (yyval.d) = GetGmshMinorVersion(); ;}
+#line 2955 "Gmsh.y"
+ { (yyval.d) = GetGmshMajorVersion(); ;}
break;
case 296:
-#line 2940 "Gmsh.y"
- { (yyval.d) = GetGmshPatchVersion(); ;}
+#line 2956 "Gmsh.y"
+ { (yyval.d) = GetGmshMinorVersion(); ;}
break;
case 297:
-#line 2945 "Gmsh.y"
+#line 2957 "Gmsh.y"
+ { (yyval.d) = GetGmshPatchVersion(); ;}
+ break;
+
+ case 298:
+#line 2962 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (1)].c))){
yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (1)].c));
@@ -7197,8 +7269,8 @@ yyreduce:
;}
break;
- case 298:
-#line 2958 "Gmsh.y"
+ case 299:
+#line 2975 "Gmsh.y"
{
char tmpstring[1024];
sprintf(tmpstring, "%s_%d", (yyvsp[(1) - (5)].c), (int)(yyvsp[(4) - (5)].d)) ;
@@ -7212,8 +7284,8 @@ yyreduce:
;}
break;
- case 299:
-#line 2970 "Gmsh.y"
+ case 300:
+#line 2987 "Gmsh.y"
{
int index = (int)(yyvsp[(3) - (4)].d);
if(!gmsh_yysymbols.count((yyvsp[(1) - (4)].c))){
@@ -7230,8 +7302,8 @@ yyreduce:
;}
break;
- case 300:
-#line 2985 "Gmsh.y"
+ case 301:
+#line 3002 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(2) - (4)].c))){
yymsg(0, "Unknown variable '%s'", (yyvsp[(2) - (4)].c));
@@ -7243,8 +7315,8 @@ yyreduce:
;}
break;
- case 301:
-#line 2995 "Gmsh.y"
+ case 302:
+#line 3012 "Gmsh.y"
{
if(!gmsh_yysymbols.count((yyvsp[(1) - (2)].c))){
yymsg(0, "Unknown variable '%s'", (yyvsp[(1) - (2)].c));
@@ -7256,8 +7328,8 @@ yyreduce:
;}
break;
- case 302:
-#line 3005 "Gmsh.y"
+ case 303:
+#line 3022 "Gmsh.y"
{
int index = (int)(yyvsp[(3) - (5)].d);
if(!gmsh_yysymbols.count((yyvsp[(1) - (5)].c))){
@@ -7274,24 +7346,24 @@ yyreduce:
;}
break;
- case 303:
-#line 3023 "Gmsh.y"
+ case 304:
+#line 3040 "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));
;}
break;
- case 304:
-#line 3028 "Gmsh.y"
+ case 305:
+#line 3045 "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));
;}
break;
- case 305:
-#line 3033 "Gmsh.y"
+ case 306:
+#line 3050 "Gmsh.y"
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[(1) - (4)].c), 0, (yyvsp[(3) - (4)].c), d)){
@@ -7303,8 +7375,8 @@ yyreduce:
;}
break;
- case 306:
-#line 3043 "Gmsh.y"
+ case 307:
+#line 3060 "Gmsh.y"
{
double d = 0.;
if(NumberOption(GMSH_GET, (yyvsp[(1) - (7)].c), (int)(yyvsp[(3) - (7)].d), (yyvsp[(6) - (7)].c), d)){
@@ -7316,124 +7388,124 @@ yyreduce:
;}
break;
- case 307:
-#line 3053 "Gmsh.y"
+ case 308:
+#line 3070 "Gmsh.y"
{
(yyval.d) = Msg::GetValue((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].d));
Free((yyvsp[(3) - (6)].c));
;}
break;
- case 308:
-#line 3061 "Gmsh.y"
+ case 309:
+#line 3078 "Gmsh.y"
{
memcpy((yyval.v), (yyvsp[(1) - (1)].v), 5*sizeof(double));
;}
break;
- case 309:
-#line 3065 "Gmsh.y"
+ case 310:
+#line 3082 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = -(yyvsp[(2) - (2)].v)[i];
;}
break;
- case 310:
-#line 3069 "Gmsh.y"
+ case 311:
+#line 3086 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(2) - (2)].v)[i];
;}
break;
- case 311:
-#line 3073 "Gmsh.y"
+ case 312:
+#line 3090 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] - (yyvsp[(3) - (3)].v)[i];
;}
break;
- case 312:
-#line 3077 "Gmsh.y"
+ case 313:
+#line 3094 "Gmsh.y"
{
for(int i = 0; i < 5; i++) (yyval.v)[i] = (yyvsp[(1) - (3)].v)[i] + (yyvsp[(3) - (3)].v)[i];
;}
break;
- case 313:
-#line 3084 "Gmsh.y"
+ case 314:
+#line 3101 "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 314:
-#line 3088 "Gmsh.y"
+ case 315:
+#line 3105 "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 315:
-#line 3092 "Gmsh.y"
+ case 316:
+#line 3109 "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 316:
-#line 3096 "Gmsh.y"
+ case 317:
+#line 3113 "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 317:
-#line 3103 "Gmsh.y"
+ case 318:
+#line 3120 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(List_T*));
List_Add((yyval.l), &((yyvsp[(1) - (1)].l)));
;}
break;
- case 318:
-#line 3108 "Gmsh.y"
+ case 319:
+#line 3125 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].l)));
;}
break;
- case 319:
-#line 3115 "Gmsh.y"
+ case 320:
+#line 3132 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
;}
break;
- case 320:
-#line 3120 "Gmsh.y"
+ case 321:
+#line 3137 "Gmsh.y"
{
(yyval.l) = (yyvsp[(1) - (1)].l);
;}
break;
- case 321:
-#line 3124 "Gmsh.y"
+ case 322:
+#line 3141 "Gmsh.y"
{
// creates an empty list
(yyval.l) = List_Create(2, 1, sizeof(double));
;}
break;
- case 322:
-#line 3129 "Gmsh.y"
+ case 323:
+#line 3146 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (3)].l);
;}
break;
- case 323:
-#line 3133 "Gmsh.y"
+ case 324:
+#line 3150 "Gmsh.y"
{
(yyval.l) = (yyvsp[(3) - (4)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -7443,8 +7515,8 @@ yyreduce:
;}
break;
- case 324:
-#line 3141 "Gmsh.y"
+ case 325:
+#line 3158 "Gmsh.y"
{
(yyval.l) = (yyvsp[(4) - (5)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -7454,15 +7526,15 @@ yyreduce:
;}
break;
- case 325:
-#line 3152 "Gmsh.y"
+ case 326:
+#line 3169 "Gmsh.y"
{
(yyval.l) = (yyvsp[(1) - (1)].l);
;}
break;
- case 326:
-#line 3156 "Gmsh.y"
+ case 327:
+#line 3173 "Gmsh.y"
{
if(!strcmp((yyvsp[(1) - (1)].c), "*") || !strcmp((yyvsp[(1) - (1)].c), "all"))
(yyval.l) = 0;
@@ -7473,8 +7545,8 @@ yyreduce:
;}
break;
- case 327:
-#line 3168 "Gmsh.y"
+ case 328:
+#line 3185 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (2)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -7484,8 +7556,8 @@ yyreduce:
;}
break;
- case 328:
-#line 3176 "Gmsh.y"
+ case 329:
+#line 3193 "Gmsh.y"
{
(yyval.l) = (yyvsp[(3) - (3)].l);
for(int i = 0; i < List_Nbr((yyval.l)); i++){
@@ -7495,8 +7567,8 @@ yyreduce:
;}
break;
- case 329:
-#line 3184 "Gmsh.y"
+ case 330:
+#line 3201 "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));
@@ -7505,8 +7577,8 @@ yyreduce:
;}
break;
- case 330:
-#line 3191 "Gmsh.y"
+ case 331:
+#line 3208 "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)){
@@ -7519,8 +7591,8 @@ yyreduce:
;}
break;
- case 331:
-#line 3202 "Gmsh.y"
+ case 332:
+#line 3219 "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
@@ -7542,8 +7614,8 @@ yyreduce:
;}
break;
- case 332:
-#line 3222 "Gmsh.y"
+ case 333:
+#line 3239 "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++){
@@ -7555,8 +7627,8 @@ yyreduce:
;}
break;
- case 333:
-#line 3232 "Gmsh.y"
+ case 334:
+#line 3249 "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++){
@@ -7568,8 +7640,8 @@ yyreduce:
;}
break;
- case 334:
-#line 3242 "Gmsh.y"
+ case 335:
+#line 3259 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
if(!gmsh_yysymbols.count((yyvsp[(1) - (3)].c)))
@@ -7581,8 +7653,8 @@ yyreduce:
;}
break;
- case 335:
-#line 3252 "Gmsh.y"
+ case 336:
+#line 3269 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
if(!gmsh_yysymbols.count((yyvsp[(1) - (6)].c)))
@@ -7601,30 +7673,30 @@ yyreduce:
;}
break;
- case 336:
-#line 3272 "Gmsh.y"
+ case 337:
+#line 3289 "Gmsh.y"
{
(yyval.l) = List_Create(2, 1, sizeof(double));
List_Add((yyval.l), &((yyvsp[(1) - (1)].d)));
;}
break;
- case 337:
-#line 3277 "Gmsh.y"
+ case 338:
+#line 3294 "Gmsh.y"
{
(yyval.l) = (yyvsp[(1) - (1)].l);
;}
break;
- case 338:
-#line 3281 "Gmsh.y"
+ case 339:
+#line 3298 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].d)));
;}
break;
- case 339:
-#line 3285 "Gmsh.y"
+ case 340:
+#line 3302 "Gmsh.y"
{
for(int i = 0; i < List_Nbr((yyvsp[(3) - (3)].l)); i++){
double d;
@@ -7635,22 +7707,22 @@ yyreduce:
;}
break;
- case 340:
-#line 3297 "Gmsh.y"
+ case 341:
+#line 3314 "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 341:
-#line 3301 "Gmsh.y"
+ case 342:
+#line 3318 "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 342:
-#line 3313 "Gmsh.y"
+ case 343:
+#line 3330 "Gmsh.y"
{
int flag;
(yyval.u) = GetColorForString(ColorString, -1, (yyvsp[(1) - (1)].c), &flag);
@@ -7659,8 +7731,8 @@ yyreduce:
;}
break;
- case 343:
-#line 3320 "Gmsh.y"
+ case 344:
+#line 3337 "Gmsh.y"
{
unsigned int val = 0;
ColorOption(GMSH_GET, (yyvsp[(1) - (5)].c), 0, (yyvsp[(5) - (5)].c), val);
@@ -7669,15 +7741,15 @@ yyreduce:
;}
break;
- case 344:
-#line 3330 "Gmsh.y"
+ case 345:
+#line 3347 "Gmsh.y"
{
(yyval.l) = (yyvsp[(2) - (3)].l);
;}
break;
- case 345:
-#line 3334 "Gmsh.y"
+ case 346:
+#line 3351 "Gmsh.y"
{
(yyval.l) = List_Create(256, 10, sizeof(unsigned int));
GmshColorTable *ct = GetColorTable((int)(yyvsp[(3) - (6)].d));
@@ -7691,30 +7763,30 @@ yyreduce:
;}
break;
- case 346:
-#line 3349 "Gmsh.y"
+ case 347:
+#line 3366 "Gmsh.y"
{
(yyval.l) = List_Create(256, 10, sizeof(unsigned int));
List_Add((yyval.l), &((yyvsp[(1) - (1)].u)));
;}
break;
- case 347:
-#line 3354 "Gmsh.y"
+ case 348:
+#line 3371 "Gmsh.y"
{
List_Add((yyval.l), &((yyvsp[(3) - (3)].u)));
;}
break;
- case 348:
-#line 3361 "Gmsh.y"
+ case 349:
+#line 3378 "Gmsh.y"
{
(yyval.c) = (yyvsp[(1) - (1)].c);
;}
break;
- case 349:
-#line 3365 "Gmsh.y"
+ case 350:
+#line 3382 "Gmsh.y"
{
if(!gmsh_yystringsymbols.count((yyvsp[(1) - (1)].c))){
yymsg(0, "Unknown string variable '%s'", (yyvsp[(1) - (1)].c));
@@ -7729,8 +7801,8 @@ yyreduce:
;}
break;
- case 350:
-#line 3378 "Gmsh.y"
+ case 351:
+#line 3395 "Gmsh.y"
{
std::string out;
StringOption(GMSH_GET, (yyvsp[(1) - (3)].c), 0, (yyvsp[(3) - (3)].c), out);
@@ -7740,8 +7812,8 @@ yyreduce:
;}
break;
- case 351:
-#line 3386 "Gmsh.y"
+ case 352:
+#line 3403 "Gmsh.y"
{
std::string out;
StringOption(GMSH_GET, (yyvsp[(1) - (6)].c), (int)(yyvsp[(3) - (6)].d), (yyvsp[(6) - (6)].c), out);
@@ -7751,15 +7823,15 @@ yyreduce:
;}
break;
- case 352:
-#line 3397 "Gmsh.y"
+ case 353:
+#line 3414 "Gmsh.y"
{
(yyval.c) = (yyvsp[(1) - (1)].c);
;}
break;
- case 353:
-#line 3401 "Gmsh.y"
+ case 354:
+#line 3418 "Gmsh.y"
{
(yyval.c) = (char *)Malloc(32 * sizeof(char));
time_t now;
@@ -7769,8 +7841,8 @@ yyreduce:
;}
break;
- case 354:
-#line 3409 "Gmsh.y"
+ case 355:
+#line 3426 "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));
@@ -7780,8 +7852,8 @@ yyreduce:
;}
break;
- case 355:
-#line 3417 "Gmsh.y"
+ case 356:
+#line 3434 "Gmsh.y"
{
(yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c)) + 1) * sizeof(char));
int i;
@@ -7797,8 +7869,8 @@ yyreduce:
;}
break;
- case 356:
-#line 3431 "Gmsh.y"
+ case 357:
+#line 3448 "Gmsh.y"
{
(yyval.c) = (char *)Malloc((strlen((yyvsp[(3) - (4)].c)) + 1) * sizeof(char));
int i;
@@ -7814,15 +7886,15 @@ yyreduce:
;}
break;
- case 357:
-#line 3445 "Gmsh.y"
+ case 358:
+#line 3462 "Gmsh.y"
{
(yyval.c) = (yyvsp[(3) - (4)].c);
;}
break;
- case 358:
-#line 3449 "Gmsh.y"
+ case 359:
+#line 3466 "Gmsh.y"
{
char tmpstring[1024];
int i = PrintListOfDouble((yyvsp[(3) - (6)].c), (yyvsp[(5) - (6)].l), tmpstring);
@@ -7845,7 +7917,7 @@ yyreduce:
/* Line 1267 of yacc.c. */
-#line 7849 "Gmsh.tab.cpp"
+#line 7921 "Gmsh.tab.cpp"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -8059,7 +8131,7 @@ yyreturn:
}
-#line 3469 "Gmsh.y"
+#line 3486 "Gmsh.y"
int PrintListOfDouble(char *format, List_T *list, char *buffer)
diff --git a/Parser/Gmsh.y b/Parser/Gmsh.y
index 48c0f8c59bcf1b4e0249a2167617a7f6bfeb877f..1c9258158535373216e2a4a638dd56d06b71230b 100644
--- a/Parser/Gmsh.y
+++ b/Parser/Gmsh.y
@@ -1487,6 +1487,23 @@ Shape :
$$.Num = num;
}
+ | tCompound tLine '(' FExpr ')' tAFFECT ListOfDouble tEND
+ {
+ int num = (int)$4;
+ if(FindPhysicalGroup(num, MSH_PHYSICAL_SURFACE)){
+ yymsg(0, "Physical surface %d already exists", num);
+ }
+ else{
+ List_T *temp = ListOfDouble2ListOfInt($7);
+ List_T *S[4] = {temp, 0, 0, 0};
+ PhysicalGroup *p = Create_PhysicalGroup(num, MSH_PHYSICAL_LINE, temp, S);
+ List_Delete(temp);
+ List_Add(GModel::current()->getGEOInternals()->PhysicalGroups, &p);
+ }
+ List_Delete($7);
+ $$.Type = MSH_PHYSICAL_LINE;
+ $$.Num = num;
+ }
// Volumes
// for backward compatibility:
diff --git a/Plugin/FiniteElement.cpp b/Plugin/FiniteElement.cpp
index f1cdf4ebd1a7cd852cd1c4bb1794e23c6d6bc9c5..b2fa3601bbfe522faef66f00d5086b7136f96dee 100644
--- a/Plugin/FiniteElement.cpp
+++ b/Plugin/FiniteElement.cpp
@@ -102,17 +102,19 @@ class solver{
GModel *m = GModel::current();
std::vector<MVertex*> vertices;
+ int dim = m->getNumRegions() ? 3 : 2;
+
if(bc1 == "Dirichlet"){
- m->getMeshVertices(surface1, 2, vertices);
+ m->getMeshVertices(surface1, dim-1, vertices);
for(unsigned int i = 0; i < vertices.size(); i++)
myAssembler->fixVertex(vertices[i], 0, 1, value1);
}
if(bc2 == "Dirichlet"){
- m->getMeshVertices(surface2, 2, vertices);
+ m->getMeshVertices(surface2, dim-1, vertices);
for(unsigned int i = 0; i < vertices.size(); i++)
myAssembler->fixVertex(vertices[i], 0, 1, value2);
}
- m->getMeshVertices(volume, 3, vertices);
+ m->getMeshVertices(volume, dim, vertices);
for(unsigned int i = 0; i < vertices.size(); i++)
myAssembler->numberVertex(vertices[i], 0, 1);
@@ -132,9 +134,10 @@ PView *GMSH_FiniteElementPlugin::execute(PView *v)
GModel *m = GModel::current();
std::map<int, std::vector<GEntity*> > groups[4];
m->getPhysicalGroups(groups);
+ int dim = m->getNumRegions() ? 3 : 2;
std::vector<MVertex*> vertices;
- m->getMeshVertices(volume, 3, vertices);
+ m->getMeshVertices(volume, dim, vertices);
std::map<int, std::vector<double> > data;
if(equation == "Laplace"){
@@ -142,8 +145,8 @@ PView *GMSH_FiniteElementPlugin::execute(PView *v)
if(!s.myAssembler->sizeOfR()) return 0;
gmshFunction<double> diffusivity(parameter);
gmshLaplaceTerm laplace(m, &diffusivity, 1);
- for(unsigned int i = 0; i < groups[3][volume].size(); i++)
- laplace.addToMatrix(*s.myAssembler, groups[3][volume][i]);
+ for(unsigned int i = 0; i < groups[dim][volume].size(); i++)
+ laplace.addToMatrix(*s.myAssembler, groups[dim][volume][i]);
s.lsys->systemSolve();
for (unsigned int i = 0; i < vertices.size(); i++)
data[vertices[i]->getNum()].push_back
@@ -155,8 +158,8 @@ PView *GMSH_FiniteElementPlugin::execute(PView *v)
if(!s.myAssembler->sizeOfR()) return 0;
gmshFunction<std::complex<double> > waveNumber(parameter);
gmshHelmholtzTerm helmholtz(m, &waveNumber, 1);
- for(unsigned int i = 0; i < groups[3][volume].size(); i++)
- helmholtz.addToMatrix(*s.myAssembler, groups[3][volume][i]);
+ for(unsigned int i = 0; i < groups[dim][volume].size(); i++)
+ helmholtz.addToMatrix(*s.myAssembler, groups[dim][volume][i]);
s.lsys->setGmres(1);
s.lsys->systemSolve();
for (unsigned int i = 0; i < vertices.size(); i++)
diff --git a/benchmarks/2d/conge.geo b/benchmarks/2d/conge.geo
index 86a5d8178ee5928d93d485b5ba91f5300a723d70..cec41f9134b95ab020b52d427c130682e5a30c6d 100644
--- a/benchmarks/2d/conge.geo
+++ b/benchmarks/2d/conge.geo
@@ -73,5 +73,8 @@ Plane Surface(22) = {21};
Line Loop(23) = {11,-12,13,14,1,2,-3,4,5,6,7,-8,9,10};
Plane Surface(24) = {23,21};
-Physical Line(25) = {9,1,2,3,4,5,6,7,8,11,12,13,14,15,16,17,18,19,20,10};
+Physical Line(24) = {9,1,2,3,4,5,6,7,8,11};
+Physical Line(25) = {12,13,14,15,16,17,18,19,20,10};
Physical Surface(26) = {22,24};
+Physical Line(27) = {10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 14, 13, 12, 11};
+Physical Line(28) = {17, 16, 20, 19, 18, 15};
diff --git a/configure b/configure
index 2e8ffcf219f087371c0f3e3cf91c188b2079cfcb..154fc1f131ad0b3a45ad0e0900e1319a3fc0278b 100755
--- a/configure
+++ b/configure
@@ -5402,7 +5402,7 @@ if test "x$UNAME" != "xDarwin"; then
F77LIB="-lgfortran"
;;
*g77*)
- F77LIB="-lg2c"
+ F77LIB=""
;;
esac
fi