Merge remote-tracking branch 'upstream/master' into gc4

Author: ddeclerck

.github/workflows/windows-msys2.yml

@@ -68,8 +68,8 @@ jobs:
   build:
     needs: prepare
     runs-on: windows-latest
-    timeout-minutes: ${{ matrix.sys == 'clang64' && 35 || 20 }}
-    strategy:        # usually 13-15 min, except clang, which takes ~30 min
+    timeout-minutes: 15
+    strategy:
       fail-fast: false
       matrix:
         include:

NEWS

@@ -107,13 +107,16 @@ Open Plans:
 ** support the COLLATING SEQUENCE clause on indexed files
    (currently only with the BDB backend)
 
-** Support for time profiling of modules, sections, paragraphs, entries
+** support for time profiling of modules, sections, paragraphs, entries
    and external CALLs. This feature is activated by compiling the modules
    to be profiled with -fprof, and then executing the code with environment
    variable COB_PROF_ENABLE. The output is stored in a CSV file. Further
    customization can be done using COB_PROF_FILE, COB_PROF_MAX_DEPTH and
    COB_PROF_FORMAT
 
+** new runtime configuraiton COB_HIDE_CURSOR, allows to hide the cursor during
+   extended ScreenIO operations
+
   more work in progress
 
 * Important Bugfixes

cobc/ChangeLog

@@ -1,4 +1,12 @@
 
+2024-07-26  Simon Sobisch <simonsobisch@gnu.org>
+
+	* parser.y, config.def: rewrite ENVIRONMENT DIVISION parsing to allow
+	  non-standard order of CONFIGURATION and INPUT-OUTPUT sections,
+	  depending on dialect setting "incorrect-conf-sec-order"
+	* reserved.c: make MENU context-sensitive
+	* reserved.c, parser.y: added MODAL + MODELESS to acu extension windows
+
 2024-06-19  David Declerck <david.declerck@ocamlpro.com>
 
 	* cobc.c (process_compile): fix MSVC build command

cobc/codegen.c

@@ -1376,6 +1376,9 @@ output_data (cb_tree x)
 			output (")->data");
 		}
 		break;
+	case CB_TAG_DIRECT:
+		output ("%s", CB_DIRECT (x)->line);
+		break;
 	/* LCOV_EXCL_START */
 	default:
 		CB_TREE_TAG_UNEXPECTED_ABORT (x);

cobc/config.def

@@ -400,7 +400,7 @@ CB_CONFIG_SUPPORT (cb_numeric_value_for_edited_item, "numeric-value-for-edited-i
 	_("numeric literals in VALUE clause of numeric-edited items"))
 
 CB_CONFIG_SUPPORT (cb_incorrect_conf_sec_order, "incorrect-conf-sec-order",
-	_("incorrect order of CONFIGURATION SECTION paragraphs")) /* OpenCOBOL/GnuCOBOL extension */
+	_("incorrect order of CONFIGURATION SECTION and its paragraphs")) /* MF extension */
 
 CB_CONFIG_SUPPORT (cb_define_constant_directive, "define-constant-directive",
 	_("allow >> DEFINE CONSTANT var AS literal")) /* OpenCOBOL/GnuCOBOL extension */

cobc/parser.y

@@ -2999,7 +2999,9 @@ set_record_size (cb_tree min, cb_tree max)
 %token MINUS
 %token MIN_VAL			"MIN-VAL"
 %token MNEMONIC_NAME		"Mnemonic name"
+%token MODAL
 %token MODE
+%token MODELESS
 %token MODIFY
 %token MODULES
 %token MOVE
@@ -4183,8 +4185,21 @@ intermediate_rounding_choice:
 
 _environment_division:
   _environment_header
-  _configuration_section
-  _input_output_section
+  _environment_sections
+;
+
+_environment_sections:
+| configuration_section _input_output_section
+| input_output_section configuration_section
+  {
+#define MESSAGE_LEN 100
+	char			message[MESSAGE_LEN] = { '\0' };
+	snprintf (message, MESSAGE_LEN, _("%s incorrectly after %s"),
+			"CONFIGURATION SECTION", "INPUT-OUTPUT SECTION");
+	cb_verify (cb_incorrect_conf_sec_order, message);
+#undef MESSAGE_LEN
+  }
+| input_output_section
 ;
 
 _environment_header:
@@ -4201,13 +4216,9 @@ environment_header:
 
 /* CONFIGURATION SECTION */
 
-_configuration_section:
-  _configuration_header
-  _configuration_paragraphs
-;
-
-_configuration_header:
-| configuration_header
+configuration_section:
+  configuration_header _configuration_paragraphs
+| configuration_paragraphs
 ;
 
 configuration: CONFIGURATION { check_area_a_of ("CONFIGURATION SECTION"); };
@@ -5336,15 +5347,19 @@ top_clause:
 /* INPUT-OUTPUT SECTION */
 
 _input_output_section:
