Merge branch 'thread-safe' of https://github.com/jacobwilliams/json-fortran into coverage

updated test 15.

Author: jacobwilliams

.travis.yml

@@ -27,7 +27,7 @@ addons:
 # Build matrix: Run the three build systems and tests in parallel
 env:
   global:
-    - CHECK_README_PROGS="yes"
+    - CHECK_README_PROGS="no"
   matrix:
       # CMake build with unit tests, no documentation, with coverage analysis
       # No unicode so that coverage combined with the build script will cover unicode
@@ -41,10 +41,11 @@ env:
       DEPLOY_DOCUMENTATION="no"
 
       # build with build.sh, make documentation, run unit tests and perform coverage analysis
+      # JW note: disabled coverage for testing purposes !!!! need to fix !!!!
     - >
-      BUILD_SCRIPT="./build.sh --coverage --skip-documentation &&
-      ./build.sh --coverage --enable-unicode"
-      CODE_COVERAGE="yes"
+      BUILD_SCRIPT="./build.sh --skip-documentation &&
+      ./build.sh --enable-unicode"
+      CODE_COVERAGE="no"
       DEPLOY_DOCUMENTATION="yes"
 
 install:

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - [Change Log](#change-log)
     - [Unreleased](#unreleased)
+    - [4.3.0 (2015-12-05)](#430-2015-12-05)
     - [4.2.0 (2015-08-03)](#420-2015-08-03)
     - [4.1.1 (2015-05-27)](#411-2015-05-27)
     - [4.1.0 (2015-05-05)](#410-2015-05-05)
@@ -15,7 +16,30 @@
 
 ### [Unreleased](https://github.com/jacobwilliams/json-fortran/tree/HEAD)
 
-[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/4.2.0...HEAD)
+[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/4.3.0...HEAD)
+
+### [4.3.0](https://github.com/jacobwilliams/json-fortran/tree/4.3.0) (2015-12-05)
+
+[Complete Changeset](https://github.com/jacobwilliams/json-fortran/compare/4.2.0...4.3.0)
+or [Download v4.3.0](https://github.com/jacobwilliams/json-fortran/releases/tag/4.3.0)
+
+**Enhancements:**
+
+- Added routines for getting the `parent`, `next`, `previous`, and `tail` pointers [\#161](https://github.com/jacobwilliams/json-fortran/issues/161) ([jacobwilliams](https://github.com/jacobwilliams))
+- Added a deep copy routine for `json_value` structures [\#160](https://github.com/jacobwilliams/json-fortran/issues/160) ([jacobwilliams](https://github.com/jacobwilliams))
+- Updated the Visual Studio solution to VS 2013. Also removed the test projects (it now just compiles the library) ([jacobwilliams](https://github.com/jacobwilliams))
+
+**Fixed issues:**
+
+- Rewrote logic for decoding strings, and fixed bugs related to parsing strings with certain escape character combinations [\#164](https://github.com/jacobwilliams/json-fortran/issues/164) ([jacobwilliams](https://github.com/jacobwilliams))
+- Fixed a bug where some real numbers weren't being read in properly. Also added an option to output real numbers with `fmt=*` formatting [\#157](https://github.com/jacobwilliams/json-fortran/issues/157) ([jacobwilliams](https://github.com/jacobwilliams))
+
+**Merged pull requests:**
+
+- Minor documentation change. [\#153](https://github.com/jacobwilliams/json-fortran/pull/153) ([jacobwilliams](https://github.com/jacobwilliams))
+- Enabled FORD graphs in documentation. [\#149](https://github.com/jacobwilliams/json-fortran/pull/149) ([jacobwilliams](https://github.com/jacobwilliams))
+- Tag documentation fix [\#147](https://github.com/jacobwilliams/json-fortran/pull/147) ([zbeekman](https://github.com/zbeekman))
+- Fix url in 4.2.0 tag documentation [\#146](https://github.com/jacobwilliams/json-fortran/pull/146) ([zbeekman](https://github.com/zbeekman))
 
 ### [4.2.0](https://github.com/jacobwilliams/json-fortran/tree/4.2.0) (2015-08-03)
 

CONTRIBUTING.md

@@ -99,6 +99,5 @@ git rebase upstream/master
 - *Do NOT* allow your editor to make a bunch of indentation or white space changes, that will introduce non-substantive changes on lines that you have not actually edited.
 - The coding style is modern free-form Fortran, consistent with the Fortran 2008 standard.  Note that the two supported compilers (ifort and gfortran) do not currently include the entire Fortran 2008 standard. Therefore, only those language features supported by Gfortran 4.9 and Intel 13.1.0 are currently allowed.  This also means that previous versions of these compilers are not supported, and major changes to the code to support earlier compilers (or Fortran 95) will not be accepted.  At some point in the future (when compiler support has improved), all Fortran 2008 features will be allowed.
 - All subroutines and functions *must* be properly documented.  This includes useful inline comments as well as comment blocks using the [FORD](https://github.com/cmacmackin/ford/wiki/Writing-Documentation) syntax.
-- For simplicity, JSON-Fortran currently consists of one module file. It is not envisioned that it will ever need to expand to include multiple files (if it does, there would need to be a very good reason).
 
 [top](#contributing-to-json-fortran)

LICENSE

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

README.md

@@ -12,20 +12,13 @@ A Fortran 2008 JSON API
     - [Brief description](#brief-description)
     - [Download](#download)
     - [Building the library](#building-the-library)
-    - [Example Usage](#example-usage)
-        - [Reading JSON from a file](#reading-json-from-a-file)
-        - [Reading JSON from a string](#reading-json-from-a-string)
-        - [Modifying variables in a JSON file](#modifying-variables-in-a-json-file)
-        - [Writing a JSON file](#writing-a-json-file)
-        - [Building a JSON file from scratch](#building-a-json-file-from-scratch)
     - [Documentation](#documentation)
     - [Contributing](#contributing)
     - [License](#license)
     - [Miscellaneous](#miscellaneous)
 
 <!-- markdown-toc end -->
 
-
 Status
 ------
 [![Build Status](https://img.shields.io/travis/jacobwilliams/json-fortran/master.svg?style=plastic)](https://travis-ci.org/jacobwilliams/json-fortran)
@@ -40,6 +33,7 @@ Status
 Take a look at the
 [CHANGELOG](https://github.com/jacobwilliams/json-fortran/blob/master/CHANGELOG.md#unreleased)
 for a list of changes since the latest release.
+
 [top](#json-fortran)
 
 Brief description
@@ -120,7 +114,7 @@ cmake_minimum_required ( VERSION 2.8.8 FATAL_ERROR )
 enable_language ( Fortran )
 project ( jf_test NONE )
 
-find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 4.2.0 REQUIRED )
+find_package ( jsonfortran-${CMAKE_Fortran_COMPILER_ID} 4.3.0 REQUIRED )
 include_directories ( "${jsonfortran_INCLUDE_DIRS}" )
 
 file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.f90" )
@@ -135,161 +129,6 @@ endforeach()
 
 [top](#json-fortran)
 
-Example Usage
----------------
-In this section the basic functionality of the JSON-Fortran library is illustrated.
-
-### Reading JSON from a file
-
-Reading a JSON file and getting data from it is fairly
-straightforward using the `json_file` class.  Here is an example.  See unit tests 1 and 3-6
-for more examples. The source files may be found in `src/tests/`.
-
-```fortran
-    program example1
-
-        use json_module
-
-        type(json_file) :: json
-        logical :: found
-        integer :: i,j,k
-
-        ! initialize the module
-        call json_initialize()
-
-        ! read the file
-        call json%load_file(filename = '../files/inputs/test1.json')
-
-        ! print the file to the console
-        call json%print_file()
-
-        ! extract data from the file
-        ! [found can be used to check if the data was really there]
-        call json%get('version.major', i, found)
-        if ( .not. found ) stop 1
-        call json%get('version.minor', j, found)
-        if ( .not. found ) stop 1
-        call json%get('data(1).number', k, found)
-        if ( .not. found ) stop 1
-
-        ! clean up
-        call json%destroy()
-        if (json_failed()) stop 1
-
-    end program example1
-```
-
-[top](#json-fortran)
-
-### Reading JSON from a string
-
-JSON can also be read directly from a character string like so:
-```fortran
-    call json%load_from_string('{"name": "Leonidas"}')
-```
-
-[top](#json-fortran)
-
-### Modifying variables in a JSON file
-
-After reading a JSON file, if you want to change the values of some of the variables, you can use the `update` method.  For the example above:
-
-```fortran
-    ! [found can be used to check if the data was really there]
-    call json%update('version.major',9,found)  !change major version to 9
-    call json%update('version.minor',0,found)  !change minor version to 0
-    call json%update('version.patch',0,found)  !change patch to 0
-```
-
-[top](#json-fortran)
-
-### Writing a JSON file
-
-To print the JSON file (either to a file or the console), the `print_file` method can be used.  For the above example:
-
-```fortran
-    call json%print_file()         !prints to the console
-    call json%print_file(iunit)    !prints to the file connected to iunit
-```
-
-[top](#json-fortran)
-
-### Building a JSON file from scratch
-
-Constructing a JSON file element by element is slightly more complicated and involves the use
-of `json_value` pointers.  For more examples see unit tests 2, 4 and 7 in `src/tests/`.
-
-```fortran
-    program example2
-
-        use,intrinsic :: iso_fortran_env, only: wp => real64
-
-        use json_module
-
-        type(json_value),pointer :: p, inp
-
-        ! initialize the module
-        call json_initialize()
-
-        ! initialize the structure:
-        call json_create_object(p,'')
-
-        ! add an "inputs" object to the structure:
-        call json_create_object(inp,'inputs')
-        call json_add(p, inp) !add it to the root
-
-        ! add some data to inputs:
-        call json_add(inp, 't0', 0.1_wp)
-        call json_add(inp, 'tf', 1.1_wp)
-        call json_add(inp, 'x0', 9999.0000d0)
-        call json_add(inp, 'integer_scalar', 787)
-        call json_add(inp, 'integer_array', [2,4,99])
-        call json_add(inp, 'names', ['aaa','bbb','ccc'])
-        call json_add(inp, 'logical_scalar', .true.)
-        call json_add(inp, 'logical_vector', [.true., .false., .true.])
-        nullify(inp)  !don't need this anymore
-
-        ! write the file:
-        call json_print(p,'../files/example2.json')
-
-        !cleanup:
-        call json_destroy(p)
-        if (json_failed()) stop 1
-
-    end program example2
-```
-
-The code above produces the file:
-
-```JSON
-{
-  "inputs": {
-    "t0": 0.1E+0,
-    "tf": 0.11E+1,
-    "x0": 0.9999E+4,
-    "integer_scalar": 787,
-    "integer_array": [
-      2,
-      4,
-      99
-    ],
-    "names": [
-      "aaa",
-      "bbb",
-      "ccc"
-    ],
-    "logical_scalar": true,
-    "logical_vector": [
-      true,
-      false,
-      true
-    ]
-  }
-}
-```
-
-[top](#json-fortran)
-
 Documentation
 --------------
 
@@ -299,6 +138,8 @@ documentation can also be generated by processing the source files
 with [FORD](https://github.com/cmacmackin/ford).  Note that both the
 shell script and CMake will also generate these files automatically in the documentation folder, assuming you have FORD installed.
 
+Some examples can also be found on the [wiki](https://github.com/jacobwilliams/json-fortran/wiki/Example-Usage).
+
 [top](#json-fortran)
 
 Contributing

__VERSION__

@@ -1 +1 @@
-4.2.0
+4.3.0

files/inputs/test1.json

@@ -11,7 +11,8 @@
     "..\\path\\to\\files\\file2.txt",
     "..\\path\\to\\files\\file3.txt",
     "test \u2FA4 \uABCD \uABCD\uABCDtest",
-    "   test    test test"
+    "   test  \\u \" blah\\\" test test",
+    "..\\path\\to\\files\\"
   ],
 "empty_array": [
   ],

json-fortran.md

@@ -1,3 +1,4 @@
+---
 project: JSON-Fortran
 favicon: ./media/json-fortran-32x32.png
 project_dir: ./src
@@ -20,27 +21,33 @@ display: public
 source: true
 graph: true
 extra_mods: iso_fortran_env:https://gcc.gnu.org/onlinedocs/gfortran/ISO_005fFORTRAN_005fENV.html
-md_extensions: markdown.extensions.toc
+md_extensions: markdown.extensions.toc(anchorlink=True)
                markdown.extensions.smarty(smart_quotes=False)
+---
+
+--------------------
 
 [TOC]
 
-# Brief description
+Brief description
+-----------------
 
 A user-friendly and object-oriented API for reading and writing JSON files, written in
 modern Fortran (Fortran 2003+).  The source code is
 [a single Fortran module](|url|/module/json_module.html) file
 ([json_module.F90](|url|/sourcefile/json_module.f90.html)).
 
-# License
+License
+-------
 
 The JSON-Fortran source code and related files and documentation are
 distributed under a permissive free software license (BSD-style).  See
 the
 [LICENSE](http://jacobwilliams.github.io/json-fortran/page/development-resources/LICENSE.html)
 file for more details.
 
-# Official Releases
+Official Releases
+-----------------
 
 The **current stable release** is **{!__VERSION__!}** and can be [downloaded
 on GitHub](https://github.com/jacobwilliams/json-fortran/releases/latest)
@@ -54,7 +61,8 @@ A list of all past releases, links to their documentation, and the
 chage log can be found on the
 [releases page](http://jacobwilliams.github.io/json-fortran/page/releases/index.html).
 
-# Miscellaneous
+Miscellaneous
+-------------
 
 * For more information about JSON, see: <http://www.json.org/>
 

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.
 
+* [4.3.0](http://jacobwilliams.github.io/json-fortran/4.3.0/index.html)
+   ([FORD](https://github.com/cmacmackin/ford) generated documentation)
+    - [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/4.3.0)
 * [4.2.0](http://jacobwilliams.github.io/json-fortran/4.2.0/index.html)
    ([FORD](https://github.com/cmacmackin/ford) generated documentation)
     - [Download](https://github.com/jacobwilliams/json-fortran/releases/tag/4.2.0)