diff options
| author | dos-reis <gdr@axiomatics.org> | 2013-05-17 05:44:26 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2013-05-17 05:44:26 +0000 |
| commit | 1a4d9fc1eef3c6ac261907a42a1d6e0cf0490dfc (patch) | |
| tree | a985840fc345ec3bc1b4d723881b767f9fc85eee /src/algebra/table.spad.pamphlet | |
| parent | c485556490b352a6e28436bbded564c1b10e348f (diff) | |
| download | open-axiom-1a4d9fc1eef3c6ac261907a42a1d6e0cf0490dfc.tar.gz | |
* algebra/aggcat.spad.pamphlet (TableAggregate): Now extend
FiniteAggregate Record(key:Key,entry:Entry).
* algebra/files.spad.pamphlet (KeyedAccessFile): Remove
finiteAggregate attribute.
* algebra/table.spad.pamphlet (HashTable): Likewise.
(InnerTable): Likewise.
(Table): Likewise.
Diffstat (limited to 'src/algebra/table.spad.pamphlet')
| -rw-r--r-- | src/algebra/table.spad.pamphlet | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/algebra/table.spad.pamphlet b/src/algebra/table.spad.pamphlet index 22984b89..dc650485 100644 --- a/src/algebra/table.spad.pamphlet +++ b/src/algebra/table.spad.pamphlet @@ -31,9 +31,7 @@ HashTable(Key, Entry, hashfn): Exports == Implementation where Key, Entry: SetCategory hashfn: String -- Union("EQ", "EQL", "EQUAL", "UEQUAL", "CVEC", "ID") - Exports ==> TableAggregate(Key, Entry) with - finiteAggregate - + Exports ==> TableAggregate(Key, Entry) Implementation ==> add import tableValue: (%,Key) -> Entry from Foreign Builtin import tableLength: % -> NonNegativeInteger from Foreign Builtin @@ -80,10 +78,8 @@ HashTable(Key, Entry, hashfn): Exports == Implementation where ++ for the implementation of \spadtype{Table}. InnerTable(Key: SetCategory, Entry: SetCategory, addDom):Exports == Implementation where - addDom : TableAggregate(Key, Entry) with - finiteAggregate - Exports ==> TableAggregate(Key, Entry) with - finiteAggregate + addDom : TableAggregate(Key, Entry) + Exports ==> TableAggregate(Key, Entry) Implementation ==> addDom @ @@ -108,9 +104,7 @@ InnerTable(Key: SetCategory, Entry: SetCategory, addDom):Exports == Implementati ++ \spadtype{AssociationList} Table(Key: SetCategory, Entry: SetCategory):Exports == Implementation where - Exports ==> TableAggregate(Key, Entry) with - finiteAggregate - + Exports ==> TableAggregate(Key, Entry) Implementation ==> InnerTable(Key, Entry, if hashable(Key)$Lisp then HashTable(Key, Entry, "EQUAL") else AssociationList(Key, Entry)) |