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

Author: ddeclerck

.github/workflows/build_nightly.yml

@@ -500,10 +500,7 @@ jobs:
   coverage:
     name: Coverage and Warnings
     needs: build
-# Since the latest Ubuntu image, lcov fails complaining about negative branch counts,
-# and using fprofile-update=atomic as suggested does not help, so use the previous image
-#    runs-on: ubuntu-latest
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     timeout-minutes: 10
 
     steps:

.github/workflows/ibm.yml

@@ -3,6 +3,8 @@ name: IBM Power & Z
 on:
   pull_request:
     branches: [ gcos4gnucobol-3.x ]
+  push:
+    branches: [ gcos4gnucobol-3.x ]
   # manual run in actions tab - for all branches
   workflow_dispatch:
 

cobc/ChangeLog

@@ -1,4 +1,16 @@
 
+2025-07-30  Simon Sobisch <simonsobisch@gnu.org>
+
+	* scanner.l, parser.y, reserved.c: use yyless to push part of scanned
+	  tokens back, used in case of multi-word scanning, if one or more scanned
+	  words are reserved: PICTURE SYMBOL, FROM CRT, SCREEN CONTROL,
+	  EVENT STATUS
+	* parser.y, scanner.l, reserved.c, cobc.h: READY, RESET and TRACE as
+	  reserved words (TRACE is C/S for std default), fixing bug #1130 while
+	  increasing portability (for dialects not reserving it), dropping
+	  special handling within the scanner and extra tokens in the parser
+	* ppparse.y, pplex.l: add (simple) handling for SET TRACE/NOTRACE
+
 2025-07-28  David Declerck <david.declerck@ocamlpro.com>
 
 	* codegen.c (output_module_init_function): replace "module" by
@@ -1004,7 +1016,7 @@
 2023-02-09  Simon Sobisch <simonsobisch@gnu.org>
 
 	* typeck.c (validate_alphabet): slightly rewritten to fix compiler warnings
-	* config.c, pparse.y (ppp_replace_list_add), reserved.c (is_invalid_word),
+	* config.c, ppparse.y (ppp_replace_list_add), reserved.c (is_invalid_word),
 	  tree.c, tree.h, typeck.c: minor adjustments to fix compiler warnings
 	* field.c (validate_multi_value, validate_elem_value),
 	  parser.y (setup_external_definition): fixed analyzer warnings by switching
@@ -1709,7 +1721,7 @@
 	* pplex.l: match and ignore editor folding $REGION statement
 	* pplex.l: output actual directive for @OPTIONS and PROCESS
 	* pplex.l: *CONTROL from col7+
-	* pparse.y: don't warn on *CONTROL as this adjust listing only
+	* ppparse.y: don't warn on *CONTROL as this adjust listing only
 	  and does not apply directly (possibly real handling later)
 
 2022-08-19  Simon Sobisch <simonsobisch@gnu.org>
@@ -2714,7 +2726,7 @@
 	FR #390 ref-mod with zero-length
 	* config.def, typeck.c (cb_build_identifier): added cb_ref_mod_zero_length
 	  to allow reference-modification at compile-time with a length of zero
-	* pparse.y, pplex.l, scanner.l, cobc.c: added >> REF-MOD-ZERO-LENGTH and
+	* ppparse.y, pplex.l, scanner.l, cobc.c: added >> REF-MOD-ZERO-LENGTH and
 	  adjusted SSRANGE, now also supporting SSRANGE"1" and SSRANGE"3"
 
 2020-11-04  Simon Sobisch <simonsobisch@gnu.org>
@@ -3858,7 +3870,7 @@
 
 2018-11-22  Simon Sobisch <simonsobisch@gnu.org>
 
-	* pplex.l, pparse.y: FR #344 Support copybook and library names
+	* pplex.l, ppparse.y: FR #344 Support copybook and library names
 	  as text-names (not literals) with periods, always upper-cased
 	  if not requested otherwise by FOLD-CALL=LOWER
 
@@ -6913,7 +6925,7 @@
 2016-04-24  Simon Sobisch <simonsobisch@gnu.org>
 
 	* parser.y: implement STOP RUN integer/identifier (RM/COBOL extension)
-	* parser.y, pparse.y: remove printf non literal spec warning.
+	* parser.y, ppparse.y: remove printf non literal spec warning.
 
 2016-04-24  Edward Hart <edward.dan.hart@gmail.com>
 
@@ -9776,7 +9788,7 @@
 
 2003-05-26  Keisuke Nishida  <knishida@wind.sannet.ne.jp>
 
-	* pplex.l (ppcopy), pparse.y, cobc.c, cobc.h: split ppcopy from ppopen
+	* pplex.l (ppcopy), ppparse.y, cobc.c, cobc.h: split ppcopy from ppopen
 
 2003-05-21  Keisuke Nishida  <knishida@netlab.jp>
 
@@ -9818,13 +9830,13 @@
 
 	integrate cobcpp into cobc
 	* pplex.l: renamed and adjusted from cobpp/scanner.l
