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

bin/ChangeLog

@@ -11,6 +11,11 @@
 
 	* cobcrun.c: use libcob's cob_getenv_direct instead of getenv
 
+2023-07-01  Fabrice Le Fessant <[email protected]>
+
+	* cob-config: echo in same order as arguments. Add missing
+	  arguments (--bindir,--libdir,--datadir,--mandir,--includedir)
+
 2022-10-18  Simon Sobisch <[email protected]>
 
 	* cobcrun.c: minor validation - check for empty parameters

bin/cob-config.in

@@ -26,6 +26,10 @@ exec_prefix=${prefix}
 exec_prefix_set=no
 libdir=@libdir@
 includedir=@includedir@
+bindir=@bindir@
+datadir=@datadir@
+includedir=@includedir@
+mandir=@mandir@
 
 version="@VERSION@.@COB_PATCH_LEVEL@"
 cflags="@COB_CFLAGS@"
@@ -76,24 +80,39 @@ while test $# -gt 0; do
         exec_prefix=$optarg
       fi
       ;;
-    --prefix)
-      echo_prefix=yes
-      ;;
     --exec-prefix=*)
       exec_prefix=$optarg
       exec_prefix_set=yes
       ;;
+    --prefix)
+      echo ${prefix}
+      ;;
     --exec-prefix)
-      echo_exec_prefix=yes
+      echo ${exec_prefix}
       ;;
     --version)
-      echo $version
+      echo ${version}
       ;;
     --cflags)
-      echo_cflags=yes
+      echo ${cflags}
       ;;
     --libs)
-      echo_libs=yes
+      echo ${libs}
+      ;;
+    --bindir)
+      echo ${bindir}
+      ;;
+    --datadir)
+      echo ${datadir}
+      ;;
+    --includedir)
+      echo ${includedir}
+      ;;
+    --libdir)
+      echo ${libdir}
+      ;;
+    --mandir)
+      echo ${mandir}
       ;;
     --help)
 	cat <<EOF
@@ -109,19 +128,3 @@ EOF
   esac
   shift
 done
-
-if test "$echo_prefix" = "yes"; then
-	echo $prefix
-fi
-
-if test "$echo_exec_prefix" = "yes"; then
-	echo $exec_prefix
-fi
-
-if test "$echo_cflags" = "yes"; then
-      echo $cflags
-fi
-
-if test "$echo_libs" = "yes"; then
-      echo $libs
-fi

build_windows/ChangeLog.txt

@@ -8,6 +8,10 @@
 	* makedist.cmd: cater for new different library names
 	* version_cobc.rc, version_libcob.rc: updated date + rev
 
+2023-06-30  Simon Sobisch <[email protected]>
+
+	* config.h.in: updated for OrangeC 6.0.70.2
+
 2023-05-27  Simon Sobisch <[email protected]>
 
 	* makedist.cmd: first addition for CI output

build_windows/config.h.in

@@ -1,6 +1,6 @@
 
 /* config.h, tested with x86/x64 VS2008-2022
-   and OrangeC 6.0.50 (which ignores the lib comments) */
+   and OrangeC 6.0.70.2 (which ignores the lib comments) */
 
 #define NOISAM       0
 #define VISAM        1
@@ -284,7 +284,11 @@
 #undef COB_CFLAGS
 
 /* Compilation of computed gotos works */
+#if defined(__ORANGEC__)
+#define COB_COMPUTED_GOTO
+#else
 /* #undef COB_COMPUTED_GOTO */
+#endif
 
 /* default search path for copybooks */
 #define COB_CONFIG_DIR   COB_MAIN_DIR "\\config"
@@ -296,7 +300,7 @@
 #if defined(__ORANGEC__)
 #define COB_DEBUG_FLAGS "-g"
 #else
-#undef COB_DEBUG_FLAGS
+/* #undef COB_DEBUG_FLAGS */
 #endif
 
 /* Enable internal logging (Developers only!) */
@@ -312,7 +316,7 @@
 #if defined(__ORANGEC__)
 #define COB_EXPORT_DYN ""	/* needs to be specified for all but MSVC */
 #else
-#undef COB_EXPORT_DYN
+/* #undef COB_EXPORT_DYN */
 #endif
 
 /* Keyword for inline */
@@ -358,7 +362,7 @@
 #if defined(__ORANGEC__)
 #define COB_PIC_FLAGS ""	/* needs to be specified for all but MSVC */
 #else
-#undef COB_PIC_FLAGS
+/* #undef COB_PIC_FLAGS */
 #endif
 
 /* default search path for indexed schema definitions */
@@ -368,7 +372,7 @@
 #if defined(__ORANGEC__)
 #define COB_SHARED_OPT "/Wd"
 #else
-#undef COB_SHARED_OPT
+/* #undef COB_SHARED_OPT */
 #endif
 
 /* Strip command */
@@ -378,7 +382,7 @@
 #ifdef _DEBUG
 #define COB_TREE_DEBUG
 #else
-#undef COB_TREE_DEBUG
+/* #undef COB_TREE_DEBUG */
 #endif
 
 /* Define to 1 if translation of program messages to the user's native
@@ -484,10 +488,11 @@
 /* #undef HAVE_DEFINE_KEY */
 
 /* Has designated initializers */
