X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=52945505795cdeb92abb34334f8c508f08ef38ae;hp=ff03e69019edbef76ccb6aa2476228583622df20;hb=e4e1e0f2f5156d78cd2d896d9f3c711babd7ac15;hpb=f49e9034420e79b0dffc73c557f0c00ee6207eb2

diff --git a/content.mdwn b/content.mdwn
index ff03e690..52945505 100644
--- a/content.mdwn
+++ b/content.mdwn
@@ -5,29 +5,61 @@ week in which they were introduced.
 
 ## Topics by content ##
 
-* [[Introduction to functional programming|topics/week1 kapulet intro]]
+*   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
+
+*   Order, "static versus dynamic"
+
+    *    [[Order in programming languages and natural language|topics/week1 order]]
+    *    Reduction Strategies and Normal Forms in the Lambda Calculus
+
+*   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")
+        *   How to get the `tail` of v1 lists?
+    *    Reduction Strategies and Normal Forms
+
+
+*    Combinatorial 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 kapulet intro]]
+*   [[Introduction to functional programming|topics/week1 kapulet intro]]
 Basics of functional programming: `let`, `case`, pattern matching, and
 recursion.  Definitions of factorial.
-* [[Advanced notes on functional programming|topics/week1 kapulet advanced]]
-* [[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:
 
-* [[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 (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]]
+
+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