summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ds9/parsers/dssesolex.fcl1
-rw-r--r--ds9/parsers/dssesoparser.tac2
-rw-r--r--ds9/parsers/dsssaolex.fcl1
-rw-r--r--ds9/parsers/dsssaoparser.tac2
-rw-r--r--ds9/parsers/dssstscilex.fcl1
-rw-r--r--ds9/parsers/dssstsciparser.tac2
-rw-r--r--ds9/parsers/imgsvr.fin14
-rw-r--r--ds9/parsers/imgsvr.tin11
-rw-r--r--ds9/parsers/imgsvr.trl5
-rw-r--r--ds9/parsers/nvsslex.fcl1
-rw-r--r--ds9/parsers/nvssparser.tac2
-rw-r--r--ds9/parsers/skyviewlex.fcl1
-rw-r--r--ds9/parsers/skyviewparser.tac2
-rw-r--r--ds9/parsers/twomasslex.fcl1
-rw-r--r--ds9/parsers/twomassparser.tac2
-rw-r--r--ds9/parsers/vlalex.fcl1
-rw-r--r--ds9/parsers/vlaparser.tac2
-rw-r--r--ds9/parsers/vlsslex.fcl1
-rw-r--r--ds9/parsers/vlssparser.tac2
19 files changed, 30 insertions, 24 deletions
diff --git a/ds9/parsers/dssesolex.fcl b/ds9/parsers/dssesolex.fcl
index d754f8d..bad1e7f 100644
--- a/ds9/parsers/dssesolex.fcl
+++ b/ds9/parsers/dssesolex.fcl
@@ -13,7 +13,6 @@ dss2-blue {return $DSS2BLUE_}
dss2-infrared {return $DSS2INFRARED_}
#include yesno.fin
-#include coords.fin
#include imgsvr.fin
#include numeric.fin
#include string.fin
diff --git a/ds9/parsers/dssesoparser.tac b/ds9/parsers/dssesoparser.tac
index c9e817b..a72a209 100644
--- a/ds9/parsers/dssesoparser.tac
+++ b/ds9/parsers/dssesoparser.tac
@@ -2,7 +2,6 @@
%}
#include yesno.tin
-#include coords.tin
#include imgsvr.tin
#include numeric.tin
#include string.tin
@@ -17,7 +16,6 @@
%%
#include yesno.trl
-#include coords.trl
#include imgsvr.trl
#include numeric.trl
diff --git a/ds9/parsers/dsssaolex.fcl b/ds9/parsers/dsssaolex.fcl
index 0946b0b..c3359c3 100644
--- a/ds9/parsers/dsssaolex.fcl
+++ b/ds9/parsers/dsssaolex.fcl
@@ -8,7 +8,6 @@
%%
#include yesno.fin
-#include coords.fin
#include imgsvr.fin
#include numeric.fin
#include string.fin
diff --git a/ds9/parsers/dsssaoparser.tac b/ds9/parsers/dsssaoparser.tac
index 787a9f2..28f611b 100644
--- a/ds9/parsers/dsssaoparser.tac
+++ b/ds9/parsers/dsssaoparser.tac
@@ -2,7 +2,6 @@
%}
#include yesno.tin
-#include coords.tin
#include imgsvr.tin
#include numeric.tin
#include string.tin
@@ -12,7 +11,6 @@
%%
#include yesno.trl
-#include coords.trl
#include imgsvr.trl
#include numeric.trl
diff --git a/ds9/parsers/dssstscilex.fcl b/ds9/parsers/dssstscilex.fcl
index 09010bd..bbecd3a 100644
--- a/ds9/parsers/dssstscilex.fcl
+++ b/ds9/parsers/dssstscilex.fcl
@@ -18,7 +18,6 @@ phase2_gsc2 {return $GSC2_}
phase2_gsc1 {return $GSC1_}
#include yesno.fin
-#include coords.fin
#include imgsvr.fin
#include numeric.fin
#include string.fin
diff --git a/ds9/parsers/dssstsciparser.tac b/ds9/parsers/dssstsciparser.tac
index ee09390..d90aecd 100644
--- a/ds9/parsers/dssstsciparser.tac
+++ b/ds9/parsers/dssstsciparser.tac
@@ -2,7 +2,6 @@
%}
#include yesno.tin
-#include coords.tin
#include imgsvr.tin
#include numeric.tin
#include string.tin
@@ -22,7 +21,6 @@
%%
#include yesno.trl
-#include coords.trl
#include imgsvr.trl
#include numeric.trl
diff --git a/ds9/parsers/imgsvr.fin b/ds9/parsers/imgsvr.fin
index 4fc50c4..d2d0155 100644
--- a/ds9/parsers/imgsvr.fin
+++ b/ds9/parsers/imgsvr.fin
@@ -11,3 +11,17 @@ save {return $SAVE_}
size {return $SIZE_}
survey {return $SURVEY_}
update {return $UPDATE_}
+
+wcs {return $WCS_}
+fk5 {return $FK5_}
+
+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/imgsvr.tin b/ds9/parsers/imgsvr.tin
index 030433d..c40245e 100644
--- a/ds9/parsers/imgsvr.tin
+++ b/ds9/parsers/imgsvr.tin
@@ -11,3 +11,14 @@
%token SAVE_
%token SIZE_
%token SURVEY_
+
+%token WCS_
+%token FK5_
+
+%token DEGREES_
+%token ARCMIN_
+%token ARCSEC_
+
+%token SEXAGESIMAL_
+
+%token SEXSTR_
diff --git a/ds9/parsers/imgsvr.trl b/ds9/parsers/imgsvr.trl
index 914e90e..6c82328 100644
--- a/ds9/parsers/imgsvr.trl
+++ b/ds9/parsers/imgsvr.trl
@@ -24,3 +24,8 @@ sizeOpt : {set _ degrees}
frame : NEW_ {set _ new}
| CURRENT_ {set _ current}
;
+
+rformat : DEGREES_ {set _ degrees}
+ | ARCMIN_ {set _ arcmin}
+ | ARCSEC_ {set _ arcsec}
+ ; \ No newline at end of file
diff --git a/ds9/parsers/nvsslex.fcl b/ds9/parsers/nvsslex.fcl
index 02c5fcb..977e916 100644
--- a/ds9/parsers/nvsslex.fcl
+++ b/ds9/parsers/nvsslex.fcl
@@ -8,7 +8,6 @@
%%
#include yesno.fin
-#include coords.fin
#include imgsvr.fin
#include numeric.fin
#include string.fin
diff --git a/ds9/parsers/nvssparser.tac b/ds9/parsers/nvssparser.tac
index f0ef4c7..ba25d7e 100644
--- a/ds9/parsers/nvssparser.tac
+++ b/ds9/parsers/nvssparser.tac
@@ -2,7 +2,6 @@
%}
#include yesno.tin
-#include coords.tin
#include imgsvr.tin
#include numeric.tin
#include string.tin
@@ -12,7 +11,6 @@
%%
#include yesno.trl
-#include coords.trl
#include imgsvr.trl
#include numeric.trl
diff --git a/ds9/parsers/skyviewlex.fcl b/ds9/parsers/skyviewlex.fcl
index 58328ba..415463f 100644
--- a/ds9/parsers/skyviewlex.fcl
+++ b/ds9/parsers/skyviewlex.fcl
@@ -22,7 +22,6 @@ survey {return $SURVEY_}
update {return $UPDATE_}
#include yesno.fin
-#include coords.fin
#include imgsvr.fin
#include numeric.fin
#include string.fin
diff --git a/ds9/parsers/skyviewparser.tac b/ds9/parsers/skyviewparser.tac
index cd07731..b652766 100644
--- a/ds9/parsers/skyviewparser.tac
+++ b/ds9/parsers/skyviewparser.tac
@@ -2,7 +2,6 @@
%}
#include yesno.tin
-#include coords.tin
#include imgsvr.tin
#include numeric.tin
#include string.tin
@@ -14,7 +13,6 @@
%%
#include yesno.trl
-#include coords.trl
#include imgsvr.trl
#include numeric.trl
diff --git a/ds9/parsers/twomasslex.fcl b/ds9/parsers/twomasslex.fcl
index 7145226..833b1b1 100644
--- a/ds9/parsers/twomasslex.fcl
+++ b/ds9/parsers/twomasslex.fcl
@@ -8,7 +8,6 @@
%%
#include yesno.fin
-#include coords.fin
#include imgsvr.fin
#include numeric.fin
#include string.fin
diff --git a/ds9/parsers/twomassparser.tac b/ds9/parsers/twomassparser.tac
index a65649f..01339d7 100644
--- a/ds9/parsers/twomassparser.tac
+++ b/ds9/parsers/twomassparser.tac
@@ -2,7 +2,6 @@
%}
#include yesno.tin
-#include coords.tin
#include imgsvr.tin
#include numeric.tin
#include string.tin
@@ -12,7 +11,6 @@
%%
#include yesno.trl
-#include coords.trl
#include imgsvr.trl
#include numeric.trl
diff --git a/ds9/parsers/vlalex.fcl b/ds9/parsers/vlalex.fcl
index 8819294..b772010 100644
--- a/ds9/parsers/vlalex.fcl
+++ b/ds9/parsers/vlalex.fcl
@@ -11,7 +11,6 @@ stripe82 {return $STRIPE82_}
first {return $FIRST_}
#include yesno.fin
-#include coords.fin
#include imgsvr.fin
#include numeric.fin
#include string.fin
diff --git a/ds9/parsers/vlaparser.tac b/ds9/parsers/vlaparser.tac
index 15320bb..87a2d73 100644
--- a/ds9/parsers/vlaparser.tac
+++ b/ds9/parsers/vlaparser.tac
@@ -2,7 +2,6 @@
%}
#include yesno.tin
-#include coords.tin
#include imgsvr.tin
#include numeric.tin
#include string.tin
@@ -15,7 +14,6 @@
%%
#include yesno.trl
-#include coords.trl
#include imgsvr.trl
#include numeric.trl
diff --git a/ds9/parsers/vlsslex.fcl b/ds9/parsers/vlsslex.fcl
index 3fbbd9f..1408972 100644
--- a/ds9/parsers/vlsslex.fcl
+++ b/ds9/parsers/vlsslex.fcl
@@ -8,7 +8,6 @@
%%
#include yesno.fin
-#include coords.fin
#include imgsvr.fin
#include numeric.fin
#include string.fin
diff --git a/ds9/parsers/vlssparser.tac b/ds9/parsers/vlssparser.tac
index d2de3d6..d2b3941 100644
--- a/ds9/parsers/vlssparser.tac
+++ b/ds9/parsers/vlssparser.tac
@@ -2,7 +2,6 @@
%}
#include yesno.tin
-#include coords.tin
#include imgsvr.tin
#include numeric.tin
#include string.tin
@@ -12,7 +11,6 @@
%%
#include yesno.trl
-#include coords.trl
#include imgsvr.trl
#include numeric.trl
generated by cgit v0.12 at 2024-08-31 23:02:31 (GMT)