XGitUrl: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=cb67dcff78d8a90bd6ab31da6e8e1d6fcdf65e2a;hp=6b4c55fb02f3f7bc94e308c167babd1b09617f20;hb=54566d57756ec32f26dd22ec4a8258be7d3c5ebb;hpb=47a1e74d28317b889a39c4ab9233445fb05f402f
diff git a/content.mdwn b/content.mdwn
index 6b4c55fb..cb67dcff 100644
 a/content.mdwn
+++ b/content.mdwn
@@ 5,46 +5,78 @@ week in which they were introduced.
## Topics by content ##
* [[Basics of functional programmingtopics/week1]]
+* [[What is computation?topics/week3_what_is_computation]]
+
+* Functional Programming
+
+ * [[Introductiontopics/week1 kapulet intro]]
+ * [[Week 1 Advanced notestopics/week1 kapulet advanced]]
+ * [["Rosetta Stone" page #1 for Kaupulet, Scheme, OCaml, Haskellrosetta1]]
+ * Offsite links for help on [[learning Scheme]], [[OCamllearning OCaml]], and [[Haskelllearning Haskell]]
+ * [[List Comprehensionstopics/week3 lists#comprehensions]]
+ * [[Unit and its usefulnesstopics/week3 unit]]
+ * More tips on using Scheme
+
+* Order, "static versus dynamic"
+
+ * [[Order in programming languages and natural languagetopics/week1 order]]
+ * Reduction Strategies and Normal Forms in the Lambda Calculus
+ * Usefulness of `()`
+
+* The Lambda Calculus
+
+ * [[Introduction to the Lambda Calculustopics/week2 lambda intro]]
+ * [[Advanced notes on the Lambda Calculustopics/week2 lambda advanced]]
+ * Encoding data types in the Lambda Calculus
+ * [[Booleanstopics/week2 encodings#booleans]]
+ * [[Tuplestopics/week2 encodings#tuples]]
+ * [[Liststopics/week2 encodings#lists]], v1 (as rightfolds)
+ * [[Numberstopics/week2 encodings#numbers]], v1 ("Church's encoding")
+ * [[Arithmetic with Church numberstopics/week3_church_arithmetic]]
+ * [[How to get the `tail` of v1 lists?topics/week3 lists#tails]]
+ * [[Some other list encodingstopics/week3 lists#otherlists]]
+ * Reduction Strategies and Normal Forms
+ * [[Fixed point combinatorstopics/week4_fixed_point_combinators]]
+
+
+* [[Combinatory Logictopics/week3 combinatory logic]]
* [[Order: static versus dynamictopics/week1 order]]
## Topics by week ##
Week 1:
+Week 1:
* [[Order in programming languages and natural languagetopics/order]]
+* [[Order in programming languages and natural languagetopics/week1 order]]
This discussion considers conjunction in a language that recognized presupposition failure.
* [[Introduction to functional programmingtopics/week1]]
+* [[Introduction to functional programmingtopics/week1 kapulet intro]]
Basics of functional programming: `let`, `case`, pattern matching, and
recursion. Definitions of factorial.
* [[Homework for week 1exercises/assignment1]]
* [[Advanced notesweek1 advanced notes]]

*More coming, please wait...*


+* [[Advanced notes on functional programmingtopics/week1 kapulet advanced]]
+* [[Homework for week 1exercises/assignment1]] ([[Answersexercises/assignment1_answers]])
+
+Week 2:
+
+* [[Introduction to the Lambda Calculustopics/week2 lambda intro]]
+* [[Advanced notes on the Lambda Calculustopics/week2 lambda advanced]]
+* [[Encoding Booleans, Tuples, Lists, and Numberstopics/week2 encodings]]
+* [[Homework for week 2exercises/assignment2]] ([[Answersexercises/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 numberstopics/week3_church_arithmetic]]
+* [[More on Liststopics/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 usefulnesstopics/week3 unit]]
+* [[Combinatory Logictopics/week3 combinatory logic]]
+* [[Homework for week 3exercises/assignment3]]
+
+Week 4:
+
+* [[Fixed point combinatorstopics/week4_fixed_point_combinators]]
+* More on fixed point combinators (in progress)
+* Towards types (in progress)
+