update ds9 parsers

19 files changed, 49 insertions, 32 deletions

diff --git a/ds9/parsers/dssesolex.fcl b/ds9/parsers/dssesolex.fcl
index bad1e7f..0c87820 100644
--- a/ds9/parsers/dssesolex.fcl
+++ b/ds9/parsers/dssesolex.fcl
@@ -13,6 +13,8 @@ dss2-blue    {return $DSS2BLUE_}
 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 fbf7122..2cfe561 100644
--- a/ds9/parsers/dssesoparser.tac
+++ b/ds9/parsers/dssesoparser.tac
@@ -2,6 +2,8 @@
 %}
 
 #include yesno.tin
+#include coords.tin
+#include skyframe.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
@@ -16,6 +18,8 @@
 %%
 
 #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 c3359c3..aa85701 100644
--- a/ds9/parsers/dsssaolex.fcl
+++ b/ds9/parsers/dsssaolex.fcl
@@ -8,6 +8,8 @@
 %%
 
 #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 ab87731..7f1bf29 100644
--- a/ds9/parsers/dsssaoparser.tac
+++ b/ds9/parsers/dsssaoparser.tac
@@ -2,6 +2,8 @@
 %}
 
 #include yesno.tin
+#include coords.tin
+#include skyframe.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
@@ -11,6 +13,8 @@
 %%
 
 #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 bbecd3a..266d55b 100644
--- a/ds9/parsers/dssstscilex.fcl
+++ b/ds9/parsers/dssstscilex.fcl
@@ -18,6 +18,8 @@ phase2_gsc2	{return $GSC2_}
 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 f46cf76..c7ba721 100644
--- a/ds9/parsers/dssstsciparser.tac
+++ b/ds9/parsers/dssstsciparser.tac
@@ -2,6 +2,8 @@
 %}
 
 #include yesno.tin
+#include coords.tin
+#include skyframe.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
@@ -21,6 +23,8 @@
 %%
 
 #include yesno.trl
+#include coords.trl
+#include skyframe.trl
 #include imgsvr.trl
 #include numeric.trl
 
diff --git a/ds9/parsers/imgsvr.fin b/ds9/parsers/imgsvr.fin
index b1a9904..553edc5 100644
--- a/ds9/parsers/imgsvr.fin
+++ b/ds9/parsers/imgsvr.fin
@@ -1,11 +1,3 @@
-wcs	    {return $WCS_}
-fk5	    {return $FK5_}
-
-degrees	    {return $DEGREES_}
-sexagesimal {return $SEXAGESIMAL_}
-arcmin	    {return $ARCMIN_}
-arcsec	    {return $ARCSEC_}
-
 close	    {return $CLOSE_}
 coord	    {return $COORD_}
 crosshair   {return $CROSSHAIR_}
@@ -18,7 +10,3 @@ save	    {return $SAVE_}
 size	    {return $SIZE_}
 survey	    {return $SURVEY_}
 update	    {return $UPDATE_}
-
-# SEXAGESIMAL
-[+-]?{D}+:{D}+:{D}+"."? |
-[+-]?{D}+:{D}+:{D}*"."{D}+ {set yylval $yytext; return $SEXSTR_}
diff --git a/ds9/parsers/imgsvr.tin b/ds9/parsers/imgsvr.tin
index fcfbef5..5b8546d 100644
--- a/ds9/parsers/imgsvr.tin
+++ b/ds9/parsers/imgsvr.tin
@@ -1,12 +1,3 @@
-%token SEXSTR_
-%token WCS_
-%token FK5_
-
-%token DEGREES_
-%token SEXAGESIMAL_
-%token ARCMIN_
-%token ARCSEC_
-
 %token CLOSE_
 %token COORD_
 %token CROSSHAIR_
diff --git a/ds9/parsers/imgsvr.trl b/ds9/parsers/imgsvr.trl
index 3cb2c0e..914e90e 100644
--- a/ds9/parsers/imgsvr.trl
+++ b/ds9/parsers/imgsvr.trl
@@ -18,19 +18,9 @@ coordOpt :
  ;
 
 sizeOpt : {set _ degrees}
