Commitfe2002b

Alan Geller

authored and

KevinRansom

committed

Bug fix to allow RebuildShapeCombination for indexed static property gets (dotnet#2512)

* Bug fix to allow RebuildShapeCombination to rebuild gets of indexed static properties* Unit test for RebuildShapeCombination of indexed static property

1 parent527d6de commitfe2002bCopy full SHA for fe2002b

File tree

2 files changed

+15

-1

lines changed

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

2 files changed

+15

-1

lines changed

`‎src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Quotations/FSharpQuotations.fs‎`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ open Microsoft.FSharp.Quotations`
`11`	`11`
`12`	`12`	`typeE= Microsoft.FSharp.Quotations.Expr;;`
`13`	`13`
	`14`	`+typeStaticIndexedPropertyTest()=`
	`15`	`+static memberIdxPropwith get(n:int)= n+1`
	`16`	`+`
`14`	`17`	`moduleCheck=`
`15`	`18`	`letargumentException f=`
`16`	`19`	`let mutableex=false`
`@@ -68,6 +71,17 @@ type FSharpQuotationsTests() =`
`68`	`71`	`Check.argumentException(fun()-> ExprShape.RebuildShapeCombination(shape,[wrongValue;lambda]))`
`69`	`72`	`\|_-> Assert.Fail()`
`70`	`73`
	`74`	`+[<Test>]`
	`75`	`+memberx.ReShapeStaticIndexedProperties()=`
	`76`	`+letq0=<@ StaticIndexedPropertyTest.IdxProp5@>`
	`77`	`+match q0with`
	`78`	`+\| ExprShape.ShapeCombination(shape, args)->`
	`79`	`+try`
	`80`	`+ ExprShape.RebuildShapeCombination(shape, args)\|> ignore`
	`81`	`+with`
	`82`	`+\|_-> Assert.Fail()`
	`83`	`+\|_-> Assert.Fail()`
	`84`	`+`
`71`	`85`	`[<Test>]`
`72`	`86`	`memberx.GetConstructorFiltersOutStaticConstructor()=`
`73`	`87`	`ignore<@ System.Exception()@>`

`‎src/fsharp/FSharp.Core/quotations.fs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2171,7 +2171,7 @@ module ExprShape =`
`2171`	`2171`	`\| NewTupleOp(ty),_-> mkNewTupleWithType(ty, args)`
`2172`	`2172`	`\| TupleGetOp(ty,i),[arg]-> mkTupleGet(ty,i,arg)`
`2173`	`2173`	`\| InstancePropGetOp(pinfo),(obj::args)-> mkInstancePropGet(obj,pinfo,args)`
`2174`		`-\| StaticPropGetOp(pinfo),[]-> mkStaticPropGet(pinfo,args)`
	`2174`	`+\| StaticPropGetOp(pinfo),_-> mkStaticPropGet(pinfo,args)`
`2175`	`2175`	`\| InstancePropSetOp(pinfo),obj::(FrontAndBack(args,v))-> mkInstancePropSet(obj,pinfo,args,v)`
`2176`	`2176`	`\| StaticPropSetOp(pinfo),(FrontAndBack(args,v))-> mkStaticPropSet(pinfo,args,v)`
`2177`	`2177`	`\| InstanceFieldGetOp(finfo),[obj]-> mkInstanceFieldGet(obj,finfo)`

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!

Commitfe2002b

File tree

2 files changed

2 files changed

`‎src/fsharp/FSharp.Core.Unittests/FSharp.Core/Microsoft.FSharp.Quotations/FSharpQuotations.fs‎`

`‎src/fsharp/FSharp.Core/quotations.fs‎`

0 commit comments