Merge pull request #4246 from wilzbach/sed_spaces_part_2

style fix: add space after 'for' operator
This commit is contained in:
Dmitry Olshansky 2016-04-27 16:17:18 +04:00
commit c1027f1970
35 changed files with 139 additions and 139 deletions

View file

@ -1870,14 +1870,14 @@ bool isPermutation(alias pred = "a == b", Range1, Range2)
// of item in the scanning loop has an index smaller than the current index, // of item in the scanning loop has an index smaller than the current index,
// then you know that the element has been seen before // then you know that the element has been seen before
size_t index; size_t index;
outloop: for(auto r1s1 = r1.save; !r1s1.empty; r1s1.popFront, index++) outloop: for (auto r1s1 = r1.save; !r1s1.empty; r1s1.popFront, index++)
{ {
auto item = r1s1.front; auto item = r1s1.front;
r1_count = 0; r1_count = 0;
r2_count = 0; r2_count = 0;
size_t i; size_t i;
for(auto r1s2 = r1.save; !r1s2.empty; r1s2.popFront, i++) for (auto r1s2 = r1.save; !r1s2.empty; r1s2.popFront, i++)
{ {
auto e = r1s2.front; auto e = r1s2.front;
if (predEquals(e, item) && i < index) if (predEquals(e, item) && i < index)

View file

@ -1622,7 +1622,7 @@ private template TimSortImpl(alias pred, R)
//11 instructions vs 7 in the innermost loop [checked on Win32] //11 instructions vs 7 in the innermost loop [checked on Win32]
//moveAll(retro(range[lower .. sortedLen]), //moveAll(retro(range[lower .. sortedLen]),
// retro(range[lower+1 .. sortedLen+1])); // retro(range[lower+1 .. sortedLen+1]));
for(upper=sortedLen; upper > lower; upper--) for (upper=sortedLen; upper > lower; upper--)
range[upper] = range.moveAt(upper - 1); range[upper] = range.moveAt(upper - 1);
range[lower] = move(item); range[lower] = move(item);
} }

View file

@ -2241,7 +2241,7 @@ unittest
left <<= (T.sizeof - 1) * 8; left <<= (T.sizeof - 1) * 8;
T right = 0xffU; T right = 0xffU;
for(size_t i = 1; i < T.sizeof; ++i) for (size_t i = 1; i < T.sizeof; ++i)
{ {
assert(swapEndian(left) == right); assert(swapEndian(left) == right);
assert(swapEndian(right) == left); assert(swapEndian(right) == left);

View file

@ -1390,7 +1390,7 @@ private:
import core.time; import core.time;
scope(exit) notified = false; scope(exit) notified = false;
for( auto limit = MonoTime.currTime + period; for ( auto limit = MonoTime.currTime + period;
!notified && !period.isNegative; !notified && !period.isNegative;
period = limit - MonoTime.currTime ) period = limit - MonoTime.currTime )
{ {
@ -1986,7 +1986,7 @@ private
bool scan( ref ListT list ) bool scan( ref ListT list )
{ {
for( auto range = list[]; !range.empty; ) for ( auto range = list[]; !range.empty; )
{ {
// Only the message handler will throw, so if this occurs // Only the message handler will throw, so if this occurs
// we can be certain that the message was handled. // we can be certain that the message was handled.
@ -2130,7 +2130,7 @@ private
void sweep( ref ListT list ) void sweep( ref ListT list )
{ {
for( auto range = list[]; !range.empty; range.popFront() ) for ( auto range = list[]; !range.empty; range.popFront() )
{ {
if ( range.front.type == MsgType.linkDead ) if ( range.front.type == MsgType.linkDead )
onLinkDeadMsg( range.front ); onLinkDeadMsg( range.front );

View file

@ -771,7 +771,7 @@ private:
alias IntList = DList!int; alias IntList = DList!int;
IntList list = IntList([0,1,2,3]); IntList list = IntList([0,1,2,3]);
auto range = list[]; auto range = list[];
for( ; !range.empty; range.popFront()) for ( ; !range.empty; range.popFront())
{ {
int item = range.front; int item = range.front;
if (item == 2) if (item == 2)
@ -784,7 +784,7 @@ private:
list = IntList([0,1,2,3]); list = IntList([0,1,2,3]);
range = list[]; range = list[];
for( ; !range.empty; range.popFront()) for ( ; !range.empty; range.popFront())
{ {
int item = range.front; int item = range.front;
if (item == 2) if (item == 2)
@ -797,7 +797,7 @@ private:
list = IntList([0,1,2,3]); list = IntList([0,1,2,3]);
range = list[]; range = list[];
for( ; !range.empty; range.popFront()) for ( ; !range.empty; range.popFront())
{ {
int item = range.front; int item = range.front;
if (item == 0) if (item == 0)
@ -810,7 +810,7 @@ private:
list = IntList([0,1,2,3]); list = IntList([0,1,2,3]);
range = list[]; range = list[];
for( ; !range.empty; range.popFront()) for ( ; !range.empty; range.popFront())
{ {
int item = range.front; int item = range.front;
if (item == 1) if (item == 1)

View file

@ -1638,14 +1638,14 @@ assert(equal(rbt[], [5]));
if (n !is null) if (n !is null)
{ {
printTree(n.right, indent + 2); printTree(n.right, indent + 2);
for(int i = 0; i < indent; i++) for (int i = 0; i < indent; i++)
write("."); write(".");
writeln(n.color == n.color.Black ? "B" : "R"); writeln(n.color == n.color.Black ? "B" : "R");
printTree(n.left, indent + 2); printTree(n.left, indent + 2);
} }
else else
{ {
for(int i = 0; i < indent; i++) for (int i = 0; i < indent; i++)
write("."); write(".");
writeln("N"); writeln("N");
} }

View file

@ -1036,7 +1036,7 @@ public:
T[U] aa; T[U] aa;
try try
{ {
for(; !recordRange.empty; recordRange.popFront()) for (; !recordRange.empty; recordRange.popFront())
{ {
aa[header[_input.col-1]] = recordRange.front; aa[header[_input.col-1]] = recordRange.front;
} }
@ -1057,7 +1057,7 @@ public:
size_t colIndex; size_t colIndex;
try try
{ {
for(; !recordRange.empty;) for (; !recordRange.empty;)
{ {
auto colData = recordRange.front; auto colData = recordRange.front;
scope(exit) colIndex++; scope(exit) colIndex++;

View file

@ -33892,7 +33892,7 @@ R _stripCFWS(R)(R range)
(is(Unqual!(ElementType!R) == char) || is(Unqual!(ElementType!R) == ubyte))) (is(Unqual!(ElementType!R) == char) || is(Unqual!(ElementType!R) == ubyte)))
{ {
immutable e = range.length; immutable e = range.length;
outer: for(size_t i = 0; i < e; ) outer: for (size_t i = 0; i < e; )
{ {
switch (range[i]) switch (range[i])
{ {

View file

@ -194,7 +194,7 @@ struct MD5
{ {
import std.bitmanip : littleEndianToNative; import std.bitmanip : littleEndianToNative;
for(size_t i = 0; i < 16; i++) for (size_t i = 0; i < 16; i++)
{ {
x[i] = littleEndianToNative!uint(*cast(ubyte[4]*)&(*block)[i*4]); x[i] = littleEndianToNative!uint(*cast(ubyte[4]*)&(*block)[i*4]);
} }
@ -321,7 +321,7 @@ struct MD5
(&_buffer[index])[0 .. partLen] = data.ptr[0 .. partLen]; (&_buffer[index])[0 .. partLen] = data.ptr[0 .. partLen];
transform(&_buffer); transform(&_buffer);
for(i = partLen; i + 63 < inputLen; i += 64) for (i = partLen; i + 63 < inputLen; i += 64)
{ {
transform(cast(const(ubyte[64])*)(data[i .. i + 64].ptr)); transform(cast(const(ubyte[64])*)(data[i .. i + 64].ptr));
} }

View file

@ -239,7 +239,7 @@ struct RIPEMD160
{ {
import std.bitmanip : littleEndianToNative; import std.bitmanip : littleEndianToNative;
for(size_t i = 0; i < 16; i++) for (size_t i = 0; i < 16; i++)
{ {
x[i] = littleEndianToNative!uint(*cast(ubyte[4]*)&(*block)[i*4]); x[i] = littleEndianToNative!uint(*cast(ubyte[4]*)&(*block)[i*4]);
} }
@ -477,7 +477,7 @@ struct RIPEMD160
(&_buffer[index])[0 .. partLen] = data.ptr[0 .. partLen]; (&_buffer[index])[0 .. partLen] = data.ptr[0 .. partLen];
transform(&_buffer); transform(&_buffer);
for(i = partLen; i + 63 < inputLen; i += 64) for (i = partLen; i + 63 < inputLen; i += 64)
{ {
transform(cast(const(ubyte[64])*)(data[i .. i + 64].ptr)); transform(cast(const(ubyte[64])*)(data[i .. i + 64].ptr));
} }

View file

@ -244,7 +244,7 @@ unittest
// Make sure we can sanitize everything bad // Make sure we can sanitize everything bad
assert(invalidStrings.length == sanitizedStrings.length); assert(invalidStrings.length == sanitizedStrings.length);
for(int i=0; i<invalidStrings.length; ++i) for (int i=0; i<invalidStrings.length; ++i)
{ {
string s = cast(string)invalidStrings[i]; string s = cast(string)invalidStrings[i];
string t = sanitize(s); string t = sanitize(s);
@ -2114,7 +2114,7 @@ size_t encode(Tgt, Src, R)(in Src[] s, R range)
} }
-------------------------------------------------------- --------------------------------------------------------
Note that, currently, foreach (c:codePoints(s)) is superior to foreach(c;s) Note that, currently, foreach (c:codePoints(s)) is superior to foreach (c;s)
in that the latter will fall over on encountering U+FFFF. in that the latter will fall over on encountering U+FFFF.
*/ */
CodePoints!(E) codePoints(E)(immutable(E)[] s) CodePoints!(E) codePoints(E)(immutable(E)[] s)

View file

@ -140,7 +140,7 @@ unittest
// test allocation sizes // test allocation sizes
assert(GCAllocator.instance.goodAllocSize(1) == 16); assert(GCAllocator.instance.goodAllocSize(1) == 16);
for(size_t s = 16; s <= 8192; s *= 2) for (size_t s = 16; s <= 8192; s *= 2)
{ {
assert(GCAllocator.instance.goodAllocSize(s) == s); assert(GCAllocator.instance.goodAllocSize(s) == s);
assert(GCAllocator.instance.goodAllocSize(s - (s / 2) + 1) == s); assert(GCAllocator.instance.goodAllocSize(s - (s / 2) + 1) == s);

View file

@ -1206,7 +1206,7 @@ pure nothrow unittest
import std.experimental.ndslice.slice; import std.experimental.ndslice.slice;
auto slice = new long[20].sliced(5, 4); auto slice = new long[20].sliced(5, 4);
for(auto elems = slice.byElement; !elems.empty; elems.popFront) for (auto elems = slice.byElement; !elems.empty; elems.popFront)
{ {
size_t[2] index = elems.index; size_t[2] index = elems.index;
elems.front = index[0] * 10 + index[1] * 3; elems.front = index[0] * 10 + index[1] * 3;

View file

@ -3612,7 +3612,7 @@ private struct DirIteratorImpl
{ {
if (_stack.data.empty) if (_stack.data.empty)
return false; return false;
for(dirent* fdata; (fdata = readdir(_stack.data[$-1].h)) != null; ) for (dirent* fdata; (fdata = readdir(_stack.data[$-1].h)) != null; )
{ {
// Skip "." and ".." // Skip "." and ".."
if (core.stdc.string.strcmp(fdata.d_name.ptr, ".") && if (core.stdc.string.strcmp(fdata.d_name.ptr, ".") &&

View file

@ -2260,7 +2260,7 @@ void toHexZeroPadded(char[] output, uint value,
ptrdiff_t x = output.length - 1; ptrdiff_t x = output.length - 1;
static immutable string upperHexDigits = "0123456789ABCDEF"; static immutable string upperHexDigits = "0123456789ABCDEF";
static immutable string lowerHexDigits = "0123456789abcdef"; static immutable string lowerHexDigits = "0123456789abcdef";
for( ; x>=0; --x) for ( ; x>=0; --x)
{ {
if (letterCase == LetterCase.upper) if (letterCase == LetterCase.upper)
{ {

View file

@ -159,7 +159,7 @@ void multibyteShr(uint [] dest, const(uint) [] src, uint numbits)
pure @nogc @safe pure @nogc @safe
{ {
ulong c = 0; ulong c = 0;
for(ptrdiff_t i = dest.length; i!=0; --i) for (ptrdiff_t i = dest.length; i!=0; --i)
{ {
c += (src[i-1] >>numbits) + (cast(ulong)(src[i-1]) << (64 - numbits)); c += (src[i-1] >>numbits) + (cast(ulong)(src[i-1]) << (64 - numbits));
dest[i-1] = cast(uint)c; dest[i-1] = cast(uint)c;
@ -195,7 +195,7 @@ uint multibyteMul(uint[] dest, const(uint)[] src, uint multiplier, uint carry)
{ {
assert(dest.length == src.length); assert(dest.length == src.length);
ulong c = carry; ulong c = carry;
for(size_t i = 0; i < src.length; ++i) for (size_t i = 0; i < src.length; ++i)
{ {
c += cast(ulong)(src[i]) * multiplier; c += cast(ulong)(src[i]) * multiplier;
dest[i] = cast(uint)c; dest[i] = cast(uint)c;
@ -222,7 +222,7 @@ uint multibyteMulAdd(char op)(uint [] dest, const(uint)[] src,
{ {
assert(dest.length == src.length); assert(dest.length == src.length);
ulong c = carry; ulong c = carry;
for(size_t i = 0; i < src.length; ++i) for (size_t i = 0; i < src.length; ++i)
{ {
static if (op=='+') static if (op=='+')
{ {
@ -285,7 +285,7 @@ uint multibyteDivAssign(uint [] dest, uint divisor, uint overflow)
pure @nogc @safe pure @nogc @safe
{ {
ulong c = cast(ulong)overflow; ulong c = cast(ulong)overflow;
for(ptrdiff_t i = dest.length-1; i>= 0; --i) for (ptrdiff_t i = dest.length-1; i>= 0; --i)
{ {
c = (c<<32) + cast(ulong)(dest[i]); c = (c<<32) + cast(ulong)(dest[i]);
uint q = cast(uint)(c/divisor); uint q = cast(uint)(c/divisor);
@ -314,7 +314,7 @@ void multibyteAddDiagonalSquares(uint[] dest, const(uint)[] src)
pure @nogc @safe pure @nogc @safe
{ {
ulong c = 0; ulong c = 0;
for(size_t i = 0; i < src.length; ++i) for (size_t i = 0; i < src.length; ++i)
{ {
// At this point, c is 0 or 1, since FFFF*FFFF+FFFF_FFFF = 1_0000_0000. // At this point, c is 0 or 1, since FFFF*FFFF+FFFF_FFFF = 1_0000_0000.
c += cast(ulong)(src[i]) * src[i] + dest[2*i]; c += cast(ulong)(src[i]) * src[i] + dest[2*i];

View file

@ -753,7 +753,7 @@ ihalve:
dir = 0; dir = 0;
di = 0.5L; di = 0.5L;
for( i=0; i<400; i++ ) { for ( i=0; i<400; i++ ) {
if ( i != 0 ) { if ( i != 0 ) {
x = x0 + di * (x1 - x0); x = x0 + di * (x1 - x0);
if ( x == 1.0L ) { if ( x == 1.0L ) {
@ -846,7 +846,7 @@ newt:
nflg = 1; nflg = 1;
lgm = logGamma(a+b) - logGamma(a) - logGamma(b); lgm = logGamma(a+b) - logGamma(a) - logGamma(b);
for( i=0; i<15; i++ ) { for ( i=0; i<15; i++ ) {
/* Compute the function at this point. */ /* Compute the function at this point. */
if ( i != 0 ) if ( i != 0 )
y = betaIncomplete(a,b,x); y = betaIncomplete(a,b,x);
@ -1346,7 +1346,7 @@ body {
lgm = logGamma(a); lgm = logGamma(a);
for( i=0; i<10; i++ ) { for ( i=0; i<10; i++ ) {
if ( x > x0 || x < x1 ) if ( x > x0 || x < x1 )
goto ihalve; goto ihalve;
y = gammaIncompleteCompl(a,x); y = gammaIncompleteCompl(a,x);
@ -1391,7 +1391,7 @@ ihalve:
d = 0.5L; d = 0.5L;
dir = 0; dir = 0;
for( i=0; i<400; i++ ) { for ( i=0; i<400; i++ ) {
x = x1 + d * (x0 - x1); x = x1 + d * (x0 - x1);
y = gammaIncompleteCompl( a, x ); y = gammaIncompleteCompl( a, x );
lgm = (x0 - x1)/(x1 + x0); lgm = (x0 - x1)/(x1 + x0);
@ -1603,9 +1603,9 @@ unittest {
assert(logmdigamma(-5.0).isNaN()); assert(logmdigamma(-5.0).isNaN());
assert(isIdentical(logmdigamma(NaN(0xABC)), NaN(0xABC))); assert(isIdentical(logmdigamma(NaN(0xABC)), NaN(0xABC)));
assert(logmdigamma(0.0) == real.infinity); assert(logmdigamma(0.0) == real.infinity);
for(auto x = 0.01; x < 1.0; x += 0.1) for (auto x = 0.01; x < 1.0; x += 0.1)
assert(approxEqual(digamma(x), log(x) - logmdigamma(x))); assert(approxEqual(digamma(x), log(x) - logmdigamma(x)));
for(auto x = 1.0; x < 15.0; x += 1.0) for (auto x = 1.0; x < 15.0; x += 1.0)
assert(approxEqual(digamma(x), log(x) - logmdigamma(x))); assert(approxEqual(digamma(x), log(x) - logmdigamma(x)));
} }

View file

@ -1922,7 +1922,7 @@ public:
assert(from !is null); assert(from !is null);
size_t i; size_t i;
for(; !source.empty && i < from.length; source.popFront()) for (; !source.empty && i < from.length; source.popFront())
{ {
from[i++] = source.front; from[i++] = source.front;
} }
@ -2180,7 +2180,7 @@ public:
assert(buf !is null); assert(buf !is null);
size_t i; size_t i;
for(; !source.empty && i < buf.length; source.popFront()) for (; !source.empty && i < buf.length; source.popFront())
{ {
buf[i++] = source.front; buf[i++] = source.front;
} }
@ -3617,7 +3617,7 @@ enum string parallelApplyMixinInputRange = q{
scope(exit) rangeMutex.unlock(); scope(exit) rangeMutex.unlock();
size_t i = 0; size_t i = 0;
for(; i < workUnitSize && !range.empty; range.popFront(), i++) for (; i < workUnitSize && !range.empty; range.popFront(), i++)
{ {
temp[i] = addressOf(range.front); temp[i] = addressOf(range.front);
} }
@ -3647,7 +3647,7 @@ enum string parallelApplyMixinInputRange = q{
scope(exit) rangeMutex.unlock(); scope(exit) rangeMutex.unlock();
size_t i = 0; size_t i = 0;
for(; i < workUnitSize && !range.empty; range.popFront(), i++) for (; i < workUnitSize && !range.empty; range.popFront(), i++)
{ {
temp[i] = range.front; temp[i] = range.front;
} }
@ -4296,7 +4296,7 @@ version(parallelismStressTest)
unittest unittest
{ {
size_t attempt; size_t attempt;
for(; attempt < 10; attempt++) for (; attempt < 10; attempt++)
foreach (poolSize; [0, 4]) foreach (poolSize; [0, 4])
{ {

View file

@ -404,7 +404,7 @@ template InputRangeObject(R) if (isInputRange!(Unqual!R)) {
int opApply(int delegate(E) dg) { int opApply(int delegate(E) dg) {
int res; int res;
for(auto r = _range; !r.empty; r.popFront()) { for (auto r = _range; !r.empty; r.popFront()) {
res = dg(r.front); res = dg(r.front);
if (res) break; if (res) break;
} }
@ -416,7 +416,7 @@ template InputRangeObject(R) if (isInputRange!(Unqual!R)) {
int res; int res;
size_t i = 0; size_t i = 0;
for(auto r = _range; !r.empty; r.popFront()) { for (auto r = _range; !r.empty; r.popFront()) {
res = dg(i, r.front); res = dg(i, r.front);
if (res) break; if (res) break;
i++; i++;

View file

@ -1718,7 +1718,7 @@ if (isRandomAccessRange!(Unqual!R) && hasLength!(Unqual!R))
static assert(isForwardRange!(typeof(radial(a, 1)))); static assert(isForwardRange!(typeof(radial(a, 1))));
auto r = radial([1,2,3,4,5]); auto r = radial([1,2,3,4,5]);
for(auto rr = r.save; !rr.empty; rr.popFront()) for (auto rr = r.save; !rr.empty; rr.popFront())
{ {
assert(rr.front == moveFront(rr)); assert(rr.front == moveFront(rr));
} }
@ -2021,7 +2021,7 @@ if (isInputRange!(Unqual!R) && (isInfinite!(Unqual!R) || !hasSlicing!(Unqual!R)
static assert(isForwardRange!T); static assert(isForwardRange!T);
} }
for(auto tt = t; !tt.empty; tt.popFront()) for (auto tt = t; !tt.empty; tt.popFront())
{ {
assert(tt.front == moveFront(tt)); assert(tt.front == moveFront(tt));
} }
@ -4735,7 +4735,7 @@ auto sequence(alias fun, State...)(State args)
auto odds = Sequence!("a[0] + n * a[1]", Tuple!(int, int))( auto odds = Sequence!("a[0] + n * a[1]", Tuple!(int, int))(
tuple(1, 2)); tuple(1, 2));
for(int currentOdd = 1; currentOdd <= 21; currentOdd += 2) { for (int currentOdd = 1; currentOdd <= 21; currentOdd += 2) {
assert(odds.front == odds[0]); assert(odds.front == odds[0]);
assert(odds[0] == currentOdd); assert(odds[0] == currentOdd);
odds.popFront(); odds.popFront();

View file

@ -218,7 +218,7 @@ template BacktrackingMatcher(bool CTregex)
{ {
if (!re.kickstart.empty) if (!re.kickstart.empty)
{ {
for(;;) for (;;)
{ {
int val = matchFinalize(); int val = matchFinalize();
if (val) if (val)
@ -240,7 +240,7 @@ template BacktrackingMatcher(bool CTregex)
} }
} }
//no search available - skip a char at a time //no search available - skip a char at a time
for(;;) for (;;)
{ {
int val = matchFinalize(); int val = matchFinalize();
if (val) if (val)
@ -280,7 +280,7 @@ template BacktrackingMatcher(bool CTregex)
auto start = s._index; auto start = s._index;
debug(std_regex_matcher) debug(std_regex_matcher)
writeln("Try match starting at ", s[index..s.lastIndex]); writeln("Try match starting at ", s[index..s.lastIndex]);
for(;;) for (;;)
{ {
debug(std_regex_matcher) debug(std_regex_matcher)
writefln("PC: %s\tCNT: %s\t%s \tfront: %s src: %s", writefln("PC: %s\tCNT: %s\t%s \tfront: %s src: %s",
@ -295,7 +295,7 @@ template BacktrackingMatcher(bool CTregex)
uint end = pc + len; uint end = pc + len;
if (re.ir[pc].data != front && re.ir[pc+1].data != front) if (re.ir[pc].data != front && re.ir[pc+1].data != front)
{ {
for(pc = pc+2; pc < end; pc++) for (pc = pc+2; pc < end; pc++)
if (re.ir[pc].data == front) if (re.ir[pc].data == front)
break; break;
if (pc == end) if (pc == end)
@ -976,7 +976,7 @@ struct CtContext
CtState[] pieces; CtState[] pieces;
CtState r; CtState r;
enum optL = IRL!(IR.Option); enum optL = IRL!(IR.Option);
for(;;) for (;;)
{ {
assert(ir[0].code == IR.Option); assert(ir[0].code == IR.Option);
auto len = ir[0].data; auto len = ir[0].data;
@ -998,7 +998,7 @@ struct CtContext
} }
} }
r = pieces[0]; r = pieces[0];
for(uint i = 1; i < pieces.length; i++) for (uint i = 1; i < pieces.length; i++)
{ {
r.code ~= ctSub(` r.code ~= ctSub(`
case $$: case $$:
@ -1230,7 +1230,7 @@ struct CtContext
if (atEnd) if (atEnd)
$$`, bailOut); $$`, bailOut);
uint len = ir[0].sequence; uint len = ir[0].sequence;
for(uint i = 0; i < len; i++) for (uint i = 0; i < len; i++)
{ {
code ~= ctSub( ` code ~= ctSub( `
if (front == $$) if (front == $$)

View file

@ -39,7 +39,7 @@ module std.regex.internal.generator;
void compose() void compose()
{ {
uint pc = 0, counter = 0, dataLenOld = uint.max; uint pc = 0, counter = 0, dataLenOld = uint.max;
for(;;) for (;;)
{ {
switch (re.ir[pc].code) switch (re.ir[pc].code)
{ {
@ -90,7 +90,7 @@ module std.regex.internal.generator;
} }
nOpt++; nOpt++;
nOpt = rand(nOpt); nOpt = rand(nOpt);
for(;nOpt; nOpt--) for (;nOpt; nOpt--)
{ {
pc += re.ir[pc].data + IRL!(IR.Option); pc += re.ir[pc].data + IRL!(IR.Option);
} }

View file

@ -443,7 +443,7 @@ struct Group(DataIndex)
@trusted void printBytecode()(in Bytecode[] slice, in NamedGroup[] dict=[]) @trusted void printBytecode()(in Bytecode[] slice, in NamedGroup[] dict=[])
{ {
import std.stdio; import std.stdio;
for(uint pc=0; pc<slice.length; pc += slice[pc].length) for (uint pc=0; pc<slice.length; pc += slice[pc].length)
writeln("\t", disassemble(slice, pc, dict)); writeln("\t", disassemble(slice, pc, dict));
} }
@ -534,7 +534,7 @@ package(std.regex):
if (flags & RegexOption.multiline) if (flags & RegexOption.multiline)
return; return;
L_CheckLoop: L_CheckLoop:
for(uint i = 0; i < ir.length; i += ir[i].length) for (uint i = 0; i < ir.length; i += ir[i].length)
{ {
switch (ir[i].code) switch (ir[i].code)
{ {
@ -552,7 +552,7 @@ package(std.regex):
//print out disassembly a program's IR //print out disassembly a program's IR
@trusted debug(std_regex_parser) void print() const @trusted debug(std_regex_parser) void print() const
{//@@@BUG@@@ write is system {//@@@BUG@@@ write is system
for(uint i = 0; i < ir.length; i += ir[i].length) for (uint i = 0; i < ir.length; i += ir[i].length)
{ {
writefln("%d\t%s ", i, disassemble(ir, i, dict)); writefln("%d\t%s ", i, disassemble(ir, i, dict));
} }

View file

@ -81,7 +81,7 @@ private:
Char[dchar.sizeof/Char.sizeof] buf; Char[dchar.sizeof/Char.sizeof] buf;
uint tmask = mask; uint tmask = mask;
size_t total = encode(buf, ch); size_t total = encode(buf, ch);
for(size_t i = 0; i < total; i++, tmask<<=1) for (size_t i = 0; i < total; i++, tmask<<=1)
{ {
static if (charSize == 1) static if (charSize == 1)
setBits(buf[i], tmask); setBits(buf[i], tmask);
@ -143,7 +143,7 @@ public:
return h; return h;
} }
L_FindChar: L_FindChar:
for(size_t i = 0;;) for (size_t i = 0;;)
{ {
switch (re.ir[i].code) switch (re.ir[i].code)
{ {
@ -176,10 +176,10 @@ public:
ShiftThread t = ShiftThread(0, 0, table); ShiftThread t = ShiftThread(0, 0, table);
//locate first fixed char if any //locate first fixed char if any
n_length = 32; n_length = 32;
for(;;) for (;;)
{ {
L_Eval_Thread: L_Eval_Thread:
for(;;) for (;;)
{ {
switch (re.ir[t.pc].code) switch (re.ir[t.pc].code)
{ {
@ -196,17 +196,17 @@ public:
uint end = t.pc + len; uint end = t.pc + len;
uint[Bytecode.maxSequence] s; uint[Bytecode.maxSequence] s;
uint numS; uint numS;
for(uint i = 0; i < len; i++) for (uint i = 0; i < len; i++)
{ {
auto x = charLen(re.ir[t.pc+i].data); auto x = charLen(re.ir[t.pc+i].data);
if (countUntil(s[0..numS], x) < 0) if (countUntil(s[0..numS], x) < 0)
s[numS++] = x; s[numS++] = x;
} }
for(uint i = t.pc; i < end; i++) for (uint i = t.pc; i < end; i++)
{ {
t.add(re.ir[i].data); t.add(re.ir[i].data);
} }
for(uint i = 0; i < numS; i++) for (uint i = 0; i < numS; i++)
{ {
auto tx = fork(t, t.pc + len, t.counter); auto tx = fork(t, t.pc + len, t.counter);
if (tx.idx + s[i] <= n_length) if (tx.idx + s[i] <= n_length)
@ -245,7 +245,7 @@ public:
arr[ofs++] = ival.b; arr[ofs++] = ival.b;
} }
auto srange = assumeSorted!"a <= b"(arr); auto srange = assumeSorted!"a <= b"(arr);
for(uint i = 0; i < codeBounds.length/2; i++) for (uint i = 0; i < codeBounds.length/2; i++)
{ {
auto start = srange.lowerBound(codeBounds[2*i]).length; auto start = srange.lowerBound(codeBounds[2*i]).length;
auto end = srange.lowerBound(codeBounds[2*i+1]).length; auto end = srange.lowerBound(codeBounds[2*i+1]).length;
@ -265,7 +265,7 @@ public:
continue; continue;
t.add(ch); t.add(ch);
} }
for(uint i = 0; i < numS; i++) for (uint i = 0; i < numS; i++)
{ {
auto tx = fork(t, t.pc + IRL!(IR.CodepointSet), t.counter); auto tx = fork(t, t.pc + IRL!(IR.CodepointSet), t.counter);
tx.advance(s[i]); tx.advance(s[i]);
@ -405,7 +405,7 @@ public:
{ {
if (!~state) if (!~state)
{//speed up seeking first matching place {//speed up seeking first matching place
for(;;) for (;;)
{ {
assert(p <= end, text(p," vs ", end)); assert(p <= end, text(p," vs ", end));
p = cast(ubyte*)memchr(p, fChar, end - p); p = cast(ubyte*)memchr(p, fChar, end - p);
@ -500,7 +500,7 @@ public:
@system debug static void dump(uint[] table) @system debug static void dump(uint[] table)
{//@@@BUG@@@ writef(ln) is @system {//@@@BUG@@@ writef(ln) is @system
import std.stdio; import std.stdio;
for(size_t i = 0; i < table.length; i += 4) for (size_t i = 0; i < table.length; i += 4)
{ {
writefln("%32b %32b %32b %32b",table[i], table[i+1], table[i+2], table[i+3]); writefln("%32b %32b %32b %32b",table[i], table[i+1], table[i+2], table[i+3]);
} }

View file

@ -83,9 +83,9 @@ unittest
Stack!(Tuple!(uint, uint, uint)) stack; Stack!(Tuple!(uint, uint, uint)) stack;
uint start = 0; uint start = 0;
uint end = cast(uint)code.length; uint end = cast(uint)code.length;
for(;;) for (;;)
{ {
for(uint pc = start; pc < end; ) for (uint pc = start; pc < end; )
{ {
uint len = code[pc].length; uint len = code[pc].length;
if (code[pc].code == IR.GotoEndOr) if (code[pc].code == IR.GotoEndOr)
@ -163,7 +163,7 @@ dchar parseUniHex(Char)(ref Char[] str, size_t maxDigit)
//std.conv.parse is both @system and bogus //std.conv.parse is both @system and bogus
enforce(str.length >= maxDigit,"incomplete escape sequence"); enforce(str.length >= maxDigit,"incomplete escape sequence");
uint val; uint val;
for(int k = 0; k < maxDigit; k++) for (int k = 0; k < maxDigit; k++)
{ {
auto current = str[k];//accepts ascii only, so it's OK to index directly auto current = str[k];//accepts ascii only, so it's OK to index directly
if ('0' <= current && current <= '9') if ('0' <= current && current <= '9')
@ -729,7 +729,7 @@ struct Parser(R, Generator)
switch (current) switch (current)
{ {
case '#': case '#':
for(;;) for (;;)
{ {
if (!next()) if (!next())
error("Unexpected end of pattern"); error("Unexpected end of pattern");
@ -969,7 +969,7 @@ struct Parser(R, Generator)
} }
L_CharTermLoop: L_CharTermLoop:
for(;;) for (;;)
{ {
final switch (state) final switch (state)
{ {
@ -1144,7 +1144,7 @@ struct Parser(R, Generator)
enforce(last <= current, "inverted range"); enforce(last <= current, "inverted range");
if (re_flags & RegexOption.casefold) if (re_flags & RegexOption.casefold)
{ {
for(uint ch = last; ch <= current; ch++) for (uint ch = last; ch <= current; ch++)
addWithFlags(set, ch, re_flags); addWithFlags(set, ch, re_flags);
} }
else else
@ -1493,7 +1493,7 @@ struct Parser(R, Generator)
auto counterRange = FixedStack!uint(new uint[maxCounterDepth+1], -1); auto counterRange = FixedStack!uint(new uint[maxCounterDepth+1], -1);
counterRange.push(1); counterRange.push(1);
ulong cumRange = 0; ulong cumRange = 0;
for(uint i = 0; i < ir.length; i += ir[i].length) for (uint i = 0; i < ir.length; i += ir[i].length)
{ {
if (ir[i].hotspot) if (ir[i].hotspot)
{ {
@ -1548,7 +1548,7 @@ void fixupBytecode()(Bytecode[] ir)
{ {
Stack!uint fixups; Stack!uint fixups;
with(IR) for(uint i=0; i<ir.length; i+= ir[i].length) with(IR) for (uint i=0; i<ir.length; i+= ir[i].length)
{ {
if (ir[i].isStart || ir[i].code == Option) if (ir[i].isStart || ir[i].code == Option)
fixups.push(i); fixups.push(i);
@ -1564,7 +1564,7 @@ void fixupBytecode()(Bytecode[] ir)
// fixup all GotoEndOrs // fixup all GotoEndOrs
j = j + IRL!(OrStart); j = j + IRL!(OrStart);
assert(ir[j].code == Option); assert(ir[j].code == Option);
for(;;) for (;;)
{ {
auto next = j + ir[j].data + IRL!(Option); auto next = j + ir[j].data + IRL!(Option);
if (ir[next].code == IR.OrEnd) if (ir[next].code == IR.OrEnd)
@ -1595,7 +1595,7 @@ void optimize(Char)(ref Regex!Char zis)
CodepointSet set; CodepointSet set;
with(zis) with(IR) with(zis) with(IR)
Outer: Outer:
for(uint i = idx; i < ir.length; i += ir[i].length) for (uint i = idx; i < ir.length; i += ir[i].length)
{ {
switch (ir[i].code) switch (ir[i].code)
{ {
@ -1615,7 +1615,7 @@ void optimize(Char)(ref Regex!Char zis)
return set; return set;
} }
with(zis) with(IR) for(uint i = 0; i < ir.length; i += ir[i].length) with(zis) with(IR) for (uint i = 0; i < ir.length; i += ir[i].length)
{ {
if (ir[i].code == InfiniteEnd) if (ir[i].code == InfiniteEnd)
{ {
@ -1640,7 +1640,7 @@ void optimize(Char)(ref Regex!Char zis)
import std.conv; import std.conv;
with(zis) with(zis)
{ {
for(uint pc = 0; pc < ir.length; pc += ir[pc].length) for (uint pc = 0; pc < ir.length; pc += ir[pc].length)
{ {
if (ir[pc].isStart || ir[pc].isEnd) if (ir[pc].isStart || ir[pc].isEnd)
{ {

View file

@ -781,7 +781,7 @@ unittest
auto r = regex( auto r = regex(
r"^NAME = (?P<comp>[a-zA-Z0-9_]+):*(?P<blk>[a-zA-Z0-9_]*)","gm"); r"^NAME = (?P<comp>[a-zA-Z0-9_]+):*(?P<blk>[a-zA-Z0-9_]*)","gm");
auto uniCapturesNew = match(uniFileOld, r); auto uniCapturesNew = match(uniFileOld, r);
for(int i = 0; i < 20; i++) for (int i = 0; i < 20; i++)
foreach (matchNew; uniCapturesNew) {} foreach (matchNew; uniCapturesNew) {}
//a second issue with same symptoms //a second issue with same symptoms
auto r2 = regex(`([а-яА-Я\-_]+\s*)+(?<=[\s\.,\^])`); auto r2 = regex(`([а-яА-Я\-_]+\s*)+(?<=[\s\.,\^])`);

View file

@ -562,7 +562,7 @@ template ThompsonOps(E, S, bool withInput:true)
uint len = re.ir[t.pc].sequence; uint len = re.ir[t.pc].sequence;
uint end = t.pc + len; uint end = t.pc + len;
static assert(IRL!(IR.OrChar) == 1); static assert(IRL!(IR.OrChar) == 1);
for(; t.pc < end; t.pc++) for (; t.pc < end; t.pc++)
if (re.ir[t.pc].data == front) if (re.ir[t.pc].data == front)
break; break;
if (t.pc != end) if (t.pc != end)
@ -796,7 +796,7 @@ template ThompsonOps(E,S, bool withInput:false)
opCacheBackTrue = arrayInChunk!(OpBackFunc)(re.ir.length, memory); opCacheBackTrue = arrayInChunk!(OpBackFunc)(re.ir.length, memory);
opCacheBackFalse = arrayInChunk!(OpBackFunc)(re.ir.length, memory); opCacheBackFalse = arrayInChunk!(OpBackFunc)(re.ir.length, memory);
for(uint pc = 0; pc<re.ir.length; pc += re.ir[pc].length) for (uint pc = 0; pc<re.ir.length; pc += re.ir[pc].length)
{ {
L_dispatch: L_dispatch:
switch (re.ir[pc].code) switch (re.ir[pc].code)
@ -919,7 +919,7 @@ template ThompsonOps(E,S, bool withInput:false)
state.matches = matches; state.matches = matches;
if (!atEnd)//if no char if (!atEnd)//if no char
for(;;) for (;;)
{ {
genCounter++; genCounter++;
debug(std_regex_matcher) debug(std_regex_matcher)
@ -933,7 +933,7 @@ template ThompsonOps(E,S, bool withInput:false)
writeln(); writeln();
} }
} }
for(state.t = clist.fetch(); state.t; state.t = clist.fetch()) for (state.t = clist.fetch(); state.t; state.t = clist.fetch())
{ {
eval!true(&state); eval!true(&state);
} }
@ -974,7 +974,7 @@ template ThompsonOps(E,S, bool withInput:false)
genCounter++; //increment also on each end genCounter++; //increment also on each end
debug(std_regex_matcher) writefln("Threaded matching threads at end"); debug(std_regex_matcher) writefln("Threaded matching threads at end");
//try out all zero-width posibilities //try out all zero-width posibilities
for(state.t = clist.fetch(); state.t; state.t = clist.fetch()) for (state.t = clist.fetch(); state.t; state.t = clist.fetch())
{ {
eval!false(&state); eval!false(&state);
} }
@ -1055,7 +1055,7 @@ template ThompsonOps(E,S, bool withInput:false)
genCounter++; genCounter++;
evalFn!true(&state); evalFn!true(&state);
} }
for(;;) for (;;)
{ {
debug(std_regex_matcher) writeln("\n-- Started iteration of main cycle"); debug(std_regex_matcher) writeln("\n-- Started iteration of main cycle");
genCounter++; genCounter++;
@ -1066,7 +1066,7 @@ template ThompsonOps(E,S, bool withInput:false)
assert(t); assert(t);
} }
} }
for(state.t = clist.fetch(); state.t; state.t = clist.fetch()) for (state.t = clist.fetch(); state.t; state.t = clist.fetch())
{ {
evalFn!true(&state); evalFn!true(&state);
} }
@ -1085,7 +1085,7 @@ template ThompsonOps(E,S, bool withInput:false)
genCounter++; //increment also on each end genCounter++; //increment also on each end
debug(std_regex_matcher) writefln("-- Matching threads at end"); debug(std_regex_matcher) writefln("-- Matching threads at end");
//try out all zero-width posibilities //try out all zero-width posibilities
for(state.t = clist.fetch(); state.t; state.t = clist.fetch()) for (state.t = clist.fetch(); state.t; state.t = clist.fetch())
{ {
evalFn!false(&state); evalFn!false(&state);
} }
@ -1113,7 +1113,7 @@ template ThompsonOps(E,S, bool withInput:false)
memory = memory[threadSize * size .. $]; memory = memory[threadSize * size .. $];
freelist = cast(Thread!DataIndex*)&mem[0]; freelist = cast(Thread!DataIndex*)&mem[0];
size_t i; size_t i;
for(i = threadSize; i < threadSize*size; i += threadSize) for (i = threadSize; i < threadSize*size; i += threadSize)
(cast(Thread!DataIndex*)&mem[i-threadSize]).next = cast(Thread!DataIndex*)&mem[i]; (cast(Thread!DataIndex*)&mem[i-threadSize]).next = cast(Thread!DataIndex*)&mem[i];
(cast(Thread!DataIndex*)&mem[i-threadSize]).next = null; (cast(Thread!DataIndex*)&mem[i-threadSize]).next = null;
} }

View file

@ -1098,7 +1098,7 @@ L_Replace_Loop:
final switch (state) final switch (state)
{ {
case State.Normal: case State.Normal:
for(offset = 0; offset < format.length; offset++)//no decoding for (offset = 0; offset < format.length; offset++)//no decoding
{ {
if (format[offset] == '$') if (format[offset] == '$')
{ {

View file

@ -427,7 +427,7 @@ class Protocol
name = to!string(proto.p_name); name = to!string(proto.p_name);
int i; int i;
for(i = 0;; i++) for (i = 0;; i++)
{ {
if (!proto.p_aliases[i]) if (!proto.p_aliases[i])
break; break;
@ -436,7 +436,7 @@ class Protocol
if (i) if (i)
{ {
aliases = new string[i]; aliases = new string[i];
for(i = 0; i != aliases.length; i++) for (i = 0; i != aliases.length; i++)
{ {
aliases[i] = aliases[i] =
to!string(proto.p_aliases[i]); to!string(proto.p_aliases[i]);
@ -529,7 +529,7 @@ class Service
protocolName = to!string(serv.s_proto); protocolName = to!string(serv.s_proto);
int i; int i;
for(i = 0;; i++) for (i = 0;; i++)
{ {
if (!serv.s_aliases[i]) if (!serv.s_aliases[i])
break; break;
@ -538,7 +538,7 @@ class Service
if (i) if (i)
{ {
aliases = new string[i]; aliases = new string[i];
for(i = 0; i != aliases.length; i++) for (i = 0; i != aliases.length; i++)
{ {
aliases[i] = aliases[i] =
to!string(serv.s_aliases[i]); to!string(serv.s_aliases[i]);
@ -696,7 +696,7 @@ class InternetHost
name = to!string(he.h_name); name = to!string(he.h_name);
for(i = 0;; i++) for (i = 0;; i++)
{ {
p = he.h_aliases[i]; p = he.h_aliases[i];
if (!p) if (!p)
@ -706,7 +706,7 @@ class InternetHost
if (i) if (i)
{ {
aliases = new string[i]; aliases = new string[i];
for(i = 0; i != aliases.length; i++) for (i = 0; i != aliases.length; i++)
{ {
aliases[i] = aliases[i] =
to!string(he.h_aliases[i]); to!string(he.h_aliases[i]);
@ -717,7 +717,7 @@ class InternetHost
aliases = null; aliases = null;
} }
for(i = 0;; i++) for (i = 0;; i++)
{ {
p = he.h_addr_list[i]; p = he.h_addr_list[i];
if (!p) if (!p)
@ -727,7 +727,7 @@ class InternetHost
if (i) if (i)
{ {
addrList = new uint[i]; addrList = new uint[i];
for(i = 0; i != addrList.length; i++) for (i = 0; i != addrList.length; i++)
{ {
addrList[i] = ntohl(*(cast(uint*)he.h_addr_list[i])); addrList[i] = ntohl(*(cast(uint*)he.h_addr_list[i]));
} }

View file

@ -3231,7 +3231,7 @@ unittest // bugzilla 14861
static import std.file; static import std.file;
auto deleteme = testFilename(); auto deleteme = testFilename();
File fw = File(deleteme, "w"); File fw = File(deleteme, "w");
for(int i; i != 5000; i++) for (int i; i != 5000; i++)
fw.writeln(i, ";", "Иванов;Пётр;Петрович"); fw.writeln(i, ";", "Иванов;Пётр;Петрович");
fw.close(); fw.close();
scope(exit) std.file.remove(deleteme); scope(exit) std.file.remove(deleteme);

View file

@ -416,7 +416,7 @@ class Stream : InputStream, OutputStream {
// reads block of data of specified size, // reads block of data of specified size,
// throws ReadException on error // throws ReadException on error
void readExact(void* buffer, size_t size) { void readExact(void* buffer, size_t size) {
for(;;) { for (;;) {
if (!size) return; if (!size) return;
size_t readsize = readBlock(buffer, size); // return 0 on eof size_t readsize = readBlock(buffer, size); // return 0 on eof
if (readsize == 0) break; if (readsize == 0) break;
@ -1082,7 +1082,7 @@ class Stream : InputStream, OutputStream {
// throws WriteException on error // throws WriteException on error
void writeExact(const void* buffer, size_t size) { void writeExact(const void* buffer, size_t size) {
const(void)* p = buffer; const(void)* p = buffer;
for(;;) { for (;;) {
if (!size) return; if (!size) return;
size_t writesize = writeBlock(p, size); size_t writesize = writeBlock(p, size);
if (writesize == 0) break; if (writesize == 0) break;
@ -1767,7 +1767,7 @@ class BufferedStream : FilterStream {
ubyte* pc = cast(ubyte*)&c; ubyte* pc = cast(ubyte*)&c;
L0: L0:
for(;;) { for (;;) {
size_t start = bufferCurPos; size_t start = bufferCurPos;
L1: L1:
foreach (ubyte b; buffer[start .. bufferLen]) { foreach (ubyte b; buffer[start .. bufferLen]) {

View file

@ -696,14 +696,14 @@ else
void copyBackwards(T,U)(T[] src, U[] dest) void copyBackwards(T,U)(T[] src, U[] dest)
{ {
assert(src.length == dest.length); assert(src.length == dest.length);
for(size_t i=src.length; i-- > 0; ) for (size_t i=src.length; i-- > 0; )
dest[i] = src[i]; dest[i] = src[i];
} }
void copyForward(T,U)(T[] src, U[] dest) void copyForward(T,U)(T[] src, U[] dest)
{ {
assert(src.length == dest.length); assert(src.length == dest.length);
for(size_t i=0; i<src.length; i++) for (size_t i=0; i<src.length; i++)
dest[i] = src[i]; dest[i] = src[i];
} }
@ -1044,12 +1044,12 @@ unittest
alias fn3 = sliceBits!( 6, 9); alias fn3 = sliceBits!( 6, 9);
alias fn4 = sliceBits!( 0, 6); alias fn4 = sliceBits!( 0, 6);
static void check(size_t lvl, MA)(ref MA arr){ static void check(size_t lvl, MA)(ref MA arr){
for(size_t i = 0; i< arr.length!lvl; i++) for (size_t i = 0; i< arr.length!lvl; i++)
assert(arr.slice!(lvl)[i] == i, text("Mismatch on lvl ", lvl, " idx ", i, " value: ", arr.slice!(lvl)[i])); assert(arr.slice!(lvl)[i] == i, text("Mismatch on lvl ", lvl, " idx ", i, " value: ", arr.slice!(lvl)[i]));
} }
static void fillIdx(size_t lvl, MA)(ref MA arr){ static void fillIdx(size_t lvl, MA)(ref MA arr){
for(size_t i = 0; i< arr.length!lvl; i++) for (size_t i = 0; i< arr.length!lvl; i++)
arr.slice!(lvl)[i] = i; arr.slice!(lvl)[i] = i;
} }
Bitty m1; Bitty m1;
@ -1062,7 +1062,7 @@ unittest
m1.length!4 = 2^^16; m1.length!4 = 2^^16;
for(size_t i = 0; i< m1.length!4; i++) for (size_t i = 0; i< m1.length!4; i++)
m1.slice!(4)[i] = i % 2; m1.slice!(4)[i] = i % 2;
fillIdx!1(m1); fillIdx!1(m1);
@ -1076,7 +1076,7 @@ unittest
check!3(m1); check!3(m1);
check!2(m1); check!2(m1);
check!1(m1); check!1(m1);
for(size_t i=0; i < 2^^16; i++) for (size_t i=0; i < 2^^16; i++)
{ {
m1.slice!(4)[i] = i % 2; m1.slice!(4)[i] = i % 2;
m1.slice!(0)[fn1(i)] = fn1(i); m1.slice!(0)[fn1(i)] = fn1(i);
@ -1084,7 +1084,7 @@ unittest
m1.slice!(2)[fn3(i)] = fn3(i); m1.slice!(2)[fn3(i)] = fn3(i);
m1.slice!(3)[fn4(i)] = fn4(i); m1.slice!(3)[fn4(i)] = fn4(i);
} }
for(size_t i=0; i < 2^^16; i++) for (size_t i=0; i < 2^^16; i++)
{ {
assert(m1.slice!(4)[i] == i % 2); assert(m1.slice!(4)[i] == i % 2);
assert(m1.slice!(0)[fn1(i)] == fn1(i)); assert(m1.slice!(0)[fn1(i)] == fn1(i));
@ -1263,14 +1263,14 @@ pure nothrow:
} }
size_t pad_e = roundDown(e); size_t pad_e = roundDown(e);
size_t i; size_t i;
for(i=s; i<pad_s; i++) for (i=s; i<pad_s; i++)
if (ptr[i]) if (ptr[i])
return false; return false;
// all in between is x*factor elements // all in between is x*factor elements
for(size_t j=i/factor; i<pad_e; i+=factor, j++) for (size_t j=i/factor; i<pad_e; i+=factor, j++)
if (ptr.origin[j]) if (ptr.origin[j])
return false; return false;
for(; i<e; i++) for (; i<e; i++)
if (ptr[i]) if (ptr[i])
return false; return false;
return true; return true;
@ -1334,16 +1334,16 @@ pure nothrow:
} }
size_t pad_end = roundDown(end); // rounded down size_t pad_end = roundDown(end); // rounded down
size_t i; size_t i;
for(i=start; i<pad_start; i++) for (i=start; i<pad_start; i++)
ptr[i] = val; ptr[i] = val;
// all in between is x*factor elements // all in between is x*factor elements
if (pad_start != pad_end) if (pad_start != pad_end)
{ {
size_t repval = replicateBits!(factor, bits)(val); size_t repval = replicateBits!(factor, bits)(val);
for(size_t j=i/factor; i<pad_end; i+=factor, j++) for (size_t j=i/factor; i<pad_end; i+=factor, j++)
ptr.origin[j] = repval;// so speed it up by factor ptr.origin[j] = repval;// so speed it up by factor
} }
for(; i<end; i++) for (; i<end; i++)
ptr[i] = val; ptr[i] = val;
} }
@ -1371,7 +1371,7 @@ pure nothrow:
return ptr.origin[s1/factor .. e1/factor] return ptr.origin[s1/factor .. e1/factor]
== arr.ptr.origin[s2/factor .. e2/factor]; == arr.ptr.origin[s2/factor .. e2/factor];
} }
for(size_t i=0;i<limit; i++) for (size_t i=0;i<limit; i++)
if (this[i] != arr[i]) if (this[i] != arr[i])
return false; return false;
return true; return true;
@ -1456,7 +1456,7 @@ private struct SliceOverIndexed(T)
{ {
if (arr.length != length) if (arr.length != length)
return false; return false;
for(size_t i=0; i <length; i++) for (size_t i=0; i <length; i++)
if (this[i] != arr[i]) if (this[i] != arr[i])
return false; return false;
return true; return true;
@ -1917,7 +1917,7 @@ pure:
//@@@BUG another forward reference workaround //@@@BUG another forward reference workaround
@trusted bool equalS(R1, R2)(R1 lhs, R2 rhs) @trusted bool equalS(R1, R2)(R1 lhs, R2 rhs)
{ {
for(;;){ for (;;){
if (lhs.empty) if (lhs.empty)
return rhs.empty; return rhs.empty;
if (rhs.empty) if (rhs.empty)
@ -2137,7 +2137,7 @@ public:
package auto scanFor()(dchar ch) const package auto scanFor()(dchar ch) const
{ {
immutable len = data.length; immutable len = data.length;
for(size_t i = 0; i < len; i++) for (size_t i = 0; i < len; i++)
if (ch < data[i]) if (ch < data[i])
return i & 1; return i & 1;
return 0; return 0;
@ -3862,7 +3862,7 @@ private:
auto last = idx!level-pageSize; auto last = idx!level-pageSize;
auto slice = ptr[idx!level - pageSize..idx!level]; auto slice = ptr[idx!level - pageSize..idx!level];
size_t j; size_t j;
for(j=0; j<last; j+=pageSize) for (j=0; j<last; j+=pageSize)
{ {
if (ptr[j..j+pageSize] == slice) if (ptr[j..j+pageSize] == slice)
{ {
@ -5564,13 +5564,13 @@ unittest
alias Set = CodepointSet; alias Set = CodepointSet;
auto set = Set('A','Z','a','z'); auto set = Set('A','Z','a','z');
auto trie = buildTrie!(bool, uint, 256, lo8)(set.byInterval);// simple bool array auto trie = buildTrie!(bool, uint, 256, lo8)(set.byInterval);// simple bool array
for(int a='a'; a<'z';a++) for (int a='a'; a<'z';a++)
assert(trie[a]); assert(trie[a]);
for(int a='A'; a<'Z';a++) for (int a='A'; a<'Z';a++)
assert(trie[a]); assert(trie[a]);
for(int a=0; a<'A'; a++) for (int a=0; a<'A'; a++)
assert(!trie[a]); assert(!trie[a]);
for(int a ='Z'; a<'a'; a++) for (int a ='Z'; a<'a'; a++)
assert(!trie[a]); assert(!trie[a]);
trieStats(trie); trieStats(trie);
@ -6809,7 +6809,7 @@ private:
{ {
size_t k = smallLength; size_t k = smallLength;
ubyte* p = cast(ubyte*)enforce(malloc(3*(grow+1)), "malloc failed"); ubyte* p = cast(ubyte*)enforce(malloc(3*(grow+1)), "malloc failed");
for(int i=0; i<k; i++) for (int i=0; i<k; i++)
write24(p, read24(small_.ptr, i), i); write24(p, read24(small_.ptr, i), i);
// now we can overwrite small array data // now we can overwrite small array data
ptr_ = p; ptr_ = p;
@ -7028,7 +7028,7 @@ private int fullCasedCmp(Range)(dchar lhs, dchar rhs, ref Range rtail)
size_t start = idx - fTable[idx].n; size_t start = idx - fTable[idx].n;
size_t end = fTable[idx].size + start; size_t end = fTable[idx].size + start;
assert(fTable[start].entry_len == 1); assert(fTable[start].entry_len == 1);
for(idx=start; idx<end; idx++) for (idx=start; idx<end; idx++)
{ {
auto entryLen = fTable[idx].entry_len; auto entryLen = fTable[idx].entry_len;
if (entryLen == 1) if (entryLen == 1)
@ -7066,7 +7066,7 @@ int icmp(S1, S2)(S1 str1, S2 str2)
if (isForwardRange!S1 && is(Unqual!(ElementType!S1) == dchar) if (isForwardRange!S1 && is(Unqual!(ElementType!S1) == dchar)
&& isForwardRange!S2 && is(Unqual!(ElementType!S2) == dchar)) && isForwardRange!S2 && is(Unqual!(ElementType!S2) == dchar))
{ {
for(;;) for (;;)
{ {
if (str1.empty) if (str1.empty)
return str2.empty ? 0 : -1; return str2.empty ? 0 : -1;
@ -7435,7 +7435,7 @@ int hangulSyllableIndex(dchar ch) pure nothrow @nogc
// internal helper: compose hangul syllables leaving dchar.init in holes // internal helper: compose hangul syllables leaving dchar.init in holes
void hangulRecompose(dchar[] seq) pure nothrow @nogc void hangulRecompose(dchar[] seq) pure nothrow @nogc
{ {
for(size_t idx = 0; idx + 1 < seq.length; ) for (size_t idx = 0; idx + 1 < seq.length; )
{ {
if (isJamoL(seq[idx]) && isJamoV(seq[idx+1])) if (isJamoL(seq[idx]) && isJamoV(seq[idx+1]))
{ {
@ -7643,7 +7643,7 @@ inout(C)[] normalize(NormalizationForm norm=NFC, C)(inout(C)[] input)
auto first = countUntil(ccc, 0); auto first = countUntil(ccc, 0);
if (first >= 0) // no starters?? no recomposition if (first >= 0) // no starters?? no recomposition
{ {
for(;;) for (;;)
{ {
auto second = recompose(first, decomposed, ccc); auto second = recompose(first, decomposed, ccc);
if (second == decomposed.length) if (second == decomposed.length)
@ -7721,7 +7721,7 @@ private size_t recompose(size_t start, dchar[] input, ubyte[] ccc) pure nothrow
// writefln("recomposing %( %04x %)", input); // writefln("recomposing %( %04x %)", input);
// first one is always a starter thus we start at i == 1 // first one is always a starter thus we start at i == 1
size_t i = start+1; size_t i = start+1;
for(; ; ) for (; ; )
{ {
if (i == input.length) if (i == input.length)
break; break;
@ -7804,7 +7804,7 @@ private auto seekStable(NormalizationForm norm, C)(size_t idx, in C[] input)
auto br = input[0..idx]; auto br = input[0..idx];
size_t region_start = 0;// default size_t region_start = 0;// default
for(;;) for (;;)
{ {
if (br.empty)// start is 0 if (br.empty)// start is 0
break; break;

View file

@ -494,7 +494,7 @@ public struct UUID
return data; return data;
} }
for(size_t i = 0; i < 16; i++) for (size_t i = 0; i < 16; i++)
{ {
assert(!UUID(getData(i)).empty); assert(!UUID(getData(i)).empty);
} }
@ -504,7 +504,7 @@ public struct UUID
bool ctfeTest() bool ctfeTest()
{ {
for(size_t i = 0; i < 16; i++) for (size_t i = 0; i < 16; i++)
{ {
auto ctfeEmpty2 = UUID(getData(i)).empty; auto ctfeEmpty2 = UUID(getData(i)).empty;
assert(!ctfeEmpty2); assert(!ctfeEmpty2);

View file

@ -2206,7 +2206,7 @@ private
if (c != '\u0022' && c != '\u0027') if (c != '\u0022' && c != '\u0027')
fail("attribute value requires quotes"); fail("attribute value requires quotes");
s = s[1..$]; s = s[1..$];
for(;;) for (;;)
{ {
munch(s,"^<&"~c); munch(s,"^<&"~c);
if (s.length == 0) fail("unterminated attribute value"); if (s.length == 0) fail("unterminated attribute value");

View file

@ -689,7 +689,7 @@ unittest // by Dave
// smallish buffers // smallish buffers
for(int idx = 0; idx < 25; idx++) { for (int idx = 0; idx < 25; idx++) {
char[] buf = new char[uniform(0, 100)]; char[] buf = new char[uniform(0, 100)];
// Alternate between more & less compressible // Alternate between more & less compressible
@ -704,7 +704,7 @@ unittest // by Dave
} }
// larger buffers // larger buffers
for(int idx = 0; idx < 25; idx++) { for (int idx = 0; idx < 25; idx++) {
char[] buf = new char[uniform(0, 1000/*0000*/)]; char[] buf = new char[uniform(0, 1000/*0000*/)];
// Alternate between more & less compressible // Alternate between more & less compressible