Skip to content

Remove goto into catch block. #253

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
merged 3 commits into from
Sep 13, 2011
Merged

Remove goto into catch block. #253

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
863d7a6
Remove goto into catch block.
Sep 12, 2011
9fc8498
Move code out of catch block, re-add goto in formatElement.
Sep 13, 2011
1f30d04
Move declaration of invalidSeq to correct place.
Sep 13, 2011
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
16 changes: 12 additions & 4 deletions std/format.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1525,6 +1525,7 @@ if (isSomeString!T)
{
if (f.spec == 's')
{
bool invalidSeq = false;
try
{
// ignore other specifications and quote
Expand All @@ -1537,18 +1538,25 @@ if (isSomeString!T)
// \uFFFE and \uFFFF are considered valid by isValidDchar,
// so need checking for interchange.
if (c == 0xFFFE || c == 0xFFFF)
goto InvalidSeq;

{
invalidSeq = true;
goto LinvalidSeq;
}
formatChar(app, c);
}
put(app, '\"');

put(w, app.data());
}
catch (UtfException e)
catch (UtfException)
{
InvalidSeq:
// If val contains invalid UTF sequence, formatted like HexString literal
invalidSeq = true;
}

LinvalidSeq:
if (invalidSeq)
{
static if (is(typeof(val[0]) : const(char)))
{
enum postfix = 'c';
Expand Down