Changeset 24287 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jul 14, 2007, 10:04:03 AM (18 years ago)

Author:

bdash

Message:

2007-07-14 Cameron Zwarich <​[email protected]>

Reviewed by Darin.

Fixes ​http://bugs.webkit.org/show_bug.cgi?id=13517,

​http://bugs.webkit.org/show_bug.cgi?id=14237, and
the failure of test js1_5/Scope/regress-185485.js

Bug 13517: DOM Exception 8 in finance.aol.com sub-page
Bug 14237: Javascript "var" statement interprets initialization in the topmost function scope

• kjs/nodes.cpp: (VarDeclNode::evaluate):
• tests/mozilla/expected.html:

2007-07-14 Cameron Zwarich <​[email protected]>

Reviewed by Darin.

Added tests for the following bugs:
​http://bugs.webkit.org/show_bug.cgi?id=13517
​http://bugs.webkit.org/show_bug.cgi?id=14237

Bug 13517: DOM Exception 8 in finance.aol.com sub-page
Bug 14237: Javascript "var" statement interprets initialization in the topmost function scope

• fast/js/resources/vardecl-blocks-init.js: Added.
• fast/js/resources/vardecl-preserve-arguments.js: Updated.
• fast/js/vardecl-blocks-init-expected.txt: Added.
• fast/js/vardecl-blocks-init.html: Added.
• fast/js/vardecl-preserve-arguments-expected.txt: Updated result.

File:

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

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -4 +4 @@
  *  Copyright (C) 2001 Peter Kelly ([email protected])
  *  Copyright (C) 2003, 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
+ *  Copyright (C) 2007 Cameron Zwarich ([email protected])
  *
  *  This library is free software; you can redistribute it and/or
@@ -1596 +1597 @@
       val = init->evaluate(exec);
       KJS_CHECKEXCEPTIONVALUE
-  } else {
+      
+      if (variable->getDirect(ident) || ident == exec->propertyNames().arguments) {
+          const ScopeChain& chain = exec->context()->scopeChain();
+          ScopeChainIterator iter = chain.begin();
+          ScopeChainIterator end = chain.end();        
+
+          // we must always have something in the scope chain
+          ASSERT(iter != end);
+
+          PropertySlot slot;
+          JSObject* base;
+
+          do {
+              base = *iter;
+              if (base->getPropertySlot(exec, ident, slot))
+                  break;
+
+             ++iter;
+          } while (iter != end);
+
+          unsigned flags = 0;
+          base->getPropertyAttributes(ident, flags);
+          if (varType == VarDeclNode::Constant)
+              flags |= ReadOnly;
+
+          base->put(exec, ident, val, flags);
+          return jsString(ident.ustring());
+      }
+    } else {
       // already declared? - check with getDirect so you can override
       // built-in properties of the global object with var declarations.