From: Tomas Musil Date: Wed, 3 Dec 2014 15:21:10 +0000 (+0100) Subject: remove unnecessary brackets X-Git-Url: http://git.tomasm.cz/fp.git/commitdiff_plain/1e130750a3014baa6328e323ef877e7f7839d925?hp=494e6afee1f1c583a880fca4e1f234de6823271a remove unnecessary brackets --- diff --git a/Arithmetic.lc b/Arithmetic.lc index 6851970..f3cd19a 100644 --- a/Arithmetic.lc +++ b/Arithmetic.lc @@ -1,13 +1,13 @@ import Logic -Succ=\n f x.(f ((n f) x)) +Succ=\n f x.f (n f x) Zero=\f x.x -One=(Succ Zero) -Two=(Succ One) -Three=(Succ Two) -Add=\n m f x.((n f) ((m f) x)) -Mult=\n m f.(n (m f)) -IsZero=\n x y.((n \z.y) x) -((Add Two) Three) -((Mult Two) Three) -(PrintBool (IsZero Zero)) -(PrintBool (IsZero ((Add One) Two))) +One=Succ Zero +Two=Succ One +Three=Succ Two +Add=\n m f x.n f (m f x) +Mult=\n m f.n (m f) +IsZero=\n x y.n (\z.y) x +Add Two Three +Mult Two Three +PrintBool (IsZero Zero) +PrintBool (IsZero (Add One Two)) diff --git a/Logic.lc b/Logic.lc index 8193a34..7ed9ed5 100644 --- a/Logic.lc +++ b/Logic.lc @@ -1,5 +1,5 @@ True=\x y.x False=\x y.y -And=\a b.((a b) False) +And=\a b.a b False If=\x.x -PrintBool=\x.(((If x) TRUE) FALSE) +PrintBool=\x.If x TRUE FALSE