Skip to content

test for standard conformance #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jun 4, 2020
Merged

test for standard conformance #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
39bb56c
test for standard conformance
MarDiehl May 30, 2020
d2dc3ec
option was only introduced in gfortran 10.0
MarDiehl May 30, 2020
285e3a1
support for older gfortran
MarDiehl May 30, 2020
a7becc3
Merge branch 'master' into standard-checks
MarDiehl May 31, 2020
a206e25
language
MarDiehl May 31, 2020
022fcf7
allow non-standard conforming code only selectively where needed
MarDiehl May 31, 2020
999be0b
prevent erroneous rejection of valid code
MarDiehl May 31, 2020
4378a67
order was mixed up, no global relaxation of standards
MarDiehl May 31, 2020
f563893
polishing
MarDiehl Jun 1, 2020
0abec4b
following standard, no exception for gfortran 10 needed
MarDiehl Jun 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,27 @@ include(${CMAKE_SOURCE_DIR}/cmake/stdlib.cmake)
# --- compiler options
if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
add_compile_options(-fimplicit-none)
add_compile_options(-ffree-line-length-132)
add_compile_options(-Wall)
add_compile_options(-Wextra)
add_compile_options(-Wimplicit-procedure)
add_compile_options(-Wconversion-extra)
# -pedantic-errors triggers a false positive for optional arguments of elemental functions,
# see test_optval and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95446
add_compile_options(-pedantic-errors)
if(CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
add_compile_options(-std=f2018)
else()
add_compile_options(-std=f2008ts)
endif()
elseif(CMAKE_Fortran_COMPILER_ID STREQUAL Intel)
add_compile_options(-warn declarations)
add_compile_options(-warn declarations,general,usage,interfaces,unused)
add_compile_options(-standard-semantics)
if(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 18.0)
add_compile_options(-stand f15)
else()
add_compile_options(-stand f18)
endif()
elseif(CMAKE_Fortran_COMPILER_ID STREQUAL PGI)
add_compile_options(-Mdclchk)
endif()
Expand Down
4 changes: 2 additions & 2 deletions cmake/stdlib.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ endfunction()
# Preprocesses fortran files with fypp.
#
# It assumes that source files have the ".fypp" extension. Target files will be
# created the extension ".f90". The FYPP variable must contain the path to the
# fypp-preprocessor.
# created with the extension ".f90". The FYPP variable must contain the path to
# the fypp-preprocessor.
#
# Args:
# fyppopts [in]: Options to pass to fypp.
Expand Down
82 changes: 41 additions & 41 deletions src/stdlib_experimental_ascii.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,39 +15,39 @@ module stdlib_experimental_ascii
public :: to_lower, to_upper

! All control characters in the ASCII table (see www.asciitable.com).
character(len=1), public, parameter :: NUL = achar(z'00') !! Null
character(len=1), public, parameter :: SOH = achar(z'01') !! Start of heading
character(len=1), public, parameter :: STX = achar(z'02') !! Start of text
character(len=1), public, parameter :: ETX = achar(z'03') !! End of text
character(len=1), public, parameter :: EOT = achar(z'04') !! End of transmission
character(len=1), public, parameter :: ENQ = achar(z'05') !! Enquiry
character(len=1), public, parameter :: ACK = achar(z'06') !! Acknowledge
character(len=1), public, parameter :: BEL = achar(z'07') !! Bell
character(len=1), public, parameter :: BS = achar(z'08') !! Backspace
character(len=1), public, parameter :: TAB = achar(z'09') !! Horizontal tab
character(len=1), public, parameter :: LF = achar(z'0A') !! NL line feed, new line
character(len=1), public, parameter :: VT = achar(z'0B') !! Vertical tab
character(len=1), public, parameter :: FF = achar(z'0C') !! NP form feed, new page
character(len=1), public, parameter :: CR = achar(z'0D') !! Carriage return
character(len=1), public, parameter :: SO = achar(z'0E') !! Shift out
character(len=1), public, parameter :: SI = achar(z'0F') !! Shift in
character(len=1), public, parameter :: DLE = achar(z'10') !! Data link escape
character(len=1), public, parameter :: DC1 = achar(z'11') !! Device control 1
character(len=1), public, parameter :: DC2 = achar(z'12') !! Device control 2
character(len=1), public, parameter :: DC3 = achar(z'13') !! Device control 3
character(len=1), public, parameter :: DC4 = achar(z'14') !! Device control 4
character(len=1), public, parameter :: NAK = achar(z'15') !! Negative acknowledge
character(len=1), public, parameter :: SYN = achar(z'16') !! Synchronous idle
character(len=1), public, parameter :: ETB = achar(z'17') !! End of transmission block
character(len=1), public, parameter :: CAN = achar(z'18') !! Cancel
character(len=1), public, parameter :: EM = achar(z'19') !! End of medium
character(len=1), public, parameter :: SUB = achar(z'1A') !! Substitute
character(len=1), public, parameter :: ESC = achar(z'1B') !! Escape
character(len=1), public, parameter :: FS = achar(z'1C') !! File separator
character(len=1), public, parameter :: GS = achar(z'1D') !! Group separator
character(len=1), public, parameter :: RS = achar(z'1E') !! Record separator
character(len=1), public, parameter :: US = achar(z'1F') !! Unit separator
character(len=1), public, parameter :: DEL = achar(z'7F') !! Delete
character(len=1), public, parameter :: NUL = achar(int(z'00')) !! Null
character(len=1), public, parameter :: SOH = achar(int(z'01')) !! Start of heading
character(len=1), public, parameter :: STX = achar(int(z'02')) !! Start of text
character(len=1), public, parameter :: ETX = achar(int(z'03')) !! End of text
character(len=1), public, parameter :: EOT = achar(int(z'04')) !! End of transmission
character(len=1), public, parameter :: ENQ = achar(int(z'05')) !! Enquiry
character(len=1), public, parameter :: ACK = achar(int(z'06')) !! Acknowledge
character(len=1), public, parameter :: BEL = achar(int(z'07')) !! Bell
character(len=1), public, parameter :: BS = achar(int(z'08')) !! Backspace
character(len=1), public, parameter :: TAB = achar(int(z'09')) !! Horizontal tab
character(len=1), public, parameter :: LF = achar(int(z'0A')) !! NL line feed, new line
character(len=1), public, parameter :: VT = achar(int(z'0B')) !! Vertical tab
character(len=1), public, parameter :: FF = achar(int(z'0C')) !! NP form feed, new page
character(len=1), public, parameter :: CR = achar(int(z'0D')) !! Carriage return
character(len=1), public, parameter :: SO = achar(int(z'0E')) !! Shift out
character(len=1), public, parameter :: SI = achar(int(z'0F')) !! Shift in
character(len=1), public, parameter :: DLE = achar(int(z'10')) !! Data link escape
character(len=1), public, parameter :: DC1 = achar(int(z'11')) !! Device control 1
character(len=1), public, parameter :: DC2 = achar(int(z'12')) !! Device control 2
character(len=1), public, parameter :: DC3 = achar(int(z'13')) !! Device control 3
character(len=1), public, parameter :: DC4 = achar(int(z'14')) !! Device control 4
character(len=1), public, parameter :: NAK = achar(int(z'15')) !! Negative acknowledge
character(len=1), public, parameter :: SYN = achar(int(z'16')) !! Synchronous idle
character(len=1), public, parameter :: ETB = achar(int(z'17')) !! End of transmission block
character(len=1), public, parameter :: CAN = achar(int(z'18')) !! Cancel
character(len=1), public, parameter :: EM = achar(int(z'19')) !! End of medium
character(len=1), public, parameter :: SUB = achar(int(z'1A')) !! Substitute
character(len=1), public, parameter :: ESC = achar(int(z'1B')) !! Escape
character(len=1), public, parameter :: FS = achar(int(z'1C')) !! File separator
character(len=1), public, parameter :: GS = achar(int(z'1D')) !! Group separator
character(len=1), public, parameter :: RS = achar(int(z'1E')) !! Record separator
character(len=1), public, parameter :: US = achar(int(z'1F')) !! Unit separator
character(len=1), public, parameter :: DEL = achar(int(z'7F')) !! Delete

! Constant character sequences
character(len=*), public, parameter :: fullhex_digits = "0123456789ABCDEFabcdef" !! 0 .. 9A .. Fa .. f
Expand Down Expand Up @@ -79,15 +79,15 @@ pure logical function is_alphanum(c)
! i.e. in the range 0 .. 0x7F.
pure logical function is_ascii(c)
character(len=1), intent(in) :: c !! The character to test.
is_ascii = iachar(c) <= z'7F'
is_ascii = iachar(c) <= int(z'7F')
end function

!> Checks whether `c` is a control character.
pure logical function is_control(c)
character(len=1), intent(in) :: c !! The character to test.
integer :: ic
ic = iachar(c)
is_control = ic < z'20' .or. ic == z'7F'
is_control = ic < int(z'20') .or. ic == int(z'7F')
end function

!> Checks whether `c` is a digit (0 .. 9).
Expand Down Expand Up @@ -116,7 +116,7 @@ pure logical function is_punctuation(c)
character(len=1), intent(in) :: c !! The character to test.
integer :: ic
ic = iachar(c) ! '~' '!'
is_punctuation = (ic <= z'7E') .and. (ic >= z'21') .and. &
is_punctuation = (ic <= int(z'7E')) .and. (ic >= int(z'21')) .and. &
(.not. is_alphanum(c))
end function

Expand All @@ -126,7 +126,7 @@ pure logical function is_graphical(c)
character(len=1), intent(in) :: c !! The character to test.
integer :: ic
ic = iachar(c) ! '!' '~'
is_graphical = (z'21' <= ic) .and. (ic <= z'7E')
is_graphical = (int(z'21') <= ic) .and. (ic <= int(z'7E'))
end function

!> Checks whether or not `c` is a printable character - including the
Expand All @@ -135,7 +135,7 @@ pure logical function is_printable(c)
character(len=1), intent(in) :: c !! The character to test.
integer :: ic
ic = iachar(c) ! '~'
is_printable = c >= ' ' .and. ic <= z'7E'
is_printable = c >= ' ' .and. ic <= int(z'7E')
end function

!> Checks whether `c` is a lowercase ASCII letter (a .. z).
Expand All @@ -157,7 +157,7 @@ pure logical function is_white(c)
character(len=1), intent(in) :: c !! The character to test.
integer :: ic
ic = iachar(c) ! TAB, LF, VT, FF, CR
is_white = (c == ' ') .or. (ic >= z'09' .and. ic <= z'0D');
is_white = (c == ' ') .or. (ic >= int(z'09') .and. ic <= int(z'0D'));
end function

!> Checks whether or not `c` is a blank character. That includes the
Expand All @@ -166,7 +166,7 @@ pure logical function is_blank(c)
character(len=1), intent(in) :: c !! The character to test.
integer :: ic
ic = iachar(c) ! TAB
is_blank = (c == ' ') .or. (ic == z'09');
is_blank = (c == ' ') .or. (ic == int(z'09'));
end function

!> Returns the corresponding lowercase letter, if `c` is an uppercase
Expand All @@ -193,4 +193,4 @@ pure function to_upper(c) result(t)
if (is_lower(t)) t = achar(iachar(t) + diff)
end function

end module
end module
20 changes: 10 additions & 10 deletions src/tests/linalg/test_linalg.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ subroutine test_eye
msg="sum(rye - diag([(1.0_sp,i=1,6)])) < sptol failed.",warn=warn)

