Skip to content

Commit

Permalink
Allow additional function names in ljl_propfunc
Browse files Browse the repository at this point in the history
  • Loading branch information
oschulz committed Dec 4, 2024
1 parent 3e4b1db commit ac13b57
Showing 1 changed file with 11 additions and 8 deletions.
19 changes: 11 additions & 8 deletions src/ljl_expressions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -30,30 +30,33 @@ end
export parse_ljlexpr


const ljl_expr_allowed_heads = [:., :ref, :call, :macrocall, :||, :&&, :comparison, :if]
const ljl_expr_allowed_heads = Symbol[:., :ref, :call, :macrocall, :||, :&&, :comparison, :if]

const ljl_expr_allowed_funcs = Set([
const ljl_expr_allowed_funcs = Set{Symbol}([
:!,
:(==), :<, :>, :>=, :<=, :!=,
:isapprox, :, :,
:isapprox, :,
:in, :, :..,
:+, :-, :*, :/,
:+, :-, :*, :/, :div, :rem, :mod,
:|, :&, :xor,
:^, :sqrt,
:one, :zero, :identity,
:abs, :abs2, :normalize, :norm,
:exp, :exp2, :exp10, :log, :log2, :log10,
:sin, :cos, :tan, :asin, :acos, :atan,
:min, :max,
:isnan, :isinf, :isfinite,
:all, :any, :broadcast,
:get, :getproperty,
:value, :uncertainty, :stdscore, :weightedmean,
:±,
:sum, :prod, :minimum, :maximum, :mean,
:get, :getproperty, :getindex, first, last,
:haskey, :isempty, :length, :size,
:(:), :Symbol, :String, :Int, :Float64, :Bool,
:string, :parse,
:value, :uncertainty, :stdscore, :weightedmean, :±,
:DetectorId, :ChannelId
])

const _ljlexpr_units = IdDict([
const _ljlexpr_units = IdDict{Symbol,Expr}([
:s => :(u"s"),
:ms => :(u"ms"),
:μs => :(u"μs"),
Expand Down

0 comments on commit ac13b57

Please sign in to comment.