[Gnash-commit] /srv/bzr/gnash/trunk r10535: Use the versioned to_string for String.concat. This was easy. Why isn't to_string *always* versioned btw ?

[Sandro Santilli]

------------------------------------------------------------
revno: 10535
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Fri 2009-01-09 22:33:17 +0100
message:
  Use the versioned to_string for String.concat. This was easy. Why isn't 
to_string *always* versioned btw ?
modified:
  libcore/asobj/String_as.cpp
  testsuite/swfdec/PASSING

=== modified file 'libcore/asobj/String_as.cpp'
--- a/libcore/asobj/String_as.cpp       2008-12-31 12:53:47 +0000
+++ b/libcore/asobj/String_as.cpp       2009-01-09 21:33:17 +0000
@@ -250,12 +250,15 @@
 string_concat(const fn_call& fn)
 {
     boost::intrusive_ptr<as_object> obj = ensureType<as_object>(fn.this_ptr);
+
+    const int swfVersion = fn.env().get_version();
+
     as_value val(fn.this_ptr);
     
     std::string str = val.to_string();
 
     for (unsigned int i = 0; i < fn.nargs; i++) {
-        str += fn.arg(i).to_string();
+        str += fn.arg(i).to_string_versioned(swfVersion);
     }
 
     return as_value(str);

=== modified file 'testsuite/swfdec/PASSING'
--- a/testsuite/swfdec/PASSING  2009-01-09 21:10:24 +0000
+++ b/testsuite/swfdec/PASSING  2009-01-09 21:33:17 +0000
@@ -1033,6 +1033,8 @@
 stage-size-6.swf:8a83971dbf1f6beb6ba3ed0c94d3559c
 stage-size-7.swf:7090e81184777b7adb4527fbab83780b
 stage-size-8.swf:4f6c615f5c25c2653ec68b42bbc4089f
+string-concat-5.swf:7ef482ca38cbb401c78fd56b97a7660e
+string-concat-6.swf:26c30407ceda5af4b4189bb0654b7b67
 string-concat-7.swf:7ee49503a493abdbff8045300218bb24
 string-construct-5.swf:b90373977a72afa66f1f4962a7e67d7a
 string-construct-6.swf:3466a3de80b49a570bddb27a77f19795