WI #2434 #2441 Check builder state before attempting to close current statement (#2450)

Author: fm-117

TypeCobol.Test/Parser/Programs/Cobol85/UncommentedInsidePerform.rdz-Nodes.txt

@@ -0,0 +1,19 @@
+Line 14[21,24] <27, Error, Syntax> - Syntax error : extraneous input 'TODO' expecting {separator, numeric literal, character string, symbol, statement starting keyword, keyword, Formalized Comments elements, Sql statement starting keyword}
+Line 15[26,26] <27, Error, Syntax> - Syntax error : no viable alternative at input 'TODO ... :'
+Line 16[12,22] <27, Error, Syntax> - Syntax error : extraneous input 'end-perform' expecting {ProgramIdentification, ProgramEnd, ClassIdentification, MethodEnd, DeclarativesEnd, SectionHeader, ParagraphHeader, SentenceEnd, AcceptStatement, AddStatement, AllocateStatement, AlterStatement, CallStatement, CancelStatement, CloseStatement, ComputeStatement, ContinueStatement, DeleteStatement, DisplayStatement, DivideStatement, EntryStatement, EvaluateStatement, ExecStatement, ExitMethodStatement, ExitProgramStatement, ExitStatement, FreeStatement, GobackStatement, GotoStatement, IfStatement, InitializeStatement, InspectStatement, InvokeStatement, JsonGenerateStatement, JsonParseStatement, MergeStatement, MoveStatement, MultiplyStatement, OpenStatement, PerformProcedureStatement, PerformStatement, ReadStatement, ReleaseStatement, ReturnStatement, RewriteStatement, SearchStatement, SetStatement, SortStatement, StartStatement, StopStatement, StringStatement, SubtractStatement, UnstringStatement, WriteStatement, XmlGenerateStatement, XmlParseStatement, FunctionDeclarationHeader, FunctionDeclarationEnd, ProcedureStyleCall}
+--- Nodes ---
+?
+  MyPGM
+    data-division
+      working-storage
+        MyArray
+          TAB-EXC-ELE
+            TAB-EXC-IDX
+            TAB-EXC-CLE
+    procedure-division
+      sentence-0
+        [[PerformStatement]] [12,18:perform]<PERFORM> --> [42,43:50]<IntegerLiteral>{50}
+
+        end
+      end
+    end

TypeCobol.Test/Parser/Programs/Cobol85/UncommentedInsidePerform.rdz.cbl

@@ -0,0 +1,18 @@
+       IDENTIFICATION division.
+       PROGRAM-ID. MyPGM.
+       data division.
+       working-storage section.
+       01  MyArray.
+          05 TAB-EXC-ELE occurs 1 to 50
+                          indexed by TAB-EXC-IDX.
+             10 TAB-EXC-CLE   pic X(08).
+
+       procedure division.
+           perform varying TAB-EXC-IDX from 1 by 1
+                   until   TAB-EXC-IDX > 50
+
+                    TODO : case1.
+                    TODO : case2.
+           end-perform
+           .
+       end program MyPGM.

TypeCobol/Compiler/CupParser/NodeBuilder/CupParserTypeCobolProgramDiagnosticErrorReporter.cs

@@ -4,6 +4,7 @@
 using TypeCobol.Compiler.CodeElements;
 using TypeCobol.Compiler.CupCommon;
 using TypeCobol.Compiler.Diagnostics;
+using TypeCobol.Compiler.Nodes;
 
 namespace TypeCobol.Compiler.CupParser.NodeBuilder
 {
@@ -112,10 +113,10 @@ public bool SyntaxError(lr_parser parser, Symbol curToken)
                 }
             }
 
-            // Try to close current statement if current token is an END-Statement
-            if (ce is CodeElementEnd codeElementEnd)
+            // Try to close current statement if current token is a matching END-Statement
+            if (((ProgramClassBuilder)tcpParser.Builder).CurrentNode is StatementWithBody currentStatement && ce?.Type == currentStatement.EndType)
             {
-                lr_parser stmtParser = CloneParser(parser, TypeCobolProgramSymbols.StatementClosingPoint, codeElementEnd, true);
+                lr_parser stmtParser = CloneParser(parser, TypeCobolProgramSymbols.StatementClosingPoint, ce, true);
                 stmtParser.parse();
             }