Merge pull request #5646 from WestleyArgentum/which

change which to return rather than show
JuliaLang · Feb 6, 2014 · 31ecf33 · 31ecf33
2 parents 570f5f7 + 9c34cdf
commit 31ecf33
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/base/util.jl b/base/util.jl
@@ -94,15 +94,17 @@ function whicht(f, types)
         d = f.env.defs
         while !is(d,())
             if is(d.func.code, lsd)
-                display(d)
-                return
+                return d
             end
             d = d.next
         end
     end
 end
 
-which(f, args...) = whicht(f, map(a->(isa(a,Type) ? Type{a} : typeof(a)), args))
+function which(f, args...)
+    method = whicht(f, map(a->(isa(a,Type) ? Type{a} : typeof(a)), args))
+    method != nothing ? method : throw(MethodError(f, args))
+end
 
 macro which(ex0)
     if isa(ex0,Expr) &&