Skip to content

Use synthetic ranges when rewriting range expressions #13958

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 7 commits into from
Oct 21, 2022
Merged

Use synthetic ranges when rewriting range expressions #13958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3cce105
Use synthetic ranges when rewriting range expressions
auduchinok Sep 22, 2022
01c7114
Merge branch 'main' into opRangeSynthetic
dsyme Sep 23, 2022
b11878b
Merge branch 'main' into opRangeSynthetic
T-Gro Oct 17, 2022
9c718f2
Update CheckComputationExpressions.fs
dsyme Oct 17, 2022
b0ff887
Merge branch 'main' into opRangeSynthetic
dsyme Oct 17, 2022
ab10733
Merge branch 'main' into opRangeSynthetic
dsyme Oct 17, 2022
bfdbe22
Merge branch 'main' into opRangeSynthetic
vzarytovskii Oct 19, 2022
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
7 changes: 4 additions & 3 deletions src/Compiler/Checking/CheckComputationExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,11 @@ let (|JoinRelation|_|) cenv env (expr: SynExpr) =

| _ -> None

let elimFastIntegerForLoop (spFor, spTo, id, start, dir, finish, innerExpr, m) =
let elimFastIntegerForLoop (spFor, spTo, id, start: SynExpr, dir, finish: SynExpr, innerExpr, m: range) =
let mOp = (unionRanges start.Range finish.Range).MakeSynthetic()
let pseudoEnumExpr =
if dir then mkSynInfix m start ".." finish
else mkSynTrifix m ".. .." start (SynExpr.Const (SynConst.Int32 -1, start.Range)) finish
if dir then mkSynInfix mOp start ".." finish
else mkSynTrifix mOp ".. .." start (SynExpr.Const (SynConst.Int32 -1, mOp)) finish
SynExpr.ForEach (spFor, spTo, SeqExprOnly false, true, mkSynPatVar None id, pseudoEnumExpr, innerExpr, m)

/// Check if a computation or sequence expression is syntactically free of 'yield' (though not yield!)
Expand Down
2 changes: 2 additions & 0 deletions src/Compiler/Checking/CheckExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6125,10 +6125,12 @@ and RewriteRangeExpr synExpr =
match synExpr with
// a..b..c (parsed as (a..b)..c )
| SynExpr.IndexRange(Some (SynExpr.IndexRange(Some synExpr1, _, Some synStepExpr, _, _, _)), _, Some synExpr2, _m1, _m2, mWhole) ->
let mWhole = mWhole.MakeSynthetic()
Some (mkSynTrifix mWhole ".. .." synExpr1 synStepExpr synExpr2)
// a..b
| SynExpr.IndexRange (Some synExpr1, mOperator, Some synExpr2, _m1, _m2, mWhole) ->
let otherExpr =
let mWhole = mWhole.MakeSynthetic()
match mkSynInfix mOperator synExpr1 ".." synExpr2 with
| SynExpr.App (a, b, c, d, _) -> SynExpr.App (a, b, c, d, mWhole)
| _ -> failwith "impossible"
Expand Down