Commitc88d3f4

authored and

committed

add test and fix bug# (#4077)

1 parentbfb5762 commitc88d3f4Copy full SHA for c88d3f4

File tree

+48

-1

lines changed

+48

-1

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12679,14 +12679,16 @@ module IncrClassChecking =`
`12679`	`12679`	`\| Expr.TyLambda (_, tps, b, m, returnTy) -> tps, [], b, returnTy, m`
`12680`	`12680`	`\| e -> [], [], e, (tyOfExpr cenv.g e), e.Range`
`12681`	`12681`
`12682`		`- let chooseTps = chooseTps @ freeChoiceTypars`
	`12682`	`+ let chooseTps = chooseTps @ (ListSet.subtract typarEq freeChoiceTypars methodVal.Typars)`
	`12683`	`+`
`12683`	`12684`	`// Add the 'this' variable as an argument`
`12684`	`12685`	`let tauExpr, tauTy =`
`12685`	`12686`	`if isStatic then`
`12686`	`12687`	`tauExpr, tauTy`
`12687`	`12688`	`else`
`12688`	`12689`	`let e = mkLambda m thisVal (tauExpr, tauTy)`
`12689`	`12690`	`e, tyOfExpr cenv.g e`
	`12691`	`+`
`12690`	`12692`	`// Replace the type parameters that used to be on the rhs with`
`12691`	`12693`	`// the full set of type parameters including the type parameters of the enclosing class`
`12692`	`12694`	`let rhsExpr = mkTypeLambda m methodVal.Typars (mkTypeChoose m chooseTps tauExpr, tauTy)`

Lines changed: 45 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1791,6 +1791,51 @@ module SRTPFix =`
`1791`	`1791`	`printfn "%A" <\| replace 'q' (test("HI"))`
`1792`	`1792`	`*)`
`1793`	`1793`
	`1794`	`+// See https://github.com/Microsoft/visualfsharp/issues/4040`
	`1795`	`+moduleInferenceRegression4040=`
	`1796`	`+typeFoo()=`
	`1797`	`+static lettest(t:'T):'T list=`
	`1798`	`+letb:Bar<'T>=new Bar<'T>(t)`
	`1799`	`+[b.Value]`
	`1800`	`+`
	`1801`	`+static memberTest(t:int)= test t`
	`1802`	`+`
	`1803`	`+andBar<'U>(value:'U)=`
	`1804`	`+member__.Value= value`
	`1805`	`+`
	`1806`	`+ printfn"%A"(Foo.Test42)`
	`1807`	`+`
	`1808`	`+`
	`1809`	`+// See https://github.com/Microsoft/visualfsharp/issues/4040`
	`1810`	`+moduleInferenceRegression4040b=`
	`1811`	`+typeFoo()=`
	`1812`	`+static lettest(t:'T):'T list=`
	`1813`	`+letb:Bar<'T>=new Bar<'T>(t)`
	`1814`	`+[b.Value]`
	`1815`	`+`
	`1816`	`+static memberTest(t:int)= test t`
	`1817`	`+`
	`1818`	`+andBar<'T>(value:'T)=`
	`1819`	`+member__.Value= value`
	`1820`	`+`
	`1821`	`+ printfn"%A"(Foo.Test42)`
	`1822`	`+`
	`1823`	`+// See https://github.com/Microsoft/visualfsharp/issues/4040`
	`1824`	`+moduleInferenceRegression4040C=`
	`1825`	`+typeFoo()=`
	`1826`	`+static lettest(t:'T):'T list=`
	`1827`	`+letb:Bar<'T>=new Bar<'T>(t)`
	`1828`	`+[b.Value]`
	`1829`	`+`
	`1830`	`+static memberTest(t:int)= test t`
	`1831`	`+`
	`1832`	`+andBar<'U>(value:'U)=`
	`1833`	`+member__.Value:'U= value`
	`1834`	`+`
	`1835`	`+ printfn"%A"(Foo.Test42)`
	`1836`	`+`
	`1837`	`+`
	`1838`	`+`
`1794`	`1839`	`#if TESTS_AS_APP`
`1795`	`1840`	`letRUN()=!failures`
`1796`	`1841`	`#else`

Comments

(0)