bug fix #529

TestSuite/lambdas_closures_13.pas

@@ -0,0 +1,25 @@
+type
+  t1 = class
+    
+    public class i: integer;
+    
+    procedure p1;
+    begin
+      var i2: integer;
+      
+      var p: procedure := ()->begin
+        
+        i += 1;
+        i2 += 1;
+        
+      end;
+      p;
+    end;
+  
+  end;
+
+begin
+  var o := new t1;
+  o.p1;
+  assert(t1.i = 1);
+end.

TreeConverter/LambdaExpressions/Closure/CapturedVariablesSubstitutionClassGenerator.cs

@@ -392,7 +392,11 @@ namespace TreeConverter.LambdaExpressions.Closure
                     {
                         if (upperScopeWhereVarsAreCaptured != scope)
                         {
-                            var dotnode1 = new dot_node(
+                            dot_node dotnode1 = null;
+                            if (ClassField != null && ClassField.IsStatic)
+                                dotnode1 = new dot_node(ClassName, new ident(varName));
+                            else
+                                dotnode1 = new dot_node(
                                 new ident(compiler_string_consts.self_word),
                                 new ident(
                                     _capturedVarsClassDefs[upperScopeWhereVarsAreCaptured.ScopeIndex]
@@ -429,6 +433,7 @@ namespace TreeConverter.LambdaExpressions.Closure
                                     }
                                     else
                                     {
+                                        if (!(ClassField != null && ClassField.IsStatic))
                                             dotnode1 = new dot_node(dotnode1, new ident(varName));
                                     }
                                 }