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

bug fix #2555

Browse source
This commit is contained in:
Ivan Bondarev 2021-11-07 10:14:35 +01:00
parent 0adae8b26d
commit 9f4de084cc
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
TestSuite/sizeof1.pas
View file

@ -1,13 +1,19 @@
type TRec = record type TRec = record
a: integer; a: integer;
b: real; b: real;
c: char; c: char;
end; end;
type
t1 = class
o: t1;
end;
begin begin
assert(sizeof(integer)=4); assert(sizeof(integer)=4);
assert(sizeof(real)=8); assert(sizeof(real)=8);
assert(sizeof(char)=2); assert(sizeof(char)=2);
assert(sizeof(pointer)=System.Runtime.InteropServices.Marshal.SizeOf(typeof(pointer))); assert(sizeof(pointer)=System.Runtime.InteropServices.Marshal.SizeOf(typeof(pointer)));
assert(sizeof(TRec)=System.Runtime.InteropServices.Marshal.SizeOf(typeof(TRec))); assert(sizeof(TRec)=System.Runtime.InteropServices.Marshal.SizeOf(typeof(TRec)));
assert(sizeof(t1) > 0);
end. end.

4
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -3731,6 +3731,8 @@ namespace PascalABCCompiler.TreeConverter
switch (_class_definition.keyword) switch (_class_definition.keyword)
{ {
case PascalABCCompiler.SyntaxTree.class_keyword.Class: case PascalABCCompiler.SyntaxTree.class_keyword.Class:
//if (context.converted_type.IsPartial)
// generic_convertions.remove_type_instances(context.converted_type);
if (context.converted_type.is_value || context.converted_type.IsInterface) if (context.converted_type.is_value || context.converted_type.IsInterface)
{ {
AddError(get_location(_class_definition), "FORWARD_DECLARATION_OF_{0}_MISMATCH_DECLARATION", context.converted_type.name); AddError(get_location(_class_definition), "FORWARD_DECLARATION_OF_{0}_MISMATCH_DECLARATION", context.converted_type.name);
@ -19445,7 +19447,7 @@ namespace PascalABCCompiler.TreeConverter
if (tn.is_generic_parameter || tn.is_generic_type_definition || tn.is_generic_type_instance) if (tn.is_generic_parameter || tn.is_generic_type_definition || tn.is_generic_type_instance)
return false; return false;
foreach (class_field cf in ctn.fields) foreach (class_field cf in ctn.fields)
if (!cf.IsStatic) if (!cf.IsStatic && cf.type != tn)
if (!can_evaluate_size(cf.type)) return false; if (!can_evaluate_size(cf.type)) return false;
} }

6
TreeConverter/TreeRealization/generics.cs
View file

@ -243,6 +243,12 @@ namespace PascalABCCompiler.TreeRealization
return instances; return instances;
} }
public static void remove_type_instances(type_node original_generic_type)
{
if (generic_instances[original_generic_type] != null)
generic_instances.Remove(original_generic_type);
}
public static List<generic_function_instance_info> get_function_instances(function_node original_generic_function) public static List<generic_function_instance_info> get_function_instances(function_node original_generic_function)
{ {
List<generic_function_instance_info> instances = generic_instances[original_generic_function] as List<generic_function_instance_info>; List<generic_function_instance_info> instances = generic_instances[original_generic_function] as List<generic_function_instance_info>;