Fixes for Julia 0.7

REQUIRE

@@ -1 +1,2 @@
 julia 0.6
+Compat 0.60.0

src/Retry.jl

@@ -1,10 +1,12 @@
+__precompile__(true)
+
 module Retry
 
-__precompile__(true)
+using Compat
 
 export @repeat, @protected, efield, ecode
 
-efield(x, f, default=nothing) = f in fieldnames(x) ? getfield(x, f) : default
+efield(x, f, default=nothing) = f in fieldnames(typeof(x)) ? getfield(x, f) : default
 ecode(x) = efield(x, :code)
 
 include("repeat_try.jl")

src/protected_try.jl

@@ -72,7 +72,7 @@ macro protected(try_expr::Expr)
     end
 
     # Check for nothing exception at start of catch block...
-    unshift!(catch_block.args, :($exception == nothing && rethrow($exception)))
+    pushfirst!(catch_block.args, :($exception == nothing && rethrow($exception)))
 
     # Check rethrow flag at end of catch block...
     push!(catch_block.args,  :($exception == nothing || rethrow($exception)))

src/repeat_try.jl

@@ -185,14 +185,14 @@ macro repeat(max, try_expr::Expr)
 
             # Replace @ignore/@retry macro call with modified if expression...
             catch_block.args[i] = if_expr
-        elseif expr.head != :line
+        elseif !isa(expr, LineNumberNode) || (isa(expr, Expr) && expr.head != :line)
             catch_block.args[i] = esc(expr)
         end
     end
 
     # Check for nothing exception at start of catch block...
     insert!(catch_block.args, 2, :($exception == nothing && rethrow()))
-    unshift!(catch_block.args, :(ignore = false))
+    pushfirst!(catch_block.args, :(ignore = false))
 
     # Rethrow at end of catch block...
     push!(catch_block.args, :(ignore || rethrow($exception)))

test/runtests.jl

@@ -8,7 +8,8 @@
 
 
 using Retry
-using Base.Test
+using Compat
+using Compat.Test
 
 
 mutable struct TestException <: Exception