]> git.tdb.fi Git - libs/core.git/blobdiff - source/fs/path.cpp
Use #ifdef _WIN32 rather than WIN32
[libs/core.git] / source / fs / path.cpp
index 52b1da2241dc9a762dbab76a6caa2a0f9bfa3478..d68595bb55ee83588ce9ae7a535c9424cbbaabef 100644 (file)
@@ -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)
+{
+       if(p.empty())
+               return;
+       string::size_type start = 0;
+       while(start<p.size())
+       {
+               string::size_type slash = p.find_first_of("/\\", 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;
+       }
+}
+
 unsigned Path::size() const
 {
        if(path.empty())
@@ -35,21 +53,16 @@ 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
+#ifdef _WIN32
        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
@@ -76,7 +89,7 @@ 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)
@@ -85,82 +98,32 @@ 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())
-               ;
-       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=="..")
        {
@@ -169,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();
                        }
                }
        }
@@ -199,64 +161,122 @@ 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;
        }
 }
 
+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[]");
+}
 
-Path::Iterator::Iterator(const Path &p):
-       path(p),
-       start(0)
+bool Path::operator==(const Path &other) const
 {
-       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;
+#ifdef _WIN32
+       return strcasecmp(path, other.path)==0;
+#else
+       return path==other.path;
 #endif
-       else
-               end = path.path.find(DIRSEP);
 }
 
-Path::Iterator &Path::Iterator::operator++()
+bool Path::operator<(const Path &other) const
 {
-       start = end;
-       if(start>=path.path.size())
-               return *this;
-       if(path.path[start]==DIRSEP)
-               ++start;
-       end = path.path.find(DIRSEP, start);
-       return *this;
+#ifdef _WIN32
+       return strcasecmp(path, other.path)<0;
+#else
+       return path<other.path;
+#endif
 }
 
-Path::Iterator &Path::Iterator::operator--()
+bool Path::operator>(const Path &other) const
 {
-       if(start==0)
-               return *this;
+#ifdef _WIN32
+       return strcasecmp(path, other.path)>0;
+#else
+       return path>other.path;
+#endif
+}
 
-       end = start;
-       if(end>1 && end<path.path.size() && path.path[end]!=DIRSEP)
-               --end;
 
-       start = path.path.rfind(DIRSEP, end-1);
-       if(start==string::npos)
-               start = 0;
-       else if(start<end-1)
-               ++start;
+Path::Iterator::Iterator(const Path &p, bool e):
+       path(&p),
+       iter(e ? path->separators.end() : path->separators.begin()),
+       end(e || path->path.empty())
+{
+       update();
+}
 
+Path::Iterator &Path::Iterator::operator++()
+{
+       if(iter==path->separators.end())
+               end = true;
+       else
+       {
+               ++iter;
+               if(path->path.size()==1 && path->separators.size()==1)
+                       end = true;
+       }
+       update();
        return *this;
 }
 
-string Path::Iterator::operator*() const
+Path::Iterator &Path::Iterator::operator--()
 {
-       if(start>=path.path.size())
-               return string();
-       if(start==end)
-               return string();
-       return path.path.substr(start, end-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;
+}
+
+void Path::Iterator::update()
+{
+       if(end)
+       {
+               current.clear();
+               return;
+       }
+
+       string::size_type start = 0;
+       if(iter!=path->separators.begin())
+       {
+               PositionArray::const_iterator prev = iter;
+               start = *--prev+1;
+       }
+
+       string::size_type slash = string::npos;
+       if(iter!=path->separators.end())
+               slash = *iter;
+
+       if(slash==0)
+               current = path->path.substr(start, 1);
+       else
+               current = path->path.substr(start, slash-start);
 }
 
 } // namespace FS