fix Complex constructor on 0.3, fixes #54

JuliaLang · Mar 19, 2015 · 3582cf1 · stevengj · Apr 2, 2015 · stevengj
1 parent c4413a8
commit 3582cf1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/Compat.jl b/src/Compat.jl
@@ -236,7 +236,15 @@ function _compat(ex::Expr)
             ex = rewrite_split(ex, f)
         elseif VERSION < v"0.4.0-dev+3732" && haskey(calltypes, f) && length(ex.args) > 1
             T = ex.args[1]
-            ex = Expr(:(::), Expr(:call, :convert, T, ex.args[2:end]...), T)
+            if T in (:Complex32, :Complex64, :Complex128)
+                if length(ex.args) < 3
+                    ex = Expr(:call, T, ex.args[2], zero(ex.args[2]))
+                else
+                    ex = Expr(:call, T, ex.args[2:end]...)
+                end
+            else
+                ex = Expr(:(::), Expr(:call, :convert, T, ex.args[2:end]...), T)
+            end
         elseif VERSION < v"0.4.0-dev+3732" && (f == :map && haskey(calltypes, ex.args[2]) && length(ex.args) > 2)
             ex = Expr(:call, calltypes[ex.args[2]], ex.args[3:end]...)
         end

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -131,6 +131,15 @@ let convert_funcs_and_types =
     end
     @test (@compat Bool(1))
     @test !(@compat Bool(0))
+
+    # issue #54
+    c = @compat Complex128(1)
+    @test c.re == 1
+    @test c.im == 0
+
+    c = @compat Complex128(1,1)
+    @test c.re == 1
+    @test c.im == 1
 end
 
 type Test3609