Skip to content

Keep track of EQUALS range in Syntax Tree #12311

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 13 commits into from
Oct 31, 2021
Merged

Keep track of EQUALS range in Syntax Tree #12311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
740d1ec
Keep track of EQUALS range in SynBinding.
nojaf Oct 28, 2021
1820276
Keep track of EQUALS range in SynExpr.LetOrUseBang and AndBang.
nojaf Oct 29, 2021
b1e7ac3
Keep track of EQUALS range in SynExpr.Record.
nojaf Oct 30, 2021
8ccf37c
Keep track of EQUALS range in SynExpr.AnonRecd.
nojaf Oct 30, 2021
a4f9abf
Keep track of EQUALS range in SynPat.Record.
nojaf Oct 30, 2021
c3c4ff6
Keep track of EQUALS range in SynTypeDefn.
nojaf Oct 30, 2021
8b3d27f
Keep track of EQUALS range in SynExpr.For.
nojaf Oct 30, 2021
f6ced1e
Keep track of EQUALS range in SynTypeDefnSig.
nojaf Oct 31, 2021
cadf067
Keep track of EQUALS range in SynEnumCase.
nojaf Oct 31, 2021
b85b4ba
Keep track of EQUALS range in SynModuleDecl.NestedModule & SynModuleS…
nojaf Oct 31, 2021
55a28fe
Keep track of EQUALS range in SynMemberDefn.AutoProperty.
nojaf Oct 31, 2021
e2a545b
Keep track of EQUALS range in SynArgPats.NamePatPairs.
nojaf Oct 31, 2021
4b1cddb
Renamed RecordInstanceField and AndBang, removed spaces between named…
nojaf Oct 31, 2021
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
84 changes: 42 additions & 42 deletions src/fsharp/CheckComputationExpressions.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,29 +92,29 @@ let YieldFree (cenv: cenv) expr =
// Implement yield free logic for F# Language including the LanguageFeature.ImplicitYield
let rec YieldFree expr =
match expr with
| SynExpr.Sequential (_, _, e1, e2, _) ->
| SynExpr.Sequential (expr1=e1; expr2=e2) ->
YieldFree e1 && YieldFree e2

| SynExpr.IfThenElse (_, _, _, _, e2, _, e3opt, _, _, _, _) ->
| SynExpr.IfThenElse (thenExpr=e2; elseExpr=e3opt) ->
YieldFree e2 && Option.forall YieldFree e3opt

| SynExpr.TryWith (e1, _, clauses, _, _, _, _) ->
| SynExpr.TryWith (tryExpr=e1; withCases=clauses) ->
YieldFree e1 && clauses |> List.forall (fun (SynMatchClause(resultExpr = e)) -> YieldFree e)

| SynExpr.Match (_, _, clauses, _) | SynExpr.MatchBang (_, _, clauses, _) ->
| SynExpr.Match (clauses=clauses) | SynExpr.MatchBang (clauses=clauses) ->
clauses |> List.forall (fun (SynMatchClause(resultExpr = e)) -> YieldFree e)

| SynExpr.For (_, _, _, _, _, body, _)
| SynExpr.TryFinally (body, _, _, _, _)
| SynExpr.LetOrUse (_, _, _, body, _)
| SynExpr.While (_, _, body, _)
| SynExpr.ForEach (_, _, _, _, _, body, _) ->
| SynExpr.For (doBody=body)
| SynExpr.TryFinally (tryExpr=body)
| SynExpr.LetOrUse (body=body)
| SynExpr.While (doExpr=body)
| SynExpr.ForEach (bodyExpr=body) ->
YieldFree body

| SynExpr.LetOrUseBang(_, _, _, _, _, _, body, _) ->
| SynExpr.LetOrUseBang(body=body) ->
YieldFree body

| SynExpr.YieldOrReturn((true, _), _, _) -> false
| SynExpr.YieldOrReturn(flags=(true, _)) -> false

| _ -> true

