diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-06-07 19:17:06 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-06-07 19:17:06 (GMT) |
| commit | 9eed977cd4c532f17151bc8ad9275698b977a605 (patch) | |
| tree | 98e0faeb328166362db3f0f22a8bfa849446f217 /ds9/parsers | |
| parent | 75d81565076d3bab3e92a10c8e04fd949faaea90 (diff) | |
| download | blt-9eed977cd4c532f17151bc8ad9275698b977a605.zip blt-9eed977cd4c532f17151bc8ad9275698b977a605.tar.gz blt-9eed977cd4c532f17151bc8ad9275698b977a605.tar.bz2 | |
update ds9 parsers
Diffstat (limited to 'ds9/parsers')
| -rw-r--r-- | ds9/parsers/nreslex.fcl | 5 | ||||
| -rw-r--r-- | ds9/parsers/nresparser.tac | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/ds9/parsers/nreslex.fcl b/ds9/parsers/nreslex.fcl index bd8aad9..a21cd7a 100644 --- a/ds9/parsers/nreslex.fcl +++ b/ds9/parsers/nreslex.fcl @@ -22,8 +22,9 @@ simbad-cds {return $SIMBADCDS_} vizier-sao {return $VIZIERSAO_} vizier-cds {return $VIZIERCDS_} -#include coords.fin -#include numeric.fin +degrees {return $DEGREES_} +sexagesimal {return $SEXAGESIMAL_} + #include string.fin %% diff --git a/ds9/parsers/nresparser.tac b/ds9/parsers/nresparser.tac index 7bf80b4..f5728a1 100644 --- a/ds9/parsers/nresparser.tac +++ b/ds9/parsers/nresparser.tac @@ -1,8 +1,6 @@ %{ %} -#include coords.tin -#include numeric.tin #include string.tin %start command @@ -22,10 +20,10 @@ %token VIZIERSAO_ %token VIZIERCDS_ -%% +%token DEGREES_ +%token SEXAGESIMAL_ -#include coords.trl -#include numeric.trl +%% command : nres | nres {yyclearin; YYACCEPT} STRING_ @@ -41,6 +39,10 @@ nres : OPEN_ | STRING_ {ProcessCmdSet dnres name $1 "NRESApply dnres 1"} ; +skyformat : DEGREES_ {set _ degrees} + | SEXAGESIMAL_ {set _ sexagesimal} + ; + server : NEDSAO_ {set _ ned-sao} | NEDCDS_ {set _ ned-cds} | SIMBADSAO_ {set _ simbad-sao} |