diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index 6344bb059..acb2c5f1a 100644
--- a/Configuration/GlobalAssemblyInfo.cs
+++ b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "2";
 	public const string Minor = "2";
 	public const string Build = "0";
-	public const string Revision = "1019";
+	public const string Revision = "1022";
 
         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 19fd861c9..ccee83330 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
 %MINOR%=2
-%REVISION%=1019
+%REVISION%=1022
 %MAJOR%=2
 %COREVERSION%=0
diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
index f4cd15ac6..139ae233c 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascal.cs
@@ -2,7 +2,7 @@
 //  This CSharp output file generated by Gardens Point LEX
 //  Version:  1.1.3.301
 //  Machine:  SSM
-//  DateTime: 25.08.2015 22:41:39
+//  DateTime: 26.08.2015 21:42:03
 //  UserName: ?????????
 //  GPLEX input file <ABCPascal.lex>
 //  GPLEX frame file <embedded resource>
diff --git a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
index 226d1f438..b1e76c6e2 100644
--- a/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
+++ b/Parsers/PascalABCParserNewSaushkin/ABCPascalYacc.cs
@@ -2,7 +2,7 @@
 
 // GPPG version 1.3.6
 // Machine:  SSM
-// DateTime: 25.08.2015 22:41:40
+// DateTime: 26.08.2015 21:42:04
 // UserName: ?????????
 // Input file <ABCPascal.y>
 
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index 844cb1156..a3b110dcd 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '2.2.0.1019'
\ No newline at end of file
+!define VERSION '2.2.0.1022'
\ No newline at end of file
diff --git a/TreeConverter/TreeConversion/compilation_context.cs b/TreeConverter/TreeConversion/compilation_context.cs
index 3a15407d4..a3c2285b4 100644
--- a/TreeConverter/TreeConversion/compilation_context.cs
+++ b/TreeConverter/TreeConversion/compilation_context.cs
@@ -48,6 +48,7 @@ namespace PascalABCCompiler.TreeConverter
 	public class compilation_context
 	{
         private ContextState SavedContext = null; // сохраненный контекст, используется при переходе к другому контексту при компиляции и последующем возврате к первоначальному контексту
+        public Stack<ContextState> SavedContextStack = new Stack<ContextState>(); // SSM 26/08/15 - пробую сделать стек контекстов. Может, что-то надо удет клонировать?
 
         // Существуют 3 перехода вверх:
         // Из блока в раздел описаний до beginа этого блока (если это глобальный блок, то - на глобальный уровень). Обнуляется convertion_data_and_alghoritms.statement_list_stack. Поля func_stack и _ctn остаются нетронутыми
@@ -96,6 +97,8 @@ namespace PascalABCCompiler.TreeConverter
             SavedContext.member_decls = member_decls;
             SavedContext.types_predefined = _types_predefined;
             SavedContext.ret_value = syntax_tree_visitor.ret.get_result();
+
+            SavedContextStack.Push(SavedContext);
             // SavedContext.type_stack = type_stack;
 
             convertion_data_and_alghoritms.statement_list_stack = new statement_list_stack();
@@ -127,6 +130,7 @@ namespace PascalABCCompiler.TreeConverter
 
         public void RestoreCurrentContext()
         {
+            SavedContext = SavedContextStack.Pop();
             convertion_data_and_alghoritms.statement_list_stack = SavedContext.stlist_stack;
             _cmn = SavedContext.cmn;
             _ctn = SavedContext.ctn;
@@ -151,7 +155,8 @@ namespace PascalABCCompiler.TreeConverter
             _types_predefined = SavedContext.types_predefined;
             syntax_tree_visitor.ret.return_value(SavedContext.ret_value);
 
-            SavedContext = null;
+            if (SavedContextStack.Count == 0)
+                SavedContext = null;
             // type_stack = cs.type_stack; оно почему-то readonly - ну и ладно
         }
 
diff --git a/bin/AspectCore.dll b/bin/AspectCore.dll
index 39f6c0e88..3f1f0ddeb 100644
Binary files a/bin/AspectCore.dll and b/bin/AspectCore.dll differ
diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll
index a65531364..ab0577dfd 100644
Binary files a/bin/Lib/PABCRtl.dll and b/bin/Lib/PABCRtl.dll differ
diff --git a/bin/Lib/PABCSystem.axml b/bin/Lib/PABCSystem.axml
index a2166fc1f..98172c413 100644
--- a/bin/Lib/PABCSystem.axml
+++ b/bin/Lib/PABCSystem.axml
@@ -1,34 +1,114 @@
-<?xml version="1.0"?>
-<AspectFile xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <TreeRoot>
+<?xml version="1.0" encoding="utf-16"?>
+<AspectFile Version="2">
+  <PointOfInterest>
     <Items>
       <PointOfInterest>
         <Name>Раздел интерфейса</Name>
         <Items>
           <PointOfInterest>
-            <FileName>\PABCSystem.pas</FileName>
-            <Text>MaxShortInt = shortint.MaxValue;</Text>
             <Name>Стандартные константы</Name>
+            <FileName>\PABCSystem.pas</FileName>
+            <OuterContext>
+              <OuterContextItem Type="Defs">
+                <string>const</string>
+              </OuterContextItem>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
+            <InnerContext>
+              <InnerContextItem Type="Field">
+                <string>MaxShortInt</string>
+                <string>=</string>
+                <string>shortint</string>
+                <string>.</string>
+                <string>MaxValue</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>MaxByte</string>
+                <string>=</string>
+                <string>byte</string>
+                <string>.</string>
+                <string>MaxValue</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>MaxSmallInt</string>
+                <string>=</string>
+                <string>smallint</string>
+                <string>.</string>
+                <string>MaxValue</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>MaxWord</string>
+                <string>=</string>
+                <string>word</string>
+                <string>.</string>
+                <string>MaxValue</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>MaxLongWord</string>
+                <string>=</string>
+                <string>longword</string>
+                <string>.</string>
+                <string>MaxValue</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>MaxInt64</string>
+                <string>=</string>
+                <string>int64</string>
+                <string>.</string>
+                <string>MaxValue</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>MaxUInt64</string>
+                <string>=</string>
+                <string>uint64</string>
+                <string>.</string>
+                <string>MaxValue</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>MaxDouble</string>
+                <string>=</string>
+                <string>real</string>
+                <string>.</string>
+                <string>MaxValue</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>MinDouble</string>
+                <string>=</string>
+                <string>real</string>
+                <string>.</string>
+                <string>Epsilon</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>MaxReal</string>
+                <string>=</string>
+                <string>real</string>
+                <string>.</string>
+                <string>MaxValue</string>
+              </InnerContextItem>
+            </InnerContext>
             <Items />
-            <Note />
-            <Context>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>PAS_TreeNode</ParserClassName>
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Стандартные типы</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>object   = System.Object;</Text>
-            <Name>Стандартные типы</Name>
+            <OuterContext>
+              <OuterContextItem Type="Field">
+                <string>object</string>
+                <string>=</string>
+                <string>System</string>
+                <string>.</string>
+                <string>Object</string>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
             <Items>
               <PointOfInterest>
+                <Name>Классы коллекций</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>List&lt;T&gt; = System.Collections.Generic.List&lt;T&gt;;</Text>
-                <Name>Классы коллекций</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Field">
                     <string>List</string>
                     <string>&lt;</string>
                     <string>T</string>
@@ -44,37 +124,33 @@
                     <string>&lt;</string>
                     <string>T</string>
                     <string>&gt;</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Field</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
               <PointOfInterest>
+                <Name>Action, Func и Predicate</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>Action0 = System.Action;</Text>
-                <Name>Action, Func и Predicate</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Field">
                     <string>Action0</string>
                     <string>=</string>
                     <string>System</string>
                     <string>.</string>
                     <string>Action</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Field</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
               <PointOfInterest>
+                <Name>Regex</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>Regex = System.Text.RegularExpressions.Regex;</Text>
-                <Name>Regex</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Field">
                     <string>Regex</string>
                     <string>=</string>
                     <string>System</string>
@@ -84,52 +160,46 @@
                     <string>RegularExpressions</string>
                     <string>.</string>
                     <string>Regex</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Field</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
               <PointOfInterest>
+                <Name>Типы указателей</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>PBoolean  = ^boolean;//bool</Text>
-                <Name>Типы указателей</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Field">
                     <string>PBoolean</string>
                     <string>=</string>
                     <string>^</string>
                     <string>boolean</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Field</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
               <PointOfInterest>
+                <Name>Класс текстового файла</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>Text = class</Text>
-                <Name>Класс текстового файла</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Class">
                     <string>Text</string>
                     <string>=</string>
                     <string>class</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Class</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
               <PointOfInterest>
+                <Name>Класс стандартного множества</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>TypedSet = class (System.Collections.IEnumerable)</Text>
-                <Name>Класс стандартного множества</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Class">
                     <string>TypedSet</string>
                     <string>=</string>
                     <string>class</string>
@@ -140,35 +210,31 @@
                     <string>.</string>
                     <string>IEnumerable</string>
                     <string>)</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Class</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
               <PointOfInterest>
