From c6b852f373d7dbdd5f4d0cc47a6bf9c6d0b0208c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D0=BE=D0=BD=D0=B4=D0=B0=D1=80=D0=B5=D0=B2=20=D0=98?=
 =?UTF-8?q?=D0=B2=D0=B0=D0=BD?= <ibond84@googlemail.com>
Date: Sun, 6 Oct 2019 12:38:27 +0200
Subject: [PATCH] bug fix #1502

---
 NETGenerator/NETGenerator.cs                |   3 +-
 TestSuite/CompilationSamples/PABCSystem.pas |   2 +-
 TestSuite/class3.pas                        |  39 ++++++++++++++++++++
 _GenerateAllSetups.bat                      |   1 +
 _RebuildReleaseAndRunTests.bat              |   1 +
 bin/TestRunner.exe                          | Bin 33280 -> 33280 bytes
 bin/TestRunner.pas                          |  24 +++---------
 7 files changed, 50 insertions(+), 20 deletions(-)
 create mode 100644 TestSuite/class3.pas

diff --git a/NETGenerator/NETGenerator.cs b/NETGenerator/NETGenerator.cs
index 005ee08ae..d6ad44a8a 100644
--- a/NETGenerator/NETGenerator.cs
+++ b/NETGenerator/NETGenerator.cs
@@ -9630,10 +9630,11 @@ namespace PascalABCCompiler.NETGenerator
             {
                 is_dot_expr = false;
             }
-            if (init_call_awaited && !value.new_obj_awaited())
+            if (init_call_awaited && !value.new_obj_awaited() && cnstr.DeclaringType != cur_type)
             {
                 il.Emit(OpCodes.Ldarg_0);
                 il.Emit(OpCodes.Call, cur_ti.init_meth);
+                //throw new Exception(cnstr.DeclaringType.Name+"-"+cur_meth.DeclaringType.Name);
                 init_call_awaited = false;
             }
         }
diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas
index 3d0c1c010..7c1dbc897 100644
--- a/TestSuite/CompilationSamples/PABCSystem.pas
+++ b/TestSuite/CompilationSamples/PABCSystem.pas
@@ -9413,7 +9413,7 @@ end;
 /// Возвращает индекс последнего минимального элемента
 function LastIndexMin<T>(Self: array of T): integer; extensionmethod; where T: System.IComparable<T>;
 begin
-  Result := Self.LastIndexMin(Self.Count - 1);
+  Result := Self.LastIndexMin(Self.Length - 1);
 end;  
 
 /// Возвращает индекс последнего минимального элемента в диапазоне [0,index-1]
diff --git a/TestSuite/class3.pas b/TestSuite/class3.pas
new file mode 100644
index 000000000..e17b48a9f
--- /dev/null
+++ b/TestSuite/class3.pas
@@ -0,0 +1,39 @@
+type
+  t1=class
+    
+    public i1 := 1;
+    public i2 := 2;
+    public o: object := new Object;
+    
+    public constructor(i1, i2: integer);
+    begin
+      assert(o <> nil);
+      self.i1 := i1;
+      self.i2 := i2;
+    end;
+    
+    public constructor(i1: integer) :=
+    Create(i1,6);
+    
+  end;
+  
+  t2 = class
+    a: array of integer := (1, 2, 3);
+    b: set of char := ['a', 'b', 'c'];
+    constructor(a: array of integer);
+    begin
+      assert('b' in b);
+      assert(self.a[0] = 1);
+      self.a := a;
+    end;
+  end;
+  
+
+begin
+  var o1 := new t1(3,4);
+  var o2 := new t1(5);
+  assert(o2.i1 = 5);
+  assert(o2.i2 = 6);
+  var o3 := new t2(Arr(4, 5, 6));
+  assert(o3.a[0] = 4);
+end.
\ No newline at end of file
diff --git a/_GenerateAllSetups.bat b/_GenerateAllSetups.bat
index d2bbf277d..1be7acccc 100644
--- a/_GenerateAllSetups.bat
+++ b/_GenerateAllSetups.bat
@@ -45,6 +45,7 @@ TestRunner.exe 2
 TestRunner.exe 3
 TestRunner.exe 4
 TestRunner.exe 5
+TestRunner.exe 6
 
 cd ..\ReleaseGenerators
 call PascalABCNET_ALL.bat
diff --git a/_RebuildReleaseAndRunTests.bat b/_RebuildReleaseAndRunTests.bat
index 9ce4bc6de..d6fc274a9 100644
--- a/_RebuildReleaseAndRunTests.bat
+++ b/_RebuildReleaseAndRunTests.bat
@@ -28,6 +28,7 @@ TestRunner.exe 2
 TestRunner.exe 3
 TestRunner.exe 4
 TestRunner.exe 5
+TestRunner.exe 6
 cd ..
 GOTO EXIT
 
