@@ -10,3 +10,33 @@ cell(:LexicalBlock) <- = method(other, if(cell?(:activatable) && activatable, fnx(arg, cell(:outsideSelf) call(cell(:other) call(arg))), fn(arg, cell(:outsideSelf) call(cell(:other) call(arg))))) + +cell(:LexicalBlock) & = method(other, + outsideSelf = self + if(cell?(:activatable) && activatable, + fnx(arg, + res1 = cell(:outsideSelf) call(arg) + res2 = cell(:other) call(arg) + res1 && res2), + fn(arg, + res1 = cell(:outsideSelf) call(arg) + res2 = cell(:other) call(arg) + res1 && res2))) + +cell(:LexicalBlock) | = method(other, + outsideSelf = self + if(cell?(:activatable) && activatable, + fnx(arg, + res1 = cell(:outsideSelf) call(arg) + res2 = cell(:other) call(arg) + res1 || res2), + fn(arg, + res1 = cell(:outsideSelf) call(arg) + res2 = cell(:other) call(arg) + res1 || res2))) + +cell(:LexicalBlock) complement = method( + outsideSelf = self + if(cell?(:activatable) && activatable, + fnx(arg, !(cell(:outsideSelf) call(arg))), + fn(arg, !(cell(:outsideSelf) call(arg))))) src/builtin/H10_lexicalBlock.ik @@ -190,6 +190,61 @@ describe(LexicalBlock, ) ) + describe("&", + it("should take a block and return a new one that combines them using boolean logic", + x = fn(a, a > 5) + y = fn(a, a < 10) + res = x & y + res call(0) should be false + res call(1) should be false + res call(2) should be false + res call(3) should be false + res call(4) should be false + res call(5) should be false + res call(6) should be true + res call(7) should be true + res call(8) should be true + res call(9) should be true + res call(10) should be false + res call(11) should be false + res call(12) should be false + ) + ) + + describe("|", + it("should take a block and return a new one that combines them using boolean logic", + x = fn(a, a < 5) + y = fn(a, a > 10) + res = x | y + res call(0) should be true + res call(1) should be true + res call(2) should be true + res call(3) should be true + res call(4) should be true + res call(5) should be false + res call(6) should be false + res call(7) should be false + res call(8) should be false + res call(9) should be false + res call(10) should be false + res call(11) should be true + res call(12) should be true + ) + ) + + describe("complement", + it("should return a new block that is the complement of the original one", + x = fn(a, a < 5) + res = x complement + res call(0) should be false + res call(4) should be false + res call(5) should be true + res call(6) should be true + res call(7) should be true + res call(8) should be true + ) + ) + it("should report arity failures with regular arguments", noargs = fnx(nil) onearg = fnx(x, nil) test/fn_spec.ik docs/functionali_composition b5daff4df24fce4c522fb88e24fe7f261298c52c Ola Bini ola.bini@gmail.com http://github.com/olabini/ioke/commit/06dccbe0ca062bc286f674774ea49166e33a2f2c 06dccbe0ca062bc286f674774ea49166e33a2f2c 2009-11-05T08:48:06-08:00 2009-11-05T08:48:06-08:00 Make functional composition easier 98211d6335d7ed7d0f6575a292efdeb2ccb79a8b Ola Bini ola.bini@gmail.com