Commitb05a2e5

forki

authored and

KevinRansom

committed

Lot's of cleanups in TypeCheck.fs (dotnet#2260)

* cleanup* Check if vals are empty* More isNil tests* cleanup* More isNil tests* More isNil tests* More isNil tests* formatting* formatting* We don't need to calc the full length* Check length before we call typ functions* Don't call length if not needed* move opTakesThreeArgs to usage* formatting* reduce one if* Remvoe one isSome check* cleanup* cleanup* remove begin/end* formatting* Interate the fields only once* Choose can be simplified here* formatting* formatting* Things that don't computation should go first in &&* formatting* We should not generate Options just to throw them away in inlined function* Do not pattern match twice for the same thing* formating* Removed inline* formatting* formatting* formatting* formatting* formatting* yet another typo* remove begin end

1 parentc9974b5 commitb05a2e5Copy full SHA for b05a2e5

File tree

4 files changed

+281

-222

lines changed

src/fsharp

4 files changed

+281

-222

lines changed

`‎src/fsharp/ConstraintSolver.fs‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2461,7 +2461,8 @@ let UnifyUniqueOverloading`
`2461`	`2461`
`2462`	`2462`	`letEliminateConstraintsForGeneralizedTypars csenv(trace:OptionalTrace)(generalizedTypars:Typars)=`
`2463`	`2463`	`// Remove the global constraints where this type variable appears in the support of the constraint`
`2464`		`- generalizedTypars\|> List.iter(fun tp->`
	`2464`	`+ generalizedTypars`
	`2465`	`+\|> List.iter(fun tp->`
`2465`	`2466`	`lettpn= tp.Stamp`
`2466`	`2467`	`letcxst= csenv.SolverState.ExtraCxs`
`2467`	`2468`	`letcxs= cxst.FindAll tpn`

`‎src/fsharp/NameResolution.fs‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3054,9 +3054,11 @@ let ResolveField sink ncenv nenv ad typ (mp,id) allFields =`
`3054`	`3054`	`letres= ResolveFieldPrim ncenv nenv ad typ(mp,id) allFields`
`3055`	`3055`	`// Register the results of any field paths "Module.Type" in "Module.Type.field" as a name resolution. (Note, the path resolution`
`3056`	`3056`	`// info is only non-empty if there was a unique resolution of the field)`
`3057`		`-for(resInfo,_rfref)in resdo`
`3058`		`- ResolutionInfo.SendToSink(sink,ncenv,nenv,ItemOccurence.UseInType, ad,resInfo,ResultTyparChecker(fun()->true))`
`3059`		`- res\|> List.map snd`
	`3057`	`+letchecker= ResultTyparChecker(fun()->true)`
	`3058`	`+ res`
	`3059`	`+\|> List.map(fun(resInfo,rfref)->`
	`3060`	`+ ResolutionInfo.SendToSink(sink,ncenv,nenv,ItemOccurence.UseInType,ad,resInfo,checker)`
	`3061`	`+ rfref)`
`3060`	`3062`
`3061`	`3063`	`/// Generate a new reference to a record field with a fresh type instantiation`
`3062`	`3064`	`letFreshenRecdFieldRef(ncenv:NameResolver)m(rfref:RecdFieldRef)=`

`‎src/fsharp/TastOps.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1348,7 +1348,7 @@ let destForallTy g ty =`
`1348`	`1348`	`tps,tau`
`1349`	`1349`
`1350`	`1350`	`lettryDestForallTy g ty=`
`1351`		`-if isForallTy g tythen destForallTy g tyelse([],ty)`
	`1351`	`+if isForallTy g tythen destForallTy g tyelse[],ty`
`1352`	`1352`
`1353`	`1353`
`1354`	`1354`	`let recstripFunTy g ty=`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitb05a2e5

File tree

4 files changed

4 files changed

`‎src/fsharp/ConstraintSolver.fs‎`

`‎src/fsharp/NameResolution.fs‎`

`‎src/fsharp/TastOps.fs‎`

0 commit comments