Merge branch 'master' of github.com:zbeekman/json-fortran into CMake-build

This incorporates upstream changes from
github.com:jacobwilliams/json-fortran made by @jacobwilliams.
Conflicts:
	README.md

Author: zbeekman

README.md

@@ -1,19 +1,19 @@
 json-fortran
 ============
 
-A Fortran 2003/2008 JSON API
+A Fortran 2008 JSON API
 
 Brief Description
 ---------------
 
- A mostly-complete API for reading and writing JSON files, written in
- modern Fortran.  The code requires a Fortran compiler that supports
- various Fortran 2003 and Fortran 2008 features such as: allocatable
- strings, associate, newunit, generic, class, and abstract interface.
- I am using the Intel Fortran compiler 13.1.0 on Linux (the Mac and PC
- versions should also work fine).  It also currently compiles under
- recent experimental 4.9 release of the gnu gfortran compiler.  The
- source code is a single Fortran module file (json_module.f90).
+A mostly-complete API for reading and writing JSON files, written in
+modern Fortran.  The code requires a Fortran compiler that supports
+various Fortran 2003 and Fortran 2008 features such as: allocatable
+strings, associate, newunit, generic, class, and abstract interface.
+It has been successfully compiled with the Intel Fortran compiler
+13.1.0 (and greater) and the recent [4.9 release of the GNU gfortran
+compiler](http://gcc.gnu.org/wiki/GFortran/News#GCC4.9).  The source
+code is a single Fortran module file (json_module.f90).
 
 Building the Library
 --------------------
@@ -22,14 +22,14 @@ Currently two ways are provided to build the jsonfortran library
 (libjsonfortran). A build script, build.sh is provided in the project
 root directory. Additionally, a [CMake](http://www.cmake.org) build
 system is provided. This build system has been tested on Mac and Linux
-using the Intel Fortran Compiler. It has not been tested on
-Windows. This CMake based build provides an install target, and
-exports from both the install location and the build location so that
-building and using json-fortran in another CMake based project is
+using the Intel Fortran Compiler and gfortran 4.9. It has not been
+tested on Windows. This CMake based build provides an install target,
+and exports from both the install location and the build location so
+that building and using json-fortran in another CMake based project is
 trivial. To get started with the CMake based build, set the
 environment variable `FC` to point to your Fortran compiler, and
 create a build directory. Then `(cmake-gui|ccmake|cmake)
-/path/to/json-fortran` to configure, `make` to build and `make
+/path/to/json-fortran-root` to configure, `make` to build and `make
 install` to optionally install. As long as the project is built with
 CMake other CMake projects can find it and link against it:
 
@@ -134,10 +134,10 @@ of pointers.  See the json_example.f90 file for more examples.
 Other Comments
 ---------------
 
-This code is a fork and extensive upgrade of the FSON code that can be
-found at: <https://github.com/josephalevin/fson>.  It includes many
-features that the original code did not have, and fixes many of that
-code's bugs.
+This code is a fork and extensive upgrade of the Fortran 95 FSON code
+that can be found at: <https://github.com/josephalevin/fson>.  It
+includes many features that the original code did not have, and fixes
+many of that code's bugs.
 
 More About JSON
 ------------

build.sh

@@ -1,7 +1,9 @@
 #!/bin/sh
 
 #
-#  Build the json library and example program on Linux using ifort
+#  This is just a simple script to 
+#  build the json-fortran library and 
+#  example program on Linux and Mac.
 #
 #  Jacob Williams : 2/8/2014
 #
@@ -35,6 +37,8 @@ ARCHIVERFLAGS='-cq'
 FEXT='.f90'
 OBJEXT='.o'
 LIBEXT='.a'
+MODEXT='.mod'
+WC='*'
 
 LIBOUT='libjson'
 EXEOUT='json'
@@ -46,6 +50,11 @@ EXAMPLECODE='json_example'
 mkdir -p $BUILDDIR
 mkdir -p $BINDIR
 
+#clean build:
+rm -f $BUILDDIR$WC$OBJEXT
+rm -f $BUILDDIR$WC$MODEXT
+rm -f $BUILDDIR$WC$LIBEXT
+
 #build library:
 $FCOMPILER $FCOMPILERFLAGS -c $SRCDIR$MODCODE$FEXT $FCMODULEPATHFLAG$BUILDDIR
 mv $MODCODE$OBJEXT $BUILDDIR

src/json_example.f90

@@ -605,7 +605,7 @@ subroutine print_error_message()
 
     !print it if there is one:
     if (.not. status_ok) then
-        write(*,*) error_msg
+        write(*,'(A)') error_msg
         deallocate(error_msg)
         call json_clear_exceptions()
     end if

src/json_module.f90

@@ -7,7 +7,7 @@ module json_module
 !    json_module
 !
 !  DESCRIPTION
-!    JSON-FORTRAN: A Fortran 2003/2008 JSON (JavaScript Object Notation) API.
+!    JSON-FORTRAN: A Fortran 2008 JSON (JavaScript Object Notation) API.
 !
 !  NOTES
 !    -Based on fson by Joseph A. Levin (see LICENSE below)
@@ -2855,22 +2855,20 @@ subroutine json_parse(file, p)
     character(len=*),intent(in) :: file
     type(json_value),pointer    :: p
 
-    integer :: iunit
-    integer :: istat
-
-    character(len=256) :: line
+    integer :: iunit, istat
+    character(len=:),allocatable :: line
 
     !clean any exceptions and initialize:
     call json_initialize()
 
     ! open the file
-    open (    newunit     = iunit, &
-            file         = file, &
-            status         = 'OLD', &
-            action         = 'READ', &
-            form         = 'FORMATTED', &
-            position     = 'REWIND', &
-            iostat        = istat)
+    open (  newunit     = iunit, &
+            file        = file, &
+            status      = 'OLD', &
+            action      = 'READ', &
+            form        = 'FORMATTED', &
+            position    = 'REWIND', &
+            iostat      = istat)
 
     if (istat==0) then
 
@@ -2888,10 +2886,10 @@ subroutine json_parse(file, p)
         !   can print the line where the error occurred:
         !
         if (exception_thrown) then
-            backspace(iunit)
-            read(iunit, fmt='(A256)',iostat=istat) line
+            call get_current_line_from_file(iunit,line)
             if (istat==0) err_message = err_message//new_line(' ')//&
-                                        '   Error in line: '//trim(line)
+                                        'Offending line: '//trim(line)
+            if (allocated(line)) deallocate(line)
         end if
 
         ! close the file
@@ -2909,6 +2907,58 @@ subroutine json_parse(file, p)
     end subroutine json_parse
 !********************************************************************************
 
+!********************************************************************************
+    subroutine get_current_line_from_file(iunit,line)
+!********************************************************************************
+!****f* json_module/get_current_line_from_file
+!
+!  NAME
+!    get_current_line_from_file
+!
+!  DESCRIPTION
+!    Rewind the file to the beginning of the current line, and return this line.
+!    The file is assumed to be opened.
+!
+!  AUTHOR
+!    Jacob Williams
+!
+!********************************************************************************
+    
+    implicit none
+    
+    integer,intent(in)    :: iunit
+    character(len=:),allocatable,intent(out)    :: line
+    
+    integer,parameter           :: n_chunk = 256      !chunk size [arbitrary]
+    character(len=*),parameter  :: nfmt = '(A256)'    !corresponding format statement
+    
+    character(len=n_chunk) :: chunk
+    integer :: istat,isize
+    
+    !initialize:
+    line = ''
+
+    !rewind to beginning of the current record:
+    backspace(iunit, iostat=istat)
+
+    !loop to read in all the characters in the current record.
+    ![the line is read in chunks until the end of the line is reached]
+    if (istat==0) then
+        do
+            read(iunit,fmt=nfmt,advance='NO',size=isize,iostat=istat) chunk
+            if (istat==0) then            
+                line = line//chunk
+            else
+                if (isize>0) line = line//chunk(1:isize)
+                exit
+            end if
+        end do
+    end if
+    
+!********************************************************************************
+    end subroutine get_current_line_from_file
+!********************************************************************************
+    
 !********************************************************************************
     recursive subroutine parse_value(unit, value)
 !********************************************************************************