3.11.1.3743

Configuration/GlobalAssemblyInfo.cs

@@ -14,8 +14,8 @@ internal static class RevisionClass
 {
 	public const string Major = "3";
 	public const string Minor = "11";
-	public const string Build = "0";
-	public const string Revision = "3738";
+	public const string Build = "1";
+	public const string Revision = "3743";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

Configuration/Version.defs

@@ -1,4 +1,4 @@
-%COREVERSION%=0
-%REVISION%=3738
 %MINOR%=11
+%REVISION%=3743
+%COREVERSION%=1
 %MAJOR%=3

Release/pabcversion.txt

@@ -1 +1 @@
-3.11.0.3738
+3.11.1.3743

ReleaseGenerators/PascalABCNET_version.nsh

@@ -1 +1 @@
-!define VERSION '3.11.0.3738'
+!define VERSION '3.11.1.3743'

ReleaseGenerators/RebuildStandartModules.pas

@@ -19,7 +19,8 @@ uses
    OpenGLABC, OpenGL,
    BBCMicroBit, School, SF, TwoPanelsWindow, NUnitABC, PlotWPF, XLSX, LightPT, Tasks, Мозаика,
    TasksArr, TasksMatr, TasksStr, Tasks1Begin, Tasks1BoolIfCase, Tasks1Loops, Tasks1Arr,
-   WPF
+   WPF,
+   DataFrameABC, DataFrameABCCore
    ;
    
 begin

ReleaseGenerators/RebuildStandartModulesMono.pas

@@ -9,7 +9,8 @@
    Sockets, Utils, Timers, 
    Collections, Arrays, Core, ClientServer, Countries,
    ABCDatabases,
-   School, SF, TurtleABC
+   School, SF, TurtleABC,
+   DataFrameABC, DataFrameABCCore
    ;
    
 begin

ReleaseGenerators/sect_Core.nsh

@@ -179,6 +179,8 @@
     File ..\bin\Lib\Tasks1Loops.pcu
     File ..\bin\Lib\Tasks1Arr.pcu
     File ..\bin\Lib\WPF.pcu
+    File ..\bin\Lib\DataFrameABC.pcu
+    File ..\bin\Lib\DataFrameABCCore.pcu
 
     File ..\bin\Lib\PABCRtl.dll
     File ..\bin\Lib\HelixToolkit.Wpf.dll
@@ -272,6 +274,8 @@
     ${AddFile} "Tasks1Loops.pcu"
     ${AddFile} "Tasks1Arr.pcu"
     ${AddFile} "WPF.pcu"
+    ${AddFile} "DataFrameABC.pcu"
+    ${AddFile} "DataFrameABCCore.pcu"
 
     ${AddFile} "turtle.png"
 
@@ -401,6 +405,9 @@
     File ..\bin\Lib\XLSX.pas
     File ..\bin\Lib\Мозаика.pas
     File ..\bin\Lib\WPF.pas
+    File ..\bin\Lib\DataFrameABC.pas
+    File ..\bin\Lib\DataFrameABCCore.pas
+
 
     File ..\bin\Lib\__RedirectIOMode.vb
     File ..\bin\Lib\VBSystem.vb
@@ -481,6 +488,8 @@
     ${AddFile} "XLSX.pas"
     ${AddFile} "Мозаика.pas"
     ${AddFile} "WPF.pas"
+    ${AddFile} "DataFrameABC.pas"
+    ${AddFile} "DataFrameABCCore.pas"
 
     ${AddFile} "__RedirectIOMode.vb"
     ${AddFile} "VBSystem.vb"

TestSuite/CompilationSamples/LightPT.pas

@@ -559,6 +559,8 @@ procedure ConvertStringsToNumbersInOutputList;
 procedure FlattenOutput;
 /// Очистить выходной список от пробелов, возникающих в методах расширения типа a.Print. Очень редко очищать не надо при решении задач на символы с пробелами
 procedure ClearOutputListFromSpaces;
+/// Очистить выходной список от строк, содержащих только пробельные символы
+procedure ClearOutputListFromEmptyStrings;
 /// Отфильтровать в выходном списке только числа
 procedure FilterOnlyNumbers;
 /// Отфильтровать в выходном списке только числа и логические
@@ -2231,11 +2233,16 @@ var OutputListIsClearedFromSpaces := False;
 procedure ClearOutputListFromSpaces;
 begin
   if OutputListIsClearedFromSpaces then exit;
-  OutputList := OutputList.Where(s -> (not (s is string)) or ((s as string) <> ' ')).ToList;
+  OutputList := OutputList.Where(s -> (not (s is string)) or (string(s) <> ' ')).ToList;
   OutputList := OutputList.Where(s -> (not (s is char)) or ((char(s)) <> ' ')).ToList;
   OutputListIsClearedFromSpaces := True;
 end;
 
+procedure ClearOutputListFromEmptyStrings;
+begin
+  OutputList := OutputList.Where(ob -> not (ob is string) or (string(ob).Trim <> '')).ToList;
+end;
+
 procedure FilterOnlyNumbers;
 begin
   OutputList := OutputList.Where(x -> (x is integer) or (x is real) or (x is int64)).ToList;

TestSuite/CompilationSamples/PABCSystem.pas

@@ -1777,7 +1777,7 @@ function Sign(x: real): integer;
 ///--
 function Sign(x: BigInteger): integer;
 ///-function Abs(x: число): число;
-/// Возвращает модуль числа x
+/// Возвращает модуль числа
 function Abs(x: shortint): shortint;
 ///--
 function Abs(x: smallint): smallint;

TestSuiteAdditionalLanguages/SPythonTests/CompilationSamples/SPythonSystemPys.pys

@@ -15,4 +15,7 @@ def print(*args: obj, **kwargs: str):
     
     if len(args) != 0:
         pas_print(args[len(args) - 1])
-    pas_print(end)
+    pas_print(end)
+    
+#def divmod(a: int, b: int) -> (int,int) 
+#  := (a // b, a % b);

_RebuildReleaseAndRunTestsForGitHubActions.bat

@@ -57,9 +57,9 @@ cd ..\TestSuiteAdditionalLanguages\SPythonTests
 @IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 cd ..\..\bin
-pabcnetcclear GitIgnoreTester.pas
-GitIgnoreTester.exe NoWait
-@IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+rem pabcnetcclear GitIgnoreTester.pas
+rem GitIgnoreTester.exe NoWait
+rem @IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 cd ..
 
 GOTO EXIT