-	* pparse.y: renamed and adjusted from cobpp/parser.y
+	* ppparse.y: renamed and adjusted from cobpp/parser.y
 	* cobc.h: definitions from scanner.h
 	* Makefile.am, cobc.c: adjusted
 
 2003-04-02  Keisuke Nishida  <knishida@netlab.jp>
 
-	* pparse.y <- cobpp/parser.y, pplex.l <- cobpp/scanner.l: support for
+	* ppparse.y <- cobpp/parser.y, pplex.l <- cobpp/scanner.l: support for
 	  SOURCE FORMAT compiler directive
 
 2003-03-26  Keisuke Nishida  <knishida@netlab.jp>
@@ -9950,7 +9962,7 @@
 	* cobc.c (probe_source_format): Removed.
 	  (preprocess): Don't set source format.
 	  (process_command_line): Set cobpp flags here.
-	* pparse.y <- cobpp/parser.y (yywarn): New function.
+	* ppparse.y <- cobpp/parser.y (yywarn): New function.
 	* cobpp.h (COBPP_FORMAT_UNKNOWN): New macro.
 	* cobpp.h, cobpp.c (cobpp_source_format_inferred): New variable.
 	* cobpp.c (cobpp_source_format): Default to COBPP_FORMAT_UNKNOWN.
@@ -10154,7 +10166,7 @@
 
 2002-06-07  Keisuke Nishida  <knishida@netlab.jp>
 
-	* pparse.y <- cobpp/parser.y (copy_statement, copy_in, copy_replacing):
+	* ppparse.y <- cobpp/parser.y (copy_statement, copy_in, copy_replacing):
 	  Support "COPY ... IN/OF ..." syntax.
 	* pplex.l <- cobpp/scanner.l, scanner.h (include_copybook): Take a library name.
 

cobc/cobc.h

