From 2df1860167c58b6940284b86da76c8a2229bf6b9 Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 8 Jun 2018 11:49:53 -0400 Subject: update ds9 parsers --- ds9/parsers/crosshairsendlex.fcl | 5 ++++- ds9/parsers/crosshairsendparser.tac | 10 ++++++++-- ds9/parsers/gridlex.fcl | 5 ++++- ds9/parsers/gridparser.tac | 10 ++++++++-- ds9/parsers/panlex.fcl | 5 ++++- ds9/parsers/panparser.tac | 9 +++++++-- ds9/parsers/pansendlex.fcl | 5 ++++- ds9/parsers/pansendparser.tac | 10 ++++++++-- ds9/parsers/regionlex.fcl | 5 ++++- ds9/parsers/regionparser.tac | 10 ++++++++-- ds9/parsers/regionsendlex.fcl | 5 ++++- ds9/parsers/regionsendparser.tac | 10 ++++++++-- ds9/parsers/wcslex.fcl | 4 +++- ds9/parsers/wcsparser.tac | 8 ++++++-- 14 files changed, 80 insertions(+), 21 deletions(-) diff --git a/ds9/parsers/crosshairsendlex.fcl b/ds9/parsers/crosshairsendlex.fcl index 9d10643..b1e81df 100644 --- a/ds9/parsers/crosshairsendlex.fcl +++ b/ds9/parsers/crosshairsendlex.fcl @@ -9,7 +9,10 @@ lock {return $LOCK_} -#include coords.fin +#include coordsys.fin +#include wcssys.fin +#include skyframe.fin +#include skyformat.fin #include ws.fin %% diff --git a/ds9/parsers/crosshairsendparser.tac b/ds9/parsers/crosshairsendparser.tac index 23fffd5..e60b972 100644 --- a/ds9/parsers/crosshairsendparser.tac +++ b/ds9/parsers/crosshairsendparser.tac @@ -1,7 +1,10 @@ %{ %} -#include coords.tin +#include coordsys.tin +#include wcssys.tin +#include skyframe.tin +#include skyformat.tin %start crosshairsend @@ -9,7 +12,10 @@ %% -#include coords.trl +#include coordsys.trl +#include wcssys.trl +#include skyframe.trl +#include skyformat.trl crosshairsend : {ProcessSendCmdCurrent frame "get crosshair physical fk5 degrees"} | coordsys {ProcessSendCmdCurrent frame "get crosshair $1 fk5 degrees"} diff --git a/ds9/parsers/gridlex.fcl b/ds9/parsers/gridlex.fcl index dc380ae..4c58463 100644 --- a/ds9/parsers/gridlex.fcl +++ b/ds9/parsers/gridlex.fcl @@ -66,7 +66,10 @@ uuu {return $UUU_} #include yesno.fin #include font.fin -#include coords.fin +#include coordsys.fin +#include wcssys.fin +#include skyframe.fin +#include skyformat.fin #include numeric.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/gridparser.tac b/ds9/parsers/gridparser.tac index f8f9efe..fab5833 100644 --- a/ds9/parsers/gridparser.tac +++ b/ds9/parsers/gridparser.tac @@ -3,7 +3,10 @@ #include yesno.tin #include font.tin -#include coords.tin +#include coordsys.tin +#include wcssys.tin +#include skyframe.tin +#include skyformat.tin #include numeric.tin #include string.tin @@ -63,7 +66,10 @@ #include yesno.trl #include font.trl -#include coords.trl +#include coordsys.trl +#include wcssys.trl +#include skyframe.trl +#include skyformat.trl #include numeric.trl command : grid diff --git a/ds9/parsers/panlex.fcl b/ds9/parsers/panlex.fcl index 6c200d6..c421217 100644 --- a/ds9/parsers/panlex.fcl +++ b/ds9/parsers/panlex.fcl @@ -11,8 +11,11 @@ close {return $CLOSE_} open {return $OPEN_} to {return $TO_} -#include coords.fin +#include coordsys.fin +#include wcssys.fin +#include skyframe.fin #include numeric.fin +#include sexstr.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/panparser.tac b/ds9/parsers/panparser.tac index b20a995..3bda81a 100644 --- a/ds9/parsers/panparser.tac +++ b/ds9/parsers/panparser.tac @@ -1,8 +1,11 @@ %{ %} -#include coords.tin +#include coordsys.tin +#include wcssys.tin +#include skyframe.tin #include numeric.tin +#include sexstr.tin #include string.tin %start command @@ -13,7 +16,9 @@ %% -#include coords.trl +#include coordsys.trl +#include wcssys.trl +#include skyframe.trl #include numeric.trl command : pan diff --git a/ds9/parsers/pansendlex.fcl b/ds9/parsers/pansendlex.fcl index 9e65b81..db4f952 100644 --- a/ds9/parsers/pansendlex.fcl +++ b/ds9/parsers/pansendlex.fcl @@ -7,7 +7,10 @@ %% -#include coords.fin +#include coordsys.fin +#include wcssys.fin +#include skyframe.fin +#include skyformat.fin #include ws.fin %% diff --git a/ds9/parsers/pansendparser.tac b/ds9/parsers/pansendparser.tac index ec2a39f..2e201ae 100644 --- a/ds9/parsers/pansendparser.tac +++ b/ds9/parsers/pansendparser.tac @@ -1,13 +1,19 @@ %{ %} -#include coords.tin +#include coordsys.tin +#include wcssys.tin +#include skyframe.tin +#include skyformat.tin %start pansend %% -#include coords.trl +#include coordsys.trl +#include wcssys.trl +#include skyframe.trl +#include skyformat.trl pansend : {ProcessSendCmdCurrent frame "get cursor physical fk5 degrees"} | coordsys {ProcessSendCmdCurrent frame "get cursor $1 fk5 degrees"} diff --git a/ds9/parsers/regionlex.fcl b/ds9/parsers/regionlex.fcl index 0239078..c82d9b1 100644 --- a/ds9/parsers/regionlex.fcl +++ b/ds9/parsers/regionlex.fcl @@ -103,7 +103,10 @@ boxcircle {return $BOXCIRCLE_} -sky {return $MSKY_} #include yesno.fin -#include coords.fin +#include coordsys.fin +#include wcssys.fin +#include skyframe.fin +#include skyformat.fin #include numeric.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/regionparser.tac b/ds9/parsers/regionparser.tac index 39db756..31f4c79 100644 --- a/ds9/parsers/regionparser.tac +++ b/ds9/parsers/regionparser.tac @@ -2,7 +2,10 @@ %} #include yesno.tin -#include coords.tin +#include coordsys.tin +#include wcssys.tin +#include skyframe.tin +#include skyformat.tin #include numeric.tin #include string.tin @@ -105,7 +108,10 @@ %% #include yesno.trl -#include coords.trl +#include coordsys.trl +#include wcssys.trl +#include skyframe.trl +#include skyformat.trl #include numeric.trl command : region diff --git a/ds9/parsers/regionsendlex.fcl b/ds9/parsers/regionsendlex.fcl index 07e64ee..0584804 100644 --- a/ds9/parsers/regionsendlex.fcl +++ b/ds9/parsers/regionsendlex.fcl @@ -51,7 +51,10 @@ xy {return $XY_} -group {return $MGROUP_} #include yesno.fin -#include coords.fin +#include coordsys.fin +#include wcssys.fin +#include skyframe.fin +#include skyformat.fin #include numeric.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/regionsendparser.tac b/ds9/parsers/regionsendparser.tac index 26149c5..63efbe7 100644 --- a/ds9/parsers/regionsendparser.tac +++ b/ds9/parsers/regionsendparser.tac @@ -2,7 +2,10 @@ %} #include yesno.tin -#include coords.tin +#include coordsys.tin +#include wcssys.tin +#include skyframe.tin +#include skyformat.tin #include numeric.tin #include string.tin @@ -54,7 +57,10 @@ %% #include yesno.trl -#include coords.trl +#include coordsys.trl +#include wcssys.trl +#include skyframe.trl +#include skyformat.trl #include numeric.trl regionsend : {RegionSendCmd} diff --git a/ds9/parsers/wcslex.fcl b/ds9/parsers/wcslex.fcl index 8034ff1..6b82c28 100644 --- a/ds9/parsers/wcslex.fcl +++ b/ds9/parsers/wcslex.fcl @@ -18,7 +18,9 @@ skyformat {return $SKYFORMAT_} system {return $SYSTEM_} #include yesno.fin -#include coords.fin +#include wcssys.fin +#include skyframe.fin +#include skyformat.fin #include numeric.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/wcsparser.tac b/ds9/parsers/wcsparser.tac index 4404fb8..8b19526 100644 --- a/ds9/parsers/wcsparser.tac +++ b/ds9/parsers/wcsparser.tac @@ -2,7 +2,9 @@ %} #include yesno.tin -#include coords.tin +#include wcssys.tin +#include skyframe.tin +#include skyformat.tin #include numeric.tin #include string.tin @@ -21,7 +23,9 @@ %% #include yesno.trl -#include coords.trl +#include wcssys.trl +#include skyframe.trl +#include skyformat.trl #include numeric.trl command : wcs -- cgit v0.12