This is an archive of the discontinued LLVM Phabricator instance.

Differential D12517

[lldb-mi] Use find, not find_first_of, for "--".
ClosedPublic

Authored by brucem on Aug 31 2015, 9:23 PM.

Details

Reviewers
abidh
ki.stfu
Commits
rGee188ba20e3f: [lldb-mi] Use find, not find_first_of, for "--".
rLLDB246529: [lldb-mi] Use find, not find_first_of, for "--".
rL246529: [lldb-mi] Use find, not find_first_of, for "--".
Summary

find_first_of will look for any of the characters, not the full
string passed in. When looking for "--" then, we must use find
and not find_first_of.

Diff Detail

Repository
rL LLVM

Event Timeline

brucem updated this revision to Diff 33662.Aug 31 2015, 9:23 PM
brucem retitled this revision from to [lldb-mi] Use find, not find_first_of, for "--"..
brucem updated this object.
brucem added reviewers: ki.stfu, abidh.
brucem added a subscriber: lldb-commits.
ki.stfu accepted this revision.Aug 31 2015, 9:34 PM
ki.stfu edited edge metadata.
This revision is now accepted and ready to land.Aug 31 2015, 9:34 PM
Closed by commit rL246529: [lldb-mi] Use find, not find_first_of, for "--". (authored by brucem). · Explain WhyAug 31 2015, 9:38 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
trunk/
tools/
lldb-mi/
2 lines
2 lines

Diff 33663

lldb/trunk/tools/lldb-mi/MICmdArgValFile.cpp

Show First 20 Lines • Show All 140 Lines • ▼ Show 20 Lines
{ {
if (vrFileNamePath.empty()) if (vrFileNamePath.empty())
return false; return false;
const bool bHavePosSlash = (vrFileNamePath.find_first_of("/") != std::string::npos); const bool bHavePosSlash = (vrFileNamePath.find_first_of("/") != std::string::npos);
const bool bHaveBckSlash = (vrFileNamePath.find_first_of("\\") != std::string::npos); const bool bHaveBckSlash = (vrFileNamePath.find_first_of("\\") != std::string::npos);
// Look for --someLongOption // Look for --someLongOption
size_t nPos = vrFileNamePath.find_first_of("--"); size_t nPos = vrFileNamePath.find("--");
const bool bLong = (nPos == 0); const bool bLong = (nPos == 0);
if (bLong) if (bLong)
return false; return false;
// Look for -f type short parameters // Look for -f type short parameters
nPos = vrFileNamePath.find_first_of("-"); nPos = vrFileNamePath.find_first_of("-");
const bool bShort = (nPos == 0); const bool bShort = (nPos == 0);
if (bShort) if (bShort)
Show All 40 Lines

lldb/trunk/tools/lldb-mi/MICmdArgValOptionLong.cpp

Show First 20 Lines • Show All 248 Lines • ▼ Show 20 Lines
bool bool
CMICmdArgValOptionLong::IsArgLongOption(const CMIUtilString &vrTxt) const CMICmdArgValOptionLong::IsArgLongOption(const CMIUtilString &vrTxt) const
{ {
const bool bHavePosSlash = (vrTxt.find_first_of("/") != std::string::npos); const bool bHavePosSlash = (vrTxt.find_first_of("/") != std::string::npos);
const bool bHaveBckSlash = (vrTxt.find_first_of("\\") != std::string::npos); const bool bHaveBckSlash = (vrTxt.find_first_of("\\") != std::string::npos);
if (bHavePosSlash || bHaveBckSlash) if (bHavePosSlash || bHaveBckSlash)
return false; return false;
const size_t nPos = vrTxt.find_first_of("--"); const size_t nPos = vrTxt.find("--");
if (nPos != 0) if (nPos != 0)
return false; return false;
if (vrTxt.length() < 3) if (vrTxt.length() < 3)
return false; return false;
const CMIUtilString strArg = vrTxt.substr(2).c_str(); const CMIUtilString strArg = vrTxt.substr(2).c_str();
if (strArg.IsNumber()) if (strArg.IsNumber())
▲ Show 20 Lines • Show All 48 Lines • Show Last 20 Lines