Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RFC: Provide a way to get the inferred return type of a function #6692

Closed
wants to merge 3 commits into from
Closed

RFC: Provide a way to get the inferred return type of a function #6692

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c569e0b
Provide a way to get the inferred return type of a function
simonster Apr 29, 2014
8530990
s/Base.Callable/Callable/
simonster Apr 30, 2014
bea6a57
Don't infer Base.return_type unless the input types are known
simonster Apr 30, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 35 additions & 6 deletions base/inference.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,14 +748,19 @@ function to_tuple_of_Types(t::ANY)
return t
end

function const_func_or_constructor(f, ftype, sv)
if isType(ftype) && isleaftype(ftype.parameters[1])
af = ftype.parameters[1]
_methods(af,(),0)
else
af = isconstantfunc(f, sv)
end
af
end

function abstract_call(f, fargs, argtypes, vtypes, sv::StaticVarInfo, e)
if is(f,apply) && length(fargs)>0
if isType(argtypes[1]) && isleaftype(argtypes[1].parameters[1])
af = argtypes[1].parameters[1]
_methods(af,(),0)
else
af = isconstantfunc(fargs[1], sv)
end
af = const_func_or_constructor(fargs[1], argtypes[1], sv)
if !is(af,false)
aargtypes = map(to_tuple_of_Types, argtypes[2:end])
if all(x->isa(x,Tuple), aargtypes) &&
Expand Down Expand Up @@ -797,6 +802,14 @@ function abstract_call(f, fargs, argtypes, vtypes, sv::StaticVarInfo, e)
return abstract_call(af, (), Tuple, vtypes, sv, ())
end
end
if isdefined(Main.Base,:return_type) && f === Main.Base.return_type &&
length(fargs) == 2 && argtypes[2] <: Tuple && isleaftype(argtypes[2])
af = const_func_or_constructor(fargs[1], argtypes[1], sv)
if !is(af,false)
e.head = :call1
return Type{return_type(_ieval(af), map(x->x.parameters[1], argtypes[2]))}
end
end
if isgeneric(f)
return abstract_call_gf(f, fargs, argtypes, e)
end
Expand Down Expand Up @@ -1961,6 +1974,9 @@ function inlineable(f, e::Expr, atypes, sv, enclosing_ast)
isleaftype(e.typ.parameters[1])
return (e.typ.parameters[1],())
end
if isdefined(Main.Base,:return_type) && is(f,Main.Base.return_type)
return (e.typ.parameters[1],())
end
if is(f,Union)
union = e.typ.parameters[1]
if isa(union,UnionType) && all(isleaftype, (union::UnionType).types)
Expand Down Expand Up @@ -2791,6 +2807,19 @@ function code_typed(f::Callable, types::(Type...))
asts
end

function return_type(f::Callable, types::Tuple)
if isdefined(f, :code)
typeinf(f.code, types, f.code.sparams, f.code, true)[2]
else
fargs = ntuple(x->gensym(), length(types))
if isgeneric(f)
abstract_call_gf(f, fargs, types, Expr(:call, f.env.name, fargs...))
else
builtin_tfunction(f, fargs, types)
end
end
end

function return_types(f::Callable, types)
rt = {}
for x in _methods(f,types,-1)
Expand Down