XGitUrl: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=0a6fa2dee44aed1bd6af0cf0c9384e9b1434c938;hp=e4e81495f53bbcd44acd741b5e93fb3c0a3e6385;hb=588916b85952d356b51cccea0fb38b8cc1582174;hpb=7cc39c68d74503b3ea9d143ebe9acf21ff425042;ds=sidebyside
diff git a/content.mdwn b/content.mdwn
index e4e81495..0a6fa2de 100644
 a/content.mdwn
+++ b/content.mdwn
@@ 5,31 +5,71 @@ week in which they were introduced.
## Topics by content ##
* [[Introduction to functional programmingtopics/week1 kapulet intro]]
+* [[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]]
+ * Usefulness of `()`
+ * 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 encodings
+ * Reduction Strategies and Normal Forms
+
+
+* [[Combinatory Logictopics/week3 combinatory logic]]
* [[Order: static versus dynamictopics/week1 order]]
## Topics by week ##
Week 1:
* [[Order in programming languages and natural languagetopics/week1 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 kapulet intro]]
+* [[Introduction to functional programmingtopics/week1 kapulet intro]]
Basics of functional programming: `let`, `case`, pattern matching, and
recursion. Definitions of factorial.
* [[Advanced notes on functional programmingtopics/week1 kapulet advanced]]
* [[Homework for week 1exercises/assignment1]]
+* [[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]];
* [[Homeworkexercises/assignment2]]

+* [[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]]
+Week 3:
+*We will continue to develop these notes over the next few days. Expect some of the notes already posted to be expanded, and more notes to appear.*
*More coming, please wait...*
+* [[Arithmetic with Church numberstopics/week3_church_arithmetic]]
+* [[What is computation?topics/week3_what_is_computation]]
+* [[More on Liststopics/week3 lists]]
+Introduces list comprehensions, discusses how to get the `tail` of lists in the Lambda Calculus (and will discuss some other list encodings)
+* [[Combinatory Logictopics/week3 combinatory logic]]
+* Reduction Strategies and Normal Forms
+* Usefulness of `()`
+* [[Homework for week 3exercises/assignment3]]