forks
/
dfmt
mirror of https://github.com/dlang-community/dfmt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not call bsf with 0

This commit is contained in:
Hackerpilot 2015-03-30 17:34:24 -07:00
parent e5832e6cd8
commit 469da17c36
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dfmt/wrapping.d
View File

@ -55,7 +55,8 @@ struct State
{ {
immutable uint k = breaks >>> i; immutable uint k = breaks >>> i;
immutable bool b = k == 0; immutable bool b = k == 0;
immutable size_t j = min(i + bsf(k) + 1, tokens.length); immutable uint bits = b ? 0 : bsf(k);
immutable size_t j = min(i + bits + 1, tokens.length);
ll += tokens[i .. j].map!(a => tokenLength(a)).sum(); ll += tokens[i .. j].map!(a => tokenLength(a)).sum();
if (ll > config.columnSoftLimit) if (ll > config.columnSoftLimit)
{ {
@ -90,8 +91,8 @@ struct State
{ {
import core.bitop : bsf, popcnt; import core.bitop : bsf, popcnt;
if (_cost < other._cost || (_cost == other._cost && ((popcnt(breaks) if (_cost < other._cost || (_cost == other._cost && ((breaks != 0
&& popcnt(other.breaks) && bsf(breaks) > bsf(other.breaks)) && other.breaks != 0 && bsf(breaks) > bsf(other.breaks))
|| (_solved && !other.solved)))) || (_solved && !other.solved))))
{ {
return -1; return -1;