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

Author: yutaro-sakamoto

cobj/codegen.c

@@ -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);
   }
 
@@ -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);
@@ -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);
   }
 }
@@ -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);
@@ -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);
@@ -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);
@@ -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) {
@@ -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();
     }
   }
 

tests/misc.src/fd-external.at

@@ -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