[Gnash-commit] gnash ChangeLog server/array.cpp server/array.h

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/06 08:19:12

Modified files:
        .              : ChangeLog 
        server         : array.cpp array.h 

Log message:
        Most functions made module-static

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.470&r2=1.471
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.h?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -b -r1.470 -r1.471
--- ChangeLog   6 Jul 2006 08:16:31 -0000       1.470
+++ ChangeLog   6 Jul 2006 08:19:12 -0000       1.471
@@ -1,5 +1,6 @@
 2006-07-06 Sandro Santilli <address@hidden>
 
+       * server/array.cpp: most functions made module-statics, indentation
        * testsuite/actionscript.all/array.as: "tostring" => "toString"
        (SWF 7 and up are case-sensitive in this); added tests for
        Array constants and instanceOf.

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- server/array.cpp    6 Jul 2006 07:59:50 -0000       1.28
+++ server/array.cpp    6 Jul 2006 08:19:12 -0000       1.29
@@ -79,7 +79,8 @@
     log_action("%s : %p\n", __FUNCTION__, (void*)this);
 }
 
-int as_array_object::index_requested(const tu_stringi& name)
+int
+as_array_object::index_requested(const tu_stringi& name)
 {
        double value;
        as_value temp;
@@ -97,17 +98,20 @@
        return int(value + 0.01);
 }
 
-void as_array_object::push(as_value& val)
+void
+as_array_object::push(as_value& val)
 {
        elements.push_back(val);
 }
 
-void as_array_object::unshift(as_value& val)
+void
+as_array_object::unshift(as_value& val)
 {
        elements.push_front(val);
 }
 
-as_value as_array_object::pop()
+as_value
+as_array_object::pop()
 {
        // If the array is empty, report an error and return undefined!
        if (elements.size() <= 0)
@@ -122,7 +126,8 @@
        return ret;
 }
 
-as_value as_array_object::shift()
+as_value
+as_array_object::shift()
 {
        // If the array is empty, report an error and return undefined!
        if (elements.size() <= 0)
@@ -137,13 +142,15 @@
        return ret;
 }
 
-void as_array_object::reverse()
+void
+as_array_object::reverse()
 {
        // Reverse the deque elements
        std::reverse(elements.begin(), elements.end());
 }
 
-std::string as_array_object::join(const std::string& separator)
+std::string
+as_array_object::join(const std::string& separator)
 {
        // TODO - confirm this is the right format!
        // Reportedly, flash version 7 on linux, and Flash 8 on IE look like
@@ -177,30 +184,27 @@
 
 }
 
-void as_array_object::concat(const as_array_object& other)
+void
+as_array_object::concat(const as_array_object& other)
 {
        elements.insert(elements.end(), other.elements.begin(),
                other.elements.end());
 }
 
-std::string as_array_object::toString()
+std::string
+as_array_object::toString()
 {
        return join(",");
 }
 
-unsigned int as_array_object::size() const
+unsigned int
+as_array_object::size() const
 {
        return elements.size();
 }
 
