conflict resolution

Author: jacobwilliams

.travis.yml

@@ -50,7 +50,7 @@ install:
   - sudo ln -fs /usr/bin/gcov-4.9 /usr/bin/gcov && gcov --version
   - if [[ $FoBiS == [yY]* ]]; then sudo -H pip install FoBiS.py && FoBiS.py --version; fi
   - if [[ $DOCS == [yY]* ]]; then sudo -H pip install ford && ford --version; fi
-  - if [[ $CHECK_README_PROGS == [yY]* ]]; then gfortran -o f90split f90split.f90 && ./f90split README.md && for f in example*.md; do mv $f src/tests/jf_test_${f%.md}.f90; done; rm f90split.f90 f90split; fi
+  - if [[ $CHECK_README_PROGS == [yY]* ]]; then gfortran -o f90split f90split.f90 && ./f90split README.md && shopt -s extglob && for f in !(README|CONTRIBUTING|CHANGELOG).md; do mv $f src/tests/jf_test_${f%.md}.f90; done; rm f90split.f90 f90split; fi
 
 script:
   - echo $BUILD_SCRIPT

src/json_module.F90

@@ -39,7 +39,7 @@
 !
 !  **json-fortran License:**
 !
-!    JSON-FORTRAN: A Fortran 2008 JSON API
+!    JSON-Fortran: A Fortran 2008 JSON API
 !
 !    http://github.com/jacobwilliams/json-fortran
 !
@@ -844,8 +844,8 @@ end subroutine array_callback_func
     !6 = sign + leading 0 + decimal + 'E' + exponent sign + 1 extra
     integer(IK),parameter :: max_numeric_str_len = real_precision + real_exponent_digits + 6
     ! real format set by library initialization
-    character(kind=CDK,len=*),parameter :: int_fmt  = '(I0)' !minimum width format for integers
-    character(kind=CK, len=*),parameter :: star     = '*'    !for invalid numbers
+    character(kind=CDK,len=*),parameter :: int_fmt  = '(ss,I0)' !minimum width format for integers
+    character(kind=CK, len=*),parameter :: star     = '*'       !for invalid numbers
 
     !real string printing:
     character(kind=CDK,len=:),allocatable :: real_fmt  !the format string to use for real numbers
@@ -1588,13 +1588,13 @@ subroutine json_initialize(verbose,compact_reals)
     ! set the default output/input format for reals:
     !  [this only needs to be done once, since it can't change]
     if (.not. allocated(real_fmt)) then
-                      write(w,'(I0)',iostat=istat) max_numeric_str_len
-        if (istat==0) write(d,'(I0)',iostat=istat) real_precision
-        if (istat==0) write(e,'(I0)',iostat=istat) real_exponent_digits
+                      write(w,'(ss,I0)',iostat=istat) max_numeric_str_len
+        if (istat==0) write(d,'(ss,I0)',iostat=istat) real_precision
+        if (istat==0) write(e,'(ss,I0)',iostat=istat) real_exponent_digits
         if (istat==0) then
-            real_fmt = '(E' // trim(w) // '.' // trim(d) // 'E' // trim(e) // ')'
+            real_fmt = '(ss,E' // trim(w) // '.' // trim(d) // 'E' // trim(e) // ')'
         else
-            real_fmt = '(E30.16E3)'  !just use this one (should never happen)
+            real_fmt = '(ss,E30.16E3)'  !just use this one (should never happen)
         end if
     end if
 
@@ -1644,7 +1644,7 @@ subroutine json_throw_exception(msg)
 
     if (is_verbose) then
         write(*,'(A)') '***********************'
-        write(*,'(A)') 'JSON-FORTRAN EXCEPTION: '//trim(msg)
+        write(*,'(A)') 'JSON-Fortran EXCEPTION: '//trim(msg)
         !call backtrace()     ! gfortran (use -fbacktrace -fall-intrinsics flags)
         !call tracebackqq(-1) ! intel (requires "use ifcore" in this routine)
         write(*,'(A)') '***********************'
@@ -6487,7 +6487,7 @@ subroutine compact_real_string(str)
     decimal_pos = scan(str,CK_'.')
     if (exp_start /= 0) separator = str(exp_start:exp_start)
 
-    if (exp_start > 0 .and. exp_start < decimal_pos) then !signed, exponent-less float
+    if ( exp_start < decimal_pos ) then !possibly signed, exponent-less float
 
         significand = str
         sig_trim = len(trim(significand))