[Gnash-commit] /srv/bzr/gnash/trunk r9831: Minor cleanups, minor AS compatibility fixes.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9831
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Wed 2008-09-24 17:52:29 +0200
message:
  Minor cleanups, minor AS compatibility fixes.
modified:
  libcore/array.cpp
  libcore/array.h
  libcore/asobj/LoadableObject.cpp
  libcore/asobj/XML_as.cpp
  libcore/asobj/xmlnode.cpp
    ------------------------------------------------------------
    revno: 9827.1.7
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Wed 2008-09-24 17:46:11 +0200
    message:
      Minor cleanup.
    modified:
      libcore/array.cpp
      libcore/array.h
    ------------------------------------------------------------
    revno: 9827.1.8
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Wed 2008-09-24 17:46:40 +0200
    message:
      Correct propflags for XML and XMLNode members, split long lines.
    modified:
      libcore/asobj/LoadableObject.cpp
      libcore/asobj/XML_as.cpp
      libcore/asobj/xmlnode.cpp

=== modified file 'libcore/array.cpp'
--- a/libcore/array.cpp 2008-09-18 11:59:44 +0000
+++ b/libcore/array.cpp 2008-09-24 15:46:11 +0000
@@ -1439,10 +1439,7 @@
 static void
 attachArrayProperties(as_object& proto)
 {
-    as_c_function_ptr gettersetter;
-
-    gettersetter = &array_length;
-    proto.init_property(NSV::PROP_LENGTH, *gettersetter, *gettersetter);
+    proto.init_property(NSV::PROP_LENGTH, &array_length, &array_length);
 }
 
 static void

=== modified file 'libcore/array.h'
--- a/libcore/array.h   2008-09-17 07:27:11 +0000
+++ b/libcore/array.h   2008-09-24 15:46:11 +0000
@@ -368,9 +368,7 @@
                return get_indices(ielem);
        }
 
-       /// Overridden to provide 'length' member
-       //
-       /// TODO: use a property for handling 'length'
+    /// Why is this overridden?
        virtual bool get_member(string_table::key name, as_value* val,
                string_table::key nsname = 0);
 

=== modified file 'libcore/asobj/LoadableObject.cpp'
--- a/libcore/asobj/LoadableObject.cpp  2008-09-19 09:41:54 +0000
+++ b/libcore/asobj/LoadableObject.cpp  2008-09-24 15:46:40 +0000
@@ -127,8 +127,10 @@
 
         if (get_member(NSV::PROP_CONTENT_TYPE, &contentType))
         {
-            // This should not overwrite anything set in 
LoadVars.addRequestHeader();
-            headers.insert(std::make_pair("Content-Type", 
contentType.to_string()));
+            // This should not overwrite anything set in 
+            // LoadVars.addRequestHeader();
+            headers.insert(std::make_pair("Content-Type", 
+                        contentType.to_string()));
         }
 
         /// It doesn't matter if there are no request headers.

=== modified file 'libcore/asobj/XML_as.cpp'
--- a/libcore/asobj/XML_as.cpp  2008-09-19 08:48:00 +0000
+++ b/libcore/asobj/XML_as.cpp  2008-09-24 15:46:40 +0000
@@ -364,16 +364,19 @@
 static void
 attachXMLInterface(as_object& o)
 {
-    o.init_member("addRequestHeader", new 
builtin_function(xml_addRequestHeader));
-    o.init_member("createElement", new builtin_function(xml_createelement));
-    o.init_member("createTextNode", new builtin_function(xml_createtextnode));
-    o.init_member("getBytesLoaded", new builtin_function(xml_getbytesloaded));
-    o.init_member("getBytesTotal", new builtin_function(xml_getbytestotal));
-    o.init_member("load", new builtin_function(xml_load));
-    o.init_member("parseXML", new builtin_function(xml_parsexml));
-    o.init_member("send", new builtin_function(xml_send));
-    o.init_member("sendAndLoad", new builtin_function(xml_sendAndLoad));
-    o.init_member("onData", new builtin_function(xml_ondata));
+    const int flags = 0;
+
+    // No flags:
+    o.init_member("addRequestHeader", new 
builtin_function(xml_addRequestHeader), flags);
+    o.init_member("createElement", new builtin_function(xml_createelement), 
flags);
+    o.init_member("createTextNode", new builtin_function(xml_createtextnode), 
flags);
+    o.init_member("getBytesLoaded", new builtin_function(xml_getbytesloaded), 
flags);
+    o.init_member("getBytesTotal", new builtin_function(xml_getbytestotal), 
flags);
+    o.init_member("load", new builtin_function(xml_load), flags);
+    o.init_member("parseXML", new builtin_function(xml_parsexml), flags);
+    o.init_member("send", new builtin_function(xml_send), flags);
+    o.init_member("sendAndLoad", new builtin_function(xml_sendAndLoad), flags);
+    o.init_member("onData", new builtin_function(xml_ondata), flags);
 
 }
 

