Commit124e934

authored and

committed

implement IDisposable interfaces explicitly (#3447)

* added IDisposable* reverted Dispose change

1 parentdc744fd commit124e934Copy full SHA for 124e934

File tree

+11

-6

lines changed

+11

-6

lines changed

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5260,10 +5260,11 @@ namespace Microsoft.FSharp.Core`
`5260`	`5260`	`state.Current`
`5261`	`5261`
`5262`	`5262`	`{new IEnumerator<'T>with`
`5263`		`-member__.Dispose()=()`
`5264`		`-`
`5265`	`5263`	`member__.Current= current()`
`5266`	`5264`
	`5265`	`+interface System.IDisposablewith`
	`5266`	`+member__.Dispose()=()`
	`5267`	`+`
`5267`	`5268`	`interface IEnumeratorwith`
`5268`	`5269`	`member__.Current= box(current())`
`5269`	`5270`
`@@ -5317,9 +5318,11 @@ namespace Microsoft.FSharp.Core`
`5317`	`5318`	`derefValue`
`5318`	`5319`
`5319`	`5320`	`{new IEnumerator<'T>with`
`5320`		`-member__.Dispose()=()`
`5321`	`5321`	`member__.Current= current()`
`5322`	`5322`
	`5323`	`+interface System.IDisposablewith`
	`5324`	`+member__.Dispose()=()`
	`5325`	`+`
`5323`	`5326`	`interface IEnumeratorwith`
`5324`	`5327`	`member__.Current= box(current())`
`5325`	`5328`	`member__.Reset()= value:= n- LanguagePrimitives.GenericOne`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ namespace Microsoft.FSharp.Collections`
`406`	`406`	`ifnot finishedthen disposeG g`
`407`	`407`
`408`	`408`	`// Internal type, used to optimize Enumerator/Generator chains`
`409`		`-typeLazyGeneratorWrappingEnumerator<'T>(e:System.Collections.Generic.IEnumerator<'T>)=`
	`409`	`+typeLazyGeneratorWrappingEnumerator<'T>(e:IEnumerator<'T>)=`
`410`	`410`	`memberg.Enumerator= e`
`411`	`411`	`interface Generator<'T>with`
`412`	`412`	`memberg.Apply=(fun()->`
`@@ -419,9 +419,9 @@ namespace Microsoft.FSharp.Collections`
`419`	`419`	`letEnumerateFromGenerator(g:Generator<'T>)=`
`420`	`420`	`match gwith`
`421`	`421`	`\|:? LazyGeneratorWrappingEnumerator<'T>as g-> g.Enumerator`
`422`		`-\|_->(new EnumeratorWrappingLazyGenerator<_>(g):>System.Collections.Generic.IEnumerator<_>)`
	`422`	`+\|_->(new EnumeratorWrappingLazyGenerator<'T>(g):> IEnumerator<'T>)`
`423`	`423`
`424`		`-letGenerateFromEnumerator(e:System.Collections.Generic.IEnumerator<'T>)=`
	`424`	`+letGenerateFromEnumerator(e:IEnumerator<'T>)=`
`425`	`425`	`match ewith`
`426`	`426`	`\|:? EnumeratorWrappingLazyGenerator<'T>as e-> e.Generator`
`427`	`427`	`\|_->(new LazyGeneratorWrappingEnumerator<'T>(e):> Generator<'T>)`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -395,6 +395,7 @@ namespace Microsoft.FSharp.Core.CompilerServices`
`395`	`395`	`memberx.GetEnumerator()=(x.GetFreshEnumerator():> IEnumerator)`
`396`	`396`	`interface IEnumerator<'T>with`
`397`	`397`	`memberx.Current=if redirectthen redirectTo.LastGeneratedelse x.LastGenerated`
	`398`	`+interface System.IDisposablewith`
`398`	`399`	`memberx.Dispose()=if redirectthen redirectTo.Close()else x.Close()`
`399`	`400`	`interface IEnumeratorwith`
`400`	`401`	`memberx.Current= box(if redirectthen redirectTo.LastGeneratedelse x.LastGenerated)`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -148,3 +148,4 @@ namespace Microsoft.FSharp.Core.CompilerServices`
`148`	`148`	`interface IEnumerable`
`149`	`149`	`interface IEnumerator<'T>`
`150`	`150`	`interface IEnumerator`
	`151`	`+interface IDisposable`

Comments

(0)