Skip to content

Commit 8d3861b

Browse files
committed
2 parents 0d13277 + 3b6d523 commit 8d3861b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+2588
-874
lines changed

.VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.5.2
1+
9.2.1

.github/workflows/CI.yml

Lines changed: 45 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,32 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
os: [ubuntu-20.04]
13-
gcc_v: [7,8,9,10,11] # Version of GFortran we want to use.
12+
os: [ubuntu-latest]
13+
gcc_v: [12,10,11,9] # Version of GFortran we want to use.
1414
python-version: [3.11]
1515
env:
1616
FC: gfortran-${{matrix.gcc_v}}
1717
GCC_V: ${{matrix.gcc_v}}
1818

19-
steps:
19+
#
20+
# GCC version
21+
#
22+
# 9 - build.sh with documentation, unit tests and coverage analysis. doc deployment
23+
# 10 - build.sh - no documentation, with and without unicode.
24+
# 11 - FPM
25+
# 12 - CMake build with unit tests, no documentation, with coverage analysis. no unicode
26+
#
27+
# NOTE: coverage disabled for now
2028

21-
- name: Set vars
22-
id: vars
23-
# run: echo ::set-output name=tag::${GITHUB_REF#refs/*/} # this is depreciated: https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/
24-
run: echo "name=tag::${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
29+
steps:
2530

2631
- name: Checkout code
27-
uses: actions/checkout@v4.1.6
32+
uses: actions/checkout@v4.2.2
2833
with:
2934
submodules: recursive
3035

3136
- name: Setup cmake
32-
if: contains( matrix.gcc_v, 9 )
37+
if: contains( matrix.gcc_v, 12 )
3338
uses: jwlawson/actions-setup-cmake@v2.0.2
3439
with:
3540
cmake-version: '3.28.x'
@@ -42,11 +47,24 @@ jobs:
4247
- name: Setup Graphviz
4348
uses: ts-graphviz/setup-graphviz@v2.0.2
4449

