1752 handle copy replacing with 4colon ol #1794

mayanje · 2020-10-29T08:06:26Z

Fixes #1752

TypeCobol/Compiler/Preprocessor/ReplaceTokensLinesIterator.cs

TypeCobol.Test/Parser/Scanner/ResultFiles/PseudoText.txt

Codegen/test/resources/input/TypeCobol/CopyReplace4Colon/CopyReplace4Colon7.rdz.cbl

Codegen/test/resources/input/TypeCobol/CopyReplace4Colon/YxxxENT

Codegen/test/resources/input/TypeCobol/CopyReplace4Colon/CopyReplace4Colon.rdz.cbl

mayanje · 2020-10-29T15:06:16Z

Sorry I made a mistake with my last commit the target issue should be #1752 rather than #1252

TypeCobol.Test/Parser/Programs/Cobol85/CopyReplace4Colon.rdzPGM.txt

fm-117 · 2020-10-30T08:35:35Z

TypeCobol/Compiler/CompilationDocument.cs

+        internal bool IsForCopy
+        {
+            get;
+            set;
+        }


Should be private readonly. Set via constructors.

There are so many parameters in constructors, I prefer to let FileCompiler set this specific and contextual option.

This is also the case for CustomSymbols

As the CompilationDocument is always for Copy and CompilationUnit is always for Program, you can simplify with:
internal virtual bool IsForCopy => true;

And override it CompilationUnit.

No longer needed

fm-117 · 2020-10-30T08:36:40Z

TypeCobol/Compiler/CompilationDocument.cs

+        public MultilineScanState InitialScanStateForCopy
+        {
+            get;
+            set;
+        }


Not required, this field should be private readonly.

fm-117 · 2020-10-30T08:49:45Z

TypeCobol/Compiler/CompilationUnit.cs

@@ -1,13 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Text;


The two new using directives are the only changes in this file, they are not required.

ok removed.

TypeCobol/Compiler/CupPreprocessor/CompilerDirectiveBuilder.cs

TypeCobol/Compiler/Directives/TypeCobolOptions.cs

TypeCobol/Compiler/Preprocessor/ReplaceTokensLinesIterator.cs

TypeCobol/Compiler/Scanner/Scanner.cs

fm-117 · 2020-10-30T10:04:31Z

TypeCobol/Compiler/Scanner/Scanner.cs

        /// Look for pattern ':' (cobol word chars)+ ':'
        /// </summary>
-        private bool CheckForPartialCobolWordPattern(int startIndex, out int patternEndIndex)
+        private bool CheckForPartialCobolWordPattern(MultilineScanState currentState, int startIndex, out int patternEndIndex)


the state can be read directly by the method using the instance field tokensLine so the new parameter is not required.

TypeCobol/Compiler/Scanner/Scanner.cs

rooksdo · 2020-11-02T08:35:48Z

Codegen/test/resources/output/TypeCobol/CopyReplace4Colon/CopyReplace4Colon6.rdz.cbl

+       01 xxxENT3. COPY YxxxENT REPLACING ==::== BY ==S==.
+       PROCEDURE DIVISION.
+           MOVE 'A' TO xxxENTS-FCT01-Var1.
+       END PROGRAM CPYRPL4C.


Not much, but for this test we could simply use the following working-storage

01 xxxENT. COPY YxxxENT REPLACING ==::== BY ==S==.

The goal here is to test multiple COPY inclusion.

TypeCobol.Test/Parser/Programs/Cobol85/CopyReplace4Colon.rdzPGM.txt

TypeCobol/Compiler/Directives/TypeCobolOptions.cs

TypeCobol/Compiler/Scanner/Scanner.cs

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

TypeCobol/Compiler/Scanner/Scanner.cs

TypeCobol/Compiler/Scanner/MultilineScanState.cs

Codegen/test/resources/input/TypeCobol/CopyReplace4Colon/CopyReplace4Colon.rdz.cbl

fm-117 · 2020-12-02T11:10:15Z

