Diff for /gforth/objects.fs between versions 1.4 and 1.7

version 1.4, 1997/06/23 15:53:53 version 1.7, 1998/08/02 15:06:01
Line 41 Line 41
   
 \ helper words  \ helper words
   
   s" gforth" environment? [if]
       2drop
   [else]
   
 : -rot ( a b c -- c a b )  : -rot ( a b c -- c a b )
     rot rot ;      rot rot ;
   
 : under+ ( a b c -- a+c b )  
     rot + swap ;  
   
 : perform ( ... addr -- ... )  : perform ( ... addr -- ... )
     @ execute ;      @ execute ;
   
Line 73 Line 74
     over >r + dup >r resize throw      over >r + dup >r resize throw
     r> over r> + -rot ;      r> over r> + -rot ;
   
   : \g ( -- )
       postpone \ ; immediate
   [then]
   
 \ data structures  \ data structures
   
 struct  struct
Line 90  end-struct interface% Line 95  end-struct interface%
   
 interface%  interface%
     cell%    field class-parent      cell%    field class-parent
     cell%    field class-wordlist \ instance variables and other private words      cell%    field class-wordlist \ inst-vars and other protected words
     cell% 2* field class-inst-size \ size and alignment      cell% 2* field class-inst-size ( class -- addr ) \ objects
       \g used as @code{class-inst-size 2@ ( class -- align size )},
       \g gives the size specification for an instance (i.e. an object)
       \g of @code{class}.
 end-struct class%  end-struct class%
   
 struct  struct
Line 110  end-struct selector% Line 118  end-struct selector%
   
 \ selectors and methods  \ selectors and methods
   
 variable current-interface  variable current-interface ( -- addr ) \ objects
   \g this variable contains the class or interface currently being
   \g defined.
   
   
   
 : no-method ( -- )  : no-method ( -- )
     true abort" no method defined for this object/selector combination" ;      true abort" no method defined for this object/selector combination" ;
   
 : do-class-method ( -- )  : do-class-method ( -- )
 does> ( ... object -- ... )  does> ( ... object -- ... )
     ( object )      ( object selector-body )
     selector-offset @ over object-map @ + ( object xtp ) perform ;      selector-offset @ over object-map @ + ( object xtp ) perform ;
   
 : do-interface-method ( -- )  : do-interface-method ( -- )
Line 127  does> ( ... object -- ... ) Line 139  does> ( ... object -- ... )
     swap object-map @ + @ ( object selector-body map )      swap object-map @ + @ ( object selector-body map )
     swap selector-offset @ + perform ;      swap selector-offset @ + perform ;
   
 : method ( xt "name" -- )  : method ( xt "name" -- ) \ objects
     \ define selector with method xt      \g @code{name} execution: @code{... object -- ...}@*
       \g creates selector @code{name} and makes @code{xt} its method in
       \g the current class.
     create      create
     current-interface @ interface-map 2@ ( xt map-addr map-size )      current-interface @ interface-map 2@ ( xt map-addr map-size )
     dup current-interface @ interface-map-offset @ - ,      dup current-interface @ interface-map-offset @ - ,
Line 140  does> ( ... object -- ... ) Line 154  does> ( ... object -- ... )
         do-class-method          do-class-method
     then ;      then ;
   
 : selector ( "name" -- )  : selector ( "name" -- ) \ objects
     \ define a method selector for later overriding in subclasses      \g @code{name} execution: @code{... object -- ...}@*
       \g creates selector @code{name} for the current class and its
       \g descendents; you can set a method for the selector in the
       \g current class with @code{overrides}.
     ['] no-method method ;      ['] no-method method ;
   
 : interface-override! ( xt sel-xt interface-map -- )  : interface-override! ( xt sel-xt interface-map -- )
