Added workaround for gfortran bug with character cells.

Improved efficiency of split routine.
Fixed a bug where skip_rows didn’t work right.

Author: jacobwilliams

build.sh

@@ -6,7 +6,7 @@
 #  Requires: FoBiS and Ford
 #
 
-MODCODE='csv_module.f90'            # module file name
+MODCODE='csv_module.F90'            # module file name
 LIBOUT='libcsv.a'                   # name of library
 DOCDIR='./doc/'                     # build directory for documentation
 SRCDIR='./src/'                     # library source directory
@@ -17,10 +17,10 @@ FORDMD='fortran-csv-module.md'      # FORD config file name
 
 #compiler flags:
 
-#FCOMPILER='gnu' #Set compiler to gfortran
-#FCOMPILERFLAGS='-c -O2 -std=f2008'
-FCOMPILER='intel' #Set compiler to intel
-FCOMPILERFLAGS='-c -O2 -warn -stand f08 -traceback'
+FCOMPILER='gnu' #Set compiler to gfortran
+FCOMPILERFLAGS='-c -O2 -std=f2008'
+#FCOMPILER='intel' #Set compiler to intel
+#FCOMPILERFLAGS='-c -O0 -warn -stand f08 -traceback -g'
 
 #build using FoBiS:
 

files/test_2_columns.csv

@@ -0,0 +1,5 @@
+id,first_name
+1,Julie
+2,Jose
+3,Lois
+4,Walter

src/csv_module.f90 src/csv_module.F90

@@ -229,6 +229,7 @@ subroutine read_csv_file(me,filename,header_row,skip_rows,status_ok)
                                 !! class have been allocated
     integer :: iheader          !! row number of header row
                                 !! (0 if no header specified)
+    character(len=1) :: tmp     !! for skipping a row
 
     call me%destroy()
     arrays_allocated = .false.
@@ -267,7 +268,17 @@ subroutine read_csv_file(me,filename,header_row,skip_rows,status_ok)
 
             ! skip row if necessary
             if (allocated(rows_to_skip)) then
-                if (any(i==rows_to_skip)) cycle
+                if (any(i==rows_to_skip)) then
+                    read(iunit,fmt='(A1)',iostat=istat) tmp
+                    if (istat/=0) then
+                        if (me%verbose) write(error_unit,'(A)') &
+                                'Error skipping row in file: '//trim(filename)
+                        close(unit=iunit,iostat=istat)
+                        status_ok = .false.
+                        return
+                    end if
+                    cycle
+                end if
             end if
 
             call me%read_line_from_file(iunit,line,status_ok)
@@ -884,10 +895,11 @@ subroutine get_column(me,icol,r,status_ok)
     integer,intent(in) :: icol  !! column number
     class(*),dimension(:),intent(out) :: r  !! assumed to have been allocated to
                                             !! the correct size by the caller.
-                                            !! (n_rows)
+                                            !! (`n_rows`)
     logical,intent(out) :: status_ok  !! status flag
 
     integer :: i !! counter
+    character(len=:),allocatable :: tmp !! for gfortran workaround
 
     ! we know the data is allocated, since that
     ! was checked by the calling routines.
@@ -896,8 +908,19 @@ subroutine get_column(me,icol,r,status_ok)
 
         do i=1,me%n_rows  ! row loop
 
+#if defined __GFORTRAN__
+            ! the following is a workaround for gfortran bugs:
+            select type (r)
+            type is (character(len=*))
+                tmp = repeat(' ',len(r)) ! size the string
+                call me%csv_get_value(i,icol,tmp,status_ok)
+                r(i) = tmp
+            class default
+                call me%csv_get_value(i,icol,r(i),status_ok)
+            end select
+#else
             call me%csv_get_value(i,icol,r(i),status_ok)
-
+#endif
             if (.not. status_ok) then
                 select type (r)
                 ! note: character conversion can never fail, so not
@@ -1174,11 +1197,10 @@ end subroutine read_line_from_file
 !
 !### Example
 !````Fortran
-!   type(csv_file) :: f
 !   character(len=:),allocatable :: s
 !   type(csv_string),dimension(:),allocatable :: vals
 !   s = '1,2,3,4,5'
-!   vals = f%split(s,',')
+!   call split(s,',',vals)
 !````
 !
 !@warning Doesn't seem to work for `len(token)>1`
@@ -1201,23 +1223,38 @@ pure subroutine split(str,token,chunk_size,vals)
     integer :: i1         !! index
     integer :: i2         !! index
     integer :: j          !! counters
-    character(len=:),allocatable :: temp
-    integer,dimension(:),allocatable :: itokens
+    integer,dimension(:),allocatable :: itokens !! start indices of the
+                                                !! token locations in `str`
 
-    temp      = str         ! make a copy of the string
     len_token = len(token)  ! length of the token
