feat(string): get_json_value integer mold/result

Author: rouson

src/sourcery/sourcery_string_m.f90

@@ -14,11 +14,12 @@ module sourcery_string_m
     generic :: string => as_character
     procedure :: is_allocated
     procedure :: get_json_key
-    procedure :: get_json_string_scalar_value
-    procedure :: get_json_logical_scalar_value
+    procedure :: get_json_string_value
+    procedure :: get_json_logical_value
+    procedure :: get_json_integer_value
     procedure :: get_json_integer_array_value
     generic :: get_json_value => &
-                 get_json_string_scalar_value, get_json_logical_scalar_value, get_json_integer_array_value
+                 get_json_string_value, get_json_logical_value, get_json_integer_array_value, get_json_integer_value
     procedure :: equivalent
     generic :: operator(==) => equivalent
   end type
@@ -59,13 +60,20 @@ elemental module function get_json_key(self) result(unquoted_key)
       type(string_t) unquoted_key
     end function
 
-    elemental module function get_json_string_scalar_value(self, key, mold) result(value_)
+    elemental module function get_json_string_value(self, key, mold) result(value_)
       implicit none
       class(string_t), intent(in) :: self, key, mold
       type(string_t) :: value_
     end function
 
-    elemental module function get_json_logical_scalar_value(self, key, mold) result(value_)
+    elemental module function get_json_integer_value(self, key, mold) result(value_)
+      implicit none
+      class(string_t), intent(in) :: self, key
+      integer, intent(in) ::  mold
+      integer value_
+    end function
+
+    elemental module function get_json_logical_value(self, key, mold) result(value_)
       implicit none
       class(string_t), intent(in) :: self, key
       logical, intent(in) :: mold

src/sourcery/sourcery_string_s.f90

@@ -51,11 +51,11 @@
 
   end procedure
 
-  module procedure get_json_string_scalar_value
+  module procedure get_json_string_value
 
     character(len=:), allocatable :: raw_line
 
-    call assert(key==self%get_json_key(), "key==self%get_string_scalar_json_value()", key)
+    call assert(key==self%get_json_key(), "key==self%get_string_json_value()", key)
 
     raw_line = self%string()
     associate(text_after_colon => raw_line(index(raw_line, ':')+1:))
@@ -72,27 +72,46 @@
 
   end procedure
 
-  module procedure get_json_logical_scalar_value
+  module procedure get_json_logical_value
     character(len=:), allocatable :: raw_line, string_value
 
-    call assert(key==self%get_json_key(), "string_s(get_json_logical_scalar_value): key==self%get_json_key()", key)
+    call assert(key==self%get_json_key(), "string_s(get_json_logical_value): key==self%get_json_key()", key)
 
     raw_line = self%string()
     associate(text_after_colon => raw_line(index(raw_line, ':')+1:))
-      associate(comma => index(text_after_colon, ','))
-        if (comma == 0) then
+      associate(trailing_comma => index(text_after_colon, ','))
+        if (trailing_comma == 0) then
           string_value = trim(adjustl((text_after_colon)))
         else 
-          string_value = trim(adjustl((text_after_colon(:comma-1))))
+          string_value = trim(adjustl((text_after_colon(:trailing_comma-1))))
         end if
         call assert(string_value=="true" .or. string_value=="false", &
-          'string_s(get_json_logical_scalar_value): string_value=="true" .or. string_value="false"', string_value)
+          'string_s(get_json_logical_value): string_value=="true" .or. string_value="false"', string_value)
         value_ = string_value == "true"
       end associate
     end associate
 
   end procedure
 
+  module procedure get_json_integer_value
+    character(len=:), allocatable :: raw_line, string_value
+
+    call assert(key==self%get_json_key(), "string_s(get_json_logical_value): key==self%get_json_key()", key)
+
+    raw_line = self%string()
+    associate(text_after_colon => raw_line(index(raw_line, ':')+1:))
+      associate(trailing_comma => index(text_after_colon, ','))
+        if (trailing_comma == 0) then
+          string_value = trim(adjustl((text_after_colon)))
+        else 
+          string_value = trim(adjustl((text_after_colon(:trailing_comma-1))))
+        end if
+        read(string_value, fmt=*) value_
+      end associate
+    end associate
+
+  end procedure
+
   module procedure get_json_integer_array_value
     character(len=:), allocatable :: raw_line
     real, allocatable :: real_array(:)
@@ -108,7 +127,7 @@
             associate(num_inputs => commas + 1)
               allocate(real_array(num_inputs))
               read(raw_line(opening_bracket+1:closing_bracket-1), fmt=*) real_array
-              value_ = real_array
+              value_ = int(real_array)
             end associate
           end associate
         end associate

test/string_test.f90

@@ -24,10 +24,11 @@ function results() result(test_results)
 
     test_results = [ &
       test_result_t("is_allocated() result .true. if & only if the string_t component(s) is/are allocated", check_allocation()), &
-      test_result_t("extracting a key string from colon-separated key/value pair", extracts_key()), &
-      test_result_t("extracting a string value from colon-separated key/value pair", extracts_string_scalar_value()), &
-      test_result_t("extracting a logical value from colon-separated key/value pair", extracts_logical_scalar_value()), &
-      test_result_t("extracting an integer array value from colon-separated key/value pair", extracts_integer_array_value()) &
+      test_result_t("extracting a key string from a colon-separated key/value pair", extracts_key()), &
+      test_result_t("extracting a string value from a colon-separated key/value pair", extracts_string_value()), &
+      test_result_t("extracting a logical value from a colon-separated key/value pair", extracts_logical_value()), &
+      test_result_t("extracting an integer array value from a colon-separated key/value pair", extracts_integer_array_value()), &
+      test_result_t("extracting an integer value from a colon-separated key/value pair", extracts_integer_value()) &
     ]
   end function
 
@@ -49,15 +50,23 @@ function extracts_key() result(passed)
     end associate
   end function
 
-  function extracts_string_scalar_value() result(passed)
+  function extracts_string_value() result(passed)
     logical passed
 
     associate(line => string_t('"foo" : "bar"'))
       passed = line%get_json_value(key=string_t("foo"), mold=string_t("")) == string_t("bar")
     end associate
   end function
 
-  function extracts_logical_scalar_value() result(passed)
+  function extracts_integer_value() result(passed)
+    logical passed
+    
+    associate(line => string_t('"an integer" : 99'))
+      passed = line%get_json_value(key=string_t("an integer"), mold=0) == 99
+    end associate
+  end function
+
+  function extracts_logical_value() result(passed)
     logical passed
 
     associate( &