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

Author: jacobwilliams

.travis.yml

@@ -1,7 +1,7 @@
 language: python
 
 python:
-  - 2.7
+  - 3.5
 
 sudo: false
 
@@ -57,6 +57,7 @@ install:
   - ln -fs /usr/bin/gfortran-4.9 "$HOME/.local/bin/gfortran" && gfortran --version
   - ls -l /usr/bin/gfortran-4.9
   - ln -fs /usr/bin/gcov-4.9 "$HOME/.local/bin/gcov" && gcov --version
+  - perl --version
   - |
     if ! which f90split; then
       wget http://people.sc.fsu.edu/~jburkardt/f_src/f90split/f90split.f90 && \

build.sh

@@ -68,6 +68,8 @@
 #    Jacob Williams : 12/27/2014
 #
 
+#set -x
+#set -v
 set -o errexit
 
 FORDMD='json-fortran.md'        # FORD options file for building documentation
@@ -314,13 +316,19 @@ if [[ $JF_SKIP_TESTS != [yY]* ]] ; then
     # run next commands in subshell to avoid `cd -`
     (cd "$BINDIR"
     GLOBIGNORE='*.*'
-    #
-    for TEST in jf_test_*; do
+    # from: http://stackoverflow.com/questions/7992689/bash-how-to-loop-all-files-in-sorted-order
+    ls jf_test_* | sed 's/^\([^0-9]*\)\([0-9]*\)/\1 \2/' | sort -k2,2n | tr -d ' ' |
+    while read TEST; do
         # It would be nice to run json output printed to stdout through jsonlint, however,
         # some tests output more than one json structure and these need to be split
+        echo ""
+        echo "======================================================"
+        echo ""
         echo "Running ${TEST}"
         "./${TEST}"
     done)
+    echo ""
+    echo "======================================================"
     GLOBIGNORE="$OLD_IGNORES"
     if [[ $CODE_COVERAGE = [yY]* ]] ; then
         for SRCFILE in json_string_utilities.F90 json_value_module.F90 json_file_module.F90 ; do
@@ -337,6 +345,23 @@ if [[ $JF_SKIP_TESTS != [yY]* ]] ; then
                 mv ${SRCFILE}.gcov ${SRCFILE}-no-unicode.gcov
             fi
             if [ -f ${SRCFILE}-unicode.gcov ] && [ -f ${SRCFILE}-no-unicode.gcov ]; then
+
+                ############## for debugging
+                #echo ""
+                #echo "-------------------"
+                #echo "no-unicode file"
+                #echo "-------------------"
+                #cat ${SRCFILE}-no-unicode.gcov
+                #echo ""
+                #echo "-------------------"
+                #echo "unicode file"
+                #echo "-------------------"
+                #cat ${SRCFILE}-unicode.gcov
+                #echo ""
+                #./pages/development-resources/gccr.pl -n -c ${SRCFILE}-no-unicode.gcov no-unicode \
+                #                  ${SRCFILE}-unicode.gcov unicode
+                ##############
+
                 # merge them
                 ./pages/development-resources/gccr.pl -n -c ${SRCFILE}-no-unicode.gcov no-unicode \
                                   ${SRCFILE}-unicode.gcov unicode > ${SRCFILE}.gcov

pages/development-resources/gccr.pl

@@ -248,7 +248,7 @@ ($$)
 			if($save_raw) {
 				$data{'line'}[$file_line_num]{'raw'} = $raw;
 			}
-		}elsif($line =~ /^\s+(\d+):\s*(\d+):(.*)/) {
+		}elsif($line =~ /^\s*(\d+):\s*(\d+):(.*)/) {
 
 			# line was executed
 

src/json_string_utilities.F90

@@ -62,6 +62,7 @@ module json_string_utilities
     public :: integer_to_string
     public :: real_to_string
     public :: string_to_integer
+    public :: string_to_real
     public :: valid_json_hex
     public :: to_unicode
     public :: escape_string
@@ -176,6 +177,35 @@ subroutine real_to_string(rval,real_fmt,compact_real,str)
     end subroutine real_to_string
 !*****************************************************************************************
 
+!*****************************************************************************************
+!> author: Jacob Williams
+!  date: 1/19/2014
+!
+!  Convert a string into a `real(RK)`.
+!
+!# History
+!  * Jacob Williams, 10/27/2015 : Now using `fmt=*`, rather than
+!    `fmt=real_fmt`, since it doesn't work for some unusual cases
+!    (e.g., when `str='1E-5'`).
+!  * Jacob Williams : 2/6/2017 : moved core logic to this routine.
+
+    subroutine string_to_real(str,rval,status_ok)
+
+    implicit none
+
+    character(kind=CK,len=*),intent(in) :: str
+    real(RK),intent(out)                :: rval
+    logical(LK),intent(out)             :: status_ok  !! true if there were no errors
+
+    integer(IK) :: ierr  !! read iostat error code
+
+    read(str,fmt=*,iostat=ierr) rval
+    status_ok = (ierr==0)
+    if (.not. status_ok) rval = 0.0_RK
+
+    end subroutine string_to_real
+!*****************************************************************************************
+
 !*****************************************************************************************
 !> author: Izaak Beekman
 !  date: 02/24/2015
@@ -333,7 +363,7 @@ subroutine escape_string(str_in, str_out)
         !trim the string if necessary:
         if (ipos<len(str_out)+1) then
             if (ipos==1) then
-                str_out = ''
+                str_out = CK_''
             else
 #if defined __GFORTRAN__
                 tmp = str_out(1:ipos-1)      !workaround for bug in gfortran 6.1
@@ -718,7 +748,7 @@ pure elemental function lowercase_string(str) result(s_lower)
     integer :: i  !! counter
     integer :: n  !! length of input string
 
-    s_lower = ''
+    s_lower = CK_''
     n = len_trim(str)
 
     if (n>0) then
@@ -754,7 +784,7 @@ pure subroutine replace_string(str,s1,s2)
 
     if (len(str)>0) then
 
-        tmp = ''  ! initialize
+        tmp = CK_''  ! initialize
         ilen1 = len(s1)
 
         !     .