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 f742b11241aeb280e46322793b68ebbb37fa6aea..b8b7c223043786cf6bef748262f1e2d7cf495756 100644 (file)
--- 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
@@ -73,11 +89,6 @@ Path Path::operator/(const Path &p) const
        return a;
 }
 
-/**
-Attaches another path to the end of this one.  An absolute path replaces the
-existing data.  ".." elements annihilate the last component and "." elements
-are ignored.
-*/
 Path &Path::operator/=(const Path &p)
 {
        if(p.is_absolute())
@@ -90,68 +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;
-       }
-}
-
-/**
-Adds a single component to the path, emulating the cd command.  Fails horribly
-if comp contains a separator character.
-*/
 void Path::add_component(const string &comp)
 {
        if(comp.empty())
@@ -213,31 +162,91 @@ 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),
+       path(&p),
        start(0)
 {
-       if(path.path.empty())
-               start=end = string::npos;
-       else if(path.path[0]==DIRSEP)
+       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)))
+       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;
 }
 
@@ -247,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)
@@ -261,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