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
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 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;
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;
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)
*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;
}
void Path::add_component(const string &comp)
{
- if(comp.size()==1 && comp[0]==DIRSEP)
+ 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)))
{
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;
// .. 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
path += DIRSEP;
path += comp;
}
- else if(separators.empty())
+ else if(start==0)
+ {
+ /* Removing the last component of a relative path results in the
+ current directory */
path = ".";
+ }
+ else if(start==1)
+ {
+ /* Removing the last component of an absolute path results in the
+ root directory */
+ path.erase(start, string::npos);
+ }
else
{
- // Otherwise, erase the last component
+ // Otherwise, erase the last component and its separator
path.erase(separators.back(), string::npos);
separators.pop_back();
}
{
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)
bool Path::operator==(const Path &other) const
{
-#ifdef WIN32
+#ifdef _WIN32
return strcasecmp(path, other.path)==0;
#else
return path==other.path;
bool Path::operator<(const Path &other) const
{
-#ifdef WIN32
+#ifdef _WIN32
return strcasecmp(path, other.path)<0;
#else
return path<other.path;
bool Path::operator>(const Path &other) const
{
-#ifdef WIN32
+#ifdef _WIN32
return strcasecmp(path, other.path)>0;
#else
return path>other.path;
path(&p),
iter(e ? path->separators.end() : path->separators.begin()),
end(e || path->path.empty())
-{ }
+{
+ update();
+}
Path::Iterator &Path::Iterator::operator++()
{
if(path->path.size()==1 && path->separators.size()==1)
end = true;
}
+ update();
return *this;
}
}
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