Implement -fshort-variable option (#61)

Author: yutaro-sakamoto

cobj/codegen.c

@@ -185,6 +185,9 @@ get_java_identifier_field(struct cb_field* f) {
 	char *buf = malloc(COB_SMALL_BUFF);
 	if(cb_flag_serial_variable) {
 		sprintf(buf, "%s%d", CB_PREFIX_FIELD, f->id);
+	} else if(cb_flag_short_variable) {
+		strcpy(buf, CB_PREFIX_FIELD);
+		strcpy_identifier_cobol_to_java(buf + strlen(CB_PREFIX_FIELD), f->name);
 	} else {
 		strcpy(buf, CB_PREFIX_FIELD);
 		get_java_identifier_helper(f, buf + strlen(CB_PREFIX_FIELD));
@@ -197,6 +200,9 @@ get_java_identifier_base(struct cb_field* f) {
 	char *buf = malloc(COB_SMALL_BUFF);
 	if(cb_flag_serial_variable) {
 		sprintf(buf, "%s%d", CB_PREFIX_BASE, f->id);
+	} else if(cb_flag_short_variable) {
+		strcpy(buf, CB_PREFIX_BASE);
+		strcpy_identifier_cobol_to_java(buf + strlen(CB_PREFIX_BASE), f->name);
 	} else {
 		strcpy(buf, CB_PREFIX_BASE);
 		get_java_identifier_helper(f, buf + strlen(CB_PREFIX_BASE));

cobj/flag-help.def

@@ -36,3 +36,6 @@ CB_FLAG (cb_flag_syntax_only, "syntax-only",
 
 CB_FLAG (cb_flag_serial_variable, "serial-variable",
 	 N_("Instead of embedding COBOL variable names in Java variable names, give them serial numbers."))
+
+CB_FLAG (cb_flag_short_variable, "short-variable",
+	 N_("Use short variable names in Java source code. This feature may cause compilation errors"))

cobj/flag.def

@@ -74,3 +74,6 @@ CB_FLAG (cb_flag_null_param, "null-param",
 
 CB_FLAG (cb_flag_serial_variable, "serial-variable",
 	 N_("Instead of embedding COBOL variable names in Java variable names, give them serial numbers."))
+
+CB_FLAG (cb_flag_short_variable, "short-variable",
+	 N_("Use short variable names in Java source code. This feature may cause compilation errors"))

tests/Makefile.am

@@ -150,7 +150,8 @@ command_line_options_DEPENDENCIES = \
 	command-line-options.src/Wunreachable.at \
 	command-line-options.src/ftrace-ftraceall.at \
 	command-line-options.src/fsyntax-only.at \
-	command-line-options.src/fserial-variable.at
+	command-line-options.src/fserial-variable.at \
+	command-line-options.src/fshort-variable.at
 
 misc_DEPENDENCIES = \
 	misc.src/signed-comp3.at \

tests/Makefile.in

@@ -689,7 +689,8 @@ command_line_options_DEPENDENCIES = \
 	command-line-options.src/Wunreachable.at \
 	command-line-options.src/ftrace-ftraceall.at \
 	command-line-options.src/fsyntax-only.at \
-	command-line-options.src/fserial-variable.at
+	command-line-options.src/fserial-variable.at \
+	command-line-options.src/fshort-variable.at
 
 misc_DEPENDENCIES = \
 	misc.src/signed-comp3.at \

tests/command-line-options.at

@@ -12,3 +12,4 @@ m4_include([Wunreachable.at])
 m4_include([ftrace-ftraceall.at])
 m4_include([fsyntax-only.at])
 m4_include([fserial-variable.at])
+m4_include([fshort-variable.at])

tests/command-line-options.src/fshort-variable.at

@@ -0,0 +1,48 @@
+AT_SETUP([-fshort-variable])
+
+AT_DATA([prog.cbl], [
+       identification              division.
+       program-id.                 prog.
+
+       data                        division.
+       working-storage             section.
+       01 aa.
+         03 bb pic x(2) value "bb".
+         03 cc pic x(2) value "cc".
+         03 dd.
+           05 ee pic x(2) value "ee".
+         03 ff pic 9(3) USAGE COMP-3 VALUE 5.
+         03 gg pic 9(5) USAGE COMP-3.
+
+       procedure                   division.
+
+           display bb.
+           display cc.
+           display ee.
+
+           move ff to gg.
+           display gg.
+])
+
+AT_CHECK([${COBJ} --help | grep short-variable > /dev/null], [0])
+
+AT_CHECK([${COBJ} -fshort-variable prog.cbl])
+AT_CHECK([${RUN_MODULE} prog], [0],
+[bb
+cc
+ee
+00005
+])
+AT_CHECK([cat prog.java | grep f_bb > /dev/null], [0])
+AT_CHECK([cat prog.java | grep f_cc > /dev/null], [0])
+AT_CHECK([cat prog.java | grep f_ee > /dev/null], [0])
+AT_CHECK([cat prog.java | grep f_ff > /dev/null], [0])
+AT_CHECK([cat prog.java | grep f_gg > /dev/null], [0])
+
+AT_CHECK([cat prog.java | grep f_bb_of > /dev/null], [1])
+AT_CHECK([cat prog.java | grep f_cc_of > /dev/null], [1])
+AT_CHECK([cat prog.java | grep f_ee_of > /dev/null], [1])
+AT_CHECK([cat prog.java | grep f_ff_of > /dev/null], [1])
+AT_CHECK([cat prog.java | grep f_gg_of > /dev/null], [1])
+
+AT_CLEANUP