-/* #undef HAVE_DESIGNATED_INITS */
 #if defined(_MSC_VER) && _MSC_VER >= 1800 /* = COB_USE_VC2013_OR_GREATER [which is defined later] */ \
  || defined(__ORANGEC__)
 #define HAVE_DESIGNATED_INITS 1
+#else
+/* #undef HAVE_DESIGNATED_INITS */
 #endif
 
 

cobc/ChangeLog

@@ -37,6 +37,50 @@
 	* error.c, cobc.c (print_program_trailer), flag.def:
 	  implemented -fmax-errors=0 as unlimited
 
+2023-07-05  Fabrice Le Fessant <[email protected]>
+
+	* flag.def/cobc.c: new flags -fno-ttimestamp to suppress timestamp
+	  in listing headers, and -fttitle=<TITLE>, so that listings can be
+	  compared accross different versions and dates. This patch partially
+	  implements feature-request #294.
+	  Replace numeric constants in flags and switch by a constant macro
+	  CB_FLAG_GETOPT_. Remove unused 'case 6:' for -fdefaultbyte that is
+	  now handled in config.c
+
+2023-07-04  Simon Sobisch <[email protected]>
+
+	* codegen.c (output_char): extracted usage of disabled code for
+	  char generation as char into this new inline function
+	* codegen.c (output_char): fixed previously disabled code and enable it
+	  by default, old code may still be used with defining GEN_CHAR_AS_UINT
+	* codegen.c (output_initialize_to_value): handle zero-length VALUE
+	* codegen.c (output_initialize_to_value): fix cb_initial_justify
+	* codegen.c (output_initialize_to_value): disable setting from a
+	  possibly huge internal buffer with a single generated memcpy from
+	  a generated string, instead use a local buffer of max. 128 bytes
+	  and set padding spaces with memset for bigger fields, old code may
+	  still be used with defining GEN_SINGLE_MEMCPY
+
+2023-07-03  Simon Sobisch <[email protected]>
+
+	* pplex.l (check_listing): rewrite of change 2022-07-04:
+	  do not output sequence number of short lines,
+	  but keep its line break and the general output
+	* pplex.l: drop unused "requires_new_line" (added without use in OC2.0)
+
+2023-07-01  Simon Sobisch <[email protected]>
+
+	* scanner.l: add check for reserved word FUNCTION, add missing
+	  word value for not reserved SUPPRESS and SEND
+	* parser.y (at_line_column): fixed bad cast when conflicting clauses
+	  were used, fixing bug #601
+
+2023-06-30  Simon Sobisch <[email protected]>
+
+	* codegen.c (output_function_prototypes): generate plain "extern"
+	  instead of "COB_EXT_IMPORT" again, as the second only works with
+	  libraries, not with object files / sources
+
 2023-06-25  Chuck Haatvedt  <[email protected]>
 
 	FR #439: dialect option to support justify for IBM compatibility
@@ -47,10 +91,10 @@
 2023-06-23  Fabrice Le Fessant <[email protected]>
 
 	* pplex.l (get_word): fix an overflow with words exceeding the
-	maximal size COB_MAX_WORDLEN
-	* pplex.l (is_condition_directive_clause)
-	(next_word_is_comment_paragraph_name): decrease stack storage
-	and optimize string comparisons
+	  maximal size COB_MAX_WORDLEN
+	* pplex.l (is_condition_directive_clause,
+	  next_word_is_comment_paragraph_name): decrease stack storage
+	  and optimize string comparisons
 
 2023-06-22  Nicolas Berthier <[email protected]>
 
@@ -61,17 +105,17 @@
 	  -ffast-compare and -fconstant-folding for programs with a non-native
 	  collating sequence
 
-2023-06-20  Fabrice Le Fessant <[email protected]>
-
-	* typeck.c (cb_build_expr): fix bug #875 "V IS ZERO AND
-	... generate 'invalid conditional expression' error",
-	fix bug #880 error compiling abbreviated conditions in GC3.2 RC2
-        (NOT comparison should be translated to inversed comparison)
-
 2023-06-20  Fabrice Le Fessant <[email protected]>
 
 	* typeck.c (cb_build_expr): remove cb_ prefix from static functions
-	and comment algorithm
+	  and comment algorithm
+
+	Bugs #875 V IS ZERO AND, #880 error compiling abbreviated conditions
+	and #887 error compiling parenthesized relation
+	* typeck.c (cb_build_expr): additional generate 'invalid conditional
+	  expression' error", translate NOT comparison to inversed comparison
+	* typeck.c (cb_build_expr), tree.c (cb_build_binary_op): give more
+	  details on invalid expressions
 
 2023-06-13  Fabrice Le Fessant <[email protected]>
 
@@ -451,7 +495,7 @@
 	  REPORT and SCREEN section only expecting the possibly USAGEs instead all
 	  removing the need to check for bad USAGE later
 	* parser.y (display_erase, display_pos_specifier): pass display attributes
-	  to codegen
+	  to codegen, fixing bug #737
 
 2023-01-28  Simon Sobisch <[email protected]>