diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index 11e5d9de5..f438bea6a 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 = "3673"; + public const string Revision = "3676"; 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 032c2b919..d147780c6 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%MINOR%=11 -%REVISION%=3673 %COREVERSION%=0 +%REVISION%=3676 +%MINOR%=11 %MAJOR%=3 diff --git a/InstallerSamples/WhatsNew/3_11_1/CountOf_s.pas b/InstallerSamples/WhatsNew/3_11_1/CountOf_s.pas new file mode 100644 index 000000000..a1b718a87 --- /dev/null +++ b/InstallerSamples/WhatsNew/3_11_1/CountOf_s.pas @@ -0,0 +1,5 @@ +begin + var s := 'arara'; + s.CountOf('ara').Println; + s.CountOf('ara',allowOverlap := True).Println; +end. \ No newline at end of file diff --git a/InstallerSamples/WhatsNew/3_11_1/TurtleABCExample.pas b/InstallerSamples/WhatsNew/3_11_1/TurtleABCExample.pas new file mode 100644 index 000000000..724ccf799 --- /dev/null +++ b/InstallerSamples/WhatsNew/3_11_1/TurtleABCExample.pas @@ -0,0 +1,55 @@ +uses TurtleABC; + +begin + Mark; + SetScale(4); + SetOrigin(5,-35); + //SetOrigin(-20,-50); + Mark; + SetColor(Color.Blue); + Down; + + loop 4 do + begin + Forw(20); + Turn(90); + end; + + Up; + MoveTo(-30, 30); + Down; + SetColor(Color.Red); + + Mark; + loop 3 do + begin + Forw(15); + Turn(120); + end; + + Up; + MoveTo(30, 40); + Down; + SetColor(Color.Green); + + Mark; + loop 20 do + begin + Forw(30); + Turn(100); + end; + + Up; + MoveTo(-30, 90); + Mark; + Down; + SetColor(Color.Orange); + + loop 5 do + begin + Forw(30); + Turn(144); + end; + + DrawCoordPoints; +end. \ No newline at end of file diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Common subroutines.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Common subroutines.html index 1b200a4ee..d2c82a3d7 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Common subroutines.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Common subroutines.html @@ -1,5 +1,6 @@ + @@ -15,10 +16,12 @@

- +
function Between<T>(val, a, b: T): boolean; where T: IComparable<T>; -
         True, val a b () a b
+ +
         , +
        
function Between<T>(val, a, b: T; inclusive: boolean := true): boolean; where T: IComparable<T>; +
         True, val a b a b
function Clamp<T>(x,bottom,top: T): T; where T: IComparable<T>; +
         x [bottom, top]
function CommandLineArgs: array of string; -
         ,
procedure Dec(var i: integer);
         i 1
procedure Dec(var i: integer; n: integer); @@ -60,6 +63,6 @@
function Succ(x: ): ;
         x
procedure Swap<T>(var a, b: T); -
        
\ No newline at end of file diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for List T.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for List T.html index f4c2ab3bf..7666c7793 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for List T.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for List T.html @@ -15,6 +15,7 @@ +

