update ds9 parsers

15 files changed, 86 insertions, 46 deletions

diff --git a/ds9/parsers/croplex.fcl b/ds9/parsers/croplex.fcl
index fd5f46f..de42f5a 100644
--- a/ds9/parsers/croplex.fcl
+++ b/ds9/parsers/croplex.fcl
@@ -9,10 +9,12 @@
 
 3d	{return $3D_}
 close	{return $CLOSE_}
+lock	{return $LOCK_}
+match	{return $MATCH_}
+none	{return $NONE_}
 open	{return $OPEN_}
 reset	{return $RESET_}
 
-#include matchlock.fin
 #include coordsys.fin
 #include wcssys.fin
 #include skyframe.fin
diff --git a/ds9/parsers/cropparser.tac b/ds9/parsers/cropparser.tac
index 96e8707..ba959bc 100644
--- a/ds9/parsers/cropparser.tac
+++ b/ds9/parsers/cropparser.tac
@@ -1,7 +1,6 @@
 %{
 %}
 
-#include matchlock.tin
 #include coordsys.tin
 #include wcssys.tin
 #include skyframe.tin
@@ -14,12 +13,14 @@
 
 %token 3D_
 %token CLOSE_
+%token LOCK_
+%token MATCH_
+%token NONE_
 %token OPEN_
 %token RESET_
 
 %%
 
-#include matchlock.trl
 #include coordsys.trl
 #include wcssys.trl
 #include skyframe.trl
@@ -61,6 +62,15 @@ crop : OPEN_ {CropDialog}
  | numeric numeric wcssys {ProcessCmdCurrent frame "crop 3d $1 $2 $3"}
  ;
 
