Merge branch 'master' of https://github.com/jacobwilliams/json-fortran into coverage

Author: jacobwilliams

CMakeLists.txt

@@ -44,7 +44,12 @@ message ( STATUS "CMake build configuration for JSON-Fortran ${VERSION_MAJOR}.${
 #-------------------------------------
 # Collect source files for the library
 #-------------------------------------
-set ( JF_LIB_SRCS  src/json_module.F90 )
+set ( JF_LIB_SRCS  src/json_kinds.F90
+                   src/json_parameters.F90
+                   src/json_string_utilities.F90
+                   src/json_value_module.F90
+                   src/json_file_module.F90
+                   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")
 

json-fortran.md

@@ -20,9 +20,9 @@ display: public
          private
 source: true
 graph: true
+exclude_dir: tests
 extra_mods: iso_fortran_env:https://gcc.gnu.org/onlinedocs/gfortran/ISO_005fFORTRAN_005fENV.html
-md_extensions: markdown.extensions.toc(anchorlink=True)
-               markdown.extensions.smarty(smart_quotes=False)
+md_extensions: markdown.extensions.smarty(smart_quotes=False)
 ---
 
 --------------------

src/json_file_module.F90

@@ -241,7 +241,9 @@ end subroutine json_file_print_error_message
 !
 !@note: This does not destroy the data in the file.
 
-    subroutine initialize_json_core_in_file(me,verbose,compact_reals,print_signs,real_format,spaces_per_tab)
+    subroutine initialize_json_core_in_file(me,verbose,compact_reals,&
+                                            print_signs,real_format,spaces_per_tab,&
+                                            strict_type_checking)
 
     implicit none
 
@@ -251,8 +253,13 @@ subroutine initialize_json_core_in_file(me,verbose,compact_reals,print_signs,rea
     logical(LK),intent(in),optional :: print_signs   !! always print numeric sign (default is false)
     character(len=*,kind=CDK),intent(in),optional :: real_format !! Real number format: 'E' [default], '*', 'G', 'EN', or 'ES'
     integer,intent(in),optional :: spaces_per_tab !! number of spaces per tab for indenting (default is 2)
+    logical(LK),intent(in),optional :: strict_type_checking !! if true, no integer, double, or logical type
+                                                            !! conversions are done for the `get` routines
+                                                            !! (default is false)
 
-    call me%json%initialize(verbose,compact_reals,print_signs,real_format,spaces_per_tab)
+    call me%json%initialize(verbose,compact_reals,&
+                            print_signs,real_format,spaces_per_tab,&
+                            strict_type_checking)
 
     end subroutine initialize_json_core_in_file
 !*****************************************************************************************
@@ -264,7 +271,9 @@ end subroutine initialize_json_core_in_file
 !  Cast a [[json_value]] object as a [[json_file(type)]] object.
 !  It also calls the `initialize()` method.
 
-    function initialize_json_file(p,verbose,compact_reals,print_signs,real_format,spaces_per_tab) result(file_object)
+    function initialize_json_file(p,verbose,compact_reals,&
+                                  print_signs,real_format,spaces_per_tab,&
+                                  strict_type_checking) result(file_object)
 
     implicit none
 
@@ -276,8 +285,13 @@ function initialize_json_file(p,verbose,compact_reals,print_signs,real_format,sp
     logical(LK),intent(in),optional :: print_signs   !! always print numeric sign (default is false)
     character(len=*,kind=CDK),intent(in),optional :: real_format !! Real number format: 'E' [default], '*', 'G', 'EN', or 'ES'
     integer,intent(in),optional :: spaces_per_tab !! number of spaces per tab for indenting (default is 2)
+    logical(LK),intent(in),optional :: strict_type_checking !! if true, no integer, double, or logical type
+                                                            !! conversions are done for the `get` routines
+                                                            !! (default is false)
 
-    call file_object%initialize(verbose,compact_reals,print_signs,real_format,spaces_per_tab)
+    call file_object%initialize(verbose,compact_reals,&
+                                print_signs,real_format,spaces_per_tab,&
+                                strict_type_checking)
 
     if (present(p)) file_object%p => p
 

src/json_macros.inc

@@ -1,11 +1,9 @@
-!*****************************************************************************************
-!>
-!  JSON-Fortran preprocessor macros.
+! JSON-Fortran preprocessor macros.
 !
-!## 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.
+! 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.
 
 !*********************************************************
 ! File encoding preprocessor macro.

src/json_module.F90

@@ -4,17 +4,32 @@
 !
 !  A Fortran 2008 JSON (JavaScript Object Notation) API.
 !
-!  This module provides access to [[json_kinds]], [[json_value_module]] and
-!  [[json_file_module]].  Either one can be used separately, or all can be
-!  used by using this module.
+!  This module provides access to [[json_value_module]] and
+!  [[json_file_module]]. For normal JSON-Fortran use, using this module
+!  is all that is necessary.
+!
+!  Note that this module renames the kind definition variables from [[json_kinds]]
+!  from [`RK`, `IK`, `LK`, `CK`, and `CDK`] to [`json_RK`, `json_IK`, `json_LK`,
+!  `json_CK`, and `json_CDK`] so as to avoid namespace pollution with short
+!  variable names.
+!
+#ifdef USE_UCS4
+#pragma push_macro("USE_UCS4")
+#undef USE_UCS4
+!  Since ```USE_UCS4``` **is** defined, this module also exports the
+!  operators `==`, `/=`, and `//` from [[json_string_utilities]] for
+!  `CK` and `CDK` operations.
+#pragma pop_macro("USE_UCS4")
+#endif
 !
 !## 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.
 !
 !## History
-!  * Joseph A. Levin : March 2012 : Original FSON code [retrieved on 12/2/2013].
+!  * Joseph A. Levin : March 2012 : Original [FSON](https://github.com/josephalevin/fson)
+!    code [retrieved on 12/2/2013].
 !  * Jacob Williams : 2/8/2014 : Extensive modifications to the original FSON code.
 !    The original F95 code was split into four files:
 !    fson_path_m.f95, fson_string_m.f95, fson_value_m.f95, and fson.f95.
@@ -34,7 +49,16 @@
 
     module json_module
 
-    use json_kinds
+    use json_kinds, only: json_RK  => RK, &
+                          json_IK  => IK, &
+                          json_LK  => LK, &
+                          json_CK  => CK, &
+                          json_CDK => CDK
+#ifdef USE_UCS4
+    use json_string_utilities, only: operator(==),&
+                                     operator(//),&
+                                     operator(/=)
+#endif
     use json_value_module
     use json_file_module
 

src/json_parameters.F90

@@ -43,7 +43,8 @@ module json_parameters
     character(kind=CK,len=*),parameter :: backslash       = achar(92)
 
     character(kind=CDK,len=*),parameter,public :: default_real_fmt = '(ss,E26.16E4)'
-        !! default real number format statement
+        !! default real number format statement (for writing real values to strings and files).
+        !! Note that this can be overridden by calling [[json_initialize]].
 
     character(kind=CK,len=*),parameter,public :: star = '*' !! for invalid numbers and
                                                             !! list-directed real output
@@ -56,9 +57,9 @@ module json_parameters
 
     !These were parameters, but gfortran bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65141)
     !necessitates moving them here to be variables
-    character(kind=CK,len=4),protected :: null_str  = 'null'
-    character(kind=CK,len=4),protected :: true_str  = 'true'
-    character(kind=CK,len=5),protected :: false_str = 'false'
+    character(kind=CK,len=4),protected :: null_str  = 'null'  !! JSON Null variable string
+    character(kind=CK,len=4),protected :: true_str  = 'true'  !! JSON logical True string
+    character(kind=CK,len=5),protected :: false_str = 'false' !! JSON logical False string
 
     integer, private :: i_      !! just a counter for control_chars array
     character(kind=CK,len=*),dimension(32),parameter :: control_chars = &