Expand All @@ -123,23 +123,23 @@ let YieldFree (cenv: cenv) expr =
// Implement yield free logic for F# Language without the LanguageFeature.ImplicitYield
let rec YieldFree expr =
match expr with
| SynExpr.Sequential (_, _, e1, e2, _) ->
| SynExpr.Sequential (expr1=e1; expr2=e2) ->
YieldFree e1 && YieldFree e2

| SynExpr.IfThenElse (_, _, _, _, e2, _, e3opt, _, _, _, _) ->
| SynExpr.IfThenElse (thenExpr=e2; elseExpr=e3opt) ->
YieldFree e2 && Option.forall YieldFree e3opt

| SynExpr.TryWith (e1, _, clauses, _, _, _, _) ->
| SynExpr.TryWith (tryExpr=e1; withCases=clauses) ->
YieldFree e1 && clauses |> List.forall (fun (SynMatchClause(resultExpr = e)) -> YieldFree e)

| SynExpr.Match (_, _, clauses, _) | SynExpr.MatchBang (_, _, clauses, _) ->
| SynExpr.Match (clauses=clauses) | SynExpr.MatchBang (clauses=clauses) ->
clauses |> List.forall (fun (SynMatchClause(resultExpr = e)) -> YieldFree e)

| SynExpr.For (_, _, _, _, _, body, _)
| SynExpr.TryFinally (body, _, _, _, _)
| SynExpr.LetOrUse (_, _, _, body, _)
| SynExpr.While (_, _, body, _)
| SynExpr.ForEach (_, _, _, _, _, body, _) ->
| SynExpr.For (doBody=body)
| SynExpr.TryFinally (tryExpr=body)
| SynExpr.LetOrUse (body=body)
| SynExpr.While (doExpr=body)
| SynExpr.ForEach (bodyExpr=body) ->
YieldFree body