+                <Name>Класс AbstractBinaryFile</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>AbstractBinaryFile = class</Text>
-                <Name>Класс AbstractBinaryFile</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Class">
                     <string>AbstractBinaryFile</string>
                     <string>=</string>
                     <string>class</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Class</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
               <PointOfInterest>
+                <Name>Класс TypedFile</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>TypedFile = sealed class(AbstractBinaryFile)</Text>
-                <Name>Класс TypedFile</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Class">
                     <string>TypedFile</string>
                     <string>=</string>
                     <string>sealed</string>
@@ -176,19 +242,17 @@
                     <string>(</string>
                     <string>AbstractBinaryFile</string>
                     <string>)</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Class</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
               <PointOfInterest>
+                <Name>Класс BinaryFile</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>BinaryFile = sealed class(AbstractBinaryFile)</Text>
-                <Name>Класс BinaryFile</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Class">
                     <string>BinaryFile</string>
                     <string>=</string>
                     <string>sealed</string>
@@ -196,33 +260,19 @@
                     <string>(</string>
                     <string>AbstractBinaryFile</string>
                     <string>)</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Class</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
             </Items>
-            <Note />
-            <Context>
-              <ArrayOfString>
-                <string>object</string>
-                <string>=</string>
-                <string>System</string>
-                <string>.</string>
-                <string>Object</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>Field</ParserClassName>
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Функции работы со стандартными множествами</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function Union(s1, s2: TypedSet): TypedSet;</Text>
-            <Name>Функции работы со стандартными множествами</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Union</string>
                 <string>(</string>
@@ -234,24 +284,25 @@
                 <string>)</string>
                 <string>:</string>
                 <string>TypedSet</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Подпрограммы ввода read</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>//                  read - readln</Text>
