2006-04-18 Eric Seidel <eseidel@apple.com>

        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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13960 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index fbbd1f9491cd94fc1a15b180ae0877ed408ac367..af6d8c7668216e84f88b724974319fb59a3f0db5 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,17 @@
+2006-04-18  Eric Seidel  <eseidel@apple.com>
+
+        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  <speth@end.com>
 
         Reviewed by Timothy.

diff --git a/JavaScriptCore/kjs/function_object.cpp b/JavaScriptCore/kjs/function_object.cpp
index d11012cbe52cd035ba3c8bb2c35f5a2ef3120c40..219b38d659649d4a2772d81038874ceaeb58455b 100644 (file)
--- a/JavaScriptCore/kjs/function_object.cpp
+++ b/JavaScriptCore/kjs/function_object.cpp
@@ -204,7 +204,7 @@ JSObject* FunctionObjectImp::construct(ExecState* exec, const List& args, const
     return throwError(exec, SyntaxError, errMsg, errLine, sid, &sourceURL);
 
   ScopeChain scopeChain;
-  scopeChain.push(exec->dynamicInterpreter()->globalObject());
+  scopeChain.push(exec->lexicalInterpreter()->globalObject());
   FunctionBodyNode *bodyNode = progNode.get();
 
   FunctionImp* fimp = new DeclaredFunctionImp(exec, functionName, bodyNode, scopeChain);

diff --git a/JavaScriptCore/kjs/scope_chain.cpp b/JavaScriptCore/kjs/scope_chain.cpp
index 229fc22d8f23801f26b9bd101961962891a8362c..72ad595f27226986165a97c9c43f0f42c14d5856 100644 (file)
--- a/JavaScriptCore/kjs/scope_chain.cpp
+++ b/JavaScriptCore/kjs/scope_chain.cpp
@@ -21,6 +21,7 @@
 
 #include "config.h"
 #include "scope_chain.h"
+#include "reference_list.h"
 
 namespace KJS {
 
@@ -34,4 +35,25 @@ void ScopeChain::push(const ScopeChain &c)
     }
 }
 
+#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

diff --git a/JavaScriptCore/kjs/scope_chain.h b/JavaScriptCore/kjs/scope_chain.h
index 421fdfa9e0ee4e7de88255d958b018413062756e..f227dacf455dddb1b5709f20a5a3918aefe7595e 100644 (file)
--- a/JavaScriptCore/kjs/scope_chain.h
+++ b/JavaScriptCore/kjs/scope_chain.h
@@ -27,6 +27,7 @@
 namespace KJS {
 
     class JSObject;
+    class ExecState;
     
     class ScopeChainNode {
     public:
@@ -79,6 +80,10 @@ namespace KJS {
         void pop();
         
         void mark();
+
+#ifndef NDEBUG        
+        void print(ExecState*);
+#endif
         
     private:
         ScopeChainNode *_node;

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a596b85dbe29f2c9ad8254aa26441fa604c6753b..809f49164234777b2faedf71b54f7b08738f7fa4 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-18  Eric Seidel  <eseidel@apple.com>
+
+        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  <bdakin@apple.com>
 
         Reviewed by Hyatt

diff --git a/LayoutTests/fast/js/lexical-lookup-in-function-constructor-expected.txt b/LayoutTests/fast/js/lexical-lookup-in-function-constructor-expected.txt
new file mode 100644 (file)
index 0000000..86aefce
--- /dev/null
+++ b/LayoutTests/fast/js/lexical-lookup-in-function-constructor-expected.txt
@@ -0,0 +1,3 @@
+SUCCESS
+
+

diff --git a/LayoutTests/fast/js/lexical-lookup-in-function-constructor.html b/LayoutTests/fast/js/lexical-lookup-in-function-constructor.html
new file mode 100644 (file)
index 0000000..feeff28
--- /dev/null
+++ b/LayoutTests/fast/js/lexical-lookup-in-function-constructor.html
@@ -0,0 +1,14 @@
+<script>
+if (window.layoutTestController)
+    layoutTestController.dumpAsText();
+
+message = "FAILURE (Bad lookup)";
+function doTest() {
+    var para = document.getElementById("test");
+    frames[0].doTest(para);
+}
+</script>
+<body onLoad="doTest()">
+<p id="test">FAILURE (Didn't execute)</p>
+<iframe src="resources/lexical-lookup-in-function-constructor-child.html"></iframe>
+</body>

diff --git a/LayoutTests/fast/js/resources/lexical-lookup-in-function-constructor-child.html b/LayoutTests/fast/js/resources/lexical-lookup-in-function-constructor-child.html
new file mode 100644 (file)
index 0000000..ec10581
--- /dev/null
+++ b/LayoutTests/fast/js/resources/lexical-lookup-in-function-constructor-child.html
@@ -0,0 +1,10 @@
+<script>
+message = "SUCCESS";
+function doTest(para) {
+    var f = new Function('para', 'para.innerHTML = message;');
+    f(para);
+}
+</script>
+<body>
+</body>
+