add Plexy and some stubs/reorganization

diff --git a/content.mdwn b/content.mdwn
index b5ecf20..1ec4a92 100644 (file)
--- 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,6 +20,9 @@ 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
+    *   Starting with Monads
 
 *   Order, "static versus dynamic"
 
@@ -40,14 +45,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]]
+    *   Interpreter for Combinatory Logic terms
 
 *   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)
+    *   Starting with Monads
 
 
 ## Topics by week ##
@@ -99,10 +109,17 @@ 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 about "Plexy"|readings/kaplan-plexy.pdf]] from Kaplan's *Demonstratives*
+*   [[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)
-*   Michael Rieppel, "[[Being Something: Properties and Predicative Quantification|readings/rieppel-beingsthg.pdf]]"
 *   (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]]"
+
+Week 7:
+
+*   Interpreter for Combinatory Logic terms
+*   Interpreter for Lambda terms
+*   Starting with Monads
+
+