Author: Kazu Hirata Date: 2021-01-22T23:25:03-08:00 New Revision: 5f843b2dd2ee1f36162a861ef02b2b4bc4dc79b7
URL: https://github.com/llvm/llvm-project/commit/5f843b2dd2ee1f36162a861ef02b2b4bc4dc79b7 DIFF: https://github.com/llvm/llvm-project/commit/5f843b2dd2ee1f36162a861ef02b2b4bc4dc79b7.diff LOG: [llvm] Use isAlpha/isAlnum (NFC) Added: Modified: llvm/include/llvm/Bitstream/BitCodes.h llvm/lib/IR/Mangler.cpp llvm/lib/MC/MCAsmInfo.cpp llvm/lib/Support/YAMLParser.cpp llvm/utils/TableGen/AsmMatcherEmitter.cpp llvm/utils/TableGen/AsmWriterEmitter.cpp llvm/utils/TableGen/AsmWriterInst.cpp Removed: ################################################################################ diff --git a/llvm/include/llvm/Bitstream/BitCodes.h b/llvm/include/llvm/Bitstream/BitCodes.h index 41a3de3b20efc..9cd4e535a4701 100644 --- a/llvm/include/llvm/Bitstream/BitCodes.h +++ b/llvm/include/llvm/Bitstream/BitCodes.h @@ -18,6 +18,7 @@ #define LLVM_BITSTREAM_BITCODES_H #include "llvm/ADT/SmallVector.h" +#include "llvm/ADT/StringExtras.h" #include "llvm/Support/DataTypes.h" #include "llvm/Support/ErrorHandling.h" #include <cassert> @@ -137,13 +138,7 @@ class BitCodeAbbrevOp { } /// isChar6 - Return true if this character is legal in the Char6 encoding. - static bool isChar6(char C) { - if (C >= 'a' && C <= 'z') return true; - if (C >= 'A' && C <= 'Z') return true; - if (C >= '0' && C <= '9') return true; - if (C == '.' || C == '_') return true; - return false; - } + static bool isChar6(char C) { return isAlnum(C) || C == '.' || C == '_'; } static unsigned EncodeChar6(char C) { if (C >= 'a' && C <= 'z') return C-'a'; if (C >= 'A' && C <= 'Z') return C-'A'+26; diff --git a/llvm/lib/IR/Mangler.cpp b/llvm/lib/IR/Mangler.cpp index 8536503cb6d80..674ba3cdaa24e 100644 --- a/llvm/lib/IR/Mangler.cpp +++ b/llvm/lib/IR/Mangler.cpp @@ -12,6 +12,7 @@ #include "llvm/IR/Mangler.h" #include "llvm/ADT/SmallString.h" +#include "llvm/ADT/StringExtras.h" #include "llvm/ADT/Triple.h" #include "llvm/ADT/Twine.h" #include "llvm/IR/DataLayout.h" @@ -186,8 +187,7 @@ void Mangler::getNameWithPrefix(SmallVectorImpl<char> &OutName, // Check if the name needs quotes to be safe for the linker to interpret. static bool canBeUnquotedInDirective(char C) { - return (C >= 'a' && C <= 'z') || (C >= 'A' && C <= 'Z') || - (C >= '0' && C <= '9') || C == '_' || C == '$' || C == '.' || C == '@'; + return isAlnum(C) || C == '_' || C == '$' || C == '.' || C == '@'; } static bool canBeUnquotedInDirective(StringRef Name) { diff --git a/llvm/lib/MC/MCAsmInfo.cpp b/llvm/lib/MC/MCAsmInfo.cpp index 0d2d26b0eb47c..620d3e7cffc30 100644 --- a/llvm/lib/MC/MCAsmInfo.cpp +++ b/llvm/lib/MC/MCAsmInfo.cpp @@ -109,8 +109,7 @@ MCAsmInfo::getExprForFDESymbol(const MCSymbol *Sym, } bool MCAsmInfo::isAcceptableChar(char C) const { - return (C >= 'a' && C <= 'z') || (C >= 'A' && C <= 'Z') || - (C >= '0' && C <= '9') || C == '_' || C == '$' || C == '.' || C == '@'; + return isAlnum(C) || C == '_' || C == '$' || C == '.' || C == '@'; } bool MCAsmInfo::isValidUnquotedName(StringRef Name) const { diff --git a/llvm/lib/Support/YAMLParser.cpp b/llvm/lib/Support/YAMLParser.cpp index 17321177105e6..f68ba0d065c1d 100644 --- a/llvm/lib/Support/YAMLParser.cpp +++ b/llvm/lib/Support/YAMLParser.cpp @@ -981,17 +981,9 @@ void Scanner::advanceWhile(SkipWhileFunc Func) { Current = Final; } -static bool is_ns_hex_digit(const char C) { - return (C >= '0' && C <= '9') - || (C >= 'a' && C <= 'z') - || (C >= 'A' && C <= 'Z'); -} +static bool is_ns_hex_digit(const char C) { return isAlnum(C); } -static bool is_ns_word_char(const char C) { - return C == '-' - || (C >= 'a' && C <= 'z') - || (C >= 'A' && C <= 'Z'); -} +static bool is_ns_word_char(const char C) { return C == '-' || isAlpha(C); } void Scanner::scan_ns_uri_char() { while (true) { diff --git a/llvm/utils/TableGen/AsmMatcherEmitter.cpp b/llvm/utils/TableGen/AsmMatcherEmitter.cpp index 48b7014e84af7..9d304910ba4e6 100644 --- a/llvm/utils/TableGen/AsmMatcherEmitter.cpp +++ b/llvm/utils/TableGen/AsmMatcherEmitter.cpp @@ -1112,9 +1112,7 @@ static std::string getEnumNameForToken(StringRef Str) { case '-': Res += "_MINUS_"; break; case '#': Res += "_HASH_"; break; default: - if ((*it >= 'A' && *it <= 'Z') || - (*it >= 'a' && *it <= 'z') || - (*it >= '0' && *it <= '9')) + if (isAlnum(*it)) Res += *it; else Res += "_" + utostr((unsigned) *it) + "_"; diff --git a/llvm/utils/TableGen/AsmWriterEmitter.cpp b/llvm/utils/TableGen/AsmWriterEmitter.cpp index a09ea775808c6..92df204475b9a 100644 --- a/llvm/utils/TableGen/AsmWriterEmitter.cpp +++ b/llvm/utils/TableGen/AsmWriterEmitter.cpp @@ -713,9 +713,7 @@ class IAPrinter { ++Next; } else { // $name, just eat the usual suspects. - while (I != End && - ((*I >= 'a' && *I <= 'z') || (*I >= 'A' && *I <= 'Z') || - (*I >= '0' && *I <= '9') || *I == '_')) + while (I != End && (isAlnum(*I) || *I == '_')) ++I; Next = I; } diff --git a/llvm/utils/TableGen/AsmWriterInst.cpp b/llvm/utils/TableGen/AsmWriterInst.cpp index 24d29ffc28e5d..cf24f79334cad 100644 --- a/llvm/utils/TableGen/AsmWriterInst.cpp +++ b/llvm/utils/TableGen/AsmWriterInst.cpp @@ -18,12 +18,7 @@ using namespace llvm; -static bool isIdentChar(char C) { - return (C >= 'a' && C <= 'z') || - (C >= 'A' && C <= 'Z') || - (C >= '0' && C <= '9') || - C == '_'; -} +static bool isIdentChar(char C) { return isAlnum(C) || C == '_'; } std::string AsmWriterOperand::getCode(bool PassSubtarget) const { if (OperandType == isLiteralTextOperand) { _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
