RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-28 15:25:06 +00:00
Code Issues Activity Actions

LibJS: Rename BinaryOp::{Plus,Minus,Asterisk,Slash}

Browse source
This commit is contained in:
Linus Groh 2020-04-05 12:56:53 +01:00 • committed by Andreas Kling
parent a4f6f8e0e7
commit eafd3dbaf8
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Libraries/LibJS/AST.cpp
View file

@ -273,13 +273,13 @@ Value BinaryExpression::execute(Interpreter& interpreter) const
return {}; return {};
switch (m_op) { switch (m_op) {
case BinaryOp::Plus: case BinaryOp::Addition:
return add(lhs_result, rhs_result); return add(lhs_result, rhs_result);
case BinaryOp::Minus: case BinaryOp::Subtraction:
return sub(lhs_result, rhs_result); return sub(lhs_result, rhs_result);
case BinaryOp::Asterisk: case BinaryOp::Multiplication:
return mul(lhs_result, rhs_result); return mul(lhs_result, rhs_result);
case BinaryOp::Slash: case BinaryOp::Division:
return div(lhs_result, rhs_result); return div(lhs_result, rhs_result);
case BinaryOp::Modulo: case BinaryOp::Modulo:
return mod(lhs_result, rhs_result); return mod(lhs_result, rhs_result);
@ -406,16 +406,16 @@ void BinaryExpression::dump(int indent) const
{ {
const char* op_string = nullptr; const char* op_string = nullptr;
switch (m_op) { switch (m_op) {
case BinaryOp::Plus: case BinaryOp::Addition:
op_string = "+"; op_string = "+";
break; break;
case BinaryOp::Minus: case BinaryOp::Subtraction:
op_string = "-"; op_string = "-";
break; break;
case BinaryOp::Asterisk: case BinaryOp::Multiplication:
op_string = "*"; op_string = "*";
break; break;
case BinaryOp::Slash: case BinaryOp::Division:
op_string = "/"; op_string = "/";
break; break;
case BinaryOp::Modulo: case BinaryOp::Modulo:

8
Libraries/LibJS/AST.h
View file

@ -309,10 +309,10 @@ private:
}; };
enum class BinaryOp { enum class BinaryOp {
Plus, Addition,
Minus, Subtraction,
Asterisk, Multiplication,
Slash, Division,
Modulo, Modulo,
TypedEquals, TypedEquals,
TypedInequals, TypedInequals,

8
Libraries/LibJS/Parser.cpp
View file

@ -445,25 +445,25 @@ NonnullRefPtr<Expression> Parser::parse_secondary_expression(NonnullRefPtr<Expre
switch (m_parser_state.m_current_token.type()) { switch (m_parser_state.m_current_token.type()) {
case TokenType::Plus: case TokenType::Plus:
consume(); consume();
return create_ast_node<BinaryExpression>(BinaryOp::Plus, move(lhs), parse_expression(min_precedence, associativity)); return create_ast_node<BinaryExpression>(BinaryOp::Addition, move(lhs), parse_expression(min_precedence, associativity));
case TokenType::PlusEquals: case TokenType::PlusEquals:
consume(); consume();
return create_ast_node<AssignmentExpression>(AssignmentOp::AdditionAssignment, move(lhs), parse_expression(min_precedence, associativity)); return create_ast_node<AssignmentExpression>(AssignmentOp::AdditionAssignment, move(lhs), parse_expression(min_precedence, associativity));
case TokenType::Minus: case TokenType::Minus:
consume(); consume();
return create_ast_node<BinaryExpression>(BinaryOp::Minus, move(lhs), parse_expression(min_precedence, associativity)); return create_ast_node<BinaryExpression>(BinaryOp::Subtraction, move(lhs), parse_expression(min_precedence, associativity));
case TokenType::MinusEquals: case TokenType::MinusEquals:
consume(); consume();
return create_ast_node<AssignmentExpression>(AssignmentOp::SubtractionAssignment, move(lhs), parse_expression(min_precedence, associativity)); return create_ast_node<AssignmentExpression>(AssignmentOp::SubtractionAssignment, move(lhs), parse_expression(min_precedence, associativity));
case TokenType::Asterisk: case TokenType::Asterisk:
consume(); consume();
return create_ast_node<BinaryExpression>(BinaryOp::Asterisk, move(lhs), parse_expression(min_precedence, associativity)); return create_ast_node<BinaryExpression>(BinaryOp::Multiplication, move(lhs), parse_expression(min_precedence, associativity));
case TokenType::AsteriskEquals: case TokenType::AsteriskEquals:
consume(); consume();
return create_ast_node<AssignmentExpression>(AssignmentOp::MultiplicationAssignment, move(lhs), parse_expression(min_precedence, associativity)); return create_ast_node<AssignmentExpression>(AssignmentOp::MultiplicationAssignment, move(lhs), parse_expression(min_precedence, associativity));
case TokenType::Slash: case TokenType::Slash:
consume(); consume();
return create_ast_node<BinaryExpression>(BinaryOp::Slash, move(lhs), parse_expression(min_precedence, associativity)); return create_ast_node<BinaryExpression>(BinaryOp::Division, move(lhs), parse_expression(min_precedence, associativity));
case TokenType::SlashEquals: case TokenType::SlashEquals:
consume(); consume();
return create_ast_node<AssignmentExpression>(AssignmentOp::DivisionAssignment, move(lhs), parse_expression(min_precedence, associativity)); return create_ast_node<AssignmentExpression>(AssignmentOp::DivisionAssignment, move(lhs), parse_expression(min_precedence, associativity));