Merge pull request #5869 from wilzbach/do-body

Replace `body` keyword with its replacement: `do`
merged-on-behalf-of: Andrei Alexandrescu <andralex@users.noreply.github.com>

posix.mak

@@ -69,7 +69,7 @@ ROOT_OF_THEM_ALL = generated
 ROOT = $(ROOT_OF_THEM_ALL)/$(OS)/$(BUILD)/$(MODEL)
 DUB=dub
 TOOLS_DIR=../tools
-DSCANNER_HASH=eb16fe4e8610e7477e09710fee1137d657a56f72
+DSCANNER_HASH=bb32e9f1e3e5206deb11b3dbc43ad44e23fabf96
 DSCANNER_DIR=../dscanner-$(DSCANNER_HASH)
 
 # Documentation-related stuff

std/algorithm/comparison.d

@@ -535,7 +535,7 @@ in
     import std.functional : greaterThan;
     assert(!lower.greaterThan(upper));
 }
-body
+do
 {
     return max(lower, min(upper, val));
 }

std/algorithm/iteration.d

@@ -430,7 +430,7 @@ private struct _Cache(R, bool bidir)
             {
                 assert(low <= high, "Bounds error when slicing cache.");
             }
-            body
+            do
             {
                 import std.range : takeExactly;
                 return this[low .. $].takeExactly(high - low);

std/algorithm/searching.d

@@ -1278,7 +1278,7 @@ in
 {
     assert(!r.empty, "r is an empty range");
 }
-body
+do
 {
     alias Element = ElementType!Range;
     Unqual!Element seed = r.front;

std/algorithm/sorting.d

@@ -2354,7 +2354,7 @@ private template TimSortImpl(alias pred, R)
     {
         assert(ret <= range.length);
     }
-    body
+    do
     {
         import std.algorithm.mutation : reverse;
 
@@ -2379,7 +2379,7 @@ private template TimSortImpl(alias pred, R)
     {
         if (!__ctfe) assert(isSorted!pred(range));
     }
-    body
+    do
     {
         import std.algorithm.mutation : move;
 
@@ -2412,7 +2412,7 @@ private template TimSortImpl(alias pred, R)
         assert(stack.length >= 2);
         assert(stack.length - at == 2 || stack.length - at == 3);
     }
-    body
+    do
     {
         immutable base = stack[at].base;
         immutable mid  = stack[at].length;
@@ -2437,7 +2437,7 @@ private template TimSortImpl(alias pred, R)
             assert(isSorted!pred(range[mid .. range.length]));
         }
     }
-    body
+    do
     {
         assert(mid < range.length);
 
@@ -2468,7 +2468,7 @@ private template TimSortImpl(alias pred, R)
     {
         assert(ret.length >= minCapacity);
     }
-    body
+    do
     {
         if (temp.length < minCapacity)
         {
@@ -2489,7 +2489,7 @@ private template TimSortImpl(alias pred, R)
     {
         if (!__ctfe) assert(isSorted!pred(range));
     }
-    body
+    do
     {
         import std.algorithm.mutation : copy;
 
@@ -2572,7 +2572,7 @@ private template TimSortImpl(alias pred, R)
     {
         if (!__ctfe) assert(isSorted!pred(range));
     }
-    body
+    do
     {
         import std.algorithm.mutation : copy;
 
@@ -2678,7 +2678,7 @@ private template TimSortImpl(alias pred, R)
         {
             assert(ret <= range.length);
         }
-        body
+        do
         {
             size_t lower = 0, center = 1, upper = range.length;
             alias gap = center;
@@ -3349,7 +3349,7 @@ out
     assert(r[0 .. pivot + 1].all!(x => !lp(r[pivot], x)));
     assert(r[pivot + 1 .. r.length].all!(x => !lp(x, r[pivot])));
 }
-body
+do
 {
     import std.algorithm.mutation : swapAt;
     import std.algorithm.searching : all;

std/array.d

@@ -2787,7 +2787,7 @@ in
     // Verify that slice[] really is a slice of s[]
     assert(overlap(s, slice) is slice);
 }
-body
+do
 {
     auto result = new T[s.length - slice.length + replacement.length];
     immutable so = slice.ptr - s.ptr;

std/base64.d

@@ -227,7 +227,7 @@ template Base64Impl(char Map62th, char Map63th, char Padding = '=')
     {
         assert(result.length == encodeLength(source.length), "The length of result is different from Base64");
     }
-    body
+    do
     {
         immutable srcLen = source.length;
         if (srcLen == 0)
@@ -310,7 +310,7 @@ template Base64Impl(char Map62th, char Map63th, char Padding = '=')
         // @@@BUG@@@ D's DbC can't caputre an argument of function and store the result of precondition.
         //assert(result.length == encodeLength(source.length), "The length of result is different from Base64");
     }
-    body
+    do
     {
         immutable srcLen = source.length;
         if (srcLen == 0)
@@ -397,7 +397,7 @@ template Base64Impl(char Map62th, char Map63th, char Padding = '=')
     {
         assert(result == encodeLength(source.length), "The number of put is different from the length of Base64");
     }
-    body
+    do
     {
         immutable srcLen = source.length;
         if (srcLen == 0)
@@ -486,7 +486,7 @@ template Base64Impl(char Map62th, char Map63th, char Padding = '=')
         // @@@BUG@@@ Workaround for DbC problem.
         //assert(result == encodeLength(source.length), "The number of put is different from the length of Base64");
     }
-    body
+    do
     {
         immutable srcLen = source.length;
         if (srcLen == 0)
@@ -1005,7 +1005,7 @@ template Base64Impl(char Map62th, char Map63th, char Padding = '=')
         immutable expect = realDecodeLength(source);
         assert(result.length == expect, "The length of result is different from the expected length");
     }
-    body
+    do
     {
         immutable srcLen = source.length;
         if (srcLen == 0)
@@ -1091,7 +1091,7 @@ template Base64Impl(char Map62th, char Map63th, char Padding = '=')
         //immutable expect = decodeLength(source.length) - 2;
         //assert(result.length >= expect, "The length of result is smaller than expected length");
     }
-    body
+    do
     {
         immutable srcLen = source.length;
         if (srcLen == 0)
@@ -1182,7 +1182,7 @@ template Base64Impl(char Map62th, char Map63th, char Padding = '=')
         immutable expect = realDecodeLength(source);
         assert(result == expect, "The result of decode is different from the expected");
     }
-    body
+    do
     {
         immutable srcLen = source.length;
         if (srcLen == 0)
@@ -1271,7 +1271,7 @@ template Base64Impl(char Map62th, char Map63th, char Padding = '=')
         //immutable expect = decodeLength(source.length) - 2;
         //assert(result >= expect, "The length of result is smaller than expected length");
     }
-    body
+    do
     {
         immutable srcLen = source.length;
         if (srcLen == 0)

std/bitmanip.d

@@ -849,7 +849,7 @@ public:
     {
         assert(i < _len);
     }
-    body
+    do
     {
         return cast(bool) bt(_ptr, i);
     }
@@ -877,7 +877,7 @@ public:
     {
         assert(i < _len);
     }
-    body
+    do
     {
         if (b)
             bts(_ptr, i);
@@ -929,7 +929,7 @@ public:
         assert(start <= end);
         assert(end <= length);
     }
-    body
+    do
     {
         size_t startBlock = start / bitsPerSizeT;
         size_t endBlock = end / bitsPerSizeT;
@@ -1208,7 +1208,7 @@ public:
     {
         assert(result == this);
     }
-    body
+    do
     {
         if (_len >= 2)
         {
@@ -1252,7 +1252,7 @@ public:
     {
         assert(result == this);
     }
-    body
+    do
     {
         if (_len >= 2)
         {
@@ -1506,7 +1506,7 @@ public:
         assert(numbits <= v.length * 8);
         assert(v.length % size_t.sizeof == 0);
     }
-    body
+    do
     {
         _ptr = cast(size_t*) v.ptr;
         _len = numbits;
@@ -1615,7 +1615,7 @@ public:
     {
         assert(_len == e2.length);
     }
-    body
+    do
     {
         auto dim = this.dim;
 
@@ -1721,7 +1721,7 @@ public:
     {
         assert(_len == e2.length);
     }
-    body
+    do
     {
         foreach (i; 0 .. fullWords)
         {
@@ -1977,7 +1977,7 @@ public:
     {
         assert(nbits < bitsPerSizeT);
     }
-    body
+    do
     {
         if (nbits == 0)
             return lower;
@@ -2014,7 +2014,7 @@ public:
     {
         assert(nbits < bitsPerSizeT);
     }
-    body
+    do
     {
         if (nbits == 0)
             return upper;

std/concurrency.d

@@ -649,7 +649,7 @@ in
            "Cannot receive a message until a thread was spawned "
            ~ "or thisTid was passed to a running thread.");
 }
-body
+do
 {
     checkops( ops );
 
@@ -737,7 +737,7 @@ in
     assert(thisInfo.ident.mbox !is null,
         "Cannot receive a message until a thread was spawned or thisTid was passed to a running thread.");
 }
-body
+do
 {
     import std.format : format;
     import std.typecons : Tuple;
@@ -801,7 +801,7 @@ in
     assert(thisInfo.ident.mbox !is null,
         "Cannot receive a message until a thread was spawned or thisTid was passed to a running thread.");
 }
-body
+do
 {
     checkops(ops);
 

std/container/rbtree.d

@@ -185,7 +185,7 @@ struct RBNode(V)
     {
         assert(_left !is null);
     }
-    body
+    do
     {
         // sets _left._parent also
         if (isLeftNode)
@@ -228,7 +228,7 @@ struct RBNode(V)
     {
         assert(_right !is null);
     }
-    body
+    do
     {
         // sets _right._parent also
         if (isLeftNode)
@@ -257,7 +257,7 @@ struct RBNode(V)
     {
         assert(_parent !is null);
     }
-    body
+    do
     {
         return _parent._left is &this;
     }

std/conv.d

@@ -1324,7 +1324,7 @@ in
 {
     assert(radix >= 2 && radix <= 36);
 }
-body
+do
 {
     alias EEType = Unqual!(ElementEncodingType!T);
 
@@ -2444,7 +2444,7 @@ in
 {
     assert(radix >= 2 && radix <= 36);
 }
-body
+do
 {
     import core.checkedint : mulu, addu;
     import std.exception : enforce;

std/datetime/date.d

@@ -3398,7 +3398,7 @@ public:
         assert(result._date == Date.min);
         assert(result._tod == TimeOfDay.min);
     }
-    body
+    do
     {
         auto dt = DateTime.init;
         dt._date._year = short.min;
@@ -3425,7 +3425,7 @@ public:
         assert(result._date == Date.max);
         assert(result._tod == TimeOfDay.max);
     }
-    body
+    do
     {
         auto dt = DateTime.init;
         dt._date._year = short.max;
@@ -9996,7 +9996,7 @@ in
 {
     assert(valid!"months"(month));
 }
-body
+do
 {
     switch (month)
     {