From a287596f8318385c78aa2ea58ad396afce34b443 Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 8 Jun 2018 11:35:05 -0400 Subject: update ds9 parsers --- ds9/parsers/catlex.fcl | 6 +++++- ds9/parsers/catparser.tac | 11 +++++++++-- ds9/parsers/contourlex.fcl | 4 +++- ds9/parsers/contourparser.tac | 8 ++++++-- ds9/parsers/contoursendlex.fcl | 4 +++- ds9/parsers/contoursendparser.tac | 8 ++++++-- ds9/parsers/croplex.fcl | 6 +++++- ds9/parsers/cropparser.tac | 11 +++++++++-- ds9/parsers/cropsendlex.fcl | 2 +- ds9/parsers/crosshairlex.fcl | 5 ++++- ds9/parsers/crosshairparser.tac | 9 +++++++-- ds9/parsers/rformat.fin | 3 +++ ds9/parsers/rformat.tin | 3 +++ ds9/parsers/rformat.trl | 5 +++++ ds9/parsers/sexstr.fin | 11 +++++++++++ ds9/parsers/sexstr.tin | 1 + ds9/parsers/skyformat.fin | 2 ++ ds9/parsers/skyformat.tin | 2 ++ ds9/parsers/skyformat.trl | 4 ++++ ds9/parsers/skyframe.fin | 7 +++++++ ds9/parsers/skyframe.tin | 7 +++++++ ds9/parsers/skyframe.trl | 8 ++++++++ 22 files changed, 111 insertions(+), 16 deletions(-) create mode 100644 ds9/parsers/rformat.fin create mode 100644 ds9/parsers/rformat.tin create mode 100644 ds9/parsers/rformat.trl create mode 100644 ds9/parsers/sexstr.fin create mode 100644 ds9/parsers/sexstr.tin create mode 100644 ds9/parsers/skyformat.fin create mode 100644 ds9/parsers/skyformat.tin create mode 100644 ds9/parsers/skyformat.trl create mode 100644 ds9/parsers/skyframe.fin create mode 100644 ds9/parsers/skyframe.tin create mode 100644 ds9/parsers/skyframe.trl diff --git a/ds9/parsers/catlex.fcl b/ds9/parsers/catlex.fcl index fe29e9c..e68c765 100644 --- a/ds9/parsers/catlex.fcl +++ b/ds9/parsers/catlex.fcl @@ -96,8 +96,12 @@ saao {return $SAAO_} #include yesno.fin #include font.fin -#include coords.fin +#include wcssys.fin +#include skyframe.fin +#include skyformat.fin +#include rformat.fin #include numeric.fin +#include sexstr.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac index f4f3d0f..95b386c 100644 --- a/ds9/parsers/catparser.tac +++ b/ds9/parsers/catparser.tac @@ -3,8 +3,12 @@ #include yesno.tin #include font.tin -#include coords.tin +#include wcssys.tin +#include skyframe.tin +#include skyformat.tin +#include rformat.tin #include numeric.tin +#include sexstr.tin #include string.tin %start command @@ -101,7 +105,10 @@ #include yesno.trl #include font.trl -#include coords.trl +#include wcssys.trl +#include skyframe.trl +#include skyformat.trl +#include rformat.trl #include numeric.trl command : catalog diff --git a/ds9/parsers/contourlex.fcl b/ds9/parsers/contourlex.fcl index 7a12068..7fa48fc 100644 --- a/ds9/parsers/contourlex.fcl +++ b/ds9/parsers/contourlex.fcl @@ -46,7 +46,9 @@ zmax {return $ZMAX_} zscale {return $ZSCALE_} #include yesno.fin -#include coords.fin +#include coordsys.fin +#include wcssys.fin +#include skyframe.fin #include numeric.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/contourparser.tac b/ds9/parsers/contourparser.tac index 01406d7..bd11b89 100644 --- a/ds9/parsers/contourparser.tac +++ b/ds9/parsers/contourparser.tac @@ -2,7 +2,9 @@ %} #include yesno.tin -#include coords.tin +#include coordsys.tin +#include wcssys.tin +#include skyframe.tin #include numeric.tin #include string.tin @@ -49,7 +51,9 @@ %% #include yesno.trl -#include coords.trl +#include coordsys.trl +#include wcssys.trl +#include skyframe.trl #include numeric.trl command : contour diff --git a/ds9/parsers/contoursendlex.fcl b/ds9/parsers/contoursendlex.fcl index 48d7805..ecf6c4f 100644 --- a/ds9/parsers/contoursendlex.fcl +++ b/ds9/parsers/contoursendlex.fcl @@ -21,7 +21,9 @@ scope {return $SCOPE_} smooth {return $SMOOTH_} width {return $WIDTH_} -#include coords.fin +#include coordsys.fin +#include wcssys.fin +#include skyframe.fin #include ws.fin %% diff --git a/ds9/parsers/contoursendparser.tac b/ds9/parsers/contoursendparser.tac index d8cfc3a..fd23d56 100644 --- a/ds9/parsers/contoursendparser.tac +++ b/ds9/parsers/contoursendparser.tac @@ -1,7 +1,9 @@ %{ %} -#include coords.tin +#include coordsys.tin +#include wcssys.tin +#include skyframe.tin %start contoursend @@ -21,7 +23,9 @@ %% -#include coords.trl +#include coordsys.trl +#include wcssys.trl +#include skyframe.trl contoursend : {ProcessSendCmdYesNo contour view} | COLOR_ {ProcessSendCmdGet contour color} diff --git a/ds9/parsers/croplex.fcl b/ds9/parsers/croplex.fcl index 078ff5d..fd5f46f 100644 --- a/ds9/parsers/croplex.fcl +++ b/ds9/parsers/croplex.fcl @@ -13,8 +13,12 @@ open {return $OPEN_} reset {return $RESET_} #include matchlock.fin -#include coords.fin +#include coordsys.fin +#include wcssys.fin +#include skyframe.fin +#include rformat.fin #include numeric.fin +#include sexstr.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/cropparser.tac b/ds9/parsers/cropparser.tac index 2c27ba7..96e8707 100644 --- a/ds9/parsers/cropparser.tac +++ b/ds9/parsers/cropparser.tac @@ -2,8 +2,12 @@ %} #include matchlock.tin -#include coords.tin +#include coordsys.tin +#include wcssys.tin +#include skyframe.tin +#include rformat.tin #include numeric.tin +#include sexstr.tin #include string.tin %start command @@ -16,7 +20,10 @@ %% #include matchlock.trl -#include coords.trl +#include coordsys.trl +#include wcssys.trl +#include skyframe.trl +#include rformat.trl #include numeric.trl command : crop diff --git a/ds9/parsers/cropsendlex.fcl b/ds9/parsers/cropsendlex.fcl index ccd81fc..8441e5d 100644 --- a/ds9/parsers/cropsendlex.fcl +++ b/ds9/parsers/cropsendlex.fcl @@ -8,7 +8,7 @@ %% 3d {return $3D_} -LOCK_ {return $LOCK_} +lock {return $LOCK_} #include coords.fin #include ws.fin diff --git a/ds9/parsers/crosshairlex.fcl b/ds9/parsers/crosshairlex.fcl index feca79d..d753d68 100644 --- a/ds9/parsers/crosshairlex.fcl +++ b/ds9/parsers/crosshairlex.fcl @@ -8,8 +8,11 @@ %% #include matchlock.fin -#include coords.fin +#include coordsys.fin +#include wcssys.fin +#include skyframe.fin #include numeric.fin +#include sexstr.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/crosshairparser.tac b/ds9/parsers/crosshairparser.tac index 2985582..d66ae72 100644 --- a/ds9/parsers/crosshairparser.tac +++ b/ds9/parsers/crosshairparser.tac @@ -2,8 +2,11 @@ %} #include matchlock.tin -#include coords.tin +#include coordsys.tin +#include wcssys.tin +#include skyframe.tin #include numeric.tin +#include sexstr.tin #include string.tin %start command @@ -11,7 +14,9 @@ %% #include matchlock.trl -#include coords.trl +#include coordsys.trl +#include wcssys.trl +#include skyframe.trl #include numeric.trl command : crosshair diff --git a/ds9/parsers/rformat.fin b/ds9/parsers/rformat.fin new file mode 100644 index 0000000..d52ed71 --- /dev/null +++ b/ds9/parsers/rformat.fin @@ -0,0 +1,3 @@ +degrees {return $DEGREES_} +arcmin {return $ARCMIN_} +arcsec {return $ARCSEC_} diff --git a/ds9/parsers/rformat.tin b/ds9/parsers/rformat.tin new file mode 100644 index 0000000..2fd83f8 --- /dev/null +++ b/ds9/parsers/rformat.tin @@ -0,0 +1,3 @@ +%token DEGREES_ +%token ARCMIN_ +%token ARCSEC_ diff --git a/ds9/parsers/rformat.trl b/ds9/parsers/rformat.trl new file mode 100644 index 0000000..f69b850 --- /dev/null +++ b/ds9/parsers/rformat.trl @@ -0,0 +1,5 @@ +rformat : DEGREES_ {set _ degrees} + | ARCMIN_ {set _ arcmin} + | ARCSEC_ {set _ arcsec} + ; + diff --git a/ds9/parsers/sexstr.fin b/ds9/parsers/sexstr.fin new file mode 100644 index 0000000..6a91acc --- /dev/null +++ b/ds9/parsers/sexstr.fin @@ -0,0 +1,11 @@ +# SEXAGESIMAL +[+-]?{D}+:{D}+:{D}+"."? | +[+-]?{D}+:{D}+:{D}*"."{D}+ {set yylval $yytext; return $SEXSTR_} + +# HMS +[+-]?{D}+h{D}+m{D}+"."?s | +[+-]?{D}+h{D}+m{D}*"."{D}+s {set yylval $yytext; return $HMSSTR_} + +# DMS +[+-]?{D}+d{D}+m{D}+"."?s | +[+-]?{D}+d{D}+m{D}*"."{D}+s {set yylval $yytext; return $SMSSTR_} diff --git a/ds9/parsers/sexstr.tin b/ds9/parsers/sexstr.tin new file mode 100644 index 0000000..56f4769 --- /dev/null +++ b/ds9/parsers/sexstr.tin @@ -0,0 +1 @@ +%token SEXSTR_ diff --git a/ds9/parsers/skyformat.fin b/ds9/parsers/skyformat.fin new file mode 100644 index 0000000..85450e6 --- /dev/null +++ b/ds9/parsers/skyformat.fin @@ -0,0 +1,2 @@ +degrees {return $DEGREES_} +sexagesimal {return $SEXAGESIMAL_} diff --git a/ds9/parsers/skyformat.tin b/ds9/parsers/skyformat.tin new file mode 100644 index 0000000..f3eb2c8 --- /dev/null +++ b/ds9/parsers/skyformat.tin @@ -0,0 +1,2 @@ +%token DEGREES_ +%token SEXAGESIMAL_ diff --git a/ds9/parsers/skyformat.trl b/ds9/parsers/skyformat.trl new file mode 100644 index 0000000..b950a1b --- /dev/null +++ b/ds9/parsers/skyformat.trl @@ -0,0 +1,4 @@ +skyformat : DEGREES_ {set _ degrees} + | SEXAGESIMAL_ {set _ sexagesimal} + ; + \ No newline at end of file diff --git a/ds9/parsers/skyframe.fin b/ds9/parsers/skyframe.fin new file mode 100644 index 0000000..4d4966d --- /dev/null +++ b/ds9/parsers/skyframe.fin @@ -0,0 +1,7 @@ +fk4 {return $FK4_} +b1950 {return $FK4_} +fk5 {return $FK5_} +j2000 {return $FK5_} +icrs {return $ICRS_} +galactic {return $GALACTIC_} +ecliptic {return $ECLIPTIC_} diff --git a/ds9/parsers/skyframe.tin b/ds9/parsers/skyframe.tin new file mode 100644 index 0000000..b3b26aa --- /dev/null +++ b/ds9/parsers/skyframe.tin @@ -0,0 +1,7 @@ +%token FK4_ +%token B1950_ +%token FK5_ +%token J2000_ +%token ICRS_ +%token GALACTIC_ +%token ECLIPTIC_ diff --git a/ds9/parsers/skyframe.trl b/ds9/parsers/skyframe.trl new file mode 100644 index 0000000..df3780d --- /dev/null +++ b/ds9/parsers/skyframe.trl @@ -0,0 +1,8 @@ +skyframe : FK4_ {set _ fk4} + | B1950_ {set _ fk4} + | FK5_ {set _ fk5} + | J2000_ {set _ fk5} + | ICRS_ {set _ icrs} + | GALACTIC_ {set _ galactic} + | ECLIPTIC_ {set _ ecliptic} + ; -- cgit v0.12