[BACK]Return to hash.fs CVS log [TXT] [DIR] Up to [gforth] / gforth

Diff for /gforth/hash.fs between versions 1.18 and 1.19

version 1.18, 1997/07/06 15:55:24 version 1.19, 1997/09/13 12:04:56
Line 18 Line 18
 \ along with this program; if not, write to the Free Software  \ along with this program; if not, write to the Free Software
 \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   
 [IFUNDEF] e? : e? name 2drop false ; [THEN]  [IFUNDEF] allocate
   
 e? ec  
 [IF]  
 : reserve-mem here swap allot ;  : reserve-mem here swap allot ;
 \ ToDo: check memory space with unused  
 \ move to a kernel/memory.fs  \ move to a kernel/memory.fs
 [ELSE]  [ELSE]
 : reserve-mem allocate throw ;  : reserve-mem allocate throw ;
 [THEN]  [THEN]
   
 [IFUNDEF] hashbits  [IFUNDEF] hashbits
 11 value hashbits  11 Value hashbits
 [THEN]  [THEN]
 1 hashbits lshift Value Hashlen  1 hashbits lshift Value Hashlen
   
Line 140  to hashsearch-map Line 136  to hashsearch-map
       HashTable Hashlen cells erase THEN        HashTable Hashlen cells erase THEN
   HashIndex @ over !  1 HashIndex +!    HashIndex @ over !  1 HashIndex +!
   HashIndex @ Hashlen >=    HashIndex @ Hashlen >=
   [ e? ec [IF] ]    [ [IFUNDEF] allocate ]
   ABORT" no more space in hashtable"    ABORT" no more space in hashtable"
   [ [ELSE] ]    [ [ELSE] ]
   IF  HashTable >r clearhash    IF  HashTable >r clearhash
Line 151  to hashsearch-map Line 147  to hashsearch-map
   [ [THEN] ] ; is hash-alloc    [ [THEN] ] ; is hash-alloc
   
 \ Hash-Find                                            01jan93py  \ Hash-Find                                            01jan93py
 e? cross 0=   has? cross 0= 
 [IF]  [IF]
 : make-hash  : make-hash
   hashsearch-map forth-wordlist cell+ !    hashsearch-map forth-wordlist cell+ !
Line 164  e? cross 0= Line 160  e? cross 0=
 \ for ec version display that vocabulary goes hashed  \ for ec version display that vocabulary goes hashed
   
 : hash-cold  ( -- )  : hash-cold  ( -- )
 [ e? ec [IF] ] ." Hashing..." [ [THEN] ]  [ has? ec [IF] ] ." Hashing..." [ [THEN] ]
   HashPointer off  0 TO HashTable  HashIndex off    HashPointer off  0 TO HashTable  HashIndex off
   addall    addall
 \  voclink  \  voclink
 \  BEGIN  @ dup WHILE  \  BEGIN  @ dup WHILE
 \         dup 0 wordlist-link - initvoc  \         dup 0 wordlist-link - initvoc
 \  REPEAT  drop   \  REPEAT  drop 
 [ e? ec [IF] ] ." Done" cr [ [THEN] ] ;  [ has? ec [IF] ] ." Done" cr [ [THEN] ] ;
   
 ' hash-cold INIT8 chained  ' hash-cold INIT8 chained
   
Removed from v.1.18  
changed lines
  Added in v.1.19

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>