Merge pull request #52 from sourceryinstitute/prepend-sourcery

rouson · web-flow · commit bb8885d84f06 · 2023-09-20T15:04:34.000-04:00
chore: prepend sourcery_ to module/file names
diff --git a/example/get-flag-value.f90 b/example/get-flag-value.f90
@@ -6,7 +6,7 @@ program get_flag_value
   !!
   !! result in normal termination.
   use assert_m, only : assert
-  use command_line_m, only : command_line_t
+  use sourcery_m, only : command_line_t
   implicit none
 
   type(command_line_t) command_line
diff --git a/src/sourcery/array_functions_s.f90 b/src/sourcery/array_functions_s.f90
@@ -4,7 +4,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !
-submodule(array_functions_m) array_functions_s
+submodule(sourcery_array_functions_m) array_functions_s
   use assert_m, only : assert
   implicit none
 contains
diff --git a/src/sourcery/bin_s.f90 b/src/sourcery/bin_s.f90
@@ -1,4 +1,4 @@
-submodule(bin_m) bin_s
+submodule(sourcery_bin_m) bin_s
   use assert_m, only : assert, intrinsic_array_t
   implicit none
 
diff --git a/src/sourcery/co_object_implementation.f90 b/src/sourcery/co_object_implementation.f90
@@ -4,7 +4,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !
-submodule(co_object_m) co_object_s
+submodule(sourcery_co_object_m) co_object_s
   implicit none
 
 contains
diff --git a/src/sourcery/command_line_s.f90 b/src/sourcery/command_line_s.f90
@@ -1,4 +1,4 @@
-submodule(command_line_m) command_line_s
+submodule(sourcery_command_line_m) command_line_s
   implicit none
 
 contains
diff --git a/src/sourcery/data_partition_s.f90 b/src/sourcery/data_partition_s.f90
@@ -1,6 +1,6 @@
-submodule(data_partition_m) data_partition_s
+submodule(sourcery_data_partition_m) data_partition_s
   use assert_m, only : assert
-  use bin_m, only : bin_t
+  use sourcery_bin_m, only : bin_t
   implicit none
 
   logical, parameter :: verbose=.false.
diff --git a/src/sourcery/file_s.f90 b/src/sourcery/file_s.f90
@@ -1,4 +1,4 @@
-submodule(file_m) file_s
+submodule(sourcery_file_m) file_s
   use iso_fortran_env, only : iostat_end, iostat_eor, output_unit
   use assert_m, only : assert
   implicit none
diff --git a/src/sourcery/files b/src/sourcery/files
@@ -0,0 +1,14 @@
+git mv {,sourcery_}array_functions_m.f90
+git mv {,sourcery_}bin_m.f90
+git mv {,sourcery_}data_partition_m.f90
+git mv {,sourcery_}file_m.f90
+git mv {,sourcery_}formats_m.f90
+git mv {,sourcery_}object_m.f90
+git mv {,sourcery_}oracle_m.f90
+git mv {,sourcery_}sourcery_command_line_m.f90
+git mv {,sourcery_}string_functions_m.f90
+git mv {,sourcery_}string_m.f90
+git mv {,sourcery_}test_m.f90
+git mv {,sourcery_}test_result_m.f90
+git mv {,sourcery_}units_m.f90
+git mv {,sourcery_}user_defined_collectives_m.f90
diff --git a/src/sourcery/formats_s.f90 b/src/sourcery/formats_s.f90
@@ -1,4 +1,4 @@
-submodule(formats_m) formats_s
+submodule(sourcery_formats_m) formats_s
   !! Construct separated-value formats 
   implicit none
 
diff --git a/src/sourcery/object_s.f90 b/src/sourcery/object_s.f90
@@ -4,7 +4,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !
-submodule(object_m) object_s
+submodule(sourcery_object_m) object_s
   implicit none
 
 contains
diff --git a/src/sourcery/oracle_s.f90 b/src/sourcery/oracle_s.f90
@@ -1,4 +1,4 @@
-submodule(oracle_m) oracle_s
+submodule(sourcery_oracle_m) oracle_s
   !! define procedures corresponding to the interface bodies in oracle_m
   implicit none
 
diff --git a/src/sourcery/sourcery_array_functions_m.f90 b/src/sourcery/sourcery_array_functions_m.f90
@@ -4,7 +4,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !
-module array_functions_m
+module sourcery_array_functions_m
   !! author: Damian Rouson
   !! date: 04/25/2019
   !!
diff --git a/src/sourcery/sourcery_bin_m.f90 b/src/sourcery/sourcery_bin_m.f90
@@ -1,4 +1,4 @@
-module bin_m
+module sourcery_bin_m
   !! distribute item numbers across bins such that the number of items differs by at most 1 between any two bins
   implicit none
 
@@ -42,4 +42,4 @@ elemental module function last(self) result(last_item_number)
 
   end interface
 
-end module bin_m
+end module sourcery_bin_m
diff --git a/src/sourcery/sourcery_co_object_m.f90 b/src/sourcery/sourcery_co_object_m.f90
@@ -4,7 +4,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !
-module co_object_m
+module sourcery_co_object_m
   implicit none
 
   private
