99aa87a5b5
There were several different ways of handling the option to f18 to find predefined modules: - test_errors.sh was created by cmake substituting FLANG_INTRINSIC_MODULES_DIR into test_errors.sh.in - some tests used the flang script which has the option built it - some tests used %f18_with_includes which was replaced by the path to f18 plus the -I option - some included -I../../include/flang in their run command To make this more consistent, change %f18 to include the -intrinsic-module-directory option and use it everywhere, including to replace %flang and %f18_with_includes. This requires changing all of the invocations of the test scripts to put %f18 at the end so that it can expand to more than one argument. This eliminates the need to generate test_errors.sh which means we don't need flang/test/Semantics/CMakeLists.txt or the %B substitution. That makes the test_errors.sh command like the others, replacing %B/test/Semantics/test_errors.sh with %S/test_errors.sh. Also remove the OPTIONS: functionality as custom options can be included in the RUN: command. And remove -I/../../include/flang as that is now always included. Differential Revision: https://reviews.llvm.org/D79634
119 lines
2.3 KiB
Fortran
119 lines
2.3 KiB
Fortran
! RUN: %S/test_modfile.sh %s %t %f18
|
|
! Test resolution of type-bound generics.
|
|
|
|
module m1
|
|
type :: t
|
|
contains
|
|
procedure, pass(x) :: add1 => add
|
|
procedure, nopass :: add2 => add
|
|
procedure :: add_real
|
|
generic :: g => add1, add2, add_real
|
|
end type
|
|
contains
|
|
integer(8) pure function add(x, y)
|
|
class(t), intent(in) :: x, y
|
|
end
|
|
integer(8) pure function add_real(x, y)
|
|
class(t), intent(in) :: x
|
|
real, intent(in) :: y
|
|
end
|
|
subroutine test1(x, y, z)
|
|
type(t) :: x, y
|
|
real :: z(x%add1(y))
|
|
end
|
|
subroutine test1p(x, y, z)
|
|
class(t) :: x, y
|
|
real :: z(x%add1(y))
|
|
end
|
|
subroutine test2(x, y, z)
|
|
type(t) :: x, y
|
|
real :: z(x%g(y))
|
|
end
|
|
subroutine test2p(x, y, z)
|
|
class(t) :: x, y
|
|
real :: z(x%g(y))
|
|
end
|
|
subroutine test3(x, y, z)
|
|
type(t) :: x, y
|
|
real :: z(x%g(y, x))
|
|
end
|
|
subroutine test3p(x, y, z)
|
|
class(t) :: x, y
|
|
real :: z(x%g(y, x))
|
|
end
|
|
subroutine test4(x, y, z)
|
|
type(t) :: x
|
|
real :: y
|
|
real :: z(x%g(y))
|
|
end
|
|
subroutine test4p(x, y, z)
|
|
class(t) :: x
|
|
real :: y
|
|
real :: z(x%g(y))
|
|
end
|
|
end
|
|
|
|
!Expect: m1.mod
|
|
!module m1
|
|
! type :: t
|
|
! contains
|
|
! procedure, pass(x) :: add1 => add
|
|
! procedure, nopass :: add2 => add
|
|
! procedure :: add_real
|
|
! generic :: g => add1
|
|
! generic :: g => add2
|
|
! generic :: g => add_real
|
|
! end type
|
|
!contains
|
|
! pure function add(x, y)
|
|
! class(t), intent(in) :: x
|
|
! class(t), intent(in) :: y
|
|
! integer(8) :: add
|
|
! end
|
|
! pure function add_real(x, y)
|
|
! class(t), intent(in) :: x
|
|
! real(4), intent(in) :: y
|
|
! integer(8) :: add_real
|
|
! end
|
|
! subroutine test1(x, y, z)
|
|
! type(t) :: x
|
|
! type(t) :: y
|
|
! real(4) :: z(1_8:add(x, y))
|
|
! end
|
|
! subroutine test1p(x,y,z)
|
|
! class(t)::x
|
|
! class(t)::y
|
|
! real(4)::z(1_8:x%add1(y))
|
|
! end
|
|
! subroutine test2(x, y, z)
|
|
! type(t) :: x
|
|
! type(t) :: y
|
|
! real(4)::z(1_8:add(x,y))
|
|
! end
|
|
! subroutine test2p(x,y,z)
|
|
! class(t)::x
|
|
! class(t)::y
|
|
! real(4) :: z(1_8:x%add1(y))
|
|
! end
|
|
! subroutine test3(x, y, z)
|
|
! type(t) :: x
|
|
! type(t) :: y
|
|
! real(4)::z(1_8:add(y,x))
|
|
! end
|
|
! subroutine test3p(x,y,z)
|
|
! class(t)::x
|
|
! class(t)::y
|
|
! real(4) :: z(1_8:x%add2(y, x))
|
|
! end
|
|
! subroutine test4(x, y, z)
|
|
! type(t) :: x
|
|
! real(4) :: y
|
|
! real(4)::z(1_8:add_real(x,y))
|
|
! end
|
|
! subroutine test4p(x,y,z)
|
|
! class(t)::x
|
|
! real(4)::y
|
|
! real(4) :: z(1_8:x%add_real(y))
|
|
! end
|
|
!end
|