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

Author: Ian Porter

.VERSION

@@ -1 +1 @@
-6.10.0
+7.0.0

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 - [Change Log](#change-log)
     - [Unreleased](#unreleased)
+    - [7.0.0 (2019-01-26)](#700-2019-01-26)
+    - [6.11.0 (2019-01-19)](#611-2019-01-19)
     - [6.10.0 (2019-10-20)](#610-2019-10-20)
     - [6.9.0 (2018-07-29)](#690-2018-07-29)
     - [6.8.0 (2018-07-19)](#680-2018-07-19)
@@ -33,7 +35,38 @@
 
 ### [Unreleased](https://github.com/jacobwilliams/json-fortran/tree/HEAD)
 
-[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/6.10.0...HEAD)
+[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/7.0.0...HEAD)
+
+### [7.0.0](https://github.com/jacobwilliams/json-fortran/tree/7.0.0) (2019-01-26)
+
+[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/6.11.0...7.0.0)
+or [Download v7.0.0](https://github.com/jacobwilliams/json-fortran/releases/tag/7.0.0)
+
+**Enhancements:**
+
+- Added support for multiple real kinds:
+  * The library now supports the default real kind specified (`real32`, `real64` and `real128`) as well as the kinds in this set with less precision than the default. For example, if `real64` is specified (which is the default), then both `real32` and `real64` are available in all the public APIs. Internally, the values are always stored in a variable of the default kind. [\#386](https://github.com/jacobwilliams/json-fortran/issues/386) [\#387](https://github.com/jacobwilliams/json-fortran/pull/387) ([jacobwilliams](https://github.com/jacobwilliams))
+  * Added a `create_real()` method and a `json_real` parameter to replace `create_double()` and `json_double`. The old versions are still available for backward compatibility.
+  * Added CMake options to control integer and real kinds [\#284](https://github.com/jacobwilliams/json-fortran/issues/284)
+  * Updated the default real format statement to correctly correspond to the specified real kind.
+- Added new `json_file` constructor functions for strings. This allows a `json_file` to be initialized using syntax such as: `f = json_file('{"x": 1}')`. [\#381](https://github.com/jacobwilliams/json-fortran/issues/381) [\#382](https://github.com/jacobwilliams/json-fortran/pull/382) ([jacobwilliams](https://github.com/jacobwilliams))
+- Fixed some links in the documentation.
+
+**Bug fixes:**
+
+- Fixed an issue where the parser would fail if the JSON structure was just a lone integer. [\#388](https://github.com/jacobwilliams/json-fortran/issues/388) [\#389](https://github.com/jacobwilliams/json-fortran/pull/389) ([jacobwilliams](https://github.com/jacobwilliams))
+- Fixed an issue where the unit tests did not compile when using `real32` or `real128`. [\#383](https://github.com/jacobwilliams/json-fortran/issues/383) [\#384](https://github.com/jacobwilliams/json-fortran/pull/384) ([jacobwilliams](https://github.com/jacobwilliams))
+- Fixed various issues preventing compilation if the integer kind was changed from the default. [\#365](https://github.com/jacobwilliams/json-fortran/issues/365) [\#385](https://github.com/jacobwilliams/json-fortran/pull/385) ([jacobwilliams](https://github.com/jacobwilliams))
+- Renamed the integrated tests preprocessor flag to `INTEGRATED_TESTS` since it was mispelled. [\#390](https://github.com/jacobwilliams/json-fortran/issues/390) [\#391](https://github.com/jacobwilliams/json-fortran/pull/391) ([jacobwilliams](https://github.com/jacobwilliams))
+
+### [6.11.0](https://github.com/jacobwilliams/json-fortran/tree/6.11.0) (2019-01-19)
+
+[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/6.10.0...6.11.0)
+or [Download v6.11.0](https://github.com/jacobwilliams/json-fortran/releases/tag/6.11.0)
+
+**Enhancements:**
+
+- Speed up writing JSON to a string [\#377](https://github.com/jacobwilliams/json-fortran/issues/377) [\#378](https://github.com/jacobwilliams/json-fortran/pull/378) ([jacobwilliams](https://github.com/jacobwilliams))
 
 ### [6.10.0](https://github.com/jacobwilliams/json-fortran/tree/6.10.0) (2019-10-20)
 

CMakeLists.txt

@@ -36,6 +36,32 @@ include ( "cmake/checkOutOfSource.cmake" )
 #---------------------
 project ( jsonfortran NONE )
 
+#---------------------
+# Real and Integer kinds
+#---------------------
+
+SET(JSON_REAL_KIND "REAL64" CACHE STRING "Real kind parameter")
+SET_PROPERTY(CACHE JSON_REAL_KIND PROPERTY STRINGS REAL32 REAL64 REAL128)
+if(${JSON_REAL_KIND} MATCHES "REAL32")
+  add_definitions(-DREAL32)
+elseif(${JSON_REAL_KIND} MATCHES "REAL64")
+  add_definitions(-DREAL64)
+elseif(${JSON_REAL_KIND} MATCHES "REAL128")
+  add_definitions(-DREAL128)
+endif()
+
+SET(JSON_INT_KIND "INT32" CACHE STRING "Integer kind parameter")
+SET_PROPERTY(CACHE JSON_INT_KIND PROPERTY STRINGS INT8 INT16 INT32 INT64)
+if(${JSON_INT_KIND} MATCHES "INT8")
+  add_definitions(-DINT8)
+elseif(${JSON_INT_KIND} MATCHES "INT16")
+  add_definitions(-DINT16)
+elseif(${JSON_INT_KIND} MATCHES "INT32")
+  add_definitions(-DINT32)
+elseif(${JSON_INT_KIND} MATCHES "INT64")
+  add_definitions(-DINT64)
+endif()
+
 #----------------------------------
 # Get version (semantic versioning)
 # C.F. semver.org

LICENSE

@@ -1,7 +1,7 @@
 JSON-Fortran: A Fortran 2008 JSON API
 <https://github.com/jacobwilliams/json-fortran>
 
-Copyright (c) 2014-2018, Jacob Williams
+Copyright (c) 2014-2019, Jacob Williams
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

README.md

@@ -42,7 +42,7 @@ 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)](http://braumeister.org/formula/json-fortran)
+[![homebrew version](https://img.shields.io/homebrew/v/json-fortran.svg?style=plastic)](https://formulae.brew.sh/formula/json-fortran)
 
 Download the official versioned releases
 [here](https://github.com/jacobwilliams/json-fortran/releases/latest).
@@ -55,7 +55,7 @@ downloaded and installed with the [homebrew](http://brew.sh) package
 manager on Mac OS X. Once [homebrew](http://brew.sh) is installed,
 make sure that the formulae are up to date, view the package options
 and caveats, and install the
-[json-fortran formula](http://braumeister.org/formula/json-fortran):
+[json-fortran formula](https://formulae.brew.sh/formula/json-fortran):
 
 ```bash
 brew update
@@ -121,7 +121,7 @@ cmake_minimum_required ( VERSION 2.8.8 FATAL_ERROR )
 enable_language ( Fortran )
 project ( jf_test NONE )
 
-find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 6.10.0 REQUIRED )
+find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 7.0.0 REQUIRED )
 include_directories ( "${jsonfortran_INCLUDE_DIRS}" )
 
 file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.F90" )

json-fortran.md

@@ -29,7 +29,7 @@ extra_filetypes: .inc !
 print_creation_date: true
 creation_date: %Y-%m-%d %H:%M %z
 extra_mods: iso_fortran_env:https://gcc.gnu.org/onlinedocs/gfortran/ISO_005fFORTRAN_005fENV.html
-            ifcore:https://software.intel.com/en-us/node/525900
+            ifcore:https://software.intel.com/en-us/fortran-compiler-developer-guide-and-reference-tracebackqq
 md_extensions: markdown.extensions.toc
                markdown.extensions.smarty
 ---

pages/releases/index.md

@@ -25,6 +25,12 @@ 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.
 
+* [7.0.0](http://jacobwilliams.github.io/json-fortran/7.0.0/index.html)
+   ([FORD](https://github.com/Fortran-FOSS-Programmers/ford) generated documentation)
+    - [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/7.0.0)
+* [6.11.0](http://jacobwilliams.github.io/json-fortran/6.11.0/index.html)
+   ([FORD](https://github.com/Fortran-FOSS-Programmers/ford) generated documentation)
+    - [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/6.11.0)
 * [6.10.0](http://jacobwilliams.github.io/json-fortran/6.10.0/index.html)
    ([FORD](https://github.com/Fortran-FOSS-Programmers/ford) generated documentation)
     - [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/6.10.0)