Skip to content

Implement Langversion switch for implicit yields #7166

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
KevinRansom merged 7 commits into from
Jul 11, 2019
Merged

Implement Langversion switch for implicit yields #7166

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3bca678
Langversion tests for ImplicitYield
KevinRansom Jul 9, 2019
e8c20ad
tweak
KevinRansom Jul 10, 2019
df51a22
Update single-test.fs
KevinRansom Jul 10, 2019
bfbf3d7
Feedback
KevinRansom Jul 10, 2019
5141676
One more cleanup
KevinRansom Jul 10, 2019
c87ed3e
Uncore une fois
KevinRansom Jul 10, 2019
f3b1921
Update TypeChecker.fs
KevinRansom Jul 10, 2019
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
Prev Previous commit
Next Next commit
Uncore une fois
  • Loading branch information
@KevinRansom
KevinRansom committed Jul 10, 2019
commit c87ed3ece1146bc6bd87f4c1caf563172aec568a
4 changes: 2 additions & 2 deletions src/fsharp/TypeChecker.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5806,7 +5806,7 @@ and TcExprUndelayed cenv overallTy env tpenv (synExpr: SynExpr) =
// LanguageFeatures.ImplicitYield do not require this validation
let implicitYieldEnabled = cenv.g.langVersion.SupportsFeature LanguageFeature.ImplicitYield
let validateObjectSequenceOrRecordExpression = not implicitYieldEnabled
let validateExpressionWithIfRequiresParnethesis = implicitYieldEnabled
let validateExpressionWithIfRequiresParenethesis = not implicitYieldEnabled
let acceptDeprecatedIfThenExpression = not implicitYieldEnabled

match synExpr with
Expand Down Expand Up @@ -6022,7 +6022,7 @@ and TcExprUndelayed cenv overallTy env tpenv (synExpr: SynExpr) =
| SynExpr.CompExpr (_, _, (SimpleSemicolonSequence cenv acceptDeprecatedIfThenExpression elems as body), _) ->
match body with
| SimpleSemicolonSequence cenv false _ -> ()
| _ when validateExpressionWithIfRequiresParnethesis -> errorR(Deprecated(FSComp.SR.tcExpressionWithIfRequiresParenthesis(), m))
| _ when validateExpressionWithIfRequiresParenethesis -> errorR(Deprecated(FSComp.SR.tcExpressionWithIfRequiresParenthesis(), m))
| _ -> ()

let replacementExpr =
Expand Down