CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/10/25 09:37:35
Modified files:
. : ChangeLog
server : as_environment.cpp as_environment.h
sprite_instance.cpp
server/asobj : MovieClipLoader.cpp
server/vm : ASHandlers.cpp
Log message:
* server/as_environment.{cpp,h}: drop find_target taking
as_value.
* server/sprite_instance.cpp, server/asobj/MovieClipLoader.cpp,
server/vm/ASHandlers.cpp: update calls to find_target (always
takes a string now).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4705&r2=1.4706
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.h?cvsroot=gnash&r1=1.60&r2=1.61
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.371&r2=1.372
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.144&r2=1.145
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4705
retrieving revision 1.4706
diff -u -b -r1.4705 -r1.4706
--- ChangeLog 25 Oct 2007 09:33:50 -0000 1.4705
+++ ChangeLog 25 Oct 2007 09:37:34 -0000 1.4706
@@ -1,9 +1,16 @@
+2007-10-25 Sandro Santilli <[EMAIL PROTECTED]>
+
+ * server/as_environment.{cpp,h}: drop find_target taking as_value.
+ * server/sprite_instance.cpp, server/asobj/MovieClipLoader.cpp,
+ server/vm/ASHandlers.cpp: update calls to find_target (always
+ takes a string now).
+
2007-10-25 Udo Giacomozzi <[EMAIL PROTECTED]>
* testsuite/actionscript.all/Date.as: Added testcase for bug #21414
(currently failing)
-2007-10-24 Sandro Santilli <[EMAIL PROTECTED]>
+2007-10-25 Sandro Santilli <[EMAIL PROTECTED]>
* testsuite/misc-swfc.all/opcode_guard_test2.sc: add more consistency
checks for zou new tests.
Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- server/as_environment.cpp 25 Oct 2007 07:52:10 -0000 1.102
+++ server/as_environment.cpp 25 Oct 2007 09:37:34 -0000 1.103
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: as_environment.cpp,v 1.102 2007/10/25 07:52:10 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.103 2007/10/25 09:37:34 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -472,6 +472,7 @@
return true;
}
+#if 0
character*
as_environment::find_target(const as_value& val) const
{
@@ -507,6 +508,7 @@
return NULL;
}
}
+#endif
// Search for next '.' or '/' character in this word. Return
// a pointer to it, or to NULL if it wasn't found.
Index: server/as_environment.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.h,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- server/as_environment.h 17 Oct 2007 21:09:56 -0000 1.60
+++ server/as_environment.h 25 Oct 2007 09:37:35 -0000 1.61
@@ -343,7 +343,7 @@
///
/// @@ make private ? --strk;
///
- character* find_target(const as_value& val) const;
+ //character* find_target(const as_value& val) const;
/// Dump content of the stack to a std::ostream
void dump_stack(std::ostream& out=std::cerr)
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.371
retrieving revision 1.372
diff -u -b -r1.371 -r1.372
--- server/sprite_instance.cpp 24 Oct 2007 13:50:53 -0000 1.371
+++ server/sprite_instance.cpp 25 Oct 2007 09:37:35 -0000 1.372
@@ -652,7 +652,7 @@
case 1: // target
{
as_value& tgt_val = fn.arg(0);
- character* target = fn.env().find_target(tgt_val);
+ character* target =
fn.env().find_target(tgt_val.to_string(&env));
if ( ! target )
{
IF_VERBOSE_ASCODING_ERRORS(
Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/asobj/MovieClipLoader.cpp 2 Oct 2007 12:17:46 -0000 1.32
+++ server/asobj/MovieClipLoader.cpp 25 Oct 2007 09:37:35 -0000 1.33
@@ -271,6 +271,8 @@
{
as_value val, method;
+ as_environment& env = fn.env();
+
//log_msg(_("%s: nargs = %d"), __FUNCTION__, fn.nargs);
boost::intrusive_ptr<MovieClipLoader> ptr =
ensureType<MovieClipLoader>(fn.this_ptr);
@@ -287,9 +289,9 @@
return;
}
#endif
- std::string str_url = url_arg.to_string();
+ std::string str_url = url_arg.to_string(&env);
- character* target = fn.env().find_target(fn.arg(1));
+ character* target = fn.env().find_target(fn.arg(1).to_string(&env));
if ( ! target )
{
log_error(_("Could not find target %s"),
fn.arg(1).to_string().c_str());
Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- server/vm/ASHandlers.cpp 25 Oct 2007 07:52:10 -0000 1.144
+++ server/vm/ASHandlers.cpp 25 Oct 2007 09:37:35 -0000 1.145
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ASHandlers.cpp,v 1.144 2007/10/25 07:52:10 strk Exp $ */
+/* $Id: ASHandlers.cpp,v 1.145 2007/10/25 09:37:35 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1067,7 +1067,7 @@
}
else
{
- target = env.find_target(tgt_val);
+ target = env.find_target(tgt_str);
}
unsigned int prop_number = (unsigned int)env.top(0).to_number(&env);
if (target)
@@ -1110,7 +1110,7 @@
thread.ensureStack(3); // prop val, prop num, target
- character *target = env.find_target(env.top(2));
+ character *target = env.find_target(env.top(2).to_string(&env));
unsigned int prop_number = (unsigned int)env.top(1).to_number(&env);
as_value prop_val = env.top(0);
@@ -1239,7 +1239,7 @@
drag_state st;
- character* tgt = env.find_target(env.top(0));
+ character* tgt = env.find_target(env.top(0).to_string(&env));
if ( tgt ) {
st.setCharacter( tgt );
} else {
@@ -2036,7 +2036,7 @@
return;
}
- character* target_ch = env.find_target(target);
+ character* target_ch = env.find_target(target.to_string(&env));
sprite_instance* target_movie = target_ch ? target_ch->to_movie() : 0;
if ( loadVariableFlag )
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
