From d7b08372e7be61697873b44ad88ca4b1805acd3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Depreeuw?= Date: Sun, 8 Oct 2017 19:42:45 +0200 Subject: [PATCH] Fix inconsistencies --- 02-hello-haskell/2.5-comprehension-check.md | 2 +- 02-hello-haskell/src/chapter.hs | 11 ----------- 02-hello-haskell/src/chapter2.hs | 13 +++++++++++++ 03-strings/3.11-chapter-exercises.md | 2 +- 4 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 02-hello-haskell/src/chapter.hs diff --git a/02-hello-haskell/2.5-comprehension-check.md b/02-hello-haskell/2.5-comprehension-check.md index 3f220b8..5613d88 100644 --- a/02-hello-haskell/2.5-comprehension-check.md +++ b/02-hello-haskell/2.5-comprehension-check.md @@ -1,4 +1,4 @@ -# Exercises: Comprhension check +# Exercises: Comprehension check ## Exercise 1 To declare these functions in the REPL, you need to prepend them with **let**. diff --git a/02-hello-haskell/src/chapter.hs b/02-hello-haskell/src/chapter.hs deleted file mode 100644 index f1108b2..0000000 --- a/02-hello-haskell/src/chapter.hs +++ /dev/null @@ -1,11 +0,0 @@ --- 4 -waxOn = x * 5 - where z = 7 - x = y ^ 2 - y = z + 8 - --- 5 -triple x = x * 3 - --- 6 -waxOff x = triple x \ No newline at end of file diff --git a/02-hello-haskell/src/chapter2.hs b/02-hello-haskell/src/chapter2.hs index 89fbb1f..b1b67f8 100644 --- a/02-hello-haskell/src/chapter2.hs +++ b/02-hello-haskell/src/chapter2.hs @@ -36,3 +36,16 @@ bar x = pi * (x * x) x = 7 y = 18 f = x + y + +-- 2.11 Chpater Exercises +-- 4 +waxOn = x * 5 + where z = 7 + x = y ^ 2 + y = z + 8 + +-- 5 +triple x = x * 3 + +-- 6 +waxOff x = triple x diff --git a/03-strings/3.11-chapter-exercises.md b/03-strings/3.11-chapter-exercises.md index aac3334..3c8b197 100644 --- a/03-strings/3.11-chapter-exercises.md +++ b/03-strings/3.11-chapter-exercises.md @@ -2,7 +2,7 @@ ## Reading syntax ### Excercise 1 1. Correct -2. Incorrect, should be: `(++) [1,2,3] [4,5,6] +2. Incorrect, should be: `(++) [1,2,3] [4,5,6]` 3. Correct 4. Correct 5. Incorrect, should be: `"hello" !! 4`