From 8a02d07fc39229a39eaaf3d2ab76a4a371d95e89 Mon Sep 17 00:00:00 2001
From: Mikhalkovich Stanislav <miks@math.sfedu.ru>
Date: Sat, 18 May 2024 00:05:32 +0300
Subject: [PATCH] 3.9.0.3482

---
 Configuration/GlobalAssemblyInfo.cs         |   2 +-
 Configuration/Version.defs                  |   4 +--
 Localization/DefaultLang.resources          | Bin 103263 -> 101963 bytes
 Release/pabcversion.txt                     |   2 +-
 ReleaseGenerators/PascalABCNET_version.nsh  |   2 +-
 TestSuite/CompilationSamples/PABCSystem.pas |  33 ++++++++++++++------
 6 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index 982895d1e..05422c97b 100644
--- a/Configuration/GlobalAssemblyInfo.cs
+++ b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "9";
 	public const string Build = "0";
-	public const string Revision = "3481";
+	public const string Revision = "3482";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;
diff --git a/Configuration/Version.defs b/Configuration/Version.defs
index fd1ca666a..270869984 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
-%MINOR%=9
-%REVISION%=3481
 %COREVERSION%=0
+%REVISION%=3482
+%MINOR%=9
 %MAJOR%=3
diff --git a/Localization/DefaultLang.resources b/Localization/DefaultLang.resources
index c66ba23b4bfa0d7af7199eb3a95c235e060b498f..6b74cef7bf3be00c8576f0ff9dec0c57d81f1435 100644
GIT binary patch
delta 24
gcmcb=jP3Lswh0fI(t9^PQa5Urwb(9e!RQnX0F87B%>V!Z

delta 1171
zcmZ`(O>5LZ7^Z>+0|5^nL_AEPuzC=rJ%~t<G?^{2YqBJ}{lLQ<+AS1HD=nUi1iW|^
z_uxf5diUZl=&iKgygH3Lb(%Djk4jtEVx37gakp+y%kIqc@xIS9yYq4M$LG;^_}bR{
zFJ5KhraGn7H(D<@))!lwo9i1BA4cAe+__c1{4<iJ_Jc>auUEDnzOJ-CJyxGWtE$}d
zSx8R6Z+sZw`?7>|!-iVJn1#wVjftO956hA)8Kzci>JU|p8bq7`nO38XZrpV>!`7NL
z)keh)eyDt>en3x2;xhs~KlpP>LP~NCkjcvuv~5d(kPfSc36Zm4Hq?1#?~LyI7<eF|
zDfSbZ5HP;fT3%Ue^+5_Lj&ZL7t*kAszFOiaQ+*DR;q-KLVP5&hqHfA%BIczm4%trz
zSQL{E3AoV<K#%xGVKl?fsg9WVe-f9o(4;rw1qeyWld%pk8Ro27Gju+515QI5!TGuk
z9mlXtWtVt_`yk+i1niV1+=uw)bz^)Wb|*_slV6AP4X7h%>PEE}lq-_jCG3E9a2VnX
z&?!;_<E^!&mE}QX&4GOhUxi!U6x;4o;UdCqCa>%XtpF$ILTe$fNGX=bi2kKp)G6D0
znQq~d6kBeZGp04i+fd$bKYKFf=2L58YNxJh(8(H8-Vs^u&@)l4C}#U4=<?<a;TGOA
z64j~eYD4Xl5ft0y&a!d>FC+jb5%JxWmtVJ<Q@r%Up_iKke&G&I&q0J^d_>Z?n-itD
z7&PC^aI#&}VbO7t(xWaPh%>l3#gLge!4#b4569$vD4){6V*1z)!Ewwy5}pGuV7yQv
l<03t0%qy(PlEoilnE+qQSoseiP6m#8CvPUdPL9mH_zRMsR7U^+

diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt
index 10296f9f7..cc41d3fd0 100644
--- a/Release/pabcversion.txt
+++ b/Release/pabcversion.txt
@@ -1 +1 @@
-3.9.0.3481
+3.9.0.3482
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index 7e856cc45..354ec8dd4 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.9.0.3481'
+!define VERSION '3.9.0.3482'
diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas
index 82493f723..fbdee0e67 100644
--- a/TestSuite/CompilationSamples/PABCSystem.pas
+++ b/TestSuite/CompilationSamples/PABCSystem.pas
@@ -4225,7 +4225,7 @@ type
     private static empty_obj_arr := new object[0];
     
     public static procedure ContentsToString(o: Object; prev: Stack<object>; res: TextWriter);
-    const val_sep = '; ';
+    const val_sep = ',';
     begin
       res.Write('(');
       var any_vals := false;
@@ -4250,8 +4250,8 @@ type
           if any_vals then
             res.Write( val_sep ) else
             any_vals := true;
-          res.Write( fi.Name );
-          res.Write('=');
+          //res.Write( fi.Name );
+          //res.Write('=');
           Append(fi.GetValue(o), prev, res);
         end;
       
@@ -4264,8 +4264,8 @@ type
           if any_vals then
             res.Write( val_sep ) else
             any_vals := true;
-          res.Write( pi.Name );
-          res.Write('=');
+          //res.Write( pi.Name );
+          //res.Write('=');
           var val: object;
           try
             val := mi.Invoke(o, empty_obj_arr);
@@ -4310,7 +4310,8 @@ type
         exit;
       end;
       
-      if o is Complex then
+      // Исправить это форматирование
+      {if o is Complex then
       begin
         var c := Complex(o);
         res.Write('(');
@@ -4319,6 +4320,18 @@ type
         AppendImpl(c.Imaginary, prev, res);
         res.Write(')');
         exit;
+      end;}
+      
+      if o is Complex then
+      begin
+        var c := Complex(o);
+        //res.Write('(');
+        AppendImpl(c.Real, prev, res);
+        if c.Imaginary >= 0 then
+          res.Write('+');
+        AppendImpl(c.Imaginary, prev, res);
+        res.Write('i');
+        exit;
       end;
       
       if o is Delegate then
@@ -4333,8 +4346,10 @@ type
         exit;
       end;
       
-      // Чтобы стандартный .ToString не срабатывал
-      if o_t.IsGenericType and (o_t.GetGenericTypeDefinition=typeof(KeyValuePair<,>)) then
+      // Без пробела при выводе полей
+      if o_t.IsGenericType and ((o_t.GetGenericTypeDefinition=typeof(KeyValuePair<,>)) 
+        or (o_t.FullName.StartsWith('System.Tuple`')))
+        then
       begin
         ContentsToString(o, prev, res);
         exit;
@@ -4378,7 +4393,7 @@ type
         var a := &Array(o);
         if a.Length=0 then
         begin
-          // Алгоритм ниже не расчитан на пустые массив
+          // Алгоритм ниже не расчитан на пустые массивы
           loop a.Rank do res.Write('[');
           loop a.Rank do res.Write(']');
           exit;