Mercurial > hg > octave-nkf
changeset 2370:a45c7d64b5e3
[project @ 1996-10-11 23:51:15 by jwe]
author | jwe |
---|---|
date | Fri, 11 Oct 1996 23:55:30 +0000 |
parents | 5ece30fb2af6 |
children | dd29ab8af9e7 |
files | src/Array-tc.cc src/Map-tc.cc src/SLList-misc.cc src/SLList-tc.cc src/dynamic-ld.cc src/error.cc src/file-io.cc src/fn-cache.cc src/fn-cache.h src/sysdep.cc src/toplev.cc |
diffstat | 11 files changed, 29 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Array-tc.cc +++ b/src/Array-tc.cc @@ -29,7 +29,7 @@ #include "Array.h" #include "Array.cc" -#include "pt-const.h" +#include "ov.h" extern template class Array<int>; extern template class Array2<int>;
--- a/src/Map-tc.cc +++ b/src/Map-tc.cc @@ -25,7 +25,7 @@ #include "Map.h" #include "Map.cc" -#include "pt-const.h" +#include "ov.h" template class Map<octave_value>; template class CHNode<octave_value>;
--- a/src/SLList-misc.cc +++ b/src/SLList-misc.cc @@ -29,7 +29,7 @@ #include <SLList.h> #include "pt-exp.h" -#include "pt-const.h" +#include "ov.h" #include "pt-misc.h" template class SLNode<tree_statement *>;
--- a/src/SLList-tc.cc +++ b/src/SLList-tc.cc @@ -28,7 +28,7 @@ #include <SLList.h> -#include "pt-const.h" +#include "ov.h" template class SLNode<octave_value>; template class SLList<octave_value>;
--- a/src/dynamic-ld.cc +++ b/src/dynamic-ld.cc @@ -49,7 +49,7 @@ #include "error.h" #include "toplev.h" #include "pathsearch.h" -#include "pt-const.h" +#include "ov.h" #include "utils.h" #include "variables.h"
--- a/src/error.cc +++ b/src/error.cc @@ -34,9 +34,10 @@ #include "defun.h" #include "error.h" #include "pager.h" -#include "pt-const.h" #include "oct-obj.h" #include "utils.h" +#include "ov.h" +#include "variables.h" // TRUE means that Octave will try to beep obnoxiously before printing // error messages.
--- a/src/file-io.cc +++ b/src/file-io.cc @@ -63,6 +63,7 @@ #include "sysdep.h" #include "syswait.h" #include "utils.h" +#include "variables.h" void initialize_file_io (void)
--- a/src/fn-cache.cc +++ b/src/fn-cache.cc @@ -73,6 +73,22 @@ return something_changed; } +string_vector +octave_fcn_file_name_cache::list (const string& path, bool no_suffix) +{ + string_vector retval; + + if (! instance) + instance = new octave_fcn_file_name_cache (); + + if (instance) + retval = instance->do_list (path, no_suffix); + else + panic_impossible (); + + return retval; +} + // Check to see if any of the elements in the cache need to be // updated, then return the list of names in the cache. @@ -148,22 +164,6 @@ return no_suffix ? fcn_file_names_no_suffix : fcn_file_names; } -string_vector -octave_fcn_file_name_cache::list (const string& path, bool no_suffix) -{ - string_vector retval; - - if (! instance) - instance = new octave_fcn_file_name_cache (); - - if (instance) - retval = instance->do_list (path, no_suffix); - else - panic_impossible (); - - return retval; -} - // Create a list of the function names in a given directory. Returns // TRUE if the cache element was out of date.
--- a/src/fn-cache.h +++ b/src/fn-cache.h @@ -106,7 +106,7 @@ private: - static octave_fcn_file_name_cache *instance; + static octave_fcn_file_name_cache* instance; // An associative array of all the directory names in the load path // and the corresponding cache elements.
--- a/src/sysdep.cc +++ b/src/sysdep.cc @@ -81,7 +81,7 @@ #include "mappers.h" #include "oct-obj.h" #include "pathlen.h" -#include "pt-const.h" +#include "ov.h" #include "sysdep.h" #include "toplev.h" #include "utils.h"
--- a/src/toplev.cc +++ b/src/toplev.cc @@ -43,6 +43,7 @@ #endif #include "lo-error.h" +#include "lo-mappers.h" #include "str-vec.h" #include "builtins.h" @@ -61,7 +62,8 @@ #include "parse.h" #include "pathsearch.h" #include "procstream.h" -#include "pt-const.h" +#include "ov.h" +#include "pt-fvc.h" #include "pt-misc.h" #include "pt-plot.h" #include "sighandlers.h"