Diff for /gforth/compat/struct.fs between versions 1.1 and 1.4

version 1.1, 1996/11/11 17:00:07 version 1.4, 1997/07/31 16:17:23
Line 1 Line 1
 \ data structures (like C structs)  \ data structures (like C structs)
   
 \ Copyright (C) 1995 Free Software Foundation, Inc.  \ This file is in the public domain. NO WARRANTY.
   
 \ This file is part of Gforth.  \ This program uses the following words
   \ from CORE :
 \ Gforth is free software; you can redistribute it and/or  \ : 1- + swap invert and ; DOES> @ immediate drop Create rot dup , >r
 \ modify it under the terms of the GNU General Public License  \ r> IF ELSE THEN over chars aligned cells 2* here - allot
 \ as published by the Free Software Foundation; either version 2  \ from CORE-EXT :
 \ of the License, or (at your option) any later version.  \ tuck pick nip 
   \ from BLOCK-EXT :
 \ This program is distributed in the hope that it will be useful,  \ \ 
 \ but WITHOUT ANY WARRANTY; without even the implied warranty of  \ from DOUBLE :
 \ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  \ 2Constant 
 \ GNU General Public License for more details.  \ from EXCEPTION :
   \ throw 
 \ You should have received a copy of the GNU General Public License  \ from FILE :
 \ along with this program; if not, write to the Free Software  \ ( 
 \ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  \ from FLOAT :
   \ faligned floats 
   \ from FLOAT-EXT :
 \ Usage example:  \ dfaligned dfloats sfaligned sfloats 
 \  \ from MEMORY :
 \ struct  \ allocate 
 \     1 cells: field search-method  
 \     1 cells: field reveal-method  
 \ end-struct wordlist-map  
 \  
 \ The structure can then be extended in the following way  
 \ wordlist-map  
 \     1 cells: field enum-method  
 \ end-struct ext-wordlist-map \ with the fields search-method,...,enum-method  
   
 : nalign ( addr1 n -- addr2 )  : nalign ( addr1 n -- addr2 )
 \ addr2 is the aligned version of addr1 wrt the alignment size n  \ addr2 is the aligned version of addr1 wrt the alignment size n
  1- tuck +  swap invert and ;   1- tuck +  swap invert and ;
   
 : field ( offset1 align1 size align -- offset2 align2 )  : dofield ( -- )
     create  does> ( name execution: addr1 -- addr2 )
     >r rot r@ nalign  dup ,  ( align1 size offset )  
     + swap r> nalign  
 does> ( addr1 -- addr2 )  
     @ + ;      @ + ;
   
 : end-struct ( size align -- )  : dozerofield ( -- )
  2constant ;      immediate
   does> ( name execution: -- )
 0 1 chars end-struct struct      drop ;
   
 \ I don't really like the "type:" syntax. Any other ideas? - anton  
 \ Also, this seems to be somewhat general. It probably belongs to some  
 \ other place  
 : cells: ( n -- size align )  
     cells 1 cells ;  
   
 : doubles: ( n -- size align )  
     2* cells 1 cells ;  
   
 : chars: ( n -- size align )  
     chars 1 chars ;  
   
 : floats: ( n -- size align )  : create-field ( align1 offset1 align size "name" --  align2 offset2 )
     floats 1 floats ;      create rot dup , ( align1 align size offset1 )
       + >r nalign r> ;
   
   : field ( align1 offset1 align size "name" --  align2 offset2 )
       \ name execution: addr1 -- addr2
       2 pick >r \ this uglyness is just for optimizing with dozerofield
       create-field
       r> if \ offset<>0
           dofield
       else
           dozerofield
       then ;
   
   : end-struct ( align size "name" -- )
       over nalign \ pad size to full alignment
       2constant ;
   
   \ an empty struct
   1 chars 0 end-struct struct
   
   \ type descriptors, all ( -- align size )
   1 aligned   1 cells   2constant cell%
   1 chars     1 chars   2constant char%
   1 faligned  1 floats  2constant float%
   1 dfaligned 1 dfloats 2constant dfloat%
   1 sfaligned 1 sfloats 2constant sfloat%
   cell% 2*              2constant double%
   
 : dfloats: ( n -- size align )  \ memory allocation words
     dfloats 1 dfloats ;  : %alignment ( align size -- align )
       drop ;
   
 : sfloats: ( n -- size align )  : %size ( align size -- size )
     sfloats 1 sfloats ;      nip ;
   
 : struct-align ( size align -- )  : %align ( align size -- )
     here swap nalign here - allot      drop here swap nalign here - allot ;
     drop ;  
   
 : struct-allot ( size align -- addr )  : %allot ( align size -- addr )
     over swap struct-align      tuck %align
     here swap allot ;      here swap allot ;
   
 : struct-allocate ( size align -- addr ior )  : %allocate ( align size -- addr ior )
     drop allocate ;      nip allocate ;
   
   : %alloc ( size align -- addr )
       %allocate throw ;

Removed from v.1.1  
changed lines
  Added in v.1.4


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