Fix the problem involved with compiling multiple files (#271) (#272)

Author: yutaro-sakamoto

cobj/codegen.c

@@ -5821,6 +5821,12 @@ void codegen(struct cb_program *prog, const int nested, char **program_id_list,
   needs_exit_prog = 0;
   gen_custom = 0;
   call_cache = NULL;
+  while (call_parameter_cache) {
+    struct call_parameter_list *next = call_parameter_cache->next;
+    free(call_parameter_cache);
+    call_parameter_cache = next;
+  }
+  call_parameter_cache = NULL;
   label_cache = NULL;
   local_cache = NULL;
   excp_current_program_id = prog->orig_source_name;

tests/Makefile.am

@@ -188,7 +188,8 @@ misc_DEPENDENCIES = \
 	misc.src/comp3-compute.at \
 	misc.src/index-file-status.at \
 	misc.src/comp-n.at \
-	misc.src/fd-external.at
+	misc.src/fd-external.at \
+	misc.src/compile-multiple-files.at
 
 EXTRA_DIST = $(srcdir)/package.m4 \
 	$(TESTS) \

tests/Makefile.in

@@ -729,7 +729,8 @@ misc_DEPENDENCIES = \
 	misc.src/comp3-compute.at \
 	misc.src/index-file-status.at \
 	misc.src/comp-n.at \
-	misc.src/fd-external.at
+	misc.src/fd-external.at \
+	misc.src/compile-multiple-files.at
 
 EXTRA_DIST = $(srcdir)/package.m4 \
 	$(TESTS) \

tests/misc.at

@@ -40,3 +40,4 @@ m4_include([comp3-compute.at])
 m4_include([index-file-status.at])
 m4_include([comp-n.at])
 m4_include([fd-external.at])
+m4_include([compile-multiple-files.at])

tests/misc.src/compile-multiple-files.at

@@ -0,0 +1,55 @@
+# With the previous version, compiling the following programs fails because the compiler write
+# the declarations of call parameters in multiple times.
+# This test checks whether this problem is resolved.
+# See Issue #271 (https://github.com/opensourcecobol/opensourcecobol4j/issues/271) for detail.
+AT_SETUP([Compile multiple files])
+
+AT_DATA([caller.cbl], [
+       IDENTIFICATION   DIVISION.
+       PROGRAM-ID.      caller.
+       DATA             DIVISION.
+       WORKING-STORAGE  SECTION.
+       01 W             PIC X.
+       01 X             PIC X.
+       01 Y             PIC X.
+       01 Z             PIC X.
+       PROCEDURE        DIVISION.
+           CALL "callee"
+           END-CALL.
+           CALL "callee" USING W
+           END-CALL.
+           CALL "callee" USING W X
+           END-CALL.
+           CALL "callee" USING W X Y
+           END-CALL.
+           CALL "callee" USING W X Y Z
+           END-CALL.
+           STOP RUN.
+])
+
+AT_DATA([callee.cbl], [
+       IDENTIFICATION   DIVISION.
+       PROGRAM-ID.      callee.
+       DATA             DIVISION.
+       LINKAGE          SECTION.
+       01 W             PIC X.
+       01 X             PIC X.
+       01 Y             PIC X.
+       01 Z             PIC X.
+       PROCEDURE        DIVISION
+           USING W X Y Z.
+           DISPLAY NUMBER-OF-CALL-PARAMETERS
+           END-DISPLAY.
+           EXIT PROGRAM.
+])
+
+AT_CHECK([${COBJ} callee.cbl caller.cbl])
+AT_CHECK([java caller], [0],
+[+000000000
++000000001
++000000002
++000000003
++000000004
+])
+
+AT_CLEANUP