-            <Name>Подпрограммы ввода read</Name>
+            <OuterContext>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
             <Items>
               <PointOfInterest>
+                <Name>Ввод из текстового файла</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>procedure Read(f: Text);</Text>
-                <Name>Ввод из текстового файла</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="MethodHeader">
                     <string>procedure</string>
                     <string>Read</string>
                     <string>(</string>
@@ -259,37 +310,28 @@
                     <string>:</string>
                     <string>Text</string>
                     <string>)</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>MethodHeader</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
             </Items>
-            <Note />
-            <Context>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>PAS_TreeNode</ParserClassName>
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Подпрограммы ввода write</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>//                  write - writeln</Text>
-            <Name>Подпрограммы ввода write</Name>
+            <OuterContext>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
             <Items />
-            <Note />
-            <Context>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>PAS_TreeNode</ParserClassName>
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Процедуры Print</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>procedure Print(params args: array of object);</Text>
-            <Name>Процедуры Print</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>procedure</string>
                 <string>Print</string>
                 <string>(</string>
@@ -300,19 +342,17 @@
                 <string>of</string>
                 <string>object</string>
                 <string>)</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Подпрограммы для работы с текстовыми файлами</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>procedure Assign(f: Text; name: string);</Text>
-            <Name>Подпрограммы для работы с текстовыми файлами</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>procedure</string>
                 <string>Assign</string>
                 <string>(</string>
@@ -324,19 +364,17 @@
                 <string>:</string>
                 <string>string</string>
                 <string>)</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Подпрограммы для работы с двоичными файлами</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>procedure Assign(f: AbstractBinaryFile; name: string);</Text>
-            <Name>Подпрограммы для работы с двоичными файлами</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>procedure</string>
                 <string>Assign</string>
                 <string>(</string>
@@ -348,19 +386,17 @@
                 <string>:</string>
                 <string>string</string>
                 <string>)</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Подпрограммы для работы с типизированными файлами</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function FilePos(f: TypedFile): int64;</Text>
-            <Name>Подпрограммы для работы с типизированными файлами</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>FilePos</string>
                 <string>(</string>
@@ -370,19 +406,17 @@
                 <string>)</string>
                 <string>:</string>
                 <string>int64</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Подпрограммы для работы с бестиповыми файлами</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function FilePos(f: BinaryFile): int64;</Text>
-            <Name>Подпрограммы для работы с бестиповыми файлами</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>FilePos</string>
                 <string>(</string>
@@ -392,36 +426,32 @@
                 <string>)</string>
                 <string>:</string>
                 <string>int64</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Cистемные подпрограммы</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function ParamCount: integer;</Text>
