fix #2103

Configuration/GlobalAssemblyInfo.cs

@@ -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 = "2494";
+	public const string Revision = "2496";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

Configuration/Version.defs

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

Release/pabcversion.txt

@@ -1 +1 @@
-3.6.3.2494
+3.6.3.2496

ReleaseGenerators/PascalABCNET_version.nsh

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

SyntaxVisitors/YieldVisitors/RenameSameBlockLocalVarsVisitor.cs

@@ -129,7 +129,8 @@ namespace SyntaxVisitors
 
             Replace(var_def, newVS);
             listNodes[listNodes.Count - 1] = newVS; //SSM 8.11.18
-            base.visit(newVS);
+            ProcessNode(newVS.inital_value); // SSM 10.06.2020 #2103
+            //base.visit(newVS); // SSM 10.06.2020 - зачем обходить всё?
         }
 
         /*public override void visit(var_statement vs)

TestSuite/CompilationSamples/GraphWPF.pas

@@ -722,15 +722,18 @@ begin
   Result := visual.RenderOpen();
 end;
 
+procedure HostToRenderBitmap;
+begin
+  rtBmap.Render(host);
+  rtbmapIsCleared := False;
+  host.Children.Clear;
+end;
+
 procedure ReleaseDC(dc: DrawingContext);
 begin
   dc.Close;
   if host.Children.Count > 1000 then
-  begin
-    rtBmap.Render(host);
-    rtbmapIsCleared := False;
-    host.Children.Clear;
-  end;
+    HostToRenderBitmap
 end;
 
 procedure FastDraw(d: DrawingContext->());
@@ -1612,6 +1615,7 @@ function GraphWindowType.GetHeight := InvokeReal(GraphWindowTypeGetHeightP);
 
 procedure SaveWindowP(canvas: FrameworkElement; filename: string);
 begin
+  HostToRenderBitmap;
   var (scalex,scaley) := ScaleToDevice;
   var (dpiX,dpiY) := (scalex * 96, scaley * 96);
   
@@ -1625,7 +1629,9 @@ begin
   var mm := (canvas as MyVisualHost).RenderTransform.Value;
   mm.Invert;
   r.Transform(mm);
-  dc.DrawRectangle(Brush.BrushConstruct,nil,r);
+  dc.DrawRectangle(Brushes.White,nil,r);
+  var rr := Rect(0,0,rtbmap.Width,rtbmap.Height);
+  dc.DrawImage(rtbmap,rr);
   dc.Close;
   (canvas as MyVisualHost).children.Insert(0,myvis);
   

TestSuite/CompilationSamples/GraphWPFBase.pas

@@ -273,6 +273,7 @@ function operator implicit(Self: (integer, real)): Point; extensionmethod := new
 function operator implicit(Self: (real, integer)): Point; extensionmethod := new Point(Self[0], Self[1]);
 function operator implicit(Self: (real, real)): Point; extensionmethod := new Point(Self[0], Self[1]);
 
+
 function operator implicit(Self: (integer, integer)): Size; extensionmethod := new Size(Self[0], Self[1]);
 function operator implicit(Self: (integer, real)): Size; extensionmethod := new Size(Self[0], Self[1]);
 function operator implicit(Self: (real, integer)): Size; extensionmethod := new Size(Self[0], Self[1]);

TestSuite/CompilationSamples/PABCSystem.pas

@@ -2307,6 +2307,8 @@ function Rec<T1, T2, T3, T4, T5>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5): (T1, T
 function Rec<T1, T2, T3, T4, T5, T6>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5; x6: T6): (T1, T2, T3, T4, T5, T6);
 ///--
 function Rec<T1, T2, T3, T4, T5, T6, T7>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5; x6: T6; x7: T7): (T1, T2, T3, T4, T5, T6, T7);
+///--
+//function Rec<T1, T2, T3, T4, T5, T6, T7, T8>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5; x6: T6; x7: T7; x8: T8): (T1, T2, T3, T4, T5, T6, T7);
 
 
 // -----------------------------------------------------

TestSuite/yi1.pas

@@ -0,0 +1,10 @@
+function f1: sequence of byte;
+begin
+  var action: System.Action;
+  
+  yield 2;
+end;
+
+begin 
+  Assert(f1.First=2)
+end.

bin/Lib/GraphWPFBase.pas

@@ -273,6 +273,7 @@ function operator implicit(Self: (integer, real)): Point; extensionmethod := new
 function operator implicit(Self: (real, integer)): Point; extensionmethod := new Point(Self[0], Self[1]);
 function operator implicit(Self: (real, real)): Point; extensionmethod := new Point(Self[0], Self[1]);
 
+
 function operator implicit(Self: (integer, integer)): Size; extensionmethod := new Size(Self[0], Self[1]);
 function operator implicit(Self: (integer, real)): Size; extensionmethod := new Size(Self[0], Self[1]);
 function operator implicit(Self: (real, integer)): Size; extensionmethod := new Size(Self[0], Self[1]);

bin/Lib/PABCSystem.pas

@@ -2307,6 +2307,8 @@ function Rec<T1, T2, T3, T4, T5>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5): (T1, T
 function Rec<T1, T2, T3, T4, T5, T6>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5; x6: T6): (T1, T2, T3, T4, T5, T6);
 ///--
 function Rec<T1, T2, T3, T4, T5, T6, T7>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5; x6: T6; x7: T7): (T1, T2, T3, T4, T5, T6, T7);
+///--
+//function Rec<T1, T2, T3, T4, T5, T6, T7, T8>(x1: T1; x2: T2; x3: T3; x4: T4; x5: T5; x6: T6; x7: T7; x8: T8): (T1, T2, T3, T4, T5, T6, T7);
 
 
 // -----------------------------------------------------