Skip to content

Commit

Permalink
Fixed long lines in std/net/isemail.d
Browse files Browse the repository at this point in the history
  • Loading branch information
JackStouffer committed May 11, 2016
1 parent fb80717 commit 909582a
Showing 1 changed file with 20 additions and 13 deletions.
33 changes: 20 additions & 13 deletions std/net/isemail.d
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ EmailStatus isEmail (Char) (const(Char)[] email, CheckDns checkDNS = CheckDns.no
break;

default:
throw new Exception("More text found where none is allowed, but unrecognised prior " ~
"context: " ~ to!(string)(contextPrior));
throw new Exception("More text found where none is allowed, but "
~"unrecognised prior context: " ~ to!(string)(contextPrior));
}
}

Expand All @@ -254,9 +254,11 @@ EmailStatus isEmail (Char) (const(Char)[] email, CheckDns checkDNS = CheckDns.no
{
case Token.openParenthesis:
if (elementLength == 0)
returnStatus ~= elementCount == 0 ? EmailStatusCode.deprecatedCommentFoldingWhitespaceNearAt
{
returnStatus ~= elementCount == 0 ?
EmailStatusCode.deprecatedCommentFoldingWhitespaceNearAt
: EmailStatusCode.deprecatedComment;

}
else
{
returnStatus ~= EmailStatusCode.comment;
Expand Down Expand Up @@ -316,9 +318,11 @@ EmailStatus isEmail (Char) (const(Char)[] email, CheckDns checkDNS = CheckDns.no
}

if (elementLength == 0)
returnStatus ~= elementCount == 0 ? EmailStatusCode.deprecatedCommentFoldingWhitespaceNearAt
{
returnStatus ~= elementCount == 0 ?
EmailStatusCode.deprecatedCommentFoldingWhitespaceNearAt
: EmailStatusCode.deprecatedFoldingWhitespace;

}
else
{
returnStatus ~= EmailStatusCode.foldingWhitespace;
Expand All @@ -345,8 +349,8 @@ EmailStatus isEmail (Char) (const(Char)[] email, CheckDns checkDNS = CheckDns.no
break;

default:
throw new Exception("More text found where none is allowed, but unrecognised prior " ~
"context: " ~ to!(string)(contextPrior));
throw new Exception("More text found where none is allowed, but "
~"unrecognised prior context: " ~ to!(string)(contextPrior));
}

}
Expand Down Expand Up @@ -1099,9 +1103,12 @@ unittest
assert(`test@[RFC-5322-domain-literal] (comment)`.isEmail(CheckDns.no, EmailStatusCode.any).statusCode ==
EmailStatusCode.rfc5322DomainLiteral);

assert("\u007F@iana.org".isEmail(CheckDns.no, EmailStatusCode.any).statusCode == EmailStatusCode.errorExpectingText);
assert("test@\u007F.org".isEmail(CheckDns.no, EmailStatusCode.any).statusCode == EmailStatusCode.errorExpectingText);
assert("\"\u007F\"@iana.org".isEmail(CheckDns.no, EmailStatusCode.any).statusCode == EmailStatusCode.deprecatedQuotedText);
assert("\u007F@iana.org".isEmail(CheckDns.no, EmailStatusCode.any).statusCode ==
EmailStatusCode.errorExpectingText);
assert("test@\u007F.org".isEmail(CheckDns.no, EmailStatusCode.any).statusCode ==
EmailStatusCode.errorExpectingText);
assert("\"\u007F\"@iana.org".isEmail(CheckDns.no, EmailStatusCode.any).statusCode ==
EmailStatusCode.deprecatedQuotedText);

assert("\"\\\u007F\"@iana.org".isEmail(CheckDns.no, EmailStatusCode.any).statusCode ==
EmailStatusCode.deprecatedQuotedPair);
Expand All @@ -1115,8 +1122,8 @@ unittest
assert("\u000Dtest@iana.org".isEmail(CheckDns.no, EmailStatusCode.any).statusCode == EmailStatusCode.errorCrNoLf,
`No LF after the CR`);

assert("\"\u000Dtest\"@iana.org".isEmail(CheckDns.no, EmailStatusCode.any).statusCode == EmailStatusCode.errorCrNoLf
,`No LF after the CR`);
assert("\"\u000Dtest\"@iana.org".isEmail(CheckDns.no, EmailStatusCode.any).statusCode ==
EmailStatusCode.errorCrNoLf, `No LF after the CR`);

assert("(\u000D)test@iana.org".isEmail(CheckDns.no, EmailStatusCode.any).statusCode == EmailStatusCode.errorCrNoLf,
`No LF after the CR`);
Expand Down

0 comments on commit 909582a

Please sign in to comment.