Skip to content

Removed auto-decoding from the floating point version of std.conv.parse #5015

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 2 commits into from
Jan 5, 2017
Merged

Removed auto-decoding from the floating point version of std.conv.parse #5015

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b09695
micro-optimization in std.conv.parse
JackStouffer Jan 4, 2017
a308446
Removed auto-decoding from the floating point version of std.conv.parse
JackStouffer Jan 5, 2017
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
29 changes: 24 additions & 5 deletions std/conv.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2519,14 +2519,24 @@ Target parse(Target, Source)(ref Source s)
* A $(LREF ConvException) if `p` is empty, if no number could be
* parsed, or if an overflow occurred.
*/
Target parse(Target, Source)(ref Source p)
Target parse(Target, Source)(ref Source source)
if (isInputRange!Source && isSomeChar!(ElementType!Source) && !is(Source == enum) &&
isFloatingPoint!Target && !is(Target == enum))
{
import std.ascii : isDigit, isAlpha, toLower, toUpper, isHexDigit;
import std.exception : enforce;
import core.stdc.math : HUGE_VAL;

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

static immutable real[14] negtab =
[ 1e-4096L,1e-2048L,1e-1024L,1e-512L,1e-256L,1e-128L,1e-64L,1e-32L,
1e-16L,1e-8L,1e-4L,1e-2L,1e-1L,1.0L ];
Expand All @@ -2541,13 +2551,14 @@ Target parse(Target, Source)(ref Source p)
return new ConvException(text(msg, " for input \"", p, "\"."), fn, ln);
}


enforce(!p.empty, bailOut());

char sign = 0; /* indicating + */
bool sign = false;
Copy link
Member

@andralex andralex Jan 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, nice

switch (p.front)
{
case '-':
sign++;
sign = true;
Copy link
Member

@andralex andralex Jan 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmm... looks like both the previous code and the current code are parsing --5 as positive 5, right?

Copy link
Member

@andralex andralex Jan 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I guess an enforce(!sign) is in order here. In fact sign should be a ternary: not seen, + seen, - seen.

p.popFront();
enforce(!p.empty, bailOut());
if (toLower(p.front) == 'i')
Expand All @@ -2569,6 +2580,8 @@ Target parse(Target, Source)(ref Source p)
{
// 'inf'
p.popFront();
static if (isNarrowString!Source)
source = p.assumeUTF;
return sign ? -Target.infinity : Target.infinity;
}
}
Expand All @@ -2583,7 +2596,9 @@ Target parse(Target, Source)(ref Source p)
p.popFront();
if (p.empty)
{
return (sign) ? -0.0 : 0.0;
static if (isNarrowString!Source)
source = p.assumeUTF;
return sign ? -0.0 : 0.0;
}

isHex = p.front == 'x' || p.front == 'X';
Expand Down Expand Up @@ -2805,6 +2820,8 @@ Target parse(Target, Source)(ref Source p)
new ConvException("error converting input to floating point"));
// skip past the last 'n'
p.popFront();
static if (isNarrowString!Source)
source = p.assumeUTF;
return typeof(return).nan;
}

Expand Down Expand Up @@ -2917,7 +2934,9 @@ Target parse(Target, Source)(ref Source p)
enforce(ldval != HUGE_VAL, new ConvException("Range error"));

L1:
return (sign) ? -ldval : ldval;
static if (isNarrowString!Source)
source = p.assumeUTF;
return sign ? -ldval : ldval;
}

///
Expand Down