From 89c9e3ee58a331947bf078d7fe70f67c9c7e37b6 Mon Sep 17 00:00:00 2001
From: miks1965 <miks@math.sfedu.ru>
Date: Thu, 18 Aug 2016 22:32:48 +0300
Subject: [PATCH] #267 bug fix

---
 Configuration/GlobalAssemblyInfo.cs           |   2 +-
 Configuration/Version.defs                    |   4 ++--
 PascalABCNET.axml                             |  22 ++++++++++++++++++
 ReleaseGenerators/PascalABCNET_version.nsh    |   2 +-
 .../TreeConversion/syntax_tree_visitor.cs     |  11 +++++++++
 bin/Lib/PABCRtl.dll                           | Bin 528896 -> 528896 bytes
 6 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs
index 6c10f07cb..5fac34288 100644
--- a/Configuration/GlobalAssemblyInfo.cs
+++ b/Configuration/GlobalAssemblyInfo.cs
@@ -15,7 +15,7 @@ internal static class RevisionClass
 	public const string Major = "3";
 	public const string Minor = "1";
 	public const string Build = "0";
-	public const string Revision = "1305";
+	public const string Revision = "1306";
 
         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 780be2fde..8fc06792c 100644
--- a/Configuration/Version.defs
+++ b/Configuration/Version.defs
@@ -1,4 +1,4 @@
-%COREVERSION%=0
-%REVISION%=1305
 %MINOR%=1
+%REVISION%=1306
+%COREVERSION%=0
 %MAJOR%=3
diff --git a/PascalABCNET.axml b/PascalABCNET.axml
index b98d933dd..dd94af723 100644
--- a/PascalABCNET.axml
+++ b/PascalABCNET.axml
@@ -1326,6 +1326,28 @@
           </Node>
         </Items>
       </Node>
+      <Node Name="visit(SyntaxTree.dot_node">
+        <FileName>\TreeConverter\TreeConversion\syntax_tree_visitor.cs</FileName>
+        <Text>public override void visit(SyntaxTree.dot_node _dot_node)</Text>
+        <OCtx>
+          <i Type="Method">public override void visit ( SyntaxTree . dot_node _dot_node )</i>
+          <i Type="ClassOrNamespace">public class syntax_tree_visitor : SyntaxTree . AbstractVisitor</i>
+          <i Type="ClassOrNamespace">namespace PascalABCCompiler . TreeConverter</i>
+          <i Type="CS_TreeNode">
+          </i>
+        </OCtx>
+      </Node>
+      <Node Name=" visit(SyntaxTree.indexer">
+        <FileName>\TreeConverter\TreeConversion\syntax_tree_visitor.cs</FileName>
+        <Text>public override void visit(SyntaxTree.indexer _indexer)</Text>
+        <OCtx>
+          <i Type="Method">public override void visit ( SyntaxTree . indexer _indexer )</i>
+          <i Type="ClassOrNamespace">public class syntax_tree_visitor : SyntaxTree . AbstractVisitor</i>
+          <i Type="ClassOrNamespace">namespace PascalABCCompiler . TreeConverter</i>
+          <i Type="CS_TreeNode">
+          </i>
+        </OCtx>
+      </Node>
     </Items>
   </Node>
 </AspectFile>
\ No newline at end of file
diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh
index 3d69a3a3a..68285ad4c 100644
--- a/ReleaseGenerators/PascalABCNET_version.nsh
+++ b/ReleaseGenerators/PascalABCNET_version.nsh
@@ -1 +1 @@
-!define VERSION '3.1.0.1305'
+!define VERSION '3.1.0.1306'
diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs
index 9e506aba4..6b9f5d33c 100644
--- a/TreeConverter/TreeConversion/syntax_tree_visitor.cs
+++ b/TreeConverter/TreeConversion/syntax_tree_visitor.cs
@@ -14454,6 +14454,17 @@ namespace PascalABCCompiler.TreeConverter
             }*/
             //end SSM 11/02/16
 
+            // SSM 18.08.16 - пробуем обработать захват enn[i] в yieldах где enn - поле класса и нуждается в переименовании
+            // Так же ниже делает lroman
+            if (_indexer.dereferencing_value is yield_unknown_ident)
+            {
+                var yui = (yield_unknown_ident)_indexer.dereferencing_value;
+                var av = ProcessUnknownIdent(yui);
+                var nodeToVisit = new indexer(av,_indexer.indexes);
+                visit(nodeToVisit);
+                return;
+            }
+
             //lroman
             if (_indexer.dereferencing_value is closure_substituting_node)
             {
diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll
index 47bda1e821f080ae287c98cb49f0c0d93533940e..6bc0ea2b4cc9db8a8b421fee869ef1476b423010 100644
GIT binary patch
delta 234
zcmV<G02Tj$q#%H#AdrXyb_}+Wi%kLw<AK_R+5v^y0=3!$>BoP2x8LxPp`EuAu8`Ei
z#vf+Xl+nXHqj#v6d_*k7xnFio*yRS51)Y>$Wguar-4U{TaWcrkq!!MUKLwzDW(zkX
zx;EhlbFx25(`_883tgL0E$DA=!*m{l5*H1}YWG3Njkn+6zN0C5O<vyAB97P8&sYT8
z?OKT2U2S}q<%<C?heOE&heOE(heOE)w?oMWy^Ro80Q?2kghob;guQSO9V0Zi5LXA>
kw*z(zwwLb?2pJGz<eWsy7MMV<W~7|5B$u+c7!L^O0$2-ervLx|

delta 234
zcmV<G02Tj$q#%H#AdrXydGxiBi%kM&iGkXM+5v^y0=3!$>BoOcE?wfy8*+elc=^zE
zYs{D5J48o!!ysdL_8+EYeU3T~_Gi56se(|bN|Em0CFpDVl!4U@PZRt`^tQCQJY=44
zh`40W5DYRkf|s`WkK8BHmD$<=Cej;dcyFl`RJa$^iw298+dYjr_9<kGZyV@a5QE99
zZV3SgStk7fPox0_heOE&heOE(heOE)w?oMWy^RnyHjt01HG@u{I70QA&$(E)5LXA>
kw*z_fwU_S>2pJIU&QFxY7dJtK5#6gD1whER7!L^O0?@8)tpET3