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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/05 19:03:03

Modified files:
        .              : ChangeLog 
        server         : array.cpp 
        testsuite/actionscript.all: array.as 

Log message:
                * server/array.cpp (array_concat): fix typo in function argument
                  access. Fixes bug #20355.
                * testsuite/actionscript.all/array.as: add more tests for 
Array.concat()

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3655&r2=1.3656
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.18&r2=1.19

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3655
retrieving revision 1.3656
diff -u -b -r1.3655 -r1.3656
--- ChangeLog   4 Jul 2007 07:32:51 -0000       1.3655
+++ ChangeLog   5 Jul 2007 19:03:02 -0000       1.3656
@@ -1,3 +1,9 @@
+2007-07-05 Sandro Santilli <address@hidden>
+
+       * server/array.cpp (array_concat): fix typo in function argument
+         access. Fixes bug #20355.
+       * testsuite/actionscript.all/array.as: add more tests for Array.concat()
+
 2007-07-04 Udo Giacomozzi <address@hidden>
 
        * gui/NullGui.cpp: use tu_timer instead of gettimeofday()

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- server/array.cpp    1 Jul 2007 10:54:19 -0000       1.63
+++ server/array.cpp    5 Jul 2007 19:03:03 -0000       1.64
@@ -749,7 +749,7 @@
        for (unsigned int i=0; i<fn.nargs; i++)
        {
                // Array args get concatenated by elements
-               boost::intrusive_ptr<as_array_object> other = 
boost::dynamic_pointer_cast<as_array_object>(fn.arg(1).to_object());
+               boost::intrusive_ptr<as_array_object> other = 
boost::dynamic_pointer_cast<as_array_object>(fn.arg(i).to_object());
                if ( other )
                {
                        newarray->concat(*other);

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- testsuite/actionscript.all/array.as 30 Apr 2007 16:57:40 -0000      1.18
+++ testsuite/actionscript.all/array.as 5 Jul 2007 19:03:03 -0000       1.19
@@ -5,7 +5,7 @@
 // Updated with sort functions, and to use check() macro
 // by Mike Carlson Feb. 14th, 2006
 
-rcsid="$Id: array.as,v 1.18 2007/04/30 16:57:40 strk Exp $";
+rcsid="$Id: array.as,v 1.19 2007/07/05 19:03:03 strk Exp $";
 
 #include "check.as"
 
@@ -166,6 +166,10 @@
 check_equals ( portion.toString(), "5");
 portion = concatted.slice(-2);
 check_equals ( portion.toString(), "5,6");
+mixed = portion.concat([7,8,9]);
+check_equals ( mixed.toString(), "5,6,7,8,9");
+mixed = mixed.concat([10,11],12,[13]);
+check_equals ( mixed.toString(), "5,6,7,8,9,10,11,12,13");
 
 // invalid calls
 portion = concatted.slice(-18);