improve interface.extends

now accepts an Interface, like ClassEntry.implements() does

Author: brettmc

phper-doc/doc/_06_module/_07_register_interface/index.md

@@ -41,12 +41,12 @@ interface Foo {}
 If you want the interface `Foo` extends `ArrayAccess` and `Iterator` interfaces.
 
 ```rust,no_run
-use phper::classes::{InterfaceEntity, ClassEntry};
+use phper::classes::{Interface, InterfaceEntity, ClassEntry};
 use phper::classes::{array_access_class, iterator_class};
 
 let mut foo = InterfaceEntity::new("Foo");
-foo.extends(|| array_access_class());
-foo.extends(|| iterator_class());
+foo.extends(Interface::from_name("ArrayAccess"));
+foo.extends(Interface::from_name("Iterator"));
 ```
 
 Same as:

phper/src/classes.rs

@@ -807,13 +807,16 @@ impl InterfaceEntity {
     /// # Examples
     ///
     /// ```no_run
-    /// use phper::classes::{ClassEntry, InterfaceEntity};
+    /// use phper::classes::{Interface, InterfaceEntity};
     ///
     /// let mut interface = InterfaceEntity::new("MyInterface");
-    /// interface.extends(|| ClassEntry::from_globals("Stringable").unwrap());
+    /// interface.extends(Interface::from_name("Stringable"));
     /// ```
-    pub fn extends(&mut self, interface: impl Fn() -> &'static ClassEntry + 'static) {
-        self.extends.push(Box::new(interface));
+    pub fn extends(&mut self, interface: Interface) {
+        self.extends.push(Box::new(move || {
+            let entry: &'static ClassEntry = unsafe { std::mem::transmute(interface.as_class_entry()) };
+            entry
+        }));
     }
 
     #[allow(clippy::useless_conversion)]

tests/integration/src/classes.rs

@@ -11,8 +11,7 @@
 use phper::{
     alloc::RefClone,
     classes::{
-        ClassEntity, ClassEntry, Interface, InterfaceEntity, Visibility, array_access_class,
-        iterator_class,
+        ClassEntity, ClassEntry, Interface, InterfaceEntity, Visibility,
     },
     functions::{Argument, ReturnType},
     modules::Module,
@@ -175,8 +174,8 @@ fn integrate_foo(module: &mut Module) {
 fn integrate_i_bar(module: &mut Module) {
     let mut interface = InterfaceEntity::new(r"IntegrationTest\IBar");
 
-    interface.extends(|| array_access_class());
-    interface.extends(|| iterator_class());
+    interface.extends(Interface::from_name("ArrayAccess"));
+    interface.extends(Interface::from_name("Iterator"));
 
     interface
         .add_method("doSomethings")