Merge SVN 4653

cobc/ChangeLog

@@ -237,6 +237,26 @@
 	* tree.c (cb_build_picture), tree.h: return cb_picture instead of cb_tree
 	  as all but one caller directly use it that way
 
+2022-07-12  Simon Sobisch <[email protected]>
+
+	* scanner.l (read_literal): do the necessary conversion for national
+	  literals (simple approach, only working with source in iso-8859-15
+	  or plain ascii)
+	* typeck.c (get_value): return correct numeric value for national
+	  (utf16) literals
+	* tree.c (cb_build_intrinsic): fixed optimized length generation for
+	  national fields and literals
+	* typeck.c (cb_validate_program_environment): refactored,
+	  reducing variable scope and extracted (validate_alphabet) and
+	  (check_class_duplicates); call the later depending on
+	  cb_warn_additional, no need to test if the final result is ignored
+	* typeck.c (validate_alphabet): adjustments for national literals,
+	  now partially supported
+	* scanner.l: moved static literal_error to local variable,
+	  passing it (to error_literal); return a valid literal in case of
+	  literal errors (intead of cb_error_node) to prevent spurious
+	  follow-up errors on their use
+
 2022-07-06  Nicolas Berthier <[email protected]>
 
 	* cobc.h: define function purity attribute COB_A_PURE

cobc/codegen.c

@@ -5347,6 +5347,10 @@ initialize_uniform_char (const struct cb_field *f,
 			return '0';
 		case COB_TYPE_ALPHANUMERIC:
 			return ' ';
+#if 1 /* TODO: proper initialization of NATIONAL data */
+		case COB_TYPE_NATIONAL:
+			return ' ';
+#endif
 		default:
 			return -1;
 		}