Merge branch 'working'

[lambda.git] / content.mdwn

diff --git a/content.mdwn b/content.mdwn
index ad76dd4..e6a02af 100644 (file)
--- a/content.mdwn
+++ b/content.mdwn
@@ -8,6 +8,7 @@ week in which they were introduced.
 *   [[What is computation?|topics/week3_what_is_computation]]
 
 *   [[Kaplan on Plexy|topics/week6_plexy]]
+*   [[Groenendijk, Stokhof, and Veltman|/topics/week10_gsv]]
 
 *   Functional Programming
 
@@ -21,7 +22,11 @@ week in which they were introduced.
     *   Types in OCaml and Haskell (will be posted someday)
     *   Practical advice for working with OCaml and/or Haskell (will be posted someday)
     *   [[Kaplan on Plexy|topics/week6_plexy]] and the Maybe type
-    *   Untyped lambda evaluator ([[in browser|code/lambda_evaluator]]) (for home)
+    *   Untyped lambda evaluator ([[in browser|code/lambda_evaluator]]) ([[for home|topics/week7_untyped_evaluator]])
+    *   [[Ramble on Monads and Modules|topics/week8_monads_and_modules]]
+    *   [[Installing and Using the Juli8 Libraries|/juli8]]
+    *   [[Programming with mutable state|/topics/week9_mutable_state]]
+
 
 *   Order, "static versus dynamic"
 
@@ -29,6 +34,7 @@ week in which they were introduced.
     *   [[Reduction Strategies and Normal Forms in the Lambda Calculus|topics/week3_evaluation_order]]
     *   [[Unit and its usefulness|topics/week3 unit]]
     *   Combinatory evaluator ([[for home|topics/week7_combinatory_evaluator]])
+    *   [[Programming with mutable state|/topics/week9_mutable_state]]
 
 *   The Untyped Lambda Calculus
 
@@ -45,7 +51,9 @@ 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]]
-    *   Untyped lambda evaluator ([[in browser|code/lambda_evaluator]]) (for home)
+    *   Untyped lambda evaluator ([[in browser|code/lambda_evaluator]]) ([[for home|topics/week7_untyped_evaluator]])
+    *   [[Environments and Closures|topics/week7_environments_and_closures]]
+
 
 *   Combinatory logic
 
@@ -62,7 +70,13 @@ week in which they were introduced.
 *   Monads
     *   [[Introducing Monads|topics/week7_introducing_monads]]
     *   [[Safe division with monads|topics/week8_safe_division_with_monads]]
-
+    *   [[Reader Monad|/topics/week8_reader_monad]]
+    *   [[Ramble on Monads and Modules|topics/week8_monads_and_modules]]
+    *   [[Using the OCaml Monad library|/topics/week9_using_the_monad_library]]
+    *   [[Programming with mutable state|/topics/week9_mutable_state]]
+    *   [[A State Monad Tutorial|/topics/week9_state_monad_tutorial]]
+    *   [[Using multiple monads together|/topics/week9_monad_transformers]]
+    *   [[Groenendijk, Stokhof, and Veltman|/topics/week10_gsv]]
 
 
 ## Topics by week ##
@@ -108,7 +122,7 @@ Week 5:
 *   [[System F|topics/week5 system F]]
 *   Types in OCaml and Haskell (will be posted someday)
 *   Practical advice for working with OCaml and/or Haskell (will be posted someday)
-*   [[Homework for weeks 5 and 6|exercises/assignment5]] ([[Answers|exercises/assignment5_answers]])
+*   [[Homework for weeks 5 and 6|exercises/assignment5-6]] ([[Answers|exercises/assignment5-6_answers]])
 
 
 Week 6:
@@ -121,11 +135,30 @@ Week 6:
 Week 7:
 
 *   [[Combinatory evaluator|topics/week7_combinatory_evaluator]]
-*   Untyped lambda evaluator (will be posted soon)
-*   [[Introducing Monads|topics/week7_introducing_monads]] (updated Fri 20 Mar)
-*   [[Homework for week 7|exercises/assignment7]]
+*   [[Introducing Monads|topics/week7_introducing_monads]] (updated Mon 23 Mar)
+*   [[Homework for week 7|exercises/assignment7]] (updated Mon 23 Mar)
+*   [[Environments and Closures|topics/week7_environments_and_closures]]
+*   [[Untyped lambda evaluator|topics/week7_untyped_evaluator]]
+
 
 Week 8:
 
-    *   [[Safe division with monads|topics/week8_safe_division_with_monads]]
+*   [[Safe division with monads|topics/week8_safe_division_with_monads]]
+*   [[Reader Monad|/topics/week8_reader_monad]]
+*   [[Ramble on Monads and Modules|topics/week8_monads_and_modules]]
+
+Week 9:
+
+*   [[Installing and Using the Juli8 Libraries|/juli8]]
+*   [[Using the OCaml Monad library|/topics/week9_using_the_monad_library]]
+*   [[Programming with mutable state|/topics/week9_mutable_state]]
+*   [[A State Monad Tutorial|/topics/week9_state_monad_tutorial]]
+*   [[Using multiple monads together|/topics/week9_monad_transformers]]
+*   [[Homework for weeks 8-9|/exercises/assignment8-9]]
+
+Week 10:
+
+*    Groenendijk, Stokhof, and Veltman, "[[Coreference and Modality|/readings/coreference-and-modality.pdf]]" (1996)
+*    [[Notes on GSV|/topics/week10_gsv]], with links to code
+