diff options
143 files changed, 207 insertions, 52 deletions
diff --git a/ds9/library/frame.tcl b/ds9/library/frame.tcl index 7dadb56..b04b18a 100644 --- a/ds9/library/frame.tcl +++ b/ds9/library/frame.tcl @@ -2232,6 +2232,15 @@ proc ProcessLockCmd {varname iname} { } proc ProcessSendLockCmd {proc id param {sock {}} {fn {}}} { + global parse + set parse(proc) $proc + set parse(id) $id + + locksend::YY_FLUSH_BUFFER + locksend::yy_scan_string $param + locksend::yyparse + + return global panzoom global crop global crosshair diff --git a/ds9/library/source.tcl b/ds9/library/source.tcl index 9b0137e..db997e3 100644 --- a/ds9/library/source.tcl +++ b/ds9/library/source.tcl @@ -272,6 +272,8 @@ source $ds9(root)/library/iisparser.tcl source $ds9(root)/library/iislex.tcl source $ds9(root)/library/lockparser.tcl source $ds9(root)/library/locklex.tcl +source $ds9(root)/library/locksendparser.tcl +source $ds9(root)/library/locksendlex.tcl source $ds9(root)/library/magnifierparser.tcl source $ds9(root)/library/magnifierlex.tcl source $ds9(root)/library/maskparser.tcl diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl index 02d346b..ebbd522 100644 --- a/ds9/library/util.tcl +++ b/ds9/library/util.tcl @@ -358,9 +358,7 @@ proc ProcessSendCmdSend {ext cmd} { proc ProcessSendCmdResult {ext rr} { global parse - if {$parse(sock) != {}} { - puts $parse(sock) $rr - } elseif {$parse(fn) != {}} { + if {$parse(fn) != {}} { append parse(fn) $ext set ch [open $parse(fn) w] puts $ch $rr @@ -373,9 +371,7 @@ proc ProcessSendCmdResult {ext rr} { # old proc ProcessSend {proc id sock fn ext rr} { - if {$sock != {}} { - puts $sock $rr - } elseif {$fn != {}} { + if {$fn != {}} { append fn $ext set ch [open $fn w] puts $ch $rr diff --git a/ds9/parsers/alignlex.fcl b/ds9/parsers/alignlex.fcl index 3bda66c..542e327 100644 --- a/ds9/parsers/alignlex.fcl +++ b/ds9/parsers/alignlex.fcl @@ -9,5 +9,6 @@ #include yesno.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/analysislex.fcl b/ds9/parsers/analysislex.fcl index 0ba847d..4c826a9 100644 --- a/ds9/parsers/analysislex.fcl +++ b/ds9/parsers/analysislex.fcl @@ -28,5 +28,6 @@ xyexey {return $XYEXEY} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/arraylex.fcl b/ds9/parsers/arraylex.fcl index 54a251a..c187657 100644 --- a/ds9/parsers/arraylex.fcl +++ b/ds9/parsers/arraylex.fcl @@ -12,5 +12,6 @@ new {return $NEW_} rgb {return $RGB_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/backuplex.fcl b/ds9/parsers/backuplex.fcl index 2a9042d..c0a0e6f 100644 --- a/ds9/parsers/backuplex.fcl +++ b/ds9/parsers/backuplex.fcl @@ -8,5 +8,6 @@ %% #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/bglex.fcl b/ds9/parsers/bglex.fcl index 3ad6178..7efbf0d 100644 --- a/ds9/parsers/bglex.fcl +++ b/ds9/parsers/bglex.fcl @@ -8,5 +8,6 @@ %% #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/binlex.fcl b/ds9/parsers/binlex.fcl index f2c4fad..dc017ed 100644 --- a/ds9/parsers/binlex.fcl +++ b/ds9/parsers/binlex.fcl @@ -31,5 +31,6 @@ to {return $TO_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/binsendlex.fcl b/ds9/parsers/binsendlex.fcl index 1f25d03..6120f7a 100644 --- a/ds9/parsers/binsendlex.fcl +++ b/ds9/parsers/binsendlex.fcl @@ -16,6 +16,6 @@ filter {return $FILTER_} function {return $FUNCTION_} lock {return $LOCK_} -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/binsendparser.tac b/ds9/parsers/binsendparser.tac index f855995..eb0fc89 100644 --- a/ds9/parsers/binsendparser.tac +++ b/ds9/parsers/binsendparser.tac @@ -1,8 +1,6 @@ %{ %} -#include string.tin - %token ABOUT_ %token BUFFERSIZE_ %token COLS_ diff --git a/ds9/parsers/blinklex.fcl b/ds9/parsers/blinklex.fcl index a4366fa..dba0cab 100644 --- a/ds9/parsers/blinklex.fcl +++ b/ds9/parsers/blinklex.fcl @@ -12,5 +12,6 @@ interval {return $INTERVAL_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/blocklex.fcl b/ds9/parsers/blocklex.fcl index a5acde7..d0e1f1d 100644 --- a/ds9/parsers/blocklex.fcl +++ b/ds9/parsers/blocklex.fcl @@ -19,5 +19,6 @@ to {return $TO_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/blocksendlex.fcl b/ds9/parsers/blocksendlex.fcl index 7306a81..c761bf5 100644 --- a/ds9/parsers/blocksendlex.fcl +++ b/ds9/parsers/blocksendlex.fcl @@ -9,6 +9,6 @@ lock {return $LOCK_} -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/blocksendparser.tac b/ds9/parsers/blocksendparser.tac index 786928d..657510b 100644 --- a/ds9/parsers/blocksendparser.tac +++ b/ds9/parsers/blocksendparser.tac @@ -1,8 +1,6 @@ %{ %} -#include string.tin - %start blocksend %token LOCK_ diff --git a/ds9/parsers/catlex.fcl b/ds9/parsers/catlex.fcl index 4ce9463..fe29e9c 100644 --- a/ds9/parsers/catlex.fcl +++ b/ds9/parsers/catlex.fcl @@ -99,5 +99,6 @@ saao {return $SAAO_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/catsendlex.fcl b/ds9/parsers/catsendlex.fcl index 3f1c5e5..dd85467 100644 --- a/ds9/parsers/catsendlex.fcl +++ b/ds9/parsers/catsendlex.fcl @@ -10,4 +10,6 @@ header {return $HEADER_} #include string.fin +#include ws.fin + %% diff --git a/ds9/parsers/cmaplex.fcl b/ds9/parsers/cmaplex.fcl index da55b06..cb4e10d 100644 --- a/ds9/parsers/cmaplex.fcl +++ b/ds9/parsers/cmaplex.fcl @@ -22,5 +22,6 @@ value {return $VALUE_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/cmapsendlex.fcl b/ds9/parsers/cmapsendlex.fcl index 7a6af6c..c172f0c 100644 --- a/ds9/parsers/cmapsendlex.fcl +++ b/ds9/parsers/cmapsendlex.fcl @@ -12,6 +12,6 @@ invert {return $INVERT_} lock {return $LOCK_} value {return $VALUE_} -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/cmapsendparser.tac b/ds9/parsers/cmapsendparser.tac index 24ec0cd..4d1a201 100644 --- a/ds9/parsers/cmapsendparser.tac +++ b/ds9/parsers/cmapsendparser.tac @@ -1,8 +1,6 @@ %{ %} -#include string.tin - %start cmapsend %token FILE_ diff --git a/ds9/parsers/colorbarlex.fcl b/ds9/parsers/colorbarlex.fcl index b243abe..d628d34 100644 --- a/ds9/parsers/colorbarlex.fcl +++ b/ds9/parsers/colorbarlex.fcl @@ -23,5 +23,6 @@ vertical {return $VERTICAL_} #include font.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/colorbarsendlex.fcl b/ds9/parsers/colorbarsendlex.fcl index 05d06f2..ab00f22 100644 --- a/ds9/parsers/colorbarsendlex.fcl +++ b/ds9/parsers/colorbarsendlex.fcl @@ -16,6 +16,6 @@ ticks {return $TICKS_} value {return $VALUE_} #include font.fin -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/colorbarsendparser.tac b/ds9/parsers/colorbarsendparser.tac index 0f27545..35ffde0 100644 --- a/ds9/parsers/colorbarsendparser.tac +++ b/ds9/parsers/colorbarsendparser.tac @@ -2,7 +2,6 @@ %} #include font.tin -#include string.tin %start colorbarsend diff --git a/ds9/parsers/contourlex.fcl b/ds9/parsers/contourlex.fcl index 1d87d47..7a12068 100644 --- a/ds9/parsers/contourlex.fcl +++ b/ds9/parsers/contourlex.fcl @@ -49,5 +49,6 @@ zscale {return $ZSCALE_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/contoursendlex.fcl b/ds9/parsers/contoursendlex.fcl index face3a9..48d7805 100644 --- a/ds9/parsers/contoursendlex.fcl +++ b/ds9/parsers/contoursendlex.fcl @@ -22,6 +22,6 @@ smooth {return $SMOOTH_} width {return $WIDTH_} #include coords.fin -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/contoursendparser.tac b/ds9/parsers/contoursendparser.tac index 050ec09..d8cfc3a 100644 --- a/ds9/parsers/contoursendparser.tac +++ b/ds9/parsers/contoursendparser.tac @@ -2,7 +2,6 @@ %} #include coords.tin -#include string.tin %start contoursend diff --git a/ds9/parsers/croplex.fcl b/ds9/parsers/croplex.fcl index d07e346..078ff5d 100644 --- a/ds9/parsers/croplex.fcl +++ b/ds9/parsers/croplex.fcl @@ -16,6 +16,7 @@ reset {return $RESET_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/cropsendlex.fcl b/ds9/parsers/cropsendlex.fcl index 59ee21e..ccd81fc 100644 --- a/ds9/parsers/cropsendlex.fcl +++ b/ds9/parsers/cropsendlex.fcl @@ -11,6 +11,7 @@ LOCK_ {return $LOCK_} #include coords.fin +#include ws.fin %% diff --git a/ds9/parsers/crosshairlex.fcl b/ds9/parsers/crosshairlex.fcl index cf7f268..feca79d 100644 --- a/ds9/parsers/crosshairlex.fcl +++ b/ds9/parsers/crosshairlex.fcl @@ -11,5 +11,6 @@ #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/crosshairsendlex.fcl b/ds9/parsers/crosshairsendlex.fcl index 0fa3d47..9d10643 100644 --- a/ds9/parsers/crosshairsendlex.fcl +++ b/ds9/parsers/crosshairsendlex.fcl @@ -10,7 +10,7 @@ lock {return $LOCK_} #include coords.fin -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/crosshairsendparser.tac b/ds9/parsers/crosshairsendparser.tac index 32db6ca..23fffd5 100644 --- a/ds9/parsers/crosshairsendparser.tac +++ b/ds9/parsers/crosshairsendparser.tac @@ -2,7 +2,6 @@ %} #include coords.tin -#include string.tin %start crosshairsend diff --git a/ds9/parsers/cubelex.fcl b/ds9/parsers/cubelex.fcl index 9db861c..d250a00 100644 --- a/ds9/parsers/cubelex.fcl +++ b/ds9/parsers/cubelex.fcl @@ -32,5 +32,6 @@ stop {return $STOP_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/cubesendlex.fcl b/ds9/parsers/cubesendlex.fcl index 5a51bdd..b13a079 100644 --- a/ds9/parsers/cubesendlex.fcl +++ b/ds9/parsers/cubesendlex.fcl @@ -13,6 +13,6 @@ interval {return $INTERVAL_} lock {return $LOCK_} order {return $ORDER_} -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/cubesendparser.tac b/ds9/parsers/cubesendparser.tac index 70cfb3e..2f854fb 100644 --- a/ds9/parsers/cubesendparser.tac +++ b/ds9/parsers/cubesendparser.tac @@ -1,8 +1,6 @@ %{ %} -#include string.tin - %start cubesend %token AXIS_ diff --git a/ds9/parsers/cursorlex.fcl b/ds9/parsers/cursorlex.fcl index 9e4a423..5746ca6 100644 --- a/ds9/parsers/cursorlex.fcl +++ b/ds9/parsers/cursorlex.fcl @@ -9,5 +9,6 @@ #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/dssesolex.fcl b/ds9/parsers/dssesolex.fcl index bad1e7f..4ea3291 100644 --- a/ds9/parsers/dssesolex.fcl +++ b/ds9/parsers/dssesolex.fcl @@ -16,5 +16,6 @@ dss2-infrared {return $DSS2INFRARED_} #include imgsvr.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/dssesosendlex.fcl b/ds9/parsers/dssesosendlex.fcl index 3a7194b..dc2d416 100644 --- a/ds9/parsers/dssesosendlex.fcl +++ b/ds9/parsers/dssesosendlex.fcl @@ -8,5 +8,6 @@ %% #include imgsvrsend.fin +#include ws.fin %% diff --git a/ds9/parsers/dsssaolex.fcl b/ds9/parsers/dsssaolex.fcl index c3359c3..5314d19 100644 --- a/ds9/parsers/dsssaolex.fcl +++ b/ds9/parsers/dsssaolex.fcl @@ -11,5 +11,6 @@ #include imgsvr.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/dsssaosendlex.fcl b/ds9/parsers/dsssaosendlex.fcl index 8e705c0..0ce563f 100644 --- a/ds9/parsers/dsssaosendlex.fcl +++ b/ds9/parsers/dsssaosendlex.fcl @@ -8,5 +8,6 @@ %% #include imgsvrsend.fin +#include ws.fin %% diff --git a/ds9/parsers/dssstscilex.fcl b/ds9/parsers/dssstscilex.fcl index bbecd3a..240b511 100644 --- a/ds9/parsers/dssstscilex.fcl +++ b/ds9/parsers/dssstscilex.fcl @@ -21,5 +21,6 @@ phase2_gsc1 {return $GSC1_} #include imgsvr.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/dssstscisendlex.fcl b/ds9/parsers/dssstscisendlex.fcl index 64c7bcd..b91d797 100644 --- a/ds9/parsers/dssstscisendlex.fcl +++ b/ds9/parsers/dssstscisendlex.fcl @@ -8,5 +8,6 @@ %% #include imgsvrsend.fin +#include ws.fin %% diff --git a/ds9/parsers/envilex.fcl b/ds9/parsers/envilex.fcl index 47398a9..da78e59 100644 --- a/ds9/parsers/envilex.fcl +++ b/ds9/parsers/envilex.fcl @@ -10,5 +10,6 @@ new {return $NEW_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/exportlex.fcl b/ds9/parsers/exportlex.fcl index a0991e0..2907a71 100644 --- a/ds9/parsers/exportlex.fcl +++ b/ds9/parsers/exportlex.fcl @@ -27,5 +27,6 @@ deflate {return $DEFLATE_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/fitslex.fcl b/ds9/parsers/fitslex.fcl index c23f70e..6ea6004 100644 --- a/ds9/parsers/fitslex.fcl +++ b/ds9/parsers/fitslex.fcl @@ -12,5 +12,6 @@ new {return $NEW_} slice {return $SLICE_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/framelex.fcl b/ds9/parsers/framelex.fcl index b450f40..f4e65a0 100644 --- a/ds9/parsers/framelex.fcl +++ b/ds9/parsers/framelex.fcl @@ -32,5 +32,6 @@ show {return $SHOW_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/gridlex.fcl b/ds9/parsers/gridlex.fcl index 27c5b3d..dc380ae 100644 --- a/ds9/parsers/gridlex.fcl +++ b/ds9/parsers/gridlex.fcl @@ -69,5 +69,6 @@ uuu {return $UUU_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/gridsendlex.fcl b/ds9/parsers/gridsendlex.fcl index eadbb27..7e27d79 100644 --- a/ds9/parsers/gridsendlex.fcl +++ b/ds9/parsers/gridsendlex.fcl @@ -47,6 +47,6 @@ view {return $VIEW_} width {return $WIDTH_} #include font.fin -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/gridsendparser.tac b/ds9/parsers/gridsendparser.tac index c0509e9..96d8d12 100644 --- a/ds9/parsers/gridsendparser.tac +++ b/ds9/parsers/gridsendparser.tac @@ -2,7 +2,6 @@ %} #include font.tin -#include string.tin %start gridsend diff --git a/ds9/parsers/headerlex.fcl b/ds9/parsers/headerlex.fcl index dd279a9..2f429a5 100644 --- a/ds9/parsers/headerlex.fcl +++ b/ds9/parsers/headerlex.fcl @@ -12,5 +12,6 @@ save {return $SAVE_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/heightlex.fcl b/ds9/parsers/heightlex.fcl index 49bf3fd..17ea7c5 100644 --- a/ds9/parsers/heightlex.fcl +++ b/ds9/parsers/heightlex.fcl @@ -9,5 +9,6 @@ #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/iconifylex.fcl b/ds9/parsers/iconifylex.fcl index 564a6cd..fc65dd5 100644 --- a/ds9/parsers/iconifylex.fcl +++ b/ds9/parsers/iconifylex.fcl @@ -10,5 +10,6 @@ #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/iislex.fcl b/ds9/parsers/iislex.fcl index 7795f16..c3c26c4 100644 --- a/ds9/parsers/iislex.fcl +++ b/ds9/parsers/iislex.fcl @@ -11,5 +11,6 @@ filename {return $FILENAME_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/locklex.fcl b/ds9/parsers/locklex.fcl index 8147344..39e8b7f 100644 --- a/ds9/parsers/locklex.fcl +++ b/ds9/parsers/locklex.fcl @@ -23,7 +23,7 @@ smooth {return $SMOOTH_} #include matchlock.fin #include coords.fin #include yesno.fin -#include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/lockparser.tac b/ds9/parsers/lockparser.tac index 1b298c9..e990ab9 100644 --- a/ds9/parsers/lockparser.tac +++ b/ds9/parsers/lockparser.tac @@ -4,7 +4,6 @@ #include matchlock.tin #include coords.tin #include yesno.tin -#include numeric.tin #include string.tin %start command @@ -27,7 +26,6 @@ #include matchlock.trl #include coords.trl #include yesno.trl -#include numeric.trl command : lock | lock {yyclearin; YYACCEPT} STRING_ @@ -43,7 +41,7 @@ lock : FRAME_ lock {ProcessCmdSet panzoom lock $2 LockFrameCurrent} | SCALELIMITS_ yesno {ProcessCmdSet scale lock,limits $2 LockScaleLimitsCurrent} | COLORBAR_ yesno {ProcessCmdSet colorbar lock $2 LockColorCurrent} | BLOCK_ yesno {ProcessCmdSet block lock $2 LockBlockCurrent} - | SMOOTH_ yesno {ProessCmdSet smooth lock $2 LockSmoothCurrent} + | SMOOTH_ yesno {ProcessCmdSet smooth lock $2 LockSmoothCurrent} | 3D_ yesno {ProcessCmdSet threed lock $2 Lock3DCurrent} ; diff --git a/ds9/parsers/locksendlex.fcl b/ds9/parsers/locksendlex.fcl new file mode 100644 index 0000000..1040baf --- /dev/null +++ b/ds9/parsers/locksendlex.fcl @@ -0,0 +1,25 @@ +#tab locksendparser.tab.tcl + +%{ +%} + +#include defs.fin + +%% + +3d {return $3D_} +axes {return $AXES_} +bin {return $BIN_} +block {return $BLOCK_} +colorbar {return $COLORBAR_} +crop {return $CROP_} +crosshair {return $CROSSHAIR_} +frame {return $FRAME_} +scale {return $SCALE_} +scalelimits {return $SCALELIMITS_} +slice {return $SLICE_} +smooth {return $SMOOTH_} + +#include ws.fin + +%% diff --git a/ds9/parsers/locksendparser.tac b/ds9/parsers/locksendparser.tac new file mode 100644 index 0000000..dccec15 --- /dev/null +++ b/ds9/parsers/locksendparser.tac @@ -0,0 +1,43 @@ +%{ +%} + +%start locksend + +%token 3D_ +%token AXES_ +%token BIN_ +%token BLOCK_ +%token COLORBAR_ +%token CROP_ +%token CROSSHAIR_ +%token FRAME_ +%token SCALE_ +%token SCALELIMITS_ +%token SLICE_ +%token SMOOTH_ + +%% + +locksend : FRAME_ {ProcessSendCmdGet panzoom lock} + | CROSSHAIR_ {ProcessSendCmdGet crosshair lock} + | CROP_ {ProcessSendCmdGet crop lock} + | SLICE_ {ProcessSendCmdGet cube lock} + | BIN_ {ProcessSendCmdYesNo bin lock} + | AXES_ {ProcessSendCmdYesNo cube lock,axes} + | SCALE_ {ProcessSendCmdYesNo scale lock} + | SCALELIMITS_ {ProcessSendCmdYesNo scale lock,limits} + | COLORBAR_ {ProcessSendCmdYesNo colorbar lock} + | BLOCK_ {ProcessSendCmdYesNo block lock} + | SMOOTH_ {ProcessSendCmdYesNo smooth lock} + | 3D_ {ProcessSendCmdYesNo threed lock} + ; + +%% + +proc locksend::yyerror {msg} { + variable yycnt + variable yy_current_buffer + variable index_ + + ParserError $msg $yycnt $yy_current_buffer $index_ +} diff --git a/ds9/parsers/magnifierlex.fcl b/ds9/parsers/magnifierlex.fcl index d5a3561..c7cf020 100644 --- a/ds9/parsers/magnifierlex.fcl +++ b/ds9/parsers/magnifierlex.fcl @@ -15,5 +15,6 @@ zoom {return $ZOOM_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/masklex.fcl b/ds9/parsers/masklex.fcl index a64b52f..080b345 100644 --- a/ds9/parsers/masklex.fcl +++ b/ds9/parsers/masklex.fcl @@ -16,5 +16,6 @@ transparency {return $TRANSPARENCY_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/matchlex.fcl b/ds9/parsers/matchlex.fcl index 8331b5e..325dba8 100644 --- a/ds9/parsers/matchlex.fcl +++ b/ds9/parsers/matchlex.fcl @@ -24,5 +24,6 @@ smooth {return $SMOOTH_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/mecubelex.fcl b/ds9/parsers/mecubelex.fcl index e2bf949..4f8ee1e 100644 --- a/ds9/parsers/mecubelex.fcl +++ b/ds9/parsers/mecubelex.fcl @@ -10,5 +10,6 @@ new {return $NEW_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/minmaxlex.fcl b/ds9/parsers/minmaxlex.fcl index be171dd..2ecd1f3 100644 --- a/ds9/parsers/minmaxlex.fcl +++ b/ds9/parsers/minmaxlex.fcl @@ -18,5 +18,6 @@ scan {return $SCAN_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/minmaxsendlex.fcl b/ds9/parsers/minmaxsendlex.fcl index 6a33af6..2a036bc 100644 --- a/ds9/parsers/minmaxsendlex.fcl +++ b/ds9/parsers/minmaxsendlex.fcl @@ -10,6 +10,6 @@ interval {return $INTERVAL_} mode {return $MODE_} -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/minmaxsendparser.tac b/ds9/parsers/minmaxsendparser.tac index 21fe269..3ca9879 100644 --- a/ds9/parsers/minmaxsendparser.tac +++ b/ds9/parsers/minmaxsendparser.tac @@ -2,7 +2,6 @@ %} #include numeric.tin -#include string.tin %start minmaxsend diff --git a/ds9/parsers/modelex.fcl b/ds9/parsers/modelex.fcl index 8b7767e..7dab10a 100644 --- a/ds9/parsers/modelex.fcl +++ b/ds9/parsers/modelex.fcl @@ -20,5 +20,6 @@ examine {return $EXAMINE_} pointer {return $POINTER_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/mosaicimageiraflex.fcl b/ds9/parsers/mosaicimageiraflex.fcl index 31be3ff..34e60de 100644 --- a/ds9/parsers/mosaicimageiraflex.fcl +++ b/ds9/parsers/mosaicimageiraflex.fcl @@ -11,5 +11,6 @@ mask {return $MASK_} new {return $NEW_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/mosaicimagewcslex.fcl b/ds9/parsers/mosaicimagewcslex.fcl index b8a006d..3bd6e8b 100644 --- a/ds9/parsers/mosaicimagewcslex.fcl +++ b/ds9/parsers/mosaicimagewcslex.fcl @@ -12,5 +12,6 @@ new {return $NEW_} #include coords.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/mosaicimagewfpc2lex.fcl b/ds9/parsers/mosaicimagewfpc2lex.fcl index 8464c5e..bdcec4d 100644 --- a/ds9/parsers/mosaicimagewfpc2lex.fcl +++ b/ds9/parsers/mosaicimagewfpc2lex.fcl @@ -10,5 +10,6 @@ new {return $NEW_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/mosaiciraflex.fcl b/ds9/parsers/mosaiciraflex.fcl index aaf5a95..4cf8af8 100644 --- a/ds9/parsers/mosaiciraflex.fcl +++ b/ds9/parsers/mosaiciraflex.fcl @@ -11,5 +11,6 @@ mask {return $MASK_} new {return $NEW_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/mosaicwcslex.fcl b/ds9/parsers/mosaicwcslex.fcl index 807a62e..b742ee9 100644 --- a/ds9/parsers/mosaicwcslex.fcl +++ b/ds9/parsers/mosaicwcslex.fcl @@ -12,5 +12,6 @@ new {return $NEW_} #include coords.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/movielex.fcl b/ds9/parsers/movielex.fcl index ce77dc7..04de0d5 100644 --- a/ds9/parsers/movielex.fcl +++ b/ds9/parsers/movielex.fcl @@ -22,5 +22,6 @@ slto {return $SLTO_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/multiframelex.fcl b/ds9/parsers/multiframelex.fcl index 9405845..2cfa8ae 100644 --- a/ds9/parsers/multiframelex.fcl +++ b/ds9/parsers/multiframelex.fcl @@ -8,5 +8,6 @@ %% #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/nanlex.fcl b/ds9/parsers/nanlex.fcl index 3691a07..6db3f5d 100644 --- a/ds9/parsers/nanlex.fcl +++ b/ds9/parsers/nanlex.fcl @@ -8,5 +8,6 @@ %% #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/nreslex.fcl b/ds9/parsers/nreslex.fcl index a21cd7a..949731d 100644 --- a/ds9/parsers/nreslex.fcl +++ b/ds9/parsers/nreslex.fcl @@ -26,5 +26,6 @@ degrees {return $DEGREES_} sexagesimal {return $SEXAGESIMAL_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/nrrdlex.fcl b/ds9/parsers/nrrdlex.fcl index 1f7836e..04ebe61 100644 --- a/ds9/parsers/nrrdlex.fcl +++ b/ds9/parsers/nrrdlex.fcl @@ -11,5 +11,6 @@ mask {return $MASK_} new {return $NEW_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/nvsslex.fcl b/ds9/parsers/nvsslex.fcl index 977e916..3c20ccb 100644 --- a/ds9/parsers/nvsslex.fcl +++ b/ds9/parsers/nvsslex.fcl @@ -11,5 +11,6 @@ #include imgsvr.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/nvsssendlex.fcl b/ds9/parsers/nvsssendlex.fcl index 086f978..71b016d 100644 --- a/ds9/parsers/nvsssendlex.fcl +++ b/ds9/parsers/nvsssendlex.fcl @@ -8,5 +8,6 @@ %% #include imgsvrsend.fin +#include ws.fin %% diff --git a/ds9/parsers/orientlex.fcl b/ds9/parsers/orientlex.fcl index 65b0253..c964667 100644 --- a/ds9/parsers/orientlex.fcl +++ b/ds9/parsers/orientlex.fcl @@ -13,5 +13,6 @@ open {return $OPEN_} xy {return $XY_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/pagesetuplex.fcl b/ds9/parsers/pagesetuplex.fcl index 9ca4730..fe28639 100644 --- a/ds9/parsers/pagesetuplex.fcl +++ b/ds9/parsers/pagesetuplex.fcl @@ -23,5 +23,6 @@ a4 {return $A4_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/panlex.fcl b/ds9/parsers/panlex.fcl index 33a918b..6c200d6 100644 --- a/ds9/parsers/panlex.fcl +++ b/ds9/parsers/panlex.fcl @@ -14,6 +14,7 @@ to {return $TO_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/pansendlex.fcl b/ds9/parsers/pansendlex.fcl index 1531358..9e65b81 100644 --- a/ds9/parsers/pansendlex.fcl +++ b/ds9/parsers/pansendlex.fcl @@ -8,7 +8,7 @@ %% #include coords.fin -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/pansendparser.tac b/ds9/parsers/pansendparser.tac index 2fa0d5f..ec2a39f 100644 --- a/ds9/parsers/pansendparser.tac +++ b/ds9/parsers/pansendparser.tac @@ -2,7 +2,6 @@ %} #include coords.tin -#include string.tin %start pansend diff --git a/ds9/parsers/photolex.fcl b/ds9/parsers/photolex.fcl index c39bd1b..b142687 100644 --- a/ds9/parsers/photolex.fcl +++ b/ds9/parsers/photolex.fcl @@ -11,5 +11,6 @@ new {return $NEW_} slice {return $SLICE_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/pixeltablelex.fcl b/ds9/parsers/pixeltablelex.fcl index 6ba9705..a096ff2 100644 --- a/ds9/parsers/pixeltablelex.fcl +++ b/ds9/parsers/pixeltablelex.fcl @@ -12,5 +12,6 @@ open {return $OPEN_} #include yesno.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/plotlex.fcl b/ds9/parsers/plotlex.fcl index 270b27b..9254e03 100644 --- a/ds9/parsers/plotlex.fcl +++ b/ds9/parsers/plotlex.fcl @@ -137,5 +137,6 @@ yaxis {return $YAXIS_} #include font.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/precisionlex.fcl b/ds9/parsers/precisionlex.fcl index ab5d199..8e9e8d4 100644 --- a/ds9/parsers/precisionlex.fcl +++ b/ds9/parsers/precisionlex.fcl @@ -9,5 +9,6 @@ #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/prefslex.fcl b/ds9/parsers/prefslex.fcl index 1d8cdbb..e25b854 100644 --- a/ds9/parsers/prefslex.fcl +++ b/ds9/parsers/prefslex.fcl @@ -17,5 +17,6 @@ threads {return $THREADS_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/preservelex.fcl b/ds9/parsers/preservelex.fcl index ef0834b..dafbd18 100644 --- a/ds9/parsers/preservelex.fcl +++ b/ds9/parsers/preservelex.fcl @@ -13,5 +13,6 @@ regions {return $REGIONS_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/pslex.fcl b/ds9/parsers/pslex.fcl index ae763a5..ea34343 100644 --- a/ds9/parsers/pslex.fcl +++ b/ds9/parsers/pslex.fcl @@ -32,5 +32,6 @@ screen {return $SCREEN_} 1200 {return $1200_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/regionlex.fcl b/ds9/parsers/regionlex.fcl index d30d5f4..0239078 100644 --- a/ds9/parsers/regionlex.fcl +++ b/ds9/parsers/regionlex.fcl @@ -106,5 +106,6 @@ boxcircle {return $BOXCIRCLE_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/regionsendlex.fcl b/ds9/parsers/regionsendlex.fcl index 0e38358..07e64ee 100644 --- a/ds9/parsers/regionsendlex.fcl +++ b/ds9/parsers/regionsendlex.fcl @@ -7,7 +7,6 @@ %% - auto {return $AUTO_} autocentroid {return $AUTOCENTROID_} background {return $BACKGROUND_} @@ -55,5 +54,6 @@ xy {return $XY_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/restorelex.fcl b/ds9/parsers/restorelex.fcl index 8e28d79..d57c147 100644 --- a/ds9/parsers/restorelex.fcl +++ b/ds9/parsers/restorelex.fcl @@ -8,5 +8,6 @@ %% #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/rgbarraylex.fcl b/ds9/parsers/rgbarraylex.fcl index 7f2d962..0146cd6 100644 --- a/ds9/parsers/rgbarraylex.fcl +++ b/ds9/parsers/rgbarraylex.fcl @@ -11,5 +11,6 @@ mask {return $MASK_} new {return $NEW_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/rgbcubelex.fcl b/ds9/parsers/rgbcubelex.fcl index bf43fb5..011f35e 100644 --- a/ds9/parsers/rgbcubelex.fcl +++ b/ds9/parsers/rgbcubelex.fcl @@ -10,5 +10,6 @@ new {return $NEW_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/rgbimagelex.fcl b/ds9/parsers/rgbimagelex.fcl index cf8f852..d96a33d 100644 --- a/ds9/parsers/rgbimagelex.fcl +++ b/ds9/parsers/rgbimagelex.fcl @@ -10,5 +10,6 @@ new {return $NEW_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/rgblex.fcl b/ds9/parsers/rgblex.fcl index ac81e78..50135c2 100644 --- a/ds9/parsers/rgblex.fcl +++ b/ds9/parsers/rgblex.fcl @@ -30,5 +30,6 @@ view {return $VIEW_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/rotatelex.fcl b/ds9/parsers/rotatelex.fcl index 633dfcf..72bfcdf 100644 --- a/ds9/parsers/rotatelex.fcl +++ b/ds9/parsers/rotatelex.fcl @@ -13,5 +13,6 @@ to {return $TO_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/samplex.fcl b/ds9/parsers/samplex.fcl index 7d4d16d..000ced0 100644 --- a/ds9/parsers/samplex.fcl +++ b/ds9/parsers/samplex.fcl @@ -16,5 +16,6 @@ table {return $TABLE_} #include yesno.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/saveimagelex.fcl b/ds9/parsers/saveimagelex.fcl index 8174f50..0367bca 100644 --- a/ds9/parsers/saveimagelex.fcl +++ b/ds9/parsers/saveimagelex.fcl @@ -21,5 +21,6 @@ deflate {return $DEFLATE_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/savelex.fcl b/ds9/parsers/savelex.fcl index 80a7969..9aca089 100644 --- a/ds9/parsers/savelex.fcl +++ b/ds9/parsers/savelex.fcl @@ -23,5 +23,6 @@ slice {return $SLICE_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/scalelex.fcl b/ds9/parsers/scalelex.fcl index 3bf9827..873833a 100644 --- a/ds9/parsers/scalelex.fcl +++ b/ds9/parsers/scalelex.fcl @@ -35,5 +35,6 @@ zscale {return $ZSCALE_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/scalesendlex.fcl b/ds9/parsers/scalesendlex.fcl index 272efaf..4bfa9a7 100644 --- a/ds9/parsers/scalesendlex.fcl +++ b/ds9/parsers/scalesendlex.fcl @@ -16,6 +16,6 @@ mode {return $MODE_} scalelimits {return $SCALELIMITS_} scope {return $SCOPE_} -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/scalesendparser.tac b/ds9/parsers/scalesendparser.tac index 1af2c5b..9e301b2 100644 --- a/ds9/parsers/scalesendparser.tac +++ b/ds9/parsers/scalesendparser.tac @@ -1,8 +1,6 @@ %{ %} -#include string.tin - %start scalesend %token DATASEC_ diff --git a/ds9/parsers/sfitslex.fcl b/ds9/parsers/sfitslex.fcl index 5baebf6..c27f29d 100644 --- a/ds9/parsers/sfitslex.fcl +++ b/ds9/parsers/sfitslex.fcl @@ -12,5 +12,6 @@ new {return $NEW_} slice {return $SLICE_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/shmlex.fcl b/ds9/parsers/shmlex.fcl index 39dd528..61d6b00 100644 --- a/ds9/parsers/shmlex.fcl +++ b/ds9/parsers/shmlex.fcl @@ -35,5 +35,6 @@ shm {return $SHM_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/sialex.fcl b/ds9/parsers/sialex.fcl index b7987ab..ff8094b 100644 --- a/ds9/parsers/sialex.fcl +++ b/ds9/parsers/sialex.fcl @@ -43,5 +43,6 @@ tsv {return $TSV_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/skyviewlex.fcl b/ds9/parsers/skyviewlex.fcl index 873cec7..8bdbda9 100644 --- a/ds9/parsers/skyviewlex.fcl +++ b/ds9/parsers/skyviewlex.fcl @@ -13,5 +13,6 @@ pixels {return $PIXELS_} #include imgsvr.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/skyviewsendlex.fcl b/ds9/parsers/skyviewsendlex.fcl index 1ae0088..e33d285 100644 --- a/ds9/parsers/skyviewsendlex.fcl +++ b/ds9/parsers/skyviewsendlex.fcl @@ -10,5 +10,6 @@ pixels {return $PIXELS_} #include imgsvrsend.fin +#include ws.fin %% diff --git a/ds9/parsers/sleeplex.fcl b/ds9/parsers/sleeplex.fcl index 3987b50..98bbf56 100644 --- a/ds9/parsers/sleeplex.fcl +++ b/ds9/parsers/sleeplex.fcl @@ -9,5 +9,6 @@ #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/smoothlex.fcl b/ds9/parsers/smoothlex.fcl index 81fd963..f719bca 100644 --- a/ds9/parsers/smoothlex.fcl +++ b/ds9/parsers/smoothlex.fcl @@ -25,5 +25,6 @@ tophat {return $TOPHAT_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/smoothsendlex.fcl b/ds9/parsers/smoothsendlex.fcl index 778f79b..b4acae9 100644 --- a/ds9/parsers/smoothsendlex.fcl +++ b/ds9/parsers/smoothsendlex.fcl @@ -15,6 +15,6 @@ radiusminor {return $RADIUSMINOR_} sigma {return $SIGMA_} sigmaminor {return $SIGMAMINOR_} -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/smoothsendparser.tac b/ds9/parsers/smoothsendparser.tac index 469b0d6..5351780 100644 --- a/ds9/parsers/smoothsendparser.tac +++ b/ds9/parsers/smoothsendparser.tac @@ -1,8 +1,6 @@ %{ %} -#include string.tin - %start smoothsend %token ANGLE_ diff --git a/ds9/parsers/smosaiciraflex.fcl b/ds9/parsers/smosaiciraflex.fcl index 9af2cd3..25bdf21 100644 --- a/ds9/parsers/smosaiciraflex.fcl +++ b/ds9/parsers/smosaiciraflex.fcl @@ -11,5 +11,6 @@ mask {return $MASK_} new {return $NEW_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/smosaicwcslex.fcl b/ds9/parsers/smosaicwcslex.fcl index f5da16f..0bc4907 100644 --- a/ds9/parsers/smosaicwcslex.fcl +++ b/ds9/parsers/smosaicwcslex.fcl @@ -12,5 +12,6 @@ new {return $NEW_} #include coords.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/sourcelex.fcl b/ds9/parsers/sourcelex.fcl index 8c17472..8677a68 100644 --- a/ds9/parsers/sourcelex.fcl +++ b/ds9/parsers/sourcelex.fcl @@ -8,5 +8,6 @@ %% #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/srgbcubelex.fcl b/ds9/parsers/srgbcubelex.fcl index f70cdca..9e4bb60 100644 --- a/ds9/parsers/srgbcubelex.fcl +++ b/ds9/parsers/srgbcubelex.fcl @@ -10,5 +10,6 @@ new {return $NEW_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/string.fin b/ds9/parsers/string.fin index 5f02bf8..a02f852 100644 --- a/ds9/parsers/string.fin +++ b/ds9/parsers/string.fin @@ -10,7 +10,3 @@ # STRING \S+\S+ {set yylval $yytext; return $STRING_} -\s # ignore whitespace - -. {set yylval $yytext; return $yylval} - diff --git a/ds9/parsers/threadslex.fcl b/ds9/parsers/threadslex.fcl index 1648106..49546a9 100644 --- a/ds9/parsers/threadslex.fcl +++ b/ds9/parsers/threadslex.fcl @@ -9,5 +9,6 @@ #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/threedlex.fcl b/ds9/parsers/threedlex.fcl index ecfe7e3..2b954a2 100644 --- a/ds9/parsers/threedlex.fcl +++ b/ds9/parsers/threedlex.fcl @@ -32,5 +32,6 @@ vp {return $VIEW_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/threedsendlex.fcl b/ds9/parsers/threedsendlex.fcl index 61ff179..119553a 100644 --- a/ds9/parsers/threedsendlex.fcl +++ b/ds9/parsers/threedsendlex.fcl @@ -23,6 +23,6 @@ scale {return $SCALE_} view {return $VIEW_} vp {return $VIEW_} -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/threedsendparser.tac b/ds9/parsers/threedsendparser.tac index 941bf5c..ba0b4c0 100644 --- a/ds9/parsers/threedsendparser.tac +++ b/ds9/parsers/threedsendparser.tac @@ -1,8 +1,6 @@ %{ %} -#include string.tin - %start threedsend %token AZ_ diff --git a/ds9/parsers/tilelex.fcl b/ds9/parsers/tilelex.fcl index 0b4364d..11e5cd4 100644 --- a/ds9/parsers/tilelex.fcl +++ b/ds9/parsers/tilelex.fcl @@ -20,5 +20,6 @@ row {return $ROW_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/twomasslex.fcl b/ds9/parsers/twomasslex.fcl index 833b1b1..9c926b2 100644 --- a/ds9/parsers/twomasslex.fcl +++ b/ds9/parsers/twomasslex.fcl @@ -11,5 +11,6 @@ #include imgsvr.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/twomasssendlex.fcl b/ds9/parsers/twomasssendlex.fcl index cf20789..26e7db5 100644 --- a/ds9/parsers/twomasssendlex.fcl +++ b/ds9/parsers/twomasssendlex.fcl @@ -8,5 +8,6 @@ %% #include imgsvrsend.fin +#include ws.fin %% diff --git a/ds9/parsers/updatelex.fcl b/ds9/parsers/updatelex.fcl index 3cab237..43e00b8 100644 --- a/ds9/parsers/updatelex.fcl +++ b/ds9/parsers/updatelex.fcl @@ -12,5 +12,6 @@ now {return $NOW_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/urlfitslex.fcl b/ds9/parsers/urlfitslex.fcl index 108d416..353db6e 100644 --- a/ds9/parsers/urlfitslex.fcl +++ b/ds9/parsers/urlfitslex.fcl @@ -12,5 +12,6 @@ new {return $NEW_} slice {return $SLICE_} #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/viewlex.fcl b/ds9/parsers/viewlex.fcl index f980b7d..db0dbad 100644 --- a/ds9/parsers/viewlex.fcl +++ b/ds9/parsers/viewlex.fcl @@ -36,5 +36,6 @@ vertgraph {return $VERTGRAPH_} #include yesno.fin #include coords.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/viewsendlex.fcl b/ds9/parsers/viewsendlex.fcl index 9cd0469..77992fb 100644 --- a/ds9/parsers/viewsendlex.fcl +++ b/ds9/parsers/viewsendlex.fcl @@ -34,6 +34,6 @@ vertical {return $VERTICAL_} vertgraph {return $VERTGRAPH_} #include coords.fin -#include string.fin +#include ws.fin %% diff --git a/ds9/parsers/viewsendparser.tac b/ds9/parsers/viewsendparser.tac index e39b556..8c7fce0 100644 --- a/ds9/parsers/viewsendparser.tac +++ b/ds9/parsers/viewsendparser.tac @@ -2,7 +2,6 @@ %} #include coords.tin -#include string.tin %start viewsend diff --git a/ds9/parsers/vlalex.fcl b/ds9/parsers/vlalex.fcl index b772010..9670cb5 100644 --- a/ds9/parsers/vlalex.fcl +++ b/ds9/parsers/vlalex.fcl @@ -14,5 +14,6 @@ first {return $FIRST_} #include imgsvr.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/vlasendlex.fcl b/ds9/parsers/vlasendlex.fcl index 676a8f1..09b0a84 100644 --- a/ds9/parsers/vlasendlex.fcl +++ b/ds9/parsers/vlasendlex.fcl @@ -8,5 +8,6 @@ %% #include imgsvrsend.fin +#include ws.fin %% diff --git a/ds9/parsers/vlsslex.fcl b/ds9/parsers/vlsslex.fcl index 1408972..f420f4f 100644 --- a/ds9/parsers/vlsslex.fcl +++ b/ds9/parsers/vlsslex.fcl @@ -11,5 +11,6 @@ #include imgsvr.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/vlsssendlex.fcl b/ds9/parsers/vlsssendlex.fcl index 638842c..00f3c25 100644 --- a/ds9/parsers/vlsssendlex.fcl +++ b/ds9/parsers/vlsssendlex.fcl @@ -8,5 +8,6 @@ %% #include imgsvrsend.fin +#include ws.fin %% diff --git a/ds9/parsers/volex.fcl b/ds9/parsers/volex.fcl index 511c614..46ae40f 100644 --- a/ds9/parsers/volex.fcl +++ b/ds9/parsers/volex.fcl @@ -21,5 +21,6 @@ xpa {return $XPA_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/wcslex.fcl b/ds9/parsers/wcslex.fcl index 917212e..8034ff1 100644 --- a/ds9/parsers/wcslex.fcl +++ b/ds9/parsers/wcslex.fcl @@ -21,5 +21,6 @@ system {return $SYSTEM_} #include coords.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/weblex.fcl b/ds9/parsers/weblex.fcl index e051e1c..c25019b 100644 --- a/ds9/parsers/weblex.fcl +++ b/ds9/parsers/weblex.fcl @@ -18,5 +18,6 @@ stop {return $STOP_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/widthlex.fcl b/ds9/parsers/widthlex.fcl index 665274e..85a377e 100644 --- a/ds9/parsers/widthlex.fcl +++ b/ds9/parsers/widthlex.fcl @@ -9,5 +9,6 @@ #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/ws.fin b/ds9/parsers/ws.fin new file mode 100644 index 0000000..582e88b --- /dev/null +++ b/ds9/parsers/ws.fin @@ -0,0 +1,3 @@ +\s # ignore whitespace + +. {set yylval $yytext; return $yylval} diff --git a/ds9/parsers/xpafirstlex.fcl b/ds9/parsers/xpafirstlex.fcl index 0ba673b..f5e609e 100644 --- a/ds9/parsers/xpafirstlex.fcl +++ b/ds9/parsers/xpafirstlex.fcl @@ -21,5 +21,6 @@ unix {return $UNIX_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/xpalex.fcl b/ds9/parsers/xpalex.fcl index 0ba673b..f5e609e 100644 --- a/ds9/parsers/xpalex.fcl +++ b/ds9/parsers/xpalex.fcl @@ -21,5 +21,6 @@ unix {return $UNIX_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/zoomlex.fcl b/ds9/parsers/zoomlex.fcl index 8a505d4..5d7b61c 100644 --- a/ds9/parsers/zoomlex.fcl +++ b/ds9/parsers/zoomlex.fcl @@ -16,5 +16,6 @@ to {return $TO_} #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/zscalelex.fcl b/ds9/parsers/zscalelex.fcl index 062e49f..966d655 100644 --- a/ds9/parsers/zscalelex.fcl +++ b/ds9/parsers/zscalelex.fcl @@ -14,5 +14,6 @@ line {return $LINE_} #include yesno.fin #include numeric.fin #include string.fin +#include ws.fin %% diff --git a/ds9/parsers/zscalesendlex.fcl b/ds9/parsers/zscalesendlex.fcl index ea43480..72712b2 100644 --- a/ds9/parsers/zscalesendlex.fcl +++ b/ds9/parsers/zscalesendlex.fcl @@ -11,4 +11,6 @@ contrast {return $CONTRAST_} sample {return $SAMPLE_} line {return $LINE_} +#include ws.fin + %% diff --git a/ds9/parsers/zscalesendparser.tac b/ds9/parsers/zscalesendparser.tac index a3ebd96..275d095 100644 --- a/ds9/parsers/zscalesendparser.tac +++ b/ds9/parsers/zscalesendparser.tac @@ -1,8 +1,6 @@ %{ %} -#include string.tin - %start zscalesend %token CONTRAST_ |