Skip to content

Fix the runtime checking of OCCURS DEPENDING ON #328

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

Merged
merged 1 commit into from
Feb 4, 2024
Merged

Fix the runtime checking of OCCURS DEPENDING ON #328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions cobj/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1855,6 +1855,13 @@ static void joutput_funcall(cb_tree x) {
} else {
screenptr = p->screenptr;
joutput("%s (", p->name);

int flag_func_is_check_odo = strcmp(p->name, "CobolCheck.checkOdo") == 0;
int save_flag = param_wrap_string_flag;
if (flag_func_is_check_odo) {
param_wrap_string_flag = 0;
}

for (i = 0; i < p->argc; i++) {
if (p->varcnt && i + 1 == p->argc) {
joutput("%d, ", p->varcnt);
Expand All @@ -1872,6 +1879,7 @@ static void joutput_funcall(cb_tree x) {
}
}
}
param_wrap_string_flag = save_flag;
joutput(")");
screenptr = 0;
}
Expand Down
3 changes: 2 additions & 1 deletion libcobj/app/src/main/java/jp/osscons/opensourcecobol/libcobj/common/CobolCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package jp.osscons.opensourcecobol.libcobj.common;

import jp.osscons.opensourcecobol.libcobj.data.AbstractCobolField;
import jp.osscons.opensourcecobol.libcobj.data.CobolDataStorage;
import jp.osscons.opensourcecobol.libcobj.exceptions.CobolExceptionId;
import jp.osscons.opensourcecobol.libcobj.exceptions.CobolRuntimeException;
Expand Down Expand Up @@ -62,6 +63,6 @@ public static void checkOdo(int i, int min, int max, String name) throws CobolSt
}

public static void checkOdo(int i, int min, int max, byte[] name) throws CobolStopRunException {
CobolCheck.checkOdo(i, min, max, new String(name));
CobolCheck.checkOdo(i, min, max, new String(name, AbstractCobolField.charSetSJIS));
}
}
1 change: 0 additions & 1 deletion tests/i18n_sjis.src/user-defined-word.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ AT_CHECK([java prog], [1], [],
AT_CLEANUP

AT_SETUP([Nihongo field name in ODO test msg.])
AT_CHECK([${SKIP_TEST}])

AT_DATA([prog.cob], [
IDENTIFICATION DIVISION.
Expand Down