X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=04ee19f377654126f742d447a63d97e0bcaff36e;hp=9f8a5bf80583a3d09e51c9873e7dbf09e468c9ff;hb=a7d60f895476d232e9b811e87b29036a1232745a;hpb=ff8a444fb04636e09e1c8797f15451b42065953f

diff --git a/content.mdwn b/content.mdwn
index 9f8a5bf8..04ee19f3 100644
--- a/content.mdwn
+++ b/content.mdwn
@@ -7,6 +7,8 @@ week in which they were introduced.
 
 *   [[What is computation?|topics/week3_what_is_computation]]
 
+*   [[Kaplan on Plexy|topics/week6_plexy]]
+
 *   Functional Programming
 
     *   [[Introduction|topics/week1 kapulet intro]]
@@ -18,12 +20,16 @@ week in which they were introduced.
     *   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 Plexy|topics/week6_plexy]] and the Maybe type
+    *   Interpreter for Lambda terms
+    *   [[Introducing Monads|topics/week7_introducing_monads]]
 
 *   Order, "static versus dynamic"
 
     *   [[Order in programming languages and natural language|topics/week1 order]]
     *   [[Reduction Strategies and Normal Forms in the Lambda Calculus|topics/week3_evaluation_order]]
     *   [[Unit and its usefulness|topics/week3 unit]]
+    *   [[Combinatory evaluator|topics/week7_combinatory_evaluator]]
 
 *   The Untyped Lambda Calculus
 
@@ -40,14 +46,19 @@ week in which they were introduced.
     *   [[Reduction Strategies and Normal Forms|topics/week3_evaluation_order]]
     *   [[Fixed point combinators|topics/week4_fixed_point_combinators]]
     *   [[More about fixed point combinators|topics/week4_more_about_fixed_point_combinators]]
+    *   Interpreter for Lambda terms
 
-*   [[Combinatory Logic|topics/week3 combinatory logic]]
+*   Combinatory logic
+
+    *   [[Introduction|topics/week3 combinatory logic]]
+    *   [[Combinatory evaluator|topics/week7_combinatory_evaluator]]
 
 *   Typed Lambda Calculi
 
     *   [[Simply-typed lambda calculus|topics/week5 simply typed]] (will be updated)
     *   [[System F|topics/week5 system F]] (will be updated)
     *   Types in OCaml and Haskell (will be posted soon)
+    *   [[Introducing Monads|topics/week7_introducing_monads]]
 
 
 ## Topics by week ##
@@ -99,8 +110,16 @@ Week 5:
 *   Practical advice for working with OCaml and/or Haskell (will be posted soon)
 *   [[Homework for weeks 5 and 6|exercises/assignment5]]
 
-Outside readings for week 6:
+Week 6:
 
-*   [[footnote|readings/kaplan-plexy.pdf]] from Kaplan's *Demonstratives* about "Plexy"
+*   [[footnote about "Plexy"|readings/kaplan-plexy.pdf]] from Kaplan's *Demonstratives* about Plexy; [[our notes|topics/week6_plexy]] comparing to the Maybe type
+*   (Recommended) [[King's discussion of Schiffer|readings/king-on-schiffer.pdf]] in Chapter 4 of *The Nature and Structure of Content* (2007)
+*   (Recommended) [[King's discussion of clausal complements and proposition-designators|readings/king-on-logicism.pdf]] from Chapter 5 of *The Nature and Structure of Content* (2007) <!-- reviews and elaborates his paper "[Designating propositions](http://philpapers.org/rec/KINDP)" -->
 *   Michael Rieppel, "[[Being Something: Properties and Predicative Quantification|readings/rieppel-beingsthg.pdf]]"
-*   Optional: Jeff King, from *The Nature and Structure of Content*, on the difference between clausal complements and "the proposition that P", "the fact that P"
+
+Week 7:
+
+*   [[Combinatory evaluator|topics/week7_combinatory_evaluator]]
+*   Interpreter for Lambda terms
+*   [[Introducing Monads|topics/week7_introducing_monads]]
+*   [[Homework for week 7|exercises/assignment7]]