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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/18 15:51:35

Modified files:
        .              : ChangeLog 
        server         : as_environment.cpp sprite_instance.cpp 
                         sprite_instance.h 
        testsuite/misc-ming.all: timeline_var_test.c 

Log message:
                * server/sprite_instance.cpp (execute_action): don't reset
                  local frame top as there's nothing like a 'movie-frame' local
                  scope. See bug #18523.
                * testsuite/misc-ming.all/timeline_var_test.c: don't expect 
failures.
                * server/as_environment.cpp (get_variable_raw): target members 
take
                  precedence over local variables.
                * testsuite/misc-ming.all/: Makefile.am, timeline_var_test.c:
                  added Dejagnu.swf capabilities (for visual debugging).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1964&r2=1.1965
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.108&r2=1.109
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.h?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/timeline_var_test.c?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1964
retrieving revision 1.1965
diff -u -b -r1.1964 -r1.1965
--- ChangeLog   18 Dec 2006 13:40:45 -0000      1.1964
+++ ChangeLog   18 Dec 2006 15:51:35 -0000      1.1965
@@ -1,5 +1,11 @@
 2006-12-18 Sandro Santilli <address@hidden>
 
+       * server/sprite_instance.cpp (execute_action): don't reset 
+         local frame top as there's nothing like a 'movie-frame' local
+         scope. See bug #18523.
+       * testsuite/misc-ming.all/timeline_var_test.c: don't expect failures.
+       * server/as_environment.cpp (get_variable_raw): target members take
+         precedence over local variables.
        * testsuite/misc-ming.all/: Makefile.am, timeline_var_test.c:
          added Dejagnu.swf capabilities (for visual debugging).
 

Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- server/as_environment.cpp   15 Dec 2006 00:06:02 -0000      1.42
+++ server/as_environment.cpp   18 Dec 2006 15:51:35 -0000      1.43
@@ -16,7 +16,7 @@
 
 //
 
-/* $Id: as_environment.cpp,v 1.42 2006/12/15 00:06:02 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.43 2006/12/18 15:51:35 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -91,6 +91,11 @@
        }
     }
 
+    // Check target members.
+    if (m_target->get_member(varname.c_str(), &val)) {
+       return val;
+    }
+
     // Check locals for getting them
     LocalFrames::const_iterator it = findLocal(varname, true);
     if (it != endLocal()) {
@@ -104,11 +109,6 @@
        return val;
     }
 
-    // Check target members.
-    if (m_target->get_member(varname.c_str(), &val)) {
-       return val;
-    }
-    
     // Check built-in constants.
     if (varname == "_root" || varname == "_level0") {
        return as_value(m_target->get_root_movie());

Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -b -r1.108 -r1.109
--- server/sprite_instance.cpp  18 Dec 2006 09:48:53 -0000      1.108
+++ server/sprite_instance.cpp  18 Dec 2006 15:51:35 -0000      1.109
@@ -2170,14 +2170,16 @@
 {
        as_environment& env = m_as_environment; // just type less
 
-       int local_stack_top = env.get_local_frame_top();
+       // Do not cleanup locals here, as there's nothing like
+       // a movie-frame local scope...
 
-       env.add_frame_barrier();
+       //int local_stack_top = env.get_local_frame_top();
+       //env.add_frame_barrier();
 
        ActionExec exec(ab, env);
        exec();
 
-       env.set_local_frame_top(local_stack_top);
+       //env.set_local_frame_top(local_stack_top);
 }
 
 // 0-based frame number !

Index: server/sprite_instance.h
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/sprite_instance.h    12 Dec 2006 19:48:04 -0000      1.49
+++ server/sprite_instance.h    18 Dec 2006 15:51:35 -0000      1.50
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sprite_instance.h,v 1.49 2006/12/12 19:48:04 strk Exp $ */
+/* $Id: sprite_instance.h,v 1.50 2006/12/18 15:51:35 strk Exp $ */
 
 // Stateful live Sprite instance
 
@@ -553,10 +553,6 @@
 private:
 
        /// Execute a single action buffer (DOACTION block)
-       //
-       /// The function will take care of cleaning up
-       /// the environment's frames stack after execution
-       ///
        void execute_action(action_buffer& ab);
 
        /// Execute the actions in the action list

Index: testsuite/misc-ming.all/timeline_var_test.c
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/timeline_var_test.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/misc-ming.all/timeline_var_test.c 18 Dec 2006 13:40:45 -0000      
1.3
+++ testsuite/misc-ming.all/timeline_var_test.c 18 Dec 2006 15:51:35 -0000      
1.4
@@ -59,9 +59,9 @@
      else \
      { \
          if ( var_at_frame3 == \"var_defined_at_frame3\" ) \
-             _root.xpass(\"var_at_frame3 == var_defined_at_frame3\" ); \
+             _root.pass(\"var_at_frame3 == var_defined_at_frame3\" ); \
          else \
-             _root.xfail(\"var_at_frame3 == var_defined_at_frame3\" ); \
+             _root.fail(\"var_at_frame3 == var_defined_at_frame3\" ); \
      } \
   ");
   return ac;