From 6d53115e9f01feb7dbb0cb98204e4250294a40ef Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Thu, 7 Jun 2018 17:45:18 -0400
Subject: update ds9 parsers

---
 ds9/parsers/matchlex.fcl             | 4 ++--
 ds9/parsers/matchparser.tac          | 8 ++++----
 ds9/parsers/mosaicimagewcslex.fcl    | 2 +-
 ds9/parsers/mosaicimagewcsparser.tac | 4 ++--
 ds9/parsers/mosaicwcslex.fcl         | 2 +-
 ds9/parsers/mosaicwcsparser.tac      | 4 ++--
 ds9/parsers/rgblex.fcl               | 3 +--
 ds9/parsers/rgbparser.tac            | 6 ++----
 ds9/parsers/shmlex.fcl               | 2 +-
 ds9/parsers/shmparser.tac            | 4 ++--
 ds9/parsers/smosaicwcslex.fcl        | 2 +-
 ds9/parsers/smosaicwcsparser.tac     | 4 ++--
 12 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/ds9/parsers/matchlex.fcl b/ds9/parsers/matchlex.fcl
index 325dba8..31ebf7b 100644
--- a/ds9/parsers/matchlex.fcl
+++ b/ds9/parsers/matchlex.fcl
@@ -21,8 +21,8 @@ slice	    {return $SLICE_}
 smooth	    {return $SMOOTH_}
 
 #include matchlock.fin
-#include coords.fin
-#include numeric.fin
+#include coordsys.fin
+#include wcssys.fin
 #include string.fin
 #include ws.fin
 
diff --git a/ds9/parsers/matchparser.tac b/ds9/parsers/matchparser.tac
index b332702..9bda245 100644
--- a/ds9/parsers/matchparser.tac
+++ b/ds9/parsers/matchparser.tac
@@ -2,8 +2,8 @@
 %}
 
 #include matchlock.tin
-#include coords.tin
-#include numeric.tin
+#include coordsys.tin
+#include wcssys.tin
 #include string.tin
 
 %start command
@@ -24,8 +24,8 @@
 %%
 
 #include matchlock.trl
-#include coords.trl
-#include numeric.trl
+#include coordsys.trl
+#include wcssys.trl
 
 command : match 
  | match {yyclearin; YYACCEPT} STRING_
diff --git a/ds9/parsers/mosaicimagewcslex.fcl b/ds9/parsers/mosaicimagewcslex.fcl
index 3bd6e8b..c6e2c0b 100644
--- a/ds9/parsers/mosaicimagewcslex.fcl
+++ b/ds9/parsers/mosaicimagewcslex.fcl
@@ -10,7 +10,7 @@
 mask	    {return $MASK_}
 new	    {return $NEW_}
 
-#include coords.fin
+#include wcssys.fin
 #include string.fin
 #include ws.fin
 
diff --git a/ds9/parsers/mosaicimagewcsparser.tac b/ds9/parsers/mosaicimagewcsparser.tac
index 361ea79..96860cf 100644
--- a/ds9/parsers/mosaicimagewcsparser.tac
+++ b/ds9/parsers/mosaicimagewcsparser.tac
@@ -1,7 +1,7 @@
 %{
 %}
 
-#include coords.tin
+#include wcssys.tin
 #include string.tin
 
 %start command
@@ -11,7 +11,7 @@
 
 %%
 
-#include coords.trl
+#include wcssys.trl
 
 # XPA/SAMP only
 command : mosaicimagewcs 
diff --git a/ds9/parsers/mosaicwcslex.fcl b/ds9/parsers/mosaicwcslex.fcl
index b742ee9..e09a9dc 100644
--- a/ds9/parsers/mosaicwcslex.fcl
+++ b/ds9/parsers/mosaicwcslex.fcl
@@ -10,7 +10,7 @@
 mask	    {return $MASK_}
 new	    {return $NEW_}
 
-#include coords.fin
+#include wcssys.fin
 #include string.fin
 #include ws.fin
 
