updates for new multiple-file version.

Author: jacobwilliams

src/json_file_module.F90

@@ -7,9 +7,9 @@
     module json_file_module
 
     use,intrinsic :: iso_fortran_env
-    use json_value_module
     use json_kinds
     use json_string_utilities
+    use json_value_module
 
     implicit none
 
@@ -179,7 +179,7 @@ subroutine json_file_destroy(me)
 
     class(json_file),intent(inout) :: me
 
-    if (associated(me%p)) call json_value_destroy(me%p)
+    if (associated(me%p)) call json_destroy(me%p)
 
     end subroutine json_file_destroy
 !*****************************************************************************************
@@ -298,9 +298,10 @@ subroutine json_file_print_to_console(me)
 
     class(json_file),intent(inout)  :: me
 
-    character(kind=CK,len=:),allocatable :: dummy
+    !character(kind=CK,len=:),allocatable :: dummy
 
-    call json_value_print(me%p,iunit=output_unit,str=dummy,indent=1,colon=.true.)
+    !call json_value_print(me%p,iunit=output_unit,str=dummy,indent=1,colon=.true.)
+    call json_print(me%p,iunit=output_unit)
 
     end subroutine json_file_print_to_console
 !*****************************************************************************************
@@ -318,12 +319,13 @@ subroutine json_file_print_1(me, iunit)
     class(json_file),intent(inout)  :: me
     integer(IK),intent(in)          :: iunit  !! file unit number (must not be -1)
 
-    integer(IK) :: i
-    character(kind=CK,len=:),allocatable :: dummy
+    !integer(IK) :: i
+    !character(kind=CK,len=:),allocatable :: dummy
 
     if (iunit/=unit2str) then
-        i = iunit
-        call json_value_print(me%p,iunit=i,str=dummy,indent=1,colon=.true.)
+        !i = iunit
+        !call json_value_print(me%p,iunit=i,str=dummy,indent=1,colon=.true.)
+        call json_print(me%p,iunit=iunit)
     else
         call throw_exception('Error in json_file_print_1: iunit must not be -1.')
     end if
@@ -358,6 +360,8 @@ subroutine json_file_print_2(me,filename)
 
     integer(IK) :: iunit,istat
 
+    !...note: why not just call [[json_print_2]] here?
+
     open(newunit=iunit,file=filename,status='REPLACE',iostat=istat FILE_ENCODING )
     if (istat==0) then
         call me%print_file(iunit)    !call the other routine
@@ -393,7 +397,7 @@ subroutine json_file_print_to_string(me,str)
     class(json_file),intent(inout)                   :: me
     character(kind=CK,len=:),allocatable,intent(out) :: str  !! string to print JSON data to
 
-    call json_value_to_string(me%p,str)
+    call json_print_to_string(me%p,str)
 
     end subroutine json_file_print_to_string
 !*****************************************************************************************

src/json_kinds.F90

@@ -1,5 +1,7 @@
 !*****************************************************************************************
-!>
+!> author: Jacob Williams
+!  license: BSD
+!
 !  JSON-Fortran kind definitions.
 !
 !@note ```-DUSE_UCS4``` is an optional preprocessor flag.

src/json_string_utilities.F90

@@ -1,6 +1,9 @@
 !*****************************************************************************************
-!>
+!> author: Jacob Williams
+!  license: BSD
+!
 !  JSON-Fortran support module for string manipulation.
+!  This is a low-level module not meant to be used by a JSON-Fortran user.
 
     module json_string_utilities
 

src/json_value_module.F90

@@ -579,7 +579,8 @@ end subroutine traverse_callback_func
     public :: json_print_error_message   !
 
     !... so it can be used in json_file_module ...
-    public :: json_value_print
+    !public :: json_value_print
+    public :: throw_exception
 
     character(kind=CDK,len=*),parameter,public :: json_ext = '.json'   !! JSON file extension
 