Line 149  does> ( ... object -- ... ) Line 166  does> ( ... object -- ... )
     swap >body ( xt map selector-body )      swap >body ( xt map selector-body )
     selector-offset @ + ! ;      selector-offset @ + ! ;
   
 : class->map ( class -- map )  : class->map ( class -- map ) \ objects
     \ compute the (object-)map for the class      \g @code{map} is the pointer to @code{class}'s method map; it
       \g points to the place in the map to which the selector offsets
       \g refer (i.e., where @code{object-map}s point to).
     dup interface-map 2@ drop swap interface-map-offset @ + ;      dup interface-map 2@ drop swap interface-map-offset @ + ;
   
 : unique-interface-map ( class-map offset -- )  : unique-interface-map ( class-map offset -- )
Line 167  does> ( ... object -- ... ) Line 186  does> ( ... object -- ... )
         2drop          2drop
     then ;      then ;
   
 : class-override! ( xt sel-xt class-map -- )  : class-override! ( xt sel-xt class-map -- ) \ objects
     \ xt is the new method for the selector sel-xt in class-map      \g @code{xt} is the new method for the selector @code{sel-xt} in
       \g @code{class-map}.
     over >body ( xt sel-xt class-map selector-body )      over >body ( xt sel-xt class-map selector-body )
     selector-interface @ ( xt sel-xt class-map offset )      selector-interface @ ( xt sel-xt class-map offset )
     ?dup-if \ the selector is for an interface      ?dup-if \ the selector is for an interface
Line 177  does> ( ... object -- ... ) Line 197  does> ( ... object -- ... )
     then      then
     interface-override! ;      interface-override! ;
   
 : overrides ( xt "selector" -- )  : overrides ( xt "selector" -- ) \ objects
     \ replace default method "method" in the current class with xt      \g replace default method for @code{selector} in the current class
     \ must not be used during an interface definition      \g with @code{xt}. @code{overrides} must not be used during an
       \g interface definition.
     ' current-interface @ class->map class-override! ;      ' current-interface @ class->map class-override! ;
   
 \ interfaces  \ interfaces
Line 187  does> ( ... object -- ... ) Line 208  does> ( ... object -- ... )
 \ every interface gets a different offset; the latest one is stored here  \ every interface gets a different offset; the latest one is stored here
 variable last-interface-offset 0 last-interface-offset !  variable last-interface-offset 0 last-interface-offset !
   
 : interface ( -- )  : interface ( -- ) \ objects
       \g starts an interface definition.
     interface% %allot >r      interface% %allot >r
     0 0 r@ interface-map 2!      0 0 r@ interface-map 2!
     -1 cells last-interface-offset +!      -1 cells last-interface-offset +!
Line 195  variable last-interface-offset 0 last-in Line 217  variable last-interface-offset 0 last-in
     0 r@ interface-map-offset !      0 r@ interface-map-offset !
     r> current-interface ! ;      r> current-interface ! ;
   
 : end-interface-noname ( -- interface )  : end-interface-noname ( -- interface ) \ objects
       \g ends an interface definition. The resulting interface is
       \g @code{interface}.
     current-interface @ ;      current-interface @ ;
   
 : end-interface ( "name" -- )  : end-interface ( "name" -- ) \ objects
     \ name execution: ( -- interface )      \g @code{name} execution: @code{-- interface}@*
       \g ends an interface definition. The resulting interface is
       \g @code{interface}.
     end-interface-noname constant ;      end-interface-noname constant ;
   
 \ classes  \ classes
Line 211  variable last-interface-offset 0 last-in Line 237  variable last-interface-offset 0 last-in
     then      then
     r> class-wordlist @ swap 1+ ;      r> class-wordlist @ swap 1+ ;
   
 : push-order ( class -- )  : push-order ( class -- ) \ objects
     \ add the class's wordlist to the search-order (in front)      \g add @code{class}'s wordlists to the search-order (in front)
     >r get-order r> add-class-order set-order ;      >r get-order r> add-class-order set-order ;
   
 : class ( parent-class -- align size )  : class ( parent-class -- align offset ) \ objects
       \g start a new class definition as a child of
       \g @code{parent-class}. @code{align offset} are for use by
       \g @code{field} etc.
     class% %allot >r      class% %allot >r
     dup interface-map 2@ save-mem r@ interface-map 2!      dup interface-map 2@ save-mem r@ interface-map 2!
     dup interface-map-offset @ r@ interface-map-offset !      dup interface-map-offset @ r@ interface-map-offset !
