Process review comments

Author: windelbouwman

tests/snippets/with.py

@@ -15,8 +15,24 @@ def __str__(self):
         ls.append(3)
         return "c'est moi!"
 
-
 with ContextManager() as c:
     print(c)
 
 assert ls == [1, 3, 2]
+
+ls = []
+class ContextManager2:
+    def __enter__(self):
+        print('Entrada')
+        ls.append(1)
+        return ls
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        ls.append(2)
+        print('Wiedersehen')
+
+with ContextManager2() as c:
+    print(c)
+    assert c == [1]
+
+assert ls == [1, 2]

vm/src/vm.rs

@@ -179,10 +179,7 @@ impl VirtualMachine {
         // Assume top of stack is __exit__ method:
         // TODO: do we want to put the exit call on the stack?
         let exit_method = self.pop_value();
-        let args = PyFuncArgs {
-            args: vec![],
-            kwargs: vec![],
-        };
+        let args = PyFuncArgs::default();
         // TODO: what happens when we got an error during handling exception?
         self.invoke(exit_method, args).unwrap();
     }
@@ -842,15 +839,15 @@ impl VirtualMachine {
                 None
             }
             bytecode::Instruction::SetupWith { end } => {
-                let obj = self.pop_value();
+                let context_manager = self.pop_value();
                 // Call enter:
-                match self.call_method(obj, "__enter__", vec![]) {
-                    Ok(manager) => {
+                match self.call_method(context_manager.clone(), "__enter__", vec![]) {
+                    Ok(obj) => {
                         self.push_block(Block::With {
                             end: *end,
-                            context_manager: manager.clone(),
+                            context_manager: context_manager.clone(),
                         });
-                        self.push_value(manager);
+                        self.push_value(obj);
                         None
                     }
                     Err(err) => Some(Err(err)),
@@ -866,6 +863,7 @@ impl VirtualMachine {
                     assert!(end1 == end2);
 
                     // call exit now:
+                    // TODO: improve exception handling in context manager.
                     let exc_type = self.ctx.none();
                     let exc_val = self.ctx.none();
                     let exc_tb = self.ctx.none();