Calls to initialize() are now optional. If not called, a default real format statement is used. Fixes #171.

Documentation updates.

Author: jacobwilliams

src/json_module.F90

@@ -4,8 +4,9 @@
 !
 !  A Fortran 2008 JSON (JavaScript Object Notation) API.
 !
-!  This module provides access to the [[json_value_module]] and [[json_file_module]],
-!  Either one can be used separately, or both can be used by using this module.
+!  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.
 !
 !## License
 !  * JSON-Fortran is released under a BSD-style license.
@@ -33,9 +34,9 @@
 
     module json_module
 
+    use json_kinds
     use json_value_module
     use json_file_module
-    use json_string_utilities
 
     implicit none
 

src/json_parameters.F90

@@ -42,9 +42,18 @@ module json_parameters
     character(kind=CK,len=*),parameter :: slash           = achar(47)
     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
+
     character(kind=CK,len=*),parameter,public :: star = '*' !! for invalid numbers and
                                                             !! list-directed real output
 
+    !these are default character kind:
+    character(kind=CDK,len=*),parameter,public :: upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        !! uppercase characters
+    character(kind=CDK,len=*),parameter,public :: lower = 'abcdefghijklmnopqrstuvwxyz'
+        !! lowercase characters
+
     !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'

src/json_string_utilities.F90

@@ -54,6 +54,7 @@ module json_string_utilities
     public :: valid_json_hex
     public :: to_unicode
     public :: escape_string
+    public :: lowercase_character
 
     contains
 !*****************************************************************************************
@@ -306,7 +307,8 @@ pure function valid_json_hex(str) result(valid)
     logical(LK)                         :: valid  !! is str a value 4-digit hex string
     character(kind=CK,len=*),intent(in) :: str    !! the string to check.
 
-    integer(IK) :: n,i
+    integer(IK) :: n  !! length of `str`
+    integer(IK) :: i  !! counter
 
     !an array of the valid hex characters:
     character(kind=CK,len=1),dimension(22),parameter :: valid_chars = &
@@ -437,5 +439,24 @@ function default_comp_ucs4(def_str,ucs4_str) result(res)
     end function default_comp_ucs4
 !*****************************************************************************************
 
+!*****************************************************************************************
+!>
+!  Return the lowercase version of the character.
+
+    pure function lowercase_character(c) result(c_lower)
+
+    implicit none
+
+    character(kind=CDK,len=1),intent(in) :: c
+    character(kind=CDK,len=1)            :: c_lower
+
+    integer :: i  !! index in array
+
+    i = index(upper,c)
+    c_lower = merge(lower(i:i),c,i>0)
+
+    end function lowercase_character
+!*****************************************************************************************
+
     end module json_string_utilities
 !*****************************************************************************************