Skip to content

added path_mode integer input #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2017
Merged

added path_mode integer input #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/json_file_module.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ subroutine initialize_json_core_in_file(me,verbose,compact_reals,&
no_whitespace,&
unescape_strings,&
comment_char,&
use_rfc6901_paths,&
path_mode,&
path_separator)

implicit none
Expand All @@ -291,7 +291,7 @@ subroutine initialize_json_core_in_file(me,verbose,compact_reals,&
no_whitespace,&
unescape_strings,&
comment_char,&
use_rfc6901_paths,&
path_mode,&
path_separator)

end subroutine initialize_json_core_in_file
Expand Down Expand Up @@ -354,7 +354,7 @@ function initialize_json_file(p,verbose,compact_reals,&
no_whitespace,&
unescape_strings,&
comment_char,&
use_rfc6901_paths,&
path_mode,&
path_separator) result(file_object)

implicit none
Expand All @@ -372,7 +372,7 @@ function initialize_json_file(p,verbose,compact_reals,&
no_whitespace,&
unescape_strings,&
comment_char,&
use_rfc6901_paths,&
path_mode,&
path_separator)

if (present(p)) file_object%p => p
Expand Down
13 changes: 8 additions & 5 deletions src/json_initialize_arguments.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@
!! to denote comments in the JSON file,
!! which will be ignored if present.
!! Example: `!` or `#`.
logical(LK),intent(in),optional :: use_rfc6901_paths !! If true, then path values in the
!! `get_by_path` routines are interpreted
!! as RFC 6901 "JSON Pointer" paths.
!! By default, this is False.
integer(IK),intent(in),optional :: path_mode !! How the path strings are interpreted in the
!! `get_by_path` routines:
!!
!! * 1 -- Default way (see [[json_get_by_path_default]])
!! [Default]
!! * 2 -- as RFC 6901 "JSON Pointer" paths
!! (see [[json_get_by_path_rfc6901]])
character(kind=CK,len=1),intent(in),optional :: path_separator !! The `path` separator to use
!! in the "default" mode for
!! the paths in the various
!! `get_by_path` routines.
!! Example: `.` [default] or `%`.
!! Note: if `use_rfc6901_paths=true`
!! Note: if `path_mode/=1`
!! then this is ignored.
61 changes: 37 additions & 24 deletions src/json_value_module.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,18 @@ module json_value_module
!! `allow_comments` is true.
!! Examples: '`!`' or '`#`'.

logical(LK) :: use_rfc6901_paths = .false. !! use the RFC 6901 standard for
!! JSON paths. Otherwise, the original
!! default method is used
integer(IK) :: path_mode = 1_IK !! How the path strings are interpreted in the
!! `get_by_path` routines:
!!
!! * 1 -- Default mode (see [[json_get_by_path_default]])
!! * 2 -- as RFC 6901 "JSON Pointer" paths
!! (see [[json_get_by_path_rfc6901]])

character(kind=CK,len=1) :: path_separator = dot !! The `path` separator to use
!! in the "default" mode for
!! the paths in the various
!! `get_by_path` routines.
!! Note: if `use_rfc6901_paths=true`
!! Note: if `path_mode/=1`
!! then this is ignored.

contains
Expand Down Expand Up @@ -660,7 +663,7 @@ function initialize_json_core(verbose,compact_reals,&
no_whitespace,&
unescape_strings,&
comment_char,&
use_rfc6901_paths,&
path_mode,&
path_separator) result(json_core_object)

implicit none
Expand All @@ -676,7 +679,7 @@ function initialize_json_core(verbose,compact_reals,&
no_whitespace,&
unescape_strings,&
comment_char,&
use_rfc6901_paths,&
path_mode,&
path_separator)

end function initialize_json_core
Expand Down Expand Up @@ -709,7 +712,7 @@ subroutine json_initialize(json,verbose,compact_reals,&
no_whitespace,&
unescape_strings,&
comment_char,&
use_rfc6901_paths,&
path_mode,&
path_separator)

