Fixed a few mistakes regarding invariance, etc, between D1 and D2.

[software/druntime.git] / src / compiler / dmd / adi.d

diff --git a/src/compiler/dmd/adi.d b/src/compiler/dmd/adi.d
index 908841b838f2509aea5820ce44e8e32ac29cc1a3..11d3ab4916a3de7633029a0136a5765770f9820c 100644 (file)
--- a/src/compiler/dmd/adi.d
+++ b/src/compiler/dmd/adi.d
@@ -228,9 +228,8 @@ extern (C) long _adReverseWchar(wchar[] a)
 unittest
 {
     wstring a = "abcd";
 unittest
 {
     wstring a = "abcd";

-    wstring r;

 
 

-    r = a.dup.reverse;
+    auto r = a.dup.reverse;

     assert(r == "dcba");
 
     a = "a\U00012356\U00012346c";
     assert(r == "dcba");
 
     a = "a\U00012356\U00012346c";


@@ -337,7 +336,7 @@ extern (C) long _adSortChar(char[] a)
 {
     if (a.length > 1)
     {
 {
     if (a.length > 1)
     {

-        dchar[] da = toUTF32(a);
+        dstring da = toUTF32(a);

         da.sort;
         size_t i = 0;
         foreach (dchar d; da)
         da.sort;
         size_t i = 0;
         foreach (dchar d; da)


@@ -359,7 +358,7 @@ extern (C) long _adSortWchar(wchar[] a)
 {
     if (a.length > 1)
     {
 {
     if (a.length > 1)
     {

-        dchar[] da = toUTF32(a);
+        dstring da = toUTF32(a);

         da.sort;
         size_t i = 0;
         foreach (dchar d; da)
         da.sort;
         size_t i = 0;
         foreach (dchar d; da)