fixed serialize/deserialize mixups

Author: jacobwilliams

src/json_file_module.F90

@@ -76,18 +76,30 @@ module json_file_module
 
         procedure,public :: get_core => get_json_core_in_file
 
+        !>
+        !  Load JSON from a file.
         procedure,public :: load => json_file_load
 
         !>
         !  The same as `load`, but only here for backward compatibility
         procedure,public :: load_file => json_file_load
 
-        generic,public :: serialize => MAYBEWRAP(json_file_load_from_string)
+        !>
+        !  Load JSON from a string.
+        generic,public :: deserialize => MAYBEWRAP(json_file_load_from_string)
 
         !>
-        !  The same as `serialize`, but only here for backward compatibility
+        !  The same as `deserialize`, but only here for backward compatibility
         generic,public :: load_from_string => MAYBEWRAP(json_file_load_from_string)
 
+        !>
+        !  Print the [[json_value]] structure to an allocatable string
+        procedure,public :: serialize => json_file_print_to_string
+
+        !>
+        !  The same as `serialize`, but only here for backward compatibility
+        procedure,public :: print_to_string => json_file_print_to_string
+
         procedure,public :: destroy => json_file_destroy
         procedure,public :: nullify => json_file_nullify
         procedure,public :: move    => json_file_move_pointer
@@ -100,14 +112,6 @@ module json_file_module
         procedure,public :: check_for_errors => json_file_check_for_errors
         procedure,public :: clear_exceptions => json_file_clear_exceptions
 
-        !>
-        !  Print the [[json_value]] structure to an allocatable string
-        procedure,public :: deserialize => json_file_print_to_string
-
-        !>
-        !  The same as `deserialize`, but only here for backward compatibility
-        procedure,public :: print_to_string => json_file_print_to_string
-
         generic,public :: print => json_file_print_to_console, &
                                    json_file_print_to_unit, &
                                    json_file_print_to_filename
