[Gnash-commit] gnash ChangeLog server/asobj/Global.cpp server/...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/03 16:11:54

Modified files:
        .              : ChangeLog 
        server/asobj   : Global.cpp 
        server/swf     : ASHandlers.cpp 

Log message:
                * server/asobj/Global.cpp (as_global_assetpropflags):
                  removed complain about ASSetProfFlag not implemented
                  for a NULL property argument (seems actually implemented)
                * server/swf/ASHandlers.cpp (ActionEnumerate): log 'testing'
                  rather then 'unimplemented' (seems actually working).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1019&r2=1.1020
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.71&r2=1.72

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1019
retrieving revision 1.1020
diff -u -b -r1.1019 -r1.1020
--- ChangeLog   3 Oct 2006 15:45:03 -0000       1.1019
+++ ChangeLog   3 Oct 2006 16:11:54 -0000       1.1020
@@ -1,3 +1,11 @@
+2006-10-03 Sandro Santilli  <address@hidden>
+
+       * server/asobj/Global.cpp (as_global_assetpropflags):
+         removed complain about ASSetProfFlag not implemented
+         for a NULL property argument (seems actually implemented)
+       * server/swf/ASHandlers.cpp (ActionEnumerate): log 'testing'
+         rather then 'unimplemented' (seems actually working).
+
 2006-10-03 Patrice Dumas <address@hidden>
 
        * testsuite/actionscript.all/Makefile.am,

Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/asobj/Global.cpp     2 Oct 2006 18:15:19 -0000       1.9
+++ server/asobj/Global.cpp     3 Oct 2006 16:11:54 -0000       1.10
@@ -18,7 +18,7 @@
 
 // Implementation of the Global ActionScript Object
 
-/* $Id: Global.cpp,v 1.9 2006/10/02 18:15:19 nihilus Exp $ */
+/* $Id: Global.cpp,v 1.10 2006/10/03 16:11:54 strk Exp $ */
 
 #include "as_object.h"
 #include "array.h"
@@ -371,7 +371,7 @@
 {
        int version = fn.env->get_version();
 
-       log_msg("ASSetPropFlags called with %d args", fn.nargs);
+       //log_msg("ASSetPropFlags called with %d args", fn.nargs);
 
        // Check the arguments
        assert(fn.nargs == 3 || fn.nargs == 4);
@@ -392,19 +392,6 @@
        // list of child names
 
        as_object* props = fn.arg(1).to_object();
-       if (props == NULL)
-       {
-               // second argument can either be an array or
-               // a comma-delimited string.
-               // see: http://www.flashguru.co.uk/assetpropflags/
-               log_error("ASSetPropFlags unimplemented for non-array prop"
-                       " argument (%s)", fn.arg(1).to_string());
-
-               return; // be nice, dont' abort
-
-               // tulrich: this fires in test_ASSetPropFlags -- is it correct?
-               assert(fn.arg(1).get_type() == as_value::NULLTYPE);
-       }
 
     // a number which represents three bitwise flags which
     // are used to determine whether the list of child names should be hidden,

Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- server/swf/ASHandlers.cpp   2 Oct 2006 16:28:11 -0000       1.71
+++ server/swf/ASHandlers.cpp   3 Oct 2006 16:11:54 -0000       1.72
@@ -34,7 +34,7 @@
 // forward this exception.
 //
 
-/* $Id: ASHandlers.cpp,v 1.71 2006/10/02 16:28:11 bjacques Exp $ */
+/* $Id: ASHandlers.cpp,v 1.72 2006/10/03 16:11:54 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2231,7 +2231,6 @@
                                log_action("---enumerate - push: %s", val);
                        );
                }
-        
        }
     
        // Enumerate __proto__ ?? are we sure this is required ?
@@ -2289,8 +2288,9 @@
 
        if ( ! obj )
        {
-               log_warning("Top of stack not an object (%s) at ActionEnum2 "
-                       " execution", variable.to_string());
+               log_warning("Top of stack not an object (%s) at "
+                       "ActionEnumerate execution",
+                       variable.to_string());
                return;
        }
 
@@ -2643,28 +2643,26 @@
 
        ensure_stack(env, 1); // object
 
-       // Get the object
-       as_value& obj_val = env.top(0);
-       as_object* obj = obj_val.to_object();
+       // Get the object.
+       // Copy it so we can override env.top(0)
+       as_value obj_val = env.top(0);
 
-       // The end of the enumeration, don't set top(0) *before*
-       // fetching the as_object* obj above or it will get lost
+       // End of the enumeration. Won't override the object
+       // as we copied that as_value.
        env.top(0).set_null(); 
 
-       IF_VERBOSE_ACTION (
-       log_action("---enumerate - push: NULL");
-       );
-
+       as_object* obj = obj_val.to_object();
        if ( ! obj )
        {
                log_warning("Top of stack not an object (%s) at ActionEnum2 "
-                       " execution", obj_val.to_string());
+                       " execution",
+                       obj_val.to_string());
                return;
        }
 
        enumerateObject(env, *obj);
 
-    dbglogfile << __PRETTY_FUNCTION__ << ": unimplemented!" << endl;
+       dbglogfile << __PRETTY_FUNCTION__ << ": testing" << endl;
 }
 
 void