[Gnash-commit] /srv/bzr/gnash/trunk r11131: Some debugging.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11131
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Tue 2009-06-16 12:13:01 +0200
message:
  Some debugging.
modified:
  libcore/parser/abc_block.cpp
  libcore/vm/Machine.cpp
    ------------------------------------------------------------
    revno: 11124.1.10
    committer: Benjamin Wolsey <address@hidden>
    branch nick: test
    timestamp: Tue 2009-06-16 11:32:44 +0200
    message:
      Re-enable finalize class code, as it doesn't seem to cause any problems.
      
      Do add namespaces to the string table when not found.
    modified:
      libcore/parser/abc_block.cpp
    ------------------------------------------------------------
    revno: 11124.1.11
    committer: Benjamin Wolsey <address@hidden>
    branch nick: test
    timestamp: Tue 2009-06-16 11:52:52 +0200
    message:
      More debugging, showing that looking for classes in a namespace is 
failing.
    modified:
      libcore/vm/Machine.cpp

=== modified file 'libcore/parser/abc_block.cpp'
--- a/libcore/parser/abc_block.cpp      2009-06-03 08:55:42 +0000
+++ b/libcore/parser/abc_block.cpp      2009-06-16 09:32:44 +0000
@@ -81,30 +81,22 @@
        }
        case KIND_GETTER:
        {
-               log_abc("Finalize getter not implemented.");
-               break;
                pClass->addGetter(_name, _namespace, _method, do_static);
                break;
        }
        case KIND_SETTER:
        {
-               log_abc("Finalize setter not implemented.");
-               break;
                pClass->addSetter(_name, _namespace, _method, do_static);
                break;
        }
        case KIND_CLASS:
        {
-               log_abc("Finalize class not implemented.");
-               break;
                pClass->addMemberClass(_name, _namespace, _slotID, 
                        pBlock->_classes[_classInfoIndex], do_static);
                break;
        }
        case KIND_FUNCTION:
        {
-               log_abc("Finalize function not implemented.");
-               break;
                pClass->addSlotFunction(_name, _namespace, _slotID, _method, 
do_static);
                break;
        }
@@ -377,10 +369,9 @@
 void
 abc_block::setNamespaceURI(asNamespace *ns, string_table::key ABCName)
 {
-       
        ns->setAbcURI(ABCName);
        std::string name = _stringPool[ABCName];
-       string_table::key global_key = _stringTable->find(name, false);
+       string_table::key global_key = _stringTable->find(name);
        ns->setURI(global_key);
        log_abc("Namespace: %s AbcURI=%u URI=%u.", name, ABCName, global_key);
 }

=== modified file 'libcore/vm/Machine.cpp'
--- a/libcore/vm/Machine.cpp    2009-06-16 08:39:26 +0000
+++ b/libcore/vm/Machine.cpp    2009-06-16 10:13:01 +0000
@@ -1982,6 +1982,8 @@
                     boost::uint32_t sindex = mStream->read_V32();
                     as_value value = pop_stack();
                     as_value object = pop_stack();
+                    log_abc("SETSLOT object: %s, value: %s, index: %s",
+                            object, value, sindex);
 
                     as_object* obj = object.to_object().get();
                     if ( ! obj )
@@ -1993,9 +1995,9 @@
                         break;
                     }
 
-                    // We use sindex + 1, because currently as_object sets a 
property
-                    // at a slot index 1 higher than the index the abc_block 
thinks the
-                    // property is at.
+                    // We use sindex + 1, because currently as_object sets
+                    // a property at a slot index 1 higher than the
+                    // index the abc_block thinks the property is at.
                     if ( ! obj->set_member_slot(sindex+1, value) )
                     {
                         log_abc("Failed to set property at "
@@ -3095,7 +3097,9 @@
 Machine::find_prop_strict(asName multiname)
 {
        
-    log_abc("Looking for property %s", mST.value(multiname.getGlobalName()));
+    log_abc("Looking for property %2% in namespace %1%",
+            mST.value(multiname.getNamespace()->getURI()),
+            mST.value(multiname.getGlobalName()));
 
        as_value val;
        mScopeStack.push(mGlobalObject);