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
76 lines
2.3 KiB
Fortran
76 lines
2.3 KiB
Fortran
! RUN: %S/test_errors.sh %s %t %f18
|
|
module m2
|
|
public s2, s4
|
|
private s3
|
|
contains
|
|
subroutine s2
|
|
end
|
|
subroutine s3
|
|
end
|
|
subroutine s4
|
|
end
|
|
end module
|
|
|
|
module m
|
|
use m2
|
|
external bar
|
|
interface
|
|
subroutine foo
|
|
end subroutine
|
|
end interface
|
|
integer :: i
|
|
type t1
|
|
integer :: c
|
|
contains
|
|
!ERROR: The binding of 'a' ('missing') must be either an accessible module procedure or an external procedure with an explicit interface
|
|
procedure, nopass :: a => missing
|
|
procedure, nopass :: b => s, s2
|
|
!ERROR: Type parameter, component, or procedure binding 'c' already defined in this type
|
|
procedure, nopass :: c
|
|
!ERROR: DEFERRED is only allowed when an interface-name is provided
|
|
procedure, nopass, deferred :: d => s
|
|
!Note: s3 not found because it's not accessible -- should we issue a message
|
|
!to that effect?
|
|
!ERROR: 's3' must be either an accessible module procedure or an external procedure with an explicit interface
|
|
procedure, nopass :: s3
|
|
procedure, nopass :: foo
|
|
!ERROR: 'bar' must be either an accessible module procedure or an external procedure with an explicit interface
|
|
procedure, nopass :: bar
|
|
!ERROR: 'i' must be either an accessible module procedure or an external procedure with an explicit interface
|
|
procedure, nopass :: i
|
|
!ERROR: Type parameter, component, or procedure binding 'b' already defined in this type
|
|
procedure, nopass :: b => s4
|
|
!ERROR: DEFERRED is required when an interface-name is provided
|
|
procedure(foo), nopass :: g
|
|
end type
|
|
type, abstract :: t1a ! DEFERRED valid only in ABSTRACT derived type
|
|
contains
|
|
procedure(foo), nopass, deferred :: e
|
|
procedure(s), nopass, deferred :: f
|
|
!ERROR: Type parameter, component, or procedure binding 'f' already defined in this type
|
|
procedure(foo), nopass, deferred :: f
|
|
!ERROR: 'bar' must be an abstract interface or a procedure with an explicit interface
|
|
procedure(bar), nopass, deferred :: h
|
|
end type
|
|
type t2
|
|
integer :: i
|
|
contains
|
|
procedure, nopass :: b => s
|
|
final :: f
|
|
!ERROR: Type parameter, component, or procedure binding 'i' already defined in this type
|
|
final :: i
|
|
end type
|
|
type t3
|
|
contains
|
|
private
|
|
procedure, nopass :: b => s
|
|
procedure, nopass, public :: f
|
|
end type
|
|
contains
|
|
subroutine s
|
|
end
|
|
subroutine f(x)
|
|
type(t2) :: x
|
|
end
|
|
end module
|