XGitUrl: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=84d34856b9a3efae5e6788792ec8bee0ce5b974b;hp=ab681318509d5f30fc7675367e56c5d56c8bed1e;hb=8b5f17b3b2c71d443362d7f629dec6cd82b4fb59;hpb=e51d4e8f1aaeaeba9d2527f7469582adba886a02;ds=sidebyside
diff git a/content.mdwn b/content.mdwn
index ab681318..84d34856 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 Plexytopics/week6_plexy]]
+
* Functional Programming
* [[Introductiontopics/week1 kapulet intro]]
@@ 14,16 +16,21 @@ week in which they were introduced.
* [["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 `()`
+ * [[Unit and its usefulnesstopics/week3 unit]]
* More tips on using Scheme
+ * Types in OCaml and Haskell (will be posted someday)
+ * Practical advice for working with OCaml and/or Haskell (will be posted someday)
+ * [[Kaplan on Plexytopics/week6_plexy]] and the Maybe type
+ * Untyped lambda evaluator ([[in browsercode/lambda_evaluator]]) (for home)
* Order, "static versus dynamic"
 * [[Order in programming languages and natural languagetopics/week1 order]]
 * Reduction Strategies and Normal Forms in the Lambda Calculus
 * Usefulness of `()`
+ * [[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 evaluator ([[for hometopics/week7_combinatory_evaluator]])
* The Lambda Calculus
+* The Untyped Lambda Calculus
* [[Introduction to the Lambda Calculustopics/week2 lambda intro]]
* [[Advanced notes on the Lambda Calculustopics/week2 lambda advanced]]
@@ 34,11 +41,28 @@ week in which they were introduced.
* [[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
+ * [[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]]
+ * Untyped lambda evaluator ([[in browsercode/lambda_evaluator]]) (for home)
+
+* Combinatory logic
+
+ * [[Introductiontopics/week3 combinatory logic]]
+ * Combinatory evaluator ([[for hometopics/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 someday)
+ * see also Monads links, below
+* Monads
+ * [[Introducing Monadstopics/week7_introducing_monads]]
+ * [[Safe division with monadstopics/week8_safe_division_with_monads]]
* [[Combinatory Logictopics/week3 combinatory logic]]
## Topics by week ##
@@ 58,17 +82,50 @@ 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]]
+* [[Homework for week 2exercises/assignment2]] ([[Answersexercises/assignment2_answers]])
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.*

* [[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 will discuss some other list encodings)
+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 Forms
* Usefulness of `()`
+* [[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]]
+* [[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]] ([[Answersexercises/assignment4_answers]])
+
+Week 5:
+
+* [[Simplytyped lambda calculustopics/week5 simply typed]]
+* [[System Ftopics/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 6exercises/assignment5]] ([[Answersexercises/assignment5_answers]])
+
+
+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]]"
+
+Week 7:
+
+* [[Combinatory evaluatortopics/week7_combinatory_evaluator]]
+* Untyped lambda evaluator (will be posted soon)
+* [[Introducing Monadstopics/week7_introducing_monads]] (updated Mon 23 Mar)
+* [[Homework for week 7exercises/assignment7]]
+
+Week 8:
+
+* [[Safe division with monadstopics/week8_safe_division_with_monads]]
+