Commitc3c50ee

authored and

committed

Fixdotnet#68 - filter out type initializer from Type.GetConstructor portable implementation

1 parentb9d2f3f commitc3c50eeCopy full SHA for c3c50ee

File tree

+10

-3

lines changed

src/fsharp
- FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Quotations
  - FSharpQuotations.fs
- FSharp.Core
  - reflect.fs

+10

-3

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -67,3 +67,7 @@ type FSharpQuotationsTests() =`
`67`	`67`	`letwrongValue=<@"!"@>`
`68`	`68`	`Check.argumentException(fun()-> ExprShape.RebuildShapeCombination(shape,[wrongValue;lambda]))`
`69`	`69`	`\|_-> Assert.Fail()`
	`70`	`+`
	`71`	`+[<Test>]`
	`72`	`+memberx.GetConstructorFiltersOutStaticConstructor()=`
	`73`	`+ ignore<@ System.Exception()@>`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,9 +125,12 @@ module ReflectionAdapters =`
`125`	`125`	`memberthis.GetConstructor(parameterTypes:Type[])=`
`126`	`126`	`this.GetTypeInfo().DeclaredConstructors`
`127`	`127`	`\|> Seq.filter(fun ci->`
`128`		`-letparameters= ci.GetParameters()`
`129`		`-(parameters.Length= parameterTypes.Length)&&`
`130`		`-(parameterTypes, parameters)\|\|> Array.forall2(fun ty pi-> pi.ParameterType.Equals ty)`
	`128`	`+not ci.IsStatic&&//exclude type initializer`
	`129`	`+(`
	`130`	`+letparameters= ci.GetParameters()`
	`131`	`+(parameters.Length= parameterTypes.Length)&&`
	`132`	`+(parameterTypes, parameters)\|\|> Array.forall2(fun ty pi-> pi.ParameterType.Equals ty)`
	`133`	`+)`
`131`	`134`	`)`
`132`	`135`	`\|> Seq.toArray`
`133`	`136`	`\|> commit`

Comments

(0)