Merge SVN 3738, 3798

cobc/ChangeLog

@@ -1211,6 +1211,11 @@
 
 	* scanner.l (read_literal): catch and error  missing termination of literal
 
+2020-09-01  Simon Sobisch <[email protected]>
+
+	* codegen.c (codegen_init): fixed broken codegen for multi-source compiles
+	  introduced when fixing bug #666
+
 2020-08-28  Ron Norman <[email protected]>
 
 	* codegen.c: Changes for UNBOUNDED OCCURS
@@ -1233,22 +1238,24 @@
 	  improved syntax checks, now allowing RECORD VARYING also with
 	  fixed length FD (as all other known compilers do)
 
-2020-07-14  Simon Sobisch <[email protected]>
+2020-07-30  Simon Sobisch <[email protected]>
 
-	* cobc.c, cobc.h, codegen.c: added dumping of LOCAL-STORAGE,
-	  fixed dump of of SD
+	* codegen.c (output_call): don't setup exceptions for static CALLs
 
 2020-07-30  Simon Sobisch <[email protected]>
 
 	* help.c: adjusted help output;
 	  including fix for bug #670 "multiple listing of -debug"
 	* flag.def: removed dummy variables cb_def_dump, cb_def_callfh
 
-2020-07-09  Edward Hart <[email protected]>
+2020-07-27  Simon Sobisch <[email protected]>
 
-	* reserved.c (is_reserved_word): fixed division by zero when called
-	  before reserved words list has been initialised (bug #659). Thanks
-	  to Paul Smith for fix.
+	refactored codegen, now using a loop instead of a recursive call
+	fixing bug #666
+	* codegen.c, cobc.c, tree.h: split (codegen) into
+	  (codegen_init, codegen_internal, codegen_finalize);
+	  moved more initialization to codegen_init;
+	  limit variable scope and use of static variables
 
 2020-07-26  Edward Hart <[email protected]>
 
@@ -1266,6 +1273,17 @@
 	* scanner.l: add EQUALS as alias for EQUAL in conditions (bug #663).
 	* typeck.c: fixed segfault with parens around condition word (bug #663).
 
+2020-07-14  Simon Sobisch <[email protected]>
+
+	* cobc.c, cobc.h, codegen.c: added dumping of LOCAL-STORAGE,
+	  fixed dump of of SD
+
+2020-07-09  Edward Hart <[email protected]>
+
+	* reserved.c (is_reserved_word): fixed division by zero when called
+	  before reserved words list has been initialised (bug #659). Thanks
+	  to Paul Smith for fix.
+
 2020-07-08  Simon Sobisch <[email protected]>
 
 	* scanner.l (scan_x): fixed #658 by building a national literal for nx''

cobc/cobc.c

@@ -2865,7 +2865,7 @@ process_command_line (const int argc, char **argv)
 		while (++argnum < argc) {
 			if (strrchr(argv[argnum], '/') == argv[argnum]) {
 				if (argv[argnum][1] == '?' && !argv[argnum][2]) {
-					argv[argnum] = (char *)"--help";
+					argv[argnum] = (char *) "--help";
 					continue;
 				}
 				argv[argnum][0] = '-';
@@ -7717,18 +7717,7 @@ process_translate (struct filename *fn)
 	}
 
 	/* Translate to C */
-	current_section = NULL;
-	current_paragraph = NULL;
-	current_statement = NULL;
-	cb_source_line = 0;
-	/* Temporarily disable cross-reference during C generation */
-	if (cb_listing_xref) {
-		cb_listing_xref = 0;
-		codegen (current_program, fn->translate, 0);
-		cb_listing_xref = 1;
-	} else {
-		codegen (current_program, fn->translate, 0);
-	}
+	codegen (current_program, fn->translate);
 
 	/* Close files */
 	if (fclose (cb_storage_file) != 0) {