Merge pull request #389 from jacobwilliams/388-integer-parse

Fix integer parse issue

Author: jacobwilliams

src/json_value_module.F90

@@ -10985,60 +10985,53 @@ subroutine parse_number(json, unit, str, value)
             !get the next character:
             call json%pop_char(unit, str=str, eof=eof, skip_ws=.true., popped=c)
 
-            if (eof) then
-                call json%throw_exception('Error in parse_number:'//&
-                                     ' Unexpected end of file while parsing number.')
-                return
-            else
-
-                select case (c)
-                case(CK_'-',CK_'+')    !note: allowing a '+' as the first character here.
+            select case (c)
+            case(CK_'-',CK_'+')    !note: allowing a '+' as the first character here.
 
-                    if (is_integer .and. (.not. first)) is_integer = .false.
+                if (is_integer .and. (.not. first)) is_integer = .false.
 
-                    !add it to the string:
-                    !tmp = tmp // c   !...original
-                    if (ip>len(tmp)) tmp = tmp // blank_chunk
-                    tmp(ip:ip) = c
-                    ip = ip + 1
+                !add it to the string:
+                !tmp = tmp // c   !...original
+                if (ip>len(tmp)) tmp = tmp // blank_chunk
+                tmp(ip:ip) = c
+                ip = ip + 1
 
-                case(CK_'.',CK_'E',CK_'e')    !can be present in real numbers
+            case(CK_'.',CK_'E',CK_'e')    !can be present in real numbers
 
-                    if (is_integer) is_integer = .false.
+                if (is_integer) is_integer = .false.
 
-                    !add it to the string:
-                    !tmp = tmp // c   !...original
-                    if (ip>len(tmp)) tmp = tmp // blank_chunk
-                    tmp(ip:ip) = c
-                    ip = ip + 1
+                !add it to the string:
+                !tmp = tmp // c   !...original
+                if (ip>len(tmp)) tmp = tmp // blank_chunk
+                tmp(ip:ip) = c
+                ip = ip + 1
 
-                case(CK_'0':CK_'9')    !valid characters for numbers
+            case(CK_'0':CK_'9')    !valid characters for numbers
 
-                    !add it to the string:
-                    !tmp = tmp // c   !...original
-                    if (ip>len(tmp)) tmp = tmp // blank_chunk
-                    tmp(ip:ip) = c
-                    ip = ip + 1
+                !add it to the string:
+                !tmp = tmp // c   !...original
+                if (ip>len(tmp)) tmp = tmp // blank_chunk
+                tmp(ip:ip) = c
+                ip = ip + 1
 
-                case default
+            case default
 
-                    !push back the last character read:
-                    call json%push_char(c)
+                !push back the last character read:
+                call json%push_char(c)
 
-                    !string to value:
-                    if (is_integer) then
-                        ival = json%string_to_int(tmp)
-                        call json%to_integer(value,ival)
-                    else
-                        rval = json%string_to_dble(tmp)
-                        call json%to_real(value,rval)
-                    end if
+                !string to value:
+                if (is_integer) then
+                    ival = json%string_to_int(tmp)
+                    call json%to_integer(value,ival)
+                else
+                    rval = json%string_to_dble(tmp)
+                    call json%to_real(value,rval)
+                end if
 
-                    exit    !finished
+                exit    !finished
 
-                end select
+            end select
 
-            end if
             if (first) first = .false.
 
         end do

src/tests/jf_test_39.F90

@@ -0,0 +1,81 @@
+!*****************************************************************************************
+!> author: Jacob Williams
+!  date: 1/26/2019
+!
+!  Module for the 39th unit test.
+
+module jf_test_39_mod
+
+    use json_module, CK => json_CK, CDK => json_CDK, IK => json_IK
+    use, intrinsic :: iso_fortran_env , only: error_unit, output_unit
+
+    implicit none
+
+    private
+    public :: test_39
+
+contains
+
+    subroutine test_39(error_cnt)
+
+    !! Test of some weird (but valid) JSON structures
+
+    implicit none
+
+    integer,intent(out) :: error_cnt !! report number of errors to caller
+
+    type(json_file) :: json
+    integer :: i !! counter
+
+    character(kind=CK,len=*),dimension(6),parameter :: tests = ['"42" ',&
+                                                                '[42] ',&
+                                                                '42   ',&
+                                                                'true ',&
+                                                                'false',&
+                                                                'null ' ]
+
+    write(error_unit,'(A)') ''
+    write(error_unit,'(A)') '================================='
+    write(error_unit,'(A)') '   TEST 39'
+    write(error_unit,'(A)') '================================='
+    write(error_unit,'(A)') ''
+
+    error_cnt = 0
+
+    do i = 1, size(tests)
+
+        json = json_file(trim(tests(i)),verbose=.true.,stop_on_error=.true.)
+        call json%print_file(int(error_unit,IK))
+        write(error_unit,'(A)') ''
+        if (json%failed()) then
+            call json%print_error_message(error_unit)
+            error_cnt = error_cnt + 1
+            write(error_unit,'(A)') ' FAILED!'
+        else
+            write(error_unit,'(A)') ' Success!'
+        end if
+        call json%destroy()
+        write(error_unit,'(A)') ''
+
+    end do
+
+    end subroutine test_39
+
+end module jf_test_39_mod
+!*****************************************************************************************
+
+#ifndef INTERGATED_TESTS
+!*****************************************************************************************
+program jf_test_39
+
+    !! 39th unit test.
+
+    use jf_test_39_mod, only: test_39
+    implicit none
+    integer :: n_errors
+    call test_39(n_errors)
+    if ( n_errors /= 0) stop 1
+
+end program jf_test_39
+!*****************************************************************************************
+#endif