From df3274d578969e9dbd2472b4700de9a25d76c91c Mon Sep 17 00:00:00 2001
From: miks1965 <miks@math.sfedu.ru>
Date: Thu, 12 Jan 2017 15:42:16 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=20=D1=80=D0=B0=D1=81=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D0=B8=20=D1=84=D0=B0=D0=B9=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D0=B2=D0=B8=D0=B7=D0=B8=D1=82=D0=BE=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2,=20=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D0=B0=20=D0=BE=D1=82=20=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=D1=85=20references,=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B5=D0=BA=D1=82=20YieldConversionSyntax=20=D1=83?=
 =?UTF-8?q?=D0=B6=D0=B5=20=D0=BD=D0=B5=20=D0=BD=D1=83=D0=B6=D0=B5=D0=BD=20?=
 =?UTF-8?q?-=20=D0=B2=D1=81=D0=B5=20=D0=B5=D0=B3=D0=BE=20=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B8=D1=82=D0=BE=D1=80=D1=8B=20=D0=BF=D0=BE=D0=B4=D0=BA?=
 =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B0=D1=8E=D1=82=D1=81=D1=8F=20=D1=8F=D0=B2?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=B2=20StandardSyntaxConverter.cs,=20ObjectCop?=
 =?UTF-8?q?ier=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=20?=
 =?UTF-8?q?=D0=B2=20=D0=BF=D0=BE=D0=B4=D0=BF=D0=B0=D0=BF=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SyntaxTreeConvertersController.cs         |   2 +-
 ...ExprWithLambdaInForeachSequenceVisitor.cs} |   0
 .../StandardSyntaxConverter.cs                |   9 ++++++++-
 .../StandardSyntaxTreeConverter.csproj        |  10 +++++++++-
 SyntaxVisitors/SyntaxVisitors.csproj          |  11 +----------
 .../SimplePrettyPrinterVisitor.cs             |   5 -----
 .../ObjectCopier}/ObjectCopier.cs             |   0
 .../YieldConversionSyntax.csproj              |   4 ----
 .../YieldDesugarSyntaxTreeConverter.cs        |   4 ++--
 bin/Lib/PABCRtl.dll                           | Bin 545280 -> 545280 bytes
 10 files changed, 21 insertions(+), 24 deletions(-)
 rename StandardSyntaxTreeConverter/{StandOutExprWithLambdaInForeachSequenceConverter.cs => StandOutExprWithLambdaInForeachSequenceVisitor.cs} (100%)
 rename SyntaxVisitors/{ => YieldVisitors/ObjectCopier}/ObjectCopier.cs (100%)

