[Gnash-commit] /srv/bzr/gnash/avm2 r9517: Remove all object->dump_member calls, and clean up ASTYPE opcode.

[Tom Stellard]

------------------------------------------------------------
revno: 9517
committer: Tom Stellard <address@hidden>
branch nick: gnash_traits
timestamp: Fri 2008-08-22 19:16:15 +0800
message:
  Remove all object->dump_member calls, and clean up ASTYPE opcode.
modified:
  libcore/vm/Machine.cpp
  libcore/vm/Machine.h

=== modified file 'libcore/vm/Machine.cpp'
--- a/libcore/vm/Machine.cpp    2008-08-22 10:19:17 +0000
+++ b/libcore/vm/Machine.cpp    2008-08-22 11:16:15 +0000
@@ -1166,7 +1166,6 @@
                as_environment env = get_args(argc);
                //TODO: If multiname is runtime also pop namespace and/or name 
values.
                as_object *object = pop_stack().to_object().get();
-               
                as_value property = object->getMember(a.getGlobalName(),0);
                LOG_DEBUG_AVM("Calling method %s on object 
%s",property.toDebugString(),object->get_text_value());
                as_value result = 
call_method(property,&env,object,argc,env.stack_size() - 1);
@@ -1290,7 +1289,6 @@
                as_object* object = pop_stack().to_object().get();
                as_value prop = 
object->getMember(a.getGlobalName(),a.getNamespace()->getURI());
                as_object* object_to_construct = prop.to_object().get();
-               object_to_construct->dump_members();
                as_value property = 
object_to_construct->getMember(NSV::PROP_CONSTRUCTOR,0);
                as_value value = 
call_method(property,&env,object_to_construct,argc,env.stack_size() - 1);
                push_stack(value);
@@ -1829,10 +1827,9 @@
        case SWF::ABC_ACTION_ASTYPE:
        {
                asName a = pool_name(mStream->read_V32(), mPoolObject);
-               mStack.drop(completeName(a));
-               // TODO: Might need some namespace stuff.
-               if (!mStack.top(0).conforms_to(a.getABCName()))
-                       mStack.top(0).set_null();
+               as_value value = pop_stack();
+               //TODO: Make sure the value is of the correct type;
+               push_stack(value);
                break;
        }
 /// 0x87 ABC_ACTION_ASTYPELATE

=== modified file 'libcore/vm/Machine.h'
--- a/libcore/vm/Machine.h      2008-08-22 09:51:45 +0000
+++ b/libcore/vm/Machine.h      2008-08-22 11:16:15 +0000
@@ -308,7 +308,6 @@
                //GET PROPERTY
                boost::intrusive_ptr<gnash::as_object> object = 
mStack.pop().to_object();
 //             LOG_DEBUG_AVM("Here are the members in the object the property 
was resolved in:");
-//             object->dump_members();
                as_value value = p->getValue(*object);
                LOG_DEBUG_AVM("Property's value is %s",value.toDebugString());
                mStack.push(value);