octave-nkf: libinterp/corefcn/load-path.cc comparison

comparison libinterp/corefcn/load-path.cc @ 17856:97e49b588f5d classdef

maint: periodic merge of default to classdef

author	John W. Eaton <jwe@octave.org>
date	Tue, 05 Nov 2013 12:27:42 -0500
parents	93b3d03b05e7 175b392e91fe
children	181bbce78595

comparison

equal deleted inserted replaced

-:c4f5c781c3ca
+:97e49b588f5d
 // avoid unnecessary calls to stat that can slow
 // things down tremendously for large directories.
 const dir_info& di = p->second;
-if (fs.mtime () + fs.time_resolution () > di.dir_time_last_checked)
+if (fs.mtime () + fs.time_resolution ()
+> di.dir_time_last_checked)
 initialize ();
 else
 *this = di;
 }
 else
 try
 {
 std::string abs_name = octave_env::make_absolute (dir_name);
-// FIXME -- nothing is ever removed from this cache of
+// FIXME: nothing is ever removed from this cache of
 // directory information, so there could be some resource
 // problems.  Perhaps it should be pruned from time to time.
 abs_dir_cache[abs_name] = *this;
 }
 }
 return retval;
 }
-// FIXME -- maybe we should also maintain a map to speed up this
+// FIXME: maybe we should also maintain a map to speed up this method of access.
-// method of access.
 load_path::const_dir_info_list_iterator
 load_path::find_dir_info (const std::string& dir_arg) const
 {
 std::string dir = file_ops::tilde_expand (dir_arg);
 if (file_info_list.size () == 1)
 continue;
 else
 {
 for (file_info_list_iterator p = file_info_list.begin ();
-p != file_info_list.end ();
+p != file_info_list.end (); p++)
-p++)
 {
 if (p->dir_name == full_dir_name)
 {
 file_info fi = *p;
 std::string msg = fs.error ();
 warning ("addpath: %s: %s", dir_arg.c_str (), msg.c_str ());
 }
 }
-// FIXME -- is there a better way to do this?
+// FIXME: is there a better way to do this?
 i = find_dir_info (".");
 if (i != dir_info_list.end ())
 do_move (i, false);
 if (file_info_list.size () == 1)
 continue;
 else
 {
 for (file_info_list_iterator p = file_info_list.begin ();
-p != file_info_list.end ();
+p != file_info_list.end (); p++)
-p++)
 {
 if (p->dir_name == full_dir_name)
 {
 file_info_list.erase (p);
-// FIXME -- if there are no other elements, we
+// FIXME: if there are no other elements, we
 // should remove this element of fm but calling
 // erase here would invalidate the iterator q.
 break;
 }
 }
 }
 }
 }
 done:
 if (! dir_name.empty ())
 retval = file_ops::concat (dir_name, file_name);
 return retval;
 }
 rel_flist.resize (rel_flen);
 for (const_dir_info_list_iterator p = dir_info_list.begin ();
-p != dir_info_list.end ();
+p != dir_info_list.end (); p++)
-p++)
 {
 string_vector all_files = p->all_files;
 octave_idx_type len = all_files.length ();
 for (octave_idx_type i = 0; i < len; i++)
 {
 for (octave_idx_type j = 0; j < rel_flen; j++)
 {
 if (all_files[i] == rel_flist[j])
-retlist.push_back
+retlist.push_back (file_ops::concat (p->dir_name,
-(file_ops::concat (p->dir_name, rel_flist[j]));
+rel_flist[j]));
 }
 }
 }
 return retlist;
 const dir_info::method_file_map_type& method_file_map
 = i->method_file_map;
 if (! method_file_map.empty ())
 {
-for (dir_info::const_method_file_map_iterator p = method_file_map.begin ();
+for (dir_info::const_method_file_map_iterator
-p != method_file_map.end ();
+p = method_file_map.begin (); p != method_file_map.end (); p++)
-p++)
 {
 os << "\n*** methods in " << i->dir_name
 << "/@" << p->first << ":\n\n";
 const dir_info::class_info& ci = p->second;
 // True if a path is contained in a path list separated by path_sep_char
 static bool
 in_path_list (const std::string& path_list, const std::string& path)
 {
-size_t ps = path.size (), pls = path_list.size (), pos = path_list.find (path);
+size_t ps = path.size ();
+size_t pls = path_list.size ();
+size_t pos = path_list.find (path);
 char psc = dir_path::path_sep_char ();
 while (pos != std::string::npos)
 {
 if ((pos == 0 || path_list[pos-1] == psc)
 && (pos + ps == pls || path_list[pos + ps] == psc))
 if (! file_info_list.empty ())
 {
 file_info& old = file_info_list.front ();
-// FIXME -- do we need to be more careful about the
+// FIXME: do we need to be more careful about the
 // way we look for old.dir_name in sys_path to avoid
 // partial matches?
 // Don't warn about Contents.m files since we expect
 // more than one to exist in the load path.
 else
 file_info_list.push_front (fi);
 }
 else
 {
-// FIXME -- is this possible?
+// FIXME: is this possible?
 file_info& fi = *p2;
 fi.types = types;
 }
 {
 execute_pkg_add_or_del (dir, "PKG_DEL");
 }
 DEFUN (genpath, args, ,
 "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} genpath (@var{dir})\n\
 @deftypefnx {Built-in Function} {} genpath (@var{dir}, @var{skip}, @dots{})\n\
 Return a path constructed from @var{dir} and all its subdirectories.\n\
 If additional string parameters are given, the resulting path will\n\
 exclude directories with those names.\n\
 static void
 rehash_internal (void)
 {
 load_path::update ();
-// FIXME -- maybe we should rename this variable since it is being
+// FIXME: maybe we should rename this variable since it is being
 // used for more than keeping track of the prompt time.
 // This will force updated functions to be found.
 Vlast_prompt_time.stamp ();
 }
 DEFUN (rehash, , ,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} rehash ()\n\
 Reinitialize Octave's load path directory cache.\n\
 @end deftypefn")
 {
 octave_value_list retval;
 return retval;
 }
 DEFUN (command_line_path, , ,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} command_line_path (@dots{})\n\
 Return the command line path variable.\n\
 \n\
 @seealso{path, addpath, rmpath, genpath, pathdef, savepath, pathsep}\n\
 @end deftypefn")
 {
 return octave_value (load_path::get_command_line_path ());
 }
 DEFUN (restoredefaultpath, , ,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} restoredefaultpath (@dots{})\n\
 Restore Octave's path to its initial state at startup.\n\
 \n\
 @seealso{path, addpath, rmpath, genpath, pathdef, savepath, pathsep}\n\
 @end deftypefn")
 // search for function files.  This corresponds to the path that
 // exists prior to running the system's octaverc file or the user's
 // ~/.octaverc file
 DEFUN (__pathorig__, , ,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {@var{val} =} __pathorig__ ()\n\
 Undocumented internal function.\n\
 @end deftypefn")
 {
 return octave_value (load_path::system_path ());
 }
 DEFUN (path, args, nargout,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} path (@dots{})\n\
 Modify or display Octave's load path.\n\
 \n\
 If @var{nargin} and @var{nargout} are zero, display the elements of\n\
 Octave's load path in an easy to read format.\n\
 if (nargout > 0)
 retval = load_path::path ();
 else if (argc == 1 && nargout == 0)
 {
-octave_stdout << "\nOctave's search path contains the following directories:\n\n";
+octave_stdout <<
+"\nOctave's search path contains the following directories:\n\n";
 string_vector dirs = load_path::dirs ();
 dirs.list_in_columns (octave_stdout);
 return retval;
 }
 DEFUN (addpath, args, nargout,
 "-*- texinfo -*-\n\
 @deftypefn  {Built-in Function} {} addpath (@var{dir1}, @dots{})\n\
 @deftypefnx {Built-in Function} {} addpath (@var{dir1}, @dots{}, @var{option})\n\
 Add named directories to the function search path.  If\n\
 @var{option} is @qcode{\"-begin\"} or 0 (the default), prepend the\n\
 directory name to the current path.  If @var{option} is @qcode{\"-end\"}\n\
 return retval;
 }
 DEFUN (rmpath, args, nargout,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} rmpath (@var{dir1}, @dots{})\n\
 Remove @var{dir1}, @dots{} from the current function search path.\n\
 \n\
 In addition to accepting individual directory arguments, lists of\n\
 directory names separated by @code{pathsep} are also accepted.  For example:\n\

Mercurial > octave-nkf

comparison libinterp/corefcn/load-path.cc @ 17856:97e49b588f5d classdef