diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/algebra/aggcat.spad.pamphlet | 8 | ||||
| -rw-r--r-- | src/algebra/attreg.spad.pamphlet | 3 | ||||
| -rw-r--r-- | src/algebra/stream.spad.pamphlet | 4 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/algebra/aggcat.spad.pamphlet b/src/algebra/aggcat.spad.pamphlet index c2c8a429..de3c92a9 100644 --- a/src/algebra/aggcat.spad.pamphlet +++ b/src/algebra/aggcat.spad.pamphlet @@ -36,8 +36,6 @@ import NonNegativeInteger ++ An aggregate can in principle ++ represent everything from a string of characters to abstract sets such ++ as "the set of x satisfying relation {\em r(x)}" -++ An attribute \spadatt{finiteAggregate} is used to assert that a domain -++ has a finite number of elements. Aggregate: Category == Type with eq?: (%,%) -> Boolean ++ eq?(u,v) tests if u and v are same objects. @@ -85,8 +83,6 @@ import Evalable ++ same type. ++ In the current system, all aggregates are homogeneous. ++ Two attributes characterize classes of aggregates. -++ Aggregates from domains with attribute \spadatt{finiteAggregate} -++ have a finite number of members. ++ Those with attribute \spadatt{shallowlyMutable} allow an element ++ to be modified or updated without changing its overall value. HomogeneousAggregate(S:Type): Category == Aggregate with @@ -559,7 +555,7 @@ DictionaryOperations(S:SetCategory): Category == add construct l == dictionary l dictionary() == empty() - if % has finiteAggregate then + if % has FiniteAggregate S then copy d == dictionary members d coerce(s:%):OutputForm == prefix("dictionary"@String :: OutputForm, @@ -1376,7 +1372,7 @@ BinaryRecursiveAggregate(S:Type):Category == RecursiveAggregate S with empty?(x) => empty?(y) empty?(y) => false value x = value y and left x = left y and right x = right y - if % has finiteAggregate then + if % has FiniteAggregate S then member?(x,u) == empty? u => false x = value u => true diff --git a/src/algebra/attreg.spad.pamphlet b/src/algebra/attreg.spad.pamphlet index 8fd926b0..b8853786 100644 --- a/src/algebra/attreg.spad.pamphlet +++ b/src/algebra/attreg.spad.pamphlet @@ -15,9 +15,6 @@ ++ This category exports the attributes in the AXIOM Library AttributeRegistry(): Category == with - finiteAggregate - ++ \spad{finiteAggregate} is true if it is an aggregate with a - ++ finite number of elements. commutative("*") ++ \spad{commutative("*")} is true if it has an operation ++ \spad{"*": (D,D) -> D} which is commutative. diff --git a/src/algebra/stream.spad.pamphlet b/src/algebra/stream.spad.pamphlet index b7fe4421..e6fc3f8b 100644 --- a/src/algebra/stream.spad.pamphlet +++ b/src/algebra/stream.spad.pamphlet @@ -162,7 +162,7 @@ LazyStreamAggregate(S:Type): Category == StreamAggregate(S) with if odd? i then x := rst x eq?(x,y) => return true --- following ops count and member? are only exported if $ has finiteAggregate +-- following ops count and member? are only exported if $ has FiniteAggregate S -- count(f:S -> Boolean,x:%) == -- -- error if stream is not finite @@ -233,7 +233,7 @@ LazyStreamAggregate(S:Type): Category == StreamAggregate(S) with --% IXAGG functions --- following assumes % has finiteAggregate and S has SetCategory +-- following assumes % has FiniteAggregate S and S has SetCategory -- entry?(s,x) == -- -- error message only when x is a stream with lazy -- -- evaluation and 's' is not among the stream elements |