1 files changed, 10 insertions, 145 deletions

diff --git a/raul/Path.h b/raul/Path.h
index c19767d..200d05e 100644
--- a/raul/Path.h
+++ b/raul/Path.h
@@ -1,4 +1,4 @@
-/* This file is part of Ingen.  Copyright (C) 2006 Dave Robillard.
+/* This file is part of Ingen.  Copyright (C) 2006-2007 Dave Robillard.
  * 
  * Ingen 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
@@ -63,142 +63,20 @@ public:
 		assert(is_valid(cpath));
 	}
 	
-
-	static bool is_valid(const std::basic_string<char>& path)
-	{
-		if (path.length() == 0)
-			return false;
-
-		// Must start with a /
-		if (path.at(0) != '/')
-			return false;
-		
-		// Must not end with a slash unless "/"
-		if (path.length() > 1 && path.at(path.length()-1) == '/')
-			return false;
+	static bool is_valid(const std::basic_string<char>& path);
 	
-		assert(path.find_last_of("/") != string::npos);
-		
-		// Double slash not allowed
-		if (path.find("//") != string::npos)
-			return false;
-
-		// All characters must be printable ASCII
-		for (size_t i=0; i < path.length(); ++i)
-			if (path.at(i) < 32 || path.at(i) > 126)
-				return false;
-
-		// Disallowed characters
-		if (       path.find(" ") != string::npos 
-				|| path.find("#") != string::npos
-				|| path.find("*") != string::npos
-				|| path.find(",") != string::npos
-				|| path.find("?") != string::npos
-				|| path.find("[") != string::npos
-				|| path.find("]") != string::npos
-				|| path.find("{") != string::npos
-				|| path.find("}") != string::npos)
-			return false;
-
-		return true;
-	}
-	
-	static bool is_valid_name(const std::basic_string<char>& path)
+	static bool is_valid_name(const std::basic_string<char>& name)
 	{
-		return is_valid(string("/").append(path));
+		return is_valid(string("/").append(name));
 	}
 
+	static string pathify(const std::basic_string<char>& str);
+	static string nameify(const std::basic_string<char>& str);
 
-	/** Convert a string to a valid full path.
-	 *
-	 * This will make a best effort at turning @a str into a complete, valid
-	 * Path, and will always return one.
-	 */
-	static string pathify(const std::basic_string<char>& str)
-	{
-		string path = str;
-
-		if (path.length() == 0)
-			return "/"; // this might not be wise
-
-		// Must start with a /
-		if (path.at(0) != '/')
-			path = string("/").append(path);
-		
-		// Must not end with a slash unless "/"
-		if (path.length() > 1 && path.at(path.length()-1) == '/')
-			path = path.substr(0, path.length()-1); // chop trailing slash
-	
-		assert(path.find_last_of("/") != string::npos);
-		
-		replace_invalid_chars(path, false);
-
-		assert(is_valid(path));
-		
-		return path;
-	}
+	static void replace_invalid_chars(string& str, bool replace_slash = false);
 	
-	/** Convert a string to a valid name (or "method" - tokens between slashes)
-	 *
-	 * This will strip all slashes, etc, and always return a valid name/method.
-	 */
-	static string nameify(const std::basic_string<char>& str)
-	{
-		string name = str;
-
-		if (name.length() == 0)
-			return "."; // this might not be wise
-
-		replace_invalid_chars(name, true);
-
-		assert(is_valid(string("/") + name));
-
-		return name;
-	}
-
-
-	/** Replace any invalid characters in @a str with a suitable replacement.
-	 *
-	 * Makes a pretty name - underscores are a valid character, but this chops
-	 * both spaces and underscores, uppercasing the next letter, to create
-	 * uniform CamelCase names that look nice
-	 */
-	static void replace_invalid_chars(string& str, bool replace_slash = false)
-	{
-		for (size_t i=0; i < str.length(); ++i) {
-			if (str[i] == ' ' || str[i] == '_') {
-				str[i+1] = std::toupper(str[i+1]); // capitalize next char
-				str = str.substr(0, i) + str.substr(i+1); // chop space/underscore
-				--i;
-			} else if (str[i] ==  '[' || str[i] ==  '{') {
-				str[i] = '(';
-			} else if (str[i] ==  ']' || str[i] ==  '}') {
-				str[i] = ')';
-			} else if (str[i] < 32 || str.at(i) > 126
-					|| str[i] ==  '#' 
-					|| str[i] ==  '*' 
-					|| str[i] ==  ',' 
-					|| str[i] ==  '?' 
-					|| (replace_slash && str[i] ==  '/')) {
-				str[i] = '.';
-			}
-		}
-
-		// Chop brackets
-		while (true) {
-
-			const string::size_type open  = str.find("(");
-			const string::size_type close = str.find(")");
-
-			if (open != string::npos) {
-				if (close != string::npos)
-					str.erase(open, (close - open) + 1);
-			} else {
-				break;
-			}
-
-		}
-	}
+	bool is_child_of(const Path& parent) const;
+	bool is_parent_of(const Path& child) const;
 
 	
 	/** Return the name of this object (everything after the last '/').
@@ -224,6 +102,7 @@ public:
 		return (parent == "") ? "/" : parent;
 	}
 	
+
 	/** Parent path with a "/" appended.
 	 *
 	 * This exists to avoid needing to be careful about the special case of "/".
@@ -238,20 +117,6 @@ public:
 		else
 			return (*this) + "/";
 	}
-
-	inline bool is_child_of(const Path& parent) const
-	{
-		/*return (length() > parent.length()
-			&& substr(0, parent.length()) == parent
-			&& (*this)[parent.length()] == '/');*/
-		const string parent_base = parent.base();
-		return (substr(0, parent_base.length()) == parent_base);
-	}
-	
-	inline bool is_parent_of(const Path& child) const
-	{
-		return child.is_child_of(*this);
-	}
 };