[Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/03/09 10:39:11

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp 
        server/vm      : ASHandlers.cpp 

Log message:
                * server/as_environment.cpp: include index in registers dump.
                * server/vm/ASHandlers.cpp (ActionEnumerate, ActionEnumerate2):
                  Make 'for (i in <non-object-value>)' an ASCODING error.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2586&r2=1.2587
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.58&r2=1.59

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2586
retrieving revision 1.2587
diff -u -b -r1.2586 -r1.2587
--- ChangeLog   9 Mar 2007 10:18:49 -0000       1.2586
+++ ChangeLog   9 Mar 2007 10:39:10 -0000       1.2587
@@ -1,5 +1,8 @@
 2007-03-09 Sandro Santilli <address@hidden>
 
+       * server/as_environment.cpp: include index in registers dump.
+       * server/vm/ASHandlers.cpp (ActionEnumerate, ActionEnumerate2):
+         Make 'for (i in <non-object-value>)' an ASCODING error.
        * server/: sprite_instance.{cpp,h}, character.{cpp,h}:
          Moved getNextUnnamedInstanceName() from sprite_instance
          to character, for use withing other character types

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- server/as_environment.cpp   2 Mar 2007 19:38:56 -0000       1.56
+++ server/as_environment.cpp   9 Mar 2007 10:39:10 -0000       1.57
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.56 2007/03/02 19:38:56 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.57 2007/03/09 10:39:10 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -823,7 +823,7 @@
        for (size_t i=0; i<r.size(); ++i)
        {
                if (i) out << ", ";
-               out << '"' << r[i].to_string() << '"';
+               out << i << ':' << '"' << r[i].to_string() << '"';
        }
 }
 

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- server/vm/ASHandlers.cpp    9 Mar 2007 10:03:42 -0000       1.58
+++ server/vm/ASHandlers.cpp    9 Mar 2007 10:39:11 -0000       1.59
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: ASHandlers.cpp,v 1.58 2007/03/09 10:03:42 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.59 2007/03/09 10:39:11 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2390,15 +2390,13 @@
        // fetching the as_object* obj above or it will get lost
        env.top(0).set_null();
 
-       IF_VERBOSE_ACTION (
-       log_action("---enumerate - push: NULL");
-       );
-
        if ( ! obj )
        {
-               log_warning("Top of stack not an object (%s) at "
+               IF_VERBOSE_ASCODING_ERRORS(
+               log_aserror("Top of stack not an object (%s) at "
                        "ActionEnumerate execution",
                        variable.to_string());
+               );
                return;
        }
 
@@ -2866,9 +2864,11 @@
        as_object* obj = obj_val.to_object();
        if ( ! obj )
        {
-               log_warning("Top of stack not an object (%s) at ActionEnum2 "
+               IF_VERBOSE_ASCODING_ERRORS(
+               log_aserror("Top of stack not an object (%s [%s]) at 
ActionEnum2 "
                        " execution",
-                       obj_val.to_string());
+                       obj_val.to_string(), obj_val.typeOf());
+               );
                return;
        }