[Gnash-commit] gnash ChangeLog server/vm/ActionExec.cpp server...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/06/18 13:37:15

Modified files:
        .              : ChangeLog 
        server/vm      : ActionExec.cpp ActionExec.h 

Log message:
                * server/vm/ActionExec.{cpp,h}: drop unused method, rename 
with_stack.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6970&r2=1.6971
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.cpp?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.h?cvsroot=gnash&r1=1.37&r2=1.38

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6970
retrieving revision 1.6971
diff -u -b -r1.6970 -r1.6971
--- ChangeLog   18 Jun 2008 11:22:37 -0000      1.6970
+++ ChangeLog   18 Jun 2008 13:37:14 -0000      1.6971
@@ -1,3 +1,8 @@
+2008-06-18 Benjamin Wolsey <address@hidden>
+
+       * server/vm/ActionExec.{cpp,h}: drop unused method, rename
+         with_stack.
+
 2008-06-18 Sandro Santilli <address@hidden>
 
        * server/character.cpp (getTarget): don't abort when called for 

Index: server/vm/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- server/vm/ActionExec.cpp    18 Jun 2008 07:18:54 -0000      1.85
+++ server/vm/ActionExec.cpp    18 Jun 2008 13:37:15 -0000      1.86
@@ -52,7 +52,7 @@
 # define STACK_DUMP_LIMIT 32
 
 // Define to get debugging messages for try / catch
-#define GNASH_DEBUG_TRY 1
+//#define GNASH_DEBUG_TRY 1
 
 #endif
 
@@ -66,7 +66,7 @@
 
 ActionExec::ActionExec(const swf_function& func, as_environment& newEnv, 
as_value* nRetVal, as_object* this_ptr)
     :
-    with_stack(),
+    _withStack(),
     _scopeStack(func.getScopeStack()),
     // See comment in header
     _withStackLimit(7),
@@ -106,7 +106,7 @@
 
 ActionExec::ActionExec(const action_buffer& abuf, as_environment& newEnv, bool 
abortOnUnloaded)
     :
-    with_stack(),
+    _withStack(),
     _scopeStack(), // TODO: initialize the scope stack somehow
     _withStackLimit(7),
     _func(NULL),
@@ -207,12 +207,12 @@
             }
 
             // Cleanup any expired "with" blocks.
-            while ( ! with_stack.empty() && pc >= with_stack.back().end_pc() )
+            while ( ! _withStack.empty() && pc >= _withStack.back().end_pc() )
             {
            
                 // Drop last stack element
-                assert(with_stack.back().object() == _scopeStack.back().get());
-                with_stack.pop_back();
+                assert(_withStack.back().object() == _scopeStack.back().get());
+                _withStack.pop_back();
                 
                 // hopefully nothing gets after the 'with' stack.
                 _scopeStack.pop_back();
@@ -663,20 +663,20 @@
 ActionExec::pushWithEntry(const with_stack_entry& entry)
 {
     // See comment in header about _withStackLimit
-    if (with_stack.size() >= _withStackLimit)
+    if (_withStack.size() >= _withStackLimit)
     {
         IF_VERBOSE_ASCODING_ERRORS (
         log_aserror(_("'With' stack depth (%d) "
             "exceeds the allowed limit for current SWF "
             "target version (%d for version %d)."
             " Don't expect this movie to work with all players."),
-            with_stack.size()+1, _withStackLimit,
+            _withStack.size()+1, _withStackLimit,
             env.get_version());
         );
         return false;
     }
     
-    with_stack.push_back(entry);
+    _withStack.push_back(entry);
     _scopeStack.push_back(const_cast<as_object*>(entry.object()));
     return true;
 }
@@ -763,9 +763,9 @@
 as_object*
 ActionExec::getTarget()
 {
-    if ( ! with_stack.empty() )
+    if ( ! _withStack.empty() )
     {
-        return with_stack.back().object();
+        return _withStack.back().object();
     }
     else
     {

Index: server/vm/ActionExec.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/vm/ActionExec.h      17 Jun 2008 19:36:44 -0000      1.37
+++ server/vm/ActionExec.h      18 Jun 2008 13:37:15 -0000      1.38
@@ -106,17 +106,6 @@
        ///
        void dumpActions(size_t start, size_t end, std::ostream& os);
 
-       /// Returns 'with' stack associated with this execution thread
-       // 
-       /// If you need to modify it, use the pushWithEntry() function.
-       ///
-       /// TODO: deprecate this
-       ///
-       const std::vector<with_stack_entry>& getWithStack() const
-       {
-               return with_stack;
-       }
-
     /// Processes the current try - catch - finally block
     //
     /// This function is called after each stage of a
@@ -131,7 +120,6 @@
     /// @return whether to continue executing the buffer
     //
     /// @param t the try block to process.
-    
     bool processExceptions(TryBlock& t);
 
        /// Run after a complete run, or after an run interrupted by 
@@ -158,7 +146,7 @@
        void cleanupAfterRun(bool expectInconsistencies=false);
 
        /// the 'with' stack associated with this execution thread
-       std::vector<with_stack_entry> with_stack;
+       std::vector<with_stack_entry> _withStack;
 
        typedef as_environment::ScopeStack ScopeStack;