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 c66ba23b4..6b74cef7b 100644 Binary files a/Localization/DefaultLang.resources and b/Localization/DefaultLang.resources differ 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; 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;