Skip to content

Do not rely on the result of a comma expression #4348

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
DmitryOlshansky merged 1 commit into from
May 27, 2016
Merged

Do not rely on the result of a comma expression #4348

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
10 changes: 5 additions & 5 deletions std/regex/internal/ir.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,15 +606,15 @@ struct Input(Char)
}

//codepoint at current stream position
bool nextChar(ref dchar res, ref size_t pos)
pragma(inline, true) bool nextChar(ref dchar res, ref size_t pos)
{
pos = _index;
// DMD's inliner hates multiple return functions
// but can live with single statement if/else bodies
if (_index == _origin.length)
return false;
else
return res = std.utf.decode(_origin, _index), true;
bool n = !(_index == _origin.length);
if (n)
Copy link
Member

@DmitryOlshansky DmitryOlshansky May 24, 2016

Choose a reason for hiding this comment

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

The re-write is fine, just please make sure it's inlined by DMD.

res = std.utf.decode(_origin, _index);
return n;
}
@property bool atEnd(){
return _index == _origin.length;
Expand Down