Don't overwrite Base.vect for numbers with a different implementation

Fixes jump-dev#241
invenia · Nov 2, 2018 · 3b0cd7a · 3b0cd7a
1 parent f111790
commit 3b0cd7a
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/atoms/affine/stack.jl b/src/atoms/affine/stack.jl
@@ -132,8 +132,15 @@ function hvcat(rows::Tuple{Vararg{Int}}, args::AbstractExprOrValue...)
     return vcat(rs...)
 end
 
+_isexpr(x::Union{T,Type{T}}) where {T<:AbstractExpr} = true
+_isexpr(x) = false
 
-Base.vect(args::T...) where {T<:AbstractExpr} = transpose(HcatAtom(map(transpose, args)...))
 Base.vect(args::AbstractExpr...) = transpose(HcatAtom(map(transpose, args)...))
-Base.vect(args::AbstractExprOrValue...) = transpose(HcatAtom(map(arg -> transpose(convert(AbstractExpr, arg)), args)...))
-Base.vect(args::Value...) = collect(args)
+
+function Base.vect(args::AbstractExprOrValue...)
+    if any(_isexpr, args)
+        transpose(HcatAtom(map(arg -> transpose(convert(AbstractExpr, arg)), args)...))
+    else
+        invoke(Base.vect, Tuple{Vararg{Any}}, args...)
+    end
+end