From 01eac975de794a0a269f8a55bcfe9fcbd1387dcb Mon Sep 17 00:00:00 2001
From: miks1965 <miks@math.sfedu.ru>
Date: Sat, 11 Jun 2016 09:47:22 +0300
Subject: [PATCH] bug fix #199

---
 PascalABCNET.axml                             | 33 +++++++++++++++++++
 .../TreeConversion/syntax_tree_visitor.cs     | 10 +++---
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/PascalABCNET.axml b/PascalABCNET.axml
index d67836fcb..bec9fd4d7 100644
--- a/PascalABCNET.axml
+++ b/PascalABCNET.axml
@@ -757,6 +757,39 @@
           </i>
         </OCtx>
       </Node>
+      <Node Name="ObjectCopier.Clone">
+        <FileName>\yield\syntaxvisitors\yieldvisitors\processyieldscapturedvars.cs</FileName>
+        <Text>function_header nfh = ObjectCopier.Clone(fh);</Text>
+        <OCtx>
+          <i Type="Method">type_declarations GenClassesForYield ( procedure_definition pd , IEnumerable &lt; var_def_statement &gt; fields , IDictionary &lt; string , string &gt; localsMap , IDictionary &lt; string , string &gt; formalParamsMap , IDictionary &lt; var_def_statement , var_def_statement &gt; localsCloneMap , yield_locals_type_map_helper localTypeMapHelper )</i>
+          <i Type="ClassOrNamespace">public class ProcessYieldCapturedVarsVisitor : BaseChangeVisitor</i>
+          <i Type="ClassOrNamespace">namespace SyntaxVisitors</i>
+          <i Type="CS_TreeNode">
+          </i>
+        </OCtx>
+      </Node>
+      <Node Name="visit_program_code(_block.program_code)">
+        <FileName>\treeconverter\treeconversion\syntax_tree_visitor.cs</FileName>
+        <Text>visit_program_code(_block.program_code);</Text>
+        <OCtx>
+          <i Type="Method">public override void visit ( SyntaxTree . block _block )</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="lab.is_defined">
+        <FileName>\treeconverter\treeconversion\syntax_tree_visitor.cs</FileName>
+        <Text>if (lab.is_defined)</Text>
+        <OCtx>
+          <i Type="Method">public override void visit ( SyntaxTree . labeled_statement _labeled_statement )</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/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs
index bbd829a74..afee8b2ec 100644
--- a/TreeConverter/TreeConversion/syntax_tree_visitor.cs
+++ b/TreeConverter/TreeConversion/syntax_tree_visitor.cs
@@ -8308,10 +8308,12 @@ namespace PascalABCCompiler.TreeConverter
             {
                 AddError(get_location(_labeled_statement.label_name), "IDENT_{0}_IS_NOT_LABEL", _labeled_statement.label_name.name);
             }
-            if (lab.is_defined)
-            {
-                AddError(get_location(_labeled_statement.label_name), "LABEL_{0}_REDEFINED", _labeled_statement.label_name.name);
-            }
+            // SSM - Patch повторного определения меток в подпрограммах при наличии лямбд
+            if (lambdaProcessingState != LambdaProcessingState.FinishPhase)
+                if (lab.is_defined)
+                {
+                    AddError(get_location(_labeled_statement.label_name), "LABEL_{0}_REDEFINED", _labeled_statement.label_name.name);
+                }
             lab.is_defined = true;
             lab.comprehensive_code_block = context.block_stack.Peek();
             foreach (goto_statement gs in lab.goto_statements)