Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2025-01-10 18:11:19 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[FileCheck] Remove llvm:: prefix

Browse Source 
Summary:
Remove all llvm:: prefixes in FileCheck library header and
implementation except for calls to make_unique and make_shared since
both files already use the llvm namespace.

Reviewers: jhenderson, jdenny, probinson, arichardson

Subscribers: hiraditya, arichardson, probinson, llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D62323

llvm-svn: 361515
This commit is contained in:
Thomas Preud'homme 2019-05-23 17:19:36 +00:00
parent aa7a2c547e
commit 7b7683d7a6
2 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
llvm/include/llvm/Support/FileCheck.h
View File

@ -48,7 +48,7 @@ private:
StringRef Name;
/// Value of numeric variable, if defined, or None otherwise.
llvm::Optional<uint64_t> Value;
Optional<uint64_t> Value;
public:
/// Constructor for numeric variable \p Name with a known \p Value at parse
@ -60,7 +60,7 @@ public:
StringRef getName() const { return Name; }
/// \returns value of this numeric variable.
llvm::Optional<uint64_t> getValue() const { return Value; }
Optional<uint64_t> getValue() const { return Value; }
/// Sets value of this numeric variable if not defined. \returns whether the
/// variable was already defined.
@ -96,7 +96,7 @@ public:
/// Evaluates the value of this numeric expression, using EvalBinop to
/// perform the binary operation it consists of. \returns None if the numeric
/// variable used is undefined, or the expression value otherwise.
llvm::Optional<uint64_t> eval() const;
Optional<uint64_t> eval() const;
/// \returns the name of the undefined variable used in this expression if
/// any or an empty string otherwise.
@ -139,7 +139,7 @@ public:
/// \returns a string containing the result of the substitution represented
/// by this class instance or None if substitution failed.
virtual llvm::Optional<std::string> getResult() const = 0;
virtual Optional<std::string> getResult() const = 0;
/// \returns the name of the variable used in this substitution if undefined,
/// or an empty string otherwise.
@ -154,7 +154,7 @@ public:
/// \returns the text that the string variable in this substitution matched
/// when defined, or None if the variable is undefined.
llvm::Optional<std::string> getResult() const override;
Optional<std::string> getResult() const override;
/// \returns the name of the string variable used in this substitution if
/// undefined, or an empty string otherwise.
@ -174,7 +174,7 @@ public:
/// \returns a string containing the result of evaluating the numeric
/// expression in this substitution, or None if evaluation failed.
llvm::Optional<std::string> getResult() const override;
Optional<std::string> getResult() const override;
/// \returns the name of the numeric variable used in this substitution if
/// undefined, or an empty string otherwise.
@ -268,7 +268,7 @@ private:
public:
/// \returns the value of string variable \p VarName or None if no such
/// variable has been defined.
llvm::Optional<StringRef> getPatternVarValue(StringRef VarName);
Optional<StringRef> getPatternVarValue(StringRef VarName);
/// Defines string and numeric variables from definitions given on the
/// command line, passed as a vector of [#]VAR=VAL strings in

48
llvm/lib/Support/FileCheck.cpp
View File

