Fix COPY REPLACING and REPLACE

Current implementation does not conform to standard (COPY REPLACING
and REPLACE are supposed to be in two successive passes instead of
applied together), and has various bugs.

This version is probably less efficient, but better conforms to the
standard.

Limitations:

* This first version only modify the replacements during
  preprocessing, not the ones during the listing printing.

* Since REPLACE are interpreted *before* the COPY REPLACING, they
  cannot be modified by them. A conforming implementation would
  interpret REPLACE strictly after COPY REPLACING.

cobc/Makefile.am

@@ -22,7 +22,8 @@
 bin_PROGRAMS = cobc
 cobc_SOURCES = cobc.c cobc.h ppparse.y pplex.c parser.y scanner.c config.c \
 	reserved.c error.c tree.c tree.h field.c typeck.c codegen.c help.c \
-	config.def flag.def warning.def codeoptim.def ppparse.def codeoptim.c
+	config.def flag.def warning.def codeoptim.def ppparse.def \
+	codeoptim.c replace.c 
 
 #cobc_SOURCES = cobc.c cobc.h ppparse.y pplex.l parser.y scanner.l config.c
 

cobc/cobc.c

@@ -983,8 +983,7 @@ cobc_strdup (const char *dupstr)
 	return p;
 }
 
-#if	defined (_WIN32) || defined (__CYGWIN__)
-static char *
+char *
 cobc_stradd_dup (const char *str1, const char *str2)
 {
 	char	*p;
@@ -1003,7 +1002,6 @@ cobc_stradd_dup (const char *str1, const char *str2)
 	memcpy (p + m, str2, n);
 	return p;
 }
-#endif
 
 void *
 cobc_realloc (void *prevptr, const size_t size)
@@ -1313,6 +1311,59 @@ cobc_plex_strdup (const char *dupstr)
 	return p;
 }
 
+char *
+cobc_plex_stradd (const char *str1, const char *str2)
+{
+	char	*p;
+	size_t	m, n;
+
+	/* LCOV_EXCL_START */
+	if (unlikely (!str1 || !str2)) {
+		cobc_err_msg (_("call to %s with NULL pointer"),
+			      "cobc_plex_stradd");
+		cobc_abort_terminate (1);
+	}
+	/* LCOV_EXCL_STOP */
+	m = strlen (str1);
+	n = strlen (str2);
+	p = cobc_plex_malloc (m + n + 1);
+	memcpy (p, str1, m);
+	memcpy (p + m, str2, n);
+	return p;
+}
+
+void *
+cobc_plex_strsub (const char *s, const int len)
+{
+	void	*p;
+	int	n;
+
+#ifdef	COB_TREE_DEBUG
+	/* LCOV_EXCL_START */
+	if (unlikely (!s)) {
+		cobc_err_msg (_("call to %s with NULL pointer"),
+			      "cobc_plex_strsub");
+		cobc_abort_terminate (1);
+	}
+	/* LCOV_EXCL_STOP */
+#endif
+	n = strlen (s);
+
+#ifdef	COB_TREE_DEBUG
+	/* LCOV_EXCL_START */
+	if ( len>n ) {
+		cobc_err_msg (_("call to %s with bad argument len=%d>%d=strlen(s)"),
+			      "cobc_plex_strsub", len, n);
+		cobc_abort_terminate (1);
+	}
+	/* LCOV_EXCL_STOP */
+#endif
+
+	p = cobc_plex_malloc (len + 1);
+	memcpy (p, s, len);
+	return p;
+}
+
 /* variant of strcpy which copies max 'max_size' bytes from 'src' to 'dest',
    if the size of 'src' is too long only its last/last bytes are copied and an
    eliding "..." is placed in front or at end depending on 'elide_at_end' */
@@ -5961,6 +6012,7 @@ print_program_trailer (void)
 
 		/* Print file/symbol tables if requested */
 		if (cb_listing_symbols) {
+
 			if (cb_listing_with_header) {
 				set_listing_header_symbols ();
 			}

cobc/cobc.h

@@ -489,6 +489,8 @@ extern struct reserved_word_list	*cob_user_res_list;
 extern void			*cobc_malloc (const size_t);
 extern void			cobc_free (void *);
 extern void			*cobc_strdup (const char *);
+extern char                     *cobc_stradd_dup (const char *str1,
+						  const char *str2);
 extern void			*cobc_realloc (void *, const size_t);
 
 extern void			*cobc_main_malloc (const size_t);
@@ -503,6 +505,9 @@ extern void			cobc_parse_free (void *);
 
 extern void			*cobc_plex_malloc (const size_t);
 extern void			*cobc_plex_strdup (const char *);
+extern void			*cobc_plex_strsub (const char *, const int);
+extern char                     *cobc_plex_stradd (const char *str1,
+						  const char *str2);
 
 extern void			*cobc_check_string (const char *);
 extern void			cobc_err_msg (const char *, ...) COB_A_FORMAT12;