typo week1

[lambda.git] / topics / week1.mdwn

diff --git a/topics/week1.mdwn b/topics/week1.mdwn
index 430cc5d..70f330e 100644 (file)
--- a/topics/week1.mdwn
+++ b/topics/week1.mdwn
@@ -616,7 +616,7 @@ There are also some [[advanced notes|week1 advanced notes]] extending this week'
 
 ### Summary ###
 
 
 ### Summary ###
 

-Here is the hierarcy of **values** that we've talked about so far.
+Here is the hierarchy of **values** that we've talked about so far.

 
 *   Multivalues
 *   Singular values, including:
 
 *   Multivalues
 *   Singular values, including:


@@ -626,16 +626,19 @@ Here is the hierarcy of **values** that we've talked about so far.
             *   Booleans (or truth-values)
         *   Functions: these are not literals, but instead have to be generated by evaluating complex expressions
     *   Containers, including:
             *   Booleans (or truth-values)
         *   Functions: these are not literals, but instead have to be generated by evaluating complex expressions
     *   Containers, including:

-        *   the literals `[]` and `{}`
-        *   Non-empty sequences
-        *   Non-empty sets
+        *   the **literal containers** `[]` and `{}`
+        *   Non-empty sequences, built using `&`
+        *   Non-empty sets, built using `&`

         *   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
         *   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`
+*   Complex expressions that apply `&` or some variable understood to be bound to a function to some arguments
+*   Various other complex expressions involving λ 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`.
 
 
 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`.
 

+We also talked about **patterns**. These aren't themselves expressions, but form part of some larger expressions.
+