From ecd77af5ce74ac002bd6550bed79eae5a3704c35 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Thu, 10 Nov 2011 10:32:38 +0000 Subject: * algebra/boolean.spad.pamphlet (IndexedBits) [Not, Or, And]: Remove. Implement ~. \/, and /\ instead. * algebra/si.spad.pamphlet (SingleInteger): Likewise. * algebra/pattern.spad.pamphlet (Pattern): Adjust. * algebra/string.spad.pamphlet (CharacterClass): Likewise. --- src/algebra/si.spad.pamphlet | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/algebra/si.spad.pamphlet') diff --git a/src/algebra/si.spad.pamphlet b/src/algebra/si.spad.pamphlet index 7b58a44f..4e3524b4 100644 --- a/src/algebra/si.spad.pamphlet +++ b/src/algebra/si.spad.pamphlet @@ -195,15 +195,6 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,BooleanLogic) with xor: (%, %) -> % ++ xor(n,m) returns the bit-by-bit logical {\em xor} of ++ the single integers n and m. - Not : % -> % - ++ Not(n) returns the bit-by-bit logical {\em not} of the single integer n. - And : (%,%) -> % - ++ And(n,m) returns the bit-by-bit logical {\em and} of - ++ the single integers n and m. - Or : (%,%) -> % - ++ Or(n,m) returns the bit-by-bit logical {\em or} of - ++ the single integers n and m. - == SubDomain(Integer, %ismall?(#1)$Foreign(Builtin)) add import %icst0: % from Foreign Builtin @@ -251,10 +242,7 @@ SingleInteger(): Join(IntegerNumberSystem,OrderedFinite,BooleanLogic) with not(x) == %bitnot x x /\ y == %bitand(x,y) x \/ y == %bitior(x,y) - Not(x) == %bitnot x - And(x,y) == %bitand(x,y) x and y == %bitand(x,y) - Or(x,y) == %bitior(x,y) x or y == %bitior(x,y) xor(x,y) == %bitxor(x,y) x < y == %ilt(x,y) -- cgit v1.2.3