X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=content.mdwn;h=1178c43d15283cf6ca3a36d07ea9917fa9beeab8;hp=52945505795cdeb92abb34334f8c508f08ef38ae;hb=d83905df72d2387c41cf8df3c83b9853e102e1cb;hpb=eccdc0a13b19857fb310918dc48f290a44d18e54
diff --git a/content.mdwn b/content.mdwn
index 52945505..1178c43d 100644
--- a/content.mdwn
+++ b/content.mdwn
@@ -5,20 +5,33 @@ week in which they were introduced.
## Topics by content ##
+* [[What is computation?|topics/week3_what_is_computation]]
+
+* [[Kaplan on Plexy|topics/week6_plexy]]
+
* Functional Programming
* [[Introduction|topics/week1 kapulet intro]]
* [[Week 1 Advanced notes|topics/week1 kapulet advanced]]
* [["Rosetta Stone" page #1 for Kaupulet, Scheme, OCaml, Haskell|rosetta1]]
* Offsite links for help on [[learning Scheme]], [[OCaml|learning OCaml]], and [[Haskell|learning Haskell]]
- * List Comprehensions
+ * [[List Comprehensions|topics/week3 lists#comprehensions]]
+ * [[Unit and its usefulness|topics/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 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
+ * [[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 Lambda Calculus
+* The Untyped Lambda Calculus
* [[Introduction to the Lambda Calculus|topics/week2 lambda intro]]
* [[Advanced notes on the Lambda Calculus|topics/week2 lambda advanced]]
@@ -27,11 +40,25 @@ week in which they were introduced.
* [[Tuples|topics/week2 encodings#tuples]]
* [[Lists|topics/week2 encodings#lists]], v1 (as right-folds)
* [[Numbers|topics/week2 encodings#numbers]], v1 ("Church's encoding")
- * How to get the `tail` of v1 lists?
- * Reduction Strategies and Normal Forms
+ * [[Arithmetic with Church numbers|topics/week3_church_arithmetic]]
+ * [[How to get the `tail` of v1 lists?|topics/week3 lists#tails]]
+ * [[Some other list encodings|topics/week3 lists#other-lists]]
+ * [[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
+ * [[Introduction|topics/week3 combinatory logic]]
+ * [[Combinatory evaluator|topics/week7_combinatory_evaluator]]
-* Combinatorial Logic
+* 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 ##
@@ -51,17 +78,47 @@ Week 2:
* [[Introduction to the Lambda Calculus|topics/week2 lambda intro]]
* [[Advanced notes on the Lambda Calculus|topics/week2 lambda advanced]]
* [[Encoding Booleans, Tuples, Lists, and Numbers|topics/week2 encodings]]
-* [[Homework for week 2|exercises/assignment2]]
+* [[Homework for week 2|exercises/assignment2]] ([[Answers|exercises/assignment2_answers]])
Week 3:
-* More on Lists
-Introduces list comprehensions, discusses how to get the `tail` of lists in the Lambda Calculus
-* Combinatorial Logic
-* Reduction Strategies and Normal Forms
-* 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 numbers|topics/week3_church_arithmetic]]
+* [[More on Lists|topics/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 Forms|topics/week3_evaluation_order]] (posted on Monday 23 Feb)
+* [[Unit and its usefulness|topics/week3 unit]]
+* [[Combinatory Logic|topics/week3 combinatory logic]]
+* [[Homework for week 3|exercises/assignment3]] ([[Answers|exercises/assignment3_answers]])
+
+Week 4:
+
+* [[Fixed point combinators|topics/week4_fixed_point_combinators]]
+* [[More about fixed point combinators|topics/week4_more_about_fixed_point_combinators]]
+* Towards types (in progress)
+* [[Homework for week 4|exercises/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 re-read the pages when the expanded versions are posted.
+
+* [[Simply-typed lambda calculus|topics/week5 simply typed]]
+* [[System F|topics/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 6|exercises/assignment5]]
+Week 6:
+* [[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)
+* Michael Rieppel, "[[Being Something: Properties and Predicative Quantification|readings/rieppel-beingsthg.pdf]]"
-*More coming, please wait...*
+Week 7:
+* [[Combinatory evaluator|topics/week7_combinatory_evaluator]]
+* Interpreter for Lambda terms
+* [[Introducing Monads|topics/week7_introducing_monads]]