diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-05-13 14:47:31 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-05-13 14:47:31 +0000 |
| commit | 8f2bad3b8cea97189a9e842ed0f78559aa4be795 (patch) | |
| tree | f355c7ba0711e9cf0e243eecb0be62faf1468347 /src/interp/topics.boot | |
| parent | 348cdc0022cf9aaf0fc5491ed8d899a7284e07ec (diff) | |
| download | open-axiom-8f2bad3b8cea97189a9e842ed0f78559aa4be795.tar.gz | |
* interp/sys-utility.boot (hashTable): Define.
* interp/word.boot: Use it.
* interp/topics.boot: Likewise.
* interp/sys-driver.boot: Likewise.
* interp/slam.boot: Likewise.
* interp/setvars.boot: Likewise.
* interp/scan.boot: Likewise.
* interp/nrunopt.boot: Likewise.
* interp/nruncomp.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/mark.boot: Likewise.
* interp/interop.boot: Likewise.
* interp/i-toplev.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/htcheck.boot: Likewise.
* interp/guess.boot: Likewise.
* interp/g-util.boot: Likewise.
* interp/database.boot: Likewise.
* interp/compress.boot: Likewise.
* interp/clam.boot: Likewise.
* interp/cattable.boot: Likewise.
* interp/c-util.boot: Likewise.
* interp/br-op2.boot: Likewise.
* interp/br-op1.boot: Likewise.
* interp/br-con.boot: Likewise.
* interp/sys-globals.boot ($ConstructorCache): Move elsewhere.
($instantRecord): Likewise.
* algebra/newdata.spad.pamphlet: Use EQUAL as equality function
for hash table.
* algebra/table.spad.pamphlet: Call hashTable builtin function
instead of MAKE-HASHTABLE.
Diffstat (limited to 'src/interp/topics.boot')
| -rw-r--r-- | src/interp/topics.boot | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/topics.boot b/src/interp/topics.boot index f3959be9..995120ee 100644 --- a/src/interp/topics.boot +++ b/src/interp/topics.boot @@ -64,7 +64,7 @@ $topicSynonyms := '( $groupAssoc := '((extended . 1) (basic . 2) (hidden . 4)) -$topicHash := MAKE_-HASHTABLE "ID" +$topicHash := hashTable 'EQ SETF(GETHASH("basic",$topicHash),2) SETF(GETHASH("algebraic",$topicHash),4) SETF(GETHASH("miscellaneous",$topicHash),13) @@ -85,11 +85,11 @@ SETF(GETHASH("trignometric",$topicHash),11) --======================================================================= --called at build-time before making DOCUMENTATION property mkTopicHashTable() == --given $groupAssoc = ((extended . 1)(basic . 2)(xx . 4)..) - $defaultsHash := MAKE_-HASHTABLE 'ID --keys are ops, value is list of topic names + $defaultsHash := hashTable 'EQ --keys are ops, value is list of topic names for [kind,:items] in $topicsDefaults repeat --$topicsDefaults is ((<topic> op ...) ..) for item in items repeat HPUT($defaultsHash,item,[kind,:HGET($defaultsHash,item)]) - $conTopicHash := MAKE_-HASHTABLE 'EQL --key is constructor name; value is + $conTopicHash := hashTable 'EQL --key is constructor name; value is instream := OPEN '"topics.data" while not EOFP instream repeat line := READLINE instream @@ -107,7 +107,7 @@ mkTopicHashTable() == --given $groupAssoc = ((extended . | lst := string2OpAlist line] alist => HPUT($conTopicHash,con,alist) --initialize table of topic classes - $topicHash := MAKE_-HASHTABLE 'ID --$topicHash has keys: topic and value: index + $topicHash := hashTable 'EQ --$topicHash has keys: topic and value: index for [x,:c] in $groupAssoc repeat HPUT($topicHash,x,c) $topicIndex := rest LAST $groupAssoc @@ -190,7 +190,7 @@ addTopic2Documentation(con,docAlist) == td con == $topicClasses := ASSOCRIGHT mySort [[HGET($topicHash,key),:key] for key in HKEYS $topicHash] - hash := MAKE_-HASHTABLE 'ID + hash := hashTable 'EQ tdAdd(con,hash) tdPrint hash @@ -212,7 +212,7 @@ topics con == --assumes that DOCUMENTATION property already has #s added $topicClasses := ASSOCRIGHT mySort [[HGET($topicHash,key),:key] for key in HKEYS $topicHash] - hash := MAKE_-HASHTABLE 'ID + hash := hashTable 'EQ tdAdd(con,hash) for x in removeDuplicates [CAAR y for y in ancestorsOf(getConstructorForm con,nil)] repeat tdAdd(x,hash) |