[llvm] Use early exits and get rid of if-return-else-return pattern; NFC

https://llvm.org/docs/CodingStandards.html#use-early-exits-and-continue-to-simplify-code

Reviewed By: kadircet

Differential Revision: https://reviews.llvm.org/D89857
This commit is contained in:
Kirill Bobyrev 2020-10-21 14:18:36 +02:00
parent 9f5ece63ce
commit 96685faf6d
No known key found for this signature in database
GPG Key ID: 2307C055C8384FA0
1 changed files with 14 additions and 20 deletions

View File

@ -354,10 +354,9 @@ StringRef root_path(StringRef path, Style style) {
if ((++pos != e) && is_separator((*pos)[0], style)) { if ((++pos != e) && is_separator((*pos)[0], style)) {
// {C:/,//net/}, so get the first two components. // {C:/,//net/}, so get the first two components.
return path.substr(0, b->size() + pos->size()); return path.substr(0, b->size() + pos->size());
} else {
// just {C:,//net}, return the first component.
return *b;
} }
// just {C:,//net}, return the first component.
return *b;
} }
// POSIX style root directory. // POSIX style root directory.
@ -467,8 +466,7 @@ StringRef parent_path(StringRef path, Style style) {
size_t end_pos = parent_path_end(path, style); size_t end_pos = parent_path_end(path, style);
if (end_pos == StringRef::npos) if (end_pos == StringRef::npos)
return StringRef(); return StringRef();
else return path.substr(0, end_pos);
return path.substr(0, end_pos);
} }
void remove_filename(SmallVectorImpl<char> &path, Style style) { void remove_filename(SmallVectorImpl<char> &path, Style style) {
@ -581,12 +579,10 @@ StringRef stem(StringRef path, Style style) {
size_t pos = fname.find_last_of('.'); size_t pos = fname.find_last_of('.');
if (pos == StringRef::npos) if (pos == StringRef::npos)
return fname; return fname;
else if ((fname.size() == 1 && fname == ".") ||
if ((fname.size() == 1 && fname == ".") || (fname.size() == 2 && fname == ".."))
(fname.size() == 2 && fname == "..")) return fname;
return fname; return fname.substr(0, pos);
else
return fname.substr(0, pos);
} }
StringRef extension(StringRef path, Style style) { StringRef extension(StringRef path, Style style) {
@ -594,12 +590,10 @@ StringRef extension(StringRef path, Style style) {
size_t pos = fname.find_last_of('.'); size_t pos = fname.find_last_of('.');
if (pos == StringRef::npos) if (pos == StringRef::npos)
return StringRef(); return StringRef();
else if ((fname.size() == 1 && fname == ".") ||
if ((fname.size() == 1 && fname == ".") || (fname.size() == 2 && fname == ".."))
(fname.size() == 2 && fname == "..")) return StringRef();
return StringRef(); return fname.substr(pos);
else
return fname.substr(pos);
} }
bool is_separator(char value, Style style) { bool is_separator(char value, Style style) {
@ -1299,7 +1293,7 @@ Expected<TempFile> TempFile::create(const Twine &Model, unsigned Mode) {
#endif #endif
return std::move(Ret); return std::move(Ret);
} }
} } // namespace fs
} // end namsspace sys } // namespace sys
} // end namespace llvm } // namespace llvm