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

fix #1416

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2020-06-27 16:38:15 +03:00
parent aee1a5e176
commit ace3bd6164
8 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
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 = "2534";
public const string Revision = "2537";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%COREVERSION%=3
%REVISION%=2534
%MINOR%=6
%REVISION%=2537
%COREVERSION%=3
%MAJOR%=3

BIN
Localization/DefaultLang.resources
View file

Binary file not shown.

2
Release/pabcversion.txt
View file

@ -1 +1 @@
3.6.3.2534
3.6.3.2537

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.6.3.2534'
!define VERSION '3.6.3.2537'

7
TestSuite/anon.pas Normal file
View file

@ -0,0 +1,7 @@
// #1416
function f1 := 5;
begin
var o := new class(a := f1);
Assert(o.a = 5);
end.

2
TreeConverter/LambdaExpressions/Closure/CapturedVariablesSubstitutionClassGenerator.cs
View file

@ -706,7 +706,7 @@ namespace TreeConverter.LambdaExpressions.Closure
.ToList();
var fieldNames = vars
.Select(var => new ident(var.name,(var as local_variable).loc))
.Select(var => new ident(var.name,(var as local_variable)?.loc ?? null))
.ToList();
var fieldTypes = vars

22
TreeConverter/TreeConversion/syntax_tree_visitor.cs
View file

@ -16706,6 +16706,9 @@ namespace PascalABCCompiler.TreeConverter
sil, lloc, context.converted_type, context.top_function, false);
if (!(sil.FirstOrDefault().sym_info is common_in_function_function_node))
{
var ex = sil.FirstOrDefault().sym_info as basic_function_node;
if (ex != null && ex.name.ToLower() == "exit")
return new basic_function_call(ex, ex.location);
return make_delegate_wrapper(null, sil, lloc, ((sil.FirstOrDefault().sym_info is common_method_node) && ((common_method_node)sil.FirstOrDefault().sym_info).IsStatic));
}
return convertion_data_and_alghoritms.create_full_function_call(new expressions_list(),
@ -19657,8 +19660,15 @@ namespace PascalABCCompiler.TreeConverter
try
{
qq = convert_strong(ff.dereferencing_value);
if (qq is exit_procedure && stl.list.Count == 1)
{
// SSM #2172 27/06/20 - тело - это вызов exit
stl.list[0] = new procedure_call(ff, ff.source_context);
_function_lambda_definition.return_type = null;
return;
}
dm = qq.type as delegated_methods;
if (dm == null && qq.type.IsDelegate)
if (dm == null && qq.type != null && qq.type.IsDelegate)
delegate_type = qq.type as common_type_node;
}
@ -20109,7 +20119,15 @@ namespace PascalABCCompiler.TreeConverter
/*var tt1 = l.name_expr[0].expr;
var tse = convert_strong(tt1);*/
var semantic_types = l.name_expr.Select(x => convert_strong(x.expr).type).ToList();
var semantic_exprs = l.name_expr.Select(x => convert_strong(x.expr)).ToList();
for (var i = 0; i < semantic_exprs.Count; i++)
{
var ex = semantic_exprs[i];
try_convert_typed_expression_to_function_call(ref ex);
semantic_exprs[i] = ex;
}
var semantic_types = semantic_exprs.Select(x => x.type).ToList();
var types = semantic_types.Select(x => SyntaxTreeBuilder.BuildSemanticType(x)).ToList();
contextChanger.SaveContextAndUpToGlobalLevel();