Skip to content

Fix INSPECT #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Fix INSPECT #550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b7dc935
Fix INSPECT
kio-watanabe Nov 8, 2024
6d5315a
Fix INSPECT
kio-watanabe Nov 8, 2024
308a63c
Fix INSPECT
kio-watanabe Nov 8, 2024
c4e2a4b
[WIP] Fix putSign()
kio-watanabe Nov 8, 2024
884f82d
[WIP] Fix putSign()
kio-watanabe Nov 8, 2024
bbf7cfe
Fix INSPECT
kio-watanabe Nov 8, 2024
852be8a
Add a test case for INSPECT
kio-watanabe Nov 8, 2024
08fc6b5
Improve added test case
kio-watanabe Nov 8, 2024
9cd6344
Cancel a correction
kio-watanabe Nov 12, 2024
1a297ab
Change name of added test case
kio-watanabe Nov 12, 2024
a4ef001
Merge branch 'develop' into fix-inspect-improve
kio-watanabe Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/common/CobolInspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,11 +169,13 @@ private static void common(AbstractCobolField f1, AbstractCobolField f2, int typ
public static void init(AbstractCobolField var, int replacing) {
CobolInspect.inspectVarCopy = var;
CobolInspect.inspectVar = CobolInspect.inspectVarCopy;
if (inspectVar.getAttribute().isTypeNumericDisplay()) {
CobolInspect.inspectSign = var.getSign();

if (var.getAttribute().isTypeNumericDisplay()) {
inspectVar.putSign(1);
}

CobolInspect.inspectReplacing = replacing;
CobolInspect.inspectSign = var.getSign();
CobolInspect.inspectSize = var.getFieldSize();
CobolInspect.inspectData = var.getDataStorage();
CobolInspect.inspectStart = -1;
Expand Down
3 changes: 2 additions & 1 deletion tests/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,8 @@ misc_DEPENDENCIES = \
misc.src/file-handler-japanese.at \
misc.src/perform-until-div.at \
misc.src/search-occurs-depending.at \
misc.src/fix-subtract.at
misc.src/fix-subtract.at \
misc.src/display-inspect-sign.at

EXTRA_DIST = $(srcdir)/package.m4 \
$(TESTS) \
Expand Down
3 changes: 2 additions & 1 deletion tests/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,8 @@ misc_DEPENDENCIES = \
misc.src/file-handler-japanese.at \
misc.src/perform-until-div.at \
misc.src/search-occurs-depending.at \
misc.src/fix-subtract.at
misc.src/fix-subtract.at \
misc.src/display-inspect-sign.at

EXTRA_DIST = $(srcdir)/package.m4 \
$(TESTS) \
Expand Down
1 change: 1 addition & 0 deletions tests/misc.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,4 @@ m4_include([file-handler-japanese.at])
m4_include([perform-until-div.at])
m4_include([search-occurs-depending.at])
m4_include([fix-subtract.at])
m4_include([display-inspect-sign.at])
53 changes: 53 additions & 0 deletions tests/misc.src/display-inspect-sign.at
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
AT_SETUP([DISPLAY values after INSPECT])

AT_DATA([prog.cbl], [
IDENTIFICATION DIVISION.
PROGRAM-ID. prog.
DATA DIVISION.
WORKING-STORAGE SECTION.
01 DATA1
02 DATA-SIGN PIC S9(5).
01 DATA2
02 DATA-SIGN-LEADING PIC S9(5) SIGN IS LEADING.
01 DATA3
02 DATA-SIGN-LEADING-SEPARATE PIC S9(5) SIGN LEADING SEPARATE.
01 DATA4
02 DATA-SIGN-TRAILING-SEPARATE PIC S9(5) SIGN TRAILING SEPARATE.
PROCEDURE DIVISION.
MAIN-RTN.
MOVE -12345 TO DATA-SIGN.
DISPLAY DATA1.
INSPECT DATA-SIGN REPLACING ALL ' ' BY '0'.
DISPLAY DATA1.

MOVE -12345 TO DATA-SIGN-LEADING.
DISPLAY DATA2.
INSPECT DATA-SIGN-LEADING REPLACING ALL ' ' BY '0'.
DISPLAY DATA2.

MOVE -12345 TO DATA-SIGN-LEADING-SEPARATE.
DISPLAY DATA3.
INSPECT DATA-SIGN-LEADING-SEPARATE REPLACING ALL ' ' BY '0'.
DISPLAY DATA3.

MOVE -12345 TO DATA-SIGN-TRAILING-SEPARATE.
DISPLAY DATA4.
INSPECT DATA-SIGN-TRAILING-SEPARATE REPLACING ALL ' ' BY '0'.
DISPLAY DATA4.
STOP RUN.
])


AT_CHECK([${COMPILE} prog.cbl])
AT_CHECK([${RUN_MODULE} prog], [0],
[1234u
1234u
q2345
q2345
-12345
-12345
12345-
12345-
])

AT_CLEANUP