@@ -40,4 +40,4 @@ pure module function user_defined(self) result(is_defined)
 
   end interface
 
-end module co_object_m
+end module sourcery_co_object_m
diff --git a/src/sourcery/sourcery_command_line_m.f90 b/src/sourcery/sourcery_command_line_m.f90
@@ -1,4 +1,4 @@
-module command_line_m
+module sourcery_command_line_m
   !! return command line argument information
   implicit none
 
diff --git a/src/sourcery/sourcery_data_partition_m.f90 b/src/sourcery/sourcery_data_partition_m.f90
@@ -1,4 +1,4 @@
-module data_partition_m
+module sourcery_data_partition_m
   !! distribute data identification numbers across images such that the number of
   !! items differs by at most 1 between any two images.
   use iso_fortran_env, only : real32, real64
@@ -73,4 +73,4 @@ module subroutine gather_real64_2D_array( a, result_image, dim )
 
   end interface
 
-end module data_partition_m
+end module sourcery_data_partition_m
diff --git a/src/sourcery/sourcery_file_m.f90 b/src/sourcery/sourcery_file_m.f90
@@ -1,6 +1,6 @@
-module file_m
+module sourcery_file_m
   !! A representation of a file as an object
-  use string_m, only : string_t
+  use sourcery_string_m, only : string_t
 
   private
   public :: file_t
@@ -45,4 +45,4 @@ impure elemental module subroutine write_lines(self, file_name)
 
   end interface
 
-end module file_m
+end module sourcery_file_m
diff --git a/src/sourcery/sourcery_formats_m.f90 b/src/sourcery/sourcery_formats_m.f90
@@ -1,4 +1,4 @@
-module formats_m
+module sourcery_formats_m
   !! Useful strings for formatting `print` and `write` statements
   implicit none
 
