[Gnash-commit] [SCM] Gnash branch, master, updated. 391debf87d40cef32d299634feb629838adf79ef

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  391debf87d40cef32d299634feb629838adf79ef (commit)
       via  a48358d511b81a3374ab80d4be43501ed7eeb420 (commit)
       via  65b16245648d5977e665236de8e049d22fd66034 (commit)
       via  6c4f05cc7c444ccbcf02461fb7a8e943c7e5fa4e (commit)
       via  1159d40475395218cf925e384d432cc0086ae26e (commit)
       via  2e34cc73995c9e7491345fd9b3d65e05d5cdaf56 (commit)
      from  8fda2fa4859983939549fd1639cbbf528c98d73f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=391debf87d40cef32d299634feb629838adf79ef


commit 391debf87d40cef32d299634feb629838adf79ef
Merge: a48358d 8fda2fa
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Nov 16 15:31:58 2010 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=a48358d511b81a3374ab80d4be43501ed7eeb420


commit a48358d511b81a3374ab80d4be43501ed7eeb420
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Nov 16 15:07:27 2010 +0100

    Drop obsolete comments.

diff --git a/libcore/vm/VM.h b/libcore/vm/VM.h
index b52cdf8..0b18fdf 100644
--- a/libcore/vm/VM.h
+++ b/libcore/vm/VM.h
@@ -162,9 +162,6 @@ public:
        movie_root& getRoot() const;
 
     /// Return the Shared Object Library
-    //
-    /// The Shared Object Library is assumed to exist until VM::clear()
-    /// is called.
     SharedObjectLibrary& getSharedObjectLibrary() const {
         assert(_shLib.get());
         return *_shLib;
@@ -178,8 +175,6 @@ public:
        /// - root movie / stage (_rootMovie)
        /// - Global object (_global)
        /// - Class Hierarchy object
-       ///
-       ///
        void markReachableResources() const;
 
        void registerNative(as_c_function_ptr fun, unsigned int x, unsigned int 
y);

http://git.savannah.gnu.org/cgit//commit/?id=65b16245648d5977e665236de8e049d22fd66034


commit 65b16245648d5977e665236de8e049d22fd66034
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Nov 16 15:02:09 2010 +0100

    Drop another unused function declaration.

diff --git a/libcore/vm/VM.h b/libcore/vm/VM.h
index acfcc1e..b52cdf8 100644
--- a/libcore/vm/VM.h
+++ b/libcore/vm/VM.h
@@ -102,17 +102,6 @@ public:
         return _clock;
     }
 
-    /// Resets any VM members that must be cleared before the GC cleans up
-    //
-    /// At present, this is:
-    /// - SharedObjectLibrary
-    ///
-    /// Ideally, this would be left to the VM's dtor, but we have no control
-    /// over destruction order at present.
-    /// It is assumed that this is the last VM function called before the
-    /// dtor.
-    void clear();
-
        /// Get SWF version context for the currently running actions.
        //
        /// This information will drive operations of the virtual machine

http://git.savannah.gnu.org/cgit//commit/?id=6c4f05cc7c444ccbcf02461fb7a8e943c7e5fa4e


commit 6c4f05cc7c444ccbcf02461fb7a8e943c7e5fa4e
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Nov 16 15:01:28 2010 +0100

    Drop unused function declaration.

diff --git a/libcore/vm/VM.h b/libcore/vm/VM.h
index c902a44..acfcc1e 100644
--- a/libcore/vm/VM.h
+++ b/libcore/vm/VM.h
@@ -85,9 +85,6 @@ public:
 
        ~VM();
 
-    /// Initialize VM resources
-       void init();
-
     /// Accessor for the VM's stack
     //
     /// TODO: drop

http://git.savannah.gnu.org/cgit//commit/?id=1159d40475395218cf925e384d432cc0086ae26e


commit 1159d40475395218cf925e384d432cc0086ae26e
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Nov 16 15:00:24 2010 +0100

    Rearrange class and forward declarations.

diff --git a/libcore/as_environment.h b/libcore/as_environment.h
index de14c4e..5ac9979 100644
--- a/libcore/as_environment.h
+++ b/libcore/as_environment.h
@@ -199,17 +199,6 @@ public:
 
 private:
 
