octave-nkf: src/load-path.cc comparison

comparison src/load-path.cc @ 5867:b305874f50ef

[project @ 2006-06-28 22:11:51 by jwe]

author	jwe
date	Wed, 28 Jun 2006 22:11:51 +0000
parents	e884ab4f29ee
children	b9fd54407c8d

comparison

equal deleted inserted replaced

-:f9ac7ebf0e19
+:b305874f50ef
 xpath += dir_path::path_sep_str + tpath;
 if (Vsystem_path != ":")
 xpath += Vsystem_path;
-do_set (xpath + ":::");
+do_set (xpath + ":::", false);
 }
 void
 load_path::do_clear (void)
 {
 dir_info_list.clear ();
 fcn_map.clear ();
+do_append (".", false);
 }
 static std::list<std::string>
 split_path (const std::string& p)
 {
 return retval;
 }
 void
-load_path::do_set (const std::string& p)
+load_path::do_set (const std::string& p, bool warn)
 {
 do_clear ();
 std::list<std::string> elts = split_path (p);
 add_hook = 0;
 for (std::list<std::string>::const_iterator i = elts.begin ();
 i != elts.end ();
 i++)
-do_append (*i);
+do_append (*i, warn);
 // Restore add hook and execute for all newly added directories.
 unwind_protect::run ();
 	add_hook (i->dir_name);
 }
 }
 void
-load_path::do_append (const std::string& dir)
+load_path::do_append (const std::string& dir, bool warn)
 {
 if (! dir.empty ())
-{
+do_add (dir, true, warn);
-dir_info_list_iterator i = find_dir_info (dir);
-if (i != dir_info_list.end ())
-	move (i, true);
-else
-	{
-	  dir_info di (dir);
-	  if (! error_state)
-	    {
-	      dir_info_list.push_back (di);
-	      add_to_fcn_map (di, true);
-	      if (add_hook)
-		add_hook (dir);
-	    }
-	}
-}
 }
 void