diff --git a/bin/TestRunner.exe b/bin/TestRunner.exe
index 5114254be0e6e53c6f7eb870248fadaa4f5ea348..9f504e384e66db287d676eeffd87956abaacb20e 100644
GIT binary patch
delta 542
zcmZo@VQOe$n$W>y)<3aJj_Kc=iL1g`*UVvH@SkkRD8sXWfq{pCfguAZAT#+Qqt4_=
zMs-G($&HNl3J-u{Am9PSObo0HXW|(c=GZVWFar5N%r-f&-e7Y8Q?w9!1dzw15jHtb
zRDAMDk$Fgb84)H1K8Sij1||)d!g->9P$hC8CTw0O_C}pqfgyAAT)RR>mH?p6$p;<O
zC;L07OrB~lrI5(UP@o~kz`&JY0dj@7Wi*gv5YylWYG)`)<(z!qL0)++NKrFLM1vnJ
z&dmiE5C97VPgZo4XPXKXR_L1S<|xPN&II)4<V?r+l3%zO7?eYU8P1q8FaQ-ZD7%Mx
zx&Y}rn+u)3vdZZI!vJU@!#@r~2402<P#zm6h_@qtbBo6b0nyVOAT<mOLLetHFatx5
zk>T{_#K<=?Ow4ARy~`#t3Me++*!kZ!$b0?o*fa9E)9N?BDL=yIXVyPG7NiB}7zT9^
z0|;8`7#M<rU4r-TxmxVVdB&x8la!*A$6QU2*&(ULB|)Wmd8tKu1u01k3|F8L2GaL#
k&g6e}Qf!booGexUd~!m)1Lp)tY%|zy7HoLWIMIL|0OSaLG5`Po

delta 559
zcmZo@VQOe$n$W?t+G}E$9FyJLiL1g`Kg?lZ@SbeQD8sXWfq{pCfng0$KxXnqMxDu#
zjOvUolN%Z96%^(IC4j&Kh?y8z8AK8o7-rZoFfao7K+HB-u-;&E08_LOdl-<%q!BSW
zPgH#JNs)O-d>IjD20n;-K?Wubn8JCYe<nwX@In>lY+fh!Mx9xXVdLhxc7=@MvLGA8
zHJX5?7L{`_6ljPsFmPEWP3Cv-6BpCq1`0D2C2|7An?X#ASfJ|3whjtd<TQkUDkcj#
zs83$tAf~($u1A9(YzR9S%n%I$uz>&Mn-2196M@1C(<c9OkYnv<VqlmsS<&&m<OePW
z2IbITh7+a?3_!&U%I=|_E<pOmW=*HBta2ssKsJLI!#@r~24036P#zm6h{uqy*~a69
zfaoa>kQxRCA&~zVn1Mmc$Z%@2WaJx}&75WZi~@K0?{b$r*SSvj{&mwPl9zk)it;0D
zL94x{gM0{#0tN<k5CaHK)G;sw1-k?vkPG|#rs$u0U*F%UwM|{AAcI3vi%Wt^^YT)Q
t^a@gv7#Jj=(FoF~2VyHsR1{-Um^=Aa-E+<fkmz@?-7MJfo^hf9I{<dfeIEb-

diff --git a/bin/TestRunner.pas b/bin/TestRunner.pas
index fa1c8894f..6bae4a64c 100644
--- a/bin/TestRunner.pas
+++ b/bin/TestRunner.pas
@@ -367,8 +367,7 @@ begin
     end;
     if (ParamCount = 0) or (ParamStr(1) = '5') then
     begin
-      if ParamStr(1) = '5' then
-      begin
+      
         CompileAllRunTests(false, true);
         writeln('Tests in 32bit mode compiled successfully');
         RunAllTests(false);
@@ -377,22 +376,11 @@ begin
         CompileAllRunTests(true);
         writeln('Tests with pabcrtl compiled successfully');
         CompileAllCompilationTests('pabcrtl_tests', true);
-        RunAllTests(false);
-        writeln('Tests with pabcrtl run successfully');
-      end
-      else
-      begin
-        CompileAllRunTests(true);
-        writeln('Tests with pabcrtl compiled successfully');
-        CompileAllCompilationTests('pabcrtl_tests', true);
-        RunAllTests(false);
-        writeln('Tests with pabcrtl run successfully');
-        ClearExeDir;
-        CompileAllRunTests(false, true);
-        writeln('Tests in 32bit mode compiled successfully');
-        RunAllTests(false);
-        writeln('Tests in 32bit run successfully');
-      end;
+    end;
+    if (ParamCount = 0) or (ParamStr(1) = '6') then
+    begin
+      RunAllTests(false);
+      writeln('Tests with pabcrtl run successfully');
       System.Environment.CurrentDirectory := Path.GetDirectoryName(GetEXEFileName());
       RunExpressionsExtractTests;
       writeln('Intellisense expression tests run successfully');