- | skyformat {set _ $1}
- ;
-
-skyformat : DEGREES_ {set _ degrees}
- | ARCMIN_ {set _ arcmin}
- | ARCSEC_ {set _ arcsec}
+ | rformat {set _ $1}
  ;
 
 frame : NEW_ {set _ new}
  | CURRENT_ {set _ current}
  ;
-
-# | error {
-#   yyerror "must be: degrees|arcmin|arcsec"
-#   YYABORT
-# }
diff --git a/ds9/parsers/nvsslex.fcl b/ds9/parsers/nvsslex.fcl
index 977e916..683bd2b 100644
--- a/ds9/parsers/nvsslex.fcl
+++ b/ds9/parsers/nvsslex.fcl
@@ -8,6 +8,8 @@
 %%
 
 #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 4a7839c..492bb4f 100644
--- a/ds9/parsers/nvssparser.tac
+++ b/ds9/parsers/nvssparser.tac
@@ -2,6 +2,8 @@
 %}
 
 #include yesno.tin
+#include coords.tin
+#include skyframe.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
@@ -11,6 +13,8 @@
 %%
 
 #include yesno.trl
+#include coords.trl
+#include skyframe.trl
 #include imgsvr.trl
 #include numeric.trl
 
diff --git a/ds9/parsers/skyviewlex.fcl b/ds9/parsers/skyviewlex.fcl
index 415463f..4487fd5 100644
--- a/ds9/parsers/skyviewlex.fcl
+++ b/ds9/parsers/skyviewlex.fcl
@@ -22,6 +22,8 @@ survey	    {return $SURVEY_}
 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 60fc5a2..cb9599e 100644
--- a/ds9/parsers/skyviewparser.tac
+++ b/ds9/parsers/skyviewparser.tac
@@ -2,6 +2,8 @@
 %}
 
 #include yesno.tin
+#include coords.tin
+#include skyframe.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
@@ -13,6 +15,8 @@
 %%
 
 #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 833b1b1..9b9f91a 100644
--- a/ds9/parsers/twomasslex.fcl
+++ b/ds9/parsers/twomasslex.fcl
@@ -8,6 +8,8 @@
 %%
 
 #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 7ab17e1..3aebe9d 100644
--- a/ds9/parsers/twomassparser.tac
+++ b/ds9/parsers/twomassparser.tac
@@ -2,6 +2,8 @@
 %}
 
 #include yesno.tin
+#include coords.tin
+#include skyframe.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
@@ -11,6 +13,8 @@
 %%
 
 #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 b772010..86bd21d 100644
--- a/ds9/parsers/vlalex.fcl
+++ b/ds9/parsers/vlalex.fcl
@@ -11,6 +11,8 @@ stripe82    {return $STRIPE82_}
 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 e8fa127..edf3dd3 100644
--- a/ds9/parsers/vlaparser.tac
+++ b/ds9/parsers/vlaparser.tac
@@ -2,6 +2,8 @@
 %}
 
 #include yesno.tin
+#include coords.tin
+#include skyframe.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
@@ -14,6 +16,8 @@
 %%
 
 #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 1408972..307e0de 100644
--- a/ds9/parsers/vlsslex.fcl
+++ b/ds9/parsers/vlsslex.fcl
@@ -8,6 +8,8 @@
 %%
 
 #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 fbec5a1..9112fe6 100644
--- a/ds9/parsers/vlssparser.tac
+++ b/ds9/parsers/vlssparser.tac
@@ -2,6 +2,8 @@
 %}
 
 #include yesno.tin
+#include coords.tin
+#include skyframe.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
@@ -11,6 +13,8 @@
 %%
 
 #include yesno.trl
+#include coords.trl
+#include skyframe.trl
 #include imgsvr.trl
 #include numeric.trl