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

Diff for /gforth/hash.fs between versions 1.22 and 1.26

version 1.22, 1998/12/08 22:02:45 version 1.26, 2000/09/23 15:46:57
Line 1 Line 1
 \ Hashed dictionaries                                  15jul94py  \ Hashed dictionaries                                  15jul94py
   
 \ Copyright (C) 1995,1998 Free Software Foundation, Inc.  \ Copyright (C) 1995,1998,2000 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 16 Line 16
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
   
 [IFUNDEF] allocate  [IFUNDEF] allocate
 : reserve-mem here swap allot ;  : reserve-mem here swap allot ;
Line 48  Variable HashIndex Line 48  Variable HashIndex
   
 \ forward declarations  \ forward declarations
 0 Value hashsearch-map  0 Value hashsearch-map
 Defer hash-alloc  Defer hash-alloc ( addr -- addr )
   
 \ DelFix and NewFix are from bigFORTH                  15jul94py  \ DelFix and NewFix are from bigFORTH                  15jul94py
   
Line 97  Defer hash-alloc Line 97  Defer hash-alloc
     voclink      voclink
     BEGIN  @ dup WHILE      BEGIN  @ dup WHILE
            dup 0 wordlist-link -             dup 0 wordlist-link -
            dup wordlist-map @ hashsearch-map =              dup wordlist-map @ reveal-method @ ['] hash-reveal = 
            IF  inithash ELSE drop THEN             IF  inithash ELSE drop THEN
     REPEAT  drop ;      REPEAT  drop ;
   
Line 105  Defer hash-alloc Line 105  Defer hash-alloc
     HashTable Hashlen cells bounds      HashTable Hashlen cells bounds
     DO  I @      DO  I @
         BEGIN  dup  WHILE          BEGIN  dup  WHILE
                dup @ swap HashPointer DelFix              dup @ swap HashPointer DelFix
         REPEAT  I !          REPEAT
     cell +LOOP  HashIndex off           I !
           cell +LOOP
       HashIndex off 
     voclink      voclink
     BEGIN @ dup WHILE      BEGIN ( wordlist-link-addr )
           dup 0 wordlist-link -          @ dup
           dup wordlist-map @ hashsearch-map =       WHILE ( wordlist-link )
           IF 0 swap wordlist-extend ! ELSE drop THEN          dup 0 wordlist-link - ( wordlist-link wid ) 
     REPEAT drop ;          dup wordlist-map @ hashsearch-map = 
           IF ( wordlist-link wid )
               0 swap wordlist-extend !
           ELSE
               drop
           THEN
       REPEAT
       drop ;
   
 : rehashall  ( wid -- )   : rehashall  ( wid -- ) 
   drop revealed @     drop revealed @ 
Line 131  to hashsearch-map Line 140  to hashsearch-map
   
 \ hash allocate and vocabulary initialization          10oct94py  \ hash allocate and vocabulary initialization          10oct94py
   
 :noname ( hash-alloc ) ( addr -- addr )    :noname ( addr -- addr )
   HashTable 0=     HashTable 0= 
   IF  Hashlen cells reserve-mem TO HashTable    IF  Hashlen cells reserve-mem TO HashTable
       HashTable Hashlen cells erase THEN        HashTable Hashlen cells erase THEN
Removed from v.1.22  
changed lines
  Added in v.1.26

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