Mercurial > hg > octave-terminal
changeset 4215:bc6059c5ddc7
[project @ 2002-12-04 05:21:08 by jwe]
author | jwe |
---|---|
date | Wed, 04 Dec 2002 05:21:08 +0000 |
parents | b9317f3973ec |
children | e613ffa9f0e6 |
files | doc/ChangeLog doc/interpreter/Makefile.in doc/interpreter/Map-s.cc doc/interpreter/munge-texi.cc src/ChangeLog src/Makefile.in src/TEMPLATE-INST/Map-fnc.cc src/TEMPLATE-INST/Map-tc.cc src/fn-cache.cc src/fn-cache.h |
diffstat | 10 files changed, 31 insertions(+), 164 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,16 @@ +2002-12-03 John W. Eaton <jwe@bevo.che.wisc.edu> + + * interpreter/Makefile.in (%.o : %.c): No longer need + -DNO_PRAGMA_INTERFACE_IMPLEMENTATION=1 compiler option. + (munge-texi#(BUILD_EXEEXT)): Likewise. + Don't link to Map-s.o. + + * interpreter/Map-s.cc: Delete. + * interpreter/Makefile.in (DISTFILES): Delete it from the list. + (mostlyclean, clean): Don't delete Map-s.o. + + * interpreter/munge-texi.cc: Require working STL. + 2002-11-24 John W. Eaton <jwe@bevo.che.wisc.edu> * interpreter/Makefile.in (maintainer-clean): Depend on
--- a/doc/interpreter/Makefile.in +++ b/doc/interpreter/Makefile.in @@ -42,7 +42,7 @@ MAN_BASE := mkoctfile octave octave-bug MAN_SRC := $(addsuffix .1, $(MAN_BASE)) -DISTFILES = Makefile.in dir munge-texi.cc Map-s.cc $(MAN_SRC) \ +DISTFILES = Makefile.in dir munge-texi.cc $(MAN_SRC) \ $(SOURCES) $(TEXINFO) $(FORMATTED) ifeq ($(wildcard octave.info), ) @@ -69,10 +69,10 @@ $(TEXINFO): src-DOCSTRINGS scripts-DOCSTRINGS munge-texi$(BUILD_EXEEXT) %.o : %.cc - $(BUILD_CXX) -DNO_PRAGMA_INTERFACE_IMPLEMENTATION=1 -c $(INCFLAGS) -DHAVE_CONFIG_H $< -o $@ + $(BUILD_CXX) -c $(INCFLAGS) -DHAVE_CONFIG_H $< -o $@ -munge-texi$(BUILD_EXEEXT): munge-texi.o Map-s.o - $(BUILD_CXX) -DNO_PRAGMA_INTERFACE_IMPLEMENTATION=1 -o $@ $^ +munge-texi$(BUILD_EXEEXT): munge-texi.o + $(BUILD_CXX) -o $@ $^ src-DOCSTRINGS: $(MAKE) -C ../../src DOCSTRINGS @@ -183,7 +183,7 @@ octave.cps octave.fns octave.ins octave.kys octave.ops \ octave.pgs octave.rds octave.tps octave.vrs octave.aux \ octave.log octave.toc \ - munge-texi$(BUILD_EXEEXT) munge-texi.o Map-s.o + munge-texi$(BUILD_EXEEXT) munge-texi.o .PHONY: mostlyclean clean distclean: clean
deleted file mode 100644 --- a/doc/interpreter/Map-s.cc +++ /dev/null @@ -1,40 +0,0 @@ -/* - -Copyright (C) 1999 John W. Eaton - -This file is part of Octave. - -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -// Instantiate Maps of strings. - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "Map.h" -#include "Map.cc" - -template class Map<std::string>; -template class CHNode<std::string>; -template class CHMap<std::string>; - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/
--- a/doc/interpreter/munge-texi.cc +++ b/doc/interpreter/munge-texi.cc @@ -24,28 +24,12 @@ #include <iostream> #include <fstream> #include <string> +#include <map> static const char doc_delim = ''; -// If this fails to compile and link for you, delete the following -// define to use old non-standard GNU libg++ Map class. - -#define USE_STL - -#if defined (USE_STL) - -#include <map> - static std::map<std::string, std::string> help_text; -#else - -#include "Map.h" - -static CHMap<std::string> help_text = CHMap<std::string> (std::string ()); - -#endif - static void fatal (const std::string& msg) { @@ -104,11 +88,7 @@ { std::string doc_string = extract_docstring (infile); -#if defined (USE_STL) if (help_text.find (symbol_name) != help_text.end ()) -#else - if (help_text.contains (symbol_name)) -#endif std::cerr << "ignoring duplicate entry for " << symbol_name << "\n"; else
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,11 @@ 2002-12-03 John W. Eaton <jwe@bevo.che.wisc.edu> + * TEMPLATE-INST/Map-tc.cc, TEMPLATE-INST/Map-fnc.cc: Delete. + * Makefile.in (TI_XSRC): Delete them from the list. + + * fn-cache.h (octave_fcn_file_name_cache::cache): Now std::map, + not CHMap. + * TEMPLATE-INST/SLStack-i.cc, TEMPLATE-INST/SLStack-ovl.cc, TEMPLATE-INST/SLStack-pc.cc, TEMPLATE-INST/SLStack-str.cc, TEMPLATE-INST/SLStack-sym.cc, TEMPLATE-INST/SLStack-tok.cc,
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -90,9 +90,8 @@ siglist.h symtab.h sysdep.h token.h toplev.h unwind-prot.h utils.h \ variables.h version.h xdiv.h xpow.h $(OV_INCLUDES) $(PT_INCLUDES) -TI_XSRC := Array-oc.cc Array-os.cc Array-sym.cc Array-tc.cc Map-fnc.cc \ - Map-oct-obj.cc Map-tc.cc SLList-expr.cc SLList-misc.cc \ - SLList-plot.cc SLList-tc.cc SLList-tm.cc +TI_XSRC := Array-oc.cc Array-os.cc Array-sym.cc Array-tc.cc Map-oct-obj.cc \ + SLList-expr.cc SLList-misc.cc SLList-plot.cc SLList-tc.cc SLList-tm.cc TI_SRC := $(addprefix TEMPLATE-INST/, $(TI_XSRC))
deleted file mode 100644 --- a/src/TEMPLATE-INST/Map-fnc.cc +++ /dev/null @@ -1,46 +0,0 @@ -/* - -Copyright (C) 1996, 1997 John W. Eaton - -This file is part of Octave. - -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -// Instantiate Maps of file_name_cache_elts. - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <string> - -#include "Map.h" -#include "Map.cc" - -#include "str-vec.h" - -#include "fn-cache.h" - -template class Map<file_name_cache_elt>; -template class CHNode<file_name_cache_elt>; -template class CHMap<file_name_cache_elt>; - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/
deleted file mode 100644 --- a/src/TEMPLATE-INST/Map-tc.cc +++ /dev/null @@ -1,42 +0,0 @@ -/* - -Copyright (C) 1996, 1997 John W. Eaton - -This file is part of Octave. - -Octave is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - -Octave is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with Octave; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -*/ - -// Instantiate Maps of octave_values. - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include "Map.h" -#include "Map.cc" - -#include "oct-obj.h" - -template class Map<octave_value>; -template class CHNode<octave_value>; -template class CHMap<octave_value>; - -/* -;;; Local Variables: *** -;;; mode: C++ *** -;;; End: *** -*/
--- a/src/fn-cache.cc +++ b/src/fn-cache.cc @@ -58,7 +58,7 @@ { std::string d = dirs[i]; - if (cache.contains (d)) + if (cache.find (d) != cache.end ()) { if (cache[d].update (d)) something_changed = true;
--- a/src/fn-cache.h +++ b/src/fn-cache.h @@ -24,8 +24,7 @@ #define octave_fn_cache_h 1 #include <string> - -#include "Map.h" +#include <map> #include "oct-time.h" @@ -89,9 +88,7 @@ { protected: - octave_fcn_file_name_cache (void) - : cache (file_name_cache_elt ()) - { update (std::string ()); } + octave_fcn_file_name_cache (void) : cache () { update (std::string ()); } public: @@ -116,7 +113,7 @@ // An associative array of all the directory names in the load path // and the corresponding cache elements. - CHMap<file_name_cache_elt> cache; + std::map<std::string, file_name_cache_elt> cache; string_vector do_list (const std::string& path, bool no_suffix); };