diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 9283ec8e4..4d12191c5 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 = "3445"; + public const string Revision = "3446"; 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 d882356aa..db65b1f84 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=9 -%REVISION%=3445 %COREVERSION%=0 +%REVISION%=3446 +%MINOR%=9 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 6545cf947..33ab07b6d 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3445 +3.9.0.3446 diff --git a/ReleaseGenerators/PascalABCNETConsoleZIP.bat b/ReleaseGenerators/PascalABCNETConsoleZIP.bat index c7905fd03..6835835e3 100644 --- a/ReleaseGenerators/PascalABCNETConsoleZIP.bat +++ b/ReleaseGenerators/PascalABCNETConsoleZIP.bat @@ -5,5 +5,6 @@ del ..\Release\PACNETConsole.zip ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip Lng\*.dat ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip Lng\*.LanguageName ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip doc\*.* +..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip -dir LanguageKits cd ..\ReleaseGenerators ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PABCNETC.zip install_pabcnetc.bat \ No newline at end of file diff --git a/ReleaseGenerators/PascalABCNETMonoZIP.bat b/ReleaseGenerators/PascalABCNETMonoZIP.bat index c8f2fb357..e2c05c510 100644 --- a/ReleaseGenerators/PascalABCNETMonoZIP.bat +++ b/ReleaseGenerators/PascalABCNETMonoZIP.bat @@ -1,10 +1,11 @@ cd ..\bin del ..\Release\PascalABCNETMono.zip -..\utils\pkzipc\pkzipc.exe -add ..\Release\PascalABCNETMono.zip PascalABCNETMono.exe pabcnetc.exe pabcnetc PascalABCNET Compiler.dll CompilerTools.dll Errors.dll Localization.dll NETGenerator.dll ParserTools.dll SyntaxTreeConverters.dll ICSharpCode.NRefactory.dll SemanticTree.dll SyntaxTree.dll TreeConverter.dll OptimizerConversion.dll PascalABCParser.dll licence.txt PascalABCNET.chm System.Threading.dll PluginsSupport.dll InternalErrorReport.dll ICSharpCode.TextEditor.dll ICSharpCode.SharpZipLib.dll CodeCompletion.dll Debugger.Core.dll Mono.Debugger.Soft.dll Mono.Debugging.dll Mono.Debugging.Soft.dll NETXP.Controls.dll NETXP.Controls.Bars.dll NETXP.Library.dll NETXP.Win32.dll WeifenLuo.WinFormsUI.Docking.dll template.pct YieldHelpers.dll +..\utils\pkzipc\pkzipc.exe -add ..\Release\PascalABCNETMono.zip PascalABCNETMono.exe pabcnetc.exe pabcnetc PascalABCNET Compiler.dll CompilerTools.dll Errors.dll Localization.dll NETGenerator.dll ParserTools.dll SyntaxTreeConverters.dll ICSharpCode.NRefactory.dll SemanticTree.dll SyntaxTree.dll TreeConverter.dll OptimizerConversion.dll PascalABCParser.dll licence.txt PascalABCNET.chm System.Threading.dll PluginsSupport.dll InternalErrorReport.dll ICSharpCode.TextEditor.dll ICSharpCode.SharpZipLib.dll CodeCompletion.dll Debugger.Core.dll Mono.Debugger.Soft.dll Mono.Debugging.dll Mono.Debugging.Soft.dll NETXP.Controls.dll NETXP.Controls.Bars.dll NETXP.Library.dll NETXP.Win32.dll WeifenLuo.WinFormsUI.Docking.dll template.pct YieldHelpers.dll LanguageIntegrator.dll ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Lib\*.pcu ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Highlighting\*.xshd ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Ico\*.ico ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Lng\Rus\*.dat Lng\Rus\.LanguageName Lng\Rus\.LanguageName Lng\Rus\_Global Lng\Rus\_Global_loc +..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip -dir LanguageKits cd ..\ReleaseGenerators ..\utils\pkzipc\pkzipc.exe -add -nozip -dir ..\Release\PascalABCNETMono.zip Samples\Pas\* cd ..\Release diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 91d293164..57fa015a8 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3445' +!define VERSION '3.9.0.3446' diff --git a/TestSuite/CompilationSamples/NumLibABC.pas b/TestSuite/CompilationSamples/NumLibABC.pas index 5948da0bd..8f4cb7037 100644 --- a/TestSuite/CompilationSamples/NumLibABC.pas +++ b/TestSuite/CompilationSamples/NumLibABC.pas @@ -1,7 +1,6 @@ unit NumLibABC; -const &NumLibABCVersion = 'NumLibABC 1.0.1 от 14.09.2019'; -// предыдущая версия 1.0.0 от 06.09.2017 +const &NumLibABCVersion = 'NumLibABC 1.0.2 от 20.03.2024'; type Point=auto class @@ -1205,7 +1204,7 @@ type begin Assert((pa.RowCount=pb.RowCount) and (pa.ColCount=pb.ColCount), 'Сложение MarixR: Несовпадение размеров'); - Result:=new Matrix(pa.RowCount,pa.RowCount); + Result:=new Matrix(pa.RowCount,pa.ColCount); for var i:=0 to pa.RowCount-1 do for var j:=0 to pa.ColCount-1 do Result.Value[i,j]:=pa.Value[i,j]+pb.Value[i,j] @@ -1550,7 +1549,7 @@ type else Result.Value:=MatrFill(RowCount,ColCount,MaxReal); end; - /// Решение системы линейных алнебраических уравнения (СЛАУ) + /// Решение системы линейных алгебраических уравнения (СЛАУ) function SLAU(vb:Vector; var cond:real):Vector; // Возвращает вектор, содержащий решение СЛАУ. // Заносит в cond число обусловленности исходной матрицы. diff --git a/_GenerateLinuxVersion.bat b/_GenerateLinuxVersion.bat index b65a61c3f..9a65d91dd 100644 --- a/_GenerateLinuxVersion.bat +++ b/_GenerateLinuxVersion.bat @@ -6,6 +6,7 @@ mkdir Release\PascalABCNETLinux\LibSource\ mkdir Release\PascalABCNETLinux\Lng\Rus mkdir Release\PascalABCNETLinux\Lng\Eng mkdir Release\PascalABCNETLinux\Highlighting\ +mkdir Release\PascalABCNETLinux\LanguageKits\ del Release\PascalABCNETLinux.zip diff --git a/bin/Lib/NumLibABC.pas b/bin/Lib/NumLibABC.pas index 5948da0bd..8f4cb7037 100644 --- a/bin/Lib/NumLibABC.pas +++ b/bin/Lib/NumLibABC.pas @@ -1,7 +1,6 @@ unit NumLibABC; -const &NumLibABCVersion = 'NumLibABC 1.0.1 от 14.09.2019'; -// предыдущая версия 1.0.0 от 06.09.2017 +const &NumLibABCVersion = 'NumLibABC 1.0.2 от 20.03.2024'; type Point=auto class @@ -1205,7 +1204,7 @@ type begin Assert((pa.RowCount=pb.RowCount) and (pa.ColCount=pb.ColCount), 'Сложение MarixR: Несовпадение размеров'); - Result:=new Matrix(pa.RowCount,pa.RowCount); + Result:=new Matrix(pa.RowCount,pa.ColCount); for var i:=0 to pa.RowCount-1 do for var j:=0 to pa.ColCount-1 do Result.Value[i,j]:=pa.Value[i,j]+pb.Value[i,j] @@ -1550,7 +1549,7 @@ type else Result.Value:=MatrFill(RowCount,ColCount,MaxReal); end; - /// Решение системы линейных алнебраических уравнения (СЛАУ) + /// Решение системы линейных алгебраических уравнения (СЛАУ) function SLAU(vb:Vector; var cond:real):Vector; // Возвращает вектор, содержащий решение СЛАУ. // Заносит в cond число обусловленности исходной матрицы. diff --git a/bin/Lib/WPF.pas b/bin/Lib/WPF.pas index 640559e0d..e8e9703d6 100644 --- a/bin/Lib/WPF.pas +++ b/bin/Lib/WPF.pas @@ -308,17 +308,18 @@ begin Result := Self; end; -function LoadFromXaml(fname: string): object; +function ParseXaml(s: string): object; begin - var s := ReadAllText(fname); var context := new ParserContext(); context.XmlnsDictionary.Add('','http://schemas.microsoft.com/winfx/2006/xaml/presentation'); context.XmlnsDictionary.Add('x', 'http://schemas.microsoft.com/winfx/2006/xaml'); - Result := System.Windows.Markup.XamlReader.Parse(ReadAllText(fname),nil); + Result := System.Windows.Markup.XamlReader.Parse(s,context); +end; - //var s := new System.IO.FileStream(fname, System.IO.FileMode.Open); - //Result := System.Windows.Markup.XamlReader.Load(s); - //s.Close(); +function LoadFromXaml(fname: string): object; +begin + var s := ReadAllText(fname); + Result := ParseXaml(s); end; // Функции создания элементов управления