summaryrefslogtreecommitdiffstats
path: root/ds9/parsers
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2018-10-01 18:23:08 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2018-10-01 18:23:08 (GMT)
commitc7875abc11890d5246a09c2bc8fe30bacb4846ab (patch)
treeff2dfb0ac07ca4c216f26e0d0773932f3436ac70 /ds9/parsers
parent5130749bcb63ad668268d6a2c314193df575da35 (diff)
downloadblt-c7875abc11890d5246a09c2bc8fe30bacb4846ab.zip
blt-c7875abc11890d5246a09c2bc8fe30bacb4846ab.tar.gz
blt-c7875abc11890d5246a09c2bc8fe30bacb4846ab.tar.bz2
minor fix for XPA errors
Diffstat (limited to 'ds9/parsers')
-rw-r--r--ds9/parsers/alignparser.tac2
-rw-r--r--ds9/parsers/analysisparser.tac2
-rw-r--r--ds9/parsers/backupparser.tac2
-rw-r--r--ds9/parsers/bgparser.tac2
-rw-r--r--ds9/parsers/binparser.tac2
-rw-r--r--ds9/parsers/blinkparser.tac2
-rw-r--r--ds9/parsers/blockparser.tac2
-rw-r--r--ds9/parsers/catparser.tac2
-rw-r--r--ds9/parsers/cmapparser.tac2
-rw-r--r--ds9/parsers/colorbarparser.tac2
-rw-r--r--ds9/parsers/contourparser.tac2
-rw-r--r--ds9/parsers/cropparser.tac2
-rw-r--r--ds9/parsers/crosshairparser.tac2
-rw-r--r--ds9/parsers/cubeparser.tac2
-rw-r--r--ds9/parsers/cursorparser.tac2
-rw-r--r--ds9/parsers/dssesoparser.tac2
-rw-r--r--ds9/parsers/dsssaoparser.tac2
-rw-r--r--ds9/parsers/dssstsciparser.tac2
-rw-r--r--ds9/parsers/enviparser.tac2
-rw-r--r--ds9/parsers/exportparser.tac2
-rw-r--r--ds9/parsers/frameparser.tac2
-rw-r--r--ds9/parsers/gridparser.tac2
-rw-r--r--ds9/parsers/headerparser.tac2
-rw-r--r--ds9/parsers/heightparser.tac2
-rw-r--r--ds9/parsers/iconifyparser.tac2
-rw-r--r--ds9/parsers/iisparser.tac2
-rw-r--r--ds9/parsers/lockparser.tac2
-rw-r--r--ds9/parsers/magnifierparser.tac2
-rw-r--r--ds9/parsers/maskparser.tac2
-rw-r--r--ds9/parsers/matchparser.tac2
-rw-r--r--ds9/parsers/minmaxparser.tac2
-rw-r--r--ds9/parsers/modeparser.tac2
-rw-r--r--ds9/parsers/movieparser.tac2
-rw-r--r--ds9/parsers/nanparser.tac2
-rw-r--r--ds9/parsers/nresparser.tac2
-rw-r--r--ds9/parsers/nrrdparser.tac2
-rw-r--r--ds9/parsers/nvssparser.tac2
-rw-r--r--ds9/parsers/orientparser.tac2
-rw-r--r--ds9/parsers/pagesetupparser.tac2
-rw-r--r--ds9/parsers/panparser.tac2
-rw-r--r--ds9/parsers/pixeltableparser.tac2
-rw-r--r--ds9/parsers/plotparser.tac2
-rw-r--r--ds9/parsers/precisionparser.tac2
-rw-r--r--ds9/parsers/prefsparser.tac2
-rw-r--r--ds9/parsers/preserveparser.tac2
-rw-r--r--ds9/parsers/psparser.tac2
-rw-r--r--ds9/parsers/regionparser.tac2
-rw-r--r--ds9/parsers/restoreparser.tac2
-rw-r--r--ds9/parsers/rgbparser.tac2
-rw-r--r--ds9/parsers/rotateparser.tac2
-rw-r--r--ds9/parsers/sampparser.tac2
-rw-r--r--ds9/parsers/saveimageparser.tac2
-rw-r--r--ds9/parsers/saveparser.tac2
-rw-r--r--ds9/parsers/scaleparser.tac2
-rw-r--r--ds9/parsers/siaparser.tac2
-rw-r--r--ds9/parsers/skyviewparser.tac2
-rw-r--r--ds9/parsers/sleepparser.tac2
-rw-r--r--ds9/parsers/smoothparser.tac2
-rw-r--r--ds9/parsers/sourceparser.tac2
-rw-r--r--ds9/parsers/threadsparser.tac2
-rw-r--r--ds9/parsers/threedparser.tac2
-rw-r--r--ds9/parsers/tileparser.tac2
-rw-r--r--ds9/parsers/twomassparser.tac2
-rw-r--r--ds9/parsers/updateparser.tac2
-rw-r--r--ds9/parsers/viewparser.tac2
-rw-r--r--ds9/parsers/vlaparser.tac2
-rw-r--r--ds9/parsers/vlssparser.tac2
-rw-r--r--ds9/parsers/voparser.tac2
-rw-r--r--ds9/parsers/wcsparser.tac2
-rw-r--r--ds9/parsers/webparser.tac2
-rw-r--r--ds9/parsers/widthparser.tac2
-rw-r--r--ds9/parsers/xpafirstparser.tac2
-rw-r--r--ds9/parsers/xpaparser.tac2
-rw-r--r--ds9/parsers/zoomparser.tac2
-rw-r--r--ds9/parsers/zscaleparser.tac4
75 files changed, 76 insertions, 76 deletions
diff --git a/ds9/parsers/alignparser.tac b/ds9/parsers/alignparser.tac
index d2a9ad0..4fe7260 100644
--- a/ds9/parsers/alignparser.tac
+++ b/ds9/parsers/alignparser.tac
@@ -12,7 +12,7 @@
#include yesno.trl
command : align
- | align {yyclearin; YYACCEPT} STRING_
+ | align {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
diff --git a/ds9/parsers/analysisparser.tac b/ds9/parsers/analysisparser.tac
index 46330ab..69cda5d 100644
--- a/ds9/parsers/analysisparser.tac
+++ b/ds9/parsers/analysisparser.tac
@@ -29,7 +29,7 @@
%%
command : analysis
- | analysis {yyclearin; YYACCEPT} STRING_
+ | analysis {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
analysis : INT_ {AnalysisTask $1 menu}
diff --git a/ds9/parsers/backupparser.tac b/ds9/parsers/backupparser.tac
index ff68658..c2b73e9 100644
--- a/ds9/parsers/backupparser.tac
+++ b/ds9/parsers/backupparser.tac
@@ -9,7 +9,7 @@
%%
command : backup
- | backup {yyclearin; YYACCEPT} STRING_
+ | backup {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
backup : STRING_ {FileLast backupfbox $1; Backup $1}
diff --git a/ds9/parsers/bgparser.tac b/ds9/parsers/bgparser.tac
index b28a554..fd71ef9 100644
--- a/ds9/parsers/bgparser.tac
+++ b/ds9/parsers/bgparser.tac
@@ -9,7 +9,7 @@
%%
command : bg
- | bg {yyclearin; YYACCEPT} STRING_
+ | bg {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
bg : STRING_ {ProcessCmdSet pds9 bg $1 PrefsBgColor}
diff --git a/ds9/parsers/binparser.tac b/ds9/parsers/binparser.tac
index ca2ffef..1384b53 100644
--- a/ds9/parsers/binparser.tac
+++ b/ds9/parsers/binparser.tac
@@ -35,7 +35,7 @@
#include numeric.trl
command : bin
- | bin {yyclearin; YYACCEPT} STRING_
+ | bin {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
bin : OPEN_ {BinDialog}
diff --git a/ds9/parsers/blinkparser.tac b/ds9/parsers/blinkparser.tac
index b1fe6d7..776600d 100644
--- a/ds9/parsers/blinkparser.tac
+++ b/ds9/parsers/blinkparser.tac
@@ -16,7 +16,7 @@
#include numeric.trl
command : blink
- | blink {yyclearin; YYACCEPT} STRING_
+ | blink {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
blink : {ProcessCmdSet current display blink DisplayMode}
diff --git a/ds9/parsers/blockparser.tac b/ds9/parsers/blockparser.tac
index cbb07d9..253c6ce 100644
--- a/ds9/parsers/blockparser.tac
+++ b/ds9/parsers/blockparser.tac
@@ -23,7 +23,7 @@
#include numeric.trl
command : block
- | block {yyclearin; YYACCEPT} STRING_
+ | block {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
block : OPEN_ {BlockDialog}
diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac
index d2d23d8..118ebcc 100644
--- a/ds9/parsers/catparser.tac
+++ b/ds9/parsers/catparser.tac
@@ -112,7 +112,7 @@
#include numeric.trl
command : catalog
- | catalog {yyclearin; YYACCEPT} STRING_
+ | catalog {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
catalog : NEW_ {CATTool}
diff --git a/ds9/parsers/cmapparser.tac b/ds9/parsers/cmapparser.tac
index b3a78fb..43a8219 100644
--- a/ds9/parsers/cmapparser.tac
+++ b/ds9/parsers/cmapparser.tac
@@ -26,7 +26,7 @@
#include numeric.trl
command : cmap
- | cmap {yyclearin; YYACCEPT} STRING_
+ | cmap {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
cmap : cmapSelect
diff --git a/ds9/parsers/colorbarparser.tac b/ds9/parsers/colorbarparser.tac
index b0180b0..4c9ab3a 100644
--- a/ds9/parsers/colorbarparser.tac
+++ b/ds9/parsers/colorbarparser.tac
@@ -27,7 +27,7 @@
#include fonts.trl
command : colorbar
- | colorbar {yyclearin; YYACCEPT} STRING_
+ | colorbar {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
colorbar : yesno {ProcessCmdSet view colorbar $1 UpdateView}
diff --git a/ds9/parsers/contourparser.tac b/ds9/parsers/contourparser.tac
index 73bda46..11384f2 100644
--- a/ds9/parsers/contourparser.tac
+++ b/ds9/parsers/contourparser.tac
@@ -58,7 +58,7 @@
#include numeric.trl
command : contour
- | contour {yyclearin; YYACCEPT} STRING_
+ | contour {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
contour : yesno {ProcessCmdSet contour view $1 UpdateContour}
diff --git a/ds9/parsers/cropparser.tac b/ds9/parsers/cropparser.tac
index 371c2cd..9928c56 100644
--- a/ds9/parsers/cropparser.tac
+++ b/ds9/parsers/cropparser.tac
@@ -29,7 +29,7 @@
#include numeric.trl
command : crop
-| crop {yyclearin; YYACCEPT} STRING_
+| crop {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
crop : OPEN_ {CropDialog}
diff --git a/ds9/parsers/crosshairparser.tac b/ds9/parsers/crosshairparser.tac
index 8becaec..3493b7c 100644
--- a/ds9/parsers/crosshairparser.tac
+++ b/ds9/parsers/crosshairparser.tac
@@ -23,7 +23,7 @@
#include numeric.trl
command : crosshair
- | crosshair {yyclearin; YYACCEPT} STRING_
+ | crosshair {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
crosshair : MATCH_ match {MatchCrosshairCurrent $2}
diff --git a/ds9/parsers/cubeparser.tac b/ds9/parsers/cubeparser.tac
index 784ab32..77d515c 100644
--- a/ds9/parsers/cubeparser.tac
+++ b/ds9/parsers/cubeparser.tac
@@ -42,7 +42,7 @@
#include numeric.trl
command : cube
- | cube {yyclearin; YYACCEPT} STRING_
+ | cube {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
cube : OPEN_
diff --git a/ds9/parsers/cursorparser.tac b/ds9/parsers/cursorparser.tac
index d3f6552..7252884 100644
--- a/ds9/parsers/cursorparser.tac
+++ b/ds9/parsers/cursorparser.tac
@@ -10,7 +10,7 @@
%%
command : cursor
- | cursor {yyclearin; YYACCEPT} STRING_
+ | cursor {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
cursor : INT_ INT_ {CursorCmd $1 $2}
diff --git a/ds9/parsers/dssesoparser.tac b/ds9/parsers/dssesoparser.tac
index e415992..0819bfa 100644
--- a/ds9/parsers/dssesoparser.tac
+++ b/ds9/parsers/dssesoparser.tac
@@ -21,7 +21,7 @@
#include numeric.trl
command : dsseso
- | dsseso {yyclearin; YYACCEPT} STRING_
+ | dsseso {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
dsseso : {IMGSVRApply deso 1}
diff --git a/ds9/parsers/dsssaoparser.tac b/ds9/parsers/dsssaoparser.tac
index 5858711..1bf8869 100644
--- a/ds9/parsers/dsssaoparser.tac
+++ b/ds9/parsers/dsssaoparser.tac
@@ -16,7 +16,7 @@
#include numeric.trl
command : dsssao
- | dsssao {yyclearin; YYACCEPT} STRING_
+ | dsssao {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
dsssao : {IMGSVRApply dsao 1}
diff --git a/ds9/parsers/dssstsciparser.tac b/ds9/parsers/dssstsciparser.tac
index df96d69..0735ccf 100644
--- a/ds9/parsers/dssstsciparser.tac
+++ b/ds9/parsers/dssstsciparser.tac
@@ -26,7 +26,7 @@
#include numeric.trl
command : dssstsci
- | dssstsci {yyclearin; YYACCEPT} STRING_
+ | dssstsci {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
dssstsci : {IMGSVRApply dstsci 1}
diff --git a/ds9/parsers/enviparser.tac b/ds9/parsers/enviparser.tac
index c58a9ca..27f2b03 100644
--- a/ds9/parsers/enviparser.tac
+++ b/ds9/parsers/enviparser.tac
@@ -11,7 +11,7 @@
%%
command : envi
- | envi {yyclearin; YYACCEPT} STRING_
+ | envi {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
envi : opts STRING_ {ImportENVIFile $2 [FindENVIDataFile $2]; FinishLoad}
diff --git a/ds9/parsers/exportparser.tac b/ds9/parsers/exportparser.tac
index 3d066f2..3bee54e 100644
--- a/ds9/parsers/exportparser.tac
+++ b/ds9/parsers/exportparser.tac
@@ -30,7 +30,7 @@
#include numeric.trl
command : export
- | export {yyclearin; YYACCEPT} STRING_
+ | export {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
export : STRING_ {ExportCmdSave [ExtToFormat $1] $1}
diff --git a/ds9/parsers/frameparser.tac b/ds9/parsers/frameparser.tac
index 27aa32c..80dec60 100644
--- a/ds9/parsers/frameparser.tac
+++ b/ds9/parsers/frameparser.tac
@@ -38,7 +38,7 @@
#include wcssys.trl
command : frame
- | frame {yyclearin; YYACCEPT} STRING_
+ | frame {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
frame : MATCH_ match {MatchFrameCurrent $2}
diff --git a/ds9/parsers/gridparser.tac b/ds9/parsers/gridparser.tac
index c9aaa77..a67618b 100644
--- a/ds9/parsers/gridparser.tac
+++ b/ds9/parsers/gridparser.tac
@@ -74,7 +74,7 @@
#include numeric.trl
command : grid
- | grid {yyclearin; YYACCEPT} STRING_
+ | grid {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
typegrid : ANALYSIS_ {set _ analysis}
diff --git a/ds9/parsers/headerparser.tac b/ds9/parsers/headerparser.tac
index 3690b0d..e3fd102 100644
--- a/ds9/parsers/headerparser.tac
+++ b/ds9/parsers/headerparser.tac
@@ -13,7 +13,7 @@
%%
command : header
- | header {yyclearin; YYACCEPT} STRING_
+ | header {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
diff --git a/ds9/parsers/heightparser.tac b/ds9/parsers/heightparser.tac
index 620c5df..828c773 100644
--- a/ds9/parsers/heightparser.tac
+++ b/ds9/parsers/heightparser.tac
@@ -10,7 +10,7 @@
%%
command : height
- | height {yyclearin; YYACCEPT} STRING_
+ | height {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
height : INT_ {ProcessCmdSet canvas height $1 UpdateView}
diff --git a/ds9/parsers/iconifyparser.tac b/ds9/parsers/iconifyparser.tac
index 52e1a84..31a58da 100644
--- a/ds9/parsers/iconifyparser.tac
+++ b/ds9/parsers/iconifyparser.tac
@@ -12,7 +12,7 @@
#include yesno.trl
command : iconify
- | iconify {yyclearin; YYACCEPT} STRING_
+ | iconify {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
iconify : yesno {IconifyCmd $1}
diff --git a/ds9/parsers/iisparser.tac b/ds9/parsers/iisparser.tac
index 7200bfe..ff1082e 100644
--- a/ds9/parsers/iisparser.tac
+++ b/ds9/parsers/iisparser.tac
@@ -12,7 +12,7 @@
%%
command : iis
- | iis {yyclearin; YYACCEPT} STRING_
+ | iis {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
iis : FILENAME_ STRING_ {IISCmd $2}
diff --git a/ds9/parsers/lockparser.tac b/ds9/parsers/lockparser.tac
index 91612dc..1a7760f 100644
--- a/ds9/parsers/lockparser.tac
+++ b/ds9/parsers/lockparser.tac
@@ -31,7 +31,7 @@
#include yesno.trl
command : lock
- | lock {yyclearin; YYACCEPT} STRING_
+ | lock {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
lock : FRAME_ lock {ProcessCmdSet panzoom lock $2 LockFrameCurrent}
diff --git a/ds9/parsers/magnifierparser.tac b/ds9/parsers/magnifierparser.tac
index 0fe16c9..c9cb3a9 100644
--- a/ds9/parsers/magnifierparser.tac
+++ b/ds9/parsers/magnifierparser.tac
@@ -19,7 +19,7 @@
#include numeric.trl
command : magnifier
- | magnifier {yyclearin; YYACCEPT} STRING_
+ | magnifier {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
magnifier : COLOR_ STRING_ {ProcessCmdSet pmagnifier color $2 MagnifierColor}
diff --git a/ds9/parsers/maskparser.tac b/ds9/parsers/maskparser.tac
index c42ce3c..4759e50 100644
--- a/ds9/parsers/maskparser.tac
+++ b/ds9/parsers/maskparser.tac
@@ -19,7 +19,7 @@
#include numeric.trl
command : mask
- | mask {yyclearin; YYACCEPT} STRING_
+ | mask {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
mask : {global parse; set parse(result) mask}
diff --git a/ds9/parsers/matchparser.tac b/ds9/parsers/matchparser.tac
index e88841a..997bd7d 100644
--- a/ds9/parsers/matchparser.tac
+++ b/ds9/parsers/matchparser.tac
@@ -27,7 +27,7 @@
#include wcssys.trl
command : match
- | match {yyclearin; YYACCEPT} STRING_
+ | match {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
match : FRAME_ match {MatchFrameCurrent $2}
diff --git a/ds9/parsers/minmaxparser.tac b/ds9/parsers/minmaxparser.tac
index c9a93e4..2f2b392 100644
--- a/ds9/parsers/minmaxparser.tac
+++ b/ds9/parsers/minmaxparser.tac
@@ -18,7 +18,7 @@
%%
command : minmax
- | minmax {yyclearin; YYACCEPT} STRING_
+ | minmax {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
minmax : {ProcessCmdSet scale mode minmax ChangeScaleMode}
diff --git a/ds9/parsers/modeparser.tac b/ds9/parsers/modeparser.tac
index 7f1520c..f745303 100644
--- a/ds9/parsers/modeparser.tac
+++ b/ds9/parsers/modeparser.tac
@@ -21,7 +21,7 @@
%%
command : mode
- | mode {yyclearin; YYACCEPT} STRING_
+ | mode {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
mode : item {ProcessCmdSet current mode $1 ChangeMode}
diff --git a/ds9/parsers/movieparser.tac b/ds9/parsers/movieparser.tac
index b9ab487..e48f9f0 100644
--- a/ds9/parsers/movieparser.tac
+++ b/ds9/parsers/movieparser.tac
@@ -25,7 +25,7 @@
#include numeric.trl
command : movie
- | movie {yyclearin; YYACCEPT} STRING_
+ | movie {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
movie : STRING_ {ProcessCmdSet movie action frame; Movie $1}
diff --git a/ds9/parsers/nanparser.tac b/ds9/parsers/nanparser.tac
index 11ecacc..f1655de 100644
--- a/ds9/parsers/nanparser.tac
+++ b/ds9/parsers/nanparser.tac
@@ -9,7 +9,7 @@
%%
command : nan
- | nan {yyclearin; YYACCEPT} STRING_
+ | nan {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
nan : STRING_ {ProcessCmdSet pds9 nan $1 PrefsNanColor}
diff --git a/ds9/parsers/nresparser.tac b/ds9/parsers/nresparser.tac
index 9f68a9c..c3885b8 100644
--- a/ds9/parsers/nresparser.tac
+++ b/ds9/parsers/nresparser.tac
@@ -27,7 +27,7 @@
%%
command : nres
- | nres {yyclearin; YYACCEPT} STRING_
+ | nres {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
nres : OPEN_
diff --git a/ds9/parsers/nrrdparser.tac b/ds9/parsers/nrrdparser.tac
index 9653685..daa9da3 100644
--- a/ds9/parsers/nrrdparser.tac
+++ b/ds9/parsers/nrrdparser.tac
@@ -12,7 +12,7 @@
%%
command : nrrd
- | nrrd {yyclearin; YYACCEPT} STRING_
+ | nrrd {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
nrrd : opts {NRRDCmdLoad {} $1}
diff --git a/ds9/parsers/nvssparser.tac b/ds9/parsers/nvssparser.tac
index 5c0efaf..3efe558 100644
--- a/ds9/parsers/nvssparser.tac
+++ b/ds9/parsers/nvssparser.tac
@@ -16,7 +16,7 @@
#include numeric.trl
command : nvss
- | nvss {yyclearin; YYACCEPT} STRING_
+ | nvss {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
nvss : {IMGSVRApply dnvss 1}
diff --git a/ds9/parsers/orientparser.tac b/ds9/parsers/orientparser.tac
index 7f06631..67709aa 100644
--- a/ds9/parsers/orientparser.tac
+++ b/ds9/parsers/orientparser.tac
@@ -14,7 +14,7 @@
%%
command : orient
- | orient {yyclearin; YYACCEPT} STRING_
+ | orient {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
orient : orientation {ProcessCmdSet current orient $1 ChangeOrient}
diff --git a/ds9/parsers/pagesetupparser.tac b/ds9/parsers/pagesetupparser.tac
index 20d7451..525287e 100644
--- a/ds9/parsers/pagesetupparser.tac
+++ b/ds9/parsers/pagesetupparser.tac
@@ -25,7 +25,7 @@
#include numeric.trl
command : pagesetup
- | pagesetup {yyclearin; YYACCEPT} STRING_
+ | pagesetup {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
pagesetup : ORIENT_ orient {ProcessCmdSet ps orient $2}
diff --git a/ds9/parsers/panparser.tac b/ds9/parsers/panparser.tac
index 460b679..84034d7 100644
--- a/ds9/parsers/panparser.tac
+++ b/ds9/parsers/panparser.tac
@@ -24,7 +24,7 @@
#include numeric.trl
command : pan
-| pan {yyclearin; YYACCEPT} STRING_
+| pan {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
pan : OPEN_ {PanZoomDialog}
diff --git a/ds9/parsers/pixeltableparser.tac b/ds9/parsers/pixeltableparser.tac
index 5f48ed5..dfce787 100644
--- a/ds9/parsers/pixeltableparser.tac
+++ b/ds9/parsers/pixeltableparser.tac
@@ -15,7 +15,7 @@
#include yesno.trl
command : pixeltable
- | pixeltable {yyclearin; YYACCEPT} STRING_
+ | pixeltable {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
pixeltable : {PixelTableDialog}
diff --git a/ds9/parsers/plotparser.tac b/ds9/parsers/plotparser.tac
index 6401728..f427296 100644
--- a/ds9/parsers/plotparser.tac
+++ b/ds9/parsers/plotparser.tac
@@ -143,7 +143,7 @@
#include numeric.trl
command : plot
- | plot {yyclearin; YYACCEPT} STRING_
+ | plot {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
plot : LINE_ line
diff --git a/ds9/parsers/precisionparser.tac b/ds9/parsers/precisionparser.tac
index 62772ec..fb0e24f 100644
--- a/ds9/parsers/precisionparser.tac
+++ b/ds9/parsers/precisionparser.tac
@@ -10,7 +10,7 @@
%%
command : precision
- | precision {yyclearin; YYACCEPT} STRING_
+ | precision {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
precision : INT_ INT_ INT_ INT_ INT_ INT_ {ProcessCmdSet pds9 prec,linear $1; ProcessCmdSet pds9 prec,deg $2; ProcessCmdSet pds9 prec,hms $3;ProcessCmdSet pds9 prec,dms $4; ProcessCmdSet pds9 prec,arcmin $5; ProcessCmdSet pds9 prec,arcsec $6 PrefsPrecision}
diff --git a/ds9/parsers/prefsparser.tac b/ds9/parsers/prefsparser.tac
index 749d43f..64be8f3 100644
--- a/ds9/parsers/prefsparser.tac
+++ b/ds9/parsers/prefsparser.tac
@@ -20,7 +20,7 @@
#include yesno.trl
command : prefs
- | prefs {yyclearin; YYACCEPT} STRING_
+ | prefs {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
prefs : CLEAR_ {ClearPrefs}
diff --git a/ds9/parsers/preserveparser.tac b/ds9/parsers/preserveparser.tac
index 1ffe15e..e23c33e 100644
--- a/ds9/parsers/preserveparser.tac
+++ b/ds9/parsers/preserveparser.tac
@@ -15,7 +15,7 @@
#include yesno.trl
command : preserve
- | preserve {yyclearin; YYACCEPT} STRING_
+ | preserve {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
preserve : PAN_ yesno {ProcessCmdSet panzoom preserve $2 PreservePan}
diff --git a/ds9/parsers/psparser.tac b/ds9/parsers/psparser.tac
index faee8cd..aca229c 100644
--- a/ds9/parsers/psparser.tac
+++ b/ds9/parsers/psparser.tac
@@ -33,7 +33,7 @@
%%
command : ps
- | ps {yyclearin; YYACCEPT} STRING_
+ | ps {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
ps : {PostScript}
diff --git a/ds9/parsers/regionparser.tac b/ds9/parsers/regionparser.tac
index 85d63b3..ea3231b 100644
--- a/ds9/parsers/regionparser.tac
+++ b/ds9/parsers/regionparser.tac
@@ -119,7 +119,7 @@
#include numeric.trl
command : region
- | region {yyclearin; YYACCEPT} STRING_
+ | region {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
region : {RegionCmdLoad}
diff --git a/ds9/parsers/restoreparser.tac b/ds9/parsers/restoreparser.tac
index ad3c301..bf9e29e 100644
--- a/ds9/parsers/restoreparser.tac
+++ b/ds9/parsers/restoreparser.tac
@@ -9,7 +9,7 @@
%%
command : restore
- | restore {yyclearin; YYACCEPT} STRING_
+ | restore {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
restore : STRING_ {FileLast backupfbox $1; Restore $1}
diff --git a/ds9/parsers/rgbparser.tac b/ds9/parsers/rgbparser.tac
index 7b4171e..72bc889 100644
--- a/ds9/parsers/rgbparser.tac
+++ b/ds9/parsers/rgbparser.tac
@@ -33,7 +33,7 @@
#include yesno.trl
command : rgb
- | rgb {yyclearin; YYACCEPT} STRING_
+ | rgb {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
rgb : {CreateRGBFrame}
diff --git a/ds9/parsers/rotateparser.tac b/ds9/parsers/rotateparser.tac
index 1a02632..f386e56 100644
--- a/ds9/parsers/rotateparser.tac
+++ b/ds9/parsers/rotateparser.tac
@@ -16,7 +16,7 @@
#include numeric.trl
command : rotate
- | rotate {yyclearin; YYACCEPT} STRING_
+ | rotate {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
rotate : numeric {Rotate $1}
diff --git a/ds9/parsers/sampparser.tac b/ds9/parsers/sampparser.tac
index 5947cfa..1bd117d 100644
--- a/ds9/parsers/sampparser.tac
+++ b/ds9/parsers/sampparser.tac
@@ -19,7 +19,7 @@
#include yes-no.trl
command : samp
- | samp {yyclearin; YYACCEPT} STRING_
+ | samp {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
samp : yes {SAMPConnect}
diff --git a/ds9/parsers/saveimageparser.tac b/ds9/parsers/saveimageparser.tac
index 890c080..52b4613 100644
--- a/ds9/parsers/saveimageparser.tac
+++ b/ds9/parsers/saveimageparser.tac
@@ -24,7 +24,7 @@
#include numeric.trl
command : saveimage
- | saveimage {yyclearin; YYACCEPT} STRING_
+ | saveimage {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
saveimage : STRING_ opts {SaveImageCmdLoad [ExtToFormat $1] $1}
diff --git a/ds9/parsers/saveparser.tac b/ds9/parsers/saveparser.tac
index f75d51c..9fef177 100644
--- a/ds9/parsers/saveparser.tac
+++ b/ds9/parsers/saveparser.tac
@@ -24,7 +24,7 @@
%%
command : save
- | save {yyclearin; YYACCEPT} STRING_
+ | save {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
save : STRING_ opts {SaveCmdLoad [ExtToFormat $1] $1}
diff --git a/ds9/parsers/scaleparser.tac b/ds9/parsers/scaleparser.tac
index a4039c8..4bff69b 100644
--- a/ds9/parsers/scaleparser.tac
+++ b/ds9/parsers/scaleparser.tac
@@ -39,7 +39,7 @@
#include numeric.trl
command : scale
- | scale {yyclearin; YYACCEPT} STRING_
+ | scale {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
scale : OPEN_ {ScaleDialog}
diff --git a/ds9/parsers/siaparser.tac b/ds9/parsers/siaparser.tac
index 7dca210..a7d8a4e 100644
--- a/ds9/parsers/siaparser.tac
+++ b/ds9/parsers/siaparser.tac
@@ -53,7 +53,7 @@
#include numeric.trl
command : sia
- | sia {yyclearin; YYACCEPT} STRING_
+ | sia {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
sia : {if {![SIACmdCheck]} {sia::YYABORT}} siaCmd
diff --git a/ds9/parsers/skyviewparser.tac b/ds9/parsers/skyviewparser.tac
index 3c13805..8a7ab7f 100644
--- a/ds9/parsers/skyviewparser.tac
+++ b/ds9/parsers/skyviewparser.tac
@@ -18,7 +18,7 @@
#include numeric.trl
command : skyview
- | skyview {yyclearin; YYACCEPT} STRING_
+ | skyview {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
skyview : {IMGSVRApply dskyview 1}
diff --git a/ds9/parsers/sleepparser.tac b/ds9/parsers/sleepparser.tac
index 8942bf1..a0c5520 100644
--- a/ds9/parsers/sleepparser.tac
+++ b/ds9/parsers/sleepparser.tac
@@ -12,7 +12,7 @@
#include numeric.trl
command : sleep
- | sleep {yyclearin; YYACCEPT} STRING_
+ | sleep {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
sleep : {after 1000}
diff --git a/ds9/parsers/smoothparser.tac b/ds9/parsers/smoothparser.tac
index d7f5c7f..696fff5 100644
--- a/ds9/parsers/smoothparser.tac
+++ b/ds9/parsers/smoothparser.tac
@@ -29,7 +29,7 @@
#include numeric.trl
command : smooth
- | smooth {yyclearin; YYACCEPT} STRING_
+ | smooth {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
diff --git a/ds9/parsers/sourceparser.tac b/ds9/parsers/sourceparser.tac
index 7dc72ba..ed67783 100644
--- a/ds9/parsers/sourceparser.tac
+++ b/ds9/parsers/sourceparser.tac
@@ -9,7 +9,7 @@
%%
command : source
- | source {yyclearin; YYACCEPT} STRING_
+ | source {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
source : STRING_ {SourceCmd $1}
diff --git a/ds9/parsers/threadsparser.tac b/ds9/parsers/threadsparser.tac
index 78e0d90..a34d786 100644
--- a/ds9/parsers/threadsparser.tac
+++ b/ds9/parsers/threadsparser.tac
@@ -10,7 +10,7 @@
%%
command : threads
- | threads {yyclearin; YYACCEPT} STRING_
+ | threads {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
threads : INT_ {ProcessCmdSet ds9 threads $1 ChangeThreads}
diff --git a/ds9/parsers/threedparser.tac b/ds9/parsers/threedparser.tac
index 789ed9a..0f92cf7 100644
--- a/ds9/parsers/threedparser.tac
+++ b/ds9/parsers/threedparser.tac
@@ -32,7 +32,7 @@
#include numeric.trl
command : 3d
- | 3d {yyclearin; YYACCEPT} STRING_
+ | 3d {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
3d : {Create3DFrame}
diff --git a/ds9/parsers/tileparser.tac b/ds9/parsers/tileparser.tac
index 7c194c4..67dd750 100644
--- a/ds9/parsers/tileparser.tac
+++ b/ds9/parsers/tileparser.tac
@@ -23,7 +23,7 @@
#include yes-no.trl
command : tile
- | tile {yyclearin; YYACCEPT} STRING_
+ | tile {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
tile: {ProcessCmdSet current display tile DisplayMode}
diff --git a/ds9/parsers/twomassparser.tac b/ds9/parsers/twomassparser.tac
index 360043e..dab1581 100644
--- a/ds9/parsers/twomassparser.tac
+++ b/ds9/parsers/twomassparser.tac
@@ -16,7 +16,7 @@
#include numeric.trl
command : twomass
- | twomass {yyclearin; YYACCEPT} STRING_
+ | twomass {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
twomass : {IMGSVRApply dtwomass 1}
diff --git a/ds9/parsers/updateparser.tac b/ds9/parsers/updateparser.tac
index 058f066..1a43b37 100644
--- a/ds9/parsers/updateparser.tac
+++ b/ds9/parsers/updateparser.tac
@@ -15,7 +15,7 @@
#include yesno.trl
command : update
- | update {yyclearin; YYACCEPT} STRING_
+ | update {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
update : {UpdateCmd}
diff --git a/ds9/parsers/viewparser.tac b/ds9/parsers/viewparser.tac
index 880dc16..809a77d 100644
--- a/ds9/parsers/viewparser.tac
+++ b/ds9/parsers/viewparser.tac
@@ -40,7 +40,7 @@
#include wcssys.trl
command : view
- | view {yyclearin; YYACCEPT} STRING_
+ | view {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
view : layout
diff --git a/ds9/parsers/vlaparser.tac b/ds9/parsers/vlaparser.tac
index 1259e79..354b101 100644
--- a/ds9/parsers/vlaparser.tac
+++ b/ds9/parsers/vlaparser.tac
@@ -19,7 +19,7 @@
#include numeric.trl
command : vla
- | vla {yyclearin; YYACCEPT} STRING_
+ | vla {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
vla : {IMGSVRApply dvla 1}
diff --git a/ds9/parsers/vlssparser.tac b/ds9/parsers/vlssparser.tac
index 477b5ce..0fde684 100644
--- a/ds9/parsers/vlssparser.tac
+++ b/ds9/parsers/vlssparser.tac
@@ -16,7 +16,7 @@
#include numeric.trl
command : vlss
- | vlss {yyclearin; YYACCEPT} STRING_
+ | vlss {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
vlss : {IMGSVRApply dvlss 1}
diff --git a/ds9/parsers/voparser.tac b/ds9/parsers/voparser.tac
index 27c9ac6..1f12d39 100644
--- a/ds9/parsers/voparser.tac
+++ b/ds9/parsers/voparser.tac
@@ -24,7 +24,7 @@
#include yesno.trl
command : vo
- | vo {yyclearin; YYACCEPT} STRING_
+ | vo {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
vo : OPEN_ {VODialog}
diff --git a/ds9/parsers/wcsparser.tac b/ds9/parsers/wcsparser.tac
index ccd227f..1f0149d 100644
--- a/ds9/parsers/wcsparser.tac
+++ b/ds9/parsers/wcsparser.tac
@@ -29,7 +29,7 @@
#include skyformat.trl
command : wcs
- | wcs {yyclearin; YYACCEPT} STRING_
+ | wcs {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
wcs : OPEN_ {WCSDialog}
diff --git a/ds9/parsers/webparser.tac b/ds9/parsers/webparser.tac
index be9df36..51eb7f0 100644
--- a/ds9/parsers/webparser.tac
+++ b/ds9/parsers/webparser.tac
@@ -19,7 +19,7 @@
%%
command : web
- | web {yyclearin; YYACCEPT} STRING_
+ | web {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
web : {WebCmdNew {}}
diff --git a/ds9/parsers/widthparser.tac b/ds9/parsers/widthparser.tac
index 4f400a7..5c8e22e 100644
--- a/ds9/parsers/widthparser.tac
+++ b/ds9/parsers/widthparser.tac
@@ -10,7 +10,7 @@
%%
command : width
- | width {yyclearin; YYACCEPT} STRING_
+ | width {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
width : INT_ {ProcessCmdSet canvas width $1 UpdateView}
diff --git a/ds9/parsers/xpafirstparser.tac b/ds9/parsers/xpafirstparser.tac
index 47d6c13..890e42f 100644
--- a/ds9/parsers/xpafirstparser.tac
+++ b/ds9/parsers/xpafirstparser.tac
@@ -22,7 +22,7 @@
#include yesno.trl
command : xpa
- | xpa {yyclearin; YYACCEPT} STRING_
+ | xpa {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
xpa : yesno {ProcessCmdSet pds9 xpa $1}
diff --git a/ds9/parsers/xpaparser.tac b/ds9/parsers/xpaparser.tac
index 5b9c9db..821eab8 100644
--- a/ds9/parsers/xpaparser.tac
+++ b/ds9/parsers/xpaparser.tac
@@ -22,7 +22,7 @@
#include yesno.trl
command : xpa
- | xpa {yyclearin; YYACCEPT} STRING_
+ | xpa {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
xpa : yesno
diff --git a/ds9/parsers/zoomparser.tac b/ds9/parsers/zoomparser.tac
index 92c65e2..22ec20d 100644
--- a/ds9/parsers/zoomparser.tac
+++ b/ds9/parsers/zoomparser.tac
@@ -19,7 +19,7 @@
#include numeric.trl
command : zoom
- | zoom {yyclearin; YYACCEPT} STRING_
+ | zoom {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
zoom : OPEN_ {PanZoomDialog}
diff --git a/ds9/parsers/zscaleparser.tac b/ds9/parsers/zscaleparser.tac
index a0b3021..97ce687 100644
--- a/ds9/parsers/zscaleparser.tac
+++ b/ds9/parsers/zscaleparser.tac
@@ -18,10 +18,10 @@
#include numeric.trl
command : zscale
- | zscale {yyclearin; YYACCEPT} STRING_
+ | zscale {global ds9; if {!$ds9(init)} {YYERROR} else {yyclearin; YYACCEPT}} STRING_
;
-zscale : yesno {ProcessCmdSet scale mode zscale ChangeScaleMode}
+zscale : {ProcessCmdSet scale mode zscale ChangeScaleMode}
| CONTRAST_ numeric {ProcessCmdSet zscale contrast $2 ChangeZScale}
| SAMPLE_ INT_ {ProcessCmdSet zscale sample $2 ChangeZScale}
| LINE_ INT_ {ProcessCmdSet zscale line $2 ChangeZScale}