aboutsummaryrefslogtreecommitdiff
path: root/libgcobol
diff options
context:
space:
mode:
Diffstat (limited to 'libgcobol')
-rw-r--r--libgcobol/ChangeLog66
-rw-r--r--libgcobol/Makefile.am4
-rw-r--r--libgcobol/Makefile.in9
-rw-r--r--libgcobol/aclocal.m44
-rw-r--r--libgcobol/charmaps.cc13
-rw-r--r--libgcobol/common-defs.h30
-rw-r--r--libgcobol/config.h.in24
-rwxr-xr-xlibgcobol/configure954
-rw-r--r--libgcobol/configure.ac9
-rw-r--r--libgcobol/constants.cc9
-rw-r--r--libgcobol/ec.h60
-rw-r--r--libgcobol/gcobolio.h38
-rw-r--r--libgcobol/gfileio.cc10
-rw-r--r--libgcobol/gfileio.h24
-rw-r--r--libgcobol/gmath.cc2
-rw-r--r--libgcobol/intrinsic.cc59
-rw-r--r--libgcobol/io.cc3
-rw-r--r--libgcobol/libgcobol.cc36
-rw-r--r--libgcobol/libgcobol.h157
-rw-r--r--libgcobol/valconv.cc4
20 files changed, 1310 insertions, 205 deletions
diff --git a/libgcobol/ChangeLog b/libgcobol/ChangeLog
index 5e3cc11..48d65ef 100644
--- a/libgcobol/ChangeLog
+++ b/libgcobol/ChangeLog
@@ -1,3 +1,69 @@
+2025-04-02 Bob Dubner <rdubner@symas.com>
+
+ PR cobol/119521
+ * intrinsic.cc: (__gg__reverse): Trim final result for intermediate_e.
+ * libgcobol.cc: (__gg__adjust_dest_size): Abort on attempt to increase
+ the size of a result. (__gg__module_name): Formatting.
+ __gg__reverse(): Resize only intermediates
+
+2025-03-28 Bob Dubner <rdubner@symas.com>
+
+ * charmaps.cc:Eliminate "#include libgcobol.h".
+ Change comment about _Float128.
+ * common-defs.h: Change comment about _Float128. Receive
+ #defines from libgcobol.h.
+ * constants.cc: Eliminate #include libgcobol.h. Eliminate other
+ unneeded #includes.
+ * ec.h: Receive declarations from libgcobol.h.
+ * gcobolio.h: Likewise.
+ * gfileio.cc: (__gg__file_init): Use file_flag_none_e instead of
+ zero in assignment. (__gg__file_reopen): Likewise.
+ (__io__file_open): Likewise.
+ * gfileio.h: Receive declarations from libgcobol.h.
+ * libgcobol.h: Numerous declarations moved elsewhere.
+
+2025-03-26 Jonathan Wakely <jwakely@redhat.com>
+
+ * charmaps.cc (__gg__raw_to_ascii): Use auto for complicated
+ nested type.
+ (__gg__raw_to_ebcdic): Likewise.
+ (__gg__console_to_ascii): Likewise.
+ (__gg__console_to_ebcdic): Likewise.
+
+2025-03-26 Jonathan Wakely <jwakely@redhat.com>
+
+ * intrinsic.cc (is_zulu_format): Qualify toupper and cast
+ argument to unsigned char.
+ (fill_cobol_tm): Likewise.
+ (iscasematch): Likewise for to lower.
+ (numval): Qualify calls to tolower.
+ (__gg__lower_case): Use lambda expression for
+ tolower call.
+ (__gg__upper_case): Likewise for toupper call.
+ * libgcobol.cc (mangler_core): Cast tolower argument to unsigned
+ char.
+ * valconv.cc (__gg__string_to_numeric_edited): Cast to upper
+ arguments to unsigned char.
+
+2025-03-26 Jonathan Wakely <jwakely@redhat.com>
+
+ * common-defs.h (cbl_enabled_exceptions_t::operator=): Define as
+ defaulted.
+
+2025-03-23 Bob Dubner <rdubner@symas.com>
+
+ * Makefile.am: Incorporate AM_CXXFLAGS = $(CXXFLAGS_FOR_TARGET).
+ * Makefile.in: Regenerated.
+
+2025-03-20 Iain Sandoe <iain@sandoe.co.uk>
+
+ * Makefile.am: Use LIBICONV.
+ * Makefile.in: Regenerate.
+ * aclocal.m4: Regenerate.
+ * config.h.in: Regenerate.
+ * configure: Regenerate.
+ * configure.ac: Check for iconv support.
+
2025-03-17 Bob Dubner <rdubner@symas.com>
* charmaps.cc: Remove unused headers
diff --git a/libgcobol/Makefile.am b/libgcobol/Makefile.am
index eddf209..cafb733 100644
--- a/libgcobol/Makefile.am
+++ b/libgcobol/Makefile.am
@@ -48,10 +48,12 @@ libgcobol_la_LINK = $(LIBTOOL) --mode=link --tag=CXX $(CXX) \
-Wc,-shared-libgcc \
-version-info $(LIBGCOBOL_VERSION) \
-lstdc++ \
- $(LTLDFLAGS)
+ $(LTLDFLAGS) $(LTLIBICONV)
WARN_CFLAGS = -W -Wall -Wwrite-strings
+AM_CXXFLAGS = $(CXXFLAGS_FOR_TARGET)
+
# not defined: DEFS, MAX_ERRORS, LTLDFLAGS
ALL_CXXFLAGS = -I. -I$(srcdir) $(AM_CPPFLAGS) $(DEFS) \
$(XCFLAGS) $(AM_CXXFLAGS) $(WARN_CFLAGS) $(MAX_ERRORS) \
diff --git a/libgcobol/Makefile.in b/libgcobol/Makefile.in
index a6096d2..c4a562a 100644
--- a/libgcobol/Makefile.in
+++ b/libgcobol/Makefile.in
@@ -113,7 +113,11 @@ target_triplet = @target@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
+ $(top_srcdir)/../config/iconv.m4 \
$(top_srcdir)/../config/lead-dot.m4 \
+ $(top_srcdir)/../config/lib-ld.m4 \
+ $(top_srcdir)/../config/lib-link.m4 \
+ $(top_srcdir)/../config/lib-prefix.m4 \
$(top_srcdir)/../config/multi.m4 \
$(top_srcdir)/../config/override.m4 \
$(top_srcdir)/../config/toolexeclibdir.m4 \
@@ -300,11 +304,13 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBGCOBOL_VERSION = @LIBGCOBOL_VERSION@
+LIBICONV = @LIBICONV@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
LN_S = @LN_S@
+LTLIBICONV = @LTLIBICONV@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
@@ -422,9 +428,10 @@ libgcobol_la_LINK = $(LIBTOOL) --mode=link --tag=CXX $(CXX) \
-Wc,-shared-libgcc \
-version-info $(LIBGCOBOL_VERSION) \
-lstdc++ \
- $(LTLDFLAGS)
+ $(LTLDFLAGS) $(LTLIBICONV)
WARN_CFLAGS = -W -Wall -Wwrite-strings
+AM_CXXFLAGS = $(CXXFLAGS_FOR_TARGET)
# not defined: DEFS, MAX_ERRORS, LTLDFLAGS
ALL_CXXFLAGS = -I. -I$(srcdir) $(AM_CPPFLAGS) $(DEFS) \
diff --git a/libgcobol/aclocal.m4 b/libgcobol/aclocal.m4
index 1d5125e..25c8b71 100644
--- a/libgcobol/aclocal.m4
+++ b/libgcobol/aclocal.m4
@@ -1188,7 +1188,11 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([../config/depstand.m4])
+m4_include([../config/iconv.m4])
m4_include([../config/lead-dot.m4])
+m4_include([../config/lib-ld.m4])
+m4_include([../config/lib-link.m4])
+m4_include([../config/lib-prefix.m4])
m4_include([../config/multi.m4])
m4_include([../config/override.m4])
m4_include([../config/toolexeclibdir.m4])
diff --git a/libgcobol/charmaps.cc b/libgcobol/charmaps.cc
index 6a79750..d935b89 100644
--- a/libgcobol/charmaps.cc
+++ b/libgcobol/charmaps.cc
@@ -42,7 +42,6 @@
#include "common-defs.h"
#include "io.h"
#include "gcobolio.h"
-#include "libgcobol.h"
#include "charmaps.h"
#include "valconv.h"
@@ -439,8 +438,7 @@ __gg__raw_to_ascii(char **dest, size_t *dest_size, const char *in, size_t length
// Check for that unicode code point in the subset of characters we
// know about:
- std::unordered_map<unsigned short, unsigned char>::const_iterator it =
- utf8_to_cp1252_values.find(unicode_point);
+ auto it = utf8_to_cp1252_values.find(unicode_point);
if( it == utf8_to_cp1252_values.end() )
{
// That unicode character isn't in our list
@@ -501,8 +499,7 @@ __gg__raw_to_ebcdic(char **dest, size_t *dest_size, const char *in, size_t lengt
position );
// Check for that unicode code point in the subset of characters we
// know about:
- std::unordered_map<unsigned short, unsigned char>::const_iterator it =
- utf8_to_cp1252_values.find(unicode_point);
+ auto it = utf8_to_cp1252_values.find(unicode_point);
if( it == utf8_to_cp1252_values.end() )
{
// That unicode character isn't in our list
@@ -769,8 +766,7 @@ void __gg__console_to_ascii(char * const str, size_t length)
{
// Check for that unicode code point in the subset of characters we
// know about:
- std::unordered_map<unsigned short, unsigned char>::const_iterator it
- = utf8_to_cp1252_values.find(unicode_point);
+ auto it = utf8_to_cp1252_values.find(unicode_point);
if( it == utf8_to_cp1252_values.end() )
{
// That unicode character isn't in our list
@@ -810,8 +806,7 @@ __gg__console_to_ebcdic(char * const str, size_t length)
{
// Check for that unicode code point in the subset of characters we
// know about:
- std::unordered_map<unsigned short, unsigned char>::const_iterator it
- = utf8_to_cp1252_values.find(unicode_point);
+ auto it = utf8_to_cp1252_values.find(unicode_point);
if( it == utf8_to_cp1252_values.end() )
{
// That unicode character isn't in our list
diff --git a/libgcobol/common-defs.h b/libgcobol/common-defs.h
index d052f58..f9d9c56 100644
--- a/libgcobol/common-defs.h
+++ b/libgcobol/common-defs.h
@@ -41,7 +41,7 @@
// takes 127 bits. By using a maximum of 37, that gives us an additional digit
// of headroom in order to accomplish rounding.
-// You should keep in mind that the _Float128 binary floating point numbers that
+// You should keep in mind that the 128-bit binary floating point numbers that
// we use can reliably reproduce numbers of 33 decimal digits when going to
// binary and back.
@@ -63,8 +63,23 @@
// In the __gg__move_literala() call, we piggyback this bit onto the
// cbl_round_t parameter, just to cut down on the number of parameters passed
+
#define REFER_ALL_BIT 0x80
+// Other bits for handling MOVE ALL and so on.
+#define REFER_T_ALL_FLAGS_MASK 0x0FF // We allow for seven subscripts
+#define REFER_T_MOVE_ALL 0x100 // This is the move_all flag
+#define REFER_T_ADDRESS_OF 0x200 // This is the address_of flag
+
+#define MIN_FIELD_BLOCK_SIZE (16)
+
+#define A_ZILLION (1000000) // Absurdly large number for __gg__call_parameter_count
+
+// These bits are used for the "call flags" of arithmetic operations
+#define ON_SIZE_ERROR 0x01
+#define REMAINDER_PRESENT 0x02
+
+#define MINIMUM_ALLOCATION_SIZE 16
/*
* User-defined names in IBM COBOL can have at most 30 characters.
@@ -444,11 +459,7 @@ class cbl_enabled_exceptions_t : protected std::set<cbl_enabled_exception_t>
bool empty() const { return std::set<cbl_enabled_exception_t>::empty(); }
size_t size() const { return std::set<cbl_enabled_exception_t>::size(); }
- cbl_enabled_exceptions_t& operator=( const cbl_enabled_exceptions_t& that ) {
- std::set<cbl_enabled_exception_t>& self(*this);
- self = that;
- return *this;
- }
+ cbl_enabled_exceptions_t& operator=( const cbl_enabled_exceptions_t& ) = default;
};
extern cbl_enabled_exceptions_t enabled_exceptions;
@@ -499,6 +510,11 @@ T enabled_exception_match( T beg, T end, ec_type_t type, size_t file ) {
return output;
}
-
+enum substitute_flags_t
+ {
+ substitute_anycase_e = 1,
+ substitute_first_e = 2, // first and last are mutually exclusive
+ substitute_last_e = 4,
+ };
#endif
diff --git a/libgcobol/config.h.in b/libgcobol/config.h.in
index 39b2044..5dd2b50 100644
--- a/libgcobol/config.h.in
+++ b/libgcobol/config.h.in
@@ -6,6 +6,12 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
+/* Define if you have the iconv() function and it works. */
+#undef HAVE_ICONV
+
+/* Define to 1 if you have the `initstate_r' function. */
+#undef HAVE_INITSTATE_R
+
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
@@ -15,12 +21,27 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
+/* Define to 1 if you have the `random_r' function. */
+#undef HAVE_RANDOM_R
+
+/* Define to 1 if you have the `setstate_r' function. */
+#undef HAVE_SETSTATE_R
+
+/* Define to 1 if you have the `srandom_r' function. */
+#undef HAVE_SRANDOM_R
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
+/* Define to 1 if you have the `strfromf32' function. */
+#undef HAVE_STRFROMF32
+
+/* Define to 1 if you have the `strfromf64' function. */
+#undef HAVE_STRFROMF64
+
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
@@ -36,6 +57,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define as const if the declaration of iconv() needs const. */
+#undef ICONV_CONST
+
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#undef LT_OBJDIR
diff --git a/libgcobol/configure b/libgcobol/configure
index 73433eb..e12b72e 100755
--- a/libgcobol/configure
+++ b/libgcobol/configure
@@ -629,11 +629,14 @@ ac_includes_default="\
# include <unistd.h>
#endif"
+ac_func_list=
ac_unique_file="Makefile.am"
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+LTLIBICONV
+LIBICONV
extra_darwin_ldflags_libgcobol
VERSION_SUFFIX
LIBGCOBOL_VERSION
@@ -804,6 +807,9 @@ enable_fast_install
with_gnu_ld
enable_libtool_lock
enable_darwin_at_rpath
+enable_rpath
+with_libiconv_prefix
+with_libiconv_type
'
ac_precious_vars='build_alias
host_alias
@@ -1456,6 +1462,7 @@ Optional Features:
--enable-darwin-at-rpath
install libraries with @rpath/library-name, requires
rpaths to be added to executables
+ --disable-rpath do not hardcode runtime library paths
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1471,6 +1478,10 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-gnu-ld assume the C compiler uses GNU ld default=no
+ --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib
+ --without-libiconv-prefix don't search for libiconv in includedir and libdir
+ --with-libiconv-type=TYPE type of library to search for (auto/static/shared)
Some influential environment variables:
CC C compiler command
@@ -2505,6 +2516,12 @@ $as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
+as_fn_append ac_func_list " random_r"
+as_fn_append ac_func_list " srandom_r"
+as_fn_append ac_func_list " initstate_r"
+as_fn_append ac_func_list " setstate_r"
+as_fn_append ac_func_list " strfromf32"
+as_fn_append ac_func_list " strfromf64"
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -12891,7 +12908,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12894 "configure"
+#line 12911 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12997,7 +13014,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 13000 "configure"
+#line 13017 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16344,6 +16361,39 @@ fi
+# These are GLIBC
+
+
+
+ for ac_func in $ac_func_list
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+
+
+
+
+
+
+
+
+# These are C23, and might not be available in libc.
+
+
+
+
+
+
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"
else
@@ -17183,6 +17233,906 @@ case $host in
esac
+# For iconv support.
+
+ if test "X$prefix" = "XNONE"; then
+ acl_final_prefix="$ac_default_prefix"
+ else
+ acl_final_prefix="$prefix"
+ fi
+ if test "X$exec_prefix" = "XNONE"; then
+ acl_final_exec_prefix='${prefix}'
+ else
+ acl_final_exec_prefix="$exec_prefix"
+ fi
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-gnu-ld was given.
+if test "${with_gnu_ld+set}" = set; then :
+ withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+else
+ with_gnu_ld=no
+fi
+
+# Prepare PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+ac_prog=ld
+if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by GCC" >&5
+$as_echo_n "checking for ld used by GCC... " >&6; }
+ case $host in
+ *-*-mingw*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $ac_prog in
+ # Accept absolute paths.
+ [\\/]* | [A-Za-z]:[\\/]*)
+ re_direlt='/[^/][^/]*/\.\./'
+ # Canonicalize the path of ld
+ ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+ while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+ ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+ done
+ test -z "$LD" && LD="$ac_prog"
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ac_prog=ld
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
+ esac
+elif test "$with_gnu_ld" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
+fi
+if ${acl_cv_path_LD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ if test -z "$LD"; then
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ acl_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+ # but apparently some GNU ld's only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ if "$acl_cv_path_LD" -v 2>&1 < /dev/null | $EGREP '(GNU|with BFD)' > /dev/null; then
+ test "$with_gnu_ld" != no && break
+ else
+ test "$with_gnu_ld" != yes && break
+ fi
+ fi
+ done
+ IFS="$ac_save_ifs"
+else
+ acl_cv_path_LD="$LD" # Let the user override the test with a path.
+fi
+fi
+
+LD="$acl_cv_path_LD"
+if test -n "$LD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${acl_cv_prog_gnu_ld+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+if $LD -v 2>&1 </dev/null | $EGREP '(GNU|with BFD)' 1>&5; then
+ acl_cv_prog_gnu_ld=yes
+else
+ acl_cv_prog_gnu_ld=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+with_gnu_ld=$acl_cv_prog_gnu_ld
+
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+$as_echo_n "checking for shared library run path origin... " >&6; }
+if ${acl_cv_rpath+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
+ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
+ . ./conftest.sh
+ rm -f ./conftest.sh
+ acl_cv_rpath=done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+$as_echo "$acl_cv_rpath" >&6; }
+ wl="$acl_cv_wl"
+ libext="$acl_cv_libext"
+ shlibext="$acl_cv_shlibext"
+ hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
+ hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
+ hardcode_direct="$acl_cv_hardcode_direct"
+ hardcode_minus_L="$acl_cv_hardcode_minus_L"
+ # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+ enableval=$enable_rpath; :
+else
+ enable_rpath=yes
+fi
+
+
+
+
+
+
+
+
+ use_additional=yes
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+
+# Check whether --with-libiconv-prefix was given.
+if test "${with_libiconv_prefix+set}" = set; then :
+ withval=$with_libiconv_prefix;
+ if test "X$withval" = "Xno"; then
+ use_additional=no
+ else
+ if test "X$withval" = "X"; then
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+
+ eval additional_includedir=\"$includedir\"
+ eval additional_libdir=\"$libdir\"
+
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ else
+ additional_includedir="$withval/include"
+ additional_libdir="$withval/lib"
+ fi
+ fi
+
+fi
+
+
+# Check whether --with-libiconv-type was given.
+if test "${with_libiconv_type+set}" = set; then :
+ withval=$with_libiconv_type; with_libiconv_type=$withval
+else
+ with_libiconv_type=auto
+fi
+
+ lib_type=`eval echo \$with_libiconv_type`
+
+ LIBICONV=
+ LTLIBICONV=
+ INCICONV=
+ rpathdirs=
+ ltrpathdirs=
+ names_already_handled=
+ names_next_round='iconv '
+ while test -n "$names_next_round"; do
+ names_this_round="$names_next_round"
+ names_next_round=
+ for name in $names_this_round; do
+ already_handled=
+ for n in $names_already_handled; do
+ if test "$n" = "$name"; then
+ already_handled=yes
+ break
+ fi
+ done
+ if test -z "$already_handled"; then
+ names_already_handled="$names_already_handled $name"
+ uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
+ eval value=\"\$HAVE_LIB$uppername\"
+ if test -n "$value"; then
+ if test "$value" = yes; then
+ eval value=\"\$LIB$uppername\"
+ test -z "$value" || LIBICONV="${LIBICONV}${LIBICONV:+ }$value"
+ eval value=\"\$LTLIB$uppername\"
+ test -z "$value" || LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$value"
+ else
+ :
+ fi
+ else
+ found_dir=
+ found_la=
+ found_so=
+ found_a=
+ if test $use_additional = yes; then
+ if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext" && test x$lib_type != xstatic; then
+ found_dir="$additional_libdir"
+ found_so="$additional_libdir/lib$name.$shlibext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ elif test x$lib_type != xshared; then
+ if test -f "$additional_libdir/lib$name.$libext"; then
+ found_dir="$additional_libdir"
+ found_a="$additional_libdir/lib$name.$libext"
+ if test -f "$additional_libdir/lib$name.la"; then
+ found_la="$additional_libdir/lib$name.la"
+ fi
+ fi
+ fi
+ fi
+ if test "X$found_dir" = "X"; then
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ case "$x" in
+ -L*)
+ dir=`echo "X$x" | sed -e 's/^X-L//'`
+ if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext" && test x$lib_type != xstatic; then
+ found_dir="$dir"
+ found_so="$dir/lib$name.$shlibext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ elif test x$lib_type != xshared; then
+ if test -f "$dir/lib$name.$libext"; then
+ found_dir="$dir"
+ found_a="$dir/lib$name.$libext"
+ if test -f "$dir/lib$name.la"; then
+ found_la="$dir/lib$name.la"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ if test "X$found_dir" != "X"; then
+ break
+ fi
+ done
+ fi
+ if test "X$found_dir" != "X"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
+ if test "X$found_so" != "X"; then
+ if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $found_dir"
+ fi
+ if test "$hardcode_direct" = yes; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $found_dir"
+ fi
+ else
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$found_dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir"
+ fi
+ if test "$hardcode_minus_L" != no; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ fi
+ fi
+ fi
+ fi
+ else
+ if test "X$found_a" != "X"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$found_a"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir -l$name"
+ fi
+ fi
+ additional_includedir=
+ case "$found_dir" in
+ */lib | */lib/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
+ additional_includedir="$basedir/include"
+ ;;
+ esac
+ if test "X$additional_includedir" != "X"; then
+ if test "X$additional_includedir" != "X/usr/include"; then
+ haveit=
+ if test "X$additional_includedir" = "X/usr/local/include"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ for x in $CPPFLAGS $INCICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-I$additional_includedir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_includedir"; then
+ INCICONV="${INCICONV}${INCICONV:+ }-I$additional_includedir"
+ fi
+ fi
+ fi
+ fi
+ fi
+ if test -n "$found_la"; then
+ save_libdir="$libdir"
+ case "$found_la" in
+ */* | *\\*) . "$found_la" ;;
+ *) . "./$found_la" ;;
+ esac
+ libdir="$save_libdir"
+ for dep in $dependency_libs; do
+ case "$dep" in
+ -L*)
+ additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$additional_libdir" != "X/usr/lib"; then
+ haveit=
+ if test "X$additional_libdir" = "X/usr/local/lib"; then
+ if test -n "$GCC"; then
+ case $host_os in
+ linux*) haveit=yes;;
+ esac
+ fi
+ fi
+ if test -z "$haveit"; then
+ haveit=
+ for x in $LDFLAGS $LIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ haveit=
+ for x in $LDFLAGS $LTLIBICONV; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X-L$additional_libdir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ if test -d "$additional_libdir"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+ fi
+ fi
+ fi
+ fi
+ ;;
+ -R*)
+ dir=`echo "X$dep" | sed -e 's/^X-R//'`
+ if test "$enable_rpath" != no; then
+ haveit=
+ for x in $rpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ rpathdirs="$rpathdirs $dir"
+ fi
+ haveit=
+ for x in $ltrpathdirs; do
+ if test "X$x" = "X$dir"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ ltrpathdirs="$ltrpathdirs $dir"
+ fi
+ fi
+ ;;
+ -l*)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ ;;
+ *.la)
+ names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
+ ;;
+ *)
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$dep"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }$dep"
+ ;;
+ esac
+ done
+ fi
+ else
+ if test "x$lib_type" = "xauto" || test "x$lib_type" = "xshared"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l$name"
+ else
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-l:lib$name.$libext"
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-l:lib$name.$libext"
+ fi
+ fi
+ fi
+ fi
+ done
+ done
+ if test "X$rpathdirs" != "X"; then
+ if test -n "$hardcode_libdir_separator"; then
+ alldirs=
+ for found_dir in $rpathdirs; do
+ alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
+ done
+ acl_save_libdir="$libdir"
+ libdir="$alldirs"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ else
+ for found_dir in $rpathdirs; do
+ acl_save_libdir="$libdir"
+ libdir="$found_dir"
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ libdir="$acl_save_libdir"
+ LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
+ done
+ fi
+ fi
+ if test "X$ltrpathdirs" != "X"; then
+ for found_dir in $ltrpathdirs; do
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-R$found_dir"
+ done
+ fi
+
+
+
+
+
+
+
+ am_save_CPPFLAGS="$CPPFLAGS"
+
+ for element in $INCICONV; do
+ haveit=
+ for x in $CPPFLAGS; do
+
+ acl_save_prefix="$prefix"
+ prefix="$acl_final_prefix"
+ acl_save_exec_prefix="$exec_prefix"
+ exec_prefix="$acl_final_exec_prefix"
+ eval x=\"$x\"
+ exec_prefix="$acl_save_exec_prefix"
+ prefix="$acl_save_prefix"
+
+ if test "X$x" = "X$element"; then
+ haveit=yes
+ break
+ fi
+ done
+ if test -z "$haveit"; then
+ CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }$element"
+ fi
+ done
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+$as_echo_n "checking for iconv... " >&6; }
+if ${am_cv_func_iconv+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_cv_func_iconv="no, consider installing GNU libiconv"
+ am_cv_lib_iconv=no
+ if test x$gcc_no_link = xyes; then
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+fi
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <stdlib.h>
+#include <iconv.h>
+
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test "$am_cv_func_iconv" != yes; then
+ am_save_LIBS="$LIBS"
+ LIBS="$LIBS $LIBICONV"
+ if test x$gcc_no_link = xyes; then
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+fi
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <stdlib.h>
+#include <iconv.h>
+
+int
+main ()
+{
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_lib_iconv=yes
+ am_cv_func_iconv=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$am_save_LIBS"
+ fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+$as_echo "$am_cv_func_iconv" >&6; }
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+$as_echo_n "checking for working iconv... " >&6; }
+if ${am_cv_func_iconv_works+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+
+ am_save_LIBS="$LIBS"
+ if test $am_cv_lib_iconv = yes; then
+ LIBS="$LIBS $LIBICONV"
+ fi
+ am_cv_func_iconv_works=no
+ for ac_iconv_const in '' 'const'; do
+ if test "$cross_compiling" = yes; then :
+ case "$host_os" in
+ aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
+ *) am_cv_func_iconv_works="guessing yes" ;;
+ esac
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <iconv.h>
+#include <string.h>
+
+#ifndef ICONV_CONST
+# define ICONV_CONST $ac_iconv_const
+#endif
+
+int
+main ()
+{
+int result = 0;
+ /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from
+ successful returns. This is even documented in
+ <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */
+ {
+ iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
+ if (cd_utf8_to_88591 != (iconv_t)(-1))
+ {
+ static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
+ char buf[10];
+ ICONV_CONST char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_utf8_to_88591,
+ &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ result |= 1;
+ iconv_close (cd_utf8_to_88591);
+ }
+ }
+ /* Test against Solaris 10 bug: Failures are not distinguishable from
+ successful returns. */
+ {
+ iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
+ if (cd_ascii_to_88591 != (iconv_t)(-1))
+ {
+ static ICONV_CONST char input[] = "\263";
+ char buf[10];
+ ICONV_CONST char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_ascii_to_88591,
+ &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res == 0)
+ result |= 2;
+ iconv_close (cd_ascii_to_88591);
+ }
+ }
+ /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static ICONV_CONST char input[] = "\304";
+ static char buf[2] = { (char)0xDE, (char)0xAD };
+ ICONV_CONST char *inptr = input;
+ size_t inbytesleft = 1;
+ char *outptr = buf;
+ size_t outbytesleft = 1;
+ size_t res = iconv (cd_88591_to_utf8,
+ &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
+ result |= 4;
+ iconv_close (cd_88591_to_utf8);
+ }
+ }
+#if 0 /* This bug could be worked around by the caller. */
+ /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
+ {
+ iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
+ if (cd_88591_to_utf8 != (iconv_t)(-1))
+ {
+ static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
+ char buf[50];
+ ICONV_CONST char *inptr = input;
+ size_t inbytesleft = strlen (input);
+ char *outptr = buf;
+ size_t outbytesleft = sizeof (buf);
+ size_t res = iconv (cd_88591_to_utf8,
+ &inptr, &inbytesleft,
+ &outptr, &outbytesleft);
+ if ((int)res > 0)
+ result |= 8;
+ iconv_close (cd_88591_to_utf8);
+ }
+ }
+#endif
+ /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
+ provided. */
+ {
+ /* Try standardized names. */
+ iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
+ /* Try IRIX, OSF/1 names. */
+ iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
+ /* Try AIX names. */
+ iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
+ /* Try HP-UX names. */
+ iconv_t cd4 = iconv_open ("utf8", "eucJP");
+ if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
+ && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
+ result |= 16;
+ if (cd1 != (iconv_t)(-1))
+ iconv_close (cd1);
+ if (cd2 != (iconv_t)(-1))
+ iconv_close (cd2);
+ if (cd3 != (iconv_t)(-1))
+ iconv_close (cd3);
+ if (cd4 != (iconv_t)(-1))
+ iconv_close (cd4);
+ }
+ return result;
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+ am_cv_func_iconv_works=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+ conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+ test "$am_cv_func_iconv_works" = no || break
+ done
+ LIBS="$am_save_LIBS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+$as_echo "$am_cv_func_iconv_works" >&6; }
+ case "$am_cv_func_iconv_works" in
+ *no) am_func_iconv=no am_cv_lib_iconv=no ;;
+ *) am_func_iconv=yes ;;
+ esac
+ else
+ am_func_iconv=no am_cv_lib_iconv=no
+ fi
+ if test "$am_func_iconv" = yes; then
+
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+
+ fi
+ if test "$am_cv_lib_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+$as_echo_n "checking how to link with libiconv... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+$as_echo "$LIBICONV" >&6; }
+ else
+ CPPFLAGS="$am_save_CPPFLAGS"
+ LIBICONV=
+ LTLIBICONV=
+ fi
+
+
+
+ if test "$am_cv_func_iconv" = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iconv is compatible with its POSIX signature" >&5
+$as_echo_n "checking whether iconv is compatible with its POSIX signature... " >&6; }
+if ${gl_cv_iconv_nonconst+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#include <stdlib.h>
+#include <iconv.h>
+extern
+#ifdef __cplusplus
+"C"
+#endif
+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
+
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ gl_cv_iconv_nonconst=yes
+else
+ gl_cv_iconv_nonconst=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_iconv_nonconst" >&5
+$as_echo "$gl_cv_iconv_nonconst" >&6; }
+ else
+ gl_cv_iconv_nonconst=yes
+ fi
+ if test $gl_cv_iconv_nonconst = yes; then
+ iconv_arg1=""
+ else
+ iconv_arg1="const"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define ICONV_CONST $iconv_arg1
+_ACEOF
+
+
+
+ if test "$am_func_iconv" = yes; then
+ if test -n "$LIBICONV"; then
+ am_cv_func_iconv_summary='yes, in libiconv'
+ else
+ am_cv_func_iconv_summary='yes, in libc'
+ fi
+ else
+ if test "$am_cv_func_iconv" = yes; then
+ am_cv_func_iconv_summary='not working, consider installing GNU libiconv'
+ else
+ am_cv_func_iconv_summary='no, consider installing GNU libiconv'
+ fi
+ fi
+
+
ac_config_files="$ac_config_files Makefile"
diff --git a/libgcobol/configure.ac b/libgcobol/configure.ac
index 2e4a88e..34c0235 100644
--- a/libgcobol/configure.ac
+++ b/libgcobol/configure.ac
@@ -215,6 +215,12 @@ AM_CONDITIONAL([ENABLE_DARWIN_AT_RPATH], [test x$enable_darwin_at_rpath = xyes])
AC_SUBST(enable_shared)
AC_SUBST(enable_static)
+# These are GLIBC
+AC_CHECK_FUNCS_ONCE(random_r srandom_r initstate_r setstate_r)
+
+# These are C23, and might not be available in libc.
+AC_CHECK_FUNCS_ONCE(strfromf32 strfromf64)
+
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"
else
@@ -266,6 +272,9 @@ case $host in
esac
AC_SUBST(extra_darwin_ldflags_libgcobol)
+# For iconv support.
+AM_ICONV
+
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_FILES([Makefile])
####AC_CONFIG_FILES(libgcobol.spec)
diff --git a/libgcobol/constants.cc b/libgcobol/constants.cc
index 3b4d68a..026f919 100644
--- a/libgcobol/constants.cc
+++ b/libgcobol/constants.cc
@@ -44,13 +44,6 @@
#include "io.h"
#include "common-defs.h"
#include "gcobolio.h"
-#include "libgcobol.h"
-#include "gfileio.h"
-#include "charmaps.h"
-
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wwrite-strings"
@@ -113,8 +106,6 @@ struct cblc_field_t __gg___2_##a = { \
.dummy = 0 , \
};
-
-
unsigned char __gg__data_space[1] = {' '};
struct cblc_field_t __gg__space = {
.data = __gg__data_space ,
diff --git a/libgcobol/ec.h b/libgcobol/ec.h
index 1e3f7cf..69d9731 100644
--- a/libgcobol/ec.h
+++ b/libgcobol/ec.h
@@ -210,4 +210,64 @@ enum ec_type_t {
};
+// The following declarations are used by both gcc/cobol code and the libgcobol
+// code
+
+struct cblc_declarative_t
+ {
+ int format;
+ int culprit; //declarative_culprit_t
+ int nfiles;
+ };
+
+/* According to the standard, the first digit of the file operation status
+ register is interpreted like this:
+
+ EC-I-O-AT-END '1'
+ EC-I-O-INVALID-KEY '2'
+ EC-I-O-PERMANENT-ERROR '3'
+ EC-I-O-LOGIC-ERROR '4'
+ EC-I-O-RECORD-OPERATION '5'
+ EC-I-O-FILE-SHARING '6'
+ EC-I-O-IMP '9'
+
+When the tens digit is '0', there are a number of conditions for
+successful completion. See section 9.1.12.1
+
+ 00 unqualified success
+ 02 duplicate key detected
+ 04 the data read were either too short or too long
+ 05 the operator couldn't find the tape
+ 07 somebody tried to rewind the card reader.
+
+For now, I am going to treat the io_status as an integer 00 through 99. I
+anticipate mostly returning
+ 00 for ordinary success,
+ 04 for a mismatched record size
+ 10 for an end-of-file
+
+*/
+
+// This global variable is constantly being updated with the yylineno. This is
+// useful for creating error messages, and for handling EXCEPTION_CONDITIONS
+extern int __gg__exception_code;
+extern int __gg__exception_line_number;
+extern int __gg__exception_file_status;
+extern const char *__gg__exception_file_name;
+extern const char *__gg__exception_statement;
+extern const char *__gg__exception_source_file;
+extern const char *__gg__exception_program_id;
+extern const char *__gg__exception_section;
+extern const char *__gg__exception_paragraph;
+
+extern "C" void __gg__set_exception_code( ec_type_t ec,
+ int from_raise_statement=0);
+
+#if 1
+ static inline
+ void exception_raise(ec_type_t ec_code) { __gg__set_exception_code(ec_code); }
+#else
+# define exception_raise(ec_code)do{__gg__set_exception_code(ec_code);}while(0);
+#endif
+
#endif
diff --git a/libgcobol/gcobolio.h b/libgcobol/gcobolio.h
index 061f24f..f1a26a2 100644
--- a/libgcobol/gcobolio.h
+++ b/libgcobol/gcobolio.h
@@ -35,6 +35,13 @@
#include <unordered_map>
#include <vector>
+// RUNTIME structures *must* match the ones created in structs.c and initialized
+// and used in genapi.c. It's actually not all that important to emphasize that
+// fact, since the compiled executable will crash and burn quickly if they don't
+// match precisely.
+
+// Note that it must match the same structure in the GDB-COBOL debugger
+
typedef struct cblc_field_t
{
// This structure must match the code in structs.cc
@@ -76,6 +83,15 @@ enum cblc_file_prior_op_t
/* end implementation details */
+enum cblc_file_flags_t
+ {
+ file_flag_none_e = 0x00000,
+ file_flag_optional_e = 0x00001,
+ file_flag_existed_e = 0x00002,
+ file_name_quoted_e = 0x00004,
+ file_flag_initialized_e = 0x00008,
+ };
+
typedef struct cblc_file_t
{
// This structure must match the code in structs.cc
@@ -111,4 +127,26 @@ typedef struct cblc_file_t
int dummy;
} cblc_file_t;
+
+/* In various arithmetic routines implemented in libgcobol, it is oftent the
+ case that complicates lists of variables need to be conveyed. For example,
+ "ADD A B C D GIVING E" and "ADD A TO B C D" are valid instructions.
+
+ These treeplets (triplets of trees) were created to handle that. */
+
+extern cblc_field_t ** __gg__treeplet_1f;
+extern size_t * __gg__treeplet_1o;
+extern size_t * __gg__treeplet_1s;
+extern cblc_field_t ** __gg__treeplet_2f;
+extern size_t * __gg__treeplet_2o;
+extern size_t * __gg__treeplet_2s;
+extern cblc_field_t ** __gg__treeplet_3f;
+extern size_t * __gg__treeplet_3o;
+extern size_t * __gg__treeplet_3s;
+extern cblc_field_t ** __gg__treeplet_4f;
+extern size_t * __gg__treeplet_4o;
+extern size_t * __gg__treeplet_4s;
+
+extern int * __gg__fourplet_flags;
+
#endif
diff --git a/libgcobol/gfileio.cc b/libgcobol/gfileio.cc
index 9852dbf..ed250c4 100644
--- a/libgcobol/gfileio.cc
+++ b/libgcobol/gfileio.cc
@@ -40,6 +40,8 @@
#include <unistd.h>
#include <algorithm>
+#include "config.h"
+
#include "ec.h"
#include "io.h"
#include "common-defs.h"
@@ -334,8 +336,8 @@ __gg__file_init(
file->errnum = 0 ;
file->io_status = FsSuccess ;
file->delimiter = internal_newline ;
- file->flags = 0;
- file->flags |= (optional ? file_flag_optional_e : 0)
+ file->flags = file_flag_none_e;
+ file->flags |= (optional ? file_flag_optional_e : file_flag_none_e)
+ file_flag_initialized_e;
file->record_area_min = record_area_min;
file->record_area_max = record_area_max;
@@ -4138,7 +4140,7 @@ __gg__file_reopen(cblc_file_t *file, int mode_char)
random_access_mode = ( file->access == file_access_rnd_e
|| file->access == file_access_dyn_e);
the_file_exists = access(trimmed_name, F_OK) == 0;
- file->flags |= the_file_exists ? file_flag_existed_e : 0 ;
+ file->flags |= the_file_exists ? file_flag_existed_e : file_flag_none_e ;
// We have four operations: INPUT (r) OUTPUT (w) I-O (+) and EXTEND (a)
// INPUT and I-O and EXTEND have different results based on is_optional
@@ -4351,7 +4353,7 @@ __io__file_open(cblc_file_t *file,
// file close time.
file->filename = filename;
file->flags &= ~file_name_quoted_e;
- file->flags |= is_quoted ? file_name_quoted_e : 0;
+ file->flags |= is_quoted ? file_name_quoted_e : file_flag_none_e;
__gg__file_reopen(file, mode_char);
}
diff --git a/libgcobol/gfileio.h b/libgcobol/gfileio.h
index e70d84f..d525500 100644
--- a/libgcobol/gfileio.h
+++ b/libgcobol/gfileio.h
@@ -30,6 +30,30 @@
#ifndef GFILEIO_H_
#define GFILEIO_H_
+// For indexed files, there can be one or more indexes, one per key.
+// Each index is one or more fields.
+
+struct file_hole_t
+ {
+ long location;
+ size_t size;
+ };
+
+struct file_index_t
+ {
+ std::multimap<std::vector<unsigned char>, long> key_to_position;
+ std::multimap<std::vector<unsigned char>, long>::iterator current_iterator;
+ std::multimap<std::vector<unsigned char>, long>::iterator ending_iterator;
+ };
+
+class supplemental_t
+ {
+ public:
+ std::vector<file_hole_t> holes;
+ std::vector<file_index_t> indexes;
+ std::vector<int> uniques;
+ };
+
extern "C"
{
void __gg__handle_error(const char *function, const char *msg);
diff --git a/libgcobol/gmath.cc b/libgcobol/gmath.cc
index 2af0e8a..fb2eae3 100644
--- a/libgcobol/gmath.cc
+++ b/libgcobol/gmath.cc
@@ -39,6 +39,8 @@
#include <unistd.h>
#include <algorithm>
+#include "config.h"
+
#include "ec.h"
#include "common-defs.h"
#include "io.h"
diff --git a/libgcobol/intrinsic.cc b/libgcobol/intrinsic.cc
index e3d255a..4bce481 100644
--- a/libgcobol/intrinsic.cc
+++ b/libgcobol/intrinsic.cc
@@ -44,6 +44,8 @@
#include <langinfo.h>
#include <string.h>
+#include "config.h"
+
#include "ec.h"
#include "common-defs.h"
#include "io.h"
@@ -99,7 +101,7 @@ is_zulu_format(PCHAR left, PCHAR &right)
bool retval = false;
if( right > left )
{
- retval = toupper(*(right-1)) == internal_Z;
+ retval = std::toupper((unsigned char)*(right-1)) == internal_Z;
}
return retval;
}
@@ -1984,7 +1986,8 @@ __gg__lower_case( cblc_field_t *dest,
memset(dest->data, internal_space, dest_length);
memcpy(dest->data, input->data+input_offset, std::min(dest_length, source_length));
internal_to_ascii((char *)dest->data, dest_length);
- std::transform(dest->data, dest->data + dest_length, dest->data, tolower);
+ std::transform(dest->data, dest->data + dest_length, dest->data,
+ [](unsigned char c) { return std::tolower(c); });
ascii_to_internal_str((char *)dest->data, dest_length);
}
@@ -2431,7 +2434,7 @@ numval( cblc_field_t *dest,
state = SPACE4;
break;
}
- if( tolower(ch) == 'd' )
+ if( std::tolower(ch) == 'd' )
{
if( leading_sign )
{
@@ -2439,7 +2442,7 @@ numval( cblc_field_t *dest,
}
ch = *p++;
errpos += 1;
- if( p > pend || tolower(ch) != 'b' )
+ if( p > pend || std::tolower(ch) != 'b' )
{
goto done;
}
@@ -2447,7 +2450,7 @@ numval( cblc_field_t *dest,
state = SPACE4;
break;
}
- if( tolower(ch) == 'c' )
+ if( std::tolower(ch) == 'c' )
{
if( leading_sign )
{
@@ -2455,7 +2458,7 @@ numval( cblc_field_t *dest,
}
ch = *p++;
errpos += 1;
- if( p > pend || tolower(ch) != 'r' )
+ if( p > pend || std::tolower(ch) != 'r' )
{
goto done;
}
@@ -2494,7 +2497,7 @@ numval( cblc_field_t *dest,
state = SPACE4;
break;
}
- if( tolower(ch) == 'd' )
+ if( std::tolower(ch) == 'd' )
{
if( leading_sign )
{
@@ -2502,7 +2505,7 @@ numval( cblc_field_t *dest,
}
ch = *p++;
errpos += 1;
- if( p > pend || tolower(ch) != 'b' )
+ if( p > pend || std::tolower(ch) != 'b' )
{
goto done;
}
@@ -2510,7 +2513,7 @@ numval( cblc_field_t *dest,
state = SPACE4;
break;
}
- if( tolower(ch) == 'c' )
+ if( std::tolower(ch) == 'c' )
{
if( leading_sign )
{
@@ -2518,7 +2521,7 @@ numval( cblc_field_t *dest,
}
ch = *p++;
errpos += 1;
- if( p > pend || tolower(ch) != 'r' )
+ if( p > pend || std::tolower(ch) != 'r' )
{
goto done;
}
@@ -3408,9 +3411,13 @@ __gg__trim( cblc_field_t *dest,
}
}
+#if HAVE_INITSTATE_R && HAVE_SRANDOM_R && HAVE_RANDOM_R
static struct random_data *buf = NULL;
static char *state = NULL;
static const size_t state_len = 256;
+#else
+static unsigned seed = 0;
+#endif
extern "C"
void
@@ -3419,6 +3426,9 @@ __gg__random( cblc_field_t *dest,
size_t input_offset,
size_t input_size)
{
+ int32_t retval_31;
+ int rdigits;
+#if HAVE_INITSTATE_R && HAVE_SRANDOM_R && HAVE_RANDOM_R
// This creates a thread-safe pseudo-random number generator
// using input as the seed
@@ -3435,16 +3445,21 @@ __gg__random( cblc_field_t *dest,
__gg__clock_gettime(CLOCK_REALTIME, &ts);
initstate_r( ts.tv_nsec, state, state_len, buf);
}
-
- int rdigits;
int seed = (int)__gg__binary_value_from_qualified_field(&rdigits,
input,
input_offset,
input_size);
srandom_r(seed, buf);
- int32_t retval_31;
random_r(buf, &retval_31);
+#else
+ seed = (unsigned)__gg__binary_value_from_qualified_field(&rdigits,
+ input,
+ input_offset,
+ input_size);
+ srandom (seed);
+ retval_31 = random ();
+#endif
// We are going to convert this to a value between zero and not quite one:
double retval = double(retval_31) / double(0x80000000UL);
__gg__double_to_target( dest,
@@ -3456,6 +3471,8 @@ extern "C"
void
__gg__random_next(cblc_field_t *dest)
{
+ int32_t retval_31;
+#if HAVE_INITSTATE_R && HAVE_SRANDOM_R && HAVE_RANDOM_R
// The return value is between zero and not quite one
if( !buf )
@@ -3468,9 +3485,10 @@ __gg__random_next(cblc_field_t *dest)
__gg__clock_gettime(CLOCK_REALTIME, &ts);
initstate_r( ts.tv_nsec, state, state_len, buf);
}
- int32_t retval_31;
random_r(buf, &retval_31);
-
+#else
+ retval_31 = random ();
+#endif
// We are going to convert this to a value between zero and not quite one:
double retval = double(retval_31) / double(0x80000000UL);
__gg__double_to_target( dest,
@@ -3493,6 +3511,10 @@ __gg__reverse(cblc_field_t *dest,
{
dest->data[i] = (input->data+input_offset)[source_length-1-i];
}
+ if( (dest->attr & intermediate_e) )
+ {
+ dest->capacity = std::min(dest_length, source_length);
+ }
}
extern "C"
@@ -3736,7 +3758,8 @@ __gg__upper_case( cblc_field_t *dest,
memset(dest->data, internal_space, dest_length);
memcpy(dest->data, input->data+input_offset, std::min(dest_length, source_length));
internal_to_ascii((char *)dest->data, dest_length);
- std::transform(dest->data, dest->data + dest_length, dest->data, toupper);
+ std::transform(dest->data, dest->data + dest_length, dest->data,
+ [](unsigned char c) { return std::toupper(c); });
ascii_to_internal_str((char *)dest->data, dest_length);
}
@@ -4551,7 +4574,7 @@ fill_cobol_tm(cobol_tm &ctm,
if( ch == internal_Z || ch == internal_z )
{
// This has to be the end of the road
- if( toupper(source[0]) != 'Z' )
+ if( std::toupper((unsigned char)source[0]) != 'Z' )
{
retval += 0;
break;
@@ -5054,7 +5077,7 @@ iscasematch(char *a1, char *a2, char *b1, char *b2)
bool retval = true;
while( a1 < a2 && b1 < b2 )
{
- if( tolower(*a1++) != tolower(*b1++) )
+ if( std::tolower((unsigned char)*a1++) != std::tolower((unsigned char)*b1++) )
{
retval = false;
}
diff --git a/libgcobol/io.cc b/libgcobol/io.cc
index 4dca42e..95e1d02 100644
--- a/libgcobol/io.cc
+++ b/libgcobol/io.cc
@@ -27,6 +27,9 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+
+#include "config.h"
+
#include "io.h"
#include "stdio.h"
#include "stdlib.h"
diff --git a/libgcobol/libgcobol.cc b/libgcobol/libgcobol.cc
index 0890835..c163e2c 100644
--- a/libgcobol/libgcobol.cc
+++ b/libgcobol/libgcobol.cc
@@ -49,6 +49,8 @@
#include <dirent.h>
#include <sys/resource.h>
+#include "config.h"
+
#include "ec.h"
#include "common-defs.h"
#include "io.h"
@@ -66,6 +68,30 @@
#include "exceptl.h"
+#if !defined (HAVE_STRFROMF32)
+# if __FLT_MANT_DIG__ == 24 && __FLT_MAX_EXP__ == 128
+static int
+strfromf32 (char *s, size_t n, const char *f, float v)
+{
+ return snprintf (s, n, f, (double) v);
+}
+# else
+# error "It looks like float on this platform is not IEEE754"
+# endif
+#endif
+
+#if !defined (HAVE_STRFROMF64)
+# if __DBL_MANT_DIG__ == 53 && __DBL_MAX_EXP__ == 1024
+static int
+strfromf64 (char *s, size_t n, const char *f, double v)
+{
+ return snprintf (s, n, f, v);
+}
+# else
+# error "It looks like double on this platform is not IEEE754"
+# endif
+#endif
+
// This couldn't be defined in symbols.h because it conflicts with a LEVEL66
// in parse.h
#define LEVEL66 (66)
@@ -8826,7 +8852,7 @@ mangler_core(const char *s, const char *eos)
}
else
{
- *d++ = tolower(ch);
+ *d++ = tolower((unsigned char)ch);
}
}
*d++ = NULLCH;
@@ -11312,8 +11338,10 @@ __gg__adjust_dest_size(cblc_field_t *dest, size_t ncount)
{
if( dest->allocated < ncount )
{
- dest->allocated = ncount;
- dest->data = (unsigned char *)realloc(dest->data, ncount);
+ fprintf(stderr, "libgcobol.cc:__gg__adjust_dest_size(): Adjusting size upward is not possible.\n");
+ abort();
+// dest->allocated = ncount;
+// dest->data = (unsigned char *)realloc(dest->data, ncount);
}
dest->capacity = ncount;
}
@@ -12643,7 +12671,7 @@ __gg__module_name(cblc_field_t *dest, module_type_t type)
break;
}
-__gg__adjust_dest_size(dest, strlen(result));
+ __gg__adjust_dest_size(dest, strlen(result));
memcpy(dest->data, result, strlen(result)+1);
}
diff --git a/libgcobol/libgcobol.h b/libgcobol/libgcobol.h
index 513f34a..1fc7abc 100644
--- a/libgcobol/libgcobol.h
+++ b/libgcobol/libgcobol.h
@@ -30,153 +30,14 @@
#ifndef LIBGCOBOL_H_
#define LIBGCOBOL_H_
-#include <stdio.h>
+/* Many of the routines declared here are called from the gcc/cobol code by
+ means of explicit GENERIC calls, which is why they are defined as external
+ "C". Because there is no mechanism for checking the definitions, the caller
+ and callee have to agree on parameter types and the types of returned
+ values.
-#include <map>
-#include <vector>
-
-#define MIN_FIELD_BLOCK_SIZE (16)
-
-// RUNTIME structures *must* match the ones created in structs.c and initialized
-// and used in genapi.c. It's actually not all that important to emphasize that
-// fact, since the compiled executable will crash and burn quickly if they don't
-// match precisely.
-
-// Note that it must match the same structure in the GDB-COBOL debugger
-
-#define A_ZILLION (1000000) // Absurdly large number for __gg__call_parameter_count
-
-// These bits are used for the "call flags" of arithmetic operations
-#define ON_SIZE_ERROR 0x01
-#define REMAINDER_PRESENT 0x02
-
-/* 'offset' is overloaded for FldAlphanumeric/temporary/intermediate variables
- * For such variables, offset is a copy of the initial capacity. This is in
- * support of the FUNCTION TRIM function, which both needs to be able to
- * reduce the capacity of the target variable, and then to reset it back to
- * the original value
- */
-
-enum substitute_flags_t
- {
- substitute_anycase_e = 1,
- substitute_first_e = 2, // first and last are mutually exclusive
- substitute_last_e = 4,
- };
-
-enum cblc_file_flags_t
- {
- file_flag_optional_e = 0x00001,
- file_flag_existed_e = 0x00002,
- file_name_quoted_e = 0x00004,
- file_flag_initialized_e = 0x00008,
- };
-
-// For indexed files, there can be one or more indexes, one per key.
-// Each index is one or more fields.
-
-struct file_hole_t
- {
- long location;
- size_t size;
- };
-
-struct file_index_t
- {
- std::multimap<std::vector<unsigned char>, long> key_to_position;
- std::multimap<std::vector<unsigned char>, long>::iterator current_iterator;
- std::multimap<std::vector<unsigned char>, long>::iterator ending_iterator;
- };
-
-class supplemental_t
- {
- public:
- std::vector<file_hole_t> holes;
- std::vector<file_index_t> indexes;
- std::vector<int> uniques;
- };
-
-struct cblc_subscript_t
- {
- cblc_field_t *field; // That's what it usually is:
- unsigned int type; // When type is FldLiteralN, field is a pointer to __int128
- };
-
-#define REFER_T_ALL_FLAGS_MASK 0x0FF // We allow for seven subscripts
-#define REFER_T_MOVE_ALL 0x100 // This is the move_all flag
-#define REFER_T_ADDRESS_OF 0x200 // This is the address_of flag
-
-struct cblc_declarative_t
- {
- int format;
- int culprit; //declarative_culprit_t
- int nfiles;
- };
-
-/* According to the standard, the first digit of the file operation status
- register is interpreted like this:
-
- EC-I-O-AT-END '1'
- EC-I-O-INVALID-KEY '2'
- EC-I-O-PERMANENT-ERROR '3'
- EC-I-O-LOGIC-ERROR '4'
- EC-I-O-RECORD-OPERATION '5'
- EC-I-O-FILE-SHARING '6'
- EC-I-O-IMP '9'
-
-When the tens digit is '0', there are a number of conditions for
-successful completion. See section 9.1.12.1
-
- 00 unqualified success
- 02 duplicate key detected
- 04 the data read were either too short or too long
- 05 the operator couldn't find the tape
- 07 somebody tried to rewind the card reader.
-
-For now, I am going to treat the io_status as an integer 00 through 99. I
-anticipate mostly returning
- 00 for ordinary success,
- 04 for a mismatched record size
- 10 for an end-of-file
-
-*/
-
-// This global variable is constantly being updated with the yylineno. This is
-// useful for creating error messages, and for handling EXCEPTION_CONDITIONS
-extern int __gg__exception_code;
-extern int __gg__exception_line_number;
-extern int __gg__exception_file_status;
-extern const char *__gg__exception_file_name;
-extern const char *__gg__exception_statement;
-extern const char *__gg__exception_source_file;
-extern const char *__gg__exception_program_id;
-extern const char *__gg__exception_section;
-extern const char *__gg__exception_paragraph;
-
-extern "C" void __gg__set_exception_code( ec_type_t ec,
- int from_raise_statement=0);
-
-extern int * __gg__fourplet_flags;
-
-extern cblc_field_t ** __gg__treeplet_1f;
-extern size_t * __gg__treeplet_1o;
-extern size_t * __gg__treeplet_1s;
-extern cblc_field_t ** __gg__treeplet_2f;
-extern size_t * __gg__treeplet_2o;
-extern size_t * __gg__treeplet_2s;
-extern cblc_field_t ** __gg__treeplet_3f;
-extern size_t * __gg__treeplet_3o;
-extern size_t * __gg__treeplet_3s;
-extern cblc_field_t ** __gg__treeplet_4f;
-extern size_t * __gg__treeplet_4o;
-extern size_t * __gg__treeplet_4s;
-
-#if 1
- static inline
- void exception_raise(ec_type_t ec_code) { __gg__set_exception_code(ec_code); }
-#else
-# define exception_raise(ec_code)do{__gg__set_exception_code(ec_code);}while(0);
-#endif
+ Some are also called between source code modules in libgcobol, hence the
+ need here for declarations. */
extern "C" __int128 __gg__power_of_ten(int n);
@@ -188,6 +49,7 @@ extern "C" __int128 __gg__dirty_to_binary_internal( const char *dirty,
int *rdigits);
extern "C" __int128 __gg__binary_value_from_field( int *rdigits,
cblc_field_t *var);
+
extern "C" int __gg__compare_2( cblc_field_t *left_side,
unsigned char *left_location,
size_t left_length,
@@ -234,7 +96,7 @@ extern "C" void __gg__clock_gettime(clockid_t clk_id, struct timespec *tp);
extern "C" _Float128 __gg__float128_from_location(cblc_field_t *var,
unsigned char *location);
extern "C" void __gg__adjust_dest_size(cblc_field_t *dest, size_t ncount);
-#define MINIMUM_ALLOCATION_SIZE 16
+
extern "C" void __gg__realloc_if_necessary( char **dest,
size_t *dest_size,
size_t new_size);
@@ -252,5 +114,4 @@ extern "C" __int128 __gg__integer_from_qualified_field(cblc_field_t *var,
size_t var_size);
void __gg__abort(const char *msg);
-
#endif
diff --git a/libgcobol/valconv.cc b/libgcobol/valconv.cc
index 0b80d72..33d9a0d 100644
--- a/libgcobol/valconv.cc
+++ b/libgcobol/valconv.cc
@@ -252,8 +252,8 @@ __gg__string_to_numeric_edited( char * const dest,
if( dlength >= 2 )
{
// It's a positive number, so we might have to get rid of a CR or DB:
- char ch1 = toupper(dest[dlength-2]);
- char ch2 = toupper(dest[dlength-1]);
+ char ch1 = toupper((unsigned char)dest[dlength-2]);
+ char ch2 = toupper((unsigned char)dest[dlength-1]);
if( (ch1 == ascii_D && ch2 == ascii_B)
|| (ch1 == ascii_C && ch2 == ascii_R) )
{
generated by cgit v1.1 at 2025-04-03 21:40:35 +0000