@@ -770,11 +771,10 @@ recursive subroutine json_value_clone_func(from,to,parent,previous,next,children
     end subroutine json_value_clone_func
 !*****************************************************************************************
 
-
 !*****************************************************************************************
 !> author: Jacob Williams
 !
-!  Destroy the data within a [[json_value]], and rest type to `json_unknown`.
+!  Destroy the data within a [[json_value]], and reset type to `json_unknown`.
 
     subroutine destroy_json_data(d)
 

src/tests/jf_test_1.f90

@@ -7,6 +7,7 @@
 
 module jf_test_1_mod
 
+    use json_kinds
     use json_module
     use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
 
@@ -249,13 +250,13 @@ end module jf_test_1_mod
 program jf_test_1
 
     !! First unit test.
-    
+
     use jf_test_1_mod , only: test_1
     implicit none
     integer :: n_errors
     n_errors = 0
     call test_1(n_errors)
     if (n_errors /= 0) stop 1
-    
+
 end program jf_test_1
-!*****************************************************************************************
+!*****************************************************************************************

src/tests/jf_test_10.f90

@@ -6,6 +6,7 @@
 
 module jf_test_10_mod
 
+    use json_kinds
     use json_module
     use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
 

src/tests/jf_test_11.F90

@@ -6,6 +6,7 @@
 
 module jf_test_11_mod
 
+    use json_kinds
     use json_module
     use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
 
@@ -283,12 +284,12 @@ end module jf_test_11_mod
 program jf_test_11
 
     !! 11th unit test.
-    
+
     use jf_test_11_mod , only: test_11
     implicit none
     integer :: n_errors
     n_errors = 0
     call test_11(n_errors)
     if (n_errors /= 0) stop 1
 end program jf_test_11
-!*****************************************************************************************
+!*****************************************************************************************

src/tests/jf_test_12.f90

@@ -6,6 +6,7 @@
 
 module jf_test_12_mod
 
+    use json_kinds
     use json_module
     use, intrinsic :: iso_fortran_env , only: error_unit, output_unit, wp => real64
 
@@ -18,13 +19,13 @@ module jf_test_12_mod
 contains
 
     subroutine test_12(error_cnt)
-    
+
     implicit none
 
     integer,intent(out) :: error_cnt !! report number of errors to caller
 
     integer,parameter :: imx = 5, jmx = 3, kmx = 4 !! dimensions for raw work array of primitive type
-    
+
     integer,dimension(3)                  :: shape             !! shape of work array
     integer, dimension(:), allocatable    :: fetched_shape     !! retrieved shape
     type(json_value), pointer             :: root, meta_array  !! json nodes to work with
@@ -171,7 +172,7 @@ subroutine test_12(error_cnt)
     close(lun)
 
     contains
-    
+
       subroutine check_errors(assertion)
         logical, optional, intent(in) :: assertion
         if (json_failed()) then
@@ -206,13 +207,13 @@ end module jf_test_12_mod
 program jf_test_12
 
     !! 12th unit test.
-    
+
     use jf_test_12_mod, only: test_12
     implicit none
     integer :: n_errors
     n_errors = 0
     call test_12(n_errors)
     if ( n_errors /= 0) stop 1
-    
+
 end program jf_test_12
 !*****************************************************************************************

src/tests/jf_test_13.f90

@@ -6,6 +6,7 @@
 
 module jf_test_13_mod
 
+    use json_kinds
     use json_module
     use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
 
@@ -14,17 +15,17 @@ module jf_test_13_mod
 contains
 
     subroutine test_13(error_cnt)
-    
+
     !! Tests different real format strings using repeated calls to [[json_initialize]].
-    
+
     implicit none
 
     integer,intent(out) :: error_cnt !! report number of errors to caller
-    
+
     type(json_file)  :: my_file
     character(kind=CK,len=:),allocatable :: str
     integer :: i
-    
+
     character(len=2),dimension(5),parameter :: fmts=['g ','e ','en','es','* ']
         !! format statements to test
 
@@ -35,11 +36,11 @@ subroutine test_13(error_cnt)
     write(error_unit,'(A)') ''
 
     error_cnt = 0
-    
+
     do i=1,size(fmts)
-    
+
         call json_initialize(real_format=trim(fmts(i)))
-    
+
         call my_file%load_from_string('{ "value": 1234.56789 }')
         if (json_failed()) then
             call json_print_error_message(error_unit)
@@ -52,11 +53,11 @@ subroutine test_13(error_cnt)
         else
             write(output_unit,'(A)') str
         end if
-    
+
         call my_file%destroy()
-    
+
     end do
-    
+
     end subroutine test_13
 
 end module jf_test_13_mod
@@ -66,12 +67,12 @@ end module jf_test_13_mod
 program jf_test_13
 
     !! 13th unit test.
-    
+
     use jf_test_13_mod, only: test_13
     implicit none
     integer :: n_errors
     call test_13(n_errors)
     if ( n_errors /= 0) stop 1
-    
+
 end program jf_test_13
 !*****************************************************************************************