Fix Julia v0.6 xor, is deprecations

REQUIRE

@@ -1,2 +1,2 @@
 julia 0.4
-Compat 0.8.5
+Compat 0.9.4

src/classified_collections.jl

@@ -42,7 +42,7 @@ done(cc::ClassifiedCollections, state) = done(cc.map, state)
 
 function push!{K, C}(cc::ClassifiedCollections{K, C}, key::K, e)
     c = get(cc.map, key, nothing)
-    if is(c, nothing)
+    if c === nothing
         c = _create_empty(C)
         cc.map[key] = c
     end

src/deque.jl

@@ -31,8 +31,8 @@ head_deque_block{T}(ty::Type{T}, n::Int) = DequeBlock{T}(n, n+1)
 capacity(blk::DequeBlock) = blk.capa
 length(blk::DequeBlock) = blk.back - blk.front + 1
 isempty(blk::DequeBlock) = blk.back < blk.front
-ishead(blk::DequeBlock) = is(blk.prev, blk)
-isrear(blk::DequeBlock) = is(blk.next, blk)
+ishead(blk::DequeBlock) = blk.prev === blk
+isrear(blk::DequeBlock) =  blk.next === blk
 
 
 # reset the block to empty, and position
@@ -188,7 +188,7 @@ function dump(io::IO, q::Deque)
         println(io)
 
         cb_next::DequeBlock = cb.next
-        if !is(cb, cb_next)
+        if cb !== cb_next
             cb = cb_next
             i += 1
         else

src/int_set.jl

@@ -1,9 +1,9 @@
 # This file was a part of Julia. License is MIT: http://julialang.org/license
 
-import Base: similar, copy, copy!, eltype, push!, pop!, delete!, shift!, 
+import Base: similar, copy, copy!, eltype, push!, pop!, delete!, shift!,
              empty!, isempty, union, union!, intersect, intersect!,
              setdiff, setdiff!, symdiff, symdiff!, in, start, next, done,
-             last, length, show, hash, issubset, ==, <=, <, unsafe_getindex, 
+             last, length, show, hash, issubset, ==, <=, <, unsafe_getindex,
              unsafe_setindex!, findnextnot, first
 if !isdefined(Base, :complement)
     export complement, complement!
@@ -153,13 +153,13 @@ symdiff(s::IntSet, ns) = symdiff!(copy(s), ns)
 symdiff!(s::IntSet, ns) = (for n in ns; symdiff!(s, n); end; s)
 function symdiff!(s::IntSet, n::Integer)
     0 <= n < typemax(Int) || throw(ArgumentError(_intset_bounds_err_msg))
-    val = (n in s) $ !s.inverse
+    val = (n in s) ⊻ !s.inverse
     _setint!(s, n, val)
     s
 end
 function symdiff!(s1::IntSet, s2::IntSet)
     e = _matchlength!(s1.bits, length(s2.bits))
-    map!($, s1.bits, s1.bits, s2.bits)
+    map!(⊻, s1.bits, s1.bits, s2.bits)
     s2.inverse && (s1.inverse = !s1.inverse)
     append!(s1.bits, e)
     s1
@@ -177,7 +177,7 @@ end
 # Use the next-set index as the state to prevent looking it up again in done
 start(s::IntSet) = next(s, 0)[2]
 function next(s::IntSet, i, invert=false)
-    if s.inverse $ invert
+    if s.inverse ⊻ invert
         # i+1 could rollover causing a BoundsError in findnext/findnextnot
         nextidx = i == typemax(Int) ? 0 : findnextnot(s.bits, i+1)
         # Extend indices beyond the length of the bits since it is inverted
@@ -248,7 +248,7 @@ function hash(s::IntSet, h::UInt)
     # Only hash the bits array up to the last-set bit to prevent extra empty
     # bits from changing the hash result
     l = findprev(s.bits, length(s.bits))
