Merge branch 'master' into features/typeclasses-another-approach

Compiler/Compiler.cs

@@ -2306,7 +2306,7 @@ namespace PascalABCCompiler
             if (ClearAfterCompilation)
             ClearAll();
             
-            
+            if (!need_recompiled)
                 OnChangeCompilerState(this, CompilerState.Ready, null);
             if (ErrorsList.Count > 0)
             {

Compiler/PCU/PCUFileFormatVersion.cs

@@ -6,6 +6,6 @@ namespace PascalABCCompiler.PCU
 {
     public static class PCUFileFormatVersion
     {
-        public static System.Int16 Version = 115;
+        public static System.Int16 Version = 116;
     }
 }

Compiler/PCU/PCUReader.cs

@@ -2129,6 +2129,8 @@ namespace PascalABCCompiler.PCU
             //Читаем, является ли тип интерфейсом
             bool type_is_interface = (br.ReadByte() == 1);
 
+            bool type_is_class = (br.ReadByte() == 1);
+
             //Читаем, является ли тип делегатом
             bool type_is_delegate = (br.ReadByte() == 1);
 
@@ -2170,14 +2172,7 @@ namespace PascalABCCompiler.PCU
             type_node base_type = GetTypeReference();
             bool is_value_type = br.ReadBoolean();
 
-            //Читаем поддерживаемые интерфейсы
             List<SemanticTree.ITypeNode> interf_implemented = ReadImplementingInterfaces();
-            //int interf_count = br.ReadInt32();
-            //List<SemanticTree.ITypeNode> interf_implemented = new List<SemanticTree.ITypeNode>(interf_count);
-            //for (int i = 0; i < interf_count; i++)
-            //{
-            //    interf_implemented.Add(GetTypeReference());
-            //}
             constant_node low_val = null;
             constant_node upper_val = null;
             SemanticTree.type_access_level tal = (SemanticTree.type_access_level)br.ReadByte();
@@ -2203,12 +2198,10 @@ namespace PascalABCCompiler.PCU
                 }
                 iscope.TopInterfaceScopeArray = interf_scopes.ToArray();
             }
-            //ctn = new wrapped_common_type_node(this, base_type, name, tal, cun.namespaces[0], scope, null, offset);
-            //AddMember(ctn, offset);
-            //int_members.Insert(0,ctn);
             ctn.SetBaseType(base_type);
             ctn.IsInterface = type_is_interface;
             ctn.IsDelegate = type_is_delegate;
+            ctn.is_class = type_is_class;
             ctn.ImplementingInterfaces.AddRange(interf_implemented);
             ctn.internal_is_value = is_value_type;
             ctn.type_special_kind = tsk;
@@ -2252,7 +2245,6 @@ namespace PascalABCCompiler.PCU
             }
             br.ReadInt32();//comprehensive unit;
             ctn.attributes.AddRange(GetAttributes());
-            //common_namespace_node ns = cun.namespaces[0];
             byte flag = br.ReadByte();
             int def_prop_off = 0;
             if (flag == 1)
@@ -2266,10 +2258,6 @@ namespace PascalABCCompiler.PCU
                 SystemLibrary.SystemLibrary.type_constructor.AddOperatorsToDelegate(ctn, loc);
             }
 
-            //создаем scope для класса
-            //ctn = new wrapped_common_type_node(this, base_type, name, tal, ns, scope, loc, offset);
-            //members[offset] = ctn;
-            //AddMember(ctn, offset);
             class_names[ctn] = AddClassMemberNames(scope);
             if (flag == 1) ctn.default_property = GetPropertyNode(def_prop_off);
             //ivan
@@ -2309,11 +2297,6 @@ namespace PascalABCCompiler.PCU
                 ctn.add_internal_interface(dii);
             }
 
