Changeset 34593 in webkit for trunk/JavaScriptCore/kjs/nodes.h

Timestamp:

Jun 16, 2008, 1:19:17 AM (17 years ago)

Author:

[email protected]

Message:

2008-06-16 Cameron Zwarich <​[email protected]>

Reviewed by Maciej.

Make a UnaryOpNode class to reduce boilerplate code for UnaryPlusNode,
NegateNode, BitwiseNotNode, and LogicalNotNode.

• VM/CodeGenerator.h: (KJS::CodeGenerator::emitToJSNumber):
• kjs/nodes.cpp: (KJS::UnaryOpNode::emitCode):
• kjs/nodes.h: (KJS::UnaryOpNode::UnaryOpNode): (KJS::UnaryPlusNode::): (KJS::NegateNode::): (KJS::NegateNode::precedence): (KJS::BitwiseNotNode::): (KJS::BitwiseNotNode::precedence): (KJS::LogicalNotNode::): (KJS::LogicalNotNode::precedence):

File:

• trunk/JavaScriptCore/kjs/nodes.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/nodes.h

@@ -1133 +1133 @@
     };
 
-    class UnaryPlusNode : public ExpressionNode {
+    class UnaryOpNode : public ExpressionNode {
+    public:
+        UnaryOpNode(ExpressionNode* expr)
+            : m_expr(expr)
+        {
+        }
+
+        UnaryOpNode(JSType type, ExpressionNode* expr)
+            : ExpressionNode(type)
+            , m_expr(expr)
+        {
+        }
+
+        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
+        virtual OpcodeID opcode() const KJS_FAST_CALL = 0;
+
+    protected:
+        RefPtr<ExpressionNode> m_expr;
+    };
+
+    class UnaryPlusNode : public UnaryOpNode {
     public:
         UnaryPlusNode(ExpressionNode* expr) KJS_FAST_CALL
-            : ExpressionNode(NumberType)
-            , m_expr(expr)
-        {
-        }
-
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
+            : UnaryOpNode(NumberType, expr)
+        {
+        }
+
+        virtual OpcodeID opcode() const KJS_FAST_CALL { return op_to_jsnumber; }
         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
         virtual Precedence precedence() const { return PrecUnary; }
-
-    private:
-        RefPtr<ExpressionNode> m_expr;
-    };
-
-    class NegateNode : public ExpressionNode {
+    };
+
+    class NegateNode : public UnaryOpNode {
     public:
         NegateNode(ExpressionNode* expr) KJS_FAST_CALL
-            : ExpressionNode(NumberType)
-            , m_expr(expr)
-        {
-        }
-
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
+            : UnaryOpNode(NumberType, expr)
+        {
+        }
+
+        virtual OpcodeID opcode() const KJS_FAST_CALL { return op_negate; }
         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
         virtual Precedence precedence() const { return PrecUnary; }
-
-    private:
-        RefPtr<ExpressionNode> m_expr;
-    };
-
-    class BitwiseNotNode : public ExpressionNode {
+    };
+
+    class BitwiseNotNode : public UnaryOpNode {
     public:
         BitwiseNotNode(ExpressionNode* expr) KJS_FAST_CALL
-            : ExpressionNode(NumberType)
-            , m_expr(expr)
-        {
-        }
-
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
+            : UnaryOpNode(NumberType, expr)
+        {
+        }
+
+        virtual OpcodeID opcode() const KJS_FAST_CALL { return op_bitnot; }
         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
         virtual Precedence precedence() const { return PrecUnary; }
-
-    private:
-        RefPtr<ExpressionNode> m_expr;
-    };
-
-    class LogicalNotNode : public ExpressionNode {
+    };
+
+    class LogicalNotNode : public UnaryOpNode {
     public:
         LogicalNotNode(ExpressionNode* expr) KJS_FAST_CALL
-            : ExpressionNode(BooleanType)
-            , m_expr(expr)
-        {
-        }
-
-        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
+            : UnaryOpNode(BooleanType, expr)
+        {
+        }
+
+        virtual OpcodeID opcode() const KJS_FAST_CALL { return op_not; }
         virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
         virtual Precedence precedence() const { return PrecUnary; }
-
-    private:
-        RefPtr<ExpressionNode> m_expr;
     };