Merge pull request #192 from jacobwilliams/name-search

Name searching options

Author: jacobwilliams

src/json_file_module.F90

@@ -255,23 +255,31 @@ end subroutine json_file_print_error_message
 
     subroutine initialize_json_core_in_file(me,verbose,compact_reals,&
                                             print_signs,real_format,spaces_per_tab,&
-                                            strict_type_checking)
+                                            strict_type_checking,&
+                                            trailing_spaces_significant,&
+                                            case_sensitive_keys)
 
     implicit none
 
     class(json_file),intent(inout) :: me
     logical(LK),intent(in),optional :: verbose       !! mainly useful for debugging (default is false)
     logical(LK),intent(in),optional :: compact_reals !! to compact the real number strings for output (default is true)
     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)
+    character(kind=CDK,len=*),intent(in),optional :: real_format !! Real number format: 'E' [default], '*', 'G', 'EN', or 'ES'
+    integer(IK),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)
+    logical(LK),intent(in),optional :: trailing_spaces_significant  !! for name and path comparisons, is trailing
+                                                                    !! space to be considered significant.
+    logical(LK),intent(in),optional :: case_sensitive_keys  !! for name and path comparisons, are they
+                                                            !! case sensitive.
 
     call me%json%initialize(verbose,compact_reals,&
                             print_signs,real_format,spaces_per_tab,&
-                            strict_type_checking)
+                            strict_type_checking,&
+                            trailing_spaces_significant,&
+                            case_sensitive_keys)
 
     end subroutine initialize_json_core_in_file
 !*****************************************************************************************
@@ -289,7 +297,9 @@ end subroutine initialize_json_core_in_file
 
     function initialize_json_file(p,verbose,compact_reals,&
                                   print_signs,real_format,spaces_per_tab,&
-                                  strict_type_checking) result(file_object)
+                                  strict_type_checking,&
+                                  trailing_spaces_significant,&
+                                  case_sensitive_keys) result(file_object)
 
     implicit none
 
@@ -299,15 +309,21 @@ function initialize_json_file(p,verbose,compact_reals,&
     logical(LK),intent(in),optional :: verbose       !! mainly useful for debugging (default is false)
     logical(LK),intent(in),optional :: compact_reals !! to compact the real number strings for output (default is true)
     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)
+    character(kind=CDK,len=*),intent(in),optional :: real_format !! Real number format: 'E' [default], '*', 'G', 'EN', or 'ES'
+    integer(IK),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)
+    logical(LK),intent(in),optional :: trailing_spaces_significant  !! for name and path comparisons, is trailing
+                                                                    !! space to be considered significant.
+    logical(LK),intent(in),optional :: case_sensitive_keys  !! for name and path comparisons, are they
+                                                            !! case sensitive.
 
     call file_object%initialize(verbose,compact_reals,&
                                 print_signs,real_format,spaces_per_tab,&
-                                strict_type_checking)
+                                strict_type_checking,&
+                                trailing_spaces_significant,&
+                                case_sensitive_keys)
 
     if (present(p)) file_object%p => p
 

src/json_parameters.F90

@@ -49,26 +49,34 @@ module json_parameters
     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
+#if defined __GFORTRAN__
+    !not parameters due to gfortran bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65141)
+    character(kind=CK,len=26),protected :: upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' !! uppercase characters
+    character(kind=CK,len=26),protected :: lower = 'abcdefghijklmnopqrstuvwxyz' !! lowercase characters
+#else
+    character(kind=CK,len=*),parameter,public :: upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' !! uppercase characters
+    character(kind=CK,len=*),parameter,public :: lower = 'abcdefghijklmnopqrstuvwxyz' !! lowercase characters
+#endif
+
+#if defined __GFORTRAN__
+    !not parameters due to gfortran bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65141)
     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
+#else
+    character(kind=CK,len=*),parameter,public :: null_str  = 'null'  !! JSON Null variable string
+    character(kind=CK,len=*),parameter,public :: true_str  = 'true'  !! JSON logical True string
+    character(kind=CK,len=*),parameter,public :: false_str = 'false' !! JSON logical False string
+#endif
 
-    integer, private :: i_      !! just a counter for control_chars array
+    integer, private :: i_      !! just a counter for `control_chars` array
     character(kind=CK,len=*),dimension(32),parameter :: control_chars = &
         [(achar(i_),i_=1,31), achar(127)] !! Control characters, possibly in unicode
 
     !find out the precision of the floating point number system
     !and set safety factors
-    integer(IK),parameter :: rp_safety_factor = 1
-    integer(IK),parameter :: rp_addl_safety = 1
+    integer(IK),parameter :: rp_safety_factor = 1_IK
+    integer(IK),parameter :: rp_addl_safety = 1_IK
     integer(IK),parameter :: real_precision = rp_safety_factor*precision(1.0_RK) + &
                                               rp_addl_safety
 
@@ -83,14 +91,14 @@ module json_parameters
         !! 6 = sign + leading 0 + decimal + 'E' + exponent sign + 1 extra
     character(kind=CDK,len=*),parameter :: int_fmt  = '(ss,I0)' !! minimum width format for integers
 
