X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=6bcc55e18b8900440ab99c5a951cbe4004d61a48;hp=79cb0b98c00a28f806aaa8cba8a0a196f32f4c1a;hb=8a2e3fac5b5faf8eebef6b4c24db35dfc101c07c;hpb=c1b22b6a5bcbc75769917a9c10588461fd7b28c4
diff --git a/content.mdwn b/content.mdwn
index 79cb0b98..6bcc55e1 100644
--- a/content.mdwn
+++ b/content.mdwn
@@ -14,14 +14,14 @@ week in which they were introduced.
* [["Rosetta Stone" page #1 for Kaupulet, Scheme, OCaml, Haskell|rosetta1]]
* Offsite links for help on [[learning Scheme]], [[OCaml|learning OCaml]], and [[Haskell|learning Haskell]]
* [[List Comprehensions|topics/week3 lists#comprehensions]]
- * Usefulness of `()`
+ * [[Unit and its usefulness|topics/week3 unit]]
* More tips on using Scheme
* Order, "static versus dynamic"
- * [[Order in programming languages and natural language|topics/week1 order]]
- * Reduction Strategies and Normal Forms in the Lambda Calculus
- * Usefulness of `()`
+ * [[Order in programming languages and natural language|topics/week1 order]]
+ * [[Reduction Strategies and Normal Forms in the Lambda Calculus|topics/week3_evaluation_order]]
+ * [[Unit and its usefulness|topics/week3 unit]]
* The Lambda Calculus
@@ -32,10 +32,12 @@ week in which they were introduced.
* [[Tuples|topics/week2 encodings#tuples]]
* [[Lists|topics/week2 encodings#lists]], v1 (as right-folds)
* [[Numbers|topics/week2 encodings#numbers]], v1 ("Church's encoding")
+ * [[Arithmetic with Church numbers|topics/week3_church_arithmetic]]
* [[How to get the `tail` of v1 lists?|topics/week3 lists#tails]]
- * Some other list encodings
- * Arithmetic with Church numbers
- * Reduction Strategies and Normal Forms
+ * [[Some other list encodings|topics/week3 lists#other-lists]]
+ * [[Reduction Strategies and Normal Forms|topics/week3_evaluation_order]]
+ * [[Fixed point combinators|topics/week4_fixed_point_combinators]]
+ * [[More about fixed point combinators|topics/week4_more_about_fixed_point_combinators]]
* [[Combinatory Logic|topics/week3 combinatory logic]]
@@ -58,18 +60,25 @@ Week 2:
* [[Introduction to the Lambda Calculus|topics/week2 lambda intro]]
* [[Advanced notes on the Lambda Calculus|topics/week2 lambda advanced]]
* [[Encoding Booleans, Tuples, Lists, and Numbers|topics/week2 encodings]]
-* [[Homework for week 2|exercises/assignment2]]
+* [[Homework for week 2|exercises/assignment2]] ([[Answers|exercises/assignment2_answers]])
Week 3:
-*We will continue to develop these notes over the next few days. Expect some of the notes already posted to be expanded, and more notes to appear.*
+*These notes were developed over the course of the week. It'd be a good idea to review them again now, to be sure you've read all the content.*
-* Arithmetic with Church numbers
-* [[What is computation?|topics/week3_what_is_computation]]
+* [[Arithmetic with Church numbers|topics/week3_church_arithmetic]]
* [[More on Lists|topics/week3 lists]]
-Introduces list comprehensions, discusses how to get the `tail` of lists in the Lambda Calculus (and will discuss some other list encodings)
+Introduces list comprehensions, discusses how to get the `tail` of lists in the Lambda Calculus, and some new list encodings
+* [[What is computation?|topics/week3_what_is_computation]]
+* [[Reduction Strategies and Normal Forms|topics/week3_evaluation_order]] (posted on Monday 23 Feb)
+* [[Unit and its usefulness|topics/week3 unit]]
* [[Combinatory Logic|topics/week3 combinatory logic]]
-* Reduction Strategies and Normal Forms
-* Usefulness of `()`
-* [[Homework for week 3|exercises/assignment3]]
+* [[Homework for week 3|exercises/assignment3]] ([[Answers|exercises/assignment3_answers]])
+
+Week 4:
+
+* [[Fixed point combinators|topics/week4_fixed_point_combinators]]
+* [[More about fixed point combinators|topics/week4_more_about_fixed_point_combinators]]
+* Towards types (in progress)
+* [[Homework for week 4|exercises/assignment4]]