replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

switch command line 'parse' methods to use StringRef for efficiency, which 

is also required for an llvm-side change.

llvm-svn: 82344
This commit is contained in:
Chris Lattner 2009-09-20 00:39:15 +00:00
parent 2b807cb364
commit 78765c36de
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clang/include/clang/Frontend/CommandLineSourceLoc.h
View File

@ -37,39 +37,38 @@ namespace llvm {
class parser<clang::ParsedSourceLocation>
: public basic_parser<clang::ParsedSourceLocation> {
public:
bool parse(Option &O, const char *ArgName,
const std::string &ArgValue,
bool parse(Option &O, StringRef ArgName, StringRef ArgValue,
clang::ParsedSourceLocation &Val);
};
bool
parser<clang::ParsedSourceLocation>::
parse(Option &O, const char *ArgName, const std::string &ArgValue,
parse(Option &O, StringRef ArgName, StringRef ArgValue,
clang::ParsedSourceLocation &Val) {
using namespace clang;
const char *ExpectedFormat
= "source location must be of the form filename:line:column";
std::string::size_type SecondColon = ArgValue.rfind(':');
StringRef::size_type SecondColon = ArgValue.rfind(':');
if (SecondColon == std::string::npos) {
std::fprintf(stderr, "%s\n", ExpectedFormat);
return true;
}
char *EndPtr;
long Column
= std::strtol(ArgValue.c_str() + SecondColon + 1, &EndPtr, 10);
if (EndPtr != ArgValue.c_str() + ArgValue.size()) {
unsigned Column;
if (ArgValue.substr(SecondColon + 1).getAsInteger(10, Column)) {
std::fprintf(stderr, "%s\n", ExpectedFormat);
return true;
}
ArgValue = ArgValue.substr(0, SecondColon);
std::string::size_type FirstColon = ArgValue.rfind(':', SecondColon-1);
StringRef::size_type FirstColon = ArgValue.rfind(':');
if (FirstColon == std::string::npos) {
std::fprintf(stderr, "%s\n", ExpectedFormat);
return true;
}
long Line = std::strtol(ArgValue.c_str() + FirstColon + 1, &EndPtr, 10);
if (EndPtr != ArgValue.c_str() + SecondColon) {
unsigned Line;
if (ArgValue.substr(FirstColon + 1).getAsInteger(10, Line)) {
std::fprintf(stderr, "%s\n", ExpectedFormat);
return true;
}

4
clang/tools/clang-cc/clang-cc.cpp
View File

@ -667,8 +667,8 @@ TargetABI("target-abi",
// It might be nice to add bounds to the CommandLine library directly.
struct OptLevelParser : public llvm::cl::parser<unsigned> {
bool parse(llvm::cl::Option &O, const char *ArgName,
const std::string &Arg, unsigned &Val) {
bool parse(llvm::cl::Option &O, llvm::StringRef ArgName,
llvm::StringRef Arg, unsigned &Val) {
if (llvm::cl::parser<unsigned>::parse(O, ArgName, Arg, Val))
return true;
if (Val > 3)