-    hash(unsafe_getindex(s.bits, 1:l), h) $ hash(s.inverse) $ hashis_seed
+    hash(unsafe_getindex(s.bits, 1:l), h) ⊻ hash(s.inverse) ⊻ hashis_seed
 end
 
 issubset(a::IntSet, b::IntSet) = isequal(a, intersect(a,b))

src/list.jl

@@ -21,7 +21,7 @@ tail(x::Cons) = x.tail
 
 function show{T}(io::IO, l::LinkedList{T})
     if isa(l,Nil)
-        if is(T,Any)
+        if T === Any
             print(io, "nil()")
         else
             print(io, "nil(", T, ")")

src/multi_dict.jl

@@ -71,13 +71,13 @@ end
 function in{K,V}(pr::(Tuple{Any,Any}), d::MultiDict{K,V})
     k = convert(K, pr[1])
     v = get(d,k,Base.secret_table_token)
-    !is(v, Base.secret_table_token) && (isa(pr[2], AbstractArray) ? v == pr[2] : pr[2] in v)
+    (v !== Base.secret_table_token) && (isa(pr[2], AbstractArray) ? v == pr[2] : pr[2] in v)
 end
 
 function pop!(d::MultiDict, key, default)
     vs = get(d, key, Base.secret_table_token)
-    if is(vs, Base.secret_table_token)
-        if !is(default, Base.secret_table_token)
+    if vs === Base.secret_table_token
+        if default !== Base.secret_table_token
             return default
         else
             throw(KeyError(key))

test/test_int_set.jl

@@ -8,7 +8,7 @@ data_out = collect(s)
 @test length(data_out) == length(data_in)
 
 # eltype, similar
-@test is(eltype(IntSet()), Int)
+@test eltype(IntSet()) ===  Int
 @test isequal(similar(IntSet([1,2,3])), IntSet())
 
 # show

test/test_ordered_dict.jl

@@ -307,12 +307,12 @@ end
 # issue 9295
 let
     d = OrderedDict()
-    @test is(push!(d, 'a'=> 1), d)
+    @test push!(d, 'a'=> 1) === d
     @test d['a'] == 1
-    @test is(push!(d, 'b' => 2, 'c' => 3), d)
+    @test push!(d, 'b' => 2, 'c' => 3) === d
     @test d['b'] == 2
     @test d['c'] == 3
-    @test is(push!(d, 'd' => 4, 'e' => 5, 'f' => 6), d)
+    @test push!(d, 'd' => 4, 'e' => 5, 'f' => 6) === d
     @test d['d'] == 4
     @test d['e'] == 5
     @test d['f'] == 6

test/test_ordered_set.jl

@@ -15,8 +15,8 @@ data_in = (1, "banana", ())
 s = OrderedSet(data_in)
 data_out = collect(s)
 @test isa(data_out, Array{Any,1})
-@test is(tuple(data_out...), data_in)
-@test is(tuple(data_in...), tuple(s...))
+@test tuple(data_out...) === data_in
+@test tuple(data_in...) === tuple(s...)
 @test length(data_out) == length(data_in)
 
 # hash
@@ -47,10 +47,10 @@ s3 = OrderedSet{Compat.ASCIIString}(["baz"])
 # eltype, similar
 s1 = similar(OrderedSet([1,"hello"]))
 @test isequal(s1, OrderedSet())
-@test is(eltype(s1), Any)
+@test eltype(s1) === Any
 s2 = similar(OrderedSet{Float32}([2.0f0,3.0f0,4.0f0]))
 @test isequal(s2, OrderedSet())
-@test is(eltype(s2), Float32)
+@test eltype(s2) === Float32
 
 # show
 @test endswith(sprint(show, OrderedSet()), "OrderedSet{Any}()")
@@ -108,10 +108,10 @@ for data_in in ((7,8,4,5),
 
     t = tuple(s...)
 
-    @test is(t, data_in)
+    @test t === data_in
     @test length(t) == length(s)
     for (e,f) in zip(t,s)
-        @test is(e,f)
+        @test e === f
     end
 end