-            /*if (ctn.type_special_kind == PascalABCCompiler.SemanticTree.type_special_kind.array_wrapper)
-            {
-            	bounded_array_interface bai = new bounded_array_interface(oti_indexer, ctn.element_type, cpn, oti_indexer.lower_value.type, int_arr);
-				ctn.add_internal_interface(bai);
-            }*/
             if (type_is_interface)
             {
                 RestoreAllFields(ctn);
@@ -2333,10 +2316,6 @@ namespace PascalABCCompiler.PCU
                     }
                 }
             }
-            /*if (ctn.type_special_kind == SemanticTree.type_special_kind.array_wrapper)
-            {
-            	RestoreAllFields(ctn);
-            }*/
 
             return ctn;
         }

Compiler/PCU/PCUWriter.cs

@@ -2508,11 +2508,7 @@ namespace PascalABCCompiler.PCU
                 bw.Write(GetNameIndex(type));
             else
                 bw.Write(type.name);
-            /*if (type.base_type != null)
-             WriteTypeReference(type.base_type);
-            else*/
 
-            //Пишем, является ли данный класс интерфейсом
             if (type.IsInterface)
             {
                 bw.Write((byte)1);
@@ -2522,7 +2518,15 @@ namespace PascalABCCompiler.PCU
                 bw.Write((byte)0);
             }
 
