diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-02-26 21:49:38 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-02-26 21:49:38 (GMT) |
| commit | 675120595dcaf84e838665df8f69dc4f0073dfb9 (patch) | |
| tree | bb7b279aaa4a54aab01f06ea4d6db826317bc449 /ds9 | |
| parent | 008b58aed410034000a2398ef97e93ea8d5eb549 (diff) | |
| download | blt-675120595dcaf84e838665df8f69dc4f0073dfb9.zip blt-675120595dcaf84e838665df8f69dc4f0073dfb9.tar.gz blt-675120595dcaf84e838665df8f69dc4f0073dfb9.tar.bz2 | |
update ds9 parsers
Diffstat (limited to 'ds9')
| -rw-r--r-- | ds9/library/command.tcl | 11 | ||||
| -rw-r--r-- | ds9/library/source.tcl | 4 | ||||
| -rw-r--r-- | ds9/make.include | 16 | ||||
| -rw-r--r-- | ds9/unix/Makefile.in | 1 |
4 files changed, 17 insertions, 15 deletions
diff --git a/ds9/library/command.tcl b/ds9/library/command.tcl index 216e966..20afa4b 100644 --- a/ds9/library/command.tcl +++ b/ds9/library/command.tcl @@ -452,18 +452,13 @@ proc ProcessCommand {argv argc} { -zmax {set scale(mode) zmax; ChangeScaleMode} -zoom { incr i; -# ProcessZoomCmd argv i + ProcessZoomCmd argv i - if {1} { - puts "***b: $i [lrange $argv $i end]***" - puts "start: $i out of $argc" + if {0} { zoom::YY_FLUSH_BUFFER zoom::yy_scan_string [lrange $argv $i end] zoom::yyparse - puts "found $zoom::yycnt" - set cnt [expr $zoom::yycnt-1] - incr i $cnt - puts "***a: $i [lrange $argv $i end]***" + incr i [expr $zoom::yycnt-1] } } diff --git a/ds9/library/source.tcl b/ds9/library/source.tcl index feba385..bf947cc 100644 --- a/ds9/library/source.tcl +++ b/ds9/library/source.tcl @@ -188,8 +188,8 @@ 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 +#source $ds9(root)/library/zoomparser.tcl +#source $ds9(root)/library/zoomlex.tcl switch [tk windowingsystem] { x11 {} diff --git a/ds9/make.include b/ds9/make.include index 4264fdc..f9a3fa2 100644 --- a/ds9/make.include +++ b/ds9/make.include @@ -1,12 +1,19 @@ -#--------------------------parser +#--------------------------parsers + +parsers : zoomparser -libparsers : zoomparser zoomparser : ../library/zoomparser.tcl ../library/zoomlex.tcl -../library/zoomparser.tcl : ../library/zoomparser.tac +../library/zoomparser.tcl : ../parsers/zoomparser.tac tclsh $(prefix)/taccle/taccle.tcl -p zoom -d -v -w $< -../library/zoomlex.tcl : ../library/zoomlex.fcl + 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 @@ -84,4 +91,5 @@ distclean: clean parsersclean 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/unix/Makefile.in b/ds9/unix/Makefile.in index 18e0aa7..a2841bd 100644 --- a/ds9/unix/Makefile.in +++ b/ds9/unix/Makefile.in @@ -120,7 +120,6 @@ PREQS = \ $(LIBDIR)/tcl$(TCL_VERSION) \ $(LIBDIR)/tcl8 \ $(LIBDIR)/tk$(TCL_VERSION) \ - libparsers \ $(LIBDIR)/library \ $(LIBDIR)/msgs \ $(LIBDIR)/doc \ |