X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=week7.mdwn;h=abb6cfe82690c24556155b8dcf0b730bddcc2535;hp=65d528c45b0f13bf068fc31df047c9578f75ee6d;hb=193823d816ee0b6ed88532df8ab2d9f43f66daca;hpb=e8a135f7bc1a0aa4118703baa78ec8d2ea9db490

diff --git a/week7.mdwn b/week7.mdwn
index 65d528c4..abb6cfe8 100644
--- a/week7.mdwn
+++ b/week7.mdwn
@@ -58,12 +58,11 @@ operations.  So we have to jack up the types of the inputs:
 
 <pre>
 let div' (u:int option) (v:int option) =
-  match v with
+  match u with
 	  None -> None
-    | Some 0 -> None
-	| Some y -> (match u with
-					  None -> None
-                    | Some x -> Some (x / y));;
+	| Some x -> (match v with
+				  Some 0 -> None
+				| Some y -> Some (x / y));;
 
 (*
 val div' : int option -> int option -> int option = <fun>
@@ -237,7 +236,7 @@ that provides at least the following three elements:
 	most straightforward way to lift an ordinary value into a monadic value
 	of the monadic type in question.
 
-*	Thirdly, an operation that's often called `bind`. This is another
+*	Thirdly, an operation that's often called `bind`. As we said before, this is another
 	unfortunate name: this operation is only very loosely connected to
 	what linguists usually mean by "binding." In our option/maybe monad, the
 	bind operation is:
@@ -366,7 +365,7 @@ Just like good robots, monads must obey three laws designed to prevent
 them from hurting the people that use them or themselves.
 
 *	**Left identity: unit is a left identity for the bind operation.**
-	That is, for all `f:'a -> 'a m`, where `'a m` is a monadic
+	That is, for all `f:'a -> 'b m`, where `'b m` is a monadic
 	type, we have `(unit x) >>= f == f x`.  For instance, `unit` is itself
 	a function of type `'a -> 'a m`, so we can use it for `f`:
 
@@ -379,14 +378,15 @@ them from hurting the people that use them or themselves.
 	function to be defined (in this case, the name of the function
 	is `>>=`, pronounced "bind") is an infix operator, so we write
 	`u >>= f` or equivalently `( >>= ) u f` instead of `>>= u
-	f`. Now, for a less trivial instance of a function from `int`s
-	to `int option`s:
+	f`.
 
 		# unit 2;;
 		- : int option = Some 2
 		# unit 2 >>= unit;;
 		- : int option = Some 2
 
+	Now, for a less trivial instance of a function from `int`s to `int option`s:
+
 		# let divide x y = if 0 = y then None else Some (x/y);;
 		val divide : int -> int -> int option = <fun>
 		# divide 6 2;;
@@ -404,8 +404,8 @@ them from hurting the people that use them or themselves.
 
 		(u >>= f) >>= g == u >>= (fun x -> f x >>= g)
 
-	If you don't understand why the lambda form is necessary (the "fun
-	x" part), you need to look again at the type of `bind`.
+	If you don't understand why the lambda form is necessary (the
+	"fun x -> ..." part), you need to look again at the type of `bind`.
 
 	Some examples of associativity in the option monad (bear in
 	mind that in the Ocaml implementation of integer division, 2/3
@@ -427,7 +427,7 @@ them from hurting the people that use them or themselves.
 		- : int option = None
 
 Of course, associativity must hold for *arbitrary* functions of
-type `'a -> 'a m`, where `m` is the monad type.  It's easy to
+type `'a -> 'b m`, where `m` is the monad type.  It's easy to
 convince yourself that the `bind` operation for the option monad
 obeys associativity by dividing the inputs into cases: if `u`
 matches `None`, both computations will result in `None`; if
@@ -462,22 +462,22 @@ See also <http://www.haskell.org/haskellwiki/Monad_Laws>.
 
 Here are some papers that introduced monads into functional programming:
 
-*	[Eugenio Moggi, Notions of Computation and Monads](http://www.disi.unige.it/person/MoggiE/ftp/ic91.pdf): Information and Computation 93 (1) 1991.
+*	[Eugenio Moggi, Notions of Computation and Monads](http://www.disi.unige.it/person/MoggiE/ftp/ic91.pdf): Information and Computation 93 (1) 1991. Would be very difficult reading for members of this seminar. However, the following two papers should be accessible.
+
+*	[Philip Wadler. The essence of functional programming](http://homepages.inf.ed.ac.uk/wadler/papers/essence/essence.ps):
+invited talk, *19'th Symposium on Principles of Programming Languages*, ACM Press, Albuquerque, January 1992.
+<!--	This paper explores the use monads to structure functional programs. No prior knowledge of monads or category theory is required.
+	Monads increase the ease with which programs may be modified. They can mimic the effect of impure features such as exceptions, state, and continuations; and also provide effects not easily achieved with such features. The types of a program reflect which effects occur.
+	The first section is an extended example of the use of monads. A simple interpreter is modified to support various extra features: error messages, state, output, and non-deterministic choice. The second section describes the relation between monads and continuation-passing style. The third section sketches how monads are used in a compiler for Haskell that is written in Haskell.-->
 
 *	[Philip Wadler. Monads for Functional Programming](http://homepages.inf.ed.ac.uk/wadler/papers/marktoberdorf/baastad.pdf):
 in M. Broy, editor, *Marktoberdorf Summer School on Program Design
 Calculi*, Springer Verlag, NATO ASI Series F: Computer and systems
 sciences, Volume 118, August 1992. Also in J. Jeuring and E. Meijer,
 editors, *Advanced Functional Programming*, Springer Verlag, 
-LNCS 925, 1995. Some errata fixed August 2001.  This paper has a great first
-line: **Shall I be pure, or impure?**
+LNCS 925, 1995. Some errata fixed August 2001.
 <!--	The use of monads to structure functional programs is described. Monads provide a convenient framework for simulating effects found in other languages, such as global state, exception handling, output, or non-determinism. Three case studies are looked at in detail: how monads ease the modification of a simple evaluator; how monads act as the basis of a datatype of arrays subject to in-place update; and how monads can be used to build parsers.-->
 
-*	[Philip Wadler. The essence of functional programming](http://homepages.inf.ed.ac.uk/wadler/papers/essence/essence.ps):
-invited talk, *19'th Symposium on Principles of Programming Languages*, ACM Press, Albuquerque, January 1992.
-<!--	This paper explores the use monads to structure functional programs. No prior knowledge of monads or category theory is required.
-	Monads increase the ease with which programs may be modified. They can mimic the effect of impure features such as exceptions, state, and continuations; and also provide effects not easily achieved with such features. The types of a program reflect which effects occur.
-	The first section is an extended example of the use of monads. A simple interpreter is modified to support various extra features: error messages, state, output, and non-deterministic choice. The second section describes the relation between monads and continuation-passing style. The third section sketches how monads are used in a compiler for Haskell that is written in Haskell.-->
 
 There's a long list of monad tutorials on the [[Offsite Reading]] page. (Skimming the titles is somewhat amusing.) If you are confused by monads, make use of these resources. Read around until you find a tutorial pitched at a level that's helpful for you.
 
@@ -583,7 +583,7 @@ Continuation monad.
 But first, we'll look at several linguistic applications for monads, based
 on what's called the *Reader monad*.
 
-##[[Reader monad]]##
+##[[Reader monad for Variable Binding]]##
 
-##[[Intensionality monad]]##
+##[[Reader monad for Intensionality]]##