From: Jim Pryor Date: Wed, 15 Sep 2010 21:49:09 +0000 (-0400) Subject: Merge branch 'pryor' X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=1915897e1ad86830751b427f898b5512c1a3a05c;hp=d20d0076c870d6700c489ebda7c1c9df6d80df9d Merge branch 'pryor' --- diff --git a/week1.mdwn b/week1.mdwn index 0122ed9b..78a808b6 100644 --- a/week1.mdwn +++ b/week1.mdwn @@ -101,24 +101,24 @@ Map - - - + + - - + - -
Scheme (functional part)OCaml (functional part)C, Java, Pasval
+
Scheme (functional part)OCaml (functional part)C, Java, Pasval
Scheme (imperative part)
OCaml (imperative part)
lambda calculus
+
lambda calculus
combinatorial logic
--------- Turing complete --------------------------------- Turing complete ---------------------
  -more advanced type systems, such as polymorphic types -  +  +more advanced type systems, such as polymorphic types + 
  -simply-typed lambda calculus (what linguists mostly use) -  +  +simply-typed lambda calculus (what linguists mostly use) +