Current implementation left out return symbol

heetbeet · Feb 3, 2021 · 4b4e091 · 4b4e091 · heetbeet · Feb 3, 2021
1 parent 5eedacf
commit 4b4e091
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/TryCatch.jl b/src/TryCatch.jl
@@ -291,13 +291,16 @@ module TryCatch
                 # refactor into proper conditionals
                 cond, sym = conditionhelper(cond, linenum)
 
-                # find-and-repalace error symbol in block
+                cond = Expr(:block, linenum, cond)
+                block = Expr(:block, block...)
+
+                # find-and-replace the error symbol in block
                 cond = symbolrename(cond, sym, exception)
                 block = symbolrename(block, sym, exception)
 
                 push!(
                     conditions,
-                    Expr(:block, linenum, cond) => Expr(:block, block...)
+                    cond => block
                 )
             end
         end

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -8,6 +8,18 @@ using Test
 
     @test (@try @catch e @else 2) == 2
 
+    @test (@try @catch @else 2) == 2
+
+    @test (
+        @try begin
+            sqrt("0")
+        @catch 
+            2
+        end
+    ) == 2
+
+    @test (@try sqrt("0") @catch _ 2) == 2
+
     @test (@try 1) == 1
 
     @test_throws MethodError (@try sqrt("34"))