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
93 lines
1.6 KiB
Fortran
93 lines
1.6 KiB
Fortran
! RUN: %S/test_modfile.sh %s %t %f18
|
|
! Test writing procedure bindings in a derived type.
|
|
|
|
module m
|
|
interface
|
|
subroutine a(i, j)
|
|
integer :: i, j
|
|
end subroutine
|
|
end interface
|
|
type, abstract :: t
|
|
integer :: i
|
|
contains
|
|
procedure(a), deferred, nopass :: q
|
|
procedure(b), deferred, nopass :: p, r
|
|
end type
|
|
type t2
|
|
integer :: x
|
|
contains
|
|
private
|
|
final :: c
|
|
procedure, non_overridable :: d
|
|
end type
|
|
type, abstract :: t2a
|
|
contains
|
|
procedure(a), deferred, public, nopass :: e
|
|
end type
|
|
type t3
|
|
sequence
|
|
integer i
|
|
real x
|
|
double precision y
|
|
double complex z
|
|
end type
|
|
contains
|
|
subroutine b()
|
|
end subroutine
|
|
subroutine c(x)
|
|
type(t2) :: x
|
|
end subroutine
|
|
subroutine d(x)
|
|
class(t2) :: x
|
|
end subroutine
|
|
subroutine test
|
|
type(t2) :: x
|
|
call x%d()
|
|
end subroutine
|
|
end module
|
|
|
|
!Expect: m.mod
|
|
!module m
|
|
! interface
|
|
! subroutine a(i,j)
|
|
! integer(4)::i
|
|
! integer(4)::j
|
|
! end
|
|
! end interface
|
|
! type,abstract::t
|
|
! integer(4)::i
|
|
! contains
|
|
! procedure(a),deferred,nopass::q
|
|
! procedure(b),deferred,nopass::p
|
|
! procedure(b),deferred,nopass::r
|
|
! end type
|
|
! type::t2
|
|
! integer(4)::x
|
|
! contains
|
|
! final::c
|
|
! procedure,non_overridable,private::d
|
|
! end type
|
|
! type,abstract::t2a
|
|
! contains
|
|
! procedure(a),deferred,nopass::e
|
|
! end type
|
|
! type::t3
|
|
! sequence
|
|
! integer(4)::i
|
|
! real(4)::x
|
|
! real(8)::y
|
|
! complex(8)::z
|
|
! end type
|
|
!contains
|
|
! subroutine b()
|
|
! end
|
|
! subroutine c(x)
|
|
! type(t2)::x
|
|
! end
|
|
! subroutine d(x)
|
|
! class(t2)::x
|
|
! end
|
|
! subroutine test()
|
|
! end
|
|
!end
|