zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: fileName hasPath(), removePath() methods

Browse Source 
- improved move constructors/assignments for fileName, string, etc
This commit is contained in:
Mark Olesen
2018-10-03 14:05:45 +02:00
parent 3963cd95d9
commit 6c91048e8b
15 changed files with 469 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/OpenFOAM/primitives/strings/string/stringI.H
View File

@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation | Copyright (C) 2017 OpenCFD Ltd.
\\/ M anipulation | Copyright (C) 2017-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -44,9 +44,29 @@ inline std::string::size_type Foam::string::find_ext() const
}
inline bool Foam::string::hasPath() const
{
return (npos != find('/'));
}
inline bool Foam::string::hasExt() const
{
return (find_ext() != npos);
return (npos != find_ext());
}
inline bool Foam::string::removePath()
{
const auto i = rfind('/');
if (npos == i)
{
return false;
}
this->erase(0, i+1);
return true;
}
@ -54,7 +74,7 @@ inline bool Foam::string::removeExt()
{
const auto i = find_ext();
if (i == npos)
if (npos == i)
{
return false;
}
@ -64,20 +84,21 @@ inline bool Foam::string::removeExt()
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
inline Foam::string::string()
:
std::string()
{}
inline Foam::string::string(const std::string& str)
:
std::string(str)
{}
inline Foam::string::string(std::string&& str)
:
std::string(std::move(str))
{}
inline Foam::string::string(const char* str)
:
std::string(str)
@ -102,12 +123,6 @@ inline Foam::string::string(const size_type len, const char c)
{}
inline Foam::string::string(std::string&& str)
:
std::string(std::move(str))
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class String>