From d5a0bb91590a6f76be6ad859a1e905d79cd5eeb8 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 2 Sep 2024 11:14:18 +0200 Subject: [PATCH] LibJS: Remove unused field Token::m_filename --- Userland/Libraries/LibJS/Lexer.cpp | 5 +---- Userland/Libraries/LibJS/Token.h | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/Userland/Libraries/LibJS/Lexer.cpp b/Userland/Libraries/LibJS/Lexer.cpp index ddf4cc9f1ee..c5fb732857c 100644 --- a/Userland/Libraries/LibJS/Lexer.cpp +++ b/Userland/Libraries/LibJS/Lexer.cpp @@ -224,7 +224,7 @@ static constexpr auto s_single_char_tokens = make_single_char_tokens_array(); Lexer::Lexer(StringView source, StringView filename, size_t line_number, size_t line_column) : m_source(source) - , m_current_token(TokenType::Eof, {}, {}, {}, filename, 0, 0, 0) + , m_current_token(TokenType::Eof, {}, {}, {}, 0, 0, 0) , m_filename(String::from_utf8(filename).release_value_but_fixme_should_propagate_errors()) , m_line_number(line_number) , m_line_column(line_column) @@ -962,7 +962,6 @@ Token Lexer::next() m_current_token = Token(TokenType::Invalid, "Invalid unicode codepoint in source"_string, ""sv, // Since the invalid unicode can occur anywhere in the current token the trivia is not correct m_source.substring_view(value_start + 1, min(4u, m_source.length() - value_start - 2)), - m_filename, m_line_number, m_line_column - 1, value_start + 1); @@ -975,7 +974,6 @@ Token Lexer::next() token_message, m_source.substring_view(trivia_start - 1, value_start - trivia_start), m_source.substring_view(value_start - 1, m_position - value_start), - m_filename, value_start_line_number, value_start_column_number, value_start - 1); @@ -1019,7 +1017,6 @@ Token Lexer::force_slash_as_regex() String {}, m_current_token.trivia(), m_source.substring_view(value_start - 1, m_position - value_start), - m_filename, m_current_token.line_number(), m_current_token.line_column(), value_start - 1); diff --git a/Userland/Libraries/LibJS/Token.h b/Userland/Libraries/LibJS/Token.h index 8b78a607a6c..add55592a2f 100644 --- a/Userland/Libraries/LibJS/Token.h +++ b/Userland/Libraries/LibJS/Token.h @@ -181,13 +181,12 @@ class Token { public: Token() = default; - Token(TokenType type, StringView message, StringView trivia, StringView value, StringView filename, size_t line_number, size_t line_column, size_t offset) + Token(TokenType type, StringView message, StringView trivia, StringView value, size_t line_number, size_t line_column, size_t offset) : m_type(type) , m_message(message) , m_trivia(trivia) , m_original_value(value) , m_value(value) - , m_filename(filename) , m_line_number(line_number) , m_line_column(line_column) , m_offset(offset) @@ -219,7 +218,6 @@ public: [](Empty) -> DeprecatedFlyString { VERIFY_NOT_REACHED(); }); } - StringView filename() const { return m_filename; } size_t line_number() const { return m_line_number; } size_t line_column() const { return m_line_column; } size_t offset() const { return m_offset; } @@ -250,7 +248,6 @@ private: StringView m_trivia; StringView m_original_value; Variant m_value {}; - StringView m_filename; size_t m_line_number { 0 }; size_t m_line_column { 0 }; size_t m_offset { 0 };