From d9c990f6cbb098e1e43ca0e1414597ef869a3cf0 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Tue, 18 Jul 2017 14:55:46 -0400
Subject: update parser

---
 ds9/library/cat.tcl    |  5 +++++
 ds9/library/lex.fcl    |  1 +
 ds9/library/parser.tac | 14 +++++++++-----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ds9/library/cat.tcl b/ds9/library/cat.tcl
index 89b25f2..0bd1961 100644
--- a/ds9/library/cat.tcl
+++ b/ds9/library/cat.tcl
@@ -1253,6 +1253,11 @@ proc CatalogRefCmd {ref} {
     global icat
     global cvarname
 
+    # backward compatibility
+    if {$ref == "cxc"} {
+	set ref csc
+    }
+
     # look for reference in current list
     if {[lsearch $icat(cats) cat${ref}] < 0} {
 	# see if its from our list of cats
diff --git a/ds9/library/lex.fcl b/ds9/library/lex.fcl
index c10aacc..46daafd 100644
--- a/ds9/library/lex.fcl
+++ b/ds9/library/lex.fcl
@@ -128,6 +128,7 @@ broadcast   {return $::BROADCAST_}
 buffersize  {return $::BUFFERSIZE_}
 cancel	    {return $::CANCEL_}
 catalog	    {return $::CATALOG_}
+cds	    {return $::CDS_}
 center	    {return $::CENTER_}
 channel	    {return $::CHANNEL_}
 circle	    {return $::CIRCLE_}
diff --git a/ds9/library/parser.tac b/ds9/library/parser.tac
index 8c43e9e..fe18993 100644
--- a/ds9/library/parser.tac
+++ b/ds9/library/parser.tac
@@ -134,6 +134,7 @@ set cvarname {}
 %token CANCEL_
 %token CATALOG_
 %token CENTER_
+%token CDS_
 %token CHANNEL_
 %token CIRCLE_
 %token CLEAR_
@@ -712,11 +713,13 @@ catalog : {CATTool}
  | FILE_ catLoad
  | IMPORT_ catLoad
  | STRING_ {CatalogRefCmd $1} cat
+ # backward compatibility
+ | CDS_ STRING_ {CatalogRefCmd $2} cat
  | cat
  ;
 
-catLoad: catLoadReader STRING_ {global icats; CATDialog cattool {} {} {} none; CATLoadFn [lindex $icat(cats) end] $2 $1; FileLast catfbox $2}
- | STRING_ {global icats; CATDialog cattool {} {} {} none; CATLoadFn [lindex $icat(cats) end] $1 VOTRead; FileLast catfbox $1}
+catLoad: catLoadReader STRING_ {global icat; CATDialog cattool {} {} {} none; CATLoadFn [lindex $icat(cats) end] $2 $1; FileLast catfbox $2}
+ | STRING_ {global icat; CATDialog cattool {} {} {} none; CATLoadFn [lindex $icat(cats) end] $1 VOTRead; FileLast catfbox $1}
  ;
 
 catLoadReader : XML_ {set _ VOTRead}
@@ -759,8 +762,8 @@ cat :
  | SKY_ skyframe {global cvarname; global $cvarname; set ${cvarname}(sky) $1; CoordMenuButtonCmd $cvarname system sky [list CATWCSMenuUpdate $cvarname]}
  | SKYFORMAT_ skyformat {global cvarname; global $cvarname; set ${cvarname}(skyformat) $2}
  | SORT_ catSort
- | SYMBOL_ {global cvarname; global $cvarname; set $cvarname(row) 1} catSymbol
- | SYMBOL_ int {global cvarname; global $cvarname; set $cvarname(row) $2} catSymbol
+ | SYMBOL_ {global cvarname; global $cvarname; set ${cvarname}(row) 1} catSymbol
+ | SYMBOL_ int {global cvarname; global $cvarname; set ${cvarname}(row) $2} catSymbol
  | SYSTEM_ wcssys {global cvarname; global $cvarname; set ${cvarname}(system) $1; CoordMenuButtonCmd $cvarname system sky [list CATWCSMenuUpdate $cvarname]}
  | UPDATE_ {global cvarname; CATUpdate $cvarname}
  | X_ STRING_ {global cvarname; global $cvarname; set ${cvarname}(colx) $2; CATGenerate $cvarname}
@@ -839,7 +842,8 @@ catSymbol : ADD_ {CatalogSymbolAddCmd}
  | UNITS_ STRING_ {global cvarname; global $cvarname; starbase_set ${cvarname}(symdb) ${cvarname}(row) [starbase_colnum ${cvarname}(symdb) units] $2; CATGenerate $cvarname}
  ;
 
-catSymbolShape : CIRCLE_ POINT_ {set _ "circle point"}
+catSymbolShape : POINT_ {set _ "circle point"}
+ | CIRCLE_ POINT_ {set _ "circle point"}
  | BOX_ POINT_ {set _ "box point"}
  | DIAMOND_ POINT_ {set _ "diamond point"}
  | CROSS_ POINT_ {set _ "cross point"}
-- 
cgit v0.12