Merge pull request #1104 from oscardssmith/os/improve-hasx-defs

make hasx foldable

Author: ChrisRackauckas

src/scimlfunctions.jl

@@ -4938,47 +4938,47 @@ end
 ########## Existence Functions
 
 # Check that field/property exists (may be nothing)
-__has_jac(f) = isdefined(f, :jac)
-__has_jvp(f) = isdefined(f, :jvp)
-__has_vjp(f) = isdefined(f, :vjp)
-__has_tgrad(f) = isdefined(f, :tgrad)
-__has_Wfact(f) = isdefined(f, :Wfact)
-__has_Wfact_t(f) = isdefined(f, :Wfact_t)
-__has_W_prototype(f) = isdefined(f, :W_prototype)
-__has_paramjac(f) = isdefined(f, :paramjac)
-__has_jac_prototype(f) = isdefined(f, :jac_prototype)
-__has_controljac_prototype(f) = isdefined(f, :controljac_prototype)
-__has_sparsity(f) = isdefined(f, :sparsity)
-__has_mass_matrix(f) = isdefined(f, :mass_matrix)
-__has_syms(f) = isdefined(f, :syms)
-__has_indepsym(f) = isdefined(f, :indepsym)
-__has_paramsyms(f) = isdefined(f, :paramsyms)
-__has_observed(f) = isdefined(f, :observed)
-__has_analytic(f) = isdefined(f, :analytic)
-__has_colorvec(f) = isdefined(f, :colorvec)
-__has_sys(f) = isdefined(f, :sys)
-__has_analytic_full(f) = isdefined(f, :analytic_full)
-__has_resid_prototype(f) = isdefined(f, :resid_prototype)
-__has_nlstep_data(f) = isdefined(f, :nlstep_data)
+__has_jac(f) = hasfield(typeof(f), :jac)
+__has_jvp(f) = hasfield(typeof(f), :jvp)
+__has_vjp(f) = hasfield(typeof(f), :vjp)
+__has_tgrad(f) = hasfield(typeof(f), :tgrad)
+__has_Wfact(f) = hasfield(typeof(f), :Wfact)
+__has_Wfact_t(f) = hasfield(typeof(f), :Wfact_t)
+__has_W_prototype(f) = hasfield(typeof(f), :W_prototype)
+__has_paramjac(f) = hasfield(typeof(f), :paramjac)
+__has_jac_prototype(f) = hasfield(typeof(f), :jac_prototype)
+__has_controljac_prototype(f) = hasfield(typeof(f), :controljac_prototype)
+__has_sparsity(f) = hasfield(typeof(f), :sparsity)
+__has_mass_matrix(f) = hasfield(typeof(f), :mass_matrix)
+__has_syms(f) = hasfield(typeof(f), :syms)
+__has_indepsym(f) = hasfield(typeof(f), :indepsym)
+__has_paramsyms(f) = hasfield(typeof(f), :paramsyms)
+__has_observed(f) = hasfield(typeof(f), :observed)
+__has_analytic(f) = hasfield(typeof(f), :analytic)
+__has_colorvec(f) = hasfield(typeof(f), :colorvec)
+__has_sys(f) = hasfield(typeof(f), :sys)
+__has_analytic_full(f) = hasfield(typeof(f), :analytic_full)
+__has_resid_prototype(f) = hasfield(typeof(f), :resid_prototype)
+__has_nlstep_data(f) = hasfield(typeof(f), :nlstep_data)
 function __has_initializeprob(f)
-    has_initialization_data(f) && isdefined(f.initialization_data, :initializeprob)
+    has_initialization_data(f) && hasfield(typeof(f.initialization_data), :initializeprob)
 end
 function __has_update_initializeprob!(f)
-    has_initialization_data(f) && isdefined(f.initialization_data, :update_initializeprob!)
+    has_initialization_data(f) && hasfield(typeof(f.initialization_data), :update_initializeprob!)
 end
 function __has_initializeprobmap(f)
-    has_initialization_data(f) && isdefined(f.initialization_data, :initializeprobmap)
+    has_initialization_data(f) && hasfield(typeof(f.initialization_data), :initializeprobmap)
 end
 function __has_initializeprobpmap(f)
-    has_initialization_data(f) && isdefined(f.initialization_data, :initializeprobpmap)
-end
-__has_initialization_data(f) = isdefined(f, :initialization_data)
-__has_polynomialize(f) = isdefined(f, :polynomialize)
-__has_unpolynomialize(f) = isdefined(f, :unpolynomialize)
-__has_denominator(f) = isdefined(f, :denominator)
-__has_cost(f) = isdefined(f, :cost)
-__has_equality(f) = isdefined(f, :equality)
-__has_inequality(f) = isdefined(f, :inequality)
+    has_initialization_data(f) && hasfield(typeof(f.initialization_data), :initializeprobpmap)
+end
+__has_initialization_data(f) = hasfield(typeof(f), :initialization_data)
+__has_polynomialize(f) = hasfield(typeof(f), :polynomialize)
+__has_unpolynomialize(f) = hasfield(typeof(f), :unpolynomialize)
+__has_denominator(f) = hasfield(typeof(f), :denominator)
+__has_cost(f) = hasfield(typeof(f), :cost)
+__has_equality(f) = hasfield(typeof(f), :equality)
+__has_inequality(f) = hasfield(typeof(f), :inequality)
 
 # compatibility
 has_invW(f::AbstractSciMLFunction) = false