Merge pull request #5 from jacobwilliams/gfortran-fix

added a workaround for gfortran character bugs. Fixes #4.

Author: jacobwilliams

src/csv_module.F90

@@ -45,14 +45,15 @@ module csv_module
 
         character(len=1) :: quote     = '"'  !! quotation character
         character(len=1) :: delimiter = ','  !! delimiter character
+
+        ! for reading a csv file:
         integer :: n_rows = 0  !! number of rows in the file
         integer :: n_cols = 0  !! number of columns in the file
         integer :: chunk_size = 100 !! for expanding vectors
-
         type(csv_string),dimension(:),allocatable :: header      !! the header
         type(csv_string),dimension(:,:),allocatable :: csv_data  !! the data in the file
 
-        !for writing a csv file:
+        ! for writing a csv file:
         integer :: icol = 0    !! last column written in current row
         integer :: iunit = 0   !! file unit for writing
         logical :: enclose_strings_in_quotes = .true.  !! if true, all string cells
@@ -124,7 +125,7 @@ module csv_module
 
 !*****************************************************************************************
 !>
-!  Constructor.
+!  Initialize a [[csv_file(type)]].
 
     subroutine initialize_csv_file(me,quote,delimiter,&
                                     enclose_strings_in_quotes,&
@@ -183,18 +184,11 @@ end subroutine initialize_csv_file
 !>
 !  Destroy the data in a CSV file.
 
-    pure subroutine destroy_csv_file(me)
+    subroutine destroy_csv_file(me)
 
     implicit none
 
-    class(csv_file),intent(inout) :: me
-
-    if (allocated(me%csv_data)) deallocate(me%csv_data)
-    if (allocated(me%header)) deallocate(me%header)
-
-    me%n_cols = 0
-    me%n_rows = 0
-    me%icol   = 0
+    class(csv_file),intent(out) :: me
 
     end subroutine destroy_csv_file
 !*****************************************************************************************
@@ -348,7 +342,8 @@ subroutine open_csv_file(me,filename,n_cols,status_ok)
     if (istat==0) then
         status_ok = .true.
     else
-        if (me%verbose) write(error_unit,'(A)') 'Error opening file: '//trim(filename)
+        if (me%verbose) write(error_unit,'(A)') &
+                            'Error opening file: '//trim(filename)
         status_ok = .false.
     end if
 
@@ -482,8 +477,6 @@ end subroutine add_cell
 !*****************************************************************************************
 !>
 !  Add a vector to a CSV file. Each element is added as a cell to the current line.
-!
-!@warning There is some bug here with GFortran 6.1 when `val` is a character string.
 
     subroutine add_vector(me,val,int_fmt,real_fmt,trim_str)
 
@@ -500,7 +493,19 @@ subroutine add_vector(me,val,int_fmt,real_fmt,trim_str)
     integer :: i !! counter
 
     do i=1,size(val)
+
+#if defined __GFORTRAN__
+        ! This is a stupid workaround for gfortran bugs (tested with 7.2.0)
+        select type (val)
+        type is (character(len=*))
+            call me%add(val(i),int_fmt,real_fmt,trim_str)
+        class default
+            call me%add(val(i),int_fmt,real_fmt,trim_str)
+        end select
+#else
         call me%add(val(i),int_fmt,real_fmt,trim_str)
+#endif
+
     end do
 
     end subroutine add_vector

src/tests/csv_read_test.f90

@@ -0,0 +1,36 @@
+program csv_read_test
+
+use csv_module
+use iso_fortran_env, only: wp => real64
+
+implicit none
+
+type(csv_file) :: f
+character(len=30),dimension(:),allocatable :: header
+real(wp),dimension(:),allocatable :: x,y,z
+logical,dimension(:),allocatable :: t
+logical :: status_ok
+integer,dimension(:),allocatable :: itypes
+
+! read the file
+call f%read('test.csv',header_row=1,status_ok=status_ok)
+
+! get the header and type info
+call f%get_header(header,status_ok)
+call f%variable_types(itypes,status_ok)
+
+! get some data
+call f%get(1,x,status_ok)
+call f%get(2,y,status_ok)
+call f%get(3,z,status_ok)
+call f%get(4,t,status_ok)
+
+write(*,*) 'x=',x
+write(*,*) 'y=',y
+write(*,*) 'z=',z
+write(*,*) 't=',t
+
+! destroy the file
+call f%destroy()
+
+end program csv_read_test

src/tests/csv_test.f90

@@ -29,10 +29,12 @@ program csv_test
 
         ! read the file:
         if (ifile==1) then
-            call f%read(trim(files_to_test(ifile)),header_row=1,status_ok=status_ok)
+            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)
+            call f%read(trim(files_to_test(ifile)),&
+                        header_row=1,skip_rows=[2],status_ok=status_ok)
         end if
 
         write(*,*) ''

src/tests/csv_write_test.f90

@@ -0,0 +1,29 @@
+program csv_write_test
+
+use csv_module
+use iso_fortran_env, only: wp => real64
+
+implicit none
+
+type(csv_file) :: f
+logical :: status_ok
+
+! open the file
+call f%open('test.csv',n_cols=4,status_ok=status_ok)
+
+! add header
+call f%add(['x','y','z','t'])
+call f%next_row()
+
+! add some data:
+call f%add([1.0_wp,2.0_wp,3.0_wp],real_fmt='(F5.3)')
+call f%add(.true.)
+call f%next_row()
+call f%add([4.0_wp,5.0_wp,6.0_wp],real_fmt='(F5.3)')
+call f%add(.false.)
+call f%next_row()
+
+! finished
+call f%close(status_ok)
+
+end program csv_write_test