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

Timestamp:

Aug 12, 2005, 12:36:00 AM (20 years ago)

Author:

mjs

Message:

Reviewed by hyatt.

• refactor function calls, 3% speedup on JS iBench.

• kjs/grammar.y:
• kjs/nodes.cpp: (Node::throwError): Added new useful variants. (FunctionCallValueNode::evaluate): New node to handle calls on expressions that are strictly values, not references. (FunctionCallValueNode::ref): ditto (FunctionCallValueNode::deref): ditto (FunctionCallResolveNode::evaluate): New node to handle calls on identifier expressions, so that they are looked up in the scope chain. (FunctionCallResolveNode::ref): ditto (FunctionCallResolveNode::deref): ditto (FunctionCallBracketNode::evaluate): New node to handle calls on bracket dereferences, so that the expression before brackets is used as the this object. (FunctionCallBracketNode::ref): ditto (FunctionCallBracketNode::deref): ditto (FunctionCallDotNode::evaluate): New node to handle calls on dot dereferences, so that the expression before the dot is used as the this object. (FunctionCallDotNode::ref): ditto (FunctionCallDotNode::deref): ditto (dotExprNotAnObjectString): helper function to avoid global variable access. (dotExprDoesNotAllowCallsString): ditto
• kjs/nodes.h: Declared new classes.
• kjs/nodes2string.cpp: (FunctionCallValueNode::streamTo): Added - serializes the appropriate function call (FunctionCallResolveNode::streamTo): ditto (FunctionCallBracketNode::streamTo): ditto (FunctionCallParenBracketNode::streamTo): ditto (FunctionCallDotNode::streamTo): ditto (FunctionCallParenDotNode::streamTo): ditto
• kjs/object.h: (KJS::ObjectImp::isActivation): Change how activation objects are detected in the scope chain, a virtual function is cheaper than the old inheritance test.
• kjs/function.h: (KJS::ActivationImp::isActivation): Ditto.

File:

• trunk/JavaScriptCore/kjs/nodes.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/nodes.h

@@ -107 +107 @@
     ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, Node *expr);
     ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, Identifier label);
+    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, Identifier ident);
+    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, Node *e1, Node *e2);
+    ValueImp *throwError(ExecState *exec, ErrorType e, const char *msg, ValueImp *v, Node *expr, Identifier ident);
+
     void setExceptionDetailsIfNeeded(ExecState *exec);
     int line;
@@ -361 +365 @@
   };
 
-  class FunctionCallNode : public Node {
-  public:
-    FunctionCallNode(Node *e, ArgumentsNode *a) : expr(e), args(a) {}
+  class FunctionCallValueNode : public Node {
+  public:
+    FunctionCallValueNode(Node *e, ArgumentsNode *a) : expr(e), args(a) {}
     virtual void ref();
     virtual bool deref();
@@ -371 +375 @@
     Node *expr;
     ArgumentsNode *args;
+  };
+
+  class FunctionCallResolveNode : public Node {
+  public:
+    FunctionCallResolveNode(const Identifier& i, ArgumentsNode *a) : ident(i), args(a) {}
+    virtual void ref();
+    virtual bool deref();
+    ValueImp *evaluate(ExecState *exec);
+    virtual void streamTo(SourceStream &s) const;
+  private:
+    Identifier ident;
+    ArgumentsNode *args;
+  };
+
+  class FunctionCallBracketNode : public Node {
+  public:
+    FunctionCallBracketNode(Node *b, Node *s, ArgumentsNode *a) : base(b), subscript(s), args(a) {}
+    virtual void ref();
+    virtual bool deref();
+    ValueImp *evaluate(ExecState *exec);
+    virtual void streamTo(SourceStream &s) const;
+  private:
+    Node *base;
+    Node *subscript;
+    ArgumentsNode *args;
+  };
+
+  class FunctionCallParenBracketNode : public Node {
+  public:
+    FunctionCallParenBracketNode(Node *b, Node *s, ArgumentsNode *a) : FunctionCallBracketNode(b, s, a) {}
+    virtual void streamTo(SourceStream &s) const;
+  };
+
+  class FunctionCallDotNode : public Node {
+  public:
+    FunctionCallDotNode(Node *b, const Identifier &i, ArgumentsNode *a) : base(b), ident(i), args(a) {}
+    virtual void ref();
+    virtual bool deref();
+    ValueImp *evaluate(ExecState *exec);
+    virtual void streamTo(SourceStream &s) const;
+  private:
+    Node *base;
+    Identifier ident;
+    ArgumentsNode *args;
+  };
+
+  class FunctionCallParenDotNode : public Node {
+  public:
+    FunctionCallDotNode(Node *b, const Identifier &i, ArgumentsNode *a) : FunctionCallDotNode(b, i, a) {}
+    virtual void streamTo(SourceStream &s) const;
   };