X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffs%2Fpath.cpp;h=1181b923c1054f894c5f0e188119e067c6508566;hb=dbb2e02721b6250a434a807d92126c7716c40a15;hp=93805277749d96ed35cccaa86ecd130774f9174e;hpb=05f7e9b4c6f804102f261517c8ecdd338e1f67d3;p=libs%2Fcore.git
diff --git a/source/fs/path.cpp b/source/fs/path.cpp
index 9380527..1181b92 100644
--- 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
@@ -17,29 +17,16 @@ inline bool is_windows_drive(const std::string &p)
namespace Msp {
namespace FS {
-Path::Path()
-{ }
-
Path::Path(const string &p)
{
- init(p);
-}
-
-Path::Path(const char *p)
-{
- init(p);
-}
-
-void Path::init(const string &p)
-{
+ if(p.empty())
+ return;
string::size_type start = 0;
- if(p[0]=='/' || p[0]=='\\')
- add_component(string(1, DIRSEP));
- while(1)
+ while(start
start)
- add_component(p.substr(start, slash-start));
+ if(slash>start || start==0)
+ add_component(p.substr(start, max(slash-start, 1U)));
if(slash==string::npos)
break;
start = slash+1;
@@ -58,8 +45,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 +55,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=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)
@@ -194,7 +189,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;
@@ -203,7 +198,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(const Path &other) const
{
-#ifdef WIN32
+#ifdef _WIN32
return strcasecmp(path, other.path)>0;
#else
return path>other.path;
@@ -224,7 +219,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++()
{
@@ -236,6 +233,7 @@ Path::Iterator &Path::Iterator::operator++()
if(path->path.size()==1 && path->separators.size()==1)
end = true;
}
+ update();
return *this;
}
@@ -249,28 +247,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