Merge pull request #21 from sourceryinstitute/remove-assert

Remove assert

Author: Damian Rouson

fpm.toml

@@ -5,6 +5,9 @@ author = ["Damian Rouson"]
 maintainer = "[email protected]"
 copyright = "2020 Sourcery Institute"
 
+[dependencies]
+assert = {git = "https://github.com/sourceryinstitute/assert", tag = "1.0.0"}
+
 [dev-dependencies]
 vegetables = {git = "https://gitlab.com/everythingfunctional/vegetables", tag = "v6.0.1"}
 

src/array_functions_implementation.f90

@@ -5,15 +5,15 @@
 !     contract # NRC-HQ-60-17-C-0007
 !
 submodule(array_functions_interface) array_functions_implementation
-  use assertions_interface, only : assert, assertions
+  use assert_m, only : assert
   implicit none
 contains
 
   module procedure column_vectors
       integer i, j, k
 
       associate( n => shape(vector_field) )
-        if (assertions) call assert(size(n)==4, "3D vector field input")
+        call assert(size(n)==4, "3D vector field input")
         allocate( array_of_3D_column_vectors( n(4), product(n(1:3)) ) )
         do concurrent( i=1:n(1), j=1:n(2), k=1:n(3) )
           associate( id => (k-1)*PRODUCT(n(1:2)) + (j-1)*n(1) + i )
@@ -34,7 +34,7 @@
     associate(cols=>size(a,2)+size(b,2))
     associate(a_unrolled=>reshape(a,[size(a)]))
     associate(b_unrolled=>reshape(b,[size(b)]))
-      if (assertions) call assert( rows==size(b,1), "array_functions: compatible shapes")
+      call assert( rows==size(b,1), "array_functions: compatible shapes")
       concatenated = reshape( [a_unrolled, b_unrolled ],[rows, cols] )
     end associate; end associate; end associate; end associate
   end procedure

src/assertions_implementation.F90

@@ -1,5 +1,5 @@
 submodule(data_partition_interface) data_partition_implementation
-  use assertions_interface, only : assert, assertions
+  use assert_m, only : assert
   implicit none
 
   logical, parameter :: verbose=.false.
@@ -45,12 +45,12 @@ pure function overflow(im, excess) result(extra_datum)
 #endif
 
   module procedure first
-    if (assertions) call assert( allocated(first_datum), "allocated(first_datum)")
+    call assert( allocated(first_datum), "allocated(first_datum)")
     first_index= first_datum( image_number )
   end procedure
 
   module procedure last
-    if (assertions) call assert( allocated(last_datum), "allocated(last_datum)")
+    call assert( allocated(last_datum), "allocated(last_datum)")
     last_index = last_datum( image_number )
   end procedure
 

src/assertions_interface.F90

@@ -5,7 +5,7 @@
 !     contract # NRC-HQ-60-17-C-0007
 !
 submodule(emulated_intrinsics_interface) emulated_intrinsics_implementation
-  use assertions_interface, only : assert
+  use assert_m, only : assert
   implicit none
 
 contains