-            <Name>Cистемные подпрограммы</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>ParamCount</string>
                 <string>:</string>
                 <string>integer</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Функции для работы с именами файлов</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function ExtractFileName(fname: string): string;</Text>
-            <Name>Функции для работы с именами файлов</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>ExtractFileName</string>
                 <string>(</string>
@@ -431,19 +461,17 @@
                 <string>)</string>
                 <string>:</string>
                 <string>string</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Математические подпрограммы</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function Sign(x: shortint): integer;</Text>
-            <Name>Математические подпрограммы</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Sign</string>
                 <string>(</string>
@@ -453,19 +481,17 @@
                 <string>)</string>
                 <string>:</string>
                 <string>integer</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Подпрограммы для работы с символами и строками</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function Chr(a: byte): char;</Text>
-            <Name>Подпрограммы для работы с символами и строками</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Chr</string>
                 <string>(</string>
@@ -475,19 +501,17 @@
                 <string>)</string>
                 <string>:</string>
                 <string>char</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Общие подпрограммы</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>procedure Inc(var i: integer);</Text>
-            <Name>Общие подпрограммы</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>procedure</string>
                 <string>Inc</string>
                 <string>(</string>
@@ -496,19 +520,17 @@
                 <string>:</string>
                 <string>integer</string>
                 <string>)</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Подпрограммы для работы с динамическими массивами</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function Low(i: System.Array): integer;</Text>
-            <Name>Подпрограммы для работы с динамическими массивами</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Low</string>
                 <string>(</string>
@@ -520,19 +542,17 @@
                 <string>)</string>
                 <string>:</string>
                 <string>integer</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Подпрограммы для работы с последовательностями</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function Range(a,b: integer): IEnumerable&lt;integer&gt;;</Text>
