# HG changeset patch # User jwe # Date 940548279 0 # Node ID 27502f8b3ba75a8b1e51e7186b42af8511ec1e35 # Parent 2396decd33de4b8c1a3c6545bcadec9f68af8e8a [project @ 1999-10-21 23:24:38 by jwe] diff --git a/doc/interpreter/Makefile.in b/doc/interpreter/Makefile.in --- a/doc/interpreter/Makefile.in +++ b/doc/interpreter/Makefile.in @@ -40,7 +40,7 @@ FORMATTED = octave.dvi octave.ps octave.info octave.info-[0-9]* octave_*.html -DISTFILES = Makefile.in dir munge-texi.cc octave.1 \ +DISTFILES = Makefile.in dir munge-texi.cc Map-s.cc octave.1 \ $(SOURCES) $(TEXINFO) $(FORMATTED) ifeq ($(wildcard octave.info), ) @@ -68,6 +68,9 @@ $(TEXINFO): $(DOCSTRINGS) munge-texi +munge-texi: munge-texi.o Map-s.o + $(CXX) $(CPPFLAGS) $(ALL_CXXFLAGS) $(ALL_LDFLAGS) -o $@ $^ + # Kluge: if the DOCSTRING files are present, assume they are current. $(DOCSTRINGS): $(MAKE) -C $(dir $@) $(notdir $@) diff --git a/doc/interpreter/Map-s.cc b/doc/interpreter/Map-s.cc new file mode 100644 --- /dev/null +++ b/doc/interpreter/Map-s.cc @@ -0,0 +1,43 @@ +/* + +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 +#endif + +#include "Map.h" +#include "Map.cc" + +template class Map; +template class CHNode; +template class CHMap; + +template static int goodCHptr (CHNode *t); +template static unsigned int CHptr_to_index (CHNode *t); + +/* +;;; Local Variables: *** +;;; mode: C++ *** +;;; End: *** +*/ diff --git a/doc/interpreter/munge-texi.cc b/doc/interpreter/munge-texi.cc --- a/doc/interpreter/munge-texi.cc +++ b/doc/interpreter/munge-texi.cc @@ -1,12 +1,37 @@ +/* + +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. + +*/ + #include #include #include #include -#include + +// Someday, I hope that standard template library stuff will just +// work. Until then... +#include "Map.h" static const char doc_delim = ''; -static map help_text; +static CHMap help_text = CHMap (string ()); static void fatal (const string& msg) @@ -66,7 +91,7 @@ { string doc_string = extract_docstring (infile); - if (help_text.find (symbol_name) != help_text.end ()) + if (help_text.contains (symbol_name)) cerr << "ignoring duplicate entry for " << symbol_name << "\n"; else help_text[symbol_name] = doc_string; @@ -177,3 +202,9 @@ return 0; } + +/* +;;; Local Variables: *** +;;; mode: C++ *** +;;; End: *** +*/