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

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/06/13 20:06:48

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

Log message:
                * server/vm/ActionExec.h, server/vm/ASHandlers.cpp: drop stack 
depth
                  argument to TryBlock.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6923&r2=1.6924
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.247&r2=1.248
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ActionExec.h?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6923
retrieving revision 1.6924
diff -u -b -r1.6923 -r1.6924
--- ChangeLog   13 Jun 2008 19:05:09 -0000      1.6923
+++ ChangeLog   13 Jun 2008 20:06:47 -0000      1.6924
@@ -1,3 +1,8 @@
+2008-06-13 Benjamin Wolsey <address@hidden>
+
+       * server/vm/ActionExec.h, server/vm/ASHandlers.cpp: drop stack depth
+         argument to TryBlock.
+
 2008-06-13 Jeremy C. Reed <address@hidden>
 
        * configure.ac, macros/docbook.m4: The world doesn't always use bash's

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -b -r1.247 -r1.248
--- server/vm/ASHandlers.cpp    13 Jun 2008 13:42:41 -0000      1.247
+++ server/vm/ASHandlers.cpp    13 Jun 2008 20:06:48 -0000      1.248
@@ -4102,25 +4102,21 @@
     const char* catchName = NULL;
     boost::uint8_t catchRegister = 0;
 
-    if (!doFinally)
-        finallySize = 0;
-    if (!doCatch)
-        catchSize = 0;
+    if (!doFinally) finallySize = 0;
+    if (!doCatch) catchSize = 0;
 
     if (!catchInRegister)
     {
         catchName = code.read_string(i);
         i += strlen(catchName) + 1;
-        TryBlock t(i, trySize, catchSize, finallySize, catchName, 
-            env.stack_size());
+        TryBlock t(i, trySize, catchSize, finallySize, catchName);
         thread.pushTryBlock(t);
     }
     else
     {
         catchRegister = code[i];
         ++i;
-        TryBlock t(i, trySize, catchSize, finallySize, catchRegister,
-            env.stack_size());
+        TryBlock t(i, trySize, catchSize, finallySize, catchRegister);
         thread.pushTryBlock(t);
     }
 

Index: server/vm/ActionExec.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ActionExec.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/vm/ActionExec.h      13 Jun 2008 13:42:41 -0000      1.34
+++ server/vm/ActionExec.h      13 Jun 2008 20:06:48 -0000      1.35
@@ -49,7 +49,7 @@
        };
 
     TryBlock(size_t cur_off, size_t try_size, size_t catch_size,
-               size_t finally_size, std::string catchName, int /*stack_depth*/)
+               size_t finally_size, std::string catchName)
                :
                _catchOffset(cur_off + try_size),
                _finallyOffset(cur_off + try_size + catch_size),
@@ -59,10 +59,10 @@
                _registerIndex(),
                _tryState(TryBlock::TRY_TRY),
                _lastThrow()
-       {/**/}
+       {}
 
        TryBlock(size_t cur_off, size_t try_size, size_t catch_size,
-               size_t finally_size, boost::uint8_t register_index, int /* 
stack_depth */)
+               size_t finally_size, boost::uint8_t register_index)
                :
                _catchOffset(cur_off + try_size),
                _finallyOffset(cur_off + try_size + catch_size),
@@ -72,7 +72,7 @@
                _registerIndex(register_index),
                _tryState(TryBlock::TRY_TRY),
                _lastThrow()
-       {/**/}
+       {}
 
 private:
        size_t _catchOffset;