Merge pull request #239 from jacobwilliams/specify-kinds

added support in the code for specifying the real and integer kinds

Author: jacobwilliams

build.sh

@@ -11,7 +11,8 @@
 #    build.sh [--compiler {intel|gnu|<other>}] [--cflags '<custom compiler flags here>']
 #             [--coverage [{yes|no}]] [--profile [{yes|no}]] [--skip-tests [{yes|no}]]
 #             [--skip-documentation [{yes|no}]] [--enable-unicode [{yes|no}]] [--help]
-#             [--clean]
+#             [--clean] [--real-kind [{REAL32\REAL64\REAL128}]]
+#             [--int-kind [{INT8\INT16\INT32\INT64}]]
 #
 #    By default, if invoked without any flags, this build script will build the
 #    JSON-Fortran library using gfortran,
@@ -22,6 +23,8 @@
 #        with :
 #            unit tests enabled
 #            documentation (if FORD is installed)
+#            real(REAL64) kinds
+#            integer(INT32) kinds
 #
 #     More recent (right-most) flags will override preceding flags
 #     flags:
@@ -146,6 +149,18 @@ 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
         ;;
+    --real-kind)
+        REAL_KIND="-D$2"
+        # warning: not checking for valid input
+        # should be one of: REAL32, REAL64 [default], REAL128
+        shift
+        ;;
+    --int-kind)
+        INT_KIND="-D$2"
+        # warning: not checking for valid input
+        # should be one of: INT8, INT16, INT32 [default], INT64
+        shift
+        ;;
     --enable-unicode)
         case $2 in
         yes|Yes|YES)
@@ -178,7 +193,7 @@ while [ "$#" -ge "1" ]; do # Get command line arguments while there are more lef
             ;;
         esac
         ;;
-    --profile) #nable profiling
+    --profile) #enable profiling
         case $2 in
         yes|Yes|YES)
             CODE_PROFILE="yes"
@@ -272,7 +287,7 @@ fi
 echo ""
 echo "Building library..."
 
-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
+FoBiS.py build -ch -compiler ${FCOMPILER} "${CUSTOM[@]}" -cflags "${FCOMPILERFLAGS} ${DEFINES} ${REAL_KIND} ${INT_KIND}" ${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

src/json_kinds.F90

@@ -4,7 +4,7 @@
 !
 !  JSON-Fortran kind definitions.
 !
-!## License
+!### License
 !  * JSON-Fortran is released under a BSD-style license.
 !    See the [LICENSE](https://github.com/jacobwilliams/json-fortran/blob/master/LICENSE)
 !    file for details.
@@ -34,24 +34,66 @@
 !      character arguments of the default (```CDK```) kind. If you find a procedure which does
 !      not accept an ```intent(in)``` literal string argument of default kind, please
 !      [file an issue](https://github.com/jacobwilliams/json-fortran/issues/new) on GitHub.
+!
+!@note The default real kind (`RK`) and the default integer kind (`IK`) can be
+!      changed using optional preprocessor flags. This library was built with kinds:
+#ifdef REAL32
+!      real(kind=real32) [4 bytes]
+#elif REAL64
+!      real(kind=real64) [8 bytes]
+#elif REAL128
+!      real(kind=real128) [16 bytes]
+#else
+!      real(kind=real64) [8 bytes]
+#endif
+!      and
+#ifdef INT8
+!      integer(kind=int8) [1 byte]
+#elif INT16
+!      integer(kind=int16) [2 bytes]
+#elif INT32
+!      integer(kind=int32) [4 bytes]
+#elif INT64
+!      integer(kind=int64) [8 bytes]
+#else
+!      integer(kind=int32) [4 bytes]
+#endif
+!      .
 
     module json_kinds
 
-    use,intrinsic :: iso_fortran_env, only: real64,int32,logical_kinds
+    use,intrinsic :: iso_fortran_env
 
     implicit none
 
     private
 
-    integer,parameter,public :: RK = real64  !! Default real kind [8 bytes]
+#ifdef REAL32
+    integer,parameter,public :: RK = real32   !! Default real kind [4 bytes]
+#elif REAL64
+    integer,parameter,public :: RK = real64   !! Default real kind [8 bytes]
+#elif REAL128
+    integer,parameter,public :: RK = real128  !! Default real kind [16 bytes]
+#else
+    integer,parameter,public :: RK = real64   !! Default real kind if not specified [8 bytes]
+#endif
 
-    integer,parameter,public :: IK = int32   !! Default integer kind [4 bytes].
+#ifdef INT8
+    integer,parameter,public :: IK = int8     !! Default integer kind [1 byte]
+#elif INT16
+    integer,parameter,public :: IK = int16    !! Default integer kind [2 bytes]
+#elif INT32
+    integer,parameter,public :: IK = int32    !! Default integer kind [4 bytes]
+#elif INT64
+    integer,parameter,public :: IK = int64    !! Default integer kind [8 bytes]
+#else
+    integer,parameter,public :: IK = int32    !! Default integer kind if not specified [4 bytes]
+#endif
 
     !*********************************************************
     !>
     !  Processor dependendant 'DEFAULT' character kind.
     !  This is 1 byte for the Intel and Gfortran compilers.
-
     integer,parameter,public :: CDK = selected_char_kind('DEFAULT')
     !*********************************************************
 
@@ -62,14 +104,12 @@ module json_kinds
     !  (and perhaps others).
     !  The declaration ensures a valid kind
     !  if the compiler doesn't have a logical_kinds(3).
-    !
     integer,parameter,public :: LK = logical_kinds(min(3,size(logical_kinds)))
     !*********************************************************
 
     !*********************************************************
     !>
     !  String kind preprocessor macro.
-    !
 #if defined __GFORTRAN__ && defined USE_UCS4
     ! gfortran compiler AND UCS4 support requested:
     character(kind=CDK,len=*),parameter :: json_fortran_string_kind = 'ISO_10646'