Skip to content

Commit 02aa657

Browse files
committed
Merge branch 'develop' of https://github.com/jacobwilliams/json-fortran into 477-remove-bug-fix
2 parents 03ae20a + 3d56388 commit 02aa657

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

json-fortran.fobis

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ $SHARED_LIB = libjsonfortran.so
1414
$OPTIMIZE = -O2
1515
$CSTATIC_GNU = -c -fbacktrace -Wall -Wextra -Wno-maybe-uninitialized -Wno-unused-function -pedantic -std=f2008ts
1616
$DEBUG_GNU = -O0 -g3 -Warray-bounds -Wcharacter-truncation -Wline-truncation -Wimplicit-interface -Wimplicit-procedure -Wunderflow -fcheck=all -fmodule-private -ffree-line-length-132 -fimplicit-none -fbacktrace -fdump-core -finit-real=nan -std=f2008ts -fall-intrinsics
17-
$CSTATIC_INT = -c -std15
18-
$DEBUG_INT = -O0 -debug all -check all -warn all -extend-source 132 -traceback -gen-interfaces -fpe-all=0 -fp-stack-check -fstack-protector-all -ftrapuv -no-ftz -std15
17+
$CSTATIC_INT = -c -std18
18+
$DEBUG_INT = -O0 -debug all -check all -warn all -extend-source 132 -traceback -gen-interfaces -fpe-all=0 -fp-stack-check -fstack-protector-all -ftrapuv -no-ftz -std18
1919
$EXCLUDE_DIRS = ./src/tests/introspection
2020
./visual_studio/jsonfortrantest
2121

src/json_parameters.F90

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ module json_parameters
5252
!! [[json_get_by_path_default]]
5353
character(kind=CK,len=*),parameter :: end_array_alt = CK_')' !! alternate end of JSON array for
5454
!! [[json_get_by_path_default]]
55-
character(kind=CK,len=*),parameter :: root = CK_'$' !! root for [[json_get_by_path_default]]
55+
character(kind=CK,len=*),parameter :: root = achar(36, kind=CK) !! (`$`) root for [[json_get_by_path_default]]
5656
character(kind=CK,len=*),parameter :: this = CK_'@' !! 'this' for [[json_get_by_path_default]]
5757
character(kind=CK,len=*),parameter :: dot = CK_'.' !! path separator for [[json_get_by_path_default]]
5858
character(kind=CK,len=*),parameter :: tilde = CK_'~' !! RFC 6901 escape character

src/json_string_utilities.F90

+1-1
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ end function default_neq_ucs4
809809
!
810810
! Returns lowercase version of the `CK` string.
811811

812-
pure elemental function lowercase_string(str) result(s_lower)
812+
pure function lowercase_string(str) result(s_lower)
813813

814814
implicit none
815815

0 commit comments

Comments
 (0)