-load_path::do_prepend (const std::string& dir)
+load_path::do_prepend (const std::string& dir, bool warn)
 {
 if (! dir.empty ())
-{
+do_add (dir, false, warn);
-dir_info_list_iterator i = find_dir_info (dir);
+}
-if (i != dir_info_list.end ())
+void
-	move (i, false);
+load_path::do_add (const std::string& dir, bool at_end, bool warn)
-else
+{
-	{
+dir_info_list_iterator i = find_dir_info (dir);
-	  dir_info di (dir);
+if (i != dir_info_list.end ())
-	  if (! error_state)
+move (i, at_end);
-	    {
+else
-	      dir_info_list.push_front (di);
+{
+file_stat fs (dir);
-	      add_to_fcn_map (di, false);
+if (fs)
-	      if (add_hook)
+	{
-		add_hook (dir);
+	  if (fs.is_dir ())
-	    }
+	    {
-	}
+	      dir_info di (dir);
-// FIXME -- is there a better way to do this?
+	      if (! error_state)
+		{
-i = find_dir_info (".");
+		  if (at_end)
+		    dir_info_list.push_back (di);
-if (i != dir_info_list.end ())
+		  else
-	move (i, false);
+		    dir_info_list.push_front (di);
-else
-	panic_impossible ();
+		  add_to_fcn_map (di, true);
-}
+		  if (add_hook)
+		    add_hook (dir);
+		}
+	    }
+	  else if (warn)
+	    warning ("addpath: %s: not a directory", dir.c_str ());
+	}
+else if (warn)
+	{
+	  std::string msg = fs.error ();
+	  warning ("addpath: %s: %s", dir.c_str (), msg.c_str ());
+	}
+}
+// FIXME -- is there a better way to do this?
+i = find_dir_info (".");
+if (i != dir_info_list.end ())
+{
+if (i != dir_info_list.begin () && warn)
+	warning ("addpath: \".\" is always first in the path");
+move (i, false);
+}
+else
+panic_impossible ();
 }
 bool
 load_path::do_remove (const std::string& dir)
 {
 bool retval = false;
 if (! dir.empty ())
 {
 if (dir == ".")
-	warning ("rmpath: can't remove \".\" from path");
+	{
+	  warning ("rmpath: can't remove \".\" from path");
-dir_info_list_iterator i = find_dir_info (dir);
+	  // Avoid additional warnings.
-if (i != dir_info_list.end ())
-	{
 	  retval = true;
+	}
-	  string_vector fcn_files = i->fcn_files;
+else
+	{
-	  dir_info_list.erase (i);
+	  dir_info_list_iterator i = find_dir_info (dir);
-	  octave_idx_type len = fcn_files.length ();
+	  if (i != dir_info_list.end ())
+	    {
-	  for (octave_idx_type k = 0; k < len; k++)
+	      retval = true;
-	    {
-	      std::string fname = fcn_files[k];
+	      string_vector fcn_files = i->fcn_files;
-	      std::string ext;
+	      dir_info_list.erase (i);
-	      std::string base = fname;
+	      octave_idx_type len = fcn_files.length ();
-	      size_t pos = fname.rfind ('.');
+	      for (octave_idx_type k = 0; k < len; k++)
-	      if (pos != NPOS)
+		{
-		{
+		  std::string fname = fcn_files[k];
-		  base = fname.substr (0, pos);
-		  ext = fname.substr (pos);
+		  std::string ext;
-		}
+		  std::string base = fname;
-	      std::list<file_info>& file_info_list = fcn_map[base];
+		  size_t pos = fname.rfind ('.');
-	      for (std::list<file_info>::iterator p = file_info_list.begin ();
+		  if (pos != NPOS)
-		   p != file_info_list.end ();
-		   p++)
-		{
-		  if (p->dir_name == dir)
 		    {
-		      file_info_list.erase (p);
+		      base = fname.substr (0, pos);
+		      ext = fname.substr (pos);
-		      if (file_info_list.empty ())
-			fcn_map.erase (fname);
-		      break;
 		    }
-		}
-	    }
+		  std::list<file_info>& file_info_list = fcn_map[base];
-	  if (remove_hook)
+		  for (std::list<file_info>::iterator p = file_info_list.begin ();
-	    remove_hook (dir);
+		       p != file_info_list.end ();
+		       p++)
+		    {
+		      if (p->dir_name == dir)
+			{
+			  file_info_list.erase (p);
+			  if (file_info_list.empty ())
+			    fcn_map.erase (fname);
+			  break;
+			}
+		    }
+		}
+	      if (remove_hook)
+		remove_hook (dir);
+	    }
 	}
 }
 return retval;
 }
 if (argc > 1)
 	{
 	  std::string path = argv[1];
 	  for (int i = 2; i < argc; i++)
-	    path += dir_path::path_sep_str;
+	    path += dir_path::path_sep_str + argv[i];
-	  size_t plen = path.length ();
+	  load_path::set (path, true);
-	  if (! ((plen == 1 && path[0] == ':')
-		 || (plen > 1
-		     && path.substr (0, 2) == ("." + dir_path::path_sep_str))))
-	    path = "." + dir_path::path_sep_str + path;
-	  load_path::set (path);
 	}
 if (nargout > 0)
 	retval = load_path::path ();
 else if (argc == 1 && nargout == 0)
 	      error ("addpath: expecting final argument to be 1 or 0");
 	      return retval;
 	    }
 	}
-std::list<std::string> xpath = load_path::dir_list ();
-// Strip "." for now.  Calling path to set the path will restore it.
-xpath.remove (".");
 for (int i = 0; i < nargin; i++)
 	{
 	  std::string arg = args(i).string_value ();
 	  if (! error_state)
 		  std::string dir = *p;
 		  //dir = regexprep (dir_elts{j}, "//+", "/");
 		  //dir = regexprep (dir, "/$", "");
-		  if (dir == "." && append)
+		  if (append)
-		    warning ("addpath: \".\" is always first in the path");
+		    load_path::append (dir, true);
-		  file_stat fs (dir);
-		  if (fs)
-		    {
-		      if (fs.is_dir ())
-			{
-			  if (append)
-			    load_path::append (dir);
-			  else
-			    load_path::prepend (dir);
-			}
-		      else
-			warning ("addpath: %s: not a directory", dir.c_str ());
-		    }
 		  else
-		    {
+		    load_path::prepend (dir, true);
-		      std::string msg = fs.error ();
-		      warning ("addpath: %s: %s", dir.c_str (), msg.c_str ());
-		    }
 		}
 	    }
 	  else
 	    error ("addpath: expecting all args to be character strings");
 	}
 int nargin = args.length ();
 if (nargin > 0)
 {
-std::list<std::string> xpath = load_path::dir_list ();
 for (int i = 0; i < nargin; i++)
 	{
 	  std::string arg = args(i).string_value ();
 	  if (! error_state)

Mercurial > octave-nkf

comparison src/load-path.cc @ 5867:b305874f50ef