From d29d21bd9dff2f7804d01c9a0c07c65a4119c9d2 Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 11 Apr 2018 11:47:18 -0400 Subject: update ds9 parsers --- ds9/library/marker.tcl | 5 ----- ds9/parsers/catlex.fcl | 1 - ds9/parsers/catparser.tac | 2 -- ds9/parsers/croplex.fcl | 1 - ds9/parsers/cropparser.tac | 2 -- ds9/parsers/gridlex.fcl | 1 - ds9/parsers/gridparser.tac | 2 -- ds9/parsers/regionlex.fcl | 1 - ds9/parsers/regionparser.tac | 2 -- ds9/parsers/skyframe.fin | 6 ++++++ ds9/parsers/skyframe.tin | 6 ++++++ ds9/parsers/skyframe.trl | 8 ++++++++ 12 files changed, 20 insertions(+), 17 deletions(-) diff --git a/ds9/library/marker.tcl b/ds9/library/marker.tcl index 835da80..f26a0b7 100644 --- a/ds9/library/marker.tcl +++ b/ds9/library/marker.tcl @@ -1411,11 +1411,6 @@ proc ProcessRegionsCmd {varname iname sock fn} { # we need to be realized ProcessRealizeDS9 - puts "format: $marker(format)" - puts "system: $marker(system)" - puts "sky: $marker(sky)" - puts "skyformat: $marker(skyformat)" - global debug if {$debug(tcl,parser)} { set marker(load,sock) $sock diff --git a/ds9/parsers/catlex.fcl b/ds9/parsers/catlex.fcl index a1dd5a0..b145b42 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 rformat.fin #include skyframe.fin #include coords.fin #include numeric.fin diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac index 029cdbb..1909d40 100644 --- a/ds9/parsers/catparser.tac +++ b/ds9/parsers/catparser.tac @@ -3,7 +3,6 @@ #include yesno.tin #include font.tin -#include rformat.tin #include skyframe.tin #include coords.tin #include numeric.tin @@ -103,7 +102,6 @@ #include yesno.trl #include font.trl -#include rformat.trl #include skyframe.trl #include coords.trl #include numeric.trl diff --git a/ds9/parsers/croplex.fcl b/ds9/parsers/croplex.fcl index 8cbc3c2..9484186 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 rformat.fin #include skyframe.fin #include coords.fin #include numeric.fin diff --git a/ds9/parsers/cropparser.tac b/ds9/parsers/cropparser.tac index 05b7b09..df7d7f8 100644 --- a/ds9/parsers/cropparser.tac +++ b/ds9/parsers/cropparser.tac @@ -1,7 +1,6 @@ %{ %} -#include rformat.tin #include skyframe.tin #include coords.tin #include numeric.tin @@ -19,7 +18,6 @@ %% -#include rformat.trl #include skyframe.trl #include coords.trl #include numeric.trl diff --git a/ds9/parsers/gridlex.fcl b/ds9/parsers/gridlex.fcl index bb3d637..8ec60be 100644 --- a/ds9/parsers/gridlex.fcl +++ b/ds9/parsers/gridlex.fcl @@ -68,7 +68,6 @@ uuu {return $UUU_} #include font.fin #include coords.fin #include skyframe.fin -#include rformat.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/gridparser.tac b/ds9/parsers/gridparser.tac index d86d0c9..e5bad30 100644 --- a/ds9/parsers/gridparser.tac +++ b/ds9/parsers/gridparser.tac @@ -5,7 +5,6 @@ #include font.tin #include coords.tin #include skyframe.tin -#include rformat.tin #include numeric.tin #include string.tin @@ -67,7 +66,6 @@ #include font.trl #include coords.trl #include skyframe.trl -#include rformat.trl #include numeric.trl command : grid diff --git a/ds9/parsers/regionlex.fcl b/ds9/parsers/regionlex.fcl index fe1bcd5..738d738 100644 --- a/ds9/parsers/regionlex.fcl +++ b/ds9/parsers/regionlex.fcl @@ -108,7 +108,6 @@ boxcircle {return $BOXCIRCLE_} #include font.fin #include coords.fin #include skyframe.fin -#include rformat.fin #include numeric.fin #include string.fin diff --git a/ds9/parsers/regionparser.tac b/ds9/parsers/regionparser.tac index e3655b7..7c90ef8 100644 --- a/ds9/parsers/regionparser.tac +++ b/ds9/parsers/regionparser.tac @@ -5,7 +5,6 @@ #include font.tin #include coords.tin #include skyframe.tin -#include rformat.tin #include numeric.tin #include string.tin @@ -113,7 +112,6 @@ #include font.trl #include coords.trl #include skyframe.trl -#include rformat.trl #include numeric.trl command : region diff --git a/ds9/parsers/skyframe.fin b/ds9/parsers/skyframe.fin index 6b21803..d87a7e8 100644 --- a/ds9/parsers/skyframe.fin +++ b/ds9/parsers/skyframe.fin @@ -4,3 +4,9 @@ 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 index 3ea09b8..b8b584a 100644 --- a/ds9/parsers/skyframe.tin +++ b/ds9/parsers/skyframe.tin @@ -5,3 +5,9 @@ %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 index 92b61fa..8878eea 100644 --- a/ds9/parsers/skyframe.trl +++ b/ds9/parsers/skyframe.trl @@ -12,3 +12,11 @@ skyframe : FK4_ {set _ fk4} # YYABORT # } +skyformatt: DEGREES_ {set _ degrees} + | SEXAGESIMAL_ {set _ sexagesimal} + ; + +skyformat : DEGREES_ {set _ degrees} + | ARCMIN_ {set _ arcmin} + | ARCSEC_ {set _ arcsec} + ; -- cgit v0.12