additional refactoring.

Disabled coverage in travis to see if tests will pass without it.

Author: jacobwilliams

.travis.yml

@@ -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:

src/json_parameters.F90

@@ -23,6 +23,11 @@ module json_parameters
     character(kind=CK,len=*),parameter :: end_array       = ']'
     character(kind=CK,len=*),parameter :: delimiter       = ','
     character(kind=CK,len=*),parameter :: colon_char      = ':'
+    character(kind=CK,len=*),parameter :: start_array_alt = '('  !! for [[json_get_by_path]]
+    character(kind=CK,len=*),parameter :: end_array_alt   = ')'  !! for [[json_get_by_path]]
+    character(kind=CK,len=*),parameter :: root            = '$'  !! for [[json_get_by_path]]
+    character(kind=CK,len=*),parameter :: this            = '@'  !! for [[json_get_by_path]]
+    character(kind=CK,len=*),parameter :: child           = '.'  !! for [[json_get_by_path]]
     character(kind=CK,len=*),parameter :: bspace          = achar(8)
     character(kind=CK,len=*),parameter :: horizontal_tab  = achar(9)
     character(kind=CK,len=*),parameter :: newline         = achar(10)
@@ -34,9 +39,9 @@ module json_parameters
 
     !These were parameters, but gfortran bug (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65141)
     !necessitates moving them here to be variables
-    character(kind=CK,len=4) :: null_str  = 'null'
-    character(kind=CK,len=4) :: true_str  = 'true'
-    character(kind=CK,len=5) :: false_str = 'false'
+    character(kind=CK,len=4),protected :: null_str  = 'null'
+    character(kind=CK,len=4),protected :: true_str  = 'true'
+    character(kind=CK,len=5),protected :: false_str = 'false'
 
     integer, private :: i_      !! just a counter for control_chars array
     character(kind=CK,len=*),dimension(32),parameter :: control_chars = &
@@ -68,5 +73,7 @@ module json_parameters
                                             !! output to strings rather than files.
                                             !! See 9.5.6.12 in the F2003/08 standard
 
+    integer(IK),parameter,public :: seq_chunk_size = 256 !! chunk size for reading sequential files
+
     end module json_parameters
 !*****************************************************************************************

src/json_value_module.F90

@@ -264,12 +264,12 @@ end subroutine traverse_callback_func
         module procedure MAYBEWRAP(json_value_add_logical_vec)
         module procedure MAYBEWRAP(json_value_add_string)
         module procedure MAYBEWRAP(json_value_add_string_vec)
-#     ifdef USE_UCS4
+#ifdef USE_UCS4
         module procedure json_value_add_string_name_ascii
         module procedure json_value_add_string_val_ascii
         module procedure json_value_add_string_vec_name_ascii
         module procedure json_value_add_string_vec_val_ascii
-#     endif
+#endif
     end interface json_add
     !*************************************************************************************
 
@@ -289,10 +289,10 @@ end subroutine traverse_callback_func
                          MAYBEWRAP(json_update_double),&
                          MAYBEWRAP(json_update_integer),&
                          MAYBEWRAP(json_update_string)
-#     ifdef USE_UCS4
+#ifdef USE_UCS4
         module procedure json_update_string_name_ascii
         module procedure json_update_string_val_ascii
-#     endif
+#endif
     end interface json_update
     !*************************************************************************************
 
@@ -784,11 +784,14 @@ subroutine json_initialize(verbose,compact_reals,print_signs,real_format)
     !clear any errors from previous runs:
     call json_clear_exceptions()
 
-    !JW note: do we need this?.....
+    !
+    !JW comment out for now (these are now protected variables in another module)
+    ! for thread-save version, we won't be able to have global variables.........
+    !
     !Ensure gfortran bug work around "parameters" are set properly
-    null_str  = 'null'
-    true_str  = 'true'
-    false_str = 'false'
+    !null_str  = 'null'
+    !true_str  = 'true'
+    !false_str = 'false'
 
     !Just in case, clear these global variables also:
     pushed_index = 0
@@ -797,11 +800,11 @@ subroutine json_initialize(verbose,compact_reals,print_signs,real_format)
     line_count   = 1
     ipos         = 1
 
