Skip to content

Fix non-ASCII characters in external items and external file descriptors #629

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 3 commits into from
May 29, 2025
Merged

Fix non-ASCII characters in external items and external file descriptors #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
922d9c1
fix: conversion of variables of fd external
yutaro-sakamoto May 7, 2025
c1c6148
test: add tests
yutaro-sakamoto May 7, 2025
89ae5a1
fix: fix joutput_base slightly
yutaro-sakamoto May 7, 2025
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
88 changes: 24 additions & 64 deletions cobj/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,15 +839,8 @@ static void joutput_base(struct cb_field *f) {

// EDIT
/* Base name */
if (top->flag_external) {
strcpy(name, top->name);
char *nmp;
for (nmp = name; *nmp; nmp++) {
if (*nmp == '-') {
*nmp = '_';
}
}
} else {
strcpy_identifier_cobol_to_java(name, top->name);
if (!top->flag_external) {
register_data_storage_list(f, top);
}

Expand Down Expand Up @@ -2249,9 +2242,7 @@ static void joutput_initialize_fp(cb_tree x, struct cb_field *f) {
}

static void joutput_initialize_external(cb_tree x, struct cb_field *f) {
unsigned char *p;
cb_tree file;
char name[COB_MINI_BUFF];

joutput_prefix();
joutput_data(x);
Expand All @@ -2260,22 +2251,10 @@ static void joutput_initialize_external(cb_tree x, struct cb_field *f) {
f->size);
} else if (f->storage == CB_STORAGE_FILE) {
file = CB_TREE(f->file);
strcpy(name, CB_FILE(file)->record->name);
for (p = (unsigned char *)name; *p; p++) {
if (*p == '-') {
*p = '_';
}
}
joutput(" = CobolExternal.getStorageAddress (\"%s\", %d);\n", name,
f->size);
joutput(" = CobolExternal.getStorageAddress (\"%s\", %d);\n",
CB_FILE(file)->record->name, f->size);
} else {
strcpy(name, f->name);
for (p = (unsigned char *)name; *p; p++) {
if (islower(*p)) {
*p = (unsigned char)toupper(*p);
}
}
joutput(" = CobolExternal.getStorageAddress (\"%s\", %d);\n", name,
joutput(" = CobolExternal.getStorageAddress (\"%s\", %d);\n", f->name,
f->size);
}
}
Expand Down Expand Up @@ -4401,13 +4380,11 @@ static void joutput_internal_function(struct cb_program *prog,
cb_tree l;
struct cb_field *f;
struct cb_file *fl;
char *p;
int i;
// int n;
int parmnum = 0;
// int seen = 0;
// int anyseen;
char name[COB_MINI_BUFF];

/* Program function */
// output ("static int\n%s_ (const int entry", prog->program_id);
Expand Down Expand Up @@ -4654,15 +4631,11 @@ static void joutput_internal_function(struct cb_program *prog,
for (l = prog->file_list; l; l = CB_CHAIN(l)) {
f = CB_FILE(CB_VALUE(l))->record;
if (f->flag_external) {
strcpy(name, f->name);
for (p = name; *p; p++) {
if (*p == '-') {
*p = '_';
}
}
joutput_line("%s%s = CobolExternal.getStorageAddress (\"%s\", %d);",
CB_PREFIX_BASE, name, name,
CB_FILE(CB_VALUE(l))->record_max);
joutput_prefix();
joutput_base(f);
joutput(" = CobolExternal.getStorageAddress (\"%s\", %d);", f->name,
CB_FILE(CB_VALUE(l))->record_max);
joutput_newline();
}
}
joutput_initial_values(prog->working_storage);
Expand Down Expand Up @@ -4752,15 +4725,10 @@ static void joutput_internal_function(struct cb_program *prog,
for (l = prog->file_list; l; l = CB_CHAIN(l)) {
f = CB_FILE(CB_VALUE(l))->record;
if (f->flag_external) {
strcpy(name, f->name);
for (p = name; *p; p++) {
if (*p == '-') {
*p = '_';
}
}
joutput_line("%s%s = CobolExternal.getStorageAddress (\"%s\", %d);",
CB_PREFIX_BASE, name, name,
CB_FILE(CB_VALUE(l))->record_max);
joutput_prefix();
joutput_base(f);
joutput_line(" = CobolExternal.getStorageAddress (\"%s\", %d);",
f->name, CB_FILE(CB_VALUE(l))->record_max);
}
}
joutput_initial_values(prog->working_storage);
Expand Down Expand Up @@ -5492,8 +5460,6 @@ static void joutput_declare_member_variables(struct cb_program *prog,
struct base_list *blp;
const char *prevprog;
struct cb_field *f;
char *p;
char name[COB_MINI_BUFF];

/* CobolDecimal型変数の宣言 */
if (prog->decimal_index_max) {
Expand Down Expand Up @@ -5611,27 +5577,21 @@ static void joutput_declare_member_variables(struct cb_program *prog,
/* External items */
for (f = prog->working_storage; f; f = f->sister) {
if (f->flag_external) {
strcpy(name, f->name);
for (p = name; *p; p++) {
if (*p == '-') {
*p = '_';
}
}
joutput("private CobolDataStorage\t%s%s = null;", CB_PREFIX_BASE, name);
joutput(" /* %s */\n", f->name);
joutput_prefix();
joutput("private CobolDataStorage ");
joutput_base(f);
joutput(" = null; /* %s */", f->name);
joutput_newline();
}
}
for (l = prog->file_list; l; l = CB_CHAIN(l)) {
f = CB_FILE(CB_VALUE(l))->record;
if (f->flag_external) {
strcpy(name, f->name);
for (p = name; *p; p++) {
if (*p == '-') {
*p = '_';
}
}
joutput("private CobolDataStorage\t%s%s = null;", CB_PREFIX_BASE, name);
joutput(" /* %s */\n", f->name);
joutput_prefix();
joutput("private CobolDataStorage ");
joutput_base(f);
joutput(" = null; /* %s */", f->name);
joutput_newline();
}
}

Expand Down
102 changes: 102 additions & 0 deletions tests/misc.src/fd-external.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,105 @@ AT_CHECK([java prog], [0],
])

AT_CLEANUP

AT_SETUP([FD EXTERNAL nihongo])

AT_DATA([prog1.cbl], [
IDENTIFICATION DIVISION.
PROGRAM-ID. prog1.
environment division.
input-output section.
file-control.
select f assign to 'file.txt'
organization is line sequential
access mode is sequential.
DATA DIVISION.
file section.
fd f is external.
01 ‚a‚b|‚P pic x(5).
working-storage section.
01 ‚a‚b|‚Q pic x(5) external.
PROCEDURE DIVISION.
initialize ‚a‚b|‚P.
initialize ‚a‚b|‚Q.

open output f.
call "sub".
close f.

open input f.
read f.
close f.

display ‚a‚b|‚P.
display ‚a‚b|‚Q.
STOP RUN.
])

AT_DATA([prog2.cbl], [
IDENTIFICATION DIVISION.
PROGRAM-ID. prog2 is initial.

environment division.
input-output section.
file-control.
select f assign to 'file.txt'
organization is line sequential
access mode is sequential.
DATA DIVISION.
file section.
fd f is external.
01 ‚a‚b|‚P pic x(5).
working-storage section.
01 ‚a‚b|‚Q pic x(5) external.
PROCEDURE DIVISION.
initialize ‚a‚b|‚P.
initialize ‚a‚b|‚Q.

open output f.
call "sub".
close f.

open input f.
read f.
close f.

display ‚a‚b|‚P.
display ‚a‚b|‚Q.
STOP RUN.
])

AT_DATA([sub.cbl], [
IDENTIFICATION DIVISION.
PROGRAM-ID. sub.
environment division.
input-output section.
file-control.
select f assign to "file.txt"
organization is line sequential
access mode is sequential.
DATA DIVISION.
file section.
fd f is external.
01 ‚a‚b|‚P pic x(5).
working-storage section.
01 ‚a‚b|‚Q pic x(5) external.
PROCEDURE DIVISION.
move "abcde" to ‚a‚b|‚P.
write ‚a‚b|‚P.
move "12345" to ‚a‚b|‚Q.
goback.
])

AT_CHECK([${COBJ} prog1.cbl prog2.cbl sub.cbl])
AT_CHECK([java prog1], [0],
[abcde
12345
])

AT_CHECK([java prog2], [0],
[abcde
12345
])

AT_CLEANUP
Loading