-            <Name>Подпрограммы для работы с последовательностями</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Range</string>
                 <string>(</string>
@@ -547,130 +567,111 @@
                 <string>&lt;</string>
                 <string>integer</string>
                 <string>&gt;</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Подпрограммы для работы с Tuplами</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>//                Tuples</Text>
-            <Name>Подпрограммы для работы с Tuplами</Name>
+            <OuterContext>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
             <Items />
-            <Note />
-            <Context>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>PAS_TreeNode</ParserClassName>
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Подпрограммы работы со словарями</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>//                Dict</Text>
-            <Name>Подпрограммы работы со словарями</Name>
+            <OuterContext>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
             <Items />
-            <Note />
-            <Context>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>PAS_TreeNode</ParserClassName>
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Общедоступные переменные</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>CurrentIOSystem: IOSystem;</Text>
-            <Name>Общедоступные переменные</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="Field">
                 <string>CurrentIOSystem</string>
                 <string>:</string>
                 <string>IOSystem</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>Field</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
         </Items>
-        <Context />
       </PointOfInterest>
       <PointOfInterest>
+        <Name>Раздел реализации</Name>
         <FileName>\PABCSystem.pas</FileName>
         <Text>implementation</Text>
-        <Name>Раздел реализации</Name>
+        <OuterContext>
+          <OuterContextItem Type="PAS_TreeNode" />
+        </OuterContext>
         <Items />
-        <Note />
-        <Context>
-          <ArrayOfString />
-        </Context>
-        <ParserClassName>PAS_TreeNode</ParserClassName>
       </PointOfInterest>
       <PointOfInterest>
         <Name>Подсистема ввода-вывода</Name>
         <Items>
           <PointOfInterest>
+            <Name>Интерфейс IOSystem подсистемы ввода/вывода</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>/// Интерфейс подсистемы ввода/вывода</Text>
-            <Name>Интерфейс IOSystem подсистемы ввода/вывода</Name>
+            <OuterContext>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
             <Items />
-            <Note />
-            <Context>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>PAS_TreeNode</ParserClassName>
           </PointOfInterest>
           <PointOfInterest>
+            <Name>IOStandardSystem  = class(IOSystem)</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>IOStandardSystem = class(IOSystem)</Text>
-            <Name>IOStandardSystem  = class(IOSystem)</Name>
-            <Items>
-              <PointOfInterest>
-                <FileName>\PABCSystem.pas</FileName>
-                <Text>function IOStandardSystem.peek: integer;</Text>
-                <Name>IOStandardSystem - реализация</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
-                    <string>function</string>
-                    <string>IOStandardSystem</string>
-                    <string>.</string>
-                    <string>peek</string>
-                    <string>:</string>
-                    <string>integer</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Method</ParserClassName>
-              </PointOfInterest>
-            </Items>
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="Class">
                 <string>IOStandardSystem</string>
                 <string>=</string>
                 <string>class</string>
                 <string>(</string>
                 <string>IOSystem</string>
                 <string>)</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>Class</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items>
+              <PointOfInterest>
+                <Name>IOStandardSystem - реализация</Name>
+                <FileName>\PABCSystem.pas</FileName>
+                <Text>function IOStandardSystem.peek: integer;</Text>
+                <OuterContext>
+                  <OuterContextItem Type="Method">
+                    <string>function</string>
+                    <string>IOStandardSystem</string>
+                    <string>.</string>
+                    <string>peek</string>
+                    <string>:</string>
+                    <string>integer</string>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
+              </PointOfInterest>
+            </Items>
           </PointOfInterest>
         </Items>
-        <Context />
       </PointOfInterest>
       <PointOfInterest>
         <Name>Функции Seq</Name>
         <Items>
           <PointOfInterest>
-            <FileName>\PABCSystem.pas</FileName>
-            <Text>function Seq&lt;T&gt;(params a: array of T): array of T;</Text>
             <Name>Seq - интерфейс</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <FileName>\PABCSystem.pas</FileName>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Seq</string>
                 <string>&lt;</string>
@@ -688,19 +689,16 @@
                 <string>sequence</string>
                 <string>of</string>
                 <string>T</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
-            <FileName>\PABCSystem.pas</FileName>
-            <Text>function Seq&lt;T&gt;(params a: array of T): array of T;</Text>
             <Name>Seq - реализация</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <FileName>\PABCSystem.pas</FileName>
+            <OuterContext>
+              <OuterContextItem Type="Method">
                 <string>function</string>
                 <string>Seq</string>
                 <string>&lt;</string>
@@ -718,40 +716,75 @@
                 <string>sequence</string>
                 <string>of</string>
                 <string>T</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
         </Items>
-        <Context />
       </PointOfInterest>
       <PointOfInterest>
         <Name>Обработка ошибок в PABCSystem</Name>
         <Items>
           <PointOfInterest>
-            <FileName>\PABCSystem.pas</FileName>
-            <Text>WRITELN_IN_BINARYFILE_ERROR_MESSAGE = 'Операция Writeln не применима к бинарным файлам';</Text>
             <Name>Константы ошибок</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <FileName>\PABCSystem.pas</FileName>
+            <OuterContext>
+              <OuterContextItem Type="Defs">
+                <string>const</string>
+              </OuterContextItem>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
+            <InnerContext>
+              <InnerContextItem Type="Field">
                 <string>WRITELN_IN_BINARYFILE_ERROR_MESSAGE</string>
                 <string>=</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>Field</ParserClassName>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>InternalNullBasedArrayName</string>
+                <string>=</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>FILE_NOT_ASSIGNED</string>
+                <string>=</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>FILE_NOT_OPENED</string>
+                <string>=</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>FILE_NOT_OPENED_FOR_READING</string>
+                <string>=</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>FILE_NOT_OPENED_FOR_WRITING</string>
+                <string>=</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>RANGE_ERROR_MESSAGE</string>
+                <string>=</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>EOF_FOR_TEXT_WRITEOPENED</string>
+                <string>=</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>EOLN_FOR_TEXT_WRITEOPENED</string>
+                <string>=</string>
+              </InnerContextItem>
+              <InnerContextItem Type="Field">
+                <string>SEEKEOF_FOR_TEXT_WRITEOPENED</string>
+                <string>=</string>
+              </InnerContextItem>
+            </InnerContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>GetTranslation</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function GetTranslation(message: string): string;</Text>
-            <Name>GetTranslation</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="Method">
                 <string>function</string>
                 <string>GetTranslation</string>
                 <string>(</string>
@@ -761,13 +794,12 @@
                 <string>)</string>
                 <string>:</string>
                 <string>string</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>Method</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
         </Items>
-        <Context />
       </PointOfInterest>
       <PointOfInterest>
         <Name>Ввод-вывод в текстовый файл</Name>
@@ -776,13 +808,11 @@
             <Name>read (f: Text ...</Name>
             <Items>
               <PointOfInterest>
+                <Name>read(f: Text)</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>procedure read(f: Text);</Text>
-                <Name>read(f: Text)</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Method">
                     <string>procedure</string>
                     <string>read</string>
                     <string>(</string>
@@ -790,19 +820,17 @@
                     <string>:</string>
                     <string>Text</string>
                     <string>)</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Method</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
               <PointOfInterest>
+                <Name>read_lexem</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>function read_lexem(f: Text): string;</Text>
-                <Name>read_lexem</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Method">
                     <string>function</string>
                     <string>read_lexem</string>
                     <string>(</string>
@@ -812,19 +840,17 @@
                     <string>)</string>
                     <string>:</string>
                     <string>string</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Method</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
               <PointOfInterest>
+                <Name>procedure read(f: Text; var x: string);</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>procedure read(f: Text; var x: string);</Text>
-                <Name>procedure read(f: Text; var x: string);</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Method">
                     <string>procedure</string>
                     <string>read</string>
                     <string>(</string>
@@ -837,25 +863,22 @@
                     <string>:</string>
                     <string>string</string>
                     <string>)</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Method</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
             </Items>
-            <Context />
           </PointOfInterest>
           <PointOfInterest>
             <Name>write (f: Text ...</Name>
             <Items>
               <PointOfInterest>
+                <Name>procedure write(f: Text);</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>procedure write(f: Text);</Text>
-                <Name>procedure write(f: Text);</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Method">
                     <string>procedure</string>
                     <string>write</string>
                     <string>(</string>
@@ -863,19 +886,17 @@
                     <string>:</string>
                     <string>Text</string>
                     <string>)</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Method</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
               <PointOfInterest>
+                <Name>procedure write(f: Text; val: object);</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>procedure write(f: Text; val: object);</Text>
-                <Name>procedure write(f: Text; val: object);</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Method">
                     <string>procedure</string>
                     <string>write</string>
                     <string>(</string>
@@ -887,16 +908,14 @@
                     <string>:</string>
                     <string>object</string>
                     <string>)</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Method</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
             </Items>
-            <Context />
           </PointOfInterest>
         </Items>
-        <Context />
       </PointOfInterest>
       <PointOfInterest>
         <Name>Методы расширения</Name>
@@ -905,35 +924,29 @@
             <Name>Методы расширения для string</Name>
             <Items>
               <PointOfInterest>
+                <Name>Extension methods for String 1</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>//    Linq ext</Text>
-                <Name>Extension methods for String 1</Name>
+                <OuterContext>
+                  <OuterContextItem Type="PAS_TreeNode" />
+                </OuterContext>
                 <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>PAS_TreeNode</ParserClassName>
               </PointOfInterest>
               <PointOfInterest>
+                <Name>Операции со строками как методы расширения</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>// Extension methods for String</Text>
-                <Name>Операции со строками как методы расширения</Name>
+                <OuterContext>
+                  <OuterContextItem Type="PAS_TreeNode" />
+                </OuterContext>
                 <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>PAS_TreeNode</ParserClassName>
               </PointOfInterest>
               <PointOfInterest>
+                <Name>Extension methods for String 3 - read</Name>
                 <FileName>\PABCSystem.pas</FileName>
                 <Text>function string.ReadInteger(var from: integer): integer;</Text>
-                <Name>Extension methods for String 3 - read</Name>
-                <Items />
-                <Note />
-                <Context>
-                  <ArrayOfString>
+                <OuterContext>
+                  <OuterContextItem Type="Method">
                     <string>function</string>
                     <string>string</string>
                     <string>.</string>
@@ -946,50 +959,42 @@
                     <string>)</string>
                     <string>:</string>
                     <string>integer</string>
-                  </ArrayOfString>
-                  <ArrayOfString />
-                </Context>
-                <ParserClassName>Method</ParserClassName>
+                  </OuterContextItem>
+                  <OuterContextItem Type="" />
+                </OuterContext>
+                <Items />
               </PointOfInterest>
             </Items>
-            <Context />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Extension methods for BigInteger</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>// Extension methods for BigInteger</Text>
-            <Name>Extension methods for BigInteger</Name>
+            <OuterContext>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
             <Items />
-            <Note />
-            <Context>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>PAS_TreeNode</ParserClassName>
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Extension methods for IEnumerable&lt;T&gt;</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>// Extension methods for IEnumerable&lt;T&gt;</Text>
-            <Name>Extension methods for IEnumerable&lt;T&gt;</Name>
+            <OuterContext>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
             <Items />
-            <Note />
-            <Context>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>PAS_TreeNode</ParserClassName>
           </PointOfInterest>
         </Items>
-        <Context />
       </PointOfInterest>
       <PointOfInterest>
         <Name>Операции</Name>
         <Items>
           <PointOfInterest>
+            <Name>Операции над строками</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>procedure string.operator+=(var left: string; right: string);</Text>
-            <Name>Операции над строками</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="Method">
                 <string>procedure</string>
                 <string>string</string>
                 <string>.</string>
@@ -1006,19 +1011,17 @@
                 <string>:</string>
                 <string>string</string>
                 <string>)</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>Method</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Операции с IEnumerable&lt;T&gt;</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function System.Collections.Generic.IEnumerable&lt;T&gt;.operator+(a,b: IEnumerable&lt;T&gt;): IEnumerable&lt;T&gt;;</Text>
-            <Name>Операции с IEnumerable&lt;T&gt;</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="Method">
                 <string>function</string>
                 <string>System</string>
                 <string>.</string>
@@ -1048,19 +1051,17 @@
                 <string>&lt;</string>
                 <string>T</string>
                 <string>&gt;</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>Method</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Операции с BigInteger</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>procedure BigInteger.operator+=(var p: BigInteger; q: BigInteger);</Text>
-            <Name>Операции с BigInteger</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="Method">
                 <string>procedure</string>
                 <string>BigInteger</string>
                 <string>.</string>
@@ -1077,22 +1078,19 @@
                 <string>:</string>
                 <string>BigInteger</string>
                 <string>)</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>Method</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
         </Items>
