diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-03-28 16:39:53 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-03-28 16:39:53 (GMT) |
| commit | ef45c9f49f99dc783c8535898104c56205eb2e76 (patch) | |
| tree | 62232c3330ca174342a2e58cbb8641333b469a50 /ds9 | |
| parent | 142f393855c3a2046c5df13badae0e4bed98e84f (diff) | |
| download | blt-ef45c9f49f99dc783c8535898104c56205eb2e76.zip blt-ef45c9f49f99dc783c8535898104c56205eb2e76.tar.gz blt-ef45c9f49f99dc783c8535898104c56205eb2e76.tar.bz2 | |
add ds9 cataog parser
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/parsers/catlex.fcl | 1 | ||||
| -rw-r--r-- | ds9/parsers/catparser.tac | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ds9/parsers/catlex.fcl b/ds9/parsers/catlex.fcl index 89d831e..8951fe8 100644 --- a/ds9/parsers/catlex.fcl +++ b/ds9/parsers/catlex.fcl @@ -50,6 +50,7 @@ location {return $LOCATION_} match {return $MATCH_} maxrows {return $MAXROWS_} name {return $NAME_} +new {return $NEW_} panto {return $PANTO_} plot {return $PLOT_} point {return $POINT_} diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac index de6c7fa..42d65b9 100644 --- a/ds9/parsers/catparser.tac +++ b/ds9/parsers/catparser.tac @@ -54,6 +54,7 @@ %token MATCH_ %token MAXROWS_ %token NAME_ +%token NEW_ %token PANTO_ %token PLOT_ %token POINT_ @@ -112,6 +113,7 @@ command : catalog ; catalog : {CATTool} + | NEW_ {CATTool} | FILE_ STRING_ {CatalogCmdLoad $2 VOTRead} | LOAD_ STRING_ {CatalogCmdLoad $2 VOTRead} | IMPORT_ reader STRING_ {CatalogCmdLoad $3 $2} @@ -181,7 +183,7 @@ match : {CatalogCmdMatch} | FUNCTION_ matchFunction {CatalogCmdIcat function $2} | UNIQUE_ yesno {CatalogCmdIcat unique $2} | RETURN_ matchReturn {CatalogCmdIcat return $2} - | STRING_ STRING_ {CatalogCmdMatchParams $1 $2} + | STRING_ STRING_ {CatalogCmdMatchParams "cat$1" "cat$2"} ; matchFunction : 1AND2_ {set _ 1and2} |