-  _input_output_header
-  _file_control_header
-  _file_control_sequence
-  _i_o_control
+| input_output_section
+;
+
+input_output_section:
+  input_output_header _file_control_header _file_control_sequence  _i_o_control
+| file_control_header _file_control_sequence  _i_o_control
+| file_control_sequence  _i_o_control
+| i_o_control
 ;
 
 input_output: INPUT_OUTPUT { check_area_a_of ("INPUT-OUTPUT SECTION"); };
-_input_output_header:
-| input_output SECTION _dot
+input_output_header:
+  input_output SECTION _dot
   {
 	check_headers_present (COBC_HD_ENVIRONMENT_DIVISION, 0, 0, 0);
 	header_check |= COBC_HD_INPUT_OUTPUT_SECTION;
@@ -5354,7 +5369,10 @@ _input_output_header:
 /* FILE-CONTROL paragraph */
 
 _file_control_header:
-| FILE_CONTROL _dot
+| file_control_header
+;
+file_control_header:
+  FILE_CONTROL _dot
   {
 	check_headers_present (COBC_HD_ENVIRONMENT_DIVISION,
 			       COBC_HD_INPUT_OUTPUT_SECTION, 0, 0);
@@ -5363,7 +5381,12 @@ _file_control_header:
 ;
 
 _file_control_sequence:
-| _file_control_sequence file_control_entry
+| file_control_sequence
+;
+
+file_control_sequence:
+  file_control_entry
+| file_control_sequence file_control_entry
 ;
 
 file_control_entry:
@@ -6266,7 +6289,11 @@ track_limit_clause:
 /* I-O-CONTROL paragraph */
 
 _i_o_control:
-| i_o_control_header _i_o_control_entries
+| i_o_control
+;
+
+i_o_control:
+  i_o_control_header _i_o_control_entries
   {
 	cobc_cs_check = 0;
   }
@@ -13690,12 +13717,18 @@ display_window_clause:
   }
 | at_line_column
 | _top_or_bottom _left_or_centered_or_right TITLE _is_equal x
+| modal_modeless
 | shadow
 | boxed
 | no_scroll_wrap
 | _with disp_attr
 ;
 
+modal_modeless:
+  MODAL		{ /* TODO: set attribute */ }
+| MODELESS
+;
+
 shadow:
   SHADOW		{ /* TODO: set attribute */ }
 ;

cobc/reserved.c

@@ -1858,8 +1858,8 @@ static struct cobc_reserved default_reserved_words[] = {
   { "MEMORY",			0, 1, MEMORY,			/* 85 */
 				0, CB_CS_OBJECT_COMPUTER
   },
-  { "MENU",			0, 0, MENU,			/* ACU extension */
-				0, 0				/* Checkme: likely context sensitive */
+  { "MENU",			0, 1, MENU,			/* ACU extension */
+				0, CB_CS_GRAPHICAL_CONTROL | CB_CS_INQUIRE_MODIFY | CB_CS_USAGE	 /* at least for MF: undocumented C/S */
   },
   { "MERGE",			0, 0, MERGE,			/* 2002 */
 				0, 0
@@ -1885,9 +1885,15 @@ static struct cobc_reserved default_reserved_words[] = {
   { "MINUS",			0, 0, MINUS,			/* 2002 */
 				0, 0
   },
+  { "MODAL",			0, 1, MODAL,			/* ACU extension */
+				0, CB_CS_DISPLAY | CB_CS_GRAPHICAL_CONTROL
+  },
   { "MODE",			0, 0, MODE,			/* 2002 */
 				0, 0
   },
+  { "MODELESS",			0, 1, MODELESS,			/* ACU extension */
+				0, CB_CS_DISPLAY | CB_CS_GRAPHICAL_CONTROL
+  },
   { "MODIFY",			1, 0, MODIFY,			/* ACU extension */
 				CB_CS_INQUIRE_MODIFY, 0
   },

config/ChangeLog

@@ -8,6 +8,11 @@
 	* runtime.cfg: dropped not available "varfix_format",
 	  see "fixrel_format" instead; minor reformatting/rewording
 
+2024-08-17 Ammar Almoris <ammaralmorsi@gmail.com>
+
+	FR #474: add runtime configuration to hide cursor for extended screenio
+	* runtime.cfg: add COB_HIDE_CURSOR
+
 2024-07-11  David Declerck <david.declerck@ocamlpro.com>
 
 	* general: fix minor alignment / tab issues

config/runtime.cfg

@@ -684,6 +684,13 @@
 #             Note:  also sets the cursor type (if available)
 #          Example:  insert_mode Y
 
+# Environment name:  COB_HIDE_CURSOR
+#   Parameter name:  hide_cursor
+#          Purpose:  hide the cursor; 0=visible, 1=hidden
+#             Type:  boolean
+#          Default:  false
+#          Example:  hide_cursor Y
+
 # Environment name:  COB_MOUSE_FLAGS
 #   Parameter name:  mouse_flags
 #          Purpose:  specify which mouse events will be sent as function key

libcob/ChangeLog

@@ -17,6 +17,17 @@
 	  first, close the file descriptor only if the stream is NULL
 	  (fixes assertions under MSVC debug)
 
+2024-12-20  David Declerck <david.declerck@ocamlpro.com>
+
+	* fileio.c (indexed_start_internal)->fbdb.c: improve handling of partial
+	  keys, to ensure BDB always compares keys of identical length
+
+2024-12-18  David Declerck <david.declerck@ocamlpro.com>
+
+	* string.c: fix a bug where the source of STRING/UNSTRING/INSPECT
+	  is overwritten, by restoring the *_copy fields that were removed
+	  with the change on 2024-02-26
+
 2024-12-11  Emilien Lemaire <emilien.lemaire@ocamlpro.com>
 
 	* fileio.c->fbdb.c: fixed Bug #1032 by always using global thread-static variable
@@ -27,11 +38,6 @@
 	Reverted change 2022-02-21 to integrate change
 	from GnuCOBOL 3.1 2023-04-04
 
-2024-08-04  David Declerck <david.declerck@ocamlpro.com>
-
-	Adjustments to merge 2020-06-20:
-	* common.c (cob_sys_x91): activated functions 46-49
-
 2024-08-28  David Declerck <david.declerck@ocamlpro.com>
 
 	* intrinsics.c (cob_intr_random), move.c (cob_move_display_to_packed):
@@ -43,6 +49,18 @@
 	* common.c (DllMain) [_MSC_VER]: added calls to _CrtSetReportMode
 	  to disable Windows error popups and redirect them to stderr
 
+2024-08-17  Ammar Almorsi <ammaralmorsi@gmail.com>
+
+	FR #474: add runtime configuration to hide cursor for extended screenio
+	* common.c, coblocal.h (cob_settings): added boolean COB_HIDE_CURSOR
+	* screenio.c (cob_settings_screenio): implemented runtime config to hide
+	  the cursor
+
+2024-08-04  David Declerck <david.declerck@ocamlpro.com>
+
+	Adjustments to merge 2020-06-20:
+	* common.c (cob_sys_x91): activated functions 46-49
+
 2024-08-04  David Declerck <david.declerck@ocamlpro.com>
 
 	Adjustments to merge 2022-12-21:
@@ -63,6 +81,11 @@
 	  adjusted to use cob_open_mode where possible while
 	  merging 2022-10-04
 
+2024-07-19  Simon Sobisch <simonsobisch@gnu.org>
+
+	* coblocal.h (COB_TLS): add a new attribute for thread local static.
+	* common.h, common.c (cob_cleanup_thread): add a cleanup function for threads
+
 2024-07-12  Simon Sobisch <simonsobisch@gnu.org>
 
 	* numeric.c (cob_decimal_set_binar): C89 fix
@@ -74,6 +97,18 @@
 	* move.c (indirect_move) fixed C90 warnings
 	* profiling.c (profile_setup_clock) fixed C90 warnings
 
+2024-07-09  Boris Eng <boris.eng@ocamlpro.com>
+
+	* fileio.c (bdb_bt_compare, indexed_open)->fbdb.c: handle BDB keys of different
+	  length with a flag USE_BDB_KEYDIFF (passed with preparser flag CPPFLAGS)
+	* common.c (cob_cmp_strings), coblocal.h (cob_cmp_strings):
+	  extracted from (cob_cmp_alnum)
+
+2024-07-02  Chuck Haatvedt <chuck.haatvedt+cobol@gmail.com>
+
+	* numeric.c (cob_add_bcd) fixed check for default ROUNDED option
+	  to resolve bug 934
+
 2024-06-10  Chuck Haatvedt <chuck.haatvedt+cobol@gmail.com>
 
 	* screenio.c (cob_sys_scr_dump, cob_sys_scr_restore) added new functions
@@ -86,6 +121,19 @@
 	* fileio.c (apply_file_paths): extracted from cob_chk_file_mapping
 	  to factor out duplicated code
 
+2024-05-30  Chuck Haatvedt <chuck.haatvedt+cobol@gmail.com>
+
+		fix errors caught by the Sanitizer functionality of GCC. This
+		change did not resolve all of the issues found as some of them
+		were in Berkeley DB and some were intentional in the memory
+		corruption logic which has been implemented in the runtime.
+
+	* move.c (the cob_move_display_to_packed function was rewritten to
+	  fix the out of bounds memory addressing issues and also to make
+	  the code simpler.
+	* numeric.c (the function count_leading_zeros was changed to fix
+	  an out of bounds memory addressing issue
+
 2024-05-30  Chuck Haatvedt <chuck.haatvedt+cobol@gmail.com>
 
 		fix errors in fileio.c when building with VISAM 2.2. This issue
@@ -144,6 +192,11 @@
 
 	* common.c: add missing include libxml/parser.h
 
+2024-02-26  Boris Eng <boris.eng@ocamlpro.com>
+
+	FR #488: using state structures instead of state vars for strings
+	* strings.c: moved static variables to structures
+
 2024-01-30  Ron Norman <rjn@inglenet.com>
 
 	* fisam.c: Updated to set index field type for 'short' & 'int'