X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Ffs%2Fpath.cpp;h=f12e27492709423f0875ecb046b0f6b2724dfd03;hp=52b1da2241dc9a762dbab76a6caa2a0f9bfa3478;hb=601e088dc38005e4346766a09129a80e81c637f3;hpb=eeb6ed7b20d56578ff8c68f3c94e887d5ac768ee

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 52b1da2..f12e274 100644
--- a/source/fs/path.cpp
+++ b/source/fs/path.cpp
@@ -1,4 +1,4 @@
-#include <msp/core/except.h>
+#include <stdexcept>
 #include <msp/strings/utils.h>
 #include "path.h"
 #include "utils.h"
@@ -7,8 +7,10 @@ using namespace std;
 
 namespace {
 
+#ifdef WIN32
 inline bool is_windows_drive(const std::string &p)
 { return (p.size()==2 && ((p[0]>='A' && p[0]<='Z') || (p[0]>='a' && p[0]<='z')) && p[1]==':'); }
+#endif
 
 }
 
@@ -28,6 +30,22 @@ Path::Path(const char *p)
 	init(p);
 }
 
+void Path::init(const string &p)
+{
+	string::size_type start = 0;
+	if(p[0]=='/' || p[0]=='\\')
+		add_component(string(1, DIRSEP));
+	while(1)
+	{
+		string::size_type slash = p.find_first_of("/\\", start);
+		if(slash>start)
+			add_component(p.substr(start, slash-start));
+		if(slash==string::npos)
+			break;
+		start = slash+1;
+	}
+}
+
 unsigned Path::size() const
 {
 	if(path.empty())
@@ -47,9 +65,7 @@ bool Path::is_absolute() const
 	if(is_windows_drive((*this)[0]))
 		return true;
 #endif
-	if(path[0]==DIRSEP)
-		return true;
-	return false;
+	return path[0]==DIRSEP;
 }
 
 Path Path::subpath(unsigned start, unsigned count) const
@@ -85,64 +101,6 @@ Path &Path::operator/=(const Path &p)
 	return *this;
 }
 
-string Path::operator[](int n) const
-{
-	if(n>=0)
-	{
-		for(Iterator i=begin(); i!=end(); ++i, --n)
-			if(!n)
-				return *i;
-	}
-	else
-	{
-		for(Iterator i=end(); i!=begin();)
-		{
-			--i;
-			if(!++n)
-				return *i;
-		}
-	}
-
-	throw InvalidParameterValue("Path component index out of range");
-}
-
-bool Path::operator==(const Path &p) const
-{
-#ifdef WIN32
-	return !strcasecmp(path, p.path);
-#else
-	return path==p.path;
-#endif
-}
-
-Path::Iterator Path::begin() const
-{
-	return Iterator(*this);
-}
-
-Path::Iterator Path::end() const
-{
-	Iterator i(*this);
-	i.start=i.end = std::string::npos;
-	return i;
-}
-
-void Path::init(const string &p)
-{
-	string::size_type start = 0;
-	if(p[0]=='/' || p[0]=='\\')
-		add_component(string(1, DIRSEP));
-	while(1)
-	{
-		string::size_type slash = p.find_first_of("/\\", start);
-		if(slash>start)
-			add_component(p.substr(start, slash-start));
-		if(slash==string::npos)
-			break;
-		start = slash+1;
-	}
-}
-
 void Path::add_component(const string &comp)
 {
 	if(comp.empty())
@@ -204,13 +162,73 @@ void Path::add_component(const string &comp)
 	}
 }
 
+string Path::operator[](int n) const
+{
+	if(n>=0)
+	{
+		for(Iterator i=begin(); i!=end(); ++i, --n)
+			if(!n)
+				return *i;
+	}
+	else
+	{
+		for(Iterator i=end(); i!=begin();)
+		{
+			--i;
+			if(!++n)
+				return *i;
+		}
+	}
+
+	throw invalid_argument("Path::operator[]");
+}
+
+bool Path::operator==(const Path &other) const
+{
+#ifdef WIN32
+	return strcasecmp(path, other.path)==0;
+#else
+	return path==other.path;
+#endif
+}
+
+bool Path::operator<(const Path &other) const
+{
+#ifdef WIN32
+	return strcasecmp(path, other.path)<0;
+#else
+	return path<other.path;
+#endif
+}
+
+bool Path::operator>(const Path &other) const
+{
+#ifdef WIN32
+	return strcasecmp(path, other.path)>0;
+#else
+	return path>other.path;
+#endif
+}
+
+Path::Iterator Path::begin() const
+{
+	return Iterator(*this);
+}
+
+Path::Iterator Path::end() const
+{
+	Iterator i(*this);
+	i.start = i.end = std::string::npos;
+	return i;
+}
+
 
 Path::Iterator::Iterator(const Path &p):
 	path(p),
 	start(0)
 {
 	if(path.path.empty())
-		start=end = string::npos;
+		start = end = string::npos;
 	else if(path.path[0]==DIRSEP)
 		end = 1;
 #ifdef WIN32