X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=a546e9d8ca2fc083f901ab252b303f4c4200804e;hp=52945505795cdeb92abb34334f8c508f08ef38ae;hb=d4d2725db9c0d3367d8418971bdddf4ceaba73e1;hpb=eccdc0a13b19857fb310918dc48f290a44d18e54
diff --git a/content.mdwn b/content.mdwn
index 52945505..a546e9d8 100644
--- a/content.mdwn
+++ b/content.mdwn
@@ -5,18 +5,23 @@ week in which they were introduced.
## Topics by content ##
+* [[What is computation?|topics/week3_what_is_computation]]
+
* Functional Programming
* [[Introduction|topics/week1 kapulet intro]]
* [[Week 1 Advanced notes|topics/week1 kapulet advanced]]
* [["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
+ * [[List Comprehensions|topics/week3 lists#comprehensions]]
+ * [[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 `()`
* The Lambda Calculus
@@ -27,11 +32,15 @@ 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")
- * How to get the `tail` of v1 lists?
+ * [[Arithmetic with Church numbers|topics/week3_church_arithmetic]]
+ * [[How to get the `tail` of v1 lists?|topics/week3 lists#tails]]
+ * [[Some other list encodings|topics/week3 lists#other-lists]]
* Reduction Strategies and Normal Forms
+ * [[Fixed point combinators|topics/week4_fixed_point_combinators]]
+ * [[More about fixed point combinators|topics/week4_more_about_fixed_point_combinators]]
-* Combinatorial Logic
+* [[Combinatory Logic|topics/week3 combinatory logic]]
## Topics by week ##
@@ -51,17 +60,24 @@ 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:
-* More on Lists
-Introduces list comprehensions, discusses how to get the `tail` of lists in the Lambda Calculus
-* Combinatorial Logic
-* Reduction Strategies and Normal Forms
-* Homework for week 3
+*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|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 some new list encodings
+* [[What is computation?|topics/week3_what_is_computation]]
+* Reduction Strategies and Normal Forms (will try to post soon)
+* [[Unit and its usefulness|topics/week3 unit]]
+* [[Combinatory Logic|topics/week3 combinatory logic]]
+* [[Homework for week 3|exercises/assignment3]]
+Week 4:
-*More coming, please wait...*
+* [[Fixed point combinators|topics/week4_fixed_point_combinators]]
+* [[More about fixed point combinators|topics/week4_more_about_fixed_point_combinators]]
+* Towards types (in progress)