@@ -8,11 +8,9 @@ macro prob_str(str)
8
8
end
9
9
10
10
function get_exprs (str:: String )
11
- ind = findfirst (isequal (' |' ), str)
12
- ind === nothing && throw (" Invalid expression." )
13
-
14
- str1 = str[1 : (ind - 1 )]
15
- str2 = str[(ind + 1 ): end ]
11
+ substrings = split (str, ' |' ; limit = 2 )
12
+ length (substrings) == 2 || error (" Invalid expression." )
13
+ str1, str2 = substrings
16
14
17
15
expr1 = Meta. parse (" ($str1 ,)" )
18
16
expr1 = Expr (:tuple , expr1. args... )
@@ -57,7 +55,7 @@ function probtype(ntl::NamedTuple{namesl}, ntr::NamedTuple{namesr}) where {names
57
55
defaults = getdefaults (modelgen)
58
56
valid_arg (arg) = isdefined (ntl, arg) || isdefined (ntr, arg) ||
59
57
isdefined (defaults, arg) && getfield (defaults, arg) != = missing
60
- @assert all (valid_arg .( getargtypes (modelgen) ))
58
+ @assert all (valid_arg, getargtypes (modelgen))
61
59
return Val (:likelihood ), modelgen, vi
62
60
else
63
61
@assert isdefined (ntr, :model )
@@ -96,7 +94,7 @@ function probtype(
96
94
a = get_arg (arg)
97
95
return a != = nothing && a != = missing
98
96
end
99
- valid_args = all (valid_arg .( args) )
97
+ valid_args = all (valid_arg, args)
100
98
101
99
# Uses the default values for model arguments not provided.
102
100
# If no default value exists, use `nothing`.
0 commit comments