Changeset 24534 in webkit

Timestamp:

Jul 23, 2007 3:26:02 AM (17 years ago)

Author:

mjs

Message:

Reviewed by Oliver.

• fix remaining problems with Window shadowing

• kjs/nodes.cpp: (VarDeclNode::evaluate): Tweak the special case a little.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/nodes.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-07-23  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Oliver.
+        
+        - fix remaining problems with Window shadowing
+
+        * kjs/nodes.cpp:
+        (VarDeclNode::evaluate): Tweak the special case a little.
+
 2007-07-23  Maciej Stachowiak  <mjs@apple.com>
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1624 +1624 @@
     ASSERT(!chain.isEmpty());
 
-    if (init) {
+    bool inGlobalScope = ++chain.begin() == chain.end();
+
+    if (inGlobalScope && (init || !variableObject->getDirect(ident))) {
+        JSValue* val = init ? init->evaluate(exec) : jsUndefined();
+        int flags = Internal;
+        if (exec->context()->codeType() != EvalCode)
+            flags |= DontDelete;
+        if (varType == VarDeclNode::Constant)
+            flags |= ReadOnly;
+        variableObject->putDirect(ident, val, flags);
+    } else if (init) {
         JSValue* val = init->evaluate(exec);
         KJS_CHECKEXCEPTIONVALUE
@@ -1639 +1649 @@
             flags |= ReadOnly;
         
-        if (++chain.begin() == chain.end()) {
-            int flags = Internal;
-            if (exec->context()->codeType() != EvalCode)
-                flags |= DontDelete;
-            if (varType == VarDeclNode::Constant)
-                flags |= ReadOnly;
-            variableObject->putDirect(ident, val, flags);
-        } else {
-            ASSERT(variableObject->getDirect(ident) || ident == exec->propertyNames().arguments);
-            variableObject->put(exec, ident, val, flags);
-        }
-    } else {
-        if (++chain.begin() == chain.end()) {
-            int flags = Internal;
-            if (exec->context()->codeType() != EvalCode)
-                flags |= DontDelete;
-            if (varType == VarDeclNode::Constant)
-                flags |= ReadOnly;
-            variableObject->putDirect(ident, jsUndefined(), flags);
-        } else {
-
-        }
+        ASSERT(variableObject->getDirect(ident) || ident == exec->propertyNames().arguments);
+        variableObject->put(exec, ident, val, flags);
     }