diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2017-07-12 15:08:30 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2017-07-12 15:08:30 (GMT) |
commit | c8702dff53493e0e91851f4206af846c41ef4491 (patch) | |
tree | 6e5c50c55163f5ac555f20ed9d684ea7fdf03c5f /ds9 | |
parent | cde8d5d99872757f55bb700987846360b3e722ba (diff) | |
download | blt-c8702dff53493e0e91851f4206af846c41ef4491.zip blt-c8702dff53493e0e91851f4206af846c41ef4491.tar.gz blt-c8702dff53493e0e91851f4206af846c41ef4491.tar.bz2 |
update parser
Diffstat (limited to 'ds9')
-rw-r--r-- | ds9/library/lex.fcl | 1 | ||||
-rw-r--r-- | ds9/library/parser.tac | 15 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ds9/library/lex.fcl b/ds9/library/lex.fcl index 9f669d6..d96d55d 100644 --- a/ds9/library/lex.fcl +++ b/ds9/library/lex.fcl @@ -41,6 +41,7 @@ E [Ee][+-]?{D}+ -sleep {return $::SLEEPCMD_} -squared {return $::SQUAREDCMD_} -sqrt {return $::SQRTCMD_} +-threads {return $::THREADSCMD_} -zoom {return $::ZOOMCMD_} -zscale {return $::ZSCALECMD_} diff --git a/ds9/library/parser.tac b/ds9/library/parser.tac index 07a2978..acf1868 100644 --- a/ds9/library/parser.tac +++ b/ds9/library/parser.tac @@ -21,6 +21,7 @@ set file(load) 0 %token BGCMD_ %token HELPCMD_ %token HISTEQUCMD_ +%token IRAFALIGNCMD_ %token LINEARCMD_ %token LOGCMD_ %token NANCMD_ @@ -36,6 +37,7 @@ set file(load) 0 %token SLEEPCMD_ %token SQUAREDCMD_ %token SQRTCMD_ +%token THREADSCMD_ %token ZOOMCMD_ %token ZSCALECMD_ @@ -125,6 +127,8 @@ command : 2MASSCMD_ {2MASSDialog} 2mass | BGCMD_ STRING_ {global pds9; set pds9(bg) $2; PrefsBgColor} | HELPCMD_ {HelpCommand} | HISTEQUCMD_ {global scale; set scale(type) histequ; ChangeScale} + # backward compatibility + | IRAFALIGNCMD_ yesno {global pds9; set pds9(iraf) $2; PrefsIRAFAlign} | LINEARCMD_ {global scale; set scale(type) linear; ChangeScale} | LOGCMD_ {global scale; set scale(type) log; ChangeScale} | NANCMD_ STRING_ {global pds9; set pds9(nan) $2; PrefsNanColor} @@ -132,9 +136,8 @@ command : 2MASSCMD_ {2MASSDialog} 2mass | PANCMD_ pan | PIXELTABLECMD_ pixelTable | PREFSCMD_ prefs - | PRIVATECMD_ { - # backword compatibility - } + # backward compatibility + | PRIVATECMD_ | POWCMD_ {global scale; set scale(type) pow; ChangeScale} | QUITCMD_ {QuitDS9} | SINHCMD_ {global scale; set scale(type) sinh; ChangeScale} @@ -142,9 +145,10 @@ command : 2MASSCMD_ {2MASSDialog} 2mass | SQUAREDCMD_ {global scale; set scale(type) squared; ChangeScale} | SQRTCMD_ {global scale; set scale(type) sqrt; ChangeScale} | SCALECMD_ scale - | STRING_ {CommandLineFileName $1} + | THREADSCMD_ INT_ {global ds9; set ds9(threads) $2; ChangeThreads} | ZOOMCMD_ {ProcessRealizeDS9} zoom | ZSCALECMD_ zscale + | STRING_ {CommandLineFileName $1} ; numeric : REAL_ {set _ $1} @@ -306,8 +310,11 @@ pixelTable : {PixelTableDialog} ; prefs : CLEAR_ {ClearPrefs} + # backward compatibility | BGCOLOR_ STRING_ {global pds9; set pds9(bg) $2; PrefsBgColor} + # backward compatibility | NANCOLOR_ STRING_ {global pds9; set pds9(nan) $2; PrefsNanColor} + # backward compatibility | THREADS_ INT_ {global pds9; set ds9(threads) $2; ChangeThreads} | IRAFALIGN_ yesno {global pds9; set pds9(iraf) $2; PrefsIRAFAlign} ; |