Commit daab755

committed

+signed ADD

1 parent 21c7594 commit daab755Copy full SHA for daab755

File tree

+27

-2

lines changed

+27

-2

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@`
`12`	`12`	`NOT = lambda a: a(FALSE)(TRUE)`
`13`	`13`
`14`	`14`	`# additional boolean operations`
`15`		`-XOR = lambda a: lambda b: a(b(FALSE)(TRUE))(b(TRUE)(FALSE))`
	`15`	`+XOR = lambda a: lambda b: a(b(FALSE)(TRUE))(b(TRUE)(FALSE))`
	`16`	`+XNOR = lambda a: lambda b: NOT(XOR(a)(b))`
`16`	`17`
`17`	`18`	`# arithmetic`
`18`	`19`	`INC = lambda n: lambda a: lambda b: a(n(a)(b))`
`@@ -21,6 +22,7 @@`
`21`	`22`	`DEC = lambda n: lambda f: lambda x: n(lambda g: lambda h: h(g(f)))(lambda _: x)(IDENTITY)`
`22`	`23`	`SUB = lambda a: lambda b: b(DEC)(a)`
`23`	`24`	`POW = lambda a: lambda b: b(a)`
	`25`	`+DIFF = lambda a: lambda b: ADD(SUB(a)(b))(SUB(b)(a))`
`24`	`26`
`25`	`27`	`# numbers`
`26`	`28`	`ZERO = FALSE`
`@@ -60,6 +62,15 @@`
`60`	`62`	`ISPOS = lambda p: CAR(p)`
`61`	`63`	`ISNEG = lambda p: NOT(CAR(p))`
`62`	`64`	`UNSIGN = lambda p: CDR(p)`
	`65`	`+SADD = lambda a: lambda b: (`
	`66`	`+ XNOR(CAR(a))(CAR(b))`
	`67`	`+ (CONS(CAR(a))(ADD(CDR(a))(CDR(b)))) # same sign`
	`68`	`+ (`
	`69`	`+ CONS # opposite sign`
	`70`	`+ (XOR(CAR(a))(LTE(CDR(a))(CDR(b)))) # calculate sign`
	`71`	`+ (DIFF(CDR(a))(CDR(b))) # calculate value`
	`72`	`+ )`
	`73`	`+)`
`63`	`74`
`64`	`75`	`# recursive`
`65`	`76`	`FAC = Y(`

Lines changed: 15 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`from lambdas import ADD, INC, MUL, POW, DEC, SUB, DIV`
`8`	`8`	`from lambdas import ISZERO, GTE, LTE, GT, LT, EQ`
`9`	`9`	`from lambdas import CONS, CAR, CDR`
`10`		`-from lambdas import SIGN, UNSIGN, NEG, ISPOS, ISNEG`
	`10`	`+from lambdas import SIGN, UNSIGN, NEG, ISPOS, ISNEG, SADD`
`11`	`11`	`from lambdas import FAC, FIB`
`12`	`12`	`from lambdas import make_number`
`13`	`13`
`@@ -216,5 +216,19 @@ def test_sign_checks():`
`216`	`216`	`assert ISNEG(n) is TRUE`
`217`	`217`
`218`	`218`
	`219`	`+@pytest.mark.parametrize('lsign, left, rsign, right, expsign, expvalue', [`
	`220`	`+ (TRUE, ONE, TRUE, ONE, TRUE, 2), # 1 + 1 = 2`
	`221`	`+ (TRUE, ONE, FALSE, TWO, FALSE, 1), # 1 - 2 = -1`
	`222`	`+ (FALSE, TWO, TRUE, ONE, FALSE, 1), # -2 + 1 = -1`
	`223`	`+ (FALSE, TWO, FALSE, ONE, FALSE, 3), # -2 - 1 = -3`
	`224`	`+])`
	`225`	`+def test_sadd(lsign, left, rsign, right, expsign, expvalue):`
	`226`	`+ lv = CONS(lsign)(left)`
	`227`	`+ rv = CONS(rsign)(right)`
	`228`	`+ res = SADD(lv)(rv)`
	`229`	`+ assert CAR(res) is expsign`
	`230`	`+ assert make_number(CDR(res)) == expvalue`
	`231`	`+`
	`232`	`+`
`219`	`233`	`if __name__ == '__main__':`
`220`	`234`	`pytest.main()`

Comments

(0)