From: Nicholas Clark <nick@ccl4.org>
Date: Thu, 22 Oct 2009 08:26:58 +0000 (+0100)
Subject: Remove the "hack" that removes SVt_UTF8 in the UTF16 filter, by fixing t/TEST
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=9fb03e618192b6b5d49274cc64422acee51fe198;p=p5sagit%2Fp5-mst-13.2.git

Remove the "hack" that removes SVt_UTF8 in the UTF16 filter, by fixing t/TEST

Given that t/TEST already had code to add -I../lib when testing UTF-8 with
-utf8, do likewise for testing UTF-16 with -utf16.
---

diff --git a/t/TEST b/t/TEST
index 10a0e85..4dee636 100755
--- a/t/TEST
+++ b/t/TEST
@@ -246,7 +246,7 @@ sub _scan_test {
 	}
     }
 
-    my $utf8 = $::with_utf8 ? "-I$lib -Mutf8" : '';
+    my $utf8 = ($::with_utf8 || $::with_utf16) ? "-I$lib -Mutf8" : '';
 
     my %options = (
 	perl => $perl,
diff --git a/toke.c b/toke.c
index 7edccf4..72e3e36 100644
--- a/toke.c
+++ b/toke.c
@@ -12817,10 +12817,6 @@ S_utf16_textfilter(pTHX_ int idx, SV *sv, int maxlen)
 	*end = '\0';
     }
     SvCUR_set(utf16_buffer, 0);
-    /* This is to be bug-for-bug faithful with the implementation we've just
-       replaced. Without this, ./TEST -utf16 base/lex.t fails, attempting to
-       load utf8.pm  */
-    SvUTF8_off(sv);
     DEBUG_P({sv_dump(sv);});
     return SvCUR(sv);
 }