@@ -22,9 +23,9 @@
         . , -1 function AdjacentFind<T>(Self: IList<T>; eq: (T,T)->boolean; start: integer := 0): integer;
         , eq, . , -1 -procedure Fill<T>(Self: List<T>; x: T); +function Fill<T>(Self: List<T>; x: T): List<T>;
         -procedure Fill<T>(Self: List<T>; f: integer->T); +function Fill<T>(Self: List<T>; f: integer->T): List<T>;
         , function IndexMax<T>(Self: List<T>; index: integer := 0): integer; where T: IComparable<T>;
         index @@ -56,17 +57,19 @@
         function RemoveLast<T>(Self: List<T>): List<T>;
         . , -procedure Replace<T>(Self: List<T>; oldValue, newValue: T); -
         +function Replace<T>(Self: List<T>; oldValue, newValue: T): List<T>; +
         function Shuffle<T>(Self: List<T>): List<T>;
         function Slice<T>(Self: List<T>; from, step: integer): List<T>;
         from step function Slice<T>(Self: List<T>; from, step, count: integer): List<T>;
         from step count -procedure Transform<T>(Self: List<T>; f: T->T); +function Swap<T>(Self: List<T>; i, j: integer): List<T>; +
         i j +function Transform<T>(Self: List<T>; f: T->T): List<T>;
         -procedure Transform<T>(Self: List<T>; f: (T,integer)->T); +function Transform<T>(Self: List<T>; f: (T,integer)->T): List<T>;
         \ No newline at end of file diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for array of T.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for array of T.html index 4fcf82e86..8fc7ca3f0 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for array of T.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for array of T.html @@ -29,10 +29,12 @@ + + @@ -144,9 +146,9 @@ function Min(Self: array of real): real;
         function Permutations<T>(Self: array of T): sequence of array of T; -
         , +
         function Permutations<T>(Self: sequence of T): sequence of array of T; -
         , +
         function Permutations<T>(Self: array of T; m: integer): sequence of array of T;
         n m function Permutations<T>(Self: sequence of T; m: integer): sequence of array of T; @@ -157,6 +159,8 @@
         m function RandomElement<T>(Self: array of T): T;
         +function Replace<T>(Self: array of T; oldValue, newValue: T): array of T; +
         function Shuffle<T>(Self: array of T): array of T;
         function Slice<T>(Self: array of T; from, step: integer): array of T; @@ -181,9 +185,11 @@
         procedure SortDescending<T>(Self: array of T; keySelector: T -> string);
         -procedure Transform<T>(Self: array of T; f: T->T); +function Swap<T>(Self: array of T; i, j: integer): array of T; +
         i j +function Transform<T>(Self: array of T; f: T->T): array of T;
         -procedure Transform<T>(Self: array of T; f: (T,integer)->T); +function Transform<T>(Self: array of T; f: (T,integer)->T): array of T;
         \ No newline at end of file diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for char.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for char.html index ee1351dce..532bf221b 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for char.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for char.html @@ -13,7 +13,7 @@

char

-
function Between(Self: char; a, b: char): boolean; + diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for integer.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for integer.html index 966c779c7..282dccb22 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for integer.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for integer.html @@ -18,7 +18,7 @@

integer

-
function Between(Self: char; a, b: char; inclusive: boolean := True): boolean;
         True
function Code(Self: char): integer;
         Unicode
function Between(Self: integer; a, b: integer): boolean; + diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for real.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for real.html index 234c3eafb..f15336653 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for real.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for real.html @@ -15,8 +15,8 @@

real

-
function Between(Self: integer; a, b: integer; inclusive: boolean := true): boolean;
         True
function Clamp(Self: integer; bottom,top: integer): integer;
         , bottom top
+
function Between(Self: real; a, b: real): boolean; -
         True [a,b]
+ - @@ -231,6 +235,8 @@
         . +
function Between(Self: real; a, b: real; inclusive: boolean := True): boolean; +
         True
function Ceil(Self: real): integer;
         ,
function Clamp(Self: real; bottom,top: real): real; diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for sequence of T.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for sequence of T.html index 303cb94a9..51efd899c 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for sequence of T.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for sequence of T.html @@ -19,6 +19,7 @@ + @@ -44,6 +45,7 @@ + @@ -143,6 +145,8 @@
        
function MinBy<T, TKey>(Self: sequence of T; keySelector: T -> TKey): T;
        
function None<T>(Self: sequence of T; pred: T->boolean): boolean; +
         True,
function Numerate<T>(Self: sequence of T): sequence of (integer, T);
        
function Numerate<T>(Self: sequence of T; from: integer): sequence of (integer, T); @@ -213,7 +217,7 @@
         ind.
function Sum(Self: sequence of BigInteger): BigInteger;
        
function Tabulate<T, T1>(Self: sequence of T; F: T->T1): sequence of (T, T1); +
function Tabulate<T, T1>(Self: sequence of T; f: T->T1): sequence of (T, T1);
        
function TakeLast<T>(Self: sequence of T; count: integer): sequence of T;
         count
