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

bug fix #1929

Browse source
This commit is contained in:
Бондарев Иван 2019-06-02 12:19:18 +02:00
parent 1d9a27d08a
commit 240dfde02f
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
TestSuite/CompilationSamples/lib.dll Normal file
View file

Binary file not shown.

10
TestSuite/CompilationSamples/xpointers_in_dll.pas Normal file
View file

@ -0,0 +1,10 @@
{$reference lib.dll}
procedure p1;
begin
var r: lib.r1; // запись обязательно из библиотеки
var p: ^char;
r.p := p; // обязательно присвоить полю значение переменной. если присваивать nil - не воспроизводится
end;
begin end.

8
TreeConverter/TreeRealization/types.cs
View file

@ -1057,7 +1057,13 @@ namespace PascalABCCompiler.TreeRealization
} }
if (rtn == null) if (rtn == null)
{ {
return null; if (ctn is compiled_type_node && (ctn as compiled_type_node).compiled_type.IsPointer)
{
if (this.pointed_type == compiled_type_node.get_type_node((ctn as compiled_type_node).compiled_type.GetElementType()))
return PascalABCCompiler.TreeConverter.convertion_data_and_alghoritms.get_empty_conversion(this, ctn, false);
return get_implicit_conversion_to(new ref_type_node(compiled_type_node.get_type_node((ctn as compiled_type_node).compiled_type.GetElementType())));
}
return null;
} }
if (rtn.pointed_type == null || this.pointed_type == null) if (rtn.pointed_type == null || this.pointed_type == null)
return null; return null;