administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

#2916

Browse source
This commit is contained in:
Ivan Bondarev 2023-08-20 11:41:37 +02:00
parent 151e046aa5
commit 740ea078ca
3 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NETGenerator/Helpers.cs
View file

@ -918,7 +918,7 @@ namespace PascalABCCompiler.NETGenerator {
return TypeFactory.IEnumerableType.GetMethod("GetEnumerator", Type.EmptyTypes); return TypeFactory.IEnumerableType.GetMethod("GetEnumerator", Type.EmptyTypes);
} }
public void SetAsProcessing(ICommonTypeNode type) public void SetAsProcessing(ICommonTypeNode type)
{ {
processing_types[type] = true; processing_types[type] = true;
} }

13
NETGenerator/NETGenerator.cs
View file

@ -11620,11 +11620,14 @@ namespace PascalABCCompiler.NETGenerator
//il.Emit(OpCodes.Leave, leave_label); //il.Emit(OpCodes.Leave, leave_label);
il.BeginFinallyBlock(); il.BeginFinallyBlock();
//il.MarkLabel(br_lbl); //il.MarkLabel(br_lbl);
if (lb.LocalType.IsValueType) if (lb.LocalType.GetInterface("System.IDisposable") != null)
il.Emit(OpCodes.Ldloca, lb); {
else if (lb.LocalType.IsValueType)
il.Emit(OpCodes.Ldloc, lb); il.Emit(OpCodes.Ldloca, lb);
il.Emit(OpCodes.Callvirt, TypeFactory.IDisposableType.GetMethod("Dispose", BindingFlags.Instance | BindingFlags.Public)); else
il.Emit(OpCodes.Ldloc, lb);
il.Emit(OpCodes.Callvirt, TypeFactory.IDisposableType.GetMethod("Dispose", BindingFlags.Instance | BindingFlags.Public));
}
il.EndExceptionBlock(); il.EndExceptionBlock();
il.MarkLabel(leave_label); il.MarkLabel(leave_label);

21
TestSuite/foreach12.pas
View file

@ -17,6 +17,23 @@ type
end; end;
t2<T> = class(IEnumerable<T>, IEnumerator<T>)
public function GetEnumerator: IEnumerator<T> := self;
function System.Collections.IEnumerable.GetEnumerator: System.Collections.IEnumerator := self;
public function MoveNext := false;
public property Current: byte read 0;
property System.Collections.IEnumerator.Current: object read 0;
property System.Collections.Generic.IEnumerator<T>.Current: T read default(T);
public procedure Reset := exit;
public procedure Dispose := c += 1;
end;
function f1: sequence of byte; function f1: sequence of byte;
begin begin
yield sequence new t1; yield sequence new t1;
@ -27,5 +44,7 @@ end;
begin begin
foreach var x in new t1 do ; foreach var x in new t1 do ;
Assert(c = 1); foreach var x in new t2<byte> do ;
//foreach var x in f1 do ;
Assert(c = 2);
end. end.