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
110 lines
2.5 KiB
Fortran
110 lines
2.5 KiB
Fortran
! RUN: %S/test_errors.sh %s %t %f18
|
|
|
|
! case 1: ma_create_new_fun' was not declared a separate module procedure
|
|
module m1
|
|
integer :: i
|
|
interface ma
|
|
module function ma_create_fun( ) result(this)
|
|
integer this
|
|
end function
|
|
end interface
|
|
end module
|
|
|
|
submodule (m1) ma_submodule
|
|
integer :: j
|
|
contains
|
|
module function ma_create_fun() result(this)
|
|
integer this
|
|
i = 1
|
|
j = 2
|
|
end function
|
|
|
|
!ERROR: 'ma_create_new_fun' was not declared a separate module procedure
|
|
module function ma_create_new_fun() result(this)
|
|
integer :: this
|
|
i = 2
|
|
j = 1
|
|
print *, "Hello"
|
|
end function
|
|
end submodule
|
|
|
|
! case 2: 'mb_create_new_sub' was not declared a separate module procedure
|
|
module m2
|
|
integer :: i
|
|
interface mb
|
|
module subroutine mb_create_sub
|
|
end subroutine mb_create_sub
|
|
end interface
|
|
end module
|
|
|
|
submodule (m2) mb_submodule
|
|
integer :: j
|
|
contains
|
|
module subroutine mb_create_sub
|
|
integer this
|
|
i = 1
|
|
j = 2
|
|
end subroutine mb_create_sub
|
|
|
|
!ERROR: 'mb_create_new_sub' was not declared a separate module procedure
|
|
module SUBROUTINE mb_create_new_sub()
|
|
integer :: this
|
|
i = 2
|
|
j = 1
|
|
end SUBROUTINE mb_create_new_sub
|
|
end submodule
|
|
|
|
! case 3: separate module procedure without module prefix
|
|
module m3
|
|
interface mc
|
|
function mc_create( ) result(this)
|
|
integer :: this
|
|
end function
|
|
end interface
|
|
end module
|
|
|
|
submodule (m3) mc_submodule
|
|
contains
|
|
!ERROR: 'mc_create' was not declared a separate module procedure
|
|
module function mc_create() result(this)
|
|
integer :: this
|
|
end function
|
|
end submodule
|
|
|
|
! case 4: Submodule having separate module procedure rather than a module
|
|
module m4
|
|
interface
|
|
real module function func1() ! module procedure interface body for func1
|
|
end function
|
|
end interface
|
|
end module
|
|
|
|
submodule (m4) m4sub
|
|
interface
|
|
module function func2(b) ! module procedure interface body for func2
|
|
integer :: b
|
|
integer :: func2
|
|
end function
|
|
|
|
real module function func3() ! module procedure interface body for func3
|
|
end function
|
|
end interface
|
|
contains
|
|
real module function func1() ! implementation of func1 declared in m4
|
|
func1 = 20
|
|
end function
|
|
end submodule
|
|
|
|
submodule (m4:m4sub) m4sub2
|
|
contains
|
|
module function func2(b) ! implementation of func2 declared in m4sub
|
|
integer :: b
|
|
integer :: func2
|
|
func2 = b
|
|
end function
|
|
|
|
real module function func3() ! implementation of func3 declared in m4sub
|
|
func3 = 20
|
|
end function
|
|
end submodule
|