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

bug fix #1847

Browse source
This commit is contained in:
Бондарев Иван 2019-07-04 22:05:57 +02:00
parent 03d0f5486b
commit 222f3d981f
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NETGenerator/NETGenegratorTools.cs
View file

@ -47,6 +47,7 @@ namespace PascalABCCompiler.NETGenerator
public static Type GCHandleType = typeof(GCHandle); public static Type GCHandleType = typeof(GCHandle);
public static Type MarshalType = typeof(Marshal); public static Type MarshalType = typeof(Marshal);
public static Type TypeType = typeof(Type); public static Type TypeType = typeof(Type);
public static Type ValueType = typeof(ValueType);
public static Type IEnumerableType = typeof(System.Collections.IEnumerable); public static Type IEnumerableType = typeof(System.Collections.IEnumerable);
public static Type IEnumeratorType = typeof(System.Collections.IEnumerator); public static Type IEnumeratorType = typeof(System.Collections.IEnumerator);
public static Type IEnumerableGenericType = typeof(System.Collections.Generic.IEnumerable<>); public static Type IEnumerableGenericType = typeof(System.Collections.Generic.IEnumerable<>);
@ -110,6 +111,7 @@ namespace PascalABCCompiler.NETGenerator
sizes[UInt64Type] = sizeof(UInt64); sizes[UInt64Type] = sizeof(UInt64);
sizes[SingleType] = sizeof(Single); sizes[SingleType] = sizeof(Single);
sizes[DoubleType] = sizeof(Double); sizes[DoubleType] = sizeof(Double);
//sizes[UIntPtr] = sizeof(UIntPtr);
//types[TypeType] = TypeType; //types[TypeType] = TypeType;
ArrayCopyMethod = typeof(Array).GetMethod("Copy", new Type[3] { typeof(Array), typeof(Array), typeof(int) }); ArrayCopyMethod = typeof(Array).GetMethod("Copy", new Type[3] { typeof(Array), typeof(Array), typeof(int) });

4
NETGenerator/NETGenerator.cs
View file

@ -1132,7 +1132,6 @@ namespace PascalABCCompiler.NETGenerator
if (ctn != null) if (ctn != null)
throw new PascalABCCompiler.Errors.CommonCompilerError(ex.Message, ctn.Location.document.file_name, ctn.Location.begin_line_num, ctn.Location.begin_column_num); throw new PascalABCCompiler.Errors.CommonCompilerError(ex.Message, ctn.Location.document.file_name, ctn.Location.begin_line_num, ctn.Location.begin_column_num);
} }
} }
for (int i = 0; i < enums.Count; i++) for (int i = 0; i < enums.Count; i++)
@ -1325,7 +1324,7 @@ namespace PascalABCCompiler.NETGenerator
private void AddTypeWithoutConvert(ICommonTypeNode t) private void AddTypeWithoutConvert(ICommonTypeNode t)
{ {
if (helper.GetTypeReference(t) != null) return; if (helper.GetTypeReference(t) != null) return;
TypeBuilder tb = mb.DefineType(BuildTypeName(t.name), ConvertAttributes(t), null, new Type[0]); TypeBuilder tb = mb.DefineType(BuildTypeName(t.name), ConvertAttributes(t), t.is_value_type?TypeFactory.ValueType:null, new Type[0]);
helper.AddType(t, tb); helper.AddType(t, tb);
//(ssyy) обрабатываем generics //(ssyy) обрабатываем generics
if (t.is_generic_type_definition) if (t.is_generic_type_definition)
@ -6660,6 +6659,7 @@ namespace PascalABCCompiler.NETGenerator
if (value.is_final) if (value.is_final)
{ {
attrs |= MethodAttributes.Virtual | MethodAttributes.Final; attrs |= MethodAttributes.Virtual | MethodAttributes.Final;
} }

13
TestSuite/generics28.pas Normal file
View file

@ -0,0 +1,13 @@
type
SomeType = record(IComparable<SomeType>)
public
function CompareTo(other: SomeType): integer;
begin
Result := 2;
end;
end;
begin
var obj := new SomeType();
assert(obj.CompareTo(obj) = 2);
end.