X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=blobdiff_plain;f=week1.mdwn;h=0122ed9bcc774f3252284ee649498aae6e353fe6;hp=c55625f1102b77fbcc2343cce36282d6f67f257d;hb=08ddabea126b05d49bd952365760d322bcae0304;hpb=24d747bc81ae09cb3cabe41164220ccfa4b06293

diff --git a/week1.mdwn b/week1.mdwn
index c55625f1..0122ed9b 100644
--- a/week1.mdwn
+++ b/week1.mdwn
@@ -99,6 +99,30 @@ For the most part, these uses are only loosely connected to each other. We'll te
 Map
 ===
 
+<table>
+<tr>
+<td>Scheme (functional part)</td>
+<td>OCaml (functional part)</td>
+<td>C, Java, Pasval<br>
+Scheme (imperative part)<br>
+OCaml (imperative part)</td>
+<tr>
+<td>lambda calculus<br>
+combinatorial logic</td>
+<tr>
+<td colspan=3>--------- Turing complete ---------</td>
+<tr>
+<td>&nbsp;
+<td>more advanced type systems, such as polymorphic types
+<td>&nbsp;
+<tr>
+<td>&nbsp;
+<td>simply-typed lambda calculus (what linguists mostly use)
+<td>&nbsp;
+</table>
+
+
+
 
 Rosetta Stone
 =============
@@ -323,7 +347,11 @@ Booleans and pairs
 Our definition of these is reviewed in [[Assignment1]].
 
 
-It's possible to do the assignment without using a Scheme interpreter, however you should take this opportunity to [get the software on your computer](How to get the programming languages running on your computer), and [get started learning about Scheme](learning_scheme).
+It's possible to do the assignment without using a Scheme interpreter, however
+you should take this opportunity to [get Scheme installed on your
+computer](/how_to_get_the_programming_languages_running_on_your_computer), and
+[get started learning Scheme](/learning_scheme). It will help you test out
+proposed answers to the assignment.