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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/06 20:29:09

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

Log message:
        there's no such thing as an Array.size member

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5833&r2=1.5834
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/array.as?cvsroot=gnash&r1=1.42&r2=1.43

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5833
retrieving revision 1.5834
diff -u -b -r1.5833 -r1.5834
--- ChangeLog   6 Mar 2008 20:21:23 -0000       1.5833
+++ ChangeLog   6 Mar 2008 20:29:09 -0000       1.5834
@@ -1,5 +1,12 @@
 2008-03-06 Sandro Santilli <address@hidden>
 
+       * server/array.cpp: there's no such thing as an Array.size member, and
+         use a native getter/setter for 'length'.
+       * testsuite/actionscript.all/array.as: test that Array instances
+         don't have any 'size' member.
+
+2008-03-06 Sandro Santilli <address@hidden>
+
        * server/as_value.{cpp,h}: cleanup: remove the unused drop_refs
          and destructor (both doing nothing).
 

Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/array.cpp    19 Feb 2008 19:20:52 -0000      1.93
+++ server/array.cpp    6 Mar 2008 20:29:09 -0000       1.94
@@ -1249,14 +1249,6 @@
        return as_value(ret.c_str());
 }
 
-static as_value
-array_size(const fn_call& fn)
-{
-       boost::intrusive_ptr<as_array_object> array = 
ensureType<as_array_object>(fn.this_ptr);
-
-       return as_value(array->size());
-}
-
 // Callback to convert array to a string
 // TODO CHECKME: rely on Object.toString  ? (
 static as_value
@@ -1436,12 +1428,10 @@
 static void
 attachArrayProperties(as_object& proto)
 {
-       boost::intrusive_ptr<builtin_function> gettersetter;
+       as_c_function_ptr gettersetter;
 
-       gettersetter = new builtin_function(&array_length, NULL);
+       gettersetter = &array_length;
        proto.init_property("length", *gettersetter, *gettersetter);
-
-       proto.init_member("size", new builtin_function(array_size));
 }
 
 static void

Index: testsuite/actionscript.all/array.as
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/array.as,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- testsuite/actionscript.all/array.as 5 Mar 2008 03:56:06 -0000       1.42
+++ testsuite/actionscript.all/array.as 6 Mar 2008 20:29:09 -0000       1.43
@@ -96,6 +96,7 @@
 var a;
 var popped;
 a=[551,"asdf",12];
+check_equals(typeof(a.size), 'undefined');
 
 check (a instanceOf Array);
 check_equals(a.length, 3);
@@ -1022,11 +1023,11 @@
 
 
 #if OUTPUT_VERSION < 6
- check_totals(365);
+ check_totals(366);
 #else
 # if OUTPUT_VERSION < 7
-  check_totals(393);
+  check_totals(394);
 # else
-  check_totals(400);
+  check_totals(401);
 # endif
 #endif