TypeCobol/Compiler/FileCompiler.cs

            if (isCopyFile)
            {
-                CompilationResultsForCopy = new CompilationDocument(TextDocument.Source, TextDocument.Lines, compilerOptions, documentProvider, scanState, copyTextNameVariations);
+                CompilationResultsForCopy = new CompilationDocument(TextDocument.Source, TextDocument.Lines, compilerOptions, documentProvider, scanState, copyTextNameVariations);                


Unneeded whitespace

done in 25c29f9

rooksdo · 2020-12-03T12:46:21Z

TypeCobol.Test/Parser/Programs/Cobol85/YDVZOSM.cpy

@@ -0,0 +1,2 @@
+       01  :MDVZOSM:-A::.
+           05 :MDVZOSM:-A::-Var0 pic X.


My remark is only a detail, but for more consistency with the copy name, the copy should be :

01 :DVZOSM:-A::. 05 :DVZOSM:-A::-Var0 pic X.

done in ba16d41

rooksdo · 2020-12-03T12:50:22Z

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

+           move 'A' to MDVZOSM-A
+           move 'A' to Foo-A2
+           .
+       end program DVZS0OSM.


Following my remark on copy YDVZOSM, the 'M' prefix for all MDVZOSM could be removed.

done in ba16d41

rooksdo · 2020-12-03T13:14:31Z

TypeCobol.Test/Parser/Programs/Cobol85/CopyReplace4ColonMultiCopy.rdzPGM.txt

+  xxxENT2:Alphanumeric
+  xxxENT2-FCT01:Alphanumeric
+  xxxENT2-FCT01-Var1:Alphanumeric
+  xxxENT1:Alphanumeric


Not sure I understand how these variables are sorted but they are all there.

Nothing to say

mayanje added 2 commits October 28, 2020 18:36

WI #1752 Implementation based on Partial Cobol Word

2cf71e5

WI #1752 removing trace code.

69d2faa

mayanje requested review from fm-117, rooksdo and smedilol October 29, 2020 08:06

trafico-bot bot added the 🔍 Ready for Review Pull Request is not reviewed yet label Oct 29, 2020

mayanje mentioned this pull request Oct 29, 2020

WI #1752 Implements Replace :: by two characters :. #1787

Closed

smedilol suggested changes Oct 29, 2020

View reviewed changes

trafico-bot bot added ⚠️ Changes requested Pull Request needs changes before it can be reviewed again and removed 🔍 Ready for Review Pull Request is not reviewed yet labels Oct 29, 2020

#WI 1752 remove duplicate copy file.

973c01a

trafico-bot bot added 🔍 Ready for Review Pull Request is not reviewed yet and removed ⚠️ Changes requested Pull Request needs changes before it can be reviewed again labels Oct 29, 2020

WI #1252 Moving test files

1434b65

WI #1752 Handle diagnostic one-char pseudo-text

790bc13

fm-117 requested changes Oct 30, 2020

View reviewed changes

trafico-bot bot added ⚠️ Changes requested Pull Request needs changes before it can be reviewed again and removed 🔍 Ready for Review Pull Request is not reviewed yet labels Oct 30, 2020

rooksdo linked an issue Oct 30, 2020 that may be closed by this pull request

Handle copy replacing with ==::== #1752

Closed

rooksdo assigned mayanje Oct 30, 2020

smedilol suggested changes Nov 2, 2020

View reviewed changes

TypeCobol/Compiler/Scanner/Scanner.cs Outdated Show resolved Hide resolved

rooksdo reviewed Nov 2, 2020

View reviewed changes

rooksdo previously approved these changes Nov 2, 2020

View reviewed changes

fm-117 requested changes Nov 2, 2020

View reviewed changes

TypeCobol.Test/Parser/Programs/Cobol85/CopyReplace4Colon.rdzPGM.txt Outdated Show resolved Hide resolved

TypeCobol/Compiler/Directives/TypeCobolOptions.cs Outdated Show resolved Hide resolved

TypeCobol/Compiler/Scanner/Scanner.cs Outdated Show resolved Hide resolved

WI #1752 Review changes

5fbbb0c

mayanje dismissed rooksdo’s stale review via 5fbbb0c November 2, 2020 10:29

trafico-bot bot added 🔍 Ready for Review Pull Request is not reviewed yet and removed ⚠️ Changes requested Pull Request needs changes before it can be reviewed again labels Nov 2, 2020

smedilol suggested changes Nov 2, 2020

View reviewed changes

TypeCobol.Test/Parser/Programs/Cobol85/CopyReplace4ColonErr.rdz.cbl Show resolved Hide resolved

smedilol suggested changes Nov 10, 2020

View reviewed changes

TypeCobol/Compiler/Scanner/Scanner.cs Outdated Show resolved Hide resolved

WI #1752 Review Changes

c1f3f35

fm-117 reviewed Nov 13, 2020

View reviewed changes

TypeCobol/Compiler/Scanner/MultilineScanState.cs Show resolved Hide resolved

smedilol suggested changes Nov 17, 2020

View reviewed changes

Codegen/test/resources/input/TypeCobol/CopyReplace4Colon/CopyReplace4Colon.rdz.cbl Show resolved Hide resolved

mayanje added 3 commits November 19, 2020 17:59

WI #1752 Moving tests

4e0e199

WI #1752 Remove return on continuation call: ApplyRemainingReplaces.

041d2e1

WI #1752 move and remove some tests

8ee921a

smedilol previously approved these changes Dec 1, 2020

View reviewed changes

mayanje requested review from fm-117 and rooksdo December 2, 2020 08:44

fm-117 reviewed Dec 2, 2020

View reviewed changes

fm-117 previously approved these changes Dec 2, 2020

View reviewed changes

rooksdo reviewed Dec 3, 2020

View reviewed changes

WI #1752 Change MDVZOSM to DVZOSM

ba16d41

mayanje dismissed stale reviews from fm-117 and smedilol via ba16d41 December 7, 2020 09:05

WI #1752 Remove spaces

25c29f9

mayanje requested review from fm-117, rooksdo and smedilol December 7, 2020 09:10

fm-117 approved these changes Dec 7, 2020

View reviewed changes

smedilol approved these changes Dec 7, 2020

View reviewed changes

rooksdo approved these changes Dec 7, 2020

View reviewed changes

Merge branch 'develop' into 1752_Handle_copy_replacing_with_4colonOL

9181fda

mayanje merged commit f964118 into develop Dec 14, 2020

trafico-bot bot added ✨ Merged Pull Request has been merged successfully and removed 🔍 Ready for Review Pull Request is not reviewed yet labels Dec 14, 2020

mayanje deleted the 1752_Handle_copy_replacing_with_4colonOL branch December 14, 2020 09:29

mayanje mentioned this pull request Jan 28, 2021

V1.5 to Master #1873

Merged

		@@ -0,0 +1,2 @@
		01 :MDVZOSM:-A::.
		05 :MDVZOSM:-A::-Var0 pic X. No newline at end of file

1752 handle copy replacing with 4colon ol #1794

1752 handle copy replacing with 4colon ol #1794

Uh oh!

Conversation

mayanje commented Oct 29, 2020 • edited by rooksdo Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mayanje commented Oct 29, 2020

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mayanje Oct 30, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

mayanje commented Oct 29, 2020 •

edited by rooksdo

Loading

mayanje Oct 30, 2020 •

edited

Loading