Skip to content

Convert string literals containing SJIS characters to Java string literals #561

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 2 commits into from
Dec 27, 2024
Merged

Convert string literals containing SJIS characters to Java string literals #561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
579c31e
fix: convert SJIS string literals to ordinary Java string literals
yutaro-sakamoto Dec 10, 2024
bddb332
test: add test suites
yutaro-sakamoto Dec 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
3 changes: 2 additions & 1 deletion cobj/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,8 @@ static void joutput_string_write(const unsigned char *s, int size,
enum cb_string_category category) {
int i;

if (category == CB_STRING_CATEGORY_ALL_ASCII) {
if (category == CB_STRING_CATEGORY_ALL_ASCII ||
category == CB_STRING_CATEGORY_ALL_SJIS) {
if (param_wrap_string_flag) {
joutput("new CobolDataStorage(");
} else {
Expand Down
59 changes: 59 additions & 0 deletions tests/i18n_sjis.src/pic-x.at
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,3 +483,62 @@ AT_CHECK([cobj prog.cob], [0])
AT_CHECK([java prog], [0], [02])

AT_CLEANUP

AT_SETUP([Readable string literals])
# Older compilers converts string literals "日本語" in COBOL source code
# to `CobolUtil.toBytes((byte)0x93, (byte)0xfa, (byte)0x96, (byte)0x7b, (byte)0x8c, (byte)0xea)` in Java source code.
# The following tests check that the compiler converts the string literals to readable ones.

AT_DATA([prog1.cob], [
IDENTIFICATION DIVISION.
PROGRAM-ID. prog1.
DATA DIVISION.
WORKING-STORAGE SECTION.
01 F0 PIC X(30) VALUE "東京1".
PROCEDURE DIVISION.
MOVE "東京2" TO F0.
DISPLAY "東京3".
])

AT_CHECK([cobj prog1.cob])
AT_CHECK([grep '東京1' < prog1.java > /dev/null])
AT_CHECK([grep '東京2' < prog1.java > /dev/null])
AT_CHECK([grep '東京3' < prog1.java > /dev/null])

# '　' is the first multi-byte Shift-JIS character with respect to the byte order
# see http://charset.7jp.net/sjis.html
AT_DATA([prog2.cob], [
IDENTIFICATION DIVISION.
PROGRAM-ID. prog2.
DATA DIVISION.
WORKING-STORAGE SECTION.
01 F0 PIC X(30) VALUE "　1".
PROCEDURE DIVISION.
MOVE "　2" TO F0.
DISPLAY "　3".
])

AT_CHECK([cobj prog2.cob])
AT_CHECK([grep '　1' < prog2.java > /dev/null])
AT_CHECK([grep '　2' < prog2.java > /dev/null])
AT_CHECK([grep '　3' < prog2.java > /dev/null])

# '熙' is the last printable Shift-JIS character with respect to the byte order.
# See http://charset.7jp.net/sjis.html
AT_DATA([prog3.cob], [
IDENTIFICATION DIVISION.
PROGRAM-ID. prog3.
DATA DIVISION.
WORKING-STORAGE SECTION.
01 F0 PIC X(30) VALUE "熙1".
PROCEDURE DIVISION.
MOVE "熙2" TO F0.
DISPLAY "熙3".
])

AT_CHECK([cobj prog3.cob])
AT_CHECK([grep '熙1' < prog3.java > /dev/null])
AT_CHECK([grep '熙2' < prog3.java > /dev/null])
AT_CHECK([grep '熙3' < prog3.java > /dev/null])

AT_CLEANUP
Loading