function UnZipTuple<T, T1, T2, T3>(Self: sequence of (T, T1, T2, T3)): (sequence of T, sequence of T1, sequence of T2, sequence of T3);
         .
function Windowed<T>(Self: sequence of T; n: integer): sequence of array of T; +
         , n
function WriteLines(Self: sequence of string; fname: string): sequence of string;
        
function Zip<T, T1, T2, TRes>(Self: sequence of T; b: sequence of T1; c: sequence of T2; func: (T,T1,T2) -> TRes): sequence of TRes; diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for string.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for string.html index 73c75b87f..e82ff4112 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for string.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Extension methods for string.html @@ -1,5 +1,6 @@ + @@ -30,8 +31,10 @@

string

-
function Between(Self: string; a, b: string): boolean; + + + + + + + + + + + + + +
         [a,b], digits + +
function Between(Self: string; a, b: string; inclusive: boolean := True): boolean;
         True ( )
function CountOf(Self: string; substring: string; allowOverlap: boolean := false): integer; +
        
function IndicesOf(Self, SubS: string; overlay: boolean := False): sequence of integer;
         overlay ,
function InRange(Self: string; a, b: string): boolean; diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Math subroutines.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Math subroutines.html index 21b92c818..11943bd5d 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Math subroutines.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Math subroutines.html @@ -3,6 +3,8 @@ + + @@ -10,7 +12,12 @@ + + + + + @@ -26,8 +33,10 @@ + + @@ -47,6 +56,10 @@
         , x, -1<=x<=1
function ArcTan(x: real): real;
         , x
function Atan2(y, x: real): real; +
         ( ) X (x, y)
function Cbrt(x: real): real; +
         x (x < 0)
function Ceil(x: real): integer;
         >= x
function Cos(x: real): real; @@ -61,8 +74,26 @@
         <= x
function Frac(x: real): real;
         x
function GCD(a, b: integer): integer; +
        
function GCD(a, b: int64): int64; +
        
function GCD(a, b: BigInteger): BigInteger; +
         BigInteger
function Hypot(x, y: real): real; +
         x,y
function Int(x: real): real;
         x
function ISqrt(n: int64): int64; +
         n. r, r? ? n < (r+1)? n ,
function ISqrt(n: BigInteger): BigInteger; +
         n. r, r? ? n < (r+1)? n ,
function LCM(a, b: int64): int64; +
        
function LCM(a, b: BigInteger): BigInteger; +
         BigInteger
function Lerp(a, b, t: real): real; +
         [a, b] t ? [0, 1] t=0 a, t=1 b, t=0.5
function Ln(x: real): real;
         x
function Log(x: real): real; @@ -150,13 +181,17 @@
procedure Randomize;
        
function RandomReal(a, b: real; digits: integer := 2): real; -
         [a,b] c , digits
function Remap(x, a1, b1, a2, b2: real): real; +
         x [a1,b1] [a2,b2]
function Round(x: real): integer;
         x, . , ( ): Round(2.5)=2, Round(3.5)=4
function Round(x: real; digits: integer): real;
         x, digits
function RoundBigInteger(x: real): BigInteger;
         x,
procedure SetRandomSeed(seed: integer); +
         , seed. seed
function Sign(x: ): integer;
         -1, 0 +1 x
function Sin(x: real): real; diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Short functions Lst, HSet, SSet, Dict, KV.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Short functions Lst, HSet, SSet, Dict, KV.html index d6495751e..b8e1976c1 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Short functions Lst, HSet, SSet, Dict, KV.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Short functions Lst, HSet, SSet, Dict, KV.html @@ -19,21 +19,21 @@

Lst, LLst, HSet, SSet, Dict, KV

+
         (, ) +
         (, ), +
         (, ) +
         (, ), +
         +
         (, ) +
         (, ) +
         (, )
function Dict<TKey, TVal>(params pairs: array of KeyValuePair<TKey, TVal>): Dictionary<TKey, TVal>; -
         (, )
function Dict<TKey, TVal>(params pairs: array of (TKey, TVal)): Dictionary<TKey, TVal>; -
         (, )