-    integer(IK),parameter :: chunk_size = 100  !! for allocatable strings: allocate chunks of this size
-    integer(IK),parameter :: unit2str = -1  !! unit number to cause stuff to be
-                                            !! output to strings rather than files.
-                                            !! See 9.5.6.12 in the F2003/08 standard
+    integer(IK),parameter :: chunk_size = 100_IK  !! for allocatable strings: allocate chunks of this size
+    integer(IK),parameter :: unit2str = -1_IK  !! unit number to cause stuff to be
+                                               !! output to strings rather than files.
+                                               !! See 9.5.6.12 in the F2003/08 standard
 
-    integer(IK),parameter,public :: seq_chunk_size = 256 !! chunk size for reading sequential files
+    integer(IK),parameter,public :: seq_chunk_size = 256_IK !! chunk size for reading sequential files
 
-    integer(IK),parameter,public :: pushed_char_size = 10 !! magic number
+    integer(IK),parameter,public :: pushed_char_size = 10_IK !! magic number
 
     end module json_parameters
 !*****************************************************************************************

src/json_string_utilities.F90

@@ -65,7 +65,7 @@ module json_string_utilities
     public :: to_unicode
     public :: escape_string
     public :: unescape_string
-    public :: lowercase_character
+    public :: lowercase_string
 
     contains
 !*****************************************************************************************
@@ -154,6 +154,7 @@ subroutine compact_real_string(str)
 
     character(kind=CK,len=len(str)) :: significand, expnt
     character(kind=CK,len=2) :: separator
+
     integer(IK) :: exp_start,decimal_pos,sig_trim,exp_trim,i
 
     str = adjustl(str)
@@ -523,7 +524,7 @@ end function to_uni_vec
 !
 !  `CK`//`CDK` operator.
 
-    function ucs4_join_default(ucs4_str,def_str) result(res)
+    pure function ucs4_join_default(ucs4_str,def_str) result(res)
 
     implicit none
 
@@ -541,7 +542,7 @@ end function ucs4_join_default
 !
 !  `CDK`//`CK` operator.
 
-    function default_join_ucs4(def_str,ucs4_str) result(res)
+    pure function default_join_ucs4(def_str,ucs4_str) result(res)
 
     implicit none
 
@@ -559,7 +560,7 @@ end function default_join_ucs4
 !
 !  `CK`==`CDK` operator.
 
-    function ucs4_comp_default(ucs4_str,def_str) result(res)
+    pure elemental function ucs4_comp_default(ucs4_str,def_str) result(res)
 
     implicit none
 
@@ -577,7 +578,7 @@ end function ucs4_comp_default
 !
 !  `CDK`==`CK` operator.
 
-    function default_comp_ucs4(def_str,ucs4_str) result(res)
+    pure elemental function default_comp_ucs4(def_str,ucs4_str) result(res)
 
     implicit none
 
@@ -595,7 +596,7 @@ end function default_comp_ucs4
 !
 !  `CK`/=`CDK` operator.
 
-    function ucs4_neq_default(ucs4_str,def_str) result(res)
+    pure elemental function ucs4_neq_default(ucs4_str,def_str) result(res)
 
     implicit none
 
@@ -613,7 +614,7 @@ end function ucs4_neq_default
 !
 !  `CDK`/=`CK` operator.
 
-    function default_neq_ucs4(def_str,ucs4_str) result(res)
+    pure elemental function default_neq_ucs4(def_str,ucs4_str) result(res)
 
     implicit none
 
@@ -627,23 +628,51 @@ end function default_neq_ucs4
 !*****************************************************************************************
 
 !*****************************************************************************************
-!>
-!  Return the lowercase version of the character.
+!> author: Jacob Williams
+!
+!  Return the lowercase version of the `CK` character.
 
-    pure function lowercase_character(c) result(c_lower)
+    pure elemental function lowercase_character(c) result(c_lower)
 
     implicit none
 
-    character(kind=CDK,len=1),intent(in) :: c
-    character(kind=CDK,len=1)            :: c_lower
+    character(kind=CK,len=1),intent(in) :: c
+    character(kind=CK,len=1)            :: c_lower
 
-    integer :: i  !! index in array
+    integer :: i  !! index in uppercase array
 
     i = index(upper,c)
     c_lower = merge(lower(i:i),c,i>0)
 
     end function lowercase_character
 !*****************************************************************************************
 
+!*****************************************************************************************
+!> author: Jacob Williams
+!
+!  Returns lowercase version of the `CK` string.
+
+    pure elemental function lowercase_string(str) result(s_lower)
+
+    implicit none
+
+    character(kind=CK,len=*),intent(in) :: str      !! input string
+    character(kind=CK,len=(len(str)))   :: s_lower  !! lowercase version of the string
+
+    integer :: i  !! counter
+    integer :: n  !! length of input string
+
+    s_lower = ''
+    n = len_trim(str)
+
+    if (n>0) then
+        do concurrent (i=1:n)
+            s_lower(i:i) = lowercase_character(str(i:i))
+        end do
+    end if
+
+    end function lowercase_string
+!*****************************************************************************************
+
     end module json_string_utilities
 !*****************************************************************************************