Fix JuliaLang#16326: use typeof in code_* for all :call expressions

ihnorton · Jun 24, 2016 · 3495d9f · 3495d9f
1 parent beab3b6
commit 3495d9f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/base/interactiveutil.jl b/base/interactiveutil.jl
@@ -278,7 +278,8 @@ typesof(args...) = Tuple{map(a->(isa(a,Type) ? Type{a} : typeof(a)), args)...}
 gen_call_with_extracted_types(fcn, ex0::Symbol) = Expr(:call, fcn, Meta.quot(ex0))
 function gen_call_with_extracted_types(fcn, ex0)
  if isa(ex0, Expr) &&
- any(a->(Meta.isexpr(a, :kw) || Meta.isexpr(a, :parameters)), ex0.args)
+ (any(a->(Meta.isexpr(a, :kw) || Meta.isexpr(a, :parameters)), ex0.args) ||
+ ex0.head == :call)
  # keyword args not used in dispatch, so just remove them
  args = filter(a->!(Meta.isexpr(a, :kw) || Meta.isexpr(a, :parameters)), ex0.args)
  return Expr(:call, fcn, esc(args[1]),