week3 evaluator fix

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

diff --git a/assignment_3_evaluator.mdwn b/assignment_3_evaluator.mdwn
index 4ffaaa1..7a453e6 100644 (file)
--- a/assignment_3_evaluator.mdwn
+++ b/assignment_3_evaluator.mdwn
@@ -1,6 +1,5 @@
 Here are the definitions pre-loaded for working on assignment 3:
 
 Here are the definitions pre-loaded for working on assignment 3:
 

-<pre>

 <textarea id="INPUT" style="border: 2px solid black;
 color: black; font-family: monospace; height: 3in;
 overflow: auto; padding: 0.5em; width: 100%;">
 <textarea id="INPUT" style="border: 2px solid black;
 color: black; font-family: monospace; height: 3in;
 overflow: auto; padding: 0.5em; width: 100%;">


@@ -16,10 +15,10 @@ let isempty = \x. x fst 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
 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


@@ -27,12 +26,12 @@ let mul = \m n s. m (n s) 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
 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


@@ -40,10 +39,9 @@ let isNil = isempty in
 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>

-</pre>

 <input id="PARSE" value="Normalize" type="button">
 <input id="ETA" type="checkbox">do eta-reductions too
 <noscript><p>You may not see it because you have JavaScript turned off. Uffff!</p></noscript>
 <input id="PARSE" value="Normalize" type="button">
 <input id="ETA" type="checkbox">do eta-reductions too
 <noscript><p>You may not see it because you have JavaScript turned off. Uffff!</p></noscript>