diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas index 429ceadf7..ae61b86a1 100644 --- a/bin/Lib/PABCSystem.pas +++ b/bin/Lib/PABCSystem.pas @@ -618,8 +618,9 @@ type end; type + //TODO #2983 /// Тип диапазона целых - IntRange = record(ICollection, IReadOnlyCollection, IEquatable) + IntRange = record(ICollection{, IReadOnlyCollection}, IEquatable) private l,h: integer; public @@ -690,8 +691,9 @@ type end; + //TODO #2983 /// Тип диапазона символов - CharRange = record(ICollection, IReadOnlyCollection, IEquatable) + CharRange = record(ICollection{, IReadOnlyCollection}, IEquatable) private l,h: char; public @@ -5188,17 +5190,17 @@ function HSet(a: sequence of T): HashSet := new HashSet(a); function SSet(a: sequence of T): SortedSet := new SortedSet(a); -function HSetInt(params a: array of integer): HashSet := a.ToHashSet; +function HSetInt(params a: array of integer): HashSet := new HashSet(a); -function HSetStr(params a: array of string): HashSet := a.ToHashSet; +function HSetStr(params a: array of string): HashSet := new HashSet(a); function SSetInt(params a: array of integer): SortedSet := new SortedSet(a); function SSetStr(params a: array of string): SortedSet := new SortedSet(a); -function HSet(a: IntRange): HashSet := a.ToHashSet; +function HSet(a: IntRange): HashSet := new HashSet(a); -function HSet(a: CharRange): HashSet := a.ToHashSet; +function HSet(a: CharRange): HashSet := new HashSet(a); function Dict(params pairs: array of KeyValuePair): Dictionary;