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
68 lines
1.9 KiB
Fortran
68 lines
1.9 KiB
Fortran
! RUN: %S/test_errors.sh %s %t %f18
|
|
module m
|
|
abstract interface
|
|
subroutine foo
|
|
end subroutine
|
|
end interface
|
|
|
|
procedure() :: a
|
|
procedure(integer) :: b
|
|
procedure(foo) :: c
|
|
procedure(bar) :: d
|
|
!ERROR: 'missing' must be an abstract interface or a procedure with an explicit interface
|
|
procedure(missing) :: e
|
|
!ERROR: 'b' must be an abstract interface or a procedure with an explicit interface
|
|
procedure(b) :: f
|
|
procedure(c) :: g
|
|
external :: h
|
|
!ERROR: 'h' must be an abstract interface or a procedure with an explicit interface
|
|
procedure(h) :: i
|
|
procedure(forward) :: j
|
|
!ERROR: 'bad1' must be an abstract interface or a procedure with an explicit interface
|
|
procedure(bad1) :: k1
|
|
!ERROR: 'bad2' must be an abstract interface or a procedure with an explicit interface
|
|
procedure(bad2) :: k2
|
|
!ERROR: 'bad3' must be an abstract interface or a procedure with an explicit interface
|
|
procedure(bad3) :: k3
|
|
|
|
abstract interface
|
|
subroutine forward
|
|
end subroutine
|
|
end interface
|
|
|
|
real :: bad1(1)
|
|
real :: bad2
|
|
type :: bad3
|
|
end type
|
|
|
|
type :: m ! the name of a module can be used as a local identifier
|
|
end type m
|
|
|
|
external :: a, b, c, d
|
|
!ERROR: EXTERNAL attribute not allowed on 'm'
|
|
external :: m
|
|
!ERROR: EXTERNAL attribute not allowed on 'foo'
|
|
external :: foo
|
|
!ERROR: EXTERNAL attribute not allowed on 'bar'
|
|
external :: bar
|
|
|
|
!ERROR: PARAMETER attribute not allowed on 'm'
|
|
parameter(m=2)
|
|
!ERROR: PARAMETER attribute not allowed on 'foo'
|
|
parameter(foo=2)
|
|
!ERROR: PARAMETER attribute not allowed on 'bar'
|
|
parameter(bar=2)
|
|
|
|
type, abstract :: t1
|
|
integer :: i
|
|
contains
|
|
!ERROR: 'proc' must be an abstract interface or a procedure with an explicit interface
|
|
!ERROR: Procedure component 'p1' has invalid interface 'proc'
|
|
procedure(proc), deferred :: p1
|
|
end type t1
|
|
|
|
contains
|
|
subroutine bar
|
|
end subroutine
|
|
end module
|