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

bug fix #3060

Browse source
This commit is contained in:
Ivan Bondarev 2024-03-29 13:39:35 +01:00
parent 1d82d488a4
commit cbaff8cfd0
2 changed files with 65 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
NETGenerator/NETGenerator.cs
View file

@ -10186,9 +10186,9 @@ namespace PascalABCCompiler.NETGenerator
il.Emit(OpCodes.Stsfld, vi.fb); il.Emit(OpCodes.Stsfld, vi.fb);
il.Emit(OpCodes.Ldsfld, vi.fb); il.Emit(OpCodes.Ldsfld, vi.fb);
} }
} }
copy_string = false; copy_string = false;
} }
il.Emit(OpCodes.Stloc, pin_lb); il.Emit(OpCodes.Stloc, pin_lb);
@ -10273,7 +10273,7 @@ namespace PascalABCCompiler.NETGenerator
get_meth = mb.GetArrayMethod(ti.tp, "Get", CallingConventions.HasThis, elem_type, lst.ToArray()); get_meth = mb.GetArrayMethod(ti.tp, "Get", CallingConventions.HasThis, elem_type, lst.ToArray());
addr_meth = mb.GetArrayMethod(ti.tp, "Address", CallingConventions.HasThis, elem_type.MakeByRefType(), lst.ToArray()); addr_meth = mb.GetArrayMethod(ti.tp, "Address", CallingConventions.HasThis, elem_type.MakeByRefType(), lst.ToArray());
} }
for (int i = 0; i < indices.Length; i++) for (int i = 0; i < indices.Length; i++)
indices[i].visit(this); indices[i].visit(this);
} }
@ -10290,42 +10290,53 @@ namespace PascalABCCompiler.NETGenerator
} }
else else
if (temp_is_dot_expr) if (temp_is_dot_expr)
{
if (elem_type.IsGenericParameter)
{ {
if (elem_type.IsGenericParameter) if (value.array.type.element_type.is_generic_parameter && value.array.type.element_type.base_type != null && value.array.type.element_type.base_type.is_class && value.array.type.element_type.base_type.base_type != null)
{ {
if (indices == null)
il.Emit(OpCodes.Ldelema, elem_type);
else
il.Emit(OpCodes.Call, addr_meth);
}
else if (elem_type.IsValueType == true)
{
if (indices == null)
il.Emit(OpCodes.Ldelema, elem_type);
else
il.Emit(OpCodes.Call, addr_meth);
}
else if (elem_type.IsPointer)
{
if (indices == null)
il.Emit(OpCodes.Ldelem_I);
else
il.Emit(OpCodes.Call, addr_meth);
}
else
if (indices == null) if (indices == null)
il.Emit(OpCodes.Ldelem_Ref); il.Emit(OpCodes.Ldelem_Ref);
else else
il.Emit(OpCodes.Call, get_meth); il.Emit(OpCodes.Call, get_meth);
}
else
{
if (indices == null)
il.Emit(OpCodes.Ldelema, elem_type);
else
il.Emit(OpCodes.Call, addr_meth);
}
} }
else else if (elem_type.IsValueType == true)
{ {
if (indices == null) if (indices == null)
NETGeneratorTools.PushLdelem(il, elem_type, true); il.Emit(OpCodes.Ldelema, elem_type);
else else
il.Emit(OpCodes.Call, get_meth); il.Emit(OpCodes.Call, addr_meth);
} }
else if (elem_type.IsPointer)
{
if (indices == null)
il.Emit(OpCodes.Ldelem_I);
else
il.Emit(OpCodes.Call, addr_meth);
}
else
if (indices == null)
il.Emit(OpCodes.Ldelem_Ref);
else
il.Emit(OpCodes.Call, get_meth);
}
else
{
if (indices == null)
NETGeneratorTools.PushLdelem(il, elem_type, true);
else
il.Emit(OpCodes.Call, get_meth);
}
is_addr = temp_is_addr; is_addr = temp_is_addr;
is_dot_expr = temp_is_dot_expr; is_dot_expr = temp_is_dot_expr;
//if (pinned_handle != null) //if (pinned_handle != null)

26
TestSuite/generics75.pas Normal file
View file

@ -0,0 +1,26 @@
var s: string;
type
c1<TSelf> = class
where TSelf: c1<TSelf>;
x: string := 'abc';
static a := new TSelf[1];
static procedure p1;
begin
assert((a[0] as c1<TSelf>).x.Length = 3); // 3
s := a[0].x; // nil
a[0].x := 'abc';
assert((a[0] as c1<TSelf>).x.Length = 3); // 0
end;
end;
c2 = class(c1<c2>) end;
begin
c2.a[0] := new c2;
c2.p1;
assert(c2.a[0].x.Length = 3); // 0
assert(s = 'abc');
end.