Make FS::Path::Iterator assignable

[libs/core.git] / source / fs / path.cpp

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 035e2200609bf5f6b4f1c4e6ca59a31a6e22cf6f..b8b7c223043786cf6bef748262f1e2d7cf495756 100644 (file)
--- a/source/fs/path.cpp
+++ b/source/fs/path.cpp
@@ -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
 
 }
 
@@ -63,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
@@ -183,12 +183,30 @@ string Path::operator[](int n) const
        throw invalid_argument("Path::operator[]");
 }
 
-bool Path::operator==(const Path &p) const
+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, p.path);
+       return strcasecmp(path, other.path)>0;
 #else
-       return path==p.path;
+       return path>other.path;
 #endif
 }
 
@@ -206,29 +224,29 @@ Path::Iterator Path::end() const
 
 
 Path::Iterator::Iterator(const Path &p):
-       path(p),
+       path(&p),
        start(0)
 {
-       if(path.path.empty())
+       if(path->path.empty())
                start = end = string::npos;
-       else if(path.path[0]==DIRSEP)
+       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)))
+       else if(path->path.size()>2 && path->path[2]==DIRSEP && is_windows_drive(path->path.substr(0, 2)))
                end = 2;
 #endif
        else
-               end = path.path.find(DIRSEP);
+               end = path->path.find(DIRSEP);
 }
 
 Path::Iterator &Path::Iterator::operator++()
 {
        start = end;
-       if(start>=path.path.size())
+       if(start>=path->path.size())
                return *this;
-       if(path.path[start]==DIRSEP)
+       if(path->path[start]==DIRSEP)
                ++start;
-       end = path.path.find(DIRSEP, start);
+       end = path->path.find(DIRSEP, start);
        return *this;
 }
 
@@ -238,10 +256,10 @@ Path::Iterator &Path::Iterator::operator--()
                return *this;
 
        end = start;
-       if(end>1 && end<path.path.size() && path.path[end]!=DIRSEP)
+       if(end>1 && end<path->path.size() && path->path[end]!=DIRSEP)
                --end;
 
-       start = path.path.rfind(DIRSEP, end-1);
+       start = path->path.rfind(DIRSEP, end-1);
        if(start==string::npos)
                start = 0;
        else if(start<end-1)
@@ -252,11 +270,11 @@ Path::Iterator &Path::Iterator::operator--()
 
 string Path::Iterator::operator*() const
 {
-       if(start>=path.path.size())
+       if(start>=path->path.size())
                return string();
        if(start==end)
                return string();
-       return path.path.substr(start, end-start);
+       return path->path.substr(start, end-start);
 }
 
 } // namespace FS