JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / runtime / ScopeChain.cpp

diff --git a/runtime/ScopeChain.cpp b/runtime/ScopeChain.cpp
index 5c2edab68b683e44bdbd6d75dc309e93cb9140ae..df4da41c021394270654c051c6f7c8e52885ec65 100644 (file)
--- a/runtime/ScopeChain.cpp
+++ b/runtime/ScopeChain.cpp
@@ -31,19 +31,19 @@ namespace JSC {
 
 #ifndef NDEBUG
 
 
 #ifndef NDEBUG
 

-void ScopeChainNode::print() const
+void ScopeChainNode::print()

 {
     ScopeChainIterator scopeEnd = end();
     for (ScopeChainIterator scopeIter = begin(); scopeIter != scopeEnd; ++scopeIter) {
 {
     ScopeChainIterator scopeEnd = end();
     for (ScopeChainIterator scopeIter = begin(); scopeIter != scopeEnd; ++scopeIter) {

-        JSObject* o = *scopeIter;
-        PropertyNameArray propertyNames(globalObject()->globalExec());
-        o->getPropertyNames(globalObject()->globalExec(), propertyNames);
+        JSObject* o = scopeIter->get();
+        PropertyNameArray propertyNames(globalObject->globalExec());
+        o->getPropertyNames(globalObject->globalExec(), propertyNames);

         PropertyNameArray::const_iterator propEnd = propertyNames.end();
 
         fprintf(stderr, "----- [scope %p] -----\n", o);
         for (PropertyNameArray::const_iterator propIter = propertyNames.begin(); propIter != propEnd; propIter++) {
             Identifier name = *propIter;
         PropertyNameArray::const_iterator propEnd = propertyNames.end();
 
         fprintf(stderr, "----- [scope %p] -----\n", o);
         for (PropertyNameArray::const_iterator propIter = propertyNames.begin(); propIter != propEnd; propIter++) {
             Identifier name = *propIter;

-            fprintf(stderr, "%s, ", name.ascii());
+            fprintf(stderr, "%s, ", name.ustring().utf8().data());

         }
         fprintf(stderr, "\n");
     }
         }
         fprintf(stderr, "\n");
     }


@@ -51,12 +51,14 @@ void ScopeChainNode::print() const
 
 #endif
 
 
 #endif
 

-int ScopeChain::localDepth() const
+const ClassInfo ScopeChainNode::s_info = { "ScopeChainNode", 0, 0, 0 };
+
+int ScopeChainNode::localDepth()

 {
     int scopeDepth = 0;
     ScopeChainIterator iter = this->begin();
     ScopeChainIterator end = this->end();
 {
     int scopeDepth = 0;
     ScopeChainIterator iter = this->begin();
     ScopeChainIterator end = this->end();

-    while (!(*iter)->isObject(&JSActivation::info)) {
+    while (!(*iter)->inherits(&JSActivation::s_info)) {

         ++iter;
         if (iter == end)
             break;
         ++iter;
         if (iter == end)
             break;


@@ -65,4 +67,16 @@ int ScopeChain::localDepth() const
     return scopeDepth;
 }
 
     return scopeDepth;
 }
 

+void ScopeChainNode::visitChildren(SlotVisitor& visitor)
+{
+    ASSERT_GC_OBJECT_INHERITS(this, &s_info);
+    COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
+    ASSERT(structure()->typeInfo().overridesVisitChildren());
+    if (next)
+        visitor.append(&next);
+    visitor.append(&object);
+    visitor.append(&globalObject);
+    visitor.append(&globalThis);
+}
+

 } // namespace JSC
 } // namespace JSC