The Trunk: Kernel-nice.1397.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Kernel-nice.1397.mcz

commits-2
Nicolas Cellier uploaded a new version of Kernel to project The Trunk:
http://source.squeak.org/trunk/Kernel-nice.1397.mcz

==================== Summary ====================

Name: Kernel-nice.1397
Author: nice
Time: 30 April 2021, 9:48:57.972338 pm
UUID: df20ab21-bba8-4919-b4a1-d2c7a6c6e8de
Ancestors: Kernel-mt.1396, Kernel-jar.1395

merge Kernel-jar.1395 (fix outer)

=============== Diff against Kernel-mt.1396 ===============

Item was changed:
  ----- Method: Exception>>outer (in category 'handling') -----
  outer
  "Evaluate the enclosing exception action and return to here instead of signal if it resumes (see #resumeUnchecked:)."
 
+ | prevOuterContext currHandlerContext |
- | prevOuterContext |
  self isResumable ifTrue: [
+ currHandlerContext := handlerContext.
  prevOuterContext := outerContext.
  outerContext := thisContext contextTag.
  ].
  self pass.
  !

Item was changed:
  ----- Method: Exception>>resumeUnchecked: (in category 'handling') -----
  resumeUnchecked: resumptionValue
  "Return resumptionValue as the value of #signal, unless this was called after an #outer message, then return resumptionValue as the value of #outer."
 
  | ctxt |
  outerContext ifNil: [
  signalContext return: resumptionValue
  ] ifNotNil: [
  ctxt := outerContext.
  outerContext := ctxt tempAt: 1. "prevOuterContext in #outer"
+ handlerContext := ctxt tempAt: 2. "currHandlerContext in #outer"
  ctxt return: resumptionValue
  ].
  !