Handle SJIS hyphens in group item variable names correctly (#624)

This pull request addresses a bug where SJIS hyphens in variable names within group items were not being correctly converted during Cobol to Java code generation, leading to incorrect variable names in the generated Java code.

Author: kio-watanabe

cobj/codegen.c

@@ -807,45 +807,16 @@ static int is_call_parameter(const struct cb_field *f) {
 }
 
 static int joutput_field_storage(struct cb_field *f, struct cb_field *top) {
-  const char *p;
   int flag_call_parameter = is_call_parameter(top);
   if (flag_call_parameter ||
       (f->offset == 0 && strcmp(f->name, top->name) == 0)) {
     char *base_name = get_java_identifier_base(top);
     joutput(base_name);
     free(base_name);
     return flag_call_parameter;
-  } else if (cb_flag_short_variable) {
-    joutput(CB_PREFIX_BASE);
-    for (p = f->name; *p != '\0'; ++p) {
-      if (*p == '-') {
-        joutput("_");
-      } else {
-        joutput("%c", *p);
-      }
-    }
-  } else if (cb_flag_serial_variable) {
+  } else {
     char *base_name = get_java_identifier_base(f);
     joutput(base_name);
-  } else {
-    joutput(CB_PREFIX_BASE);
-    struct cb_field *field = f;
-    int flag_first_iteration = 1;
-    while (field) {
-      if (flag_first_iteration) {
-        flag_first_iteration = 0;
-      } else {
-        joutput("__");
-      }
-      for (p = field->name; *p != '\0'; ++p) {
-        if (*p == '-') {
-          joutput("_");
-        } else {
-          joutput("%c", *p);
-        }
-      }
-      field = field->parent;
-    }
   }
   return 0;
 }

tests/i18n_sjis.src/user-defined-word.at

@@ -177,6 +177,77 @@ AT_CHECK([java prog], [0], [OK])
 
 AT_CLEANUP
 
+
+AT_SETUP([Nihongo field name with SJIS hyphens])
+
+AT_DATA([prog.cob], [
+       IDENTIFICATION   DIVISION.
+       PROGRAM-ID.      prog.
+       DATA             DIVISION.
+       WORKING-STORAGE  SECTION.
+       01  �s�d�r�s�|�c�`�s�`�P     PIC X(10) VALUE "test-data1".
+       01  �s�d�r�s�|�q�d�b�n�q�c�P.
+         03  �s�d�r�s�|�c�`�s�`�Q   PIC X(10) VALUE "test-data2".
+         03  �s�d�r�s�|�q�d�b�n�q�c�Q.
+           05  �s�d�r�s�|�c�`�s�`�R PIC X(10) VALUE "test-data3".
+       PROCEDURE        DIVISION.
+           DISPLAY �s�d�r�s�|�c�`�s�`�P.
+           DISPLAY �s�d�r�s�|�c�`�s�`�Q.
+           DISPLAY �s�d�r�s�|�c�`�s�`�R.
+])
+
+AT_CHECK([cobj prog.cob])
+AT_CHECK([java prog], [0], 
+[test-data1
+test-data2
+test-data3
+])
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�Q�c�`�s�`�P' > /dev/null], [0])
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�Q�c�`�s�`�Q__�s�d�r�s�Q�q�d�b�n�q�c�P' > /dev/null], [0])
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�Q�c�`�s�`�R__�s�d�r�s�Q�q�d�b�n�q�c�Q__�s�d�r�s�Q�q�d�b�n�q�c�P' > /dev/null], [0])
+
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�|�c�`�s�`�P' > /dev/null], [1])
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�|�c�`�s�`�Q__�s�d�r�s�|�q�d�b�n�q�c�P' > /dev/null], [1])
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�|�c�`�s�`�R__�s�d�r�s�|�q�d�b�n�q�c�Q__�s�d�r�s�|�q�d�b�n�q�c�P' > /dev/null], [1])
+
+AT_CLEANUP
+
+
+AT_SETUP([Nihongo field name with SJIS hyphens using -fshort-variable ])
+
+AT_DATA([prog.cob], [
+       IDENTIFICATION   DIVISION.
+       PROGRAM-ID.      prog.
+       DATA             DIVISION.
+       WORKING-STORAGE  SECTION.
+       01  �s�d�r�s�|�c�`�s�`�P     PIC X(10) VALUE "test-data1".
+       01  �s�d�r�s�|�q�d�b�n�q�c�P.
+         03  �s�d�r�s�|�c�`�s�`�Q   PIC X(10) VALUE "test-data2".
+         03  �s�d�r�s�|�q�d�b�n�q�c�Q.
+           05  �s�d�r�s�|�c�`�s�`�R PIC X(10) VALUE "test-data3".
+       PROCEDURE        DIVISION.
+           DISPLAY �s�d�r�s�|�c�`�s�`�P.
+           DISPLAY �s�d�r�s�|�c�`�s�`�Q.
+           DISPLAY �s�d�r�s�|�c�`�s�`�R.
+])
+
+AT_CHECK([cobj -fshort-variable prog.cob])
+AT_CHECK([java prog], [0], 
+[test-data1
+test-data2
+test-data3
+])
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�Q�c�`�s�`�P' > /dev/null], [0])
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�Q�c�`�s�`�Q' > /dev/null], [0])
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�Q�c�`�s�`�R' > /dev/null], [0])
+
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�|�c�`�s�`�P' > /dev/null], [1])
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�|�c�`�s�`�Q' > /dev/null], [1])
+AT_CHECK([cat prog.java | grep 'f_�s�d�r�s�|�c�`�s�`�R' > /dev/null], [1])
+
+AT_CLEANUP
+
+
 AT_SETUP([Nihongo field name in numeric test msg.])
 
 AT_DATA([prog.cob], [