Changeset 24533 in webkit for trunk/JavaScriptCore/kjs/nodes.cpp

Timestamp:

Jul 23, 2007, 1:48:04 AM (18 years ago)

Author:

mjs

Message:

Reviewed by Oliver.

• fix Window shadowing regressions caused by the previous commit.

• kjs/nodes.cpp: (VarDeclNode::evaluate): Handle the case of global scope specially.

File:

• trunk/JavaScriptCore/kjs/nodes.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1619 +1619 @@
 JSValue* VarDeclNode::evaluate(ExecState* exec)
 {
-    JSValue* val;
+    const ScopeChain& chain = exec->context()->scopeChain();
+    JSObject* variableObject = exec->context()->variableObject();
+
+    ASSERT(!chain.isEmpty());
+
     if (init) {
-        val = init->evaluate(exec);
+        JSValue* val = init->evaluate(exec);
         KJS_CHECKEXCEPTIONVALUE
             
-        const ScopeChain& chain = exec->context()->scopeChain();
-        JSObject* variableObject = exec->context()->variableObject();
-
-        ASSERT(!chain.isEmpty());
-        ASSERT(variableObject->getDirect(ident) || ident == exec->propertyNames().arguments);
-
         // if the variable object is the top of the scope chain, then that must
         // be where this variable is declared, processVarDecls would have put 
@@ -1641 +1639 @@
             flags |= ReadOnly;
         
-        variableObject->put(exec, ident, val, flags);
-    } 
+        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 {
+
+        }
+    }
 
     // no caller of this function actually uses the return value.