From 3cf328254182c428cd2902c42c6c37d13b711dab Mon Sep 17 00:00:00 2001 From: William Joye Date: Fri, 8 Jun 2018 12:57:16 -0400 Subject: update ds9 parsers --- ds9/parsers/analysislex.fcl | 2 +- ds9/parsers/analysisparser.tac | 4 +--- ds9/parsers/blinkparser.tac | 2 +- ds9/parsers/colorbarlex.fcl | 2 +- ds9/parsers/colorbarparser.tac | 3 +-- ds9/parsers/cursorlex.fcl | 2 +- ds9/parsers/cursorparser.tac | 4 +--- ds9/parsers/framelex.fcl | 2 +- ds9/parsers/frameparser.tac | 3 +-- ds9/parsers/headerlex.fcl | 2 +- ds9/parsers/headerparser.tac | 4 +--- ds9/parsers/heightlex.fcl | 2 +- ds9/parsers/heightparser.tac | 4 +--- ds9/parsers/iconifylex.fcl | 1 - ds9/parsers/iconifyparser.tac | 2 -- ds9/parsers/iislex.fcl | 2 +- ds9/parsers/iisparser.tac | 4 +--- ds9/parsers/masklex.fcl | 2 +- ds9/parsers/maskparser.tac | 4 +--- ds9/parsers/minmaxlex.fcl | 2 +- ds9/parsers/minmaxparser.tac | 4 +--- ds9/parsers/minmaxsendparser.tac | 4 ---- ds9/parsers/precisionlex.fcl | 2 +- ds9/parsers/precisionparser.tac | 4 +--- ds9/parsers/prefslex.fcl | 2 +- ds9/parsers/prefsparser.tac | 3 +-- ds9/parsers/preservelex.fcl | 1 - ds9/parsers/preserveparser.tac | 2 -- ds9/parsers/regionsendlex.fcl | 2 +- ds9/parsers/regionsendparser.tac | 3 +-- ds9/parsers/sampparser.tac | 2 +- ds9/parsers/savelex.fcl | 2 +- ds9/parsers/saveparser.tac | 4 +--- ds9/parsers/shmlex.fcl | 2 +- ds9/parsers/shmparser.tac | 3 +-- ds9/parsers/threadslex.fcl | 2 +- ds9/parsers/threadsparser.tac | 4 +--- ds9/parsers/tilelex.fcl | 2 +- ds9/parsers/tileparser.tac | 5 ++--- ds9/parsers/updatelex.fcl | 2 +- ds9/parsers/updateparser.tac | 3 +-- ds9/parsers/volex.fcl | 2 +- ds9/parsers/voparser.tac | 3 +-- ds9/parsers/wcslex.fcl | 2 +- ds9/parsers/wcsparser.tac | 3 +-- ds9/parsers/weblex.fcl | 2 +- ds9/parsers/webparser.tac | 4 +--- ds9/parsers/widthlex.fcl | 2 +- ds9/parsers/widthparser.tac | 4 +--- ds9/parsers/xpafirstlex.fcl | 1 - ds9/parsers/xpafirstparser.tac | 2 -- ds9/parsers/xpalex.fcl | 1 - ds9/parsers/xpaparser.tac | 2 -- ds9/parsers/yes-no.trl | 9 +++++++++ ds9/parsers/yesno.trl | 10 ---------- 55 files changed, 54 insertions(+), 104 deletions(-) create mode 100644 ds9/parsers/yes-no.trl diff --git a/ds9/parsers/analysislex.fcl b/ds9/parsers/analysislex.fcl index 4c826a9..fe9bfdc 100644 --- a/ds9/parsers/analysislex.fcl +++ b/ds9/parsers/analysislex.fcl @@ -26,7 +26,7 @@ xyex {return $XYEX} xyey {return $XYEY} xyexey {return $XYEXEY} -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/analysisparser.tac b/ds9/parsers/analysisparser.tac index 4b42b99..631c063 100644 --- a/ds9/parsers/analysisparser.tac +++ b/ds9/parsers/analysisparser.tac @@ -1,7 +1,7 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command @@ -27,8 +27,6 @@ %% -#include numeric.trl - command : analysis | analysis {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/blinkparser.tac b/ds9/parsers/blinkparser.tac index 2277764..12e7f22 100644 --- a/ds9/parsers/blinkparser.tac +++ b/ds9/parsers/blinkparser.tac @@ -11,7 +11,7 @@ %% -#include yesno.trl +#include yes-no.trl #include numeric.trl command : blink diff --git a/ds9/parsers/colorbarlex.fcl b/ds9/parsers/colorbarlex.fcl index d628d34..723880f 100644 --- a/ds9/parsers/colorbarlex.fcl +++ b/ds9/parsers/colorbarlex.fcl @@ -21,7 +21,7 @@ vertical {return $VERTICAL_} #include yesno.fin #include font.fin -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/colorbarparser.tac b/ds9/parsers/colorbarparser.tac index a1252a5..3c1376e 100644 --- a/ds9/parsers/colorbarparser.tac +++ b/ds9/parsers/colorbarparser.tac @@ -3,7 +3,7 @@ #include yesno.tin #include font.tin -#include numeric.tin +#include int.tin #include string.tin %start command @@ -24,7 +24,6 @@ #include yesno.trl #include font.trl -#include numeric.trl command : colorbar | colorbar {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/cursorlex.fcl b/ds9/parsers/cursorlex.fcl index 5746ca6..6aa93f5 100644 --- a/ds9/parsers/cursorlex.fcl +++ b/ds9/parsers/cursorlex.fcl @@ -7,7 +7,7 @@ %% -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/cursorparser.tac b/ds9/parsers/cursorparser.tac index a1b4255..a83c383 100644 --- a/ds9/parsers/cursorparser.tac +++ b/ds9/parsers/cursorparser.tac @@ -1,15 +1,13 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command %% -#include numeric.trl - command : cursor | cursor {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/framelex.fcl b/ds9/parsers/framelex.fcl index 2b5ae22..1309195 100644 --- a/ds9/parsers/framelex.fcl +++ b/ds9/parsers/framelex.fcl @@ -31,7 +31,7 @@ show {return $SHOW_} #include matchlock.fin #include coordsys.fin #include wcssys.fin -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/frameparser.tac b/ds9/parsers/frameparser.tac index 9aadf9a..7a91411 100644 --- a/ds9/parsers/frameparser.tac +++ b/ds9/parsers/frameparser.tac @@ -4,7 +4,7 @@ #include matchlock.tin #include coordsys.tin #include wcssys.tin -#include numeric.tin +#include int.tin #include string.tin %start command @@ -34,7 +34,6 @@ #include matchlock.trl #include coordsys.trl #include wcssys.trl -#include numeric.trl command : frame | frame {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/headerlex.fcl b/ds9/parsers/headerlex.fcl index 2f429a5..8b8d8de 100644 --- a/ds9/parsers/headerlex.fcl +++ b/ds9/parsers/headerlex.fcl @@ -10,7 +10,7 @@ close {return $CLOSE_} save {return $SAVE_} -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/headerparser.tac b/ds9/parsers/headerparser.tac index 45b8bfc..233d668 100644 --- a/ds9/parsers/headerparser.tac +++ b/ds9/parsers/headerparser.tac @@ -1,7 +1,7 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command @@ -11,8 +11,6 @@ %% -#include numeric.trl - command : header | header {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/heightlex.fcl b/ds9/parsers/heightlex.fcl index 17ea7c5..cb36625 100644 --- a/ds9/parsers/heightlex.fcl +++ b/ds9/parsers/heightlex.fcl @@ -7,7 +7,7 @@ %% -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/heightparser.tac b/ds9/parsers/heightparser.tac index f3a49ce..8173363 100644 --- a/ds9/parsers/heightparser.tac +++ b/ds9/parsers/heightparser.tac @@ -1,15 +1,13 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command %% -#include numeric.trl - command : height | height {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/iconifylex.fcl b/ds9/parsers/iconifylex.fcl index fc65dd5..29c05a6 100644 --- a/ds9/parsers/iconifylex.fcl +++ b/ds9/parsers/iconifylex.fcl @@ -8,7 +8,6 @@ %% #include yesno.fin -#include numeric.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/iconifyparser.tac b/ds9/parsers/iconifyparser.tac index 4a88369..eba3075 100644 --- a/ds9/parsers/iconifyparser.tac +++ b/ds9/parsers/iconifyparser.tac @@ -2,7 +2,6 @@ %} #include yesno.tin -#include numeric.tin #include string.tin %start command @@ -10,7 +9,6 @@ %% #include yesno.trl -#include numeric.trl command : iconify | iconify {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/iislex.fcl b/ds9/parsers/iislex.fcl index c3c26c4..9c3d0a8 100644 --- a/ds9/parsers/iislex.fcl +++ b/ds9/parsers/iislex.fcl @@ -9,7 +9,7 @@ filename {return $FILENAME_} -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/iisparser.tac b/ds9/parsers/iisparser.tac index e486cbb..47640fa 100644 --- a/ds9/parsers/iisparser.tac +++ b/ds9/parsers/iisparser.tac @@ -1,7 +1,7 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command @@ -10,8 +10,6 @@ %% -#include numeric.trl - command : iis | iis {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/masklex.fcl b/ds9/parsers/masklex.fcl index 080b345..1ae1583 100644 --- a/ds9/parsers/masklex.fcl +++ b/ds9/parsers/masklex.fcl @@ -14,7 +14,7 @@ mark {return $MARK_} open {return $OPEN_} transparency {return $TRANSPARENCY_} -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/maskparser.tac b/ds9/parsers/maskparser.tac index 9087950..2b60384 100644 --- a/ds9/parsers/maskparser.tac +++ b/ds9/parsers/maskparser.tac @@ -1,7 +1,7 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command @@ -15,8 +15,6 @@ %% -#include numeric.trl - command : mask | mask {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/minmaxlex.fcl b/ds9/parsers/minmaxlex.fcl index 2ecd1f3..4fc4744 100644 --- a/ds9/parsers/minmaxlex.fcl +++ b/ds9/parsers/minmaxlex.fcl @@ -16,7 +16,7 @@ mode {return $MODE_} sample {return $SAMPLE_} scan {return $SCAN_} -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/minmaxparser.tac b/ds9/parsers/minmaxparser.tac index b5be097..cd14eba 100644 --- a/ds9/parsers/minmaxparser.tac +++ b/ds9/parsers/minmaxparser.tac @@ -1,7 +1,7 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command @@ -16,8 +16,6 @@ %% -#include numeric.trl - command : minmax | minmax {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/minmaxsendparser.tac b/ds9/parsers/minmaxsendparser.tac index 3ca9879..2d0e2a1 100644 --- a/ds9/parsers/minmaxsendparser.tac +++ b/ds9/parsers/minmaxsendparser.tac @@ -1,8 +1,6 @@ %{ %} -#include numeric.tin - %start minmaxsend %token INTERVAL_ @@ -10,8 +8,6 @@ %% -#include numeric.trl - minmaxsend : {ProcessSendCmdGet minmax mode} | MODE_ {ProcessSendCmdGet minmax mode} | INTERVAL_ {ProcessSendCmdGet minmax sample} diff --git a/ds9/parsers/precisionlex.fcl b/ds9/parsers/precisionlex.fcl index 8e9e8d4..28b4018 100644 --- a/ds9/parsers/precisionlex.fcl +++ b/ds9/parsers/precisionlex.fcl @@ -7,7 +7,7 @@ %% -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/precisionparser.tac b/ds9/parsers/precisionparser.tac index 4a89c59..d8494c1 100644 --- a/ds9/parsers/precisionparser.tac +++ b/ds9/parsers/precisionparser.tac @@ -1,15 +1,13 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command %% -#include numeric.trl - command : precision | precision {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/prefslex.fcl b/ds9/parsers/prefslex.fcl index e25b854..9b2387d 100644 --- a/ds9/parsers/prefslex.fcl +++ b/ds9/parsers/prefslex.fcl @@ -15,7 +15,7 @@ precision {return $PRECISION_} threads {return $THREADS_} #include yesno.fin -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/prefsparser.tac b/ds9/parsers/prefsparser.tac index 0630354..2b32269 100644 --- a/ds9/parsers/prefsparser.tac +++ b/ds9/parsers/prefsparser.tac @@ -2,7 +2,7 @@ %} #include yesno.tin -#include numeric.tin +#include int.tin #include string.tin %start command @@ -17,7 +17,6 @@ %% #include yesno.trl -#include numeric.trl command : prefs | prefs {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/preservelex.fcl b/ds9/parsers/preservelex.fcl index dafbd18..ee095fe 100644 --- a/ds9/parsers/preservelex.fcl +++ b/ds9/parsers/preservelex.fcl @@ -11,7 +11,6 @@ pan {return $PAN_} regions {return $REGIONS_} #include yesno.fin -#include numeric.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/preserveparser.tac b/ds9/parsers/preserveparser.tac index c372044..5471639 100644 --- a/ds9/parsers/preserveparser.tac +++ b/ds9/parsers/preserveparser.tac @@ -2,7 +2,6 @@ %} #include yesno.tin -#include numeric.tin #include string.tin %start command @@ -13,7 +12,6 @@ %% #include yesno.trl -#include numeric.trl command : preserve | preserve {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/regionsendlex.fcl b/ds9/parsers/regionsendlex.fcl index 0584804..023d749 100644 --- a/ds9/parsers/regionsendlex.fcl +++ b/ds9/parsers/regionsendlex.fcl @@ -55,7 +55,7 @@ xy {return $XY_} #include wcssys.fin #include skyframe.fin #include skyformat.fin -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/regionsendparser.tac b/ds9/parsers/regionsendparser.tac index 63efbe7..d3d11bf 100644 --- a/ds9/parsers/regionsendparser.tac +++ b/ds9/parsers/regionsendparser.tac @@ -6,7 +6,7 @@ #include wcssys.tin #include skyframe.tin #include skyformat.tin -#include numeric.tin +#include int.tin #include string.tin %start regionsend @@ -61,7 +61,6 @@ #include wcssys.trl #include skyframe.trl #include skyformat.trl -#include numeric.trl regionsend : {RegionSendCmd} | props {RegionSendCmd} diff --git a/ds9/parsers/sampparser.tac b/ds9/parsers/sampparser.tac index 2c3d4ba..d3e16f1 100644 --- a/ds9/parsers/sampparser.tac +++ b/ds9/parsers/sampparser.tac @@ -15,7 +15,7 @@ %% -#include yesno.trl +#include yes-no.trl command : samp | samp {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/savelex.fcl b/ds9/parsers/savelex.fcl index 9aca089..9d50085 100644 --- a/ds9/parsers/savelex.fcl +++ b/ds9/parsers/savelex.fcl @@ -21,7 +21,7 @@ image {return $IMAGE_} table {return $TABLE_} slice {return $SLICE_} -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/saveparser.tac b/ds9/parsers/saveparser.tac index 32fb6a4..09ab967 100644 --- a/ds9/parsers/saveparser.tac +++ b/ds9/parsers/saveparser.tac @@ -1,7 +1,7 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command @@ -22,8 +22,6 @@ %% -#include numeric.trl - command : save | save {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/shmlex.fcl b/ds9/parsers/shmlex.fcl index 226db7b..c92cbbf 100644 --- a/ds9/parsers/shmlex.fcl +++ b/ds9/parsers/shmlex.fcl @@ -33,7 +33,7 @@ shm {return $SHM_} -shm {return $SHMCMD_} #include wcssys.fin -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/shmparser.tac b/ds9/parsers/shmparser.tac index 42ef5d1..3f85a71 100644 --- a/ds9/parsers/shmparser.tac +++ b/ds9/parsers/shmparser.tac @@ -2,7 +2,7 @@ %} #include wcssys.tin -#include numeric.tin +#include int.tin #include string.tin %start command @@ -34,7 +34,6 @@ %% #include wcssys.trl -#include numeric.trl # only called by xpa/samp command : shms diff --git a/ds9/parsers/threadslex.fcl b/ds9/parsers/threadslex.fcl index 49546a9..b8c7e72 100644 --- a/ds9/parsers/threadslex.fcl +++ b/ds9/parsers/threadslex.fcl @@ -7,7 +7,7 @@ %% -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/threadsparser.tac b/ds9/parsers/threadsparser.tac index fe013c9..f8b79e0 100644 --- a/ds9/parsers/threadsparser.tac +++ b/ds9/parsers/threadsparser.tac @@ -1,15 +1,13 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command %% -#include numeric.trl - command : threads | threads {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/tilelex.fcl b/ds9/parsers/tilelex.fcl index 11e5cd4..9eab720 100644 --- a/ds9/parsers/tilelex.fcl +++ b/ds9/parsers/tilelex.fcl @@ -18,7 +18,7 @@ mode {return $MODE_} row {return $ROW_} #include yesno.fin -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/tileparser.tac b/ds9/parsers/tileparser.tac index 486814d..ce1560c 100644 --- a/ds9/parsers/tileparser.tac +++ b/ds9/parsers/tileparser.tac @@ -2,7 +2,7 @@ %} #include yesno.tin -#include numeric.tin +#include int.tin #include string.tin %start command @@ -19,8 +19,7 @@ %% -#include yesno.trl -#include numeric.trl +#include yes-no.trl command : tile | tile {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/updatelex.fcl b/ds9/parsers/updatelex.fcl index 43e00b8..0055573 100644 --- a/ds9/parsers/updatelex.fcl +++ b/ds9/parsers/updatelex.fcl @@ -10,7 +10,7 @@ now {return $NOW_} #include yesno.fin -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/updateparser.tac b/ds9/parsers/updateparser.tac index bbfb015..74bb8aa 100644 --- a/ds9/parsers/updateparser.tac +++ b/ds9/parsers/updateparser.tac @@ -2,7 +2,7 @@ %} #include yesno.tin -#include numeric.tin +#include int.tin #include string.tin %start command @@ -12,7 +12,6 @@ %% #include yesno.trl -#include numeric.trl command : update | update {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/volex.fcl b/ds9/parsers/volex.fcl index 46ae40f..43cdbd1 100644 --- a/ds9/parsers/volex.fcl +++ b/ds9/parsers/volex.fcl @@ -19,7 +19,7 @@ server {return $SERVER_} xpa {return $XPA_} #include yesno.fin -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/voparser.tac b/ds9/parsers/voparser.tac index e448a37..d44c60c 100644 --- a/ds9/parsers/voparser.tac +++ b/ds9/parsers/voparser.tac @@ -2,7 +2,7 @@ %} #include yesno.tin -#include numeric.tin +#include int.tin #include string.tin %start command @@ -21,7 +21,6 @@ %% #include yesno.trl -#include numeric.trl command : vo | vo {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/wcslex.fcl b/ds9/parsers/wcslex.fcl index 6b82c28..af371bb 100644 --- a/ds9/parsers/wcslex.fcl +++ b/ds9/parsers/wcslex.fcl @@ -21,7 +21,7 @@ system {return $SYSTEM_} #include wcssys.fin #include skyframe.fin #include skyformat.fin -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/wcsparser.tac b/ds9/parsers/wcsparser.tac index 8b19526..7823907 100644 --- a/ds9/parsers/wcsparser.tac +++ b/ds9/parsers/wcsparser.tac @@ -5,7 +5,7 @@ #include wcssys.tin #include skyframe.tin #include skyformat.tin -#include numeric.tin +#include int.tin #include string.tin %start command @@ -26,7 +26,6 @@ #include wcssys.trl #include skyframe.trl #include skyformat.trl -#include numeric.trl command : wcs | wcs {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/weblex.fcl b/ds9/parsers/weblex.fcl index c25019b..092a45c 100644 --- a/ds9/parsers/weblex.fcl +++ b/ds9/parsers/weblex.fcl @@ -16,7 +16,7 @@ new {return $NEW_} reload {return $RELOAD_} stop {return $STOP_} -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/webparser.tac b/ds9/parsers/webparser.tac index 8939480..de5693b 100644 --- a/ds9/parsers/webparser.tac +++ b/ds9/parsers/webparser.tac @@ -1,7 +1,7 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command @@ -17,8 +17,6 @@ %% -#include numeric.trl - command : web | web {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/widthlex.fcl b/ds9/parsers/widthlex.fcl index 85a377e..0f61dcc 100644 --- a/ds9/parsers/widthlex.fcl +++ b/ds9/parsers/widthlex.fcl @@ -7,7 +7,7 @@ %% -#include numeric.fin +#include int.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/widthparser.tac b/ds9/parsers/widthparser.tac index 8fe7cfe..8504104 100644 --- a/ds9/parsers/widthparser.tac +++ b/ds9/parsers/widthparser.tac @@ -1,15 +1,13 @@ %{ %} -#include numeric.tin +#include int.tin #include string.tin %start command %% -#include numeric.trl - command : width | width {yyclearin; YYACCEPT} STRING_ ; diff --git a/ds9/parsers/xpafirstlex.fcl b/ds9/parsers/xpafirstlex.fcl index f5e609e..9f62c60 100644 --- a/ds9/parsers/xpafirstlex.fcl +++ b/ds9/parsers/xpafirstlex.fcl @@ -19,7 +19,6 @@ tcl {return $TCL_} unix {return $UNIX_} #include yesno.fin -#include numeric.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/xpafirstparser.tac b/ds9/parsers/xpafirstparser.tac index bdeca86..df0ce4b 100644 --- a/ds9/parsers/xpafirstparser.tac +++ b/ds9/parsers/xpafirstparser.tac @@ -2,7 +2,6 @@ %} #include yesno.tin -#include numeric.tin #include string.tin %start command @@ -20,7 +19,6 @@ %% #include yesno.trl -#include numeric.trl command : xpa | xpa {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/xpalex.fcl b/ds9/parsers/xpalex.fcl index f5e609e..9f62c60 100644 --- a/ds9/parsers/xpalex.fcl +++ b/ds9/parsers/xpalex.fcl @@ -19,7 +19,6 @@ tcl {return $TCL_} unix {return $UNIX_} #include yesno.fin -#include numeric.fin #include string.fin #include ws.fin diff --git a/ds9/parsers/xpaparser.tac b/ds9/parsers/xpaparser.tac index 944a29f..ec5b1e7 100644 --- a/ds9/parsers/xpaparser.tac +++ b/ds9/parsers/xpaparser.tac @@ -2,7 +2,6 @@ %} #include yesno.tin -#include numeric.tin #include string.tin %start command @@ -20,7 +19,6 @@ %% #include yesno.trl -#include numeric.trl command : xpa | xpa {yyclearin; YYACCEPT} STRING_ diff --git a/ds9/parsers/yes-no.trl b/ds9/parsers/yes-no.trl new file mode 100644 index 0000000..6612fac --- /dev/null +++ b/ds9/parsers/yes-no.trl @@ -0,0 +1,9 @@ +yes : YES_ {set _ 1} + | ON_ {set _ 1} + | TRUE_ {set _ 1} + ; + +no : NO_ {set _ 0} + | OFF_ {set _ 0} + | FALSE_ {set _ 0} + ; diff --git a/ds9/parsers/yesno.trl b/ds9/parsers/yesno.trl index 4827a5a..4855f6a 100644 --- a/ds9/parsers/yesno.trl +++ b/ds9/parsers/yesno.trl @@ -6,13 +6,3 @@ yesno : {set _ 1} | OFF_ {set _ 0} | FALSE_ {set _ 0} ; - -yes : YES_ {set _ 1} - | ON_ {set _ 1} - | TRUE_ {set _ 1} - ; - -no : NO_ {set _ 0} - | OFF_ {set _ 0} - | FALSE_ {set _ 0} - ; -- cgit v0.12