From e5afe787ef9fc4c2855ac044f5ef5ab3abc6c6b3 Mon Sep 17 00:00:00 2001
From: Jameson Nash <vtjnash@gmail.com>
Date: Fri, 15 Aug 2014 23:06:25 -0400
Subject: [PATCH] help Julia get further in bootstrapping this branch

---
 base/base.jl | 5 +++--
 base/boot.jl | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/base/base.jl b/base/base.jl
index a726c55202145..7e5bfc5f909df 100644
--- a/base/base.jl
+++ b/base/base.jl
@@ -15,8 +15,9 @@ convert(T, x) = convert_default(T, x, convert)
 convert(::(), ::()) = ()
 convert(::Type{Tuple}, x::Tuple) = x
 
-# allow convert to be called as if it were a single-argument constructor
-call{T}(::Type{T}, x) = convert(T, x)
+# general definition for call (order is important for these two definitions)
+call(f::Callable, args...; kws...) = f(args...; kws...)
+call(f::Callable, args...) = f(args...)
 
 argtail(x, rest...) = rest
 tupletail(x::Tuple) = argtail(x...)
diff --git a/base/boot.jl b/base/boot.jl
index 2f964530110a7..3cd808b329de8 100644
--- a/base/boot.jl
+++ b/base/boot.jl
@@ -244,4 +244,4 @@ typealias ByteString Union(ASCIIString,UTF8String)
 
 include(fname::ByteString) = ccall(:jl_load_, Any, (Any,), fname)
 
-call(f::Function, args...; kws...) = f(args...; kws...)
+call() = nothing