Merge SVN 3940

cobc/ChangeLog

@@ -1270,6 +1270,12 @@
 	* config.def: added possible values for assign-clause and
 	  screen-section-rules.
 
+2020-07-21  Simon Sobisch <[email protected]>
+
+	* ppparse.y: improved error handling for broken IF/ELIF
+	  directives by consuming as much errors as possible and
+	  emitting a "false"
+
 2020-07-19  Edward Hart <[email protected]>
 
 	* cobc.c, typeck.c: added support for JSON-C as JSON handler.

cobc/cobc.c

@@ -4134,7 +4134,7 @@ process_filename (const char *filename)
 #if	defined(__OS400__)
 	    extension[0] == 0
 #else
-		cb_strcasecmp (extension, COB_OBJECT_EXT) == 0
+	    cb_strcasecmp (extension, COB_OBJECT_EXT) == 0
 #if	defined(_WIN32)
 	 || cb_strcasecmp (extension, "lib") == 0
 #endif
@@ -4160,8 +4160,8 @@ process_filename (const char *filename)
 		fn->preprocess = cobc_main_strdup (fn->source);
 	} else if (output_name && cb_compile_level == CB_LEVEL_PREPROCESS) {
 		fn->preprocess = cobc_main_strdup (output_name);
-	} else if (save_all_src || save_temps ||
-		   cb_compile_level == CB_LEVEL_PREPROCESS) {
+	} else if (save_all_src || save_temps
+	        || cb_compile_level == CB_LEVEL_PREPROCESS) {
 		fn->preprocess = cobc_main_stradd_dup (fbasename, ".i");
 	} else {
 		fn->preprocess = cobc_main_malloc (COB_FILE_MAX);