CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/10/17 21:09:56
Modified files:
. : ChangeLog
server : as_environment.cpp as_environment.h
sprite_instance.cpp
Log message:
* server/: as_environment.{cpp,h}, sprite_instance.cpp:
Drop useless as_environment::{get,set}_member.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4623&r2=1.4624
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.368&r2=1.369
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4623
retrieving revision 1.4624
diff -u -b -r1.4623 -r1.4624
--- ChangeLog 17 Oct 2007 17:05:55 -0000 1.4623
+++ ChangeLog 17 Oct 2007 21:09:55 -0000 1.4624
@@ -1,5 +1,10 @@
2007-10-17 Sandro Santilli <[EMAIL PROTECTED]>
+ * server/: as_environment.{cpp,h}, sprite_instance.cpp:
+ Drop useless as_environment::{get,set}_member.
+
+2007-10-17 Sandro Santilli <[EMAIL PROTECTED]>
+
* configure.ac: add --enable-cassert (build with NDEBUG defined by
default)
* server/dlist.{cpp,h}: add isSorted private method
Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- server/as_environment.cpp 15 Oct 2007 21:42:20 -0000 1.98
+++ server/as_environment.cpp 17 Oct 2007 21:09:55 -0000 1.99
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: as_environment.cpp,v 1.98 2007/10/15 21:42:20 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.99 2007/10/17 21:09:55 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -397,23 +397,6 @@
}
}
-bool
-as_environment::get_member(const std::string& varname, as_value* val) const
-{
- Variables::const_iterator it = _variables.find(varname);
- if ( it == _variables.end() ) return false;
-
- *val = it->second;
- return true;
-}
-
-
-void
-as_environment::set_member(const std::string& varname, const as_value& val)
-{
- _variables[varname] = val;
-}
-
/* public static */
bool
as_environment::parse_path(const std::string& var_path,
Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- server/as_environment.h 15 Oct 2007 21:42:20 -0000 1.59
+++ server/as_environment.h 17 Oct 2007 21:09:56 -0000 1.60
@@ -261,21 +261,6 @@
/// Create the specified local var if it doesn't exist already.
void declare_local(const std::string& varname);
- /// Retrieve the named member (variable).
- //
- /// If no member is found under the given name
- /// 'val' is untouched and 'false' is returned.
- ///
- /// TODO: rename to get_variable
- ///
- bool get_member(const std::string& varname, as_value* val) const;
-
- /// Set the named variable
- //
- /// TODO: rename to set_variable, take a std::string
- ///
- void set_member(const std::string& varname, const as_value& val);
-
/// Add 'count' local registers (add space to end)
//
/// Local registers are only meaningful within a function2 context.
@@ -522,9 +507,6 @@
CallStack _localFrames;
- /// Variables available in this environment
- Variables _variables;
-
as_value m_global_register[numGlobalRegisters];
/// Movie target.
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.368
retrieving revision 1.369
diff -u -b -r1.368 -r1.369
--- server/sprite_instance.cpp 6 Oct 2007 09:06:27 -0000 1.368
+++ server/sprite_instance.cpp 17 Oct 2007 21:09:56 -0000 1.369
@@ -1798,20 +1798,6 @@
return true;
}
-#if 0 // see MovieClip.as
- if ( name == "this" )
- {
- val->set_as_object( this );
- return true;
- }
-#endif
-
- // Try variables.
- if ( m_as_environment.get_member(name, val) )
- {
- return true;
- }
-
// Try object members, BEFORE display list items!
// (see testcase VarAndCharClash.swf in testsuite/misc-ming.all)
//
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
