Merge remote-tracking branch 'upstream/gnucobol-3.x' into gcos4gnucobol-3.x

Author: ddeclerck

.github/workflows/windows-msvc.yml

@@ -187,18 +187,14 @@ jobs:
           # sed -i '/AT_SETUP(\[runtime check: write to internal storage (1)\])/a AT_SKIP_IF(\[true\])' tests/testsuite.src/run_misc.at
           sed -i '/run_misc/{N;/write to internal storage (1)/{N;N;N;N;s/traceon/traceon; echo "workflow:1">"$at_check_line_file"; at_fn_check_skip 77/;}}' tests/testsuite
 
-        # Fail two tests that behave differently under MSVC Debug
+        # Fail tests that behave differently under MSVC Debug
         # - System routine CBL_GC_HOSTED: fails because libcob is linked with the debug version
         #   of the C runtime while the generated module is linked with the release version
-        # - PROGRAM COLLATING SEQUENCE: fails because of a data loss in a cast, due
-        #   to lack of specific handling of LOW/HIGH-VALUE for NATIONAL alphabets
-        #   (see typeck.c:cb_validate_collating)
       - name: Adjust testsuite for Debug target
         if: ${{ matrix.target == 'Debug' }}
         shell: C:\shells\msys2bash.cmd {0}
         run: |
           sed -i '/run_extensions/{N;/System routine CBL_GC_HOSTED/{N;s/at_xfail=no/at_xfail=yes/;}}' tests/testsuite
-          sed -i '/syn_definition/{N;/PROGRAM COLLATING SEQUENCE/{N;s/at_xfail=no/at_xfail=yes/;}}' tests/testsuite
 
       - name: Run testsuite
         run: |

NEWS

@@ -43,6 +43,10 @@ NEWS - user visible changes				-*- outline -*-
    later binary comparison of the field as well as on group MOVEs
 ** #918: COB_LS_VALIDATE (io status 09 and 71) partial broken
 
+** #948: Comparison with HIGH-VALUE in presence of collating sequences
+   using a non-native program collating sequence together with the
+   -febcdic-table option might now alter LOW/HIGH-VALUE
+
 * Changes to the COBOL compiler (cobc) options:
 
 ** New option --copy COPYBOOK to load copybooks before parsing files. This

build_windows/makedist.cmd

@@ -120,7 +120,7 @@ if exist "%cob_source_path%doc\*.html" (
 
 echo Copying configuration files...
 mkdir config
-set "config_ext_list=conf conf-inc words cfg"
+set "config_ext_list=conf conf-inc words cfg ttbl"
 for %%f in (%config_ext_list%) do (
     copy "%cob_source_path%config\*.%%f"	config\	1>nul
 )

cobc/ChangeLog

@@ -1,4 +1,11 @@
 
+2025-04-04  David Declerck <[email protected]>
+
+	* cobc.c (process_filename): ensure we don't keep the preprocessed
+	  file when using -M or -fcopybook-deps
+	* cobc.c, cobc.h, help.c, pplex.l: make -fcopybook-deps an experimental
+	  feature, activable with the EXPERIMENTAL_COPYBOOK_DEPS_OPTION flag
+
 2025-03-26  David Declerck <[email protected]>
 
 	* gentable.c: generate EBCDIC/ASCII translation tables
@@ -215,6 +222,30 @@
 	  also forces -E, -foneline-deps, -MT=copybooks, disables errors on
 	  missing copybooks and removes output on stdout
 
+2024-02-26  David Declerck <[email protected]>
+
+	BUG #948: comparison with HIGH-VALUE in presence of collating sequences
+	* tree.h (cb_program): add low_value and high_value fields to hold
+	  the low and high values used by the program collating sequence
+	* tree.c (cb_build_program): initialize the low_value and
+	  high_value fields to reasonable default values
+	* typeck.c: replace hard-coded cob_refer_ascii and
+	  cob_refer_ebcdic by ebcdic_to_ascii and ascii_to_ebcdic
+	* typeck.c (cb_validate_collating): set the program's
+	  low_value and high_value fields
+	* typeck.c (validate_alphabet): use the new tables,
+	  set the alphabet's low and high values
+	* cobc.h: export the new symbols defined in typeck.c
+	* cobc.c (process_command_line): always load the collating table
+	* scanner.l (scan_ebcdic_char): remove code that loads and use a
+	  local collating table, use the table defined in typeck.c instead
+	* codegen.c: replace hard-coded 0 and 255 / 0xff contants with
+	  the low_value and high_value fields where appropriate
+	* codegen.c (output_low_value, output_high_value): move the
+	  cob_all_low and cob_all_high fields from global to local
+	* codegen.c (output_collating_tables): remove local tables and code
+	  that loads the tables, since they are now loaded from cobc.c
+
 2024-02-19  Boris Eng <[email protected]>
 
 	* parser.y (screen_value_clause): replaced basic literals by literals

cobc/cobc.c

@@ -261,7 +261,9 @@ int			cb_depend_output_only = 0;
 int			cb_depend_add_phony = 0;
 int			cb_depend_keep_missing = 0;
 int			cb_depend_target_auto = 0;
+#ifdef EXPERIMENTAL_COPYBOOK_DEPS_OPTION
 int			cb_flag_copybook_deps = 0;
+#endif
 
 /* set by option -fttitle=<title> */
 char                    *cb_listing_with_title = NULL;
@@ -634,7 +636,9 @@ static const struct option long_options[] = {
 	{"MP",			CB_NO_ARG, NULL, CB_FLAG_GETOPT_DEPEND_ADD_PHONY},
 	{"MG",			CB_NO_ARG, NULL, CB_FLAG_GETOPT_DEPEND_KEEP_MISSING},
 	{"MD",			CB_NO_ARG, NULL, CB_FLAG_GETOPT_DEPEND_ON_THE_SIDE},
+#ifdef EXPERIMENTAL_COPYBOOK_DEPS_OPTION
 	{"fcopybook-deps",	CB_NO_ARG, &cb_flag_copybook_deps, 1},
+#endif
 	{"gentable",		CB_RQ_ARG, NULL, CB_FLAG_GETOPT_GENTABLE},
 	{"coverage",	CB_NO_ARG, &cb_coverage_enabled, 1},
 	{"P",			CB_OP_ARG, NULL, 'P'},
@@ -4193,6 +4197,7 @@ process_command_line (const int argc, char **argv)
 		}
 	}
 
