updated interface to json_file info routines to match the ones in json_core.

Author: jacobwilliams

src/json_file_module.F90

@@ -648,57 +648,45 @@ end subroutine json_file_print_to_string
 !  date: 2/3/2014
 !
 !  Returns information about a variable in a [[json_file(type)]].
+!
+!@note If `found` is present, no exceptions will be thrown if an
+!      error occurs. Otherwise, an exception will be thrown if the
+!      variable is not found.
 
-    subroutine json_file_variable_info(me,path,found,var_type,n_children)
+    subroutine json_file_variable_info(me,path,found,var_type,n_children,name)
 
     implicit none
 
     class(json_file),intent(inout)      :: me
     character(kind=CK,len=*),intent(in) :: path       !! path to the variable
-    logical(LK),intent(out)             :: found      !! the variable exists in the structure
-    integer(IK),intent(out)             :: var_type   !! variable type
-    integer(IK),intent(out)             :: n_children !! number of children
-
-    type(json_value),pointer :: p
-
-    !initialize:
-    nullify(p)
-
-    !get a pointer to the variable (if it is there):
-    call me%get(path,p,found)
-
-    if (found) then
-
-        !get info:
-        call me%core%info(p,var_type,n_children)
-
-    else
-
-        !set to dummy values:
-        var_type = json_unknown
-        n_children = 0
-
-    end if
+    logical(LK),intent(out),optional    :: found      !! the variable exists in the structure
+    integer(IK),intent(out),optional    :: var_type   !! variable type
+    integer(IK),intent(out),optional    :: n_children !! number of children
+    character(kind=CK,len=:),allocatable,intent(out),optional :: name !! variable name
 
-    !cleanup:
-    nullify(p)
+    call me%core%info(me%p,path,found,var_type,n_children,name)
 
     end subroutine json_file_variable_info
 !*****************************************************************************************
 
 !*****************************************************************************************
 !>
 !  Alternate version of [[json_file_variable_info]], where "path" is kind=CDK.
+!
+!@note If `found` is present, no exceptions will be thrown if an
+!      error occurs. Otherwise, an exception will be thrown if the
+!      variable is not found.
 
-    subroutine wrap_json_file_variable_info(me,path,found,var_type,n_children)
+    subroutine wrap_json_file_variable_info(me,path,found,var_type,n_children,name)
 
     implicit none
 
     class(json_file),intent(inout)       :: me
     character(kind=CDK,len=*),intent(in) :: path
-    logical(LK),intent(out)              :: found
-    integer(IK),intent(out)              :: var_type
-    integer(IK),intent(out)              :: n_children
+    logical(LK),intent(out),optional     :: found
+    integer(IK),intent(out),optional     :: var_type
+    integer(IK),intent(out),optional     :: n_children
+    character(kind=CK,len=:),allocatable,intent(out),optional :: name !! variable name
 
     call me%info(to_unicode(path),found,var_type,n_children)
 

src/json_value_module.F90

@@ -990,6 +990,10 @@ end subroutine json_info
 !
 !### See also
 !  * [[json_info]]
+!
+!@note If `found` is present, no exceptions will be thrown if an
+!      error occurs. Otherwise, an exception will be thrown if the
+!      variable is not found.
 
     subroutine json_info_by_path(json,p,path,found,var_type,n_children,name)
 
@@ -1006,18 +1010,26 @@ subroutine json_info_by_path(json,p,path,found,var_type,n_children,name)
     type(json_value),pointer :: p_var
     logical(LK) :: p_var_found
 
-    call json%get(p,path,p_var,found)
+    nullify(p_var)
+    call json%get(p,path,p_var,p_var_found)
 
     !check if it was found:
     if (present(found)) then
+        found = p_var_found
         if (.not. found) then
             if (present(var_type))   var_type   = json_unknown
             if (present(n_children)) n_children = 0
             if (present(name))       name       = ''
+            call json%clear_exceptions()
             return
         end if
     else
-        if (json%failed()) return
+        if (json%failed()) then
+            if (present(var_type))   var_type   = json_unknown
+            if (present(n_children)) n_children = 0
+            if (present(name))       name       = ''
+            return
+        end if
     end if
 
     !get info: