GenericException.st
changeset 5984 2d5c04c9fab6
parent 5950 5757b9ba4ff2
child 5985 4bffb803f9e8
--- a/GenericException.st	Fri Sep 07 13:17:24 2001 +0200
+++ b/GenericException.st	Fri Sep 07 13:22:06 2001 +0200
@@ -153,7 +153,6 @@
         originator:origin.
 ! !
 
-
 !GenericException class methodsFor:'Compatibility - ANSI'!
 
 raiseSignal
@@ -1144,7 +1143,6 @@
     "Modified: 15.1.1997 / 20:15:12 / cg"
 ! !
 
-
 !GenericException methodsFor:'Compatibility - ANSI'!
 
 pass
@@ -1386,12 +1384,22 @@
 
 ! !
 
+!GenericException methodsFor:'default values'!
+
+defaultResumeValue
+    ^ nil
+!
+
+defaultReturnValue
+    ^ nil
+! !
+
 !GenericException methodsFor:'handler actions'!
 
 proceed
     "Continue after the raise - the raise returns nil"
 
-    self proceedWith:nil.
+    self proceedWith:(self defaultResumeValue).
 
     "cg: a strange example: 
         there are two cought errors here - can you spot them ?
@@ -1607,8 +1615,8 @@
 
     <resource:#obsolete>
 
-    self obsoleteMethodWarning:'use #proceed'.
-    ^ self proceedWith:nil
+    "/ self obsoleteMethodWarning:'use #proceed'.   "/ nope - ANSI defines #resume - sigh
+    ^ self proceedWith:(self defaultResumeValue)
 
     "Modified: / 2.3.1998 / 10:51:55 / stefan"
 !
@@ -1619,7 +1627,7 @@
 
     <resource:#obsolete>
 
-    self obsoleteMethodWarning:'use #proceedWith:'.
+    "/ self obsoleteMethodWarning:'use #proceedWith:'.   "/ nope - ANSI defines #resume: - sigh
     ^ self proceedWith:value
 
     "Modified: / 2.3.1998 / 10:51:48 / stefan"
@@ -1632,7 +1640,7 @@
 
     con := handlerContext.
     handlerContext := suspendedContext := nil.
-    con unwind:nil
+    con unwind:(self defaultReturnValue)
 
     "Modified: 27.3.1997 / 16:46:39 / cg"
 !
@@ -1958,6 +1966,6 @@
 !GenericException class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.47 2001-09-04 10:35:13 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.48 2001-09-07 11:22:06 cg Exp $'
 ! !
 GenericException initialize!