Skip to content
Browse files

copyediting

  • Loading branch information...
1 parent 133f9ba commit d5a8a102c4bcbb2e8899be803a21fa7f3462938f @mwotton mwotton committed Apr 15, 2011
Showing with 16 additions and 17 deletions.
  1. +3 −4 seed/Chapter1/Step_1_1.hs
  2. +4 −4 seed/Chapter1/Step_1_3.hs
  3. +3 −3 seed/Chapter1/Step_1_5.hs
  4. +6 −6 seed/Chapter2/Step_2_4.hs
View
7 seed/Chapter1/Step_1_1.hs
@@ -11,7 +11,7 @@ page = slideDeck "Chapter 1: Intro"
"Haskell seems scary 'cause:"
[ "Oh noes! Where's my state?"
, "Hey, I don't want my program to be lazy!"
- , "Yo, PHP doesn't need no templates or combintors..."
+ , "Yo, PHP doesn't need no templates or combinators..."
, "Uhm, I thought dynamic languages were better?"
, "MONADS!"
]
@@ -26,7 +26,7 @@ page = slideDeck "Chapter 1: Intro"
, pointSlide "Haskell"
"This is what got us hooked:"
[ "It is a new way to thinking about programming"
- , "It twists the brain in delightful way."
+ , "It twists the brain in delightful ways."
, "It is very expressive, yet concise and clear"
, "It is beautiful."
]
@@ -40,7 +40,6 @@ page = slideDeck "Chapter 1: Intro"
"What they do:"
[ "Take input"
, "Process the input."
- , "Produce produce output."
, "Produce output as soon as they're able."
, "Don't modify any state."
, "In short, they are functional, pure, and lazy."
@@ -53,4 +52,4 @@ page = slideDeck "Chapter 1: Intro"
]
]
-
+
View
8 seed/Chapter1/Step_1_3.hs
@@ -13,11 +13,11 @@ page = slideDeck "Chapter 1: Syntax"
]
, pointSlide "Functional Application"
"But the one big difference is in Function application:"
- [ "There are no parenthesis around the arguments."
+ [ "There are no parentheses around the arguments."
, "There are no commas between the arguments."
]
, codeSlide "Function Application"
- "Just drop the parenthesis..."
+ "Just drop the parentheses..."
[ "length(s) // as in C*/P*/J*"
, ""
, "length s -- Haskell"
@@ -51,8 +51,8 @@ page = slideDeck "Chapter 1: Syntax"
[ "Be brave..."
, "You'll soon be able to read it easily"
, "You'll soon love how clear and consise it is"
- , "You'll soon loath to type in those other, verbose languages."
+ , "You'll soon be loath to type in those other, verbose languages."
]
]
-
+
View
6 seed/Chapter1/Step_1_5.hs
@@ -4,7 +4,7 @@ import Slides
page = slideDeck "Chapter 1: Types"
[ pointSlide "Types?"
- "Where are all those types? Isn't Haskell strongly, static typed?"
+ "Where are all those types? Isn't Haskell strongly, statically typed?"
[ "They were all there!"
, "Haskell uses \"type inferencing\", meaning it figures them out."
, "When we add types to the program, it is mostly for the programmers!"
@@ -55,7 +55,7 @@ page = slideDeck "Chapter 1: Types"
, "length :: [a] -> Int"
]
, codeSlide "Two or more arguments"
- "Mutliple arguments are written as successive terms with arrows"
+ "Multiple arguments are written as successive terms with arrows"
[ "sumSquares :: Integer -> Integer -> Integer"
, "sumSquares a b = a*a + b*b"
, ""
@@ -69,4 +69,4 @@ page = slideDeck "Chapter 1: Types"
]
]
-
+
View
12 seed/Chapter2/Step_2_4.hs
@@ -18,7 +18,7 @@ page = slideDeck "Chapter 2: Lists"
, "The first item in the list, and the rest of the list"
]
, codeSlide "Lists in Haskell"
- "In Haskell, [] is the empty list, and the : operator is used to build\
+ "In Haskell, [] is the empty list, and the : operator is used to build \
\up lists:"
[ "[] -- the empty list"
, "42 : [] -- a list of one value"
@@ -44,8 +44,8 @@ page = slideDeck "Chapter 2: Lists"
, "[2, \"bob\"] -- NOT legal in Haskell"
, "[[1,2,3], [10,20,30]] -- of course lists of lists are fine!"
]
- , codeSlide "Syntatic Sugar"
- "In Haskell, the way we've been writing lists is just syntatic sugar \
+ , codeSlide "Syntactic Sugar"
+ "In Haskell, the way we've been writing lists is just syntactic sugar \
\for their construction with the : operator and []:"
[ "[42] == 42 : []"
, "[1, 2, 3] == 1 : 2 : 3 : []"
@@ -83,12 +83,12 @@ page = slideDeck "Chapter 2: Lists"
\arguments match the given pattern:"
[ "[] will match only the empty list"
, "(i:is) will match a list that has a first item (i) and a rest of the \
- \list (is). Careful: Notice that those are parenthesis, not square \
+ \list (is). Careful: Notice that those are parentheses, not square \
\brackets around the : expression!"
]
, codeSlide "Some gotchas:"
"Look at this function to see how NOT to get caught up between matching \
- \the : operator, vs. matching the syntatic sugar lists:"
+ \the : operator, vs. matching the syntactic sugar lists:"
[ "funnyFunction :: [Int] -> String"
, "funnyFunction [] = \"Empty List\""
, "funnyFunction [i] = \"One element list\""
@@ -112,4 +112,4 @@ page = slideDeck "Chapter 2: Lists"
, "['a', 'b', 'c']"
, "'a' : 'b' : 'c' : []"
]
- ]
+ ]

0 comments on commit d5a8a10

Please sign in to comment.
Something went wrong with that request. Please try again.