From: Chris Barker Date: Mon, 4 Oct 2010 00:37:14 +0000 (-0400) Subject: Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda X-Git-Url: http://lambda.jimpryor.net/git/gitweb.cgi?p=lambda.git;a=commitdiff_plain;h=bea2932d9f91273c294112b7c896229fa7398158;hp=5a235579e3764fed888bdbd8465c373634c63984 Merge branch 'master' of ssh://server.philosophy.fas.nyu.edu/Users/lambda/lambda --- diff --git a/assignment_3_evaluator.mdwn b/assignment_3_evaluator.mdwn index 28693f43..f4f5fb92 100644 --- a/assignment_3_evaluator.mdwn +++ b/assignment_3_evaluator.mdwn @@ -42,22 +42,22 @@ 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 -let t12 = (make_list t1 (make_list t2 empty)) in -let t23 = (make_list t2 (make_list t3 empty)) in -let ta = (make_list t1 t23) in -let tb = (make_list t12 t3) in -let tc = (make_list t1 (make_list t23 empty)) in +let t1 = (make\_list 1 empty) in +let t2 = (make\_list 2 empty) in +let t3 = (make\_list 3 empty) in +let t12 = (make\_list t1 (make\_list t2 empty)) in +let t23 = (make\_list t2 (make\_list t3 empty)) in +let ta = (make\_list t1 t23) in +let tb = (make\_list t12 t3) in +let tc = (make\_list t1 (make\_list t23 empty)) in ; -;sum-leaves t1 ~~> 1 -;sum-leaves t2 ~~> 2 -;sum-leaves t3 ~~> 3 -;sum-leaves t12 ~~> 3 -;sum-leaves t23 ~~> 5 -;sum-leaves ta ~~> 6 -;sum-leaves tb ~~> 6 +;sum-leaves t1 ; ~~> 1 +;sum-leaves t2 ; ~~> 2 +;sum-leaves t3 ; ~~> 3 +;sum-leaves t12 ; ~~> 3 +;sum-leaves t23 ; ~~> 5 +;sum-leaves ta ; ~~> 6 +;sum-leaves tb ; ~~> 6 ; length (tail mylist)