summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibJS/Parser.cpp
diff options
context:
space:
mode:
authordavidot <davidot@serenityos.org>2021-10-08 00:38:24 +0200
committerLinus Groh <mail@linusgroh.de>2021-10-15 10:27:16 +0100
commit9394cbcd24ef7f5f139f65ae581d2e528fad5b4d (patch)
treefb87c7fa1097f3fbd10292fd841511803976ffc0 /Userland/Libraries/LibJS/Parser.cpp
parentc3cb44ca8a5a25fa6362e4a73e138acac7ee2acd (diff)
downloadserenity-9394cbcd24ef7f5f139f65ae581d2e528fad5b4d.zip
LibJS: Do not save state for peeking at the next token from the lexer
This saves having to save and load the parser state. This could give an incorrect token in some cases where the parser communicates to the lexer. However this is not applicable in any of the current usages and this would require one to parse the current token as normal which is exactly what you don't want to do in that scenario.
Diffstat (limited to 'Userland/Libraries/LibJS/Parser.cpp')
-rw-r--r--Userland/Libraries/LibJS/Parser.cpp21
1 files changed, 8 insertions, 13 deletions
diff --git a/Userland/Libraries/LibJS/Parser.cpp b/Userland/Libraries/LibJS/Parser.cpp
index 9778b572ab..4f5228b2b2 100644
--- a/Userland/Libraries/LibJS/Parser.cpp
+++ b/Userland/Libraries/LibJS/Parser.cpp
@@ -615,8 +615,7 @@ RefPtr<FunctionExpression> Parser::try_parse_arrow_function_expression(bool expe
// The logic is duplicated below in the "real" !expect_parens branch.
if (!match_identifier() && !match(TokenType::Yield) && !match(TokenType::Await))
return nullptr;
- auto forked_lexer = m_state.lexer;
- auto token = forked_lexer.next();
+ auto token = next_token();
if (token.trivia_contains_line_terminator())
return nullptr;
if (token.type() != TokenType::Arrow)
@@ -725,9 +724,7 @@ RefPtr<Statement> Parser::try_parse_labelled_statement(AllowLabelledFunction all
{
{
// NOTE: This is a fast path where we try to fail early to avoid the expensive save_state+load_state.
- auto forked_lexer = m_state.lexer;
- auto token = forked_lexer.next();
- if (token.type() != TokenType::Colon)
+ if (next_token().type() != TokenType::Colon)
return {};
}
@@ -3138,7 +3135,7 @@ bool Parser::match_export_or_import() const
|| type == TokenType::Import;
}
-bool Parser::match_declaration()
+bool Parser::match_declaration() const
{
auto type = m_state.current_token.type();
@@ -3152,18 +3149,16 @@ bool Parser::match_declaration()
|| type == TokenType::Let;
}
-Token Parser::next_token()
+Token Parser::next_token() const
{
- save_state();
+ Lexer lookahead_lexer = m_state.lexer;
- consume();
- auto token_after = m_state.current_token;
+ auto token_after = lookahead_lexer.next();
- load_state();
return token_after;
}
-bool Parser::try_match_let_declaration()
+bool Parser::try_match_let_declaration() const
{
VERIFY(m_state.current_token.type() == TokenType::Let);
auto token_after = next_token();
@@ -3177,7 +3172,7 @@ bool Parser::try_match_let_declaration()
return false;
}
-bool Parser::match_variable_declaration()
+bool Parser::match_variable_declaration() const
{
auto type = m_state.current_token.type();