Changeset 35022 in webkit for trunk/JavaScriptCore/kjs/JSFunction.cpp

Timestamp:

Jul 5, 2008, 10:26:58 PM (17 years ago)

Author:

[email protected]

Message:

2008-07-05 Sam Weinig <​[email protected]>

Reviewed by Cameron Zwarich.

First step in broad cleanup effort.

[ File list elided ]

File:

• trunk/JavaScriptCore/kjs/JSFunction.cpp (modified) (8 diffs)

trunk/JavaScriptCore/kjs/JSFunction.cpp

@@ -42 +42 @@
 const ClassInfo JSFunction::info = { "Function", &InternalFunction::info, 0, 0 };
 
-JSFunction::JSFunction(ExecState* exec, const Identifier& name, FunctionBodyNode* b, ScopeChainNode* scopeChain)
-  : InternalFunction(exec->lexicalGlobalObject()->functionPrototype(), name)
-  , body(b)
-  , _scope(scopeChain)
+JSFunction::JSFunction(ExecState* exec, const Identifier& name, FunctionBodyNode* body, ScopeChainNode* scopeChainNode)
+    : InternalFunction(exec->lexicalGlobalObject()->functionPrototype(), name)
+    , m_body(body)
+    , m_scopeChain(scopeChainNode)
 {
 }
@@ -52 +52 @@
 {
     InternalFunction::mark();
-    body->mark();
-    _scope.mark();
+    m_body->mark();
+    m_scopeChain.mark();
 }
 
 CallType JSFunction::getCallData(CallData& callData)
 {
-    callData.js.functionBody = body.get();
-    callData.js.scopeChain = _scope.node();
+    callData.js.functionBody = m_body.get();
+    callData.js.scopeChain = m_scopeChain.node();
     return CallTypeJS;
 }
@@ -65 +65 @@
 JSValue* JSFunction::call(ExecState* exec, JSValue* thisValue, const ArgList& args)
 {
-    return exec->machine()->execute(body.get(), exec, this, thisValue->toThisObject(exec), args, _scope.node(), exec->exceptionSlot());
+    return exec->machine()->execute(m_body.get(), exec, this, thisValue->toThisObject(exec), args, m_scopeChain.node(), exec->exceptionSlot());
 }
 
@@ -83 +83 @@
 {
     JSFunction* thisObj = static_cast<JSFunction*>(slot.slotBase());
-    return jsNumber(exec, thisObj->body->parameters().size());
+    return jsNumber(exec, thisObj->m_body->parameters().size());
 }
 
@@ -129 +129 @@
 const Identifier& JSFunction::getParameterName(int index)
 {
-    Vector<Identifier>& parameters = body->parameters();
+    Vector<Identifier>& parameters = m_body->parameters();
 
-    if (static_cast<size_t>(index) >= body->parameters().size())
-        return _scope.globalObject()->globalData()->propertyNames->nullIdentifier;
+    if (static_cast<size_t>(index) >= m_body->parameters().size())
+        return m_scopeChain.globalObject()->globalData()->propertyNames->nullIdentifier;
   
     const Identifier& name = parameters[index];
@@ -138 +138 @@
     // Are there any subsequent parameters with the same name?
     size_t size = parameters.size();
-    for (size_t i = index + 1; i < size; ++i)
+    for (size_t i = index + 1; i < size; ++i) {
         if (parameters[i] == name)
-            return _scope.globalObject()->globalData()->propertyNames->nullIdentifier;
+            return m_scopeChain.globalObject()->globalData()->propertyNames->nullIdentifier;
+    }
 
     return name;
@@ -148 +149 @@
 ConstructType JSFunction::getConstructData(ConstructData& constructData)
 {
-    constructData.js.functionBody = body.get();
-    constructData.js.scopeChain = _scope.node();
+    constructData.js.functionBody = m_body.get();
+    constructData.js.scopeChain = m_scopeChain.node();
     return ConstructTypeJS;
 }
@@ -164 +165 @@
     JSObject* thisObj = new (exec) JSObject(proto);
 
-    JSValue* result = exec->machine()->execute(body.get(), exec, this, thisObj, args, _scope.node(), exec->exceptionSlot());
+    JSValue* result = exec->machine()->execute(m_body.get(), exec, this, thisObj, args, m_scopeChain.node(), exec->exceptionSlot());
     if (exec->hadException() || !result->isObject())
         return thisObj;