diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2017-07-07 20:59:09 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2017-07-07 20:59:09 (GMT) |
| commit | 30ae87e4432e9b8ff95558903b3395063d11c9c8 (patch) | |
| tree | 5f3328c0d9641a07d51409f37686e38d2ab70c1e /ds9 | |
| parent | 8e9a3390fc8daf5626cb006904bac5ff3700dbf2 (diff) | |
| download | blt-30ae87e4432e9b8ff95558903b3395063d11c9c8.zip blt-30ae87e4432e9b8ff95558903b3395063d11c9c8.tar.gz blt-30ae87e4432e9b8ff95558903b3395063d11c9c8.tar.bz2 | |
update parser
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/library/lex.fcl | 25 | ||||
| -rw-r--r-- | ds9/library/parser.tac | 2 |
2 files changed, 15 insertions, 12 deletions
diff --git a/ds9/library/lex.fcl b/ds9/library/lex.fcl index 9e0c1a1..5736183 100644 --- a/ds9/library/lex.fcl +++ b/ds9/library/lex.fcl @@ -9,6 +9,8 @@ source $ds9(root)/library/parser.tab.tcl %option stack %option debug +%s CMD + D [0-9] E [Ee][+-]?{D}+ @@ -16,12 +18,21 @@ E [Ee][+-]?{D}+ -2mass {return $::2MASSCMD_} -3d {return $::3DCMD_} -aip {return $::AIP_} -align {return $::ALIGNCMD_} +-asinh {return $::ASINHCMD_} +-histequ {return $::HISTEQUCMD_} +-linear {return $::LINEARCMD_} +-log {return $::LOGCMD_} +-pow {return $::POWCMD_} +-scale {return $::SCALECMD_} +-sinh {return $::SINHCMD_} +-squared {return $::SQUAREDCMD_} +-sqrt {return $::SQRTCMD_} + +aip {return $::AIP_} arcmin {return $::ARCMIN_} arcsec {return $::ARCSEC_} asinh {return $::ASINH_} --asinh {return $::ASINHCMD_} azimuth {return $::AZIMUTH_} az {return $::AZIMUTH_} background {return $::BACKGROUND_} @@ -43,14 +54,11 @@ frame {return $::FRAME_} global {return $::GLOBAL_} highlite {return $::HIGHLITE_} histequ {return $::HISTEQU_} --histequ {return $::HISTEQUCMD_} linear {return $::LINEAR_} --linear {return $::LINEARCMD_} limits {return $::LIMITS_} local {return $::LOCAL_} lock {return $::LOCK_} log {return $::LOG_} --log {return $::LOGCMD_} match {return $::MATCH_} method {return $::METHOD_} minmax {return $::MINMAX_} @@ -64,26 +72,21 @@ off {return $::OFF_} on {return $::ON_} open {return $::OPEN_} pow {return $::POW_} --pow {return $::POWCMD_} save {return $::SAVE_} scale {return $::SCALE_} --scale {return $::SCALECMD_} scalelimits {return $::SCALELIMITS_} scope {return $::SCOPE_} sexagesimal {return $::SEXAGESIMAL_} sinh {return $::SINH_} --sinh {return $::SINHCMD_} size {return $::SIZE_} squared {return $::SQUARED_} --squared {return $::SQUAREDCMD_} sqrt {return $::SQRT_} --sqrt {return $::SQRTCMD_} survey {return $::SURVEY_} true {return $::TRUE_} update {return $::UPDATE_} user {return $::USER_} view {return $::VIEW_} -vp {return $::VIEW_} +vp {return $::VIEW_} yes {return $::YES_} zscale {return $::ZSCALE_} zmax {return $::ZMAX_} diff --git a/ds9/library/parser.tac b/ds9/library/parser.tac index 8568285..68183ae 100644 --- a/ds9/library/parser.tac +++ b/ds9/library/parser.tac @@ -96,7 +96,7 @@ command : 2MASSCMD_ {2MASSDialog} 2mass | SQUAREDCMD_ {global scale; set scale(type) squared; ChangeScale} | SQRTCMD_ {global scale; set scale(type) sqrt; ChangeScale} | SCALECMD_ scale - | STRING_ {puts " STRING: $::yylval"} + | STRING_ {puts "STRING: $::yylval"} ; numeric : REAL_ {set _ $1} |