Refactor This to Object.

Author: jmjoy

examples/hello/src/lib.rs

@@ -4,7 +4,7 @@ use phper::{
     functions::Argument,
     ini::Policy,
     modules::{Module, ModuleArgs},
-    objects::This,
+    objects::Object,
     php_get_module,
     values::{SetVal, Val},
 };
@@ -65,15 +65,15 @@ pub fn get_module(module: &mut Module) {
     foo_class.add_property("foo", 100);
     foo_class.add_method(
         "getFoo",
-        |this: &mut This, _: &mut [Val]| {
+        |this: &mut Object, _: &mut [Val]| {
             let prop = this.get_property("foo");
             Val::from_val(prop)
         },
         vec![],
     );
     foo_class.add_method(
         "setFoo",
-        |this: &mut This, arguments: &mut [Val]| {
+        |this: &mut Object, arguments: &mut [Val]| {
             let prop = this.get_property("foo");
             prop.set(&arguments[0]);
         },

phper/src/functions.rs

@@ -7,7 +7,7 @@ use std::{
 
 use crate::{
     classes::ClassEntry,
-    objects::This,
+    objects::Object,
     sys::*,
     values::{ExecuteData, SetVal, Val},
 };
@@ -28,15 +28,15 @@ where
 }
 
 pub trait Method: Send + Sync {
-    fn call(&self, this: &mut This, arguments: &mut [Val], return_value: &mut Val);
+    fn call(&self, this: &mut Object, arguments: &mut [Val], return_value: &mut Val);
 }
 
 impl<F, R> Method for F
 where
-    F: Fn(&mut This, &mut [Val]) -> R + Send + Sync,
+    F: Fn(&mut Object, &mut [Val]) -> R + Send + Sync,
     R: SetVal,
 {
-    fn call(&self, this: &mut This, arguments: &mut [Val], return_value: &mut Val) {
+    fn call(&self, this: &mut Object, arguments: &mut [Val], return_value: &mut Val) {
         let r = self(this, arguments);
         r.set_val(return_value);
     }
@@ -189,7 +189,7 @@ pub(crate) unsafe extern "C" fn invoke(
             f.call(&mut arguments, return_value);
         }
         Callable::Method(m, class) => {
-            let mut this = This::new(execute_data.get_this(), class.load(Ordering::SeqCst));
+            let mut this = Object::new(execute_data.get_this(), class.load(Ordering::SeqCst));
             m.call(&mut this, &mut arguments, return_value);
         }
     }

phper/src/objects.rs

@@ -1,13 +1,13 @@
 use crate::{classes::ClassEntry, sys::*, values::Val};
 use std::ptr::null_mut;
 
-pub struct This {
+pub struct Object {
     val: *mut Val,
     class: *mut ClassEntry,
 }
 
-impl This {
-    pub(crate) fn new<'a>(val: *mut Val, class: *mut ClassEntry) -> This {
+impl Object {
+    pub(crate) fn new<'a>(val: *mut Val, class: *mut ClassEntry) -> Object {
         assert!(!val.is_null());
         assert!(!class.is_null());
         Self { val, class }