week3 evaluator fix

Signed-off-by: Jim Pryor <profjim@jimpryor.net>

diff --git a/assignment_3_evaluator.mdwn b/assignment_3_evaluator.mdwn
index df5e1c2..e357bb5 100644 (file)
--- a/assignment_3_evaluator.mdwn
+++ b/assignment_3_evaluator.mdwn
@@ -1,7 +1,6 @@
 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%;">
 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
        ; booleans
        let true = \x y. x in
        let false = \x y. y in


@@ -14,10 +13,10 @@ Here are the definitions pre-loaded for working on assignment 3:
        let make_list = \h t. make_pair false (make_pair h t) in
        let head = \l. isempty l err (l snd fst) in
        let tail = \l. isempty l err (l snd snd) in
        let make_list = \h t. make_pair false (make_pair h t) in
        let head = \l. isempty l err (l snd fst) in
        let tail = \l. isempty l err (l snd snd) in

-
+       

        ; a list of numbers to experiment on
        let mylist = make_list 1 (make_list 2 (make_list 3 empty)) 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
        ; church numerals
        let iszero = \n. n (\x. false) true in
        let succ = \n s z. s (n s z) in


@@ -25,12 +24,12 @@ Here are the definitions pre-loaded for working on assignment 3:
        let pred = \n. iszero n 0 (length (tail (n (\p. make_list junk p) empty))) in
        let leq = \m n. iszero(n pred m) in
        let eq = \m n. and (leq m n)(leq n m) in
        let pred = \n. iszero n 0 (length (tail (n (\p. make_list junk p) empty))) 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
        ; 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
        let length = Y (\length l. isempty l 0 (succ (length (tail l)))) in

-
+       

        ; synonyms
        let makePair = make_pair in
        let nil = empty in
        ; synonyms
        let makePair = make_pair in
        let nil = empty in


@@ -38,8 +37,7 @@ Here are the definitions pre-loaded for working on assignment 3:
        let makeList = make_list in
        let isZero = iszero in
        let mult = mul in
        let makeList = make_list in
        let isZero = iszero in
        let mult = mul in

-
-
+       

        ;
        length (tail mylist)
 </textarea>
        ;
        length (tail mylist)
 </textarea>