fix: issues spotted by JET

Author: MilesCranmer

src/DynamicExpressions.jl

@@ -73,9 +73,17 @@ include("deprecated.jl")
 
 import TOML: parsefile
 
-const PACKAGE_VERSION = let
-    project = parsefile(joinpath(pkgdir(@__MODULE__), "Project.toml"))
-    VersionNumber(project["version"])
+const PACKAGE_VERSION = let d = pkgdir(@__MODULE__)
+    try
+        if d isa String
+            project = parsefile(joinpath(d, "Project.toml"))
+            VersionNumber(project["version"])
+        else
+            v"0.0.0"
+        end
+    catch
+        v"0.0.0"
+    end
 end
 
 macro ignore(args...) end

src/EvaluateDerivative.jl

@@ -80,7 +80,9 @@ end
         end
     end
     deg2_branch = if nbin > OPERATOR_LIMIT_BEFORE_SLOWDOWN
-        diff_deg2_eval(tree, cX, operators.binops[op_idx], operators, direction)
+        quote
+            diff_deg2_eval(tree, cX, operators.binops[op_idx], operators, direction)
+        end
     else
         quote
             Base.Cartesian.@nif(

src/Expression.jl

@@ -213,8 +213,8 @@ import ..NodeUtilsModule:
     set_constants!
 
 #! format: off
-count_constants(ex::AbstractExpression; kws...) = count_constants(get_tree(ex); kws...)
-count_depth(ex::AbstractExpression; kws...) = count_depth(get_tree(ex); kws...)
+count_constants(ex::AbstractExpression) = count_constants(get_tree(ex))
+count_depth(ex::AbstractExpression) = count_depth(get_tree(ex))
 index_constants(ex::AbstractExpression, ::Type{T}=UInt16) where {T} = index_constants(get_tree(ex), T)
 has_operators(ex::AbstractExpression) = has_operators(get_tree(ex))
 has_constants(ex::AbstractExpression) = has_constants(get_tree(ex))
@@ -310,14 +310,14 @@ end
 import ..SimplifyModule: combine_operators, simplify_tree!
 
 # Avoid implementing a generic version for these, as it is less likely to generalize
-function combine_operators(ex::Expression, operators=nothing; kws...)
+function combine_operators(ex::Expression, operators=nothing)
     return Expression(
-        combine_operators(get_tree(ex), get_operators(ex, operators); kws...), ex.metadata
+        combine_operators(get_tree(ex), get_operators(ex, operators)), ex.metadata
     )
 end
-function simplify_tree!(ex::Expression, operators=nothing; kws...)
+function simplify_tree!(ex::Expression, operators=nothing)
     return Expression(
-        simplify_tree!(get_tree(ex), get_operators(ex, operators); kws...), ex.metadata
+        simplify_tree!(get_tree(ex), get_operators(ex, operators)), ex.metadata
     )
 end
 

src/OperatorEnumConstruction.jl

@@ -82,7 +82,7 @@ function set_default_variable_names!(variable_names::Vector{String})
     return LATEST_VARIABLE_NAMES.x = copy(variable_names)
 end
 
-Base.@deprecate create_evaluation_helpers! set_default_operators!
+Base.@deprecate create_evaluation_helpers!(operators) set_default_operators!(operators)
 
 function set_default_operators!(operators::OperatorEnum)
     LATEST_OPERATORS.x = operators

src/deprecated.jl

@@ -1,8 +1,8 @@
 import Base: @deprecate
 import .NodeModule: Node, GraphNode
 
-@deprecate set_constants set_constants!
-@deprecate simplify_tree simplify_tree!
+@deprecate set_constants(tree, constants) set_constants!(tree, constants)
+@deprecate simplify_tree(tree, operators) simplify_tree!(tree, operators)
 
 for N in (:Node, :GraphNode)
     @eval begin

test/Project.toml

@@ -5,6 +5,7 @@ ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 Enzyme = "7da242da-08ed-463a-9acd-ee780be4f1d9"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
+JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 LoopVectorization = "bdcacae8-1622-11e9-2a5c-532679323890"
 Optim = "429524aa-4258-5aef-a3af-852621145aeb"

test/unittest.jl

@@ -135,3 +135,11 @@ end
 @testitem "Test parametric expression" begin
     include("test_parametric_expression.jl")
 end
+
+@testitem "JET" begin
+    using DynamicExpressions
+    using JET
+    if VERSION >= v"1.10"
+        JET.test_package(DynamicExpressions; target_defined_modules=true)
+    end
+end