-        <Context />
       </PointOfInterest>
       <PointOfInterest>
+        <Name>StructuredObjectToString</Name>
         <FileName>\PABCSystem.pas</FileName>
         <Text>function StructuredObjectToString(o: Object; n: integer := 0): string;</Text>
-        <Name>StructuredObjectToString</Name>
-        <Items />
-        <Note />
-        <Context>
-          <ArrayOfString>
+        <OuterContext>
+          <OuterContextItem Type="Method">
             <string>function</string>
             <string>StructuredObjectToString</string>
             <string>(</string>
@@ -1109,36 +1107,32 @@
             <string>)</string>
             <string>:</string>
             <string>string</string>
-          </ArrayOfString>
-          <ArrayOfString />
-        </Context>
-        <ParserClassName>Method</ParserClassName>
+          </OuterContextItem>
+          <OuterContextItem Type="" />
+        </OuterContext>
+        <Items />
       </PointOfInterest>
       <PointOfInterest>
+        <Name>read_lexem</Name>
         <FileName>\PABCSystem.pas</FileName>
         <Text>function read_lexem: string;// SSM 08.03.11 - пытаюсь исправить с peekом ситуацию с вводом '1 hello'. Должно работать</Text>
-        <Name>read_lexem</Name>
-        <Items />
-        <Note />
-        <Context>
-          <ArrayOfString>
+        <OuterContext>
+          <OuterContextItem Type="Method">
             <string>function</string>
             <string>read_lexem</string>
             <string>:</string>
             <string>string</string>
