Merge pull request #2513 from TypeCobolTeam/v1.6.2

v1.6.2

Author: efr15

TypeCobol.LanguageServer.Test/LSRTests/GlobalStorageCompletion/input/GlobalStorageCompletion.tlsp

@@ -23,7 +23,7 @@
     },
     {
       "category": 1,
-      "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/publishDiagnostics\",\"params\":{\"uri\":\"file:///C:/Users/COLLARBE/AppData/Local/Temp/tcbl/PROCCALL580149467693110299.cee\",\"diagnostics\":[{\"range\":{\"start\":{\"line\":26,\"character\":12},\"end\":{\"line\":26,\"character\":18}},\"severity\":1,\"code\":\"27\",\"source\":\"Find the syntax diagram describing the statement in error in the language reference\",\"message\":\"Syntax error : mismatched input 'DECLARE' expecting {symbol, special register, keyword}\"},{\"range\":{\"start\":{\"line\":26,\"character\":12},\"end\":{\"line\":28,\"character\":17}},\"severity\":1,\"code\":\"27\",\"source\":\"Find the syntax diagram describing the statement in error in the language reference\",\"message\":\"Syntax error : extraneous input 'DECLAREPROCEDUREMyTestProcPRIVATEINPUTParam1TYPEBool.' expecting {SentenceEnd, AcceptStatement, AddStatement, AllocateStatement, AlterStatement, CallStatement, CancelStatement, CloseStatement, ComputeStatement, ContinueStatement, DeleteStatement, DisplayStatement, DivideStatement, EntryStatement, EvaluateStatement, ExecStatement, ExitMethodStatement, ExitParagraphStatement, ExitPerformStatement, ExitProgramStatement, ExitSectionStatement, 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, AtEndCondition, NotAtEndCondition, OnExceptionCondition, NotOnExceptionCondition, OnOverflowCondition, NotOnOverflowCondition, InvalidKeyCondition, NotInvalidKeyCondition, OnSizeErrorCondition, NotOnSizeErrorCondition, ElseCondition, WhenCondition, WhenOtherCondition, AddStatementEnd, CallStatementEnd, ComputeStatementEnd, DeleteStatementEnd, DivideStatementEnd, EvaluateStatementEnd, IfStatementEnd, InvokeStatementEnd, JsonStatementEnd, MultiplyStatementEnd, PerformStatementEnd, ReadStatementEnd, ReturnStatementEnd, RewriteStatementEnd, SearchStatementEnd, StartStatementEnd, StringStatementEnd, SubtractStatementEnd, UnstringStatementEnd, WriteStatementEnd, XmlStatementEnd, ProcedureStyleCall}\"}]}}"
+      "message": "{\"jsonrpc\":\"2.0\",\"method\":\"textDocument/publishDiagnostics\",\"params\":{\"uri\":\"file:///C:/Users/COLLARBE/AppData/Local/Temp/tcbl/PROCCALL580149467693110299.cee\",\"diagnostics\":[{\"range\":{\"start\":{\"line\":26,\"character\":12},\"end\":{\"line\":26,\"character\":18}},\"severity\":1,\"code\":\"27\",\"source\":\"Find the syntax diagram describing the statement in error in the language reference\",\"message\":\"Syntax error : mismatched input 'DECLARE' expecting {symbol, special register, keyword}\"},{\"range\":{\"start\":{\"line\":26,\"character\":12},\"end\":{\"line\":28,\"character\":17}},\"severity\":1,\"code\":\"27\",\"source\":\"Find the syntax diagram describing the statement in error in the language reference\",\"message\":\"Syntax error : Sentence is not correctly ended: a period was required.\"}]}}"
     },
     {
       "category": 2,

TypeCobol.LanguageServer.Test/LSRTests/ProcedureCompletionCaseInsensitive/input/ProcedureCompletionCaseInsensitive.tlsp

@@ -1,4 +1,4 @@
-Line 9[8,26] <27, Error, Syntax> - Syntax error : extraneous input 'ENDPROGRAMSimple.' expecting {SentenceEnd, AcceptStatement, AddStatement, AllocateStatement, AlterStatement, CallStatement, CancelStatement, CloseStatement, ComputeStatement, ContinueStatement, DeleteStatement, DisplayStatement, DivideStatement, EntryStatement, EvaluateStatement, ExecStatement, ExitMethodStatement, ExitParagraphStatement, ExitPerformStatement, ExitProgramStatement, ExitSectionStatement, 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, AtEndCondition, NotAtEndCondition, OnExceptionCondition, NotOnExceptionCondition, OnOverflowCondition, NotOnOverflowCondition, InvalidKeyCondition, NotInvalidKeyCondition, OnSizeErrorCondition, NotOnSizeErrorCondition, ElseCondition, WhenCondition, WhenOtherCondition, AddStatementEnd, CallStatementEnd, ComputeStatementEnd, DeleteStatementEnd, DivideStatementEnd, EvaluateStatementEnd, IfStatementEnd, InvokeStatementEnd, JsonStatementEnd, MultiplyStatementEnd, PerformStatementEnd, ReadStatementEnd, ReturnStatementEnd, RewriteStatementEnd, SearchStatementEnd, StartStatementEnd, StringStatementEnd, SubtractStatementEnd, UnstringStatementEnd, WriteStatementEnd, XmlStatementEnd, ProcedureStyleCall}
+Line 9[8,26] <27, Error, Syntax> - Syntax error : Sentence is not correctly ended: a period was required.
 --- Nodes ---
 ?
   Simple
@@ -9,6 +9,8 @@ Line 9[8,26] <27, Error, Syntax> - Syntax error : extraneous input 'ENDPROGRAMSi
 
           end
       a
-        [[DisplayStatement]] [12,18:DISPLAY]<DISPLAY> --> [20,22+:"a"]<AlphanumericLiteral>(",Y,Y){a}
+        sentence-0
+          [[DisplayStatement]] [12,18:DISPLAY]<DISPLAY> --> [20,22+:"a"]<AlphanumericLiteral>(",Y,Y){a}
 - variables = "a"
 
+    end

TypeCobol.LanguageServer.Test/LSRTests/ProcedureCompletionPotentialChildrenWithNoName/input/ProcedureCompletionPotentialChildrenWithNoName.tlsp

@@ -0,0 +1,29 @@
+Line 16[8,10] <27, Error, Syntax> - Syntax error : no viable alternative at input 'set ... end'
+Line 13[12,28] <37, Warning, General> - Warning: "end-if" is missing
+Line 16[8,27] <27, Error, Syntax> - Syntax error : Sentence is not correctly ended: a period was required.
+--- Nodes ---
+?
+  MainPgm
+    procedure-division
+    Nested1
+      data-division
+        local-storage
+          Var1
+      procedure-division
+        sentence-0
+          [[IfStatement]] [12,13:if]<IF> --> [28,28:)]<RightParenthesisSeparator>
+
+            ?
+              [[SetStatement]] [17,19:set]<SET> --> [17,19:set]<SET>
+
+      end
+    Nested2
+      procedure-division
+        sentence-0
+          [[GobackStatement]] [12,17:goback]<GOBACK> --> [12,17:goback]<GOBACK>
+
+          end
+      end
+    Nested3
+      end
+    end

TypeCobol.Test/Parser/Incremental/BasicEdits/ParagraphAndPERFORM.2_AddStatement.Nodes.txt

@@ -0,0 +1,32 @@
+       IDENTIFICATION DIVISION.
+       PROGRAM-ID. MainPgm.
+       procedure division.
+
+
+       IDENTIFICATION DIVISION.
+       PROGRAM-ID. Nested1.
+       data division.
+       local-storage section.
+       01 Var1             pic X.
+
+       procedure division.
+           if ( Var1 = "A" )
+                set
+
+       end program Nested1.
+
+
+       IDENTIFICATION DIVISION.
+       PROGRAM-ID. Nested2.
+       procedure division.
+           goback
+           .
+       end program Nested2.
+
+
+       IDENTIFICATION DIVISION.
+       PROGRAM-ID. Nested3.
+
+       END PROGRAM Nested3.
+
+       END PROGRAM MainPgm.

TypeCobol.Test/Parser/Programs/Cobol85/IncompleteSet_NestedPrograms.Nodes.txt

@@ -1,9 +1,7 @@
 --- Diagnostics ---
 Line 4[6,6] <30, Error, Semantics> - Semantic error: Symbol a is not referenced OffendingSymbol=[6,6:a]<UserDefinedWord>
 Line 4[11,11] <30, Error, Semantics> - Semantic error: Symbol b is not referenced OffendingSymbol=[11,11:b]<UserDefinedWord>
-Line 5[1,32] <27, Error, Syntax> - Syntax error : extraneous input 'EndProgramMissingSentenceEnd. ' expecting {SentenceEnd, AcceptStatement, AddStatement, AllocateStatement, AlterStatement, CallStatement, CancelStatement, CloseStatement, ComputeStatement, ContinueStatement, DeleteStatement, DisplayStatement, DivideStatement, EntryStatement, EvaluateStatement, ExecStatement, ExitMethodStatement, ExitParagraphStatement, ExitPerformStatement, ExitProgramStatement, ExitSectionStatement, 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, AtEndCondition, NotAtEndCondition, OnExceptionCondition, NotOnExceptionCondition, OnOverflowCondition, NotOnOverflowCondition, InvalidKeyCondition, NotInvalidKeyCondition, OnSizeErrorCondition, NotOnSizeErrorCondition, ElseCondition, WhenCondition, WhenOtherCondition, AddStatementEnd, CallStatementEnd, ComputeStatementEnd, DeleteStatementEnd, DivideStatementEnd, EvaluateStatementEnd, IfStatementEnd, InvokeStatementEnd, JsonStatementEnd, MultiplyStatementEnd, PerformStatementEnd, ReadStatementEnd, ReturnStatementEnd, RewriteStatementEnd, SearchStatementEnd, StartStatementEnd, StringStatementEnd, SubtractStatementEnd, UnstringStatementEnd, WriteStatementEnd, XmlStatementEnd, ProcedureStyleCall} OffendingSymbol=[[ProgramEnd]] [1,3:End]<END> --> [31,32:. ]<PeriodSeparator>
-- ProgramName = MissingSentenceEnd
-
+Line 5[1,32] <27, Error, Syntax> - Syntax error : Sentence is not correctly ended: a period was required.
 
 --- Program ---
 PROGRAM: MissingSentenceEnd common:False initial:False recursive:False

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

@@ -0,0 +1,140 @@
+       IDENTIFICATION DIVISION.
+       PROGRAM-ID.    ReplaceCheckAllowedCharacters.
+       DATA DIVISION.
+       working-storage section.
+
+       01  Group1.
+       replace ==:_:== by ==OK1-UNDERSCORE==.
+           05 :_:-Var pic X.
+       replace ==:>:== by ==OK2-GREATER==.
+           05 :>:-Var pic X.
+       replace ==:=:== by ==OK3-EQUAL==.
+           05 :=:-Var pic X.
+       replace ==:<:== by ==OK4-LESS==.
+           05 :<:-Var pic X.
+       replace ==:;:== by ==OK5-SEMICOLON==.
+           05 :;:-Var pic X.
+       replace ==:/:== by ==OK6-SLASH==.
+           05 :/:-Var pic X.
+       replace ==:.:== by ==OK7-DOT==.
+           05 :.:-Var pic X.
+       replace ==:-:== by ==OK8-HYPHEN==.
+           05 :-:-Var pic X.
+       replace ==:,:== by ==OK9-COLON==.
+           05 :,:-Var pic X.
+       replace ==:+:== by ==OK10-PLUS==.
+           05 :+:-Var pic X.
+       replace ==:*:== by ==OK11-STAR==.
+           05 :*:-Var pic X.
+       replace ==:$:== by ==OK12-DOLLAR==.
+           05 :$:-Var pic X.
+       replace ==: :== by ==OK13-SPACE==.
+           05 : :-Var pic X.
+
+      *Ok
+       replace ==:'':== by ==OK14-2-QUOTE==.
+           05 :'':-Var pic X.
+      *Ok
+       replace ==:"":== by ==OK15-2-DOUBLEQUOTE==.
+           05 :"":-Var pic X.
+
+      *Ok for CobolEditorE-I
+      *But NOT OK in IBM because string is not terminated correctly ?
+      *An invalid"REPLACE"statement was found.  Scanning was resumed at
+      *  the period terminating the"REPLACE"statement.
+       replace ==:':== by ==OK16-QUOTE==.
+           05 :':-Var pic X.
+      *Ok for CobolEditorE-I
+      *But NOT OK because string is not terminated correctly ?
+      *An invalid"REPLACE"statement was found.  Scanning was resumed at
+      *  the period terminating the"REPLACE"statement.
+       replace ==:":== by ==OK17-DOUBLE-QUOTE==.
+           05 :":-Var pic X.
+
+      *KO for CobolEditorE-I
+       replace ==:):== by ==KO-OPEN-PARENTHESIS==.
+Line 56[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+Line 56[28,28] <27, Error, Syntax> - Syntax error : extraneous input '.' expecting {ProgramIdentification, ProgramEnd, ClassIdentification, ClassEnd, FactoryEnd, ObjectIdentification, ObjectEnd, MethodEnd, ProcedureDivisionHeader, WorkingStorageSectionHeader, LocalStorageSectionHeader, LinkageSectionHeader, FileDescriptionEntry, DataDescriptionEntry, DataRedefinesEntry, DataRenamesEntry, DataConditionEntry, ExecStatement, FunctionDeclarationEnd, GlobalStorageSectionHeader}
+           05 :):-Var pic X.
+       replace ==:(:== by ==KO-CLOSE-PARENTHESIS==.
+Line 58[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :(:-Var pic X.
+
+
+      *Non-COBOL character"@"was found in column 19.
+      *  The character was accepted.
+Line 63[18,18] <55, Error, Tokens> - Non-COBOL character "@" was found in column 19.
+       replace ==:@:== by ==KO-AROBASE==.
+      *Non-COBOL character(s) were found starting with"@"in column 16.
+      *  The characters were discarded.
+Line 66[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :@:-Var pic X.
+
+
+      *Ko Non-COBOL character"€"was found in column 19.
+      *The character was accepted.
+Line 71[18,18] <55, Error, Tokens> - Non-COBOL character "€" was found in column 19.
+       replace ==:€:== by ==KO-EURO==.
+Line 72[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :€:-Var pic X.
+
+      *Ko Non-COBOL character"£"was found in column 19.
+      *The character was accepted.
+Line 76[18,18] <55, Error, Tokens> - Non-COBOL character "£" was found in column 19.
+       replace ==:£:== by ==KO-GBR==.
+Line 77[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :£:-Var pic X.
+
+      *Ko Non-COBOL character"#"was found in column 19.
+      *The character was accepted.
+Line 81[18,18] <55, Error, Tokens> - Non-COBOL character "#" was found in column 19.
+       replace ==:#:== by ==KO-SHARP==.
+Line 82[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :#:-Var pic X.
+
+      *Ko Non-COBOL character"é"was found in column 19.
+      *The character was accepted.
+Line 86[18,18] <55, Error, Tokens> - Non-COBOL character "é" was found in column 19.
+       replace ==:é:== by ==KO-E-ACUTE==.
+Line 87[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :é:-Var pic X.
+
+      *Ko Non-COBOL character"&"was found in column 19.
+      *The character was accepted.
+Line 91[18,18] <55, Error, Tokens> - Non-COBOL character "&" was found in column 19.
+       replace ==:&:== by ==KO-AND==.
+Line 92[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :&:-Var pic X.
+
+      *Ko Non-COBOL character"["was found in column 19.
+      *The character was accepted.
+Line 96[18,18] <55, Error, Tokens> - Non-COBOL character "[" was found in column 19.
+       replace ==:[:== by ==KO-OPEN-BRACKET==.
+Line 97[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :[:-Var pic X.
+      *Ko Non-COBOL character"]"was found in column 19.
+      *The character was accepted.
+Line 100[18,18] <55, Error, Tokens> - Non-COBOL character "]" was found in column 19.
+       replace ==:]:== by ==KO-CLOSE-BRACKET==.
+Line 101[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :]:-Var pic X.
+      *Ko Non-COBOL character"^"was found in column 19.
+      *The character was accepted.
+Line 104[18,18] <55, Error, Tokens> - Non-COBOL character "^" was found in column 19.
+       replace ==:^:== by ==KO-CIRCUMFLEX ==.
+Line 105[19,19] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :^ :-Var pic X.
+      *Ko Non-COBOL character"{"was found in column 19.
+      *The character was accepted.
+Line 108[18,18] <55, Error, Tokens> - Non-COBOL character "{" was found in column 19.
+       replace ==:{:== by ==KO-OPEN-BRACE==.
+Line 109[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :{:-Var pic X.
+      *Ko Non-COBOL character"}"was found in column 19.
+      *The character was accepted.
+Line 112[18,18] <55, Error, Tokens> - Non-COBOL character "}" was found in column 19.
+       replace ==:}:== by ==KO-CLOSE-BRACE==.
+Line 113[18,18] <27, Error, Syntax> - Syntax error : no viable alternative at input '05 ... -'
+           05 :}:-Var pic X.
+
+       END PROGRAM ReplaceCheckAllowedCharacters.