Merge branch 'master' of https://github.com/jacobwilliams/json-fortran into speed

Author: jacobwilliams

.VERSION

@@ -1 +1 @@
-8.2.5
+8.3.0

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - [Change Log](#change-log)
     - [Unreleased](#unreleased)
+    - [8.3.0 (2022-05-07)](#830-2022-05-07)
     - [8.2.5 (2021-08-17)](#825-2021-08-17)
     - [8.2.4 (2021-08-15)](#824-2021-08-15)
     - [8.2.3 (2021-06-05)](#823-2021-06-05)
@@ -44,7 +45,25 @@
 
 ### [Unreleased](https://github.com/jacobwilliams/json-fortran/tree/HEAD)
 
-[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.2.5...HEAD)
+[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.3.0...HEAD)
+
+### [8.3.0](https://github.com/jacobwilliams/json-fortran/tree/8.3.0) (2022-05-07)
+
+[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/8.2.5...8.3.0)
+or [Download v8.3.0](https://github.com/jacobwilliams/json-fortran/releases/tag/8.3.0)
+
+**Enhancements:**
+
+- Added procedure to query version of json-fortran [\#505](https://github.com/jacobwilliams/json-fortran/issues/505) [\#512](https://github.com/jacobwilliams/json-fortran/pull/512) [\#516](https://github.com/jacobwilliams/json-fortran/pull/516) ([jacobwilliams](https://github.com/jacobwilliams))
+- Updates to the CI [\#509](https://github.com/jacobwilliams/json-fortran/pull/509) [\#508](https://github.com/jacobwilliams/json-fortran/issues/508) ([jacobwilliams](https://github.com/jacobwilliams))
+- Add information on conda-forge distribution [\#506](https://github.com/jacobwilliams/json-fortran/pull/506) ([awvwgk](https://github.com/awvwgk))  [\#507](https://github.com/jacobwilliams/json-fortran/issues/507)
+- Updated CMake to export include directories with target [\#504](https://github.com/jacobwilliams/json-fortran/pull/504) [\#503](https://github.com/jacobwilliams/json-fortran/issues/503) ([awvwgk](https://github.com/awvwgk))
+
+
+**Bug Fixes:**
+
+- Fixed a minor standards violation [\#510](https://github.com/jacobwilliams/json-fortran/issues/510) [\#511](https://github.com/jacobwilliams/json-fortran/pull/511) ([jacobwilliams](https://github.com/jacobwilliams))
+- Minor changes to work around issues with nvfortran compiler [\#496](https://github.com/jacobwilliams/json-fortran/pull/496) ([vyu16](https://github.com/vyu16))
 
 ### [8.2.5](https://github.com/jacobwilliams/json-fortran/tree/8.2.5) (2021-08-17)
 
@@ -59,8 +78,7 @@ or [Download v8.2.5](https://github.com/jacobwilliams/json-fortran/releases/tag/
 **Bug Fixes:**
 
 - Fixed a potential uninitialized variable issue in `get_current_line_from_file_stream`
-- Fixed a memory leak when parsing an invalid JSON
-- Fixed various memory issues in the unit tests [\#495](https://github.com/jacobwilliams/json-fortran/pull/495) ([jacobwilliams](https://github.com/jacobwilliams))
+- Fixed a memory leak when parsing an invalid JSON. Fixed various memory issues in the unit tests [\#494](https://github.com/jacobwilliams/json-fortran/issues/494) [\#495](https://github.com/jacobwilliams/json-fortran/pull/495) ([jacobwilliams](https://github.com/jacobwilliams))
 
 ### [8.2.4](https://github.com/jacobwilliams/json-fortran/tree/8.2.4) (2021-08-15)
 

README.md

@@ -21,8 +21,10 @@ JSON-Fortran: A Modern Fortran JSON API
 Status
 ------
 [![Build Status](https://github.com/jacobwilliams/json-fortran/actions/workflows/CI.yml/badge.svg)](https://github.com/jacobwilliams/json-fortran/actions)
-[![GitHub issues](https://img.shields.io/github/issues/jacobwilliams/json-fortran.png?style=plastic)](https://github.com/jacobwilliams/json-fortran/issues)
+[![GitHub issues](https://img.shields.io/github/issues/jacobwilliams/json-fortran.png)](https://github.com/jacobwilliams/json-fortran/issues)
 [![Codecov](https://codecov.io/gh/jacobwilliams/json-fortran/branch/master/graph/badge.svg)](https://codecov.io/gh/jacobwilliams/json-fortran)
+[![last-commit](https://img.shields.io/github/last-commit/jacobwilliams/json-fortran)](https://github.com/jacobwilliams/json-fortran/commits/master)
+
 
 Take a look at the
 [CHANGELOG](https://github.com/jacobwilliams/json-fortran/blob/master/CHANGELOG.md#unreleased)
@@ -40,9 +42,9 @@ JSON-Fortran is a user-friendly, thread-safe, and object-oriented API for readin
 Download
 --------------------
 
-[![GitHub release](https://img.shields.io/github/release/jacobwilliams/json-fortran.svg?style=plastic)](https://github.com/jacobwilliams/json-fortran/releases)
-[![homebrew version](https://img.shields.io/homebrew/v/json-fortran.svg?style=plastic)](https://formulae.brew.sh/formula/json-fortran)
-[![Conda (channel only)](https://img.shields.io/conda/vn/conda-forge/json-fortran?style=plastic)](https://github.com/conda-forge/json-fortran-feedstock)
+[![GitHub release](https://img.shields.io/github/release/jacobwilliams/json-fortran.svg)](https://github.com/jacobwilliams/json-fortran/releases)
+[![homebrew version](https://img.shields.io/homebrew/v/json-fortran.svg)](https://formulae.brew.sh/formula/json-fortran)
+[![Conda (channel only)](https://img.shields.io/conda/vn/conda-forge/json-fortran)](https://github.com/conda-forge/json-fortran-feedstock)
 
 Download the official versioned releases
 [here](https://github.com/jacobwilliams/json-fortran/releases/latest).
@@ -137,7 +139,7 @@ cmake_minimum_required ( VERSION 2.8.8 FATAL_ERROR )
 enable_language ( Fortran )
 project ( jf_test NONE )
 
-find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 8.2.5 REQUIRED )
+find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 8.3.0 REQUIRED )
 
 file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.F90" )
 foreach ( UNIT_TEST ${JF_TEST_SRCS} )

pages/development-resources/release-checklist.md

@@ -52,7 +52,7 @@ remain accurate.
 	 1. Add `pages/releases/index.md` to the git index: `git add pages/releases/index.md`
  1. Update the version string in remaining files requiring manual edits:
      1. Edit the `.VERSION` file
-     1. Edit the CMake example on line 124 of `README.md`
+     1. Edit the CMake example on line 142 of `README.md`
      1. Edit the `json_fortran_version` string in `json_module.F90`
 	 1. Add these files to the git index: `git add .VERSION README.md ./src/json_module.F90`
  1. Commit the changes to the master branch: `git commit`

pages/releases/index.md

@@ -25,6 +25,9 @@ documentation from the documentation for official releases other than
 using the browser's back button. Feel free to bookmark this page, or
 the [main project page](|url|/index.html) for convenient navigation.
 
+* [8.3.0](https://jacobwilliams.github.io/json-fortran/prev/8.3.0/index.html)
+   ([FORD](https://github.com/Fortran-FOSS-Programmers/ford) generated documentation)
+    - [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/8.3.0)
 * [8.2.5](https://jacobwilliams.github.io/json-fortran/prev/8.2.5/index.html)
    ([FORD](https://github.com/Fortran-FOSS-Programmers/ford) generated documentation)
     - [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/8.2.5)

src/json_module.F90

@@ -73,13 +73,32 @@ module json_module
 
     implicit none
 
-    character(kind=json_CK,len=5),protected :: json_fortran_version = '8.2.5'
+    character(kind=json_CK,len=*),parameter,private :: version = '8.3.0'
         !! JSON-Fortran version.
         !!
         !!@note This string should match the one in the `.VERSION` file (which is used
-        !! for the documentation generation.)
+        !!      for the documentation generation.)
 
     public
 
+    contains
+!*****************************************************************************************
+
+!*****************************************************************************************
+!>
+!  Returns the JSON-Fortran version string.
+
+    function json_fortran_version() result(ver)
+
+    implicit none
+
+    character(len=:),allocatable :: ver  !! JSON-Fortran version string
+
+    ver = version
+
+    end function json_fortran_version
+!*****************************************************************************************
+
+!*****************************************************************************************
     end module json_module
 !*****************************************************************************************

src/json_parameters.F90

@@ -57,14 +57,14 @@ module json_parameters
     character(kind=CK,len=*),parameter :: dot             = CK_'.'  !! path separator for [[json_get_by_path_default]]
     character(kind=CK,len=*),parameter :: tilde           = CK_'~'  !! RFC 6901 escape character
     character(kind=CK,len=*),parameter :: single_quote    = CK_"'"  !! for JSONPath bracket-notation
-    character(kind=CK,len=*),parameter :: slash           = CK_'/'  !! JSON special character
-    character(kind=CK,len=*),parameter :: backslash       = CK_'\'  !! JSON special character
     character(kind=CK,len=*),parameter :: quotation_mark  = CK_'"'  !! JSON special character
     character(kind=CK,len=*),parameter :: bspace          = achar(8,  kind=CK) !! JSON special character
     character(kind=CK,len=*),parameter :: horizontal_tab  = achar(9,  kind=CK) !! JSON special character
     character(kind=CK,len=*),parameter :: newline         = achar(10, kind=CK) !! JSON special character
     character(kind=CK,len=*),parameter :: formfeed        = achar(12, kind=CK) !! JSON special character
     character(kind=CK,len=*),parameter :: carriage_return = achar(13, kind=CK) !! JSON special character
+    character(kind=CK,len=*),parameter :: slash           = achar(47, kind=CK) !! JSON special character
+    character(kind=CK,len=*),parameter :: backslash       = achar(92, kind=CK) !! JSON special character
 
     !> default real number format statement (for writing real values to strings and files).
     !  Note that this can be overridden by calling [[json_initialize]].

src/tests/jf_test_01.F90

@@ -57,7 +57,7 @@ subroutine test_1(error_cnt)
     write(error_unit,'(A)') '================================='
     write(error_unit,'(A)') ''
 
-    write(error_unit,'(A)') 'JSON-Fortran version: '//json_fortran_version
+    write(error_unit,'(A)') 'JSON-Fortran version: '//json_fortran_version()
 
     ! parse the json file:
     write(error_unit,'(A)') ''