diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index aea531ea9..c5a1c43a4 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "0"; public const string Build = "0"; - public const string Revision = "1078"; + public const string Revision = "1083"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index 4990275ca..24ad9a89d 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=0 -%REVISION%=1078 %COREVERSION%=0 +%REVISION%=1083 +%MINOR%=0 %MAJOR%=3 diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources index fc59b9060..911e0709c 100644 Binary files a/Localization/DefaultLang.resources and b/Localization/DefaultLang.resources differ diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 0f2a1b89b..b102f6a05 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.0.0.1078' +!define VERSION '3.0.0.1083' diff --git a/TreeConverter/TreeRealization/generics.cs b/TreeConverter/TreeRealization/generics.cs index 9da0c03a6..33ccd7ab8 100644 --- a/TreeConverter/TreeRealization/generics.cs +++ b/TreeConverter/TreeRealization/generics.cs @@ -650,6 +650,10 @@ namespace PascalABCCompiler.TreeRealization if (lambdaInfType != null && lambdaInfType.real_type is lambda_any_type_node) { + if (formal_delegate == null) + { + return false; + } if (!CheckIfTypeDependsOnUndeducedGenericParameters(formal_delegate.parameters[param_counter].type, deduced)) //Если тип параметра не зависит от невыведенных дженерик-параметров, то можем вычислить этот тип явно { lambdaInfType.real_type = generic_convertions.determine_type(formal_delegate.parameters[param_counter].type, diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll index 66ea2f37a..1d9d6b3fd 100644 Binary files a/bin/Lib/PABCRtl.dll and b/bin/Lib/PABCRtl.dll differ