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

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index f12e274..a5a5a10 100644
--- a/source/fs/path.cpp
+++ b/source/fs/path.cpp
@@ -7,8 +7,8 @@ using namespace std;
 
 namespace {
 
-#ifdef WIN32
-inline bool is_windows_drive(const std::string &p)
+#ifdef _WIN32
+inline bool is_windows_drive(const string &p)
 { return (p.size()==2 && ((p[0]>='A' && p[0]<='Z') || (p[0]>='a' && p[0]<='z')) && p[1]==':'); }
 #endif
 
@@ -32,14 +32,14 @@ Path::Path(const char *p)
 
 void Path::init(const string &p)
 {
+	if(p.empty())
+		return;
 	string::size_type start = 0;
-	if(p[0]=='/' || p[0]=='\\')
-		add_component(string(1, DIRSEP));
-	while(1)
+	while(start<p.size())
 	{
 		string::size_type slash = p.find_first_of("/\\", start);
-		if(slash>start)
-			add_component(p.substr(start, slash-start));
+		if(slash>start || start==0)
+			add_component(p.substr(start, max<string::size_type>(slash-start, 1U)));
 		if(slash==string::npos)
 			break;
 		start = slash+1;
@@ -53,16 +53,13 @@ unsigned Path::size() const
 	if(path.size()==1 && path[0]==DIRSEP)
 		return 1;
 
-	unsigned count = 1;
-	for(string::const_iterator i=path.begin(); i!=path.end(); ++i)
-		if(*i==DIRSEP) ++count;
-	return count;
+	return separators.size()+1;
 }
 
 bool Path::is_absolute() const
 {
-#ifdef WIN32
-	if(is_windows_drive((*this)[0]))
+#ifdef _WIN32
+	if(!empty() && is_windows_drive((*this)[0]))
 		return true;
 #endif
 	return path[0]==DIRSEP;
@@ -71,7 +68,7 @@ bool Path::is_absolute() const
 Path Path::subpath(unsigned start, unsigned count) const
 {
 	Path result;
-	Iterator i = begin();
+	auto i = begin();
 	for(unsigned j=0; (j<start && i!=end()); ++j)
 		++i;
 	for(unsigned j=0; (j<count && i!=end()); ++j)
@@ -92,33 +89,41 @@ Path Path::operator/(const Path &p) const
 Path &Path::operator/=(const Path &p)
 {
 	if(p.is_absolute())
-		path = p.path;
+		*this = p;
 	else
 	{
-		for(Iterator i=p.begin(); i!=p.end(); ++i)
-			add_component(*i);
+		for(const string &c: p)
+			add_component(c);
 	}
 	return *this;
 }
 
 void Path::add_component(const string &comp)
 {
-	if(comp.empty())
-		;
-	else if(comp.size()==1 && comp[0]==DIRSEP)
+	if(comp.size()==1 && (comp[0]=='/' || comp[0]=='\\'))
 	{
 		// Replace the path with the root directory
-#ifdef WIN32
-		unsigned slash = path.find(DIRSEP);
+#ifdef _WIN32
+		string::size_type slash = (separators.empty() ? string::npos : separators.front());
 		if(is_windows_drive(path.substr(0, slash)))
+		{
 			path = path.substr(0, 2);
+			separators.clear();
+		}
 		else
 #endif
-		path = comp;
+		{
+			path.assign(1, DIRSEP);
+			separators.clear();
+			separators.push_back(0);
+		}
 	}
-#ifdef WIN32
+#ifdef _WIN32
 	else if(is_windows_drive(comp))
+	{
 		path = comp;
+		separators.clear();
+	}
 #endif
 	else if(comp=="..")
 	{
@@ -127,28 +132,27 @@ void Path::add_component(const string &comp)
 		// .. in root directory is a no-op
 		else if(path.size()==1 && path[0]==DIRSEP)
 			;
-#ifdef WIN32
+#ifdef _WIN32
 		else if(is_windows_drive(path))
 			;
 #endif
 		else
 		{
-			string::size_type slash = path.rfind(DIRSEP);
-			string::size_type start = (slash==string::npos ? 0 : slash+1);
+			string::size_type start = (separators.empty() ? 0 : separators.back()+1);
 			if(!path.compare(start, string::npos, ".."))
 			{
 				// If the last component already is a .., add another
+				separators.push_back(path.size());
 				path += DIRSEP;
 				path += comp;
 			}
-			else if(slash==string::npos)
+			else if(separators.empty())
 				path = ".";
 			else
 			{
-				if(slash==0)
-					slash = 1;
 				// Otherwise, erase the last component
-				path.erase(slash, string::npos);
+				path.erase(separators.back(), string::npos);
+				separators.pop_back();
 			}
 		}
 	}
@@ -157,7 +161,10 @@ void Path::add_component(const string &comp)
 		if(comp!="." && path.empty())
 			path = ".";
 		if(path.size()>1 || (path.size()==1 && path[0]!=DIRSEP))
+		{
+			separators.push_back(path.size());
 			path += DIRSEP;
+		}
 		path += comp;
 	}
 }
@@ -166,13 +173,13 @@ string Path::operator[](int n) const
 {
 	if(n>=0)
 	{
-		for(Iterator i=begin(); i!=end(); ++i, --n)
+		for(auto i=begin(); i!=end(); ++i, --n)
 			if(!n)
 				return *i;
 	}
 	else
 	{
-		for(Iterator i=end(); i!=begin();)
+		for(auto i=end(); i!=begin();)
 		{
 			--i;
 			if(!++n)
@@ -185,7 +192,7 @@ string Path::operator[](int n) const
 
 bool Path::operator==(const Path &other) const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return strcasecmp(path, other.path)==0;
 #else
 	return path==other.path;
@@ -194,7 +201,7 @@ bool Path::operator==(const Path &other) const
 
 bool Path::operator<(const Path &other) const
 {
-#ifdef WIN32
+#ifdef _WIN32
 	return strcasecmp(path, other.path)<0;
 #else
 	return path<other.path;
@@ -203,78 +210,70 @@ bool Path::operator<(const Path &other) const
 
 bool Path::operator>(const Path &other) const
 {
-#ifdef WIN32
+#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
+Path::Iterator::Iterator(const Path &p, bool e):
+	path(&p),
+	iter(e ? path->separators.end() : path->separators.begin()),
+	end(e || path->path.empty())
 {
-	Iterator i(*this);
-	i.start = i.end = std::string::npos;
-	return i;
+	update();
 }
 
-
-Path::Iterator::Iterator(const Path &p):
-	path(p),
-	start(0)
+Path::Iterator &Path::Iterator::operator++()
 {
-	if(path.path.empty())
-		start = end = string::npos;
-	else if(path.path[0]==DIRSEP)
-		end = 1;
-#ifdef WIN32
-	else if(path.path.size()>2 && path.path[2]==DIRSEP && is_windows_drive(path.path.substr(0, 2)))
-		end = 2;
-#endif
+	if(iter==path->separators.end())
+		end = true;
 	else
-		end = path.path.find(DIRSEP);
+	{
+		++iter;
+		if(path->path.size()==1 && path->separators.size()==1)
+			end = true;
+	}
+	update();
+	return *this;
 }
 
-Path::Iterator &Path::Iterator::operator++()
+Path::Iterator &Path::Iterator::operator--()
 {
-	start = end;
-	if(start>=path.path.size())
-		return *this;
-	if(path.path[start]==DIRSEP)
-		++start;
-	end = path.path.find(DIRSEP, start);
+	if(end)
+	{
+		end = false;
+		if(path->path.size()==1 && path->separators.size()==1)
+			--iter;
+	}
+	else if(iter!=path->separators.begin())
+		--iter;
+	update();
 	return *this;
 }
 
-Path::Iterator &Path::Iterator::operator--()
+void Path::Iterator::update()
 {
-	if(start==0)
-		return *this;
-
-	end = start;
-	if(end>1 && end<path.path.size() && path.path[end]!=DIRSEP)
-		--end;
+	if(end)
+	{
+		current.clear();
+		return;
+	}
 
-	start = path.path.rfind(DIRSEP, end-1);
-	if(start==string::npos)
-		start = 0;
-	else if(start<end-1)
-		++start;
+	string::size_type start = 0;
+	if(iter!=path->separators.begin())
+		start = *prev(iter)+1;
 
-	return *this;
-}
+	string::size_type slash = string::npos;
+	if(iter!=path->separators.end())
+		slash = *iter;
 
-string Path::Iterator::operator*() const
-{
-	if(start>=path.path.size())
-		return string();
-	if(start==end)
-		return string();
-	return path.path.substr(start, end-start);
+	if(slash==0)
+		current = path->path.substr(start, 1);
+	else
+		current = path->path.substr(start, slash-start);
 }
 
 } // namespace FS