--- a/GenericException.st Thu Oct 27 18:43:56 2011 +0200
+++ b/GenericException.st Fri Oct 28 00:28:12 2011 +0200
@@ -199,6 +199,7 @@
"Modified: / 24.7.1999 / 13:21:25 / stefan"
! !
+
!GenericException class methodsFor:'Compatibility-Dolphin'!
signal:messageText
@@ -1096,6 +1097,7 @@
"Modified: / 23.7.1999 / 14:50:11 / stefan"
! !
+
!GenericException methodsFor:'Compatibility-ANSI'!
pass
@@ -1509,7 +1511,7 @@
VW compatibility."
self isResumable ifTrue:[
- self resume:(self defaultResumeValue)
+ self proceedWith:(self defaultResumeValue)
] ifFalse:[
self return:(self defaultReturnValue)
]
@@ -1522,7 +1524,7 @@
VW compatibility."
self isResumable ifTrue:[
- self resume:value
+ self proceedWith:value
] ifFalse:[
self return:value
]
@@ -1619,8 +1621,9 @@
|con|
con := self returnableSuspendedContext.
+ thisContext evaluateUnwindActionsUpTo:con.
handlerContext := suspendedContext := raiseContext := nil.
- con unwindThenDo:[anotherException raiseSignal].
+ con returnDoing:[anotherException raiseSignal]
"
|rslt|
@@ -1669,8 +1672,9 @@
|con|
con := handlerContext.
+ thisContext evaluateUnwindActionsUpTo:con.
handlerContext := suspendedContext := raiseContext := nil.
- con unwindAndRestart
+ con restart
"
|rslt n|
@@ -1699,9 +1703,11 @@
"/ handle:(handlerContext argAt:1)
"/ do:aBlock
"/ ].
- handlerContext := suspendedContext := raiseContext := nil.
+
con receiver handlerProtectedBlock:aBlock inContext:con.
- con unwindAndRestart
+ thisContext evaluateUnwindActionsUpTo:con.
+ handlerContext := suspendedContext := raiseContext := nil.
+ con restart
"
|sig rslt|
@@ -1777,8 +1783,9 @@
|con|
con := handlerContext.
+ thisContext evaluateUnwindActionsUpTo:con.
handlerContext := suspendedContext := raiseContext := nil.
- con unwind:(self defaultReturnValue)
+ con return:(self defaultReturnValue)
"Modified: / 7.9.2001 / 13:29:34 / cg"
!
@@ -1789,8 +1796,9 @@
|con|
con := handlerContext.
+ thisContext evaluateUnwindActionsUpTo:con.
handlerContext := suspendedContext := raiseContext := nil.
- con unwind:value
+ con return:value.
"Modified: 27.3.1997 / 16:46:51 / cg"
!
@@ -1803,8 +1811,9 @@
|con|
con := handlerContext.
+ thisContext evaluateUnwindActionsUpTo:con.
handlerContext := suspendedContext := raiseContext := nil.
- con unwindThenDo:aBlock
+ con returnDoing:aBlock
"
[
@@ -2295,11 +2304,11 @@
!GenericException class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.130 2011-02-10 11:30:47 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.131 2011-10-27 22:28:12 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.130 2011-02-10 11:30:47 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.131 2011-10-27 22:28:12 stefan Exp $'
! !
GenericException initialize!