X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=6bcc55e18b8900440ab99c5a951cbe4004d61a48;hp=5893819c089f4f665d6cba52621dc03984449cbe;hb=6338e2431dd0efb7b1277071f645854f97675a3d;hpb=0b1bbb3b846871fc9245456e0be8a1c1fb102050

diff --git a/content.mdwn b/content.mdwn
index 5893819c..6bcc55e1 100644
--- a/content.mdwn
+++ b/content.mdwn
@@ -5,31 +5,80 @@ week in which they were introduced.
 
 ## Topics by content ##
 
-* [[Introduction to functional programming|topics/week1]]
+*   [[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|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|topics/week3_evaluation_order]]
+    *   [[Unit and its usefulness|topics/week3 unit]]
+
+*   The Lambda Calculus
+
+    *   [[Introduction to the Lambda Calculus|topics/week2 lambda intro]]
+    *   [[Advanced notes on the Lambda Calculus|topics/week2 lambda advanced]]
+    *   Encoding data types in the Lambda Calculus
+        *   [[Booleans|topics/week2 encodings#booleans]]
+        *   [[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|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]]
 
-* [[Order: static versus dynamic|topics/week1 order]]
 
 ## Topics by week ##
 
 Week 1:
 
-* [[Order in programming languages and natural language|topics/week1 order]]
+*   [[Order in programming languages and natural language|topics/week1 order]]
 This discussion considers conjunction in a language that recognized presupposition failure.
-* [[Introduction to functional programming|topics/week1]]
+*   [[Introduction to functional programming|topics/week1 kapulet intro]]
 Basics of functional programming: `let`, `case`, pattern matching, and
 recursion.  Definitions of factorial.
-* [[Advanced notes|topics/week1 advanced notes]]
-* [[Homework for week 1|exercises/assignment1]]
+*   [[Advanced notes on functional programming|topics/week1 kapulet advanced]]
+*   [[Homework for week 1|exercises/assignment1]] ([[Answers|exercises/assignment1_answers]])
 
 Week 2:
 
-* [[Intro to the Lambda Calculus|topics/week2_lambda_intro]]
-* [[Advanced notes on the Lambda Calculus|topics/ week2 lambda calculus fine points]]
-* Encoding Booleans, Tuples, Lists, and Numbers (in progress)
-* Homework for week 2 (in progress)
+*   [[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]] ([[Answers|exercises/assignment2_answers]])
+
+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|topics/week3_evaluation_order]] (posted on Monday 23 Feb)
+*   [[Unit and its usefulness|topics/week3 unit]]
+*   [[Combinatory Logic|topics/week3 combinatory logic]]
+*   [[Homework for week 3|exercises/assignment3]] ([[Answers|exercises/assignment3_answers]])
 
+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)
+*   [[Homework for week 4|exercises/assignment4]]