Diff for /gforth/except.fs between versions 1.21 and 1.25

version 1.21, 2007/12/31 18:40:24 version 1.25, 2010/12/31 18:09:02
Line 1 Line 1
 \ catch, throw, etc.  \ catch, throw, etc.
   
 \ Copyright (C) 1999,2000,2003,2006,2007 Free Software Foundation, Inc.  \ Copyright (C) 1999,2000,2003,2006,2007,2010 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
Line 75  Variable first-throw Line 75  Variable first-throw
     \G backtrace.      \G backtrace.
     first-throw on ;      first-throw on ;
   
   : (try0) ( -- aoldhandler )
       first-throw on
       handler @ ;
   
   [undefined] (try1) [if]
   : (try1) ( aoldhandler arecovery -- anewhandler )
       r>
       swap >r \ recovery address
       sp@ cell+ >r
       fp@ >r
       lp@ >r
       swap >r \ old handler
       rp@ swap \ new handler
       >r ;
   [endif]
   
   : (try2)
       handler ! ;
   
 : (try) ( ahandler -- )  : (try) ( ahandler -- )
     first-throw on      first-throw on
     r>      r>
Line 86  Variable first-throw Line 105  Variable first-throw
     rp@ handler !      rp@ handler !
     >r ;      >r ;
   
   \ : try ( compilation  -- orig ; run-time  -- R:sys1 ) \ gforth
   \     \G Start an exception-catching region.
   \     POSTPONE ahead here >r >mark 1 cs-roll POSTPONE then
   \     r> POSTPONE literal POSTPONE (try) ; immediate compile-only
   
 : try ( compilation  -- orig ; run-time  -- R:sys1 ) \ gforth  : try ( compilation  -- orig ; run-time  -- R:sys1 ) \ gforth
     \G Start an exception-catching region.      \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      POSTPONE (try0) r> POSTPONE literal POSTPONE (try1) POSTPONE (try2)
   ; immediate compile-only
   
   
 : (endtry) ( -- )  : (endtry) ( -- )
     \ normal end of try block: restore handler, forget rest      \ normal end of try block: restore handler, forget rest
Line 142  Variable first-throw Line 168  Variable first-throw
     then endtry ;      then endtry ;
 is catch  is catch
   
   [undefined] (throw1) [if]
   : (throw1) ( ... ball frame -- ... ball )
       dup rp! ( ... ball frame )
       cell+ dup @ lp!
       cell+ dup @ fp!
       cell+ dup @ ( ... ball addr sp ) -rot 2>r sp! drop 2r>
       cell+ @ perform ;
   [endif]
       
 :noname ( y1 .. ym error/0 -- y1 .. ym / z1 .. zn error ) \ exception  :noname ( y1 .. ym error/0 -- y1 .. ym / z1 .. zn error ) \ exception
     ?DUP IF      ?DUP IF
         [ here forthstart 9 cells + ! ]          [ here forthstart 9 cells + ! ]
Line 154  is catch Line 189  is catch
             2 (bye)              2 (bye)
 \           quit  \           quit
         THEN          THEN
         dup rp! ( ... ball frame )          \ cr .s dup 64 dump
         cell+ dup @ lp!          (throw1)
         cell+ dup @ fp!  
         cell+ dup @ ( ... ball addr sp ) -rot 2>r sp! drop 2r>  
         cell+ @ perform  
     THEN ;      THEN ;
 is throw  is throw

Removed from v.1.21  
changed lines
  Added in v.1.25


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