Merge remote-tracking branch 'origin/master' into joey/fun-with-functions

Conflicts:
      vm/src/lib.rs
      vm/src/pyobject.rs
      wasm/lib/src/vm_class.rs

Author: OddCoincidence

parser/src/fstring.rs

@@ -121,7 +121,7 @@ impl<'a> FStringParser<'a> {
             }
         }
 
-        return Err(UnclosedLbrace);
+        Err(UnclosedLbrace)
     }
 
     fn parse(mut self) -> Result<StringGroup, FStringError> {

src/main.rs

@@ -12,10 +12,11 @@ use rustpython_parser::error::ParseError;
 use rustpython_vm::{
     compile,
     error::CompileError,
+    frame::ScopeRef,
     import,
     obj::objstr,
     print_exception,
-    pyobject::{AttributeProtocol, PyObjectRef, PyResult},
+    pyobject::{AttributeProtocol, PyResult},
     util, VirtualMachine,
 };
 use rustyline::{error::ReadlineError, Editor};
@@ -120,11 +121,7 @@ fn run_script(vm: &mut VirtualMachine, script_file: &str) -> PyResult {
     }
 }
 
-fn shell_exec(
-    vm: &mut VirtualMachine,
-    source: &str,
-    scope: PyObjectRef,
-) -> Result<(), CompileError> {
+fn shell_exec(vm: &mut VirtualMachine, source: &str, scope: ScopeRef) -> Result<(), CompileError> {
     match compile::compile(
         source,
         &compile::Mode::Single,

tests/snippets/try_exceptions.py

@@ -8,6 +8,19 @@
     # print(ex.__traceback__)
     # print(type(ex.__traceback__))
 
+try:
+    raise ZeroDivisionError
+except ZeroDivisionError as ex:
+    pass
+
+class E(Exception):
+    def __init__(self):
+        asdf
+
+try:
+    raise E
+except NameError as ex:
+    pass
 
 l = []
 try:

vm/src/builtins.rs

@@ -3,7 +3,6 @@
 //! Implements functions listed here: https://docs.python.org/3/library/builtins.html
 
 // use std::ops::Deref;
-use std::cell::RefCell;
 use std::char;
 use std::io::{self, Write};
 
@@ -15,10 +14,11 @@ use crate::obj::objiter;
 use crate::obj::objstr;
 use crate::obj::objtype;
 
+use crate::frame::{Scope, ScopeRef};
 use crate::pyobject::{
-    AttributeProtocol, IdProtocol, PyContext, PyFuncArgs, PyObject, PyObjectPayload, PyObjectRef,
-    PyResult, Scope, TypeProtocol,
+    AttributeProtocol, IdProtocol, PyContext, PyFuncArgs, PyObjectRef, PyResult, TypeProtocol,
 };
+use std::rc::Rc;
 
 #[cfg(not(target_arch = "wasm32"))]
 use crate::stdlib::io::io_open;
@@ -258,7 +258,7 @@ fn builtin_exec(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
     vm.run_code_obj(code_obj, scope)
 }
 
-fn make_scope(vm: &mut VirtualMachine, locals: Option<&PyObjectRef>) -> PyObjectRef {
+fn make_scope(vm: &mut VirtualMachine, locals: Option<&PyObjectRef>) -> ScopeRef {
     // handle optional global and locals
     let locals = if let Some(locals) = locals {
         locals.clone()
@@ -268,18 +268,10 @@ fn make_scope(vm: &mut VirtualMachine, locals: Option<&PyObjectRef>) -> PyObject
 
     // TODO: handle optional globals
     // Construct new scope:
-    let scope_inner = Scope {
+    Rc::new(Scope {
         locals,
         parent: None,
-    };
-
-    PyObject {
-        payload: PyObjectPayload::Scope {
-            scope: RefCell::new(scope_inner),
-        },
-        typ: None,
-    }
-    .into_ref()
+    })
 }
 
 fn builtin_format(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
@@ -842,13 +834,7 @@ pub fn builtin_build_class_(vm: &mut VirtualMachine, mut args: PyFuncArgs) -> Py
         },
     )?;
 
-    vm.invoke(
-        function,
-        PyFuncArgs {
-            args: vec![namespace.clone()],
-            kwargs: vec![],
-        },
-    )?;
+    vm.invoke_with_locals(function, namespace.clone())?;
 
     vm.call_method(&metaclass, "__call__", vec![name_arg, bases, namespace])
 }

vm/src/bytecode.rs

@@ -159,7 +159,6 @@ pub enum Instruction {
     },
     PrintExpr,
     LoadBuildClass,
-    StoreLocals,
     UnpackSequence {
         size: usize,
     },
@@ -191,7 +190,7 @@ pub enum Constant {
     Boolean { value: bool },
     String { value: String },
     Bytes { value: Vec<u8> },
-    Code { code: CodeObject },
+    Code { code: Box<CodeObject> },
     Tuple { elements: Vec<Constant> },
     None,
 }
@@ -269,7 +268,7 @@ impl CodeObject {
         }
     }
 
-    pub fn get_constants<'a>(&'a self) -> impl Iterator<Item = &'a Constant> {
+    pub fn get_constants(&self) -> impl Iterator<Item = &Constant> {
         self.instructions.iter().filter_map(|x| {
             if let Instruction::LoadConst { value } = x {
                 Some(value)
@@ -358,14 +357,10 @@ impl Instruction {
             MapAdd { i } => w!(MapAdd, i),
             PrintExpr => w!(PrintExpr),
             LoadBuildClass => w!(LoadBuildClass),
-            StoreLocals => w!(StoreLocals),
             UnpackSequence { size } => w!(UnpackSequence, size),
             UnpackEx { before, after } => w!(UnpackEx, before, after),
             Unpack => w!(Unpack),
-            FormatValue {
-                conversion: _,
-                spec,
-            } => w!(FormatValue, spec), // TODO: write conversion
+            FormatValue { spec, .. } => w!(FormatValue, spec), // TODO: write conversion
         }
     }
 }