From: Chris Barker <barker@kappa.(none)>
Date: Mon, 4 Oct 2010 00:32:09 +0000 (-0400)
Subject: edits
X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=2a61846bbb48e29385fc7639a47c76f82d70bb18

edits
---

diff --git a/assignment_3_evaluator.mdwn b/assignment_3_evaluator.mdwn
index 27cdd9bb..eb3c18b6 100644
--- a/assignment_3_evaluator.mdwn
+++ b/assignment_3_evaluator.mdwn
@@ -1,27 +1,46 @@
 Here are the definitions pre-loaded for working on assignment 3:
 
 <textarea id="INPUT" style="border: 2px solid black; color: black; font-family: monospace; height: 3in; overflow: auto; padding: 0.5em; width: 100%;">
+; booleans
 let true = \x y. x in
 let false = \x y. y in
 let and = \l r. l (r true false) false in
-let makePair = \f s g. g f s in
-let fst = true in
-let snd = false in
-let nil = makePair true meh in
-let isNil = \x. x fst in
-let makeList = \h t. makePair false (makePair h t) in
-let head = \l. isNil l err (l snd fst) in
-let tail = \l. isNil l err (l snd snd) in
-let mylist = makeList 1 (makeList 2 (makeList 3 nil)) in
-let Y = \f. (\h. f (h h)) (\h. f (h h)) in
-let isZero = \n. n (\x. false) true in
+let or = \l r. l true r in
+let make_pair = \f s g. g f s in
+let get_fst = true in
+let get_snd = false in
+let empty = make_pair true junk in
+let isempty = \x. x get_fst in
+let make_list = \h t. make_pair false (make_pair h t) in
+let head = \l. isempty l err (l get_snd get_fst) in
+let tail = \l. isempty l err (l get_snd get_snd) in
+;
+; a list of numbers to experiment on
+let mylist = make_list 1 (make_list 2 (make_list 3 empty)) in
+;
+; church numerals
+let iszero = \n. n (\x. false) true in
 let succ = \n s z. s (n s z) in
-let mult = \m n s. m (n s) in
-let length = Y (\length l. isNil l 0 (succ (length (tail l)))) in
-let pred = \n. isZero n 0 (length (tail (n (\p. makeList meh p) nil))) in
-let leq = \m n. isZero(n pred m) in
+let mul = \m n s. m (n s) in
+let pred = (\shift n. n shift (make_pair 0 0) get_snd) (\p. p (\x y. make_pair (succ x) x))  in
+let leq = \m n. iszero(n pred m) in
 let eq = \m n. and (leq m n)(leq n m) in
 ;
+; a fixed-point combinator for defining recursive functions
+let Y = \f. (\h. f (h h)) (\h. f (h h)) in
+;
+let length = Y (\length l. isempty l 0 (succ (length (tail l)))) in
+;
+; synonyms
+let makePair = make_pair in
+let fst = get_fst in
+let snd = get_snd in
+let nil = empty in
+let isNil = isempty in
+let makeList = make_list in
+let isZero = iszero in
+let mult = mul in
+;
 let t1 = (make_list 1 empty) in
 let t2 = (make_list 2 empty) in
 let t3 = (make_list 3 empty) in