[svn:parrot] r48858 - trunk/src/string

[nwellnhof at svn.parrot.org]

Author: nwellnhof
Date: Wed Sep  8 18:08:21 2010
New Revision: 48858
URL: https://trac.parrot.org/parrot/changeset/48858

Log:
[str] Don't convert to UTF-16 in str_replace

It requires ICU

Modified:
   trunk/src/string/api.c

Modified: trunk/src/string/api.c
==============================================================================
--- trunk/src/string/api.c	Wed Sep  8 15:13:32 2010	(r48857)
+++ trunk/src/string/api.c	Wed Sep  8 18:08:21 2010	(r48858)
@@ -1156,8 +1156,10 @@
     enc = string_rep_compatible(interp, src, rep);
 
     if (!enc) {
-        src = Parrot_utf16_encoding_ptr->to_encoding(interp, src);
-        rep = Parrot_utf16_encoding_ptr->to_encoding(interp, rep);
+        if (src->encoding != Parrot_utf8_encoding_ptr)
+            src = Parrot_utf8_encoding_ptr->to_encoding(interp, src);
+        if (rep->encoding != Parrot_utf8_encoding_ptr)
+            rep = Parrot_utf8_encoding_ptr->to_encoding(interp, rep);
         /* Remember selected encoding */
         enc = src->encoding;
     }