Merge pull request #18214 from JuliaLang/mh/fix18213

Move specialized isequal definitions to avoid hitting #265
JuliaLang · Aug 24, 2016 · 941fa26 · 941fa26
2 parents 3ab4d76 + 1c5f4ca
commit 941fa26
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -461,12 +461,11 @@ end
 
 @deprecate ==(x::Char, y::Integer) UInt32(x) == y
 @deprecate ==(x::Integer, y::Char) x == UInt32(y)
+# Note: when these deprecations are deleted, the specialized definitions isequal(x::Char, y::Integer)
+# and isequal(x::Integer, y::Char) in operators.jl can be deleted, too
 @deprecate isless(x::Char, y::Integer) UInt32(x) < y
 @deprecate isless(x::Integer, y::Char) x < UInt32(y)
 
-# delete these methods along with deprecations:
-isequal(x::Char, y::Integer) = false
-isequal(x::Integer, y::Char) = false
 
 #6674 and #4233
 macro windows(qm,ex)

diff --git a/base/operators.jl b/base/operators.jl
@@ -15,6 +15,11 @@ supertype(T::DataType) = T.super
 ==(x, y) = x === y
 isequal(x, y) = x == y
 
+# TODO: these can be deleted once the deprecations of ==(x::Char, y::Integer) and
+# ==(x::Integer, y::Char) are gone and the above returns false anyway
+isequal(x::Char, y::Integer) = false
+isequal(x::Integer, y::Char) = false
+
 ## minimally-invasive changes to test == causing NotComparableError
 # export NotComparableError
 # =={T}(x::T, y::T) = x === y