diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2018-03-07 22:12:22 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2018-03-07 22:12:22 (GMT) |
commit | 61a6a0682e5c15df1296e92d747d2b1245e86add (patch) | |
tree | ddc02f974486c6b0082290709f582c42b98dbd87 /ds9/parsers/skyviewparser.tac | |
parent | fa6b5102a4a03920929120d2991413d7896e9d86 (diff) | |
download | blt-61a6a0682e5c15df1296e92d747d2b1245e86add.zip blt-61a6a0682e5c15df1296e92d747d2b1245e86add.tar.gz blt-61a6a0682e5c15df1296e92d747d2b1245e86add.tar.bz2 |
simplify ds9 imgsvr parsers
Diffstat (limited to 'ds9/parsers/skyviewparser.tac')
-rw-r--r-- | ds9/parsers/skyviewparser.tac | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/ds9/parsers/skyviewparser.tac b/ds9/parsers/skyviewparser.tac index 0dc6022..276fa43 100644 --- a/ds9/parsers/skyviewparser.tac +++ b/ds9/parsers/skyviewparser.tac @@ -2,53 +2,23 @@ %} #include yesno.tin -#include coords.tin +#include imgsvr.tin #include base.tin %start command -%token CLOSE_ -%token COORD_ -%token CROSSHAIR_ -%token CURRENT_ -%token FRAME_ -%token NAME_ -%token NEW_ -%token OPEN_ %token PIXELS_ -%token UPDATE_ -%token SAVE_ -%token SIZE_ -%token SURVEY_ %% #include yesno.trl -#include coords.trl +#include imgsvr.trl #include base.trl command : skyview | skyview {yyclearin; YYACCEPT} CMD_ ; -deg : {set _ degrees} - | DEGREES_ {set _ degrees} - ; - -sex : {set _ sexagesimal} - | SEXAGESIMAL_ {set _ sexagesimal} - ; - -coordOpt : - | WCS_ - | FK5_ - | WCS_ FK5_ - ; - -sizeOpt : {set _ degrees} - | skyformat {set _ $1} - ; - # COORD_ is depricated # NAME_ is depricated # new optional WCS_ FK5_, does nothing @@ -58,7 +28,7 @@ skyview : {IMGSVRApply dskyview 1} | OPEN_ {} | CLOSE_ {ARDestroy dskyview} | STRING_ {global dskyview; set dskyview(name) $1; IMGSVRApply dskyview 1} - | numeric numeric coordOpt {global dskyview; set dskyview(x) $1; set dskyview(y) $2; set dskyview(skyformat) degrees; set dskyview(skyformat,msg) degress; IMGSVRApply dskyview 1} + | numeric numeric coordOpt {global dskyview; set dskyview(x) $1; set dskyview(y) $2; set dskyview(skyformat) degrees; set dskyview(skyformat,msg) degrees; IMGSVRApply dskyview 1} | SEXSTR_ SEXSTR_ coordOpt {global dskyview; set dskyview(x) $1; set dskyview(y) $2; set dskyview(skyformat) sexagesimal; set dskyview(skyformat,msg) sexagesimal; IMGSVRApply dskyview 1} | SIZE_ numeric numeric sizeOpt {global dskyview; set dskyview(width) $2; set dskyview(height) $3; set dskyview(rformat) $4; set dskyview(rformat,msg) $4} | PIXELS_ numeric numeric {global dskyview; set dskyview(width,pixels) $2; set dskyview(height,pixels) $3} @@ -76,10 +46,6 @@ update : FRAME_ {IMGSVRUpdate dskyview; IMGSVRApply dskyview 1} | CROSSHAIR_ {IMGSVRCrosshair dskyview; IMGSVRApply dskyview 1} ; -frame : NEW_ {set _ new} - | CURRENT_ {set _ current} - ; - %% proc skyview::yyerror {msg} { |