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
92 lines
2.1 KiB
Fortran
92 lines
2.1 KiB
Fortran
! RUN: %S/test_errors.sh %s %t %f18
|
|
|
|
! C1568 The procedure-name shall have been declared to be a separate module
|
|
! procedure in the containing program unit or an ancestor of that program unit.
|
|
module m1
|
|
interface
|
|
module subroutine sub1(arg1)
|
|
integer, intent(inout) :: arg1
|
|
end subroutine
|
|
module integer function fun1()
|
|
end function
|
|
end interface
|
|
type t
|
|
end type
|
|
integer i
|
|
end module
|
|
|
|
submodule(m1) s1
|
|
contains
|
|
!ERROR: 'missing1' was not declared a separate module procedure
|
|
module procedure missing1
|
|
end
|
|
!ERROR: 'missing2' was not declared a separate module procedure
|
|
module subroutine missing2
|
|
end
|
|
!ERROR: 't' was not declared a separate module procedure
|
|
module procedure t
|
|
end
|
|
!ERROR: 'i' was not declared a separate module procedure
|
|
module subroutine i
|
|
end
|
|
end submodule
|
|
|
|
module m2
|
|
interface
|
|
module subroutine sub1(arg1)
|
|
integer, intent(inout) :: arg1
|
|
end subroutine
|
|
module integer function fun1()
|
|
end function
|
|
end interface
|
|
type t
|
|
end type
|
|
!ERROR: Declaration of 'i' conflicts with its use as module procedure
|
|
integer i
|
|
contains
|
|
!ERROR: 'missing1' was not declared a separate module procedure
|
|
module procedure missing1
|
|
end
|
|
!ERROR: 'missing2' was not declared a separate module procedure
|
|
module subroutine missing2
|
|
end
|
|
!ERROR: 't' is already declared in this scoping unit
|
|
!ERROR: 't' was not declared a separate module procedure
|
|
module procedure t
|
|
end
|
|
!ERROR: 'i' was not declared a separate module procedure
|
|
module subroutine i
|
|
end
|
|
end module
|
|
|
|
! Separate module procedure defined in same module as declared
|
|
module m3
|
|
interface
|
|
module subroutine sub
|
|
end subroutine
|
|
end interface
|
|
contains
|
|
module procedure sub
|
|
end procedure
|
|
end module
|
|
|
|
! Separate module procedure defined in a submodule
|
|
module m4
|
|
interface
|
|
module subroutine a
|
|
end subroutine
|
|
module subroutine b
|
|
end subroutine
|
|
end interface
|
|
end module
|
|
submodule(m4) s4a
|
|
contains
|
|
module procedure a
|
|
end procedure
|
|
end submodule
|
|
submodule(m4:s4a) s4b
|
|
contains
|
|
module procedure b
|
|
end procedure
|
|
end
|