Diff for /gforth/hash.fs between versions 1.5 and 1.12

version 1.5, 1994/11/15 15:55:36 version 1.12, 1996/05/06 12:39:00
Line 1 Line 1
 \ Hashed dictionaries                                  15jul94py  \ Hashed dictionaries                                  15jul94py
   
 9 value hashbits  \ Copyright (C) 1995 Free Software Foundation, Inc.
   
   \ This file is part of Gforth.
   
   \ Gforth is free software; you can redistribute it and/or
   \ modify it under the terms of the GNU General Public License
   \ as published by the Free Software Foundation; either version 2
   \ of the License, or (at your option) any later version.
   
   \ This program is distributed in the hope that it will be useful,
   \ but WITHOUT ANY WARRANTY; without even the implied warranty of
   \ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   \ GNU General Public License for more details.
   
   \ You should have received a copy of the GNU General Public License
   \ along with this program; if not, write to the Free Software
   \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   
   11 value hashbits
 1 hashbits lshift Value Hashlen  1 hashbits lshift Value Hashlen
   
 Variable insRule        insRule on  Variable insRule        insRule on
Line 27  Variable HashIndex Line 45  Variable HashIndex
 \   (hashkey)  \   (hashkey)
 \   Hashlen 1- and ;  \   Hashlen 1- and ;
   
   : bucket ( addr len wordlist -- bucket-addr )
       \ @var{bucket-addr} is the address of a cell that points to the first
       \ element in the list of the bucket for the string @var{addr len}
       wordlist-extend @ -rot hash xor ( bucket# )
       cells HashTable @ + ;
   
 : hash-find ( addr len wordlist -- nfa / false )  : hash-find ( addr len wordlist -- nfa / false )
     $C + @ >r      >r 2dup r> bucket @ (hashfind) ;
     2dup hash r> xor cells HashTable @ + @ (hashfind) ;  
   
 \ hash vocabularies                                    16jul94py  \ hash vocabularies                                    16jul94py
   
 : lastlink! ( addr link -- )  : lastlink! ( addr link -- )
   BEGIN  dup @ dup  WHILE  nip  REPEAT  drop ! ;    BEGIN  dup @ dup  WHILE  nip  REPEAT  drop ! ;
   
 : (reveal ( addr voc -- )  $C + dup @ 0< IF  2drop EXIT  THEN  : (reveal ( addr voc -- )
   @ over cell+ count $1F and Hash xor cells >r      dup wordlist-extend @ 0<
   HashPointer 8 $400 NewFix      IF
   tuck cell+ ! r> HashTable @ + insRule @          2drop EXIT
   IF  dup @ 2 pick ! !  ELSE  lastlink!  THEN  revealed on ;      THEN
       over name>string rot bucket >r
 : hash-reveal ( -- )  (reveal) last?  IF      HashPointer 2 Cells $400 NewFix
   current @ (reveal  THEN ;      tuck cell+ ! r> insRule @
       IF
           dup @ 2 pick ! !
       ELSE
           lastlink!
       THEN
       revealed on ;
   
   : hash-reveal ( -- )
       (reveal) last?
       IF
           current @ (reveal
       THEN ;
   
 : addall  ( -- )  : addall  ( -- )
     voclink      voclink
Line 58  Variable HashIndex Line 92  Variable HashIndex
         REPEAT  I !          REPEAT  I !
     cell +LOOP  HashIndex off ;      cell +LOOP  HashIndex off ;
   
 : rehash  clearhash addall ;  : re-hash  clearhash addall ;
 : (rehash) ( addr -- )  : (rehash) ( addr -- )
   drop revealed @ IF  rehash revealed off  THEN ;    drop revealed @ IF  re-hash revealed off  THEN ;
   
 Create hashsearch  ' hash-find A, ' hash-reveal A, ' (rehash) A,  Create hashsearch-map ( -- wordlist-map )
       ' hash-find A, ' hash-reveal A, ' (rehash) A,
   
 \ hash allocate and vocabulary initialization          10oct94py  \ hash allocate and vocabulary initialization          10oct94py
   
Line 80  Create hashsearch  ' hash-find A, ' hash Line 115  Create hashsearch  ' hash-find A, ' hash
 : (initvoc) ( addr -- )  : (initvoc) ( addr -- )
     cell+ dup @ 0< IF  drop EXIT  THEN      cell+ dup @ 0< IF  drop EXIT  THEN
     insRule @ >r  insRule off  hash-alloc      insRule @ >r  insRule off  hash-alloc
     3 cells - hashsearch over cell+ ! dup      3 cells - hashsearch-map over cell+ ! dup
     BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT      BEGIN  @ dup  WHILE  2dup swap (reveal  REPEAT
     2drop  r> insRule ! ;      2drop  r> insRule ! ;
   
Line 93  addall          \ Baum aufbauen Line 128  addall          \ Baum aufbauen
   
 : hash-cold  ( -- ) Defers 'cold  : hash-cold  ( -- ) Defers 'cold
   HashPointer off  HashTable off  HashIndex off    HashPointer off  HashTable off  HashIndex off
   addall ;    voclink
     BEGIN  @ dup @  WHILE
            dup cell - @ >r
            dup 'initvoc
            r> over cell - !
     REPEAT  drop ;
 ' hash-cold IS 'cold  ' hash-cold IS 'cold
   
 : .words  ( -- )  : .words  ( -- )

Removed from v.1.5  
changed lines
  Added in v.1.12


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