-    n_tokens  = 0           ! initialize the number of token counter
-    j         = 0           ! length of string removed
+    n_tokens  = 0           ! initialize the token counter
+    j         = 0           ! index to start looking for the next token
+
+    ! first, count the number of times the token
+    ! appears in the string, and get the token indices.
+    !
+    ! Examples:
+    !  ',         '    --> 1
+    !  '1234,67,90'    --> 5,8
+    !  '123,      '    --> 4
+
+    ! length of the string
+    if (token == ' ') then
+        ! in this case, we can't ignore trailing space
+        len_str = len(str)
+    else
+        ! safe to ignore trailing space when looking for tokens
+        len_str = len_trim(str)
+    end if
 
-    !first, count the number of times the token appears in the string
+    j = 1
+    n_tokens = 0
     do
-        len_str = len(temp)    ! length of the string
-        i = index(temp,token)  ! location of the next token
-        if (i<=0) exit         ! no more tokens found
-        call expand_vector(itokens,n_tokens,chunk_size,i+j)  ! save the token location
-        if (i+len_token>len_str) exit  ! if the last bit of the string is a token
-        j = j + i
-        temp = trim(temp(i+len_token:len_str))  !remove previously scanned part of string
+        if (j>len_str) exit      ! end of string, finished
+        i = index(str(j:),token) ! index of next token in remaining string
+        if (i<=0) exit           ! no more tokens found
+        call expand_vector(itokens,n_tokens,chunk_size,i+j-1)  ! save the token location
+        j = j + i + (len_token - 1)
     end do
     call expand_vector(itokens,n_tokens,chunk_size,finished=.true.)  ! resize the vector
 

src/tests/csv_test.f90

@@ -19,35 +19,58 @@ program csv_test
     real(wp),dimension(:),allocatable :: x  !! for getting a real vector from a csv file
     logical :: status_ok  !! error flag
     integer,dimension(:),allocatable :: itypes  !! array of variable types in the file
+    integer :: ifile !! file counter
+    character(len=30),dimension(:),allocatable :: names
 
-    ! read the file:
-    call f%read('../files/test.csv',header_row=1,status_ok=status_ok)
+    character(len=*),dimension(2),parameter :: files_to_test = ['../files/test.csv          ',&
+                                                                '../files/test_2_columns.csv']
 
-    ! print the header and type info:
-    call f%get_header(header,status_ok)
-    call f%variable_types(itypes,status_ok)
-    write(*,*) ''
-    write(*,'(*(A30,1X,A4))') 'Header', 'Type'
-    do i=1,size(header)
-        write(*,'(*(A30,1X,I4))') header(i), itypes(i)
-    end do
+    do ifile = 1, size(files_to_test)
 
-    write(*,*) ''
-    write(*,*) 'print all the rows:'
+        ! read the file:
+        if (ifile==1) then
+            call f%read(trim(files_to_test(ifile)),header_row=1,status_ok=status_ok)
+        else
+            ! also skip a row
+            call f%read(trim(files_to_test(ifile)),header_row=1,skip_rows=[2],status_ok=status_ok)
+        end if
 
-    call f%get(csv_data,status_ok)
-    do i=1,size(csv_data,1)
-        write(*,'(*(A30,1X))') csv_data(i,:)
-    end do
+        write(*,*) ''
+        write(*,*) 'File: '//trim(files_to_test(ifile))
+        ! print the header and type info:
+        call f%get_header(header,status_ok)
+        call f%variable_types(itypes,status_ok)
+        write(*,*) ''
+        write(*,'(*(A30,1X,A4))') 'Header', 'Type'
+        do i=1,size(header)
+            write(*,'(*(A30,1X,I4))') header(i), itypes(i)
+        end do
+
+        write(*,*) ''
+        write(*,*) 'print all the rows:'
 
-    write(*,*) ''
-    write(*,*) 'get some vectors:'
+        call f%get(csv_data,status_ok)
+        do i=1,size(csv_data,1)
+            write(*,'(*(A30,1X))') csv_data(i,:)
+        end do
 
-    write(*,*) ''
-    write(*,*) 'age:'
-    call f%get(3,x,status_ok)
-    write(*,'(F6.3,1x)',advance='NO') x
-    write(*,*) ''
+        write(*,*) ''
+        write(*,*) 'get some vectors:'
+        if (ifile==1) then
+            write(*,*) ''
+            write(*,*) 'age:'
+            call f%get(3,x,status_ok)
+            write(*,'(F6.3,1x)',advance='NO') x
+            write(*,*) ''
+        else
+            write(*,*) ''
+            write(*,*) 'name:'
+            call f%get(2,names,status_ok)
+            write(*,'(A10,1x)',advance='NO') names
+            write(*,*) ''
+        end if
+
+    end do
 
     ! now test creating a CSV:
     call f2%initialize(enclose_strings_in_quotes=.false.,verbose=.true.)