test serialization

Author: perazz

src/fpm_compile_commands.F90

@@ -79,12 +79,10 @@ subroutine compile_command_dump_toml(self, table, error)
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
-        call self%destroy()
- 
-        call set_string(table, "directory", self%directory, error, 'compile_command_t')
-        if (allocated(error)) return
         call set_list(table, "arguments", self%arguments, error)
         if (allocated(error)) return
+        call set_string(table, "directory", self%directory, error, 'compile_command_t')
+        if (allocated(error)) return
         call set_string(table, "file", self%file, error, 'compile_command_t')
         if (allocated(error)) return    
 
@@ -102,12 +100,14 @@ subroutine compile_command_load_toml(self, table, error)
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
-        call get_value(table, "directory", self%directory, error, 'compile_command_t')
-        if (allocated(error)) return
+        call self%destroy()
+        
         call get_list(table, "arguments", self%arguments, error)
-        if (allocated(error)) return   
-        call get_value(table, "file", self%file, error, 'compile_command_t')
-        if (allocated(error)) return
+        if (allocated(error)) return           
+        
+        ! Return unallocated value if not present
+        call get_value(table, "directory", self%directory%s)
+        call get_value(table, "file", self%file%s)
 
     end subroutine compile_command_load_toml
 
@@ -316,8 +316,6 @@ subroutine cct_dump_toml(self, table, error)
         integer :: stat, ii
         type(toml_array), pointer :: array
 
-        if (.not.allocated(self%command)) return
-        
         ! Create array
         call add_array(table, 'compile_commands', array, stat=stat)
         if (stat/=toml_stat%success .or. .not.associated(array)) then 
@@ -349,20 +347,22 @@ subroutine cct_load_toml(self, table, error)
         call self%destroy()
 
         call get_value(table, key='compile_commands', ptr=array, requested=.true.,stat=stat)
-        
+
         if (stat/=toml_stat%success .or. .not.associated(array)) then 
 
             call fatal_error(error, "TOML table has no 'compile_commands' key")
             return
 
         else
 
-            n = len(array)            
+            n = len(array)               
+            if (n<=0) return
+                    
             allocate(self%command(n))
 
             do i = 1, n
                 call get_value(array, pos=i, ptr=elem, stat=stat)
-                if (stat /= toml_stat%success) then
+                if (stat /= toml_stat%success .or. .not.associated(elem)) then
                     call fatal_error(error, "Entry in 'compile_commands' field cannot be read")
                     return
                 end if

test/fpm_test/test_backend.f90

@@ -7,6 +7,7 @@ module test_backend
                             FPM_TARGET_OBJECT, FPM_TARGET_ARCHIVE, &
                            add_target, add_dependency
     use fpm_backend, only: sort_target, schedule_targets
+    use fpm_strings, only: string_t
     use fpm_compile_commands, only: compile_command_t, compile_command_table_t
     implicit none
     private