From 50ad52023beea8b6491e41e9940ae2d6ce202716 Mon Sep 17 00:00:00 2001
From: Sun Serega <sunserega2@gmail.com>
Date: Sun, 10 Dec 2023 01:08:43 +0200
Subject: [PATCH 1/2] fix #2977

---
 bin/Lib/PABCSystem.pas | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

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

From a73dc92478951f4c9e491a507988f29360c393b3 Mon Sep 17 00:00:00 2001
From: Sun Serega <sunserega2@gmail.com>
Date: Sun, 10 Dec 2023 01:11:41 +0200
Subject: [PATCH 2/2] reference right issue

---
 bin/Lib/PABCSystem.pas | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas
index d2361d95e..071de6b66 100644
--- a/bin/Lib/PABCSystem.pas
+++ b/bin/Lib/PABCSystem.pas
@@ -618,7 +618,7 @@ type
   end;
   
 type 
-  //TODO #2982
+  //TODO #2983
   /// Тип диапазона целых
   IntRange = record(ICollection<integer>{, IReadOnlyCollection<integer>}, IEquatable<IntRange>)
   private
@@ -691,7 +691,7 @@ type
     
   end;
   
-  //TODO #2982
+  //TODO #2983
   /// Тип диапазона символов
   CharRange = record(ICollection<char>{, IReadOnlyCollection<char>}, IEquatable<CharRange>)
   private