Skip to content

Commit 209583a

Browse files
GG -> GeneralizedGenerated
1 parent 948b5d2 commit 209583a

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
88
DiffRules = "b552c78f-8df3-52c6-915a-8e097449b14b"
99
Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
1010
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
11+
GeneralizedGenerated = "6b9d7cbe-bcb9-11e9-073f-15a7a543e2eb"
1112
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1213
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
1314
NaNMath = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
1415
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1516
SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
1617
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
17-
GG = "6b9d7cbe-bcb9-11e9-073f-15a7a543e2eb"
1818

1919
[compat]
2020
julia = "1"

src/ModelingToolkit.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ using StaticArrays, LinearAlgebra
1313

1414
using MacroTools
1515
import MacroTools: splitdef, combinedef
16-
import GG
16+
import GeneralizedGenerated
1717
using DocStringExtensions
1818

1919
"""

src/utils.jl

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ function flatten_expr!(x)
3232
end
3333

3434
mk_function(args, kwargs, body) =
35-
let Args = args |> GG.expr2typelevel,
36-
Kwargs = kwargs |> GG.expr2typelevel,
37-
Body = body |> GG.expr2typelevel
38-
GG.RuntimeFn{Args, Kwargs, Body}()
35+
let Args = args |> GeneralizedGenerated.expr2typelevel,
36+
Kwargs = kwargs |> GeneralizedGenerated.expr2typelevel,
37+
Body = body |> GeneralizedGenerated.expr2typelevel
38+
GeneralizedGenerated.RuntimeFn{Args, Kwargs, Body}()
3939
end
4040

4141
function build_function(rhss, vs, ps = (), args = (), conv = simplified_expr, expression = Val{true}; constructor=nothing)
@@ -106,11 +106,3 @@ function vars!(vars, O)
106106

107107
return vars
108108
end
109-
110-
@inline @generated function fast_invokelatest(f, ::Type{rt}, args...) where rt
111-
tupargs = Expr(:tuple,(a==Nothing ? Int : a for a in args)...)
112-
quote
113-
_f = $(Expr(:cfunction, Base.CFunction, :f, rt, :((Core.svec)($((a==Nothing ? Int : a for a in args)...))), :(:ccall)))
114-
return ccall(_f.ptr,rt,$tupargs,$((:(getindex(args,$i) === nothing ? 0 : getindex(args,$i)) for i in 1:length(args))...))
115-
end
116-
end

0 commit comments

Comments
 (0)