+#ifdef EXPERIMENTAL_COPYBOOK_DEPS_OPTION
 	if (cb_flag_copybook_deps) {
 		/* same as -M, but only COPYBOOK names */
 		cb_depend_output = 1;
@@ -4201,6 +4206,7 @@ process_command_line (const int argc, char **argv)
 		cb_depend_add_phony = 0;
 		cb_compile_level = CB_LEVEL_PREPROCESS;
 	}
+#endif
 	if (!cb_depend_output &&
 	    (cb_depend_filename || cb_depend_add_phony || cb_depend_target
 	      || cb_depend_keep_missing)) {
@@ -4257,6 +4263,10 @@ process_command_line (const int argc, char **argv)
 			cb_flag_alt_ebcdic ? "alternate" : "default");
 	}
 
+	if (cob_load_collation (cb_ebcdic_table, ebcdic_to_ascii, ascii_to_ebcdic) < 0) {
+		cobc_err_exit (_("invalid parameter: %s"), "-febcdic-table");
+	}
+
 	/* Exit on missing options */
 #ifdef COB_INTERNAL_XREF
 	if (cb_listing_xref && !cb_listing_outputfile) {
@@ -4640,7 +4650,7 @@ process_filename (const char *filename)
 		fn->preprocess = cobc_main_strdup (output_name);
 	} else
 	if (save_all_src || save_temps
-	 || cb_compile_level == CB_LEVEL_PREPROCESS) {
+	 || (cb_compile_level == CB_LEVEL_PREPROCESS && !cb_depend_output_only)) {
 		fn->preprocess = cobc_main_stradd_dup (fbasename, ".i");
 	} else {
 		fn->preprocess = cobc_main_malloc (COB_FILE_MAX);
@@ -9335,9 +9345,11 @@ process_file (struct filename *fn, int status)
 		const char *sep = " \\\n";
 		FILE *file = NULL;
 
+#ifdef EXPERIMENTAL_COPYBOOK_DEPS_OPTION
 		if (cb_flag_copybook_deps) {
 			sep = "";
 		}
+#endif
 		if (cb_depend_file) {
 			file = cb_depend_file;
 		} else {
@@ -9354,9 +9366,14 @@ process_file (struct filename *fn, int status)
 			fprintf (file, "%s:%s", basename, sep);
 		}
 
-		for (l = cb_depend_list; l; l = l->next) {
-			fprintf (file, " %s%s", l->text, l->next ? sep : "\n\n");
+		if (cb_depend_list) {
+			for (l = cb_depend_list; l; l = l->next) {
+				fprintf (file, " %s%s", l->text, l->next ? sep : "\n\n");
+			}
+		} else {
+			fprintf (file, "\n\n");
 		}
+
 		/* These lines should only be added with -MP */
 		if (cb_depend_add_phony) {
 			for (l = cb_depend_list; l; l = l->next) {

cobc/cobc.h

@@ -475,7 +475,9 @@ extern FILE			*cb_src_list_file;
 extern FILE			*cb_depend_file;
 extern int			cb_depend_output;
 extern int			cb_depend_keep_missing;
+#ifdef EXPERIMENTAL_COPYBOOK_DEPS_OPTION
 extern int			cb_flag_copybook_deps;
+#endif
 extern struct cb_text_list	*cb_depend_list;
 extern struct cb_text_list	*cb_copy_list;
 extern struct cb_text_list	*cb_include_file_list; /* global */
@@ -625,6 +627,9 @@ extern int		yyparse (void);
 /* typeck.c */
 extern size_t		suppress_warn;	/* no warnings for internal generated stuff */
 
+extern cob_u8_t ebcdic_to_ascii[256];
+extern cob_u8_t ascii_to_ebcdic[256];
+
 /* error.c */
 #define CB_MSG_STYLE_GCC	0
 #define CB_MSG_STYLE_MSC	1U

cobc/codegen.c

@@ -2522,23 +2522,23 @@ static void
 output_low_value (void)
 {
 	if (gen_figurative & CB_NEED_LOW) {
-		output ("static cob_field cob_all_low\t= ");
-		output ("{1, ");
-		output ("(cob_u8_ptr)\"\\0\", ");
-		output ("&cob_all_attr};");
-		output_newline ();
+		output_local ("static cob_field cob_all_low\t= ");
+		output_local ("{1, ");
+		output_local ("(cob_u8_ptr)\"\\x%02x\", ", current_prog->low_value);
+		output_local ("&cob_all_attr};");
+		output_local ("\n");
 	}
 }
 
 static void
 output_high_value (void)
 {
 	if (gen_figurative & CB_NEED_HIGH) {
-		output ("static cob_field cob_all_high\t= ");
-		output ("{1, ");
-		output ("(cob_u8_ptr)\"\\xff\", ");
-		output ("&cob_all_attr};");
-		output_newline ();
+		output_local ("static cob_field cob_all_high\t= ");
+		output_local ("{1, ");
+		output_local ("(cob_u8_ptr)\"\\x%02x\", ", current_prog->high_value);
+		output_local ("&cob_all_attr};");
+		output_local ("\n");
 	}
 }
 
@@ -2622,8 +2622,6 @@ output_literals_figuratives_and_constants (void)
 
 	if (gen_figurative) {
 		output_newline ();
-		output_low_value ();
-		output_high_value ();
 		output_quote ();
 		output_space ();
 		output_zero ();
@@ -2661,18 +2659,6 @@ output_colseq_table_field (const char * field_name, const char * table_name)
 static void
 output_collating_tables (void)
 {
-	cob_u8_t ebcdic_to_ascii[256];
-	cob_u8_t ascii_to_ebcdic[256];
-
-	/* Load the collating tables if needed */
-	if (gen_ascii_ebcdic || gen_ebcdic_ascii) {
-		if (cob_load_collation (cb_ebcdic_table,
-					gen_ebcdic_ascii ? ebcdic_to_ascii : NULL,
-					gen_ascii_ebcdic ? ascii_to_ebcdic : NULL) < 0) {
-			cobc_err_exit (_("invalid parameter: %s"), "-febcdic-table");
-		}
-	}
-
 	if (gen_native) {
 		output_storage ("\n/* NATIVE table */\n");
 		output_colseq_table ("cob_native", NULL);
@@ -4282,9 +4268,9 @@ output_funcall_typed (struct cb_funcall *p, const char type)
 		} else if (p->argv[1] == cb_zero) {
 			output (") - '0')");
 		} else if (p->argv[1] == cb_low) {
-			output ("))");
+			output (") - 0x%02x)", current_prog->low_value);
 		} else if (p->argv[1] == cb_high) {
-			output (") - 255)");
+			output (") - 0x%02x)", current_prog->high_value);
 		} else if (CB_LITERAL_P (p->argv[1])) {
 			output_char (") - ", CB_LITERAL (p->argv[1])->data[0], ")");
 		} else {
@@ -5069,10 +5055,10 @@ output_initialize_to_value (struct cb_field *f, cb_tree x,
 			output_figurative (x, f, ' ', init_occurs);
 			return;
 		} else if (value == cb_low) {
-			output_figurative (x, f, 0, init_occurs);
+			output_figurative (x, f, current_prog->low_value, init_occurs);
 			return;
 		} else if (value == cb_high) {
-			output_figurative (x, f, 255, init_occurs);
+			output_figurative (x, f, current_prog->high_value, init_occurs);
 			return;
 		} else if (value == cb_quote) {
 			if (cb_flag_apostrophe) {
@@ -10815,9 +10801,9 @@ output_class_name_definition (struct cb_class_name *p)
 			} else if (x == cb_null) {
 				vals[0] = 1;
 			} else if (x == cb_low) {
-				vals[0] = 1;
+				vals[current_prog->low_value] = 1;
 			} else if (x == cb_high) {
-				vals[255] = 1;
+				vals[current_prog->high_value] = 1;
 			} else {
 				size = CB_LITERAL (x)->size;
 				data = CB_LITERAL (x)->data;
@@ -14162,6 +14148,9 @@ codegen_internal (struct cb_program *prog, const int subsequent_call)
 			output_local ("\n");
 		}
 	}
+
+	output_low_value ();
+	output_high_value ();
 }
 
 void

cobc/help.c

@@ -149,7 +149,9 @@ cobc_print_usage_common_options (void)
 	puts (_("  -MG                   output missing dependencies without complaining"));
 	puts (_("  -MD                   output dependencies in .d files while compiling"));
 	puts (_("  -ext <extension>      add file extension for resolving COPY"));
+#ifdef EXPERIMENTAL_COPYBOOK_DEPS_OPTION
 	puts (_("  -fcopybook-deps       output copybook names as dependencies"));
+#endif
 	puts (_("  --gentable=<ebcdic-enc>,<ascii-enc>[+]\toutput a translation table between the\n"
 		"                        given encodings to stdout and exit"));
 	putchar ('\n');

cobc/pplex.l

@@ -1474,7 +1474,11 @@ ppopen (const char *name, struct cb_replace_list *replacing_list)
 	}
 
 	/* add opened file to dependency list */
-	if (cb_depend_output && !cb_flag_copybook_deps) {
+	if (cb_depend_output
+#ifdef EXPERIMENTAL_COPYBOOK_DEPS_OPTION
+	 && !cb_flag_copybook_deps
+#endif
+	) {
 		cb_depend_list = pp_text_list_add (cb_depend_list, name, strlen (name));
 	}
 
@@ -1677,6 +1681,7 @@ ppcopy (const char *name, const char *lib, struct cb_replace_list *replace_list)
 		plexbuff1 = cobc_malloc ((size_t)COB_SMALL_BUFF);
 	}
 
+#ifdef EXPERIMENTAL_COPYBOOK_DEPS_OPTION
 	if (cb_depend_output && cb_flag_copybook_deps) {
 
 		if (lib) {
@@ -1690,6 +1695,7 @@ ppcopy (const char *name, const char *lib, struct cb_replace_list *replace_list)
 			pp_text_list_add (cb_depend_list, plexbuff1,
 					  strlen (plexbuff1));
 	}
+#endif
 
 	/* TODO: open with path relative to the current file's path,
 	         if any (applies both to with and without "lib") */
@@ -1762,12 +1768,14 @@ ppcopy (const char *name, const char *lib, struct cb_replace_list *replace_list)
 		/* otherwise fall-trough to error handling */
 	} else {
 		/* do not output error if looking only for copybook deps */
-		if (!cb_flag_copybook_deps){
+#ifdef EXPERIMENTAL_COPYBOOK_DEPS_OPTION
+		if (!cb_flag_copybook_deps)
+#endif
+		{
 
 			/* add opened file to dependency list */
 			if (cb_depend_output && cb_depend_keep_missing) {
 				const char *depname = cobc_plex_stradd (plexbuff1, cb_extension_list->text);
-
 				cb_depend_list = pp_text_list_add (cb_depend_list, depname, strlen (depname));
 			} else {
 

cobc/scanner.l

@@ -1357,10 +1357,6 @@ static cob_u8_t
 scan_ebcdic_char (int c)
 {
 	char buff[10];	       /* Arbitrary limit, mostly for error-reporting */
-#ifndef COB_EBCDIC_MACHINE
-	static  cob_u8_t ebcdic_to_ascii[256] ;
-	static  int ebcdic_to_ascii_initialized = 0 ;
-#endif
 	unsigned int j = 0;
 	do {
 		buff[j++] = (char)c;
@@ -1377,20 +1373,7 @@ scan_ebcdic_char (int c)
 #ifdef COB_EBCDIC_MACHINE
 	return (cob_u8_t) c;
 #else
-	if (!ebcdic_to_ascii_initialized ) {
-		if (cob_load_collation (cb_ebcdic_table, ebcdic_to_ascii, NULL) < 0) {
-			cb_error (_("invalid parameter: %s"), "-febcdic-table");
-			ebcdic_to_ascii_initialized = -1;
-		} else {
-			ebcdic_to_ascii_initialized = 1;
-		}
-	}
-
-	if (ebcdic_to_ascii_initialized > 0) {
-		return ebcdic_to_ascii[c];
-	} else {
-		return '?';
-	}
+	return ebcdic_to_ascii[c];
 #endif
 }