X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=b6f23c0b58dba7b43274e6f55243e3bc99c0e300;hp=ff03e69019edbef76ccb6aa2476228583622df20;hb=13d34ffc9870f957a786ba93b0e72ce5f47367d2;hpb=9201649f036db0e397214de35bddc445cc0d49f2;ds=sidebyside

diff --git a/content.mdwn b/content.mdwn
index ff03e690..b6f23c0b 100644
--- a/content.mdwn
+++ b/content.mdwn
@@ -5,31 +5,79 @@ week in which they were introduced.
 
 ## Topics by content ##
 
-* [[Introduction to functional programming|topics/week1 kapulet intro]]
+*   [[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
+    *   Usefulness of `()`
+
+*   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
+    *   [[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 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]] ([[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 (will try to post soon)
+*   [[Unit and its usefulness|topics/week3 unit]]
+*   [[Combinatory Logic|topics/week3 combinatory logic]]
+*   [[Homework for week 3|exercises/assignment3]]
 
-*More coming, please wait...*
+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]]