Skip to content

Cleaned up auto decoding special case in std.conv.parse for integers #5014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JackStouffer merged 1 commit into from
Jan 4, 2017
Merged

Cleaned up auto decoding special case in std.conv.parse for integers #5014

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 27 additions & 28 deletions std/conv.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1993,13 +1993,20 @@ Target parse(Target, Source)(ref Source s)
enum char maxLastDigit = Target.min < 0 ? 7 : 5;
uint c;

if (s.empty)
static if (isNarrowString!Source)
{
import std.string : representation, assumeUTF;
auto source = s.representation;
}
else
{
alias source = s;
}

if (source.empty)
goto Lerr;

static if (isAutodecodableString!Source)
c = s[0];
else
c = s.front;
c = source.front;

static if (Target.min < 0)
{
Expand All @@ -2009,18 +2016,12 @@ Target parse(Target, Source)(ref Source s)
sign = true;
goto case '+';
case '+':
static if (isAutodecodableString!Source)
s = s[1 .. $];
else
s.popFront();
source.popFront();

if (s.empty)
if (source.empty)
goto Lerr;

static if (isAutodecodableString!Source)
c = s[0];
else
c = s.front;
c = source.front;

break;

Expand All @@ -2033,17 +2034,11 @@ Target parse(Target, Source)(ref Source s)
{
Target v = cast(Target)c;

static if (isAutodecodableString!Source)
s = s[1 .. $];
else
s.popFront();
source.popFront();

while (!s.empty)
while (!source.empty)
{
static if (isAutodecodableString!Source)
c = cast(typeof(c)) (s[0] - '0');
else
c = cast(typeof(c)) (s.front - '0');
c = cast(typeof(c)) (source.front - '0');

if (c > 9)
break;
Expand All @@ -2055,21 +2050,25 @@ Target parse(Target, Source)(ref Source s)
// the most negative value:
v = cast(Target) (v * 10 + c);

static if (isAutodecodableString!Source)
s = s[1 .. $];
else
s.popFront();
source.popFront();
}
else
throw new ConvOverflowException("Overflow in integral conversion");
}

if (sign)
v = -v;

static if (isNarrowString!Source)
s = source.assumeUTF;

return v;
}
Lerr:
throw convError!(Source, Target)(s);
static if (isNarrowString!Source)
throw convError!(Source, Target)(source.assumeUTF);
else
throw convError!(Source, Target)(source);
}
}

Expand Down