Diff for /gforth/struct.fs between versions 1.2 and 1.11

version 1.2, 1994/07/29 11:16:26 version 1.11, 1997/06/06 17:27:58
Line 1 Line 1
 \ $Id$  \ data structures (like C structs)
   
   \ Copyright (C) 1995, 1997 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.
   
   
 \ Usage example:  \ Usage example:
 \  \
Line 16 Line 35
 \ 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 ;
   
 : create-field ( offset1 align1 size align -- offset2 align2 )  : dozerofield ( -- )
 \ note: this version uses local variables      \ a field that makes no change
      create      \ to enable accessing the offset with "['] <field> >body @" this
         >r rot r@ nalign  dup ,  ( align1 size offset )      \ is not implemented with "['] noop alias"
         + swap r> nalign ;      last @
       if
           immediate
       then
   does> ( -- )
       drop ;
   
   : field ( offset1 align1 size align "name" -- offset2 align2 ) \ gforth
       \G name execution: ( addr1 -- addr2 )
       >r rot r@ nalign dup
       if \ field offset <> 0
           [IFDEF]  (Field)
               (Field)
           [ELSE]
               Header reveal dofield: cfa,
           [THEN]
       else
           create dozerofield
       then ( align1 size offset )
       dup , + swap r> nalign ;
   
 : end-struct ( size align -- )  : end-struct ( size align -- )
  2constant ;   2constant ;
   
 0 1 chars end-struct struct  0 1 chars end-struct struct
   
 : field  ( offset1 align1 size align -- offset2 align2 )  \ : field  ( offset1 align1 size align -- offset2 align2 )
     create-field  \    create-field
     does> ( addr1 -- addr2 )  \    does> ( addr1 -- addr2 )
         @ + ;  \       @ + ;
   
 \ I don't really like the "type:" syntax. Any other ideas? - anton  \ I don't really like the "type:" syntax. Any other ideas? - anton
 \ Also, this seems to be somewhat general. It probably belongs to some  \ Also, this seems to be somewhat general. It probably belongs to some
Line 47 Line 85
 : floats: ( n -- size align )  : floats: ( n -- size align )
     floats 1 floats ;      floats 1 floats ;
   
 \ dfoats and sfloats is not yet defined  : dfloats: ( n -- size align )
 \ : dfloats: ( n -- size align )      dfloats 1 dfloats ;
 \     dfloats 1 dfloats ;  
 \   : sfloats: ( n -- size align )
 \ : sfloats: ( n -- size align )      sfloats 1 sfloats ;
 \     sfloats 1 sfloats ;  
   
 : struct-align ( size align -- )  : struct-align ( size align -- )
     dp @ swap nalign dp !      dp @ swap nalign dp !
Line 62 Line 99
     over swap struct-align      over swap struct-align
     here swap allot ;      here swap allot ;
   
 : struct-allocate ( size align -- addr )  : struct-allocate ( size align -- addr ior )
     drop allocate ;      drop allocate ;
   
   : struct-alloc ( size align -- addr )
       struct-allocate throw ;

Removed from v.1.2  
changed lines
  Added in v.1.11


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