build.sh and CMake added option for Unicode support

 - If user requests unicode support then:
   - Attempt to compile and run test program to determine compiler support for iso 10646
   - If support preprocess code to enable unicode support
   - If not supported by compiler or not requested use default character encoding

Author: zbeekman

CMakeLists.txt

@@ -43,6 +43,7 @@ set ( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 #-------------------------------------
 set ( JF_LIB_SRCS  src/json_module.F90 )
 file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.f90" )
+set ( JF_TEST_UCS4_SUPPORT_SRC "${CMAKE_SOURCE_DIR}/src/tests/introspection/test_iso_10646_support.f90")
 
 #-----------------------------------------
 # Collect all the mod files into their own
@@ -83,6 +84,22 @@ else ()
     "${ABS_LIB_INSTALL_DIR}" )
 endif ()
 
+#---------------------------------------------
+# See if our compiler supports ISO 10646/UCS4
+#---------------------------------------------
+set ( ENABLE_UNICODE FLASE CACHE BOOL
+  "Enable unicode/UCS4 support" )
+if ( ENABLE_UNICODE )
+  try_run( UCS4_TEST_RUNS UCS4_TEST_COMPILES
+    ${CMAKE_BINARY_DIR}/bin ${JF_TEST_UCS4_SUPPORT_SRC} )
+  if (UCS4_TEST_RUNS EQUAL 0)
+    add_definitions (-DUSE_UCS4)
+  else ()
+    message ( WARNING
+      "Unicode support requested but ${CMAKE_Fortran_COMPILER_ID} Fortran compiler does not support 'ISO_10646' characters!" )
+  endif ()
+endif ()
+
 #---------------------------------------------
 # Build a shared and static library by default
 #---------------------------------------------

build.sh

@@ -25,6 +25,8 @@ PROJECTNAME='jsonfortran'       # project name for robodoc (example: jsonfortran
 DOCDIR='./documentation/'       # build directory for documentation
 SRCDIR='./src/'                 # library source directory
 TESTDIR='./src/tests/'          # unit test source directory
+INTROSPECDIR='./src/tests/introspection/' # pre compile configuration tests directory
+UCS4TESTCODE='test_iso_10646_support.f90'
 BINDIR='./bin/'                 # build directory for unit tests
 LIBDIR='./lib/'                 # build directory for library
 MODCODE='json_module.F90'       # json module file name
@@ -35,10 +37,10 @@ LIBOUT='libjsonfortran.a'       # name of json library
 # warning #7601: F2008 standard does not allow an internal procedure to be an actual argument procedure name. (R1214.4).
 # In the context of F2008 this is an erroneous warning.
 # See https://prd1idz.cps.intel.com/en-us/forums/topic/486629
-INTELCOMPILERFLAGS='-c -O2 -warn -stand f08 -diag-disable 7601 -traceback'
+INTELCOMPILERFLAGS='-c -O2 -warn -stand f08 -diag-disable 7601 -diag-disable 4013 -traceback'
 #INTELCOMPILERFLAGS='-c -O2 -warn -traceback -stand f08 -assume protect_parens -assume buffered_io -check all'
 
-GNUCOMPILERFLAGS='-c -O2 -fbacktrace -Wall -Wextra -Wno-maybe-uninitialized -pedantic -std=f2008'
+GNUCOMPILERFLAGS='-c -O2 -fbacktrace -Wall -Wextra -Wno-maybe-uninitialized -Wno-unused-function -pedantic -std=f2008'
 
 FCOMPILER='gnu' #Set default compiler to gfortran
 
@@ -55,7 +57,7 @@ print_usage () {
     echo -e "\n\nUsage:\n"
     echo -e "${script_name} [--compiler {intel|gnu|<other>}] [--cflags '<custom compiler flags here>']\n\
          [--coverage [{yes|no}]] [--profile [{yes|no}]] [--skip-tests [{yes|no}]]\n\
-         [--skip-documentation [{yes|no}]] [--help]"
+         [--skip-documentation [{yes|no}]] [--enable-unicode [{yes|no}]] [--help]"
     echo ""
     echo -e "Any flags that take an optional yes or no argument will default to 'yes' when no\n\
 argument is passed. Additionally, A custom compiler may be passed to the 'compiler'\n\
@@ -94,6 +96,22 @@ while [ "$#" -ge "1" ]; do # Get command line arguments while there are more lef
 	    # no good way to check that the user didn't do something questionable
 	    shift
 	    ;;
+	--enable-unicode)
+	    case $2 in
+		yes|Yes|YES)
+		    TRY_UNICODE="yes"
+		    shift
+		    ;;
+		no|No|NO)
+		    TRY_UNICODE="no"
+		    shift
+		    ;;
+		*)
+		    TRY_UNICODE="yes"
+		    # don't shift; $2 is next arg
+		    ;;
+	    esac
+	    ;;
 	--coverage) # enable coverage
 	    case $2 in
 		yes|Yes|YES)
