[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/as_environment.cpp serve...
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog server/as_environment.cpp serve... |
Date: |
Thu, 22 Nov 2007 19:39:18 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/11/22 19:39:18
Modified files:
. : ChangeLog
server : as_environment.cpp
server/vm : ASHandlers.cpp
Log message:
cleanup aserror message.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4926&r2=1.4927
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.159&r2=1.160
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4926
retrieving revision 1.4927
diff -u -b -r1.4926 -r1.4927
--- ChangeLog 22 Nov 2007 19:37:51 -0000 1.4926
+++ ChangeLog 22 Nov 2007 19:39:17 -0000 1.4927
@@ -1,5 +1,6 @@
2007-11-22 Sandro Santilli <address@hidden>
+ * server/vm/ASHandlers.cpp (ActionEnumerate): cleanup aserror message.
* testsuite/actionscript.all/getvariable.as: another test
2007-11-22 Sandro Santilli <address@hidden>
Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- server/as_environment.cpp 22 Nov 2007 18:50:56 -0000 1.111
+++ server/as_environment.cpp 22 Nov 2007 19:39:18 -0000 1.112
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: as_environment.cpp,v 1.111 2007/11/22 18:50:56 strk Exp $ */
+/* $Id: as_environment.cpp,v 1.112 2007/11/22 19:39:18 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -425,6 +425,7 @@
}
if (colon_index >= var_path_length) {
+log_msg(_(" no colon in path"));
// No colon. Is there a '.'? Find the last
// one, if any.
for (colon_index = var_path_length - 1; colon_index >= 0;
colon_index--) {
@@ -434,7 +435,7 @@
}
}
if (colon_index < 0) {
-//log_msg(_(" no colon index"));
+log_msg(_(" no dot in path"));
return false;
}
}
Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -b -r1.159 -r1.160
--- server/vm/ASHandlers.cpp 22 Nov 2007 11:09:54 -0000 1.159
+++ server/vm/ASHandlers.cpp 22 Nov 2007 19:39:18 -0000 1.160
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: ASHandlers.cpp,v 1.159 2007/11/22 11:09:54 cmusick Exp $ */
+/* $Id: ASHandlers.cpp,v 1.160 2007/11/22 19:39:18 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2811,7 +2811,7 @@
thread.ensureStack(1); // var_name
// Get the object
- as_value& var_name = env.top(0);
+ as_value var_name = env.top(0);
string var_string = var_name.to_string();
as_value variable = thread.getVariable(var_string);
@@ -2821,9 +2821,9 @@
if ( ! variable.is_object() )
{
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Top of stack not an object (%s) at "
+ log_aserror(_("Top of stack doesn't evaluate to an object (%s)
at "
"ActionEnumerate execution"),
- variable.to_debug_string().c_str());
+ var_name.to_debug_string().c_str());
);
return;
}