[Gnash-commit] gnash ChangeLog server/as_value.h server/asobj/...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/21 14:12:00

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

Log message:
                * server/as_value.h (set_null): return a reference to self,
                  to make building a null as_value cleaner.
                * server/asobj/xml.cpp, testsuite/actionscript.all/XML.as:
                  fix a couple of existing tests (minor thing).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1988&r2=1.1989
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/XML.as?cvsroot=gnash&r1=1.12&r2=1.13

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1988
retrieving revision 1.1989
diff -u -b -r1.1988 -r1.1989
--- ChangeLog   21 Dec 2006 12:20:15 -0000      1.1988
+++ ChangeLog   21 Dec 2006 14:12:00 -0000      1.1989
@@ -1,5 +1,9 @@
 2006-12-21 Sandro Santilli <address@hidden>
 
+       * server/as_value.h (set_null): return a reference to self,
+         to make building a null as_value cleaner.
+       * server/asobj/xml.cpp, testsuite/actionscript.all/XML.as:
+         fix a couple of existing tests (minor thing).
        * server/as_value.h: fixed extra qualification
          'gnash::as_value::' on member 'typeOf'.
 

Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- server/as_value.h   21 Dec 2006 12:20:15 -0000      1.23
+++ server/as_value.h   21 Dec 2006 14:12:00 -0000      1.24
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: as_value.h,v 1.23 2006/12/21 12:20:15 strk Exp $ */
+/* $Id: as_value.h,v 1.24 2006/12/21 14:12:00 strk Exp $ */
 
 #ifndef GNASH_AS_VALUE_H
 #define GNASH_AS_VALUE_H
@@ -396,7 +396,11 @@
 
        void    set_undefined() { drop_refs(); m_type = UNDEFINED; }
 
-       void    set_null() { drop_refs(); m_type = NULLTYPE; }
+       /// Set this value to the NULL value
+       //
+       /// @return a reference to this instance
+       ///
+       as_value& set_null() { drop_refs(); m_type = NULLTYPE; return *this; }
 
        void    operator=(const as_value& v)
        {

Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/asobj/xml.cpp        21 Dec 2006 11:34:49 -0000      1.2
+++ server/asobj/xml.cpp        21 Dec 2006 14:12:00 -0000      1.3
@@ -18,7 +18,7 @@
 //
 //
 
-/* $Id: xml.cpp,v 1.2 2006/12/21 11:34:49 strk Exp $ */
+/* $Id: xml.cpp,v 1.3 2006/12/21 14:12:00 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1092,8 +1092,8 @@
         xml_obj->set_member("sendAndLoad", &xml_sendandload);
         xml_obj->set_member("toString", &xml_tostring);
        // Properties
-        xml_obj->set_member("nodeName", as_value(""));
-        xml_obj->set_member("nodevalue", as_value(""));
+        xml_obj->set_member("nodeName", as_value().set_null());
+        xml_obj->set_member("nodevalue", as_value());
 
     }
 
@@ -1154,8 +1154,8 @@
     if (fn.nargs > 0) {
       bool deep = fn.env->bottom(fn.first_arg_bottom_index).to_bool();
       xml_obj = new xmlnode_as_object;
-      xml_obj->set_member("nodeName", as_value(""));
-      xml_obj->set_member("nodeValue", as_value(""));
+      xml_obj->set_member("nodeName", as_value().set_null());
+      xml_obj->set_member("nodeValue", as_value());
       xml_obj->set_member("appendChild", &xmlnode_appendchild);
       ptr->obj.cloneNode(xml_obj->obj, deep);
       fn.result->set_as_object(xml_obj);
@@ -1176,7 +1176,7 @@
         text = fn.env->bottom(fn.first_arg_bottom_index).to_string();
        xml_obj = new xmlnode_as_object;
        xml_obj->set_member("nodeName", as_value(text));
-       xml_obj->set_member("nodeValue", as_value(""));
+       xml_obj->set_member("nodeValue", as_value());
        xml_obj->set_member("appendChild", &xmlnode_appendchild);
 //     xml_obj->obj.nodeNameSet((char *)text);
        xml_obj->obj._type = XML_ELEMENT_NODE; 
@@ -1198,7 +1198,7 @@
     if (fn.nargs > 0) {
         text = fn.env->bottom(fn.first_arg_bottom_index).to_string();
        xml_obj = new xmlnode_as_object;
-       xml_obj->set_member("nodeName", as_value(""));
+       xml_obj->set_member("nodeName", as_value().set_null()); 
        xml_obj->set_member("nodeValue", as_value(text));       
        xml_obj->set_member("appendChild", &xmlnode_appendchild);
 //     xml_obj->obj.nodeValueSet((char *)text);

Index: testsuite/actionscript.all/XML.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/XML.as,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- testsuite/actionscript.all/XML.as   27 Nov 2006 00:56:06 -0000      1.12
+++ testsuite/actionscript.all/XML.as   21 Dec 2006 14:12:00 -0000      1.13
@@ -22,7 +22,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.12 2006/11/27 00:56:06 strk Exp $";
+rcsid="$Id: XML.as,v 1.13 2006/12/21 14:12:00 strk Exp $";
 
 #include "dejagnu.as"
 #include "utils.as"
@@ -268,7 +268,8 @@
 
 xcheck_equals(textElement.nodeType, 3);
 check_equals(textElement.nodeValue, "Hello World");
-xcheck_equals(textElement.nodeName, null);
+check_equals(typeof(textElement.nodeName), 'null');
+check_equals(textElement.nodeName, null);
 
 //note(textElement);