| SynExpr.LetOrUseBang _
Expand Down Expand Up @@ -708,13 +708,13 @@ let TcComputationExpression cenv env (overallTy: OverallTy) tpenv (mWhole, inter
// NOTE: we should probably suppress these sequence points altogether
let rangeForCombine innerComp1 =
match innerComp1 with
| SynExpr.IfThenElse (_, _, _, _, _, _, _, _, _, mIfToThen, _m) -> mIfToThen
| SynExpr.Match (DebugPointAtBinding.Yes mMatch, _, _, _) -> mMatch
| SynExpr.TryWith (_, _, _, _, _, DebugPointAtTry.Yes mTry, _) -> mTry
| SynExpr.TryFinally (_, _, _, DebugPointAtTry.Yes mTry, _) -> mTry
| SynExpr.For (DebugPointAtFor.Yes mBind, _, _, _, _, _, _) -> mBind
| SynExpr.ForEach (DebugPointAtFor.Yes mBind, _, _, _, _, _, _) -> mBind
| SynExpr.While (DebugPointAtWhile.Yes mWhile, _, _, _) -> mWhile
| SynExpr.IfThenElse (ifToThenRange=mIfToThen) -> mIfToThen
| SynExpr.Match (matchDebugPoint=DebugPointAtBinding.Yes mMatch) -> mMatch
| SynExpr.TryWith (tryDebugPoint=DebugPointAtTry.Yes mTry) -> mTry
| SynExpr.TryFinally (tryDebugPoint=DebugPointAtTry.Yes mTry) -> mTry
| SynExpr.For (forDebugPoint=DebugPointAtFor.Yes mBind) -> mBind
| SynExpr.ForEach (forDebugPoint=DebugPointAtFor.Yes mBind) -> mBind
| SynExpr.While (whileDebugPoint=DebugPointAtWhile.Yes mWhile) -> mWhile
| _ -> innerComp1.Range

// Check for 'where x > y', 'select x, y' and other mis-applications of infix operators, give a good error message, and return a flag
Expand Down Expand Up @@ -950,7 +950,7 @@ let TcComputationExpression cenv env (overallTy: OverallTy) tpenv (mWhole, inter
(fun holeFill ->
translatedCtxt (mkSynCall "For" mFor [wrappedSourceExpr; SynExpr.MatchLambda (false, sourceExpr.Range, [SynMatchClause(pat, None, None, holeFill, mPat, DebugPointAtTarget.Yes)], spBind, mFor) ])) )

| SynExpr.For (spBind, id, start, dir, finish, innerComp, m) ->
| SynExpr.For (forDebugPoint=spBind; ident=id; identBody=start; direction=dir; toBody=finish; doBody=innerComp; range=m) ->
let mFor = match spBind with DebugPointAtFor.Yes m -> m.NoteDebugPoint(RangeDebugPointKind.For) | _ -> m
if isQuery then errorR(Error(FSComp.SR.tcNoIntegerForLoopInQuery(), mFor))
Some (trans CompExprTranslationPass.Initial q varSpace (elimFastIntegerForLoop (spBind, id, start, dir, finish, innerComp, m)) translatedCtxt )
Expand Down Expand Up @@ -1056,7 +1056,7 @@ let TcComputationExpression cenv env (overallTy: OverallTy) tpenv (mWhole, inter
| DebugPointAtSequential.SuppressBoth -> DebugPointAtBinding.NoneAtDo
| DebugPointAtSequential.SuppressStmt -> DebugPointAtBinding.Yes m
| DebugPointAtSequential.SuppressNeither -> DebugPointAtBinding.Yes m
Some(trans CompExprTranslationPass.Initial q varSpace (SynExpr.LetOrUseBang (sp, false, true, SynPat.Const(SynConst.Unit, rhsExpr.Range), rhsExpr, [], innerComp2, m)) translatedCtxt)
Some(trans CompExprTranslationPass.Initial q varSpace (SynExpr.LetOrUseBang (sp, false, true, SynPat.Const(SynConst.Unit, rhsExpr.Range), None, rhsExpr, [], innerComp2, m)) translatedCtxt)

// "expr; cexpr" is treated as sequential execution
| _ ->
Expand Down Expand Up @@ -1118,7 +1118,7 @@ let TcComputationExpression cenv env (overallTy: OverallTy) tpenv (mWhole, inter
Some (trans CompExprTranslationPass.Initial q varSpace innerComp (fun holeFill -> translatedCtxt (SynExpr.LetOrUse (isRec, false, binds, holeFill, m))))

// 'use x = expr in expr'
| SynExpr.LetOrUse (_, true, [SynBinding (_, SynBindingKind.Normal, _, _, _, _, _, pat, _, rhsExpr, _, spBind)], innerComp, _) ->
| SynExpr.LetOrUse (isUse=true; bindings=[SynBinding (kind=SynBindingKind.Normal; headPat=pat; expr=rhsExpr; debugPoint=spBind)]; body=innerComp) ->
let bindRange = match spBind with DebugPointAtBinding.Yes m -> m | _ -> rhsExpr.Range
if isQuery then error(Error(FSComp.SR.tcUseMayNotBeUsedInQueries(), bindRange))
let innerCompRange = innerComp.Range
Expand All @@ -1131,7 +1131,7 @@ let TcComputationExpression cenv env (overallTy: OverallTy) tpenv (mWhole, inter
// --> build.Bind(e1, (fun _argN -> match _argN with pat -> expr))
// or
// --> build.BindReturn(e1, (fun _argN -> match _argN with pat -> expr-without-return))
| SynExpr.LetOrUseBang (spBind, false, isFromSource, pat, rhsExpr, [], innerComp, _) ->
| SynExpr.LetOrUseBang (bindDebugPoint=spBind; isUse=false; isFromSource=isFromSource; pat=pat; rhs=rhsExpr; andBangs=[]; body=innerComp) ->

let bindRange = match spBind with DebugPointAtBinding.Yes m -> m | _ -> rhsExpr.Range
if isQuery then error(Error(FSComp.SR.tcBindMayNotBeUsedInQueries(), bindRange))
Expand All @@ -1147,8 +1147,8 @@ let TcComputationExpression cenv env (overallTy: OverallTy) tpenv (mWhole, inter
Some (transBind q varSpace bindRange "Bind" [rhsExpr] pat spBind innerComp translatedCtxt)

// 'use! pat = e1 in e2' --> build.Bind(e1, (function _argN -> match _argN with pat -> build.Using(x, (fun _argN -> match _argN with pat -> e2))))
| SynExpr.LetOrUseBang (spBind, true, isFromSource, (SynPat.Named (id, false, _, _) as pat) , rhsExpr, [], innerComp, _)
| SynExpr.LetOrUseBang (spBind, true, isFromSource, (SynPat.LongIdent (longDotId=LongIdentWithDots([id], _)) as pat), rhsExpr, [], innerComp, _) ->
| SynExpr.LetOrUseBang (bindDebugPoint=spBind; isUse=true; isFromSource=isFromSource; pat=SynPat.Named (ident=id; isThisVal=false) as pat; rhs=rhsExpr; andBangs=[]; body=innerComp)
| SynExpr.LetOrUseBang (bindDebugPoint=spBind; isUse=true; isFromSource=isFromSource; pat=SynPat.LongIdent (longDotId=LongIdentWithDots(id=[id])) as pat; rhs=rhsExpr; andBangs=[]; body=innerComp) ->

let bindRange = match spBind with DebugPointAtBinding.Yes m -> m | _ -> rhsExpr.Range
if isQuery then error(Error(FSComp.SR.tcBindMayNotBeUsedInQueries(), bindRange))
Expand All @@ -1166,7 +1166,7 @@ let TcComputationExpression cenv env (overallTy: OverallTy) tpenv (mWhole, inter
Some(translatedCtxt (mkSynCall "Bind" bindRange [rhsExpr; consumeExpr]))

// 'use! pat = e1 ... in e2' where 'pat' is not a simple name --> error
| SynExpr.LetOrUseBang (_spBind, true, _isFromSource, pat, _rhsExpr, andBangs, _innerComp, _) ->
| SynExpr.LetOrUseBang (isUse=true; pat=pat; andBangs=andBangs) ->
if isNil andBangs then
error(Error(FSComp.SR.tcInvalidUseBangBinding(), pat.Range))
else
Expand All @@ -1178,16 +1178,16 @@ let TcComputationExpression cenv env (overallTy: OverallTy) tpenv (mWhole, inter
// build.BindNReturn(expr1, expr2, ...)
// or
// build.Bind(build.MergeSources(expr1, expr2), ...)
| SynExpr.LetOrUseBang(letSpBind, false, isFromSource, letPat, letRhsExpr, andBangBindings, innerComp, letBindRange) ->
| SynExpr.LetOrUseBang(bindDebugPoint=letSpBind; isUse=false; isFromSource=isFromSource; pat=letPat; rhs=letRhsExpr; andBangs=andBangBindings; body=innerComp; range=letBindRange) ->
if not (cenv.g.langVersion.SupportsFeature LanguageFeature.AndBang) then
error(Error(FSComp.SR.tcAndBangNotSupported(), comp.Range))

if isQuery then
error(Error(FSComp.SR.tcBindMayNotBeUsedInQueries(), letBindRange))

let bindRange = match letSpBind with DebugPointAtBinding.Yes m -> m | _ -> letRhsExpr.Range
let sources = (letRhsExpr :: [for _, _, _, _, andExpr, _ in andBangBindings -> andExpr ]) |> List.map (mkSourceExprConditional isFromSource)
let pats = letPat :: [for _, _, _, andPat, _, _ in andBangBindings -> andPat ]
let sources = (letRhsExpr :: [for SynExprAndBang(body=andExpr) in andBangBindings -> andExpr ]) |> List.map (mkSourceExprConditional isFromSource)
let pats = letPat :: [for SynExprAndBang(pat = andPat) in andBangBindings -> andPat ]
let sourcesRange = sources |> List.map (fun e -> e.Range) |> List.reduce unionRanges

let numSources = sources.Length
Expand Down Expand Up @@ -1425,7 +1425,7 @@ let TcComputationExpression cenv env (overallTy: OverallTy) tpenv (mWhole, inter
// Rebind using either for ... or let!....
let rebind =
if maintainsVarSpaceUsingBind then
SynExpr.LetOrUseBang (DebugPointAtBinding.NoneAtLet, false, false, intoPat, dataCompAfterOp, [], contExpr, intoPat.Range)
SynExpr.LetOrUseBang (DebugPointAtBinding.NoneAtLet, false, false, intoPat, None, dataCompAfterOp, [], contExpr, intoPat.Range)
else
SynExpr.ForEach (DebugPointAtFor.No, SeqExprOnly false, false, intoPat, dataCompAfterOp, contExpr, intoPat.Range)

Expand All @@ -1447,7 +1447,7 @@ let TcComputationExpression cenv env (overallTy: OverallTy) tpenv (mWhole, inter
// Rebind using either for ... or let!....
let rebind =
if lastUsesBind then
SynExpr.LetOrUseBang (DebugPointAtBinding.NoneAtLet, false, false, varSpacePat, dataCompPrior, [], compClausesExpr, compClausesExpr.Range)
SynExpr.LetOrUseBang (DebugPointAtBinding.NoneAtLet, false, false, varSpacePat, None, dataCompPrior, [], compClausesExpr, compClausesExpr.Range)
else
SynExpr.ForEach (DebugPointAtFor.No, SeqExprOnly false, false, varSpacePat, dataCompPrior, compClausesExpr, compClausesExpr.Range)

Expand All @@ -1474,7 +1474,7 @@ let TcComputationExpression cenv env (overallTy: OverallTy) tpenv (mWhole, inter
match TryFindIntrinsicOrExtensionMethInfo ResultCollectionSettings.AtMostOneResult cenv env m ad "Zero" builderTy with
| minfo :: _ when MethInfoHasAttribute cenv.g m cenv.g.attrib_DefaultValueAttribute minfo -> SynExpr.ImplicitZero m
| _ -> SynExpr.YieldOrReturn ((false, true), SynExpr.Const (SynConst.Unit, m), m)
trans CompExprTranslationPass.Initial q varSpace (SynExpr.LetOrUseBang (DebugPointAtBinding.NoneAtDo, false, false, SynPat.Const(SynConst.Unit, mUnit), rhsExpr, [], bodyExpr, m)) translatedCtxt
trans CompExprTranslationPass.Initial q varSpace (SynExpr.LetOrUseBang (DebugPointAtBinding.NoneAtDo, false, false, SynPat.Const(SynConst.Unit, mUnit), None, rhsExpr, [], bodyExpr, m)) translatedCtxt

// "expr;" in final position is treated as { expr; zero }
// Suppress the sequence point on the "zero"
Expand Down Expand Up @@ -1770,7 +1770,7 @@ let TcSequenceExpression (cenv: cenv) env tpenv comp (overallTy: OverallTy) m =
let lam = mkLambda mFor matchv (matchExpr, tyOfExpr cenv.g matchExpr)
Some(mkSeqCollect cenv env m enumElemTy genOuterTy lam enumExpr, tpenv)

| SynExpr.For (spBind, id, start, dir, finish, innerComp, m) ->
| SynExpr.For (forDebugPoint=spBind; ident=id; identBody=start; direction=dir; toBody=finish; doBody=innerComp; range=m) ->
Some(tcSequenceExprBody env genOuterTy tpenv (elimFastIntegerForLoop (spBind, id, start, dir, finish, innerComp, m)))

| SynExpr.While (spWhile, guardExpr, innerComp, _m) ->
Expand Down Expand Up @@ -1849,7 +1849,7 @@ let TcSequenceExpression (cenv: cenv) env tpenv comp (overallTy: OverallTy) m =
id |> Some

// 'use x = expr in expr'
| SynExpr.LetOrUse (_isRec, true, [SynBinding (_vis, SynBindingKind.Normal, _, _, _, _, _, pat, _, rhsExpr, _, spBind)], innerComp, wholeExprMark) ->
| SynExpr.LetOrUse (isUse=true; bindings=[SynBinding (kind=SynBindingKind.Normal; headPat=pat; expr=rhsExpr; debugPoint=spBind)]; body=innerComp; range=wholeExprMark) ->

let bindPatTy = NewInferenceType ()
let inputExprTy = NewInferenceType ()
Expand Down
Loading