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

Timestamp:

Apr 23, 2007, 3:28:10 AM (18 years ago)

Author:

mjs

Message:

Reviewed by Darin.

• shrink FunctionImp / DeclaredFunctionImp by 4 bytes, by moving parameter list to function body

I reconciled this with a similar change in KDE kjs by Maks Orlovich <​[email protected]>.

• kjs/function.cpp: (KJS::FunctionImp::callAsFunction): (KJS::FunctionImp::passInParameters): (KJS::FunctionImp::lengthGetter): (KJS::FunctionImp::getParameterName):
• kjs/function.h:
• kjs/function_object.cpp: (FunctionProtoFunc::callAsFunction): (FunctionObjectImp::construct):
• kjs/nodes.cpp: (FunctionBodyNode::addParam): (FunctionBodyNode::paramString): (FuncDeclNode::addParams): (FuncDeclNode::processFuncDecl): (FuncExprNode::addParams): (FuncExprNode::evaluate):
• kjs/nodes.h: (KJS::Parameter::Parameter): (KJS::FunctionBodyNode::numParams): (KJS::FunctionBodyNode::paramName): (KJS::FunctionBodyNode::parameters): (KJS::FuncExprNode::FuncExprNode): (KJS::FuncDeclNode::FuncDeclNode):
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Disable 64-bit warnings because they handle size_t badly.

File:

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

trunk/JavaScriptCore/kjs/nodes.h

@@ -29 +29 @@
 #include "internal.h"
 #include <wtf/ListRefPtr.h>
+#include <wtf/Vector.h>
 
 namespace KJS {
@@ -1004 +1005 @@
   };
 
+  class Parameter {
+  public:
+    Parameter() { }
+    Parameter(const Identifier& n) : name(n) { }
+    Identifier name;
+  };
+
   // inherited by ProgramNode
   class FunctionBodyNode : public BlockNode {
@@ -1011 +1019 @@
     int sourceId() { return m_sourceId; }
     const UString& sourceURL() { return m_sourceURL; }
+
+    void addParam(const Identifier& ident);
+    size_t numParams() const { return m_parameters.size(); }
+    Identifier paramName(size_t pos) const { return m_parameters[pos].name; }
+    UString paramString() const;
+    Vector<Parameter>& parameters() { return m_parameters; }
   private:
     UString m_sourceURL;
     int m_sourceId;
+    Vector<Parameter> m_parameters;
   };
 
@@ -1019 +1034 @@
   public:
     FuncExprNode(const Identifier &i, FunctionBodyNode *b, ParameterNode *p = 0)
-      : ident(i), param(p ? p->next.release() : 0), body(b) { if (p) { Parser::removeNodeCycle(param.get()); } }
+      : ident(i), param(p ? p->next.release() : 0), body(b) { if (p) { Parser::removeNodeCycle(param.get()); } addParams(); }
     virtual JSValue *evaluate(ExecState*);
     virtual void streamTo(SourceStream&) const;
   private:
+    void addParams();
     // Used for streamTo
     friend class PropertyNode;
@@ -1033 +1049 @@
   public:
     FuncDeclNode(const Identifier &i, FunctionBodyNode *b)
-      : ident(i), body(b) { }
+      : ident(i), body(b) { addParams(); }
     FuncDeclNode(const Identifier &i, ParameterNode *p, FunctionBodyNode *b)
-      : ident(i), param(p->next.release()), body(b) { Parser::removeNodeCycle(param.get()); }
+      : ident(i), param(p->next.release()), body(b) { Parser::removeNodeCycle(param.get()); addParams(); }
     virtual Completion execute(ExecState*);
     virtual void processFuncDecl(ExecState*);
     virtual void streamTo(SourceStream&) const;
   private:
+    void addParams();
     Identifier ident;
     RefPtr<ParameterNode> param;