From 621489ea721d60c8472d234b97e6757327292daa Mon Sep 17 00:00:00 2001 From: William Joye Date: Tue, 19 Jun 2018 14:28:40 -0400 Subject: update parsers --- ds9/library/2mass.tcl | 4 ++-- ds9/library/colorbar.tcl | 1 + ds9/library/eso.tcl | 4 ++-- ds9/library/fits.tcl | 2 ++ ds9/library/nvss.tcl | 4 ++-- ds9/library/panzoom.tcl | 2 -- ds9/library/sao.tcl | 4 ++-- ds9/library/sia.tcl | 1 - ds9/library/skyview.tcl | 4 ++-- ds9/library/stsci.tcl | 4 ++-- ds9/library/util.tcl | 6 ------ ds9/library/vla.tcl | 4 ++-- ds9/library/vlss.tcl | 4 ++-- ds9/library/wcs.tcl | 1 - ds9/library/xpa.tcl | 1 - 15 files changed, 19 insertions(+), 27 deletions(-) diff --git a/ds9/library/2mass.tcl b/ds9/library/2mass.tcl index 2759989..75a0662 100644 --- a/ds9/library/2mass.tcl +++ b/ds9/library/2mass.tcl @@ -137,12 +137,12 @@ proc Process2MASSCmd {varname iname} { } proc ProcessSend2MASSCmd {proc id param {sock {}} {fn {}}} { - 2MASSDialog - global parse set parse(proc) $proc set parse(id) $id + 2MASSDialog + twomasssend::YY_FLUSH_BUFFER twomasssend::yy_scan_string $param twomasssend::yyparse diff --git a/ds9/library/colorbar.tcl b/ds9/library/colorbar.tcl index 251a638..ed9ec83 100644 --- a/ds9/library/colorbar.tcl +++ b/ds9/library/colorbar.tcl @@ -1268,6 +1268,7 @@ proc ProcessSendColorbarCmd {proc id param {sock {}} {fn {}}} { global parse set parse(proc) $proc set parse(id) $id + colorbarsend::YY_FLUSH_BUFFER colorbarsend::yy_scan_string $param colorbarsend::yyparse diff --git a/ds9/library/eso.tcl b/ds9/library/eso.tcl index cd3d680..ec013c8 100644 --- a/ds9/library/eso.tcl +++ b/ds9/library/eso.tcl @@ -166,12 +166,12 @@ proc ProcessESOCmd {varname iname} { } proc ProcessSendESOCmd {proc id param {sock {}} {fn {}}} { - ESODialog - global parse set parse(proc) $proc set parse(id) $id + ESODialog + dssesosend::YY_FLUSH_BUFFER dssesosend::yy_scan_string $param dssesosend::yyparse diff --git a/ds9/library/fits.tcl b/ds9/library/fits.tcl index 1c5ab0f..fc125b1 100644 --- a/ds9/library/fits.tcl +++ b/ds9/library/fits.tcl @@ -141,6 +141,8 @@ proc ProcessSendFitsCmd {proc id param sock fn} { global parse set parse(proc) $proc set parse(id) $id + set parse(sock) $sock + set parse(fn) $fn fitssend::YY_FLUSH_BUFFER fitssend::yy_scan_string $param diff --git a/ds9/library/nvss.tcl b/ds9/library/nvss.tcl index b12df44..a2352e3 100644 --- a/ds9/library/nvss.tcl +++ b/ds9/library/nvss.tcl @@ -156,12 +156,12 @@ proc ProcessNVSSCmd {varname iname} { } proc ProcessSendNVSSCmd {proc id param {sock {}} {fn {}}} { - NVSSDialog - global parse set parse(proc) $proc set parse(id) $id + NVSSDialog + nvsssend::YY_FLUSH_BUFFER nvsssend::yy_scan_string $param nvsssend::yyparse diff --git a/ds9/library/panzoom.tcl b/ds9/library/panzoom.tcl index f885bb7..b17d8a6 100644 --- a/ds9/library/panzoom.tcl +++ b/ds9/library/panzoom.tcl @@ -740,7 +740,6 @@ proc ProcessOrientCmd {varname iname} { proc ProcessSendOrientCmd {proc id param {sock {}} {fn {}}} { global current - $proc $id "$current(orient)\n" } @@ -759,7 +758,6 @@ proc ProcessRotateCmd {varname iname} { proc ProcessSendRotateCmd {proc id param {sock {}} {fn {}}} { global current - $proc $id "$current(rotate)\n" } diff --git a/ds9/library/sao.tcl b/ds9/library/sao.tcl index 0efafa9..50026e5 100644 --- a/ds9/library/sao.tcl +++ b/ds9/library/sao.tcl @@ -151,12 +151,12 @@ proc ProcessSAOCmd {varname iname} { } proc ProcessSendSAOCmd {proc id param {sock {}} {fn {}}} { - SAODialog - global parse set parse(proc) $proc set parse(id) $id + SAODialog + dsssaosend::YY_FLUSH_BUFFER dsssaosend::yy_scan_string $param dsssaosend::yyparse diff --git a/ds9/library/sia.tcl b/ds9/library/sia.tcl index 05cf160..a07c4be 100644 --- a/ds9/library/sia.tcl +++ b/ds9/library/sia.tcl @@ -458,6 +458,5 @@ proc SIACmdSystem {sys} { proc ProcessSendSIACmd {proc id param sock fn} { global isia - $proc $id "$isia(sias)\n" } diff --git a/ds9/library/skyview.tcl b/ds9/library/skyview.tcl index 0e0a3f5..598a077 100644 --- a/ds9/library/skyview.tcl +++ b/ds9/library/skyview.tcl @@ -617,12 +617,12 @@ proc ProcessSkyViewCmd {varname iname} { } proc ProcessSendSkyViewCmd {proc id param {sock {}} {fn {}}} { - SkyViewDialog - global parse set parse(proc) $proc set parse(id) $id + SkyViewDialog + skyviewsend::YY_FLUSH_BUFFER skyviewsend::yy_scan_string $param skyviewsend::yyparse diff --git a/ds9/library/stsci.tcl b/ds9/library/stsci.tcl index c9d4001..92db8fc 100644 --- a/ds9/library/stsci.tcl +++ b/ds9/library/stsci.tcl @@ -178,12 +178,12 @@ proc ProcessSTSCICmd {varname iname} { } proc ProcessSendSTSCICmd {proc id param {sock {}} {fn {}}} { - STSCIDialog - global parse set parse(proc) $proc set parse(id) $id + STSCIDialog + dssstscisend::YY_FLUSH_BUFFER dssstscisend::yy_scan_string $param dssstscisend::yyparse diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl index 1f937c3..5aa9a5f 100644 --- a/ds9/library/util.tcl +++ b/ds9/library/util.tcl @@ -1385,7 +1385,6 @@ proc ProcessPrecisionCmd {varname iname} { proc ProcessSendPrecisionCmd {proc id param {sock {}} {fn {}}} { global pds9 - $proc $id "$pds9(prec,linear) $pds9(prec,deg) $pds9(prec,hms) $pds9(prec,dms) $pds9(prec,arcmin) $pds9(prec,arcsec)\n" } @@ -1401,7 +1400,6 @@ proc ProcessBgCmd {varname iname} { proc ProcessSendBgCmd {proc id param {sock {}} {fn {}}} { global pds9 - $proc $id "$pds9(bg)\n" } @@ -1417,7 +1415,6 @@ proc ProcessNanCmd {varname iname} { proc ProcessSendNanCmd {proc id param {sock {}} {fn {}}} { global pds9 - $proc $id "$pds9(nan)\n" } @@ -1433,13 +1430,11 @@ proc ProcessThreadsCmd {varname iname} { proc ProcessSendThreadsCmd {proc id param {sock {}} {fn {}}} { global ds9 - $proc $id "$ds9(threads)\n" } proc ProcessSendIRAFAlignCmd {proc id param {sock {}} {fn {}}} { global pds9 - $proc $id [ToYesNo $pds9(iraf)] } @@ -1612,7 +1607,6 @@ proc ProcessQuitCmd {varname iname} { proc ProcessSendModeCmd {proc id param {sock {}} {fn {}}} { global current - $proc $id "$current(mode)\n" } diff --git a/ds9/library/vla.tcl b/ds9/library/vla.tcl index d48f62d..8cebc1e 100644 --- a/ds9/library/vla.tcl +++ b/ds9/library/vla.tcl @@ -169,12 +169,12 @@ proc ProcessVLACmd {varname iname} { } proc ProcessSendVLACmd {proc id param {sock {}} {fn {}}} { - VLADialog - global parse set parse(proc) $proc set parse(id) $id + VLADialog + vlasend::YY_FLUSH_BUFFER vlasend::yy_scan_string $param vlasend::yyparse diff --git a/ds9/library/vlss.tcl b/ds9/library/vlss.tcl index 93d2e4c..8c70fa1 100644 --- a/ds9/library/vlss.tcl +++ b/ds9/library/vlss.tcl @@ -128,12 +128,12 @@ proc ProcessVLSSCmd {varname iname} { } proc ProcessSendVLSSCmd {proc id param {sock {}} {fn {}}} { - VLSSDialog - global parse set parse(proc) $proc set parse(id) $id + VLSSDialog + vlsssend::YY_FLUSH_BUFFER vlsssend::yy_scan_string $param vlsssend::yyparse diff --git a/ds9/library/wcs.tcl b/ds9/library/wcs.tcl index d0e1f5c..5356897 100644 --- a/ds9/library/wcs.tcl +++ b/ds9/library/wcs.tcl @@ -1209,7 +1209,6 @@ proc ProcessAlignCmd {varname iname} { proc ProcessSendAlignCmd {proc id param {sock {}} {fn {}}} { global current - $proc $id [ToYesNo $current(align)] } diff --git a/ds9/library/xpa.tcl b/ds9/library/xpa.tcl index 8aae80e..5dde6b5 100644 --- a/ds9/library/xpa.tcl +++ b/ds9/library/xpa.tcl @@ -2223,7 +2223,6 @@ proc ProcessXPACmd {varname iname} { proc ProcessSendXPACmd {proc id param {sock {}} {fn {}}} { global parse - set parse(proc) $proc set parse(id) $id -- cgit v0.12