Prefix pure Fypp macros

example/coarray-fypp/test_simple_fypp.fypp

@@ -17,10 +17,10 @@ contains
   !> Broadcast test with collective communication
   !!
   !! Note: as coarray parallelism might be implemented via threads, coarray tests must be "pure" and
-  !! use the passed context object to signalize test events. The Fypp macros automaticaly handle
-  !! this (using "ctx" as name for the context instance).
+  !! use a passed context object to signalize test events. The Fypp macros below automaticaly handle
+  !! this (using the configurable name "ctx" for the context instance).
   !!
-  $:TEST("broadcast")
+  $:PURE_TEST("broadcast")
     integer, parameter :: sourceimg = 1, sourceval = 100, otherval = -1
     integer :: buffer
 
@@ -38,16 +38,16 @@ contains
 
     ! THEN each image must contain source image's value
     !
-    ! Note: CHECK() and ASSERT() calls are collective calls, all images must call them with their
-    ! local result synchronously.
+    ! Note: PURE_CHECK() and PURE_ASSERT() calls are collective calls, all images must call them
+    ! with their local result synchronously.
     !
-    @:CHECK(is_equal(buffer, sourceval), msg=msg)
+    @:PURE_CHECK(is_equal(buffer, sourceval), msg=msg)
 
-  $:END_TEST()
+  $:END_PURE_TEST()
 
 
   !> Broadcast test with collective communication
-  $:TEST("broadcast_fail3")
+  $:PURE_TEST("broadcast_fail3")
     integer, parameter :: sourceimg = 1, sourceval = 100, otherval = -1
     integer :: buffer
 
@@ -75,9 +75,9 @@ contains
     ! ASSERT() causes the test code to return immediately, while CHECK() only logs the failure and
     ! continues.
     !
-    @:ASSERT(is_equal(buffer, sourceval), msg=msg)
+    @:PURE_ASSERT(is_equal(buffer, sourceval), msg=msg)
 
-  $:END_TEST()
+  $:END_PURE_TEST()
 
 
   ! Returns the test items from this module

include/fortuno_coarray.fypp

@@ -26,7 +26,7 @@
 #!     ctxvar: name of the context dummy argument
 #!     args: Arguments of the test procedure as a list of strings
 #!
-#:def TEST(name, label="", ctxtype="class(coa_context)", ctxvar="ctx", args=None)
+#:def PURE_TEST(name, label="", ctxtype="class(coa_context)", ctxvar="ctx", args=None)
   #:set proc = "test" + ("_" + label if label else "") + "_" + name
   #:set allargs = [ctxvar] if args is None else [ctxvar]+ args
   #:set argstr = ", ".join(allargs)
@@ -37,7 +37,7 @@
 
 
 #! Ends a test procedure
-#:def END_TEST()
+#:def END_PURE_TEST()
   end subroutine
 #:enddef
 
@@ -68,7 +68,7 @@
 #!     ctxvar: Name of the context variable
 #!     **kwargs: any keyword arguments, which should be passed to mpi_check()
 #!
-#:def CHECK(cond, ctxvar="ctx", **kwargs)
+#:def PURE_CHECK(cond, ctxvar="ctx", **kwargs)
 #:if kwargs
   #:set kwargstr = ", ".join([f"{name}={value}" for name, value in kwargs.items()])
   call ${ctxvar}$%check(${cond}$, file="${_FILE_}$", line=${_LINE_}$, ${kwargstr}$)
@@ -84,8 +84,8 @@
 #!     cond: Condition to check
 #!     **kwargs: any keyword arguments, which should be passed to check()
 #!
-#:def ASSERT(cond, ctxvar="ctx", **kwargs)
-$:CHECK(cond, ctxvar=ctxvar, **kwargs)
+#:def PURE_ASSERT(cond, ctxvar="ctx", **kwargs)
+$:PURE_CHECK(cond, ctxvar=ctxvar, **kwargs)
 if (${ctxvar}$%check_failed()) return
 #:enddef
 

test/export/coarray/app/testapp_fypp.fypp

@@ -13,16 +13,16 @@ module testapp_coa_fypp_tests
 contains
 
 
-  $:TEST("success")
+  $:PURE_TEST("success")
 
     integer :: buffer
 
     buffer = 0
     if (this_image() == 1) buffer = 1
     call co_broadcast(buffer, 1)
-    @:CHECK(is_equal(buffer, 1))
+    @:PURE_CHECK(is_equal(buffer, 1))
 
-  $:END_TEST()
+  $:END_PURE_TEST()
 
 
   function tests()