From 8aa4c8d87e045c9edeff9f8969535d97ca88db91 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Tue, 27 Feb 2018 11:36:10 -0500
Subject: backout ds9 parsers

---
 ds9/library/source.tcl     |  3 ---
 ds9/make.include           | 24 +----------------------
 ds9/parsers/zoomlex.fcl    | 49 ----------------------------------------------
 ds9/parsers/zoomparser.tac | 46 -------------------------------------------
 make.include               | 14 +------------
 5 files changed, 2 insertions(+), 134 deletions(-)
 delete mode 100644 ds9/parsers/zoomlex.fcl
 delete mode 100644 ds9/parsers/zoomparser.tac

diff --git a/ds9/library/source.tcl b/ds9/library/source.tcl
index bf947cc..48bd469 100644
--- a/ds9/library/source.tcl
+++ b/ds9/library/source.tcl
@@ -188,9 +188,6 @@ source $ds9(root)/library/xmfbox.tcl
 source $ds9(root)/library/xmlrpc.tcl
 source $ds9(root)/library/xpa.tcl
 
-#source $ds9(root)/library/zoomparser.tcl
-#source $ds9(root)/library/zoomlex.tcl
-
 switch [tk windowingsystem] {
     x11 {}
     aqua {source $ds9(root)/library/macosx.tcl}
diff --git a/ds9/make.include b/ds9/make.include
index f9a3fa2..c49aa53 100644
--- a/ds9/make.include
+++ b/ds9/make.include
@@ -1,20 +1,3 @@
-#--------------------------parsers
-
-parsers : zoomparser
-
-zoomparser : ../library/zoomparser.tcl ../library/zoomlex.tcl
-
-../library/zoomparser.tcl : ../parsers/zoomparser.tac
-	tclsh $(prefix)/taccle/taccle.tcl -p zoom -d -v -w $<
-	mv ../parsers/zoomparser*.tcl ../library/.
-
-../library/zoomlex.tcl : ../parsers/zoomlex.fcl
-	tclsh $(prefix)/fickle/fickle.tcl -P zoom $<
-	mv ../parsers/zoomlex.tcl ../library/.
-
-#%.tcl: %.fcl
-#%.tcl: %.tac
-
 #--------------------------framework
 
 $(LIBDIR)/library : $(prefix)/ds9/library/*.tcl
@@ -84,12 +67,7 @@ $(LIBDIR)/math	: $(prefix)/tcllib/modules/math
 
 .PHONY	: distclean
 
-distclean: clean parsersclean
+distclean: clean
 	-rm -f Makefile config.cache config.log config.status
 	-rm -rf autom4te.cache
 
-parsersclean:
-	-rm -f ../library/*.output ../library/*.tab.tcl
-	-rm -f ../library/zoomparser.tcl ../library/zoomlex.tcl
-	-rm -f ../parsers/*.output ../parsers/*.tcl
-
diff --git a/ds9/parsers/zoomlex.fcl b/ds9/parsers/zoomlex.fcl
deleted file mode 100644
index 79ff034..0000000
--- a/ds9/parsers/zoomlex.fcl
+++ /dev/null
@@ -1,49 +0,0 @@
-%{
-source $ds9(root)/library/zoomparser.tab.tcl
-%}
-
-%option noyywrap
-%option caseless
-%option nodefault
-%option nointeractive
-#%option stack
-%option yylineno
-#%option debug
-
-D   [0-9]
-E   [Ee][+-]?{D}+
-
-%%
-
-close	    {return $zoom::CLOSE_}
-in	    {return $zoom::IN_}
-fit	    {return $zoom::FIT_}
-open	    {return $zoom::OPEN_}
-out	    {return $zoom::OUT_}
-to	    {return $zoom::TO_}
-
-# INT
-[+-]?{D}+ {set zoom::yylval $yytext; return $zoom::INT_}
-
-# REAL
-[+-]?{D}+"."?({E})? |
-[+-]?{D}*"."{D}+({E})? {set zoom::yylval $yytext; return $zoom::REAL_}
-
-# Quoted STRING
-\"[^\"]*\" {set zoom::yylval [string range $yytext 1 end-1]; return $zoom::STRING_}
-
-# Quoted STRING
-\'[^\']*\' {set zoom::yylval [string range $yytext 1 end-1]; return $zoom::STRING_}
-
-# Quoted STRING
-\{[^\}]*\} {set zoom::yylval [string range $yytext 1 end-1]; return $zoom::STRING_}
-
-# STRING
-\S+\S+ {set zoom::yylval $yytext; return $zoom::STRING_}
-
-\s        # ignore whitespace
-
-.	  {set zoom::yylval $yytext; return $zoom::yylval}
-
-%%
-
diff --git a/ds9/parsers/zoomparser.tac b/ds9/parsers/zoomparser.tac
deleted file mode 100644
index 16d7ade..0000000
--- a/ds9/parsers/zoomparser.tac
+++ /dev/null
@@ -1,46 +0,0 @@
-%{
-%}
-
-%token INT_
-%token REAL_
-%token STRING_
-
-%start command
-
-%token CLOSE_
-%token IN_
-%token FIT_
-%token OPEN_
-%token OUT_
-%token TO_
-
-%%
-
-command : {ProcessRealizeDS9} zoom
- ;
-
-zoom : numeric {Zoom $1 $1}
- | numeric numeric {Zoom $1 $2}
- | OPEN_ {PanZoomDialog}
- | CLOSE_ {PanZoomDestroyDialog}
- | IN_ {Zoom 2 2}
- | OUT_ {Zoom .5 .5}
- | TO_ zoomTo
- ;
-
-zoomTo: FIT_ {ZoomToFit}
- | numeric {global zoom; set current(zoom) " $1 $1 "; ChangeZoom}
- | numeric numeric {global zoom; set current(zoom) " $1 $2 "; ChangeZoom}
- ;
-
-numeric	: INT_ {set _ $1}
- | REAL_ {set _ $1}
- ;
-
-%%
-
-proc zoom::yyerror {msg} {
-     puts stderr "$msg:"
-     puts stderr "$zoom::yy_current_buffer"
-     puts stderr [format "%*s" $zoom::index_ ^]
-}
diff --git a/make.include b/make.include
index 5c0336c..81b7e26 100644
--- a/make.include
+++ b/make.include
@@ -406,13 +406,6 @@ tktable/Makefile :
 	$(STD) \
 	$(CACHE)
 
-#-------------------------- ds9parsers
-
-ds9parsers :
-	@echo ""
-	@echo "*** $@ ***"
-	$(MAKE) -C ds9/$(OS) parsers
-
 #-------------------------- language
 
 .PHONY	: language
@@ -440,7 +433,7 @@ scrub :
 #-------------------------- clean
 
 .PHONY	: clean
-.PHONY	: dirsclean ds9clean ds9parsersclean localclean
+.PHONY	: dirsclean ds9clean localclean
 .PHONY	: tcliisclean tclsignalclean 
 .PHONY	: tclxmlclean tclzvfsclean tlsclean
 .PHONY	: tkbltclean tkconclean tkhtml1clean tkimgclean
@@ -464,11 +457,6 @@ ds9clean :
 	@echo "*** $@ ***"
 	$(MAKE) -C ds9/$(OS) clean
 
-ds9parsersclean :
-	@echo ""
-	@echo "*** $@ ***"
-	$(MAKE) -C ds9/$(OS) parsersclean
-
 localclean :
 	@echo ""
 	@echo "*** $@ ***"
-- 
cgit v0.12

