update ds9 parsers

2 files changed, 16 insertions, 20 deletions

diff --git a/ds9/library/array.tcl b/ds9/library/array.tcl
index 65c29bd..5ee12a6 100644
--- a/ds9/library/array.tcl
+++ b/ds9/library/array.tcl
@@ -78,13 +78,9 @@ proc ProcessArrayCmd {varname iname sock fn} {
 
     global debug
     if {$debug(tcl,parser)} {
-	global array
-	set array(load,sock) $sock
-	set array(load,fn) $fn
-
-	global rgbarray
-	set rgbarray(load,sock) $sock
-	set rgbarray(load,fn) $fn
+	global parse
+	set parse(sock) $sock
+	set parse(fn) $fn
 
 	array::YY_FLUSH_BUFFER
 	array::yy_scan_string [lrange $var $i end]
@@ -132,18 +128,18 @@ proc ProcessArrayCmd {varname iname sock fn} {
 }
 
 proc ArrayCmdLoad {param layer} {
-    global array
+    global parse
 
-    if {$array(load,sock) != {}} {
+    if {$parse(sock) != {}} {
 	# xpa
-	if {![ImportArraySocket $array(load,sock) $param $layer]} {
+	if {![ImportArraySocket $parse(sock) $param $layer]} {
 	    InitError xpa
 	    ImportArrayFile $param $layer
 	}
     } else {
 	# comm
-	if {$array(load,fn) != {}} {
-	    ImportArrayAlloc $array(load,fn) $param $layer
+	if {$parse(fn) != {}} {
+	    ImportArrayAlloc $parse(fn) $param $layer
 	} else {
 	    ImportArrayFile $param $layer
 	}
diff --git a/ds9/library/rgbarray.tcl b/ds9/library/rgbarray.tcl
index 469b862..aff77a0 100644
--- a/ds9/library/rgbarray.tcl
+++ b/ds9/library/rgbarray.tcl
@@ -129,9 +129,9 @@ proc ProcessRGBArrayCmd {varname iname sock fn} {
 
     global debug
     if {$debug(tcl,parser)} {
-	global rgbarray
-	set rgbarray(load,sock) $sock
-	set rgbarray(load,fn) $fn
+	global parse
+	set parse(sock) $sock
+	set parse(fn) $fn
 
 	rgbarray::YY_FLUSH_BUFFER
 	rgbarray::yy_scan_string [lrange $var $i end]
@@ -174,18 +174,18 @@ proc ProcessRGBArrayCmd {varname iname sock fn} {
 }
 
 proc RGBArrayCmdLoad {param} {
-    global rgbarray
+    global parse
 
-    if {$rgbarray(load,sock) != {}} {
+    if {$parse(sock) != {}} {
 	# xpa
-	if {![ImportRGBArraySocket $rgbarray(load,sock) $param]} {
+	if {![ImportRGBArraySocket $parse(sock) $param]} {
 	    InitError xpa
 	    ImportRGBArrayFile $param
 	}
     } else {
 	# comm
-	if {$rgbarray(load,fn) != {}} {
-	    ImportRGBArrayAlloc $rgbarray(load,fn) $param
+	if {$parse(fn) != {}} {
+	    ImportRGBArrayAlloc $parse(fn) $param
 	} else {
 	    ImportRGBArrayFile $param
 	}