index 2460087..cabcc71 100644 (file)
@@ -5,7 +5,7 @@ week in which they were introduced.

## Topics by content ##

## Topics by content ##

-* [[Introduction to functional programming|topics/week1_kapulet_intro]]
+* [[Introduction to functional programming|topics/week1 kapulet intro]]

* [[Order: static versus dynamic|topics/week1 order]]

* [[Order: static versus dynamic|topics/week1 order]]

@@ -15,19 +15,25 @@ Week 1:

* [[Order in programming languages and natural language|topics/week1 order]]
This discussion considers conjunction in a language that recognized presupposition failure.

* [[Order in programming languages and natural language|topics/week1 order]]
This discussion considers conjunction in a language that recognized presupposition failure.
-* [[Introduction to functional programming|topics/week1_kapulet_intro]]
+* [[Introduction to functional programming|topics/week1 kapulet intro]]
Basics of functional programming: `let`, `case`, pattern matching, and
recursion.  Definitions of factorial.
Basics of functional programming: `let`, `case`, pattern matching, and
recursion.  Definitions of factorial.
* [[Homework for week 1|exercises/assignment1]]

Week 2:

* [[Homework for week 1|exercises/assignment1]]

Week 2:

-* [[Intro to the Lambda Calculus|topics/week2_lambda_intro]]
-* Encoding Booleans, Tuples, Lists, and Numbers (in progress)
-* Homework for week 2 (in progress)
+* [[Introduction to the Lambda Calculus|topics/week2 lambda intro]]
+* [[Encoding Booleans, Tuples, Lists, and Numbers|topics/week2 encodings]];
+* [[Homework for week 2|exercises/assignment2]]

+Week 3:
+
+* More on Lists
+Introduces list comprehensions, shows how to encode `tail` in the Lambda Calculus
+* Combinatorial Logic
+* Homework for week 3