[Gnash-commit] gnash ./ChangeLog server/action.cpp testsuite/a...

[strk]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     strk <address@hidden>   06/02/10 13:20:04

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

Log message:
        Fixed but left from previous commit in doActionMethodCall,
        added a test for __proto__ in Function.as

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.117&tr2=1.118&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/action.cpp.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/testsuite/actionscript.all/Function.as.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.117 gnash/ChangeLog:1.118
--- gnash/ChangeLog:1.117       Fri Feb 10 12:27:42 2006
+++ gnash/ChangeLog     Fri Feb 10 13:20:03 2006
@@ -2,6 +2,7 @@
 
        * server/action.{cpp,h}: added doActionCallMethod and
        doActionCallFunction private methods to action_buffer.
+       * testsuite/actionscript.all/Function.as: more tests.
 
 2006-02-09  Rob Savoye  <address@hidden>
 
Index: gnash/server/action.cpp
diff -u gnash/server/action.cpp:1.37 gnash/server/action.cpp:1.38
--- gnash/server/action.cpp:1.37        Fri Feb 10 12:27:43 2006
+++ gnash/server/action.cpp     Fri Feb 10 13:20:04 2006
@@ -1888,7 +1888,8 @@
                        as_value        method;
                        if (obj->get_member(method_name, &method))
                        {
-                               if (method.get_type() != as_value::AS_FUNCTION)
+                               if (method.get_type() != as_value::AS_FUNCTION 
&&
+                                       method.get_type() != 
as_value::C_FUNCTION)
                                {
                                        log_error("error: call_method: '%s' is 
not a method\n",
                                                  method_name.c_str());
Index: gnash/testsuite/actionscript.all/Function.as
diff -u gnash/testsuite/actionscript.all/Function.as:1.7 
gnash/testsuite/actionscript.all/Function.as:1.8
--- gnash/testsuite/actionscript.all/Function.as:1.7    Fri Feb 10 02:24:16 2006
+++ gnash/testsuite/actionscript.all/Function.as        Fri Feb 10 13:20:04 2006
@@ -77,6 +77,11 @@
 check (TestClass.prototype.constructor == TestClass);
 check (testInstance.__proto__.constructor == TestClass);
 
+// An instance .prototype is NOT a reference to 
+// the superclass's prototype. That would be __proto__.
+testInstance.prototype.additional = "not-in-super";
+check (TestClass.prototype.additional == undefined);
+
 // Test inheritance with built-in functions
 var stringInstance = new String();
 check (stringInstance.__proto__ != undefined);