diff --git a/src/sourcery/sourcery_object_m.f90 b/src/sourcery/sourcery_object_m.f90
@@ -6,7 +6,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !     ```
-module object_m
+module sourcery_object_m
   implicit none
 
   private
@@ -60,4 +60,4 @@ subroutine write_interface(self, unit, iotype, v_list, iostat, iomsg)
     end subroutine
   end interface
 
-end module object_m
+end module sourcery_object_m
diff --git a/src/sourcery/sourcery_oracle_m.f90 b/src/sourcery/sourcery_oracle_m.f90
@@ -1,6 +1,6 @@
-module oracle_m
+module sourcery_oracle_m
   !! verify actual output against expected
-  use object_m, only : object_t
+  use sourcery_object_m, only : object_t
   implicit none
 
   private
diff --git a/src/sourcery/sourcery_string_functions_m.f90 b/src/sourcery/sourcery_string_functions_m.f90
@@ -4,7 +4,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !
-module string_functions_m
+module sourcery_string_functions_m
   !! author: Damian Rouson
   !! date: August 23, 2019
   !! summary: utilities for manipulating or producing character variables
diff --git a/src/sourcery/sourcery_string_m.f90 b/src/sourcery/sourcery_string_m.f90
@@ -1,4 +1,4 @@
-module string_m
+module sourcery_string_m
   implicit none
   
   private
@@ -45,4 +45,4 @@ elemental module function is_allocated(self) result(string_allocated)
 
   end interface
   
-end module string_m
+end module sourcery_string_m
diff --git a/src/sourcery/sourcery_test_m.f90 b/src/sourcery/sourcery_test_m.f90
@@ -1,8 +1,8 @@
-module test_m
+module sourcery_test_m
   !! Define an abstract test_t type with deferred bindings ("subject" and "results")
   !! used by a type-bound procedure ("report") for reporting test results.  The "report"
   !! procedure thus represents an implementation of the Template Method pattern.
-  use test_result_m, only : test_result_t
+  use sourcery_test_result_m, only : test_result_t
   implicit none
 
   private
@@ -42,4 +42,4 @@ module subroutine report(test, passes, tests)
 
   end interface
 
-end module test_m
+end module sourcery_test_m
diff --git a/src/sourcery/sourcery_test_result_m.f90 b/src/sourcery/sourcery_test_result_m.f90
@@ -1,4 +1,4 @@
-module test_result_m
+module sourcery_test_result_m
   !! Define an abstraction for describing test intentions and results
   implicit none
 
@@ -45,4 +45,4 @@ elemental module function passed(self) result(test_passed)
 
   end interface
 
-end module test_result_m
+end module sourcery_test_result_m
diff --git a/src/sourcery/sourcery_units_m.f90 b/src/sourcery/sourcery_units_m.f90
@@ -4,7 +4,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !
-module units_m
+module sourcery_units_m
   !! author: Damian Rouson
   !! date: 9/9/2019
   !!
diff --git a/src/sourcery/sourcery_user_defined_collectives_m.f90 b/src/sourcery/sourcery_user_defined_collectives_m.f90
@@ -4,7 +4,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !
-module user_defined_collectives_m
+module sourcery_user_defined_collectives_m
   !! author: Damian Rouson
   !! 
   !! This module contains user-defined collective subroutines.
@@ -23,4 +23,4 @@ impure elemental module subroutine co_all(boolean)
 
   end interface
 
-end module user_defined_collectives_m
+end module sourcery_user_defined_collectives_m
diff --git a/src/sourcery/string_functions_s.f90 b/src/sourcery/string_functions_s.f90
@@ -4,7 +4,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !
-submodule(string_functions_m) string_functions_s
+submodule(sourcery_string_functions_m) string_functions_s
   implicit none
 
 contains
diff --git a/src/sourcery/string_s.f90 b/src/sourcery/string_s.f90
@@ -1,4 +1,4 @@
-submodule(string_m) string_s
+submodule(sourcery_string_m) string_s
   implicit none
   
 contains
diff --git a/src/sourcery/test_result_s.f90 b/src/sourcery/test_result_s.f90
@@ -1,4 +1,4 @@
-submodule(test_result_m) test_result_s
+submodule(sourcery_test_result_m) test_result_s
   implicit none
 
 contains
diff --git a/src/sourcery/test_s.f90 b/src/sourcery/test_s.f90
@@ -1,5 +1,5 @@
-submodule(test_m) test_s
-  use user_defined_collectives_m, only : co_all
+submodule(sourcery_test_m) test_s
+  use sourcery_m, only : co_all
   implicit none
 
 contains
diff --git a/src/sourcery/units_s.f90 b/src/sourcery/units_s.f90
@@ -4,7 +4,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !
-submodule(units_m) units_s
+submodule(sourcery_units_m) units_s
     use assert_m, only : assert
     implicit none
 
diff --git a/src/sourcery/user_defined_collectives_s.f90 b/src/sourcery/user_defined_collectives_s.f90
@@ -4,7 +4,7 @@
 !     "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",
 !     contract # NRC-HQ-60-17-C-0007
 !
-submodule(user_defined_collectives_m) user_defined_collectives_s
+submodule(sourcery_user_defined_collectives_m) user_defined_collectives_s
   implicit none
 
 contains
diff --git a/src/sourcery_m.f90 b/src/sourcery_m.f90
@@ -1,20 +1,20 @@
 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 bin_m, only : bin_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
-  use test_m, only : test_t
-  use user_defined_collectives_m, only : co_all
+  use sourcery_command_line_m, only : command_line_t
+  use sourcery_data_partition_m, only : data_partition_t
+  use sourcery_bin_m, only : bin_t
+  use sourcery_formats_m, only : csv, cscv, separated_values
+  use sourcery_file_m, only : file_t
+  use sourcery_string_m, only : string_t
+  use sourcery_test_result_m, only : test_result_t
+  use sourcery_test_m, only : test_t
+  use sourcery_user_defined_collectives_m, only : co_all
 
   !! legacy modules (likely to be removed in a future release):
-  use object_m, only : object_t
-  use co_object_m, only : co_object
-  use oracle_m, only : oracle_t
-  use units_m
+  use sourcery_object_m, only : object_t
+  use sourcery_co_object_m, only : co_object
+  use sourcery_oracle_m, only : oracle_t
+  use sourcery_units_m
 
   implicit none
 
diff --git a/test/test_result_test.f90 b/test/test_result_test.f90
@@ -1,6 +1,6 @@
 module test_result_test_m
   !! Verify object pattern asbtract parent
-  use test_m, only : test_t, test_result_t
+  use sourcery_test_m, only : test_t, test_result_t
   implicit none
 
   private

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`! "Multi-Dimensional Physics Implementation into Fuel Analysis under Steady-state and Transients (FAST)",`
`5`	`5`	`! contract # NRC-HQ-60-17-C-0007`
`6`	`6`	`!`
`7`		`-submodule(array_functions_m) array_functions_s`
	`7`	`+submodule(sourcery_array_functions_m) array_functions_s`
`8`	`8`	`use assert_m, only : assert`
`9`	`9`	`implicit none`
`10`	`10`	`contains`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-submodule(bin_m) bin_s`
	`1`	`+submodule(sourcery_bin_m) bin_s`
`2`	`2`	`use assert_m, only : assert, intrinsic_array_t`
`3`	`3`	`implicit none`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-submodule(command_line_m) command_line_s`
	`1`	`+submodule(sourcery_command_line_m) command_line_s`
`2`	`2`	`implicit none`
`3`	`3`
`4`	`4`	`contains`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-submodule(file_m) file_s`
	`1`	`+submodule(sourcery_file_m) file_s`
`2`	`2`	`use iso_fortran_env, only : iostat_end, iostat_eor, output_unit`
`3`	`3`	`use assert_m, only : assert`
`4`	`4`	`implicit none`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-submodule(formats_m) formats_s`
	`1`	`+submodule(sourcery_formats_m) formats_s`
`2`	`2`	`!! Construct separated-value formats`
`3`	`3`	`implicit none`
`4`	`4`