[LLVM] Change error messages to start with lower case #113748
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@llvm/pr-subscribers-tablegen Author: Rahul Joshi (jurahul) ChangesChange LLVM Asm and TableGen Lexer/Parser error messages to begin with lower case. Patch is 27.30 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/113748.diff 24 Files Affected:
diff --git a/llvm/lib/AsmParser/LLLexer.cpp b/llvm/lib/AsmParser/LLLexer.cpp
index 759db6db60774c..4e8e3b31cde997 100644
--- a/llvm/lib/AsmParser/LLLexer.cpp
+++ b/llvm/lib/AsmParser/LLLexer.cpp
@@ -60,8 +60,8 @@ uint64_t LLLexer::atoull(const char *Buffer, const char *End) {
uint64_t OldRes = Result;
Result *= 10;
Result += *Buffer-'0';
- if (Result < OldRes) { // Uh, oh, overflow detected!!!
- LexError("constant bigger than 64 bits detected!");
+ if (Result < OldRes) { // overflow detected.
+ LexError("constant bigger than 64 bits detected");
return 0;
}
}
@@ -75,8 +75,8 @@ uint64_t LLLexer::HexIntToVal(const char *Buffer, const char *End) {
Result *= 16;
Result += hexDigitValue(*Buffer);
- if (Result < OldRes) { // Uh, oh, overflow detected!!!
- LexError("constant bigger than 64 bits detected!");
+ if (Result < OldRes) { // overflow detected.
+ LexError("constant bigger than 64 bits detected");
return 0;
}
}
@@ -99,7 +99,7 @@ void LLLexer::HexToIntPair(const char *Buffer, const char *End,
Pair[1] += hexDigitValue(*Buffer);
}
if (Buffer != End)
- LexError("constant bigger than 128 bits detected!");
+ LexError("constant bigger than 128 bits detected");
}
/// FP80HexToIntPair - translate an 80 bit FP80 number (20 hexits) into
@@ -118,7 +118,7 @@ void LLLexer::FP80HexToIntPair(const char *Buffer, const char *End,
Pair[0] += hexDigitValue(*Buffer);
}
if (Buffer != End)
- LexError("constant bigger than 128 bits detected!");
+ LexError("constant bigger than 128 bits detected");
}
// UnEscapeLexed - Run through the specified buffer and change \xx codes to the
@@ -292,7 +292,7 @@ lltok::Kind LLLexer::LexDollar() {
StrVal.assign(TokStart + 2, CurPtr - 1);
UnEscapeLexed(StrVal);
if (StringRef(StrVal).contains(0)) {
- LexError("Null bytes are not allowed in names");
+ LexError("null bytes are not allowed in names");
return lltok::Error;
}
return lltok::ComdatVar;
@@ -354,7 +354,7 @@ lltok::Kind LLLexer::LexUIntID(lltok::Kind Token) {
uint64_t Val = atoull(TokStart + 1, CurPtr);
if ((unsigned)Val != Val)
- LexError("invalid value number (too large)!");
+ LexError("invalid value number (too large)");
UIntVal = unsigned(Val);
return Token;
}
@@ -375,7 +375,7 @@ lltok::Kind LLLexer::LexVar(lltok::Kind Var, lltok::Kind VarID) {
StrVal.assign(TokStart+2, CurPtr-1);
UnEscapeLexed(StrVal);
if (StringRef(StrVal).contains(0)) {
- LexError("Null bytes are not allowed in names");
+ LexError("null bytes are not allowed in names");
return lltok::Error;
}
return Var;
@@ -410,7 +410,7 @@ lltok::Kind LLLexer::LexQuote() {
if (CurPtr[0] == ':') {
++CurPtr;
if (StringRef(StrVal).contains(0)) {
- LexError("Null bytes are not allowed in names");
+ LexError("null bytes are not allowed in names");
kind = lltok::Error;
} else {
kind = lltok::LabelStr;
@@ -492,7 +492,7 @@ lltok::Kind LLLexer::LexIdentifier() {
uint64_t NumBits = atoull(StartChar, CurPtr);
if (NumBits < IntegerType::MIN_INT_BITS ||
NumBits > IntegerType::MAX_INT_BITS) {
- LexError("bitwidth for integer type out of range!");
+ LexError("bitwidth for integer type out of range");
return lltok::Error;
}
TyVal = IntegerType::get(Context, NumBits);
@@ -1122,7 +1122,7 @@ lltok::Kind LLLexer::LexDigitOrNegative() {
uint64_t Val = atoull(TokStart, CurPtr);
++CurPtr; // Skip the colon.
if ((unsigned)Val != Val)
- LexError("invalid value number (too large)!");
+ LexError("invalid value number (too large)");
UIntVal = unsigned(Val);
return lltok::LabelID;
}
diff --git a/llvm/lib/TableGen/TGLexer.cpp b/llvm/lib/TableGen/TGLexer.cpp
index 8fe7f69ecf8e59..ffe5fb9f8750b9 100644
--- a/llvm/lib/TableGen/TGLexer.cpp
+++ b/llvm/lib/TableGen/TGLexer.cpp
@@ -89,7 +89,7 @@ TGLexer::TGLexer(SourceMgr &SM, ArrayRef<std::string> Macros) : SrcMgr(SM) {
for (StringRef MacroName : Macros) {
const char *End = lexMacroName(MacroName);
if (End != MacroName.end())
- PrintFatalError("Invalid macro name `" + MacroName +
+ PrintFatalError("invalid macro name `" + MacroName +
"` specified on command line");
DefinedMacros.insert(MacroName);
@@ -156,7 +156,7 @@ int TGLexer::getNextChar() {
return EOF;
}
PrintError(getLoc(),
- "NUL character is invalid in source; treated as space");
+ "nul character is invalid in source; treated as space");
return ' ';
}
@@ -188,7 +188,7 @@ tgtok::TokKind TGLexer::LexToken(bool FileOrLineStart) {
return LexIdentifier();
// Unknown character, emit an error.
- return ReturnError(TokStart, "Unexpected character");
+ return ReturnError(TokStart, "unexpected character");
case EOF:
// Lex next token, if we just left an include file.
// Note that leaving an include file means that the next
@@ -231,7 +231,7 @@ tgtok::TokKind TGLexer::LexToken(bool FileOrLineStart) {
++CurPtr; // Eat third dot.
return tgtok::dotdotdot;
}
- return ReturnError(TokStart, "Invalid '..' punctuation");
+ return ReturnError(TokStart, "invalid '..' punctuation");
}
return tgtok::dot;
@@ -255,7 +255,7 @@ tgtok::TokKind TGLexer::LexToken(bool FileOrLineStart) {
if (SkipCComment())
return tgtok::Error;
} else // Otherwise, this is an error.
- return ReturnError(TokStart, "Unexpected character");
+ return ReturnError(TokStart, "unexpected character");
return LexToken(FileOrLineStart);
case '-': case '+':
case '0': case '1': case '2': case '3': case '4': case '5': case '6':
@@ -313,10 +313,10 @@ tgtok::TokKind TGLexer::LexString() {
while (*CurPtr != '"') {
// If we hit the end of the buffer, report an error.
if (*CurPtr == 0 && CurPtr == CurBuf.end())
- return ReturnError(StrStart, "End of file in string literal");
+ return ReturnError(StrStart, "end of file in string literal");
if (*CurPtr == '\n' || *CurPtr == '\r')
- return ReturnError(StrStart, "End of line in string literal");
+ return ReturnError(StrStart, "end of line in string literal");
if (*CurPtr != '\\') {
CurStrVal += *CurPtr++;
@@ -346,7 +346,7 @@ tgtok::TokKind TGLexer::LexString() {
// If we hit the end of the buffer, report an error.
case '\0':
if (CurPtr == CurBuf.end())
- return ReturnError(StrStart, "End of file in string literal");
+ return ReturnError(StrStart, "end of file in string literal");
[[fallthrough]];
default:
return ReturnError(CurPtr, "invalid escape in string literal");
@@ -359,7 +359,7 @@ tgtok::TokKind TGLexer::LexString() {
tgtok::TokKind TGLexer::LexVarName() {
if (!isValidIDChar(CurPtr[0], /*First=*/true))
- return ReturnError(TokStart, "Invalid variable name");
+ return ReturnError(TokStart, "invalid variable name");
// Otherwise, we're ok, consume the rest of the characters.
const char *VarNameStart = CurPtr++;
@@ -433,7 +433,7 @@ bool TGLexer::LexInclude() {
tgtok::TokKind Tok = LexToken();
if (Tok == tgtok::Error) return true;
if (Tok != tgtok::StrVal) {
- PrintError(getLoc(), "Expected filename after include");
+ PrintError(getLoc(), "expected filename after include");
return true;
}
@@ -444,7 +444,7 @@ bool TGLexer::LexInclude() {
CurBuffer = SrcMgr.AddIncludeFile(Filename, SMLoc::getFromPointer(CurPtr),
IncludedFile);
if (!CurBuffer) {
- PrintError(getLoc(), "Could not find include file '" + Filename + "'");
+ PrintError(getLoc(), "could not find include file '" + Filename + "'");
return true;
}
@@ -476,7 +476,7 @@ bool TGLexer::SkipCComment() {
int CurChar = getNextChar();
switch (CurChar) {
case EOF:
- PrintError(TokStart, "Unterminated comment!");
+ PrintError(TokStart, "unterminated comment");
return true;
case '*':
// End of the comment?
@@ -543,7 +543,7 @@ tgtok::TokKind TGLexer::LexNumber() {
// Requires at least one digit.
if (CurPtr == NumStart)
- return ReturnError(TokStart, "Invalid number");
+ return ReturnError(TokStart, "invalid number");
errno = 0;
if (IsMinus)
@@ -552,9 +552,9 @@ tgtok::TokKind TGLexer::LexNumber() {
CurIntVal = strtoull(NumStart, nullptr, Base);
if (errno == EINVAL)
- return ReturnError(TokStart, "Invalid number");
+ return ReturnError(TokStart, "invalid number");
if (errno == ERANGE)
- return ReturnError(TokStart, "Number out of range");
+ return ReturnError(TokStart, "number out of range");
return Base == 2 ? tgtok::BinaryIntVal : tgtok::IntVal;
}
@@ -580,13 +580,13 @@ tgtok::TokKind TGLexer::LexBracket() {
}
}
- return ReturnError(CodeStart - 2, "Unterminated code block");
+ return ReturnError(CodeStart - 2, "unterminated code block");
}
/// LexExclaim - Lex '!' and '![a-zA-Z]+'.
tgtok::TokKind TGLexer::LexExclaim() {
if (!isAlpha(*CurPtr))
- return ReturnError(CurPtr - 1, "Invalid \"!operator\"");
+ return ReturnError(CurPtr - 1, "invalid \"!operator\"");
const char *Start = CurPtr++;
while (isAlpha(*CurPtr))
@@ -648,7 +648,8 @@ tgtok::TokKind TGLexer::LexExclaim() {
.Case("repr", tgtok::XRepr)
.Default(tgtok::Error);
- return Kind != tgtok::Error ? Kind : ReturnError(Start-1, "Unknown operator");
+ return Kind != tgtok::Error ? Kind
+ : ReturnError(Start - 1, "unknown operator");
}
bool TGLexer::prepExitInclude(bool IncludeStackMustBeEmpty) {
@@ -662,17 +663,17 @@ bool TGLexer::prepExitInclude(bool IncludeStackMustBeEmpty) {
// Pop the preprocessing controls from the include stack.
if (PrepIncludeStack.empty()) {
- PrintFatalError("Preprocessor include stack is empty");
+ PrintFatalError("preprocessor include stack is empty");
}
PrepIncludeStack.pop_back();
if (IncludeStackMustBeEmpty) {
if (!PrepIncludeStack.empty())
- PrintFatalError("Preprocessor include stack is not empty");
+ PrintFatalError("preprocessor include stack is not empty");
} else {
if (PrepIncludeStack.empty())
- PrintFatalError("Preprocessor include stack is empty");
+ PrintFatalError("preprocessor include stack is empty");
}
return true;
@@ -732,7 +733,7 @@ bool TGLexer::prepEatPreprocessorDirective(tgtok::TokKind Kind) {
return true;
}
- PrintFatalError("Unsupported preprocessing token in "
+ PrintFatalError("unsupported preprocessing token in "
"prepEatPreprocessorDirective()");
return false;
}
@@ -748,7 +749,7 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
StringRef MacroName = prepLexMacroName();
StringRef IfTokName = Kind == tgtok::Ifdef ? "#ifdef" : "#ifndef";
if (MacroName.empty())
- return ReturnError(TokStart, "Expected macro name after " + IfTokName);
+ return ReturnError(TokStart, "expected macro name after " + IfTokName);
bool MacroIsDefined = DefinedMacros.count(MacroName) != 0;
@@ -763,7 +764,7 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
{tgtok::Ifdef, MacroIsDefined, SMLoc::getFromPointer(TokStart)});
if (!prepSkipDirectiveEnd())
- return ReturnError(CurPtr, "Only comments are supported after " +
+ return ReturnError(CurPtr, "only comments are supported after " +
IfTokName + " NAME");
// If we were not processing tokens before this #ifdef,
@@ -794,7 +795,7 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
if (IfdefEntry.Kind != tgtok::Ifdef) {
PrintError(TokStart, "double #else");
- return ReturnError(IfdefEntry.SrcPos, "Previous #else is here");
+ return ReturnError(IfdefEntry.SrcPos, "previous #else is here");
}
// Replace the corresponding #ifdef's control with its negation
@@ -804,7 +805,7 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
{Kind, !IfdefEntry.IsDefined, SMLoc::getFromPointer(TokStart)});
if (!prepSkipDirectiveEnd())
- return ReturnError(CurPtr, "Only comments are supported after #else");
+ return ReturnError(CurPtr, "only comments are supported after #else");
// If we were processing tokens before this #else,
// we have to start skipping lines until the matching #endif.
@@ -827,12 +828,12 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
if (IfdefOrElseEntry.Kind != tgtok::Ifdef &&
IfdefOrElseEntry.Kind != tgtok::Else) {
- PrintFatalError("Invalid preprocessor control on the stack");
+ PrintFatalError("invalid preprocessor control on the stack");
return tgtok::Error;
}
if (!prepSkipDirectiveEnd())
- return ReturnError(CurPtr, "Only comments are supported after #endif");
+ return ReturnError(CurPtr, "only comments are supported after #endif");
PrepIncludeStack.back()->pop_back();
@@ -847,15 +848,15 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
} else if (Kind == tgtok::Define) {
StringRef MacroName = prepLexMacroName();
if (MacroName.empty())
- return ReturnError(TokStart, "Expected macro name after #define");
+ return ReturnError(TokStart, "expected macro name after #define");
if (!DefinedMacros.insert(MacroName).second)
PrintWarning(getLoc(),
- "Duplicate definition of macro: " + Twine(MacroName));
+ "duplicate definition of macro: " + Twine(MacroName));
if (!prepSkipDirectiveEnd())
return ReturnError(CurPtr,
- "Only comments are supported after #define NAME");
+ "only comments are supported after #define NAME");
if (!ReturnNextLiveToken) {
PrintFatalError("#define must be ignored during the lines skipping");
@@ -865,13 +866,13 @@ tgtok::TokKind TGLexer::lexPreprocessor(tgtok::TokKind Kind,
return LexToken();
}
- PrintFatalError("Preprocessing directive is not supported");
+ PrintFatalError("preprocessing directive is not supported");
return tgtok::Error;
}
bool TGLexer::prepSkipRegion(bool MustNeverBeFalse) {
if (!MustNeverBeFalse)
- PrintFatalError("Invalid recursion.");
+ PrintFatalError("invalid recursion.");
do {
// Skip all symbols to the line end.
@@ -917,7 +918,7 @@ bool TGLexer::prepSkipRegion(bool MustNeverBeFalse) {
// due to #else or #endif.
if (prepIsProcessingEnabled()) {
if (Kind != tgtok::Else && Kind != tgtok::Endif) {
- PrintFatalError("Tokens processing was enabled by an unexpected "
+ PrintFatalError("tokens processing was enabled by an unexpected "
"preprocessing directive");
return false;
}
@@ -1032,7 +1033,7 @@ bool TGLexer::prepSkipDirectiveEnd() {
return false;
} else {
TokStart = CurPtr;
- PrintError(CurPtr, "Unexpected character");
+ PrintError(CurPtr, "unexpected character");
return false;
}
@@ -1067,8 +1068,8 @@ void TGLexer::prepReportPreprocessorStackError() {
"empty control stack");
auto &PrepControl = PrepIncludeStack.back()->back();
- PrintError(CurBuf.end(), "Reached EOF without matching #endif");
- PrintError(PrepControl.SrcPos, "The latest preprocessor control is here");
+ PrintError(CurBuf.end(), "reached EOF without matching #endif");
+ PrintError(PrepControl.SrcPos, "the latest preprocessor control is here");
TokStart = CurPtr;
}
diff --git a/llvm/test/Assembler/invalid-inttype.ll b/llvm/test/Assembler/invalid-inttype.ll
index c8aa7c66b79e4d..9e3c31148af2d6 100644
--- a/llvm/test/Assembler/invalid-inttype.ll
+++ b/llvm/test/Assembler/invalid-inttype.ll
@@ -1,5 +1,5 @@
; RUN: not llvm-as --disable-output %s 2>&1 | FileCheck -DFILE=%s %s
; i8388609 is the smallest integer type that can't be represented in LLVM IR
-; CHECK: [[FILE]]:[[@LINE+1]]:21: error: bitwidth for integer type out of range!
+; CHECK: [[FILE]]:[[@LINE+1]]:21: error: bitwidth for integer type out of range
@i2 = common global i8388609 0, align 4
diff --git a/llvm/test/Assembler/invalid-name.ll b/llvm/test/Assembler/invalid-name.ll
index 74133e60df54d5..ad73465895d459 100644
Binary files a/llvm/test/Assembler/invalid-name.ll and b/llvm/test/Assembler/invalid-name.ll differ
diff --git a/llvm/test/Assembler/invalid-name2.ll b/llvm/test/Assembler/invalid-name2.ll
index 8a848798a54caf..22740339abb0b6 100644
Binary files a/llvm/test/Assembler/invalid-name2.ll and b/llvm/test/Assembler/invalid-name2.ll differ
diff --git a/llvm/test/TableGen/64-bit-int.td b/llvm/test/TableGen/64-bit-int.td
index 2d2bdb8b560e2c..d2a2999c14e991 100644
--- a/llvm/test/TableGen/64-bit-int.td
+++ b/llvm/test/TableGen/64-bit-int.td
@@ -16,7 +16,7 @@ def {
#ifdef OOR3
bits<64> Val = 0x10000000000000000;
#endif
-// CHECK-OOR: error: Number out of range
+// CHECK-OOR: error: number out of range
bits<64> BinVal0 = 0x8000000000000000;
bits<64> HexVal0 = 0b1000000000000000000000000000000000000000000000000000000000000000;
diff --git a/llvm/test/TableGen/invalid-macro-name-command-line.td b/llvm/test/TableGen/invalid-macro-name-command-line.td
index 0d2307997ebe54..7d19e8996639af 100644
--- a/llvm/test/TableGen/invalid-macro-name-command-line.td
+++ b/llvm/test/TableGen/invalid-macro-name-command-line.td
@@ -3,7 +3,7 @@
// RUN: not llvm-tblgen %s -D_MAC# 2>&1 | FileCheck %s --check-prefix=CHECK-TEST-3
// RUN: not llvm-tblgen %s -D 2>&1 | FileCheck %s --check-prefix=CHECK-TEST-4
-// CHECK-TEST-1: error: Invalid macro name `MACRO=1` specified on command line
-// CHECK-TEST-2: error: Invalid macro name `0MAC` specified on command line
-// CHECK-TEST-3: error: Invalid macro name `_MAC#` specified on command line
+// CHECK-TEST-1: error: invalid macro name `MACRO=1` specified on command line
+// CHECK-TEST-2: error: invalid macro name `0MAC` specified on command line
+// CHECK-TEST-3: error: invalid macro name `_MAC#` specified on command line
// CHECK-TEST-4: for the -D option: requires a value!
diff --git a/llvm/test/TableGen/nul-char.td b/llvm/test/TableGen/nul-char.td
index 2a628b52f03818..94c5ea21d0756b 100644
--- a/llvm/test/TableGen/nul-char.td
+++ b/llvm/test/TableGen/nul-char.td
@@ -6,10 +6,10 @@
#ifdef ERROR1
-// ERROR1: error: NUL character is invalid in source; treated as space
-// ERROR1: error: NUL character is invalid in source; treated as space
-// ERROR1: error: NUL character is invalid in source; treated as space
-// ERROR1: error: NUL character is invalid in source; treated as space
+// ERROR1: error: nul character is invalid in source; treated as space
+// ERROR1: error: nul character is invalid in source; treated as space
+// ERROR1: error: nul character is invalid in source; treated as space
+// ERROR1: error: nul character is invalid in source; treated as space
// ERROR1: error: expected ';' after declaration
def Foo@ {
diff --git a/llvm/test/TableGen/prep-diag1.td b/llvm/test/TableGen/prep-diag1.td
index 41b7d477c6942e..27f428f4fe9598 100644
--- a/llvm/test/TableGen/prep-diag1.td
+++ b/llvm/test/TableGen/prep-diag1.td
@@ -4,22 +4,22 @@
// RUN: not llvm-tblgen -I %p %s 2>&1 | FileCheck --check-prefixes=DIAG3 %s
#ifdef DIAG1
-// DIAG1: error: Only comments are supported after #define NAME
+// DIAG1: error: only comments are supported after #define NAME
#define ENABLED1/*
*/class C;
#endif // DIAG1
#ifdef DIAG4
-// DIAG4: warning: Duplicate definition of macro: ENABLED1
+// DIAG4: warning: duplicate definition of macro: ENABLED1
#define ENABLED1
#define ENABLED1
#endif // DIAG4
#ifdef DIAG2
-// DIAG2: error: Only comments are supported after #ifdef NAME
+// DIAG2: error: only comments are supported after #ifdef NAME
// Invalid #ifdef below should be detected even if DIAG2 is not defined.
-// DIAG3: error: Only comments are supported after #ifdef NAME
+// DIAG3: error: only comments are supported after #ifdef NAME
#ifdef DIAG2/*
*/class C;
#endif
diff --git a/llvm/test/TableGen/prep-diag10.td b/llvm/te...
[truncated]
|
arsenm
reviewed
Oct 26, 2024
Change LLVM Asm and TableGen Lexer/Parser error messages to begin with lower case.
jurahul
force-pushed
the
lowercase_error_messages
branch
from
c2953e3 to
273382c
Compare
|
@arsenm any further comments? |
Thanks. Will give @arsenm a final chance to look before merging. |
arsenm
approved these changes
Oct 29, 2024
NoumanAmir657
pushed a commit
to NoumanAmir657/llvm-project
that referenced
this pull request
Nov 4, 2024
Change LLVM Asm and TableGen Lexer/Parser error messages to begin with lower case.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Change LLVM Asm and TableGen Lexer/Parser error messages to begin with lower case.