-#if 0
-void as_array_object::resize(unsigned int newsize)
-{
-       elements.resize(newsize);
-}
-#endif
-
-as_value as_array_object::at(unsigned int index)
+as_value
+as_array_object::at(unsigned int index)
 {
        if ( index > elements.size()-1 )
        {
@@ -228,9 +232,9 @@
 
 }
 
-
 /* virtual public, overriding as_object::set_member */
-bool as_array_object::get_member(const tu_stringi& name, as_value *val)
+bool
+as_array_object::get_member(const tu_stringi& name, as_value *val)
 {
        if ( name == "length" ) 
        {
@@ -250,7 +254,8 @@
 }
 
 /* virtual public, overriding as_object::set_member */
-void as_array_object::set_member(const tu_stringi& name,
+void
+as_array_object::set_member(const tu_stringi& name,
                const as_value& val )
 {
        if ( name == "length" ) 
@@ -281,7 +286,8 @@
 
 
 // Callback for unimplemented functions
-void   array_not_impl(const fn_call& fn)
+static void
+array_not_impl(const fn_call& fn)
 {
        assert(dynamic_cast<as_array_object*>(fn.this_ptr));
        //as_array_object* array = static_cast<as_array_object*>(fn.this_ptr);
@@ -290,7 +296,8 @@
 }
 
 // Callback to report array length
-void array_length(const fn_call& fn)
+static void
+array_length(const fn_call& fn)
 {
        assert(dynamic_cast<as_array_object*>(fn.this_ptr));
        as_array_object* array = \
@@ -302,7 +309,8 @@
 }
 
 // Callback to push values to the back of an array
-void array_push(const fn_call& fn)
+static void
+array_push(const fn_call& fn)
 {
        assert(dynamic_cast<as_array_object*>(fn.this_ptr));
        as_array_object* array = \
@@ -317,7 +325,8 @@
 }
 
 // Callback to push values to the front of an array
-void array_unshift(const fn_call& fn)
+static void
+array_unshift(const fn_call& fn)
 {
        assert(dynamic_cast<as_array_object*>(fn.this_ptr));
        as_array_object* array = \
@@ -332,7 +341,8 @@
 }
 
 // Callback to pop a value from the back of an array
-void array_pop(const fn_call& fn)
+static void
+array_pop(const fn_call& fn)
 {
        assert(dynamic_cast<as_array_object*>(fn.this_ptr));
        as_array_object* array = \
@@ -344,7 +354,8 @@
 }
 
 // Callback to pop a value from the front of an array
-void array_shift(const fn_call& fn)
+static void
+array_shift(const fn_call& fn)
 {
        assert(dynamic_cast<as_array_object*>(fn.this_ptr));
        as_array_object* array = \
@@ -356,7 +367,8 @@
 }
 
 // Callback to reverse the position of the elements in an array
-void array_reverse(const fn_call& fn)
+static void
+array_reverse(const fn_call& fn)
 {
        assert(dynamic_cast<as_array_object*>(fn.this_ptr));
        as_array_object* array = \
@@ -371,7 +383,8 @@
 }
 
 // Callback to convert array to a string with optional custom separator 
(default ',')
-void array_join(const fn_call& fn)
+static void
+array_join(const fn_call& fn)
 {
        assert(dynamic_cast<as_array_object*>(fn.this_ptr));
        as_array_object* array = \
@@ -388,7 +401,8 @@
 }
 
 // Callback to convert array to a string
-void array_to_string(const fn_call& fn)
+static void
+array_to_string(const fn_call& fn)
 {
        log_action("array_to_string called, nargs = %d, "
                        "this_ptr = %p",
@@ -410,7 +424,8 @@
 /// value parameters specify an array, the elements of that
 /// array are concatenated, rather than the array itself. The
 /// array my_array is left unchanged.
-void array_concat(const fn_call& fn)
+static void
+array_concat(const fn_call& fn)
 {
        assert(dynamic_cast<as_array_object*>(fn.this_ptr));
        as_array_object* array = \
@@ -438,7 +453,8 @@
 
 // Callback to slice part of an array to a new array
 // without changing the original
-void array_slice(const fn_call& fn)
+static void
+array_slice(const fn_call& fn)
 {
        assert(dynamic_cast<as_array_object*>(fn.this_ptr));
        as_array_object* array = \
@@ -508,7 +524,8 @@
 
 }
 
-void   array_new(const fn_call& fn)
+void
+array_new(const fn_call& fn)
 {
     log_action("array_new called, nargs = %d", fn.nargs);
 
@@ -584,8 +601,6 @@
        {
                proto = new as_object();
                attachArrayInterface(proto);
-               //proto->set_member("constructor", &array_new); 
-               //proto->set_member_flags("constructor", 1);
        }
        return proto;
 }

Index: server/array.h
===================================================================
RCS file: /sources/gnash/gnash/server/array.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- server/array.h      29 Apr 2006 00:56:38 -0000      1.9
+++ server/array.h      6 Jul 2006 08:19:12 -0000       1.10
@@ -102,6 +102,7 @@
        };
 
        /// Constructor for ActionScript class Array.
+       // needed by SWFHandlers::ActionInitArray
        void    array_new(const fn_call& fn);
 };