XGitUrl: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=f829610aef44ad62ca0ad7c260ef1bb2cf4189bf;hp=e2af0ee8b3d0e78f75abb1b7bacbdd39f36baae6;hb=2a7b99413dbcdb336e57c222f79e2ce85ddbb9f8;hpb=314d7e66ffee78885d37356752fb468c7600a7a7
diff git a/content.mdwn b/content.mdwn
index e2af0ee8..f829610a 100644
 a/content.mdwn
+++ b/content.mdwn
@@ 5,45 +5,121 @@ week in which they were introduced.
## Topics by content ##
* [[Introduction to functional programmingtopics/week1 kapulet intro]]
+* [[What is computation?topics/week3_what_is_computation]]
+
+* [[Kaplan on Plexytopics/week6_plexy]]
+
+* 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
+ * Types in OCaml and Haskell (will be posted soon)
+ * Practical advice for working with OCaml and/or Haskell (will be posted soon)
+ * [[Kaplan on Plexytopics/week6_plexy]] and the Maybe type
+ * Interpreter for Lambda terms
+ * [[Introducing Monadstopics/week7_introducing_monads]]
+
+* Order, "static versus dynamic"
+
+ * [[Order in programming languages and natural languagetopics/week1 order]]
+ * [[Reduction Strategies and Normal Forms in the Lambda Calculustopics/week3_evaluation_order]]
+ * [[Unit and its usefulnesstopics/week3 unit]]
+ * [[Combinatory evaluatortopics/week7_combinatory_evaluator]]
+
+* The Untyped 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 Formstopics/week3_evaluation_order]]
+ * [[Fixed point combinatorstopics/week4_fixed_point_combinators]]
+ * [[More about fixed point combinatorstopics/week4_more_about_fixed_point_combinators]]
+ * Interpreter for Lambda terms
+
+* Combinatory logic
+
+ * [[Introductiontopics/week3 combinatory logic]]
+ * [[Combinatory evaluatortopics/week7_combinatory_evaluator]]
+
+* Typed Lambda Calculi
+
+ * [[Simplytyped lambda calculustopics/week5 simply typed]] (will be updated)
+ * [[System Ftopics/week5 system F]] (will be updated)
+ * Types in OCaml and Haskell (will be posted soon)
+ * [[Introducing Monadstopics/week7_introducing_monads]]
* [[Order: static versus dynamictopics/week1 order]]

 * [[The Lambda Calculustopics/week2 lambda intro]]

 * [[Advanced notes on the Lambda Calculustopics/week2 lambda advanced]]

 * Encoding data types in the Lambda Calculus

 * [[Booleans, Tuples, Lists, and Numberstopics/week2 encodings]]
## 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]];
* [[Homework for week 2exercises/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]] ([[Answersexercises/assignment2_answers]])
Week 3:
* More on Lists
Introduces list comprehensions, shows how to encode `tail` in the Lambda Calculus
* Combinatorial Logic
* Homework for 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 Formstopics/week3_evaluation_order]] (posted on Monday 23 Feb)
+* [[Unit and its usefulnesstopics/week3 unit]]
+* [[Combinatory Logictopics/week3 combinatory logic]]
+* [[Homework for week 3exercises/assignment3]] ([[Answersexercises/assignment3_answers]])
+
+Week 4:
+
+* [[Fixed point combinatorstopics/week4_fixed_point_combinators]]
+* [[More about fixed point combinatorstopics/week4_more_about_fixed_point_combinators]]
+* Towards types (in progress)
+* [[Homework for week 4exercises/assignment4]]
+
+Week 5:
+
+*Note*: Jim will be updating and expanding the lecture notes by Tuesday, but doesn't want to delay any longer letting you have access to the drafts we (in part) presented from in seminar. But do come back and reread the pages when the expanded versions are posted.
+
+* [[Simplytyped lambda calculustopics/week5 simply typed]]
+* [[System Ftopics/week5 system F]]
+* Types in OCaml and Haskell (will be posted soon)
+* Practical advice for working with OCaml and/or Haskell (will be posted soon)
+* [[Homework for weeks 5 and 6exercises/assignment5]]
+Week 6:
+* [[footnote about "Plexy"readings/kaplanplexy.pdf]] from Kaplan's *Demonstratives* about Plexy; [[our notestopics/week6_plexy]] comparing to the Maybe type
+* (Recommended) [[King's discussion of Schifferreadings/kingonschiffer.pdf]] in Chapter 4 of *The Nature and Structure of Content* (2007)
+* (Recommended) [[King's discussion of clausal complements and propositiondesignatorsreadings/kingonlogicism.pdf]] from Chapter 5 of *The Nature and Structure of Content* (2007)
+* Michael Rieppel, "[[Being Something: Properties and Predicative Quantificationreadings/rieppelbeingsthg.pdf]]"
*More coming, please wait...*
+Week 7:
+* [[Combinatory evaluatortopics/week7_combinatory_evaluator]]
+* Interpreter for Lambda terms
+* [[Introducing Monadstopics/week7_introducing_monads]] (updated Fri 20 Mar)
+* [[Homework for week 7exercises/assignment7]]