From a3da67ce7ecd1f7c1215055322483fe9e4fc4024 Mon Sep 17 00:00:00 2001 From: cormullion Date: Fri, 28 Apr 2017 11:18:49 +0100 Subject: [PATCH] updates for 0.6 --- src/enigma.jl | 2 +- src/hill.jl | 2 +- src/playfair.jl | 2 +- src/portas.jl | 2 +- src/vigenere.jl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/enigma.jl b/src/enigma.jl index 880a0b4..86e1090 100644 --- a/src/enigma.jl +++ b/src/enigma.jl @@ -243,7 +243,7 @@ function encrypt_enigma{I <: Integer}(plaintext, print(ans, working_ch) end - uppercase(takebuf_string(ans)) + uppercase(String(take!(ans))) end function decrypt_enigma(args1...; args2...) diff --git a/src/hill.jl b/src/hill.jl index b438b2b..fa741b4 100644 --- a/src/hill.jl +++ b/src/hill.jl @@ -38,7 +38,7 @@ function encrypt_hill{I <: Integer}(plaintext, key::Array{I, 2}) print(ans, Char(x)) end end - takebuf_string(ans) + String(take!(ans)) end diff --git a/src/playfair.jl b/src/playfair.jl index b750f4f..d3fc647 100644 --- a/src/playfair.jl +++ b/src/playfair.jl @@ -108,7 +108,7 @@ function encrypt_playfair(plaintext, key::Array{Char, 2}; stripped=false, combin i += 2 end - takebuf_string(ans) + String(take!(ans)) end diff --git a/src/portas.jl b/src/portas.jl index 051481d..3913318 100644 --- a/src/portas.jl +++ b/src/portas.jl @@ -32,7 +32,7 @@ function encrypt_portas(plaintext, key_in::AbstractString) end end - takebuf_string(ans) + String(take!(ans)) end """ diff --git a/src/vigenere.jl b/src/vigenere.jl index 6d947b0..d491904 100644 --- a/src/vigenere.jl +++ b/src/vigenere.jl @@ -65,6 +65,6 @@ function crack_vigenere(plaintext; keylength=0) end derived_key = join([Char(65+crack_caesar(st)[2]) for st in everyother], "") - (derived_key, takebuf_string(ans)) + (derived_key, String(take!(ans))) end