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/pattern.spad.pamphlet | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/algebra/pattern.spad.pamphlet') diff --git a/src/algebra/pattern.spad.pamphlet b/src/algebra/pattern.spad.pamphlet index f3368758..254ed1f3 100644 --- a/src/algebra/pattern.spad.pamphlet +++ b/src/algebra/pattern.spad.pamphlet @@ -195,7 +195,7 @@ Pattern(R:SetCategory): Exports == Implementation where generic? p == symbol? p and bitSet?(p.pat.sym.tag, SYM_GENERIC) multiple? p == symbol? p and bitSet?(p.pat.sym.tag,SYM_MULTIPLE) optional? p == symbol? p and bitSet?(p.pat.sym.tag,SYM_OPTIONAL) - bitSet?(a, b) == And(a, b) ~= 0 + bitSet?(a, b) == (a /\ b) ~= 0 coerce(p:%):O == PAT2O(p.pat) p1:% ** p2:% == taggedElt(PAT_EXPT, [p1, p2]) LPAT2O(f, l) == reduce(f, [x::O for x in l])$List(O) @@ -377,7 +377,7 @@ Pattern(R:SetCategory): Exports == Implementation where c? => [0, t, empty(), empty()] mlt := (m? => SYM_MULTIPLE; 0) opt := (o? => SYM_OPTIONAL; 0) - [Or(Or(SYM_GENERIC, mlt), opt), t, empty(), empty()] + [(SYM_GENERIC \/ mlt) \/ opt, t, empty(), empty()] patternVariable(sy, c?, o?, m?) == rsy := mkrsy(sy, c?, o?, m?) -- cgit v1.2.3