projects
/
lambda.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed assignment3 pred
[lambda.git]
/
assignment_3_evaluator.mdwn
diff --git
a/assignment_3_evaluator.mdwn
b/assignment_3_evaluator.mdwn
index
496003d
..
c910064
100644
(file)
--- a/
assignment_3_evaluator.mdwn
+++ b/
assignment_3_evaluator.mdwn
@@
-21,7
+21,7
@@
let mylist = make\_list 1 (make\_list 2 (make\_list 3 empty)) in
let iszero = \n. n (\x. false) true in
let succ = \n s z. s (n s z) in
let mul = \m n s. m (n s) in
let iszero = \n. n (\x. false) true in
let succ = \n s z. s (n s z) in
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 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
;
let leq = \m n. iszero(n pred m) in
let eq = \m n. and (leq m n)(leq n m) in
;