summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLubomír Sedlář <lubomir.sedlar@gmail.com>2013-07-01 17:33:25 +0200
committerLubomír Sedlář <lubomir.sedlar@gmail.com>2013-07-01 17:33:25 +0200
commit9b6c837916dc50a4646ae1666528681e6e4a881c (patch)
treeb15b94cfcf945d46f010517d6fe2931b6472650c
parent2431545594963be4a79a2d4fbc79277fb30fef3b (diff)
Remove mentions of array
Since all the functions work with lists, calling them arrays is inaccurate. This commit also updates `myMap` function so that it works on an empty list as well as resolves ambiguity about `x` from comment.
-rw-r--r--haskell.html.markdown8
1 files changed, 4 insertions, 4 deletions
diff --git a/haskell.html.markdown b/haskell.html.markdown
index f3baa9a5..1a4cdc67 100644
--- a/haskell.html.markdown
+++ b/haskell.html.markdown
@@ -152,10 +152,10 @@ fib x = fib (x - 1) + fib (x - 2)
-- Pattern matching on tuples:
foo (x, y) = (x + 1, y + 2)
--- Pattern matching on arrays. Here `x` is the first element
--- in the array, and `xs` is the rest of the array. We can write
+-- Pattern matching on lists. Here `x` is the first element
+-- in the list, and `xs` is the rest of the list. We can write
-- our own map function:
-myMap func [x] = [func x]
+myMap func [] = []
myMap func (x:xs) = func x:(myMap func xs)
-- Anonymous functions are created with a backslash followed by
@@ -164,7 +164,7 @@ myMap (\x -> x + 2) [1..5] -- [3, 4, 5, 6, 7]
-- using fold (called `inject` in some languages) with an anonymous
-- function. foldl1 means fold left, and use the first value in the
--- array as the initial value for the accumulator.
+-- list as the initial value for the accumulator.
foldl1 (\acc x -> acc + x) [1..5] -- 15
----------------------------------------------------