function Dict<TKey, TVal>(pairs: sequence of KeyValuePair<TKey, TVal>): Dictionary<TKey, TVal>; -
         (, ),
function Dict<TKey, TVal>(pairs: sequence of (TKey, TVal)): Dictionary<TKey, TVal>; -
         (, ),
function Dict<TKey, TVal>(keys: sequence of TKey; values: sequence of TVal): Dictionary<TKey, TVal>; -
         (, ),
function DictInt(params pairs: array of (integer, integer)): Dictionary<integer, integer>; -
         (, )
function DictStr(params pairs: array of (string, string)): Dictionary<string, string>; -
         (, )
function DictStrInt(params pairs: array of (string, integer)): Dictionary<string, integer>; -
         (, )
function HSet<T>(params a: array of T): HashSet<T>;
         ,
function HSet<T>(a: sequence of T): HashSet<T>; diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T generation.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T generation.html index 27d7f2fdf..887bd0b48 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T generation.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T generation.html @@ -10,11 +10,11 @@ -

+

+
         ,
function Arr<T>(params a: array of T): array of T;
         ,
function Arr<T>(a: sequence of T): array of T; -
         ,
function Arr(a: IntRange): array of integer;
         ,
function Arr(a: CharRange): array of char; diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T.html index 5df3431a0..bc565fe5d 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for array of T.html @@ -14,25 +14,25 @@

+
         +
         +
         +
         +
         dim +
         +
         ; False, +
         +
         count, index +
         . +
         n- . +
         +
         +
         +
         +
         , cmp +
         , less +
         +
         +
         +
         +
         +
        
function ArrEqual<T>(a, b: array of T): boolean; -
        ,
function Copy(a: array of T): array of T; -
        
function High(a: array of T): integer; -
        
function Length(a: array of T): integer; -
        
function Length(a: array of T; dim: integer): integer; -
         dim
function Low(a: array of T): integer;
         0
function MatrEqual<T>(a, b: array [,] of T): boolean; -
        
function NextPermutation(a: array of integer): boolean; -
        
procedure Reverse<T>(a: array of T); -
        
procedure Reverse<T>(a: array of T; index, count: integer); -
         count, index
procedure Reverse<T>(a: List<T>);
        
procedure Reverse<T>(a: List<T>; index, count: integer); @@ -42,25 +42,25 @@
procedure Reverse(var s: string; index, count: integer);
         count , index
procedure SetLength(var a: array of T; n: integer); -
         .
procedure SetLength(var a: array [,...,] of T; n1,n2,...: integer); -
         n- .
procedure Shuffle<T>(a: array of T); -
        
procedure Shuffle<T>(l: List<T>); -
        
procedure Sort<T>(a: array of T); -
        
procedure Sort(a: array of string); -
        
procedure Sort<T>(a: array of T; cmp: (T,T)->integer); -
         , cmp
procedure Sort<T>(a: array of T; less: (T,T)->boolean); -
         , less
procedure Sort<T,TKey>(a: array of T; keySelector: T->TKey); -
        
procedure Sort<T>(a: array of T; keySelector: T->string); -
        
procedure Sort<T>(l: List<T>);
        
procedure Sort(var l: List<string>); @@ -74,13 +74,13 @@
procedure Sort<T>(var l: List<T>; keySelector: T->string);
        
procedure SortDescending<T>(a: array of T); -
        
procedure SortDescending(a: array of string); -
        
procedure SortDescending<T,T1>(var a: array of T; keySelector: T->T1); -
        
procedure SortDescending<T>(var a: array of T; keySelector: T->string); -
        
procedure SortDescending<T>(l: List<T>);
        
procedure SortDescending(var l: List<string>); diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for char.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for char.html index 6ee772752..0ff3eb8e8 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for char.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for char.html @@ -1,5 +1,6 @@ + @@ -7,6 +8,7 @@ + @@ -17,6 +19,8 @@

+ +
function Chr(a: word): char;
         Unicode
function ChrAnsi(a: byte): char; +
         Windows. . ChrWindows
function ChrUnicode(a: word): char;
         Unicode
function ChrWindows(a: byte): char; @@ -35,6 +39,8 @@
        