@@ -641,7 +645,7 @@ function initialize_json_file_from_string(str,&
     call file_object%initialize(&
 #include "json_initialize_dummy_arguments.inc"
                                )
-    call file_object%serialize(str)
+    call file_object%deserialize(str)
 
     end function initialize_json_file_from_string
 !*****************************************************************************************
@@ -685,7 +689,7 @@ function initialize_json_file_from_string_v2(str, json_core_object) &
     type(json_core),intent(in)          :: json_core_object
 
     file_object%core = json_core_object
-    call file_object%serialize(str)
+    call file_object%deserialize(str)
 
     end function initialize_json_file_from_string_v2
 !*****************************************************************************************
@@ -857,7 +861,7 @@ end subroutine json_file_load
 !  Load JSON from a string:
 !```fortran
 !     type(json_file) :: f
-!     call f%serialize('{ "name": "Leonidas" }')
+!     call f%deserialize('{ "name": "Leonidas" }')
 !```
 
     subroutine json_file_load_from_string(me, str)
@@ -867,7 +871,7 @@ subroutine json_file_load_from_string(me, str)
     class(json_file),intent(inout)      :: me
     character(kind=CK,len=*),intent(in) :: str  !! string to load JSON data from
 
-    call me%core%serialize(me%p, str)
+    call me%core%deserialize(me%p, str)
 
     end subroutine json_file_load_from_string
 !*****************************************************************************************
@@ -883,7 +887,7 @@ subroutine wrap_json_file_load_from_string(me, str)
     class(json_file),intent(inout)       :: me
     character(kind=CDK,len=*),intent(in) :: str
 
-    call me%serialize(to_unicode(str))
+    call me%deserialize(to_unicode(str))
 
     end subroutine wrap_json_file_load_from_string
 !*****************************************************************************************
@@ -970,7 +974,7 @@ end subroutine json_file_print_to_filename
 !     type(json_file) :: f
 !     character(kind=CK,len=:),allocatable :: str
 !     call f%load('my_file.json')
-!     call f%deserialize(str)
+!     call f%serialize(str)
 !```
 
     subroutine json_file_print_to_string(me,str)
@@ -980,7 +984,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 me%core%deserialize(me%p,str)
+    call me%core%serialize(me%p,str)
 
     end subroutine json_file_print_to_string
 !*****************************************************************************************

src/json_value_module.F90

@@ -562,14 +562,6 @@ module json_value_module
         procedure,private :: json_get_by_path_rfc6901
         procedure,private :: json_get_by_path_jsonpath_bracket
 
-        !>
-        !  Print the [[json_value]] structure to an allocatable string
-        procedure,public :: deserialize => json_value_to_string
-
-        !>
-        !  The same as `deserialize`, but only here for backward compatibility
-        procedure,public :: print_to_string => json_value_to_string
-
         !>
         !  Print the [[json_value]] to an output unit or file.
         !
@@ -764,13 +756,21 @@ module json_value_module
         generic,public :: load => json_parse_file
         procedure :: json_parse_file
 
+        !>
+        !  Print the [[json_value]] structure to an allocatable string
+        procedure,public :: serialize => json_value_to_string
+
+        !>
+        !  The same as `serialize`, but only here for backward compatibility
+        procedure,public :: print_to_string => json_value_to_string
+
         !>
         !  Parse the JSON string and populate the [[json_value]] tree.
-        generic,public :: serialize => MAYBEWRAP(json_parse_string)
+        generic,public :: deserialize => MAYBEWRAP(json_parse_string)
         procedure :: MAYBEWRAP(json_parse_string)
 
         !>
-        !  Same as `load` and `serialize` but only here for backward compatibility.
+        !  Same as `load` and `deserialize` but only here for backward compatibility.
         generic,public :: parse => json_parse_file, &
                                    MAYBEWRAP(json_parse_string)
 
@@ -9823,7 +9823,7 @@ subroutine wrap_json_parse_string(json, p, str)
     type(json_value),pointer             :: p     !! output structure
     character(kind=CDK,len=*),intent(in) :: str   !! string with JSON data
 
-    call json%serialize(p,to_unicode(str))
+    call json%deserialize(p,to_unicode(str))
 
     end subroutine wrap_json_parse_string
 !*****************************************************************************************

src/tests/jf_test_06.F90

@@ -62,7 +62,7 @@ subroutine test_6(error_cnt)
         if (files(i)=='') then
             write(error_unit,'(A)') 'load string: '//invalid_str
             write(error_unit,'(A)') ''
-            call json%serialize(str = invalid_str)
+            call json%deserialize(str = invalid_str)
         else
             write(error_unit,'(A)') 'load file: '//trim(files(i))
             write(error_unit,'(A)') ''

src/tests/jf_test_08.F90

@@ -57,7 +57,7 @@ subroutine test_8(error_cnt)
     write(error_unit,'(A)') ' Valid test 1:'
     write(error_unit,'(A)') '**************'
     write(error_unit,'(A)') ''
-    call json%load(str=str, p=p)   ! read it from str
+    call json%deserialize(str=str, p=p)   ! read it from str
     if (json%failed()) then
         call json%print_error_message(error_unit)
         error_cnt = error_cnt + 1
@@ -80,7 +80,7 @@ subroutine test_8(error_cnt)
     write(error_unit,'(A)') ' Valid test 2:'
     write(error_unit,'(A)') '**************'
     write(error_unit,'(A)') ''
-    call json%load(str=str2, p=p)   ! read it from str
+    call json%deserialize(str=str2, p=p)   ! read it from str
     if (json%failed()) then
         call json%print_error_message(error_unit)
         error_cnt = error_cnt + 1
@@ -103,7 +103,7 @@ subroutine test_8(error_cnt)
     write(error_unit,'(A)') ' Invalid test:'
     write(error_unit,'(A)') '**************'
     write(error_unit,'(A)') ''
-    call json%load(str=str_invalid, p=p)   ! read it from str
+    call json%deserialize(str=str_invalid, p=p)   ! read it from str
     if (json%failed()) then
         call json%print_error_message(error_unit)
     else

src/tests/jf_test_09.F90

@@ -80,15 +80,15 @@ subroutine test_9(error_cnt)
     write(error_unit,'(A)') '================================='
 
     write(error_unit,'(A)') ''
-    write(error_unit,'(A)') '  Load a file using json_file%serialize'
+    write(error_unit,'(A)') '  Load a file using json_file%deserialize'
     write(error_unit,'(A)') ''
     write(error_unit,'(A)') 'Loading file: '//trim(filename)
 
     call cpu_time(tstart)
     call read_file(dir//filename, str)
 
     if (allocated(str)) then
-        call f%serialize(str)
+        call f%deserialize(str)
         call cpu_time(tend)
         write(error_unit,'(A,1X,F10.3,1X,A)') 'Elapsed time to parse: ',tend-tstart,' sec'
         if (f%failed()) then

src/tests/jf_test_10.F90

@@ -74,7 +74,7 @@ subroutine test_10(error_cnt)
     end if
 
     write(error_unit,'(A)') 'json_file_load_from_string...'
-    call f%serialize(json_str)
+    call f%deserialize(json_str)
     if (f%failed()) then
         call f%print_error_message(error_unit)
         error_cnt = error_cnt + 1
@@ -83,7 +83,7 @@ subroutine test_10(error_cnt)
     end if
 
     write(error_unit,'(A)') 'json_file_print_to_string...'
-    call f%deserialize(str)
+    call f%serialize(str)
     if (f%failed()) then
         call f%print_error_message(error_unit)
         error_cnt = error_cnt + 1

src/tests/jf_test_11.F90

@@ -115,7 +115,7 @@ subroutine test_11(error_cnt)
         end if
 
         write(error_unit,'(A)') ''
-        call json%deserialize(cval)
+        call json%serialize(cval)
         if (json%failed()) then
            call json%print_error_message(error_unit)
            error_cnt = error_cnt + 1

src/tests/jf_test_13.F90

@@ -43,12 +43,12 @@ subroutine test_13(error_cnt)
 
         call my_file%initialize(real_format=trim(fmts(i)))
 
-        call my_file%serialize('{ "value": 1234.56789 }')
+        call my_file%deserialize('{ "value": 1234.56789 }')
         if (my_file%failed()) then
             call my_file%print_error_message(error_unit)
             error_cnt = error_cnt + 1
         end if
-        call my_file%deserialize(str)
+        call my_file%serialize(str)
         if (my_file%failed()) then
             call my_file%print_error_message(error_unit)
             error_cnt = error_cnt + 1

src/tests/jf_test_15.F90

@@ -45,7 +45,7 @@ subroutine test_15(error_cnt)
     nullify(p2)
     nullify(p)
 
-    call json%load(p2, '{"int": 1, "real": 2.0, "logical": true}')
+    call json%deserialize(p2, '{"int": 1, "real": 2.0, "logical": true}')
     call json%get(p2,'real',   i)
     call json%get(p2,'logical',i)
     call json%get(p2,'integer',d)

src/tests/jf_test_16.F90

@@ -38,7 +38,7 @@ subroutine test_16(error_cnt)
 
     write(error_unit,'(A)') ''
     write(error_unit,'(A)') 'Original:'
-    call json%load(p, '{"cities": ["New York","Los Angeles","Chicago"], '//&
+    call json%deserialize(p, '{"cities": ["New York","Los Angeles","Chicago"], '//&
                        '"value": 1, "iflag": true, "struct":{"vec":[1,2,3]}}')
     if (json%failed()) then
         call json%print_error_message(error_unit)
@@ -94,10 +94,10 @@ subroutine test_16(error_cnt)
     write(error_unit,'(A)') '.....................................'
     write(error_unit,'(A)') ''
     write(error_unit,'(A)') 'Original:'
-    call json%load(p, '{ "stats": { "iflag": 0, "str": "ok" },'//&
-                        '"vars": [{ "label": "r", "value": 0.0 }, '//&
-                                 '{ "label": "v", "value": 0.0 }],'//&
-                        '"empty": { } }')
+    call json%deserialize(p, '{ "stats": { "iflag": 0, "str": "ok" },'//&
+                             '"vars": [{ "label": "r", "value": 0.0 }, '//&
+                                      '{ "label": "v", "value": 0.0 }],'//&
+                             '"empty": { } }')
     if (json%failed()) then
         call json%print_error_message(error_unit)
         error_cnt = error_cnt + 1
@@ -144,7 +144,7 @@ subroutine test_16(error_cnt)
     write(error_unit,'(A)') '.....................................'
     write(error_unit,'(A)') ''
     write(error_unit,'(A)') 'Original:'
-    call json%load(p, '{ "color": "red", "width": 10, "height": 2 }')
+    call json%deserialize(p, '{ "color": "red", "width": 10, "height": 2 }')
     if (json%failed()) then
         call json%print_error_message(error_unit)
         error_cnt = error_cnt + 1
@@ -169,7 +169,7 @@ subroutine test_16(error_cnt)
     write(error_unit,'(A)') '.....................................'
     write(error_unit,'(A)') ''
     write(error_unit,'(A)') 'Original:'
-    call json%load(p, '{ "color": "red", "width": 10, "height": 2 }')
+    call json%deserialize(p, '{ "color": "red", "width": 10, "height": 2 }')
     if (json%failed()) then
         call json%print_error_message(error_unit)
         error_cnt = error_cnt + 1
@@ -194,7 +194,7 @@ subroutine test_16(error_cnt)
     write(error_unit,'(A)') '.....................................'
     write(error_unit,'(A)') ''
     write(error_unit,'(A)') 'Original:'
-    call json%load(p, '{ "color": "red", "width": 10, "height": 2 }')
+    call json%deserialize(p, '{ "color": "red", "width": 10, "height": 2 }')
     if (json%failed()) then
         call json%print_error_message(error_unit)
         error_cnt = error_cnt + 1