[Remove]: remove a option -fvar-name-hex

Author: yutaro-sakamoto

cobj/codegen.c

@@ -234,56 +234,29 @@ static void get_java_identifier_helper(struct cb_field *f, char *buf) {
 }
 
 static void strcpy_identifier_cobol_to_java(char *buf, const char *identifier) {
-  if (cb_flag_var_name_hex) {
-    int all_ascii = 1;
-    unsigned char *p = (unsigned char *)identifier;
-    for (; *p; ++p) {
-      unsigned char c = *p;
-      if (c < 0x0A || 0x80 <= c) {
-        all_ascii = 0;
-        break;
-      }
-    }
-
-    if (all_ascii) {
-      for (; *identifier; ++identifier, ++buf) {
-        if (*identifier == '-') {
-          *buf = '_';
-        } else {
-          *buf = *identifier;
-        }
-      }
+  unsigned char *src = (unsigned char *)identifier;
+  unsigned char *dst = (unsigned char *)buf;
+  while (*src) {
+    // ASCII characters
+    if (*src < 0x80) {
+      *dst = (*src == '-') ? '_' : *src;
+      ++dst;
+      ++src;
+      // Shift_JIS characters
     } else {
-      for (; *identifier; ++identifier) {
-        sprintf(buf, "%02x", (unsigned char)*identifier);
-        buf += 2;
-      }
-    }
-    *buf = '\0';
-  } else {
-    unsigned char *src = (unsigned char *)identifier;
-    unsigned char *dst = (unsigned char *)buf;
-    while (*src) {
-      // ASCII characters
-      if (*src < 0x80) {
-        *dst = (*src == '-') ? '_' : *src;
-        ++dst;
-        ++src;
-        // Shift_JIS characters
+      // convert zenkaku hyphen to zenkaku underscore
+      if (src[0] == 0x81 && src[1] == 0x7C) {
+        dst[0] = 0x81;
+        dst[1] = 0x51;
       } else {
-        if (src[0] == 0x81 && src[1] == 0x7C) {
-          dst[0] = 0x81;
-          dst[1] = 0x51;
-        } else {
-          dst[0] = src[0];
-          dst[1] = src[1];
-        }
-        dst += 2;
-        src += 2;
+        dst[0] = src[0];
+        dst[1] = src[1];
       }
+      dst += 2;
+      src += 2;
     }
-    *dst = '\0';
   }
+  *dst = '\0';
 }
 
 struct cb_label_id_map {

cobj/flag-help.def

@@ -56,8 +56,5 @@ CB_FLAG (cb_flag_functions_all, "functions-all",
 CB_FLAG (cb_flag_mfcomment, "mfcomment",
 	 N_("'*' or '/' in column 1 treated as comment (FIXED only)"))
 
-CB_FLAG (cb_flag_var_name_hex, "var-name-hex",
-	 N_("Use hexdecimal representation for variable names that contains non-ASCII characters"))
-
 //CB_FLAG (cb_flag_no_cobol_comment, "no-cobol-comment",
 //	 N_("Do not generate COBOL comments into Java programs"))

cobj/flag.def

@@ -81,8 +81,5 @@ CB_FLAG (cb_flag_serial_variable, "serial-variable",
 CB_FLAG (cb_flag_short_variable, "short-variable",
 	 N_("Use short variable names in Java source code. This feature may cause compilation errors"))
 
-CB_FLAG (cb_flag_var_name_hex, "var-name-hex",
-	 N_("Use hexdecimal representation for variable names that contains non-ASCII characters"))
-
 //CB_FLAG (cb_flag_no_cobol_comment, "no-cobol-comment",
 //	 N_("Do not generate COBOL comments into Java programs"))