Merge pull request #10 from rened/deprfix

fixes deprecation warnings for 0.4

.travis.yml

@@ -3,7 +3,8 @@ os:
   - linux
   - osx
 julia:
-  - release
+  - 0.3
+  - 0.4
   - nightly
 notifications:
   email: false

REQUIRE

@@ -1 +1,2 @@
 julia 0.3
+Compat

src/Levenshtein.jl

@@ -3,25 +3,27 @@
 ##
 module Levenshtein
 
+using Compat
+
 export levenshtein
 export levenshtein!
 
 
-function levenshtein(source::String, target::String)
+function levenshtein(source::AbstractString, target::AbstractString)
     return levenshtein(source, target, 1)
 end
 
-function levenshtein(source::String, target::String, cost::Real)
+function levenshtein(source::AbstractString, target::AbstractString, cost::Real)
     return levenshtein(source, target, cost, cost, cost)
 end
 
-function levenshtein{R<:Real,S<:Real,T<:Real}(source::String, target::String, deletion_cost::R, insertion_cost::S, substitution_cost::T)
+function levenshtein{R<:Real,S<:Real,T<:Real}(source::AbstractString, target::AbstractString, deletion_cost::R, insertion_cost::S, substitution_cost::T)
     return levenshtein!(target, source, insertion_cost, deletion_cost, substitution_cost)
 end
 
 function levenshtein!{R<:Real,S<:Real,T<:Real}(
-    source::String,
-    target::String,
+    source::AbstractString,
+    target::AbstractString,
     deletion_cost::R,
     insertion_cost::S,
     substitution_cost::T,

test/performance.jl

@@ -1,7 +1,7 @@
 using Levenshtein
 
 function randString(len)
-    return utf8(string([char(int(rand() * 255 + 1)) for _ in 1:len]...))
+    return utf8(string([Char(round(Int,rand() * 255 + 1)) for _ in 1:len]...))
 end
 
 function run_huge_string(l1, l2)

test/runtests.jl

@@ -1,7 +1,8 @@
 using Levenshtein
 using Base.Test
+using Compat
 
-function levenshtein_base(a::String, b::String, deletion_cost::Real, insertion_cost::Real, substitution_cost::Real)
+function levenshtein_base(a::AbstractString, b::AbstractString, deletion_cost::Real, insertion_cost::Real, substitution_cost::Real)
     local costs::Array{Real, 2} = zeros(Real, length(a) + 1, length(b) + 1)
     # Initialize the deletion costs
     for i in 1:length(a)
@@ -59,13 +60,9 @@ end
 @test levenshtein("a", "", 10, 0, 0) == 10
 @test levenshtein("", "a", 0, 10, 0) == 10
 
-function randString(len)
-    return utf8(string([char(int(rand() * 255 + 1)) for _ in 1:len]...))
-end
-
 for i in 1:100
-    s = randString(floor(rand() * 100))
-    t = randString(floor(rand() * 100))
+    s = randstring(floor(Int,rand() * 100))
+    t = randstring(floor(Int,rand() * 100))
     ins, del, sub = rand() * 1000, rand() * 1000, rand() * 1000
 
     calculated, truth = levenshtein(s, t, del, ins, sub), levenshtein_base(s, t, del, ins, sub)