Fixing the errors for v0.6. (#2)

* Fixing the errors for v0.6.

* Removed 0.4 from travis-ci

* trying to fix for 0.5

* Ensuring minimal changes needed.

.travis.yml

@@ -4,8 +4,8 @@ os:
   - linux
   - osx
 julia:
-  - 0.4
   - 0.5
+  - 0.6
   - nightly
 notifications:
   email: false

REQUIRE

@@ -1,2 +1,3 @@
 julia 0.5
 Primes
+Compat

src/arithmetic.jl

@@ -1,6 +1,6 @@
-import Base: ==, isless, <=, <, >, 
+import Base: ==, isless, <=, <, >,
     +, -, *, ^, max, min, div, %, gcd, lcm,
-    isqrt, isodd, iseven, one, isprime, factor, primes
+    isqrt, isodd, iseven, one
 
 # Remember that RN is typealiased to RomanNumeral
 
@@ -34,11 +34,11 @@ for op in [:isodd, :iseven, :isprime]
 end
 
 # Who knew Romans did number theory
-function Base.factor(num::RN)
+function Primes.factor(num::RN)
     factors = Dict{RN,RN}()
     for (fac, mul) in factor(num.val)
         factors[RN(fac)] = RN(mul)
     end
     factors
 end
-Base.primes(num::RN) = map(RN, primes(num.val))
+Primes.primes(num::RN) = map(RN, Primes.primes(num.val))

src/roman_conversion.jl

@@ -33,7 +33,7 @@ function parseroman(str::String)
     # Strip whitespace
     str = m.captures[1]
     # Make `str` uppercase
-    if !isupper(str); str = uppercase(str); end
+    if !all(isupper,str); str = uppercase(str); end
     i = 1
     val = 0
     strlen = length(str)

src/types.jl

@@ -1,3 +1,5 @@
+using Compat
+
 # Thrown when the string passed to `parseroman` is not a valid Roman numeral.
 type InvalidRomanError <: Exception
     str::String
@@ -20,7 +22,7 @@ macro rn_str(str)
     RomanNumeral(str)
 end
 
-typealias RN RomanNumeral
+const RN = RomanNumeral
 
 # Standard functions
 # Conversion + promotion
@@ -36,4 +38,4 @@ Base.print(io::IO, num::RN) = print(io, num.str)
 Base.show(io::IO, num::RN) = write(io, num.str)
 
 Base.length(num::RN) = length(num.str)
-Base.hash(num::RN) = hash(num.str) $ hash(num.val)
+Base.hash(num::RN) = @compat xor(hash(num.str), hash(num.val))

test/runtests.jl

@@ -1,5 +1,6 @@
 using RomanNumerals
 using Base.Test
+using Primes
 
 # Constructor tests
 @test RomanNumeral(46) == RomanNumeral("XLVI")