[Gnash-commit] gnash ./ChangeLog server/xmlnode.h server/xmlno...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/02/11 18:09:43

Modified files:
        .              : ChangeLog 
        server         : xmlnode.h xmlnode.cpp 
        doc/C          : gnash.xml internals.xml 
Added files:
        testsuite/actionscript.all: XMLNode.as 
        doc/C          : xmlnode.xml 

Log message:
        * server/xmlnode.{h,cpp): Implement nodeType property.
        * testsuite/actionscript.all/XMLNode.as: add test for
        XMLNode::nodeType property.
        * doc/C/xmlnode.xml: New file for accidentally skipped class.
        * testsuite/actionscript.all/XMLNode.as: New test case for
        XMLNode to test the methods and properties.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.125&tr2=1.126&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlnode.h.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlnode.cpp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/testsuite/actionscript.all/XMLNode.as?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/gnash.xml.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/internals.xml.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/doc/C/xmlnode.xml?rev=1.1

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.125 gnash/ChangeLog:1.126
--- gnash/ChangeLog:1.125       Sat Feb 11 17:29:50 2006
+++ gnash/ChangeLog     Sat Feb 11 18:09:43 2006
@@ -1,7 +1,11 @@
 2006-02-11  Rob Savoye  <address@hidden>
 
-       * doc/C/internals.xml: Update section on using as_value objects.
-
+       * server/xmlnode.{h,cpp): Implement nodeType property.
+       * testsuite/actionscript.all/XMLNode.as: add test for
+       XMLNode::nodeType property.
+       * doc/C/xmlnode.xml: New file for accidentally skipped class.
+       * doc/C/internals.xml: Update section on using as_value
+       objects. Include XMLNode section.
        * macros/docbook.m4: Extract and save the version of the Docbook2X
        tools, because there are two big differences in command line
        options depending which version you have.
@@ -9,7 +13,6 @@
        --enable-docbook is specified.
        * doc/C/Makefile.am: Check the version of the Docbook2X tools when
        running db2x_texixml.
-       
        * macros/sdl.m4: Define HAVE_SDL_MIXER_H if we have SDL Mixer
        installed.
 
Index: gnash/doc/C/gnash.xml
diff -u gnash/doc/C/gnash.xml:1.11 gnash/doc/C/gnash.xml:1.12
--- gnash/doc/C/gnash.xml:1.11  Tue Jan 31 02:52:59 2006
+++ gnash/doc/C/gnash.xml       Sat Feb 11 18:09:43 2006
@@ -45,6 +45,7 @@
   <!ENTITY astextformat SYSTEM "textformat.xml">
   <!ENTITY astextsnapshot SYSTEM "textsnapshot.xml">
   <!ENTITY asvideo SYSTEM "video.xml">
+  <!ENTITY asxmlnode SYSTEM "xmlnode.xml">
   <!ENTITY asxml SYSTEM "xml.xml">
   <!ENTITY asxmlsocket SYSTEM "xmlsocket.xml">
  ]
Index: gnash/doc/C/internals.xml
diff -u gnash/doc/C/internals.xml:1.10 gnash/doc/C/internals.xml:1.11
--- gnash/doc/C/internals.xml:1.10      Sat Feb 11 17:29:50 2006
+++ gnash/doc/C/internals.xml   Sat Feb 11 18:09:43 2006
@@ -1161,7 +1161,6 @@
       &asnetconnection;
       &asnumber;
       &asstring;
-      &asxml;
       &ascustomactions;
       &asdate;
       &aserror;
@@ -1184,6 +1183,8 @@
       &astextformat;
       &astextsnapshot;
       &asvideo;
+      &asxmlnode;
+      &asxml;
       &asxmlsocket;
 
     </sect3>
Index: gnash/server/xmlnode.cpp
diff -u gnash/server/xmlnode.cpp:1.2 gnash/server/xmlnode.cpp:1.3
--- gnash/server/xmlnode.cpp:1.2        Sat Feb 11 01:57:03 2006
+++ gnash/server/xmlnode.cpp    Sat Feb 11 18:09:43 2006
@@ -123,6 +123,31 @@
 }
 #endif
 
+/// \brief Get the type of an XML Node.
+///
+
+/// Read-only property; a nodeType value, either 1 for an XML element
+/// or 3 for a text node. The nodeType is a numeric value from the
+/// NodeType enumeration in the W3C DOM Level 1 recommendation:
+/// www.w3.org/TR/1998/REC-DOM-Level-1-19981001/level-one-core.html.
+/// The following table lists the values.
+int
+XMLNode::nodeType() 
+{
+    switch (_type) {
+      case XML_TEXT_NODE:
+         return 3;
+         break;
+      case XML_ELEMENT_NODE:
+         return 1;
+         break;
+      default:
+         return 0;
+    }
+    // you should never get here
+    return -1;
+}
+
 const char *
 XMLNode::nodeName() 
 {
@@ -271,6 +296,7 @@
     // Properties
     xml_obj->set_member("nodeName",  as_value(""));
     xml_obj->set_member("nodeValue", as_value(""));
+    xml_obj->set_member("nodeType", as_value(""));
 
     // FIXME: these need real values
     // These two return an array of objects
Index: gnash/server/xmlnode.h
diff -u gnash/server/xmlnode.h:1.2 gnash/server/xmlnode.h:1.3
--- gnash/server/xmlnode.h:1.2  Sat Feb 11 01:57:03 2006
+++ gnash/server/xmlnode.h      Sat Feb 11 18:09:43 2006
@@ -51,7 +51,9 @@
     int length()                 { return _children.size(); }
     const char *nodeName();
     const char *nodeValue();
-  //    char *valueGet();
+    int nodeType();
+
+    //    char *valueGet();
   
 #ifdef ENABLE_TESTING
     void nodeNameSet(char *name);
@@ -136,6 +138,7 @@
 void xmlnode_haschildren(const fn_call& fn);
 void xmlnode_nodename(const fn_call& fn);
 void xmlnode_nodevalue(const fn_call& fn);
+void xmlnode_nodetype(const fn_call& fn);
 #endif
 
 void xmlnode_appendchild(const fn_call& fn);