Merge pull request #45 from sourceryinstitute/minor-fixes

Minor updates: dogfooding in unit tests, rm compiler workaround, & fix sourcery_m public interface

Author: rouson

src/sourcery/formats_m.F90 renamed to src/sourcery/formats_m.f90

@@ -9,11 +9,7 @@ module formats_m
 
     pure module function separated_values(separator, mold) result(format_string)
       character(len=*), intent(in) :: separator 
-#ifndef NAGFOR
       class(*), intent(in) :: mold(..)
-#else
-      class(*), intent(in) :: mold(:)
-#endif
       character(len=:), allocatable :: format_string
     end function
 

src/sourcery/formats_s.F90 renamed to src/sourcery/formats_s.f90

@@ -9,10 +9,8 @@
     character(len=*), parameter :: suffix =           "'))"
     character(len=*), parameter :: complex_prefix = "(*('(',G0,',',G0,')',:,'" 
 
-#ifndef NAGFOR
     select rank(mold)
       rank(1)
-#endif
         select type(mold)
           type is(complex)
             format_string = complex_prefix // separator // suffix
@@ -25,11 +23,9 @@
           class default
              error stop "format_s separated_values: unsupported type"
         end select
-#ifndef NAGFOR
       rank default
         error stop "formats_s separated_values: unsupported rank"
     end select
-#endif
   end procedure
 
 end submodule formats_s

src/sourcery_m.f90

@@ -2,7 +2,7 @@ module sourcery_m
   !! export all public entities from every other sourcery module
   use command_line_m, only : command_line_t
   use data_partition_m, only : data_partition_t
-  use formats_m, only : formats_t
+  use formats_m, only : csv, cscv, separated_values
   use file_m, only : file_t
   use string_m, only : string_t
   use test_result_m, only : test_result_t
@@ -11,7 +11,7 @@ module sourcery_m
 
   !! legacy modules (likely to be removed in a future release):
   use object_m, only : object_t
-  use co_object_m, only : co_object_t
+  use co_object_m, only : co_object
   use oracle_m, only : oracle_t
   use units_m
 

test/command_line_test.f90

@@ -1,7 +1,6 @@
 module command_line_test
   !! Verify object pattern asbtract parent
-  use test_m, only : test_t, test_result_t
-  use command_line_m, only : command_line_t
+  use sourcery_m, only : test_t, test_result_t, command_line_t
   implicit none
 
   private

test/data_partition_test.f90

@@ -1,7 +1,6 @@
 module data_partition_test
   !! verify data partitioning across images and data gathering
-  use data_partition_m, only : data_partition_t
-  use test_m, only : test_t, test_result_t
+  use sourcery_m, only : data_partition_t, test_t, test_result_t
   use iso_fortran_env, only : real64
   implicit none
 

test/formats_test.f90

@@ -1,7 +1,6 @@
 module formats_test
   !! Verify that format strings provide the desired formatting
-  use formats_m, only : separated_values
-  use test_m, only : test_t, test_result_t
+  use sourcery_m, only : separated_values, test_t, test_result_t
   implicit none
 
   private

test/object_m_test.f90

@@ -1,7 +1,6 @@
 module object_m_test
   !! Verify object pattern asbtract parent
-  use test_m, only : test_t, test_result_t
-  use object_m, only : object_t
+  use sourcery_m, only : test_t, test_result_t, object_t
   implicit none
 
   private

test/string_test.f90

@@ -1,6 +1,5 @@
 module string_test
-  use test_m, only : test_t, test_result_t
-  use string_m, only : string_t
+  use sourcery_m, only : test_t, test_result_t, string_t
   implicit none
 
   private

test/test_result_test.f90

@@ -1,7 +1,6 @@
 module test_result_test
   !! Verify object pattern asbtract parent
   use test_m, only : test_t, test_result_t
-  use test_result_m, only : test_result_t
   implicit none
 
   private

test/user_defined_collectives_test.f90

@@ -1,6 +1,5 @@
 module user_defined_collectives_test
-    use user_defined_collectives_m, only : co_all
-    use test_m, only : test_t, test_result_t
+    use sourcery_m, only : co_all, test_t, test_result_t
     implicit none
 
     private