Diff for /gforth/except.fs between versions 1.16 and 1.18

version 1.16, 2007/02/18 17:57:12 version 1.18, 2007/02/19 00:08:20
Line 87  Variable first-throw Line 87  Variable first-throw
     rp@ handler !      rp@ handler !
     >r ;      >r ;
   
 : try ( compilation  -- orig ; run-time  -- ) \ gforth  : try ( compilation  -- orig ; run-time  -- R:sys1 ) \ gforth
     \ !! does not work correctly for gforth-native      \G Start an exception-catching region.
     POSTPONE ahead here >r >mark 1 cs-roll POSTPONE then      POSTPONE ahead here >r >mark 1 cs-roll POSTPONE then
     r> POSTPONE literal POSTPONE (try) ; immediate compile-only      r> POSTPONE literal POSTPONE (try) ; immediate compile-only
   
 : (recover) ( -- )  : (endtry) ( -- )
     \ normal end of try block: restore handler, forget rest      \ normal end of try block: restore handler, forget rest
     r>      r>
     r> handler !      r> handler !
Line 102  Variable first-throw Line 102  Variable first-throw
     rdrop \ recovery address      rdrop \ recovery address
     >r ;      >r ;
   
 : recover ( compilation  orig1 -- orig2 ; run-time  -- ) \ gforth  : handler-intro, ( -- )
     \ !! check using a special tag  
     POSTPONE else  
     docol: here 0 , 0 , code-address! \ start a colon def       docol: here 0 , 0 , code-address! \ start a colon def 
     postpone rdrop                    \ drop the return address      postpone rdrop                    \ drop the return address
   ;
   
   : iferror ( compilation  orig1 -- orig2 ; run-time  -- ) \ gforth
       \G Starts the exception handling code (executed if there is an
       \G exception between @code{try} and @code{endtry}).  This part has
       \G to be finished with @code{then}.
       \ !! check using a special tag
       POSTPONE else handler-intro,
   ; immediate compile-only
   
   : restore ( compilation  orig1 -- ; run-time  -- ) \ gforth
       \G Starts restoring code, that is executed if there is an
       \G exception, and if there is no exception.
       POSTPONE iferror POSTPONE then
   ; immediate compile-only
   
   : endtry ( compilation  -- ; run-time  R:sys1 -- ) \ gforth
       \G End an exception-catching region.
       POSTPONE (endtry)
 ; immediate compile-only  ; immediate compile-only
   
 : endtry ( compilation  orig -- ; run-time  -- ) \ gforth  : endtry-iferror ( compilation  orig1 -- orig2 ; run-time  R:sys1 -- ) \ gforth
     POSTPONE then      \G End an exception-catching region while starting
     POSTPONE (recover)      \G exception-handling code outside that region (executed if there
       \G is an exception between @code{try} and @code{endtry-iferror}).
       \G This part has to be finished with @code{then} (or
       \G @code{else}...@code{then}).
       POSTPONE (endtry) POSTPONE iferror POSTPONE (endtry)
 ; immediate compile-only  ; immediate compile-only
   
 :noname ( x1 .. xn xt -- y1 .. ym 0 / z1 .. zn error ) \ exception  :noname ( x1 .. xn xt -- y1 .. ym 0 / z1 .. zn error ) \ exception
     try      try
         execute 0          execute 0
     recover      iferror
         nip          nip
     endtry ;      then endtry ;
 is catch  is catch
   
 :noname ( y1 .. ym error/0 -- y1 .. ym / z1 .. zn error ) \ exception  :noname ( y1 .. ym error/0 -- y1 .. ym / z1 .. zn error ) \ exception

Removed from v.1.16  
changed lines
  Added in v.1.18


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