Commitda1a000

authored

fix 719 - traverse abstract slots for unsolved (#3273)

* fix 719 - traverse abstract slots for unsolved* fix test

1 parentd7f1358 commitda1a000Copy full SHA for da1a000

File tree

+35

-2

lines changed

+35

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -165,8 +165,13 @@ and accDiscrim cenv env d =`
`165`	`165`	`accTypeInst cenv env tys`
`166`	`166`
`167`	`167`	`andaccAttrib cenv env(Attrib(_,_k,args,props,_,_,_m))=`
`168`		`- args\|> List.iter(fun(AttribExpr(e1,_))-> accExpr cenv env e1)`
`169`		`- props\|> List.iter(fun(AttribNamedArg(_nm,_ty,_flg,AttribExpr(expr,_)))-> accExpr cenv env expr)`
	`168`	`+ args\|> List.iter(fun(AttribExpr(expr1,expr2))->`
	`169`	`+ accExpr cenv env expr1`
	`170`	`+ accExpr cenv env expr2)`
	`171`	`+ props\|> List.iter(fun(AttribNamedArg(_nm,ty,_flg,AttribExpr(expr,expr2)))->`
	`172`	`+ accExpr cenv env expr`
	`173`	`+ accExpr cenv env expr2`
	`174`	`+ accTy cenv env ty)`
`170`	`175`
`171`	`176`	`andaccAttribs cenv env attribs= List.iter(accAttrib cenv env) attribs`
`172`	`177`
`@@ -199,6 +204,7 @@ let accTyconRecdField cenv env _tycon (rfield:RecdField) =`
`199`	`204`
`200`	`205`	`letaccTycon cenv env(tycon:Tycon)=`
`201`	`206`	`accAttribs cenv env tycon.Attribs`
	`207`	`+ abstractSlotValsOfTycons[tycon]\|> List.iter(accVal cenv env)`
`202`	`208`	`tycon.AllFieldsArray\|> Array.iter(accTyconRecdField cenv env tycon)`
`203`	`209`	`if tycon.IsUnionTyconthen(* This covers finite unions.*)`
`204`	`210`	`tycon.UnionCasesAsList\|> List.iter(fun uc->`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1333,6 +1333,14 @@ module BugWithOverloadedAttributes =`
`1333`	`1333`	`[<FooAttribute(value=42)>]`
`1334`	`1334`	`typeBar=classend`
`1335`	`1335`
	`1336`	`+moduleBug719b=`
	`1337`	`+`
	`1338`	`+openTestLibModule.Bug719`
	`1339`	`+`
	`1340`	`+typeBar=`
	`1341`	`+interface IFoowith`
	`1342`	`+member__.Test(?value:int)= value.ToString()`
	`1343`	`+`
`1336`	`1344`	`(*-------------------------------------------------------------------------`
`1337`	`1345`	`!* Test passed?`
`1338`	`1346`	`-------------------------------------------------------------------------)`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,3 +118,11 @@ module TypeParamAttributesDifferent =`
`118`	`118`	`typeThisLibAssembly= X\| Y`
`119`	`119`
`120`	`120`
	`121`	`+#if!FX_PORTABLE_OR_NETSTANDARD`
	`122`	`+moduleBug719=`
	`123`	`+`
	`124`	`+openSystem.Runtime.InteropServices`
	`125`	`+`
	`126`	`+typeIFoo=`
	`127`	`+abstractTest :[<DefaultParameterValueAttribute(null)>]?value:int->string`
	`128`	`+#endif`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,3 +100,14 @@ module TypeParamAttributesDifferent =`
`100`	`100`	`valx4<[<System.CLSCompliantAttribute(true)>]'T>:'T->'T`
`101`	`101`
`102`	`102`	`typeThisLibAssembly`
	`103`	`+`
	`104`	`+`
	`105`	`+`
	`106`	`+#if!FX_PORTABLE_OR_NETSTANDARD`
	`107`	`+moduleBug719=`
	`108`	`+`
	`109`	`+openSystem.Runtime.InteropServices`
	`110`	`+`
	`111`	`+typeIFoo=`
	`112`	`+abstractTest :[<DefaultParameterValueAttribute(null)>]?value:int->string`
	`113`	`+#endif`

Comments

(0)