Adding configurable ClassSymbolNative.native_object_getter class field

bitdotgames · Jul 23, 2024 · f68323b · f68323b
1 parent 884d471
commit f68323b
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 19 deletions.
diff --git a/src/vm/symbol.cs b/src/vm/symbol.cs
@@ -1635,34 +1635,49 @@ public class ClassSymbolNative : ClassSymbol, INativeType
   IList<ProxyType> tmp_implements;
 
   System.Type native_type;
+  Func<Val, object> native_object_getter;
 
   public ClassSymbolNative(
     Origin origin,
     string name, 
     VM.ClassCreator creator = null,
-    System.Type native_type = null
+    System.Type native_type = null,
+    Func<Val, object> native_object_getter = null
   )
-    : this(origin, name, new ProxyType(), null, creator, native_type)
+    : this(
+      origin, name, 
+      new ProxyType(), null, 
+      creator, 
+      native_type, native_object_getter)
   {}
 
   public ClassSymbolNative(
     Origin origin,
     string name, 
     IList<ProxyType> proxy_implements,
     VM.ClassCreator creator = null,
-    System.Type native_type = null
+    System.Type native_type = null,
+    Func<Val, object> native_object_getter = null
   )
-    : this(origin, name, new ProxyType(), proxy_implements, creator, native_type)
+    : this(
+      origin, name, 
+      new ProxyType(), proxy_implements, 
+      creator, 
+      native_type, native_object_getter)
   {}
 
   public ClassSymbolNative(
     Origin origin,
     string name, 
     ProxyType proxy_super_class,
     VM.ClassCreator creator = null,
-    System.Type native_type = null
+    System.Type native_type = null,
+    Func<Val, object> native_object_getter = null
   )
-    : this(origin, name, proxy_super_class, null, creator, native_type)
+    : this(origin, name, 
+      proxy_super_class, null, 
+      creator, 
+      native_type, native_object_getter)
   {}
 
   public ClassSymbolNative(
@@ -1671,23 +1686,25 @@ public ClassSymbolNative(
     ProxyType proxy_super_class,
     IList<ProxyType> proxy_implements,
     VM.ClassCreator creator = null,
-    System.Type native_type = null
+    System.Type native_type = null,
+    Func<Val, object> native_object_getter = null
   )
     : base(origin, name, creator)
   {
     this.tmp_super_class = proxy_super_class;
     this.tmp_implements = proxy_implements;
     this.native_type = native_type;
+    this.native_object_getter = native_object_getter;
   }
 
   public System.Type GetNativeType()
   {
     return native_type;
   }
 
-  public virtual object GetNativeObject(Val v)
+  public object GetNativeObject(Val v)
   {
-    return v?._obj;
+    return native_object_getter?.Invoke(v) ?? v?._obj;
   }
 
   public override void Setup()

diff --git a/tests/test_type_casts.cs b/tests/test_type_casts.cs
@@ -640,8 +640,12 @@ func bool test()
     AssertEqual(1, Execute(vm, "test").result.PopRelease().num);
     CommonChecks(vm);
   }
+
+  public interface INativeFoo
+  {}
 
-  public class NativeFoo {
+  public class NativeFoo : INativeFoo
+  {
     public int foo = 10;
   }
   public class NativeBar : NativeFoo 
@@ -738,12 +742,6 @@ func int test3()
     });
   }
 
-  public interface IFoo
-  {}
-
-  public class Foo : IFoo
-  {}
-
   [IsTested()]
   public void TestIsForClassImplementingNativeInterface()
   {
@@ -759,7 +757,7 @@ func bool test() {
           new Origin(),
           "IFoo", 
           null,
-          typeof(IFoo)
+          typeof(INativeFoo)
       );
       ts.ns.Define(ifs);
       ifs.Setup();
@@ -770,9 +768,9 @@ func bool test() {
         new List<ProxyType>(){ ts.T("IFoo") },
         delegate(VM.Frame frm, ref Val v, IType type) 
         { 
-          v.SetObj(new Foo(), type);
+          v.SetObj(new NativeFoo(), type);
         },
-        typeof(Foo)
+        typeof(NativeFoo)
       );
       ts.ns.Define(cl);
       cl.Setup();