1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-06-01 11:48:13 +00:00

LibJS: Parse "with" statements :^)

This commit is contained in:
Andreas Kling 2020-11-28 15:05:57 +01:00
parent 98f2da9834
commit d617120499
4 changed files with 55 additions and 0 deletions

View file

@ -255,6 +255,11 @@ Value IfStatement::execute(Interpreter& interpreter, GlobalObject& global_object
return js_undefined(); return js_undefined();
} }
Value WithStatement::execute(Interpreter&, GlobalObject&) const
{
ASSERT_NOT_REACHED();
}
Value WhileStatement::execute(Interpreter& interpreter, GlobalObject& global_object) const Value WhileStatement::execute(Interpreter& interpreter, GlobalObject& global_object) const
{ {
Value last_value = js_undefined(); Value last_value = js_undefined();
@ -1142,6 +1147,18 @@ void WhileStatement::dump(int indent) const
body().dump(indent + 1); body().dump(indent + 1);
} }
void WithStatement::dump(int indent) const
{
ASTNode::dump(indent);
print_indent(indent + 1);
printf("Object\n");
object().dump(indent + 2);
print_indent(indent + 1);
printf("Body\n");
body().dump(indent + 2);
}
void DoWhileStatement::dump(int indent) const void DoWhileStatement::dump(int indent) const
{ {
ASTNode::dump(indent); ASTNode::dump(indent);

View file

@ -351,6 +351,27 @@ private:
NonnullRefPtr<Statement> m_body; NonnullRefPtr<Statement> m_body;
}; };
class WithStatement final : public Statement {
public:
WithStatement(NonnullRefPtr<Expression> object, NonnullRefPtr<Statement> body)
: m_object(move(object))
, m_body(move(body))
{
}
const Expression& object() const { return *m_object; }
const Statement& body() const { return *m_body; }
virtual Value execute(Interpreter&, GlobalObject&) const override;
virtual void dump(int indent) const override;
private:
virtual const char* class_name() const override { return "WithStatement"; }
NonnullRefPtr<Expression> m_object;
NonnullRefPtr<Statement> m_body;
};
class ForStatement final : public Statement { class ForStatement final : public Statement {
public: public:
ForStatement(RefPtr<ASTNode> init, RefPtr<Expression> test, RefPtr<Expression> update, NonnullRefPtr<Statement> body) ForStatement(RefPtr<ASTNode> init, RefPtr<Expression> test, RefPtr<Expression> update, NonnullRefPtr<Statement> body)

View file

@ -327,6 +327,8 @@ NonnullRefPtr<Statement> Parser::parse_statement()
return parse_do_while_statement(); return parse_do_while_statement();
case TokenType::While: case TokenType::While:
return parse_while_statement(); return parse_while_statement();
case TokenType::With:
return parse_with_statement();
case TokenType::Debugger: case TokenType::Debugger:
return parse_debugger_statement(); return parse_debugger_statement();
case TokenType::Semicolon: case TokenType::Semicolon:
@ -1580,6 +1582,19 @@ NonnullRefPtr<SwitchStatement> Parser::parse_switch_statement()
return create_ast_node<SwitchStatement>(move(determinant), move(cases)); return create_ast_node<SwitchStatement>(move(determinant), move(cases));
} }
NonnullRefPtr<WithStatement> Parser::parse_with_statement()
{
consume(TokenType::With);
consume(TokenType::ParenOpen);
auto object = parse_expression(0);
consume(TokenType::ParenClose);
auto body = parse_statement();
return create_ast_node<WithStatement>(move(object), move(body));
}
NonnullRefPtr<SwitchCase> Parser::parse_switch_case() NonnullRefPtr<SwitchCase> Parser::parse_switch_case()
{ {
RefPtr<Expression> test; RefPtr<Expression> test;
@ -1847,6 +1862,7 @@ bool Parser::match_statement() const
|| type == TokenType::Throw || type == TokenType::Throw
|| type == TokenType::Try || type == TokenType::Try
|| type == TokenType::While || type == TokenType::While
|| type == TokenType::With
|| type == TokenType::For || type == TokenType::For
|| type == TokenType::CurlyOpen || type == TokenType::CurlyOpen
|| type == TokenType::Switch || type == TokenType::Switch

View file

@ -79,6 +79,7 @@ public:
NonnullRefPtr<ContinueStatement> parse_continue_statement(); NonnullRefPtr<ContinueStatement> parse_continue_statement();
NonnullRefPtr<DoWhileStatement> parse_do_while_statement(); NonnullRefPtr<DoWhileStatement> parse_do_while_statement();
NonnullRefPtr<WhileStatement> parse_while_statement(); NonnullRefPtr<WhileStatement> parse_while_statement();
NonnullRefPtr<WithStatement> parse_with_statement();
NonnullRefPtr<DebuggerStatement> parse_debugger_statement(); NonnullRefPtr<DebuggerStatement> parse_debugger_statement();
NonnullRefPtr<ConditionalExpression> parse_conditional_expression(NonnullRefPtr<Expression> test); NonnullRefPtr<ConditionalExpression> parse_conditional_expression(NonnullRefPtr<Expression> test);
NonnullRefPtr<Expression> parse_expression(int min_precedence, Associativity associate = Associativity::Right, Vector<TokenType> forbidden = {}); NonnullRefPtr<Expression> parse_expression(int min_precedence, Associativity associate = Associativity::Right, Vector<TokenType> forbidden = {});