with statement
#594
with statement
#594
Conversation
batavia/VirtualMachine.js
Outdated
| this.push_block(block.type, block.handler, block.level-1) | ||
| } else { | ||
| throw new builtins.BataviaError.$pyclass('Confused WITH_CLEANUP') | ||
| } |
There was a problem hiding this comment.
At column 56: (no-multi-spaces) Multiple spaces found before '// XXX'.
batavia/VirtualMachine.js
Outdated
| throw new builtins.BataviaError.$pyclass('Confused WITH_CLEANUP') | ||
| } | ||
| var ret = callables.call_function(exit_func, [exc, val, tb]) // XXX this arg list is incorrect for first 2 cases | ||
| //TODO: silence error if necessary |
There was a problem hiding this comment.
At column 63: (space-infix-ops) Infix operators must be spaced.
batavia/VirtualMachine.js
Outdated
| this.push('silenced') | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
| this.push_block(block.type, block.handler, block.level - 1) | ||
| } else { | ||
| throw new builtins.BataviaError.$pyclass('Confused WITH_CLEANUP') | ||
| } |
There was a problem hiding this comment.
At column 56: (no-multi-spaces) Multiple spaces found before '// XXX'.
| this.push_block(block.type, block.handler, block.level - 1) | ||
| } else { | ||
| throw new builtins.BataviaError.$pyclass('Confused WITH_CLEANUP') | ||
| } |
There was a problem hiding this comment.
At column 56: (no-multi-spaces) Multiple spaces found before '// XXX'.
There was a problem hiding this comment.
Not sure what's going on here - the lint problem is genuine; but it's on line 1747.
There was a problem hiding this comment.
I fixed it. The XXX was only there to remind me to double check that this line works as intended. But now I am wondering if I should leave it as is, since it breaks "stack API" by using this.frame.stack.slice instead of combination of this.pop and this.push. The other way feels clunky in this case.
batavia/VirtualMachine.js
Outdated
| // this.push(ctxmgr_obj) | ||
| // } | ||
| VirtualMachine.prototype.byte_SETUP_WITH = function(dest) { | ||
| var mgr = this.top() |
There was a problem hiding this comment.
CPython would pop context manager from the stack here and push only __exit__ method of the context manager to call it as a function in WITH_CLEANUP. However I couldn't make it work this way, so I am leaving context manager on the stack and in WITH_CLEANUP I am calling mgr.__exit__ (line 1753). I don't see how this would break anything. What do you think @freakboy3742 ?
There was a problem hiding this comment.
Agreed. The state of the stack is an internal detail; and in this particular case, it's a transient detail - so go right ahead.
Opcodes SETUP_WITH and WITH_CLEANUP has been implemented to trigger context manager's `__enter__` and `__exit__` methods as necessary and suppress exceptions when appropriate. Note that Python 3.5+ replaces WITH_CLEANUP with WITH_CLEANUP_START and WITH_CLEANUP_FINISH.
Implement SETUP_WITH and WITH_CLEANUP opcodes in Batavia's VM