update ds9 parsers

6 files changed, 19 insertions, 46 deletions

diff --git a/ds9/library/array.tcl b/ds9/library/array.tcl
index 902316b..65c29bd 100644
--- a/ds9/library/array.tcl
+++ b/ds9/library/array.tcl
@@ -81,7 +81,7 @@ proc ProcessArrayCmd {varname iname sock fn} {
 	global array
 	set array(load,sock) $sock
 	set array(load,fn) $fn
-	set array(load,layer) {}
+
 	global rgbarray
 	set rgbarray(load,sock) $sock
 	set rgbarray(load,fn) $fn
@@ -96,11 +96,7 @@ proc ProcessArrayCmd {varname iname sock fn} {
 	return
     }
 
-    global loadParam
-    global current
-
     set layer {}
-
     switch -- [string tolower [lindex $var $i]] {
 	new {
 	    incr i
@@ -135,27 +131,21 @@ proc ProcessArrayCmd {varname iname sock fn} {
 }
 }
 
-proc ArrayCmdSet {which value} {
-    global array
-
-    set array($which) $value
-}
-
-proc ArrayCmdLoad {param} {
+proc ArrayCmdLoad {param layer} {
     global array
 
     if {$array(load,sock) != {}} {
 	# xpa
-	if {![ImportArraySocket $array(load,sock) $param $array(load,layer)]} {
+	if {![ImportArraySocket $array(load,sock) $param $layer]} {
 	    InitError xpa
-	    ImportArrayFile $param $array(load,layer)
+	    ImportArrayFile $param $layer
 	}
     } else {
 	# comm
 	if {$array(load,fn) != {}} {
-	    ImportArrayAlloc $array(load,fn) $param $array(load,layer)
+	    ImportArrayAlloc $array(load,fn) $param $layer
 	} else {
-	    ImportArrayFile $param $array(load,layer)
+	    ImportArrayFile $param $layer
 	}
     }
     FinishLoad
diff --git a/ds9/library/nrrd.tcl b/ds9/library/nrrd.tcl
index 2dbe750..d4c78cd 100644
--- a/ds9/library/nrrd.tcl
+++ b/ds9/library/nrrd.tcl
@@ -89,7 +89,6 @@ proc ProcessNRRDCmd {varname iname sock fn} {
 	global nrrd
 	set nrrd(load,sock) $sock
 	set nrrd(load,fn) $fn
-	set nrrd(load,layer) {}
 
 	nrrd::YY_FLUSH_BUFFER
 	nrrd::yy_scan_string [lrange $var $i end]
@@ -97,8 +96,6 @@ proc ProcessNRRDCmd {varname iname sock fn} {
 	incr i [expr $nrrd::yycnt-1]
     } else {
 
-    global loadParam
-    global current
     set layer {}
     switch -- [string tolower [lindex $var $i]] {
 	new {
@@ -134,32 +131,26 @@ proc ProcessNRRDCmd {varname iname sock fn} {
 }
 }
 
-proc NRRDCmdLoad {param} {
+proc NRRDCmdLoad {param layer} {
     global nrrd
     
     if {$nrrd(load,sock) != {}} {
 	# xpa
-	if {![ImportNRRDSocket $nrrd(load,sock) $param $nrrd(load,layer)]} {
+	if {![ImportNRRDSocket $nrrd(load,sock) $param $layer]} {
 	    InitError xpa
-	    ImportNRRDFile $param $nrrd(load,layer)
+	    ImportNRRDFile $param $layer
 	}
     } else {
 	# comm
 	if {$nrrd(load,fn) != {}} {
-	    ImportNRRDAlloc $nrrd(load,fn) $param $nrrd(load,layer)
+	    ImportNRRDAlloc $nrrd(load,fn) $param $layer
 	} else {
-	    ImportNRRDFile $param $nrrd(load,layer)
+	    ImportNRRDFile $param $layer
 	}
     }
     FinishLoad
 }
 
-proc NRRDCmdSet {which value} {
-    global nrrd
-
-    set nrrd($which) $value
-}
-
 proc ProcessSendNRRDCmd {proc id param sock fn} {
     global current
 
diff --git a/ds9/library/rgbarray.tcl b/ds9/library/rgbarray.tcl
index 3417eec..469b862 100644
--- a/ds9/library/rgbarray.tcl
+++ b/ds9/library/rgbarray.tcl
@@ -193,12 +193,6 @@ proc RGBArrayCmdLoad {param} {
     FinishLoad
 }
 
-proc RGBArrayCmdSet {which value} {
-    global rgbarray
-
-    set rgbarray($which) $value
-}
-
 proc ProcessSendRGBArrayCmd {proc id param sock fn} {
     global current
 
diff --git a/ds9/parsers/arrayparser.tac b/ds9/parsers/arrayparser.tac
index da70625..8676d43 100644
--- a/ds9/parsers/arrayparser.tac
+++ b/ds9/parsers/arrayparser.tac
@@ -15,16 +15,16 @@ command : array
  | array {yyclearin; YYACCEPT} STRING_
  ;
 
-array : opts {ArrayCmdLoad {}}
- | opts STRING_ {ArrayCmdLoad $2}
+array : opts {ArrayCmdLoad {} $1}
+ | opts STRING_ {ArrayCmdLoad $2 $1}
 # backward compatibility
  | RGB_ STRING_ {RGBArrayCmdLoad $2}
  | NEW_ RGB_ STRING_ {CreateRGBFrame; RGBArrayCmdLoad $3}
  ;
 
 opts :
- | NEW_ {CreateFrame}
- | MASK_ {ArrayCmdSet load,layer mask}
+ | NEW_ {CreateFrame; set _ {}}
+ | MASK_ {set _ mask}
  ;
 
 %%
diff --git a/ds9/parsers/nrrdparser.tac b/ds9/parsers/nrrdparser.tac
index b0511a3..1c52718 100644
--- a/ds9/parsers/nrrdparser.tac
+++ b/ds9/parsers/nrrdparser.tac
@@ -14,13 +14,13 @@ command : nrrd
  | nrrd {yyclearin; YYACCEPT} STRING_
  ;
 
-nrrd : opts {NRRDCmdLoad {}}
- | opts STRING_ {NRRDCmdLoad $2}
+nrrd : opts {NRRDCmdLoad {} $1}
+ | opts STRING_ {NRRDCmdLoad $2 $1}
  ;
 
 opts :
- | NEW_ {CreateFrame}
- | MASK_ {NRRDCmdSet load,layer mask}
+ | NEW_ {CreateFrame; set _ {}}
+ | MASK_ {set _ mask}
  ;
 
 %%
diff --git a/ds9/parsers/rgbarrayparser.tac b/ds9/parsers/rgbarrayparser.tac
index b69a283..4fdf433 100644
--- a/ds9/parsers/rgbarrayparser.tac
+++ b/ds9/parsers/rgbarrayparser.tac
@@ -5,7 +5,6 @@
 
 %start command
 
-%token MASK_
 %token NEW_
 
 %%
@@ -20,7 +19,6 @@ rgbarray : opts {RGBArrayCmdLoad {}}
 
 opts :
  | NEW_ {CreateRGBFrame}
- | MASK_ {RGBArrayCmdSet load,layer mask}
  ;
 
 %%