diff --git a/Libraries/LibJS/AST.cpp b/Libraries/LibJS/AST.cpp index 1bb47b24f1..144098e9df 100644 --- a/Libraries/LibJS/AST.cpp +++ b/Libraries/LibJS/AST.cpp @@ -419,22 +419,22 @@ Value AssignmentExpression::execute(Interpreter& interpreter) const auto rhs_result = m_rhs->execute(interpreter); switch (m_op) { - case AssignmentOp::Assign: + case AssignmentOp::Assignment: interpreter.set_variable(name, rhs_result); break; - case AssignmentOp::PlusEquals: + case AssignmentOp::AdditionAssignment: rhs_result = add(m_lhs->execute(interpreter), rhs_result); interpreter.set_variable(name, rhs_result); break; - case AssignmentOp::MinusEquals: + case AssignmentOp::SubtractionAssignment: rhs_result = sub(m_lhs->execute(interpreter), rhs_result); interpreter.set_variable(name, rhs_result); break; - case AssignmentOp::AsteriskEquals: + case AssignmentOp::MultiplicationAssignment: rhs_result = mul(m_lhs->execute(interpreter), rhs_result); interpreter.set_variable(name, rhs_result); break; - case AssignmentOp::SlashEquals: + case AssignmentOp::DivisionAssignment: rhs_result = div(m_lhs->execute(interpreter), rhs_result); interpreter.set_variable(name, rhs_result); break; @@ -446,19 +446,19 @@ void AssignmentExpression::dump(int indent) const { const char* op_string = nullptr; switch (m_op) { - case AssignmentOp::Assign: + case AssignmentOp::Assignment: op_string = "="; break; - case AssignmentOp::PlusEquals: + case AssignmentOp::AdditionAssignment: op_string = "+="; break; - case AssignmentOp::MinusEquals: + case AssignmentOp::SubtractionAssignment: op_string = "-="; break; - case AssignmentOp::AsteriskEquals: + case AssignmentOp::MultiplicationAssignment: op_string = "*="; break; - case AssignmentOp::SlashEquals: + case AssignmentOp::DivisionAssignment: op_string = "/="; break; } diff --git a/Libraries/LibJS/AST.h b/Libraries/LibJS/AST.h index 8821c5ceaf..b907514755 100644 --- a/Libraries/LibJS/AST.h +++ b/Libraries/LibJS/AST.h @@ -417,11 +417,11 @@ private: }; enum class AssignmentOp { - Assign, - PlusEquals, - MinusEquals, - AsteriskEquals, - SlashEquals, + Assignment, + AdditionAssignment, + SubtractionAssignment, + MultiplicationAssignment, + DivisionAssignment, }; class AssignmentExpression : public Expression { diff --git a/Libraries/LibJS/Parser.cpp b/Libraries/LibJS/Parser.cpp index f00c8c2efb..fdb43ed517 100644 --- a/Libraries/LibJS/Parser.cpp +++ b/Libraries/LibJS/Parser.cpp @@ -128,25 +128,25 @@ NonnullOwnPtr Parser::parse_secondary_expression(NonnullOwnPtr(BinaryOp::Plus, move(lhs), parse_expression()); case TokenType::PlusEquals: consume(); - return make(AssignmentOp::PlusEquals, move(lhs), parse_expression()); + return make(AssignmentOp::AdditionAssignment, move(lhs), parse_expression()); case TokenType::Minus: consume(); return make(BinaryOp::Minus, move(lhs), parse_expression()); case TokenType::MinusEquals: consume(); - return make(AssignmentOp::MinusEquals, move(lhs), parse_expression()); + return make(AssignmentOp::SubtractionAssignment, move(lhs), parse_expression()); case TokenType::Asterisk: consume(); return make(BinaryOp::Asterisk, move(lhs), parse_expression()); case TokenType::AsteriskEquals: consume(); - return make(AssignmentOp::AsteriskEquals, move(lhs), parse_expression()); + return make(AssignmentOp::MultiplicationAssignment, move(lhs), parse_expression()); case TokenType::Slash: consume(); return make(BinaryOp::Slash, move(lhs), parse_expression()); case TokenType::SlashEquals: consume(); - return make(AssignmentOp::SlashEquals, move(lhs), parse_expression()); + return make(AssignmentOp::DivisionAssignment, move(lhs), parse_expression()); case TokenType::GreaterThan: consume(); return make(BinaryOp::GreaterThan, move(lhs), parse_expression()); @@ -169,7 +169,7 @@ NonnullOwnPtr Parser::parse_secondary_expression(NonnullOwnPtr(AssignmentOp::Assign, move(lhs), parse_expression()); + return make(AssignmentOp::Assignment, move(lhs), parse_expression()); case TokenType::Period: consume(); return make(move(lhs), parse_expression());