Skip to content

Commit fdfaf40

Browse files
jacobwilliamsjacobwilliams
committed
Merge branch 'master' of https://github.com/jacobwilliams/json-fortran into get_alloc_string
2 parents c13a83d + 75b95e9 commit fdfaf40

File tree

12 files changed

+1852
-349
lines changed

12 files changed

+1852
-349
lines changed

‎.VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.1.0
1+
5.2.0

‎CHANGELOG.md‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
- [Change Log](#change-log)
66
- [Unreleased](#unreleased)
7+
- [5.2.0 (2017-03-05)](#520-2017-03-05)
78
- [5.1.0 (2016-08-14)](#510-2016-08-14)
89
- [5.0.2 (2016-06-11)](#502-2016-06-11)
910
- [5.0.1 (2016-06-11)](#501-2016-06-11)
@@ -20,7 +21,35 @@
2021

2122
### [Unreleased](https://github.com/jacobwilliams/json-fortran/tree/HEAD)
2223

23-
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/5.1.0...HEAD)
24+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/5.2.0...HEAD)
25+
26+
### [5.2.0](https://github.com/jacobwilliams/json-fortran/tree/5.2.0) (2017-03-05)
27+
28+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/5.1.0...5.2.0)
29+
or [Download v5.2.0](https://github.com/jacobwilliams/json-fortran/releases/tag/5.2.0)
30+
31+
**Enhancements:**
32+
33+
- Added support for comments in JSON files. [\#256](https://github.com/jacobwilliams/json-fortran/issues/256)
34+
[\#234](https://github.com/jacobwilliams/json-fortran/issues/234)
35+
[\#259](https://github.com/jacobwilliams/json-fortran/pull/259) ([jacobwilliams](https://github.com/jacobwilliams))
36+
[\#240](https://github.com/jacobwilliams/json-fortran/pull/240) ([jacobwilliams](https://github.com/jacobwilliams))
37+
- Added support for RFC 6901 paths. [\#249](https://github.com/jacobwilliams/json-fortran/issues/249) [\#253](https://github.com/jacobwilliams/json-fortran/issues/253) [\#255](https://github.com/jacobwilliams/json-fortran/issues/255)
38+
[\#258](https://github.com/jacobwilliams/json-fortran/pull/258) ([jacobwilliams](https://github.com/jacobwilliams))
39+
[\#252](https://github.com/jacobwilliams/json-fortran/pull/252) ([jacobwilliams](https://github.com/jacobwilliams))
40+
[\#251](https://github.com/jacobwilliams/json-fortran/pull/251) ([jacobwilliams](https://github.com/jacobwilliams))
41+
- Can now specify default real and integer kinds using compiler directives. [\#236](https://github.com/jacobwilliams/json-fortran/issues/236) [\#238](https://github.com/jacobwilliams/json-fortran/issues/238)
42+
[\#239](https://github.com/jacobwilliams/json-fortran/pull/239) ([jacobwilliams](https://github.com/jacobwilliams))
43+
- `compact_reals` and `real_format='*'` can now be used at the same time. [\#226](https://github.com/jacobwilliams/json-fortran/issues/226)
44+
[\#227](https://github.com/jacobwilliams/json-fortran/pull/227) ([jacobwilliams](https://github.com/jacobwilliams))
45+
- Added option to change default path separator character. [\#254](https://github.com/jacobwilliams/json-fortran/pull/254) ([jacobwilliams](https://github.com/jacobwilliams))
46+
- Add pkg-config file [\#242](https://github.com/jacobwilliams/json-fortran/pull/242) ([wesbarnett](https://github.com/wesbarnett))
47+
48+
**Fixed issues:**
49+
50+
- Real numbers now written with 17 digits of precision (previously it was using 16 which doesn't accurately represent all values to full precision) [\#230](https://github.com/jacobwilliams/json-fortran/issues/230)
51+
[\#241](https://github.com/jacobwilliams/json-fortran/pull/241) ([jacobwilliams](https://github.com/jacobwilliams))
52+
[\#232](https://github.com/jacobwilliams/json-fortran/pull/232) ([jacobwilliams](https://github.com/jacobwilliams))
2453

2554
### [5.1.0](https://github.com/jacobwilliams/json-fortran/tree/5.1.0) (2016-08-14)
2655

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ cmake_minimum_required ( VERSION 2.8.8 FATAL_ERROR )
114114
enable_language ( Fortran )
115115
project ( jf_test NONE )
116116
117-
find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 5.1.0 REQUIRED )
117+
find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 5.2.0 REQUIRED )
118118
include_directories ( "${jsonfortran_INCLUDE_DIRS}" )
119119
120120
file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.f90" )

‎files/inputs/test1.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
" test \\u \" blah\\\" test test",
1515
"..\\path\\to\\files\\"
1616
],
17+
"a": {
18+
"b": 1
19+
},
1720
"empty_array": [],
1821
"empty_object": {},
1922
"empty_string": "",

‎pages/releases/index.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ documentation from the documentation for official releases other than
2525
using the browser's back button. Feel free to bookmark this page, or
2626
the [main project page](|url|/index.html) for convenient navigation.
2727

28+
* [5.2.0](http://jacobwilliams.github.io/json-fortran/5.2.0/index.html)
29+
([FORD](https://github.com/cmacmackin/ford) generated documentation)
30+
- [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/5.2.0)
2831
* [5.1.0](http://jacobwilliams.github.io/json-fortran/5.1.0/index.html)
2932
([FORD](https://github.com/cmacmackin/ford) generated documentation)
3033
- [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/5.1.0)

‎src/json_file_module.F90‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ subroutine initialize_json_core_in_file(me,verbose,compact_reals,&
277277
no_whitespace,&
278278
unescape_strings,&
279279
comment_char,&
280-
use_rfc6901_paths,&
280+
path_mode,&
281281
path_separator)
282282

283283
implicit none
@@ -293,7 +293,7 @@ subroutine initialize_json_core_in_file(me,verbose,compact_reals,&
293293
no_whitespace,&
294294
unescape_strings,&
295295
comment_char,&
296-
use_rfc6901_paths,&
296+
path_mode,&
297297
path_separator)
298298

299299
end subroutine initialize_json_core_in_file
@@ -356,7 +356,7 @@ function initialize_json_file(p,verbose,compact_reals,&
356356
no_whitespace,&
357357
unescape_strings,&
358358
comment_char,&
359-
use_rfc6901_paths,&
359+
path_mode,&
360360
path_separator) result(file_object)
361361

362362
implicit none
@@ -374,7 +374,7 @@ function initialize_json_file(p,verbose,compact_reals,&
374374
no_whitespace,&
375375
unescape_strings,&
376376
comment_char,&
377-
use_rfc6901_paths,&
377+
path_mode,&
378378
path_separator)
379379

380380
if (present(p)) file_object%p => p

‎src/json_initialize_arguments.inc‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,20 @@
2121
character(kind=CK,len=1),intent(in),optional :: comment_char !! If present, this character is used
2222
!! to denote comments in the JSON file,
2323
!! which will be ignored if present.
24-
!! Example: `!` or `#`.
25-
logical(LK),intent(in),optional :: use_rfc6901_paths !! If true, then path values in the
26-
!! `get_by_path` routines are interpreted
27-
!! as RFC 6901 "JSON Pointer" paths.
28-
!! By default, this is False.
24+
!! Example: `!` or `#`. Setting this
25+
!! to a blank string disables the
26+
!! ignoring of comments. (Default is `!`).
27+
integer(IK),intent(in),optional :: path_mode !! How the path strings are interpreted in the
28+
!! `get_by_path` routines:
29+
!!
30+
!! * 1 -- Default way (see [[json_get_by_path_default]])
31+
!! [Default]
32+
!! * 2 -- as RFC 6901 "JSON Pointer" paths
33+
!! (see [[json_get_by_path_rfc6901]])
2934
character(kind=CK,len=1),intent(in),optional :: path_separator !! The `path` separator to use
3035
!! in the "default" mode for
3136
!! the paths in the various
3237
!! `get_by_path` routines.
3338
!! Example: `.` [default] or `%`.
34-
!! Note: if `use_rfc6901_paths=true`
39+
!! Note: if `path_mode/=1`
3540
!! then this is ignored.

0 commit comments

Comments
 (0)