Replace Expronicon with Moshi

Author: visr

Project.toml

@@ -12,12 +12,12 @@ ConstructionBase = "187b0558-2788-49d3-abe0-74a17ed4e7c9"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 EnumX = "4e289a0a-7415-4d19-859d-a7e5c4648b56"
-Expronicon = "6b7a57c9-7cc1-4fdf-b7f5-e857abae3636"
 FunctionWrappersWrappers = "77dc65aa-8811-40c2-897b-53d922fa7daf"
 IteratorInterfaceExtensions = "82899510-4779-5014-852e-03e436cf321d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
+Moshi = "2e0e35c7-a2e4-4343-998d-7ef72827ed2d"
 PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 Preferences = "21216c6a-2e73-6563-6e65-726566657250"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
@@ -62,14 +62,14 @@ DataFrames = "1.6"
 Distributed = "1.10"
 DocStringExtensions = "0.9"
 EnumX = "1"
-Expronicon = "0.8"
 ForwardDiff = "0.10.36"
 FunctionWrappersWrappers = "0.1.3"
 IteratorInterfaceExtensions = "^1"
 LinearAlgebra = "1.10"
 Logging = "1.10"
 Makie = "0.20, 0.21, 0.22"
 Markdown = "1.10"
+Moshi = "0.3"
 NonlinearSolve = "3, 4"
 PartialFunctions = "1.1"
 PrecompileTools = "1.2"

src/SciMLBase.jl

@@ -23,7 +23,8 @@ import RuntimeGeneratedFunctions
 import EnumX
 import ADTypes: ADTypes, AbstractADType
 import Accessors: @set, @reset, @delete, @insert
-using Expronicon.ADT: @match
+using Moshi.Data: @data
+using Moshi.Match: @match
 
 using Reexport
 using SciMLOperators

src/clock.jl

@@ -1,10 +1,4 @@
-module Clocks
-
-export TimeDomain
-
-using Expronicon.ADT: variant_type, @adt, @match
-
-@adt TimeDomain begin
+@data Clocks begin
     Continuous
     struct PeriodicClock
         dt::Union{Nothing, Float64, Rational{Int}}
@@ -13,21 +7,10 @@ using Expronicon.ADT: variant_type, @adt, @match
     SolverStepClock
 end
 
-Base.Broadcast.broadcastable(d::TimeDomain) = Ref(d)
-
-const DiscriminatorType = typeof(variant_type(Continuous))
-
-function Base.write(io::IO, x::DiscriminatorType)
-    write(io, Base.reinterpret(UInt32, x))
-end
-
-function Base.read(io::IO, ::Type{DiscriminatorType})
-    Base.reinterpret(DiscriminatorType, read(io, UInt32))
-end
-
-end
+const TimeDomain = Clocks.Type
+using .Clocks: Continuous, PeriodicClock, SolverStepClock
 
-using .Clocks
+Base.Broadcast.broadcastable(d::TimeDomain) = Ref(d)
 
 """
     Clock(dt)
@@ -55,27 +38,27 @@ filters.
 """ SolverStepClock
 
 isclock(c) = @match c begin
-    PeriodicClock(_...) => true
+    PeriodicClock() => true
     _ => false
 end
 
 issolverstepclock(c) = @match c begin
-    &SolverStepClock => true
+    SolverStepClock() => true
     _ => false
 end
 
 iscontinuous(c) = @match c begin
-    &Continuous => true
+    Continuous() => true
     _ => false
 end
 
 is_discrete_time_domain(c) = !iscontinuous(c)
 
 function first_clock_tick_time(c, t0)
     @match c begin
-        PeriodicClock(dt, _...) => ceil(t0 / dt) * dt
-        &SolverStepClock => t0
-        &Continuous => error("Continuous is not a discrete clock")
+        PeriodicClock(dt) => ceil(t0 / dt) * dt
+        SolverStepClock() => t0
+        Continuous() => error("Continuous is not a discrete clock")
     end
 end
 
@@ -90,13 +73,13 @@ function canonicalize_indexed_clock(ic::IndexedClock, sol::AbstractTimeseriesSol
     c = ic.clock
 
     return @match c begin
-        PeriodicClock(dt, _...) => ceil(sol.prob.tspan[1] / dt) * dt .+ (ic.idx .- 1) .* dt
-        &SolverStepClock => begin
+        PeriodicClock(dt) => ceil(sol.prob.tspan[1] / dt) * dt .+ (ic.idx .- 1) .* dt
+        SolverStepClock() => begin
             ssc_idx = findfirst(eachindex(sol.discretes)) do i
                 !isa(sol.discretes[i].t, AbstractRange)
             end
             sol.discretes[ssc_idx].t[ic.idx]
         end
-        &Continuous => sol.t[ic.idx]
+        Continuous() => sol.t[ic.idx]
     end
 end