function Ord(a: char): word;
         Unicode
function OrdAnsi(a: char): byte; +
         Windows. . OrdWindows
function OrdUnicode(a: char): word;
         Unicode
function OrdWindows(a: char): byte; diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for matrixes.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for matrixes.html index b4b2bb3e5..8ce83d057 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for matrixes.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for matrixes.html @@ -11,7 +11,7 @@ -

+

+
         m x n , +
         m x n ,
function Matr<T>(m,n: integer; params data: array of T): array [,] of T;
         m x n,
function Matr<T>(params aa: array of array of T): array [,] of T; @@ -43,9 +43,9 @@
function MatrRandomReal(m: integer := 5; n: integer := 5; a: real := 0; b: real := 10; digits: integer := 2): array [,] of real;
         m x n,
function ReadMatrInteger(m, n: integer): array [,] of integer; -
         m n ,
function ReadMatrReal(m, n: integer): array [,] of real; -
         m n ,
function Transpose<T>(a: array [,] of T): array [,] of T;
        
diff --git a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html index c35279d7c..8e5265fcf 100644 --- a/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html +++ b/PABCNetHelp/LangGuide/PABCSystemUnit/Files/Subroutines for sequence generation.html @@ -1,6 +1,7 @@ + @@ -20,23 +21,25 @@

+
         , +
         , +
         , +
         , +
         +
         +
         +
         + +
        
function Cartesian<T, T1, TRes>(a: sequence of T; b: sequence of T1; func: (T,T1)->TRes): sequence of TRes; -
         ,
function Cartesian<T, T1, T2, TRes>(a: sequence of T; b: sequence of T1; c: sequence of T2; func: (T,T1,T2)->TRes): sequence of TRes; -
         ,
function Cartesian<T, T1, T2, T3, TRes>(a: sequence of T; b: sequence of T1; c: sequence of T2; d: sequence of T3; func: (T,T1,T2,T3)->TRes): sequence of TRes; -
         ,
function Cartesian<T, T1, T2, T3, T4, TRes>(a: sequence of T; b: sequence of T1; c: sequence of T2; d: sequence of T3; e: sequence of T4; func: (T,T1,T2,T3,T4)->TRes): sequence of TRes; -
         ,
function Cartesian<T, T1>(a: sequence of T; b: sequence of T1): sequence of (T, T1); -
        
function Cartesian<T, T1, T2>(a: sequence of T; b: sequence of T1; c: sequence of T2): sequence of (T, T1, T2); -
        
function Cartesian<T, T1, T2, T3>(a: sequence of T; b: sequence of T1; c: sequence of T2; d: sequence of T3): sequence of (T, T1, T2, T3); -
        
function Cartesian<T, T1, T2, T3, T4>(a: sequence of T; b: sequence of T1; c: sequence of T2; d: sequence of T3; e: sequence of T4): sequence of (T, T1, T2, T3, T4); -
        
function Iterate<T>(first: T; next: T->T): sequence of T;
         , first next
function Linspace(a, b: real; n: integer): sequence of real; +
         n a b ( numpy.linspace)
function PartitionPoints(a, b: real; n: integer): sequence of real;
         [a,b] n
function Range(a, b: integer): sequence of integer; @@ -78,7 +81,7 @@
function ReadSeqStringWhile(prompt: string; cond: string->boolean): sequence of string;
         ,
function Seq<T>(params a: array of T): sequence of T; -
        
function SeqFill<T>(count: integer; x: T): sequence of T;
         count x