@@ -185,17 +203,26 @@ if [[ $CODE_PROFILE == [yY]* ]]; then
 fi
 
 if [[ $FCOMPILER == custom ]]; then
+    echo "Trying to compile with custom compiler, $FC"
     CUSTOM="-fc $FC"
 fi
 
+if [[ $TRY_UNICODE == [yY]* ]]; then
+    echo "Trying to compile library with Unicode/UCS4 support"
+    FoBiS.py build -ch -compiler ${FCOMPILER} ${CUSTOM} -cflags "${FCOMPILERFLAGS}" -dbld "${BINDIR}" -s "${INTROSPECDIR}" -dmod ./ -dobj ./ -t ${UCS4TESTCODE} -o ${UCS4TESTCODE%.f90} -colors
+    if "${BINDIR}/${UCS4TESTCODE%.f90}"; then
+	DEFINES="-DUSE_UCS4 -Wunused-function"
+    fi
+fi
+
 #build the stand-alone library:
 echo ""
 echo "Building library..."
 
 # work around for FoBiS.py PR #45
 [ -d "$LIBDIR" ] || mkdir "$LIBDIR"
 
-FoBiS.py build -ch -compiler ${FCOMPILER} ${CUSTOM} -cflags "${FCOMPILERFLAGS}" ${COVERAGE} ${PROFILING} -dbld ${LIBDIR} -s ${SRCDIR} -dmod ./ -dobj ./ -t ${MODCODE} -o ${LIBOUT} -mklib static -colors
+FoBiS.py build -ch -compiler ${FCOMPILER} ${CUSTOM} -cflags "${FCOMPILERFLAGS} ${DEFINES}" ${COVERAGE} ${PROFILING} -dbld ${LIBDIR} -s ${SRCDIR} -dmod ./ -dobj ./ -t ${MODCODE} -o ${LIBOUT} -mklib static -colors
 
 #build the unit tests (uses the above library):
 if [[ $JF_SKIP_TESTS != [yY]* ]]; then
@@ -208,7 +235,7 @@ if [[ $JF_SKIP_TESTS != [yY]* ]]; then
     for TEST in "${TESTDIR%/}"/jf_test_*.f90; do
 	THIS_TEST=${TEST##*/}
 	echo "Build ${THIS_TEST%.f90}"
-	FoBiS.py build -ch -compiler ${FCOMPILER} ${CUSTOM} -cflags "${FCOMPILERFLAGS}" ${COVERAGE} ${PROFILING} -dbld ${BINDIR} -s ${TESTDIR} -i ${LIBDIR} -libs ${LIBDIR}/${LIBOUT} -dmod ./ -dobj ./ -t ${THIS_TEST} -o ${THIS_TEST%.f90} -colors
+	FoBiS.py build -ch -compiler ${FCOMPILER} ${CUSTOM} -cflags "${FCOMPILERFLAGS} ${DEFINES}" ${COVERAGE} ${PROFILING} -dbld ${BINDIR} -s ${TESTDIR} -i ${LIBDIR} -libs ${LIBDIR}/${LIBOUT} -dmod ./ -dobj ./ -t ${THIS_TEST} -o ${THIS_TEST%.f90} -colors
     done
 else
     echo "Skip building the unit tests since \$JF_SKIP_TESTS has been set to 'true'."

src/tests/introspection/test_iso_10646_support.f90

@@ -0,0 +1,19 @@
+! This program is run when configuring the json-fortran build,
+! to determine whether or not ISO 10646/UCS4 characters are
+! supported by the compiler
+program test_iso_10646_support
+  use iso_fortran_env ,only: output_unit, error_unit
+  implicit none
+  integer, parameter :: UCS4_K = selected_char_kind('ISO_10646')
+
+  if ( UCS4_K == -1 ) then !Not supported!
+     write(error_unit,'(A)') 'Your compiler does not support ISO 10646/UCS4 characters!'
+     write(error_unit,'(A)') 'JSON-Fortran must/will be configured to use the "DEFAULT"'
+     write(error_unit,'(A)') 'character set. (Should be "ASCII" on a reasonable system.)'
+     stop 2
+  else
+     write(error_unit,'(A)') 'Congratulations! Your compiler supports ISO 10646/UCS4!'
+     write(error_unit,'(A)') 'JSON-Fortran may be configured to enable UCS4 support.'
+     write(output_unit,'(A)') 'UCS4_SUPPORTED'
+  end if
+end program test_iso_10646_support