From 0c29599256af346220c2cecf95ddf7c6dc56c8b5 Mon Sep 17 00:00:00 2001 From: IvoTod Date: Wed, 2 Nov 2016 01:28:03 +0200 Subject: [PATCH] Refactor code --- exercises/secret-lang/Secret-lang.hs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/exercises/secret-lang/Secret-lang.hs b/exercises/secret-lang/Secret-lang.hs index 3ee5f9b..e4ec7ba 100644 --- a/exercises/secret-lang/Secret-lang.hs +++ b/exercises/secret-lang/Secret-lang.hs @@ -15,21 +15,19 @@ isInString char (first:rest) isVowel :: Char -> Bool -isVowel char - | isInString (toLower char) vowels == True = True -isVowel _ = False +isVowel char = isInString (toLower char) vowels isConsonant :: Char -> Bool isConsonant char - | isVowel char == False && isChar char == True = True + | not (isVowel char) && isChar char = True | otherwise = False encode :: String -> String encode [] = [] encode (first:rest) - | isConsonant first == True = first : 'o' : first : (encode rest) + | isConsonant first = first : 'o' : first : (encode rest) | otherwise = first:(encode rest) @@ -37,7 +35,7 @@ encode (first:rest) encode' :: String -> String encode' [] = [] encode' (first:rest) - | isConsonant first == True = first : 'o' : toLower first : (encode' rest) + | isConsonant first = first : 'o' : toLower first : (encode' rest) | otherwise = first:(encode' rest)