Skip to content

Commit f9cb71f

Browse files
committed
Merge branch 'use-property-for-suspension-check'
2 parents b24a873 + 11add90 commit f9cb71f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/compile.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,13 +318,13 @@ Compiler.prototype._checkSuspension = function(e) {
318318

319319
e = e || {lineno: "currLineNo", col_offset: "currColNo"};
320320

321-
out ("if ($ret instanceof Sk.misceval.Suspension) { return $saveSuspension($ret,'"+this.filename+"',"+e.lineno+","+e.col_offset+"); }");
321+
out ("if ($ret && $ret.isSuspension) { return $saveSuspension($ret,'"+this.filename+"',"+e.lineno+","+e.col_offset+"); }");
322322

323323
this.u.doesSuspend = true;
324324
this.u.tempsToSave = this.u.tempsToSave.concat(this.u.localtemps);
325325

326326
} else {
327-
out ("if ($ret instanceof Sk.misceval.Suspension) { $ret = Sk.misceval.retryOptionalSuspensionOrThrow($ret); }");
327+
out ("if ($ret && $ret.isSuspension) { $ret = Sk.misceval.retryOptionalSuspensionOrThrow($ret); }");
328328
}
329329
};
330330
Compiler.prototype.ctuplelistorset = function(e, data, tuporlist) {

src/misceval.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Sk.misceval = {};
1717
* @param{Object=} data Data attached to this suspension. Will be copied from child if not supplied.
1818
*/
1919
Sk.misceval.Suspension = function Suspension(resume, child, data) {
20+
this.isSuspension = true;
2021
if (resume !== undefined && child !== undefined) {
2122
this.resume = function() { return resume(child.resume()); };
2223
}

0 commit comments

Comments
 (0)