diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-06-06 19:02:28 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-06-06 19:02:28 (GMT) |
| commit | 5178f98a0a216d2419e6695758101ab321495cbf (patch) | |
| tree | 174782b591efa61f9ed220c9b84856bcb0e8a379 /ds9/parsers | |
| parent | b3e4ff140fcd7ac46dcdf00049105cfb780294ca (diff) | |
| download | blt-5178f98a0a216d2419e6695758101ab321495cbf.zip blt-5178f98a0a216d2419e6695758101ab321495cbf.tar.gz blt-5178f98a0a216d2419e6695758101ab321495cbf.tar.bz2 | |
update ds9 parsers
Diffstat (limited to 'ds9/parsers')
| -rw-r--r-- | ds9/parsers/backupparser.tac | 2 | ||||
| -rw-r--r-- | ds9/parsers/catparser.tac | 15 | ||||
| -rw-r--r-- | ds9/parsers/restoreparser.tac | 2 |
3 files changed, 10 insertions, 9 deletions
diff --git a/ds9/parsers/backupparser.tac b/ds9/parsers/backupparser.tac index 5cf575e..256af50 100644 --- a/ds9/parsers/backupparser.tac +++ b/ds9/parsers/backupparser.tac @@ -11,7 +11,7 @@ command : backup | backup {yyclearin; YYACCEPT} STRING_ ; -backup : STRING_ {BackupCmd $1} +backup : STRING_ {FileLast backupfbox $1; Backup $1} ; %% diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac index b7b2b67..f4f3d0f 100644 --- a/ds9/parsers/catparser.tac +++ b/ds9/parsers/catparser.tac @@ -148,7 +148,7 @@ catCmd : coordinate | MAXROWS_ INT_ {ProcessCmdCVAR max $2} | NAME_ STRING_ {ProcessCmdCVAR name $2} | PANTO_ yesno {ProcessCmdCVAR panto $2} - | PLOT_ STRING_ STRING_ STRING_ STRING_ {CatalogCmdPlot $2 $3 $4 $5} + | PLOT_ STRING_ STRING_ STRING_ STRING_ {ProcessCmdCVAR4 plot,x $2 plot,y $3 plot,xerr $4 plot,yerr $5 CATPlotGenerate} | PRINT_ {global cvarname; CATPrint $cvarname} | PSKY_ skyframe {ProcessCmdCVAR psky $2 CATGenerate} | PSYSTEM_ wcssys {ProcessCmdCVAR psystem $2 CATGenerate} @@ -158,7 +158,8 @@ catCmd : coordinate | SAVE_ STRING_ {CatalogCmdSave $2 VOTWrite} | SERVER_ server {ProcessCmdCVAR server $2} | SHOW_ yesno {ProcessCmdCVAR show $2 CATGenerate} - | SIZE_ numeric numeric rformat {CatalogCmdSize $2 $3 $4} + | SIZE_ numeric numeric rformat {ProcessCmdCVAR4 width $2 height $3 rformat $4 rformat,msg $4} +# | SIZE_ numeric numeric rformat {CatalogCmdSize $2 $3 $4} | SKY_ skyframe {CatalogCmdSkyframe $2} | SKYFORMAT_ skyformat {ProcessCmdCVAR skyformat $2} | SORT_ sort @@ -172,10 +173,10 @@ catCmd : coordinate | DEC_ STRING_ {ProcessCmdCVAR coly $2 CATGenerate} ; -coordinate : numeric numeric {CatalogCmdCoord $1 $2 fk5} - | numeric numeric skyframe {CatalogCmdCoord $1 $2 $3} - | SEXSTR_ SEXSTR_ {CatalogCmdCoord $1 $2 fk5} - | SEXSTR_ SEXSTR_ skyframe {CatalogCmdCoord $1 $2 $3} +coordinate : numeric numeric {ProcessCmdCVAR3 x $1 y $2 sky fk5} + | numeric numeric skyframe {ProcessCmdCVAR3 x $1 y $2 sky $3} + | SEXSTR_ SEXSTR_ {ProcessCmdCVAR3 x $1 y $2 sky fk5} + | SEXSTR_ SEXSTR_ skyframe {ProcessCmdCVAR3 x $1 y $2 sky $3} ; filter : LOAD_ STRING_ {CatalogCmdFilterLoad $2} @@ -183,7 +184,7 @@ filter : LOAD_ STRING_ {CatalogCmdFilterLoad $2} ; match : {CatalogCmdMatch} - | ERROR_ numeric rformat {CatalogCmdMatchError $2 $3} + | ERROR_ numeric rformat {ProcessCmdSet2 icat error $2 eformat $3} | FUNCTION_ matchFunction {ProcessCmdSet icat function $2} | UNIQUE_ yesno {ProcessCmdSet icat unique $2} | RETURN_ matchReturn {ProcessCmdSet icat return $2} diff --git a/ds9/parsers/restoreparser.tac b/ds9/parsers/restoreparser.tac index 6d9a6a6..157abce 100644 --- a/ds9/parsers/restoreparser.tac +++ b/ds9/parsers/restoreparser.tac @@ -11,7 +11,7 @@ command : restore | restore {yyclearin; YYACCEPT} STRING_ ; -restore : STRING_ {RestoreCmd $1} +restore : STRING_ {FileLast backupfbox $1; Restore $1} ; %% |