function SeqGen<T>(count: integer; f: integer->T): sequence of T; diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 8c009b583..4dd76ab74 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.11.0.3673 +3.11.0.3676 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index 3b8a5800e..85fe93a58 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.11.0.3673' +!define VERSION '3.11.0.3676' diff --git a/TestSuite/CompilationSamples/PABCSystem.pas b/TestSuite/CompilationSamples/PABCSystem.pas index 95872fa60..d41300d78 100644 --- a/TestSuite/CompilationSamples/PABCSystem.pas +++ b/TestSuite/CompilationSamples/PABCSystem.pas @@ -1902,6 +1902,17 @@ function Lerp(a, b, t: real): real; /// Преобразует x из диапазона [a1,b1] в диапазон [a2,b2] с сохранением относительной позиции function Remap(x, a1, b1, a2, b2: real): real; +/// Возвращает наибольший общий делитель двух целых чисел +function GCD(a, b: integer): integer; +/// Возвращает наибольший общий делитель двух целых чисел +function GCD(a, b: int64): int64; +/// Возвращает наибольший общий делитель двух BigInteger +function GCD(a, b: BigInteger): BigInteger; +/// Возвращает наименьшее общее кратное двух целых чисел +function LCM(a, b: int64): int64; +/// Возвращает наименьшее общее кратное двух BigInteger +function LCM(a, b: BigInteger): BigInteger; + /// Инициализирует датчик псевдослучайных чисел procedure Randomize; /// Инициализирует датчик псевдослучайных чисел, используя значение seed. При одном и том же seed генерируются одинаковые псевдослучайные последовательности @@ -9525,6 +9536,48 @@ function Lerp(a, b, t: real): real := a + (b - a) * t; function Remap(x, a1, b1, a2, b2: real): real := a2 + (x - a1) * (b2 - a2) / (b1 - a1); +/// Возвращает наибольший общий делитель двух целых чисел +function GCD(a, b: integer): integer; +begin + var (x, y) := (Abs(a), Abs(b)); + while y <> 0 do + (x, y) := (y, x mod y); + Result := x; +end; + +/// Возвращает наибольший общий делитель двух больших целых чисел +function GCD(a, b: int64): int64; +begin + var (x, y) := (Abs(a), Abs(b)); + while y <> 0 do + (x, y) := (y, x mod y); + Result := x; +end; + +/// Возвращает наибольший общий делитель двух BigInteger +function GCD(a, b: BigInteger): BigInteger; +begin + var (x, y) := (Abs(a), Abs(b)); + while y <> 0 do + (x, y) := (y, x mod y); + Result := x; +end; + +/// Возвращает наименьшее общее кратное двух больших целых чисел +function LCM(a, b: int64): int64; +begin + if (a = 0) or (b = 0) then + Result := 0 + else Result := Abs(a div GCD(a, b)) * Abs(b); +end; + +/// Возвращает наименьшее общее кратное двух BigInteger +function LCM(a, b: BigInteger): BigInteger; +begin + if (a = 0) or (b = 0) then + Result := 0 + else Result := Abs(a div GCD(a, b)) * Abs(b); +end; procedure Randomize; begin @@ -13878,7 +13931,7 @@ begin Result := True; end; -/// Возвращает все перестановки множества элементов, заданного массивом +/// Возвращает все перестановки элементов массива function Permutations(Self: array of T): sequence of array of T; extensionmethod; begin var a := Self; @@ -13892,7 +13945,7 @@ begin until not NextPermutation(ind); end; -/// Возвращает все перестановки множества элементов, заданного последовательностью +/// Возвращает все перестановки элементов последовательности function Permutations(Self: sequence of T): sequence of array of T; extensionmethod; begin Result := Self.ToArray.Permutations @@ -15021,6 +15074,31 @@ begin Result := Self[Random(Self.Length)+1]; end; +/// Возвращает количество вхождений подстроки в строку +function CountOf(Self: string; substring: string; allowOverlap: boolean := false): integer; extensionmethod; +begin + if string.IsNullOrEmpty(substring) then + raise new System.ArgumentException('Подстрока не может быть пустой'); + + Result := 0; + var index := 0; + var substringLength := substring.Length; + + while true do + begin + index := Self.IndexOf(substring, index); + if index = -1 then + break; + + Result += 1; + + if allowOverlap then + index += 1 // Для пересекающихся вхождений сдвигаем на 1 символ + else index += substringLength; // Для непересекающихся - на длину подстроки + end; +end; + + ///-- function CreateSliceFromStringInternal(Self: string; from, step, count: integer): string; begin diff --git a/TestSuite/CompilationSamples/TurtleABC.pas b/TestSuite/CompilationSamples/TurtleABC.pas index bd82ffbbc..06efb8074 100644 --- a/TestSuite/CompilationSamples/TurtleABC.pas +++ b/TestSuite/CompilationSamples/TurtleABC.pas @@ -65,7 +65,7 @@ procedure SetScale(s: real); procedure SetOrigin(x,y: real); /// Рисует точки в целочисленных координатах на всём экране -procedure DrawCoordPoints; +procedure DrawCoordPoints(R: integer := 0; DotsColor: GraphABC.Color := Color.Black); implementation @@ -199,9 +199,8 @@ begin GraphABC.MoveTo(Round(screenOriginX),Round(screenOriginY)); end; -procedure DrawCoordPoints; +procedure DrawCoordPoints(R: integer; DotsColor: GraphABC.Color); begin - SetColor(color.Gray); var x1 := screenOriginX; while x1 >= 0 do x1 -= scale; @@ -223,13 +222,15 @@ begin Swap(yy1,yy2); LockDrawing; + Brush.Color := DotsColor; for var x := xx1 to xx2 do for var y := yy1 to yy2 do begin var screenX := RealToScreenX(x); var screenY := RealToScreenY(y); - Brush.Color := Color.Black; - PutPixel(screenX,screenY,Color.Black); + if R = 0 then + PutPixel(screenX,screenY,DotsColor) + else FillCircle(screenX,screenY,R) end; UnLockDrawing end; diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas index daf2d676e..d41300d78 100644 --- a/bin/Lib/PABCSystem.pas +++ b/bin/Lib/PABCSystem.pas @@ -15074,6 +15074,31 @@ begin Result := Self[Random(Self.Length)+1]; end; +/// Возвращает количество вхождений подстроки в строку +function CountOf(Self: string; substring: string; allowOverlap: boolean := false): integer; extensionmethod; +begin + if string.IsNullOrEmpty(substring) then + raise new System.ArgumentException('Подстрока не может быть пустой'); + + Result := 0; + var index := 0; + var substringLength := substring.Length; + + while true do + begin + index := Self.IndexOf(substring, index); + if index = -1 then + break; + + Result += 1; + + if allowOverlap then + index += 1 // Для пересекающихся вхождений сдвигаем на 1 символ + else index += substringLength; // Для непересекающихся - на длину подстроки + end; +end; + + ///-- function CreateSliceFromStringInternal(Self: string; from, step, count: integer): string; begin diff --git a/bin/Lib/TurtleABC.pas b/bin/Lib/TurtleABC.pas index bd82ffbbc..06efb8074 100644 --- a/bin/Lib/TurtleABC.pas +++ b/bin/Lib/TurtleABC.pas @@ -65,7 +65,7 @@ procedure SetScale(s: real); procedure SetOrigin(x,y: real); /// Рисует точки в целочисленных координатах на всём экране -procedure DrawCoordPoints; +procedure DrawCoordPoints(R: integer := 0; DotsColor: GraphABC.Color := Color.Black); implementation @@ -199,9 +199,8 @@ begin GraphABC.MoveTo(Round(screenOriginX),Round(screenOriginY)); end; -procedure DrawCoordPoints; +procedure DrawCoordPoints(R: integer; DotsColor: GraphABC.Color); begin - SetColor(color.Gray); var x1 := screenOriginX; while x1 >= 0 do x1 -= scale; @@ -223,13 +222,15 @@ begin Swap(yy1,yy2); LockDrawing; + Brush.Color := DotsColor; for var x := xx1 to xx2 do for var y := yy1 to yy2 do begin var screenX := RealToScreenX(x); var screenY := RealToScreenY(y); - Brush.Color := Color.Black; - PutPixel(screenX,screenY,Color.Black); + if R = 0 then + PutPixel(screenX,screenY,DotsColor) + else FillCircle(screenX,screenY,R) end; UnLockDrawing end; diff --git a/bin/PascalABCNET.chm b/bin/PascalABCNET.chm index 4f6d35a5b..089e00746 100644 Binary files a/bin/PascalABCNET.chm and b/bin/PascalABCNET.chm differ