Changeset 13960 in webkit

Timestamp:

Apr 18, 2006, 3:17:41 PM (19 years ago)

Author:

eseidel

Message:

2006-04-18 Eric Seidel <​[email protected]>

Reviewed by ggaren.

Fix "new Function()" to correctly use lexical scoping.
Add ScopeChain::print() function for debugging.
<rdar://problem/4067864> REGRESSION (125-407): JavaScript failure on PeopleSoft REN Server

• kjs/function_object.cpp: (FunctionObjectImp::construct):
• kjs/scope_chain.cpp: (KJS::ScopeChain::print):
• kjs/scope_chain.h:

Location:

trunk

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/kjs/function_object.cpp (modified) (1 diff)
• JavaScriptCore/kjs/scope_chain.cpp (modified) (2 diffs)
• JavaScriptCore/kjs/scope_chain.h (modified) (2 diffs)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/lexical-lookup-in-function-constructor-expected.txt (added)
• LayoutTests/fast/js/lexical-lookup-in-function-constructor.html (added)
• LayoutTests/fast/js/resources/lexical-lookup-in-function-constructor-child.html (added)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-04-18  Eric Seidel  <[email protected]>
+
+        Reviewed by ggaren.
+
+        Fix "new Function()" to correctly use lexical scoping.
+        Add ScopeChain::print() function for debugging.
+        <rdar://problem/4067864> REGRESSION (125-407): JavaScript failure on PeopleSoft REN Server
+
+        * kjs/function_object.cpp:
+        (FunctionObjectImp::construct):
+        * kjs/scope_chain.cpp:
+        (KJS::ScopeChain::print):
+        * kjs/scope_chain.h:
+
 2006-04-14  James G. Speth  <[email protected]>
 

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -205 +205 @@
 
   ScopeChain scopeChain;
-  scopeChain.push(exec->dynamicInterpreter()->globalObject());
+  scopeChain.push(exec->lexicalInterpreter()->globalObject());
   FunctionBodyNode *bodyNode = progNode.get();
 

trunk/JavaScriptCore/kjs/scope_chain.cpp

@@ -22 +22 @@
 #include "config.h"
 #include "scope_chain.h"
+#include "reference_list.h"
 
 namespace KJS {
@@ -35 +36 @@
 }
 
+#ifndef NDEBUG
+
+void ScopeChain::print(ExecState* exec)
+{
+    ScopeChainIterator scopeEnd = end();
+    for (ScopeChainIterator scopeIter = begin(); scopeIter != scopeEnd; ++scopeIter) {
+        JSObject* o = *scopeIter;
+        ReferenceList propList = o->propList(exec, false);
+        ReferenceListIterator propEnd = propList.end();
+
+        fprintf(stderr, "----- [scope %p] -----\n", o);
+        for (ReferenceListIterator propIter = propList.begin(); propIter != propEnd; propIter++) {
+            Identifier name = propIter->getPropertyName(exec);
+            fprintf(stderr, "%s, ", name.ascii());
+        }
+        fprintf(stderr, "\n");
+    }
+}
+
+#endif
+
 } // namespace KJS

trunk/JavaScriptCore/kjs/scope_chain.h

@@ -28 +28 @@
 
     class JSObject;
+    class ExecState;
     
     class ScopeChainNode {
@@ -80 +81 @@
         
         void mark();
+
+#ifndef NDEBUG        
+        void print(ExecState*);
+#endif
         
     private:

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2006-04-18  Eric Seidel  <[email protected]>
+
+        Reviewed by ggaren.
+
+        <rdar://problem/4067864> REGRESSION (125-407): JavaScript failure on PeopleSoft REN Server
+
+        * fast/js/lexical-lookup-in-function-constructor.html: Added.
+        * fast/js/resources/lexical-lookup-in-function-constructor-child.html: Added.
+        * fast/js/lexical-lookup-in-function-constructor-expected.txt: Added.
+
 2006-04-18  Beth Dakin  <[email protected]>