[gforth] / gforth / hash.fs  

gforth: gforth/hash.fs

Diff for /gforth/hash.fs between version 1.20 and 1.26

version 1.20, Sat May 2 21:28:42 1998 UTC version 1.26, Sat Sep 23 15:46:57 2000 UTC
Line 1 
Line 1 
 \ Hashed dictionaries                                  15jul94py  \ Hashed dictionaries                                  15jul94py
   
 \ Copyright (C) 1995 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 
Line 48 
   
 \ 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 88 
Line 88 
   
 : inithash ( wid -- )  : inithash ( wid -- )
     wordlist-extend      wordlist-extend
     insRule @ >r  insRule off  hash-alloc 3 cells - dup      insRule @ >r  insRule off  hash-alloc 3 cells -
       dup wordlist-id
     BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT      BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT
     2drop  r> insRule ! ;      2drop  r> insRule ! ;
   
Line 96 
Line 97 
     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 
Line 106 
     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
       WHILE ( wordlist-link )
           dup 0 wordlist-link - ( wordlist-link wid )
           dup wordlist-map @ hashsearch-map =            dup wordlist-map @ hashsearch-map =
           IF 0 swap wordlist-extend ! ELSE drop THEN          IF ( wordlist-link wid )
     REPEAT drop ;              0 swap wordlist-extend !
           ELSE
               drop
           THEN
       REPEAT
       drop ;
   
 : rehashall  ( wid -- )  : rehashall  ( wid -- )
   drop revealed @    drop revealed @
Line 130 
Line 140 
   
 \ 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
Line 150 
Line 160 
 has? cross 0=  has? cross 0=
 [IF]  [IF]
 : make-hash  : make-hash
   hashsearch-map forth-wordlist cell+ !    hashsearch-map forth-wordlist wordlist-map !
   addall ;    addall ;
   make-hash \ Baumsuche ist installiert.    make-hash \ Baumsuche ist installiert.
 [ELSE]  [ELSE]
   hashsearch-map forth-wordlist cell+ !    hashsearch-map forth-wordlist wordlist-map !
 [THEN]  [THEN]
   
 \ for ec version display that vocabulary goes hashed  \ for ec version display that vocabulary goes hashed

Generate output suitable for use with a patch program
Legend:
Removed from v.1.20  
changed lines
  Added in v.1.26
CVS Admin

Powered by ViewCVS 1.0-dev 		(Powered by ViewCVS)

ViewCVS and CVS Help