Merge pull request #634 from sourceryinstitute/reduce-name-clashes

Reduce name clashes

Author: Damian Rouson

src/tests/unit/teams/get-communicator.f90

@@ -30,6 +30,7 @@
 program main
   !! summary: Test get_commiunicator function, an OpenCoarrays-specific language extension
   use opencoarrays, only : get_communicator
+  use oc_assertions_interface, only : assert
 
   implicit none
 
@@ -99,16 +100,4 @@ subroutine mpi_matches_caf(comm)
 
   end subroutine
 
-  elemental subroutine assert(assertion,description)
-    !! TODO: move this to a common place for all tests to use
-    logical, intent(in) :: assertion
-    character(len=*), intent(in) :: description
-    integer, parameter :: max_digits=12
-    character(len=max_digits) :: image_number
-    if (.not.assertion) then
-      write(image_number,*) this_image()
-      error stop "Assertion '" // description // "' failed on image " // trim(image_number)
-    end if
-  end subroutine
-
 end program

src/tests/unit/teams/team-number.f90

@@ -1,6 +1,6 @@
 ! BSD 3-Clause License
 !
-! Copyright (c) 2018, Sourcery Institute
+! Copyright (c) 2018-2019, Sourcery Institute
 ! All rights reserved.
 !
 ! Redistribution and use in source and binary forms, with or without
@@ -31,6 +31,7 @@ program main
   !! summary: Test team_number intrinsic function
   use iso_fortran_env, only : team_type
   use iso_c_binding, only : c_loc
+  use oc_assertions_interface, only : assert
 
   implicit none
 
@@ -59,18 +60,4 @@ program main
   sync all
   if (this_image()==1) print *,"Test passed."
 
-contains
-
-  elemental subroutine assert(assertion,description)
-    !! TODO: move this to a common place for all tests to use
-    logical, intent(in) :: assertion
-    character(len=*), intent(in) :: description
-    integer, parameter :: max_digits=12
-    character(len=max_digits) :: image_number
-    if (.not.assertion) then
-      write(image_number,*) this_image()
-      error stop "Assertion " // description // "failed on image " // trim(image_number)
-    end if
-  end subroutine
-
 end program

src/tests/unit/teams/teams_subset.f90

@@ -3,7 +3,7 @@ program teams_subset
   !!
   !! Regression test for prior potential deadlock in change team/end team
   use iso_fortran_env, only : team_type
-  use assertions_interface, only : assert
+  use oc_assertions_interface, only : assert
   implicit none
 
   type(team_type) team

src/tests/utilities/CMakeLists.txt

@@ -32,11 +32,11 @@ if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" )
 endif()
 
 add_library( oc_test_interfaces OBJECT
-  object_interface.f90
-  assertions_interface.F90
+  opencoarrays_object_interface.f90
+  oc_assertions_interface.F90
   )
 add_library( opencoarrays_test_utilities
-  assertions_implementation.F90
+  oc_assertions_implementation.F90
   $<TARGET_OBJECTS:oc_test_interfaces>
   )
 set_target_properties(opencoarrays_test_utilities

src/tests/utilities/assertions_implementation.F90 renamed to src/tests/utilities/oc_assertions_implementation.F90

@@ -1,4 +1,4 @@
-submodule(assertions_interface) assertions_implementation
+submodule(oc_assertions_interface) oc_assertions_implementation
   !! Define the assert procedure
 
   implicit none
@@ -29,7 +29,7 @@
 
     pure subroutine set(msg)
 
-      use object_interface, only : object
+      use opencoarrays_object_interface, only : object
         !! import abstract type with generic binding supporting user-defined derived type output
 
       character(len=:), intent(out),  allocatable :: msg
@@ -67,4 +67,4 @@ pure subroutine set(msg)
 
   end procedure
 
-end submodule
+end submodule oc_assertions_implementation

src/tests/utilities/assertions_interface.F90 renamed to src/tests/utilities/oc_assertions_interface.F90

@@ -1,7 +1,7 @@
 #ifndef USE_ASSERTIONS
 # define USE_ASSERTIONS .false.
 #endif
-module assertions_interface
+module oc_assertions_interface
   !! author: Damian Rouson
   !!
   !! Utility for runtime checking of logical assertions.
@@ -24,15 +24,15 @@ module assertions_interface
   !! ----------
   !!    Pass the optional success argument & check for false return value as an indication of assertion failure:
   !!
-  !!    use assertions_interface, only : assert,assertions
+  !!    use opencoarrays_assertions_interface, only : assert, assertions
   !!    if (assertions) call assert( 2 > 1, "always true inequality", success)
   !!    if (error_code/=0) call my_error_handler()
   !!
   !! Use case 2
   !! ----------
   !!    Error-terminate if the assertion fails:
   !!
-  !!    use assertions_interface, only : assert,assertions
+  !!    use opencoarrays_assertions_interface, only : assert,assertions
   !!    if (assertions) call assert( 2 > 1, "always true inequality")
   !!
   implicit none
@@ -61,4 +61,4 @@ module subroutine assert(assertion,description,diagnostic_data,success,error_mes
         !! Optional informational message allocated only if assertion==.false. .and. present(success)
     end subroutine
   end interface
-end module
+end module oc_assertions_interface

src/tests/utilities/object_interface.f90 renamed to src/tests/utilities/opencoarrays_object_interface.f90

@@ -1,4 +1,4 @@
-module object_interface
+module opencoarrays_object_interface
   !! Object pattern abstract type to provide a universal interface to a userd-defined derived type ouptput
   !! capability specified in a generic binding
   implicit none