[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/array.cpp server/as_envi...
|
From: |
Benjamin Wolsey |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/array.cpp server/as_envi... |
|
Date: |
Sun, 25 May 2008 10:05:24 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Benjamin Wolsey <bwy> 08/05/25 10:05:23
Modified files:
. : ChangeLog
server : array.cpp as_environment.cpp as_function.cpp
as_object.cpp as_value.cpp as_value.h
character.cpp debugger.cpp
edit_text_character.cpp movie_root.cpp
sprite_instance.cpp timers.cpp
video_stream_instance.cpp
server/asobj : AsBroadcaster.cpp ClassHierarchy.cpp Global.cpp
Key.cpp MovieClipLoader.cpp NetStream.cpp
Number.cpp Object.cpp string.cpp xml.cpp
xmlsocket.cpp
server/vm : fn_call.h
Log message:
* server/array.cpp, server/as_environment.cpp,
server/as_function.cpp, server/as_object.cpp
server/as_value.cpp,
server/as_value.h, server/character.cpp, server/debugger.cpp,
server/edit_text_character.cpp, server/movie_root.cpp,
server/sprite_instance.cpp, server/timers.cpp,
server/video_stream_instance.cpp,
server/asobj/AsBroadcaster.cpp,
server/asobj/ClassHierarchy.cpp, server/asobj/Global.cpp,
server/asobj/Key.cpp, server/asobj/MovieClipLoader.cpp,
server/asobj/NetStream.cpp, server/asobj/Number.cpp,
server/asobj/Object.cpp, server/asobj/string.cpp,
server/asobj/xml.cpp, server/asobj/xmlsocket.cpp,
server/vm/fn_call.h: logging cleanups, dropping c_str() and
to_debug_string(). Should slim down the source a bit.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6701&r2=1.6702
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.109&r2=1.110
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.132&r2=1.133
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_function.cpp?cvsroot=gnash&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_object.cpp?cvsroot=gnash&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.135&r2=1.136
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.h?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.cpp?cvsroot=gnash&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/gnash/server/debugger.cpp?cvsroot=gnash&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/gnash/server/edit_text_character.cpp?cvsroot=gnash&r1=1.187&r2=1.188
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.196&r2=1.197
http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.540&r2=1.541
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/AsBroadcaster.cpp?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/ClassHierarchy.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Global.cpp?cvsroot=gnash&r1=1.129&r2=1.130
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Key.cpp?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/MovieClipLoader.cpp?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStream.cpp?cvsroot=gnash&r1=1.93&r2=1.94
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Number.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Object.cpp?cvsroot=gnash&r1=1.52&r2=1.53
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/string.cpp?cvsroot=gnash&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xml.cpp?cvsroot=gnash&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/xmlsocket.cpp?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/fn_call.h?cvsroot=gnash&r1=1.16&r2=1.17
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6701
retrieving revision 1.6702
diff -u -b -r1.6701 -r1.6702
--- ChangeLog 24 May 2008 22:03:32 -0000 1.6701
+++ ChangeLog 25 May 2008 10:05:18 -0000 1.6702
@@ -1,3 +1,19 @@
+2008-05-25 Benjamin Wolsey <address@hidden>
+
+ * server/array.cpp, server/as_environment.cpp,
+ server/as_function.cpp, server/as_object.cpp server/as_value.cpp,
+ server/as_value.h, server/character.cpp, server/debugger.cpp,
+ server/edit_text_character.cpp, server/movie_root.cpp,
+ server/sprite_instance.cpp, server/timers.cpp,
+ server/video_stream_instance.cpp, server/asobj/AsBroadcaster.cpp,
+ server/asobj/ClassHierarchy.cpp, server/asobj/Global.cpp,
+ server/asobj/Key.cpp, server/asobj/MovieClipLoader.cpp,
+ server/asobj/NetStream.cpp, server/asobj/Number.cpp,
+ server/asobj/Object.cpp, server/asobj/string.cpp,
+ server/asobj/xml.cpp, server/asobj/xmlsocket.cpp,
+ server/vm/fn_call.h: logging cleanups, dropping c_str() and
+ to_debug_string(). Should slim down the source a bit.
+
2008-05-24 Sandro Santilli <address@hidden>
* libbase/FLVParser.{cpp,h}: re-add nextMediaFrame as it's still
Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- server/array.cpp 21 May 2008 16:08:23 -0000 1.109
+++ server/array.cpp 25 May 2008 10:05:19 -0000 1.110
@@ -903,7 +903,7 @@
#ifdef GNASH_DEBUG
std::stringstream ss;
fn.dump_args(ss);
- log_debug(_("Array(%s).splice(%s) called"), array->toString().c_str(),
ss.str().c_str());
+ log_debug(_("Array(%s).splice(%s) called"), array->toString(),
ss.str());
#endif
if (fn.nargs < 1)
@@ -1210,7 +1210,7 @@
IF_VERBOSE_ACTION (
log_action(_("calling array pop, result:%s, new array size:%d"),
- rv.to_debug_string().c_str(), array->size());
+ rv, array->size());
);
return rv;
}
@@ -1226,7 +1226,7 @@
IF_VERBOSE_ACTION (
log_action(_("calling array shift, result:%s, new array size:%d"),
- rv.to_debug_string().c_str(), array->size());
+ rv, array->size());
);
return rv;
}
@@ -1243,7 +1243,7 @@
IF_VERBOSE_ACTION (
log_action(_("called array reverse, result:%s, new array size:%d"),
- rv.to_debug_string().c_str(), array->size());
+ rv, array->size());
);
return rv;
}
@@ -1263,7 +1263,7 @@
std::string ret = array->join(separator, env);
- return as_value(ret.c_str());
+ return as_value(ret);
}
// Callback to convert array to a string
@@ -1280,10 +1280,10 @@
log_action(_("array_to_string called, nargs = %d, "
"this_ptr = %p"),
fn.nargs, (void*)fn.this_ptr.get());
- log_action(_("to_string result is: %s"), ret.c_str());
+ log_action(_("to_string result is: %s"), ret);
);
- return as_value(ret.c_str());
+ return as_value(ret);
}
/// concatenates the elements specified in the parameters with
Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -b -r1.132 -r1.133
--- server/as_environment.cpp 27 Apr 2008 18:13:14 -0000 1.132
+++ server/as_environment.cpp 25 May 2008 10:05:19 -0000 1.133
@@ -82,7 +82,7 @@
if ( ! tmp.is_undefined() )
{
log_aserror(_("...but get_variable_raw(%s, <scopeStack>)
succeeded (%s)!"),
- path.c_str(), tmp.to_debug_string().c_str());
+ path.c_str(), tmp);
}
);
return as_value(); // TODO: should we check get_variable_raw ?
@@ -282,14 +282,14 @@
{
IF_VERBOSE_ACTION (
log_action("-------------- %s = %s",
- varname.c_str(), val.to_debug_string().c_str());
+ varname.c_str(), val);
);
// Path lookup rigamarole.
as_object* target = m_target;
std::string path;
std::string var;
- //log_debug(_("set_variable(%s, %s)"), varname.c_str(),
val.to_debug_string().c_str());
+ //log_debug(_("set_variable(%s, %s)"), varname.c_str(), val);
if ( parse_path(varname, path, var) )
{
//log_debug(_("Variable '%s' parsed into path='%s', var='%s'"),
varname.c_str(), path.c_str(), var.c_str());
@@ -303,7 +303,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Path target '%s' not found while setting %s=%s"),
- path.c_str(), varname.c_str(),
val.to_debug_string().c_str());
+ path.c_str(), varname.c_str(), val);
);
}
} else {
@@ -764,7 +764,7 @@
{
if (count++) out << ", ";
// TODO: define output operator for as_value !
- out << i->first << "==" << i->second.to_debug_string();
+ out << i->first << "==" << i->second;
}
out << std::endl;
}
@@ -803,7 +803,7 @@
if ( defined++ ) ss << ", ";
- ss << i << ":" << m_global_register[i].to_debug_string();
+ ss << i << ":" << m_global_register[i];
}
if ( defined ) out << ss.str() << std::endl;
Index: server/as_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_function.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- server/as_function.cpp 21 May 2008 16:08:23 -0000 1.61
+++ server/as_function.cpp 25 May 2008 10:05:20 -0000 1.62
@@ -241,7 +241,7 @@
log_aserror(_("Second arg of
Function.apply"
" is %s (expected array)"
" - considering as call with no
args"),
-
fn.arg(1).to_debug_string().c_str());
+ fn.arg(1));
);
goto call_it;
}
@@ -322,7 +322,7 @@
log_aserror(_("First argument to Function.call(%s)
doesn't cast to object. "
"Gnash will keep the current 'this' pointer as
it is, "
"but this is known to not be the correct way to
handle "
- "such a malformed call."),
this_val.to_debug_string().c_str());
+ "such a malformed call."), this_val);
);
}
else
@@ -420,7 +420,7 @@
//assert(func_has_prototype);
IF_VERBOSE_ACTION (
- log_action(_("constructor prototype is %s"),
proto.to_debug_string().c_str());
+ log_action(_("constructor prototype is %s"), proto);
);
// Create an empty object, with a ref to the constructor's
prototype.
Index: server/as_object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_object.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- server/as_object.cpp 7 May 2008 09:41:13 -0000 1.121
+++ server/as_object.cpp 25 May 2008 10:05:20 -0000 1.122
@@ -81,7 +81,7 @@
virtual bool get_member(string_table::key name, as_value* val,
string_table::key nsname = 0)
{
- //log_debug("as_super::get_member %s called - _proto is %p",
getVM().getStringTable().value(name).c_str(), _proto);
+ //log_debug("as_super::get_member %s called - _proto is %p",
getVM().getStringTable().value(name), _proto);
if ( _proto ) return _proto->get_member(name, val, nsname);
log_debug("Super has no associated prototype");
return false;
@@ -145,7 +145,7 @@
void operator() (string_table::key name, const as_value& val)
{
if (name == NSV::PROP_uuPROTOuu) return;
- //log_debug(_("Setting member '%s' to value '%s'"),
name.c_str(), val.to_debug_string().c_str());
+ //log_debug(_("Setting member '%s' to value '%s'"), name, val);
_tgt.set_member(name, val);
}
};
@@ -186,7 +186,7 @@
{
Trigger& trig = trigIter->second;
- log_debug("add_property: property %s is being watched,
current val: %s", name, cacheVal.to_debug_string());
+ log_debug("add_property: property %s is being watched,
current val: %s", name, cacheVal);
cacheVal = trig.call(cacheVal, as_value(), *this);
// The trigger call could have deleted the property,
@@ -309,7 +309,7 @@
as_object *proto = protoval.to_object().get();
if (!proto)
{
- log_debug("This object's (%s @ %p) 'prototype' member is not an
object (%s) - get_super returns NULL", typeName(*this), (void*)this,
protoval.to_debug_string());
+ log_debug("This object's (%s @ %p) 'prototype' member is not an
object (%s) - get_super returns NULL", typeName(*this), (void*)this, protoval);
getting = false;
return NULL;
}
@@ -395,7 +395,7 @@
//log_debug("Object %p has no __constructor__ member");
return NULL;
}
- //log_debug("%p.__constructor__ is %s",
ctorVal.to_debug_string().c_str());
+ //log_debug("%p.__constructor__ is %s", ctorVal);
return ctorVal.to_as_function();
}
@@ -545,7 +545,7 @@
as_object::set_member_default(string_table::key key, const as_value& val,
string_table::key nsname, bool ifFound)
{
- //log_debug(_("set_member_default(%s)"), key.c_str());
+ //log_debug(_("set_member_default(%s)"), key);
Property* prop = findUpdatableProperty(key, nsname);
if (prop)
{
@@ -553,7 +553,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(log_aserror(_(""
"Attempt to set read-only property '%s'"),
- _vm.getStringTable().value(key).c_str()););
+ _vm.getStringTable().value(key)););
return true;
}
@@ -572,7 +572,7 @@
as_value curVal = prop->getCache(); //
getValue(*this);
log_debug("Existing property %s is being
watched: firing trigger on update (current val:%s, new val:%s)",
- _vm.getStringTable().value(key),
curVal.to_debug_string(), val.to_debug_string());
+ _vm.getStringTable().value(key),
curVal, val);
as_value newVal = trig.call(curVal, val, *this);
// The trigger call could have deleted the
property,
// so we check for its existance again, and do
NOT put
@@ -598,7 +598,7 @@
catch (ActionTypeError& exc)
{
log_aserror(_("%s: Exception %s. Will create a new
member"),
- _vm.getStringTable().value(key).c_str(),
exc.what());
+ _vm.getStringTable().value(key), exc.what());
}
return true;
@@ -612,8 +612,8 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Unknown failure in setting property '%s'
on "
- "object '%p'"), _vm.getStringTable().value(key).c_str(),
- (void*) this););
+ "object '%p'"), _vm.getStringTable().value(key),
(void*) this);
+ );
return false;
}
@@ -656,7 +656,7 @@
{
std::pair<bool,bool> ret; // first is found, second is updated
- //log_debug(_("set_member_default(%s)"), key.c_str());
+ //log_debug(_("set_member_default(%s)"), key);
Property* prop = findUpdatableProperty(key, nsname);
if (prop)
{
@@ -664,7 +664,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(log_aserror(_(""
"Attempt to set read-only property '%s'"),
- _vm.getStringTable().value(key).c_str()););
+ _vm.getStringTable().value(key)););
return std::make_pair(true, false);
}
@@ -682,7 +682,7 @@
as_value curVal = prop->getCache(); //
Value(*this);
log_debug("Property %s is being watched: firing
trigger on update (current val:%s, new val:%s",
_vm.getStringTable().value(key),
- curVal.to_debug_string(),
val.to_debug_string());
+ curVal, val);
newVal = trig.call(curVal, val, *this);
// The trigger call could have deleted the
property,
// so we check for its existance again, and do
NOT put
@@ -700,7 +700,7 @@
catch (ActionTypeError& exc)
{
log_debug(_("%s: Exception %s. Will create a new
member"),
- _vm.getStringTable().value(key).c_str(),
exc.what());
+ _vm.getStringTable().value(key), exc.what());
}
return std::make_pair(true, false);
@@ -721,7 +721,7 @@
as_object::init_member(string_table::key key, const as_value& val, int flags,
string_table::key nsname, int order)
{
- //log_debug(_("Initializing member %s for object %p"),
_vm.getStringTable().value(key).c_str(), (void*) this);
+ //log_debug(_("Initializing member %s for object %p"),
_vm.getStringTable().value(key), (void*) this);
if (order >= 0 && !_members.
reserveSlot(static_cast<unsigned short>(order), key, nsname))
@@ -736,7 +736,7 @@
{
log_error(_("Attempt to initialize read-only property ``%s''"
" on object ``%p'' twice"),
- _vm.getStringTable().value(key).c_str(), (void*)this);
+ _vm.getStringTable().value(key), (void*)this);
// We shouldn't attempt to initialize a member twice, should we
?
abort();
}
@@ -762,7 +762,7 @@
// We shouldn't attempt to initialize a property twice, should we ?
assert(success);
- //log_debug(_("Initialized property '%s'"), name.c_str());
+ //log_debug(_("Initialized property '%s'"), name);
// TODO: optimize this, don't scan again !
//_members.setFlags(key, flags, nsname);
@@ -787,7 +787,7 @@
// We shouldn't attempt to initialize a property twice, should we ?
assert(success);
- //log_debug(_("Initialized property '%s'"), name.c_str());
+ //log_debug(_("Initialized property '%s'"), name);
// TODO: optimize this, don't scan again !
_members.setFlags(key, flags, nsname);
@@ -900,7 +900,7 @@
{
#ifdef GNASH_DEBUG_INSTANCE_OF
log_debug("Object %p can't be an instance of an object (%p)
with non-object 'prototype' (%s)",
- (void*)this, (void*)ctor, protoVal.to_debug_string());
+ (void*)this, (void*)ctor, protoVal);
#endif
return false;
}
@@ -1027,8 +1027,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Can't set propflags on object "
"property %s "
- "(either not found or protected)"),
- prop.c_str());
+ "(either not found or protected)"),
prop);
);
}
@@ -1076,7 +1075,7 @@
log_aserror(_("Invalid call to AsSetPropFlags: "
"invalid second argument %s "
"(expected string, null or an array)"),
- props_val.to_debug_string().c_str());
+ props_val);
);
return;
}
@@ -1224,7 +1223,7 @@
//log_debug("Object %p has no __proto__ member");
return NULL;
}
- //log_debug("%p.__proto__ is %s", val.to_debug_string().c_str());
+ //log_debug("%p.__proto__ is %s", val);
return val.to_object().get();
#else
static string_table::key key = NSV::PROP_uuPROTOuu;
@@ -1413,8 +1412,7 @@
{
#ifdef DEBUG_TARGET_FINDING
log_debug("Member %s not found in object %p",
- _vm.getStringTable().value(key).c_str(),
- (void*)this);
+ _vm.getStringTable().value(key), (void*)this);
#endif
return NULL;
}
@@ -1422,8 +1420,7 @@
{
#ifdef DEBUG_TARGET_FINDING
log_debug("Member %s of object %p is not an object (%s)",
- _vm.getStringTable().value(key).c_str(), (void*)this,
- tmp.to_debug_string().c_str());
+ _vm.getStringTable().value(key), (void*)this, tmp);
#endif
return NULL;
}
Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -b -r1.135 -r1.136
--- server/as_value.cpp 20 May 2008 11:40:40 -0000 1.135
+++ server/as_value.cpp 25 May 2008 10:05:20 -0000 1.136
@@ -162,8 +162,8 @@
// reference player.
#if GNASH_DEBUG_CONVERSION_TO_PRIMITIVE
log_debug(" %s.to_primitive(STRING) returned
%s",
- to_debug_string(),
- ret.to_debug_string());
+ *this,
+ ret);
#endif
if ( ret.is_string() ) return ret.to_string();
}
@@ -171,7 +171,7 @@
{
#if GNASH_DEBUG_CONVERSION_TO_PRIMITIVE
log_debug(_("to_primitive(%s, STRING) threw an
ActionTypeError %s"),
- to_debug_string(), e.what());
+ *this, e.what());
#endif
}
@@ -381,7 +381,7 @@
as_environment env;
as_value ret = call_method0(method, &env, obj);
#if GNASH_DEBUG_CONVERSION_TO_PRIMITIVE
- log_debug("to_primitive: method call returned %s",
ret.to_debug_string());
+ log_debug("to_primitive: method call returned %s", ret);
#endif
if ( ret.m_type == OBJECT || ret.m_type == AS_FUNCTION ) // not a
primitive
{
@@ -483,7 +483,7 @@
as_environment env;
as_value ret = call_method0(method, &env, obj);
#if GNASH_DEBUG_CONVERSION_TO_PRIMITIVE
- log_debug("to_primitive: method call returned %s",
ret.to_debug_string());
+ log_debug("to_primitive: method call returned %s", ret);
#endif
if ( ret.m_type == OBJECT || ret.m_type == AS_FUNCTION ) // not a
primitive
{
@@ -592,7 +592,7 @@
{
#if GNASH_DEBUG_CONVERSION_TO_PRIMITIVE
log_debug(_("to_primitive(%s, NUMBER) threw an ActionTypeError
%s"),
- to_debug_string(), e.what());
+ *this, e.what());
#endif
if ( m_type == AS_FUNCTION && swfversion < 6 )
{
@@ -937,7 +937,7 @@
#ifdef GNASH_DEBUG_EQUALITY
static int count=0;
- log_debug("equals(%s, %s) called [%d]", to_debug_string(),
v.to_debug_string(), count++);
+ log_debug("equals(%s, %s) called [%d]", *this, v, count++);
#endif
int SWFVersion = VM::get().getSWFVersion();
@@ -1014,7 +1014,7 @@
if ( v.strictly_equals(v2) ) return false;
#ifdef GNASH_DEBUG_EQUALITY
- log_debug(" 20: convertion to primitive : %s -> %s",
v.to_debug_string(), v2.to_debug_string());
+ log_debug(" 20: convertion to primitive : %s -> %s", v, v2);
#endif
return equals(v2);
@@ -1022,7 +1022,7 @@
catch (ActionTypeError& e)
{
#ifdef GNASH_DEBUG_EQUALITY
- log_debug(" %s.to_primitive() threw an ActionTypeError %s",
v.to_debug_string(), e.what());
+ log_debug(" %s.to_primitive() threw an ActionTypeError %s", v,
e.what());
#endif
return false; // no valid conversion
}
@@ -1040,7 +1040,7 @@
if ( strictly_equals(v2) ) return false;
#ifdef GNASH_DEBUG_EQUALITY
- log_debug(" 21: convertion to primitive : %s -> %s",
to_debug_string(), v2.to_debug_string());
+ log_debug(" 21: convertion to primitive : %s -> %s", *this, v2);
#endif
return v2.equals(v);
@@ -1049,7 +1049,7 @@
{
#ifdef GNASH_DEBUG_EQUALITY
- log_debug(" %s.to_primitive() threw an ActionTypeError %s",
to_debug_string(), e.what());
+ log_debug(" %s.to_primitive() threw an ActionTypeError %s",
*this, e.what());
#endif
return false; // no valid conversion
@@ -1062,7 +1062,7 @@
// Both operands are objects (OBJECT,AS_FUNCTION,MOVIECLIP)
if ( ! is_object() || ! v.is_object() )
{
- log_debug("Equals(%s,%s)", to_debug_string(),
v.to_debug_string());
+ log_debug("Equals(%s,%s)", *this, v);
}
#endif
@@ -1077,14 +1077,14 @@
p = to_primitive();
if ( ! strictly_equals(p) ) ++converted;
#ifdef GNASH_DEBUG_EQUALITY
- log_debug(" convertion to primitive (this): %s -> %s",
to_debug_string(), p.to_debug_string());
+ log_debug(" convertion to primitive (this): %s -> %s", *this,
p);
#endif
}
catch (ActionTypeError& e)
{
#ifdef GNASH_DEBUG_CONVERSION_TO_PRIMITIVE
log_debug(" %s.to_primitive() threw an ActionTypeError %s",
- to_debug_string(), e.what());
+ *this, e.what());
#endif
}
@@ -1093,14 +1093,14 @@
vp = v.to_primitive();
if ( ! v.strictly_equals(vp) ) ++converted;
#ifdef GNASH_DEBUG_EQUALITY
- log_debug(" convertion to primitive (that): %s -> %s",
v.to_debug_string(), vp.to_debug_string());
+ log_debug(" convertion to primitive (that): %s -> %s", v, vp);
#endif
}
catch (ActionTypeError& e)
{
#ifdef GNASH_DEBUG_CONVERSION_TO_PRIMITIVE
log_debug(" %s.to_primitive() threw an ActionTypeError %s",
- v.to_debug_string(), e.what());
+ v, e.what());
#endif
}
@@ -1180,7 +1180,7 @@
{
#ifdef GNASH_DEBUG_EQUALITY
static int count=0;
- log_debug("equalsSameType(%s, %s) called [%d]", to_debug_string(),
v.to_debug_string(), count++);
+ log_debug("equalsSameType(%s, %s) called [%d]", *this, v, count++);
#endif
assert(m_type == v.m_type);
switch (m_type)
@@ -1230,7 +1230,7 @@
}
std::string
-as_value::to_debug_string() const
+as_value::toDebugString() const
{
boost::format ret;
@@ -1703,20 +1703,20 @@
catch (ActionTypeError& e)
{
log_debug("%s.to_primitive() threw an error during as_value
operator+",
- to_debug_string());
+ *this);
}
try { v2 = v2.to_primitive(); }
catch (ActionTypeError& e)
{
log_debug("%s.to_primitive() threw an error during as_value
operator+",
- op2.to_debug_string());
+ op2);
}
#if GNASH_DEBUG
log_debug(_("(%s + %s) [primitive conversion done]"),
- to_debug_string(),
- v2.to_debug_string());
+ *this,
+ v2);
#endif
if (is_string() || v2.is_string() )
Index: server/as_value.h
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/as_value.h 19 May 2008 13:03:53 -0000 1.93
+++ server/as_value.h 25 May 2008 10:05:20 -0000 1.94
@@ -259,7 +259,9 @@
///
std::string to_string() const;
- std::string to_debug_string() const;
+ // Used for operator<< to give useful information about an
+ // as_value object.
+ std::string toDebugString() const;
/// Get a string representation for this value.
//
@@ -767,7 +769,7 @@
typedef as_value (*as_c_function_ptr)(const fn_call& fn);
inline std::ostream& operator<< (std::ostream& os, const as_value& v) {
- return os << v.to_debug_string();
+ return os << v.toDebugString();
}
} // namespace gnash
Index: server/character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/character.cpp,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- server/character.cpp 20 May 2008 09:54:25 -0000 1.101
+++ server/character.cpp 25 May 2008 10:05:20 -0000 1.102
@@ -403,7 +403,7 @@
log_aserror(_("Ignored attempt to set %s.%s=%s"),
ptr->getTarget(),
_("_alpha"), // trying to reuse translations
- fn.arg(0).to_debug_string());
+ fn.arg(0));
);
return rv;
}
Index: server/debugger.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/debugger.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- server/debugger.cpp 21 Apr 2008 11:27:43 -0000 1.27
+++ server/debugger.cpp 25 May 2008 10:05:20 -0000 1.28
@@ -576,7 +576,7 @@
// cerr << name << " ";
// }
// }
- cerr << env.m_stack[i].to_debug_string();
+ cerr << env.m_stack[i];
if (val.is_object()) {
boost::intrusive_ptr<as_object> o = val.to_object();
string name = lookupSymbol(o.get());
@@ -629,7 +629,7 @@
log_debug (_("Global Registers Dump:"));
for (unsigned int i=0; i<4; ++i) {
ss << "\treg #" << i << ": \"";
- ss << env.global_register(i).to_debug_string() << "\"" << endl;
+ ss << env.global_register(i) << "\"" << endl;
}
cerr << ss.str().c_str() << endl;
}
Index: server/edit_text_character.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/edit_text_character.cpp,v
retrieving revision 1.187
retrieving revision 1.188
diff -u -b -r1.187 -r1.188
--- server/edit_text_character.cpp 20 May 2008 09:54:25 -0000 1.187
+++ server/edit_text_character.cpp 25 May 2008 10:05:20 -0000 1.188
@@ -1143,7 +1143,7 @@
{
val->set_double(TWIPS_TO_PIXELS(get_width()));
#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug("Got TextField width == %s", val->to_debug_string());
+ log_debug("Got TextField width == %s", *val);
#endif // GNASH_DEBUG_TEXTFIELDS
return true;
}
@@ -1151,7 +1151,7 @@
{
val->set_double(TWIPS_TO_PIXELS(get_height()));
#ifdef GNASH_DEBUG_TEXTFIELDS
- log_debug("Got TextField height == %s", val->to_debug_string());
+ log_debug("Got TextField height == %s", *val);
#endif // GNASH_DEBUG_TEXTFIELDS
return true;
}
@@ -1750,7 +1750,7 @@
#ifdef DEBUG_DYNTEXT_VARIABLES
log_debug(_("target sprite (%s @ %p) does NOT have a member
named %s (no problem, we'll add it with value %s)"),
typeName(*target), (void*)target,
_vm.getStringTable().value(key),
- newVal.to_debug_string());
+ newVal);
#endif
target->set_member(key, newVal);
}
@@ -2370,7 +2370,7 @@
as_value& arg = fn.arg(0);
std::string strval = arg.to_string();
edit_text_character::TypeValue val = ptr->parseTypeValue(strval);
- //log_debug("setting %s.type : %s (toString->%s) => %d",
ptr->getTarget(), arg.to_debug_string(), strval, val);
+ //log_debug("setting %s.type : %s (toString->%s) => %d",
ptr->getTarget(), arg, strval, val);
IF_VERBOSE_ASCODING_ERRORS(
if ( val == edit_text_character::typeInvalid )
{
Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -b -r1.196 -r1.197
--- server/movie_root.cpp 24 May 2008 13:41:10 -0000 1.196
+++ server/movie_root.cpp 25 May 2008 10:05:21 -0000 1.197
@@ -546,7 +546,7 @@
std::string objName = PROPNAME("Mouse");
if (global->get_member(vm.getStringTable().find(objName), &val)
)
{
- //log_debug("Found member 'Mouse' in _global: %s",
val.to_debug_string());
+ //log_debug("Found member 'Mouse' in _global: %s", val);
_mouseobject = val.to_object();
}
}
Index: server/sprite_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v
retrieving revision 1.540
retrieving revision 1.541
diff -u -b -r1.540 -r1.541
--- server/sprite_instance.cpp 24 May 2008 13:41:10 -0000 1.540
+++ server/sprite_instance.cpp 25 May 2008 10:05:21 -0000 1.541
@@ -271,7 +271,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Fourth argument of attachMovie "
"doesn't cast to an object (%s), we'll act as if it wasn't given"),
- fn.arg(3).to_debug_string());
+ fn.arg(3));
);
}
}
@@ -525,7 +525,7 @@
// No dice.
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("sprite_goto_and_play('%s') -- invalid frame"),
- fn.arg(0).to_debug_string());
+ fn.arg(0));
);
return as_value();
}
@@ -554,7 +554,7 @@
// No dice.
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("sprite_goto_and_stop('%s') -- invalid frame"),
- fn.arg(0).to_debug_string());
+ fn.arg(0));
);
return as_value();
}
@@ -783,7 +783,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Can't find hitTest target %s"),
- tgt_val.to_debug_string());
+ tgt_val);
);
return as_value();
}
@@ -948,14 +948,14 @@
boost::intrusive_ptr<as_object> o = v.to_object();
if ( ! o )
{
- log_debug(_("meth(%s): first argument doesn't cast to object"),
v.to_debug_string());
+ log_debug(_("meth(%s): first argument doesn't cast to object"), v);
return as_value(0);
}
string_table& st = sprite->getVM().getStringTable();
as_value lc = o->callMethod(st.find(PROPNAME("toLowerCase")));
- log_debug(_("after call to toLowerCase with arg %s we got %s"),
v.to_debug_string(), lc.to_debug_string());
+ log_debug(_("after call to toLowerCase with arg %s we got %s"), v, lc);
//if ( ! v.is_string() ) return as_value(0);
std::string s = lc.to_string();
@@ -991,7 +991,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("MovieClip.getBounds(%s): invalid call, first arg must be
a sprite"),
- fn.arg(0).to_debug_string());
+ fn.arg(0));
);
return as_value();
}
@@ -1052,7 +1052,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("MovieClip.globalToLocal(%s): "
"first argument doesn't cast to an object"),
- fn.arg(0).to_debug_string());
+ fn.arg(0));
);
return ret;
}
@@ -1066,7 +1066,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("MovieClip.globalToLocal(%s): "
"object parameter doesn't have an 'x' member"),
- fn.arg(0).to_debug_string());
+ fn.arg(0));
);
return ret;
}
@@ -1077,7 +1077,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("MovieClip.globalToLocal(%s): "
"object parameter doesn't have an 'y' member"),
- fn.arg(0).to_debug_string());
+ fn.arg(0));
);
return ret;
}
@@ -1119,7 +1119,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("MovieClip.localToGlobal(%s): "
"first argument doesn't cast to an object"),
- fn.arg(0).to_debug_string());
+ fn.arg(0));
);
return ret;
}
@@ -1133,7 +1133,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("MovieClip.localToGlobal(%s): "
"object parameter doesn't have an 'x' member"),
- fn.arg(0).to_debug_string());
+ fn.arg(0));
);
return ret;
}
@@ -1144,7 +1144,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("MovieClip.localToGlobal(%s): "
"object parameter doesn't have an 'y' member"),
- fn.arg(0).to_debug_string());
+ fn.arg(0));
);
return ret;
}
@@ -1197,7 +1197,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("%s.setMask(%s) : first argument is not a character"),
- maskee->getTarget(), arg.to_debug_string());
+ maskee->getTarget(), arg);
);
return as_value();
}
@@ -1259,7 +1259,7 @@
std::stringstream ss; fn.dump_args(ss);
log_aserror(_("%s.lineTo(%s) : non-finite first argument (%s), "
"converted to zero"), sprite->getTarget(),
- ss.str(), fn.arg(0).to_debug_string());
+ ss.str(), fn.arg(0));
);
x = 0;
}
@@ -1270,7 +1270,7 @@
std::stringstream ss; fn.dump_args(ss);
log_aserror(_("%s.lineTo(%s) : non-finite second argument (%s), "
"converted to zero"), sprite->getTarget(),
- ss.str(), fn.arg(1).to_debug_string());
+ ss.str(), fn.arg(1));
);
y = 0;
}
@@ -1313,7 +1313,7 @@
std::stringstream ss; fn.dump_args(ss);
log_aserror(_("%s.moveTo(%s) : non-finite first argument (%s), "
"converted to zero"), sprite->getTarget(),
- ss.str(), fn.arg(0).to_debug_string());
+ ss.str(), fn.arg(0));
);
x = 0;
}
@@ -1324,7 +1324,7 @@
std::stringstream ss; fn.dump_args(ss);
log_aserror(_("%s.moveTo(%s) : non-finite second argument (%s), "
"converted to zero"), sprite->getTarget(),
- ss.str(), fn.arg(1).to_debug_string());
+ ss.str(), fn.arg(1));
);
y = 0;
}
@@ -1539,7 +1539,7 @@
std::stringstream ss; fn.dump_args(ss);
log_aserror(_("%s.curveTo(%s) : non-finite first argument (%s), "
"converted to zero"), sprite->getTarget(),
- ss.str(), fn.arg(0).to_debug_string());
+ ss.str(), fn.arg(0));
);
cx = 0;
}
@@ -1550,7 +1550,7 @@
std::stringstream ss; fn.dump_args(ss);
log_aserror(_("%s.curveTo(%s) : non-finite second argument (%s), "
"converted to zero"), sprite->getTarget(),
- ss.str(), fn.arg(1).to_debug_string());
+ ss.str(), fn.arg(1));
);
cy = 0;
}
@@ -1561,7 +1561,7 @@
std::stringstream ss; fn.dump_args(ss);
log_aserror(_("%s.curveTo(%s) : non-finite third argument (%s), "
"converted to zero"), sprite->getTarget(),
- ss.str(), fn.arg(0).to_debug_string());
+ ss.str(), fn.arg(0));
);
ax = 0;
}
@@ -1572,7 +1572,7 @@
std::stringstream ss; fn.dump_args(ss);
log_aserror(_("%s.curveTo(%s) : non-finite fourth argument (%s), "
"converted to zero"), sprite->getTarget(),
- ss.str(), fn.arg(1).to_debug_string());
+ ss.str(), fn.arg(1));
);
ay = 0;
}
@@ -2578,7 +2578,7 @@
double num = str.to_number();
- //log_debug("get_frame_number(%s), num: %g", frame_spec.to_debug_string(),
num);
+ //log_debug("get_frame_number(%s), num: %g", frame_spec, num);
if ( ! utility::isFinite(num) || int(num) != num || num == 0)
{
@@ -2608,7 +2608,7 @@
// No dice.
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("call_frame('%s') -- invalid frame"),
- frame_spec.to_debug_string());
+ frame_spec);
);
return;
}
@@ -2929,7 +2929,7 @@
const as_value& val, string_table::key nsname, bool ifFound)
{
#ifdef DEBUG_DYNTEXT_VARIABLES
- //log_debug(_("sprite[%p]::set_member(%s, %s)"), (void*)this,
VM::get().getStringTable().value(name), val.to_debug_string());
+ //log_debug(_("sprite[%p]::set_member(%s, %s)"), (void*)this,
VM::get().getStringTable().value(name), val);
#endif
//if ( val.is_function() )
Index: server/timers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/timers.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/timers.cpp 21 May 2008 16:08:23 -0000 1.51
+++ server/timers.cpp 25 May 2008 10:05:21 -0000 1.52
@@ -171,7 +171,7 @@
for ( ArgsContainer::reverse_iterator it=_args.rbegin(),
itEnd=_args.rend();
it != itEnd; ++it )
{
- //log_debug("Env-pushing %s", it->to_debug_string().c_str());
+ //log_debug("Env-pushing %s", *it);
env.push(*it);
}
Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- server/video_stream_instance.cpp 29 Mar 2008 22:50:54 -0000 1.50
+++ server/video_stream_instance.cpp 25 May 2008 10:05:21 -0000 1.51
@@ -127,7 +127,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("attachVideo(%s) first arg is not a NetStream
instance"),
- fn.arg(0).to_debug_string().c_str());
+ fn.arg(0));
);
}
return as_value();
Index: server/asobj/AsBroadcaster.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/AsBroadcaster.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- server/asobj/AsBroadcaster.cpp 21 Jan 2008 20:55:53 -0000 1.14
+++ server/asobj/AsBroadcaster.cpp 25 May 2008 10:05:22 -0000 1.15
@@ -159,7 +159,7 @@
if ( ! tgtval.is_object() )
{
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("AsBroadcaster.initialize(%s): first arg is not
an object"), tgtval.to_debug_string().c_str());
+ log_aserror(_("AsBroadcaster.initialize(%s): first arg is not
an object"), tgtval);
);
return as_value();
}
@@ -168,7 +168,7 @@
AsBroadcaster::initialize(*tgt);
- //log_debug("AsBroadcaster.initialize(%s): TESTING",
tgtval.to_debug_string().c_str());
+ //log_debug("AsBroadcaster.initialize(%s): TESTING", tgtval);
return as_value();
}
@@ -194,7 +194,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("%p.addListener(%s): this object has no
_listeners member"),
(void*)fn.this_ptr.get(),
- fn.dump_args().c_str());
+ fn.dump_args());
);
return as_value(true); // odd, but seems the case..
}
@@ -205,7 +205,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("%p.addListener(%s): this object's _listener
isn't an object: %s"),
(void*)fn.this_ptr.get(),
- fn.dump_args().c_str(),
listenersValue.to_debug_string().c_str());
+ fn.dump_args(), listenersValue);
);
return as_value(false); // TODO: check this
}
@@ -219,7 +219,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("%p.addListener(%s): this object's _listener
isn't an array: %s -- will call 'push' on it anyway"),
(void*)fn.this_ptr.get(),
- fn.dump_args().c_str(),
listenersValue.to_debug_string().c_str());
+ fn.dump_args(), listenersValue);
);
listenersObj->callMethod(NSV::PROP_PUSH, newListener);
@@ -230,7 +230,7 @@
listeners->push(newListener);
}
- //log_debug("%p.addListener(%s) TESTING", (void*)fn.this_ptr.get(),
fn.dump_args().c_str());
+ //log_debug("%p.addListener(%s) TESTING", (void*)fn.this_ptr.get(),
fn.dump_args());
return as_value(true);
}
@@ -251,7 +251,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("%p.addListener(%s): this object has no
_listeners member"),
(void*)fn.this_ptr.get(),
- fn.dump_args().c_str());
+ fn.dump_args());
);
return as_value(false); // TODO: check this
}
@@ -262,7 +262,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("%p.addListener(%s): this object's _listener
isn't an object: %s"),
(void*)fn.this_ptr.get(),
- fn.dump_args().c_str(),
listenersValue.to_debug_string().c_str());
+ fn.dump_args(), listenersValue);
);
return as_value(false); // TODO: check this
}
@@ -279,7 +279,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("%p.addListener(%s): this object's _listener
isn't an array: %s"),
(void*)fn.this_ptr.get(),
- fn.dump_args().c_str(),
listenersValue.to_debug_string().c_str());
+ fn.dump_args(), listenersValue);
);
// TODO: implement brute force scan of pseudo-array
@@ -325,7 +325,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("%p.addListener(%s): this object has no
_listeners member"),
(void*)fn.this_ptr.get(),
- fn.dump_args().c_str());
+ fn.dump_args());
);
return as_value(); // TODO: check this
}
@@ -336,7 +336,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("%p.addListener(%s): this object's _listener
isn't an object: %s"),
(void*)fn.this_ptr.get(),
- fn.dump_args().c_str(),
listenersValue.to_debug_string().c_str());
+ fn.dump_args(), listenersValue);
);
return as_value(); // TODO: check this
}
@@ -347,7 +347,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("%p.addListener(%s): this object's _listener
isn't an array: %s"),
(void*)fn.this_ptr.get(),
- fn.dump_args().c_str(),
listenersValue.to_debug_string().c_str());
+ fn.dump_args(), listenersValue);
);
return as_value(); // TODO: check this
}
Index: server/asobj/ClassHierarchy.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/ClassHierarchy.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/asobj/ClassHierarchy.cpp 7 May 2008 20:59:30 -0000 1.17
+++ server/asobj/ClassHierarchy.cpp 25 May 2008 10:05:22 -0000 1.18
@@ -112,7 +112,7 @@
// Error here -- not an object.
log_error("%s (Superclass of %s) is not a
function (%s)",
st.value(mDeclaration.super_name),
- st.value(mDeclaration.name),
super.to_debug_string());
+ st.value(mDeclaration.name), super);
super.set_undefined();
return super;
}
@@ -185,7 +185,7 @@
// Error here -- not an object.
log_error("%s (Superclass of %s) is not
a function (%s)",
st.value(mDeclaration.super_name),
- st.value(mDeclaration.name),
super.to_debug_string());
+ st.value(mDeclaration.name),
super);
super.set_undefined();
return super;
}
@@ -194,7 +194,7 @@
if ( ! us.to_object() )
{
log_error("Native class %s is not an object
after initialization (%s)",
- st.value(mDeclaration.name),
us.to_debug_string());
+ st.value(mDeclaration.name), us);
}
if (mDeclaration.super_name &&
!us.to_object()->hasOwnProperty(NSV::PROP_uuPROTOuu))
{
Index: server/asobj/Global.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Global.cpp,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- server/asobj/Global.cpp 19 May 2008 16:49:58 -0000 1.129
+++ server/asobj/Global.cpp 25 May 2008 10:05:22 -0000 1.130
@@ -543,7 +543,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Invalid call to ASSetPropFlags: "
"first argument is not an object: %s"),
- fn.arg(0).to_debug_string());
+ fn.arg(0));
);
return as_value();
}
Index: server/asobj/Key.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Key.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/asobj/Key.cpp 21 Apr 2008 11:27:44 -0000 1.53
+++ server/asobj/Key.cpp 25 May 2008 10:05:22 -0000 1.54
@@ -105,7 +105,7 @@
as_value ev(key_event.get_function_name());
- //log_debug("notify_listeners calling broadcastMessage with arg %s",
ev.to_debug_string().c_str());
+ //log_debug("notify_listeners calling broadcastMessage with arg %s", ev);
callMethod(NSV::PROP_BROADCAST_MESSAGE, ev);
}
Index: server/asobj/MovieClipLoader.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/MovieClipLoader.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- server/asobj/MovieClipLoader.cpp 21 Apr 2008 11:27:44 -0000 1.52
+++ server/asobj/MovieClipLoader.cpp 25 May 2008 10:05:22 -0000 1.53
@@ -195,11 +195,11 @@
URL url(url_str.c_str(), get_base_url());
#if GNASH_DEBUG
- log_debug(_(" resolved url: %s"), url.str().c_str());
+ log_debug(_(" resolved url: %s"), url.str());
#endif
as_value targetVal(&target);
- log_debug("Target is %s", targetVal.to_debug_string().c_str());
+ log_debug("Target is %s", targetVal);
bool ret = target.loadMovie(url);
if ( ! ret )
@@ -267,7 +267,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
std::stringstream ss; fn.dump_args(ss);
- log_aserror(_("MovieClipLoader.loadClip(%s): missing
arguments"), ss.str().c_str());
+ log_aserror(_("MovieClipLoader.loadClip(%s): missing
arguments"), ss.str());
);
return as_value(false);
}
@@ -282,7 +282,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Could not find target %s (evaluated from %s)"),
- tgt_str.c_str(), tgt_arg.to_debug_string().c_str());
+ tgt_str, tgt_arg);
);
return as_value(false);
}
@@ -292,14 +292,14 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Target %s is not a sprite instance (%s)"),
- target->getTarget().c_str(), typeName(*target).c_str());
+ target->getTarget(), typeName(*target));
);
return as_value(false);
}
#if GNASH_DEBUG
log_debug(_("load clip: %s, target is: %p\n"),
- str_url.c_str(), (void*)sprite);
+ str_url, (void*)sprite);
#endif
ptr->loadClip(str_url, *sprite);
@@ -313,7 +313,7 @@
moviecliploader_unloadclip(const fn_call& fn)
{
const std::string filespec = fn.arg(0).to_string();
- log_unimpl (_("%s: %s"), __PRETTY_FUNCTION__, filespec.c_str());
+ log_unimpl (_("%s: %s"), __PRETTY_FUNCTION__, filespec);
return as_value();
}
@@ -350,7 +350,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("MovieClipLoader.getProgress(%s): first argument
is not an object"),
- fn.arg(0).to_debug_string().c_str());
+ fn.arg(0));
);
return as_value();
}
@@ -360,7 +360,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("MovieClipLoader.getProgress(%s): first argument
is not an sprite"),
- fn.arg(0).to_debug_string().c_str());
+ fn.arg(0));
);
return as_value();
}
Index: server/asobj/NetStream.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStream.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -b -r1.93 -r1.94
--- server/asobj/NetStream.cpp 23 May 2008 17:15:44 -0000 1.93
+++ server/asobj/NetStream.cpp 25 May 2008 10:05:22 -0000 1.94
@@ -109,7 +109,7 @@
log_aserror(_("First argument "
"to NetStream constructor "
"doesn't cast to a NetConnection (%s)"),
- fn.arg(0).to_debug_string().c_str());
+ fn.arg(0));
);
}
}
@@ -154,7 +154,7 @@
if ( ! ns->isConnected() )
{
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("NetStream.play(%s): stream is not connected"),
fn.arg(0).to_debug_string().c_str());
+ log_aserror(_("NetStream.play(%s): stream is not connected"),
fn.arg(0));
);
return as_value();
}
Index: server/asobj/Number.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Number.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/asobj/Number.cpp 2 Apr 2008 10:55:32 -0000 1.43
+++ server/asobj/Number.cpp 25 May 2008 10:05:22 -0000 1.44
@@ -215,7 +215,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Number.toString(%s): "
"radix must be in the 2..36 range (%d is
invalid)"),
- fn.arg(0).to_debug_string().c_str(), userRadix)
+ fn.arg(0), userRadix)
)
}
Index: server/asobj/Object.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Object.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- server/asobj/Object.cpp 3 May 2008 00:12:15 -0000 1.52
+++ server/asobj/Object.cpp 25 May 2008 10:05:22 -0000 1.53
@@ -202,7 +202,7 @@
fn.dump_args(ss);
log_aserror(_("Invalid call to Object.addProperty(%s) - "
"expected 3 arguments (<name>, <getter>, <setter>)"),
- ss.str().c_str());
+ ss.str());
);
// if we've been given more args then needed there's
@@ -243,7 +243,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Invalid call to Object.addProperty() - "
"setter is not null and not an AS function
(%s)"),
- setterval.to_debug_string());
+ setterval);
);
return as_value(false);
}
@@ -272,7 +272,7 @@
fn.dump_args(ss);
log_aserror(_("Invalid call to Object.registerClass(%s) - "
"expected 2 arguments (<symbol>, <constructor>)"),
- ss.str().c_str());
+ ss.str());
);
// if we've been given more args then needed there's
@@ -290,7 +290,7 @@
std::stringstream ss;
fn.dump_args(ss);
log_aserror(_("Invalid call to Object.registerClass(%s) - "
- "first argument (symbol id) evaluates to empty
string"), ss.str().c_str());
+ "first argument (symbol id) evaluates to empty
string"), ss.str());
);
return as_value(false);
}
@@ -302,7 +302,7 @@
std::stringstream ss;
fn.dump_args(ss);
log_aserror(_("Invalid call to Object.registerClass(%s) - "
- "second argument (class) is not a function)"),
ss.str().c_str());
+ "second argument (class) is not a function)"),
ss.str());
);
return as_value(false);
}
@@ -331,7 +331,7 @@
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("Object.registerClass(%s, %s): "
"can't find exported symbol"),
- symbolid.c_str(),
+ symbolid,
typeid(theclass).name());
);
return as_value(false);
@@ -350,7 +350,7 @@
log_aserror(_("Object.registerClass(%s, %s): "
"exported symbol is not a MovieClip symbol "
"(sprite_definition), but a %s"),
- symbolid.c_str(),
+ symbolid,
typeid(theclass).name(),
typeid(*exp_res).name());
);
@@ -377,7 +377,7 @@
if ( arg.is_undefined() || propname.empty() )
{
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Invalid call to Object.hasOwnProperty('%s')"),
arg.to_debug_string().c_str());
+ log_aserror(_("Invalid call to Object.hasOwnProperty('%s')"),
arg);
);
return as_value(false);
}
@@ -401,7 +401,7 @@
if ( arg.is_undefined() || propname.empty() )
{
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("Invalid call to
Object.isPropertyEnumerable('%s')"), arg.to_debug_string().c_str());
+ log_aserror(_("Invalid call to
Object.isPropertyEnumerable('%s')"), arg);
);
return as_value();
}
@@ -431,7 +431,7 @@
if ( ! obj )
{
IF_VERBOSE_ASCODING_ERRORS(
- log_aserror(_("First arg to Object.isPrototypeOf(%s) is not an
object"), fn.arg(0).to_debug_string().c_str());
+ log_aserror(_("First arg to Object.isPrototypeOf(%s) is not an
object"), fn.arg(0));
);
return as_value(false);
}
Index: server/asobj/string.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/string.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- server/asobj/string.cpp 19 May 2008 13:03:54 -0000 1.69
+++ server/asobj/string.cpp 25 May 2008 10:05:23 -0000 1.70
@@ -489,8 +489,7 @@
if ( start_arg < 0 )
{
log_aserror("String.indexOf(%s, %s): second argument
casts to invalid offset (%d)",
- tfarg.to_debug_string().c_str(),
- saval.to_debug_string().c_str(), start_arg);
+ tfarg, saval, start_arg);
}
);
}
@@ -726,7 +725,7 @@
else if ( ! clval.is_function() )
{
log_debug("UNTESTED: String instantiation requested but
_global.String is not a function (%s). Returning the NULL object.",
- clval.to_debug_string().c_str());
+ clval);
return cl;
//cl = getStringConstructor();
}
Index: server/asobj/xml.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xml.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- server/asobj/xml.cpp 27 Apr 2008 18:13:16 -0000 1.81
+++ server/asobj/xml.cpp 25 May 2008 10:05:23 -0000 1.82
@@ -165,7 +165,7 @@
{
// TODO: this should really be a proper property
bool b = val.to_bool();
- //log_debug(_("set_member 'loaded' (%s) became boolean %d"),
val.to_debug_string().c_str(), b);
+ //log_debug(_("set_member 'loaded' (%s) became boolean %d"),
val, b);
if ( b ) _loaded = 1;
else _loaded = 0;
return true;
@@ -646,7 +646,7 @@
as_value ctypeVal;
if ( get_member(ctypeKey, &ctypeVal) )
{
- log_unimpl ("Custom ContentType (%s) in XML.sendAndLoad",
ctypeVal.to_debug_string().c_str());
+ log_unimpl ("Custom ContentType (%s) in XML.sendAndLoad", ctypeVal);
}
//log_debug(_("%s: mem is %d"), __FUNCTION__, mem);
@@ -772,7 +772,7 @@
{
IF_VERBOSE_ASCODING_ERRORS(
log_aserror(_("First arg given to XML constructor (%s) evaluates
to the empty string"),
- fn.arg(0).to_debug_string().c_str());
+ fn.arg(0));
);
}
else
Index: server/asobj/xmlsocket.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/xmlsocket.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- server/asobj/xmlsocket.cpp 5 May 2008 13:29:50 -0000 1.47
+++ server/asobj/xmlsocket.cpp 25 May 2008 10:05:23 -0000 1.48
@@ -561,8 +561,7 @@
if ( xmlin.empty() )
{
log_error(_("Builtin XMLSocket.onData() called with an argument "
- "that resolves to the empty string: %s"),
- fn.arg(0).to_debug_string().c_str());
+ "that resolves to the empty string: %s"), fn.arg(0));
return as_value();
}
Index: server/vm/fn_call.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/fn_call.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/vm/fn_call.h 10 Mar 2008 23:23:11 -0000 1.16
+++ server/vm/fn_call.h 25 May 2008 10:05:23 -0000 1.17
@@ -139,7 +139,7 @@
for (unsigned int i=0; i<nargs; ++i)
{
if ( i ) os << ", ";
- os << arg(i).to_debug_string();
+ os << arg(i).toDebugString();
}
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/array.cpp server/as_envi...,
Benjamin Wolsey <=