Use keyword constructor in other parts of codebase

Author: MilesCranmer

ext/DynamicExpressionsSymbolicUtilsExt.jl

@@ -93,10 +93,10 @@ function split_eq(
     else
         ind = findoperation(op, operators.binops)
     end
-    return constructorof(N)(
-        ind,
-        convert(N, args[1], operators; variable_names=variable_names),
-        convert(N, op(args[2:end]...), operators; variable_names=variable_names),
+    return constructorof(N)(;
+        op=ind,
+        l=convert(N, args[1], operators; variable_names=variable_names),
+        r=convert(N, op(args[2:end]...), operators; variable_names=variable_names),
     )
 end
 
@@ -157,8 +157,9 @@ function Base.convert(
         findoperation(op, operators.unaops)
     end
 
-    return constructorof(N)(
-        ind, map(x -> convert(N, x, operators; variable_names=variable_names), args)...
+    return constructorof(N)(;
+        op=ind,
+        children=map(x -> convert(N, x, operators; variable_names=variable_names), args),
     )
 end
 

src/Equation.jl

@@ -80,13 +80,16 @@ nodes, you can evaluate or print a given expression.
 # Constructors
 
 
-    Node([T]; val=nothing, feature=nothing, op=nothing, l=nothing, r=nothing, allocator=default_allocator)
-    Node{T}(; val=nothing, feature=nothing, op=nothing, l=nothing, r=nothing, allocator=default_allocator)
+    Node([T]; val=nothing, feature=nothing, op=nothing, l=nothing, r=nothing, children=nothing, allocator=default_allocator)
+    Node{T}(; val=nothing, feature=nothing, op=nothing, l=nothing, r=nothing, children=nothing, allocator=default_allocator)
 
 Create a new node in an expression tree. If `T` is not specified in either the type or the
 first argument, it will be inferred from the value of `val` passed or `l` and/or `r`.
 If it cannot be inferred from these, it will default to `Float32`.
 
+The `children` keyword can be used instead of `l` and `r` and should be a tuple of children. This
+is to permit the use of splatting in constructors.
+
 You may also construct nodes via the convenience operators generated by creating an `OperatorEnum`.
 
 You may also choose to specify a default memory allocator for the node other than simply `Node{T}()`
@@ -183,8 +186,12 @@ include("base.jl")
 
 #! format: off
 @inline function (::Type{N})(
-    ::Type{T1}=Undefined; val=nothing, feature=nothing, op=nothing, l=nothing, r=nothing, allocator=default_allocator,
+    ::Type{T1}=Undefined; val=nothing, feature=nothing, op=nothing, l=nothing, r=nothing, children=nothing, allocator=default_allocator,
 ) where {T1,N<:AbstractExpressionNode}
+    if children !== nothing
+        @assert l === nothing && r === nothing
+        return node_factory(N, T1, val, feature, op, children..., allocator)
+    end
     return node_factory(N, T1, val, feature, op, l, r, allocator)
 end
 """Create a constant leaf."""

src/OperatorEnumConstruction.jl

@@ -125,7 +125,7 @@ function _extend_unary_operator(f::Symbol, type_requirements, internal)
                     $_constructorof(N)(T; val=$($f)(l.val::T))
                 else
                     latest_op_idx = $($lookup_op)($($f), Val(1))
-                    $_constructorof(N)(latest_op_idx, l)
+                    $_constructorof(N)(; op=latest_op_idx, l=l)
                 end
             end
         end
@@ -152,7 +152,7 @@ function _extend_binary_operator(f::Symbol, type_requirements, build_converters,
                     $_constructorof(N)(T; val=$($f)(l.val::T, r.val::T))
                 else
                     latest_op_idx = $($lookup_op)($($f), Val(2))
-                    $_constructorof(N)(latest_op_idx, l, r)
+                    $_constructorof(N)(; op=latest_op_idx, l=l, r=r)
                 end
             end
             function $($f)(
@@ -162,7 +162,9 @@ function _extend_binary_operator(f::Symbol, type_requirements, build_converters,
                     $_constructorof(N)(T; val=$($f)(l.val::T, r))
                 else
                     latest_op_idx = $($lookup_op)($($f), Val(2))
-                    $_constructorof(N)(latest_op_idx, l, $_constructorof(N)(T; val=r))
+                    $_constructorof(N)(;
+                        op=latest_op_idx, l=l, r=$_constructorof(N)(T; val=r)
+                    )
                 end
             end
             function $($f)(
@@ -172,7 +174,9 @@ function _extend_binary_operator(f::Symbol, type_requirements, build_converters,
                     $_constructorof(N)(T; val=$($f)(l, r.val::T))
                 else
                     latest_op_idx = $($lookup_op)($($f), Val(2))
-                    $_constructorof(N)(latest_op_idx, $_constructorof(N)(T; val=l), r)
+                    $_constructorof(N)(;
+                        op=latest_op_idx, l=$_constructorof(N)(T; val=l), r=r
+                    )
                 end
             end
             if $($build_converters)

src/base.jl

@@ -440,7 +440,7 @@ function copy_node(
             constructorof(N)(T; feature=t.feature)
         end,
         identity,
-        (p, c...) -> constructorof(N)(p.op, c...),
+        (p, children...) -> constructorof(N)(; op=p.op, children),
         tree,
         N;
         break_sharing,
@@ -483,7 +483,7 @@ function convert(
             constructorof(N1)(T1; feature=t.feature)
         end,
         identity,
-        ((p, c::Vararg{Any,M}) where {M}) -> constructorof(N1)(p.op, c...),
+        (p, children...) -> constructorof(N1)(; op=p.op, children),
         tree,
         N1,
     )