Fix FAM rendering by removing FAM field early (#224)

indoorvivants · Jul 10, 2023 · d2948b9 · d2948b9
1 parent 19e2196
commit d2948b9
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 23 deletions.
diff --git a/modules/bindgen/src/main/scala/analysis/visitStruct.scala b/modules/bindgen/src/main/scala/analysis/visitStruct.scala
@@ -104,11 +104,14 @@ def visitStruct(cursor: CXCursor, name: String)(using
           val nestedName = "Struct" + builder.anonymous.size
           val str = visitStruct(cursor, builder.name.value + "." + nestedName)
           builder.anonymous.addOne(
-            Def.Struct(
-              fields = str.fields,
-              name = StructName(nestedName),
-              anonymous = str.anonymous,
-              meta = extractMetadata(cursor)
+            removeFAM(
+              Def.Struct(
+                fields = str.fields,
+                name = StructName(nestedName),
+                anonymous = str.anonymous,
+                meta = extractMetadata(cursor)
+              ),
+              Some(cursor.spelling)
             )
           )
           CXChildVisitResult.CXChildVisit_Continue
@@ -125,8 +128,27 @@ def visitStruct(cursor: CXCursor, name: String)(using
         CXClientData.wrap(ptr)
       )
 
-      (!ptr)._1.struct.build
+      removeFAM((!ptr)._1.struct.build)
     finally memory.deallocate()
     end try
   }
 end visitStruct
+
+def removeFAM(model: Def.Struct, name: Option[String] = None)(using
+    LoggingConfig
+): Def.Struct =
+
+  val hasFlexibleArrayMember = model.fields.lastOption.collectFirst {
+    case (_, CType.IncompleteArray(_)) => true
+  }.isDefined
+
+  if hasFlexibleArrayMember then
+    warning(
+      s"Struct '${name.getOrElse(model.name)}' has a Flexible Array Member, so it was dropped from the definition. " +
+        "See https://github.com/indoorvivants/sn-bindgen/issues/62 for details"
+    )
+
+    model.copy(fields = model.fields.dropRight(1))
+  else model
+
+end removeFAM
diff --git a/modules/bindgen/src/main/scala/render/struct.scala b/modules/bindgen/src/main/scala/render/struct.scala
@@ -1,25 +1,10 @@
 package bindgen
 package rendering
 
-def struct(model: Def.Struct, line: Appender)(using
+def struct(struct: Def.Struct, line: Appender)(using
     c: Config,
     ar: AliasResolver
 ): Exported =
-  val hasFlexibleArrayMember = model.fields.lastOption.collectFirst {
-    case (_, CType.IncompleteArray(_)) => true
-  }.isDefined
-
-  val struct: Def.Struct =
-    if hasFlexibleArrayMember then
-      model.copy(fields = model.fields.dropRight(1))
-    else model
-
-  if hasFlexibleArrayMember then
-    warning(
-      s"Struct '${model.name}' has a Flexible Array Member, so it was dropped from the definition. " +
-        "See https://github.com/indoorvivants/sn-bindgen/issues/62 for details"
-    )
-
   val rewriteRules = hack_recursive_structs(struct)
   val structName = struct.name
   val structType: CType.Struct = CType.Struct(struct.fields.map(_._2).toList)
@@ -84,7 +69,7 @@ def struct(model: Def.Struct, line: Appender)(using
         .map(p => p.name.value -> p.newRawType)
     )
 
-  renderComment(line, model.meta)
+  renderComment(line, struct.meta)
   line(s"opaque type $structName = ${scalaType(finalStructType)}")
   line(s"object ${sanitiseBeforeColon(structName.value)}:")
   nest {

diff --git a/modules/tests/src/test/resources/scala-native/flexible_array_member.h b/modules/tests/src/test/resources/scala-native/flexible_array_member.h
@@ -2,3 +2,13 @@ typedef struct FAM {
   int len;
   char data[]; 
 } FAM;
+
+typedef union {
+  struct 
+  {
+    int va_header;
+    char va_data[]; 
+  } va_compressed;
+} FAM_union;
+
+