RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 12:48:10 +00:00
Code Issues Activity Actions

LibJS: Clean up token constructor and use method instead for identifiers

Browse source 
Having two large constructor with just one parameter difference in the
middle seems quite dangerous so just do it with a method.
This commit is contained in:
davidot 2021-09-01 18:35:33 +02:00 • committed by Linus Groh
parent 3fee7b0d0b
commit bbddfeef4b
2 changed files with 17 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Userland/Libraries/LibJS/Lexer.cpp
View file

@ -768,28 +768,18 @@ Token Lexer::next()
}
}
if (identifier.has_value()) {
m_current_token = Token(
token_type,
token_message,
m_source.substring_view(trivia_start - 1, value_start - trivia_start),
m_source.substring_view(value_start - 1, m_position - value_start),
identifier.release_value(),
m_filename,
value_start_line_number,
value_start_column_number,
m_position);
} else {
m_current_token = Token(
token_type,
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,
m_position);
}
m_current_token = Token(
token_type,
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,
m_position);
if (identifier.has_value())
m_current_token.set_identifier_value(identifier.release_value());
if constexpr (LEXER_DEBUG) {
dbgln("------------------------------");