-          </ArrayOfString>
-          <ArrayOfString />
-        </Context>
-        <ParserClassName>Method</ParserClassName>
+          </OuterContextItem>
+          <OuterContextItem Type="" />
+        </OuterContext>
+        <Items />
       </PointOfInterest>
       <PointOfInterest>
+        <Name>Функция Ident</Name>
         <FileName>\PABCSystem.pas</FileName>
         <Text>function Ident&lt;T1&gt;(x: T1): T1;</Text>
-        <Name>Функция Ident</Name>
-        <Items />
-        <Note />
-        <Context>
-          <ArrayOfString>
+        <OuterContext>
+          <OuterContextItem Type="Method">
             <string>function</string>
             <string>Ident</string>
             <string>&lt;</string>
@@ -1151,19 +1145,17 @@
             <string>)</string>
             <string>:</string>
             <string>T</string>
-          </ArrayOfString>
-          <ArrayOfString />
-        </Context>
-        <ParserClassName>Method</ParserClassName>
+          </OuterContextItem>
+          <OuterContextItem Type="" />
+        </OuterContext>
+        <Items />
       </PointOfInterest>
       <PointOfInterest>
+        <Name>function Copy(a: &amp;Array)</Name>
         <FileName>\PABCSystem.pas</FileName>
         <Text>function Copy(a: &amp;Array): &amp;Array;</Text>
-        <Name>function Copy(a: &amp;Array)</Name>
-        <Items />
-        <Note />
-        <Context>
-          <ArrayOfString>
+        <OuterContext>
+          <OuterContextItem Type="Method">
             <string>function</string>
             <string>Copy</string>
             <string>(</string>
@@ -1173,53 +1165,52 @@
             <string>)</string>
             <string>:</string>
             <string>&amp;Array</string>