-    VM& _vm;
-
-    /// Stack of as_values in this environment
-    SafeStack<as_value>& _stack;
-
-    /// Movie target. 
-    DisplayObject* m_target;
-
-    /// Movie target. 
-    DisplayObject* _original_target;
-
     /// Given a variable name, set its value (no support for path)
     //
     /// If no variable with that name is found, a new one
@@ -233,6 +222,17 @@ private:
     as_value get_variable_raw(const std::string& varname,
         const ScopeStack& scopeStack, as_object** retTarget=NULL) const;
 
+    VM& _vm;
+
+    /// Stack of as_values in this environment
+    SafeStack<as_value>& _stack;
+
+    /// Movie target. 
+    DisplayObject* m_target;
+
+    /// Movie target. 
+    DisplayObject* _original_target;
+
     static as_value undefVal;
         
 };
diff --git a/libcore/vm/fn_call.h b/libcore/vm/fn_call.h
index fe39834..c77c1d5 100644
--- a/libcore/vm/fn_call.h
+++ b/libcore/vm/fn_call.h
@@ -19,12 +19,6 @@
 #ifndef GNASH_FN_CALL_H
 #define GNASH_FN_CALL_H
 
-#include "as_environment.h" 
-#include "as_object.h"
-#include "as_value.h"
-#include "VM.h"
-#include "GnashException.h"
-
 #include <string>
 #include <vector>
 #include <cassert> 
@@ -32,10 +26,15 @@
 #include <sstream>
 #include <algorithm>
 
+#include "as_object.h"
+#include "as_value.h"
+#include "VM.h"
+#include "GnashException.h"
+#include "as_environment.h"
+
+
 // Forward declarations
 namespace gnash {
-    class as_environment;
-    class as_function;
     class movie_definition;
 }
 

http://git.savannah.gnu.org/cgit//commit/?id=2e34cc73995c9e7491345fd9b3d65e05d5cdaf56


commit 2e34cc73995c9e7491345fd9b3d65e05d5cdaf56
Author: Benjamin Wolsey <address@hidden>
Date:   Tue Nov 16 14:51:25 2010 +0100

    Drop unused proxying function.

diff --git a/libcore/as_environment.h b/libcore/as_environment.h
index 9991406..de14c4e 100644
--- a/libcore/as_environment.h
+++ b/libcore/as_environment.h
@@ -75,13 +75,12 @@ public:
     }
 
     /// Pops an as_value off the stack top and return it.
-    as_value pop()
-    {
+    as_value pop() {
         try {
             return _stack.pop();
         }
-        catch (StackException&) {
-            return undefVal;
+        catch (const StackException&) {
+            return as_value();
         }
     }
 
@@ -100,24 +99,8 @@ public:
         }
     }
 
-    /// Get stack value at the given distance from bottom.
-    //
-    /// bottom(stack_size()-1) is actual stack top
-    ///
-    /// Throw StackException if index is out of range
-    ///
-    as_value& bottom(size_t index) const
-    {
-        try {
-            return _stack.value(index);
-        } catch (StackException&) {
-            return undefVal;
-        }
-    }
-
     /// Drop 'count' values off the top of the stack.
-    void drop(size_t count)
-    {
+    void drop(size_t count) {
         // in case count > stack size, just drop all, forget about
         // exceptions...
         _stack.drop(std::min(count, _stack.size()));
@@ -183,7 +166,6 @@ public:
     void set_variable(const std::string& path, const as_value& val,
         const ScopeStack& scopeStack);
 
-#ifdef GNASH_USE_GC
     /// Mark all reachable resources.
     //
     /// Reachable resources from an as_environment
@@ -191,7 +173,6 @@ public:
     /// actually), stack frames and targets (original and current).
     ///
     void markReachableResources() const;
-#endif
 
     /// Find the sprite/movie referenced by the given path.
     //

-----------------------------------------------------------------------

Summary of changes:
 libcore/as_environment.h |   49 ++++++++++++++-------------------------------
 libcore/vm/VM.h          |   19 -----------------
 libcore/vm/fn_call.h     |   15 ++++++-------
 3 files changed, 22 insertions(+), 61 deletions(-)


hooks/post-receive
-- 
Gnash