--- gforth/test/gforth.fs	2006/10/22 16:54:01	1.9
+++ gforth/test/gforth.fs	2007/12/31 17:34:59	1.14
@@ -1,6 +1,6 @@
 \ test some gforth extension words
 
-\ Copyright (C) 2003,2004,2005 Free Software Foundation, Inc.
+\ Copyright (C) 2003,2004,2005,2006,2007 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -44,54 +44,47 @@ decimal
 { 'A  -> 65 }
 { 1. '1 -> 1. 49 }
 
-\ represent has no trailing 0s even for inf and nan
+\ REPRESENT has no trailing 0s even for inf and nan
 
 {  1e 0e f/ pad 16 represent drop 2drop pad 15 + c@ '0 = -> false }
 {  0e 0e f/ pad 16 represent drop 2drop pad 15 + c@ '0 = -> false }
 { -1e 0e f/ pad 16 represent drop 2drop pad 15 + c@ '0 = -> false }
 
-\ gforth now guarantees exceptions in division errors
+\ TRY and friends
 
-\ division by zero
-{ 1 0 ' /    catch -> 1 0 -10 }
-{ 1 0 ' mod  catch -> 1 0 -10 }
-{ 1 0 ' /mod catch -> 1 0 -10 }
-{ 1 1 0 ' */mod catch -> 1 1 0 -10 }
-{ 1 1 0 ' */    catch -> 1 1 0 -10 }
-{ 1. 0 ' fm/mod catch -> 1. 0 -10 }
-{ 1. 0 ' sm/rem catch -> 1. 0 -10 }
-{ 1. 0 ' um/mod catch -> 1. 0 -10 }
-
-\ division overflows (might come out as "division by zero" or "overflow")
-environment-wordlist >order
-{ max-n invert -1 ' /    catch 0= -> max-n invert -1 false }
-{ max-n invert -1 ' mod  catch 0= -> max-n invert -1 false }
-{ max-n invert -1 ' /mod catch 0= -> max-n invert -1 false }
-{ 1 max-n invert -1 ' */     catch 0= -> 1 max-n invert -1 false }
-{ 1 max-n invert -1 ' */mod  catch 0= -> 1 max-n invert -1 false }
-{ max-n invert s>d -1 ' fm/mod catch 0= -> max-n invert s>d -1 false }
-{ max-n invert s>d -1 ' sm/rem catch 0= -> max-n invert s>d -1 false }
-
-{ 2 max-n 2/ 1+ 1 ' */    catch 0= -> 2 max-n 2/ 1+ 1 false }
-{ 2 max-n 2/ 1+ 1 ' */mod catch 0= -> 2 max-n 2/ 1+ 1 false }
-{ max-n 0 1. d+ 1 ' fm/mod catch 0= -> max-n 0 1. d+ 1 false }
-{ max-n 0 1. d+ 1 ' sm/rem catch 0= -> max-n 0 1. d+ 1 false }
-{ max-u 0 1. d+ 1 ' um/mod catch 0= -> max-u 0 1. d+ 1 false }
-
-{ 1 1 dnegate 2 ' fm/mod catch 0= -> max-u 0 2. d+ dnegate 2 false }
-{ 1 1 dnegate 2 ' sm/rem catch 0= -> -1 max-n invert true }
-
-{ 1 1 -2 ' fm/mod catch 0= -> 1 1 -2 false }
-{ 1 1 -2 ' sm/rem catch 0= -> 1 max-n invert true }
-
-{ max-u max-n 2/ max-n invert ' fm/mod catch -> -1 max-n invert 0 }
-{ max-u max-n 2/ max-n invert ' sm/rem catch -> max-n max-n negate 0 }
+: 0<-throw ( n -- )
+    0< throw ;
 
-{ 0 max-n 2/ 1+ max-n invert ' fm/mod catch -> 0 max-n invert 0 }
-{ 0 max-n 2/ 1+ max-n invert ' sm/rem catch -> 0 max-n invert 0 }
+: try-test1 ( n1 -- n2 )
+    try
+        dup 0<-throw
+        iferror
+            2drop 25
+        then
+        1+
+    endtry ;
+
+{ -5 try-test1 -> 26 }
+{ 5  try-test1 ->  6 }
+
+: try-test2 ( n1 -- n2 )
+    try
+        0
+    restore
+        drop 1+ dup 0<-throw
+    endtry ;
+
+{ -5 try-test2 -> 0 }
+{  5 try-test2 -> 6 }
+
+: try-test3 ( n1 -- n2 )
+    try
+        dup 0<-throw
+    endtry-iferror
+        2drop 10
+    else
+        1+
+    then ;
 
-{ 1 max-n 2/ 1+ max-n invert ' fm/mod catch 0= -> 1 max-n 2/ 1+ max-n invert false }
-{ 1 max-n 2/ 1+ max-n invert ' sm/rem catch 0= -> 1 max-n invert true }
-
-{ 0 max-u -1. d+ max-u ' um/mod catch 0= -> max-u 1- max-u true }
-{ 0 max-u max-u ' um/mod catch 0= -> 0 max-u max-u false }
+{ -5 try-test3 -> 10 }
+{  5 try-test3 ->  6 }