Make FS::Path::Iterator meet forward iterator requirements

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

diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 4db7f0cc140185d46234aa54eebfb1042af4e160..0fe95d65df943a9f0b4b1b4bf006035a4e7dccee 100644 (file)
--- a/source/fs/path.cpp
+++ b/source/fs/path.cpp
@@ -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,13 +250,17 @@ 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())
@@ -267,8 +274,9 @@ string Path::Iterator::operator*() const
                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