OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

[libcxx] Rename a method in PathParser for clarity. NFC. 

Differential Revision: https://reviews.llvm.org/D97081
This commit is contained in:
Martin Storsjö 2021-01-09 00:20:35 +02:00
parent 1a5c92f680
commit 8c305a5d82
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libcxx/src/filesystem/operations.cpp
View File

@ -130,7 +130,7 @@ public:
} }
_LIBCPP_FALLTHROUGH(); _LIBCPP_FALLTHROUGH();
case PS_InRootName: { case PS_InRootName: {
PosPtr TkEnd = consumeSeparator(Start, End); PosPtr TkEnd = consumeAllSeparators(Start, End);
if (TkEnd) if (TkEnd)
return makeState(PS_InRootDir, Start, TkEnd); return makeState(PS_InRootDir, Start, TkEnd);
else else
@ -140,7 +140,7 @@ public:
return makeState(PS_InFilenames, Start, consumeName(Start, End)); return makeState(PS_InFilenames, Start, consumeName(Start, End));
case PS_InFilenames: { case PS_InFilenames: {
PosPtr SepEnd = consumeSeparator(Start, End); PosPtr SepEnd = consumeAllSeparators(Start, End);
if (SepEnd != End) { if (SepEnd != End) {
PosPtr TkEnd = consumeName(SepEnd, End); PosPtr TkEnd = consumeName(SepEnd, End);
if (TkEnd) if (TkEnd)
@ -166,7 +166,7 @@ public:
switch (State) { switch (State) {
case PS_AtEnd: { case PS_AtEnd: {
// Try to consume a trailing separator or root directory first. // Try to consume a trailing separator or root directory first.
if (PosPtr SepEnd = consumeSeparator(RStart, REnd)) { if (PosPtr SepEnd = consumeAllSeparators(RStart, REnd)) {
if (SepEnd == REnd) if (SepEnd == REnd)
return makeState(PS_InRootDir, Path.data(), RStart + 1); return makeState(PS_InRootDir, Path.data(), RStart + 1);
PosPtr TkStart = consumeRootName(SepEnd, REnd); PosPtr TkStart = consumeRootName(SepEnd, REnd);
@ -185,7 +185,7 @@ public:
return makeState(PS_InFilenames, consumeName(RStart, REnd) + 1, return makeState(PS_InFilenames, consumeName(RStart, REnd) + 1,
RStart + 1); RStart + 1);
case PS_InFilenames: { case PS_InFilenames: {
PosPtr SepEnd = consumeSeparator(RStart, REnd); PosPtr SepEnd = consumeAllSeparators(RStart, REnd);
if (SepEnd == REnd) if (SepEnd == REnd)
return makeState(PS_InRootDir, Path.data(), RStart + 1); return makeState(PS_InRootDir, Path.data(), RStart + 1);
PosPtr TkStart = consumeRootName(SepEnd ? SepEnd : RStart, REnd); PosPtr TkStart = consumeRootName(SepEnd ? SepEnd : RStart, REnd);
@ -304,7 +304,8 @@ private:
_LIBCPP_UNREACHABLE(); _LIBCPP_UNREACHABLE();
} }
PosPtr consumeSeparator(PosPtr P, PosPtr End) const noexcept { // Consume all consecutive separators.
PosPtr consumeAllSeparators(PosPtr P, PosPtr End) const noexcept {
if (P == nullptr || P == End || !isSeparator(*P)) if (P == nullptr || P == End || !isSeparator(*P))
return nullptr; return nullptr;
const int Inc = P < End ? 1 : -1; const int Inc = P < End ? 1 : -1;
@ -316,7 +317,7 @@ private:
// Consume exactly N separators, or return nullptr. // Consume exactly N separators, or return nullptr.
PosPtr consumeNSeparators(PosPtr P, PosPtr End, int N) const noexcept { PosPtr consumeNSeparators(PosPtr P, PosPtr End, int N) const noexcept {
PosPtr Ret = consumeSeparator(P, End); PosPtr Ret = consumeAllSeparators(P, End);
if (Ret == nullptr) if (Ret == nullptr)
return nullptr; return nullptr;
if (P < End) { if (P < End) {