Skip to content

Commit c71f479

Browse files
simplify type constructor
1 parent f3518f4 commit c71f479

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

src/maketype.jl

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -67,32 +67,14 @@ function maketype(name,param_dict,origex,funcs,syms,fex;
6767
vector_ex_return_ex = Meta.quot(vector_ex_return)
6868
param_Jex_ex = Meta.quot(param_Jex)
6969

70-
constructorex = :($(name)(;
71-
$(Expr(:kw,:origex,new_ex)),
72-
$(Expr(:kw,:funcs,funcs)),
73-
$(Expr(:kw,:pfuncs,pfuncs)),
74-
$(Expr(:kw,:d_pfuncs,d_pfuncs)),
75-
$(Expr(:kw,:syms,syms)),
76-
$(Expr(:kw,:tgradex,tgradex_ex)),
77-
$(Expr(:kw,:Jex,Jex_ex)),
78-
$(Expr(:kw,:expJex,expJex_ex)),
79-
$(Expr(:kw,:param_Jex,param_Jex_ex)),
80-
$(Expr(:kw,:invJex,invJex_ex)),
81-
$(Expr(:kw,:invWex,invWex_ex)),
82-
$(Expr(:kw,:invWex_t,invWex_t_ex)),
83-
$(Expr(:kw,:Hex,Hex_ex)),
84-
$(Expr(:kw,:invHex,invHex_ex)),
85-
$(Expr(:kw,:fex,fex_ex)),
86-
$(Expr(:kw,:pex,pex_ex)),
87-
$(Expr(:kw,:vector_ex,vector_ex_ex)),
88-
$(Expr(:kw,:vector_ex_return,vector_ex_return_ex)),
89-
$(Expr(:kw,:params,params))) =
70+
constructorex = :($(name)() =
9071
$(name)($f_expr,nothing,
9172
$jac_expr,$tgrad_expr,$invW_expr,$invW_t_expr,$param_jac_expr,
92-
origex,funcs,pfuncs,d_pfuncs,syms,$symjac,$symtgrad,
93-
tgradex,Jex,expJex,param_Jex,
94-
invJex,invWex,invWex_t,
95-
Hex,invHex,fex,pex,vector_ex,vector_ex_return,params)) |> esc
73+
$new_ex,$funcs,$pfuncs,$d_pfuncs,$syms,$symjac,$symtgrad,
74+
$tgradex_ex,$Jex_ex,$expJex_ex,$param_Jex_ex,
75+
$invJex_ex,$invWex_ex,$invWex_t_ex,
76+
$Hex_ex,$invHex_ex,$fex_ex,$pex_ex,$vector_ex_ex,
77+
$vector_ex_return_ex,$params)) |> esc
9678

9779
callex = :(((f::$name))(args...) = f.f(args...)) |> esc
9880
callex2 = :(((f::$name))(u,p,t::Number) = (du=similar(u);f.f(du,u,p,t);du)) |> esc

0 commit comments

Comments
 (0)