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
46 lines
1.4 KiB
Fortran
46 lines
1.4 KiB
Fortran
! RUN: %S/test_errors.sh %s %t %f18 -flogical-abbreviations -fxor-operator
|
|
|
|
! Like m4 in resolve63 but compiled with different options.
|
|
! Alternate operators are enabled so treat these as intrinsic.
|
|
module m4
|
|
contains
|
|
subroutine s1(x, y, z)
|
|
logical :: x
|
|
real :: y, z
|
|
!ERROR: Operands of .AND. must be LOGICAL; have REAL(4) and REAL(4)
|
|
x = y .a. z
|
|
!ERROR: Operands of .OR. must be LOGICAL; have REAL(4) and REAL(4)
|
|
x = y .o. z
|
|
!ERROR: Operand of .NOT. must be LOGICAL; have REAL(4)
|
|
x = .n. y
|
|
!ERROR: Operands of .NEQV. must be LOGICAL; have REAL(4) and REAL(4)
|
|
x = y .xor. z
|
|
!ERROR: Operands of .NEQV. must be LOGICAL; have REAL(4) and REAL(4)
|
|
x = y .x. y
|
|
end
|
|
end
|
|
|
|
! Like m4 in resolve63 but compiled with different options.
|
|
! Alternate operators are enabled so treat .A. as .AND.
|
|
module m5
|
|
interface operator(.A.)
|
|
logical function f1(x, y)
|
|
integer, intent(in) :: x, y
|
|
end
|
|
end interface
|
|
interface operator(.and.)
|
|
logical function f2(x, y)
|
|
real, intent(in) :: x, y
|
|
end
|
|
end interface
|
|
contains
|
|
subroutine s1(x, y, z)
|
|
logical :: x
|
|
complex :: y, z
|
|
!ERROR: No intrinsic or user-defined OPERATOR(.A.) matches operand types COMPLEX(4) and COMPLEX(4)
|
|
x = y .and. z
|
|
!ERROR: No intrinsic or user-defined OPERATOR(.A.) matches operand types COMPLEX(4) and COMPLEX(4)
|
|
x = y .a. z
|
|
end
|
|
end
|