50+
- name: Set current directory in env variable
51+
run: echo "MYDIR=$(pwd)" >> $GITHUB_ENV
52+
53+
- name: Set PYTHONPATH and PATH for later steps
54+
run: |
55+
echo "PYTHONPATH=$MYDIR/FoBiS/src/main/python:$PYTHONPATH" >> $GITHUB_ENV
56+
echo "PATH=$MYDIR/FoBiS/src/main/python:$PATH" >> $GITHUB_ENV
57+
4558
- name: Install Python dependencies
4659
if: contains( matrix.os, 'ubuntu')
4760
run: |
4861
python -m pip install --upgrade pip
49-
pip install ford FoBiS.py pygooglechart fpm
62+
#pip install ford FoBiS.py pygooglechart fpm
63+
pip install ford pygooglechart fpm
64+
# just get the latest FoBiS from git:
65+
# git clone https://github.com/szaghi/FoBiS.git
66+
# use a fork until there is a new release:
67+
git clone https://github.com/jacobwilliams/FoBiS.git
5068
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
5169
5270
- name: Install GFortran Linux
@@ -60,7 +78,7 @@ jobs:
6078
--slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_V}
6179
6280
- name: Compile_with_build
63-
if: matrix.gcc_v != 7 && matrix.gcc_v != 11
81+
if: matrix.gcc_v == 10
6482
run: |
6583
GFORTRAN=gfortran-${{matrix.gcc_v}}
6684
GCOV=gcov-${{matrix.gcc_v}}
@@ -82,7 +100,7 @@ jobs:
82100
# CMake build with unit tests, no documentation, with coverage analysis
83101
# No unicode so that coverage combined with the build script will cover unicode
84102
# and non-unicode code paths
85-
if: matrix.gcc_v == 9
103+
if: matrix.gcc_v == 12
86104
run: |
87105
GFORTRAN=gfortran-${{matrix.gcc_v}}
88106
GCOV=gcov-${{matrix.gcc_v}}
@@ -94,16 +112,19 @@ jobs:
94112
- name: Compile_with_build_mkdocs
95113
# build with build.sh, make documentation, run unit tests
96114
# and perform coverage analysis - used for doc deployment
97-
if: matrix.gcc_v == 7
115+
if: matrix.gcc_v == 9
98116
run: |
99117
GFORTRAN=gfortran-${{matrix.gcc_v}}
100118
GCOV=gcov-${{matrix.gcc_v}}
101119
./build.sh --coverage --skip-documentation
120+
# delete old coverage files:
121+
find . -name '*.gcda' -delete
122+
find . -name '*.gcov' -delete
102123
./build.sh --coverage --enable-unicode
103124
104125
- name: Deploy Documentation for master
105-
if: matrix.gcc_v == 7 && github.ref == 'refs/heads/master'
106-
uses: JamesIves/github-pages-deploy-action@4.1.3
126+
if: matrix.gcc_v == 9 && github.ref == 'refs/heads/master'
127+
uses: JamesIves/github-pages-deploy-action@v4.7.3
107128
with:
108129
branch: gh-pages # The branch the action should deploy to.
109130
folder: doc # The folder the action should deploy.
@@ -113,26 +134,27 @@ jobs:
113134
114135
- name: Rebuild documentation for tagged release
115136
env:
116-
TAGNAME: ${{ steps.vars.outputs.tag }}
117-
if: matrix.gcc_v == 7 && startsWith(github.ref, 'refs/tags/')
137+
TAGNAME: ${{github.ref_name}}
138+
if: matrix.gcc_v == 9 && startsWith(github.ref, 'refs/tags/')
118139
run: |
119140
echo ${TAGNAME}
120141
rm -rf doc
121-
sed "2 s/^/version: ${TAGNAME}\n/" json-fortran.md > json-fortran.tagged.md
142+
sed "2 s/^/version: ${TAGNAME}\n/" ford.md > json-fortran.tagged.md
122143
ford --debug json-fortran.tagged.md
123144
124145
- name: Deploy documentation for tagged release
125-
if: matrix.gcc_v == 7 && startsWith(github.ref, 'refs/tags/')
126-
uses: JamesIves/github-pages-deploy-action@v4.4.1
146+
if: matrix.gcc_v == 9 && startsWith(github.ref, 'refs/tags/')
147+
uses: JamesIves/github-pages-deploy-action@v4.7.3
127148
with:
128149
branch: gh-pages # The branch the action should deploy to.
129150
folder: doc # The folder the action should deploy.
130-
target-folder: prev/${{ steps.vars.outputs.tag }} # deploy to a version-specific folder
151+
target-folder: prev/${{github.ref_name}} # deploy to a version-specific folder
152+
single-commit: true
131153

