Use C++11 features with containers

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

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 703be2b404744cbe76515ca4ebf40c4226649267..a5a5a10a5532133582172da6abcdf93acdf62ea6 100644 (file)
--- 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
 
@@ -39,7 +39,7 @@ void Path::init(const string &p)
        {
                string::size_type slash = p.find_first_of("/\\", start);
                if(slash>start || start==0)
-                       add_component(p.substr(start, max(slash-start, 1U)));
+                       add_component(p.substr(start, max<string::size_type>(slash-start, 1U)));
                if(slash==string::npos)
                        break;
                start = slash+1;
@@ -58,8 +58,8 @@ unsigned Path::size() const
 
 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;
@@ -68,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,8 +92,8 @@ Path &Path::operator/=(const Path &p)
                *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;
 }
@@ -103,7 +103,7 @@ void Path::add_component(const string &comp)
        if(comp.size()==1 && (comp[0]=='/' || comp[0]=='\\'))
        {
                // Replace the path with the root directory
-#ifdef WIN32
+#ifdef _WIN32
                string::size_type slash = (separators.empty() ? string::npos : separators.front());
                if(is_windows_drive(path.substr(0, slash)))
                {
@@ -118,7 +118,7 @@ void Path::add_component(const string &comp)
                        separators.push_back(0);
                }
        }
-#ifdef WIN32
+#ifdef _WIN32
        else if(is_windows_drive(comp))
        {
                path = comp;
@@ -132,7 +132,7 @@ 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
@@ -173,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)
@@ -192,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;
@@ -201,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;
@@ -210,7 +210,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;
@@ -222,7 +222,9 @@ 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++()
 {
@@ -234,6 +236,7 @@ Path::Iterator &Path::Iterator::operator++()
                if(path->path.size()==1 && path->separators.size()==1)
                        end = true;
        }
+       update();
        return *this;
 }
 
@@ -247,28 +250,30 @@ Path::Iterator &Path::Iterator::operator--()
        }
        else if(iter!=path->separators.begin())
                --iter;
+       update();
        return *this;
 }
 
-string Path::Iterator::operator*() const
+void Path::Iterator::update()
 {
        if(end)
-               throw logic_error("Path::Iterator::operator*");
+       {
+               current.clear();
+               return;
+       }
 
        string::size_type start = 0;
        if(iter!=path->separators.begin())
-       {
-               PositionArray::const_iterator prev = iter;
-               start = *--prev+1;
-       }
+               start = *prev(iter)+1;
 
        string::size_type slash = string::npos;
        if(iter!=path->separators.end())
                slash = *iter;
 
        if(slash==0)
-               return path->path.substr(start, 1);
-       return path->path.substr(start, slash-start);
+               current = path->path.substr(start, 1);
+       else
+               current = path->path.substr(start, slash-start);
 }
 
 } // namespace FS