Merge pull request #289 from JuliaLang/sb/xor

Deprecation of `$` in favour of `xor`

README.md

@@ -124,6 +124,8 @@ Currently, the `@compat` macro supports the following syntaxes:
 
 * `writemime` has been merged into `show` [#16563](https://github.com/JuliaLang/julia/pull/16563). Note that to extend this function requires `@compat`; see the [Supported Syntax](#supported-syntax) section for more information.
 
+* `$` is now `xor` or `⊻` [#18977](https://github.com/JuliaLang/julia/pull/18977).
+
 ## New macros
 
 * `@static` has been added [#16219](https://github.com/JuliaLang/julia/pull/16219).

src/Compat.jl

@@ -1679,4 +1679,11 @@ if VERSION < v"0.6.0-dev.848"
     end
 end
 
+# julia#18977
+if !isdefined(Base, :xor)
+    const xor = $
+    const ⊻ = xor
+    export xor, ⊻
+end
+
 end # module

test/runtests.jl

@@ -1509,3 +1509,6 @@ for T in types
     x = @compat Nullable{Array{T}}()
     @test_throws UndefRefError unsafe_get(x)
 end
+
+@test xor(1,5) == 4
+@test 1 ⊻ 5 == 4