summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2018-05-10 19:57:46 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2018-05-10 19:57:46 (GMT)
commit17f9645239b888c3e47dab5dde0edc86068f59eb (patch)
tree8099c4afee593e7e9806c19d58cc3a0544e79cf6
parent5681a3943cf5cde897b43d786cbf588698e79647 (diff)
downloadblt-17f9645239b888c3e47dab5dde0edc86068f59eb.zip
blt-17f9645239b888c3e47dab5dde0edc86068f59eb.tar.gz
blt-17f9645239b888c3e47dab5dde0edc86068f59eb.tar.bz2
update ds9 parsers
-rw-r--r--ds9/library/mecube.tcl16
-rw-r--r--ds9/library/multiframe.tcl16
2 files changed, 16 insertions, 16 deletions
diff --git a/ds9/library/mecube.tcl b/ds9/library/mecube.tcl
index 3c08660..426ca81 100644
--- a/ds9/library/mecube.tcl
+++ b/ds9/library/mecube.tcl
@@ -83,9 +83,9 @@ proc ProcessMECubeCmd {varname iname sock fn} {
global debug
if {$debug(tcl,parser)} {
- global mecube
- set mecube(load,sock) $sock
- set mecube(load,fn) $fn
+ global parse
+ set parse(sock) $sock
+ set parse(fn) $fn
mecube::YY_FLUSH_BUFFER
mecube::yy_scan_string [lrange $var $i end]
@@ -128,18 +128,18 @@ proc ProcessMECubeCmd {varname iname sock fn} {
}
proc MECubeCmdLoad {param} {
- global mecube
+ global parse
- if {$mecube(load,sock) != {}} {
+ if {$parse(sock) != {}} {
# xpa
- if {![LoadMECubeSocket $mecube(load,sock) $param]} {
+ if {![LoadMECubeSocket $parse(sock) $param]} {
InitError xpa
LoadMECubeFile $param
}
} else {
# comm
- if {$mecube(load,fn) != {}} {
- LoadMECubeAlloc $mecube(load,fn) $param
+ if {$parse(fn) != {}} {
+ LoadMECubeAlloc $parse(fn) $param
} else {
LoadMECubeFile $param
}
diff --git a/ds9/library/multiframe.tcl b/ds9/library/multiframe.tcl
index 89342cb..cc5a9bc 100644
--- a/ds9/library/multiframe.tcl
+++ b/ds9/library/multiframe.tcl
@@ -138,9 +138,9 @@ proc ProcessMultiFrameCmd {varname iname sock fn} {
global debug
if {$debug(tcl,parser)} {
- global multiframe
- set multiframe(load,sock) $sock
- set multiframe(load,fn) $fn
+ global parse
+ set parse(sock) $sock
+ set parse(fn) $fn
multiframe::YY_FLUSH_BUFFER
multiframe::yy_scan_string [lrange $var $i end]
@@ -191,16 +191,16 @@ proc ProcessMultiFrameCmd {varname iname sock fn} {
}
proc MultiframeCmdLoad {param} {
- global multiframe
+ global parse
- if {$multiframe(load,sock) != {}} {
+ if {$parse(sock) != {}} {
# xpa
global tcl_platform
switch $tcl_platform(os) {
Linux -
Darwin -
SunOS {
- if {![LoadMultiFrameSocket $multiframe(load,sock) $param]} {
+ if {![LoadMultiFrameSocket $parse(sock) $param]} {
InitError xpa
LoadMultiFrameFile $param
}
@@ -209,8 +209,8 @@ proc MultiframeCmdLoad {param} {
}
} else {
# comm
- if {$multiframe(load,fn) != {}} {
- LoadMultiFrameAlloc $multiframe(load,fn) $param
+ if {$parse(fn) != {}} {
+ LoadMultiFrameAlloc $parse(fn) $param
} else {
LoadMultiFrameFile $param
}