cye = eye(7)
call check(abs(trace(cye) - complex(7.0_sp,0.0_sp)) < sptol, &
msg="abs(trace(cye) - complex(7.0_sp,0.0_sp)) < sptol failed.",warn=warn)
call check(abs(trace(cye) - cmplx(7.0_sp,0.0_sp)) < sptol, &
msg="abs(trace(cye) - cmplx(7.0_sp,0.0_sp)) < sptol failed.",warn=warn)
end subroutine

subroutine test_diag_rsp
Expand Down Expand Up @@ -153,7 +153,7 @@ subroutine test_diag_rqp
subroutine test_diag_csp
integer, parameter :: n = 3
complex(sp) :: v(n), a(n,n), b(n,n)
complex(sp), parameter :: i_ = complex(0,1)
complex(sp), parameter :: i_ = cmplx(0,1)
integer :: i,j
write(*,*) "test_diag_csp"
a = diag([(i,i=1,n)]) + diag([(i_,i=1,n)])
Expand All @@ -170,7 +170,7 @@ subroutine test_diag_csp
subroutine test_diag_cdp
integer, parameter :: n = 3
complex(dp) :: v(n), a(n,n), b(n,n)
complex(dp), parameter :: i_ = complex(0,1)
complex(dp), parameter :: i_ = cmplx(0,1)
integer :: i,j
write(*,*) "test_diag_cdp"
a = diag([i_],-2) + diag([i_],2)
Expand All @@ -181,7 +181,7 @@ subroutine test_diag_cdp
subroutine test_diag_cqp
integer, parameter :: n = 3
complex(qp) :: v(n), a(n,n), b(n,n)
complex(qp), parameter :: i_ = complex(0,1)
complex(qp), parameter :: i_ = cmplx(0,1)
integer :: i,j
write(*,*) "test_diag_cqp"
a = diag([i_,i_],-1) + diag([i_,i_],1)
Expand Down Expand Up @@ -333,7 +333,7 @@ subroutine test_trace_csp
integer, parameter :: n = 5
real(sp) :: re(n,n), im(n,n)
complex(sp) :: a(n,n), b(n,n)
complex(sp), parameter :: i_ = complex(0,1)
complex(sp), parameter :: i_ = cmplx(0,1)
write(*,*) "test_trace_csp"