-# ifdef USE_UCS4
+#ifdef USE_UCS4
     ! reopen stdout and stderr with utf-8 encoding
     open(output_unit,encoding='utf-8')
     open(error_unit, encoding='utf-8')
-# endif
+#endif
 
     !verbose error printing:
     if (present(verbose)) is_verbose = verbose
@@ -1055,7 +1058,8 @@ recursive subroutine json_value_destroy(me,destroy_next)
     implicit none
 
     type(json_value),pointer :: me
-    logical(LK),intent(in),optional :: destroy_next  !! if true, then me%next is also destroyed (default is true)
+    logical(LK),intent(in),optional :: destroy_next  !! if true, then me%next
+                                                     !! is also destroyed (default is true)
 
     logical(LK) :: des_next
     type(json_value), pointer :: p
@@ -1819,7 +1823,7 @@ subroutine json_value_add_logical_vec(me, name, val)
     logical(LK),dimension(:),intent(in) :: val   !! value
 
     type(json_value),pointer :: var
-    integer(IK) :: i    !counter
+    integer(IK) :: i    !! counter
 
     !create the variable as an array:
     call json_value_create(var)
@@ -2727,13 +2731,9 @@ subroutine json_get_by_path(me, path, p, found)
     type(json_value),pointer,intent(out) :: p
     logical(LK),intent(out),optional     :: found  !! true if it was found
 
-    character(kind=CK,len=1),parameter :: start_array_alt = '('
-    character(kind=CK,len=1),parameter :: end_array_alt   = ')'
-    character(kind=CK,len=1),parameter :: root            = '$'
-    character(kind=CK,len=1),parameter :: this            = '@'
-    character(kind=CK,len=1),parameter :: child           = '.'
-
-    integer(IK)              :: i,length,child_i
+    integer(IK)              :: i
+    integer(IK)              :: length
+    integer(IK)              :: child_i
     character(kind=CK,len=1) :: c
     logical(LK)              :: array
     type(json_value),pointer :: tmp
@@ -4358,10 +4358,7 @@ subroutine get_current_line_from_file_sequential(iunit,line)
     integer(IK),intent(in)                           :: iunit  !! file unit number
     character(kind=CK,len=:),allocatable,intent(out) :: line   !! current line
 
-    integer(IK),parameter               :: n_chunk = 256   ! chunk size [arbitrary]
-    character(kind=CDK,len=*),parameter :: nfmt = '(A256)' ! corresponding format statement
-
-    character(kind=CK,len=n_chunk) :: chunk
+    character(kind=CK,len=seq_chunk_size) :: chunk
     integer(IK) :: istat,isize
 
     !initialize:
@@ -4374,12 +4371,12 @@ subroutine get_current_line_from_file_sequential(iunit,line)
     ![the line is read in chunks until the end of the line is reached]
     if (istat==0) then
         do
-            isize=0
-            read(iunit,fmt=nfmt,advance='NO',size=isize,iostat=istat) chunk
+            isize = 0
+            read(iunit,fmt='(A)',advance='NO',size=isize,iostat=istat) chunk
             if (istat==0) then
                 line = line//chunk
             else
-                if (isize>0 .and. isize<=n_chunk) line = line//chunk(1:isize)
+                if (isize>0 .and. isize<=seq_chunk_size) line = line//chunk(1:isize)
                 exit
             end if
         end do
@@ -4405,8 +4402,6 @@ subroutine get_current_line_from_file_stream(iunit,line)
     integer(IK) :: istart,iend,ios
     character(kind=CK,len=1) :: c
 
-    !updated for the new STREAM version:
-
     istart = ipos
     do
         if (istart<=1) then
@@ -4446,8 +4441,8 @@ recursive subroutine parse_value(unit, str, value)
 
     logical(LK) :: eof
     character(kind=CK,len=1) :: c
-    character(kind=CK,len=:),allocatable :: tmp  !this is a work-around for a bug
-                                                 ! in the gfortran 4.9 compiler.
+    character(kind=CK,len=:),allocatable :: tmp  !! this is a work-around for a bug
+                                                 !! in the gfortran 4.9 compiler.
 
     if (.not. exception_thrown) then