Merge pull request #465 from jacobwilliams/unicode-assignment

added unicode support for assignment

Author: jacobwilliams

src/json_file_module.F90

@@ -246,10 +246,10 @@ module json_file_module
 
         generic,public :: assignment(=) => assign_json_file,&
                                            assign_json_file_to_string,&
-                                           assign_string_to_json_file
+                                           MAYBEWRAP(assign_string_to_json_file)
         procedure :: assign_json_file
         procedure,pass(me) :: assign_json_file_to_string
-        procedure :: assign_string_to_json_file
+        procedure :: MAYBEWRAP(assign_string_to_json_file)
 
         ! ***************************************************
         ! private routines
@@ -1167,7 +1167,7 @@ subroutine assign_json_file_to_string(str,me)
     type(json_core) :: core_copy !! a copy of `core` from `me`
 
     if (me%core%failed() .or. .not. associated(me%p)) then
-        str = ''
+        str = CK_''
     else
 
         ! This is sort of a hack. Since `me` has to have `intent(in)`
@@ -1179,7 +1179,7 @@ subroutine assign_json_file_to_string(str,me)
         core_copy = me%core ! copy the parser settings
 
         call core_copy%serialize(me%p,str)
-        if (me%core%failed()) str = ''
+        if (me%core%failed()) str = CK_''
 
     end if
 
@@ -1206,6 +1206,23 @@ subroutine assign_string_to_json_file(me,str)
     end subroutine assign_string_to_json_file
 !*****************************************************************************************
 
+!*****************************************************************************************
+!> author: Jacob Williams
+!
+!  Alternate version of [[assign_string_to_json_file]], where "str" is kind=CDK.
+
+    subroutine wrap_assign_string_to_json_file(me,str)
+
+    implicit none
+
+    class(json_file),intent(inout) :: me
+    character(kind=CDK,len=*),intent(in) :: str
+
+    call me%assign_string_to_json_file(to_unicode(str))
+
+    end subroutine wrap_assign_string_to_json_file
+!*****************************************************************************************
+
 !*****************************************************************************************
 !> author: Jacob Williams
 !

src/tests/jf_test_46.F90

@@ -259,7 +259,7 @@ subroutine test_46(error_cnt)
     end if
 
     ! now, we try them when an exception is active:
-    json_f = CK_'{"x": 1.0e.2.1}'  ! this will raise an exception
+    json_f = '{"x": 1.0e.2.1}'  ! this will raise an exception
     if (.not. json_f%failed()) then
         write(error_unit,'(A)') 'Error in json_file = string assignment operator : '//&
                                 'should have raised an exception'