Line 235  variable last-interface-offset 0 last-in Line 264  variable last-interface-offset 0 last-in
     until      until
     drop ;      drop ;
   
 : drop-order ( class -- )  : drop-order ( class -- ) \ objects
     \ note: no checks, whether the wordlists are correct      \g drops @code{class}'s wordlists from the search order. No
       \g checking is made whether @code{class}'s wordlists are actually
       \g on the search order.
     >r get-order r> remove-class-order set-order ;      >r get-order r> remove-class-order set-order ;
   
 : end-class-noname ( align size -- class )  : end-class-noname ( align offset -- class ) \ objects
       \g ends a class definition. The resulting class is @code{class}.
     current-interface @ dup drop-order class-inst-size 2!      current-interface @ dup drop-order class-inst-size 2!
     end-interface-noname ;      end-interface-noname ;
   
 : end-class ( align size "name" -- )  : end-class ( align offset "name" -- ) \ objects
       \g @code{name} execution: @code{-- class}@*
       \g ends a class definition. The resulting class is @code{class}.
     \ name execution: ( -- class )      \ name execution: ( -- class )
     end-class-noname constant ;      end-class-noname constant ;
   
Line 251  variable last-interface-offset 0 last-in Line 285  variable last-interface-offset 0 last-in
   
 variable public-wordlist  variable public-wordlist
   
 : protected ( -- )  : protected ( -- ) \ objects
       \g set the compilation wordlist to the current class's wordlist
     current-interface @ class-wordlist @      current-interface @ class-wordlist @
     dup get-current <>      dup get-current <>
     if \ we are not protected already      if \ we are not protected already
Line 259  variable public-wordlist Line 294  variable public-wordlist
     then      then
     set-current ;      set-current ;
   
 : public ( -- )  : public ( -- ) \ objects
       \g restore the compilation wordlist that was in effect before the
       \g last @code{protected} that actually changed the compilation
       \g wordlist.
     public-wordlist @ set-current ;      public-wordlist @ set-current ;
   
 \ classes that implement interfaces  \ classes that implement interfaces
Line 272  variable public-wordlist Line 310  variable public-wordlist
     free throw      free throw
     r> dup r> ;      r> dup r> ;
           
 : implementation ( interface -- )  : implementation ( interface -- ) \ objects
       \g the current class implements @code{interface}. I.e., you can
       \g use all selectors of the interface in the current class and its
       \g descendents.
     dup interface-offset @ ( interface offset )      dup interface-offset @ ( interface offset )
     current-interface @ interface-map-offset @ negate over - dup 0>      current-interface @ interface-map-offset @ negate over - dup 0>
     if \ the interface does not fit in the present class-map      if \ the interface does not fit in the present class-map
Line 291  variable public-wordlist Line 332  variable public-wordlist
 \ this/self, instance variables etc.  \ this/self, instance variables etc.
   
 \ rename "this" into "self" if you are a Smalltalk fiend  \ rename "this" into "self" if you are a Smalltalk fiend
 0 value this ( -- object )  0 value this ( -- object ) \ objects
 : to-this ( object -- )  \g the receiving object of the current method (aka active object).
   : to-this ( object -- ) \ objects
       \g sets @code{this} (used internally, but useful when debugging).
     TO this ;      TO this ;
   
 \ another implementation, if you don't have (fast) values  \ another implementation, if you don't have (fast) values
