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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/09/24 12:34:50

Modified files:
        .              : ChangeLog 
        server/asobj   : xml.cpp 
        testsuite/actionscript.all: XML.as 

Log message:
                * server/asobj/xml.cpp: set _status to min 32bit signed int
                  if value is not a number, cast to_number() to an int 
otherwise.
                * testsuite/actionscript.all/XML.as: two more successes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4391&r2=1.4392
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4391
retrieving revision 1.4392
diff -u -b -r1.4391 -r1.4392
--- ChangeLog   24 Sep 2007 11:47:57 -0000      1.4391
+++ ChangeLog   24 Sep 2007 12:34:49 -0000      1.4392
@@ -1,5 +1,11 @@
 2007-09-24 Sandro Santilli <address@hidden>
 
+       * server/asobj/xml.cpp: set _status to min 32bit signed int
+         if value is not a number, cast to_number() to an int otherwise.
+       * testsuite/actionscript.all/XML.as: two more successes.
+
+2007-09-24 Sandro Santilli <address@hidden>
+
        * testsuite/misc-ming.all/action_execution_order_test5.c:
          replicate tests run from SWFACTION_INIT into SWFACTION_CONSTRUCT.
        * testsuite/actionscript.all/XML.as: more test for .status.

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/asobj/xml.cpp        23 Sep 2007 08:48:18 -0000      1.47
+++ server/asobj/xml.cpp        24 Sep 2007 12:34:50 -0000      1.48
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: xml.cpp,v 1.47 2007/09/23 08:48:18 cmusick Exp $ */
+/* $Id: xml.cpp,v 1.48 2007/09/24 12:34:50 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -156,7 +156,15 @@
 {
         if (name == NSV::PROP_STATUS)
        {
-               _status = XML::Status(val.to_number());
+               if ( ! val.is_number() )
+               {
+                       _status = 
static_cast<XML::Status>(std::numeric_limits<int32_t>::min());
+               }
+               else
+               {
+                       unsigned int statusNumber = 
static_cast<int>(val.to_number());
+                       _status = XML::Status( 
static_cast<XML::Status>(statusNumber) );
+               }
                return;
        }
         else if (name == NSV::PROP_LOADED)
@@ -173,7 +181,7 @@
 
 XML::~XML()
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
     
 #ifdef DEBUG_MEMORY_ALLOCATION
     log_msg(_("\tDeleting XML top level node at %p"), this);

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- testsuite/actionscript.all/XML.as   24 Sep 2007 10:57:34 -0000      1.36
+++ testsuite/actionscript.all/XML.as   24 Sep 2007 12:34:50 -0000      1.37
@@ -20,7 +20,7 @@
 // compile this test case with Ming makeswf, and then
 // execute it like this gnash -1 -r 0 -v out.swf
 
-rcsid="$Id: XML.as,v 1.36 2007/09/24 10:57:34 strk Exp $";
+rcsid="$Id: XML.as,v 1.37 2007/09/24 12:34:50 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -119,12 +119,13 @@
 o = new Object;
 tmp.status = o; 
 check_equals(typeof(tmp.status), 'number');
-xcheck_equals(tmp.status, -2147483648); // 0xFFFFFFFF
+check_equals(tmp.status, -2147483648); // 0xFFFFFFFF
+tmp.status = 7;
 returnFour = function() { return 4; };
 o.toString = returnFour;
 tmp.status = o;
 check_equals(typeof(tmp.status), 'number');
-xcheck_equals(tmp.status, -2147483648); // 0xFFFFFFFF
+check_equals(tmp.status, -2147483648); // 0xFFFFFFFF
 
 check_equals(typeof(tmp.loaded), 'undefined');
 check(! tmp.hasOwnProperty("loaded"));