Merge 041c7cb into ca0692e

SciML · May 14, 2019 · c4052b6 · c4052b6
2 parents ca0692e + 041c7cb
commit c4052b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/utils.jl b/src/utils.jl
@@ -2,6 +2,7 @@ using MacroTools
 
 
 function Base.convert(::Type{Expression}, ex::Expr)
+    ex.head === :if && (ex = Expr(:call, ifelse, ex.args...))
     ex.head === :call || throw(ArgumentError("internal representation does not support non-call Expr"))
 
     op = eval(ex.args[1])  # HACK

diff --git a/test/variable_parsing.jl b/test/variable_parsing.jl
@@ -32,3 +32,5 @@ D1 = Differential(t)
 
 @test @macroexpand(@parameters x, y, z(t)) == @macroexpand(@parameters x y z(t))
 @test @macroexpand(@variables x, y, z(t)) == @macroexpand(@variables x y z(t))
+
+convert(Expression, :($x == 0 ? $y : $x))