feat:Add transitions for CUnion (#184)

Fixes #176

Author: markehammons

build.sc

@@ -26,6 +26,7 @@ trait BaseModule extends ScoverageModule with ScalafmtModule {
   def scalacOptions = Seq(
     "-deprecation",
     "-Wunused:all",
+    "-feature",
     "-unchecked",
     "-Xcheck-macros",
     "-Xprint-suspension",

core/src/fr/hammons/slinc/Allocator.scala

@@ -5,6 +5,7 @@ import fr.hammons.slinc.modules.DescriptorModule
 
 trait Allocator:
   def allocate(descriptor: TypeDescriptor, num: Int): Mem
+  def addCloseAction(fn: () => Unit): Unit
   def upcall[Fn](descriptor: FunctionDescriptor, target: Fn): Mem
   protected def methodHandleFromFn[Fn](
       descriptor: FunctionDescriptor,

core/src/fr/hammons/slinc/CUnion.scala

@@ -3,6 +3,7 @@ package fr.hammons.slinc
 import scala.compiletime.erasedValue
 import scala.compiletime.error
 import scala.compiletime.summonInline
+import scala.compiletime.summonFrom
 import fr.hammons.slinc.modules.ReadWriteModule
 import fr.hammons.slinc.modules.DescriptorModule
 import scala.NonEmptyTuple
@@ -47,10 +48,14 @@ object CUnion:
     case EmptyTuple => td.nn
 
   inline def apply[T <: NonEmptyTuple](using
-      is: InferredScope,
       descriptorModule: DescriptorModule
-  ) =
+  ): CUnion[T] =
     val maxDescriptor = applyHelper[T](null).nn
-    is { allocator ?=>
-      new CUnion[T](allocator.allocate(maxDescriptor, 1))
+    summonFrom {
+      case allocator: Allocator =>
+        new CUnion[T](allocator.allocate(maxDescriptor, 1))
+      case inferredScope: InferredScope =>
+        inferredScope { allocator ?=>
+          new CUnion[T](allocator.allocate(maxDescriptor, 1))
+        }
     }

core/src/fr/hammons/slinc/FunctionContext.scala

@@ -25,6 +25,7 @@ object FunctionContext:
         case a                      => a
       .exists:
         case _: StructDescriptor => true
+        case _: CUnionDescriptor => true
         case _                   => false
 
     val allocationTransition: Seq[InputTransition] =

core/src/fr/hammons/slinc/MethodHandleTools.scala

@@ -107,20 +107,23 @@ object MethodHandleTools:
         _ => retType
       ),
       (meth, params) =>
-        retType.asType match
+        val invokeExpr = retType.asType match
           case '[r] =>
-            val invokeExpr = invokeArguments[r](
+            invokeArguments[r](
               methodHandleExpr,
               '{ $mem.asBase } +:
                 params.map(_.asExpr)
             )
-            val invokeResultExpr = '{
-              val invokeResult = $invokeExpr
-              if invokeResult == null then ().asInstanceOf[r]
-              else invokeResult.asInstanceOf[r]
+
+        val invokeResultExpr = retType.asType match
+          case '[Unit] =>
+            '{
+              $invokeExpr
+              ()
             }
-            invokeResultExpr.asTerm
-              .changeOwner(meth)
+          case '[r] => '{ $invokeExpr.asInstanceOf[r] }
+        invokeResultExpr.asTerm
+          .changeOwner(meth)
     ).asExprOf[A]
 
     expr

core/src/fr/hammons/slinc/Scope.scala

@@ -23,6 +23,7 @@ object Scope:
   def confined(using c: ConfinedScope): ConfinedScope = c
   def global(using g: GlobalScope): GlobalScope = g
   def shared(using s: SharedScope): SharedScope = s
+  def inferred(using i: InferredScope): InferredScope = i
 
 class ScopeI(platformSpecific: ScopeI.PlatformSpecific):
   given TempScope = platformSpecific.createTempScope

core/src/fr/hammons/slinc/TypeDescriptor.scala

@@ -13,6 +13,7 @@ import scala.quoted.*
 import fr.hammons.slinc.modules.TransitionModule
 import fr.hammons.slinc.modules.{ArgumentTransition, ReturnTransition}
 import scala.NonEmptyTuple
+import scala.language.implicitConversions
 
 /** Describes types used by C interop
   */
@@ -203,12 +204,13 @@ case class CUnionDescriptor(possibleTypes: Set[TypeDescriptor])
     ???
 
   override val returnTransition
-      : (TransitionModule, ReadWriteModule) ?=> ReturnTransition[Inner] = ???
+      : (TransitionModule, ReadWriteModule) ?=> ReturnTransition[Inner] = obj =>
+    summon[TransitionModule].cUnionReturn(this, obj).asInstanceOf[Inner]
 
   override val argumentTransition
       : (TransitionModule, ReadWriteModule, Allocator) ?=> ArgumentTransition[
         Inner
-      ] = ???
+      ] = (i: Inner) => i.mem.asBase
 
   override val writer: (ReadWriteModule, DescriptorModule) ?=> Writer[Inner] =
     ???

core/src/fr/hammons/slinc/container/Container.scala

@@ -4,6 +4,7 @@ import scala.reflect.ClassTag
 import scala.compiletime.erasedValue
 import scala.compiletime.error
 import scala.quoted.*
+import scala.language.implicitConversions
 
 class Data[A](a: A):
   type B = A

core/src/fr/hammons/slinc/modules/TransitionModule.scala

@@ -44,6 +44,8 @@ trait TransitionModule:
 
   def memReturn(value: Object): Mem
 
+  def cUnionReturn(td: TypeDescriptor, value: Object): CUnion[?]
+
   def functionArgument[A](td: TypeDescriptor, value: Object): A =
     methodReturn[A](td, value)
 

core/test/resources/native/test.c

@@ -102,4 +102,25 @@ EXPORTED int i30_function_ptr_va_list(int count, Adder adder, ...) {
 
 EXPORTED void* i157_null_eq() {
   return NULL;
+}
+
+typedef union {
+  float x;
+  int y;
+} union_a_issue_176;
+
+typedef union {
+  long x;
+  double y;
+} union_b_issue_176;
+
+static union_b_issue_176 b;
+EXPORTED union_b_issue_176 i176_test(union_a_issue_176 a, char is_left) {
+  if(is_left) {
+    b.y = (double) a.x;
+  } else {
+    b.x = (long) a.y;
+  }
+
+  return b;
 }