implicit none
Expand Down Expand Up @@ -756,8 +759,14 @@ subroutine json_initialize(json,verbose,compact_reals,&
json%no_whitespace = no_whitespace
if (present(unescape_strings)) &
json%unescaped_strings = unescape_strings
if (present(use_rfc6901_paths)) &
json%use_rfc6901_paths = use_rfc6901_paths
if (present(path_mode)) then
if (path_mode==1_IK .or. path_mode==2_IK) then
json%path_mode = path_mode
else
json%path_mode = 1_IK ! just to have a valid value
call json%throw_exception('Invalid path_mode.')
end if
end if

! if we are allowing comments in the file:
if (present(comment_char)) then
Expand Down Expand Up @@ -3884,11 +3893,13 @@ subroutine json_get_by_path(json, me, path, p, found)
!! specify by `path`
logical(LK),intent(out),optional :: found !! true if it was found

if (json%use_rfc6901_paths) then
call json%json_get_by_path_rfc6901(me, path, p, found)
else
! note: it can only be 1 or 2 (which was checked in initialize)
select case (json%path_mode)
case(1_IK)
call json%json_get_by_path_default(me, path, p, found)
end if
case(2_IK)
call json%json_get_by_path_rfc6901(me, path, p, found)
end select

end subroutine json_get_by_path
!*****************************************************************************************
Expand All @@ -3912,7 +3923,7 @@ end subroutine json_get_by_path
! * `$` - root
! * `@` - this
! * `.` - child object member (note this can be changed using `json%path_separator`)
! * `[]` or `()` - child array element
! * `[]` or `()` - child array element (note that indices are 1-based)
!
! Thus, if any of these characters are present in the name key,
! this routine cannot be used to get the value.
Expand Down Expand Up @@ -4312,8 +4323,8 @@ end subroutine wrap_json_get_by_path
! `found` is present, which will be set to `false`. `path`
! will be a blank string.
!
!@note If `json%use_rfc6901_paths=.true.`, then the
! `use_alt_array_tokens` and `path_sep` inputs are ignored.
!@note If `json%path_mode/=1`, then the `use_alt_array_tokens`
! and `path_sep` inputs are ignored if present.

subroutine json_get_path(json, p, path, found, use_alt_array_tokens, path_sep)

Expand Down Expand Up @@ -4389,10 +4400,11 @@ subroutine json_get_path(json, p, path, found, use_alt_array_tokens, path_sep)
exit
end if
end do
if (json%use_rfc6901_paths) then
select case(json%path_mode)
case(2)
call integer_to_string(i-1,int_fmt,istr) ! 0-based index
call add_to_path(parent_name//slash//trim(adjustl(istr)))
else
case(1)
call integer_to_string(i,int_fmt,istr)
if (use_brackets) then
call add_to_path(parent_name//start_array//&
Expand All @@ -4401,7 +4413,7 @@ subroutine json_get_path(json, p, path, found, use_alt_array_tokens, path_sep)
call add_to_path(parent_name//start_array_alt//&
trim(adjustl(istr))//end_array_alt,path_sep)
end if
end if
end select
tmp => tmp%parent ! already added parent name

case (json_object)
Expand Down Expand Up @@ -4444,7 +4456,7 @@ subroutine json_get_path(json, p, path, found, use_alt_array_tokens, path_sep)
if (json%exception_thrown) then
path = CK_''
else
if (json%use_rfc6901_paths) then
if (json%path_mode==2) then
! add the root slash:
path = slash//path
end if
Expand All @@ -4468,16 +4480,17 @@ subroutine add_to_path(str,path_sep)
character(kind=CK,len=*),intent(in) :: str !! string to prepend to `path`
character(kind=CK,len=1),intent(in),optional :: path_sep
!! path separator (default is '.').
!! (ignored if `json%use_rfc6901_paths=.true.`)
!! (ignored if `json%path_mode/=1`)

if (json%use_rfc6901_paths) then
select case (json%path_mode)
case(2)
! in this case, the options are ignored
if (path==CK_'') then
path = str
else
path = str//slash//path
end if
else
case(1)
! default path format
if (path==CK_'') then
path = str
Expand All @@ -4490,7 +4503,7 @@ subroutine add_to_path(str,path_sep)
path = str//json%path_separator//path
end if
end if
end if
end select

end subroutine add_to_path

Expand Down
4 changes: 2 additions & 2 deletions src/tests/jf_test_23.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ subroutine test_23(error_cnt)
error_cnt = 0
call json%initialize( trailing_spaces_significant=.true.,&
case_sensitive_keys=.true.,&
use_rfc6901_paths=.true.)
path_mode=2) ! RFC6901 paths
if (json%failed()) then
call json%print_error_message(error_unit)
error_cnt = error_cnt + 1
Expand Down Expand Up @@ -217,7 +217,7 @@ subroutine test_23(error_cnt)

call core%initialize( trailing_spaces_significant=.true.,&
case_sensitive_keys=.true.,&
use_rfc6901_paths=.true.)
path_mode=2) ! RFC6901 paths

write(error_unit,'(A)') ''
key = '/data/1/real'
Expand Down