diff --git a/ds9/parsers/mosaicwcsparser.tac b/ds9/parsers/mosaicwcsparser.tac
index 8d99ae6..0031baf 100644
--- a/ds9/parsers/mosaicwcsparser.tac
+++ b/ds9/parsers/mosaicwcsparser.tac
@@ -1,7 +1,7 @@
 %{
 %}
 
-#include coords.tin
+#include wcssys.tin
 #include string.tin
 
 %start command
@@ -11,7 +11,7 @@
 
 %%
 
-#include coords.trl
+#include wcssys.trl
 
 # XPA/SAMP only
 command : mosaicwcs 
diff --git a/ds9/parsers/rgblex.fcl b/ds9/parsers/rgblex.fcl
index 50135c2..a152f47 100644
--- a/ds9/parsers/rgblex.fcl
+++ b/ds9/parsers/rgblex.fcl
@@ -26,9 +26,8 @@ smooth	    {return $SMOOTH_}
 system	    {return $SYSTEM_}
 view	    {return $VIEW_}
 
-#include coords.fin
+#include wcssys.fin
 #include yesno.fin
-#include numeric.fin
 #include string.fin
 #include ws.fin
 
diff --git a/ds9/parsers/rgbparser.tac b/ds9/parsers/rgbparser.tac
index e020d04..986fcd1 100644
--- a/ds9/parsers/rgbparser.tac
+++ b/ds9/parsers/rgbparser.tac
@@ -1,9 +1,8 @@
 %{
 %}
 
-#include coords.tin
+#include wcssys.tin
 #include yesno.tin
-#include numeric.tin
 #include string.tin
 
 %start command
@@ -29,9 +28,8 @@
 
 %%
 
-#include coords.trl
+#include wcssys.trl
 #include yesno.trl
-#include numeric.trl
 
 command : rgb 
  | rgb {yyclearin; YYACCEPT} STRING_
diff --git a/ds9/parsers/shmlex.fcl b/ds9/parsers/shmlex.fcl
index 61d6b00..226db7b 100644
--- a/ds9/parsers/shmlex.fcl
+++ b/ds9/parsers/shmlex.fcl
@@ -32,7 +32,7 @@ iraf	    {return $IRAF_}
 shm	    {return $SHM_}
 -shm	    {return $SHMCMD_}
 
-#include coords.fin
+#include wcssys.fin
 #include numeric.fin
 #include string.fin
 #include ws.fin
diff --git a/ds9/parsers/shmparser.tac b/ds9/parsers/shmparser.tac
index 47a3efc..42ef5d1 100644
--- a/ds9/parsers/shmparser.tac
+++ b/ds9/parsers/shmparser.tac
@@ -1,7 +1,7 @@
 %{
 %}
 
-#include coords.tin
+#include wcssys.tin
 #include numeric.tin
 #include string.tin
 
@@ -33,7 +33,7 @@
 
 %%
 
-#include coords.trl
+#include wcssys.trl
 #include numeric.trl
 
 # only called by xpa/samp
diff --git a/ds9/parsers/smosaicwcslex.fcl b/ds9/parsers/smosaicwcslex.fcl
index 0bc4907..821dde5 100644
--- a/ds9/parsers/smosaicwcslex.fcl
+++ b/ds9/parsers/smosaicwcslex.fcl
@@ -10,7 +10,7 @@
 mask	    {return $MASK_}
 new	    {return $NEW_}
 
-#include coords.fin
+#include wcssys.fin
 #include string.fin
 #include ws.fin
 
diff --git a/ds9/parsers/smosaicwcsparser.tac b/ds9/parsers/smosaicwcsparser.tac
index 8710e69..fa65428 100644
--- a/ds9/parsers/smosaicwcsparser.tac
+++ b/ds9/parsers/smosaicwcsparser.tac
@@ -1,7 +1,7 @@
 %{
 %}
 
-#include coords.tin
+#include wcssys.tin
 #include string.tin
 
 %start command
@@ -11,7 +11,7 @@
 
 %%
 
-#include coords.trl
+#include wcssys.trl
 
 # XPA/SAMP only
 command : smosaicwcs 
-- 
cgit v0.12