Better log message

This commit is contained in:
Rafał Grodziński
2025-07-31 13:39:15 +09:00
parent ad17bd2b5f
commit def96445b2

View File

@@ -482,7 +482,7 @@ void Logger::print(shared_ptr<Error> error) {
switch (error->getKind()) { switch (error->getKind()) {
case ErrorKind::LEXER_ERROR: { case ErrorKind::LEXER_ERROR: {
string lexme = error->getLexme() ? *(error->getLexme()) : ""; string lexme = error->getLexme() ? *(error->getLexme()) : "";
message = format("Unexpected token \"{}\" at line: {}, column: {}", lexme, error->getLine() + 1, error->getColumn() + 1); message = format("At line {}, column {}: Unexpected token \"{}\"", error->getLine() + 1, error->getColumn() + 1, lexme);
break; break;
} }
case ErrorKind::PARSER_ERROR: { case ErrorKind::PARSER_ERROR: {
@@ -492,13 +492,13 @@ void Logger::print(shared_ptr<Error> error) {
if (expectedTokenKind) { if (expectedTokenKind) {
message = format( message = format(
"Expected token {} but instead found {} at line: {}, column: {}", "At line {}, column {}: Expected token {} but found {} instead",
toString(*expectedTokenKind), toString(token), token->getLine() + 1, token->getColumn() + 1 token->getLine() + 1, token->getColumn() + 1, toString(*expectedTokenKind), toString(token)
); );
} else { } else {
message = format( message = format(
"Unexpected token \"{}\" found at line: {}, column: {}", "At line {}, column {}: Unexpected token \"{}\" found",
toString(token), token->getLine() + 1, token->getColumn() + 1 token->getLine() + 1, token->getColumn() + 1, toString(token)
); );
} }
if (errorMessage) if (errorMessage)
@@ -507,7 +507,7 @@ void Logger::print(shared_ptr<Error> error) {
} }
case ErrorKind::BUILDER_ERROR: { case ErrorKind::BUILDER_ERROR: {
string errorMessage = error->getMessage() ? *(error->getMessage()) : ""; string errorMessage = error->getMessage() ? *(error->getMessage()) : "";
message = format("Error at line {}, column {}: {}", error->getLine(), error->getColumn(), errorMessage); message = format("At line {}, column {}: {}", error->getLine(), error->getColumn(), errorMessage);
break; break;
} }
} }