From 8142cb4cc65d4501fdcd8c948986cff3e9d45036 Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 12 Jan 2018 13:23:23 -0500 Subject: add precision command tests --- tksao/frame/annulus.C | 14 +- tksao/frame/base.C | 14 +- tksao/frame/base.h | 15 +- tksao/frame/basecommand.C | 17 +- tksao/frame/baseline.C | 2 +- tksao/frame/basepolygon.C | 2 +- tksao/frame/box.C | 26 +- tksao/frame/boxannulus.C | 20 +- tksao/frame/bpanda.C | 26 +- tksao/frame/circle.C | 18 +- tksao/frame/compass.C | 4 +- tksao/frame/composite.C | 6 +- tksao/frame/cpanda.C | 22 +- tksao/frame/ellipse.C | 26 +- tksao/frame/ellipseannulus.C | 22 +- tksao/frame/epanda.C | 24 +- tksao/frame/fitsimage.C | 24 +- tksao/frame/fitsmap.C | 36 +- tksao/frame/lex.C | 1864 ++++---- tksao/frame/lex.L | 1 + tksao/frame/line.C | 2 +- tksao/frame/marker.C | 8 +- tksao/frame/parser.C | 10571 +++++++++++++++++++++-------------------- tksao/frame/parser.H | 472 +- tksao/frame/parser.Y | 2 + tksao/frame/point.C | 10 +- tksao/frame/polygon.C | 8 +- tksao/frame/projection.C | 4 +- tksao/frame/text.C | 4 +- tksao/frame/vect.C | 6 +- 30 files changed, 6653 insertions(+), 6617 deletions(-) diff --git a/tksao/frame/annulus.C b/tksao/frame/annulus.C index 9b7aad3..75344a9 100644 --- a/tksao/frame/annulus.C +++ b/tksao/frame/annulus.C @@ -215,7 +215,7 @@ void Annulus::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, if (ptr->hasWCSCel(sys)) { listRADEC(ptr,center,sys,sky,format); str << type_ << '(' << ra << ',' << dec - << setprecision(parent->precArcsec) << fixed; + << setprecision(parent->precArcsec_) << fixed; for (int ii=0; iimapLenFromRef(annuli_[ii][0],sys,Coord::ARCSEC); str << ',' << rr << '"'; @@ -233,7 +233,7 @@ void Annulus::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, void Annulus::listNonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) { Vector vv = ptr->mapFromRef(center,sys); - str << type_ << '(' << setprecision(parent->precLinear) << vv; + str << type_ << '(' << setprecision(parent->precLinear_) << vv; for (int ii=0; iimapLenFromRef(annuli_[ii][0],sys); str << ',' << rr; @@ -269,7 +269,7 @@ void Annulus::listCiao(ostream& str, Coord::CoordSystem sys, int strip) Vector vv = ptr->mapFromRef(center,Coord::PHYSICAL); for (int ii=0; iiprecLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << ptr->mapLenFromRef(annuli_[ii][0],Coord::PHYSICAL) << ',' << ptr->mapLenFromRef(annuli_[ii+1][0],Coord::PHYSICAL) << ')'; listCiaoPost(str, strip); @@ -284,7 +284,7 @@ void Annulus::listCiao(ostream& str, Coord::CoordSystem sys, int strip) double r1 = ptr->mapLenFromRef(annuli_[ii][0],sys,Coord::ARCMIN); double r2 = ptr->mapLenFromRef(annuli_[ii+1][0],sys,Coord::ARCMIN); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precArcmin) << fixed + << setprecision(parent->precArcmin_) << fixed << r1 << '\'' << ',' << r2 << '\'' << ')'; str.unsetf(ios_base::floatfield); @@ -309,7 +309,7 @@ void Annulus::listPros(ostream& str, Coord::CoordSystem sys, { Vector vv = ptr->mapFromRef(center,sys); coord.listProsCoordSystem(str,sys,sky); - str << "; " << type_ << ' ' << setprecision(parent->precLinear) << vv; + str << "; " << type_ << ' ' << setprecision(parent->precLinear_) << vv; for (int ii=0; iimapLenFromRef(annuli_[ii][0],Coord::IMAGE); str << ' ' << rr; @@ -329,7 +329,7 @@ void Annulus::listPros(ostream& str, Coord::CoordSystem sys, str << ra << ' ' << dec; break; } - str << setprecision(parent->precArcsec) << fixed; + str << setprecision(parent->precArcsec_) << fixed; for (int ii=0; iimapLenFromRef(annuli_[ii][0],sys,Coord::ARCSEC); str << ' ' << rr << '"'; @@ -347,7 +347,7 @@ void Annulus::listSAOimage(ostream& str, int strip) listSAOimagePre(str); Vector vv = ptr->mapFromRef(center,Coord::IMAGE); - str << type_ << '(' << setprecision(parent->precLinear) << vv; + str << type_ << '(' << setprecision(parent->precLinear_) << vv; for (int ii=0; iimapLenFromRef(annuli_[ii][0],Coord::IMAGE); str << ',' << rr; diff --git a/tksao/frame/base.C b/tksao/frame/base.C index e790ecf..b3b471d 100644 --- a/tksao/frame/base.C +++ b/tksao/frame/base.C @@ -133,12 +133,12 @@ Base::Base(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item) useCrosshair = 0; - precArcsec = 3; - precArcmin = 5; - precDeg = 10; - precLinear = 8; - precHMS = 4; - precDMS = 3; + precLinear_ = 8; + precDeg_ = 10; + precHMS_ = 4; + precDMS_ = 3; + precArcmin_ = 5; + precArcsec_ = 3; markerEpsilon = 3; showMarkers = 1; @@ -760,7 +760,7 @@ void Base::doubleToTclArray(double dd, const char* var, str << base << "," << mod << ends; ostringstream vstr; - vstr << setprecision(precLinear) << dd << ends; + vstr << setprecision(precLinear_) << dd << ends; Tcl_SetVar2(interp, (char*)var, str.str().c_str(), vstr.str().c_str(), 0); } diff --git a/tksao/frame/base.h b/tksao/frame/base.h index 4ee4024..5ee2824 100644 --- a/tksao/frame/base.h +++ b/tksao/frame/base.h @@ -249,12 +249,12 @@ public: int useCrosshair; - int precArcsec; - int precArcmin; - int precDeg; - int precLinear; - int precHMS; - int precDMS; + int precLinear_; + int precDeg_; + int precHMS_; + int precDMS_; + int precArcmin_; + int precArcsec_; int markerEpsilon; // mouse tolerance for select/edit int showMarkers; @@ -1646,6 +1646,9 @@ public: // Pixel Table Commands void getPixelTableCmd(const Vector&, Coord::InternalSystem, int, int, char*); + // Precision Commands + void precCmd(int, int, int, int, int, int); + // Print Commands #ifdef MAC_OSX_TK void macosxPrintCmd(); diff --git a/tksao/frame/basecommand.C b/tksao/frame/basecommand.C index a745d14..bccc815 100644 --- a/tksao/frame/basecommand.C +++ b/tksao/frame/basecommand.C @@ -1762,14 +1762,14 @@ void Base::getFitsSizeCmd(Coord::CoordSystem sys, Coord::SkyFrame sky, ostringstream str; switch (dist) { case Coord::DEGREE: - str << setprecision(precDeg); + str << setprecision(precDeg_); break; case Coord::ARCMIN: - str << setprecision(precArcmin) << fixed; + str << setprecision(precArcmin_) << fixed; ss *= 60; break; case Coord::ARCSEC: - str << setprecision(precArcsec) << fixed; + str << setprecision(precArcsec_) << fixed; ss *= 60*60; break; } @@ -2624,6 +2624,17 @@ void Base::pannerCmd(char* n, int w, int h) update(MATRIX); } +void Base::precCmd(int linear, int deg, int hms, int dms, + int arcmin, int arcsec) +{ + precLinear_ = linear; + precDeg_ = deg; + precHMS_ = hms; + precDMS_ = dms; + precArcmin_ = arcmin; + precArcsec_ = arcsec; +} + void Base::rotateCmd(double r) { rotation += r; diff --git a/tksao/frame/baseline.C b/tksao/frame/baseline.C index 05609dc..95ae423 100644 --- a/tksao/frame/baseline.C +++ b/tksao/frame/baseline.C @@ -110,7 +110,7 @@ void BaseLine::listNonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) { Vector v1 = ptr->mapFromRef(p1,sys); Vector v2 = ptr->mapFromRef(p2,sys); - str << type_ << '(' << setprecision(parent->precLinear) + str << type_ << '(' << setprecision(parent->precLinear_) << v1 << ',' << v2 << ')'; } diff --git a/tksao/frame/basepolygon.C b/tksao/frame/basepolygon.C index 569f48b..aa822fd 100644 --- a/tksao/frame/basepolygon.C +++ b/tksao/frame/basepolygon.C @@ -260,7 +260,7 @@ void BasePolygon::listBaseNonCel(FitsImage* ptr, ostream& str, Matrix& mm, first=0; Vector vv = ptr->mapFromRef(vertex.current()->vector*mm,sys); - str << setprecision(parent->precLinear) << vv; + str << setprecision(parent->precLinear_) << vv; } while (vertex.next()); str << ')'; diff --git a/tksao/frame/box.C b/tksao/frame/box.C index 59a19f7..ef3d0bb 100644 --- a/tksao/frame/box.C +++ b/tksao/frame/box.C @@ -272,10 +272,10 @@ void Box::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, Vector rr = ptr->mapLenFromRef(annuli_[0],sys,Coord::ARCSEC); double aa = parent->mapAngleFromRef(angle,sys,sky); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precArcsec) << fixed << setunit('"') + << setprecision(parent->precArcsec_) << fixed << setunit('"') << rr << ','; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(aa) << ')'; + str << setprecision(parent->precLinear_) << radToDeg(aa) << ')'; } else listNonCel(ptr, str, sys); @@ -309,7 +309,7 @@ void Box::listNonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) Vector vv = ptr->mapFromRef(center,sys); Vector rr = ptr->mapLenFromRef(annuli_[0],sys); double aa = parent->mapAngleFromRef(angle,sys); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << rr << ',' << radToDeg(aa) << ')'; } @@ -346,7 +346,7 @@ void Box::listCiao(ostream& str, Coord::CoordSystem sys, int strip) { Vector vv = ptr->mapFromRef(center,Coord::PHYSICAL); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::PHYSICAL); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << rr << ',' << radToDeg(angle) << ')'; } @@ -356,10 +356,10 @@ void Box::listCiao(ostream& str, Coord::CoordSystem sys, int strip) listRADEC(ptr,center,sys,Coord::FK5,Coord::SEXAGESIMAL); Vector rr = ptr->mapLenFromRef(annuli_[0],sys,Coord::ARCMIN); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precArcmin) << fixed << setunit('\'') + << setprecision(parent->precArcmin_) << fixed << setunit('\'') << rr << ','; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(angle) << ')'; + str << setprecision(parent->precLinear_) << radToDeg(angle) << ')'; } } @@ -381,7 +381,7 @@ void Box::listSAOtng(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, { Vector vv = ptr->mapFromRef(center,Coord::IMAGE); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::IMAGE); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << rr << ',' << radToDeg(angle) << ')'; } @@ -391,8 +391,8 @@ void Box::listSAOtng(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, listRADEC(ptr,center,sys,sky,format); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::IMAGE); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precLinear) << rr << ',' - << setprecision(parent->precLinear) << radToDeg(angle) << ')'; + << setprecision(parent->precLinear_) << rr << ',' + << setprecision(parent->precLinear_) << radToDeg(angle) << ')'; } } @@ -414,7 +414,7 @@ void Box::listPros(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, Vector vv = ptr->mapFromRef(center,sys); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::IMAGE); coord.listProsCoordSystem(str,sys,sky); - str << "; "<< type_ << ' ' << setprecision(parent->precLinear) + str << "; "<< type_ << ' ' << setprecision(parent->precLinear_) << vv << ' ' << rr << ' ' << radToDeg(angle); } @@ -433,10 +433,10 @@ void Box::listPros(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, str << ra << ' ' << dec << ' '; break; } - str << setprecision(parent->precArcsec) << fixed << setunit('"') + str << setprecision(parent->precArcsec_) << fixed << setunit('"') << rr << ' '; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(angle); + str << setprecision(parent->precLinear_) << radToDeg(angle); } } @@ -449,7 +449,7 @@ void Box::listSAOimage(ostream& str, int strip) listSAOimagePre(str); Vector vv = ptr->mapFromRef(center,Coord::IMAGE); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << annuli_[0] << ',' << radToDeg(angle) << ')'; diff --git a/tksao/frame/boxannulus.C b/tksao/frame/boxannulus.C index 45bfe4b..73ecf8e 100644 --- a/tksao/frame/boxannulus.C +++ b/tksao/frame/boxannulus.C @@ -289,13 +289,13 @@ void BoxAnnulus::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, listRADEC(ptr,center,sys,sky,format); double aa = parent->mapAngleFromRef(angle,sys,sky); str << "box(" << ra << ',' << dec - << setprecision(parent->precArcsec) << fixed; + << setprecision(parent->precArcsec_) << fixed; for (int ii=0; iimapLenFromRef(annuli_[ii],sys,Coord::ARCSEC); str << ',' << setunit('"') << rr; } str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << ',' << radToDeg(aa) << ')'; + str << setprecision(parent->precLinear_) << ',' << radToDeg(aa) << ')'; } else listNonCel(ptr, str, sys); @@ -309,7 +309,7 @@ void BoxAnnulus::listNonCel(FitsImage* ptr, ostream& str, { Vector vv = ptr->mapFromRef(center,sys); double aa = parent->mapAngleFromRef(angle,sys); - str << "box(" << setprecision(parent->precLinear) << vv; + str << "box(" << setprecision(parent->precLinear_) << vv; for (int ii=0; iimapLenFromRef(annuli_[ii],sys); str << ',' << rr; @@ -352,7 +352,7 @@ void BoxAnnulus::listPros(ostream& str, Coord::CoordSystem sys, str << "; "; Vector rr = ptr->mapLenFromRef(annuli_[ii],Coord::IMAGE); - str << "box " << setprecision(parent->precLinear) << vv << ' ' + str << "box " << setprecision(parent->precLinear_) << vv << ' ' << rr << ' ' << radToDeg(angle); @@ -383,10 +383,10 @@ void BoxAnnulus::listPros(ostream& str, Coord::CoordSystem sys, str << ra << ' ' << dec << ' '; break; } - str << setprecision(parent->precArcsec) << setunit('"') << fixed + str << setprecision(parent->precArcsec_) << setunit('"') << fixed << rr << ' '; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(angle); + str << setprecision(parent->precLinear_) << radToDeg(angle); if (ii!=0) { Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],sys,Coord::ARCSEC); @@ -399,10 +399,10 @@ void BoxAnnulus::listPros(ostream& str, Coord::CoordSystem sys, str << ra << ' ' << dec << ' '; break; } - str << setprecision(parent->precArcsec) << setunit('"') << fixed + str << setprecision(parent->precArcsec_) << setunit('"') << fixed << r1 << ' '; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(angle); + str << setprecision(parent->precLinear_) << radToDeg(angle); } listProsPost(str, strip); } @@ -417,11 +417,11 @@ void BoxAnnulus::listSAOimage(ostream& str, int strip) for (int ii=0; iimapFromRef(center,Coord::IMAGE); - str << "box(" << setprecision(parent->precLinear) << vv << ',' + str << "box(" << setprecision(parent->precLinear_) << vv << ',' << annuli_[ii] << ',' << radToDeg(angle) << ')'; if (ii!=0) - str << " & !box(" << setprecision(parent->precLinear) << vv << ',' + str << " & !box(" << setprecision(parent->precLinear_) << vv << ',' << annuli_[ii-1] << ',' << radToDeg(angle) << ')'; listSAOimagePost(str, strip); diff --git a/tksao/frame/bpanda.C b/tksao/frame/bpanda.C index c526cb0..3654194 100644 --- a/tksao/frame/bpanda.C +++ b/tksao/frame/bpanda.C @@ -543,13 +543,13 @@ void Bpanda::listA(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, listRADEC(ptr,center,sys,sky,format); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precLinear) << ang1 << ',' << ang2 << ',' - << setprecision(parent->precLinear) << numAngles_-1 << ',' - << setprecision(parent->precArcsec) << fixed + << setprecision(parent->precLinear_) << ang1 << ',' << ang2 << ',' + << setprecision(parent->precLinear_) << numAngles_-1 << ',' + << setprecision(parent->precArcsec_) << fixed << setunit('"') << r1 << ',' << setunit('"') << r2 << ','; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << numAnnuli_-1 << ',' - << setprecision(parent->precLinear) + str << setprecision(parent->precLinear_) << numAnnuli_-1 << ',' + << setprecision(parent->precLinear_) << radToDeg(parent->mapAngleFromRef(angle,sys,sky)) << ')'; } else @@ -570,7 +570,7 @@ void Bpanda::listANonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) Vector r1 = ptr->mapLenFromRef(annuli_[0],sys); Vector r2 = ptr->mapLenFromRef(annuli_[numAnnuli_-1],sys); double aa = parent->mapAngleFromRef(angle,sys); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << a1 << ',' << a2 << ',' << numAngles_-1 << ',' << r1 << ',' << r2 << ',' << numAnnuli_-1 << ',' << radToDeg(aa) << ')'; @@ -622,7 +622,7 @@ void Bpanda::listBNonCel(FitsImage* ptr, ostream& str, Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],sys); Vector r2 = ptr->mapLenFromRef(annuli_[ii],sys); str << type_ << '(' - << setprecision(parent->precLinear) << vv << ',' + << setprecision(parent->precLinear_) << vv << ',' << a1 << ',' << a2 << ",1," << r1 << ',' << r2 << ",1," << radToDeg(aa) << ')'; @@ -677,11 +677,11 @@ void Bpanda::listBCel(FitsImage* ptr, int ii, int jj, ostream& str, Vector r2 = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC); double aa = parent->mapAngleFromRef(angle,sys,sky); - str << setprecision(parent->precLinear) << a1 << ',' << a2 << ",1," - << setprecision(parent->precArcsec) << fixed << setunit('"') + str << setprecision(parent->precLinear_) << a1 << ',' << a2 << ",1," + << setprecision(parent->precArcsec_) << fixed << setunit('"') << r1 << ',' << setunit('"') << r2 << ",1,"; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(aa) << ')'; + str << setprecision(parent->precLinear_) << radToDeg(aa) << ')'; if (!strip) { if (conj) @@ -689,21 +689,21 @@ void Bpanda::listBCel(FitsImage* ptr, int ii, int jj, ostream& str, str << " # bpanda="; if (ii==1 && jj==1 && !strip) { - str << '(' << setprecision(parent->precLinear); + str << '(' << setprecision(parent->precLinear_); for (int kk=0; kkmapAngleFromRef(angles_[kk],sys,sky); str << radToDeg(ar) << ((kkprecArcsec) << fixed; + str << setseparator(' ') << setprecision(parent->precArcsec_) << fixed; for (int kk=0; kkmapLenFromRef(annuli_[kk],sys,Coord::ARCSEC); str << setunit('"') << rr << ((kkprecLinear) << radToDeg(aa) << ')'; + str << '(' << setprecision(parent->precLinear_) << radToDeg(aa) << ')'; listProps(str); } else diff --git a/tksao/frame/circle.C b/tksao/frame/circle.C index 28e9e51..ad906e6 100644 --- a/tksao/frame/circle.C +++ b/tksao/frame/circle.C @@ -224,7 +224,7 @@ void Circle::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, listRADEC(ptr,center,sys,sky,format); double rr = ptr->mapLenFromRef(annuli_[0][0],sys,Coord::ARCSEC); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precArcsec) << fixed << rr << '"' << ')'; + << setprecision(parent->precArcsec_) << fixed << rr << '"' << ')'; str.unsetf(ios_base::floatfield); } else @@ -258,7 +258,7 @@ void Circle::listNonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) { Vector vv = ptr->mapFromRef(center,sys); double rr = ptr->mapLenFromRef(annuli_[0][0],sys); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << rr << ')'; } @@ -292,7 +292,7 @@ void Circle::listCiao(ostream& str, Coord::CoordSystem sys, int strip) { Vector vv = ptr->mapFromRef(center,Coord::PHYSICAL); double rr = ptr->mapLenFromRef(annuli_[0][0],Coord::PHYSICAL); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << rr << ')'; } break; @@ -301,7 +301,7 @@ void Circle::listCiao(ostream& str, Coord::CoordSystem sys, int strip) listRADEC(ptr,center,sys,Coord::FK5,Coord::SEXAGESIMAL); double rr = ptr->mapLenFromRef(annuli_[0][0],sys,Coord::ARCMIN); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precArcmin) << fixed << rr << '\'' << ')'; + << setprecision(parent->precArcmin_) << fixed << rr << '\'' << ')'; str.unsetf(ios_base::floatfield); } } @@ -324,7 +324,7 @@ void Circle::listSAOtng(ostream& str, { Vector vv = ptr->mapFromRef(center,Coord::IMAGE); double rr = ptr->mapLenFromRef(annuli_[0][0],Coord::IMAGE); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << rr << ')'; } break; @@ -334,7 +334,7 @@ void Circle::listSAOtng(ostream& str, double rr = ptr->mapLenFromRef(annuli_[0][0],Coord::IMAGE); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precLinear) << rr << ')'; + << setprecision(parent->precLinear_) << rr << ')'; } } @@ -356,7 +356,7 @@ void Circle::listPros(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, Vector vv = ptr->mapFromRef(center,sys); double rr = ptr->mapLenFromRef(annuli_[0][0],Coord::IMAGE); coord.listProsCoordSystem(str,sys,sky); - str << "; " << type_ << ' ' << setprecision(parent->precLinear) + str << "; " << type_ << ' ' << setprecision(parent->precLinear_) << vv << ' ' << rr; } break; @@ -374,7 +374,7 @@ void Circle::listPros(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, str << ra << ' ' << dec << ' '; break; } - str << setprecision(parent->precArcsec) << fixed << rr << '"'; + str << setprecision(parent->precArcsec_) << fixed << rr << '"'; str.unsetf(ios_base::floatfield); } } @@ -388,7 +388,7 @@ void Circle::listSAOimage(ostream& str, int strip) listSAOimagePre(str); Vector vv = ptr->mapFromRef(center,Coord::IMAGE); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << annuli_[0][0] << ')'; listSAOimagePost(str, strip); diff --git a/tksao/frame/compass.C b/tksao/frame/compass.C index 78686d9..d580ad9 100644 --- a/tksao/frame/compass.C +++ b/tksao/frame/compass.C @@ -566,7 +566,7 @@ void Compass::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, listRADEC(ptr,center,sys,sky,format); double rr = ptr->mapLenFromRef(radius,sys,Coord::ARCSEC); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precArcsec) << fixed << rr << '"' << ')'; + << setprecision(parent->precArcsec_) << fixed << rr << '"' << ')'; str.unsetf(ios_base::floatfield); } else @@ -588,7 +588,7 @@ void Compass::listNonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) { Vector vv = ptr->mapFromRef(center,sys); double rr = ptr->mapLenFromRef(radius,sys); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << rr << ')'; } diff --git a/tksao/frame/composite.C b/tksao/frame/composite.C index a6e6193..be66ee0 100644 --- a/tksao/frame/composite.C +++ b/tksao/frame/composite.C @@ -201,7 +201,7 @@ void Composite::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, case Coord::AMPLIFIER: { Vector vv = ptr->mapFromRef(center,sys); - str << '(' << setprecision(parent->precLinear) << vv << ',' + str << '(' << setprecision(parent->precLinear_) << vv << ',' << radToDeg(parent->mapAngleFromRef(angle,sys)) << ')'; } break; @@ -209,12 +209,12 @@ void Composite::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, if (ptr->hasWCSCel(sys)) { listRADEC(ptr,center,sys,sky,format); str << '(' << ra << ',' << dec << ',' - << setprecision(parent->precLinear) + << setprecision(parent->precLinear_) << radToDeg(parent->mapAngleFromRef(angle,sys,sky)) << ')'; } else { Vector vv = ptr->mapFromRef(center,sys); - str << '(' << setprecision(parent->precLinear) << vv << ',' + str << '(' << setprecision(parent->precLinear_) << vv << ',' << radToDeg(parent->mapAngleFromRef(angle,sys)) << ')'; } } diff --git a/tksao/frame/cpanda.C b/tksao/frame/cpanda.C index 03d2226..19c7937 100644 --- a/tksao/frame/cpanda.C +++ b/tksao/frame/cpanda.C @@ -513,12 +513,12 @@ void Cpanda::listA(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, listRADEC(ptr,center,sys,sky,format); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precLinear) << a1 << ',' << a2 << ',' + << setprecision(parent->precLinear_) << a1 << ',' << a2 << ',' << numAngles_-1 << ',' - << setprecision(parent->precArcsec) << fixed << r1 << '"' << ',' + << setprecision(parent->precArcsec_) << fixed << r1 << '"' << ',' << r2 << '"' << ','; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << numAnnuli_-1 << ')'; + str << setprecision(parent->precLinear_) << numAnnuli_-1 << ')'; } else listANonCel(ptr, str, sys); @@ -537,7 +537,7 @@ void Cpanda::listANonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) Vector vv = ptr->mapFromRef(center,sys); double r1 = ptr->mapLenFromRef(annuli_[0][0],sys); double r2 = ptr->mapLenFromRef(annuli_[numAnnuli_-1][0],sys); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << a1 << ',' << a2 << ',' << numAngles_-1 << ',' << r1 << ',' << r2 << ',' << numAnnuli_-1 << ')'; } @@ -586,7 +586,7 @@ void Cpanda::listBNonCel(FitsImage* ptr, ostream& str, double r1 = ptr->mapLenFromRef(annuli_[ii-1][0],sys); double r2 = ptr->mapLenFromRef(annuli_[ii][0],sys); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << a1 << ',' << a2 << ",1," << r1 << ',' << r2 << ",1)"; @@ -635,8 +635,8 @@ void Cpanda::listBCel(FitsImage* ptr, int ii, int jj, ostream& str, double r1 = ptr->mapLenFromRef(annuli_[ii-1][0],sys,Coord::ARCSEC); double r2 = ptr->mapLenFromRef(annuli_[ii][0],sys,Coord::ARCSEC); - str << setprecision(parent->precLinear) << a1 << ',' << a2 << ",1," - << setprecision(parent->precArcsec) << fixed << r1 << '"' << ',' + str << setprecision(parent->precLinear_) << a1 << ',' << a2 << ",1," + << setprecision(parent->precArcsec_) << fixed << r1 << '"' << ',' << r2 << '"' << ",1)"; str.unsetf(ios_base::floatfield); @@ -646,13 +646,13 @@ void Cpanda::listBCel(FitsImage* ptr, int ii, int jj, ostream& str, str << " # panda="; if (ii==1 && jj==1 && !strip) { - str << '(' << setprecision(parent->precLinear); + str << '(' << setprecision(parent->precLinear_); for (int kk=0; kkmapAngleFromRef(angles_[kk],sys,sky); str << radToDeg(aa) << ((kkprecArcsec) << fixed; + str << '(' << setprecision(parent->precArcsec_) << fixed; for (int kk=0; kkmapLenFromRef(annuli_[kk][0],sys,Coord::ARCSEC); str << rr << '"' << ((kkprecLinear) << vv << ',' + str << "pie(" << setprecision(parent->precLinear_) << vv << ',' << r1 << ',' << r2 << ',' << a1 << ',' << a2 << ')'; listCiaoPost(str, strip); @@ -731,7 +731,7 @@ void Cpanda::listCiao(ostream& str, Coord::CoordSystem sys, int strip) a2 += 360; listCiaoPre(str); - str << "pie(" << setprecision(parent->precLinear) + str << "pie(" << setprecision(parent->precLinear_) << ra << ',' << dec << ',' << r1 << '\'' << ',' << r2 << '\'' << ',' << a1 << ',' << a2 << ')'; diff --git a/tksao/frame/ellipse.C b/tksao/frame/ellipse.C index 6aace3b..a9b5f7d 100644 --- a/tksao/frame/ellipse.C +++ b/tksao/frame/ellipse.C @@ -246,10 +246,10 @@ void Ellipse::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, Vector rr = ptr->mapLenFromRef(annuli_[0],sys,Coord::ARCSEC); double aa = parent->mapAngleFromRef(angle,sys,sky); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precArcsec) << fixed << setunit('"') + << setprecision(parent->precArcsec_) << fixed << setunit('"') << rr << ','; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(aa) << ')'; + str << setprecision(parent->precLinear_) << radToDeg(aa) << ')'; } else listNonCel(ptr, str, sys); @@ -283,7 +283,7 @@ void Ellipse::listNonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) Vector vv = ptr->mapFromRef(center,sys); Vector rr = ptr->mapLenFromRef(annuli_[0],sys); double aa = parent->mapAngleFromRef(angle,sys); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << rr << ',' << radToDeg(aa) << ')'; } @@ -319,7 +319,7 @@ void Ellipse::listCiao(ostream& str, Coord::CoordSystem sys, int strip) { Vector vv = ptr->mapFromRef(center,Coord::PHYSICAL); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::PHYSICAL); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << rr << ',' << radToDeg(angle) << ')'; } @@ -329,10 +329,10 @@ void Ellipse::listCiao(ostream& str, Coord::CoordSystem sys, int strip) listRADEC(ptr,center,sys,Coord::FK5,Coord::SEXAGESIMAL); Vector rr = ptr->mapLenFromRef(annuli_[0],sys,Coord::ARCMIN); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precArcmin) << fixed << setunit('\'') + << setprecision(parent->precArcmin_) << fixed << setunit('\'') << rr << ','; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(angle) << ')'; + str << setprecision(parent->precLinear_) << radToDeg(angle) << ')'; } break; } @@ -357,7 +357,7 @@ void Ellipse::listSAOtng(ostream& str, Coord::CoordSystem sys, { Vector vv = ptr->mapFromRef(center,Coord::IMAGE); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::IMAGE); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << rr << ',' << radToDeg(angle) << ')'; } @@ -367,8 +367,8 @@ void Ellipse::listSAOtng(ostream& str, Coord::CoordSystem sys, listRADEC(ptr,center,sys,sky,format); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::IMAGE); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precLinear) << rr << ',' - << setprecision(parent->precLinear) << radToDeg(angle) << ')'; + << setprecision(parent->precLinear_) << rr << ',' + << setprecision(parent->precLinear_) << radToDeg(angle) << ')'; } } @@ -391,7 +391,7 @@ void Ellipse::listPros(ostream& str, Coord::CoordSystem sys, Vector vv = ptr->mapFromRef(center,sys); Vector rr = ptr->mapLenFromRef(annuli_[0],Coord::IMAGE); coord.listProsCoordSystem(str,sys,sky); - str << "; " << type_ << ' ' << setprecision(parent->precLinear) + str << "; " << type_ << ' ' << setprecision(parent->precLinear_) << vv << ' ' << rr << ' ' << radToDeg(angle); } @@ -410,10 +410,10 @@ void Ellipse::listPros(ostream& str, Coord::CoordSystem sys, str << ra << ' ' << dec << ' '; break; } - str << setprecision(parent->precArcsec) << fixed << setunit('"') + str << setprecision(parent->precArcsec_) << fixed << setunit('"') << rr << ' '; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(angle); + str << setprecision(parent->precLinear_) << radToDeg(angle); } } @@ -426,7 +426,7 @@ void Ellipse::listSAOimage(ostream& str, int strip) listSAOimagePre(str); Vector vv = ptr->mapFromRef(center,Coord::IMAGE); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << annuli_[0] << ',' << radToDeg(angle) << ')'; diff --git a/tksao/frame/ellipseannulus.C b/tksao/frame/ellipseannulus.C index 7c820c6..f1abdca 100644 --- a/tksao/frame/ellipseannulus.C +++ b/tksao/frame/ellipseannulus.C @@ -257,13 +257,13 @@ void EllipseAnnulus::list(ostream& str, Coord::CoordSystem sys, listRADEC(ptr,center,sys,sky,format); double aa = parent->mapAngleFromRef(angle,sys,sky); str << "ellipse(" << ra << ',' << dec - << setprecision(parent->precArcsec) << fixed; + << setprecision(parent->precArcsec_) << fixed; for (int ii=0; iimapLenFromRef(annuli_[ii],sys,Coord::ARCSEC); str << ',' << setunit('"') << rr; } str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << ',' << radToDeg(aa) << ')'; + str << setprecision(parent->precLinear_) << ',' << radToDeg(aa) << ')'; } else listNonCel(ptr, str, sys); @@ -277,7 +277,7 @@ void EllipseAnnulus::listNonCel(FitsImage* ptr, ostream& str, { Vector vv = ptr->mapFromRef(center,sys); double aa = parent->mapAngleFromRef(angle,sys); - str << "ellipse(" << setprecision(parent->precLinear) << vv; + str << "ellipse(" << setprecision(parent->precLinear_) << vv; for (int ii=0; iimapLenFromRef(annuli_[ii],sys); str << ',' << rr; @@ -320,13 +320,13 @@ void EllipseAnnulus::listPros(ostream& str, Coord::CoordSystem sys, str << "; "; Vector rr = ptr->mapLenFromRef(annuli_[ii],Coord::IMAGE); - str << "ellipse " << setprecision(parent->precLinear) << vv << ' ' + str << "ellipse " << setprecision(parent->precLinear_) << vv << ' ' << rr << ' ' << radToDeg(angle); if (ii!=0) { Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],Coord::IMAGE); - str << " & !ellipse " << setprecision(parent->precLinear) + str << " & !ellipse " << setprecision(parent->precLinear_) << vv << ' ' << r1 << ' ' << radToDeg(angle); } @@ -352,10 +352,10 @@ void EllipseAnnulus::listPros(ostream& str, Coord::CoordSystem sys, str << ra << ' ' << dec << ' '; break; } - str << setprecision(parent->precArcsec) << setunit('"') << fixed + str << setprecision(parent->precArcsec_) << setunit('"') << fixed << rr << ' '; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(angle); + str << setprecision(parent->precLinear_) << radToDeg(angle); if (ii!=0) { Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],sys,Coord::ARCSEC); @@ -368,10 +368,10 @@ void EllipseAnnulus::listPros(ostream& str, Coord::CoordSystem sys, str << ra << ' ' << dec << ' '; break; } - str << setprecision(parent->precArcsec) << setunit('"') << fixed + str << setprecision(parent->precArcsec_) << setunit('"') << fixed << r1 << ' '; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(angle); + str << setprecision(parent->precLinear_) << radToDeg(angle); } listProsPost(str, strip); @@ -387,11 +387,11 @@ void EllipseAnnulus::listSAOimage(ostream& str, int strip) for (int ii=0; iimapFromRef(center,Coord::IMAGE); - str << "ellipse(" << setprecision(parent->precLinear) << vv << ',' + str << "ellipse(" << setprecision(parent->precLinear_) << vv << ',' << annuli_[ii] << ',' << radToDeg(angle) << ')'; if (ii!=0) - str << " & !ellipse(" << setprecision(parent->precLinear) << vv << ',' + str << " & !ellipse(" << setprecision(parent->precLinear_) << vv << ',' << annuli_[ii-1] << ',' << radToDeg(angle) << ')'; listSAOimagePost(str, strip); diff --git a/tksao/frame/epanda.C b/tksao/frame/epanda.C index 5c34c28..92d33f1 100644 --- a/tksao/frame/epanda.C +++ b/tksao/frame/epanda.C @@ -509,13 +509,13 @@ void Epanda::listA(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, listRADEC(ptr,center,sys,sky,format); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precLinear) << a1 << ',' << a2 <<',' + << setprecision(parent->precLinear_) << a1 << ',' << a2 <<',' << numAngles_-1 << ',' - << setprecision(parent->precArcsec) << fixed << setunit('"') + << setprecision(parent->precArcsec_) << fixed << setunit('"') << r1 << ',' << setunit('"') << r2 << ','; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << numAnnuli_-1 << ',' - << setprecision(parent->precLinear) << radToDeg(aa) << ')'; + str << setprecision(parent->precLinear_) << numAnnuli_-1 << ',' + << setprecision(parent->precLinear_) << radToDeg(aa) << ')'; } else listANonCel(ptr, str, sys); @@ -535,7 +535,7 @@ void Epanda::listANonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) Vector r1 = ptr->mapLenFromRef(annuli_[0],sys); Vector r2 = ptr->mapLenFromRef(annuli_[numAnnuli_-1],sys); double aa = parent->mapAngleFromRef(angle,sys); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ',' << a1 << ',' << a2 << ',' << numAngles_-1 << ',' << r1 << ',' << r2 << ',' << numAnnuli_-1 << ',' << radToDeg(aa) << ')'; @@ -587,7 +587,7 @@ void Epanda::listBNonCel(FitsImage* ptr, ostream& str, Vector r1 = ptr->mapLenFromRef(annuli_[ii-1],sys); Vector r2 = ptr->mapLenFromRef(annuli_[ii],sys); str << type_ << '(' - << setprecision(parent->precLinear) << vv << ',' + << setprecision(parent->precLinear_) << vv << ',' << a1 << ',' << a2 << ",1," << r1 << ',' << r2 << ",1," << radToDeg(aa) << ')'; @@ -642,11 +642,11 @@ void Epanda::listBCel(FitsImage* ptr, int ii, int jj, ostream& str, Vector r2 = ptr->mapLenFromRef(annuli_[ii],sys,Coord::ARCSEC); double aa = parent->mapAngleFromRef(angle,sys,sky); - str << setprecision(parent->precLinear) << a1 << ',' << a2 << ",1," - << setprecision(parent->precArcsec) << fixed << setunit('"') + str << setprecision(parent->precLinear_) << a1 << ',' << a2 << ",1," + << setprecision(parent->precArcsec_) << fixed << setunit('"') << r1 << ',' << setunit('"') << r2 << ",1,"; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(aa) << ')'; + str << setprecision(parent->precLinear_) << radToDeg(aa) << ')'; if (!strip) { if (conj) @@ -654,20 +654,20 @@ void Epanda::listBCel(FitsImage* ptr, int ii, int jj, ostream& str, str << " # epanda="; if (ii==1 && jj==1 && !strip) { - str << '(' << setprecision(parent->precLinear); + str << '(' << setprecision(parent->precLinear_); for (int kk=0; kkmapAngleFromRef(angles_[kk],sys,sky); str << radToDeg(ar) << ((kkprecArcsec) << fixed; + str << setseparator(' ') << setprecision(parent->precArcsec_) << fixed; for (int kk=0; kkmapLenFromRef(annuli_[kk],sys,Coord::ARCSEC); str << setunit('"') << rr << ((kkprecLinear) + str << setseparator(',') << '(' << setprecision(parent->precLinear_) << radToDeg(aa) << ')'; listProps(str); } diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C index 31f4998..78a4dd2 100644 --- a/tksao/frame/fitsimage.C +++ b/tksao/frame/fitsimage.C @@ -3188,14 +3188,14 @@ char* FitsImage::pix2wcs(const Vector& in, Coord::CoordSystem sys, if (astOK && checkWCS(out)) { if (wcsIsASkyFrame(ast_[ss])) { ostringstream hms; - hms << "hms." << context_->parent_->precHMS; + hms << "hms." << context_->parent_->precHMS_; ostringstream dms; - dms << "+dms." << context_->parent_->precDMS; + dms << "+dms." << context_->parent_->precDMS_; switch (format) { case Coord::DEGREES: out = radToDeg(out); - str << setprecision(context_->parent_->precDeg) + str << setprecision(context_->parent_->precDeg_) << out[0] << ' ' << out[1] << ' ' << (hasWCSEqu(sys) ? coord.skyFrameStr(sky) : "") << ends; break; @@ -3225,7 +3225,7 @@ char* FitsImage::pix2wcs(const Vector& in, Coord::CoordSystem sys, } } else - str << setprecision(context_->parent_->precLinear) + str << setprecision(context_->parent_->precLinear_) << out[0] << ' ' << out[1] << ends; strncpy(lbuf, str.str().c_str(), str.str().length()); @@ -3251,14 +3251,14 @@ char* FitsImage::pix2wcs(const Vector& in, Coord::CoordSystem sys, if (astOK && checkWCS(out)) { if (hasWCSCel(sys)) { ostringstream hms; - hms << "hms." << context_->parent_->precHMS; + hms << "hms." << context_->parent_->precHMS_; ostringstream dms; - dms << "+dms." << context_->parent_->precDMS; + dms << "+dms." << context_->parent_->precDMS_; switch (format) { case Coord::DEGREES: out = radToDeg(out); - str << setprecision(context_->parent_->precDeg) + str << setprecision(context_->parent_->precDeg_) << out[0] << ' ' << out[1] << ' ' << (hasWCSEqu(sys) ? coord.skyFrameStr(sky) : "") << ends; @@ -3289,7 +3289,7 @@ char* FitsImage::pix2wcs(const Vector& in, Coord::CoordSystem sys, } } else - str << setprecision(context_->parent_->precLinear) + str << setprecision(context_->parent_->precLinear_) << out[0] << ' ' << out[1] << ends; strncpy(lbuf, str.str().c_str(), str.str().length()); @@ -3334,14 +3334,14 @@ char* FitsImage::pix2wcs(const Vector3d& in, Coord::CoordSystem sys, if (astOK && checkWCS(out)) { if (hasWCSCel(sys)) { ostringstream hms; - hms << "hms." << context_->parent_->precHMS; + hms << "hms." << context_->parent_->precHMS_; ostringstream dms; - dms << "+dms." << context_->parent_->precDMS; + dms << "+dms." << context_->parent_->precDMS_; switch (format) { case Coord::DEGREES: out = radToDeg(out); - str << setprecision(context_->parent_->precDeg) + str << setprecision(context_->parent_->precDeg_) << out[0] << ' ' << out[1] << ' ' << out[2] << ' ' << (hasWCSEqu(sys) ? coord.skyFrameStr(sky) : "") << ends; break; @@ -3371,7 +3371,7 @@ char* FitsImage::pix2wcs(const Vector3d& in, Coord::CoordSystem sys, } } else - str << setprecision(context_->parent_->precLinear) + str << setprecision(context_->parent_->precLinear_) << out[0] << ' ' << out[1] << ' ' << out[2] <parent_->precLinear) << mapFromRef(vv, sys); + str << setprecision(context_->parent_->precLinear_) << mapFromRef(vv, sys); break; default: if (hasWCS(sys)) { if (hasWCSCel(sys)) { switch (format) { case Coord::DEGREES: - str << setprecision(context_->parent_->precDeg) + str << setprecision(context_->parent_->precDeg_) << mapFromRef(vv, sys, sky); break; case Coord::SEXAGESIMAL: @@ -135,7 +135,7 @@ void FitsImage::listFromRef(ostream& str, const Vector& vv, } } else - str << setprecision(context_->parent_->precLinear) + str << setprecision(context_->parent_->precLinear_) << mapFromRef(vv, sys); } else @@ -363,26 +363,26 @@ void FitsImage::listLenFromRef(ostream& str, double dd, case Coord::PHYSICAL: case Coord::DETECTOR: case Coord::AMPLIFIER: - str << setprecision(context_->parent_->precLinear) << out; + str << setprecision(context_->parent_->precLinear_) << out; break; default: if (hasWCS(sys)) { if (hasWCSCel(sys)) { switch (dist) { case Coord::DEGREE: - str << setprecision(context_->parent_->precDeg); + str << setprecision(context_->parent_->precDeg_); break; case Coord::ARCMIN: - str << setprecision(context_->parent_->precArcmin) << fixed; + str << setprecision(context_->parent_->precArcmin_) << fixed; break; case Coord::ARCSEC: - str << setprecision(context_->parent_->precArcsec) << fixed; + str << setprecision(context_->parent_->precArcsec_) << fixed; break; } str << out; } else - str << setprecision(context_->parent_->precLinear) << out; + str << setprecision(context_->parent_->precLinear_) << out; } else str << "0"; @@ -399,26 +399,26 @@ void FitsImage::listLenFromRef(ostream& str, const Vector& vv, case Coord::PHYSICAL: case Coord::DETECTOR: case Coord::AMPLIFIER: - str << setprecision(context_->parent_->precLinear) << out; + str << setprecision(context_->parent_->precLinear_) << out; break; default: if (hasWCS(sys)) { if (hasWCSCel(sys)) { switch (dist) { case Coord::DEGREE: - str << setprecision(context_->parent_->precDeg); + str << setprecision(context_->parent_->precDeg_); break; case Coord::ARCMIN: - str << setprecision(context_->parent_->precArcmin) << fixed; + str << setprecision(context_->parent_->precArcmin_) << fixed; break; case Coord::ARCSEC: - str << setprecision(context_->parent_->precArcsec) << fixed; + str << setprecision(context_->parent_->precArcsec_) << fixed; break; } str << out; } else - str << setprecision(context_->parent_->precLinear) << out; + str << setprecision(context_->parent_->precLinear_) << out; } else str << "0 0"; @@ -489,26 +489,26 @@ void FitsImage::listDistFromRef(ostream& str, case Coord::PHYSICAL: case Coord::DETECTOR: case Coord::AMPLIFIER: - str << setprecision(context_->parent_->precLinear) << out; + str << setprecision(context_->parent_->precLinear_) << out; break; default: if (hasWCS(sys)) { if (hasWCSCel(sys)) { switch (dist) { case Coord::DEGREE: - str << setprecision(context_->parent_->precDeg); + str << setprecision(context_->parent_->precDeg_); break; case Coord::ARCMIN: - str << setprecision(context_->parent_->precArcmin) << fixed; + str << setprecision(context_->parent_->precArcmin_) << fixed; break; case Coord::ARCSEC: - str << setprecision(context_->parent_->precArcsec) << fixed; + str << setprecision(context_->parent_->precArcsec_) << fixed; break; } str << out; } else - str << setprecision(context_->parent_->precLinear) << out; + str << setprecision(context_->parent_->precLinear_) << out; } else str << "0 0"; diff --git a/tksao/frame/lex.C b/tksao/frame/lex.C index 1c32103..039f58e 100644 --- a/tksao/frame/lex.C +++ b/tksao/frame/lex.C @@ -324,8 +324,8 @@ int yyFlexLexer::yywrap() { return 1; } *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 355 -#define YY_END_OF_BUFFER 356 +#define YY_NUM_RULES 356 +#define YY_END_OF_BUFFER 357 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -333,148 +333,149 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[1276] = +static yyconst flex_int16_t yy_accept[1282] = { 0, - 0, 0, 356, 354, 353, 355, 354, 354, 354, 354, - 354, 335, 335, 335, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 354, 354, 354, 354, 354, 354, 354, 354, 354, - 354, 353, 352, 0, 352, 349, 0, 352, 350, 352, - 335, 337, 336, 335, 352, 339, 352, 352, 352, 275, - 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 30, 352, 352, 352, - 352, 352, 43, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, - - 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 131, 352, 352, 352, 352, - 352, 144, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, - 191, 352, 352, 352, 352, 198, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 279, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 330, 352, 352, 352, 352, 0, 352, 351, - - 349, 350, 337, 336, 341, 340, 352, 339, 352, 352, - 352, 336, 352, 338, 352, 2, 352, 6, 7, 352, - 352, 352, 352, 352, 352, 352, 352, 18, 352, 20, - 352, 352, 352, 352, 352, 352, 352, 352, 31, 33, - 352, 352, 352, 37, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 78, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 92, 93, - 352, 352, 352, 352, 100, 352, 352, 352, 352, 352, - 106, 352, 352, 352, 112, 352, 116, 118, 352, 352, - - 352, 352, 352, 352, 352, 126, 352, 352, 352, 352, - 133, 352, 352, 352, 352, 352, 352, 352, 352, 145, - 352, 352, 352, 352, 352, 352, 154, 352, 352, 352, - 352, 352, 352, 352, 352, 166, 352, 352, 170, 352, - 352, 352, 352, 352, 352, 178, 352, 352, 352, 352, - 352, 352, 186, 352, 352, 189, 352, 352, 193, 352, - 352, 352, 197, 352, 352, 352, 202, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 217, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 232, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 352, 246, - - 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 267, 352, 352, - 352, 271, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 291, 352, - 352, 352, 352, 298, 352, 352, 352, 329, 331, 352, - 352, 352, 351, 342, 352, 337, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 19, 352, 22, 352, 352, 25, 27, 28, - 352, 352, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 51, 352, 352, 54, 79, - - 352, 60, 352, 352, 352, 352, 352, 69, 352, 352, - 352, 71, 352, 76, 352, 80, 82, 352, 352, 352, - 352, 352, 352, 352, 352, 99, 352, 352, 101, 352, - 352, 352, 352, 352, 352, 109, 110, 352, 113, 352, - 352, 119, 352, 352, 122, 352, 352, 352, 352, 352, - 129, 130, 352, 134, 352, 352, 138, 352, 352, 352, - 143, 352, 352, 148, 149, 151, 352, 352, 352, 352, - 352, 352, 161, 163, 352, 164, 352, 352, 352, 171, - 173, 352, 352, 352, 352, 352, 179, 181, 352, 352, - 184, 185, 352, 352, 190, 192, 194, 352, 352, 199, - - 352, 352, 352, 352, 352, 352, 207, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 352, 352, 222, 352, - 352, 352, 352, 352, 352, 352, 352, 233, 352, 352, - 352, 352, 352, 239, 352, 241, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 252, 352, 254, 255, 352, - 352, 352, 352, 352, 262, 352, 352, 352, 352, 352, - 352, 352, 273, 352, 352, 352, 352, 352, 282, 283, - 284, 352, 352, 352, 352, 289, 352, 352, 352, 352, - 292, 297, 325, 299, 300, 301, 302, 303, 304, 305, + 0, 0, 357, 355, 354, 356, 355, 355, 355, 355, + 355, 336, 336, 336, 355, 355, 355, 355, 355, 355, + 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, + 355, 355, 355, 355, 355, 355, 355, 355, 355, 355, + 355, 354, 353, 0, 353, 350, 0, 353, 351, 353, + 336, 338, 337, 336, 353, 340, 353, 353, 353, 276, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 30, 353, 353, 353, + 353, 353, 43, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 131, 353, 353, 353, 353, + 353, 144, 353, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + 191, 353, 353, 353, 353, 198, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 280, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 331, 353, 353, 353, 353, 0, 353, 352, + + 350, 351, 338, 337, 342, 341, 353, 340, 353, 353, + 353, 337, 353, 339, 353, 2, 353, 6, 7, 353, + 353, 353, 353, 353, 353, 353, 353, 18, 353, 20, + 353, 353, 353, 353, 353, 353, 353, 353, 31, 33, + 353, 353, 353, 37, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 78, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 92, 93, + 353, 353, 353, 353, 100, 353, 353, 353, 353, 353, + 106, 353, 353, 353, 112, 353, 116, 118, 353, 353, + + 353, 353, 353, 353, 353, 126, 353, 353, 353, 353, + 133, 353, 353, 353, 353, 353, 353, 353, 353, 145, + 353, 353, 353, 353, 353, 353, 154, 353, 353, 353, + 353, 353, 353, 353, 353, 166, 353, 353, 170, 353, + 353, 353, 353, 353, 353, 178, 353, 353, 353, 353, + 353, 353, 186, 353, 353, 189, 353, 353, 193, 353, + 353, 353, 197, 353, 353, 353, 202, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 217, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 233, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 247, + + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 268, 353, 353, + 353, 272, 353, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 292, 353, + 353, 353, 353, 299, 353, 353, 353, 330, 332, 353, + 353, 353, 352, 343, 353, 338, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 19, 353, 22, 353, 353, 25, 27, 28, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 51, 353, 353, 54, 79, + + 353, 60, 353, 353, 353, 353, 353, 69, 353, 353, + 353, 71, 353, 76, 353, 80, 82, 353, 353, 353, + 353, 353, 353, 353, 353, 99, 353, 353, 101, 353, + 353, 353, 353, 353, 353, 109, 110, 353, 113, 353, + 353, 119, 353, 353, 122, 353, 353, 353, 353, 353, + 129, 130, 353, 134, 353, 353, 138, 353, 353, 353, + 143, 353, 353, 148, 149, 151, 353, 353, 353, 353, + 353, 353, 161, 163, 353, 164, 353, 353, 353, 171, + 173, 353, 353, 353, 353, 353, 179, 181, 353, 353, + 184, 185, 353, 353, 190, 192, 194, 353, 353, 199, + + 353, 353, 353, 353, 353, 353, 207, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 223, + 353, 353, 353, 353, 353, 353, 353, 353, 234, 353, + 353, 353, 353, 353, 240, 353, 242, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 253, 353, 255, 256, + 353, 353, 353, 353, 353, 263, 353, 353, 353, 353, + 353, 353, 353, 274, 353, 353, 353, 353, 353, 283, + 284, 285, 353, 353, 353, 353, 290, 353, 353, 353, + 353, 293, 298, 326, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, - 316, 317, 318, 319, 320, 321, 322, 323, 324, 352, - 352, 352, 332, 334, 352, 352, 343, 352, 352, 352, - 352, 1, 5, 3, 352, 352, 10, 352, 352, 352, - 352, 15, 16, 17, 352, 352, 24, 352, 29, 352, - 352, 35, 352, 352, 352, 352, 352, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 53, 55, 352, 352, - 352, 352, 352, 352, 352, 352, 70, 352, 352, 72, - 352, 352, 352, 352, 85, 352, 352, 352, 89, 352, - 352, 352, 352, 352, 352, 352, 352, 105, 352, 108, - 352, 114, 115, 352, 352, 121, 352, 352, 352, 352, - - 352, 352, 352, 352, 352, 352, 352, 352, 352, 146, - 352, 352, 352, 153, 352, 156, 352, 158, 352, 352, - 165, 352, 352, 352, 169, 352, 352, 352, 177, 352, - 352, 352, 352, 188, 352, 352, 352, 352, 203, 352, - 352, 206, 208, 352, 210, 352, 352, 213, 352, 352, - 352, 218, 352, 352, 352, 224, 352, 352, 352, 352, - 352, 230, 352, 352, 235, 352, 352, 352, 240, 352, - 243, 352, 352, 352, 248, 352, 250, 251, 253, 256, - 257, 352, 352, 352, 352, 352, 265, 352, 352, 352, - 270, 352, 277, 352, 352, 352, 352, 352, 352, 352, - - 352, 352, 290, 352, 352, 352, 352, 326, 327, 328, - 352, 344, 343, 352, 352, 347, 352, 352, 345, 352, - 352, 352, 352, 12, 13, 14, 352, 352, 352, 352, - 34, 36, 352, 39, 352, 41, 42, 352, 45, 352, - 352, 48, 352, 352, 52, 352, 352, 352, 61, 352, - 352, 352, 352, 352, 352, 352, 73, 74, 352, 77, - 352, 352, 352, 352, 352, 88, 352, 352, 352, 352, - 352, 352, 102, 352, 352, 107, 111, 352, 120, 352, - 352, 352, 127, 352, 132, 135, 136, 352, 352, 352, - 352, 352, 352, 352, 352, 352, 157, 162, 159, 167, - - 352, 172, 352, 175, 176, 352, 182, 183, 187, 195, - 196, 200, 201, 204, 205, 352, 211, 212, 352, 352, - 352, 352, 352, 352, 352, 225, 226, 227, 352, 352, - 352, 234, 236, 352, 238, 352, 352, 245, 352, 249, - 258, 259, 261, 352, 352, 266, 352, 269, 352, 352, - 352, 280, 281, 352, 352, 285, 352, 288, 293, 352, - 295, 352, 333, 348, 346, 4, 352, 352, 11, 21, - 23, 352, 352, 352, 352, 352, 46, 352, 352, 50, - 352, 352, 352, 352, 62, 63, 352, 352, 66, 352, - 352, 352, 352, 83, 84, 87, 86, 352, 91, 352, - - 352, 97, 352, 103, 352, 352, 352, 352, 352, 352, - 352, 352, 140, 352, 352, 147, 152, 352, 155, 352, - 352, 174, 352, 352, 214, 215, 352, 352, 352, 352, - 352, 228, 352, 352, 352, 352, 244, 352, 352, 263, - 264, 352, 352, 274, 352, 352, 352, 352, 294, 352, - 352, 9, 352, 352, 352, 352, 44, 352, 49, 56, - 57, 352, 352, 352, 65, 67, 352, 352, 81, 90, - 94, 352, 352, 96, 352, 117, 123, 124, 125, 128, - 352, 139, 352, 352, 352, 352, 352, 180, 209, 352, - 219, 352, 221, 352, 229, 352, 237, 352, 352, 260, - - 352, 272, 352, 352, 352, 287, 296, 8, 352, 32, - 352, 40, 352, 352, 352, 64, 352, 75, 95, 352, - 352, 352, 141, 352, 150, 352, 168, 352, 352, 352, - 352, 352, 352, 352, 276, 352, 352, 26, 38, 47, - 58, 59, 352, 352, 104, 352, 142, 352, 216, 220, - 352, 231, 242, 352, 352, 352, 286, 68, 352, 352, - 352, 223, 247, 352, 352, 352, 352, 160, 352, 278, - 352, 137, 268, 98, 0 + 316, 317, 318, 319, 320, 321, 322, 323, 324, 325, + 353, 353, 353, 333, 335, 353, 353, 344, 353, 353, + 353, 353, 1, 5, 3, 353, 353, 10, 353, 353, + 353, 353, 15, 16, 17, 353, 353, 24, 353, 29, + 353, 353, 35, 353, 353, 353, 353, 353, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 53, 55, 353, + 353, 353, 353, 353, 353, 353, 353, 70, 353, 353, + 72, 353, 353, 353, 353, 85, 353, 353, 353, 89, + 353, 353, 353, 353, 353, 353, 353, 353, 105, 353, + 108, 353, 114, 115, 353, 353, 121, 353, 353, 353, + + 353, 353, 353, 353, 353, 353, 353, 353, 353, 353, + 146, 353, 353, 353, 153, 353, 156, 353, 158, 353, + 353, 165, 353, 353, 353, 169, 353, 353, 353, 177, + 353, 353, 353, 353, 188, 353, 353, 353, 353, 203, + 353, 353, 206, 208, 353, 210, 353, 353, 213, 353, + 353, 353, 353, 219, 353, 353, 353, 225, 353, 353, + 353, 353, 353, 231, 353, 353, 236, 353, 353, 353, + 241, 353, 244, 353, 353, 353, 249, 353, 251, 252, + 254, 257, 258, 353, 353, 353, 353, 353, 266, 353, + 353, 353, 271, 353, 278, 353, 353, 353, 353, 353, + + 353, 353, 353, 353, 291, 353, 353, 353, 353, 327, + 328, 329, 353, 345, 344, 353, 353, 348, 353, 353, + 346, 353, 353, 353, 353, 12, 13, 14, 353, 353, + 353, 353, 34, 36, 353, 39, 353, 41, 42, 353, + 45, 353, 353, 48, 353, 353, 52, 353, 353, 353, + 61, 353, 353, 353, 353, 353, 353, 353, 73, 74, + 353, 77, 353, 353, 353, 353, 353, 88, 353, 353, + 353, 353, 353, 353, 102, 353, 353, 107, 111, 353, + 120, 353, 353, 353, 127, 353, 132, 135, 136, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 157, 162, + + 159, 167, 353, 172, 353, 175, 176, 353, 182, 183, + 187, 195, 196, 200, 201, 204, 205, 353, 211, 212, + 353, 353, 353, 353, 353, 353, 353, 353, 226, 227, + 228, 353, 353, 353, 235, 237, 353, 239, 353, 353, + 246, 353, 250, 259, 260, 262, 353, 353, 267, 353, + 270, 353, 353, 353, 281, 282, 353, 353, 286, 353, + 289, 294, 353, 296, 353, 334, 349, 347, 4, 353, + 353, 11, 21, 23, 353, 353, 353, 353, 353, 46, + 353, 353, 50, 353, 353, 353, 353, 62, 63, 353, + 353, 66, 353, 353, 353, 353, 83, 84, 87, 86, + + 353, 91, 353, 353, 97, 353, 103, 353, 353, 353, + 353, 353, 353, 353, 353, 140, 353, 353, 147, 152, + 353, 155, 353, 353, 174, 353, 353, 214, 215, 353, + 353, 353, 353, 353, 353, 229, 353, 353, 353, 353, + 245, 353, 353, 264, 265, 353, 353, 275, 353, 353, + 353, 353, 295, 353, 353, 9, 353, 353, 353, 353, + 44, 353, 49, 56, 57, 353, 353, 353, 65, 67, + 353, 353, 81, 90, 94, 353, 353, 96, 353, 117, + 123, 124, 125, 128, 353, 139, 353, 353, 353, 353, + 353, 180, 209, 353, 353, 220, 353, 222, 353, 230, + + 353, 238, 353, 353, 261, 353, 273, 353, 353, 353, + 288, 297, 8, 353, 32, 353, 40, 353, 353, 353, + 64, 353, 75, 95, 353, 353, 353, 141, 353, 150, + 353, 168, 353, 218, 353, 353, 353, 353, 353, 353, + 277, 353, 353, 26, 38, 47, 58, 59, 353, 353, + 104, 353, 142, 353, 216, 221, 353, 232, 243, 353, + 353, 353, 287, 68, 353, 353, 353, 224, 248, 353, + 353, 353, 353, 160, 353, 279, 353, 137, 269, 98, + 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -521,9 +522,9 @@ static yyconst flex_int32_t yy_meta[73] = 2, 2 } ; -static yyconst flex_int16_t yy_base[1283] = +static yyconst flex_int16_t yy_base[1289] = { 0, - 0, 0, 433, 2964, 429, 2964, 0, 72, 77, 75, + 0, 0, 433, 2975, 429, 2975, 0, 72, 77, 75, 83, 92, 69, 90, 141, 201, 250, 94, 295, 345, 146, 97, 390, 418, 96, 196, 295, 194, 300, 436, 83, 350, 483, 534, 91, 143, 243, 136, 103, 96, @@ -545,7 +546,7 @@ static yyconst flex_int16_t yy_base[1283] = 956, 973, 969, 969, 966, 991, 970, 964, 993, 998, 1011, 1004, 0, 998, 1018, 1006, 1019, 269, 1043, 0, - 2964, 2964, 1106, 1019, 0, 0, 1063, 0, 1072, 1081, + 2975, 2975, 1106, 1019, 0, 0, 1063, 0, 1072, 1081, 1089, 1120, 1133, 0, 1074, 0, 1089, 1092, 0, 1096, 1097, 1111, 1117, 1134, 1128, 1139, 1128, 0, 1128, 0, 1126, 1126, 1135, 324, 1140, 1147, 1129, 1146, 1151, 0, @@ -563,255 +564,255 @@ static yyconst flex_int16_t yy_base[1283] = 1344, 1353, 1340, 1352, 1348, 0, 1346, 1359, 1364, 1358, 1363, 1364, 0, 1361, 1366, 0, 1363, 1379, 0, 1388, 1396, 1394, 0, 1375, 1392, 1397, 1399, 1385, 1385, 1400, - 1387, 1389, 1406, 1392, 1400, 1390, 1396, 0, 1398, 1405, - 1434, 1408, 1403, 1413, 1414, 1423, 1450, 0, 1416, 1451, - 1449, 1440, 1448, 1453, 1452, 1454, 1444, 1450, 1462, 0, - - 1468, 1455, 1466, 1465, 1452, 1474, 1480, 1491, 1499, 1502, - 1489, 1494, 1488, 1487, 1507, 1508, 1490, 0, 1506, 1492, - 1503, 0, 1500, 1497, 1515, 1514, 1513, 1513, 1509, 1519, - 1520, 1511, 1518, 1524, 1535, 1547, 1536, 1534, 0, 1536, - 1538, 1536, 1544, 1601, 1653, 1637, 279, 0, 0, 1634, - 1646, 1659, 2964, 0, 1669, 1677, 1696, 1705, 1714, 1694, - 1701, 1713, 1708, 1693, 1714, 1708, 1707, 1713, 1718, 1699, - 1702, 1718, 0, 1726, 0, 1707, 228, 1722, 0, 0, - 1716, 1717, 1723, 1722, 1729, 1721, 1761, 1733, 1733, 1737, - 1765, 1755, 1749, 1764, 1757, 0, 1760, 1755, 0, 0, - - 1756, 0, 1762, 1775, 1788, 1763, 1775, 0, 1763, 1780, - 1765, 0, 1767, 0, 1772, 1778, 1801, 1784, 1797, 1814, - 1801, 1814, 1820, 1809, 1809, 0, 1825, 1811, 0, 1824, - 1818, 1811, 1828, 1819, 1830, 0, 0, 1831, 1812, 1834, - 1825, 0, 1840, 1822, 0, 1823, 1852, 1839, 1865, 1862, - 0, 0, 1859, 1867, 1865, 1859, 0, 1863, 1871, 1851, - 0, 1873, 1858, 0, 0, 1867, 1881, 226, 1868, 1873, - 1867, 1876, 1888, 0, 1878, 0, 1879, 1874, 1885, 1890, - 0, 1899, 1909, 1903, 1921, 1905, 1915, 0, 1916, 1911, - 0, 0, 1905, 1909, 0, 0, 0, 1924, 1927, 0, - - 1916, 1918, 1933, 1930, 1932, 1933, 0, 1924, 1931, 1929, - 123, 1922, 1936, 1926, 1941, 1927, 1954, 1957, 0, 1961, - 1949, 1974, 1961, 1976, 1965, 1959, 1968, 0, 1961, 1964, - 1971, 1971, 1972, 0, 1982, 0, 1975, 1985, 1986, 1989, - 1986, 1989, 1992, 1978, 1995, 0, 2010, 0, 0, 2009, - 2006, 2006, 2022, 2025, 0, 2011, 2012, 2012, 2014, 2029, - 2030, 2024, 0, 2027, 2044, 2027, 2040, 2023, 0, 0, - 0, 2036, 2043, 2034, 2027, 0, 2044, 2035, 2042, 2069, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 1387, 1389, 1406, 1392, 1400, 1390, 1396, 0, 1416, 1403, + 1434, 1408, 1403, 1413, 1414, 1424, 1450, 0, 1432, 1453, + 1451, 1441, 1449, 1454, 1452, 1455, 1447, 1454, 1463, 0, + + 1470, 1456, 1467, 1466, 1464, 1475, 1488, 1497, 1500, 1503, + 1490, 1495, 1489, 1488, 1508, 1509, 1491, 0, 1507, 1495, + 1504, 0, 1501, 1498, 1516, 1515, 1514, 1515, 1510, 1520, + 1521, 1512, 1530, 1525, 1543, 1553, 1537, 1535, 0, 1537, + 1539, 1537, 1545, 1602, 1654, 1638, 279, 0, 0, 1635, + 1647, 1660, 2975, 0, 1670, 1678, 1697, 1706, 1715, 1695, + 1702, 1714, 1709, 1694, 1715, 1709, 1708, 1714, 1719, 1700, + 1703, 1719, 0, 1727, 0, 1708, 228, 1723, 0, 0, + 1717, 1718, 1724, 1723, 1730, 1722, 1762, 1734, 1734, 1738, + 1766, 1756, 1750, 1765, 1758, 0, 1761, 1756, 0, 0, + + 1757, 0, 1763, 1776, 1789, 1764, 1776, 0, 1764, 1781, + 1766, 0, 1768, 0, 1773, 1779, 1802, 1785, 1798, 1815, + 1802, 1815, 1821, 1810, 1810, 0, 1826, 1812, 0, 1825, + 1819, 1812, 1829, 1820, 1831, 0, 0, 1832, 1813, 1835, + 1826, 0, 1841, 1823, 0, 1824, 1853, 1840, 1866, 1863, + 0, 0, 1860, 1868, 1866, 1860, 0, 1864, 1872, 1852, + 0, 1874, 1859, 0, 0, 1868, 1882, 226, 1869, 1874, + 1868, 1877, 1889, 0, 1879, 0, 1880, 1875, 1886, 1891, + 0, 1900, 1910, 1904, 1922, 1906, 1916, 0, 1917, 1912, + 0, 0, 1906, 1910, 0, 0, 0, 1925, 1928, 0, + + 1917, 1919, 1934, 1931, 1933, 1934, 0, 1925, 1932, 1930, + 123, 1923, 1937, 1927, 1938, 1943, 1940, 1958, 1966, 0, + 1966, 1951, 1977, 1962, 1978, 1967, 1961, 1970, 0, 1963, + 1966, 1973, 1974, 1974, 0, 1985, 0, 1977, 1987, 1988, + 1991, 1988, 1991, 1994, 1980, 2008, 0, 2014, 0, 0, + 2018, 2011, 2008, 2024, 2027, 0, 2013, 2014, 2014, 2016, + 2031, 2032, 2027, 0, 2029, 2045, 2030, 2042, 2025, 0, + 0, 0, 2038, 2046, 2036, 2030, 0, 2046, 2037, 2058, + 2070, 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, 202, - 2058, 174, 0, 0, 2067, 2088, 2115, 2123, 2132, 2140, - 2187, 0, 0, 2133, 2135, 2123, 0, 2122, 2140, 2131, - 2143, 0, 0, 0, 2140, 2128, 0, 2131, 0, 2146, - 2137, 0, 2144, 2149, 2146, 2147, 2191, 2175, 2193, 2176, - 2181, 2177, 2180, 2184, 2195, 2196, 0, 2215, 2189, 2190, - 2186, 2188, 2204, 2189, 2210, 2203, 0, 2212, 2209, 2207, - 2198, 2235, 2236, 2241, 0, 2235, 2243, 2244, 0, 2230, - 2237, 2232, 2233, 2236, 2256, 2243, 2244, 0, 2243, 0, - 2244, 0, 0, 2248, 2244, 0, 2256, 2246, 2258, 2256, - - 2260, 2275, 2268, 2276, 2292, 2289, 2282, 2293, 2286, 0, - 2298, 2294, 2284, 0, 2287, 0, 2299, 0, 2290, 2304, - 0, 2286, 2305, 2295, 0, 2307, 2311, 2292, 0, 2303, - 2315, 2305, 2315, 0, 2303, 2312, 2324, 2328, 0, 2331, - 2332, 0, 0, 2348, 0, 2348, 2349, 2349, 2340, 2353, - 2339, 0, 2356, 2342, 2358, 0, 2350, 2344, 2351, 2363, - 2351, 0, 2347, 2364, 0, 2365, 2370, 2365, 0, 2353, - 0, 2370, 2370, 2395, 0, 2397, 0, 0, 0, 0, - 0, 2394, 2383, 2399, 2400, 2401, 0, 2388, 2401, 2396, - 0, 2410, 0, 2408, 2405, 2409, 2395, 2401, 2410, 2415, - - 2415, 2416, 0, 2404, 2408, 2400, 2422, 0, 0, 0, - 2431, 2160, 2460, 2471, 2479, 0, 2487, 2515, 0, 2435, - 2480, 2482, 2473, 0, 0, 0, 2488, 2486, 2480, 2487, - 0, 0, 2476, 0, 2496, 0, 0, 2497, 0, 2494, - 2484, 0, 2494, 2492, 0, 2504, 2532, 2532, 0, 2532, - 2518, 2529, 2520, 2522, 2522, 2528, 0, 0, 2542, 0, - 2525, 2531, 2543, 2527, 2530, 0, 2535, 2547, 2543, 2544, - 2549, 2546, 0, 2542, 2539, 0, 0, 156, 0, 2543, - 2576, 2585, 0, 2584, 0, 0, 0, 2585, 2569, 2569, - 2573, 2578, 2588, 2580, 2586, 2592, 0, 0, 2592, 0, - - 2589, 0, 2594, 0, 0, 2597, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 2600, 0, 0, 2584, 2589, - 2586, 2583, 2586, 2587, 2607, 0, 0, 0, 2604, 2598, - 2617, 0, 0, 2631, 0, 2630, 2620, 0, 2622, 0, - 0, 2635, 0, 2639, 2640, 0, 2644, 0, 2626, 2628, - 2633, 0, 0, 2648, 2638, 0, 2648, 0, 0, 2638, - 0, 2652, 0, 0, 0, 0, 2649, 2636, 0, 0, - 0, 2635, 2656, 2646, 2647, 2649, 0, 2652, 2658, 0, - 2671, 2674, 2690, 2691, 0, 0, 2673, 2675, 0, 2675, - 2695, 2688, 2678, 0, 0, 0, 0, 2681, 0, 2697, - - 2686, 2701, 2700, 0, 2695, 2700, 2692, 2704, 2694, 2690, - 2698, 2706, 0, 2711, 2693, 0, 0, 2699, 0, 2727, - 2737, 0, 2725, 2732, 0, 0, 2736, 2741, 2738, 2723, - 2729, 0, 2745, 2742, 2747, 2747, 0, 2745, 2729, 0, - 0, 2744, 2752, 0, 2746, 2741, 2751, 2741, 0, 2750, - 2745, 0, 2750, 2751, 2745, 2788, 0, 2793, 0, 0, - 0, 2783, 2793, 2792, 0, 0, 2778, 2781, 0, 0, - 0, 2786, 2787, 0, 2801, 0, 0, 0, 0, 0, - 2794, 0, 2791, 2804, 2792, 2803, 2790, 0, 0, 2793, - 0, 2795, 0, 2802, 0, 2797, 0, 2804, 2801, 0, - - 2814, 0, 2812, 2812, 2798, 0, 0, 0, 2841, 0, - 2827, 0, 2835, 2843, 2844, 0, 2845, 0, 0, 2837, - 2840, 2837, 0, 2842, 0, 2846, 0, 2836, 2843, 2843, - 2845, 2857, 2860, 2859, 0, 2849, 2859, 0, 0, 0, - 0, 0, 2846, 2845, 0, 2847, 0, 2867, 0, 0, - 2855, 0, 0, 2858, 2877, 2895, 0, 0, 2887, 2891, - 2887, 0, 0, 2893, 2878, 2883, 2902, 0, 2903, 0, - 2888, 0, 0, 0, 2964, 74, 2951, 2953, 2955, 2957, - 2959, 2961 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 202, 2072, 174, 0, 0, 2069, 2090, 2117, 2125, 2134, + 2142, 2189, 0, 0, 2135, 2137, 2125, 0, 2124, 2142, + 2133, 2145, 0, 0, 0, 2142, 2130, 0, 2133, 0, + 2148, 2139, 0, 2146, 2151, 2148, 2149, 2193, 2177, 2195, + 2178, 2183, 2179, 2182, 2186, 2197, 2198, 0, 2217, 2191, + 2192, 2188, 2190, 2206, 2191, 2212, 2205, 0, 2214, 2211, + 2209, 2200, 2237, 2238, 2243, 0, 2237, 2245, 2246, 0, + 2232, 2239, 2234, 2235, 2238, 2258, 2245, 2246, 0, 2245, + 0, 2246, 0, 0, 2250, 2246, 0, 2258, 2248, 2260, + + 2258, 2262, 2277, 2270, 2278, 2294, 2291, 2284, 2295, 2288, + 0, 2300, 2296, 2286, 0, 2289, 0, 2301, 0, 2292, + 2306, 0, 2288, 2307, 2297, 0, 2309, 2313, 2294, 0, + 2305, 2317, 2307, 2317, 0, 2305, 2314, 2326, 2330, 0, + 2333, 2334, 0, 0, 2350, 0, 2350, 2351, 2351, 2342, + 2355, 2340, 2343, 0, 2359, 2345, 2361, 0, 2353, 2348, + 2354, 2366, 2354, 0, 2350, 2367, 0, 2368, 2373, 2368, + 0, 2366, 0, 2378, 2382, 2398, 0, 2400, 0, 0, + 0, 0, 0, 2397, 2386, 2402, 2403, 2404, 0, 2391, + 2404, 2400, 0, 2413, 0, 2411, 2408, 2412, 2399, 2404, + + 2413, 2418, 2418, 2419, 0, 2407, 2411, 2403, 2435, 0, + 0, 0, 2439, 2162, 2462, 2479, 2487, 0, 2495, 2523, + 0, 2443, 2488, 2490, 2481, 0, 0, 0, 2496, 2494, + 2488, 2495, 0, 0, 2484, 0, 2504, 0, 0, 2505, + 0, 2502, 2492, 0, 2502, 2500, 0, 2512, 2540, 2540, + 0, 2540, 2526, 2537, 2528, 2530, 2530, 2536, 0, 0, + 2550, 0, 2533, 2539, 2551, 2535, 2538, 0, 2543, 2555, + 2551, 2552, 2557, 2554, 0, 2550, 2547, 0, 0, 156, + 0, 2551, 2584, 2593, 0, 2592, 0, 0, 0, 2593, + 2577, 2577, 2581, 2586, 2596, 2588, 2594, 2600, 0, 0, + + 2600, 0, 2597, 0, 2602, 0, 0, 2605, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 2608, 0, 0, + 2592, 2597, 2594, 2604, 2592, 2595, 2596, 2616, 0, 0, + 0, 2613, 2633, 2626, 0, 0, 2640, 0, 2639, 2629, + 0, 2631, 0, 0, 2644, 0, 2648, 2649, 0, 2653, + 0, 2635, 2637, 2642, 0, 0, 2657, 2647, 0, 2657, + 0, 0, 2647, 0, 2661, 0, 0, 0, 0, 2658, + 2645, 0, 0, 0, 2644, 2665, 2655, 2656, 2658, 0, + 2661, 2693, 0, 2680, 2683, 2699, 2700, 0, 0, 2682, + 2684, 0, 2684, 2704, 2697, 2687, 0, 0, 0, 0, + + 2690, 0, 2706, 2695, 2710, 2709, 0, 2704, 2709, 2701, + 2713, 2703, 2699, 2707, 2715, 0, 2720, 2702, 0, 0, + 2734, 0, 2736, 2746, 0, 2734, 2741, 0, 0, 2745, + 2740, 2751, 2748, 2733, 2739, 0, 2755, 2752, 2757, 2757, + 0, 2755, 2739, 0, 0, 2754, 2762, 0, 2756, 2751, + 2761, 2751, 0, 2760, 2755, 0, 2760, 2787, 2781, 2798, + 0, 2803, 0, 0, 0, 2793, 2803, 2802, 0, 0, + 2788, 2791, 0, 0, 0, 2796, 2797, 0, 2811, 0, + 0, 0, 0, 0, 2804, 0, 2801, 2814, 2802, 2813, + 2800, 0, 0, 2803, 2806, 0, 2806, 0, 2813, 0, + + 2808, 0, 2815, 2812, 0, 2825, 0, 2849, 2849, 2835, + 0, 0, 0, 2852, 0, 2838, 0, 2846, 2854, 2855, + 0, 2856, 0, 0, 2848, 2851, 2848, 0, 2853, 0, + 2857, 0, 2847, 0, 2854, 2854, 2856, 2868, 2871, 2870, + 0, 2860, 2870, 0, 0, 0, 0, 0, 2857, 2856, + 0, 2858, 0, 2904, 0, 0, 2892, 0, 0, 2895, + 2888, 2906, 0, 0, 2898, 2902, 2898, 0, 0, 2904, + 2889, 2894, 2913, 0, 2914, 0, 2899, 0, 0, 0, + 2975, 74, 2962, 2964, 2966, 2968, 2970, 2972 } ; -static yyconst flex_int16_t yy_def[1283] = +static yyconst flex_int16_t yy_def[1289] = { 0, - 1275, 1, 1275, 1275, 1275, 1275, 1276, 1277, 1278, 1276, - 1276, 1276, 12, 12, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1279, 1275, 1276, 1280, 1277, 1276, 1281, 1278, 1276, 1276, - 12, 1276, 1276, 12, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1282, 1279, 1276, - - 1275, 1275, 1276, 203, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 59, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1275, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1275, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, 1276, - 1276, 1276, 1276, 1276, 0, 1275, 1275, 1275, 1275, 1275, - 1275, 1275 + 1281, 1, 1281, 1281, 1281, 1281, 1282, 1283, 1284, 1282, + 1282, 1282, 12, 12, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1285, 1281, 1282, 1286, 1283, 1282, 1287, 1284, 1282, 1282, + 12, 1282, 1282, 12, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1288, 1285, 1282, + + 1281, 1281, 1282, 203, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 59, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1281, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1281, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, 1282, + 0, 1281, 1281, 1281, 1281, 1281, 1281, 1281 } ; -static yyconst flex_int16_t yy_nxt[3037] = +static yyconst flex_int16_t yy_nxt[3048] = { 0, 4, 5, 6, 7, 8, 9, 10, 10, 11, 12, 13, 13, 14, 13, 13, 13, 13, 7, 15, 16, @@ -827,24 +828,24 @@ static yyconst flex_int16_t yy_nxt[3037] = 53, 54, 54, 54, 54, 54, 54, 54, 54, 55, 43, 60, 94, 56, 57, 117, 95, 58, 129, 118, 96, 157, 182, 119, 183, 194, 195, 184, 196, 120, - 97, 43, 197, 59, 846, 847, 43, 60, 94, 56, + 97, 43, 197, 59, 847, 848, 43, 60, 94, 56, 57, 117, 95, 58, 129, 118, 96, 157, 182, 119, 183, 194, 195, 184, 196, 120, 97, 43, 197, 59, - 61, 185, 43, 1106, 112, 186, 192, 62, 113, 187, + 61, 185, 43, 1109, 112, 186, 192, 62, 113, 187, 63, 64, 65, 215, 66, 114, 67, 68, 193, 69, - 70, 115, 71, 216, 72, 910, 61, 185, 43, 116, + 70, 115, 71, 216, 72, 912, 61, 185, 43, 116, 112, 186, 192, 62, 113, 187, 63, 64, 65, 215, 66, 114, 67, 68, 193, 69, 70, 115, 71, 216, - 72, 73, 139, 908, 130, 116, 140, 220, 131, 74, + 72, 73, 139, 910, 130, 116, 140, 220, 131, 74, 75, 224, 132, 76, 231, 77, 141, 78, 133, 142, - 79, 232, 143, 80, 81, 814, 233, 737, 139, 82, + 79, 232, 143, 80, 81, 815, 233, 738, 139, 82, 130, 83, 140, 220, 131, 74, 75, 224, 132, 76, 231, 77, 141, 78, 133, 142, 79, 232, 143, 80, 81, 188, 233, 189, 237, 82, 190, 83, 84, 191, 217, 221, 85, 218, 229, 86, 87, 222, 230, 88, 89, 219, 90, 91, 223, 92, 238, 188, 93, 189, - 237, 712, 190, 568, 84, 191, 217, 221, 85, 218, + 237, 713, 190, 568, 84, 191, 217, 221, 85, 218, 229, 86, 87, 222, 230, 88, 89, 219, 90, 91, 223, 92, 238, 134, 93, 98, 99, 135, 235, 144, @@ -860,62 +861,62 @@ static yyconst flex_int16_t yy_nxt[3037] = 160, 252, 227, 109, 257, 239, 110, 225, 161, 111, 121, 122, 240, 228, 162, 255, 123, 243, 241, 256, 124, 125, 226, 244, 250, 126, 251, 127, 227, 128, - 42, 239, 1275, 264, 1275, 200, 121, 122, 240, 228, - 1275, 255, 123, 243, 241, 256, 124, 125, 1275, 244, + 42, 239, 1281, 264, 1281, 200, 121, 122, 240, 228, + 1281, 255, 123, 243, 241, 256, 124, 125, 1281, 244, 250, 126, 251, 127, 149, 247, 253, 248, 150, 264, 265, 151, 152, 249, 278, 153, 270, 271, 154, 281, - 266, 155, 1275, 254, 156, 1275, 279, 1275, 282, 1275, - 149, 247, 253, 248, 150, 1275, 265, 151, 152, 249, + 266, 155, 1281, 254, 156, 1281, 279, 1281, 282, 1281, + 149, 247, 253, 248, 150, 1281, 265, 151, 152, 249, 278, 153, 270, 271, 154, 281, 266, 155, 267, 254, 156, 163, 279, 164, 282, 165, 289, 290, 166, 167, 285, 283, 168, 169, 268, 170, 269, 171, 284, 172, - 173, 174, 291, 1275, 267, 175, 1275, 163, 286, 164, - 1275, 165, 289, 290, 166, 167, 285, 283, 168, 169, + 173, 174, 291, 1281, 267, 175, 1281, 163, 286, 164, + 1281, 165, 289, 290, 166, 167, 285, 283, 168, 169, 268, 170, 269, 171, 284, 172, 173, 174, 291, 287, - 1275, 175, 176, 292, 286, 301, 177, 299, 306, 178, + 1281, 175, 176, 292, 286, 301, 177, 299, 306, 178, 294, 300, 293, 302, 304, 303, 179, 288, 295, 180, - 307, 318, 296, 305, 319, 287, 181, 1275, 176, 292, - 1275, 301, 177, 299, 306, 178, 294, 300, 293, 302, + 307, 318, 296, 305, 319, 287, 181, 1281, 176, 292, + 1281, 301, 177, 299, 306, 178, 294, 300, 293, 302, 304, 303, 179, 288, 295, 180, 307, 318, 296, 305, - 319, 1275, 181, 203, 203, 203, 203, 203, 203, 203, + 319, 1281, 181, 203, 203, 203, 203, 203, 203, 203, 203, 204, 51, 51, 51, 51, 51, 51, 51, 51, 209, 209, 209, 209, 209, 209, 209, 209, 210, 210, 210, 210, 210, 210, 210, 210, 310, 320, 205, 321, 324, 311, 211, 211, 43, 212, 212, 212, 212, 212, 212, 212, 212, 213, 213, 213, 213, 213, 213, 213, - 213, 1275, 310, 320, 205, 321, 324, 311, 1275, 325, - 43, 52, 52, 52, 52, 52, 52, 52, 52, 1275, - 327, 328, 1275, 206, 207, 210, 210, 210, 210, 210, - 210, 210, 210, 308, 312, 325, 322, 1275, 1275, 323, + 213, 1281, 310, 320, 205, 321, 324, 311, 1281, 325, + 43, 52, 52, 52, 52, 52, 52, 52, 52, 1281, + 327, 328, 1281, 206, 207, 210, 210, 210, 210, 210, + 210, 210, 210, 308, 312, 325, 322, 1281, 1281, 323, 329, 309, 313, 343, 344, 314, 327, 328, 330, 206, 207, 52, 52, 52, 52, 52, 52, 52, 52, 308, - 312, 1275, 322, 208, 57, 323, 329, 309, 313, 343, - 344, 314, 1275, 1275, 330, 1275, 1275, 1275, 1275, 1275, - 331, 345, 347, 346, 315, 332, 333, 316, 1275, 208, + 312, 1281, 322, 208, 57, 323, 329, 309, 313, 343, + 344, 314, 1281, 1281, 330, 1281, 1281, 1281, 1281, 1281, + 331, 345, 347, 346, 315, 332, 333, 316, 1281, 208, 57, 214, 214, 214, 214, 214, 214, 214, 214, 317, 214, 214, 214, 214, 214, 214, 331, 345, 347, 346, - 315, 332, 333, 316, 334, 1275, 335, 360, 1275, 361, - 336, 362, 1275, 356, 357, 317, 214, 214, 214, 214, + 315, 332, 333, 316, 334, 1281, 335, 360, 1281, 361, + 336, 362, 1281, 356, 357, 317, 214, 214, 214, 214, 214, 214, 258, 259, 260, 261, 262, 352, 353, 348, 334, 263, 335, 360, 354, 361, 336, 362, 355, 356, - 357, 363, 1275, 364, 349, 350, 1275, 351, 258, 259, + 357, 363, 1281, 364, 349, 350, 1281, 351, 258, 259, 260, 261, 262, 352, 353, 348, 358, 263, 272, 365, 354, 366, 273, 274, 355, 359, 370, 363, 275, 364, - 349, 350, 276, 351, 367, 373, 277, 1275, 368, 369, - 374, 1275, 358, 382, 272, 365, 371, 366, 273, 274, - 1275, 359, 370, 1275, 275, 1275, 372, 1275, 276, 1275, + 349, 350, 276, 351, 367, 373, 277, 1281, 368, 369, + 374, 1281, 358, 382, 272, 365, 371, 366, 273, 274, + 1281, 359, 370, 1281, 275, 1281, 372, 1281, 276, 1281, 367, 373, 277, 337, 368, 369, 374, 338, 383, 382, 384, 375, 371, 379, 376, 385, 339, 380, 340, 341, 342, 377, 372, 381, 386, 378, 388, 387, 391, 337, - 389, 1275, 1275, 338, 383, 390, 384, 375, 1275, 379, - 376, 385, 339, 380, 340, 341, 342, 377, 1275, 381, + 389, 1281, 1281, 338, 383, 390, 384, 375, 1281, 379, + 376, 385, 339, 380, 340, 341, 342, 377, 1281, 381, 386, 378, 388, 387, 391, 392, 389, 393, 395, 409, - 398, 390, 402, 1275, 394, 399, 396, 410, 406, 411, + 398, 390, 402, 1281, 394, 399, 396, 410, 406, 411, 403, 412, 397, 400, 404, 407, 405, 401, 416, 414, 417, 392, 415, 393, 395, 409, 398, 408, 402, 413, 394, 399, 396, 410, 406, 411, 403, 412, 397, 400, @@ -923,20 +924,20 @@ static yyconst flex_int16_t yy_nxt[3037] = 419, 421, 423, 408, 429, 413, 422, 425, 427, 431, 436, 437, 442, 424, 432, 438, 426, 428, 433, 443, - 1275, 439, 434, 418, 430, 420, 419, 421, 423, 435, + 1281, 439, 434, 418, 430, 420, 419, 421, 423, 435, 429, 440, 422, 425, 427, 431, 436, 437, 442, 424, 432, 438, 426, 428, 433, 443, 441, 439, 434, 444, 430, 445, 446, 448, 449, 435, 450, 440, 451, 452, - 208, 57, 447, 198, 198, 198, 1275, 1275, 1275, 1275, - 1275, 1275, 441, 1275, 205, 444, 1275, 445, 446, 448, - 449, 1275, 450, 1275, 451, 452, 208, 57, 447, 455, - 455, 1275, 456, 456, 456, 456, 456, 456, 456, 456, + 208, 57, 447, 198, 198, 198, 1281, 1281, 1281, 1281, + 1281, 1281, 441, 1281, 205, 444, 1281, 445, 446, 448, + 449, 1281, 450, 1281, 451, 452, 208, 57, 447, 455, + 455, 1281, 456, 456, 456, 456, 456, 456, 456, 456, 205, 209, 209, 209, 209, 209, 209, 209, 209, 457, 210, 210, 210, 210, 210, 210, 210, 210, 212, 212, - 212, 212, 212, 212, 212, 212, 1275, 1275, 1275, 1275, - 1275, 458, 460, 461, 200, 203, 203, 203, 203, 203, - 203, 203, 203, 1275, 462, 463, 464, 206, 207, 212, + 212, 212, 212, 212, 212, 212, 1281, 1281, 1281, 1281, + 1281, 458, 460, 461, 200, 203, 203, 203, 203, 203, + 203, 203, 203, 1281, 462, 463, 464, 206, 207, 212, 212, 212, 212, 212, 212, 212, 212, 458, 460, 461, 465, 454, 213, 213, 213, 213, 213, 213, 213, 213, 462, 463, 464, 206, 207, 466, 467, 470, 468, 472, @@ -952,7 +953,7 @@ static yyconst flex_int16_t yy_nxt[3037] = 499, 500, 501, 506, 516, 517, 502, 504, 503, 507, 505, 508, 509, 510, 511, 512, 514, 515, 513, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, - 516, 517, 529, 530, 531, 532, 533, 534, 535, 1275, + 516, 517, 529, 530, 531, 532, 533, 534, 535, 1281, 539, 540, 542, 543, 544, 518, 519, 520, 521, 522, 523, 524, 525, 526, 527, 528, 545, 546, 529, 530, @@ -970,186 +971,187 @@ static yyconst flex_int16_t yy_nxt[3037] = 595, 596, 583, 584, 585, 587, 586, 588, 589, 597, 590, 591, 592, 593, 594, 598, 599, 600, 601, 602, 603, 605, 606, 607, 608, 609, 595, 596, 610, 611, - 604, 612, 613, 614, 615, 597, 616, 620, 621, 622, - 623, 598, 599, 600, 601, 602, 603, 605, 606, 607, - 608, 609, 624, 628, 610, 611, 604, 612, 613, 614, - 615, 617, 616, 620, 621, 622, 623, 618, 625, 629, - 619, 630, 626, 631, 632, 634, 637, 638, 624, 628, - 639, 635, 627, 636, 640, 633, 641, 617, 642, 644, - 643, 645, 646, 618, 625, 629, 619, 630, 626, 631, - - 632, 634, 637, 638, 647, 648, 639, 635, 627, 636, - 640, 633, 641, 649, 642, 644, 643, 645, 646, 650, + 604, 612, 613, 614, 617, 597, 615, 621, 622, 623, + 624, 598, 599, 600, 601, 602, 603, 605, 606, 607, + 608, 609, 616, 625, 610, 611, 604, 612, 613, 614, + 617, 618, 615, 621, 622, 623, 624, 619, 626, 629, + 620, 630, 627, 631, 632, 633, 635, 638, 616, 625, + 639, 636, 628, 637, 640, 641, 634, 618, 642, 643, + 645, 644, 646, 619, 626, 629, 620, 630, 627, 631, + + 632, 633, 635, 638, 647, 648, 639, 636, 628, 637, + 640, 641, 634, 649, 642, 643, 645, 644, 646, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 647, 648, 661, 662, 663, 664, 665, 666, 667, 649, 668, 669, 670, 671, 672, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 673, 674, 661, 662, 663, 664, 665, 666, 667, 675, 668, 669, 670, 671, - 672, 676, 677, 678, 679, 680, 681, 682, 1275, 1275, - 1275, 1275, 673, 674, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 675, 1275, 1275, 1275, 1275, 1275, 676, 677, 678, + 672, 676, 677, 678, 679, 680, 681, 682, 683, 1281, + 1281, 1281, 673, 674, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 675, 1281, 1281, 1281, 1281, 1281, 676, 677, 678, - 679, 680, 681, 682, 43, 43, 43, 43, 43, 43, - 683, 43, 43, 43, 43, 43, 43, 43, 43, 684, + 679, 680, 681, 682, 683, 43, 43, 43, 43, 43, + 43, 684, 43, 43, 43, 43, 43, 43, 43, 43, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, - 705, 706, 707, 708, 709, 684, 685, 686, 687, 688, + 705, 706, 707, 708, 709, 710, 685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700, 701, 702, 703, 704, 705, 706, 707, 708, - 709, 43, 43, 710, 711, 713, 714, 715, 456, 456, + 709, 710, 43, 43, 711, 712, 714, 715, 716, 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, 456, - 456, 456, 456, 456, 1275, 1275, 1275, 1275, 1275, 710, - - 711, 713, 714, 715, 716, 717, 717, 717, 717, 717, - 717, 717, 717, 718, 719, 719, 719, 719, 719, 719, - 719, 719, 720, 721, 721, 721, 721, 721, 721, 721, - 721, 722, 723, 724, 725, 726, 727, 728, 729, 730, - 731, 732, 733, 734, 735, 736, 738, 739, 740, 741, - 742, 743, 744, 1275, 747, 748, 749, 722, 723, 724, + 456, 456, 456, 456, 456, 1281, 1281, 1281, 1281, 1281, + + 711, 712, 714, 715, 716, 717, 718, 718, 718, 718, + 718, 718, 718, 718, 719, 720, 720, 720, 720, 720, + 720, 720, 720, 721, 722, 722, 722, 722, 722, 722, + 722, 722, 723, 724, 725, 726, 727, 728, 729, 730, + 731, 732, 733, 734, 735, 736, 737, 739, 740, 741, + 742, 743, 744, 745, 1281, 748, 749, 750, 723, 724, 725, 726, 727, 728, 729, 730, 731, 732, 733, 734, - 735, 736, 738, 739, 740, 741, 742, 743, 744, 745, - 747, 748, 749, 750, 751, 752, 753, 746, 755, 756, - 757, 758, 759, 760, 1275, 764, 766, 1275, 765, 754, - - 767, 768, 769, 770, 771, 745, 761, 772, 775, 750, - 751, 752, 753, 746, 755, 756, 757, 758, 759, 760, - 762, 764, 766, 763, 765, 754, 767, 768, 769, 770, - 771, 773, 761, 772, 775, 776, 777, 774, 778, 779, - 780, 781, 782, 783, 784, 785, 762, 786, 787, 763, - 788, 789, 790, 791, 792, 793, 794, 773, 795, 796, - 797, 776, 777, 774, 778, 779, 780, 781, 782, 783, - 784, 785, 798, 786, 787, 799, 788, 789, 790, 791, - 792, 793, 794, 800, 795, 796, 797, 801, 802, 803, - 804, 805, 806, 807, 809, 810, 811, 812, 798, 813, - - 815, 799, 816, 808, 817, 818, 819, 820, 821, 800, - 822, 823, 824, 801, 802, 803, 804, 805, 806, 807, - 809, 810, 811, 812, 825, 813, 815, 826, 816, 808, - 817, 818, 819, 820, 821, 827, 822, 823, 824, 828, + 735, 736, 737, 739, 740, 741, 742, 743, 744, 745, + 746, 748, 749, 750, 751, 752, 753, 754, 747, 756, + 757, 758, 759, 760, 761, 1281, 765, 767, 1281, 766, + + 755, 768, 769, 770, 771, 772, 746, 762, 773, 776, + 751, 752, 753, 754, 747, 756, 757, 758, 759, 760, + 761, 763, 765, 767, 764, 766, 755, 768, 769, 770, + 771, 772, 774, 762, 773, 776, 777, 778, 775, 779, + 780, 781, 782, 783, 784, 785, 786, 763, 787, 788, + 764, 789, 790, 791, 792, 793, 794, 795, 774, 796, + 797, 798, 777, 778, 775, 779, 780, 781, 782, 783, + 784, 785, 786, 799, 787, 788, 800, 789, 790, 791, + 792, 793, 794, 795, 801, 796, 797, 798, 802, 803, + 804, 805, 806, 807, 808, 810, 811, 812, 813, 799, + + 814, 816, 800, 817, 809, 818, 819, 820, 821, 822, + 801, 823, 824, 825, 802, 803, 804, 805, 806, 807, + 808, 810, 811, 812, 813, 826, 814, 816, 827, 817, + 809, 818, 819, 820, 821, 822, 828, 823, 824, 825, 829, 830, 831, 832, 833, 834, 835, 836, 837, 838, - 825, 839, 840, 826, 841, 842, 843, 844, 845, 848, - 849, 827, 850, 851, 852, 828, 829, 830, 831, 832, - 833, 834, 835, 836, 837, 838, 853, 839, 840, 854, - 841, 842, 843, 844, 845, 848, 849, 855, 850, 851, - 852, 856, 857, 859, 860, 861, 862, 863, 864, 865, - - 866, 867, 853, 868, 869, 854, 870, 871, 872, 873, - 874, 875, 858, 855, 876, 877, 878, 856, 857, 859, - 860, 861, 862, 863, 864, 865, 866, 867, 879, 868, - 869, 880, 870, 871, 872, 873, 874, 875, 858, 881, - 876, 877, 878, 882, 883, 884, 885, 886, 887, 889, - 888, 890, 891, 892, 879, 893, 896, 880, 897, 898, - 899, 900, 894, 901, 902, 881, 903, 904, 905, 882, - 883, 884, 885, 886, 887, 889, 888, 890, 891, 892, - 895, 893, 896, 909, 897, 898, 899, 900, 894, 901, - 902, 906, 903, 904, 905, 907, 911, 912, 912, 912, - - 912, 912, 912, 912, 912, 1275, 895, 1275, 1275, 909, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 906, 1275, 1275, - 1275, 907, 911, 913, 717, 717, 717, 717, 717, 717, - 717, 717, 914, 914, 914, 914, 914, 914, 914, 914, - 915, 719, 719, 719, 719, 719, 719, 719, 719, 917, - 917, 917, 917, 917, 917, 917, 917, 920, 921, 922, - 923, 924, 925, 926, 927, 928, 929, 930, 916, 912, - 912, 912, 912, 912, 912, 912, 912, 1275, 931, 932, - 933, 934, 935, 920, 921, 922, 923, 924, 925, 926, - 927, 928, 929, 930, 916, 918, 721, 721, 721, 721, - - 721, 721, 721, 721, 931, 932, 933, 934, 935, 936, - 937, 938, 939, 940, 941, 942, 943, 944, 945, 1275, - 949, 950, 951, 919, 952, 1275, 953, 954, 955, 956, - 957, 958, 959, 960, 946, 936, 937, 938, 939, 940, - 941, 942, 943, 944, 945, 947, 949, 950, 951, 919, - 952, 948, 953, 954, 955, 956, 957, 958, 959, 960, - 946, 961, 962, 963, 964, 965, 966, 967, 968, 969, - 970, 947, 971, 972, 973, 974, 975, 948, 976, 977, - 978, 979, 980, 981, 982, 983, 984, 961, 962, 963, - 964, 965, 966, 967, 968, 969, 970, 985, 971, 972, - - 973, 974, 975, 986, 976, 977, 978, 979, 980, 981, - 982, 983, 984, 987, 988, 989, 990, 991, 992, 993, - 994, 995, 996, 985, 997, 998, 999, 1000, 1001, 986, - 1002, 1003, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 987, - 988, 989, 990, 991, 992, 993, 994, 995, 996, 1011, - 997, 998, 999, 1000, 1001, 1012, 1002, 1003, 1004, 1005, - 1006, 1007, 1008, 1009, 1010, 1013, 1014, 1015, 1016, 1017, - 1018, 1019, 1020, 1021, 1022, 1011, 1023, 1024, 1025, 1026, - 1027, 1012, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, - 1036, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020, 1021, - - 1022, 1037, 1023, 1024, 1025, 1026, 1027, 1038, 1028, 1029, - 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1039, 1040, 1041, - 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1037, 1049, 1050, - 1051, 1052, 1053, 1038, 1054, 1055, 1056, 1057, 1058, 1059, - 1060, 1061, 1062, 1039, 1040, 1041, 1042, 1043, 1044, 1045, - 1046, 1047, 1048, 1063, 1049, 1050, 1051, 1052, 1053, 1275, - 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 912, - 912, 912, 912, 912, 912, 912, 912, 1275, 1066, 1063, - 914, 914, 914, 914, 914, 914, 914, 914, 914, 914, - 914, 914, 914, 914, 914, 914, 917, 917, 917, 917, - - 917, 917, 917, 917, 1066, 1275, 1067, 1064, 1068, 1069, - 1070, 1071, 1072, 1073, 1074, 916, 1075, 1076, 1077, 1078, - 1079, 1080, 1081, 1065, 917, 917, 917, 917, 917, 917, - 917, 917, 1067, 1064, 1068, 1069, 1070, 1071, 1072, 1073, - 1074, 916, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1065, - 1082, 919, 1083, 1085, 1086, 1087, 1088, 1089, 1090, 1091, - 1092, 1093, 1094, 1095, 1096, 1084, 1097, 1098, 1099, 1100, - 1101, 1102, 1103, 1104, 1105, 1107, 1082, 919, 1083, 1085, - 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, - 1096, 1084, 1097, 1098, 1099, 1100, 1101, 1102, 1103, 1104, - - 1105, 1107, 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, - 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, - 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1108, 1109, - 1110, 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, - 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, 1129, - 1130, 1131, 1132, 1133, 1134, 1135, 1136, 1137, 1138, 1139, - 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, 1149, - 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, 1159, - 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, - 1144, 1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, - - 1154, 1155, 1156, 1157, 1158, 1159, 1160, 1161, 1162, 1163, - 1164, 1165, 1166, 1167, 1168, 1169, 1170, 1171, 1172, 1173, - 1174, 1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, 1183, - 1184, 1185, 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, - 1168, 1169, 1170, 1171, 1172, 1173, 1174, 1175, 1176, 1177, - 1178, 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1187, - 1188, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1196, 1197, - 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, - 1208, 1209, 1210, 1211, 1186, 1187, 1188, 1189, 1190, 1191, - 1192, 1193, 1194, 1195, 1196, 1197, 1198, 1199, 1200, 1201, - - 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211, - 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, - 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, 1230, 1231, - 1232, 1233, 1234, 1235, 1236, 1237, 1212, 1213, 1214, 1215, - 1216, 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, - 1226, 1227, 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, - 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243, 1244, 1245, - 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, - 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1238, 1239, - 1240, 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, - - 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, 1259, - 1260, 1261, 1262, 1263, 1264, 1265, 1266, 1267, 1268, 1269, - 1270, 1271, 1272, 1273, 1274, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1264, 1265, 1266, 1267, 1268, 1269, 1270, 1271, 1272, 1273, - 1274, 45, 45, 48, 48, 199, 199, 44, 44, 47, - 47, 198, 198, 3, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275 + 839, 826, 840, 841, 827, 842, 843, 844, 845, 846, + 849, 850, 828, 851, 852, 853, 829, 830, 831, 832, + 833, 834, 835, 836, 837, 838, 839, 854, 840, 841, + 855, 842, 843, 844, 845, 846, 849, 850, 856, 851, + 852, 853, 857, 858, 861, 859, 862, 863, 864, 865, + + 866, 867, 868, 854, 869, 870, 855, 871, 872, 873, + 874, 875, 876, 877, 856, 860, 878, 879, 857, 858, + 861, 859, 862, 863, 864, 865, 866, 867, 868, 880, + 869, 870, 881, 871, 872, 873, 874, 875, 876, 877, + 882, 860, 878, 879, 883, 884, 885, 886, 887, 888, + 889, 891, 890, 892, 893, 880, 894, 895, 881, 898, + 899, 900, 901, 896, 902, 903, 882, 904, 905, 906, + 883, 884, 885, 886, 887, 888, 889, 891, 890, 892, + 893, 897, 894, 895, 907, 898, 899, 900, 901, 896, + 902, 903, 908, 904, 905, 906, 909, 911, 913, 914, + + 914, 914, 914, 914, 914, 914, 914, 897, 1281, 1281, + 907, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 908, 1281, + 1281, 1281, 909, 911, 913, 915, 718, 718, 718, 718, + 718, 718, 718, 718, 916, 916, 916, 916, 916, 916, + 916, 916, 917, 720, 720, 720, 720, 720, 720, 720, + 720, 919, 919, 919, 919, 919, 919, 919, 919, 922, + 923, 924, 925, 926, 927, 928, 929, 930, 931, 932, + 918, 914, 914, 914, 914, 914, 914, 914, 914, 1281, + 933, 934, 935, 936, 937, 922, 923, 924, 925, 926, + 927, 928, 929, 930, 931, 932, 918, 920, 722, 722, + + 722, 722, 722, 722, 722, 722, 933, 934, 935, 936, + 937, 938, 939, 940, 941, 942, 943, 944, 945, 946, + 947, 1281, 951, 952, 953, 921, 954, 1281, 955, 956, + 957, 958, 959, 960, 961, 962, 948, 938, 939, 940, + 941, 942, 943, 944, 945, 946, 947, 949, 951, 952, + 953, 921, 954, 950, 955, 956, 957, 958, 959, 960, + 961, 962, 948, 963, 964, 965, 966, 967, 968, 969, + 970, 971, 972, 949, 973, 974, 975, 976, 977, 950, + 978, 979, 980, 981, 982, 983, 984, 985, 986, 963, + 964, 965, 966, 967, 968, 969, 970, 971, 972, 987, + + 973, 974, 975, 976, 977, 988, 978, 979, 980, 981, + 982, 983, 984, 985, 986, 989, 990, 991, 992, 993, + 994, 995, 996, 997, 998, 987, 999, 1000, 1001, 1002, + 1003, 988, 1004, 1005, 1006, 1007, 1008, 1009, 1010, 1011, + 1012, 989, 990, 991, 992, 993, 994, 995, 996, 997, + 998, 1013, 999, 1000, 1001, 1002, 1003, 1014, 1004, 1005, + 1006, 1007, 1008, 1009, 1010, 1011, 1012, 1015, 1016, 1017, + 1018, 1019, 1020, 1021, 1022, 1023, 1024, 1013, 1025, 1026, + 1027, 1028, 1029, 1014, 1030, 1031, 1032, 1033, 1034, 1035, + 1036, 1037, 1038, 1015, 1016, 1017, 1018, 1019, 1020, 1021, + + 1022, 1023, 1024, 1039, 1025, 1026, 1027, 1028, 1029, 1040, + 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1041, + 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1039, + 1051, 1052, 1053, 1054, 1055, 1040, 1056, 1057, 1058, 1059, + 1060, 1061, 1062, 1063, 1064, 1041, 1042, 1043, 1044, 1045, + 1046, 1047, 1048, 1049, 1050, 1065, 1051, 1052, 1053, 1054, + 1055, 1066, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, + 1064, 914, 914, 914, 914, 914, 914, 914, 914, 1281, + 1281, 1065, 1281, 1281, 1281, 1281, 1069, 1066, 916, 916, + 916, 916, 916, 916, 916, 916, 916, 916, 916, 916, + + 916, 916, 916, 916, 919, 919, 919, 919, 919, 919, + 919, 919, 1069, 1281, 1070, 1067, 1071, 1072, 1073, 1074, + 1075, 1076, 1077, 918, 1078, 1079, 1080, 1081, 1082, 1083, + 1084, 1068, 919, 919, 919, 919, 919, 919, 919, 919, + 1070, 1067, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 918, + 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1068, 1085, 921, + 1086, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, + 1097, 1098, 1099, 1087, 1100, 1101, 1102, 1103, 1104, 1105, + 1106, 1107, 1108, 1110, 1085, 921, 1086, 1088, 1089, 1090, + 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1087, + + 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1110, + 1111, 1112, 1113, 1114, 1115, 1116, 1117, 1118, 1119, 1120, + 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, 1129, 1130, + 1131, 1132, 1133, 1134, 1135, 1136, 1111, 1112, 1113, 1114, + 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, + 1125, 1126, 1127, 1128, 1129, 1130, 1131, 1132, 1133, 1134, + 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, + 1145, 1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, + 1155, 1156, 1157, 1158, 1159, 1160, 1161, 1162, 1137, 1138, + 1139, 1140, 1141, 1142, 1143, 1144, 1145, 1146, 1147, 1148, + + 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, + 1159, 1160, 1161, 1162, 1163, 1164, 1165, 1166, 1167, 1168, + 1169, 1170, 1171, 1172, 1173, 1174, 1175, 1176, 1177, 1178, + 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1187, 1188, + 1163, 1164, 1165, 1166, 1167, 1168, 1169, 1170, 1171, 1172, + 1173, 1174, 1175, 1176, 1177, 1178, 1179, 1180, 1181, 1182, + 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1192, + 1193, 1194, 1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202, + 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210, 1211, 1212, + 1213, 1214, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1196, + + 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, + 1207, 1208, 1209, 1210, 1211, 1212, 1213, 1214, 1215, 1216, + 1217, 1218, 1219, 1220, 1221, 1222, 1223, 1224, 1225, 1226, + 1227, 1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, 1236, + 1237, 1238, 1239, 1240, 1215, 1216, 1217, 1218, 1219, 1220, + 1221, 1222, 1223, 1224, 1225, 1226, 1227, 1228, 1229, 1230, + 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, 1240, + 1241, 1242, 1243, 1244, 1245, 1246, 1247, 1248, 1249, 1250, + 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, 1259, 1260, + 1261, 1262, 1263, 1264, 1265, 1266, 1241, 1242, 1243, 1244, + + 1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, + 1255, 1256, 1257, 1258, 1259, 1260, 1261, 1262, 1263, 1264, + 1265, 1266, 1267, 1268, 1269, 1270, 1271, 1272, 1273, 1274, + 1275, 1276, 1277, 1278, 1279, 1280, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1267, 1268, + 1269, 1270, 1271, 1272, 1273, 1274, 1275, 1276, 1277, 1278, + 1279, 1280, 45, 45, 48, 48, 199, 199, 44, 44, + 47, 47, 198, 198, 3, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281 } ; -static yyconst flex_int16_t yy_chk[3037] = +static yyconst flex_int16_t yy_chk[3048] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, @@ -1158,7 +1160,7 @@ static yyconst flex_int16_t yy_chk[3037] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 8, 8, 8, 1276, 8, 9, 9, 9, + 1, 1, 8, 8, 8, 1282, 8, 9, 9, 9, 108, 108, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, @@ -1168,13 +1170,13 @@ static yyconst flex_int16_t yy_chk[3037] = 18, 14, 40, 12, 611, 611, 13, 14, 18, 12, 12, 22, 18, 12, 25, 22, 18, 31, 35, 22, 35, 39, 40, 35, 40, 22, 18, 14, 40, 12, - 15, 36, 54, 978, 21, 36, 38, 15, 21, 36, + 15, 36, 54, 980, 21, 36, 38, 15, 21, 36, 15, 15, 15, 61, 15, 21, 15, 15, 38, 15, - 15, 21, 15, 62, 15, 712, 15, 36, 54, 21, + 15, 21, 15, 62, 15, 713, 15, 36, 54, 21, 21, 36, 38, 15, 21, 36, 15, 15, 15, 61, 15, 21, 15, 15, 38, 15, 15, 21, 15, 62, - 15, 16, 28, 710, 26, 21, 28, 64, 26, 16, + 15, 16, 28, 711, 26, 21, 28, 64, 26, 16, 16, 66, 26, 16, 70, 16, 28, 16, 26, 28, 16, 71, 28, 16, 16, 568, 72, 477, 28, 16, 26, 16, 28, 64, 26, 16, 16, 66, 26, 16, @@ -1308,183 +1310,184 @@ static yyconst flex_int16_t yy_chk[3037] = 357, 358, 343, 344, 345, 347, 345, 348, 349, 360, 350, 351, 352, 354, 355, 361, 362, 364, 365, 366, 367, 368, 369, 370, 371, 372, 357, 358, 373, 374, - 367, 375, 376, 377, 379, 360, 380, 382, 383, 384, + 367, 375, 376, 377, 380, 360, 379, 382, 383, 384, 385, 361, 362, 364, 365, 366, 367, 368, 369, 370, - 371, 372, 386, 389, 373, 374, 367, 375, 376, 377, - 379, 381, 380, 382, 383, 384, 385, 381, 387, 390, - 381, 391, 387, 392, 393, 394, 396, 397, 386, 389, - 398, 395, 387, 395, 399, 393, 401, 381, 402, 403, - 402, 404, 405, 381, 387, 390, 381, 391, 387, 392, - - 393, 394, 396, 397, 406, 407, 398, 395, 387, 395, - 399, 393, 401, 408, 402, 403, 402, 404, 405, 409, - 410, 411, 412, 413, 414, 415, 416, 417, 419, 420, - 406, 407, 421, 423, 424, 425, 426, 427, 428, 408, - 429, 430, 431, 432, 433, 409, 410, 411, 412, 413, - 414, 415, 416, 417, 419, 420, 434, 435, 421, 423, - 424, 425, 426, 427, 428, 436, 429, 430, 431, 432, - 433, 437, 438, 440, 441, 441, 442, 443, 0, 0, - 0, 0, 434, 435, 0, 0, 0, 0, 0, 0, - 0, 436, 0, 0, 0, 0, 0, 437, 438, 440, - - 441, 441, 442, 443, 444, 444, 444, 444, 444, 444, + 371, 372, 379, 386, 373, 374, 367, 375, 376, 377, + 380, 381, 379, 382, 383, 384, 385, 381, 387, 389, + 381, 390, 387, 391, 392, 393, 394, 396, 379, 386, + 397, 395, 387, 395, 398, 399, 393, 381, 401, 402, + 403, 402, 404, 381, 387, 389, 381, 390, 387, 391, + + 392, 393, 394, 396, 405, 406, 397, 395, 387, 395, + 398, 399, 393, 407, 401, 402, 403, 402, 404, 408, + 409, 410, 411, 412, 413, 414, 415, 416, 417, 419, + 405, 406, 420, 421, 423, 424, 425, 426, 427, 407, + 428, 429, 430, 431, 432, 408, 409, 410, 411, 412, + 413, 414, 415, 416, 417, 419, 433, 434, 420, 421, + 423, 424, 425, 426, 427, 435, 428, 429, 430, 431, + 432, 436, 437, 438, 440, 441, 441, 442, 443, 0, + 0, 0, 433, 434, 0, 0, 0, 0, 0, 0, + 0, 435, 0, 0, 0, 0, 0, 436, 437, 438, + + 440, 441, 441, 442, 443, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, 444, - 444, 444, 444, 445, 446, 450, 451, 452, 455, 455, - 455, 455, 455, 455, 455, 455, 456, 456, 456, 456, - 456, 456, 456, 456, 0, 0, 0, 0, 0, 445, - - 446, 450, 451, 452, 457, 457, 457, 457, 457, 457, - 457, 457, 457, 458, 458, 458, 458, 458, 458, 458, - 458, 458, 459, 459, 459, 459, 459, 459, 459, 459, - 459, 460, 461, 462, 463, 464, 465, 466, 467, 468, - 469, 470, 471, 472, 474, 476, 478, 481, 482, 483, - 484, 485, 486, 0, 488, 489, 490, 460, 461, 462, - 463, 464, 465, 466, 467, 468, 469, 470, 471, 472, - 474, 476, 478, 481, 482, 483, 484, 485, 486, 487, - 488, 489, 490, 491, 492, 493, 494, 487, 495, 497, - 498, 501, 503, 504, 0, 506, 507, 0, 506, 494, - - 509, 510, 511, 513, 515, 487, 505, 516, 518, 491, - 492, 493, 494, 487, 495, 497, 498, 501, 503, 504, - 505, 506, 507, 505, 506, 494, 509, 510, 511, 513, - 515, 517, 505, 516, 518, 519, 520, 517, 521, 522, - 523, 524, 525, 527, 528, 530, 505, 531, 532, 505, - 533, 534, 535, 538, 539, 540, 541, 517, 543, 544, - 546, 519, 520, 517, 521, 522, 523, 524, 525, 527, - 528, 530, 547, 531, 532, 548, 533, 534, 535, 538, - 539, 540, 541, 549, 543, 544, 546, 550, 553, 554, - 555, 556, 558, 559, 560, 562, 563, 566, 547, 567, - - 569, 548, 570, 559, 571, 572, 573, 575, 577, 549, - 578, 579, 580, 550, 553, 554, 555, 556, 558, 559, - 560, 562, 563, 566, 582, 567, 569, 583, 570, 559, - 571, 572, 573, 575, 577, 584, 578, 579, 580, 585, - 586, 587, 589, 590, 593, 594, 598, 599, 601, 602, - 582, 603, 604, 583, 605, 606, 608, 609, 610, 612, - 613, 584, 614, 615, 616, 585, 586, 587, 589, 590, - 593, 594, 598, 599, 601, 602, 617, 603, 604, 618, - 605, 606, 608, 609, 610, 612, 613, 620, 614, 615, - 616, 621, 622, 623, 624, 625, 626, 627, 629, 630, - - 631, 632, 617, 633, 635, 618, 637, 638, 639, 640, - 641, 642, 622, 620, 643, 644, 645, 621, 622, 623, - 624, 625, 626, 627, 629, 630, 631, 632, 647, 633, - 635, 650, 637, 638, 639, 640, 641, 642, 622, 651, - 643, 644, 645, 652, 653, 654, 656, 657, 658, 659, - 658, 660, 661, 662, 647, 664, 666, 650, 667, 668, - 672, 673, 665, 674, 675, 651, 677, 678, 679, 652, - 653, 654, 656, 657, 658, 659, 658, 660, 661, 662, - 665, 664, 666, 711, 667, 668, 672, 673, 665, 674, - 675, 680, 677, 678, 679, 680, 715, 716, 716, 716, - - 716, 716, 716, 716, 716, 0, 665, 0, 0, 711, - 0, 0, 0, 0, 0, 0, 0, 680, 0, 0, - 0, 680, 715, 717, 717, 717, 717, 717, 717, 717, - 717, 717, 718, 718, 718, 718, 718, 718, 718, 718, - 719, 719, 719, 719, 719, 719, 719, 719, 719, 720, - 720, 720, 720, 720, 720, 720, 720, 724, 725, 726, - 728, 729, 730, 731, 735, 736, 738, 740, 719, 912, - 912, 912, 912, 912, 912, 912, 912, 0, 741, 743, - 744, 745, 746, 724, 725, 726, 728, 729, 730, 731, - 735, 736, 738, 740, 719, 721, 721, 721, 721, 721, - - 721, 721, 721, 721, 741, 743, 744, 745, 746, 747, - 748, 749, 750, 751, 752, 753, 754, 755, 756, 0, - 759, 760, 761, 721, 762, 0, 763, 764, 765, 766, - 768, 769, 770, 771, 758, 747, 748, 749, 750, 751, - 752, 753, 754, 755, 756, 758, 759, 760, 761, 721, - 762, 758, 763, 764, 765, 766, 768, 769, 770, 771, - 758, 772, 773, 774, 776, 777, 778, 780, 781, 782, - 783, 758, 784, 784, 785, 786, 787, 758, 789, 791, - 794, 795, 797, 798, 799, 800, 801, 772, 773, 774, - 776, 777, 778, 780, 781, 782, 783, 802, 784, 784, - - 785, 786, 787, 803, 789, 791, 794, 795, 797, 798, - 799, 800, 801, 804, 805, 806, 807, 808, 809, 811, - 812, 813, 815, 802, 817, 819, 820, 822, 823, 803, - 824, 826, 827, 828, 830, 831, 832, 833, 835, 804, - 805, 806, 807, 808, 809, 811, 812, 813, 815, 836, - 817, 819, 820, 822, 823, 837, 824, 826, 827, 828, - 830, 831, 832, 833, 835, 838, 840, 841, 844, 846, - 847, 848, 849, 850, 851, 836, 853, 854, 855, 857, - 858, 837, 859, 860, 861, 863, 864, 866, 867, 868, - 870, 838, 840, 841, 844, 846, 847, 848, 849, 850, - - 851, 872, 853, 854, 855, 857, 858, 873, 859, 860, - 861, 863, 864, 866, 867, 868, 870, 874, 876, 882, - 883, 884, 885, 886, 888, 889, 890, 872, 892, 894, - 895, 896, 897, 873, 898, 899, 900, 901, 902, 904, - 905, 906, 907, 874, 876, 882, 883, 884, 885, 886, - 888, 889, 890, 911, 892, 894, 895, 896, 897, 0, - 898, 899, 900, 901, 902, 904, 905, 906, 907, 913, - 913, 913, 913, 913, 913, 913, 913, 0, 920, 911, - 914, 914, 914, 914, 914, 914, 914, 914, 915, 915, - 915, 915, 915, 915, 915, 915, 917, 917, 917, 917, - - 917, 917, 917, 917, 920, 0, 921, 914, 922, 923, - 927, 928, 929, 930, 933, 915, 935, 938, 940, 941, - 943, 944, 946, 917, 918, 918, 918, 918, 918, 918, - 918, 918, 921, 914, 922, 923, 927, 928, 929, 930, - 933, 915, 935, 938, 940, 941, 943, 944, 946, 917, - 947, 918, 948, 950, 951, 952, 953, 954, 955, 956, - 959, 961, 962, 963, 964, 948, 965, 967, 968, 969, - 970, 971, 972, 974, 975, 980, 947, 918, 948, 950, - 951, 952, 953, 954, 955, 956, 959, 961, 962, 963, - 964, 948, 965, 967, 968, 969, 970, 971, 972, 974, - - 975, 980, 981, 982, 984, 988, 989, 990, 991, 992, - 993, 994, 995, 996, 999, 1001, 1003, 1006, 1016, 1019, - 1020, 1021, 1022, 1023, 1024, 1025, 1029, 1030, 981, 982, - 984, 988, 989, 990, 991, 992, 993, 994, 995, 996, - 999, 1001, 1003, 1006, 1016, 1019, 1020, 1021, 1022, 1023, - 1024, 1025, 1029, 1030, 1031, 1034, 1036, 1037, 1039, 1042, - 1044, 1045, 1047, 1049, 1050, 1051, 1054, 1055, 1057, 1060, - 1062, 1067, 1068, 1072, 1073, 1074, 1075, 1076, 1078, 1079, - 1031, 1034, 1036, 1037, 1039, 1042, 1044, 1045, 1047, 1049, - 1050, 1051, 1054, 1055, 1057, 1060, 1062, 1067, 1068, 1072, - - 1073, 1074, 1075, 1076, 1078, 1079, 1081, 1082, 1083, 1084, - 1087, 1088, 1090, 1091, 1092, 1093, 1098, 1100, 1101, 1102, - 1103, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1114, - 1115, 1118, 1081, 1082, 1083, 1084, 1087, 1088, 1090, 1091, - 1092, 1093, 1098, 1100, 1101, 1102, 1103, 1105, 1106, 1107, - 1108, 1109, 1110, 1111, 1112, 1114, 1115, 1118, 1120, 1121, - 1123, 1124, 1127, 1128, 1129, 1130, 1131, 1133, 1134, 1135, - 1136, 1138, 1139, 1142, 1143, 1145, 1146, 1147, 1148, 1150, - 1151, 1153, 1154, 1155, 1120, 1121, 1123, 1124, 1127, 1128, - 1129, 1130, 1131, 1133, 1134, 1135, 1136, 1138, 1139, 1142, - - 1143, 1145, 1146, 1147, 1148, 1150, 1151, 1153, 1154, 1155, - 1156, 1158, 1162, 1163, 1164, 1167, 1168, 1172, 1173, 1175, - 1181, 1183, 1184, 1185, 1186, 1187, 1190, 1192, 1194, 1196, - 1198, 1199, 1201, 1203, 1204, 1205, 1156, 1158, 1162, 1163, - 1164, 1167, 1168, 1172, 1173, 1175, 1181, 1183, 1184, 1185, - 1186, 1187, 1190, 1192, 1194, 1196, 1198, 1199, 1201, 1203, - 1204, 1205, 1209, 1211, 1213, 1214, 1215, 1217, 1220, 1221, - 1222, 1224, 1226, 1228, 1229, 1230, 1231, 1232, 1233, 1234, - 1236, 1237, 1243, 1244, 1246, 1248, 1251, 1254, 1209, 1211, - 1213, 1214, 1215, 1217, 1220, 1221, 1222, 1224, 1226, 1228, - - 1229, 1230, 1231, 1232, 1233, 1234, 1236, 1237, 1243, 1244, - 1246, 1248, 1251, 1254, 1255, 1256, 1259, 1260, 1261, 1264, - 1265, 1266, 1267, 1269, 1271, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 1255, 1256, 1259, 1260, 1261, 1264, 1265, 1266, 1267, 1269, - 1271, 1277, 1277, 1278, 1278, 1279, 1279, 1280, 1280, 1281, - 1281, 1282, 1282, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, 1275, - 1275, 1275, 1275, 1275, 1275, 1275 + 444, 444, 444, 444, 445, 446, 450, 451, 452, 455, + 455, 455, 455, 455, 455, 455, 455, 456, 456, 456, + 456, 456, 456, 456, 456, 0, 0, 0, 0, 0, + + 445, 446, 450, 451, 452, 457, 457, 457, 457, 457, + 457, 457, 457, 457, 458, 458, 458, 458, 458, 458, + 458, 458, 458, 459, 459, 459, 459, 459, 459, 459, + 459, 459, 460, 461, 462, 463, 464, 465, 466, 467, + 468, 469, 470, 471, 472, 474, 476, 478, 481, 482, + 483, 484, 485, 486, 0, 488, 489, 490, 460, 461, + 462, 463, 464, 465, 466, 467, 468, 469, 470, 471, + 472, 474, 476, 478, 481, 482, 483, 484, 485, 486, + 487, 488, 489, 490, 491, 492, 493, 494, 487, 495, + 497, 498, 501, 503, 504, 0, 506, 507, 0, 506, + + 494, 509, 510, 511, 513, 515, 487, 505, 516, 518, + 491, 492, 493, 494, 487, 495, 497, 498, 501, 503, + 504, 505, 506, 507, 505, 506, 494, 509, 510, 511, + 513, 515, 517, 505, 516, 518, 519, 520, 517, 521, + 522, 523, 524, 525, 527, 528, 530, 505, 531, 532, + 505, 533, 534, 535, 538, 539, 540, 541, 517, 543, + 544, 546, 519, 520, 517, 521, 522, 523, 524, 525, + 527, 528, 530, 547, 531, 532, 548, 533, 534, 535, + 538, 539, 540, 541, 549, 543, 544, 546, 550, 553, + 554, 555, 556, 558, 559, 560, 562, 563, 566, 547, + + 567, 569, 548, 570, 559, 571, 572, 573, 575, 577, + 549, 578, 579, 580, 550, 553, 554, 555, 556, 558, + 559, 560, 562, 563, 566, 582, 567, 569, 583, 570, + 559, 571, 572, 573, 575, 577, 584, 578, 579, 580, + 585, 586, 587, 589, 590, 593, 594, 598, 599, 601, + 602, 582, 603, 604, 583, 605, 606, 608, 609, 610, + 612, 613, 584, 614, 615, 616, 585, 586, 587, 589, + 590, 593, 594, 598, 599, 601, 602, 617, 603, 604, + 618, 605, 606, 608, 609, 610, 612, 613, 619, 614, + 615, 616, 621, 622, 624, 623, 625, 626, 627, 628, + + 630, 631, 632, 617, 633, 634, 618, 636, 638, 639, + 640, 641, 642, 643, 619, 623, 644, 645, 621, 622, + 624, 623, 625, 626, 627, 628, 630, 631, 632, 646, + 633, 634, 648, 636, 638, 639, 640, 641, 642, 643, + 651, 623, 644, 645, 652, 653, 654, 655, 657, 658, + 659, 660, 659, 661, 662, 646, 663, 665, 648, 667, + 668, 669, 673, 666, 674, 675, 651, 676, 678, 679, + 652, 653, 654, 655, 657, 658, 659, 660, 659, 661, + 662, 666, 663, 665, 680, 667, 668, 669, 673, 666, + 674, 675, 681, 676, 678, 679, 681, 712, 716, 717, + + 717, 717, 717, 717, 717, 717, 717, 666, 0, 0, + 680, 0, 0, 0, 0, 0, 0, 0, 681, 0, + 0, 0, 681, 712, 716, 718, 718, 718, 718, 718, + 718, 718, 718, 718, 719, 719, 719, 719, 719, 719, + 719, 719, 720, 720, 720, 720, 720, 720, 720, 720, + 720, 721, 721, 721, 721, 721, 721, 721, 721, 725, + 726, 727, 729, 730, 731, 732, 736, 737, 739, 741, + 720, 914, 914, 914, 914, 914, 914, 914, 914, 0, + 742, 744, 745, 746, 747, 725, 726, 727, 729, 730, + 731, 732, 736, 737, 739, 741, 720, 722, 722, 722, + + 722, 722, 722, 722, 722, 722, 742, 744, 745, 746, + 747, 748, 749, 750, 751, 752, 753, 754, 755, 756, + 757, 0, 760, 761, 762, 722, 763, 0, 764, 765, + 766, 767, 769, 770, 771, 772, 759, 748, 749, 750, + 751, 752, 753, 754, 755, 756, 757, 759, 760, 761, + 762, 722, 763, 759, 764, 765, 766, 767, 769, 770, + 771, 772, 759, 773, 774, 775, 777, 778, 779, 781, + 782, 783, 784, 759, 785, 785, 786, 787, 788, 759, + 790, 792, 795, 796, 798, 799, 800, 801, 802, 773, + 774, 775, 777, 778, 779, 781, 782, 783, 784, 803, + + 785, 785, 786, 787, 788, 804, 790, 792, 795, 796, + 798, 799, 800, 801, 802, 805, 806, 807, 808, 809, + 810, 812, 813, 814, 816, 803, 818, 820, 821, 823, + 824, 804, 825, 827, 828, 829, 831, 832, 833, 834, + 836, 805, 806, 807, 808, 809, 810, 812, 813, 814, + 816, 837, 818, 820, 821, 823, 824, 838, 825, 827, + 828, 829, 831, 832, 833, 834, 836, 839, 841, 842, + 845, 847, 848, 849, 850, 851, 852, 837, 853, 855, + 856, 857, 859, 838, 860, 861, 862, 863, 865, 866, + 868, 869, 870, 839, 841, 842, 845, 847, 848, 849, + + 850, 851, 852, 872, 853, 855, 856, 857, 859, 874, + 860, 861, 862, 863, 865, 866, 868, 869, 870, 875, + 876, 878, 884, 885, 886, 887, 888, 890, 891, 872, + 892, 894, 896, 897, 898, 874, 899, 900, 901, 902, + 903, 904, 906, 907, 908, 875, 876, 878, 884, 885, + 886, 887, 888, 890, 891, 909, 892, 894, 896, 897, + 898, 913, 899, 900, 901, 902, 903, 904, 906, 907, + 908, 915, 915, 915, 915, 915, 915, 915, 915, 0, + 0, 909, 0, 0, 0, 0, 922, 913, 916, 916, + 916, 916, 916, 916, 916, 916, 917, 917, 917, 917, + + 917, 917, 917, 917, 919, 919, 919, 919, 919, 919, + 919, 919, 922, 0, 923, 916, 924, 925, 929, 930, + 931, 932, 935, 917, 937, 940, 942, 943, 945, 946, + 948, 919, 920, 920, 920, 920, 920, 920, 920, 920, + 923, 916, 924, 925, 929, 930, 931, 932, 935, 917, + 937, 940, 942, 943, 945, 946, 948, 919, 949, 920, + 950, 952, 953, 954, 955, 956, 957, 958, 961, 963, + 964, 965, 966, 950, 967, 969, 970, 971, 972, 973, + 974, 976, 977, 982, 949, 920, 950, 952, 953, 954, + 955, 956, 957, 958, 961, 963, 964, 965, 966, 950, + + 967, 969, 970, 971, 972, 973, 974, 976, 977, 982, + 983, 984, 986, 990, 991, 992, 993, 994, 995, 996, + 997, 998, 1001, 1003, 1005, 1008, 1018, 1021, 1022, 1023, + 1024, 1025, 1026, 1027, 1028, 1032, 983, 984, 986, 990, + 991, 992, 993, 994, 995, 996, 997, 998, 1001, 1003, + 1005, 1008, 1018, 1021, 1022, 1023, 1024, 1025, 1026, 1027, + 1028, 1032, 1033, 1034, 1037, 1039, 1040, 1042, 1045, 1047, + 1048, 1050, 1052, 1053, 1054, 1057, 1058, 1060, 1063, 1065, + 1070, 1071, 1075, 1076, 1077, 1078, 1079, 1081, 1033, 1034, + 1037, 1039, 1040, 1042, 1045, 1047, 1048, 1050, 1052, 1053, + + 1054, 1057, 1058, 1060, 1063, 1065, 1070, 1071, 1075, 1076, + 1077, 1078, 1079, 1081, 1082, 1084, 1085, 1086, 1087, 1090, + 1091, 1093, 1094, 1095, 1096, 1101, 1103, 1104, 1105, 1106, + 1108, 1109, 1110, 1111, 1112, 1113, 1114, 1115, 1117, 1118, + 1082, 1084, 1085, 1086, 1087, 1090, 1091, 1093, 1094, 1095, + 1096, 1101, 1103, 1104, 1105, 1106, 1108, 1109, 1110, 1111, + 1112, 1113, 1114, 1115, 1117, 1118, 1121, 1123, 1124, 1126, + 1127, 1130, 1131, 1132, 1133, 1134, 1135, 1137, 1138, 1139, + 1140, 1142, 1143, 1146, 1147, 1149, 1150, 1151, 1152, 1154, + 1155, 1157, 1121, 1123, 1124, 1126, 1127, 1130, 1131, 1132, + + 1133, 1134, 1135, 1137, 1138, 1139, 1140, 1142, 1143, 1146, + 1147, 1149, 1150, 1151, 1152, 1154, 1155, 1157, 1158, 1159, + 1160, 1162, 1166, 1167, 1168, 1171, 1172, 1176, 1177, 1179, + 1185, 1187, 1188, 1189, 1190, 1191, 1194, 1195, 1197, 1199, + 1201, 1203, 1204, 1206, 1158, 1159, 1160, 1162, 1166, 1167, + 1168, 1171, 1172, 1176, 1177, 1179, 1185, 1187, 1188, 1189, + 1190, 1191, 1194, 1195, 1197, 1199, 1201, 1203, 1204, 1206, + 1208, 1209, 1210, 1214, 1216, 1218, 1219, 1220, 1222, 1225, + 1226, 1227, 1229, 1231, 1233, 1235, 1236, 1237, 1238, 1239, + 1240, 1242, 1243, 1249, 1250, 1252, 1208, 1209, 1210, 1214, + + 1216, 1218, 1219, 1220, 1222, 1225, 1226, 1227, 1229, 1231, + 1233, 1235, 1236, 1237, 1238, 1239, 1240, 1242, 1243, 1249, + 1250, 1252, 1254, 1257, 1260, 1261, 1262, 1265, 1266, 1267, + 1270, 1271, 1272, 1273, 1275, 1277, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1254, 1257, + 1260, 1261, 1262, 1265, 1266, 1267, 1270, 1271, 1272, 1273, + 1275, 1277, 1283, 1283, 1284, 1284, 1285, 1285, 1286, 1286, + 1287, 1287, 1288, 1288, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, 1281, + 1281, 1281, 1281, 1281, 1281, 1281, 1281 } ; /* The intent behind this definition is that it'll catch @@ -1510,7 +1513,7 @@ static yyconst flex_int16_t yy_chk[3037] = extern YYSTYPE* frlval; /* rules */ -#line 1514 "frame/lex.C" +#line 1517 "frame/lex.C" #define INITIAL 0 @@ -1613,7 +1616,7 @@ YY_DECL #line 28 "frame/lex.L" -#line 1617 "frame/lex.C" +#line 1620 "frame/lex.C" if ( !(yy_init) ) { @@ -1666,13 +1669,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1276 ) + if ( yy_current_state >= 1282 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 1275 ); + while ( yy_current_state != 1281 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -2780,641 +2783,646 @@ YY_RULE_SETUP case 218: YY_RULE_SETUP #line 247 "frame/lex.L" -{return PRINT_;} +{return PRECISION_;} YY_BREAK case 219: YY_RULE_SETUP #line 248 "frame/lex.L" -{return PRESERVE_;} +{return PRINT_;} YY_BREAK case 220: YY_RULE_SETUP #line 249 "frame/lex.L" -{return PROJECTION_;} +{return PRESERVE_;} YY_BREAK case 221: YY_RULE_SETUP #line 250 "frame/lex.L" -{return PROPERTY_;} +{return PROJECTION_;} YY_BREAK case 222: YY_RULE_SETUP #line 251 "frame/lex.L" -{return PROS_;} +{return PROPERTY_;} YY_BREAK case 223: YY_RULE_SETUP #line 252 "frame/lex.L" -{return PUBLICATION_;} +{return PROS_;} YY_BREAK case 224: YY_RULE_SETUP #line 253 "frame/lex.L" -{return QUERY_;} +{return PUBLICATION_;} YY_BREAK case 225: YY_RULE_SETUP #line 254 "frame/lex.L" -{return RADIAL_;} +{return QUERY_;} YY_BREAK case 226: YY_RULE_SETUP #line 255 "frame/lex.L" -{return RADIUS_;} +{return RADIAL_;} YY_BREAK case 227: YY_RULE_SETUP #line 256 "frame/lex.L" -{return REGION_;} +{return RADIUS_;} YY_BREAK case 228: YY_RULE_SETUP #line 257 "frame/lex.L" -{return REPLACE_;} +{return REGION_;} YY_BREAK case 229: YY_RULE_SETUP #line 258 "frame/lex.L" -{return RESAMPLE_;} +{return REPLACE_;} YY_BREAK case 230: YY_RULE_SETUP #line 259 "frame/lex.L" -{return RESET_;} +{return RESAMPLE_;} YY_BREAK case 231: YY_RULE_SETUP #line 260 "frame/lex.L" -{return RESOLUTION_;} +{return RESET_;} YY_BREAK case 232: YY_RULE_SETUP #line 261 "frame/lex.L" -{return RGB_;} +{return RESOLUTION_;} YY_BREAK case 233: YY_RULE_SETUP #line 262 "frame/lex.L" -{return ROOT_;} +{return RGB_;} YY_BREAK case 234: YY_RULE_SETUP #line 263 "frame/lex.L" -{return ROTATE_;} +{return ROOT_;} YY_BREAK case 235: YY_RULE_SETUP #line 264 "frame/lex.L" -{return RULER_;} +{return ROTATE_;} YY_BREAK case 236: YY_RULE_SETUP #line 265 "frame/lex.L" -{return SAMPLE_;} +{return RULER_;} YY_BREAK case 237: YY_RULE_SETUP #line 266 "frame/lex.L" -{return SAOIMAGE_;} +{return SAMPLE_;} YY_BREAK case 238: YY_RULE_SETUP #line 267 "frame/lex.L" -{return SAOTNG_;} +{return SAOIMAGE_;} YY_BREAK case 239: YY_RULE_SETUP #line 268 "frame/lex.L" -{return SAVE_;} +{return SAOTNG_;} YY_BREAK case 240: YY_RULE_SETUP #line 269 "frame/lex.L" -{return SCALE_;} +{return SAVE_;} YY_BREAK case 241: YY_RULE_SETUP #line 270 "frame/lex.L" -{return SCAN_;} +{return SCALE_;} YY_BREAK case 242: YY_RULE_SETUP #line 271 "frame/lex.L" -{return SCIENTIFIC_;} +{return SCAN_;} YY_BREAK case 243: YY_RULE_SETUP #line 272 "frame/lex.L" -{return SCOPE_;} +{return SCIENTIFIC_;} YY_BREAK case 244: YY_RULE_SETUP #line 273 "frame/lex.L" -{return SEGMENT_;} +{return SCOPE_;} YY_BREAK case 245: YY_RULE_SETUP #line 274 "frame/lex.L" -{return SELECT_;} +{return SEGMENT_;} YY_BREAK case 246: YY_RULE_SETUP #line 275 "frame/lex.L" -{return SET_;} +{return SELECT_;} YY_BREAK case 247: YY_RULE_SETUP #line 276 "frame/lex.L" -{return SEXAGESIMAL_;} +{return SET_;} YY_BREAK case 248: YY_RULE_SETUP #line 277 "frame/lex.L" -{return SHAPE_;} +{return SEXAGESIMAL_;} YY_BREAK case 249: YY_RULE_SETUP #line 278 "frame/lex.L" -{return SHARED_;} +{return SHAPE_;} YY_BREAK case 250: YY_RULE_SETUP #line 279 "frame/lex.L" -{return SHIFT_;} +{return SHARED_;} YY_BREAK case 251: YY_RULE_SETUP #line 280 "frame/lex.L" -{return SHMID_;} +{return SHIFT_;} YY_BREAK case 252: YY_RULE_SETUP #line 281 "frame/lex.L" -{return SHOW_;} +{return SHMID_;} YY_BREAK case 253: YY_RULE_SETUP #line 282 "frame/lex.L" -{return SIGMA_;} +{return SHOW_;} YY_BREAK case 254: YY_RULE_SETUP #line 283 "frame/lex.L" -{return SINH_;} +{return SIGMA_;} YY_BREAK case 255: YY_RULE_SETUP #line 284 "frame/lex.L" -{return SIZE_;} +{return SINH_;} YY_BREAK case 256: YY_RULE_SETUP #line 285 "frame/lex.L" -{return SLICE_;} +{return SIZE_;} YY_BREAK case 257: YY_RULE_SETUP #line 286 "frame/lex.L" -{return SMMAP_;} +{return SLICE_;} YY_BREAK case 258: YY_RULE_SETUP #line 287 "frame/lex.L" -{return SMOOTH_;} +{return SMMAP_;} YY_BREAK case 259: YY_RULE_SETUP #line 288 "frame/lex.L" -{return SOCKET_;} +{return SMOOTH_;} YY_BREAK case 260: YY_RULE_SETUP #line 289 "frame/lex.L" -{return SOCKETGZ_;} +{return SOCKET_;} YY_BREAK case 261: YY_RULE_SETUP #line 290 "frame/lex.L" -{return SOURCE_;} +{return SOCKETGZ_;} YY_BREAK case 262: YY_RULE_SETUP #line 291 "frame/lex.L" -{return SQRT_;} +{return SOURCE_;} YY_BREAK case 263: YY_RULE_SETUP #line 292 "frame/lex.L" -{return SQUARED_;} +{return SQRT_;} YY_BREAK case 264: YY_RULE_SETUP #line 293 "frame/lex.L" -{return SSHARED_;} +{return SQUARED_;} YY_BREAK case 265: YY_RULE_SETUP #line 294 "frame/lex.L" -{return STATS_;} +{return SSHARED_;} YY_BREAK case 266: YY_RULE_SETUP #line 295 "frame/lex.L" -{return STATUS_;} +{return STATS_;} YY_BREAK case 267: YY_RULE_SETUP #line 296 "frame/lex.L" -{return SUM_;} +{return STATUS_;} YY_BREAK case 268: YY_RULE_SETUP #line 297 "frame/lex.L" -{return SUPERGALACTIC_;} +{return SUM_;} YY_BREAK case 269: YY_RULE_SETUP #line 298 "frame/lex.L" -{return SYSTEM_;} +{return SUPERGALACTIC_;} YY_BREAK case 270: YY_RULE_SETUP #line 299 "frame/lex.L" -{return TABLE_;} +{return SYSTEM_;} YY_BREAK case 271: YY_RULE_SETUP #line 300 "frame/lex.L" -{return TAG_;} +{return TABLE_;} YY_BREAK case 272: YY_RULE_SETUP #line 301 "frame/lex.L" -{return TEMPLATE_;} +{return TAG_;} YY_BREAK case 273: YY_RULE_SETUP #line 302 "frame/lex.L" -{return TEXT_;} +{return TEMPLATE_;} YY_BREAK case 274: YY_RULE_SETUP #line 303 "frame/lex.L" -{return THREADS_;} +{return TEXT_;} YY_BREAK case 275: YY_RULE_SETUP #line 304 "frame/lex.L" -{return THREED_;} +{return THREADS_;} YY_BREAK case 276: YY_RULE_SETUP #line 305 "frame/lex.L" -{return THRESHOLD_;} +{return THREED_;} YY_BREAK case 277: YY_RULE_SETUP #line 306 "frame/lex.L" -{return THICK_;} +{return THRESHOLD_;} YY_BREAK case 278: YY_RULE_SETUP #line 307 "frame/lex.L" -{return TRANSPARENCY_;} +{return THICK_;} YY_BREAK case 279: YY_RULE_SETUP #line 308 "frame/lex.L" -{return TO_;} +{return TRANSPARENCY_;} YY_BREAK case 280: YY_RULE_SETUP #line 309 "frame/lex.L" -{return TOGGLE_;} +{return TO_;} YY_BREAK case 281: YY_RULE_SETUP #line 310 "frame/lex.L" -{return TOPHAT_;} +{return TOGGLE_;} YY_BREAK case 282: YY_RULE_SETUP #line 311 "frame/lex.L" -{return TRUE_;} +{return TOPHAT_;} YY_BREAK case 283: YY_RULE_SETUP #line 312 "frame/lex.L" -{return TYPE_;} +{return TRUE_;} YY_BREAK case 284: YY_RULE_SETUP #line 313 "frame/lex.L" -{return UNDO_;} +{return TYPE_;} YY_BREAK case 285: YY_RULE_SETUP #line 314 "frame/lex.L" -{return UNLOAD_;} +{return UNDO_;} YY_BREAK case 286: YY_RULE_SETUP #line 315 "frame/lex.L" -{return UNHIGHLITE_;} +{return UNLOAD_;} YY_BREAK case 287: YY_RULE_SETUP #line 316 "frame/lex.L" -{return UNSELECT_;} +{return UNHIGHLITE_;} YY_BREAK case 288: YY_RULE_SETUP #line 317 "frame/lex.L" -{return UPDATE_;} +{return UNSELECT_;} YY_BREAK case 289: YY_RULE_SETUP #line 318 "frame/lex.L" -{return USER_;} +{return UPDATE_;} YY_BREAK case 290: YY_RULE_SETUP #line 319 "frame/lex.L" -{return VALUE_;} +{return USER_;} YY_BREAK case 291: YY_RULE_SETUP #line 320 "frame/lex.L" -{return VAR_;} +{return VALUE_;} YY_BREAK case 292: YY_RULE_SETUP #line 321 "frame/lex.L" -{return VIEW_;} +{return VAR_;} YY_BREAK case 293: YY_RULE_SETUP #line 322 "frame/lex.L" -{return VECTOR_;} +{return VIEW_;} YY_BREAK case 294: YY_RULE_SETUP #line 323 "frame/lex.L" -{return VERSION_;} +{return VECTOR_;} YY_BREAK case 295: YY_RULE_SETUP #line 324 "frame/lex.L" -{return VERTEX_;} +{return VERSION_;} YY_BREAK case 296: YY_RULE_SETUP #line 325 "frame/lex.L" -{return VERTICAL_;} +{return VERTEX_;} YY_BREAK case 297: YY_RULE_SETUP #line 326 "frame/lex.L" -{return WARP_;} +{return VERTICAL_;} YY_BREAK case 298: YY_RULE_SETUP #line 327 "frame/lex.L" -{return WCS_;} +{return WARP_;} YY_BREAK case 299: YY_RULE_SETUP #line 328 "frame/lex.L" -{return WCSA_;} +{return WCS_;} YY_BREAK case 300: YY_RULE_SETUP #line 329 "frame/lex.L" -{return WCSB_;} +{return WCSA_;} YY_BREAK case 301: YY_RULE_SETUP #line 330 "frame/lex.L" -{return WCSC_;} +{return WCSB_;} YY_BREAK case 302: YY_RULE_SETUP #line 331 "frame/lex.L" -{return WCSD_;} +{return WCSC_;} YY_BREAK case 303: YY_RULE_SETUP #line 332 "frame/lex.L" -{return WCSE_;} +{return WCSD_;} YY_BREAK case 304: YY_RULE_SETUP #line 333 "frame/lex.L" -{return WCSF_;} +{return WCSE_;} YY_BREAK case 305: YY_RULE_SETUP #line 334 "frame/lex.L" -{return WCSG_;} +{return WCSF_;} YY_BREAK case 306: YY_RULE_SETUP #line 335 "frame/lex.L" -{return WCSH_;} +{return WCSG_;} YY_BREAK case 307: YY_RULE_SETUP #line 336 "frame/lex.L" -{return WCSI_;} +{return WCSH_;} YY_BREAK case 308: YY_RULE_SETUP #line 337 "frame/lex.L" -{return WCSJ_;} +{return WCSI_;} YY_BREAK case 309: YY_RULE_SETUP #line 338 "frame/lex.L" -{return WCSK_;} +{return WCSJ_;} YY_BREAK case 310: YY_RULE_SETUP #line 339 "frame/lex.L" -{return WCSL_;} +{return WCSK_;} YY_BREAK case 311: YY_RULE_SETUP #line 340 "frame/lex.L" -{return WCSM_;} +{return WCSL_;} YY_BREAK case 312: YY_RULE_SETUP #line 341 "frame/lex.L" -{return WCSN_;} +{return WCSM_;} YY_BREAK case 313: YY_RULE_SETUP #line 342 "frame/lex.L" -{return WCSO_;} +{return WCSN_;} YY_BREAK case 314: YY_RULE_SETUP #line 343 "frame/lex.L" -{return WCSP_;} +{return WCSO_;} YY_BREAK case 315: YY_RULE_SETUP #line 344 "frame/lex.L" -{return WCSQ_;} +{return WCSP_;} YY_BREAK case 316: YY_RULE_SETUP #line 345 "frame/lex.L" -{return WCSR_;} +{return WCSQ_;} YY_BREAK case 317: YY_RULE_SETUP #line 346 "frame/lex.L" -{return WCSS_;} +{return WCSR_;} YY_BREAK case 318: YY_RULE_SETUP #line 347 "frame/lex.L" -{return WCST_;} +{return WCSS_;} YY_BREAK case 319: YY_RULE_SETUP #line 348 "frame/lex.L" -{return WCSU_;} +{return WCST_;} YY_BREAK case 320: YY_RULE_SETUP #line 349 "frame/lex.L" -{return WCSV_;} +{return WCSU_;} YY_BREAK case 321: YY_RULE_SETUP #line 350 "frame/lex.L" -{return WCSW_;} +{return WCSV_;} YY_BREAK case 322: YY_RULE_SETUP #line 351 "frame/lex.L" -{return WCSX_;} +{return WCSW_;} YY_BREAK case 323: YY_RULE_SETUP #line 352 "frame/lex.L" -{return WCSY_;} +{return WCSX_;} YY_BREAK case 324: YY_RULE_SETUP #line 353 "frame/lex.L" -{return WCSZ_;} +{return WCSY_;} YY_BREAK case 325: YY_RULE_SETUP #line 354 "frame/lex.L" -{return WCS0_;} +{return WCSZ_;} YY_BREAK case 326: YY_RULE_SETUP #line 355 "frame/lex.L" -{return WFPC2_;} +{return WCS0_;} YY_BREAK case 327: YY_RULE_SETUP #line 356 "frame/lex.L" -{return WIDTH_;} +{return WFPC2_;} YY_BREAK case 328: YY_RULE_SETUP #line 357 "frame/lex.L" -{return WIN32_;} +{return WIDTH_;} YY_BREAK case 329: YY_RULE_SETUP #line 358 "frame/lex.L" -{return XML_;} +{return WIN32_;} YY_BREAK case 330: YY_RULE_SETUP #line 359 "frame/lex.L" -{return XY_;} +{return XML_;} YY_BREAK case 331: YY_RULE_SETUP #line 360 "frame/lex.L" -{return YES_;} +{return XY_;} YY_BREAK case 332: YY_RULE_SETUP #line 361 "frame/lex.L" -{return ZMAX_;} +{return YES_;} YY_BREAK case 333: YY_RULE_SETUP #line 362 "frame/lex.L" -{return ZSCALE_;} +{return ZMAX_;} YY_BREAK case 334: YY_RULE_SETUP #line 363 "frame/lex.L" -{return ZOOM_;} +{return ZSCALE_;} YY_BREAK case 335: YY_RULE_SETUP -#line 365 "frame/lex.L" +#line 364 "frame/lex.L" +{return ZOOM_;} + YY_BREAK +case 336: +YY_RULE_SETUP +#line 366 "frame/lex.L" { // Integer frlval->integer = atoi(yytext); return INT; } YY_BREAK -case 336: -#line 371 "frame/lex.L" case 337: +#line 372 "frame/lex.L" +case 338: YY_RULE_SETUP -#line 371 "frame/lex.L" +#line 372 "frame/lex.L" { // Real Number frlval->real = atof(yytext); return REAL; } YY_BREAK -case 338: +case 339: YY_RULE_SETUP -#line 376 "frame/lex.L" +#line 377 "frame/lex.L" { // Pointer frlval->ptr = (void*)strtoul(yytext,NULL,16); return POINTER; } YY_BREAK -case 339: -#line 382 "frame/lex.L" case 340: +#line 383 "frame/lex.L" +case 341: YY_RULE_SETUP -#line 382 "frame/lex.L" +#line 383 "frame/lex.L" { // degrees yytext[yyleng-1] = '\0'; frlval->real = atof(yytext); return ANGDEGREE; } YY_BREAK -case 341: -#line 389 "frame/lex.L" case 342: +#line 390 "frame/lex.L" +case 343: YY_RULE_SETUP -#line 389 "frame/lex.L" +#line 390 "frame/lex.L" { // radians yytext[yyleng-1] = '\0'; frlval->real = atof(yytext); return ANGRADIAN; } YY_BREAK -case 343: -#line 396 "frame/lex.L" case 344: +#line 397 "frame/lex.L" +case 345: YY_RULE_SETUP -#line 396 "frame/lex.L" +#line 397 "frame/lex.L" { // sexagesimal int ll = yyleng <(FRBUFSIZE-1) ? yyleng:(FRBUFSIZE-1); strncpy(frlval->str,yytext,ll); @@ -3422,11 +3430,11 @@ YY_RULE_SETUP return SEXSTR; } YY_BREAK -case 345: -#line 404 "frame/lex.L" case 346: +#line 405 "frame/lex.L" +case 347: YY_RULE_SETUP -#line 404 "frame/lex.L" +#line 405 "frame/lex.L" { // HMS int ll = yyleng <(FRBUFSIZE-1) ? yyleng:(FRBUFSIZE-1); strncpy(frlval->str,yytext,ll); @@ -3434,11 +3442,11 @@ YY_RULE_SETUP return HMSSTR; } YY_BREAK -case 347: -#line 412 "frame/lex.L" case 348: +#line 413 "frame/lex.L" +case 349: YY_RULE_SETUP -#line 412 "frame/lex.L" +#line 413 "frame/lex.L" { // DMS int ll = yyleng <(FRBUFSIZE-1) ? yyleng:(FRBUFSIZE-1); strncpy(frlval->str,yytext,ll); @@ -3446,13 +3454,13 @@ YY_RULE_SETUP return DMSSTR; } YY_BREAK -case 349: -/* rule 349 can match eol */ -#line 420 "frame/lex.L" case 350: /* rule 350 can match eol */ +#line 421 "frame/lex.L" +case 351: +/* rule 351 can match eol */ YY_RULE_SETUP -#line 420 "frame/lex.L" +#line 421 "frame/lex.L" { // Quoted String int ll = (yyleng-2)<(FRBUFSIZE-1) ? (yyleng-2):(FRBUFSIZE-1); strncpy(frlval->str,yytext+1,ll); // skip the " " @@ -3460,10 +3468,10 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 351: -/* rule 351 can match eol */ +case 352: +/* rule 352 can match eol */ YY_RULE_SETUP -#line 427 "frame/lex.L" +#line 428 "frame/lex.L" { // Quoted String int ll = (yyleng-2)<(FRBUFSIZE-1) ? (yyleng-2):(FRBUFSIZE-1); strncpy(frlval->str,yytext+1,ll); // skip the '{' @@ -3471,9 +3479,9 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 352: +case 353: YY_RULE_SETUP -#line 434 "frame/lex.L" +#line 435 "frame/lex.L" { // General String-- at least 2 printable chars int ll = yyleng <(FRBUFSIZE-1) ? yyleng:(FRBUFSIZE-1); strncpy(frlval->str,yytext,ll); @@ -3481,25 +3489,25 @@ YY_RULE_SETUP return STRING; } YY_BREAK -case 353: +case 354: YY_RULE_SETUP -#line 441 "frame/lex.L" +#line 442 "frame/lex.L" { // White Spaces } YY_BREAK -case 354: +case 355: YY_RULE_SETUP -#line 444 "frame/lex.L" +#line 445 "frame/lex.L" { // Else, return the char return toupper(yytext[0]); } YY_BREAK -case 355: +case 356: YY_RULE_SETUP -#line 448 "frame/lex.L" +#line 449 "frame/lex.L" ECHO; YY_BREAK -#line 3503 "frame/lex.C" +#line 3511 "frame/lex.C" case YY_STATE_EOF(INITIAL): yyterminate(); @@ -3881,7 +3889,7 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1276 ) + if ( yy_current_state >= 1282 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -3909,11 +3917,11 @@ int yyFlexLexer::yy_get_next_buffer() while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1276 ) + if ( yy_current_state >= 1282 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 1275); + yy_is_jam = (yy_current_state == 1281); return yy_is_jam ? 0 : yy_current_state; } @@ -4398,7 +4406,7 @@ void frfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 448 "frame/lex.L" +#line 449 "frame/lex.L" diff --git a/tksao/frame/lex.L b/tksao/frame/lex.L index 3a201e4..d75924c 100644 --- a/tksao/frame/lex.L +++ b/tksao/frame/lex.L @@ -244,6 +244,7 @@ pointer {return POINTER_;} polygon {return POLYGON_;} postscript {return POSTSCRIPT_;} pow {return POW_;} +precision {return PRECISION_;} print {return PRINT_;} preserve {return PRESERVE_;} projection {return PROJECTION_;} diff --git a/tksao/frame/line.C b/tksao/frame/line.C index 9f394ce..c38a5af 100644 --- a/tksao/frame/line.C +++ b/tksao/frame/line.C @@ -279,7 +279,7 @@ void Line::listSAOtng(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, { Vector v1 = ptr->mapFromRef(p1,Coord::IMAGE); Vector v2 = ptr->mapFromRef(p2,Coord::IMAGE); - str << type_ << '(' << setprecision(parent->precLinear) + str << type_ << '(' << setprecision(parent->precLinear_) << v1 << ',' << v2 << ')'; } break; diff --git a/tksao/frame/marker.C b/tksao/frame/marker.C index e0c8a19..9cd3fd8 100644 --- a/tksao/frame/marker.C +++ b/tksao/frame/marker.C @@ -1623,7 +1623,7 @@ void Marker::listXY(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, case Coord::PHYSICAL: case Coord::DETECTOR: case Coord::AMPLIFIER: - str << setprecision(parent->precLinear) << ptr->mapFromRef(center,sys); + str << setprecision(parent->precLinear_) << ptr->mapFromRef(center,sys); break; default: if (ptr->hasWCS(sys)) { @@ -1632,7 +1632,7 @@ void Marker::listXY(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, str << ra << ' ' << dec; } else - str << setprecision(parent->precLinear) << ptr->mapFromRef(center,sys); + str << setprecision(parent->precLinear_) << ptr->mapFromRef(center,sys); } break; } @@ -1688,7 +1688,7 @@ void Marker::XMLRow(XMLColName col, double val, int prec) void Marker::XMLRowARCSEC(XMLColName col, double val) { ostringstream str; - str << setprecision(parent->precArcsec) << fixed << val << ends; + str << setprecision(parent->precArcsec_) << fixed << val << ends; if (XMLCol[col]) delete [] XMLCol[col]; @@ -1715,7 +1715,7 @@ void Marker::XMLRow(XMLColName col, double* val, int cnt, int prec) void Marker::XMLRowARCSEC(XMLColName col, double* val, int cnt) { ostringstream str; - str << setprecision(parent->precArcsec) << fixed; + str << setprecision(parent->precArcsec_) << fixed; for (int ii=0; iiprecLinear) << vv << ')'; + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ')'; } void Point::listPost(ostream& str, int conj, int strip) @@ -826,7 +826,7 @@ void Point::listCiao(ostream& str, Coord::CoordSystem sys, int strip) case Coord::AMPLIFIER: { Vector vv = ptr->mapFromRef(center,Coord::PHYSICAL); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ')'; + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ')'; } break; default: @@ -855,7 +855,7 @@ void Point::listPros(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, coord.listProsCoordSystem(str,sys,sky); str << "; "; Vector vv = ptr->mapFromRef(center,sys); - str << type_ << ' ' << setprecision(parent->precLinear) << vv; + str << type_ << ' ' << setprecision(parent->precLinear_) << vv; } break; default: @@ -891,7 +891,7 @@ void Point::listSAOtng(ostream& str, Coord::CoordSystem sys, case Coord::AMPLIFIER: { Vector vv = ptr->mapFromRef(center,Coord::IMAGE); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ')'; + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ')'; } break; default: @@ -912,7 +912,7 @@ void Point::listSAOimage(ostream& str, int strip) // all coords are in image coords Vector vv = ptr->mapFromRef(center,Coord::IMAGE); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ')'; + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ')'; listSAOimagePost(str, strip); } diff --git a/tksao/frame/polygon.C b/tksao/frame/polygon.C index 42e1ab0..c1ebaa9 100644 --- a/tksao/frame/polygon.C +++ b/tksao/frame/polygon.C @@ -440,7 +440,7 @@ void Polygon::listCiao(ostream& str, Coord::CoordSystem sys, int strip) Vector vv = ptr->mapFromRef(vertex.current()->vector*mm,Coord::PHYSICAL); - str << setprecision(parent->precLinear) << vv; + str << setprecision(parent->precLinear_) << vv; } while (vertex.next()); str << ')'; @@ -487,7 +487,7 @@ void Polygon::listPros(ostream& str, Coord::CoordSystem sys, vertex.head(); do { Vector vv = ptr->mapFromRef(vertex.current()->vector*mm,sys); - str << ' ' << setprecision(parent->precLinear) << vv; + str << ' ' << setprecision(parent->precLinear_) << vv; } while (vertex.next()); } @@ -538,7 +538,7 @@ void Polygon::listSAOtng(ostream& str, Coord::CoordSystem sys, first=0; Vector vv = ptr->mapFromRef(vertex.current()->vector*mm,sys); - str << setprecision(parent->precLinear) << vv; + str << setprecision(parent->precLinear_) << vv; } while (vertex.next()); str << ')'; @@ -580,7 +580,7 @@ void Polygon::listSAOimage(ostream& str, int strip) first=0; Vector vv = ptr->mapFromRef(vertex.current()->vector*mm,Coord::IMAGE); - str << setprecision(parent->precLinear) << vv; + str << setprecision(parent->precLinear_) << vv; } while (vertex.next()); diff --git a/tksao/frame/projection.C b/tksao/frame/projection.C index 76ca516..8e849e9 100644 --- a/tksao/frame/projection.C +++ b/tksao/frame/projection.C @@ -357,7 +357,7 @@ void Projection::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, str << ra << ',' << dec << ','; listRADEC(ptr,p2,sys,sky,format); str << ra << ',' << dec << ','; - str << setprecision(parent->precArcsec) << fixed << ww << '"' << ')'; + str << setprecision(parent->precArcsec_) << fixed << ww << '"' << ')'; str.unsetf(ios_base::floatfield); } else @@ -377,7 +377,7 @@ void Projection::listNonCel(FitsImage* ptr, ostream& str, Vector v1 = ptr->mapFromRef(p1,sys); Vector v2 = ptr->mapFromRef(p2,sys); double ww = ptr->mapLenFromRef(width,sys); - str << type_ << '(' << setprecision(parent->precLinear) + str << type_ << '(' << setprecision(parent->precLinear_) << v1 << ',' << v2 << ',' << ww << ')'; } diff --git a/tksao/frame/text.C b/tksao/frame/text.C index 60d45c0..7167b0e 100644 --- a/tksao/frame/text.C +++ b/tksao/frame/text.C @@ -247,7 +247,7 @@ void Text::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, void Text::listNonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) { Vector vv = ptr->mapFromRef(center,sys); - str << type_ << '(' << setprecision(parent->precLinear) << vv << ')'; + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ')'; } void Text::listXML(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, @@ -285,7 +285,7 @@ void Text::listSAOtng(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, case Coord::AMPLIFIER: { Vector vv = ptr->mapFromRef(center,Coord::IMAGE); - str << type_ << '(' << setprecision(parent->precLinear) + str << type_ << '(' << setprecision(parent->precLinear_) << vv << ", \"" << text << "\")"; } break; diff --git a/tksao/frame/vect.C b/tksao/frame/vect.C index bce8c03..cd0d653 100644 --- a/tksao/frame/vect.C +++ b/tksao/frame/vect.C @@ -72,9 +72,9 @@ void Vect::list(ostream& str, Coord::CoordSystem sys, Coord::SkyFrame sky, double rr = ptr->mapLenFromRef((p2-p1).length(),sys,Coord::ARCSEC); double aa = parent->mapAngleFromRef((p2-p1).angle(),sys,sky); str << type_ << '(' << ra << ',' << dec << ',' - << setprecision(parent->precArcsec) << fixed << rr << '"' << ','; + << setprecision(parent->precArcsec_) << fixed << rr << '"' << ','; str.unsetf(ios_base::floatfield); - str << setprecision(parent->precLinear) << radToDeg(aa) << ')'; + str << setprecision(parent->precLinear_) << radToDeg(aa) << ')'; } else listNonCel(ptr, str, sys); @@ -93,7 +93,7 @@ void Vect::listNonCel(FitsImage* ptr, ostream& str, Coord::CoordSystem sys) Vector v1 = ptr->mapFromRef(p1,sys); double rr = ptr->mapLenFromRef((p2-p1).length(),sys); double aa = parent->mapAngleFromRef((p2-p1).angle(),sys); - str << type_ << '(' << setprecision(parent->precLinear) << v1 << ',' + str << type_ << '(' << setprecision(parent->precLinear_) << v1 << ',' << rr << ',' << radToDeg(aa) << ')'; } -- cgit v0.12