cleanup PyFunction a little bit

youknowone · youknowone · commit 0b1050e8c1e5 · 2020-01-15T11:51:29.000+09:00
diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs
@@ -951,7 +951,7 @@ pub fn builtin_build_class_(
     let cells = vm.ctx.new_dict();
 
     let scope = function
-        .scope
+        .scope()
         .new_child_scope_with_locals(cells.clone())
         .new_child_scope_with_locals(namespace.clone());
 
diff --git a/vm/src/obj/objfunction.rs b/vm/src/obj/objfunction.rs
@@ -15,7 +15,7 @@ pub type PyFunctionRef = PyRef<PyFunction>;
 pub struct PyFunction {
     // TODO: these shouldn't be public
     pub code: PyCodeRef,
-    pub scope: Scope,
+    scope: Scope,
     pub defaults: Option<PyTupleRef>,
     pub kw_only_defaults: Option<PyDictRef>,
 }
@@ -49,6 +49,10 @@ impl PyFunction {
             kw_only_defaults,
         }
     }
+
+    pub fn scope(&self) -> &Scope {
+        &self.scope
+    }
 }
 
 impl PyValue for PyFunction {
diff --git a/vm/src/vm.rs b/vm/src/vm.rs
@@ -37,7 +37,7 @@ use crate::obj::objiter;
 use crate::obj::objlist::PyList;
 use crate::obj::objmodule::{self, PyModule};
 use crate::obj::objstr::{PyString, PyStringRef};
-use crate::obj::objtuple::{PyTuple, PyTupleRef};
+use crate::obj::objtuple::PyTuple;
 use crate::obj::objtype::{self, PyClassRef};
 use crate::pyhash;
 use crate::pyobject::{
@@ -726,7 +726,7 @@ impl VirtualMachine {
     }
 
     pub fn invoke_python_function(&self, func: &PyFunction, func_args: PyFuncArgs) -> PyResult {
-        self.invoke_python_function_with_scope(func, func_args, &func.scope)
+        self.invoke_python_function_with_scope(func, func_args, func.scope())
     }
 
     pub fn invoke_python_function_with_scope(
@@ -743,13 +743,7 @@ impl VirtualMachine {
             scope.clone()
         };
 
-        self.fill_locals_from_args(
-            &code,
-            &scope.get_locals(),
-            func_args,
-            &func.defaults,
-            &func.kw_only_defaults,
-        )?;
+        self.fill_locals_from_args(&code, &scope.get_locals(), func_args, func)?;
 
         // Construct frame:
         let frame = Frame::new(code.clone(), scope).into_ref(self);
@@ -769,8 +763,7 @@ impl VirtualMachine {
         code_object: &bytecode::CodeObject,
         locals: &PyDictRef,
         func_args: PyFuncArgs,
-        defaults: &Option<PyTupleRef>,
-        kw_only_defaults: &Option<PyDictRef>,
+        func: &PyFunction,
     ) -> PyResult<()> {
         let nargs = func_args.args.len();
         let nexpected_args = code_object.arg_names.len();
@@ -849,6 +842,9 @@ impl VirtualMachine {
             }
         }
 
+        let defaults = &func.defaults;
+        let kw_only_defaults = &func.kw_only_defaults;
+
         // Add missing positional arguments, if we have fewer positional arguments than the
         // function definition calls for
         if nargs < nexpected_args {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ pub type PyFunctionRef = PyRef<PyFunction>;`
`15`	`15`	`pub struct PyFunction {`
`16`	`16`	`// TODO: these shouldn't be public`
`17`	`17`	`pub code: PyCodeRef,`
`18`		`- pub scope: Scope,`
	`18`	`+ scope: Scope,`
`19`	`19`	`pub defaults: Option<PyTupleRef>,`
`20`	`20`	`pub kw_only_defaults: Option<PyDictRef>,`
`21`	`21`	`}`
`@@ -49,6 +49,10 @@ impl PyFunction {`
`49`	`49`	`kw_only_defaults,`
`50`	`50`	`}`
`51`	`51`	`}`
	`52`	`+`
	`53`	`+ pub fn scope(&self) -> &Scope {`
	`54`	`+ &self.scope`
	`55`	`+ }`
`52`	`56`	`}`
`53`	`57`
`54`	`58`	`impl PyValue for PyFunction {`