call random_number(re)
Expand All @@ -352,12 +352,12 @@ subroutine test_trace_csp
subroutine test_trace_cdp
integer, parameter :: n = 3
complex(dp) :: a(n,n), ans
complex(dp), parameter :: i_ = complex(0,1)
complex(dp), parameter :: i_ = cmplx(0,1)
integer :: j
write(*,*) "test_trace_cdp"

a = reshape([(j + (n**2 - (j-1))*i_,j=1,n**2)],[n,n])
ans = complex(15,15) !(1 + 5 + 9) + (9 + 5 + 1)i
ans = cmplx(15,15) !(1 + 5 + 9) + (9 + 5 + 1)i

call check(abs(trace(a) - ans) < dptol, &
msg="abs(trace(a) - ans) < dptol failed.",warn=warn)
Expand All @@ -366,7 +366,7 @@ subroutine test_trace_cdp
subroutine test_trace_cqp
integer, parameter :: n = 3
complex(qp) :: a(n,n)
complex(qp), parameter :: i_ = complex(0,1)
complex(qp), parameter :: i_ = cmplx(0,1)
write(*,*) "test_trace_cqp"
a = 3*eye(n) + 4*eye(n)*i_ ! pythagorean triple
call check(abs(trace(a)) - 3*5.0_qp < qptol, &
Expand Down Expand Up @@ -442,4 +442,4 @@ pure recursive function catalan_number(n) result(value)
end if
end function

end program
end program
4 changes: 4 additions & 0 deletions src/tests/optval/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
ADDTEST(optval)
# prevent false positive (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95446)
if(CMAKE_Fortran_COMPILER_ID STREQUAL GNU)
set_source_files_properties("test_optval.f90" PROPERTIES COMPILE_FLAGS "-Wno-error=pedantic")
endif()