Преглед изворни кода

LibJS: Tweak AssignmentOp names

Andreas Kling пре 5 година
родитељ
комит
4dc1d6654f
3 измењених фајлова са 20 додато и 20 уклоњено
  1. 10 10
      Libraries/LibJS/AST.cpp
  2. 5 5
      Libraries/LibJS/AST.h
  3. 5 5
      Libraries/LibJS/Parser.cpp

+ 10 - 10
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;
     }

+ 5 - 5
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 {

+ 5 - 5
Libraries/LibJS/Parser.cpp

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