diff --git a/CodeCompletion/Testing.cs b/CodeCompletion/Testing.cs index 7bc65e7cc..cb0209351 100644 --- a/CodeCompletion/Testing.cs +++ b/CodeCompletion/Testing.cs @@ -1148,6 +1148,8 @@ public static void Test() if (Text.Replace("\r\n","\n") != Text2.Replace("\r\n","\n")) { int line = 1; + Text = Text.Replace("\r\n", "\n"); + Text2 = Text2.Replace("\r\n", "\n"); for (int i = 0; i < Math.Min(Text.Length, Text2.Length); i++) { if (Text[i] != Text2[i]) diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 35db7addf..bbeb7c4c7 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 = "3419"; + public const string Revision = "3421"; 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 1866a0792..80088e00a 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ %MINOR%=9 -%REVISION%=3419 +%REVISION%=3421 %COREVERSION%=0 %MAJOR%=3 diff --git a/PABCNetHelp/CreateHelp.bat b/PABCNetHelp/CreateHelp.bat index 1b05764f8..e5045f13c 100644 --- a/PABCNetHelp/CreateHelp.bat +++ b/PABCNetHelp/CreateHelp.bat @@ -3,6 +3,7 @@ cd DocGenForStandardUnits !GenDocGraphWPF.exe !GenDocWPFObjects.exe !GenDocGraph3D.exe +!GenDocCRT.exe cd .. "C:\Program Files (x86)\HTML Help Workshop\hhc.exe" PascalABCNETNew.hhp copy PascalABCNET.chm ..\bin\PascalABCNET.chm diff --git a/PABCNetHelp/DocGenForStandardUnits/!GenDocCRT.exe b/PABCNetHelp/DocGenForStandardUnits/!GenDocCRT.exe new file mode 100644 index 000000000..8a8176c80 Binary files /dev/null and b/PABCNetHelp/DocGenForStandardUnits/!GenDocCRT.exe differ diff --git a/PABCNetHelp/DocGenForStandardUnits/!GenDocCRT.pas b/PABCNetHelp/DocGenForStandardUnits/!GenDocCRT.pas new file mode 100644 index 000000000..e7a984399 --- /dev/null +++ b/PABCNetHelp/DocGenForStandardUnits/!GenDocCRT.pas @@ -0,0 +1,12 @@ +uses GenDocUnit; + +begin + fname := '..\..\bin\Lib\CRT.pas'; + RootOutputDirectory := 'PABCUnits\CRT\'; + Step1; + Step2; + Step3; + Step3_1; + Step4; + FinalStep; +end. \ No newline at end of file diff --git a/PABCNetHelp/DocGenForStandardUnits/!GenDocGraphWPF.exe b/PABCNetHelp/DocGenForStandardUnits/!GenDocGraphWPF.exe index 286e0b2e5..061efd45e 100644 Binary files a/PABCNetHelp/DocGenForStandardUnits/!GenDocGraphWPF.exe and b/PABCNetHelp/DocGenForStandardUnits/!GenDocGraphWPF.exe differ diff --git a/PABCNetHelp/DocGenForStandardUnits/GenDocUnit.pas b/PABCNetHelp/DocGenForStandardUnits/GenDocUnit.pas index d017bcfec..0b7a5e218 100644 --- a/PABCNetHelp/DocGenForStandardUnits/GenDocUnit.pas +++ b/PABCNetHelp/DocGenForStandardUnits/GenDocUnit.pas @@ -92,6 +92,15 @@ procedure Step2; WriteLines('__PABC1.pas',l); end; +function ClearParam(s: string): string; +begin + var ind := Pos('',s,ind + 1); + if (ind > 0) and (ind2 > 0) then + s := '///'; + Result := s; +end; + procedure Step3; const fname = '__PABC1.pas'; begin @@ -99,13 +108,19 @@ procedure Step3; var Prev: string := ''; foreach var s in ReadLines(fname) do begin - if Prev.StartsWith('/// ') and s.StartsWith('///') and not s.StartsWith('///-') then + // Если есть summary, то взять только внутренность + var s1 := s.Replace('','').Replace('',''); + // Если есть s <> '///').ToList; WriteLines('__PABC1-1.pas',l); end; diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html index ab7570deb..28e53e74c 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html @@ -33,6 +33,8 @@
         c1 c2 function Range(c1, c2: char; step: integer): sequence of char;
         c1 c2 step +function Range(a, b, step: real): sequence of real; +
         a b step function ReadSeqInteger(n: integer): sequence of integer;
         n , function ReadSeqInteger(prompt: string; n: integer): sequence of integer; diff --git a/PABCNetHelp/PABCUnits/CRT/Files/CRT constants.html b/PABCNetHelp/PABCUnits/CRT/Files/CRT constants.html new file mode 100644 index 000000000..1bfe6bd40 --- /dev/null +++ b/PABCNetHelp/PABCUnits/CRT/Files/CRT constants.html @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + +

CRT

+ + + + + + + + + + + + + + + + +
Black = 0; +
        
Blue = 1; +
        
Brown = 6; +
        
Cyan = 3; +
        
DarkGray = 8; +
        -
Green = 2; +
        
LightBlue = 9; +
        -
LightCyan = 11; +
        -
LightGray = 7; +
        -
LightGreen = 10; +
        -
LightMagenta = 13; +
        -
LightRed = 12; +
        
Magenta = 5; +
        
Red = 4; +
        
White = 15; +
        
Yellow = 14; +
        
+ \ No newline at end of file diff --git a/PABCNetHelp/PABCUnits/CRT/Files/CRT functions.html b/PABCNetHelp/PABCUnits/CRT/Files/CRT functions.html new file mode 100644 index 000000000..86f18265f --- /dev/null +++ b/PABCNetHelp/PABCUnits/CRT/Files/CRT functions.html @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + +

CRT

+ + + + + + + + + + + + + + + + + +
procedure ClearLine; +
        
procedure ClrScr; +
         ,
procedure Delay(ms: integer); +
         ms
procedure GotoXY(x, y: integer); +
         (x,y)
procedure HideCursor; +
        
function KeyPressed: boolean; +
         true . ReadKey
function ReadKey: char; +
        
procedure SetWindowCaption(s: string); +
        
procedure SetWindowSize(w, h: integer); +
        
procedure SetWindowTitle(s: string); +
        
procedure ShowCursor; +
        
procedure TextBackground(c: integer); +
        
procedure TextColor(c: integer); +
        
function WhereX: integer; +
         -
function WhereY: integer; +
         Y-
function WindowHeight: integer; +
        
function WindowWidth: integer; +
        
+ \ No newline at end of file diff --git a/PABCNetHelp/PABCUnits/CRT/index.html b/PABCNetHelp/PABCUnits/CRT/index.html new file mode 100644 index 000000000..59ebffc69 --- /dev/null +++ b/PABCNetHelp/PABCUnits/CRT/index.html @@ -0,0 +1,23 @@ + + + + + + + + + + + + +

CRT:

+ CRT . + , + . + +

 

+ + diff --git a/PABCNetHelp/Table of Contents New.hhc b/PABCNetHelp/Table of Contents New.hhc index 108348b33..9570d7c69 100644 --- a/PABCNetHelp/Table of Contents New.hhc +++ b/PABCNetHelp/Table of Contents New.hhc @@ -1277,12 +1277,29 @@ +
  • + + +
      +
    • + + + +
    • + + + +
    • + + + +
    • - +
    • @@ -1383,7 +1400,7 @@
      • - +
      • diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index a43dac2d6..6c85760b2 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.9.0.3419 +3.9.0.3421 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index a038b53b0..3f895faa7 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.9.0.3419' +!define VERSION '3.9.0.3421' diff --git a/TestSuite/CompilationSamples/CRT.pas b/TestSuite/CompilationSamples/CRT.pas index 013f7c6f6..2517d5556 100644 --- a/TestSuite/CompilationSamples/CRT.pas +++ b/TestSuite/CompilationSamples/CRT.pas @@ -15,22 +15,51 @@ interface System; const - Black = 0; +//{{{doc: Начало секции 0 }}} +// ----------------------------------------------------- +//>> Цветовые константы модуля CRT # CRT constants +// ----------------------------------------------------- + +/// Черный цвет + Black = 0; +/// Синий цвет Blue = 1; +/// Зеленый цвет Green = 2; +/// Бирюзовый цвет Cyan = 3; +/// Красный цвет Red = 4; +/// Малиновый цвет Magenta = 5; +/// Коричневый цвет Brown = 6; +/// Светло-серый цвет LightGray = 7; +/// Темно-серый цвет DarkGray = 8; +/// Светло-голубой цвет LightBlue = 9; +/// Светло-зеленый цвет LightGreen = 10; +/// Светло-бирюзовый цвет LightCyan = 11; +/// цвет LightRed = 12; +/// Светло-малиновый цвет LightMagenta = 13; +/// Желтый цвет Yellow = 14; +/// Белый цвет White = 15; +//{{{--doc: Конец секции 0 }}} + + +//{{{doc: Начало секции 1 }}} + +// ----------------------------------------------------- +//>> Подпрограммы модуля CRT # CRT functions +// ----------------------------------------------------- /// /// Задает заголовок консольного окна @@ -65,7 +94,6 @@ function WindowWidth: integer; /// /// Возвращает высоту экрана /// -/// function WindowHeight: integer; /// /// Возвращает Х-координату курсора @@ -110,6 +138,8 @@ procedure ClearLine; /// procedure Delay(ms: integer); +//{{{--doc: Конец секции 1 }}} + ///-- procedure __InitModule__; diff --git a/TestSuite/CompilationSamples/NUnitABC.pas b/TestSuite/CompilationSamples/NUnitABC.pas index 62db4591b..aa2c2dc76 100644 --- a/TestSuite/CompilationSamples/NUnitABC.pas +++ b/TestSuite/CompilationSamples/NUnitABC.pas @@ -24,6 +24,7 @@ procedure InitPABCSystem; RepeatAttribute = NUnit.Framework.RepeatAttribute; TestFixtureAttribute = NUnit.Framework.TestFixtureAttribute; ValuesAttribute = NUnit.Framework.ValuesAttribute; + SequentialAttribute = NUnit.Framework.SequentialAttribute; Assert = NUnit.Framework.Assert; Assume = NUnit.Framework.Assume; diff --git a/bin/Lib/CRT.pas b/bin/Lib/CRT.pas index 3ac48ff32..e934f1d11 100644 --- a/bin/Lib/CRT.pas +++ b/bin/Lib/CRT.pas @@ -15,22 +15,51 @@ interface System; const - Black = 0; +//{{{doc: Начало секции 0 }}} +// ----------------------------------------------------- +//>> Цветовые константы модуля CRT # CRT constants +// ----------------------------------------------------- + +/// Черный цвет + Black = 0; +/// Синий цвет Blue = 1; +/// Зеленый цвет Green = 2; +/// Бирюзовый цвет Cyan = 3; +/// Красный цвет Red = 4; +/// Малиновый цвет Magenta = 5; +/// Коричневый цвет Brown = 6; +/// Светло-серый цвет LightGray = 7; +/// Темно-серый цвет DarkGray = 8; +/// Светло-голубой цвет LightBlue = 9; +/// Светло-зеленый цвет LightGreen = 10; +/// Светло-бирюзовый цвет LightCyan = 11; +/// цвет LightRed = 12; +/// Светло-малиновый цвет LightMagenta = 13; +/// Желтый цвет Yellow = 14; +/// Белый цвет White = 15; +//{{{--doc: Конец секции 0 }}} + + +//{{{doc: Начало секции 1 }}} + +// ----------------------------------------------------- +//>> Подпрограммы модуля CRT # CRT functions +// ----------------------------------------------------- /// /// Задает заголовок консольного окна @@ -65,7 +94,6 @@ function WindowWidth: integer; /// /// Возвращает высоту экрана /// -/// function WindowHeight: integer; /// /// Возвращает Х-координату курсора @@ -110,6 +138,8 @@ procedure ClearLine; /// procedure Delay(ms: integer); +//{{{--doc: Конец секции 1 }}} + ///-- procedure __InitModule__; diff --git a/bin/Lib/CRT.xml b/bin/Lib/CRT.xml index f6e7029af..cbfda5b02 100644 --- a/bin/Lib/CRT.xml +++ b/bin/Lib/CRT.xml @@ -43,7 +43,7 @@ Возвращает высоту экрана - + Возвращает Х-координату курсора @@ -93,5 +93,53 @@ -- + + Черный цвет + + + Синий цвет + + + Зеленый цвет + + + Бирюзовый цвет + + + Красный цвет + + + Малиновый цвет + + + Коричневый цвет + + + Светло-серый цвет + + + Темно-серый цвет + + + Светло-голубой цвет + + + Светло-зеленый цвет + + + Светло-бирюзовый цвет + + + цвет + + + Светло-малиновый цвет + + + Желтый цвет + + + Белый цвет + \ No newline at end of file diff --git a/bin/Lib/NUnitABC.pas b/bin/Lib/NUnitABC.pas index 62db4591b..aa2c2dc76 100644 --- a/bin/Lib/NUnitABC.pas +++ b/bin/Lib/NUnitABC.pas @@ -24,6 +24,7 @@ procedure InitPABCSystem; RepeatAttribute = NUnit.Framework.RepeatAttribute; TestFixtureAttribute = NUnit.Framework.TestFixtureAttribute; ValuesAttribute = NUnit.Framework.ValuesAttribute; + SequentialAttribute = NUnit.Framework.SequentialAttribute; Assert = NUnit.Framework.Assert; Assume = NUnit.Framework.Assume; diff --git a/bin/PascalABCNET.chm b/bin/PascalABCNET.chm index 89a5679db..553790194 100644 Binary files a/bin/PascalABCNET.chm and b/bin/PascalABCNET.chm differ diff --git a/bin/PascalABCNET.chw b/bin/PascalABCNET.chw index b2f564072..119999ab9 100644 Binary files a/bin/PascalABCNET.chw and b/bin/PascalABCNET.chw differ