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;
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;
}
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)
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())