From e1f5a6a2b516116e280c01e383a73c4ca12df423 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Thu, 15 Mar 2018 17:20:53 -0400
Subject: update ds9 parsers

---
 ds9/library/2mass.tcl      | 23 ++++++++++-------------
 ds9/library/3d.tcl         | 24 +++++++++---------------
 ds9/library/bin.tcl        | 20 +++++++++-----------
 ds9/library/block.tcl      | 22 +++++++++-------------
 ds9/library/colorbar.tcl   | 43 +++++++++++++++++++------------------------
 ds9/library/crop.tcl       | 22 +++++++++-------------
 ds9/library/debug.tcl      |  3 +++
 ds9/library/eso.tcl        | 23 ++++++++++-------------
 ds9/library/frame.tcl      | 19 +++++++++----------
 ds9/library/grid.tcl       | 19 +++++++++----------
 ds9/library/header.tcl     | 21 ++++++++++-----------
 ds9/library/layout.tcl     | 19 +++++++++----------
 ds9/library/nvss.tcl       | 23 ++++++++++-------------
 ds9/library/panzoom.tcl    | 44 ++++++++++++++++++--------------------------
 ds9/library/sao.tcl        | 23 ++++++++++-------------
 ds9/library/scale.tcl      | 19 +++++++++----------
 ds9/library/skyview.tcl    | 23 ++++++++++-------------
 ds9/library/stsci.tcl      | 23 ++++++++++-------------
 ds9/library/vla.tcl        | 23 ++++++++++-------------
 ds9/library/vlss.tcl       | 23 ++++++++++-------------
 ds9/parsers/gridparser.tac |  8 ++++----
 21 files changed, 206 insertions(+), 261 deletions(-)

diff --git a/ds9/library/2mass.tcl b/ds9/library/2mass.tcl
index 24b9644..aaf315f 100644
--- a/ds9/library/2mass.tcl
+++ b/ds9/library/2mass.tcl
@@ -129,22 +129,19 @@ Foundation.
 
 proc Process2MASSCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    2MASSDialog