+lock : coordsys {set _ $1}
+ | wcssys {set _ $1}
+ | NONE_  {set _ none}
+ ;
+
+match : coordsys {set _ $1}
+ | wcssys {set _ $1}
+ ;
+
 %%
 
 proc crop::yyerror {msg} {
diff --git a/ds9/parsers/crosshairlex.fcl b/ds9/parsers/crosshairlex.fcl
index d753d68..b827802 100644
--- a/ds9/parsers/crosshairlex.fcl
+++ b/ds9/parsers/crosshairlex.fcl
@@ -7,7 +7,10 @@
 
 %%
 
-#include matchlock.fin
+lock	{return $LOCK_}
+match	{return $MATCH_}
+none	{return $NONE_}
+
 #include coordsys.fin
 #include wcssys.fin
 #include skyframe.fin
diff --git a/ds9/parsers/crosshairparser.tac b/ds9/parsers/crosshairparser.tac
index d66ae72..c6a6de0 100644
--- a/ds9/parsers/crosshairparser.tac
+++ b/ds9/parsers/crosshairparser.tac
@@ -1,7 +1,6 @@
 %{
 %}
 
-#include matchlock.tin
 #include coordsys.tin
 #include wcssys.tin
 #include skyframe.tin
@@ -11,9 +10,12 @@
 
 %start command
 
+%token LOCK_
+%token MATCH_
+%token NONE_
+
 %%
 
-#include matchlock.trl
 #include coordsys.trl
 #include wcssys.trl
 #include skyframe.trl
@@ -36,6 +38,15 @@ crosshair : MATCH_ match {MatchCrosshairCurrent $2}
  | SEXSTR_ SEXSTR_ wcssys skyframe {CrosshairTo $1 $2 $3 $4}
  ;
 
+lock : coordsys {set _ $1}
+ | wcssys {set _ $1}
+ | NONE_  {set _ none}
+ ;
+
+match : coordsys {set _ $1}
+ | wcssys {set _ $1}
+ ;
+
 %%
 
 proc crosshair::yyerror {msg} {
diff --git a/ds9/parsers/cubelex.fcl b/ds9/parsers/cubelex.fcl
index 1ffd868..12d26bb 100644
--- a/ds9/parsers/cubelex.fcl
+++ b/ds9/parsers/cubelex.fcl
@@ -13,7 +13,10 @@ close	    {return $CLOSE_}
 first	    {return $FIRST_}
 interval    {return $INTERVAL_}
 last	    {return $LAST_}
+lock	    {return $LOCK_}
+match	    {return $MATCH_}
 next	    {return $NEXT_}
+none	    {return $NONE_}
 open	    {return $OPEN_}
 order	    {return $ORDER_}
 play	    {return $PLAY_}
@@ -27,7 +30,6 @@ stop	    {return $STOP_}
 312	    {return $312_}
 321	    {return $321_}
 
-#include matchlock.fin
 #include coordsys.fin
 #include wcssys.fin
 #include yesno.fin
diff --git a/ds9/parsers/cubeparser.tac b/ds9/parsers/cubeparser.tac
index 0a43504..671bbc4 100644
--- a/ds9/parsers/cubeparser.tac
+++ b/ds9/parsers/cubeparser.tac
@@ -1,7 +1,6 @@
 %{
 %}
 
-#include matchlock.tin
 #include coordsys.tin
 #include wcssys.tin
 #include yesno.tin
@@ -16,7 +15,10 @@
 %token FIRST_
 %token INTERVAL_
 %token LAST_
+%token LOCK_
+%token MATCH_
 %token NEXT_
+%token NONE_
 %token OPEN_
 %token ORDER_
 %token PLAY_
@@ -32,7 +34,6 @@
 
 %%
 
-#include matchlock.trl
 #include coordsys.trl
 #include wcssys.trl
 #include yesno.trl
@@ -71,6 +72,16 @@ orderAxes : 123_ {set _ 123}
  | 321_ {set _ 321}
  ;
 
+lockslice : {set _ image}
+ | IMAGE_ {set _ image}
+ | wcssys {set _ $1}
+ | NONE_ {set _ none}
+ ;
+
+matchslice : IMAGE_ {set _ image}
+ | wcssys {set _ $1}
+ ;
+
 %%
 
 proc cube::yyerror {msg} {
diff --git a/ds9/parsers/framelex.fcl b/ds9/parsers/framelex.fcl
index 1309195..caa531c 100644
--- a/ds9/parsers/framelex.fcl
+++ b/ds9/parsers/framelex.fcl
@@ -19,16 +19,18 @@ forward	    {return $FORWARD_}
 frameno	    {return $FRAMENO_}
 hide	    {return $HIDE_}
 last	    {return $LAST_}
+lock	    {return $LOCK_}
+match	    {return $MATCH_}
 move	    {return $MOVE_}
 new	    {return $NEW_}
 next	    {return $NEXT_}
+none	    {return $NONE_}
 prev	    {return $PREV_}
 refresh	    {return $REFRESH_}
 reset	    {return $RESET_}
 rgb	    {return $RGB_}
 show	    {return $SHOW_}
 
-#include matchlock.fin
 #include coordsys.fin
 #include wcssys.fin
 #include int.fin
diff --git a/ds9/parsers/frameparser.tac b/ds9/parsers/frameparser.tac
index 7a91411..ef8c1c3 100644
--- a/ds9/parsers/frameparser.tac
+++ b/ds9/parsers/frameparser.tac
@@ -1,7 +1,6 @@
 %{
 %}
 
-#include matchlock.tin
 #include coordsys.tin
 #include wcssys.tin
 #include int.tin
@@ -20,9 +19,12 @@
 %token FRAMENO_
 %token HIDE_
 %token LAST_
+%token LOCK_
+%token MATCH_
 %token MOVE_
 %token NEW_
 %token NEXT_
+%token NONE_
 %token PREV_
 %token REFRESH_
 %token RESET_
@@ -31,7 +33,6 @@
 
 %%
 
-#include matchlock.trl
 #include coordsys.trl
 #include wcssys.trl
 
@@ -104,6 +105,15 @@ move : FIRST_ {FirstFrame}
  | FORWARD_ {NextFrame}
  ;
 
+lock : coordsys {set _ $1}
+ | wcssys {set _ $1}
+ | NONE_  {set _ none}
+ ;
+
+match : coordsys {set _ $1}
+ | wcssys {set _ $1}
+ ;
+
 %%
 
 proc frame::yyerror {msg} {
diff --git a/ds9/parsers/locklex.fcl b/ds9/parsers/locklex.fcl
index cde314d..b4ea514 100644
--- a/ds9/parsers/locklex.fcl
+++ b/ds9/parsers/locklex.fcl
@@ -15,13 +15,13 @@ colorbar    {return $COLORBAR_}
 crop	    {return $CROP_}
 crosshair   {return $CROSSHAIR_}
 frame	    {return $FRAME_}
+image	    {return $IMAGE_}
+none	    {return $NONE_}
 scale	    {return $SCALE_}
 scalelimits {return $SCALELIMITS_}
 slice	    {return $SLICE_}
 smooth	    {return $SMOOTH_}
 
-#include matchlock.fin
-#include coordsys.fin
 #include wcssys.fin
 #include yesno.fin
 #include string.fin
diff --git a/ds9/parsers/lockparser.tac b/ds9/parsers/lockparser.tac
index b40650b..987fca4 100644
--- a/ds9/parsers/lockparser.tac
+++ b/ds9/parsers/lockparser.tac
@@ -1,7 +1,6 @@
 %{
 %}
 
-#include matchlock.tin
 #include coordsys.tin
 #include wcssys.tin
 #include yesno.tin
@@ -22,9 +21,10 @@
 %token SLICE_
 %token SMOOTH_
 
+%token NONE_
+
 %%
 
-#include matchlock.trl
 #include coordsys.trl
 #include wcssys.trl
 #include yesno.trl
@@ -47,6 +47,17 @@ lock : FRAME_ lock {ProcessCmdSet panzoom lock $2 LockFrameCurrent}
  | 3D_ yesno {ProcessCmdSet threed lock $2 Lock3DCurrent}
  ;
 
+lock : coordsys {set _ $1}
+ | wcssys {set _ $1}
+ | NONE_  {set _ none}
+ ;
+
+lockslice : {set _ image}
+ | IMAGE_ {set _ image}
+ | wcssys {set _ $1}
+ | NONE_ {set _ none}
+ ;
+
 %%
 
 proc lock::yyerror {msg} {
diff --git a/ds9/parsers/matchlex.fcl b/ds9/parsers/matchlex.fcl
index 31ebf7b..5c758c0 100644
--- a/ds9/parsers/matchlex.fcl
+++ b/ds9/parsers/matchlex.fcl
@@ -20,7 +20,6 @@ scalelimits {return $SCALELIMITS_}
 slice	    {return $SLICE_}
 smooth	    {return $SMOOTH_}
 
-#include matchlock.fin
 #include coordsys.fin
 #include wcssys.fin
 #include string.fin
diff --git a/ds9/parsers/matchlock.fin b/ds9/parsers/matchlock.fin
deleted file mode 100644
index 5c3a3a6..0000000
--- a/ds9/parsers/matchlock.fin
+++ /dev/null
@@ -1,3 +0,0 @@
-lock	{return $LOCK_}
-match	{return $MATCH_}
-none	{return $NONE_}
diff --git a/ds9/parsers/matchlock.tin b/ds9/parsers/matchlock.tin
deleted file mode 100644
index 753a5d0..0000000
--- a/ds9/parsers/matchlock.tin
+++ /dev/null
@@ -1,3 +0,0 @@
-%token LOCK_
-%token MATCH_
-%token NONE_
diff --git a/ds9/parsers/matchlock.trl b/ds9/parsers/matchlock.trl
deleted file mode 100644
index 9a2affc..0000000
--- a/ds9/parsers/matchlock.trl
+++ /dev/null
@@ -1,21 +0,0 @@
-lock : coordsys {set _ $1}
- | wcssys {set _ $1}
- | NONE_  {set _ none}
- ;
-
-lockslice : {set _ image}
- | IMAGE_ {set _ image}
- | wcssys {set _ $1}
- | NONE_ {set _ none}
- ;
-
-match : coordsys {set _ $1}
- | wcssys {set _ $1}
- ;
-
-matchslice : IMAGE_ {set _ image}
- | wcssys {set _ $1}
- ;
-
-
-
diff --git a/ds9/parsers/matchparser.tac b/ds9/parsers/matchparser.tac
index 9bda245..9c58fa3 100644
--- a/ds9/parsers/matchparser.tac
+++ b/ds9/parsers/matchparser.tac
@@ -1,7 +1,6 @@
 %{
 %}
 
-#include matchlock.tin
 #include coordsys.tin
 #include wcssys.tin
 #include string.tin
@@ -23,7 +22,6 @@
 
 %%
 
-#include matchlock.trl
 #include coordsys.trl
 #include wcssys.trl
 
@@ -45,6 +43,14 @@ match : FRAME_ match {MatchFrameCurrent $2}
  | 3D_ {Match3DCurrent}
  ;
 
+match : coordsys {set _ $1}
+ | wcssys {set _ $1}
+ ;
+
+matchslice : IMAGE_ {set _ image}
+ | wcssys {set _ $1}
+ ;
+
 %%
 
 proc match::yyerror {msg} {