Line 302  variable public-wordlist Line 345  variable public-wordlist
 \ : to-this ( object -- )  \ : to-this ( object -- )
 \     thisp ! ;  \     thisp ! ;
   
 : m: ( -- xt colon-sys ) ( run-time: object -- )  : m: ( -- xt colon-sys; run-time: object -- ) \ objects
       \g start a method definition; @code{object} becomes new @code{this}.
     :noname       :noname 
     POSTPONE this      POSTPONE this
     POSTPONE >r      POSTPONE >r
     POSTPONE to-this ;      POSTPONE to-this ;
   
 : ;m ( colon-sys -- ) ( run-time: -- )  : exitm ( -- ) \ objects
       \g @code{exit} from a method; restore old @code{this}.
       POSTPONE r>
       POSTPONE to-this
       POSTPONE exit ; immediate
   
   : ;m ( colon-sys --; run-time: -- ) \ objects
       \g end a method definition; restore old @code{this}.
     POSTPONE r>      POSTPONE r>
     POSTPONE to-this      POSTPONE to-this
     POSTPONE ; ; immediate      POSTPONE ; ; immediate
   
 : catch ( ... xt -- ... n )  : catch ( ... xt -- ... n ) \ exception
     \ make it safe to call CATCH within a method.      \ make it safe to call CATCH within a method.
     \ should also be done with all words containing CATCH.      \ should also be done with all words containing CATCH.
     this >r catch r> to-this ;      this >r catch r> to-this ;
Line 333  variable public-wordlist Line 384  variable public-wordlist
 does> \ name execution: ( -- addr )  does> \ name execution: ( -- addr )
     ( addr1 ) @ this + ;      ( addr1 ) @ this + ;
   
 : inst-var ( align1 offset1 align size "name" -- align2 offset2 )  : inst-var ( align1 offset1 align size "name" -- align2 offset2 ) \ objects
     \ name execution: ( -- addr )      \g @code{name} execution: @code{-- addr}@*
       \g @code{addr} is the address of the field @code{name} in
       \g @code{this} object.
     ['] do-inst-var inst-something ;      ['] do-inst-var inst-something ;
   
 : do-inst-value ( -- )  : do-inst-value ( -- )
 does> \ name execution: ( -- w )  does> \ name execution: ( -- w )
     ( addr1 ) @ this + @ ;      ( addr1 ) @ this + @ ;
   
 : inst-value ( align1 offset1 "name" -- align2 offset2 )  : inst-value ( align1 offset1 "name" -- align2 offset2 ) \ objects
     \ name execution: ( -- w )      \g @code{name} execution: @code{-- w}@*
     \ a cell-sized value-flavoured instance field      \g @code{w} is the value of the field @code{name} in @code{this}
       \g object.
     cell% ['] do-inst-value inst-something ;      cell% ['] do-inst-value inst-something ;
   
 : <to-inst> ( w xt -- )  : <to-inst> ( w xt -- ) \ objects
       \g store @code{w} into the field @code{xt} in @code{this} object.
     >body @ this + ! ;      >body @ this + ! ;
   
 : [to-inst] ( compile-time: "name" -- ; run-time: w -- )  : [to-inst] ( compile-time: "name" -- ; run-time: w -- ) \ objects
       \g store @code{w} into field @code{name} in @code{this} object.
     ' >body @ POSTPONE literal      ' >body @ POSTPONE literal
     POSTPONE this      POSTPONE this
     POSTPONE +      POSTPONE +
