From b350affa5df3688ac0361b6b20f31eee83bcbb91 Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 11 Apr 2018 12:24:23 -0400 Subject: update ds9 parsers --- ds9/parsers/catlex.fcl | 1 - ds9/parsers/catparser.tac | 2 -- ds9/parsers/contourlex.fcl | 1 - ds9/parsers/contourparser.tac | 2 -- ds9/parsers/coords.fin | 13 +++++++++++++ ds9/parsers/coords.tin | 14 ++++++++++++++ ds9/parsers/coords.trl | 32 ++++++++++++++++++++++++++++++++ ds9/parsers/croplex.fcl | 1 - ds9/parsers/cropparser.tac | 2 -- ds9/parsers/crosshairlex.fcl | 1 - ds9/parsers/crosshairparser.tac | 2 -- ds9/parsers/dssesolex.fcl | 1 - ds9/parsers/dssesoparser.tac | 2 -- ds9/parsers/dsssaolex.fcl | 1 - ds9/parsers/dsssaoparser.tac | 2 -- ds9/parsers/dssstscilex.fcl | 1 - ds9/parsers/dssstsciparser.tac | 2 -- ds9/parsers/gridlex.fcl | 1 - ds9/parsers/gridparser.tac | 2 -- ds9/parsers/nvsslex.fcl | 1 - ds9/parsers/nvssparser.tac | 2 -- ds9/parsers/panlex.fcl | 1 - ds9/parsers/panparser.tac | 2 -- ds9/parsers/regionlex.fcl | 1 - ds9/parsers/regionparser.tac | 2 -- ds9/parsers/skyframe.fin | 12 ------------ ds9/parsers/skyframe.tin | 13 ------------- ds9/parsers/skyframe.trl | 33 --------------------------------- ds9/parsers/skyviewlex.fcl | 1 - ds9/parsers/skyviewparser.tac | 2 -- ds9/parsers/twomasslex.fcl | 1 - ds9/parsers/twomassparser.tac | 2 -- ds9/parsers/vlalex.fcl | 1 - ds9/parsers/vlaparser.tac | 2 -- ds9/parsers/vlsslex.fcl | 1 - ds9/parsers/vlssparser.tac | 2 -- 36 files changed, 59 insertions(+), 103 deletions(-) delete mode 100644 ds9/parsers/skyframe.fin delete mode 100644 ds9/parsers/skyframe.tin delete mode 100644 ds9/parsers/skyframe.trl diff --git a/ds9/parsers/catlex.fcl b/ds9/parsers/catlex.fcl index b145b42..4ce9463 100644 --- a/ds9/parsers/catlex.fcl +++ b/ds9/parsers/catlex.fcl @@ -96,7 +96,6 @@ saao {return $SAAO_} #include yesno.fin #include font.fin -#include skyframe.fin #include coords.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac index c621c12..0cebfae 100644 --- a/ds9/parsers/catparser.tac +++ b/ds9/parsers/catparser.tac @@ -3,7 +3,6 @@ #include yesno.tin #include font.tin -#include skyframe.tin #include coords.tin #include numeric.tin #include string.tin @@ -102,7 +101,6 @@ #include yesno.trl #include font.trl -#include skyframe.trl #include coords.trl #include numeric.trl diff --git a/ds9/parsers/contourlex.fcl b/ds9/parsers/contourlex.fcl index 860296a..1d87d47 100644 --- a/ds9/parsers/contourlex.fcl +++ b/ds9/parsers/contourlex.fcl @@ -47,7 +47,6 @@ zscale {return $ZSCALE_} #include yesno.fin #include coords.fin -#include skyframe.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/contourparser.tac b/ds9/parsers/contourparser.tac index 7514e4f..f672f45 100644 --- a/ds9/parsers/contourparser.tac +++ b/ds9/parsers/contourparser.tac @@ -3,7 +3,6 @@ #include yesno.tin #include coords.tin -#include skyframe.tin #include numeric.tin #include string.tin @@ -51,7 +50,6 @@ #include yesno.trl #include coords.trl -#include skyframe.trl #include numeric.trl command : contour diff --git a/ds9/parsers/coords.fin b/ds9/parsers/coords.fin index ee01c50..910680e 100644 --- a/ds9/parsers/coords.fin +++ b/ds9/parsers/coords.fin @@ -31,6 +31,19 @@ physical {return $PHYSICAL_} amplifier {return $AMPLIFIER_} detector {return $DETECTOR_} +fk4 {return $FK4_} +b1950 {return $FK4_} +fk5 {return $FK5_} +j2000 {return $FK5_} +galactic {return $GALACTIC_} +ecliptic {return $ECLIPTIC_} + +degrees {return $DEGREES_} +arcmin {return $ARCMIN_} +arcsec {return $ARCSEC_} + +sexagesimal {return $SEXAGESIMAL_} + # SEXAGESIMAL [+-]?{D}+:{D}+:{D}+"."? | [+-]?{D}+:{D}+:{D}*"."{D}+ {set yylval $yytext; return $SEXSTR_} diff --git a/ds9/parsers/coords.tin b/ds9/parsers/coords.tin index cd90bdd..2673b30 100644 --- a/ds9/parsers/coords.tin +++ b/ds9/parsers/coords.tin @@ -32,3 +32,17 @@ %token WCSX_ %token WCSY_ %token WCSZ_ + +%token FK4_ +%token FK5_ +%token ICRS_ +%token GALACTIC_ +%token ECLIPTIC_ +%token J2000_ +%token B1950_ + +%token DEGREES_ +%token ARCMIN_ +%token ARCSEC_ + +%token SEXAGESIMAL_ diff --git a/ds9/parsers/coords.trl b/ds9/parsers/coords.trl index 823751a..e0dd7af 100644 --- a/ds9/parsers/coords.trl +++ b/ds9/parsers/coords.trl @@ -43,3 +43,35 @@ wcssys : WCS_ {set _ wcs} # YYABORT # } +skyframe : FK4_ {set _ fk4} + | B1950_ {set _ fk4} + | FK5_ {set _ fk5} + | J2000_ {set _ fk5} + | ICRS_ {set _ icrs} + | GALACTIC_ {set _ galactic} + | ECLIPTIC_ {set _ ecliptic} + ; + +# | error { +# yyerror "must be: fk4|fk5|icrs|galactic|ecliptic" +# YYABORT +# } + +skyformat: DEGREES_ {set _ degrees} + | SEXAGESIMAL_ {set _ sexagesimal} + ; + +# | error { +# yyerror "must be: degrees|sexagesimal" +# YYABORT +# } + +rformat : DEGREES_ {set _ degrees} + | ARCMIN_ {set _ arcmin} + | ARCSEC_ {set _ arcsec} + ; + +# | error { +# yyerror "must be: degrees|arcmin|arcsec" +# YYABORT +# } diff --git a/ds9/parsers/croplex.fcl b/ds9/parsers/croplex.fcl index 9484186..650ddee 100644 --- a/ds9/parsers/croplex.fcl +++ b/ds9/parsers/croplex.fcl @@ -15,7 +15,6 @@ none {return $NONE_} open {return $OPEN_} reset {return $RESET_} -#include skyframe.fin #include coords.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/cropparser.tac b/ds9/parsers/cropparser.tac index 8c8c5c3..9f5baa1 100644 --- a/ds9/parsers/cropparser.tac +++ b/ds9/parsers/cropparser.tac @@ -1,7 +1,6 @@ %{ %} -#include skyframe.tin #include coords.tin #include numeric.tin #include string.tin @@ -18,7 +17,6 @@ %% -#include skyframe.trl #include coords.trl #include numeric.trl diff --git a/ds9/parsers/crosshairlex.fcl b/ds9/parsers/crosshairlex.fcl index d06d180..17cb13f 100644 --- a/ds9/parsers/crosshairlex.fcl +++ b/ds9/parsers/crosshairlex.fcl @@ -11,7 +11,6 @@ lock {return $LOCK_} match {return $MATCH_} none {return $NONE_} -#include skyframe.fin #include coords.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/crosshairparser.tac b/ds9/parsers/crosshairparser.tac index 3284291..0eb6887 100644 --- a/ds9/parsers/crosshairparser.tac +++ b/ds9/parsers/crosshairparser.tac @@ -1,7 +1,6 @@ %{ %} -#include skyframe.tin #include coords.tin #include numeric.tin #include string.tin @@ -14,7 +13,6 @@ %% -#include skyframe.trl #include coords.trl #include numeric.trl diff --git a/ds9/parsers/dssesolex.fcl b/ds9/parsers/dssesolex.fcl index 0c87820..d754f8d 100644 --- a/ds9/parsers/dssesolex.fcl +++ b/ds9/parsers/dssesolex.fcl @@ -14,7 +14,6 @@ dss2-infrared {return $DSS2INFRARED_} #include yesno.fin #include coords.fin -#include skyframe.fin #include imgsvr.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/dssesoparser.tac b/ds9/parsers/dssesoparser.tac index 2cfe561..9a830f1 100644 --- a/ds9/parsers/dssesoparser.tac +++ b/ds9/parsers/dssesoparser.tac @@ -3,7 +3,6 @@ #include yesno.tin #include coords.tin -#include skyframe.tin #include imgsvr.tin #include numeric.tin #include string.tin @@ -19,7 +18,6 @@ #include yesno.trl #include coords.trl -#include skyframe.trl #include imgsvr.trl #include numeric.trl diff --git a/ds9/parsers/dsssaolex.fcl b/ds9/parsers/dsssaolex.fcl index aa85701..0946b0b 100644 --- a/ds9/parsers/dsssaolex.fcl +++ b/ds9/parsers/dsssaolex.fcl @@ -9,7 +9,6 @@ #include yesno.fin #include coords.fin -#include skyframe.fin #include imgsvr.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/dsssaoparser.tac b/ds9/parsers/dsssaoparser.tac index 7f1bf29..5a60544 100644 --- a/ds9/parsers/dsssaoparser.tac +++ b/ds9/parsers/dsssaoparser.tac @@ -3,7 +3,6 @@ #include yesno.tin #include coords.tin -#include skyframe.tin #include imgsvr.tin #include numeric.tin #include string.tin @@ -14,7 +13,6 @@ #include yesno.trl #include coords.trl -#include skyframe.trl #include imgsvr.trl #include numeric.trl diff --git a/ds9/parsers/dssstscilex.fcl b/ds9/parsers/dssstscilex.fcl index 266d55b..09010bd 100644 --- a/ds9/parsers/dssstscilex.fcl +++ b/ds9/parsers/dssstscilex.fcl @@ -19,7 +19,6 @@ phase2_gsc1 {return $GSC1_} #include yesno.fin #include coords.fin -#include skyframe.fin #include imgsvr.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/dssstsciparser.tac b/ds9/parsers/dssstsciparser.tac index c7ba721..6e8467f 100644 --- a/ds9/parsers/dssstsciparser.tac +++ b/ds9/parsers/dssstsciparser.tac @@ -3,7 +3,6 @@ #include yesno.tin #include coords.tin -#include skyframe.tin #include imgsvr.tin #include numeric.tin #include string.tin @@ -24,7 +23,6 @@ #include yesno.trl #include coords.trl -#include skyframe.trl #include imgsvr.trl #include numeric.trl diff --git a/ds9/parsers/gridlex.fcl b/ds9/parsers/gridlex.fcl index 8ec60be..27c5b3d 100644 --- a/ds9/parsers/gridlex.fcl +++ b/ds9/parsers/gridlex.fcl @@ -67,7 +67,6 @@ uuu {return $UUU_} #include yesno.fin #include font.fin #include coords.fin -#include skyframe.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/gridparser.tac b/ds9/parsers/gridparser.tac index e5bad30..1bbe070 100644 --- a/ds9/parsers/gridparser.tac +++ b/ds9/parsers/gridparser.tac @@ -4,7 +4,6 @@ #include yesno.tin #include font.tin #include coords.tin -#include skyframe.tin #include numeric.tin #include string.tin @@ -65,7 +64,6 @@ #include yesno.trl #include font.trl #include coords.trl -#include skyframe.trl #include numeric.trl command : grid diff --git a/ds9/parsers/nvsslex.fcl b/ds9/parsers/nvsslex.fcl index 683bd2b..02c5fcb 100644 --- a/ds9/parsers/nvsslex.fcl +++ b/ds9/parsers/nvsslex.fcl @@ -9,7 +9,6 @@ #include yesno.fin #include coords.fin -#include skyframe.fin #include imgsvr.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/nvssparser.tac b/ds9/parsers/nvssparser.tac index 492bb4f..7230380 100644 --- a/ds9/parsers/nvssparser.tac +++ b/ds9/parsers/nvssparser.tac @@ -3,7 +3,6 @@ #include yesno.tin #include coords.tin -#include skyframe.tin #include imgsvr.tin #include numeric.tin #include string.tin @@ -14,7 +13,6 @@ #include yesno.trl #include coords.trl -#include skyframe.trl #include imgsvr.trl #include numeric.trl diff --git a/ds9/parsers/panlex.fcl b/ds9/parsers/panlex.fcl index e6b6738..33a918b 100644 --- a/ds9/parsers/panlex.fcl +++ b/ds9/parsers/panlex.fcl @@ -11,7 +11,6 @@ close {return $CLOSE_} open {return $OPEN_} to {return $TO_} -#include skyframe.fin #include coords.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/panparser.tac b/ds9/parsers/panparser.tac index 487ce0c..b20a995 100644 --- a/ds9/parsers/panparser.tac +++ b/ds9/parsers/panparser.tac @@ -1,7 +1,6 @@ %{ %} -#include skyframe.tin #include coords.tin #include numeric.tin #include string.tin @@ -14,7 +13,6 @@ %% -#include skyframe.trl #include coords.trl #include numeric.trl diff --git a/ds9/parsers/regionlex.fcl b/ds9/parsers/regionlex.fcl index 738d738..1f1a5fe 100644 --- a/ds9/parsers/regionlex.fcl +++ b/ds9/parsers/regionlex.fcl @@ -107,7 +107,6 @@ boxcircle {return $BOXCIRCLE_} #include yesno.fin #include font.fin #include coords.fin -#include skyframe.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/regionparser.tac b/ds9/parsers/regionparser.tac index 7c90ef8..4651f43 100644 --- a/ds9/parsers/regionparser.tac +++ b/ds9/parsers/regionparser.tac @@ -4,7 +4,6 @@ #include yesno.tin #include font.tin #include coords.tin -#include skyframe.tin #include numeric.tin #include string.tin @@ -111,7 +110,6 @@ #include yesno.trl #include font.trl #include coords.trl -#include skyframe.trl #include numeric.trl command : region diff --git a/ds9/parsers/skyframe.fin b/ds9/parsers/skyframe.fin deleted file mode 100644 index d87a7e8..0000000 --- a/ds9/parsers/skyframe.fin +++ /dev/null @@ -1,12 +0,0 @@ -fk4 {return $FK4_} -b1950 {return $FK4_} -fk5 {return $FK5_} -j2000 {return $FK5_} -galactic {return $GALACTIC_} -ecliptic {return $ECLIPTIC_} - -degrees {return $DEGREES_} -arcmin {return $ARCMIN_} -arcsec {return $ARCSEC_} - -sexagesimal {return $SEXAGESIMAL_} diff --git a/ds9/parsers/skyframe.tin b/ds9/parsers/skyframe.tin deleted file mode 100644 index b8b584a..0000000 --- a/ds9/parsers/skyframe.tin +++ /dev/null @@ -1,13 +0,0 @@ -%token FK4_ -%token FK5_ -%token ICRS_ -%token GALACTIC_ -%token ECLIPTIC_ -%token J2000_ -%token B1950_ - -%token DEGREES_ -%token ARCMIN_ -%token ARCSEC_ - -%token SEXAGESIMAL_ diff --git a/ds9/parsers/skyframe.trl b/ds9/parsers/skyframe.trl deleted file mode 100644 index 5ad26c9..0000000 --- a/ds9/parsers/skyframe.trl +++ /dev/null @@ -1,33 +0,0 @@ -skyframe : FK4_ {set _ fk4} - | B1950_ {set _ fk4} - | FK5_ {set _ fk5} - | J2000_ {set _ fk5} - | ICRS_ {set _ icrs} - | GALACTIC_ {set _ galactic} - | ECLIPTIC_ {set _ ecliptic} - ; - -# | error { -# yyerror "must be: fk4|fk5|icrs|galactic|ecliptic" -# YYABORT -# } - -skyformat: DEGREES_ {set _ degrees} - | SEXAGESIMAL_ {set _ sexagesimal} - ; - -# | error { -# yyerror "must be: degrees|sexagesimal" -# YYABORT -# } - -rformat : DEGREES_ {set _ degrees} - | ARCMIN_ {set _ arcmin} - | ARCSEC_ {set _ arcsec} - ; - -# | error { -# yyerror "must be: degrees|arcmin|arcsec" -# YYABORT -# } - diff --git a/ds9/parsers/skyviewlex.fcl b/ds9/parsers/skyviewlex.fcl index 4487fd5..58328ba 100644 --- a/ds9/parsers/skyviewlex.fcl +++ b/ds9/parsers/skyviewlex.fcl @@ -23,7 +23,6 @@ update {return $UPDATE_} #include yesno.fin #include coords.fin -#include skyframe.fin #include imgsvr.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/skyviewparser.tac b/ds9/parsers/skyviewparser.tac index cb9599e..e44ffe2 100644 --- a/ds9/parsers/skyviewparser.tac +++ b/ds9/parsers/skyviewparser.tac @@ -3,7 +3,6 @@ #include yesno.tin #include coords.tin -#include skyframe.tin #include imgsvr.tin #include numeric.tin #include string.tin @@ -16,7 +15,6 @@ #include yesno.trl #include coords.trl -#include skyframe.trl #include imgsvr.trl #include numeric.trl diff --git a/ds9/parsers/twomasslex.fcl b/ds9/parsers/twomasslex.fcl index 9b9f91a..7145226 100644 --- a/ds9/parsers/twomasslex.fcl +++ b/ds9/parsers/twomasslex.fcl @@ -9,7 +9,6 @@ #include yesno.fin #include coords.fin -#include skyframe.fin #include imgsvr.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/twomassparser.tac b/ds9/parsers/twomassparser.tac index 3aebe9d..4432080 100644 --- a/ds9/parsers/twomassparser.tac +++ b/ds9/parsers/twomassparser.tac @@ -3,7 +3,6 @@ #include yesno.tin #include coords.tin -#include skyframe.tin #include imgsvr.tin #include numeric.tin #include string.tin @@ -14,7 +13,6 @@ #include yesno.trl #include coords.trl -#include skyframe.trl #include imgsvr.trl #include numeric.trl diff --git a/ds9/parsers/vlalex.fcl b/ds9/parsers/vlalex.fcl index 86bd21d..8819294 100644 --- a/ds9/parsers/vlalex.fcl +++ b/ds9/parsers/vlalex.fcl @@ -12,7 +12,6 @@ first {return $FIRST_} #include yesno.fin #include coords.fin -#include skyframe.fin #include imgsvr.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/vlaparser.tac b/ds9/parsers/vlaparser.tac index edf3dd3..3add524 100644 --- a/ds9/parsers/vlaparser.tac +++ b/ds9/parsers/vlaparser.tac @@ -3,7 +3,6 @@ #include yesno.tin #include coords.tin -#include skyframe.tin #include imgsvr.tin #include numeric.tin #include string.tin @@ -17,7 +16,6 @@ #include yesno.trl #include coords.trl -#include skyframe.trl #include imgsvr.trl #include numeric.trl diff --git a/ds9/parsers/vlsslex.fcl b/ds9/parsers/vlsslex.fcl index 307e0de..3fbbd9f 100644 --- a/ds9/parsers/vlsslex.fcl +++ b/ds9/parsers/vlsslex.fcl @@ -9,7 +9,6 @@ #include yesno.fin #include coords.fin -#include skyframe.fin #include imgsvr.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/vlssparser.tac b/ds9/parsers/vlssparser.tac index 9112fe6..55708fc 100644 --- a/ds9/parsers/vlssparser.tac +++ b/ds9/parsers/vlssparser.tac @@ -3,7 +3,6 @@ #include yesno.tin #include coords.tin -#include skyframe.tin #include imgsvr.tin #include numeric.tin #include string.tin @@ -14,7 +13,6 @@ #include yesno.trl #include coords.trl -#include skyframe.trl #include imgsvr.trl #include numeric.trl -- cgit v0.12