X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=topics%2Fweek1.mdwn;h=7f717d9a0cf40f1367340a6b62b64d676ecb83c2;hp=24d606b2a4ced242f0a37f96e904c339e8bb19e0;hb=c10e4dd6e3e70551ba4e619dff1363c54af53afa;hpb=26ee92a52489d4249af8c5b1a0066b0e4e6be7e1

diff --git a/topics/week1.mdwn b/topics/week1.mdwn
index 24d606b2..7f717d9a 100644
--- a/topics/week1.mdwn
+++ b/topics/week1.mdwn
@@ -134,7 +134,7 @@ It's okay to also write it all inline, like so: `let x be 5; y be x + 1 in 2 * y
 
 The `x + 1` that is evaluated to give the value that `y` gets bound to uses the (more local) binding of `x` to `5`, not the (previous, less local) binding of `x` to `0`. By the way, the parentheses in that displayed expression were just to focus your attention. It would have parsed and meant the same without them.
 
-Now we can allow ourselves to introduce λ-expressions in the following way. If a λ-expression is applied to an argument, as in: `(`λ `x.` φ`) M`, for any (simple or complex) expressions φ and `M`, this means the same as: `let x be M in` φ. That is, the argument to the λ-expression provides (when evaluated) a value for the variable `x` to be bound to, and then the result of the whole thing is whatever φ evaluates to, under that binding to `x`.
+Now we can allow ourselves to introduce λ-expressions in the following way. If a λ-expression is applied to an argument, as in: `(`λ `x.` φ`) M`, for any (simple or complex) expressions φ and `M`, this means the same as: `let x be M in` φ. That is, the argument `M` to the λ-expression provides (when evaluated) a value for the variable `x` to be bound to, and then the result of the whole thing is whatever φ evaluates to, under that binding to `x`.
 
 If we restricted ourselves to only that usage of λ-expressions, that is when they were applied to all the arguments they're expecting, then we wouldn't have moved very far from the decidable fragment of arithmetic we began with.
 
@@ -383,8 +383,8 @@ is a pattern, meaning the same as `x1 & x2 & []`. Note that while `x & xs` match
 For the time being, these are the only patterns we'll allow. But since the definition of patterns is recursive, this permits very complex patterns. What would this evaluate to:
 
     let
-      ([x, y], [z:zs, w]) match ([[], 'true], [[10, 20, 30], 'false])
-    in (z, y)
+      ([xs, ys], [z:zs, ws]) match ([[], [1]], [[10, 20, 30], [0]])
+    in z & ys
 
 Also, we will permit complex patterns in λ-expressions, too. So you can write:
 
@@ -473,7 +473,7 @@ or, using `case`:
   `factorial match` λ `n. case n of 0 then 1; _ then n * factorial (n - 1) end`  
 `in factorial`
 
-But there's a problem here. What value does `factorial` have when evaluating the expression `factorial (n - 1)`?
+But there's a problem here. What value does `factorial` have when evaluating the subexpression `factorial (n - 1)`?
 
 As we said in class, the natural precedent for this with non-function variables would go something like this:
 
@@ -540,7 +540,7 @@ Finally, we're in a position to revisit the two definitions of `length` that Jim
   `length match` λ `xs. case xs of [] then 0; _:ys then 1 + length ys end`  
 `in length`
 
-This function accept a sequence `xs`, and if its empty returns `0`, else it says that its length is `1` plus whatever is the length of its remainder when you take away the first element. In programming circles, this remainder is commonly called the sequence's "tail" (and the first element is its "head").
+This function accept a sequence `xs`, and if it's empty returns `0`, else it says that its length is `1` plus whatever is the length of its remainder when you take away the first element. In programming circles, this remainder is commonly called the sequence's "tail" (and the first element is its "head").
 
 Thus if we evaluated `length [10, 20, 30]`, that would give the same result as `1 + length [20, 30]`, which would give the same result as `1 + (1 + length [30])`, which would give the same result as `1 + (1 + (1 + length []))`. But `length []` is `0`, so our original expression evaluates to `1 + (1 + (1 + 0))`, or `3`.
 
@@ -614,3 +614,28 @@ You have all the materials you need now to do this week's [[assignment|assignmen
 
 There are also some [[advanced notes|week1 advanced notes]] extending this week's material.
 
+### Summary ###
+
+Here is the hierarcy of **values** that we've talked about so far.
+
+*   Multivalues
+*   Singular values, including:
+    *   Atoms, including:
+        *   Numbers: these are among the **literals**
+        *   Symbolic atoms: these are also among the **literals**, and include:
+            *   Booleans (or truth-values)
+        *   Functions: these are not literals, but instead have to be generated by evaluating complex expressions
+    *   Containers, including:
+        *   the **literal containers** `[]` and `{}`
+        *   Non-empty sequences
+        *   Non-empty sets
+        *   Tuples proper and other containers, to be introduced later
+
+We've also talked about a variety of **expressions** in our language, that evaluate down to various values (if their evaluation doesn't "crash" or otherwise go awry). These include:
+
+*   All of the literal atoms and literal containers
+*   Variables
+*   Various complex expressions, built using `&` or λ or `let` or `letrec` or `case`
+
+The special syntaxes `[10, 20, 30]` are just shorthand for the more offical syntax using `&` and `[]`, and likewise for `{10, 20, 30}`. The `if ... then ... else ...` syntax is just shorthand for a `case`-construction using the literal patterns `'true` and `'false`.
+