-            //Пишем, является ли данный класс делегатом
+            if (type.is_class)
+            {
+                bw.Write((byte)1);
+            }
+            else
+            {
+                bw.Write((byte)0);
+            }
+
             if (type.IsDelegate)
             {
                 bw.Write((byte)1);
@@ -2553,9 +2557,6 @@ namespace PascalABCCompiler.PCU
 
             bw.Seek(GetSizeOfReference(type.base_type), SeekOrigin.Current);
 
-            //(ssyy) На кой чёрт это надо?
-            //WriteTypeReference(SystemLibrary.SystemLibrary.object_type);
-            //WriteTypeReference(type.base_type);
             bw.Write(type.internal_is_value);
 
             //Пишем поддерживаемые интерфейсы
@@ -2572,6 +2573,7 @@ namespace PascalABCCompiler.PCU
             bw.Write(type.IsAbstract);
             bw.Write(type.IsStatic);
             bw.Write(type.IsPartial);
+
             if (type.type_special_kind == SemanticTree.type_special_kind.diap_type)
             {
                 ordinal_type_interface oti = type.get_internal_interface(internal_interface_kind.ordinal_interface) as ordinal_type_interface;

Configuration/GlobalAssemblyInfo.cs

@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "7";
 	public const string Build = "1";
-	public const string Revision = "2721";
+	public const string Revision = "2736";
 
         public const string MainVersion = Major + "." + Minor;
 	public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

Configuration/Version.defs

@@ -1,4 +1,4 @@
-%MINOR%=7
-%REVISION%=2721
 %COREVERSION%=1
+%REVISION%=2736
+%MINOR%=7
 %MAJOR%=3

Release/pabcversion.txt

@@ -1 +1 @@
-3.7.1.2721
+3.7.1.2736

ReleaseGenerators/PABCRtl/PABCRtl.pas

@@ -5,7 +5,7 @@ uses
   ABCSprites, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman, 
   DrawManField, Events, FilesOperations, GraphABC, 
   GraphABCHelper, IniFile, PointerTools, PointRect, Robot, RobotField,
-  RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, PT4TaskMakerNET, RBDMUtils,
+  RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, PT4TaskMakerNET, RBDMUtils, SF, School, BlockFileOfT,
   FormsABC, Collections, Arrays, ClientServer, WPFObjects, Graph3D, GraphWPF, __RedirectIOMode, __RunMode, __RtlUtils;
 
 end.

ReleaseGenerators/PABCRtl/PABCRtl32.pas

@@ -5,7 +5,7 @@ uses
   ABCSprites, CRT, DMCollect, DMTaskMaker, DMZadan, Drawman, 
   DrawManField, Events, FilesOperations, GraphABC, 
   GraphABCHelper, IniFile, PointerTools, PointRect, Robot, RobotField,
-  RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, PT4, PT4TaskMakerNET, RBDMUtils,
+  RobotTaskMaker, RobotZadan, Sockets, Utils, VCL, Timers, PT4, PT4TaskMakerNET, RBDMUtils, SF, School, BlockFileOfT, 
   FormsABC, Collections, Arrays, ClientServer, Graph3D, GraphWPF, WPFObjects, __RedirectIOMode, __RunMode, __RtlUtils;
 
 end.

ReleaseGenerators/PT4/loaddat.txt

@@ -0,0 +1,12 @@
+RB
+DM
+ABegin
+AInteger
+ALoopFor
+ABoolean
+AIf
+ACase
+AWhile
+ASeries
+AExam
+=br

ReleaseGenerators/PascalABCNET_version.nsh

@@ -1 +1 @@
-!define VERSION '3.7.1.2721'
+!define VERSION '3.7.1.2736'

TestSuite/CompilationSamples/BlockFileOfT.pas

@@ -830,4 +830,13 @@ end;
 
 {$endregion Utils}
 
+///--
+procedure __InitModule__;
+begin
+end;
+
+///--
+procedure __FinalizeModule__;
+begin
+end;
 end.

TestSuite/CompilationSamples/NumLibABC.pas

@@ -2776,5 +2776,13 @@ end;
 {$endregion}
 
 //----------------------------------------
+///--
+procedure __InitModule__;
+begin
+end;
 
+///--
+procedure __FinalizeModule__;
+begin
+end;
 end.

TestSuite/CompilationSamples/PABCSystem.pas

@@ -492,6 +492,7 @@ type
     function ToString: string; override;
     class function operator implicit<T>(s: TypedSet): HashSet<T>;
     class function operator implicit<T>(s: HashSet<T>): TypedSet;
+    //class function operator implicit<T>(a: array of T): TypedSet;
     function Count: integer := ht.Count;
     procedure Print(delim: string := ' ');
     procedure Println(delim: string := ' ');
@@ -3369,6 +3370,17 @@ begin
   Result := ts; 
 end;
 
+///--
+{class function TypedSet.operator implicit<T>(a: array of T): TypedSet;
+begin
+  var ts := new TypedSet();
+  foreach key: T in a do
+  begin
+    ts.ht[key] := key;  
+  end;
+  Result := ts; 
+end;}
+
 ///--
 function TypedSet.ToString: string;
 var
@@ -5193,33 +5205,6 @@ begin
   Result := sb.ToString;
 end;}
 
-function ReadLexem(f: Text): string;
-begin
-  if f.fi = nil then
-    raise new System.IO.IOException(GetTranslation(FILE_NOT_ASSIGNED));
-  if f.sr = nil then 
-    raise new System.IO.IOException(GetTranslation(FILE_NOT_OPENED_FOR_READING));
-  var i: integer;
-  repeat
-    i := f.sr.Read();
-  until not char.IsWhiteSpace(char(i)); // pass spaces
-  if i=-1 then 
-    raise new System.IO.IOException(GetTranslation(READ_LEXEM_AFTER_END_OF_TEXT_FILE));
-  var c := char(i);
-  var sb := System.Text.StringBuilder.Create;
-  repeat
-    sb.Append(c);
-    i := f.sr.Peek();
-    if i = -1 then
-      break;
-    c := char(i);
-    if char.IsWhiteSpace(c) then
-      break;
-    f.sr.Read();
-  until False; // accumulate nonspaces
-  Result := sb.ToString;
-end;
-
 // -----------------------------------------------------
 //          IOStandardSystem: implementation
 // -----------------------------------------------------
@@ -6447,6 +6432,34 @@ begin
   Result := ReadBoolean(f);
   Readln(f);
 end;
+
+function ReadLexem(f: Text): string;
+begin
+  if f.fi = nil then
+    raise new System.IO.IOException(GetTranslation(FILE_NOT_ASSIGNED));
+  if f.sr = nil then 
+    raise new System.IO.IOException(GetTranslation(FILE_NOT_OPENED_FOR_READING));
+  var i: integer;
+  repeat
+    i := f.sr.Read();
+  until not char.IsWhiteSpace(char(i)); // pass spaces
+  if i=-1 then 
+    raise new System.IO.IOException(GetTranslation(READ_LEXEM_AFTER_END_OF_TEXT_FILE));
+  var c := char(i);
+  var sb := System.Text.StringBuilder.Create;
+  repeat
+    sb.Append(c);
+    i := f.sr.Peek();
+    if i = -1 then
+      break;
+    c := char(i);
+    if char.IsWhiteSpace(c) then
+      break;
+    f.sr.Read();
+  until False; // accumulate nonspaces
+  Result := sb.ToString;
+end;
+
 // -----------------------------------------------------
 //                   TextFile methods
 // -----------------------------------------------------
@@ -6982,6 +6995,7 @@ begin
   begin  
     f.sr := new StreamReader(f.fi.FullName, DefaultEncoding);
     (CurrentIOSystem as IOStandardSystem).tr := f.sr;
+    (CurrentIOSystem as IOStandardSystem).realbuflen := -1;
     _IsPipedRedirected := True;
     _IsPipedRedirectedQuery := True;
   end;  
@@ -7032,6 +7046,11 @@ begin
     f.sr.BaseStream.Position := 0;
     f.sr.DiscardBufferedData;
   end;
+  if f = input then
+  begin  
+    (CurrentIOSystem as IOStandardSystem).tr := f.sr;
+    (CurrentIOSystem as IOStandardSystem).realbuflen := -1;
+  end;  
 end;
 
 procedure Reset(f: Text; name: string) := Reset(f, name, DefaultEncoding);

TestSuite/CompilationSamples/PT4MakerNetX.pas

@@ -1,5 +1,5 @@
 /// Конструктор учебных заданий для задачника Programming Taskbook.
-/// Версия 1.6 от 28.07.2018 (С) М. Э. Абрамян, 2016-2018.
+/// Версия 1.7 от 28.10.2020 (С) М. Э. Абрамян, 2016-2020.
 /// Все компоненты конструктора могут вызываться либо как классовые методы класса pt, 
 /// либо как обычные константы и процедуры.
 unit PT4MakerNetX;
@@ -659,7 +659,7 @@ var
   yd, yr, ye, nd, nr, pr, wd: integer;
   nt, ut, fd, fr: boolean;
   fmt: string;
-  tasks := new List<MethodInfo>(100);
+  tasks := new List<MethodInfo>(200);
 
 procedure Show(s: string);
 begin
@@ -1214,6 +1214,7 @@ begin
       tasks.Add(e);
       GroupKey := GroupKey + Copy(e.Name, 5, 100);
     end; 
+  tasks := tasks.OrderBy(e -> e.Name).ToList;  // Сортировка задач! 
   if tasks.Count = 0 then
   begin
     Show('Группа ' + GroupName + ' не содержит заданий'#13#10+

TestSuite/CompilationSamples/SF.pas

@@ -1,5 +1,30 @@
 unit SF;
 
+type
+  int = integer;
+  bool = boolean;
+  bi = BigInteger;
+  FunI = () -> int;
+  FunR = () -> real;
+  FunS = () -> string;
+  FunII = int -> int;
+  FunIR = int -> real;
+  FunIS = int -> string;
+  FunRI = real -> int;
+  FunRR = real -> real;
+  FunRS = real -> string;
+  FunSI = string -> int;
+  FunSR = string -> real;
+  FunSS = string -> string;
+  Pred = () -> bool;
+  PredI = int -> bool;
+  PredR = real -> bool;
+  PredS = string -> bool;
+  Act = () -> ();
+  ProcI = int -> ();
+  ProcR = real -> ();
+  ProcS = string -> ();
+
 procedure Pr(params a: array of object) := Print(a);
 procedure Pr(o: object) := Print(o);
 procedure Pr(s: string) := Print(s);
@@ -126,6 +151,9 @@ function Av(Self: sequence of integer): real; extensionmethod := Self.Average;
 /// Возвращает среднее элементов последовательности
 function Av(Self: sequence of real): real; extensionmethod := Self.Average;
 
+/// Возвращает количество элементов последовательности
+function Cnt<T>(Self: sequence of T): integer; extensionmethod := Self.Count;
+
 function Dst<T>(Self: sequence of T): sequence of T; extensionmethod := Self.Distinct;
 
 function Ord<T>(Self: sequence of T): sequence of T; extensionmethod := Self.Order;
@@ -195,4 +223,15 @@ procedure Tr<T>(a: array of T; transform: T->T) := a.Transform(transform);
 function H<T>(Self: array of T): integer; extensionmethod := Self.High;
 
 
+///--
+procedure __InitModule__;
+begin
+end;
+
+///--
+procedure __FinalizeModule__;
+begin
+end;
+
+
 end.

TestSuite/CompilationSamples/School.pas

@@ -755,4 +755,13 @@ end;
 
 {$endregion}
 
+///--
+procedure __InitModule__;
+begin
+end;
+
+///--
+procedure __FinalizeModule__;
+begin
+end;
 end.

TestSuite/formatter_tests/input/PT4MakerNetX.pas

@@ -1,5 +1,5 @@
 /// Конструктор учебных заданий для задачника Programming Taskbook.
-/// Версия 1.6 от 28.07.2018 (С) М. Э. Абрамян, 2016-2018.
+/// Версия 1.7 от 28.10.2020 (С) М. Э. Абрамян, 2016-2020.
 /// Все компоненты конструктора могут вызываться либо как классовые методы класса pt, 
 /// либо как обычные константы и процедуры.
 unit PT4MakerNetX;
@@ -659,7 +659,7 @@ var
   yd, yr, ye, nd, nr, pr, wd: integer;
   nt, ut, fd, fr: boolean;
   fmt: string;
-  tasks := new List<MethodInfo>(100);
+  tasks := new List<MethodInfo>(200);
 
 procedure Show(s: string);
 begin
@@ -1214,6 +1214,7 @@ begin
       tasks.Add(e);
       GroupKey := GroupKey + Copy(e.Name, 5, 100);
     end; 
+  tasks := tasks.OrderBy(e -> e.Name).ToList;  // Сортировка задач! 
   if tasks.Count = 0 then
   begin
     Show('Группа ' + GroupName + ' не содержит заданий'#13#10+

TestSuite/units/u_questiondot1.pas

@@ -0,0 +1,7 @@
+unit u_questiondot1;
+
+type
+  t1 = class end;
+  
+  
+end.

TestSuite/usesunits/use_questiondot1.pas

@@ -0,0 +1,7 @@
+uses u_questiondot1;
+
+begin
+  var a: t1 := nil;
+  var s := a?.ToString;
+  assert(string.IsNullOrEmpty(s));
+end.

TreeConverter/NetWrappers/NetHelper.cs

@@ -1106,7 +1106,8 @@ namespace PascalABCCompiler.NetHelper
                             function_node fn = si.sym_info as function_node;
                             if ((fn.return_value_type == to || fn.return_value_type.original_generic == to) && 
                                 fn.parameters.Count == 1 && 
-                                (fn.parameters[0].type == from || fn.parameters[0].type.original_generic == from))
+                                (fn.parameters[0].type == from || fn.parameters[0].type.original_generic == from)
+                                || fn.parameters[0].type.type_special_kind == type_special_kind.array_kind && fn.parameters[0].type.element_type.is_generic_parameter)
                             {
                                 return fn;
                             }

TreeConverter/TreeRealization/types.cs

@@ -3662,7 +3662,8 @@ namespace PascalABCCompiler.TreeRealization
         //TODO: Доопределить.
         public override function_node get_implicit_conversion_to(type_node ctn)
         {
-            compiled_type_node cctn = ctn as compiled_type_node;
+            // То есть получается, что конвертировать откомпилированный тип в неоткомпилированный нельзя несмотря на то что есть extension оператор
+            var cctn = ctn as compiled_type_node;
             if (cctn == null)
             {
                 return null;
@@ -3673,6 +3674,17 @@ namespace PascalABCCompiler.TreeRealization
                 fn = NetHelper.NetHelper.get_implicit_conversion(this, this, cctn, scope);
                 if (fn is compiled_function_node)
                     _implicit_convertions_to.Add(cctn, fn);
+                else if (fn == null && this.type_special_kind == SemanticTree.type_special_kind.array_kind && this.base_type.Scope != null)
+                {
+                    fn = NetHelper.NetHelper.get_implicit_conversion(this.base_type as compiled_type_node, this.base_type as compiled_type_node, cctn, this.base_type.Scope as NetHelper.NetTypeScope);
+                    if (fn != null)
+                    {
+                        List<type_node> instance_params = new List<type_node>();
+                        instance_params.Add(this.element_type);
+                        fn = fn.get_instance(instance_params, false, null);
+                        return fn;
+                    }
+                }
                 else if (fn == null && (this.is_generic_type_instance || cctn.is_generic_type_instance))
                 {
                     List<type_node> instance_params1 = this.instance_params;

VisualPascalABCNET/Form1.cs

@@ -840,7 +840,7 @@ namespace VisualPascalABC
         private void StartMenuItem_Click(object sender, EventArgs e)
         {
             WorkbenchServiceFactory.RunService.Run(true);
-            if (VisualEnvironmentCompiler.Compiler != null && VisualEnvironmentCompiler.Compiler.ErrorsList.Count == 0)
+            /*if (VisualEnvironmentCompiler.Compiler != null && VisualEnvironmentCompiler.Compiler.ErrorsList.Count == 0)
             {
                 var Percent = VisualEnvironmentCompiler.Compiler.PABCCodeHealth;
                 if (Percent > 0)
@@ -856,33 +856,7 @@ namespace VisualPascalABC
                     var PM100 = 100 - Percent;
                     HealthLabel.BackColor = Color.FromArgb(c.R - PM100 - 20, c.G - PM100 - 20, c.B - PM100 - 20);
                 }
-            }
-                
-
-            /*if (VisualEnvironmentCompiler.StandartCompiler != null &&
-                VisualEnvironmentCompiler.StandartCompiler.LinesCompiled > 1000)
-                return;
-            var root = VisualEnvironmentCompiler?.StandartCompiler?.CurrentCompilationUnit?.SyntaxTree;
-
-            if (root == null)
-                return;
-            if (VisualEnvironmentCompiler.StandartCompiler.CurrentCompilationUnit.SemanticTree == null)
-                return;
-            var stat = new SyntaxVisitors.ABCStatisticsVisitor();
-            stat.ProcessNode(root);
-            var Percent = stat.CalcHealth(out int n, out int p);
-
-            if (Percent >= 100)
-            {
-                HealthLabel.Text = "";
-                return;
-            }
-            HealthLabel.Text = $"{Percent}%";
-
-            var c = SystemColors.Control;
-            var PM100 = 100 - Percent;
-            HealthLabel.BackColor = Color.FromArgb(c.R - PM100 - 20, c.G - PM100 - 20, c.B - PM100 - 20);
-            */
+            }*/
         }
 
         private void Form1_KeyUp(object sender, KeyEventArgs e)

bin/Lib/BlockFileOfT.pas

@@ -830,4 +830,13 @@ end;
 
 {$endregion Utils}
 
+///--
+procedure __InitModule__;
+begin
+end;
+
+///--
+procedure __FinalizeModule__;
+begin
+end;
 end.

bin/Lib/NumLibABC.pas

@@ -2776,5 +2776,13 @@ end;
 {$endregion}
 
 //----------------------------------------
+///--
+procedure __InitModule__;
+begin
+end;
 
+///--
+procedure __FinalizeModule__;
+begin
+end;
 end.

bin/Lib/PABCSystem.pas

@@ -492,6 +492,7 @@ type
     function ToString: string; override;
     class function operator implicit<T>(s: TypedSet): HashSet<T>;
     class function operator implicit<T>(s: HashSet<T>): TypedSet;
+    //class function operator implicit<T>(a: array of T): TypedSet;
     function Count: integer := ht.Count;
     procedure Print(delim: string := ' ');
     procedure Println(delim: string := ' ');
@@ -3369,6 +3370,17 @@ begin
   Result := ts; 
 end;
 
+///--
+{class function TypedSet.operator implicit<T>(a: array of T): TypedSet;
+begin
+  var ts := new TypedSet();
+  foreach key: T in a do
+  begin
+    ts.ht[key] := key;  
+  end;
+  Result := ts; 
+end;}
+
 ///--
 function TypedSet.ToString: string;
 var
@@ -5193,33 +5205,6 @@ begin
   Result := sb.ToString;
 end;}
 
-function ReadLexem(f: Text): string;
-begin
-  if f.fi = nil then
-    raise new System.IO.IOException(GetTranslation(FILE_NOT_ASSIGNED));
-  if f.sr = nil then 
-    raise new System.IO.IOException(GetTranslation(FILE_NOT_OPENED_FOR_READING));
-  var i: integer;
-  repeat
-    i := f.sr.Read();
-  until not char.IsWhiteSpace(char(i)); // pass spaces
-  if i=-1 then 
-    raise new System.IO.IOException(GetTranslation(READ_LEXEM_AFTER_END_OF_TEXT_FILE));
-  var c := char(i);
-  var sb := System.Text.StringBuilder.Create;
-  repeat
-    sb.Append(c);
-    i := f.sr.Peek();
-    if i = -1 then
-      break;
-    c := char(i);
-    if char.IsWhiteSpace(c) then
-      break;
-    f.sr.Read();
-  until False; // accumulate nonspaces
-  Result := sb.ToString;
-end;
-
 // -----------------------------------------------------
 //          IOStandardSystem: implementation
 // -----------------------------------------------------
@@ -6447,6 +6432,34 @@ begin
   Result := ReadBoolean(f);
   Readln(f);
 end;
+
+function ReadLexem(f: Text): string;
+begin
+  if f.fi = nil then
+    raise new System.IO.IOException(GetTranslation(FILE_NOT_ASSIGNED));
+  if f.sr = nil then 
+    raise new System.IO.IOException(GetTranslation(FILE_NOT_OPENED_FOR_READING));
+  var i: integer;
+  repeat
+    i := f.sr.Read();
+  until not char.IsWhiteSpace(char(i)); // pass spaces
+  if i=-1 then 
+    raise new System.IO.IOException(GetTranslation(READ_LEXEM_AFTER_END_OF_TEXT_FILE));
+  var c := char(i);
+  var sb := System.Text.StringBuilder.Create;
+  repeat
+    sb.Append(c);
+    i := f.sr.Peek();
+    if i = -1 then
+      break;
+    c := char(i);
+    if char.IsWhiteSpace(c) then
+      break;
+    f.sr.Read();
+  until False; // accumulate nonspaces
+  Result := sb.ToString;
+end;
+
 // -----------------------------------------------------
 //                   TextFile methods
 // -----------------------------------------------------
@@ -6982,6 +6995,7 @@ begin
   begin  
     f.sr := new StreamReader(f.fi.FullName, DefaultEncoding);
     (CurrentIOSystem as IOStandardSystem).tr := f.sr;
+    (CurrentIOSystem as IOStandardSystem).realbuflen := -1;
     _IsPipedRedirected := True;
     _IsPipedRedirectedQuery := True;
   end;  
@@ -7032,6 +7046,11 @@ begin
     f.sr.BaseStream.Position := 0;
     f.sr.DiscardBufferedData;
   end;
+  if f = input then
+  begin  
+    (CurrentIOSystem as IOStandardSystem).tr := f.sr;
+    (CurrentIOSystem as IOStandardSystem).realbuflen := -1;
+  end;  
 end;
 
 procedure Reset(f: Text; name: string) := Reset(f, name, DefaultEncoding);

bin/Lib/PT4MakerNetX.pas

@@ -1,5 +1,5 @@
 /// Конструктор учебных заданий для задачника Programming Taskbook.
-/// Версия 1.6 от 28.07.2018 (С) М. Э. Абрамян, 2016-2018.
+/// Версия 1.7 от 28.10.2020 (С) М. Э. Абрамян, 2016-2020.
 /// Все компоненты конструктора могут вызываться либо как классовые методы класса pt, 
 /// либо как обычные константы и процедуры.
 unit PT4MakerNetX;
@@ -659,7 +659,7 @@ var
   yd, yr, ye, nd, nr, pr, wd: integer;
   nt, ut, fd, fr: boolean;
   fmt: string;
-  tasks := new List<MethodInfo>(100);
+  tasks := new List<MethodInfo>(200);
 
 procedure Show(s: string);
 begin
@@ -1214,6 +1214,7 @@ begin
       tasks.Add(e);
       GroupKey := GroupKey + Copy(e.Name, 5, 100);
     end; 
+  tasks := tasks.OrderBy(e -> e.Name).ToList;  // Сортировка задач! 
   if tasks.Count = 0 then
   begin
     Show('Группа ' + GroupName + ' не содержит заданий'#13#10+

bin/Lib/SF.pas

@@ -1,5 +1,30 @@
 unit SF;
 
+type
+  int = integer;
+  bool = boolean;
+  bi = BigInteger;
+  FunI = () -> int;
+  FunR = () -> real;
+  FunS = () -> string;
+  FunII = int -> int;
+  FunIR = int -> real;
+  FunIS = int -> string;
+  FunRI = real -> int;
+  FunRR = real -> real;
+  FunRS = real -> string;
+  FunSI = string -> int;
+  FunSR = string -> real;
+  FunSS = string -> string;
+  Pred = () -> bool;
+  PredI = int -> bool;
+  PredR = real -> bool;
+  PredS = string -> bool;
+  Act = () -> ();
+  ProcI = int -> ();
+  ProcR = real -> ();
+  ProcS = string -> ();
+
 procedure Pr(params a: array of object) := Print(a);
 procedure Pr(o: object) := Print(o);
 procedure Pr(s: string) := Print(s);
@@ -126,6 +151,9 @@ function Av(Self: sequence of integer): real; extensionmethod := Self.Average;
 /// Возвращает среднее элементов последовательности
 function Av(Self: sequence of real): real; extensionmethod := Self.Average;
 
+/// Возвращает количество элементов последовательности
+function Cnt<T>(Self: sequence of T): integer; extensionmethod := Self.Count;
+
 function Dst<T>(Self: sequence of T): sequence of T; extensionmethod := Self.Distinct;
 
 function Ord<T>(Self: sequence of T): sequence of T; extensionmethod := Self.Order;
@@ -195,4 +223,15 @@ procedure Tr<T>(a: array of T; transform: T->T) := a.Transform(transform);
 function H<T>(Self: array of T): integer; extensionmethod := Self.High;
 
 
+///--
+procedure __InitModule__;
+begin
+end;
+
+///--
+procedure __FinalizeModule__;
+begin
+end;
+
+
 end.

bin/Lib/School.pas

@@ -755,4 +755,13 @@ end;
 
 {$endregion}
 
+///--
+procedure __InitModule__;
+begin
+end;
+
+///--
+procedure __FinalizeModule__;
+begin
+end;
 end.

bin/PT4/loaddat.txt

@@ -0,0 +1,12 @@
+RB
+DM
+ABegin
+AInteger
+ALoopFor
+ABoolean
+AIf
+ACase
+AWhile
+ASeries
+AExam
+=br