From 5e817ee6783473fb73734b9417418c24841a89d3 Mon Sep 17 00:00:00 2001
From: 0xtechnobabble <0xtechnobabble@protonmail.com>
Date: Mon, 9 Mar 2020 19:04:44 +0200
Subject: [PATCH] LibJS: Move logical not operator to new unary expression
 class

---
 Libraries/LibJS/AST.cpp | 18 +++++-------------
 Libraries/LibJS/AST.h   | 11 ++---------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/Libraries/LibJS/AST.cpp b/Libraries/LibJS/AST.cpp
index bf043c4a88..2e6acb947c 100644
--- a/Libraries/LibJS/AST.cpp
+++ b/Libraries/LibJS/AST.cpp
@@ -210,17 +210,12 @@ Value LogicalExpression::execute(Interpreter& interpreter) const
 {
     auto lhs_result = m_lhs->execute(interpreter).as_bool();
 
-    if (m_op == LogicalOp::Not)
-        return Value(!lhs_result);
-
     auto rhs_result = m_rhs->execute(interpreter).as_bool();
     switch (m_op) {
     case LogicalOp::And:
         return Value(lhs_result && rhs_result);
     case LogicalOp::Or:
         return Value(lhs_result || rhs_result);
-    case LogicalOp::Not:
-        ASSERT_NOT_REACHED();
     }
 
     ASSERT_NOT_REACHED();
@@ -232,6 +227,8 @@ Value UnaryExpression::execute(Interpreter& interpreter) const
     switch (m_op) {
     case UnaryOp::BitNot:
         return bit_not(lhs_result);
+    case UnaryOp::Not:
+        return Value(!lhs_result.as_bool());
     }
 
     ASSERT_NOT_REACHED();
@@ -313,14 +310,6 @@ void LogicalExpression::dump(int indent) const
     case LogicalOp::Or:
         op_string = "||";
         break;
-    case LogicalOp::Not:
-        op_string = "!";
-        print_indent(indent);
-        printf("%s\n", class_name());
-        print_indent(indent + 1);
-        printf("%s\n", op_string);
-        m_lhs->dump(indent + 1);
-        return;
     }
 
     print_indent(indent);
@@ -338,6 +327,9 @@ void UnaryExpression::dump(int indent) const
     case UnaryOp::BitNot:
         op_string = "~";
         break;
+    case UnaryOp::Not:
+        op_string = "!";
+        break;
     }
 
     print_indent(indent);
diff --git a/Libraries/LibJS/AST.h b/Libraries/LibJS/AST.h
index 8d00fa15e6..23a2dcbb3b 100644
--- a/Libraries/LibJS/AST.h
+++ b/Libraries/LibJS/AST.h
@@ -209,7 +209,6 @@ private:
 enum class LogicalOp {
     And,
     Or,
-    Not
 };
 
 class LogicalExpression : public Expression {
@@ -221,13 +220,6 @@ public:
     {
     }
 
-    LogicalExpression(LogicalOp op, NonnullOwnPtr<Expression> lhs)
-        : m_op(op)
-        , m_lhs(move(lhs))
-    {
-        ASSERT(op == LogicalOp::Not);
-    }
-
     virtual Value execute(Interpreter&) const override;
     virtual void dump(int indent) const override;
 
@@ -236,11 +228,12 @@ private:
 
     LogicalOp m_op;
     NonnullOwnPtr<Expression> m_lhs;
-    OwnPtr<Expression> m_rhs;
+    NonnullOwnPtr<Expression> m_rhs;
 };
 
 enum class UnaryOp {
     BitNot,
+    Not,
 };
 
 class UnaryExpression : public Expression {