diff --git a/Compiler/ICompiler.cs b/Compiler/ICompiler.cs index 6b8f9344b..2e2f2a5e3 100644 --- a/Compiler/ICompiler.cs +++ b/Compiler/ICompiler.cs @@ -30,10 +30,10 @@ namespace PascalABCCompiler get; } - SemanticTree.IProgramNode SemanticTree + /*SemanticTree.IProgramNode SemanticTree { get; - } + }*/ uint LinesCompiled { @@ -104,9 +104,11 @@ namespace PascalABCCompiler void AddWarnings(List WarningList); - SyntaxTree.compilation_unit ParseText(string FileName, string Text, List ErrorList, List Warnings); + // Не нужно это в интерфейсе! Этого нет в RemoteCompiler! + // SyntaxTree.compilation_unit ParseText(string FileName, string Text, List ErrorList, List Warnings); - string GetSourceFileText(string FileName); + // Не нужно это в интерфейсе! Этого нет в RemoteCompiler! + // string GetSourceFileText(string FileName); CompilerType CompilerType { diff --git a/Compiler/RemoteCompiler.cs b/Compiler/RemoteCompiler.cs index 50a02953c..08c411c54 100644 --- a/Compiler/RemoteCompiler.cs +++ b/Compiler/RemoteCompiler.cs @@ -549,8 +549,9 @@ namespace PascalABCCompiler throw new NotSupportedException(); } } - - public PascalABCCompiler.SyntaxTree.compilation_unit ParseText(string FileName, string Text, List ErrorList, List Warnings) + + // SSM 2026 Исключил это из ICompiler + /*public PascalABCCompiler.SyntaxTree.compilation_unit ParseText(string FileName, string Text, List ErrorList, List Warnings) { throw new NotSupportedException(); } @@ -558,7 +559,7 @@ namespace PascalABCCompiler public string GetSourceFileText(string FileName) { throw new NotSupportedException(); - } + }*/ public PascalABCCompiler.SemanticTreeConverters.SemanticTreeConvertersController SemanticTreeConvertersController { diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 19e72651b..a736f7d37 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 = "11"; public const string Build = "0"; - public const string Revision = "3733"; + public const string Revision = "3736"; 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 5223bc4fb..ab3a46378 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=11 -%REVISION%=3733 %COREVERSION%=0 +%REVISION%=3736 +%MINOR%=11 %MAJOR%=3 diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 74618e375..b4b84f4c5 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.11.0.3733 +3.11.0.3736 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 9a2e34050..d679a77a0 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.11.0.3733' +!define VERSION '3.11.0.3736' diff --git a/ReleaseGenerators/RebuildStandartModulesMono.pas b/ReleaseGenerators/RebuildStandartModulesMono.pas index 0e46e96c6..f802a3be3 100644 --- a/ReleaseGenerators/RebuildStandartModulesMono.pas +++ b/ReleaseGenerators/RebuildStandartModulesMono.pas @@ -1,6 +1,6 @@ uses PABCSystem, PABCExtensions, __RedirectIOMode, __RunMode, - GraphABC,GraphABCHelper, + GraphABC,GraphABCHelper, ABCObjects, DMCollect, DMTaskMaker, DMZadan, Drawman, DrawManField, Robot, RobotField, RobotTaskMaker, RobotZadan, Events, FilesOperations, @@ -9,7 +9,7 @@ Sockets, Utils, Timers, Collections, Arrays, Core, ClientServer, Countries, ABCDatabases, - School, SF + School, SF, TurtleABC ; begin diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index 906316a60..66c05b319 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -11258,6 +11258,15 @@ begin end; end; +/// Возвращает первый элемент, удовлетворяющий условию, или значение по умолчанию, если ни одного такого элемента не найдено +function FirstOrDefault(self: sequence of T; pred: T -> boolean; defaultValue: T): T; extensionmethod; +begin + foreach var item in self do + if pred(item) then + Exit(item); + Result := defaultValue; +end; + /// Возвращает произведение элементов последовательности function Product(Self: sequence of real): real; extensionmethod; begin diff --git a/_GenerateLinuxVersion.bat b/_GenerateLinuxVersion.bat index 6659babe0..395383a9b 100644 --- a/_GenerateLinuxVersion.bat +++ b/_GenerateLinuxVersion.bat @@ -109,7 +109,6 @@ copy bin\Lib\SF.pcu Release\PascalABCNETLinux\Lib\SF.pcu copy bin\Lib\Speech.pcu Release\PascalABCNETLinux\Lib\Speech.pcu copy bin\Lib\Tasks.pcu Release\PascalABCNETLinux\Lib\Tasks.pcu copy bin\Lib\Timers.pcu Release\PascalABCNETLinux\Lib\Timers.pcu -copy bin\Lib\Turtle.pcu Release\PascalABCNETLinux\Lib\Turtle.pcu copy bin\Lib\TurtleABC.pcu Release\PascalABCNETLinux\Lib\TurtleABC.pcu copy bin\Lib\ABCDatabases.pas Release\PascalABCNETLinux\LibSource\ABCDatabases.pas @@ -145,7 +144,6 @@ copy bin\Lib\Sounds.pas Release\PascalABCNETLinux\LibSource\Sounds.pas copy bin\Lib\Speech.pas Release\PascalABCNETLinux\LibSource\Speech.pas copy bin\Lib\Tasks.pas Release\PascalABCNETLinux\LibSource\Tasks.pas copy bin\Lib\Timers.pas Release\PascalABCNETLinux\LibSource\Timers.pas -copy bin\Lib\Turtle.pas Release\PascalABCNETLinux\LibSource\Turtle.pas copy bin\Lib\TurtleABC.pas Release\PascalABCNETLinux\LibSource\TurtleABC.pas copy bin\Lib\TwoPanelsWindow.pas Release\PascalABCNETLinux\LibSource\TwoPanelsWindow.pas copy bin\Lib\XLSX.pas Release\PascalABCNETLinux\LibSource\XLSX.pas