Merge pull request #118 from SciML/as/setsym-oop-retain-tuple

fix: improve type-stability of `setsym_oop`

Author: AayushSabharwal

src/state_indexing.jl

@@ -464,6 +464,10 @@ for (t1, t2) in [
                 throw(NotVariableOrParameter("setsym_oop", s))
             end
         end
+        if sym isa Tuple
+            vars = Tuple(vars)
+            pars = Tuple(pars)
+        end
         indp = _root_indp(indp)
         return FullSetter(isempty(vars) ? nothing : OOPSetter(indp, identity.(vars), true),
             isempty(pars) ? nothing : OOPSetter(indp, identity.(pars), false),

src/value_provider_interface.jl

@@ -231,27 +231,36 @@ function (fn::Fix1Multiple)(args...)
     fn.f(fn.arg, args...)
 end
 
-struct OOPSetter{I, D}
+struct OOPSetter{S, I, D}
     indp::I
     idxs::D
-    is_state::Bool
 end
 
-function (os::OOPSetter)(valp, val)
-    buffer = if os.is_state
-        hasmethod(state_values, Tuple{typeof(valp)}) ? state_values(valp) : valp
-    else
-        hasmethod(parameter_values, Tuple{typeof(valp)}) ? parameter_values(valp) : valp
-    end
+OOPSetter(indp, idxs, isstate) = OOPSetter{isstate, typeof(indp), typeof(idxs)}(indp, idxs)
+
+function (os::OOPSetter{true})(valp, val)
+    buffer = hasmethod(state_values, Tuple{typeof(valp)}) ? state_values(valp) : valp
+    return remake_buffer(os.indp, buffer, (os.idxs,), (val,))
+end
+
+function (os::OOPSetter{false})(valp, val)
+    buffer = hasmethod(parameter_values, Tuple{typeof(valp)}) ? parameter_values(valp) :
+             valp
     return remake_buffer(os.indp, buffer, (os.idxs,), (val,))
 end
 
-function (os::OOPSetter)(valp, val::Union{Tuple, AbstractArray})
-    buffer = if os.is_state
-        hasmethod(state_values, Tuple{typeof(valp)}) ? state_values(valp) : valp
+function (os::OOPSetter{true})(valp, val::Union{Tuple, AbstractArray})
+    buffer = hasmethod(state_values, Tuple{typeof(valp)}) ? state_values(valp) : valp
+    if os.idxs isa Union{Tuple, AbstractArray}
+        return remake_buffer(os.indp, buffer, os.idxs, val)
     else
-        hasmethod(parameter_values, Tuple{typeof(valp)}) ? parameter_values(valp) : valp
+        return remake_buffer(os.indp, buffer, (os.idxs,), (val,))
     end
+end
+
+function (os::OOPSetter{false})(valp, val::Union{Tuple, AbstractArray})
+    buffer = hasmethod(parameter_values, Tuple{typeof(valp)}) ? parameter_values(valp) :
+             valp
     if os.idxs isa Union{Tuple, AbstractArray}
         return remake_buffer(os.indp, buffer, os.idxs, val)
     else