Skip to content

Commit 964455e

Browse files
authored
Refactor error messages in validation functions
1 parent b8549d5 commit 964455e

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

src/02_Tools.jl

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,15 @@ function assert_nonempty_nonneg_finite_val(val::ArrNum, val_sym::Symbol = :val)
6262
end
6363
function assert_nonempty_nonneg_finite_val(val::Pair, val_sym::Symbol = :val)
6464
@argcheck(isfinite(val[2]),
65-
DomainError("isfinite($(val_sym[2])) must hold. Got\nisfinite($(val_sym[2])) => $(isfinite(val[2]))"))
65+
DomainError("isfinite($val_sym[2]) must hold. Got\nisfinite($val_sym[2]) => $(isfinite(val[2]))"))
6666
@argcheck(zero(val[2]) <= val[2],
67-
DomainError("0 <= $(val_sym[2]) must hold. Got\n$(val_sym[2]) => $(val[2])"))
67+
DomainError("0 <= $(val[2]) must hold. Got\n$(val[2]) => $(val[2])"))
6868
return nothing
6969
end
7070
function assert_nonempty_nonneg_finite_val(val::Number, val_sym::Symbol = :val)
7171
@argcheck(isfinite(val),
7272
DomainError("isfinite($val_sym) must hold. Got\nisfinite($val_sym) => $(isfinite(val))"))
73-
@argcheck(zero(val) <= val,
74-
DomainError("0 <= $(val_sym) must hold. Got\n$(val_sym) => $(val)"))
73+
@argcheck(zero(val) <= val, DomainError("0 <= $(val) must hold. Got\n$(val) => $(val)"))
7574
return nothing
7675
end
7776
function assert_nonempty_nonneg_finite_val(args...)
@@ -141,16 +140,15 @@ function assert_nonempty_gt0_finite_val(val::ArrNum, val_sym::Symbol = :val)
141140
end
142141
function assert_nonempty_gt0_finite_val(val::Pair, val_sym::Symbol = :val)
143142
@argcheck(isfinite(val[2]),
144-
DomainError("isfinite($(val_sym[2])) must hold. Got\nisfinite($(val_sym[2])) => $(isfinite(val[2]))"))
143+
DomainError("isfinite($val_sym[2]) must hold. Got\nisfinite($val_sym[2]) => $(isfinite(val[2]))"))
145144
@argcheck(zero(val[2]) < val[2],
146-
DomainError("0 < $(val_sym[2]) must hold. Got\n$(val_sym[2]) => $(val[2])"))
145+
DomainError("0 < $(val[2]) must hold. Got\n$(val[2]) => $(val[2])"))
147146
return nothing
148147
end
149148
function assert_nonempty_gt0_finite_val(val::Number, val_sym::Symbol = :val)
150149
@argcheck(isfinite(val),
151150
DomainError("isfinite($val_sym) must hold. Got\nisfinite($val_sym) => $(isfinite(val))"))
152-
@argcheck(zero(val) < val,
153-
DomainError("0 < $(val_sym) must hold. Got\n$(val_sym) => $(val)"))
151+
@argcheck(zero(val) < val, DomainError("0 < $(val) must hold. Got\n$(val) => $(val)"))
154152
return nothing
155153
end
156154
function assert_nonempty_gt0_finite_val(args...)
@@ -214,7 +212,7 @@ function assert_nonempty_finite_val(val::ArrNum, val_sym::Symbol = :val)
214212
end
215213
function assert_nonempty_finite_val(val::Pair, val_sym::Symbol = :val)
216214
@argcheck(isfinite(val[2]),
217-
DomainError("isfinite($(val_sym[2])) must hold. Got\nisfinite($(val_sym[2])) => $(isfinite(val[2]))"))
215+
DomainError("isfinite($val_sym[2]) must hold. Got\nisfinite($val_sym[2]) => $(isfinite(val[2]))"))
218216
return nothing
219217
end
220218
function assert_nonempty_finite_val(val::Number, val_sym::Symbol = :val)

0 commit comments

Comments
 (0)