-
-    twomass::YY_FLUSH_BUFFER
-    twomass::yy_scan_string [lrange $var $ii end]
-    twomass::yyparse
-    incr ii [expr $twomass::yycnt-1]
-}
-
-proc oProcess2MASSCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     2MASSDialog
-    IMGSVRProcessCmd $varname $iname dtwomass
+
+    global debug
+    if {$debug(tcl,parser)} {
+	twomass::YY_FLUSH_BUFFER
+	twomass::yy_scan_string [lrange $var $i end]
+	twomass::yyparse
+	incr i [expr $twomass::yycnt-1]
+    } else {
+	IMGSVRProcessCmd $varname $iname dtwomass
+    }
 }
 
 proc ProcessSend2MASSCmd {proc id param} {
diff --git a/ds9/library/3d.tcl b/ds9/library/3d.tcl
index 9b258ec..6a42f92 100644
--- a/ds9/library/3d.tcl
+++ b/ds9/library/3d.tcl
@@ -462,26 +462,19 @@ proc PrefsDialog3d {} {
 
 proc Process3DCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
+    upvar $iname i
 
-    global threed
- 
     3DDialog
 
-    threed::YY_FLUSH_BUFFER
-    threed::yy_scan_string [lrange $var $ii end]
-    threed::yyparse
-    incr ii [expr $threed::yycnt-1]
-}
-
-proc oProcess3DCmd {varname iname} {
-    upvar $varname var
-    upvar $iname i
+    global debug
+    if {$debug(tcl,parser)} {
+	threed::YY_FLUSH_BUFFER
+	threed::yy_scan_string [lrange $var $i end]
+	threed::yyparse
+	incr i [expr $threed::yycnt-1]
+    } else {
 
     global threed
- 
-    3DDialog
-
     switch -- [string tolower [lindex $var $i]] {
 	open {}
 	close {3DDestroyDialog}
@@ -574,6 +567,7 @@ proc oProcess3DCmd {varname iname} {
 	default {Create3DFrame; incr i -1}
     }
 }
+}
 
 proc ProcessSend3DCmd {proc id param} {
     global threed
diff --git a/ds9/library/bin.tcl b/ds9/library/bin.tcl
index c4f2786..1e12a35 100644
--- a/ds9/library/bin.tcl
+++ b/ds9/library/bin.tcl
@@ -721,20 +721,17 @@ proc BinBackupRGB {ch which} {
 
 proc ProcessBinCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    bin::YY_FLUSH_BUFFER
-    bin::yy_scan_string [lrange $var $ii end]
-    bin::yyparse
-    incr ii [expr $bin::yycnt-1]
-}
-
-proc oProcessBinCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
-    global bin
+    global debug
+    if {$debug(tcl,parser)} {
+	bin::YY_FLUSH_BUFFER
+	bin::yy_scan_string [lrange $var $i end]
+	bin::yyparse
+	incr i [expr $bin::yycnt-1]
+    } else {
 
+    global bin
     switch -- [string tolower [lindex $var $i]] {
 	close {BinDestroyDialog}
 	open {BinDialog}
@@ -809,6 +806,7 @@ proc oProcessBinCmd {varname iname} {
 	}
     }
 }
+}
 
 proc ProcessSendBinCmd {proc id param} {
     global bin
diff --git a/ds9/library/block.tcl b/ds9/library/block.tcl
index e18f452..3df2223 100644
--- a/ds9/library/block.tcl
+++ b/ds9/library/block.tcl
@@ -284,24 +284,19 @@ proc BlockBackupRGB {ch which} {
 
 proc ProcessBlockCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    # we need to be realized
-    ProcessRealizeDS9
-
-    block::YY_FLUSH_BUFFER
-    block::yy_scan_string [lrange $var $ii end]
-    block::yyparse
-    incr ii [expr $block::yycnt-1]
-}
-
-proc oProcessBlockCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     # we need to be realized
     ProcessRealizeDS9
 
+    global debug
+    if {$debug(tcl,parser)} {
+	block::YY_FLUSH_BUFFER
+	block::yy_scan_string [lrange $var $i end]
+	block::yyparse
+	incr i [expr $block::yycnt-1]
+    } else {
+
     global block
     switch -- [string tolower [lindex $var $i]] {
 	open {BlockDialog}
@@ -351,6 +346,7 @@ proc oProcessBlockCmd {varname iname} {
 	}
     }
 }
+}
 
 proc ProcessSendBlockCmd {proc id param} {
     global block
diff --git a/ds9/library/colorbar.tcl b/ds9/library/colorbar.tcl
index f9a209f..94a5065 100644
--- a/ds9/library/colorbar.tcl
+++ b/ds9/library/colorbar.tcl
@@ -1183,21 +1183,19 @@ proc ColorbarBackupCmaps {ch dir} {
 
 proc ProcessCmapCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
+    upvar $iname i
 
     # we need to be realized
     ProcessRealizeDS9
 
-    cmap::YY_FLUSH_BUFFER
-    cmap::yy_scan_string [lrange $var $ii end]
-    cmap::yyparse
-    incr ii [expr $cmap::yycnt-1]
-}
-
-proc oProcessCmapCmd {varname iname} {
-    upvar $varname var
-    upvar $iname i
-
+    global debug
+    if {$debug(tcl,parser)} {
+	cmap::YY_FLUSH_BUFFER
+	cmap::yy_scan_string [lrange $var $i end]
+	cmap::yyparse
+	incr i [expr $cmap::yycnt-1]
+    } else {
+	
     global colorbar
     global current
 
@@ -1205,9 +1203,6 @@ proc oProcessCmapCmd {varname iname} {
     global current
     global rgb
 
-    # we need to be realized
-    ProcessRealizeDS9
-
     switch -- [string tolower [lindex $var $i]] {
 	open {ColormapDialog}
 	close {ColormapDestroyDialog}
@@ -1301,6 +1296,7 @@ proc oProcessCmapCmd {varname iname} {
 	    UpdateColorDialog
 	}
     }
+    }
 }
 
 proc CmapCmd {item} {
@@ -1368,18 +1364,16 @@ proc ProcessSendCmapCmd {proc id param} {
 
 proc ProcessColorbarCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    colorbar::YY_FLUSH_BUFFER
-    colorbar::yy_scan_string [lrange $var $ii end]
-    colorbar::yyparse
-    incr ii [expr $colorbar::yycnt-1]
-}
-
-proc oProcessColorbarCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
+    global debug
+    if {$debug(tcl,parser)} {
+	colorbar::YY_FLUSH_BUFFER
+	colorbar::yy_scan_string [lrange $var $i end]
+	colorbar::yyparse
+	incr i [expr $colorbar::yycnt-1]
+    } else {
+	
     global colorbar
     global view
 
@@ -1490,6 +1484,7 @@ proc oProcessColorbarCmd {varname iname} {
 	}
     }
 }
+}
 
 proc ProcessSendColorbarCmd {proc id param} {
     global colorbar
diff --git a/ds9/library/crop.tcl b/ds9/library/crop.tcl
index 6c71d91..faf686c 100644
--- a/ds9/library/crop.tcl
+++ b/ds9/library/crop.tcl
@@ -388,24 +388,19 @@ proc CropBackupRGB {ch which} {
 
 proc ProcessCropCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    # we need to be realized
-    ProcessRealizeDS9
-
-    crop::YY_FLUSH_BUFFER
-    crop::yy_scan_string [lrange $var $ii end]
-    crop::yyparse
-    incr ii [expr $crop::yycnt-1]
-}
-
-proc oProcessCropCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     # we need to be realized
     ProcessRealizeDS9
 
+    global debug
+    if {$debug(tcl,parser)} {
+	crop::YY_FLUSH_BUFFER
+	crop::yy_scan_string [lrange $var $i end]
+	crop::yyparse
+	incr i [expr $crop::yycnt-1]
+    } else {
+
     global crop
     global current
     switch -- [string tolower [lindex $var $i]] {
@@ -447,6 +442,7 @@ proc oProcessCropCmd {varname iname} {
 	    $current(frame) crop center $x $y $sys $sky $w $h $sys $dformat
 	}
     }
+    }
 }
 
 proc ProcessSendCropCmd {proc id param} {
diff --git a/ds9/library/debug.tcl b/ds9/library/debug.tcl
index 4ef5c7f..360f1c7 100644
--- a/ds9/library/debug.tcl
+++ b/ds9/library/debug.tcl
@@ -24,6 +24,7 @@ proc DebugDef {} {
     set debug(tcl,ftp) 0
     set debug(tcl,xpa) 0
     set debug(tcl,image) 0
+    set debug(tcl,parser) 1
 
     set debug(tksao,ast) 0
     set debug(tksao,mosaic) 0
@@ -99,6 +100,8 @@ proc DebugMenu {} {
 	-variable debug(tcl,xpa)
     $ds9(mb).debug.tcl add checkbutton -label {IMAGE} \
 	-variable debug(tcl,image)
+    $ds9(mb).debug.tcl add checkbutton -label {DS9Parser} \
+	-variable debug(tcl,parser)
 
     menu $ds9(mb).debug.tksao
     $ds9(mb).debug.tksao add checkbutton -label {AST} \
diff --git a/ds9/library/eso.tcl b/ds9/library/eso.tcl
index 9bfef54..b7b7c6a 100644
--- a/ds9/library/eso.tcl
+++ b/ds9/library/eso.tcl
@@ -158,22 +158,19 @@ taken with the UK Schmidt.
 
 proc ProcessESOCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    ESODialog
-
-    dsseso::YY_FLUSH_BUFFER
-    dsseso::yy_scan_string [lrange $var $ii end]
-    dsseso::yyparse
-    incr ii [expr $dsseso::yycnt-1]
-}
-
-proc oProcessESOCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     ESODialog
-    IMGSVRProcessCmd $varname $iname deso
+
+    global debug
+    if {$debug(tcl,parser)} {
+	dsseso::YY_FLUSH_BUFFER
+	dsseso::yy_scan_string [lrange $var $i end]
+	dsseso::yyparse
+	incr i [expr $dsseso::yycnt-1]
+    } else {
+	IMGSVRProcessCmd $varname $iname deso
+    }
 }
 
 proc ProcessSendESOCmd {proc id param} {
diff --git a/ds9/library/frame.tcl b/ds9/library/frame.tcl
index d36ac41..8c52282 100644
--- a/ds9/library/frame.tcl
+++ b/ds9/library/frame.tcl
@@ -2308,18 +2308,16 @@ proc ProcessSendSingleCmd {proc id param} {
 
 proc ProcessTileCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    tile::YY_FLUSH_BUFFER
-    tile::yy_scan_string [lrange $var $ii end]
-    tile::yyparse
-    incr ii [expr $tile::yycnt-1]
-}
-
-proc oProcessTileCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
+    global debug
+    if {$debug(tcl,parser)} {
+	tile::YY_FLUSH_BUFFER
+	tile::yy_scan_string [lrange $var $i end]
+	tile::yyparse
+	incr i [expr $tile::yycnt-1]
+    } else {
+	
     global current
     global tile
 
@@ -2387,6 +2385,7 @@ proc oProcessTileCmd {varname iname} {
     }
     DisplayMode
 }
+}
 
 proc ProcessSendTileCmd {proc id param} {
     global current
diff --git a/ds9/library/grid.tcl b/ds9/library/grid.tcl
index 139f24b..ae4d11f 100644
--- a/ds9/library/grid.tcl
+++ b/ds9/library/grid.tcl
@@ -1138,18 +1138,16 @@ proc GridBackup {ch which} {
 
 proc ProcessGridCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    grid::YY_FLUSH_BUFFER
-    grid::yy_scan_string [lrange $var $ii end]
-    grid::yyparse
-    incr ii [expr $grid::yycnt-1]
-}
-
-proc oProcessGridCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
+    global debug
+    if {$debug(tcl,parser)} {
+	grid::YY_FLUSH_BUFFER
+	grid::yy_scan_string [lrange $var $i end]
+	grid::yyparse
+	incr i [expr $grid::yycnt-1]
+    } else {
+	
     global grid
     switch -- [string tolower [lindex $var $i]] {
 	open {GridDialog}
@@ -1415,6 +1413,7 @@ proc oProcessGridCmd {varname iname} {
 	}
     }
 }
+}
 
 proc ProcessSendGridCmd {proc id param} {
     global grid
diff --git a/ds9/library/header.tcl b/ds9/library/header.tcl
index 545f70e..443ad06 100644
--- a/ds9/library/header.tcl
+++ b/ds9/library/header.tcl
@@ -104,7 +104,7 @@ proc UpdateHeaderDialog {} {
     for {set id 1} {$id <= $cnt} {incr id} {
 	set varname "hd-$frame-$id"
 	global $varname
-	if {![info exists varname]} {
+	if {![info exists $varname]} {
 	    continue
 	}
 
@@ -141,18 +141,16 @@ proc DestroyHeaderOne {frame id} {
 
 proc ProcessHeaderCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    header::YY_FLUSH_BUFFER
-    header::yy_scan_string [lrange $var $ii end]
-    header::yyparse
-    incr ii [expr $header::yycnt-1]
-}
-
-proc oProcessHeaderCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
+    global debug
+    if {$debug(tcl,parser)} {
+	header::YY_FLUSH_BUFFER
+	header::yy_scan_string [lrange $var $i end]
+	header::yyparse
+	incr i [expr $header::yycnt-1]
+    } else {
+	
     set item [string tolower [lindex $var $i]]
     switch -- $item {
 	close -
@@ -183,6 +181,7 @@ proc oProcessHeaderCmd {varname iname} {
 	}
     }
 }
+}
 
 proc DisplayHeaderCmd {id} {
     global current
diff --git a/ds9/library/layout.tcl b/ds9/library/layout.tcl
index 7e5c30f..32b6245 100644
--- a/ds9/library/layout.tcl
+++ b/ds9/library/layout.tcl
@@ -848,18 +848,16 @@ proc ProcessSendWidthCmd {proc id param} {
 
 proc ProcessViewCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    view::YY_FLUSH_BUFFER
-    view::yy_scan_string [lrange $var $ii end]
-    view::yyparse
-    incr ii [expr $view::yycnt-1]
-}
-
-proc oProcessViewCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
+    global debug
+    if {$debug(tcl,parser)} {
+	view::YY_FLUSH_BUFFER
+	view::yy_scan_string [lrange $var $i end]
+	view::yyparse
+	incr i [expr $view::yycnt-1]
+    } else {
+	
     global view
     global rgb
 
@@ -1026,6 +1024,7 @@ proc oProcessViewCmd {varname iname} {
 	}
     }
 }
+}
 
 proc ProcessSendViewCmd {proc id param} {
     global view
diff --git a/ds9/library/nvss.tcl b/ds9/library/nvss.tcl
index b6bc5dd..ba2c019 100644
--- a/ds9/library/nvss.tcl
+++ b/ds9/library/nvss.tcl
@@ -150,22 +150,19 @@ charting of the Universe.
 
 proc ProcessNVSSCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    NVSSDialog
-
-    nvss::YY_FLUSH_BUFFER
-    nvss::yy_scan_string [lrange $var $ii end]
-    nvss::yyparse
-    incr ii [expr $nvss::yycnt-1]
-}
-
-proc oProcessNVSSCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     NVSSDialog
-    IMGSVRProcessCmd $varname $iname dnvss
+
+    global debug
+    if {$debug(tcl,parser)} {
+	nvss::YY_FLUSH_BUFFER
+	nvss::yy_scan_string [lrange $var $i end]
+	nvss::yyparse
+	incr i [expr $nvss::yycnt-1]
+    } else {
+	IMGSVRProcessCmd $varname $iname dnvss
+    }
 }
 
 proc ProcessSendNVSSCmd {proc id param} {
diff --git a/ds9/library/panzoom.tcl b/ds9/library/panzoom.tcl
index 049b66a..207a04a 100644
--- a/ds9/library/panzoom.tcl
+++ b/ds9/library/panzoom.tcl
@@ -679,24 +679,19 @@ proc PanZoomBackup {ch which} {
 
 proc ProcessPanCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    # we need to be realized
-    ProcessRealizeDS9
-
-    pan::YY_FLUSH_BUFFER
-    pan::yy_scan_string [lrange $var $ii end]
-    pan::yyparse
-    incr ii [expr $pan::yycnt-1]
-}
-
-proc oProcessPanCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     # we need to be realized
     ProcessRealizeDS9
 
+    global debug
+    if {$debug(tcl,parser)} {
+	pan::YY_FLUSH_BUFFER
+	pan::yy_scan_string [lrange $var $i end]
+	pan::yyparse
+	incr i [expr $pan::yycnt-1]
+    } else {
+	
     switch -- [string tolower [lindex $var $i]] {
 	open {PanZoomDialog}
 	close {PanZoomDestroyDialog}
@@ -724,6 +719,7 @@ proc oProcessPanCmd {varname iname} {
 	}
     }
 }
+}
 
 proc ProcessSendPanCmd {proc id param} {
     global current
@@ -740,24 +736,19 @@ proc ProcessSendPanCmd {proc id param} {
 
 proc ProcessZoomCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    # we need to be realized
-    ProcessRealizeDS9
-
-    zoom::YY_FLUSH_BUFFER
-    zoom::yy_scan_string [lrange $var $ii end]
-    zoom::yyparse
-    incr ii [expr $zoom::yycnt-1]
-}
-
-proc oProcessZoomCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     # we need to be realized
     ProcessRealizeDS9
 
+    global debug
+    if {$debug(tcl,parser)} {
+	zoom::YY_FLUSH_BUFFER
+	zoom::yy_scan_string [lrange $var $i end]
+	zoom::yyparse
+	incr i [expr $zoom::yycnt-1]
+    } else {
+	
     global current
     switch -- [string tolower [lindex $var $i]] {
 	open {PanZoomDialog}
@@ -796,6 +787,7 @@ proc oProcessZoomCmd {varname iname} {
 	}
     }
 }
+}
 
 proc ProcessSendZoomCmd {proc id param} {
     global current
diff --git a/ds9/library/sao.tcl b/ds9/library/sao.tcl
index c918ebd..ebb79fe 100644
--- a/ds9/library/sao.tcl
+++ b/ds9/library/sao.tcl
@@ -145,22 +145,19 @@ taken with the UK Schmidt.
 
 proc ProcessSAOCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    SAODialog
-
-    dsssao::YY_FLUSH_BUFFER
-    dsssao::yy_scan_string [lrange $var $ii end]
-    dsssao::yyparse
-    incr ii [expr $dsssao::yycnt-1]
-}
-
-proc oProcessSAOCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     SAODialog
-    IMGSVRProcessCmd $varname $iname dsao
+
+    global debug
+    if {$debug(tcl,parser)} {
+	dsssao::YY_FLUSH_BUFFER
+	dsssao::yy_scan_string [lrange $var $i end]
+	dsssao::yyparse
+	incr i [expr $dsssao::yycnt-1]
+    } else {
+	IMGSVRProcessCmd $varname $iname dsao
+    }
 }
 
 proc ProcessSendSAOCmd {proc id param} {
diff --git a/ds9/library/scale.tcl b/ds9/library/scale.tcl
index e114d56..9fc8db0 100644
--- a/ds9/library/scale.tcl
+++ b/ds9/library/scale.tcl
@@ -1009,18 +1009,16 @@ proc ProcessSendMinMaxCmd {proc id param} {
 
 proc ProcessZScaleCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    zscale::YY_FLUSH_BUFFER
-    zscale::yy_scan_string [lrange $var $ii end]
-    zscale::yyparse
-    incr ii [expr $zscale::yycnt-1]
-}
-
-proc oProcessZScaleCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
+    global debug
+    if {$debug(tcl,parser)} {
+	zscale::YY_FLUSH_BUFFER
+	zscale::yy_scan_string [lrange $var $i end]
+	zscale::yyparse
+	incr i [expr $zscale::yycnt-1]
+    } else {
+
     global zscale
     global scale
 
@@ -1047,6 +1045,7 @@ proc oProcessZScaleCmd {varname iname} {
 	}
     }
 }
+}
 
 proc ProcessSendZScaleCmd {proc id param} {
     global zscale
diff --git a/ds9/library/skyview.tcl b/ds9/library/skyview.tcl
index aa31969..ecfe17c 100644
--- a/ds9/library/skyview.tcl
+++ b/ds9/library/skyview.tcl
@@ -606,22 +606,19 @@ Maintained by: Laura McDonald lmm@skyview.gsfc.nasa.gov
 
 proc ProcessSkyViewCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    SkyViewDialog
-
-    skyview::YY_FLUSH_BUFFER
-    skyview::yy_scan_string [lrange $var $ii end]
-    skyview::yyparse
-    incr ii [expr $skyview::yycnt-1]
-}
-
-proc oProcessSkyViewCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     SkyViewDialog
-    IMGSVRProcessCmd $varname $iname dskyview
+
+    global debug
+    if {$debug(tcl,parser)} {
+	skyview::YY_FLUSH_BUFFER
+	skyview::yy_scan_string [lrange $var $i end]
+	skyview::yyparse
+	incr i [expr $skyview::yycnt-1]
+    } else {
+	IMGSVRProcessCmd $varname $iname dskyview
+    }
 }
 
 proc ProcessSendSkyViewCmd {proc id param} {
diff --git a/ds9/library/stsci.tcl b/ds9/library/stsci.tcl
index c2ab594..c42e362 100644
--- a/ds9/library/stsci.tcl
+++ b/ds9/library/stsci.tcl
@@ -170,22 +170,19 @@ taken with the UK Schmidt.
 
 proc ProcessSTSCICmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    STSCIDialog
-
-    dssstsci::YY_FLUSH_BUFFER
-    dssstsci::yy_scan_string [lrange $var $ii end]
-    dssstsci::yyparse
-    incr ii [expr $dssstsci::yycnt-1]
-}
-
-proc oProcessSTSCICmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     STSCIDialog
-    IMGSVRProcessCmd $varname $iname dstsci
+
+    global debug
+    if {$debug(tcl,parser)} {
+	dssstsci::YY_FLUSH_BUFFER
+	dssstsci::yy_scan_string [lrange $var $i end]
+	dssstsci::yyparse
+	incr i [expr $dssstsci::yycnt-1]
+    } else {
+	IMGSVRProcessCmd $varname $iname dstsci
+    }
 }
 
 proc ProcessSendSTSCICmd {proc id param} {
diff --git a/ds9/library/vla.tcl b/ds9/library/vla.tcl
index ef33a6f..d568a20 100644
--- a/ds9/library/vla.tcl
+++ b/ds9/library/vla.tcl
@@ -161,22 +161,19 @@ charting of the Universe.
 
 proc ProcessVLACmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    VLADialog
-
-    vla::YY_FLUSH_BUFFER
-    vla::yy_scan_string [lrange $var $ii end]
-    vla::yyparse
-    incr ii [expr $vla::yycnt-1]
-}
-
-proc oProcessVLACmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     VLADialog
-    IMGSVRProcessCmd $varname $iname dvla
+
+    global debug
+    if {$debug(tcl,parser)} {
+	vla::YY_FLUSH_BUFFER
+	vla::yy_scan_string [lrange $var $i end]
+	vla::yyparse
+	incr i [expr $vla::yycnt-1]
+    } else {
+	IMGSVRProcessCmd $varname $iname dvla
+    }
 }
 
 proc ProcessSendVLACmd {proc id param} {
diff --git a/ds9/library/vlss.tcl b/ds9/library/vlss.tcl
index cf2ba36..e0e45d6 100644
--- a/ds9/library/vlss.tcl
+++ b/ds9/library/vlss.tcl
@@ -120,22 +120,19 @@ Naval Research Lab.
 
 proc ProcessVLSSCmd {varname iname} {
     upvar $varname var
-    upvar $iname ii
-
-    VLSSDialog
-
-    vlss::YY_FLUSH_BUFFER
-    vlss::yy_scan_string [lrange $var $ii end]
-    vlss::yyparse
-    incr ii [expr $vlss::yycnt-1]
-}
-
-proc oProcessVLSSCmd {varname iname} {
-    upvar $varname var
     upvar $iname i
 
     VLSSDialog
-    IMGSVRProcessCmd $varname $iname dvlss
+
+    global debug
+    if {$debug(tcl,parser)} {
+	vlss::YY_FLUSH_BUFFER
+	vlss::yy_scan_string [lrange $var $i end]
+	vlss::yyparse
+	incr i [expr $vlss::yycnt-1]
+    } else {
+	IMGSVRProcessCmd $varname $iname dvlss
+    }
 }
 
 proc ProcessSendVLSSCmd {proc id param} {
diff --git a/ds9/parsers/gridparser.tac b/ds9/parsers/gridparser.tac
index b0c9e11..c8b7afa 100644
--- a/ds9/parsers/gridparser.tac
+++ b/ds9/parsers/gridparser.tac
@@ -116,7 +116,7 @@ system : coordsys {set _ $1}
 
 gridgrid : yesno {global grid; set grid(grid) $1}
  | COLOR_ STRING_ {global grid; set grid(grid,color) $2}
- | WIDTH_ INT_ {global grid; set grid(grid,color) $2}
+ | WIDTH_ INT_ {global grid; set grid(grid,width) $2}
  | DASH_ yesno {global grid; set grid(grid,style) $2}
  # backward compatible
  | STYLE_ INT_ {global grid; set grid(grid,style) $2}
@@ -127,7 +127,7 @@ gridgrid : yesno {global grid; set grid(grid) $1}
 
 axes : yesno {global grid; set grid(axes) $1}
  | COLOR_ STRING_ {global grid; set grid(axes,color) $2}
- | WIDTH_ INT_ {global grid; set grid(axes,color) $2}
+ | WIDTH_ INT_ {global grid; set grid(axes,width) $2}
  | DASH_ yesno {global grid; set grid(axes,style) $2}
  # backward compatible
  | STYLE_ INT_ {global grid; set grid(axes,style) $2}
@@ -147,7 +147,7 @@ origin : LLL_ {set _ lll}
 
 tickmarks : yesno {global grid; set grid(tick) $1}
  | COLOR_ STRING_ {global grid; set grid(tick,color) $2}
- | WIDTH_ INT_ {global grid; set grid(tick,color) $2}
+ | WIDTH_ INT_ {global grid; set grid(tick,width) $2}
  | DASH_ yesno {global grid; set grid(tick,style) $2}
  # backward compatible
  | STYLE_ INT_ {global grid; set grid(tick,style) $2}
@@ -155,7 +155,7 @@ tickmarks : yesno {global grid; set grid(tick) $1}
 
 border : yesno {global grid; set grid(border) $1}
  | COLOR_ STRING_ {global grid; set grid(border,color) $2}
- | WIDTH_ INT_ {global grid; set grid(border,color) $2}
+ | WIDTH_ INT_ {global grid; set grid(border,width) $2}
  | DASH_ yesno {global grid; set grid(border,style) $2}
  # backward compatible
  | STYLE_ INT_ {global grid; set grid(border,style) $2}
-- 
cgit v0.12