=== modified file 'libcore/asobj/xmlnode.cpp'
--- a/libcore/asobj/xmlnode.cpp 2008-09-19 08:48:00 +0000
+++ b/libcore/asobj/xmlnode.cpp 2008-09-24 15:46:40 +0000
@@ -341,29 +341,37 @@
 attachXMLNodeInterface(as_object& o)
 {
     // These need to be full-featured AS functions (builtin_function)
-    o.init_member("appendChild", new builtin_function(xmlnode_appendchild));
-    o.init_member("cloneNode", new builtin_function(xmlnode_clonenode));
-    o.init_member("hasChildNodes", new 
builtin_function(xmlnode_haschildnodes));
-    o.init_member("insertBefore", new builtin_function(xmlnode_insertbefore));
-    o.init_member("removeNode", new builtin_function(xmlnode_removenode));
-    o.init_member("toString", new builtin_function(xmlnode_tostring));
-    o.init_member("getPrefixForNamespace", new 
builtin_function(xmlnode_getPrefixForNamespace));
-    o.init_member("getNamespaceForPrefix", new 
builtin_function(xmlnode_getNamespaceForPrefix));
-
-    o.init_property("nodeValue", &xmlnode_nodevalue, &xmlnode_nodevalue);
-    o.init_property("nodeName", &xmlnode_nodename, &xmlnode_nodename);
-
-    o.init_readonly_property("namespaceURI", &xmlnode_namespaceURI);
-    o.init_readonly_property("localName", &xmlnode_localName);
-    o.init_readonly_property("prefix", &xmlnode_prefix);
-    o.init_readonly_property("nodeType", &xmlnode_nodetype);
-    o.init_readonly_property("attributes", &xmlnode_attributes);
-    o.init_readonly_property("childNodes", &xmlnode_childNodes);
-    o.init_readonly_property("firstChild", &xmlnode_firstchild);
-    o.init_readonly_property("lastChild", &xmlnode_lastchild);
-    o.init_readonly_property("nextSibling", &xmlnode_nextsibling);
-    o.init_readonly_property("previousSibling", &xmlnode_previoussibling);
-    o.init_readonly_property("parentNode", &xmlnode_parentNode);
+    
+    const int noFlags = 0;
+    
+    // No prop flags:
+    o.init_member("appendChild", new builtin_function(xmlnode_appendchild), 
noFlags);
+    o.init_member("cloneNode", new builtin_function(xmlnode_clonenode), 
noFlags);
+    o.init_member("hasChildNodes", new 
builtin_function(xmlnode_haschildnodes), noFlags);
+    o.init_member("insertBefore", new builtin_function(xmlnode_insertbefore), 
noFlags);
+    o.init_member("removeNode", new builtin_function(xmlnode_removenode), 
noFlags);
+    o.init_member("toString", new builtin_function(xmlnode_tostring), noFlags);
+    o.init_member("getPrefixForNamespace", new 
builtin_function(xmlnode_getPrefixForNamespace), noFlags);
+    o.init_member("getNamespaceForPrefix", new 
builtin_function(xmlnode_getNamespaceForPrefix), noFlags);
+
+
+    const int protectedFlags = as_prop_flags::isProtected;
+
+    // Just the protected flag:
+    o.init_property("nodeValue", &xmlnode_nodevalue, &xmlnode_nodevalue, 
protectedFlags);
+    o.init_property("nodeName", &xmlnode_nodename, &xmlnode_nodename, 
protectedFlags);
+
+    o.init_readonly_property("firstChild", &xmlnode_firstchild, 
protectedFlags);
+    o.init_readonly_property("lastChild", &xmlnode_lastchild, protectedFlags);
+    o.init_readonly_property("localName", &xmlnode_localName, protectedFlags);
+    o.init_readonly_property("namespaceURI", &xmlnode_namespaceURI, 
protectedFlags);
+    o.init_readonly_property("nextSibling", &xmlnode_nextsibling, 
protectedFlags);
+    o.init_readonly_property("prefix", &xmlnode_prefix, protectedFlags);
+    o.init_readonly_property("previousSibling", &xmlnode_previoussibling, 
protectedFlags);
+    o.init_readonly_property("nodeType", &xmlnode_nodetype, protectedFlags);
+    o.init_readonly_property("attributes", &xmlnode_attributes, 
protectedFlags);
+    o.init_readonly_property("childNodes", &xmlnode_childNodes, 
protectedFlags);
+    o.init_readonly_property("parentNode", &xmlnode_parentNode, 
protectedFlags);
 
 }