-          </ArrayOfString>
-          <ArrayOfString />
-        </Context>
-        <ParserClassName>Method</ParserClassName>
+          </OuterContextItem>
+          <OuterContextItem Type="" />
+        </OuterContext>
+        <Items />
       </PointOfInterest>
       <PointOfInterest>
+        <Name>procedure Sort</Name>
         <FileName>\PABCSystem.pas</FileName>
         <Text>procedure Sort(a: &amp;Array);</Text>
-        <Name>procedure Sort</Name>
-        <Items />
-        <Note />
-        <Context>
-          <ArrayOfString>
+        <OuterContext>
+          <OuterContextItem Type="MethodHeader">
             <string>procedure</string>
             <string>Sort</string>
+            <string>&lt;</string>
+            <string>T</string>
+            <string>&gt;</string>
             <string>(</string>
             <string>a</string>
             <string>:</string>
-            <string>&amp;Array</string>
+            <string>array</string>
+            <string>of</string>
+            <string>T</string>
             <string>)</string>
-          </ArrayOfString>
-          <ArrayOfString />
-        </Context>
-        <ParserClassName>MethodHeader</ParserClassName>
+          </OuterContextItem>
+          <OuterContextItem Type="PAS_TreeNode" />
+        </OuterContext>
+        <Items />
       </PointOfInterest>
       <PointOfInterest>
         <Name>BigInteger</Name>
         <Items>
           <PointOfInterest>
+            <Name>Операции с BigInteger</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>// Extension methods for BigInteger</Text>
-            <Name>Операции с BigInteger</Name>
+            <OuterContext>
+              <OuterContextItem Type="PAS_TreeNode" />
+            </OuterContext>
             <Items />
-            <Note />
-            <Context>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>PAS_TreeNode</ParserClassName>
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Abs</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function Abs(x: BigInteger): BigInteger;</Text>
-            <Name>Abs</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Abs</string>
                 <string>(</string>
@@ -1229,19 +1220,17 @@
                 <string>)</string>
                 <string>:</string>
                 <string>BigInteger</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Power</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function Power(x: BigInteger; y: integer): BigInteger;</Text>
-            <Name>Power</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Power</string>
                 <string>(</string>
@@ -1255,19 +1244,17 @@
                 <string>)</string>
                 <string>:</string>
                 <string>BigInteger</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Sqr</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function Sqr(x: BigInteger): BigInteger;</Text>
-            <Name>Sqr</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Sqr</string>
                 <string>(</string>
@@ -1277,19 +1264,17 @@
                 <string>)</string>
                 <string>:</string>
                 <string>BigInteger</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Odd</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function Odd(i: BigInteger): boolean;</Text>
-            <Name>Odd</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Odd</string>
                 <string>(</string>
@@ -1299,19 +1284,17 @@
                 <string>)</string>
                 <string>:</string>
                 <string>boolean</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Max</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function Max(a, b: BigInteger): BigInteger;</Text>
-            <Name>Max</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Max</string>
                 <string>(</string>
@@ -1323,19 +1306,17 @@
                 <string>)</string>
                 <string>:</string>
                 <string>BigInteger</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
           <PointOfInterest>
+            <Name>Min</Name>
             <FileName>\PABCSystem.pas</FileName>
             <Text>function Min(a, b: BigInteger): BigInteger;</Text>
-            <Name>Min</Name>
-            <Items />
-            <Note />
-            <Context>
-              <ArrayOfString>
+            <OuterContext>
+              <OuterContextItem Type="MethodHeader">
                 <string>function</string>
                 <string>Min</string>
                 <string>(</string>
@@ -1347,15 +1328,13 @@
                 <string>)</string>
                 <string>:</string>
                 <string>BigInteger</string>
-              </ArrayOfString>
-              <ArrayOfString />
-            </Context>
-            <ParserClassName>MethodHeader</ParserClassName>
+              </OuterContextItem>
+              <OuterContextItem Type="" />
+            </OuterContext>
+            <Items />
           </PointOfInterest>
         </Items>
-        <Context />
       </PointOfInterest>
     </Items>
-    <Context />
-  </TreeRoot>
+  </PointOfInterest>
 </AspectFile>
\ No newline at end of file
diff --git a/bin/PascalABCAspects.dll b/bin/PascalABCAspects.dll
index 739e50b40..9daff5aa8 100644
Binary files a/bin/PascalABCAspects.dll and b/bin/PascalABCAspects.dll differ