This repository has been archived by the owner on May 31, 2020. It is now read-only.
Split WITH_CLEANUP into WITH_CLEANUP_START/FINISH #620
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1761,6 +1761,27 @@ VirtualMachine.prototype.byte_WITH_CLEANUP = function() { | |
| throw new builtins.BataviaError.$pyclass('Confused WITH_CLEANUP') | ||
| } | ||
| var ret = callables.call_method(mgr, '__exit__', [exc, val, tb]) | ||
| if (constants.BATAVIA_MAGIC === constants.BATAVIA_MAGIC_34) { | ||
| if (!(exc instanceof types.NoneType) && ret.__bool__ !== undefined && | ||
| ret.__bool__().valueOf()) { | ||
| this.push('silenced') | ||
| } | ||
| } else { | ||
| // Assuming Python 3.5 | ||
| this.push(exc) | ||
| this.push(ret) | ||
| } | ||
| } | ||
|
|
||
| VirtualMachine.prototype.byte_WITH_CLEANUP_FINISH = function() { | ||
| if (constants.BATAVIA_MAGIC === constants.BATAVIA_MAGIC_34) { | ||
| throw new builtins.BataviaError.$pyclass( | ||
| 'Unknown opcode WITH_CLEANUP_FINISH in Python 3.4' | ||
| ) | ||
| } | ||
| // Assuming Python 3.5 | ||
| var ret = this.pop() | ||
| var exc = this.pop() | ||
|
There was a problem hiding this comment. At column 33: (no-undef) 'opcode' is not defined. There was a problem hiding this comment. I don't see how your code is failing this check, so I think this is safe to ignore while we still work out bugs in beekeeper. There was a problem hiding this comment. Hrm... Yeah - not sure what's going on here, because the Beefore check passed... There was a problem hiding this comment. At column 49: (no-undef) 'opname' is not defined. |
||
| if (!(exc instanceof types.NoneType) && ret.__bool__ !== undefined && | ||
| ret.__bool__().valueOf()) { | ||
| this.push('silenced') | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will this code work for 3.5+ or just 3.5?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Depends on when/if they change the opcode. It looks like it's the same for 3.6 (except for the format change - but that's a marshalling issue, not an opcode issue.)