Browse Source

Remove unused assert toggling

Running testsuite *without* asserts takes roughly 150% or the time to
run it *with* asserts, probably because the compiler is helped by some
of the checks. The toggling is unused anyway, so delete it.
pull/106/head
Fredrik Ekre 1 year ago
parent
commit
6a31f28e88
No known key found for this signature in database
GPG Key ID: DE82E6D5E364C0A2
  1. 45
      src/ToggleableAsserts.jl
  2. 5
      src/debug.jl
  3. 18
      test/runtests.jl

45
src/ToggleableAsserts.jl

@ -1,45 +0,0 @@ @@ -1,45 +0,0 @@
# SPDX-License-Identifier: MIT
# The code in this file is derived from code in the ToggleableAsserts.jl package
# (https://github.com/MasonProtter/ToggleableAsserts.jl) licensed under the MIT license.
# (https://github.com/MasonProtter/ToggleableAsserts.jl/blob/master/LICENSE):
# MIT License
#
# Copyright (c) 2021 Mason Protter
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
assert_enabled() = true
macro assert(expr)
code = macroexpand_assert(expr)
return :(assert_enabled() ? $(code) : nothing)
end
const toggle_lock = ReentrantLock()
function enable_assert(enable::Bool)
@lock toggle_lock begin
if assert_enabled() != enable
@eval Runic assert_enabled() = $enable
end
end
return
end

5
src/debug.jl

@ -4,9 +4,6 @@ @@ -4,9 +4,6 @@
# Debug info #
##############
# Code derived from ToggleableAsserts.jl kept in a separate file
include("ToggleableAsserts.jl")
abstract type RunicException <: Exception end
struct AssertionError <: RunicException
@ -23,7 +20,7 @@ function Base.showerror(io::IO, err::AssertionError) @@ -23,7 +20,7 @@ function Base.showerror(io::IO, err::AssertionError)
return
end
function macroexpand_assert(expr)
macro assert(expr)
msg = string(expr)
return :($(esc(expr)) || throw(AssertionError($msg)))
end

18
test/runtests.jl

@ -22,6 +22,24 @@ using JuliaSyntax: @@ -22,6 +22,24 @@ using JuliaSyntax:
end
end
@testset "Runic.AssertionError" begin
issuemsg = "This is unexpected, please file an issue with a reproducible example at " *
"https://github.com/fredrikekre/Runic.jl/issues/new."
try
Runic.@assert 1 == 2
catch err
@test err isa Runic.AssertionError
@test sprint(showerror, err) == "Runic.AssertionError: 1 == 2. " * issuemsg
end
try
Runic.unreachable()
catch err
@test err isa Runic.AssertionError
@test sprint(showerror, err) ==
"Runic.AssertionError: unreachable code reached. " * issuemsg
end
end
@testset "Chisels" begin
# Type stability of verified_kids
node = Runic.Node(JuliaSyntax.parseall(JuliaSyntax.GreenNode, "a = 1 + b\n"))

Loading…
Cancel
Save