diff --git a/Compiler/SyntaxTreeConvertersController/SyntaxTreeConvertersController.cs b/Compiler/SyntaxTreeConvertersController/SyntaxTreeConvertersController.cs
index 03513c023..df2aa2fa9 100644
--- a/Compiler/SyntaxTreeConvertersController/SyntaxTreeConvertersController.cs
+++ b/Compiler/SyntaxTreeConvertersController/SyntaxTreeConvertersController.cs
@@ -50,7 +50,7 @@ namespace PascalABCCompiler.SyntaxTreeConverters
         private void AddExternalConvertersAsPlugins(string DirectoryName)
         {
             DirectoryInfo di = new DirectoryInfo(DirectoryName);
-            List<FileInfo> dllfiles = di.GetFiles("*ConversionSyntax.dll").ToList(); // Это только YieldConversionSyntax.dll
+            List<FileInfo> dllfiles = di.GetFiles("*ConversionSyntaxExternal.dll").ToList(); // Это только YieldConversionSyntax.dll
             //List<FileInfo> standartdllfile = di.GetFiles("StandardSyntaxTreeConverter.dll").ToList();
             //if (standartdllfile.Count>0)
             //    dllfiles.Insert(0, standartdllfile[0]);
diff --git a/StandardSyntaxTreeConverter/StandOutExprWithLambdaInForeachSequenceConverter.cs b/StandardSyntaxTreeConverter/StandOutExprWithLambdaInForeachSequenceVisitor.cs
similarity index 100%
rename from StandardSyntaxTreeConverter/StandOutExprWithLambdaInForeachSequenceConverter.cs
rename to StandardSyntaxTreeConverter/StandOutExprWithLambdaInForeachSequenceVisitor.cs
diff --git a/StandardSyntaxTreeConverter/StandardSyntaxConverter.cs b/StandardSyntaxTreeConverter/StandardSyntaxConverter.cs
index 3aaa415d3..f33eee345 100644
--- a/StandardSyntaxTreeConverter/StandardSyntaxConverter.cs
+++ b/StandardSyntaxTreeConverter/StandardSyntaxConverter.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using PascalABCCompiler.SyntaxTree;
+using SyntaxVisitors;
 
 namespace PascalABCCompiler.SyntaxTreeConverters
 {
@@ -12,10 +13,16 @@ namespace PascalABCCompiler.SyntaxTreeConverters
         public syntax_tree_node Convert(syntax_tree_node root)
         {
             // Прошивание ссылками на Parent nodes. Должно идти первым
+            // FillParentNodeVisitor расположен в SyntaxTree/tree как базовый визитор, отвечающий за построение дерева
             FillParentNodeVisitor.New.ProcessNode(root);
 
             // Выносим выражения с лямбдами из заголовка foreach
-            StandOutExprWithLambdaInForeachSequenceVisitor.New.ProcessNode(root); 
+            StandOutExprWithLambdaInForeachSequenceVisitor.New.ProcessNode(root);
+
+            // Всё, связанное с yield
+            root.visit(new MarkMethodHasYieldAndCheckSomeErrorsVisitor());
+            ProcessYieldCapturedVarsVisitor.New.ProcessNode(root);
+
 
             return root;
         }
diff --git a/StandardSyntaxTreeConverter/StandardSyntaxTreeConverter.csproj b/StandardSyntaxTreeConverter/StandardSyntaxTreeConverter.csproj
index 81604fcc7..ab4904d53 100644
--- a/StandardSyntaxTreeConverter/StandardSyntaxTreeConverter.csproj
+++ b/StandardSyntaxTreeConverter/StandardSyntaxTreeConverter.csproj
@@ -41,7 +41,7 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="StandardSyntaxConverter.cs" />
-    <Compile Include="StandOutExprWithLambdaInForeachSequenceConverter.cs" />
+    <Compile Include="StandOutExprWithLambdaInForeachSequenceVisitor.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\SyntaxTreeConverters\SyntaxTreeConverters.csproj">
@@ -52,6 +52,14 @@
       <Project>{c2cac65a-b2ae-4ccc-b067-e6b8e75df73a}</Project>
       <Name>SyntaxTree</Name>
     </ProjectReference>
+    <ProjectReference Include="..\SyntaxVisitors\SyntaxVisitors.csproj">
+      <Project>{a9ab4282-83b4-41a7-86c3-e5bf6a45e7e2}</Project>
+      <Name>SyntaxVisitors</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Yield\YieldConversionSyntax\YieldConversionSyntax.csproj">
+      <Project>{276ee073-60f6-46d2-8811-1b8026bcaada}</Project>
+      <Name>YieldConversionSyntax</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SyntaxVisitors/SyntaxVisitors.csproj b/SyntaxVisitors/SyntaxVisitors.csproj
index f0f750604..599d3d723 100644
--- a/SyntaxVisitors/SyntaxVisitors.csproj
+++ b/SyntaxVisitors/SyntaxVisitors.csproj
@@ -40,7 +40,6 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -49,7 +48,7 @@
     <Compile Include="BaseVisitors\HasStatementVisitor.cs" />
     <Compile Include="BaseVisitors\SmallHelperVisitors.cs" />
     <Compile Include="ChangeWhileVisitor.cs" />
-    <Compile Include="ObjectCopier.cs" />
+    <Compile Include="YieldVisitors\ObjectCopier\ObjectCopier.cs" />
     <Compile Include="Optimization\CalcConstExprs.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SyntaxTreeVisitorsErrors.cs" />
@@ -77,10 +76,6 @@
     <Compile Include="YieldVisitors\ReplaceYieldWithLamdasVisitor.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Compiler\Compiler.csproj">
-      <Project>{1e42361a-eda3-4872-88af-a3aaf600d36d}</Project>
-      <Name>Compiler</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Errors\Errors.csproj">
       <Project>{44a01f9e-dce7-470c-aae5-c3de0ccbee3b}</Project>
       <Name>Errors</Name>
@@ -97,10 +92,6 @@
       <Project>{c2cac65a-b2ae-4ccc-b067-e6b8e75df73a}</Project>
       <Name>SyntaxTree</Name>
     </ProjectReference>
-    <ProjectReference Include="..\TreeConverter\TreeConverter.csproj">
-      <Project>{1c9c945a-586d-42a2-a06b-65d84fa7ff78}</Project>
-      <Name>TreeConverter</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Yield\YieldHelpers\YieldHelpers.csproj">
       <Project>{ce5c55c2-a11c-4e94-a9fa-3fc6ca3e4c09}</Project>
       <Name>YieldHelpers</Name>
diff --git a/SyntaxVisitors/UniversalVisitors/SimplePrettyPrinterVisitor.cs b/SyntaxVisitors/UniversalVisitors/SimplePrettyPrinterVisitor.cs
index 8fa56fefb..cfa7f52dd 100644
--- a/SyntaxVisitors/UniversalVisitors/SimplePrettyPrinterVisitor.cs
+++ b/SyntaxVisitors/UniversalVisitors/SimplePrettyPrinterVisitor.cs
@@ -4,11 +4,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-using PascalABCCompiler.Errors;
-using PascalABCCompiler.PCU;
-using PascalABCCompiler.SemanticTreeConverters;
-using System.CodeDom.Compiler;
-using PascalABCCompiler;
 using PascalABCCompiler.SyntaxTree;
 
 
diff --git a/SyntaxVisitors/ObjectCopier.cs b/SyntaxVisitors/YieldVisitors/ObjectCopier/ObjectCopier.cs
similarity index 100%
rename from SyntaxVisitors/ObjectCopier.cs
rename to SyntaxVisitors/YieldVisitors/ObjectCopier/ObjectCopier.cs
diff --git a/Yield/YieldConversionSyntax/YieldConversionSyntax.csproj b/Yield/YieldConversionSyntax/YieldConversionSyntax.csproj
index 51def864c..bdebcb159 100644
--- a/Yield/YieldConversionSyntax/YieldConversionSyntax.csproj
+++ b/Yield/YieldConversionSyntax/YieldConversionSyntax.csproj
@@ -44,10 +44,6 @@
     <Compile Include="YieldDesugarSyntaxTreeConverter.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Compiler\Compiler.csproj">
-      <Project>{1e42361a-eda3-4872-88af-a3aaf600d36d}</Project>
-      <Name>Compiler</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Errors\Errors.csproj">
       <Project>{44a01f9e-dce7-470c-aae5-c3de0ccbee3b}</Project>
       <Name>Errors</Name>
diff --git a/Yield/YieldConversionSyntax/YieldDesugarSyntaxTreeConverter.cs b/Yield/YieldConversionSyntax/YieldDesugarSyntaxTreeConverter.cs
index 8e3ac5944..812721f99 100644
--- a/Yield/YieldConversionSyntax/YieldDesugarSyntaxTreeConverter.cs
+++ b/Yield/YieldConversionSyntax/YieldDesugarSyntaxTreeConverter.cs
@@ -3,9 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-using PascalABCCompiler;
 using PascalABCCompiler.SyntaxTree;
-using PascalABCCompiler.Errors;
 
 using SyntaxVisitors;
 
@@ -13,6 +11,8 @@ using PascalABCCompiler.SyntaxTreeConverters;
 
 namespace YieldDesugarSyntaxTreeConverter
 {
+    // Он перестал быть нужен, поскольку код YieldDesugarSyntaxTreeConverter.Convert был явно добавлен в StandardSyntaxTreeConverter.Convert
+    // Со временем этот проект надо исключить из решения, а YieldConversionSyntax.dll - исключить из инсталлята
     public class YieldDesugarSyntaxTreeConverter : ISyntaxTreeConverter
     {
         public string Name { get; } = "YieldDesugar";
diff --git a/bin/Lib/PABCRtl.dll b/bin/Lib/PABCRtl.dll
index 692c2ee408d1c54e5b85a5d1b9389631a48416de..42d0ebd73d75f67257011aa901a071ba2620b22d 100644
GIT binary patch
delta 253
zcmZozqS&xRaY6^v+^mURe#|eGI2&)b-ezpQ&9wD4bIsd&D``G62Kzggy%N7YTfInd
zo%hpIu{oXGTeSZN)L!k@PTe@gv!U-nZfH)OMD=}(3t!@UExtOZzjt>!ea~ygI}2Bp
zGh36c@0;AXIsae;$18ott3KN`o-9hZrTyhZ@LK;Fc}G8JJ($tZJmI0h0=6G3cUBy&
ztX`dcZu)UKjyIzB*s>Ve+ONN324WT<X5D`M9oxnw0^8XbB%@S3oafv$dR-aFC%1jZ
zWcHrjI&-tiBN%{y35Zod3?Q)a=U@m5b_vd#)cHy?_LEbKk5Fi>nd+MD0sb5tm;hvz
BaLE7w

delta 253
zcmZozqS&xRaY6^vrPzsGe$4JKI2v!a-ezpQ&9wD4bIsfObgNsAn$8UuBs8@<j<8+n
z|1@!KX3!?%o29F>VwDQrtX;l8<$d|cC2-Sc?KA(EXcllDlDMv0)>3%K>8yVDo0Nm<
z0k(FotC&`ErE@QD^SZy1b%m2xX!q>5Ig8`>oQ$97!MmKh^})Koh7$~UdimaEchw#A
zve|y;WB1N~HvMK9J&bAX*WWP%F$)m0ZomGHZQ~MwrcKeDe!;ok^FA!97v}q7uzkj4
z_MY83mtxB!7=VBYh*dxgAh7Z0U<e9!34T};R2HML-f3+oi*`ueyldM7{5du-0RWxP
BZxH|h