week4 tweaking

[lambda.git] / week1.mdwn

diff --git a/week1.mdwn b/week1.mdwn
index 5299e29..b1df1ad 100644 (file)
--- a/week1.mdwn
+++ b/week1.mdwn
@@ -14,6 +14,7 @@ See also:
 
 *      [Chris Barker's Lambda Tutorial](http://homepages.nyu.edu/~cb125/Lambda)
 *      [Lambda Animator](http://thyer.name/lambda-animator/)
 
 *      [Chris Barker's Lambda Tutorial](http://homepages.nyu.edu/~cb125/Lambda)
 *      [Lambda Animator](http://thyer.name/lambda-animator/)

+*      [Penn lambda calculator](http://www.ling.upenn.edu/lambda/) Pedagogical software developed by Lucas Champollion, Josh Tauberer and Maribel Romero.  Linguistically oriented. 

 *      MORE
 
 The lambda calculus we'll be focusing on for the first part of the course has no types. (Some prefer to say it instead has a single type---but if you say that, you have to say that functions from this type to this type also belong to this type. Which is weird.)
 *      MORE
 
 The lambda calculus we'll be focusing on for the first part of the course has no types. (Some prefer to say it instead has a single type---but if you say that, you have to say that functions from this type to this type also belong to this type. Which is weird.)


@@ -36,7 +37,6 @@ We'll tend to write <code>(&lambda;a M)</code> as just `(\a M)`, so we don't hav
 <strong>Application</strong>: <code>(M N)</code>
 </blockquote>
 
 <strong>Application</strong>: <code>(M N)</code>
 </blockquote>
 

-Some authors reserve the term "term" for just variables and abstracts. We'll probably just say "term" and "expression" indiscriminately for expressions of any of these three forms.

 
 Examples of expressions:
 
 
 Examples of expressions:
 


@@ -130,7 +130,7 @@ because here the second occurrence of `y` is no longer free.
 
 There is plenty of discussion of this, and the fine points of how substitution works, in Hankin and in various of the tutorials we've linked to about the lambda calculus. We expect you have a good intuitive understanding of what to do already, though, even if you're not able to articulate it rigorously.
 
 
 There is plenty of discussion of this, and the fine points of how substitution works, in Hankin and in various of the tutorials we've linked to about the lambda calculus. We expect you have a good intuitive understanding of what to do already, though, even if you're not able to articulate it rigorously.
 

-*      MORE
+*      [More discussion in week 2 notes](/week2/#index1h1)

 
 
 Shorthand
 
 
 Shorthand


@@ -312,7 +312,7 @@ Finally, you'll see the term **dynamic** used in a variety of ways in the litera
 
 *      dynamic versus static typing
 
 
 *      dynamic versus static typing
 

-*      dynamic versus lexical scoping
+*      dynamic versus lexical [[!wikipedia Scope (programming) desc="scoping"]]

 
 *      dynamic versus static control operators
 
 
 *      dynamic versus static control operators
 


@@ -327,7 +327,7 @@ To read further about the relation between declarative or functional programming
 *      [[!wikipedia Purely functional]]
 *      [[!wikipedia Referential transparency (computer science)]]
 *      [[!wikipedia Imperative programming]]
 *      [[!wikipedia Purely functional]]
 *      [[!wikipedia Referential transparency (computer science)]]
 *      [[!wikipedia Imperative programming]]

-
+*      [[!wikipedia Side effect (computer science) desc="Side effects"]]

 
 
 Map
 
 
 Map


@@ -356,6 +356,7 @@ combinatorial logic</td>
 </table>
 
 
 </table>
 
 

+

 Rosetta Stone
 =============
 
 Rosetta Stone
 =============