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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/10 14:04:38

Modified files:
        .              : ChangeLog 
        server         : array.cpp array.h 
        testsuite/swfdec: PASSING 

Log message:
                * server/array.{cpp,h}: provide an override
                  for Object.toString().
                * testsuite/swfdec/PASSING: array.swf now passes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2600&r2=1.2601
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.h?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/PASSING?cvsroot=gnash&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2600
retrieving revision 1.2601
diff -u -b -r1.2600 -r1.2601
--- ChangeLog   10 Mar 2007 13:35:07 -0000      1.2600
+++ ChangeLog   10 Mar 2007 14:04:37 -0000      1.2601
@@ -1,5 +1,11 @@
 2007-03-10 Sandro Santilli <address@hidden>
 
+       * server/array.{cpp,h}: provide an override
+         for Object.toString().
+       * testsuite/swfdec/PASSING: array.swf now passes.
+
+2007-03-10 Sandro Santilli <address@hidden>
+
        * testsuite/swfdec/PASSING: expect 5 more successes.
        * testsuite/swfdec/swfdec_gnash_tester: allow 11 advances
          rather then 10 (this is likely due to Gnash current

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/array.cpp    28 Feb 2007 13:00:05 -0000      1.50
+++ server/array.cpp    10 Mar 2007 14:04:38 -0000      1.51
@@ -221,7 +221,7 @@
 }
 
 std::string
-as_array_object::join(const std::string& separator)
+as_array_object::join(const std::string& separator) const
 {
        // TODO - confirm this is the right format!
        // Reportedly, flash version 7 on linux, and Flash 8 on IE look like
@@ -263,7 +263,7 @@
 }
 
 std::string
-as_array_object::toString()
+as_array_object::toString() const
 {
        return join(",");
 }

Index: server/array.h
===================================================================
RCS file: /sources/gnash/gnash/server/array.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- server/array.h      28 Feb 2007 07:41:27 -0000      1.20
+++ server/array.h      10 Mar 2007 14:04:38 -0000      1.21
@@ -79,9 +79,16 @@
 
        void reverse();
 
-       std::string join(const std::string& separator);
+       std::string join(const std::string& separator) const;
 
-       std::string toString();
+       std::string toString() const;
+
+       // override from as_object
+       const char* get_text_value() const
+       {
+               _strval = toString();
+               return _strval.c_str();
+       }
 
        unsigned int size() const;
 
@@ -141,6 +148,10 @@
        // if the string does not refer to an index, or an appropriate int if 
the string does refer to an index
        int index_requested(const std::string& name);
 
+       // Required due to dumb as_object::get_text_value()
+       // method returning by 'const' char *
+       mutable std::string _strval;
+
 };
 
 

Index: testsuite/swfdec/PASSING
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/PASSING,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/swfdec/PASSING    10 Mar 2007 13:35:07 -0000      1.2
+++ testsuite/swfdec/PASSING    10 Mar 2007 14:04:38 -0000      1.3
@@ -15,3 +15,4 @@
 goto4.swf
 goto5.swf
 names.swf
+array.swf