From 01307f5ba4af2d661fa7677cd407c0cdcde66846 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Fri, 14 Jul 2017 11:05:39 -0400
Subject: update parser

---
 ds9/library/lex.fcl    | 4 ++--
 ds9/library/parser.tac | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ds9/library/lex.fcl b/ds9/library/lex.fcl
index fb5aa30..dcf10f5 100644
--- a/ds9/library/lex.fcl
+++ b/ds9/library/lex.fcl
@@ -37,8 +37,8 @@ E   [Ee][+-]?{D}+
 -fits	    {return $::FITSCMD_}
 -frame	    {return $::FRAMECMD_}
 -green	    {return $::GREENCMD_}
--help	    {return $::HELPCMD_}
 -height	    {return $::HEIGHTCMD_}
+-help	    {return $::HELPCMD_}
 -histequ    {return $::HISTEQUCMD_}
 -iconify    {return $::ICONIFYCMD_}
 -irafalign  {return $::IRAFALIGNCMD_}
@@ -230,7 +230,7 @@ true	    {return $::TRUE_}
 update	    {return $::UPDATE_}
 user	    {return $::USER_}
 view	    {return $::VIEW_}
-vp    	    {return $::VIEW_}
+vp    	    {return $::VP_}
 wcs	    {return $::WCS_}
 wcsa	    {return $::WCSA_}
 wcsb	    {return $::WCSB_}
diff --git a/ds9/library/parser.tac b/ds9/library/parser.tac
index 5a08f94..8040a03 100644
--- a/ds9/library/parser.tac
+++ b/ds9/library/parser.tac
@@ -222,6 +222,7 @@ set file(load) 0
 %token UPDATE_
 %token USER_
 %token VIEW_
+%token VP_
 %token WCS_
 %token WCSA_
 %token WCSB_
@@ -495,7 +496,8 @@ mosaicType : IRAF_ {set _ iraf}
  ;
 
 3d : {Create3DFrame}
- | VIEW_ numeric numeric {global threed; set threed(az) $2; set threed(el) $3; 3DViewPoint}
+ | VIEW_ 3dView
+ | VP_ 3dView
  | AZIMUTH_ numeric {global threed; set threed(az) $2; 3DViewPoint}
  | ELEVATION_ numeric {global threed; set threed(el) $2; 3DViewPoint}
  | SCALE_ numeric {global threed; set threed(scale) $2; 3DScale}
@@ -508,6 +510,9 @@ mosaicType : IRAF_ {set _ iraf}
  | CLOSE_ {3DDestroyDialog}
  ;
 
+3dView : numeric numeric {global threed; set threed(az) $1; set threed(el) $2; 3DViewPoint}
+ ;
+
 3dMethod : MIP_ {set _ mip}
  | AIP_ {set _ aip}
  ;
-- 
cgit v0.12