Line 357  does> \ name execution: ( -- w ) Line 413  does> \ name execution: ( -- w )
   
 \ class binding stuff  \ class binding stuff
   
 : <bind> ( class selector-xt -- xt )  : <bind> ( class selector-xt -- xt ) \ objects
       \g @code{xt} is the method for the selector @code{selector-xt} in
       \g @code{class}.
     >body swap class->map over selector-interface @      >body swap class->map over selector-interface @
     ?dup-if      ?dup-if
         + @          + @
     then      then
     swap selector-offset @ + @ ;      swap selector-offset @ + @ ;
   
 : bind' ( "class" "selector" -- xt )  : bind' ( "class" "selector" -- xt ) \ objects
       \g @code{xt} is the method for @code{selector} in @code{class}.
     ' execute ' <bind> ;      ' execute ' <bind> ;
   
 : bind ( ... object "class" "selector" -- ... )  : bind ( ... "class" "selector" -- ... ) \ objects
       \g execute the method for @code{selector} in @code{class}.
     bind' execute ;      bind' execute ;
   
 : [bind] ( compile-time: "class" "selector" -- ; run-time: ... object -- ... )  : [bind] ( compile-time: "class" "selector" -- ; run-time: ... object -- ... ) \ objects
       \g compile the method for @code{selector} in @code{class}.
     bind' compile, ; immediate      bind' compile, ; immediate
   
 : current' ( "selector" -- xt )  : current' ( "selector" -- xt ) \ objects
       \g @code{xt} is the method for @code{selector} in the current class.
     current-interface @ ' <bind> ;      current-interface @ ' <bind> ;
   
 : [current] ( compile-time: "selector" -- ; run-time: ... object -- ... )  : [current] ( compile-time: "selector" -- ; run-time: ... object -- ... ) \ objects
       \g compile the method for @code{selector} in the current class.
     current' compile, ; immediate      current' compile, ; immediate
   
 : [parent] ( compile-time: "selector" -- ; run-time: ... object -- ... )  : [parent] ( compile-time: "selector" -- ; run-time: ... object -- ... ) \ objects
     \ same as `[bind] "parent" "selector"', where "parent" is the      \g compile the method for @code{selector} in the parent of the
     \ parent class of the current class      \g current class.
     current-interface @ class-parent @ ' <bind> compile, ; immediate      current-interface @ class-parent @ ' <bind> compile, ; immediate
   
 \ the object class  \ the object class
Line 398  wordlist current-interface @ class-wordl Line 461  wordlist current-interface @ class-wordl
 object%  object%
 current-interface @ push-order  current-interface @ push-order
   
 :noname ( object -- )  ' drop ( object -- )
     drop ;  method construct ( ... object -- ) \ objects
 method construct ( ... object -- )  \g initializes the data fields of @code{object}. The method for the
   \g class @code{object} just does nothing @code{( object -- )}.
   
 :noname ( object -- )  :noname ( object -- )
     ." object:" dup . ." class:" object-map @ @ . ;      ." object:" dup . ." class:" object-map @ @ . ;
 method print  method print ( object -- ) \ objects
   \g prints the object. The method for the class @code{object} prints
   \g the address of the object and the address of its class.
   
 end-class object  end-class object ( -- class ) \ objects
   \g the ancestor of all classes.
   
 \ constructing objects  \ constructing objects
   
 : init-object ( ... class object -- )  : init-object ( ... class object -- ) \ objects
       \g initializes a chunk of memory (@code{object}) to an object of
       \g class @code{class}; then performs @code{construct}.
     swap class->map over object-map ! ( ... object )      swap class->map over object-map ! ( ... object )
     construct ;      construct ;
   
 : xt-new ( ... class xt -- object )  : xt-new ( ... class xt -- object ) \ objects
     \ makes a new object, using XT ( align size -- addr ) to allocate memory      \g makes a new object, using @code{xt ( align size -- addr )} to
       \g get memory.
     over class-inst-size 2@ rot execute      over class-inst-size 2@ rot execute
     dup >r init-object r> ;      dup >r init-object r> ;
   
 : dict-new ( ... class -- object )  : dict-new ( ... class -- object ) \ objects
     \ makes a new object HERE in dictionary      \g @code{allot} and initialize an object of class @code{class} in
       \g the dictionary.
     ['] %allot xt-new ;      ['] %allot xt-new ;
   
 : heap-new ( ... class -- object )  : heap-new ( ... class -- object ) \ objects
     \ makes a new object in ALLOCATEd memory      \g @code{allocate} and initialize an object of class @code{class}.
     ['] %alloc xt-new ;      ['] %alloc xt-new ;

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


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