fix #793

Configuration/GlobalAssemblyInfo.cs

@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "5";
 	public const string Build = "0";
-	public const string Revision = "2165";
+	public const string Revision = "2166";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

Configuration/Version.defs

@@ -1,4 +1,4 @@
-%MINOR%=5
-%REVISION%=2165
 %COREVERSION%=0
+%REVISION%=2166
+%MINOR%=5
 %MAJOR%=3

Parsers/PascalABCParserNewSaushkin/ABCPascal.cs

@@ -1,9 +1,9 @@
 //
 //  This CSharp output file generated by Gardens Point LEX
 //  Version:  1.1.3.301
-//  Machine:  DESKTOP-IF20NRO
-//  DateTime: 6/29/2019 10:03:19 AM
-//  UserName: FatCow
+//  Machine:  DESKTOP-G8V08V4
+//  DateTime: 29.06.2019 23:45:26
+//  UserName: ?????????
 //  GPLEX input file <ABCPascal.lex>
 //  GPLEX frame file <embedded resource>
 //

Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs

@@ -1,9 +1,9 @@
 // (see accompanying GPPGcopyright.rtf)
 
 // GPPG version 1.3.6
-// Machine:  DESKTOP-IF20NRO
-// DateTime: 6/29/2019 10:03:19 AM
-// UserName: FatCow
+// Machine:  DESKTOP-G8V08V4
+// DateTime: 29.06.2019 23:45:26
+// UserName: ?????????
 // Input file <ABCPascal.y>
 
 // options: no-lines gplex

Parsers/PascalABCParserNewSaushkin/PABC.ymc

@@ -245,5 +245,6 @@ script=
 
 
 
+
 
 

ReleaseGenerators/PascalABCNET_version.nsh

@@ -1 +1 @@
-!define VERSION '3.5.0.2165'
+!define VERSION '3.5.0.2166'

TestSuite/lambda_2_Res_Internal.pas

@@ -0,0 +1,11 @@
+procedure p1(i1,i2:integer);
+begin
+  Assert(1=1);
+end;
+
+begin
+  Seq(0).ForEach(i1->
+  begin
+    Seq(0).ForEach(i2 ->p1(i1, i2));
+  end);
+end.

TreeConverter/TreeConversion/LambdaHelper.cs

@@ -402,6 +402,10 @@ namespace PascalABCCompiler.TreeConverter
                 ProcessNode(root);
             }
 
+            public override void visit(function_lambda_definition fd)
+            {
+                // не заходить во внутренние лямбды
+            }
             public override void visit(assign value)
             {
                 var to = value.to as ident;

TreeConverter/TreeConversion/convertion_data_and_alghoritms.cs

@@ -1333,7 +1333,7 @@ namespace PascalABCCompiler.TreeConverter
             {
                 return method_compare.greater_method;
             }
-            if (!left_func.is_generic_function_instance && right_func.is_generic_function_instance)
+            if (!left_func.is_generic_function_instance && right_func.is_generic_function_instance) // SSM 29.06.19 Это неверно для Run<int>(Func<int>) против Run(Func<Task>)
             {
                 if (left_func is basic_function_node)
                     return method_compare.less_method;

bin/pabcnetc.exe.config

@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
-
-</configuration>

bin/pabcnetcclear.exe.config

@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
-  
-</configuration>