@ -34,15 +34,15 @@ bool FileCheckNumericVariable::setValue(uint64_t NewValue) {
bool FileCheckNumericVariable::clearValue() {
if (!Value)
return true;
Value = llvm::None;
Value = None;
return false;
}
llvm::Optional<uint64_t> FileCheckNumExpr::eval() const {
llvm::Optional<uint64_t> LeftOp = this->LeftOp->getValue();
Optional<uint64_t> FileCheckNumExpr::eval() const {
Optional<uint64_t> LeftOp = this->LeftOp->getValue();
// Variable is undefined.
if (!LeftOp)
return llvm::None;
return None;
return EvalBinop(*LeftOp, RightOp);
}
@ -52,18 +52,18 @@ StringRef FileCheckNumExpr::getUndefVarName() const {
return StringRef();
}
llvm::Optional<std::string> FileCheckNumericSubstitution::getResult() const {
llvm::Optional<uint64_t> EvaluatedValue = NumExpr->eval();
Optional<std::string> FileCheckNumericSubstitution::getResult() const {
Optional<uint64_t> EvaluatedValue = NumExpr->eval();
if (!EvaluatedValue)
return llvm::None;
return None;
return utostr(*EvaluatedValue);
}
llvm::Optional<std::string> FileCheckStringSubstitution::getResult() const {
Optional<std::string> FileCheckStringSubstitution::getResult() const {
// Look up the value and escape it so that we can put it into the regex.
llvm::Optional<StringRef> VarVal = Context->getPatternVarValue(FromStr);
Optional<StringRef> VarVal = Context->getPatternVarValue(FromStr);
if (!VarVal)
return llvm::None;
return None;
return Regex::escape(*VarVal);
}
@ -472,7 +472,7 @@ size_t FileCheckPattern::match(StringRef Buffer, size_t &MatchLen) const {
// handled by back-references.
for (const auto &Substitution : Substitutions) {
// Substitute and check for failure (e.g. use of undefined variable).
llvm::Optional<std::string> Value = Substitution->getResult();
Optional<std::string> Value = Substitution->getResult();
if (!Value)
return StringRef::npos;
@ -533,7 +533,7 @@ void FileCheckPattern::printSubstitutions(const SourceMgr &SM, StringRef Buffer,
for (const auto &Substitution : Substitutions) {
SmallString<256> Msg;
raw_svector_ostream OS(Msg);
llvm::Optional<std::string> MatchedValue = Substitution->getResult();
Optional<std::string> MatchedValue = Substitution->getResult();
// Substitution failed or is not known at match time, print the undefined
// variable it uses.
@ -625,11 +625,11 @@ void FileCheckPattern::printFuzzyMatch(
}
}
llvm::Optional<StringRef>
Optional<StringRef>
FileCheckPatternContext::getPatternVarValue(StringRef VarName) {
auto VarIter = GlobalVariableTable.find(VarName);
if (VarIter == GlobalVariableTable.end())
return llvm::None;
return None;
return VarIter->second;
}
@ -703,9 +703,8 @@ size_t FileCheckPattern::FindRegexVarEnd(StringRef Str, SourceMgr &SM) {
return StringRef::npos;
}
StringRef
llvm::FileCheck::CanonicalizeFile(MemoryBuffer &MB,
SmallVectorImpl<char> &OutputBuffer) {
StringRef FileCheck::CanonicalizeFile(MemoryBuffer &MB,
SmallVectorImpl<char> &OutputBuffer) {
OutputBuffer.reserve(MB.getBufferSize());
for (const char *Ptr = MB.getBufferStart(), *End = MB.getBufferEnd();
@ -923,9 +922,8 @@ FindFirstMatchingPrefix(Regex &PrefixRE, StringRef &Buffer,
return {StringRef(), StringRef()};
}
bool llvm::FileCheck::ReadCheckFile(
SourceMgr &SM, StringRef Buffer, Regex &PrefixRE,
std::vector<FileCheckString> &CheckStrings) {
bool FileCheck::ReadCheckFile(SourceMgr &SM, StringRef Buffer, Regex &PrefixRE,
std::vector<FileCheckString> &CheckStrings) {
if (PatternContext.defineCmdlineVariables(Req.GlobalDefines, SM))
return true;
@ -1499,7 +1497,7 @@ static bool ValidateCheckPrefix(StringRef CheckPrefix) {
return Validator.match(CheckPrefix);
}
bool llvm::FileCheck::ValidateCheckPrefixes() {
bool FileCheck::ValidateCheckPrefixes() {
StringSet<> PrefixSet;
for (StringRef Prefix : Req.CheckPrefixes) {
@ -1517,7 +1515,7 @@ bool llvm::FileCheck::ValidateCheckPrefixes() {
return true;
}
Regex llvm::FileCheck::buildCheckPrefixRegex() {
Regex FileCheck::buildCheckPrefixRegex() {
// I don't think there's a way to specify an initial value for cl::list,
// so if nothing was specified, add the default
if (Req.CheckPrefixes.empty())
@ -1682,9 +1680,9 @@ void FileCheckPatternContext::clearLocalVars() {
GlobalNumericVariableTable.erase(Var);
}
bool llvm::FileCheck::CheckInput(SourceMgr &SM, StringRef Buffer,
ArrayRef<FileCheckString> CheckStrings,
std::vector<FileCheckDiag> *Diags) {
bool FileCheck::CheckInput(SourceMgr &SM, StringRef Buffer,
ArrayRef<FileCheckString> CheckStrings,
std::vector<FileCheckDiag> *Diags) {
bool ChecksFailed = false;
unsigned i = 0, j = 0, e = CheckStrings.size();