diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-05-07 21:29:45 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-05-07 21:29:45 (GMT) |
| commit | bb8810b301d47e195e83923dd87d4b76b5b3882a (patch) | |
| tree | 086bb5468daa635e827f0a385354999c48029289 /ds9/parsers/crosshairparser.tac | |
| parent | a69ff077638728f9650222acf7b688776610b8ec (diff) | |
| download | blt-bb8810b301d47e195e83923dd87d4b76b5b3882a.zip blt-bb8810b301d47e195e83923dd87d4b76b5b3882a.tar.gz blt-bb8810b301d47e195e83923dd87d4b76b5b3882a.tar.bz2 | |
update ds9 parsers
Diffstat (limited to 'ds9/parsers/crosshairparser.tac')
| -rw-r--r-- | ds9/parsers/crosshairparser.tac | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/ds9/parsers/crosshairparser.tac b/ds9/parsers/crosshairparser.tac index ddde210..d6885a7 100644 --- a/ds9/parsers/crosshairparser.tac +++ b/ds9/parsers/crosshairparser.tac @@ -1,17 +1,16 @@ %{ %} +#include matchlock.tin #include coords.tin #include numeric.tin #include string.tin %start command -%token LOCK_ -%token MATCH_ - %% +#include matchlock.trl #include coords.trl #include numeric.trl @@ -20,7 +19,7 @@ command : crosshair ; crosshair : MATCH_ match {MatchCrosshairCurrent $2} - | LOCK_ coordnone {CrosshairCmdSet lock $2 LockCrosshairCurrent} + | LOCK_ lock {CrosshairCmdSet lock $2 LockCrosshairCurrent} | numeric numeric {CrosshairTo $1 $2 physical fk5} | numeric numeric coordsys {CrosshairTo $1 $2 $3 fk5} | numeric numeric wcssys {CrosshairTo $1 $2 $3 fk5} @@ -32,10 +31,6 @@ crosshair : MATCH_ match {MatchCrosshairCurrent $2} | SEXSTR_ SEXSTR_ wcssys skyframe {CrosshairTo $1 $2 $3 $4} ; -match : coordsys {set _ $1} - | wcssys {set _ $1} - ; - %% proc crosshair::yyerror {msg} { |