This commit is contained in:
Mikhalkovich Stanislav 2020-06-10 18:33:26 +03:00
parent 1946c710f7
commit 6226fa7d41
7 changed files with 29 additions and 6 deletions

View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "6";
public const string Build = "3";
public const string Revision = "2496";
public const string Revision = "2497";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

View file

@ -1,4 +1,4 @@
%COREVERSION%=3
%REVISION%=2496
%MINOR%=6
%REVISION%=2497
%COREVERSION%=3
%MAJOR%=3

View file

@ -1 +1 @@
3.6.3.2496
3.6.3.2497

View file

@ -1 +1 @@
!define VERSION '3.6.3.2496'
!define VERSION '3.6.3.2497'

10
TestSuite/params20.pas Normal file
View file

@ -0,0 +1,10 @@
procedure p1(params a: array of ()->array of byte);
begin
Assert(1=1)
end;
function GetBArr := new byte[0];
begin
p1(GetBArr);
end.

10
TestSuite/params21.pas Normal file
View file

@ -0,0 +1,10 @@
procedure p1(params a: array of byte);
begin
Assert(1=1)
end;
function GetBArr := new byte[0];
begin
p1(GetBArr);
end.

View file

@ -917,7 +917,10 @@ namespace PascalABCCompiler.TreeConverter
parameter pr=formalparams[formalparams.Count - 1];
if (pr.is_params &&
//это для возможности вызова сразу с массивом[], типа просто не обращаем внимаение на params
!(factparams.Count == formalparams.Count && factparams[factparams.Count - 1].type == formalparams[formalparams.Count - 1].type))
!(factparams.Count == formalparams.Count && (factparams[factparams.Count - 1].type == formalparams[formalparams.Count - 1].type ||
(factparams[factparams.Count - 1].type is delegated_methods dm) && (dm.proper_methods[0].ret_type == formalparams[formalparams.Count - 1].type))
)
)
{
//TODO: Добавить проверку на правильность.
aii = (array_internal_interface)