132154
- name: Upload coverage
133-
if: matrix.gcc_v == 7
155+
if: matrix.gcc_v == 9
134156
run: |
135157
rm json_*.F90-*unicode.gcov || true
136158
mv json_*.F90.gcov src/
137-
mv jf_test*.[fF]90.gcov src/tests/
159+
mv jf_test*.[fF]90.gcov test/
138160
bash <(curl -s https://codecov.io/bash) -v -X $GCOV

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ build/
55
install/
66
doc/
77
.vscode/
8+
/env
89

910
*.gcov
1011
*.gcov.md*
@@ -35,6 +36,7 @@ My Inspector*
3536
x64/
3637
Debug/
3738
Release/
39+
/FoBiS
3840

3941
# mac
4042
.DS_Store

CHANGELOG.md

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

55
- [Change Log](#change-log)
66
- [Unreleased](#unreleased)
7+
- [9.2.1 (2026-02-22)](#921-2026-02-22)
8+
- [9.2.0 (2026-01-05)](#920-2026-01-05)
9+
- [9.1.0 (2026-01-02)](#910-2026-01-02)
10+
- [9.0.5 (2025-08-25)](#905-2025-08-25)
11+
- [9.0.4 (2025-08-02)](#904-2025-08-02)
12+
- [9.0.3 (2025-02-22)](#903-2025-02-22)
13+
- [9.0.2 (2024-08-25)](#902-2024-08-25)
14+
- [9.0.1 (2024-06-11)](#901-2024-06-11)
15+
- [9.0.0 (2024-06-11)](#900-2024-06-11)
716
- [8.5.2 (2024-05-27)](#852-2024-05-27)
817
- [8.5.1 (2024-05-26)](#851-2024-05-26)
918
- [8.5.0 (2024-05-25)](#850-2024-05-25)
@@ -49,7 +58,132 @@
4958

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

52-
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.5.2...HEAD)
61+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/9.2.1...HEAD)
62+
63+
### [9.2.1](https://github.com/jacobwilliams/json-fortran/tree/9.2.1) (2026-02-22)
64+
65+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/9.2.0...9.2.1)
66+
or [Download v9.2.1](https://github.com/jacobwilliams/json-fortran/releases/tag/9.2.1)
67+
68+
**Changes:**
69+
70+
* Fixed compile for systems without `real128` [#619](https://github.com/jacobwilliams/json-fortran/issues/619) [#621](https://github.com/jacobwilliams/json-fortran/pull/621) ([ivan-pi](https://github.com/ivan-pi))
71+
* Added a new test. [#622](https://github.com/jacobwilliams/json-fortran/issues/622) [#623](https://github.com/jacobwilliams/json-fortran/pull/623) ([jacobwilliams](https://github.com/jacobwilliams))
72+
* Some minor code and doc cleanups. [#575](https://github.com/jacobwilliams/json-fortran/issues/575) [#618](https://github.com/jacobwilliams/json-fortran/pull/618) ([jacobwilliams](https://github.com/jacobwilliams))
73+
74+
### [9.2.0](https://github.com/jacobwilliams/json-fortran/tree/9.2.0) (2026-01-05)
75+
76+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/9.1.0...9.2.0)
77+
or [Download v9.2.0](https://github.com/jacobwilliams/json-fortran/releases/tag/9.2.0)
78+
79+
**Changes:**
80+
81+
* Added a non-recursive `clone` option (see the `use_nonrecursive` optional argument to `json_clone`). Also added an optional `verbose` argument to the `equals` function, for printing information about how the two structures differ. [#602](https://github.com/jacobwilliams/json-fortran/issues/602) [#610](https://github.com/jacobwilliams/json-fortran/pull/610) ([jacobwilliams](https://github.com/jacobwilliams))
82+
* Added `null_to_integer_mode` and `null_to_integer_value` options, which allow for controlling the results if attempting to return a `null` value as an integer.
83+
[#518](https://github.com/jacobwilliams/json-fortran/issues/518)
84+
[#611](https://github.com/jacobwilliams/json-fortran/pull/611)
85+
([jacobwilliams](https://github.com/jacobwilliams))
86+
* Speed up printing JSON to a string.
87+
[#501](https://github.com/jacobwilliams/json-fortran/issues/501)
88+
[#612](https://github.com/jacobwilliams/json-fortran/pull/612)
89+
([jacobwilliams](https://github.com/jacobwilliams))
90+
* Added some `iomsg` outputs for file open/close errors.
91+
[#596](https://github.com/jacobwilliams/json-fortran/issues/596)
92+
[#613](https://github.com/jacobwilliams/json-fortran/pull/613)
93+
([jacobwilliams](https://github.com/jacobwilliams))
94+
* Added `add_null_by_path` to `json_core` and `add_null` to `json_file`. Now, `null` values and vectors can more easily be added programmatically to JSON structures.
95+
[#327](https://github.com/jacobwilliams/json-fortran/issues/327)
96+
[#614](https://github.com/jacobwilliams/json-fortran/pull/614)
97+
([jacobwilliams](https://github.com/jacobwilliams))
98+
* Fixed some issues with the example Visual Studio solution for Visual Studio 2022. Removed a deprecated flag. Also increased the stack size to 3 MB, which was necessary for one of the tests to pass.
99+
[#600](https://github.com/jacobwilliams/json-fortran/issues/600)
100+
[#601](https://github.com/jacobwilliams/json-fortran/pull/601)
101+
[#602](https://github.com/jacobwilliams/json-fortran/issues/602)
102+
[#603](https://github.com/jacobwilliams/json-fortran/pull/603)
103+
([james-tullos](https://github.com/james-tullos))
104+
* Consolidate duplicated code for `json_add_*_by_path` routines
105+
[#615](https://github.com/jacobwilliams/json-fortran/issues/615)
106+
[#616](https://github.com/jacobwilliams/json-fortran/pull/616)
107+
([jacobwilliams](https://github.com/jacobwilliams))
108+
109+
### [9.1.0](https://github.com/jacobwilliams/json-fortran/tree/9.1.0) (2026-01-02)
110+
111+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/9.0.5...9.1.0)
112+
or [Download v9.1.0](https://github.com/jacobwilliams/json-fortran/releases/tag/9.1.0)
113+
114+
**Changes:**
115+
116+
* Added a new JSON parser option (`parser_mode=2`). This is a non-recursive version of the parser. The original one is still the default. Also added `json_value_equals`, to compare two JSON structures. [#375](https://github.com/jacobwilliams/json-fortran/issues/375) [#605](https://github.com/jacobwilliams/json-fortran/pull/605) ([jacobwilliams](https://github.com/jacobwilliams))
117+
* Various updates for speed. Added a new `string_to_real_mode` option to specify the algorithm to use for string to real conversions. The original one (`string_to_real_mode=1`) is still the default. A new one (`string_to_real_mode=2`) uses C-library functions and may be faster in some cases. [#498](https://github.com/jacobwilliams/json-fortran/issues/498) [#499](https://github.com/jacobwilliams/json-fortran/pull/499) ([jacobwilliams](https://github.com/jacobwilliams))
118+
* Added a `close_unit_if_open` argument to `json_parse_file`. [#606](https://github.com/jacobwilliams/json-fortran/issues/606) [#607](https://github.com/jacobwilliams/json-fortran/pull/607) ([jacobwilliams](https://github.com/jacobwilliams))
119+
* Updated the Visual Studio solution file. Two of the tests were missing. Also added three missing `.inc` files to the solution.
120+
121+
### [9.0.5](https://github.com/jacobwilliams/json-fortran/tree/9.0.5) (2025-08-25)
122+
123+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/9.0.4...9.0.5)
124+
or [Download v9.0.5](https://github.com/jacobwilliams/json-fortran/releases/tag/9.0.5)
125+
126+
**Changes:**
127+
128+
* A minor change to work around a possible compiler bug in Gfortran 15.1. [#597](https://github.com/jacobwilliams/json-fortran/issues/597) [#598](https://github.com/jacobwilliams/json-fortran/pull/598) ([jacobwilliams](https://github.com/jacobwilliams))
129+
130+
### [9.0.4](https://github.com/jacobwilliams/json-fortran/tree/9.0.4) (2025-08-02)
131+
132+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/9.0.3...9.0.4)
133+
or [Download v9.0.4](https://github.com/jacobwilliams/json-fortran/releases/tag/9.0.4)
134+
135+
**Changes:**
136+
137+
* Configure `.VERSION.in` in `CMAKE_CURRENT_SOURCE_DIR` in main `CMakeLists.txt`. [#585](https://github.com/jacobwilliams/json-fortran/issues/585) [#586](https://github.com/jacobwilliams/json-fortran/pull/586) ([mcharlou](https://github.com/mcharlou))
138+
* Fixed error when using non-default ints. [#591](https://github.com/jacobwilliams/json-fortran/issues/591) [#592](https://github.com/jacobwilliams/json-fortran/pull/592) ([jacobwilliams](https://github.com/jacobwilliams))
139+
* Various CI updates. Now testing Gfortran 9, 10, 11, 12. Removed tests for Gfortran 7, 8.
140+
141+
### [9.0.3](https://github.com/jacobwilliams/json-fortran/tree/9.0.3) (2025-02-22)
142+
143+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/9.0.2...9.0.3)
144+
or [Download v9.0.3](https://github.com/jacobwilliams/json-fortran/releases/tag/9.0.3)
145+
146+
**Changes:**
147+
148+
* Added some checks to write statements to avoid potential crashes. [#581](https://github.com/jacobwilliams/json-fortran/issues/581) [#582](https://github.com/jacobwilliams/json-fortran/pull/582) ([jacobwilliams](https://github.com/jacobwilliams))
149+
* Attempting to reduce the size of the repo by pruning the documentation `gh-pages` history. [#583](https://github.com/jacobwilliams/json-fortran/issues/583) [#584](https://github.com/jacobwilliams/json-fortran/pull/584) ([jacobwilliams](https://github.com/jacobwilliams))
150+
151+
### [9.0.2](https://github.com/jacobwilliams/json-fortran/tree/9.0.2) (2024-08-25)
152+
153+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/9.0.1...9.0.2)
154+
or [Download v9.0.2](https://github.com/jacobwilliams/json-fortran/releases/tag/9.0.2)
155+
156+
**Bug Fixes:**
157+
158+
* Added workarounds for potential stack overflows on Windows using `ifort` compiler. [#577](https://github.com/jacobwilliams/json-fortran/pull/577) ([robertrueger](https://github.com/robertrueger))
159+
* Fixed CI documentation deployment. [#573](https://github.com/jacobwilliams/json-fortran/issues/573) ([jacobwilliams](https://github.com/jacobwilliams))
160+
161+
### [9.0.1](https://github.com/jacobwilliams/json-fortran/tree/9.0.1) (2024-06-11)
162+
163+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.5.2...9.0.1)
164+
or [Download v9.0.1](https://github.com/jacobwilliams/json-fortran/releases/tag/9.0.1)
165+
166+
**Enhancements:**
167+
168+
* No code changes. Just an update to the CI to fix documentation deployment. [#573](https://github.com/jacobwilliams/json-fortran/issues/573) ([jacobwilliams](https://github.com/jacobwilliams))
169+
170+
### [9.0.0](https://github.com/jacobwilliams/json-fortran/tree/9.0.0) (2024-06-11)
171+
172+
[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.5.2...9.0.0)
173+
or [Download v9.0.0](https://github.com/jacobwilliams/json-fortran/releases/tag/9.0.0)
174+
175+
**Enhancements:**
176+
177+
* By default, the JSON pointer in `json_file` is now destroyed before loading. This is to prevent a memory leak if the type is used later to load another file. [#561](https://github.com/jacobwilliams/json-fortran/issues/561) [#562](https://github.com/jacobwilliams/json-fortran/pull/562) ([jacobwilliams](https://github.com/jacobwilliams)) Also added a new option `destroy_pointer` to the `json_file` load routines, which can be set to False to get the old behavior (not to destroy it). [#561](https://github.com/jacobwilliams/json-fortran/issues/571) [#562](https://github.com/jacobwilliams/json-fortran/pull/572) ([jacobwilliams](https://github.com/jacobwilliams))
178+
* Added add a new `nullify_pointer` option to the `json_file` constructor (default is True) ([jacobwilliams](https://github.com/jacobwilliams))
179+
[#564](https://github.com/jacobwilliams/json-fortran/issues/564) [#566](https://github.com/jacobwilliams/json-fortran/pull/566)
180+
* Updates for the CI and unit tests. Now testing with FPM, and running all tests with valgrind to check for memory leaks.
181+
[#563](https://github.com/jacobwilliams/json-fortran/issues/563)
182+
[#565](https://github.com/jacobwilliams/json-fortran/pull/565)
183+
[#568](https://github.com/jacobwilliams/json-fortran/pull/568)
184+
([jacobwilliams](https://github.com/jacobwilliams))
185+
* Added an optional `allow_trailing_comma` argument to the initialize routines (default is True). If set to False, this disallows extra trailing commas in arrays and objects. [#569](https://github.com/jacobwilliams/json-fortran/issues/569)
186+
[#570](https://github.com/jacobwilliams/json-fortran/pull/570) ([jacobwilliams](https://github.com/jacobwilliams))
53187

54188
### [8.5.2](https://github.com/jacobwilliams/json-fortran/tree/8.5.2) (2024-05-27)
55189

CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ include ( "cmake/checkOutOfSource.cmake" )
4040
#---------------------
4141
project (
4242
jsonfortran
43-
VERSION 8.5.2
43+
VERSION 9.2.1
4444
LANGUAGES Fortran
4545
)
4646

4747
# write the version file
48-
configure_file(${CMAKE_SOURCE_DIR}/.VERSION.in ${CMAKE_SOURCE_DIR}/.VERSION)
48+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/.VERSION.in ${CMAKE_CURRENT_SOURCE_DIR}/.VERSION)
4949

5050
if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
5151
option(JSON_FORTRAN_USE_OpenCoarrays
@@ -92,7 +92,7 @@ set ( JF_LIB_SRCS src/json_kinds.F90
9292
src/json_value_module.F90
9393
src/json_file_module.F90
9494
src/json_module.F90 )
95-
file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.F90" )
95+
file ( GLOB JF_TEST_SRCS "test/jf_test_*.F90" )
9696
set ( JF_TEST_UCS4_SUPPORT_SRC "${PROJECT_SOURCE_DIR}/src/tests/introspection/test_iso_10646_support.f90")
9797

9898
#-----------------------------------------
@@ -252,7 +252,7 @@ if ( NOT SKIP_DOC_GEN )
252252
set ( DOC_DIR "${PROJECT_BINARY_DIR}/doc" )
253253
set ( PAGES_DIR "${PROJECT_SOURCE_DIR}/pages" )
254254
set ( PROJ_DIR "${PROJECT_SOURCE_DIR}/src" )
255-
set ( FORD_PROJECT_FILE "${PROJECT_SOURCE_DIR}/json-fortran.md" )
255+
set ( FORD_PROJECT_FILE "${PROJECT_SOURCE_DIR}/ford.md" )
256256
if ( ENABLE_UNICODE )
257257
set ( MACRO_FLAG "-m USE_UCS4" )
258258
else ()
@@ -288,7 +288,7 @@ if ( NOT SKIP_DOC_GEN )
288288

289289
foreach ( DOC_SRC_FILE ${JF_LIB_SRCS} ${JF_TEST_SRCS} ${PROJECT_SOURCE_DIR}/README.md
290290
${PROJECT_SOURCE_DIR}/CHANGELOG.md ${PROJECT_SOURCE_DIR}/.github/CONTRIBUTING.md
291-
${PROJECT_SOURCE_DIR}/LICENSE ${PROJECT_SOURCE_DIR}/json-fortran.md ${PAGES_FILES} )
291+
${PROJECT_SOURCE_DIR}/LICENSE ${PROJECT_SOURCE_DIR}/ford.md ${PAGES_FILES} )
292292
list ( APPEND FORD_DEPENDS "${DOC_SRC_FILE}" )
293293
endforeach ()
294294
add_custom_command ( OUTPUT ${FORD_OUTPUTS_CACHED}

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
JSON-Fortran: A Modern Fortran JSON API
22
<https://github.com/jacobwilliams/json-fortran>
33

4-
Copyright (c) 2014-2024, Jacob Williams
4+
Copyright (c) 2014-2026, Jacob Williams
55
All rights reserved.
66

77
Redistribution and use in source and binary forms, with or without modification,

0 commit comments

Comments
 (0)