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

LibJS: Tweak AssignmentOp names

Browse source
This commit is contained in:
Andreas Kling 2020-03-12 13:54:56 +01:00
parent 4781e3fb72
commit 4dc1d6654f
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Libraries/LibJS/AST.cpp
View file

@ -419,22 +419,22 @@ Value AssignmentExpression::execute(Interpreter& interpreter) const
auto rhs_result = m_rhs->execute(interpreter); auto rhs_result = m_rhs->execute(interpreter);
switch (m_op) { switch (m_op) {
case AssignmentOp::Assign: case AssignmentOp::Assignment:
interpreter.set_variable(name, rhs_result); interpreter.set_variable(name, rhs_result);
break; break;
case AssignmentOp::PlusEquals: case AssignmentOp::AdditionAssignment:
rhs_result = add(m_lhs->execute(interpreter), rhs_result); rhs_result = add(m_lhs->execute(interpreter), rhs_result);
interpreter.set_variable(name, rhs_result); interpreter.set_variable(name, rhs_result);
break; break;
case AssignmentOp::MinusEquals: case AssignmentOp::SubtractionAssignment:
rhs_result = sub(m_lhs->execute(interpreter), rhs_result); rhs_result = sub(m_lhs->execute(interpreter), rhs_result);
interpreter.set_variable(name, rhs_result); interpreter.set_variable(name, rhs_result);
break; break;
case AssignmentOp::AsteriskEquals: case AssignmentOp::MultiplicationAssignment:
rhs_result = mul(m_lhs->execute(interpreter), rhs_result); rhs_result = mul(m_lhs->execute(interpreter), rhs_result);
interpreter.set_variable(name, rhs_result); interpreter.set_variable(name, rhs_result);
break; break;
case AssignmentOp::SlashEquals: case AssignmentOp::DivisionAssignment:
rhs_result = div(m_lhs->execute(interpreter), rhs_result); rhs_result = div(m_lhs->execute(interpreter), rhs_result);
interpreter.set_variable(name, rhs_result); interpreter.set_variable(name, rhs_result);
break; break;
@ -446,19 +446,19 @@ void AssignmentExpression::dump(int indent) const
{ {
const char* op_string = nullptr; const char* op_string = nullptr;
switch (m_op) { switch (m_op) {
case AssignmentOp::Assign: case AssignmentOp::Assignment:
op_string = "="; op_string = "=";
break; break;
case AssignmentOp::PlusEquals: case AssignmentOp::AdditionAssignment:
op_string = "+="; op_string = "+=";
break; break;
case AssignmentOp::MinusEquals: case AssignmentOp::SubtractionAssignment:
op_string = "-="; op_string = "-=";
break; break;
case AssignmentOp::AsteriskEquals: case AssignmentOp::MultiplicationAssignment:
op_string = "*="; op_string = "*=";
break; break;
case AssignmentOp::SlashEquals: case AssignmentOp::DivisionAssignment:
op_string = "/="; op_string = "/=";
break; break;
} }

10
Libraries/LibJS/AST.h
View file

@ -417,11 +417,11 @@ private:
}; };
enum class AssignmentOp { enum class AssignmentOp {
Assign, Assignment,
PlusEquals, AdditionAssignment,
MinusEquals, SubtractionAssignment,
AsteriskEquals, MultiplicationAssignment,
SlashEquals, DivisionAssignment,
}; };
class AssignmentExpression : public Expression { class AssignmentExpression : public Expression {

10
Libraries/LibJS/Parser.cpp
View file

@ -128,25 +128,25 @@ NonnullOwnPtr<Expression> Parser::parse_secondary_expression(NonnullOwnPtr<Expre
return make<BinaryExpression>(BinaryOp::Plus, move(lhs), parse_expression()); return make<BinaryExpression>(BinaryOp::Plus, move(lhs), parse_expression());
case TokenType::PlusEquals: case TokenType::PlusEquals:
consume(); consume();
return make<AssignmentExpression>(AssignmentOp::PlusEquals, move(lhs), parse_expression()); return make<AssignmentExpression>(AssignmentOp::AdditionAssignment, move(lhs), parse_expression());
case TokenType::Minus: case TokenType::Minus:
consume(); consume();
return make<BinaryExpression>(BinaryOp::Minus, move(lhs), parse_expression()); return make<BinaryExpression>(BinaryOp::Minus, move(lhs), parse_expression());
case TokenType::MinusEquals: case TokenType::MinusEquals:
consume(); consume();
return make<AssignmentExpression>(AssignmentOp::MinusEquals, move(lhs), parse_expression()); return make<AssignmentExpression>(AssignmentOp::SubtractionAssignment, move(lhs), parse_expression());
case TokenType::Asterisk: case TokenType::Asterisk:
consume(); consume();
return make<BinaryExpression>(BinaryOp::Asterisk, move(lhs), parse_expression()); return make<BinaryExpression>(BinaryOp::Asterisk, move(lhs), parse_expression());
case TokenType::AsteriskEquals: case TokenType::AsteriskEquals:
consume(); consume();
return make<AssignmentExpression>(AssignmentOp::AsteriskEquals, move(lhs), parse_expression()); return make<AssignmentExpression>(AssignmentOp::MultiplicationAssignment, move(lhs), parse_expression());
case TokenType::Slash: case TokenType::Slash:
consume(); consume();
return make<BinaryExpression>(BinaryOp::Slash, move(lhs), parse_expression()); return make<BinaryExpression>(BinaryOp::Slash, move(lhs), parse_expression());
case TokenType::SlashEquals: case TokenType::SlashEquals:
consume(); consume();
return make<AssignmentExpression>(AssignmentOp::SlashEquals, move(lhs), parse_expression()); return make<AssignmentExpression>(AssignmentOp::DivisionAssignment, move(lhs), parse_expression());
case TokenType::GreaterThan: case TokenType::GreaterThan:
consume(); consume();
return make<BinaryExpression>(BinaryOp::GreaterThan, move(lhs), parse_expression()); return make<BinaryExpression>(BinaryOp::GreaterThan, move(lhs), parse_expression());
@ -169,7 +169,7 @@ NonnullOwnPtr<Expression> Parser::parse_secondary_expression(NonnullOwnPtr<Expre
return parse_call_expression(move(lhs)); return parse_call_expression(move(lhs));
case TokenType::Equals: case TokenType::Equals:
consume(); consume();
return make<AssignmentExpression>(AssignmentOp::Assign, move(lhs), parse_expression()); return make<AssignmentExpression>(AssignmentOp::Assignment, move(lhs), parse_expression());
case TokenType::Period: case TokenType::Period:
consume(); consume();
return make<MemberExpression>(move(lhs), parse_expression()); return make<MemberExpression>(move(lhs), parse_expression());