@@ -176,6 +176,7 @@ enum cb_current_date {
 #define	CB_CS_DEFAULT			CB_CS_DAY
 #define	CB_CS_VALIDATE_STATUS	CB_CS_DAY
 #define	CB_CS_USAGE				CB_CS_DAY
+#define	CB_READY_RESET_TRACE	CB_CS_DAY
 
 /* Support for cobc from stdin */
 #define COB_DASH			"-"

cobc/parser.y

@@ -3146,7 +3146,7 @@ set_record_size (cb_tree min, cb_tree max)
 %token READ
 %token READERS
 %token READ_ONLY		"READ-ONLY"
-%token READY_TRACE		"READY TRACE"
+%token READY
 %token RECEIVE
 %token RECEIVED			/* remark: not used here */
 %token RECORD
@@ -3183,7 +3183,6 @@ set_record_size (cb_tree min, cb_tree max)
 %token RERUN
 %token RESERVE
 %token RESET
-%token RESET_TRACE		"RESET TRACE"
 %token RESET_GRID		"RESET-GRID"
 %token RESET_LIST		"RESET-LIST"
 %token RESET_TABS		"RESET-TABS"
@@ -3298,6 +3297,7 @@ set_record_size (cb_tree min, cb_tree max)
 %token SUM
 %token SUPPRESS
 %token SUPPRESS_XML		"SUPPRESS"
+%token SYMBOL
 %token SYMBOLIC
 %token SYNCHRONIZED
 %token SYSTEM_DEFAULT		"SYSTEM-DEFAULT"
@@ -3351,6 +3351,7 @@ set_record_size (cb_tree min, cb_tree max)
 %token TOP
 %token TOWARD_GREATER		"TOWARD-GREATER"
 %token TOWARD_LESSER		"TOWARD-LESSER"
+%token TRACE
 %token TRACK
 %token TRACKS
 %token TRACK_AREA		"TRACK-AREA"
@@ -3497,10 +3498,10 @@ set_record_size (cb_tree min, cb_tree max)
 %nonassoc PURGE
 %nonassoc RAISE
 %nonassoc READ
-%nonassoc READY_TRACE
+%nonassoc READY
 %nonassoc RECEIVE
 %nonassoc RELEASE
-%nonassoc RESET_TRACE
+%nonassoc RESET
 %nonassoc RETURN
 %nonassoc REWRITE
 %nonassoc ROLLBACK
@@ -15966,7 +15967,11 @@ _end_read:
 /* READY TRACE statement */
 
 ready_statement:
-  READY_TRACE
+  READY
+  {
+	cobc_cs_check = CB_READY_RESET_TRACE;
+  }
+  TRACE
   {
 	begin_statement (STMT_READY_TRACE, 0);
 	cb_emit_ready_trace ();
@@ -16051,7 +16056,11 @@ release_body:
 /* RESET TRACE statement */
 
 reset_statement:
-  RESET_TRACE
+  RESET
+  {
+	cobc_cs_check = CB_READY_RESET_TRACE;
+  }
+  TRACE
   {
 	begin_statement (STMT_RESET_TRACE, 0);
 	cb_emit_reset_trace ();

cobc/pplex.l

@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2001-2012, 2014-2024 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012, 2014-2025 Free Software Foundation, Inc.
    Written by Keisuke Nishida, Roger While, Simon Sobisch, Dave Pitts
 
    This file is part of GnuCOBOL.
@@ -914,6 +914,10 @@ COBOL_WORDS_DIRECTIVE_STATE>{
   "NO-SPZERO"	{
 	return NOSPZERO;
   }
+  "NOTRACE"	|
+  "NO-TRACE"	{
+	return NOTRACE;
+  }
   "ODOSLIDE"	{
 	return ODOSLIDE;
   }
@@ -929,6 +933,9 @@ COBOL_WORDS_DIRECTIVE_STATE>{
   "SPZERO"	{
 	return SPZERO;
   }
+  "TRACE"	{
+	return TRACE;
+  }
   "SOURCEFORMAT" |
   "SOURCE-FORMAT"	{
 	return SOURCEFORMAT;

cobc/ppparse.y

@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2001-2012, 2015-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012, 2015-2023, 2025 Free Software Foundation, Inc.
    Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart
 
    This file is part of GnuCOBOL.
@@ -707,12 +707,14 @@ ppparse_clear_vars (const struct cb_define_struct *p)
 %token NOODOSLIDE
 %token NOSPZERO
 %token NOSSRANGE
+%token NOTRACE
 /* OVERRIDE token defined above. */
 %token ODOSLIDE
 %token REMOVE
 %token SOURCEFORMAT
 %token SPZERO
 %token SSRANGE
+%token TRACE
 
 %token IF_DIRECTIVE
 %token ELSE_DIRECTIVE
@@ -896,6 +898,8 @@ set_directive:
 | set_directive set_choice
 ;
 
+/* FIXME: *all* of the choices below should be #PASSED to the scanner
+   and handled there */
 set_choice:
   CONSTANT VARIABLE_NAME LITERAL
   {
@@ -1047,6 +1051,11 @@ set_choice:
 
 	append_to_turn_list (txt, 0, 0);
   }
+| NOTRACE
+  {
+	cb_flag_traceall = 0;
+	cb_flag_trace = 0;
+  }
 | ODOSLIDE
   {
 	fprintf (ppout, "#ODOSLIDE 1\n");
@@ -1124,6 +1133,10 @@ set_choice:
 		ppp_error_invalid_option ("SSRANGE", p);
 	}
   }
+| TRACE
+  {
+	cb_flag_trace = 1;	/* no traceall with Visual COBOL, leave untouched */
+  }
 ;
 
 alnum_list:

cobc/reserved.c

@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2001-2012, 2014-2024 Free Software Foundation, Inc.
+   Copyright (C) 2001-2012, 2014-2025 Free Software Foundation, Inc.
    Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart
 
    This file is part of GnuCOBOL.
@@ -2329,6 +2329,9 @@ static struct cobc_reserved default_reserved_words[] = {
   { "READ-ONLY",		0, 1, READ_ONLY,			/* ACU extension */
 				0, CB_CS_GRAPHICAL_CONTROL | CB_CS_INQUIRE_MODIFY
   },
+  { "READY",			1, 0, READY,			/* OSVS */
+				CB_READY_RESET_TRACE, 0
+  },
   { "READERS",			0, 1, READERS,		/* ACU extension */
 				0, CB_CS_OPEN
   },
@@ -2438,8 +2441,8 @@ static struct cobc_reserved default_reserved_words[] = {
   { "RESERVE",			0, 0, RESERVE,			/* 2002 */
 				0, 0
   },
-  { "RESET",			0, 0, RESET,			/* 2002 */
-				0, 0
+  { "RESET",			1, 0, RESET,			/* 2002 */
+				CB_READY_RESET_TRACE, 0
   },
   { "RESET-GRID",			0, 1, RESET_GRID,			/* ACU extension */
 				0, CB_CS_GRAPHICAL_CONTROL | CB_CS_INQUIRE_MODIFY
@@ -2791,9 +2794,11 @@ static struct cobc_reserved default_reserved_words[] = {
   { "SUPPRESS",			0, 0, SUPPRESS,			/* 2002 */
 				0, 0
   },
-  { "SYMBOL",			0, 1, -1,			/* 2002 (C/S) */
+  { "SYMBOL",			0, 1, SYMBOL,			/* 2002 (C/S) */
 				0, 0
-	/* FIXME: 2014 Context-sensitive to CURRENCY clause */
+	/* FIXME: 2014 Context-sensitive to CURRENCY clause; note: we currently
+	   work around that by scanning it only together with PICTURE as reserved
+	   word, ignoring any other context there */
   },
   { "SYMBOLIC",			0, 0, SYMBOLIC,			/* 2002 */
 				0, 0
@@ -2906,6 +2911,9 @@ static struct cobc_reserved default_reserved_words[] = {
   { "TOWARD-LESSER",		0, 1, TOWARD_LESSER,		/* 2014 (C/S) */
 				0, CB_CS_ROUNDED
   },
+  { "TRACE",			0, 1, TRACE,			/* OSVS */
+				0, CB_READY_RESET_TRACE
+  },
   { "TRACK",			0, 1, TRACK,			/* OS/VS extension */
 				0, CB_CS_SELECT | CB_CS_I_O_CONTROL
   },